plugins/SmartMagnetPanel.java

@@ -41,26 +41,31 @@ public class SmartMagnetPanel extends DevicePanel {
                 ledSupressed.setColor(Color.ORANGE);
                 ledStatus.setColor(Color.GREEN);
                 ledMounted.setColor(Color.RED);
+                textStatus.setText("Supressed");
                 break;
             case Ready:
                 ledSupressed.setColor(Color.BLACK);
                 ledStatus.setColor(Color.GREEN);
                 ledMounted.setColor(Color.GREEN);
+                textStatus.setText("Not Mounted");
                 break;
             case Busy:
                 ledSupressed.setColor(Color.BLACK);                
                 ledStatus.setColor(Color.GREEN);
                 ledMounted.setColor(Color.ORANGE);
+                textStatus.setText("Mounted");
                 break;
             case Fault:
                 ledSupressed.setColor(Color.RED);                
                 ledStatus.setColor(Color.RED);
                 ledMounted.setColor(Color.RED);
+                textStatus.setText("Error");
                 break;
             default:
                 ledSupressed.setColor(Color.BLACK);                
                 ledStatus.setColor(Color.BLACK);
                 ledMounted.setColor(Color.BLACK);
+                textStatus.setText("Invalid");
                 break;
         }
         buttonSupressOn.setEnabled((state==State.Ready) || (state == State.Busy));
@@ -83,11 +88,11 @@ public class SmartMagnetPanel extends DevicePanel {
         jPanel1 = new javax.swing.JPanel();
         ledStatus = new ch.psi.pshell.swing.Led();
         jLabel1 = new javax.swing.JLabel();
-        panelPowerCtr = new javax.swing.JPanel();
         jLabel5 = new javax.swing.JLabel();
         ledMounted = new ch.psi.pshell.swing.Led();
         jLabel10 = new javax.swing.JLabel();
         panelCurrentRb = new ch.psi.pshell.swing.DeviceValuePanel();
+        textStatus = new javax.swing.JTextField();
         panelState = new ch.psi.pshell.swing.DeviceStatePanel();
         panelCurrent = new ch.psi.pshell.swing.ProcessVariablePanel();
         jPanel2 = new javax.swing.JPanel();
@@ -105,17 +110,6 @@ public class SmartMagnetPanel extends DevicePanel {
         jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
         jLabel1.setText("Status:");
 
-        javax.swing.GroupLayout panelPowerCtrLayout = new javax.swing.GroupLayout(panelPowerCtr);
-        panelPowerCtr.setLayout(panelPowerCtrLayout);
-        panelPowerCtrLayout.setHorizontalGroup(
-            panelPowerCtrLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 150, Short.MAX_VALUE)
-        );
-        panelPowerCtrLayout.setVerticalGroup(
-            panelPowerCtrLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGap(0, 23, Short.MAX_VALUE)
-        );
-
         jLabel5.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
         jLabel5.setText("Mounted:");
 
@@ -126,6 +120,10 @@ public class SmartMagnetPanel extends DevicePanel {
 
         panelCurrentRb.setDeviceName("smc_current_rb");
 
+        textStatus.setHorizontalAlignment(javax.swing.JTextField.CENTER);
+        textStatus.setDisabledTextColor(new java.awt.Color(0, 0, 0));
+        textStatus.setEnabled(false);
+
         javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
         jPanel1.setLayout(jPanel1Layout);
         jPanel1Layout.setHorizontalGroup(
@@ -133,20 +131,18 @@ public class SmartMagnetPanel extends DevicePanel {
             .addGroup(jPanel1Layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jLabel10, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel5, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(ledMounted, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addGroup(jPanel1Layout.createSequentialGroup()
-                        .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(ledStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(panelPowerCtr, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(jPanel1Layout.createSequentialGroup()
-                        .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(ledMounted, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(jPanel1Layout.createSequentialGroup()
-                        .addComponent(jLabel10, javax.swing.GroupLayout.PREFERRED_SIZE, 52, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(panelCurrentRb, javax.swing.GroupLayout.PREFERRED_SIZE, 173, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                        .addGap(18, 18, 18)
+                        .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(panelCurrentRb, javax.swing.GroupLayout.PREFERRED_SIZE, 148, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(textStatus, javax.swing.GroupLayout.PREFERRED_SIZE, 148, javax.swing.GroupLayout.PREFERRED_SIZE))))
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
         jPanel1Layout.setVerticalGroup(
@@ -154,15 +150,15 @@ public class SmartMagnetPanel extends DevicePanel {
             .addGroup(jPanel1Layout.createSequentialGroup()
                 .addGap(4, 4, 4)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-                    .addComponent(jLabel1)
                     .addComponent(ledStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(panelPowerCtr, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(jLabel1)
+                    .addComponent(textStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(jLabel5)
                     .addComponent(ledMounted, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
                     .addComponent(jLabel10)
                     .addComponent(panelCurrentRb, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addContainerGap())
@@ -314,7 +310,7 @@ public class SmartMagnetPanel extends DevicePanel {
     private ch.psi.pshell.swing.Led ledSupressed;
     private ch.psi.pshell.swing.ProcessVariablePanel panelCurrent;
     private ch.psi.pshell.swing.DeviceValuePanel panelCurrentRb;
-    private javax.swing.JPanel panelPowerCtr;
     private ch.psi.pshell.swing.DeviceStatePanel panelState;
+    private javax.swing.JTextField textStatus;
     // End of variables declaration//GEN-END:variables
 }