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

- Resolves issues with 3D drawing. 

- Fixes saving table as string when table includes "static" data.
 - Resolves issues saving as repository.
This commit is contained in:
Scotthew 2013-08-26 22:48:26 -07:00
parent 4d4e8fb447
commit ab9387a5e4
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/romraider/maps/Table1D.java
View File

@ -246,4 +246,20 @@ public class Table1D extends Table {
public void updateTableLabel() {
this.getAxisParent().updateTableLabel();
}
@Override
public StringBuffer getTableAsString() {
if(isStaticDataTable()) {
StringBuffer output = new StringBuffer(Settings.BLANK);
for (int i = 0; i < data.length; i++) {
output.append(data[i].getStaticText());
if (i < data.length - 1) {
output.append(Settings.TAB);
}
}
return output;
} else {
return super.getTableAsString();
}
}
}

12
src/main/java/com/romraider/swing/TableToolBar.java
View File

@ -575,10 +575,7 @@ public class TableToolBar extends JToolBar implements MouseListener, ItemListene
float[] rowValues = new float[valueCount];
for (int i = 0; i < valueCount; i++) {
DataCell theCell = tableData[i][j];
rowValues[i] = (float) theCell.getBinValue();
//float theValue = (float)theCell.getValue();
//BigDecimal finalRoundedValue = new BigDecimal(theValue).setScale(2,BigDecimal.ROUND_HALF_UP);
//rowValues[i] = finalRoundedValue.floatValue();
rowValues[i] = (float) theCell.getRealValue();
}
graphValues.add(rowValues);
}
@ -592,10 +589,7 @@ public class TableToolBar extends JToolBar implements MouseListener, ItemListene
double[] xValues = new double[length];
for (int i = 0; i < length; i++) {
xValues[i] = dataCells[i].getBinValue();
//double theValue = dataCells[i].getValue();
//BigDecimal finalRoundedValue = new BigDecimal(theValue).setScale(2,BigDecimal.ROUND_HALF_UP);
//xValues[i] = finalRoundedValue.doubleValue();
xValues[i] = dataCells[i].getRealValue();
}
//Gather y/z axis values
@ -604,7 +598,7 @@ public class TableToolBar extends JToolBar implements MouseListener, ItemListene
double[] yValues = new double[length];
for (int i = 0; i < length; i++) {
double theValue = dataCells[i].getBinValue();
double theValue = dataCells[i].getRealValue();
BigDecimal finalRoundedValue = new BigDecimal(theValue).setScale(2, BigDecimal.ROUND_HALF_UP);
yValues[i] = finalRoundedValue.doubleValue();
}