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

14
src/main/java/ch/psi/mxsc/PuckDetection.java
View File

@@ -44,7 +44,7 @@ public class PuckDetection extends DeviceBase{
while (!Thread.currentThread().isInterrupted()) {
if (chrono.isTimeout(3000)){
setState(State.Offline);
MainPanel.getInstance().clearPuckStates();
Controller.getInstance().clearPuckStates();
}
Thread.sleep(1000);
}
@@ -71,14 +71,14 @@ public class PuckDetection extends DeviceBase{
String contents = subscriber.recvStr();
//System.out.println(contents);
processMessage(contents);
if (MainPanel.getInstance()!=null){
MainPanel.getInstance().repaint();
if (Controller.getInstance()!=null){
Controller.getInstance().getMainFrame().repaint();
}
setState(State.Ready);
chrono = new Chrono();
}
} finally{
MainPanel.getInstance().clearPuckStates();
Controller.getInstance().clearPuckStates();
subscriber.close();
context.term();
}
@@ -96,7 +96,7 @@ public class PuckDetection extends DeviceBase{
String[] tokens = line.split(" ");
int id = Integer.valueOf(tokens[0].substring(1));
present.add(id);
PuckState puck = MainPanel.getInstance().getPuckState(id);
PuckState puck = Controller.getInstance().getPuckState(id);
if (tokens.length<3){
puck.clear();
} else {
@@ -106,10 +106,10 @@ public class PuckDetection extends DeviceBase{
getLogger().log(Level.INFO, null, ex);
}
}
for (int i=1; i<= MainPanel.NUMBER_OF_PUCKS; i++){
for (int i=1; i<= Controller.NUMBER_OF_PUCKS; i++){
if (!Arr.containsEqual(present.toArray(), i)){
try{
MainPanel.getInstance().getPuckState(i).clear();
Controller.getInstance().getPuckState(i).clear();
} catch (Exception ex){
getLogger().log(Level.INFO, null, ex);
}