Configuration editable CTRLDIFFRA-124

capoeira/src/main/java/fr/soleil/gui/capoeira/ControlBean.java

@@ -643,7 +643,8 @@ public class ControlBean extends AbstractTangoBox {
         this.getAnalyzerPanel().removeAll();
         this.getAnalyzerPanel().revalidate();
         if (analyzerAxis == null || analyzerAxis.length == 0 || analyzerAxis[0].length < 2) {
-            this.getAnalyzerPanel().add(this.getAnalyzerAxisErrorLabel(), null);
+            // this.getAnalyzerPanel().add(this.getAnalyzerAxisErrorLabel(), null);
+            getEulerianAndDetectorPanel().remove(this.getAnalyzerPanel());
         } else {
             this.analyzerAxisBeans = new AbstractTangoBox[analyzerAxis.length];
             for (int i = 0; i < analyzerAxis.length; i++) {
@@ -698,7 +699,8 @@ public class ControlBean extends AbstractTangoBox {
         this.getPseudoPanel().removeAll();
         this.getPseudoPanel().revalidate();
         if (pseudoAxis == null || pseudoAxis.length == 0 || pseudoAxis[0].length < 2) {
-            this.getPseudoPanel().add(this.getPseudoAxisErrorLabel(), null);
+//            this.getPseudoPanel().add(this.getPseudoAxisErrorLabel(), null);
+            getKappaPanel().remove(this.getPseudoPanel());
         } else {
             this.pseudoAxisBeans = new AbstractTangoBox[pseudoAxis.length];
 
@@ -753,7 +755,8 @@ public class ControlBean extends AbstractTangoBox {
         this.getEulerianPanel().removeAll();
         this.getEulerianPanel().revalidate();
         if (eulerianPseudoAxis == null || eulerianPseudoAxis.length == 0 || eulerianPseudoAxis[0].length < 2) {
-            this.getEulerianPanel().add(this.getEulerianPseudoAxisErrorLabel(), null);
+//            this.getEulerianPanel().add(this.getEulerianPseudoAxisErrorLabel(), null);
+            getEulerianAndDetectorPanel().remove(this.getEulerianPanel());
         } else {
             this.eulerianPseudoAxisBeans = new AbstractTangoBox[eulerianPseudoAxis.length];
             for (int i = 0; i < eulerianPseudoAxis.length; i++) {
@@ -808,7 +811,8 @@ public class ControlBean extends AbstractTangoBox {
         this.getKappaAxisPanel().removeAll();
         this.getKappaAxisPanel().revalidate();
         if (kappaRealAxis == null || kappaRealAxis.length == 0 || kappaRealAxis[0].length < 2) {
-            this.getKappaAxisPanel().add(this.getKappaRealAxisErrorLabel(), null);
+//            this.getKappaAxisPanel().add(this.getKappaRealAxisErrorLabel(), null);
+            getEulerianAndDetectorPanel().remove(this.getKappaAxisPanel());
         } else {
             this.kappaRealAxisBeans = new AbstractTangoBox[kappaRealAxis.length];
             for (int i = 0; i < kappaRealAxis.length; i++) {
@@ -863,7 +867,8 @@ public class ControlBean extends AbstractTangoBox {
         }
         this.getDetectorPanel().removeAll();
         if (detectorRealAxis == null || detectorRealAxis.length == 0 || detectorRealAxis[0].length < 2) {
-            this.getDetectorPanel().add(this.getDetectorRealAxisErrorLabel(), null);
+//            this.getDetectorPanel().add(this.getDetectorRealAxisErrorLabel(), null);
+            getEulerianAndDetectorPanel().remove(this.getDetectorPanel());
         } else {
             this.detectorRealAxisBeans = new AbstractTangoBox[detectorRealAxis.length];
             for (int i = 0; i < detectorRealAxis.length; i++) {

capoeira/src/main/java/fr/soleil/gui/capoeira/model/CapoeiraModel.java

@@ -21,8 +21,8 @@ public class CapoeiraModel {
     private static final String ATTRIBUTE_DIFFRACTOMETER_TYPE = "DiffractometerType";
     private static final String PROPERTY_REAL_AXIS_PROXIES = "RealAxisProxies";
     private static final String PROPERTY_PSEUDO_AXIS_PROXIES = "PseudoAxisProxies";
-    private static final String PROPERTY_EULERIAN_PSEUDO_AXIS_PROXIES = "EulerianPseudoAxisProxies";
-    private static final String PROPERTY_ANALYZER_AXIS_PROXIES = "AnalyzerAxisProxies";
+    private static final String PROPERTY_EULERIAN_PSEUDO_AXIS_PROXIES = "GUI_EulerianPseudoAxisProxies";
+    private static final String PROPERTY_ANALYZER_AXIS_PROXIES = "GUI_AnalyzerAxisProxies";
     private final Logger logger = LoggerFactory.getLogger(CapoeiraModel.class);
     Preferences prefs = Preferences.userNodeForPackage(Capoeira.class);
     public static final String DIFFRACTOMETER_DEVICE = "DiffractometerDevice";