Skip to content
Snippets Groups Projects
Commit 2b16a0e3 authored by Arthur Coolen's avatar Arthur Coolen
Browse files

Bug 1613: Remove MSNameMask en StorageNode entries from OTB screens

parent 1c671a6e
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.form
+ 29
− 85
View file @ 2b16a0e3
...@@ -35,41 +35,25 @@ ...@@ -35,41 +35,25 @@
</Group> </Group>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Component id="applyStationList" min="-2" max="-2" attributes="0"/>
<Group type="102" alignment="1" attributes="0"> <EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0"> <Component id="coreStationSelectionPanel" min="-2" max="-2" attributes="0"/>
<Component id="applyMSNameMask" min="-2" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="applyStorageNodes" min="-2" max="-2" attributes="0"/> <Component id="remoteStationSelectionPanel" min="-2" max="-2" attributes="0"/>
<Component id="applyStationList" alignment="1" min="-2" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> <Component id="europeStationSelectionPanel" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/> <EmptySpace min="-2" pref="53" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> </Group>
<Component id="storageNodeSelectionPanel" alignment="0" min="-2" max="-2" attributes="0"/> <Group type="102" alignment="1" attributes="0">
<Group type="102" alignment="0" attributes="0"> <EmptySpace max="-2" attributes="0"/>
<Component id="coreStationSelectionPanel" min="-2" max="-2" attributes="0"/> <Component id="restoreButton" pref="196" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="remoteStationSelectionPanel" min="-2" max="-2" attributes="0"/> <Component id="cancelButton" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="europeStationSelectionPanel" min="-2" max="-2" attributes="0"/> <Component id="saveButton" min="-2" pref="90" max="-2" attributes="0"/>
</Group> <EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="102" alignment="0" attributes="0"> <Component id="statusLabel" min="-2" pref="585" max="-2" attributes="0"/>
<Component id="labelMSNameMask" min="-2" pref="84" max="-2" attributes="1"/> <EmptySpace min="-2" pref="65" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="inputMSNameMask" min="-2" pref="777" max="-2" attributes="1"/>
</Group>
</Group>
<EmptySpace min="-2" pref="53" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="restoreButton" pref="142" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="cancelButton" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="saveButton" min="-2" pref="90" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="statusLabel" pref="627" max="32767" attributes="0"/>
</Group>
</Group>
</Group> </Group>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
...@@ -88,34 +72,22 @@ ...@@ -88,34 +72,22 @@
<Component id="remoteStationSelectionPanel" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="remoteStationSelectionPanel" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="europeStationSelectionPanel" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="europeStationSelectionPanel" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="storageNodeSelectionPanel" min="-2" pref="207" max="-2" attributes="1"/>
</Group> </Group>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="131" max="-2" attributes="0"/> <EmptySpace min="-2" pref="131" max="-2" attributes="0"/>
<Component id="applyStationList" min="-2" max="-2" attributes="0"/> <Component id="applyStationList" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="192" max="-2" attributes="0"/>
<Component id="applyStorageNodes" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="103" groupAlignment="3" attributes="0">
<Component id="inputMSNameMask" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="labelMSNameMask" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<Component id="applyMSNameMask" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="-2" pref="57" max="-2" attributes="0"/> <EmptySpace min="-2" pref="68" max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" max="-2" attributes="0"> <Group type="103" groupAlignment="1" attributes="0">
<Component id="statusLabel" max="32767" attributes="1"/> <Component id="statusLabel" pref="26" max="32767" attributes="1"/>
<Group type="103" alignment="0" groupAlignment="3" attributes="0"> <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
<Component id="restoreButton" alignment="1" max="32767" attributes="1"/> <Component id="restoreButton" alignment="1" max="32767" attributes="1"/>
<Component id="cancelButton" alignment="1" max="32767" attributes="1"/> <Component id="cancelButton" alignment="1" max="32767" attributes="1"/>
<Component id="saveButton" alignment="1" max="32767" attributes="1"/> <Component id="saveButton" alignment="1" min="-2" max="-2" attributes="1"/>
</Group> </Group>
</Group> </Group>
<EmptySpace pref="162" max="32767" attributes="0"/> <EmptySpace pref="38" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
...@@ -187,28 +159,6 @@ ...@@ -187,28 +159,6 @@
<Property name="enabled" type="boolean" value="false"/> <Property name="enabled" type="boolean" value="false"/>
</Properties> </Properties>
</Component> </Component>
<Component class="nl.astron.lofar.sas.otbcomponents.StorageSelectionPanel" name="storageNodeSelectionPanel">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
<TitledBorder justification="2" title="StorageNode List">
<Font PropertyName="font" name="Tahoma" size="11" style="1"/>
</TitledBorder>
</Border>
</Property>
<Property name="enabled" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="labelMSNameMask">
<Properties>
<Property name="text" type="java.lang.String" value="MSNameMask:"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="inputMSNameMask">
<Properties>
<Property name="enabled" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="restoreButton"> <Component class="javax.swing.JButton" name="restoreButton">
<Properties> <Properties>
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor"> <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
...@@ -227,19 +177,13 @@ ...@@ -227,19 +177,13 @@
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JCheckBox" name="applyStationList"> <Component class="javax.swing.JCheckBox" name="applyStationList">
<Properties>
<Property name="text" type="java.lang.String" value="Edit?"/>
<Property name="toolTipText" type="java.lang.String" value="Select if you want to edit the stationlists"/>
</Properties>
<Events> <Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="applyStationListActionPerformed"/> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="applyStationListActionPerformed"/>
</Events> </Events>
</Component> </Component>
<Component class="javax.swing.JCheckBox" name="applyStorageNodes">
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="applyStorageNodesActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JCheckBox" name="applyMSNameMask">
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="applyMSNameMaskActionPerformed"/>
</Events>
</Component>
</SubComponents> </SubComponents>
</Form> </Form>
SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.form
+ 19
− 49
View file @ 2b16a0e3
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/> <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/> <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/> <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,-54,0,0,4,-119"/> <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,-54,0,0,4,-47"/>
</AuxValues> </AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
...@@ -97,6 +97,10 @@ ...@@ -97,6 +97,10 @@
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
<Component id="jPanel3" alignment="0" pref="1344" max="32767" attributes="1"/>
<Component id="anaBeamConfiguration" alignment="0" max="32767" attributes="1"/>
</Group>
<Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0"> <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
<Component id="treeDescriptionScrollPane" alignment="0" max="32767" attributes="1"/> <Component id="treeDescriptionScrollPane" alignment="0" max="32767" attributes="1"/>
<Component id="descriptionScrollPane" alignment="0" max="32767" attributes="1"/> <Component id="descriptionScrollPane" alignment="0" max="32767" attributes="1"/>
...@@ -107,12 +111,8 @@ ...@@ -107,12 +111,8 @@
<Component id="jPanel5" min="-2" max="-2" attributes="0"/> <Component id="jPanel5" min="-2" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
<Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
<Component id="jPanel3" alignment="0" pref="1277" max="32767" attributes="1"/>
<Component id="anaBeamConfiguration" alignment="0" max="32767" attributes="1"/>
</Group>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace pref="47" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
...@@ -129,11 +129,11 @@ ...@@ -129,11 +129,11 @@
</Group> </Group>
<EmptySpace pref="39" max="32767" attributes="0"/> <EmptySpace pref="39" max="32767" attributes="0"/>
<Component id="jPanel10" min="-2" max="-2" attributes="1"/> <Component id="jPanel10" min="-2" max="-2" attributes="1"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="descriptionScrollPane" min="-2" pref="54" max="-2" attributes="0"/> <Component id="descriptionScrollPane" min="-2" pref="54" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="treeDescriptionScrollPane" min="-2" pref="68" max="-2" attributes="0"/> <Component id="treeDescriptionScrollPane" min="-2" pref="68" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace min="-2" pref="49" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
...@@ -206,27 +206,20 @@ ...@@ -206,27 +206,20 @@
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" max="-2" attributes="0"> <Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="labelNrChannelsPerSubband" max="32767" attributes="1"/> <Component id="labelNrChannelsPerSubband" max="32767" attributes="1"/>
<Component id="labelMSNameMask" alignment="0" pref="178" max="32767" attributes="1"/> <Component id="labelNrSlotsInFrame" alignment="0" min="-2" max="-2" attributes="1"/>
<Component id="labelNrSlotsInFrame" alignment="0" max="32767" attributes="1"/>
</Group> </Group>
<EmptySpace min="-2" pref="18" max="-2" attributes="0"/> <EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="inputMSNameMask" pref="886" max="32767" attributes="1"/> <Component id="inputNrSlotsInFrame" max="32767" attributes="1"/>
<Component id="inputNrSlotsInFrame" alignment="0" pref="886" max="32767" attributes="1"/> <Component id="inputNrChannelsPerSubband" alignment="0" pref="102" max="32767" attributes="1"/>
<Component id="inputNrChannelsPerSubband" alignment="0" min="-2" pref="102" max="-2" attributes="1"/>
</Group> </Group>
<EmptySpace min="-2" pref="273" max="-2" attributes="0"/> <EmptySpace pref="908" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
<DimensionLayout dim="1"> <DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" 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"/>
</Group>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="labelNrSlotsInFrame" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="labelNrSlotsInFrame" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="inputNrSlotsInFrame" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="inputNrSlotsInFrame" alignment="3" min="-2" max="-2" attributes="0"/>
...@@ -242,16 +235,6 @@ ...@@ -242,16 +235,6 @@
</DimensionLayout> </DimensionLayout>
</Layout> </Layout>
<SubComponents> <SubComponents>
<Component class="javax.swing.JLabel" name="labelMSNameMask">
<Properties>
<Property name="text" type="java.lang.String" value="MSNameMask:"/>
</Properties>
</Component>
<Component class="javax.swing.JTextField" name="inputMSNameMask">
<Events>
<EventHandler event="focusGained" listener="java.awt.event.FocusListener" parameters="java.awt.event.FocusEvent" handler="inputMSNameMaskFocusGained"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="labelNrSlotsInFrame"> <Component class="javax.swing.JLabel" name="labelNrSlotsInFrame">
<Properties> <Properties>
<Property name="text" type="java.lang.String" value="# Slots In Frame"/> <Property name="text" type="java.lang.String" value="# Slots In Frame"/>
...@@ -298,7 +281,7 @@ ...@@ -298,7 +281,7 @@
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="beamConfigurationPanel" alignment="0" pref="1255" max="32767" attributes="0"/> <Component id="beamConfigurationPanel" alignment="0" pref="1322" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="addBeamButton" min="-2" max="-2" attributes="0"/> <Component id="addBeamButton" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
...@@ -419,19 +402,15 @@ ...@@ -419,19 +402,15 @@
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<EmptySpace max="32767" attributes="0"/> <EmptySpace max="32767" attributes="0"/>
<Component id="stationsPanel" min="-2" pref="145" max="-2" attributes="0"/> <Component id="stationsPanel" min="-2" pref="145" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/> <EmptySpace min="-2" pref="325" max="-2" attributes="0"/>
<Component id="storageNodeSelectionPanel" min="-2" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
<DimensionLayout dim="1"> <DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="1" max="-2" attributes="0"> <Component id="stationsPanel" min="-2" pref="176" max="-2" attributes="1"/>
<Component id="storageNodeSelectionPanel" alignment="0" min="0" pref="0" max="32767" attributes="1"/> <EmptySpace pref="16" max="32767" attributes="0"/>
<Component id="stationsPanel" alignment="0" pref="176" max="32767" attributes="1"/>
</Group>
<EmptySpace pref="12" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
...@@ -501,15 +480,6 @@ ...@@ -501,15 +480,6 @@
</Container> </Container>
</SubComponents> </SubComponents>
</Container> </Container>
<Component class="nl.astron.lofar.sas.otbcomponents.StorageSelectionPanel" name="storageNodeSelectionPanel">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
<TitledBorder title="StorageNode List"/>
</Border>
</Property>
</Properties>
</Component>
</SubComponents> </SubComponents>
</Container> </Container>
<Container class="javax.swing.JPanel" name="jPanel4"> <Container class="javax.swing.JPanel" name="jPanel4">
...@@ -550,7 +520,7 @@ ...@@ -550,7 +520,7 @@
<Component id="jLabel2" min="-2" max="-2" attributes="0"/> <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
<EmptySpace min="-2" pref="10" max="-2" attributes="0"/> <EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
...@@ -674,7 +644,7 @@ ...@@ -674,7 +644,7 @@
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="anaBeamConfigurationPanel" pref="1163" max="32767" attributes="0"/> <Component id="anaBeamConfigurationPanel" pref="1232" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="102" max="-2" attributes="0"/> <EmptySpace min="-2" pref="102" max="-2" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment