mirror of https://github.com/rusefi/RomRaider.git
Live Data Logging Updates:
- Now Uses static data for static data tables.
This commit is contained in:
parent
3def3b1663
commit
7b9c8de261
|
@ -500,7 +500,7 @@ public class DataCell extends JLabel implements MouseListener, Serializable {
|
|||
}
|
||||
|
||||
public String getStaticText() {
|
||||
String displayString = "";
|
||||
String displayString = null;
|
||||
try {
|
||||
DecimalFormat formatter = new DecimalFormat(table.getCurrentScale().getFormat());
|
||||
|
||||
|
|
|
@ -194,7 +194,17 @@ public class Table1D extends Table {
|
|||
|
||||
int startIdx = data.length;
|
||||
for (int i = 0; i < data.length; i++) {
|
||||
double currentValue = data[i].getRealValue();
|
||||
double currentValue = 0.0;
|
||||
if(isStaticDataTable() && null != data[i].getStaticText()) {
|
||||
try {
|
||||
currentValue = Double.parseDouble(data[i].getStaticText());
|
||||
} catch(NumberFormatException nex) {
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
currentValue = data[i].getRealValue();
|
||||
}
|
||||
|
||||
if (liveValue == currentValue) {
|
||||
startIdx = i;
|
||||
break;
|
||||
|
|
|
@ -791,7 +791,7 @@ public class Table3D extends Table {
|
|||
|
||||
@Override
|
||||
public void highlightLiveData(String liveValue) {
|
||||
if (overlayLog) {
|
||||
if (getOverlayLog()) {
|
||||
int x = xAxis.getLiveDataIndex();
|
||||
int y = yAxis.getLiveDataIndex();
|
||||
DataCell cell = data[x][y];
|
||||
|
@ -801,8 +801,9 @@ public class Table3D extends Table {
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateLiveDataHighlight() {
|
||||
if (overlayLog) {
|
||||
if (getOverlayLog()) {
|
||||
int x = xAxis.getLiveDataIndex();
|
||||
int y = yAxis.getLiveDataIndex();
|
||||
data[x][y].setLiveDataTrace(true);
|
||||
|
|
Loading…
Reference in New Issue