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

Finished map comparing 

git-svn-id: http://svn.3splooges.com/romraider-arch/trunk@60 d2e2e1cd-ba16-0410-be16-b7c4453c7c2d
This commit is contained in:
Jared Gould 2006-07-02 13:05:21 +00:00
parent a0bff7a53d
commit b8d6418976
4 changed files with 43 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/enginuity/maps/DataCell.java
View File

@ -263,7 +263,7 @@ public class DataCell extends JLabel implements MouseListener, Serializable {
parser.initSymTab(); // clear the contents of the symbol table
parser.addVariable("x", Double.parseDouble(input));
parser.parseExpression(table.getScale().getByteExpression());
this.setCompareValue((int)Math.round(parser.getValue()));
this.setCompareValue((int)Math.round(parser.getValue()));
}
public void setCompareDisplay(int compareDisplay) {

79
src/enginuity/maps/Table3D.java
View File

@ -611,14 +611,19 @@ public class Table3D extends Table implements Serializable {
if (pasteType.equalsIgnoreCase("[Table3D]")) { // Paste table
String newline = System.getProperty("line.separator");
String xAxisValues = "[Table1D]" + newline + st.nextToken(newline);
String xAxisValues = "[Table1D]" + newline + st.nextToken(newline);
StringBuffer yAxisValues = new StringBuffer("");
StringBuffer dataValues = new StringBuffer("");
// build y axis and data values
StringBuffer yAxisValues = new StringBuffer("[Table1D]" + newline + st.nextToken("\t"));
StringBuffer dataValues = new StringBuffer("[Table3D]" + newline + st.nextToken("\t") + st.nextToken(newline));
while (st.hasMoreTokens()) {
yAxisValues.append("\t" + st.nextToken("\t"));
dataValues.append(newline + st.nextToken("\t") + st.nextToken(newline));
while (st.hasMoreTokens()) {
StringTokenizer currentLine = new StringTokenizer(st.nextToken(newline));
yAxisValues.append(currentLine.nextToken("\t") + "\t");
//dataValues.append(currentLine.nextToken(newline));
while (currentLine.hasMoreTokens()) {
dataValues.append(currentLine.nextToken() + "\t");
}
dataValues.append(newline);
}
// put x axis in clipboard and paste
@ -638,8 +643,31 @@ public class Table3D extends Table implements Serializable {
public void pasteCompareValues() {
StringTokenizer st = new StringTokenizer("");
String newline = System.getProperty("line.separator");
try {
String input = (String)Toolkit.getDefaultToolkit().getSystemClipboard().getContents(null).getTransferData(DataFlavor.stringFlavor);
st = new StringTokenizer(input);
} catch (UnsupportedFlavorException ex) { /* wrong paste type -- do nothing */
} catch (IOException ex) { }
// set values
for (int y = 0; y < getSizeY(); y++) {
if (st.hasMoreTokens()) {
for (int x = 0; x < getSizeX(); x++) {
String currentToken = st.nextToken();
data[x][y].setCompareRealValue(currentToken);
}
}
}
}
public void pasteValues() {
StringTokenizer st = new StringTokenizer("");
String newline = System.getProperty("line.separator");
try {
String input = (String)Toolkit.getDefaultToolkit().getSystemClipboard().getContents(null).getTransferData(DataFlavor.stringFlavor);
st = new StringTokenizer(input);
@ -658,41 +686,6 @@ public class Table3D extends Table implements Serializable {
}
// set values
String newline = System.getProperty("line.separator");
for (int y = startY; y < getSizeY(); y++) {
if (st.hasMoreTokens()) {
StringTokenizer currentLine = new StringTokenizer(st.nextToken(newline));
for (int x = startX; x < getSizeX(); x++) {
if (currentLine.hasMoreTokens()) {
String currentToken = currentLine.nextToken();
try {
if (!data[x][y].getText().equalsIgnoreCase(currentToken)) {
data[x][y].setRealValue(currentToken);
}
} catch (ArrayIndexOutOfBoundsException ex) { /* copied table is larger than current table*/ }
}
}
}
}
}
public void pasteCompareValues() {
StringTokenizer st = new StringTokenizer("");
try {
String input = (String)Toolkit.getDefaultToolkit().getSystemClipboard().getContents(null).getTransferData(DataFlavor.stringFlavor);
st = new StringTokenizer(input);
} catch (UnsupportedFlavorException ex) { /* wrong paste type -- do nothing */
} catch (IOException ex) { }
String pasteType = st.nextToken();
// figure paste start cell
int startX = 0;
int startY = 0;
// set values
String newline = System.getProperty("line.separator");
for (int y = startY; y < getSizeY(); y++) {
if (st.hasMoreTokens()) {
StringTokenizer currentLine = new StringTokenizer(st.nextToken(newline));
@ -709,7 +702,7 @@ public class Table3D extends Table implements Serializable {
}
}
}
}
}
public void finalize(Settings settings) {
// apply settings to cells

8
src/enginuity/swing/JTableChooser.java
View File

@ -14,7 +14,7 @@ import javax.swing.tree.DefaultMutableTreeNode;
public class JTableChooser extends JOptionPane {
JPanel displayPanel = new JPanel();
DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode("Roms");
DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode("Open Images");
JTree displayTree = new JTree(rootNode);
public boolean showChooser(Vector<Rom> roms, Component parent, Table targetTable) {
@ -44,12 +44,14 @@ public class JTableChooser extends JOptionPane {
categoryNode.add(tableNode);
}
}
}
}
displayPanel.setPreferredSize(new Dimension(350, 400));
displayPanel.setMinimumSize(new Dimension(350, 400));
displayTree.setPreferredSize(new Dimension(330, 400));
displayTree.setMinimumSize(new Dimension(330, 400));
displayTree.setRootVisible(false);
displayTree.setRootVisible(true);
displayTree.updateUI();
displayPanel.add(new JScrollPane(displayTree));

6
src/enginuity/swing/TableMenuBar.java
View File

@ -79,11 +79,7 @@ public class TableMenuBar extends JMenuBar implements ActionListener {
compareMap.addActionListener(this);
compareOff.addActionListener(this);
comparePercent.addActionListener(this);
compareAbsolute.addActionListener(this);
// FOR 0.2.7.4b ONLY!! DELETE FOR 0.2.8b!
compareMap.setEnabled(false);
compareAbsolute.addActionListener(this);
this.add(editMenu);
editMenu.add(undoSel);