pshell/MXSC
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hiding puck detection errors from users.

Browse Source
This commit is contained in:
gac-S_Changer
2018-09-17 11:06:44 +02:00
parent f32260086f
commit afb1e4cac2
4 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/ch/psi/mxsc/PuckGraphics.java
View File

@@ -87,13 +87,24 @@ public class PuckGraphics {
public boolean isHighlithted() {
return puck.isSelected() || puck.isSegmentSelected();
}
Color getEmptyColor(){
return isHighlithted() ? new Color(212, 212, 212) : Color.LIGHT_GRAY;
}
Color getErrorColor(){
if (puck.getDisplayDetectionError()){
return isHighlithted() ? new Color(192, 10, 10) : new Color(192, 128, 128);
}
return getEmptyColor();
}
Color getColor() {
Color ret = Color.LIGHT_GRAY;
switch (puck.detection) {
case Empty:
//ret = isHighlithted() ? new Color(224, 224, 224) : Color.LIGHT_GRAY;
ret = isHighlithted() ? new Color(212, 212, 212) : Color.LIGHT_GRAY;
ret = getEmptyColor();
break;
case Present:
if ((puck.puckType != null) && (puck.puckType != PuckType.Unknown)){
@@ -106,15 +117,15 @@ public class PuckGraphics {
break;
case Empty:
case Error:
ret = isHighlithted() ? new Color(192, 10, 10) : new Color(192, 128, 128);
ret = getErrorColor();
break;
}
} else {
ret = isHighlithted() ? new Color(0, 140, 140) : new Color(128, 192, 192);
}
break;
case Error:
ret = isHighlithted() ? new Color(192, 10, 10) : new Color(192, 128, 128);
case Error:
ret = getErrorColor();
break;
case Offline:
ret = isHighlithted() ? new Color(250, 255, 48) : new Color(253, 194, 41);