Hiding puck detection errors from users.
This commit is contained in:
@@ -49,6 +49,7 @@ public class Controller {
|
||||
Device barcode_reader;
|
||||
Device puck_detection;
|
||||
JDialog dialogAskPuckDatamatrix;
|
||||
String currentMountedSample;
|
||||
|
||||
public static Controller getInstance() {
|
||||
return instance;
|
||||
@@ -215,6 +216,17 @@ public class Controller {
|
||||
getMainFrame().removeDevice(basePlate);
|
||||
} else if (state == State.Ready) {
|
||||
refreshSamplesTable();
|
||||
try {
|
||||
currentMountedSample = (String) Context.getInstance().evalLineBackground("get_setting('mounted_sample_position')");
|
||||
Sample sample = basePlate.getSampleByName(currentMountedSample);
|
||||
basePlate.resetLoadedSample();
|
||||
sample.setLoaded(true);
|
||||
} catch (Exception ex) {
|
||||
currentMountedSample = null;
|
||||
basePlate.resetLoadedSample();
|
||||
}
|
||||
getMainFrame().refresh();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -548,7 +560,7 @@ public class Controller {
|
||||
} catch (Exception ex) {
|
||||
clearSamplesTable();
|
||||
Logger.getLogger(Controller.class.getName()).log(Level.SEVERE, null, ex);
|
||||
}
|
||||
}
|
||||
});
|
||||
//}
|
||||
}
|
||||
|
||||
@@ -24,10 +24,10 @@ public class SampleGraphics {
|
||||
Color getColor() {
|
||||
Color ret = Color.LIGHT_GRAY;
|
||||
|
||||
if (sample.isLoaded()) {
|
||||
if (sample.isLoaded() ) {
|
||||
ret = Color.BLUE;
|
||||
} else if (sample.wasLoaded()) {
|
||||
ret = Color.GREEN;
|
||||
//} else if (sample.wasLoaded()) {
|
||||
// ret = Color.GREEN;
|
||||
} else if (sample.isPresent()) {
|
||||
ret = Color.CYAN.darker().darker();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user