This commit is contained in:
@@ -12,6 +12,7 @@ import ch.psi.pshell.device.DeviceAdapter;
|
||||
import ch.psi.pshell.imaging.Renderer;
|
||||
import ch.psi.pshell.imaging.RendererMode;
|
||||
import ch.psi.pshell.imaging.Source;
|
||||
import ch.psi.pshell.scripting.ViewPreference;
|
||||
import ch.psi.pshell.ui.App;
|
||||
import ch.psi.pshell.ui.Panel;
|
||||
import ch.psi.utils.State;
|
||||
@@ -46,6 +47,9 @@ public class MainPanel extends Panel {
|
||||
*/
|
||||
Boolean manualMode;
|
||||
Boolean roomTemperature;
|
||||
Boolean puckLoading;
|
||||
|
||||
public final String PUCK_LOADING_STATUS = "Puck loading";
|
||||
|
||||
public MainPanel() {
|
||||
initComponents();
|
||||
@@ -168,7 +172,7 @@ public class MainPanel extends Panel {
|
||||
this.getLogger().log(Level.SEVERE, null, ex);
|
||||
}
|
||||
Controller.getInstance().updatePuckTypes();
|
||||
startTimer(10000, 1000);
|
||||
startTimer(3000, 1000);
|
||||
updateCameraView();
|
||||
refreshSamplesTable();
|
||||
|
||||
@@ -197,6 +201,21 @@ public class MainPanel extends Panel {
|
||||
ledRoomTemperature.setColor(Color.BLACK);
|
||||
labelRoomTemperature.setText("Room Temperature");
|
||||
}
|
||||
|
||||
try {
|
||||
puckLoading = Controller.getInstance().isPuckLoading();
|
||||
} catch (Exception ex) {
|
||||
puckLoading = null;
|
||||
}
|
||||
if (getState()==State.Ready){
|
||||
if (Boolean.TRUE.equals(puckLoading)){
|
||||
getView().getStatusBar().setStatusMessage(PUCK_LOADING_STATUS);
|
||||
} else {
|
||||
if (PUCK_LOADING_STATUS.equals(getView().getStatusBar().getStatusLabel().getText())){
|
||||
getView().getStatusBar().setApplicationState(getState());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user