Adding version label

HenriquesLab · Aug 18, 2018 · 303d44d · 303d44d
1 parent 747b3c8
commit 303d44d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 12 deletions.
diff --git a/NanoJ-Fluidics.jar b/NanoJ-Fluidics.jar
diff --git a/NanoJ-Fluidics_IJ.jar b/NanoJ-Fluidics_IJ.jar
diff --git a/NanoJ-Fluidics_MM.jar b/NanoJ-Fluidics_MM.jar
diff --git a/PackagedBinaries/NanoJ-Fluidics.zip b/PackagedBinaries/NanoJ-Fluidics.zip
diff --git a/PackagedBinaries/NanoJ-Fluidics_IJ.zip b/PackagedBinaries/NanoJ-Fluidics_IJ.zip
diff --git a/PackagedBinaries/NanoJ-Fluidics_MM.zip b/PackagedBinaries/NanoJ-Fluidics_MM.zip
diff --git a/src/nanoj/pumpControl/java/sequentialProtocol/tabs/PumpConnections.java b/src/nanoj/pumpControl/java/sequentialProtocol/tabs/PumpConnections.java
@@ -26,13 +26,14 @@ public class PumpConnections extends JPanel {
     private static final String PUMP = "pump";
 
     JComboBox availablePumpsList;
-
-    JLabel pumpListLabel;
-    JLabel connectLabel;
+
+    JLabel version = new JLabel("NanoJ Sequential Labelling version: 1.1.2");
+    JLabel pumpListLabel = new JLabel("Pump type");
+    JLabel connectLabel = new JLabel("Serial port");
     JComboBox portsList;
-    JButton connectButton;
-    JButton disconnectButton;
-    JLabel connectedPumpsLabel;
+    JButton connectButton = new JButton("Connect");
+    JButton disconnectButton = new JButton("Disconnect");
+    JLabel connectedPumpsLabel = new JLabel("List of currently connected pumps");
     private JTable connectedPumpsTable;
     private ConnectionsTable connectedPumpsTableModel;
     JScrollPane connectedPumpsListPane;
@@ -41,12 +42,6 @@ public PumpConnections(GUI gui) {
         super();
         this.gui = gui;
 
-        pumpListLabel = new JLabel("Pump type");
-        connectLabel = new JLabel("Serial port");
-        portsList = new JComboBox();
-        connectButton = new JButton("Connect");
-        disconnectButton = new JButton("Disconnect");
-        connectedPumpsLabel = new JLabel("List of currently connected pumps");
         connectedPumpsTableModel = new ConnectionsTable();
         connectedPumpsTable = new JTable(connectedPumpsTableModel);
         connectedPumpsListPane = new JScrollPane(connectedPumpsTable);

diff --git a/src/nanoj/pumpControl/java/sequentialProtocol/tabs/PumpConnectionsLayout.java b/src/nanoj/pumpControl/java/sequentialProtocol/tabs/PumpConnectionsLayout.java
@@ -27,6 +27,7 @@ class PumpConnectionsLayout extends GroupLayout {
                         )
                         .addGroup(createParallelGroup().addComponent(panel.connectedPumpsLabel))
                         .addGroup(createParallelGroup().addComponent(panel.connectedPumpsListPane))
+                        .addGroup(createParallelGroup().addComponent(panel.version))
         );
 
         setHorizontalGroup(
@@ -47,6 +48,7 @@ class PumpConnectionsLayout extends GroupLayout {
                         )
                         .addGroup(createParallelGroup().addComponent(panel.connectedPumpsLabel))
                         .addGroup(createParallelGroup().addComponent(panel.connectedPumpsListPane))
+                        .addGroup(createParallelGroup().addComponent(panel.version))
         );
     }
 }