From dc78eb382f4f9680b01f164e98e7f30935d2fa9e Mon Sep 17 00:00:00 2001
From: gac-S_Changer <gac-S_Changer@PC12288.psi.ch>
Date: Wed, 19 Sep 2018 17:56:09 +0200
Subject: [PATCH] Hiding puck detection errors from users.

---
 src/main/java/ch/psi/mxsc/Controller.java |  2 +-
 src/main/java/ch/psi/mxsc/MainPanel.java  | 10 ++++------
 src/main/java/ch/psi/mxsc/SampleInfo.java |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/ch/psi/mxsc/Controller.java b/src/main/java/ch/psi/mxsc/Controller.java
index 1f849c3..79ed9a1 100644
--- a/src/main/java/ch/psi/mxsc/Controller.java
+++ b/src/main/java/ch/psi/mxsc/Controller.java
@@ -220,7 +220,7 @@ public class Controller {
 
     void onTimer() {
         try {
-            setPuckLoading(Controller.getInstance().isPuckLoading());
+            setPuckLoading(isPuckLoading());
         } catch (Exception ex) {
             setPuckLoading(false);
         }
diff --git a/src/main/java/ch/psi/mxsc/MainPanel.java b/src/main/java/ch/psi/mxsc/MainPanel.java
index 0ec2125..9dfe885 100644
--- a/src/main/java/ch/psi/mxsc/MainPanel.java
+++ b/src/main/java/ch/psi/mxsc/MainPanel.java
@@ -45,8 +45,6 @@ public class MainPanel extends Panel {
      */
     Boolean manualMode;
     Boolean roomTemperature;
-    Boolean puckLoading;
-
     public final String PUCK_LOADING_STATUS = "Puck loading";
 
     public MainPanel() {
@@ -92,7 +90,7 @@ public class MainPanel extends Panel {
                     if (e.getValueIsAdjusting() == false) {
                     int selection = tableSamples.getSelectedRow();
                         if (selection>=0){
-                            String add = String.valueOf(tableSamples.getModel().getValueAt(selection, 3));
+                            String add = String.valueOf(tableSamples.getModel().getValueAt(selection, 5));
                             if (!add.trim().isEmpty()) {
                                 int pos = -1;
                                 try{
@@ -226,7 +224,7 @@ public class MainPanel extends Panel {
         }
         Controller.getInstance().onTimer();
         if (getState() == State.Ready) {
-            if (Boolean.TRUE.equals(puckLoading)) {
+            if (Boolean.TRUE.equals(Controller.getInstance().puckLoading)) {
                 getView().getStatusBar().setStatusMessage(PUCK_LOADING_STATUS);
             } else {
                 if (PUCK_LOADING_STATUS.equals(getView().getStatusBar().getStatusLabel().getText())) {
@@ -471,7 +469,7 @@ public class MainPanel extends Panel {
                 sampleData,
                 new String[]{
                     "User Name", "Dewar Name",
-                    "Puck Name", "Puck Address", "Puck Barcode", "Puck Type",
+                    "Puck Name", "Puck Type",  "Puck Id", "Puck Address",
                     "Sample Name", "Sample Position", "Sample Status", "Mount Count"
                 }
         ) {
@@ -496,7 +494,7 @@ public class MainPanel extends Panel {
             }
 
             for (int i = 0; i < tableSamples.getModel().getRowCount(); i++) {
-                if (add.equals(tableSamples.getModel().getValueAt(i, 3))) {
+                if (add.equals(tableSamples.getModel().getValueAt(i, 5))) {
                     if (sample!=null){
                         if (!sample.equals(tableSamples.getModel().getValueAt(i, 7))){
                             continue;
diff --git a/src/main/java/ch/psi/mxsc/SampleInfo.java b/src/main/java/ch/psi/mxsc/SampleInfo.java
index 90e6abd..6acc475 100644
--- a/src/main/java/ch/psi/mxsc/SampleInfo.java
+++ b/src/main/java/ch/psi/mxsc/SampleInfo.java
@@ -22,7 +22,7 @@ public class SampleInfo extends HashMap {
 
     Object[] getData() {
         return new Object[]{getStr("userName"), getStr("dewarName"), 
-            getStr("puckName"), getStr("puckAddress"), getStr("puckBarcode"),  getEnum("puckType", PuckType.class, PuckType.Unknown), 
+            getStr("puckName"), getEnum("puckType", PuckType.class, PuckType.Unknown), getStr("puckBarcode"), getStr("puckAddress"), 
             getStr("sampleName"), getInt("samplePosition"), getEnum("sampleStatus", SampleStatus.class, SampleStatus.Unknown),  getInt("sampleMountCount") 
         };