This commit is contained in:
gac-S_Changer
2018-07-06 09:55:46 +02:00
parent eb45f26d1c
commit 8800ea11be
15 changed files with 1597 additions and 879 deletions
+17 -4
View File
@@ -120,6 +120,11 @@ public class Controller {
public PuckState[] getPuckStates() {
return puckState;
}
public Puck getPuck(String name){
return basePlate.getPuckByName(name);
}
EseraDetection detection;
//From 1 to PUCKS_NUMBER
@@ -155,12 +160,20 @@ public class Controller {
public Boolean isLedRoomTemp() {
try {
return ((ProcessVariableBase) getMainFrame().getDevice("led_ctrl_1")).getConfig().maxValue <= 0.50;
return getMainFrame().eval("is_led_room_temp()", true).equals(true);
} catch (Exception ex) {
return null;
return null;
}
}
public Boolean isRoomTemp() {
try {
return getMainFrame().eval("is_room_temp()", true).equals(true);
} catch (Exception ex) {
return null;
}
}
public void imageDetectPucks() throws Context.ContextStateException {
imageDetectPucks(null, null, null);
}
@@ -200,8 +213,8 @@ public class Controller {
}
void onPuckPressed(Puck puck){
getMainFrame().textDetSensors.setText(String.valueOf(puck.getDetection()));
getMainFrame().textDetImage.setText(String.valueOf(puck.getImageDetection()));
//getMainFrame().textDetSensors.setText(String.valueOf(puck.getDetection()));
//getMainFrame().textDetImage.setText(String.valueOf(puck.getImageDetection()));
}
void onSamplePressed(Sample sample){