From 487f41f20843c407a7697b38305b779bfbc80685 Mon Sep 17 00:00:00 2001
From: Arthur Coolen <coolen@astron.nl>
Date: Wed, 19 Mar 2008 12:39:56 +0000
Subject: [PATCH] Bug 1164:corrected a bit Layout
---
.../otbcomponents/userpanels/OlapPanel.form | 116 +++++++--------
.../otbcomponents/userpanels/OlapPanel.java | 135 ++++++------------
2 files changed, 95 insertions(+), 156 deletions(-)
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 b854f8cfe8f..a12a7bc7c89 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
@@ -32,7 +32,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,2,-93,0,0,3,-4"/>
+ <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,2,-93,0,0,3,-52"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
@@ -95,7 +95,7 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="jPanel4" min="-2" max="-2" attributes="1"/>
- <EmptySpace pref="3438" max="32767" attributes="0"/>
+ <EmptySpace pref="3474" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -103,7 +103,7 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="jPanel4" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="2731" max="32767" attributes="0"/>
+ <EmptySpace pref="2721" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -116,18 +116,20 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" max="-2" attributes="0">
- <Component id="jPanel6" alignment="0" min="0" max="32767" attributes="1"/>
- <Component id="jPanel8" alignment="0" max="32767" attributes="1"/>
- <Component id="jPanel5" alignment="0" max="32767" attributes="1"/>
- <Component id="jPanel11" alignment="0" pref="608" max="32767" attributes="1"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="jPanel11" pref="648" max="32767" attributes="1"/>
+ <Group type="103" alignment="0" groupAlignment="0" max="-2" attributes="0">
+ <Component id="jPanel6" alignment="0" min="0" pref="648" max="32767" attributes="1"/>
+ <Component id="jPanel8" alignment="0" max="32767" attributes="1"/>
+ <Component id="jPanel5" alignment="0" max="32767" attributes="1"/>
+ </Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="jPanel10" max="32767" attributes="1"/>
+ <Group type="103" groupAlignment="0" max="-2" attributes="0">
+ <Component id="jPanel10" min="0" pref="306" max="32767" attributes="1"/>
<Component id="jPanel7" alignment="0" max="32767" attributes="1"/>
</Group>
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -144,8 +146,8 @@
<Component id="jPanel6" min="-2" pref="125" max="-2" attributes="1"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="jPanel5" min="-2" max="-2" attributes="0"/>
- <EmptySpace min="-2" max="-2" attributes="0"/>
- <Component id="jPanel11" min="-2" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="jPanel11" pref="81" max="32767" attributes="0"/>
</Group>
<Component id="jPanel7" max="32767" attributes="1"/>
</Group>
@@ -188,17 +190,12 @@
<Component id="inputSubbandsPerPset" alignment="1" pref="144" max="32767" attributes="1"/>
</Group>
<Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
+ <Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="13" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="labelEPAHeaderSize" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="labelPsetsPerStorage" alignment="0" min="-2" max="-2" attributes="1"/>
</Group>
- <EmptySpace min="-2" pref="32" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="1" max="-2" attributes="0">
- <Component id="inputEPAHeaderSize" alignment="0" max="32767" attributes="1"/>
- <Component id="inputPsetsPerStorage" alignment="0" pref="152" max="32767" attributes="1"/>
- </Group>
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace type="unrelated" max="-2" attributes="0"/>
@@ -206,14 +203,16 @@
<Component id="labelMaxNetworkDelay" alignment="0" max="32767" attributes="1"/>
<Component id="labelNrSecondsOfBuffer" alignment="0" max="32767" attributes="1"/>
</Group>
- <EmptySpace min="-2" pref="28" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="inputMaxNetworkDelay" pref="154" max="32767" attributes="1"/>
- <Component id="inputNrSecondsOfBuffer" alignment="0" pref="154" max="32767" attributes="1"/>
- </Group>
</Group>
</Group>
- <EmptySpace pref="38" max="32767" attributes="0"/>
+ <EmptySpace min="-2" pref="30" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" max="-2" attributes="0">
+ <Component id="inputMaxNetworkDelay" max="32767" attributes="1"/>
+ <Component id="inputNrSecondsOfBuffer" alignment="0" max="32767" attributes="1"/>
+ <Component id="inputEPAHeaderSize" alignment="0" max="32767" attributes="1"/>
+ <Component id="inputPsetsPerStorage" alignment="0" pref="152" max="32767" attributes="1"/>
+ </Group>
+ <EmptySpace pref="78" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="labelDelayCompensation" min="-2" max="-2" attributes="1"/>
@@ -223,7 +222,7 @@
<Group type="102" alignment="0" attributes="0">
<Component id="labelStorageStationNames" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
- <Component id="inputStorageStationNames" pref="471" max="32767" attributes="1"/>
+ <Component id="inputStorageStationNames" pref="511" max="32767" attributes="1"/>
</Group>
</Group>
<EmptySpace max="-2" attributes="0"/>
@@ -255,7 +254,7 @@
</Group>
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
- <Group type="103" groupAlignment="3" attributes="0">
+ <Group type="103" alignment="0" groupAlignment="3" attributes="0">
<Component id="labelMaxNetworkDelay" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="inputMaxNetworkDelay" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
@@ -386,12 +385,9 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
- <Component id="labelUseGather" pref="65" max="32767" attributes="1"/>
+ <Component id="labelUseGather" max="32767" attributes="1"/>
<EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="inputUseGather" min="-2" max="-2" attributes="0"/>
- <Component id="inputUseScatter" min="-2" max="-2" attributes="0"/>
- </Group>
+ <Component id="inputUseGather" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="251" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
@@ -426,9 +422,7 @@
<Component id="labelUseGather" min="-2" max="-2" attributes="0"/>
<Component id="inputUseGather" min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="inputUseScatter" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="57" max="32767" attributes="0"/>
+ <EmptySpace pref="76" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -459,19 +453,6 @@
</Property>
</Properties>
</Component>
- <Component class="javax.swing.JCheckBox" name="inputUseScatter">
- <Properties>
- <Property name="selected" type="boolean" value="true"/>
- <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
- <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
- <EmptyBorder bottom="0" left="0" right="0" top="0"/>
- </Border>
- </Property>
- <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
- <Insets value="[0, 0, 0, 0]"/>
- </Property>
- </Properties>
- </Component>
<Component class="javax.swing.JLabel" name="labelIONProcMaxConcurrentConn">
<Properties>
<Property name="text" type="java.lang.String" value="maxConcurrentComm:"/>
@@ -502,12 +483,12 @@
<Component id="labelStationInputTransport" alignment="0" min="-2" pref="182" max="-2" attributes="1"/>
<Component id="labelBGLProcStoragePorts" alignment="0" min="-2" max="-2" attributes="1"/>
</Group>
- <EmptySpace max="-2" attributes="0"/>
+ <EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="inputBGLProcStoragePorts" max="32767" attributes="1"/>
- <Component id="inputStationInputTransport" alignment="0" pref="202" max="32767" attributes="1"/>
+ <Component id="inputStationInputTransport" alignment="0" pref="191" max="32767" attributes="1"/>
</Group>
- <EmptySpace pref="204" max="32767" attributes="0"/>
+ <EmptySpace min="-2" pref="241" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -581,22 +562,23 @@
</Group>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="1" attributes="0">
- <Component id="labelCoresPerPset" alignment="0" pref="119" max="32767" attributes="0"/>
- <Component id="labelBGLIntegrationSteps" alignment="0" pref="119" max="32767" attributes="1"/>
- <Component id="labelPsetsPerCell" alignment="0" pref="119" max="32767" attributes="1"/>
- <Component id="labelNodesPerPset" alignment="0" pref="119" max="32767" attributes="1"/>
- <Component id="labelNrPPFTaps" alignment="0" pref="119" max="32767" attributes="1"/>
- <Component id="labelMaxConcurrentComm" alignment="0" pref="119" max="32767" attributes="1"/>
+ <Component id="labelCoresPerPset" alignment="0" pref="128" max="32767" attributes="0"/>
+ <Component id="labelBGLIntegrationSteps" alignment="0" pref="128" max="32767" attributes="1"/>
+ <Component id="labelPsetsPerCell" alignment="0" pref="128" max="32767" attributes="1"/>
+ <Component id="labelNodesPerPset" alignment="0" pref="128" max="32767" attributes="1"/>
+ <Component id="labelNrPPFTaps" alignment="0" pref="128" max="32767" attributes="1"/>
+ <Component id="labelMaxConcurrentComm" alignment="0" pref="128" max="32767" attributes="1"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="inputCoresPerPset" pref="200" max="32767" attributes="0"/>
- <Component id="inputBGLIntegrationSteps" pref="200" max="32767" attributes="1"/>
- <Component id="inputPsetsPerCell" pref="200" max="32767" attributes="1"/>
- <Component id="inputNodesPerPset" pref="200" max="32767" attributes="1"/>
- <Component id="inputNrPPFTaps" pref="200" max="32767" attributes="1"/>
- <Component id="inputMaxConcurrentComm" alignment="0" pref="200" max="32767" attributes="1"/>
+ <Group type="103" groupAlignment="0" max="-2" attributes="0">
+ <Component id="inputCoresPerPset" max="32767" attributes="1"/>
+ <Component id="inputBGLIntegrationSteps" alignment="0" max="32767" attributes="1"/>
+ <Component id="inputPsetsPerCell" alignment="0" max="32767" attributes="1"/>
+ <Component id="inputNodesPerPset" alignment="0" max="32767" attributes="1"/>
+ <Component id="inputNrPPFTaps" alignment="0" max="32767" attributes="1"/>
+ <Component id="inputMaxConcurrentComm" alignment="0" pref="148" max="32767" attributes="1"/>
</Group>
+ <EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
@@ -640,7 +622,7 @@
<Component id="labelCoresPerPset" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="inputCoresPerPset" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
- <EmptySpace pref="94" max="32767" attributes="0"/>
+ <EmptySpace pref="99" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -754,7 +736,7 @@
<Component id="inputSubbandsPerMS" max="32767" attributes="1"/>
<Component id="inputStorageProcIntegrationSteps" alignment="0" pref="192" max="32767" attributes="1"/>
</Group>
- <EmptySpace min="-2" pref="203" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="243" max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -817,7 +799,7 @@
<Component id="inputPositionType" max="32767" attributes="1"/>
<Component id="inputConverterType" alignment="0" pref="192" max="32767" attributes="1"/>
</Group>
- <EmptySpace pref="203" max="32767" attributes="0"/>
+ <EmptySpace pref="243" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
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 cc6a18e3553..5577214d403 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
@@ -409,20 +409,6 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
}
}
inputUseGather.setSelected(aSelection);
- } else if (aKeyName.equals("useScatter")) {
- inputUseScatter.setToolTipText(aParam.description);
- itsUseScatter=aNode;
- boolean aSelection = false;
- if (isRef && aParam != null) {
- if (aParam.limits.equals("true")||aParam.limits.equals("TRUE")) {
- aSelection = true;
- }
- } else {
- if (aNode.limits.equals("true")||aNode.limits.equals("TRUE")) {
- aSelection = true;
- }
- }
- inputUseScatter.setSelected(aSelection);
} else if (aKeyName.equals("maxConcurrentComm")) {
inputIONProcMaxConcurrentComm.setToolTipText(aParam.description);
itsIONProcMaxConcurrentComm=aNode;
@@ -587,12 +573,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
aB=true;
}
inputUseGather.setSelected(aB);
- aB=false;
- if (itsUseScatter.limits.equals("true")||itsUseScatter.limits.equals("TRUE")) {
- aB=true;
- }
- inputUseScatter.setSelected(aB);
-
+
//OLAP StorageProc
inputStorageProcIntegrationSteps.setText(itsStorageProcIntegrationSteps.limits);
inputSubbandsPerMS.setText(itsSubbandsPerMS.limits);
@@ -812,19 +793,6 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
itsUseGather.limits = aS;
saveNode(itsUseGather);
}
- if ((!inputUseScatter.isSelected() &
- (itsUseScatter.limits.equals("TRUE") ||itsUseScatter.limits.equals("true") )) ||
- (inputUseScatter.isSelected() &
- (itsUseScatter.limits.equals("FALSE") ||itsUseScatter.limits.equals("false") )))
- {
- String aS="true";
- if (!inputUseScatter.isSelected()) {
- aS="false";
- }
- itsUseScatter.limits = aS;
- saveNode(itsUseScatter);
- }
-
//OLAP-StorageProc
if (itsStorageProcIntegrationSteps != null && !inputStorageProcIntegrationSteps.equals(itsStorageProcIntegrationSteps.limits)) {
@@ -877,7 +845,6 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
inputIONProcIntegrationSteps = new javax.swing.JTextField();
labelUseGather = new javax.swing.JLabel();
inputUseGather = new javax.swing.JCheckBox();
- inputUseScatter = new javax.swing.JCheckBox();
labelIONProcMaxConcurrentConn = new javax.swing.JLabel();
inputIONProcMaxConcurrentComm = new javax.swing.JTextField();
jPanel6 = new javax.swing.JPanel();
@@ -988,21 +955,19 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addGap(13, 13, 13)
.addGroup(jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(labelEPAHeaderSize)
- .addComponent(labelPsetsPerStorage))
- .addGap(32, 32, 32)
- .addGroup(jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
- .addComponent(inputEPAHeaderSize, javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(inputPsetsPerStorage, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 152, Short.MAX_VALUE)))
+ .addComponent(labelPsetsPerStorage)))
.addGroup(jPanel8Layout.createSequentialGroup()
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addGroup(jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
.addComponent(labelMaxNetworkDelay, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(labelNrSecondsOfBuffer, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addGap(28, 28, 28)
- .addGroup(jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(inputMaxNetworkDelay, javax.swing.GroupLayout.DEFAULT_SIZE, 154, Short.MAX_VALUE)
- .addComponent(inputNrSecondsOfBuffer, javax.swing.GroupLayout.DEFAULT_SIZE, 154, Short.MAX_VALUE))))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 38, Short.MAX_VALUE))
+ .addComponent(labelNrSecondsOfBuffer, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+ .addGap(30, 30, 30)
+ .addGroup(jPanel8Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(inputMaxNetworkDelay)
+ .addComponent(inputNrSecondsOfBuffer)
+ .addComponent(inputEPAHeaderSize)
+ .addComponent(inputPsetsPerStorage, javax.swing.GroupLayout.DEFAULT_SIZE, 152, Short.MAX_VALUE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 78, Short.MAX_VALUE))
.addGroup(jPanel8Layout.createSequentialGroup()
.addComponent(labelDelayCompensation)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
@@ -1010,7 +975,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addGroup(jPanel8Layout.createSequentialGroup()
.addComponent(labelStorageStationNames)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(inputStorageStationNames, javax.swing.GroupLayout.DEFAULT_SIZE, 471, Short.MAX_VALUE)))
+ .addComponent(inputStorageStationNames, javax.swing.GroupLayout.DEFAULT_SIZE, 511, Short.MAX_VALUE)))
.addContainerGap())
);
jPanel8Layout.setVerticalGroup(
@@ -1062,10 +1027,6 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
inputUseGather.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
inputUseGather.setMargin(new java.awt.Insets(0, 0, 0, 0));
- inputUseScatter.setSelected(true);
- inputUseScatter.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
- inputUseScatter.setMargin(new java.awt.Insets(0, 0, 0, 0));
-
labelIONProcMaxConcurrentConn.setText("maxConcurrentComm:");
javax.swing.GroupLayout jPanel10Layout = new javax.swing.GroupLayout(jPanel10);
@@ -1076,11 +1037,9 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addContainerGap()
.addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel10Layout.createSequentialGroup()
- .addComponent(labelUseGather, javax.swing.GroupLayout.DEFAULT_SIZE, 65, Short.MAX_VALUE)
+ .addComponent(labelUseGather, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(inputUseGather)
- .addComponent(inputUseScatter))
+ .addComponent(inputUseGather)
.addGap(251, 251, 251))
.addGroup(jPanel10Layout.createSequentialGroup()
.addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
@@ -1105,9 +1064,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addGroup(jPanel10Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(labelUseGather)
.addComponent(inputUseGather))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(inputUseScatter)
- .addContainerGap(57, Short.MAX_VALUE))
+ .addContainerGap(76, Short.MAX_VALUE))
);
jPanel6.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Olap Conn", 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)));
@@ -1127,11 +1084,11 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(labelStationInputTransport, javax.swing.GroupLayout.PREFERRED_SIZE, 182, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelBGLProcStoragePorts))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGap(18, 18, 18)
.addGroup(jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(inputBGLProcStoragePorts)
- .addComponent(inputStationInputTransport, 0, 202, Short.MAX_VALUE))
- .addContainerGap(204, Short.MAX_VALUE))
+ .addComponent(inputStationInputTransport, 0, 191, Short.MAX_VALUE))
+ .addGap(241, 241, 241))
);
jPanel6Layout.setVerticalGroup(
jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1184,20 +1141,21 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addComponent(inputUseZoid))
.addGroup(jPanel7Layout.createSequentialGroup()
.addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
- .addComponent(labelCoresPerPset, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE)
- .addComponent(labelBGLIntegrationSteps, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE)
- .addComponent(labelPsetsPerCell, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE)
- .addComponent(labelNodesPerPset, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE)
- .addComponent(labelNrPPFTaps, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE)
- .addComponent(labelMaxConcurrentComm, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE))
+ .addComponent(labelCoresPerPset, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 128, Short.MAX_VALUE)
+ .addComponent(labelBGLIntegrationSteps, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 128, Short.MAX_VALUE)
+ .addComponent(labelPsetsPerCell, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 128, Short.MAX_VALUE)
+ .addComponent(labelNodesPerPset, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 128, Short.MAX_VALUE)
+ .addComponent(labelNrPPFTaps, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 128, Short.MAX_VALUE)
+ .addComponent(labelMaxConcurrentComm, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 128, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(inputCoresPerPset, javax.swing.GroupLayout.DEFAULT_SIZE, 200, Short.MAX_VALUE)
- .addComponent(inputBGLIntegrationSteps, javax.swing.GroupLayout.DEFAULT_SIZE, 200, Short.MAX_VALUE)
- .addComponent(inputPsetsPerCell, 0, 200, Short.MAX_VALUE)
- .addComponent(inputNodesPerPset, 0, 200, Short.MAX_VALUE)
- .addComponent(inputNrPPFTaps, javax.swing.GroupLayout.DEFAULT_SIZE, 200, Short.MAX_VALUE)
- .addComponent(inputMaxConcurrentComm, javax.swing.GroupLayout.DEFAULT_SIZE, 200, Short.MAX_VALUE))))
+ .addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(inputCoresPerPset)
+ .addComponent(inputBGLIntegrationSteps)
+ .addComponent(inputPsetsPerCell, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(inputNodesPerPset, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(inputNrPPFTaps)
+ .addComponent(inputMaxConcurrentComm, javax.swing.GroupLayout.DEFAULT_SIZE, 148, Short.MAX_VALUE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
.addContainerGap())
);
jPanel7Layout.setVerticalGroup(
@@ -1230,7 +1188,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addGroup(jPanel7Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(labelCoresPerPset)
.addComponent(inputCoresPerPset, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addContainerGap(94, Short.MAX_VALUE))
+ .addContainerGap(99, Short.MAX_VALUE))
);
jPanel11.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Storage Proc", 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)));
@@ -1252,7 +1210,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addGroup(jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(inputSubbandsPerMS)
.addComponent(inputStorageProcIntegrationSteps, javax.swing.GroupLayout.DEFAULT_SIZE, 192, Short.MAX_VALUE))
- .addGap(203, 203, 203))
+ .addGap(243, 243, 243))
);
jPanel11Layout.setVerticalGroup(
jPanel11Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1287,7 +1245,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(inputPositionType)
.addComponent(inputConverterType, 0, 192, Short.MAX_VALUE))
- .addContainerGap(203, Short.MAX_VALUE))
+ .addContainerGap(243, Short.MAX_VALUE))
);
jPanel5Layout.setVerticalGroup(
jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1307,16 +1265,17 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel4Layout.createSequentialGroup()
.addContainerGap()
- .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(jPanel6, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(jPanel8, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(jPanel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(jPanel11, javax.swing.GroupLayout.DEFAULT_SIZE, 608, Short.MAX_VALUE))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(jPanel10, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(jPanel11, javax.swing.GroupLayout.DEFAULT_SIZE, 648, Short.MAX_VALUE)
+ .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(jPanel6, 0, 648, Short.MAX_VALUE)
+ .addComponent(jPanel8, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(jPanel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(jPanel10, 0, 306, Short.MAX_VALUE)
.addComponent(jPanel7, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addContainerGap())
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
jPanel4Layout.setVerticalGroup(
jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -1331,7 +1290,7 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jPanel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jPanel11, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(jPanel11, javax.swing.GroupLayout.DEFAULT_SIZE, 81, Short.MAX_VALUE))
.addComponent(jPanel7, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
@@ -1342,13 +1301,13 @@ 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(3438, Short.MAX_VALUE))
+ .addContainerGap(3474, Short.MAX_VALUE))
);
jPanel2Layout.setVerticalGroup(
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(2731, Short.MAX_VALUE))
+ .addContainerGap(2721, Short.MAX_VALUE))
);
jScrollPane1.setViewportView(jPanel2);
@@ -1414,7 +1373,6 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
private jOTDBnode itsIONProcIntegrationSteps=null;
private jOTDBnode itsIONProcMaxConcurrentComm=null;
private jOTDBnode itsUseGather=null;
- private jOTDBnode itsUseScatter=null;
// Variables declaration - do not modify//GEN-BEGIN:variables
@@ -1444,7 +1402,6 @@ public class OlapPanel extends javax.swing.JPanel implements IViewPanel{
private javax.swing.JTextField inputSubbandsPerMS;
private javax.swing.JTextField inputSubbandsPerPset;
private javax.swing.JCheckBox inputUseGather;
- private javax.swing.JCheckBox inputUseScatter;
private javax.swing.JCheckBox inputUseZoid;
private javax.swing.JLabel jLabel1;
private javax.swing.JPanel jPanel1;
--
GitLab