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

Live Data Overlay Updates: 

- Modified highlight and text colors.
This commit is contained in:
Scotthew 2014-01-04 23:44:28 -08:00
parent 7b9c8de261
commit 8547a567ae
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/romraider/Settings.java
View File

@ -147,7 +147,7 @@ public class Settings implements Serializable {
public static final Color scaleTextColor = new Color(0, 0, 0); public static final Color scaleTextColor = new Color(0, 0, 0);
public static final Color highlightTextColor = new Color(255, 255, 255); public static final Color highlightTextColor = new Color(255, 255, 255);
public static final Color selectTextColor = new Color(0, 0, 0); public static final Color selectTextColor = new Color(0, 0, 0);
public static final Color liveDataTraceTextColor = new Color(105, 105, 105); public static final Color liveDataTraceTextColor = new Color(50, 50, 50);
private static final String ISO15765 = "ISO15765"; private static final String ISO15765 = "ISO15765";
private static final String ISO9141 = "ISO9141"; private static final String ISO9141 = "ISO9141";
@ -181,7 +181,7 @@ public class Settings implements Serializable {
private Color selectColor = new Color(204, 204, 204); private Color selectColor = new Color(204, 204, 204);
private Color highlightColor = new Color(27, 161, 226); private Color highlightColor = new Color(27, 161, 226);
private Color liveValueColor = new Color (255, 255, 0); private Color liveValueColor = new Color (0, 255, 0);
private Color decreaseBorder = new Color(0, 0, 255); private Color decreaseBorder = new Color(0, 0, 255);
private Color increaseBorder = new Color(255, 0, 0); private Color increaseBorder = new Color(255, 0, 0);

6
src/main/java/com/romraider/maps/DataCell.java
View File

@ -279,7 +279,7 @@ public class DataCell extends JLabel implements MouseListener, Serializable {
if(traced) { if(traced) {
if(!(table instanceof Table1D)) { if(!(table instanceof Table1D)) {
displayString = displayString + (isNullOrEmpty(liveValue) ? Settings.BLANK : (':' + liveValue)); displayString = getLiveValueString(displayString);
} }
} }
return displayString; return displayString;
@ -297,6 +297,10 @@ public class DataCell extends JLabel implements MouseListener, Serializable {
return this.liveValue; return this.liveValue;
} }
private String getLiveValueString(String currentValue) {
return currentValue + (isNullOrEmpty(getLiveValue()) ? Settings.BLANK : (':' + getLiveValue()));
}
public void setBinValue(double newBinValue) { public void setBinValue(double newBinValue) {
if(binValue == newBinValue) { if(binValue == newBinValue) {
return; return;

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

@ -239,8 +239,6 @@ public class TableToolBar extends JToolBar implements MouseListener, ItemListene
im.put(enter, "enterAction"); im.put(enter, "enterAction");
getActionMap().put(im.get(enter), enterAction); getActionMap().put(im.get(enter), enterAction);
//this.add(scaleSelection);
liveDataPanel.add(overlayLog); liveDataPanel.add(overlayLog);
liveDataPanel.add(clearOverlay); liveDataPanel.add(clearOverlay);
//liveDataPanel.add(liveDataValue); //liveDataPanel.add(liveDataValue);