diff --git a/plugins/Microscope.form b/plugins/Microscope.form index a4ac0aa..6a19664 100644 --- a/plugins/Microscope.form +++ b/plugins/Microscope.form @@ -26,10 +26,8 @@ - - - - + + @@ -78,6 +76,7 @@ + @@ -90,6 +89,7 @@ + @@ -110,6 +110,7 @@ + @@ -122,6 +123,7 @@ + diff --git a/plugins/Microscope.java b/plugins/Microscope.java index bb9c0d4..8f9cada 100644 --- a/plugins/Microscope.java +++ b/plugins/Microscope.java @@ -60,11 +60,13 @@ public class Microscope extends Panel { renderer.setShowStatus(false); motorPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("cy")); + motorPanel1.setDecimals(2); motorPanel1.setDeviceName("cy"); motorPanel1.setShowStatus(false); motorPanel1.setShowTitle(true); processVariablePanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("x")); + processVariablePanel1.setDecimals(2); processVariablePanel1.setDeviceName("x"); processVariablePanel1.setShowSlider(false); processVariablePanel1.setShowTitle(true); @@ -77,11 +79,13 @@ public class Microscope extends Panel { }); motorPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("cz")); + motorPanel2.setDecimals(2); motorPanel2.setDeviceName("cz"); motorPanel2.setShowStatus(false); motorPanel2.setShowTitle(true); processVariablePanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("omega")); + processVariablePanel2.setDecimals(2); processVariablePanel2.setDeviceName("omega"); processVariablePanel2.setShowSlider(false); processVariablePanel2.setShowTitle(true); @@ -99,9 +103,8 @@ public class Microscope extends Panel { .addGroup(layout.createSequentialGroup() .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(motorPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(motorPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(motorPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(motorPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(processVariablePanel1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(processVariablePanel2, javax.swing.GroupLayout.PREFERRED_SIZE, 324, javax.swing.GroupLayout.PREFERRED_SIZE)))) .addContainerGap())