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

Created application main panel and separated Controller class

Browse Source
This commit is contained in:
gac-S_Changer
2018-01-10 11:21:06 +01:00
parent c4ce826ae8
commit 9c5a74d2a8
8 changed files with 294 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/ch/psi/mxsc/EseraDetection.java
View File

@@ -1,6 +1,6 @@
package ch.psi.mxsc;
import static ch.psi.mxsc.MainPanel.NUMBER_OF_PUCKS;
import static ch.psi.mxsc.Controller.NUMBER_OF_PUCKS;
import ch.psi.pshell.device.Device;
import ch.psi.pshell.device.DeviceAdapter;
import ch.psi.utils.State;
@@ -24,17 +24,17 @@ public class EseraDetection implements AutoCloseable{
@Override
public void onStateChanged(Device device, State state, State former) {
if (!state.isInitialized()){
MainPanel.getInstance().clearPuckStates();
Controller.getInstance().clearPuckStates();
}
}
@Override
public void onValueChanged(Device device, Object value, Object former) {
if ((value == null) || !(value instanceof List)){
MainPanel.getInstance().clearPuckStates();
Controller.getInstance().clearPuckStates();
} else {
List l = (List)value;
PuckState[] puckState = MainPanel.getInstance().getPuckStates();
PuckState[] puckState = Controller.getInstance().getPuckStates();
for (int i=0; i<NUMBER_OF_PUCKS; i++ ){
try{
List det = (List) l.get(i);
@@ -43,7 +43,7 @@ public class EseraDetection implements AutoCloseable{
puckState[i].clear();
}
}
MainPanel.getInstance().repaint();
Controller.getInstance().getMainFrame().repaint();
}
}
};
@@ -53,6 +53,6 @@ public class EseraDetection implements AutoCloseable{
if (device!=null){
device.removeListener(listener);
}
MainPanel.getInstance().clearPuckStates();
Controller.getInstance().clearPuckStates();
}
}