This commit is contained in:
gac-S_Changer
2018-08-14 14:09:01 +02:00
parent 3d571e8a4e
commit 047fad02d8
4 changed files with 415 additions and 230 deletions

View File

@@ -82,17 +82,17 @@ public class Puck extends DeviceBase {
final static PointDouble labelPositionWithImage = new PointDouble(0.0, 36.0);
ImageDetection imageDetection = ImageDetection.Unknown;
PuckType puckType = PuckType.Unknown;
public ImageDetection getImageDetection(){
return imageDetection;
public PuckType getPuckType(){
return puckType;
}
public void setImageDetection(ImageDetection value){
imageDetection = value;
public void setPuckType(PuckType value){
puckType = value;
}
public enum ImageDetection{
public enum PuckType{
Empty,
Minispine,
Unipuck,
@@ -306,8 +306,8 @@ public class Puck extends DeviceBase {
ret = isHighlithted() ? new Color(212, 212, 212) : Color.LIGHT_GRAY;
break;
case Present:
if ((imageDetection != null) && (imageDetection != ImageDetection.Unknown)){
switch (imageDetection){
if ((puckType != null) && (puckType != PuckType.Unknown)){
switch (puckType){
case Minispine:
ret = isHighlithted() ? new Color(0, 200, 80) : new Color(128, 232, 152);
break;