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

BugID: 604 

changed erreneous component name
parent 5c32e901
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/GenObsConfigPanel.form
+ 103
− 14
View file @ a633d384
......@@ -54,9 +54,9 @@
<EmptySpace min="47" pref="47" max="47" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="NodeCancelButton1" min="-2" max="-2" attributes="0"/>
<Component id="NodeCancelButton" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="NodeApplyButton1" min="-2" pref="70" max="-2" attributes="0"/>
<Component id="NodeApplyButton" min="-2" pref="70" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
......@@ -144,8 +144,8 @@
</Group>
<EmptySpace min="-2" pref="36" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0">
<Component id="NodeCancelButton1" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="NodeApplyButton1" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="NodeCancelButton" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="NodeApplyButton" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="-2" pref="219" max="-2" attributes="0"/>
</Group>
......@@ -249,20 +249,20 @@
<Property name="toolTipText" type="java.lang.String" value="Number of samples per frame for this observation"/>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="NodeCancelButton1">
<Component class="javax.swing.JButton" name="NodeCancelButton">
<Properties>
<Property name="text" type="java.lang.String" value="Cancel"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="NodeCancelButton1ActionPerformed"/>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="NodeCancelButtonActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="NodeApplyButton1">
<Component class="javax.swing.JButton" name="NodeApplyButton">
<Properties>
<Property name="text" type="java.lang.String" value="Apply"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="NodeApplyButton1ActionPerformed"/>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="NodeApplyButtonActionPerformed"/>
</Events>
</Component>
</SubComponents>
......@@ -279,15 +279,46 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="786" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jScrollPane1" pref="766" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="549" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jScrollPane1" pref="527" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Container class="javax.swing.JScrollPane" name="jScrollPane1">
<AuxValues>
<AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
<Component class="javax.swing.JTable" name="jTable1">
<Properties>
<Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
<Table columnCount="4" rowCount="0">
<Column editable="true" title="Station" type="java.lang.Integer"/>
<Column editable="true" title="Latitude" type="java.lang.Double"/>
<Column editable="true" title="Longitude" type="java.lang.Double"/>
<Column editable="true" title="Height" type="java.lang.Double"/>
</Table>
</Property>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel3">
<Constraints>
......@@ -301,15 +332,44 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="786" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jScrollPane2" pref="766" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="549" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="24" max="-2" attributes="0"/>
<Component id="jScrollPane2" pref="514" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Container class="javax.swing.JScrollPane" name="jScrollPane2">
<AuxValues>
<AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
<Component class="javax.swing.JTable" name="jTable2">
<Properties>
<Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
<Table columnCount="2" rowCount="0">
<Column editable="true" title="Subband #" type="java.lang.Integer"/>
<Column editable="true" title="Frequency" type="java.lang.Double"/>
</Table>
</Property>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel4">
<Constraints>
......@@ -323,15 +383,44 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="786" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jScrollPane3" pref="766" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="549" max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<Component id="jScrollPane3" pref="538" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Container class="javax.swing.JScrollPane" name="jScrollPane3">
<AuxValues>
<AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
<SubComponents>
<Component class="javax.swing.JTable" name="jTable3">
<Properties>
<Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
<Table columnCount="3" rowCount="0">
<Column editable="true" title="RSPBoard#" type="java.lang.Integer"/>
<Column editable="true" title="MAC addres Sender" type="java.lang.String"/>
<Column editable="true" title="MAC address Receiver" type="java.lang.String"/>
</Table>
</Property>
</Properties>
</Component>
</SubComponents>
</Container>
</SubComponents>
</Container>
</SubComponents>
</Container>
......
SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/GenObsConfigPanel.java
+ 107
− 24
View file @ a633d384
......@@ -209,11 +209,17 @@ public class GenObsConfigPanel extends javax.swing.JPanel implements IViewPanel{
MeasurementSetNameText1 = new javax.swing.JTextField();
jLabel20 = new javax.swing.JLabel();
NrSamplesFrameText = new javax.swing.JTextField();
NodeCancelButton1 = new javax.swing.JButton();
NodeApplyButton1 = new javax.swing.JButton();
NodeCancelButton = new javax.swing.JButton();
NodeApplyButton = new javax.swing.JButton();
jPanel2 = new javax.swing.JPanel();
jScrollPane1 = new javax.swing.JScrollPane();
jTable1 = new javax.swing.JTable();
jPanel3 = new javax.swing.JPanel();
jScrollPane2 = new javax.swing.JScrollPane();
jTable2 = new javax.swing.JTable();
jPanel4 = new javax.swing.JPanel();
jScrollPane3 = new javax.swing.JScrollPane();
jTable3 = new javax.swing.JTable();
jLabel11.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
jLabel11.setText("Generic Observation Configuration Panel");
......@@ -254,17 +260,17 @@ public class GenObsConfigPanel extends javax.swing.JPanel implements IViewPanel{
NrSamplesFrameText.setToolTipText("Number of samples per frame for this observation");
NodeCancelButton1.setText("Cancel");
NodeCancelButton1.addActionListener(new java.awt.event.ActionListener() {
NodeCancelButton.setText("Cancel");
NodeCancelButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
NodeCancelButton1ActionPerformed(evt);
NodeCancelButtonActionPerformed(evt);
}
});
NodeApplyButton1.setText("Apply");
NodeApplyButton1.addActionListener(new java.awt.event.ActionListener() {
NodeApplyButton.setText("Apply");
NodeApplyButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
NodeApplyButton1ActionPerformed(evt);
NodeApplyButtonActionPerformed(evt);
}
});
......@@ -281,9 +287,9 @@ public class GenObsConfigPanel extends javax.swing.JPanel implements IViewPanel{
.add(47, 47, 47)
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(jPanel1Layout.createSequentialGroup()
.add(NodeCancelButton1)
.add(NodeCancelButton)
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
.add(NodeApplyButton1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 70, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.add(NodeApplyButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 70, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.add(jPanel1Layout.createSequentialGroup()
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(jLabel12)
......@@ -352,45 +358,116 @@ public class GenObsConfigPanel extends javax.swing.JPanel implements IViewPanel{
.add(NrSamplesFrameText, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
.add(36, 36, 36)
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
.add(NodeCancelButton1)
.add(NodeApplyButton1))
.add(NodeCancelButton)
.add(NodeApplyButton))
.add(219, 219, 219))
);
jTabbedPane1.addTab("Generic", jPanel1);
jTable1.setModel(new javax.swing.table.DefaultTableModel(
new Object [][] {
},
new String [] {
"Station", "Latitude", "Longitude", "Height"
}
) {
Class[] types = new Class [] {
java.lang.Integer.class, java.lang.Double.class, java.lang.Double.class, java.lang.Double.class
};
public Class getColumnClass(int columnIndex) {
return types [columnIndex];
}
});
jScrollPane1.setViewportView(jTable1);
org.jdesktop.layout.GroupLayout jPanel2Layout = new org.jdesktop.layout.GroupLayout(jPanel2);
jPanel2.setLayout(jPanel2Layout);
jPanel2Layout.setHorizontalGroup(
jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(0, 786, Short.MAX_VALUE)
.add(jPanel2Layout.createSequentialGroup()
.addContainerGap()
.add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 766, Short.MAX_VALUE)
.addContainerGap())
);
jPanel2Layout.setVerticalGroup(
jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(0, 549, Short.MAX_VALUE)
.add(jPanel2Layout.createSequentialGroup()
.addContainerGap()
.add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 527, Short.MAX_VALUE)
.addContainerGap())
);
jTabbedPane1.addTab("StationPositions", jPanel2);
jTable2.setModel(new javax.swing.table.DefaultTableModel(
new Object [][] {
},
new String [] {
"Subband #", "Frequency"
}
) {
Class[] types = new Class [] {
java.lang.Integer.class, java.lang.Double.class
};
public Class getColumnClass(int columnIndex) {
return types [columnIndex];
}
});
jScrollPane2.setViewportView(jTable2);
org.jdesktop.layout.GroupLayout jPanel3Layout = new org.jdesktop.layout.GroupLayout(jPanel3);
jPanel3.setLayout(jPanel3Layout);
jPanel3Layout.setHorizontalGroup(
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(0, 786, Short.MAX_VALUE)
.add(jPanel3Layout.createSequentialGroup()
.addContainerGap()
.add(jScrollPane2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 766, Short.MAX_VALUE)
.addContainerGap())
);
jPanel3Layout.setVerticalGroup(
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(0, 549, Short.MAX_VALUE)
.add(jPanel3Layout.createSequentialGroup()
.add(24, 24, 24)
.add(jScrollPane2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 514, Short.MAX_VALUE)
.addContainerGap())
);
jTabbedPane1.addTab("Subband Frequencies", jPanel3);
jTable3.setModel(new javax.swing.table.DefaultTableModel(
new Object [][] {
},
new String [] {
"RSPBoard#", "MAC addres Sender", "MAC address Receiver"
}
) {
Class[] types = new Class [] {
java.lang.Integer.class, java.lang.String.class, java.lang.String.class
};
public Class getColumnClass(int columnIndex) {
return types [columnIndex];
}
});
jScrollPane3.setViewportView(jTable3);
org.jdesktop.layout.GroupLayout jPanel4Layout = new org.jdesktop.layout.GroupLayout(jPanel4);
jPanel4.setLayout(jPanel4Layout);
jPanel4Layout.setHorizontalGroup(
jPanel4Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(0, 786, Short.MAX_VALUE)
.add(jPanel4Layout.createSequentialGroup()
.addContainerGap()
.add(jScrollPane3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 766, Short.MAX_VALUE)
.addContainerGap())
);
jPanel4Layout.setVerticalGroup(
jPanel4Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
.add(0, 549, Short.MAX_VALUE)
.add(jPanel4Layout.createSequentialGroup()
.add(jScrollPane3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 538, Short.MAX_VALUE)
.addContainerGap())
);
jTabbedPane1.addTab("RSP MAC addresses", jPanel4);
......@@ -411,13 +488,13 @@ public class GenObsConfigPanel extends javax.swing.JPanel implements IViewPanel{
);
}// </editor-fold>//GEN-END:initComponents
private void NodeApplyButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_NodeApplyButton1ActionPerformed
private void NodeApplyButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_NodeApplyButtonActionPerformed
// TODO add your handling code here:
}//GEN-LAST:event_NodeApplyButton1ActionPerformed
}//GEN-LAST:event_NodeApplyButtonActionPerformed
private void NodeCancelButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_NodeCancelButton1ActionPerformed
private void NodeCancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_NodeCancelButtonActionPerformed
// TODO add your handling code here:
}//GEN-LAST:event_NodeCancelButton1ActionPerformed
}//GEN-LAST:event_NodeCancelButtonActionPerformed
private jOTDBnode itsNode = null;
private MainFrame itsMainFrame;
......@@ -425,8 +502,8 @@ public class GenObsConfigPanel extends javax.swing.JPanel implements IViewPanel{
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JTextField MeasurementSetNameText1;
private javax.swing.JButton NodeApplyButton1;
private javax.swing.JButton NodeCancelButton1;
private javax.swing.JButton NodeApplyButton;
private javax.swing.JButton NodeCancelButton;
private javax.swing.JTextField NrChannelsText1;
private javax.swing.JTextField NrRSPBoardsText1;
private javax.swing.JTextField NrSamplesFrameText;
......@@ -449,7 +526,13 @@ public class GenObsConfigPanel extends javax.swing.JPanel implements IViewPanel{
private javax.swing.JPanel jPanel2;
private javax.swing.JPanel jPanel3;
private javax.swing.JPanel jPanel4;
private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JScrollPane jScrollPane2;
private javax.swing.JScrollPane jScrollPane3;
private javax.swing.JTabbedPane jTabbedPane1;
private javax.swing.JTable jTable1;
private javax.swing.JTable jTable2;
private javax.swing.JTable jTable3;
// End of variables declaration//GEN-END:variables
/**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment