diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.form b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.form
index 504baeecdfc25539962984763d16ee73f133f8cb..d203b76c52416060882834435f5ba56e77f49374 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.form
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.form
@@ -20,7 +20,7 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
- <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,3,80,0,0,4,115"/>
+ <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,3,73,0,0,4,115"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
@@ -107,17 +107,22 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
- <Group type="103" groupAlignment="0" max="-2" attributes="0">
- <Component id="treeDescriptionScrollPane" alignment="0" max="32767" attributes="1"/>
- <Component id="descriptionScrollPane" alignment="0" max="32767" attributes="1"/>
- <Component id="jPanel3" alignment="0" pref="1102" max="32767" attributes="1"/>
- <Group type="102" alignment="0" attributes="0">
- <Component id="jPanel4" min="-2" pref="632" max="-2" attributes="0"/>
- <EmptySpace type="unrelated" max="-2" attributes="0"/>
- <Component id="jPanel5" min="-2" max="-2" attributes="0"/>
- </Group>
+ <Group type="102" alignment="0" attributes="0">
+ <Component id="descriptionScrollPane" pref="1757" max="32767" attributes="1"/>
+ <EmptySpace max="-2" attributes="0"/>
+ </Group>
+ <Group type="102" alignment="0" attributes="0">
+ <Group type="103" groupAlignment="1" attributes="0">
+ <Component id="treeDescriptionScrollPane" alignment="0" pref="1102" max="32767" attributes="1"/>
<Component id="jPanel10" alignment="0" max="32767" attributes="1"/>
+ <Group type="103" alignment="0" groupAlignment="0" max="-2" attributes="0">
+ <Component id="jPanel3" alignment="0" pref="1102" max="32767" attributes="1"/>
+ <Group type="102" alignment="0" attributes="0">
+ <Component id="jPanel4" min="-2" pref="632" max="-2" attributes="0"/>
+ <EmptySpace type="unrelated" max="-2" attributes="0"/>
+ <Component id="jPanel5" min="-2" max="-2" attributes="0"/>
+ </Group>
+ </Group>
</Group>
<EmptySpace pref="665" max="32767" attributes="0"/>
</Group>
@@ -134,11 +139,11 @@
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="jPanel10" min="-2" max="-2" attributes="1"/>
- <EmptySpace min="-2" pref="28" max="-2" attributes="0"/>
+ <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="descriptionScrollPane" min="-2" pref="54" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
- <Component id="treeDescriptionScrollPane" min="-2" pref="60" max="-2" attributes="0"/>
- <EmptySpace min="-2" pref="31" max="-2" attributes="0"/>
+ <Component id="treeDescriptionScrollPane" min="-2" pref="68" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="116" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -211,26 +216,25 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="labelMSNameMask" min="-2" pref="103" max="-2" attributes="1"/>
- <Component id="labelReceiverList" min="-2" pref="89" max="-2" attributes="0"/>
- <Component id="labelNrSlotsInFrame" alignment="0" min="-2" max="-2" attributes="1"/>
- </Group>
- <EmptySpace max="-2" attributes="0"/>
+ <Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" max="-2" attributes="0">
- <Component id="inputNrSlotsInFrame" max="32767" attributes="1"/>
- <Component id="inputMSNameMask" alignment="0" pref="743" max="32767" attributes="1"/>
- <Component id="inputReceiverList" alignment="0" max="32767" attributes="1"/>
+ <Component id="labelReceiverList" max="32767" attributes="1"/>
+ <Component id="labelMSNameMask" alignment="0" pref="178" max="32767" attributes="1"/>
+ <Component id="labelNrSlotsInFrame" alignment="0" max="32767" attributes="1"/>
</Group>
- <EmptySpace pref="226" max="32767" attributes="0"/>
+ <EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="inputMSNameMask" pref="870" max="32767" attributes="1"/>
+ <Component id="inputNrSlotsInFrame" alignment="0" pref="870" max="32767" attributes="1"/>
+ <Component id="inputReceiverList" alignment="0" pref="870" max="32767" attributes="1"/>
+ </Group>
+ <EmptySpace min="-2" pref="20" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
+ <Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="3" attributes="0">
<Component id="labelMSNameMask" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="inputMSNameMask" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -240,12 +244,12 @@
<Component id="labelNrSlotsInFrame" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="inputNrSlotsInFrame" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace type="separate" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
- <Component id="inputReceiverList" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="labelReceiverList" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="inputReceiverList" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace pref="26" max="32767" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.java
index 419083b5a90e3853e36dc957474bafcd7ec37920..afcb71891a428881a50ea846d215fa9dd6f8f5f5 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.java
@@ -1160,17 +1160,16 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
jPanel10Layout.setHorizontalGroup(
jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(jPanel10Layout.createSequentialGroup()
- .addContainerGap()
- .add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(labelMSNameMask, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 103, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(labelReceiverList, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 89, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(labelNrSlotsInFrame))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(inputNrSlotsInFrame)
- .add(inputMSNameMask, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 743, Short.MAX_VALUE)
- .add(inputReceiverList))
- .addContainerGap(226, Short.MAX_VALUE))
+ .add(labelReceiverList, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(labelMSNameMask, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 178, Short.MAX_VALUE)
+ .add(labelNrSlotsInFrame, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .add(18, 18, 18)
+ .add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(inputMSNameMask, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 870, Short.MAX_VALUE)
+ .add(inputNrSlotsInFrame, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 870, Short.MAX_VALUE)
+ .add(inputReceiverList, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 870, Short.MAX_VALUE))
+ .add(20, 20, 20))
);
jPanel10Layout.setVerticalGroup(
jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
@@ -1182,11 +1181,11 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
.add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(labelNrSlotsInFrame)
.add(inputNrSlotsInFrame, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(18, 18, 18)
+ .add(12, 12, 12)
.add(jPanel10Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(inputReceiverList, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(labelReceiverList))
- .addContainerGap(26, Short.MAX_VALUE))
+ .add(labelReceiverList)
+ .add(inputReceiverList, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Beam Configuration", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 11), new java.awt.Color(0, 0, 0))); // NOI18N
@@ -1387,15 +1386,18 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
jPanel2Layout.setHorizontalGroup(
jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(jPanel2Layout.createSequentialGroup()
- .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(treeDescriptionScrollPane)
- .add(descriptionScrollPane)
- .add(jPanel3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1102, Short.MAX_VALUE)
- .add(jPanel2Layout.createSequentialGroup()
- .add(jPanel4, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 632, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(jPanel5, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(jPanel10, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .add(descriptionScrollPane, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1757, Short.MAX_VALUE)
+ .addContainerGap())
+ .add(jPanel2Layout.createSequentialGroup()
+ .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, treeDescriptionScrollPane, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1102, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, jPanel10, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .add(org.jdesktop.layout.GroupLayout.LEADING, jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+ .add(jPanel3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 1102, Short.MAX_VALUE)
+ .add(jPanel2Layout.createSequentialGroup()
+ .add(jPanel4, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 632, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(jPanel5, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))))
.addContainerGap(665, Short.MAX_VALUE))
);
jPanel2Layout.setVerticalGroup(
@@ -1408,11 +1410,11 @@ public class ObservationPanel extends javax.swing.JPanel implements IViewPanel{
.add(jPanel4, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(jPanel10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(28, 28, 28)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
.add(descriptionScrollPane, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 54, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(treeDescriptionScrollPane, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 60, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(31, 31, 31))
+ .add(treeDescriptionScrollPane, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 68, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .add(116, 116, 116))
);
jScrollPane1.setViewportView(jPanel2);
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/OlapPanel.form b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/OlapPanel.form
index 78d28340448d2533ef1a94994c91f7438a7b9858..a470aca3f50572d9b2d2e336eb39518d6cae5f9c 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/OlapPanel.form
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/OlapPanel.form
@@ -132,7 +132,7 @@
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="PencilInfoPanel" max="32767" attributes="1"/>
- <Component id="CorrelatorPanel" alignment="0" pref="273" max="32767" attributes="1"/>
+ <Component id="CorrelatorPanel" alignment="0" max="32767" attributes="1"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="StokesPanel" max="32767" attributes="1"/>
@@ -562,7 +562,7 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<Component id="labelIntegrationTime" min="-2" pref="143" max="-2" attributes="1"/>
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="24" max="-2" attributes="0"/>
<Component id="inputIntegrationTime" min="-2" pref="54" max="-2" attributes="1"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/OlapPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/OlapPanel.java
index 7d1c6cf511e0166a07611ccd9369bfdcf7f7e82f..491b03b32cff5d2719ef8da58132dc28a73ba254 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/OlapPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/OlapPanel.java
@@ -1361,7 +1361,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addGroup(jPanel8Layout.createSequentialGroup()
.addGap(43, 43, 43)
.addComponent(jLabel3)))
- .addContainerGap(74, Short.MAX_VALUE))
+ .addContainerGap(124, Short.MAX_VALUE))
);
jPanel8Layout.setVerticalGroup(
jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1457,7 +1457,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addComponent(labelSubbandsPerMs)
.addGap(18, 18, 18)
.addComponent(inputSubbandsPerMS, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(18, Short.MAX_VALUE))
);
jPanel11Layout.setVerticalGroup(
jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1483,7 +1483,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
CorrelatorPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(CorrelatorPanelLayout.createSequentialGroup()
.addComponent(labelIntegrationTime, javax.swing.GroupLayout.PREFERRED_SIZE, 143, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGap(24, 24, 24)
.addComponent(inputIntegrationTime, javax.swing.GroupLayout.PREFERRED_SIZE, 54, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jLabel2)
@@ -1531,7 +1531,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addGroup(StokesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(inputIntegrationSteps)
.addComponent(inputWhich, 0, 173, Short.MAX_VALUE))))
- .addContainerGap(34, Short.MAX_VALUE))
+ .addContainerGap(53, Short.MAX_VALUE))
);
StokesPanelLayout.setVerticalGroup(
StokesPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1545,7 +1545,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addComponent(inputIntegrationSteps, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(inputIntegrateChannels, javax.swing.GroupLayout.PREFERRED_SIZE, 13, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(81, Short.MAX_VALUE))
+ .addContainerGap(93, Short.MAX_VALUE))
);
jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Pencil Configuration", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 11), new java.awt.Color(0, 0, 0))); // NOI18N
@@ -1588,7 +1588,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel3Layout.createSequentialGroup()
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(pencilConfigurationPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 887, Short.MAX_VALUE)
+ .addComponent(pencilConfigurationPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 883, Short.MAX_VALUE)
.addGroup(jPanel3Layout.createSequentialGroup()
.addComponent(addPencilButton)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -1606,7 +1606,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addComponent(editPencilButton)
.addComponent(addPencilButton)
.addComponent(deletePencilButton))
- .addContainerGap(17, Short.MAX_VALUE))
+ .addContainerGap(13, Short.MAX_VALUE))
);
PencilInfoPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "PencilInfo", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 11), new java.awt.Color(0, 0, 0))); // NOI18N
@@ -1646,7 +1646,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addComponent(inputNrRings, javax.swing.GroupLayout.PREFERRED_SIZE, 99, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(inputRingSize, javax.swing.GroupLayout.PREFERRED_SIZE, 99, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addComponent(inputFlysEye))
- .addContainerGap(76, Short.MAX_VALUE))
+ .addContainerGap(98, Short.MAX_VALUE))
);
PencilInfoPanelLayout.setVerticalGroup(
PencilInfoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1695,7 +1695,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addGroup(jPanel4Layout.createSequentialGroup()
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(CorrelatorPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(jPanel7, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 75, Short.MAX_VALUE))
+ .addComponent(jPanel7, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 82, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(PencilInfoPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -1718,7 +1718,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createSequentialGroup()
.addComponent(jPanel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(2392, Short.MAX_VALUE))
+ .addContainerGap(2369, Short.MAX_VALUE))
);
jScrollPane1.setViewportView(jPanel2);