rusefi
/
RomRaider
mirror of https://github.com/rusefi/RomRaider.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement compare fix

This commit is contained in:
Robin K 2022-04-26 17:45:33 +02:00
parent e7eaf8dc8f
commit 6521295880
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/romraider/maps/Rom.java
View File

@ -168,11 +168,19 @@ public class Rom extends DefaultMutableTreeNode implements Serializable {
} }
public Table getTableByName(String tableName) { public Table getTableByName(String tableName) {
TableTreeNode node = getTableNodeByName(tableName);
if(node != null)
return node.getTable();
return null;
}
public TableTreeNode getTableNodeByName(String tableName) {
if(!tableNodes.containsKey(tableName.toLowerCase())) { if(!tableNodes.containsKey(tableName.toLowerCase())) {
return null; return null;
} }
else { else {
return tableNodes.get(tableName.toLowerCase()).getTable(); return tableNodes.get(tableName.toLowerCase());
} }
} }

20
src/main/java/com/romraider/swing/CompareImagesForm.java
View File

@ -46,6 +46,7 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener; import javax.swing.event.ListSelectionListener;
import com.romraider.Settings; import com.romraider.Settings;
import com.romraider.editor.ecu.ECUEditorManager;
import com.romraider.maps.Rom; import com.romraider.maps.Rom;
import com.romraider.maps.Table; import com.romraider.maps.Table;
import com.romraider.util.ResourceUtil; import com.romraider.util.ResourceUtil;
@ -131,11 +132,14 @@ public class CompareImagesForm extends JFrame implements ActionListener {
Rom rightRom = (Rom) comboBoxImageRight.getSelectedItem(); Rom rightRom = (Rom) comboBoxImageRight.getSelectedItem();
// Display Tables // Display Tables
TableTreeNode leftNode = findAndShowTable(leftRom, tableName); TableTreeNode leftNode = leftRom.getTableNodeByName(tableName);
TableTreeNode rightNode = findAndShowTable(rightRom, tableName); TableTreeNode rightNode = rightRom.getTableNodeByName(tableName);
// Set Comparison // Set Comparison
if(leftNode != null && rightNode != null) { if(leftNode != null && rightNode != null) {
ECUEditorManager.getECUEditor().displayTable(leftNode);
ECUEditorManager.getECUEditor().displayTable(rightNode);
leftNode.getFrame().compareByTable(rightNode.getTable()); leftNode.getFrame().compareByTable(rightNode.getTable());
// Update menu bar // Update menu bar
for(int i = 0; i< leftNode.getFrame().getTableMenuBar().getSimilarOpenTables().getItemCount(); i++) { for(int i = 0; i< leftNode.getFrame().getTableMenuBar().getSimilarOpenTables().getItemCount(); i++) {
@ -152,15 +156,7 @@ public class CompareImagesForm extends JFrame implements ActionListener {
}); });
populateComboBoxes(); populateComboBoxes();
} }
private TableTreeNode findAndShowTable(Rom rom, String tableName) {
if(rom.getTableNodes().containsKey(tableName.toLowerCase())) {
return rom.getTableNodes().get(tableName.toLowerCase());
}
return null;
}
public void populateComboBoxes() public void populateComboBoxes()
{ {
for(int i=0; i<roms.size(); i++) { for(int i=0; i<roms.size(); i++) {