diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBPlotPanel.form b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBPlotPanel.form
index 6b2de17d3e06d29e3b3de124832fe2f0678f29be..9dc5ac8f56ea356264372ff52dc8e90e857e6a29 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBPlotPanel.form
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBPlotPanel.form
@@ -23,7 +23,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,101,0,0,2,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,2,-96,0,0,2,117"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
@@ -71,7 +71,7 @@
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="10" y="530" width="-1" height="-1"/>
+ <AbsoluteConstraints x="470" y="640" width="-1" height="-1"/>
</Constraint>
</Constraints>
</Component>
@@ -85,7 +85,7 @@
</Events>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="90" y="530" width="70" height="-1"/>
+ <AbsoluteConstraints x="550" y="640" width="70" height="-1"/>
</Constraint>
</Constraints>
</Component>
@@ -120,7 +120,7 @@
</AuxValues>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
- <AbsoluteConstraints x="170" y="530" width="450" height="50"/>
+ <AbsoluteConstraints x="10" y="530" width="610" height="80"/>
</Constraint>
</Constraints>
@@ -133,8 +133,8 @@
</Property>
<Property name="columns" type="int" value="20"/>
<Property name="editable" type="boolean" value="false"/>
- <Property name="rows" type="int" value="3"/>
- <Property name="text" type="java.lang.String" value="To zoom: Click and hold the left mouse button and select a rectangle.
To reset the zoom: Press CTRL-LeftMouseButton to reset the zoom.
To change colors/etc: Double-Click on a line in the legend."/>
+ <Property name="rows" type="int" value="5"/>
+ <Property name="text" type="java.lang.String" value="To zoom: Click and hold the left mouse button and select a rectangle.
To reset the zoom: Press CTRL-LeftMouseButton to reset the zoom.
To change colors/etc: Double-Click on a line in the legend.
To change plot/axis labels and tics/etc: Click on an axis or title and press the right mouse button."/>
</Properties>
</Component>
</SubComponents>
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBPlotPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBPlotPanel.java
index 80b9627876b7cea81df400b4cfc0964c9e196bdd..222b13e73cb79aa69c6ab847b577e90819836f2b 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBPlotPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBPlotPanel.java
@@ -25,8 +25,8 @@ import org.apache.log4j.Logger;
public class ParmDBPlotPanel extends javax.swing.JPanel {
static Logger logger = Logger.getLogger(ParameterViewPanel.class);
-
-
+ JScrollPane legendPane;
+ PlotPanel paramPanel;
/** Creates new form BeanForm based upon aParameter
*
* @params aParam Param to obtain the info from
@@ -49,7 +49,7 @@ public class ParmDBPlotPanel extends javax.swing.JPanel {
public void setMainFrame(MainFrame aMainFrame) {
if (aMainFrame != null) {
itsMainFrame=aMainFrame;
-
+
} else {
logger.debug("No Mainframe supplied");
@@ -64,8 +64,8 @@ public class ParmDBPlotPanel extends javax.swing.JPanel {
itsParamName=aParamName.substring(7);
itsParamName += "*";
}
-
- PlotPanel paramPanel = new PlotPanel();
+
+ paramPanel = new PlotPanel();
try{
String[] passToDataAccess = new String[7];
@@ -89,17 +89,17 @@ public class ParmDBPlotPanel extends javax.swing.JPanel {
paramPanel.createPlot(PlotConstants.PLOT_XYLINE,true,passToDataAccess);
plotPanel.removeAll();
plotPanel.add(paramPanel,BorderLayout.CENTER);
- JScrollPane legendPane = new JScrollPane(paramPanel.getLegendForPlot());
- legendPane.setPreferredSize(new Dimension(paramPanel.getWidth()-20,100));
+ legendPane = new JScrollPane(paramPanel.getLegendForPlot());
+ legendPane.setPreferredSize(new Dimension(paramPanel.getLegendForPlot().getWidth()-20,120));
legendPane.setBackground(Color.WHITE);
legendPane.getViewport().setBackground(Color.WHITE);
plotPanel.add(legendPane,BorderLayout.SOUTH);
}catch(Exception ex){
- JOptionPane.showMessageDialog(itsMainFrame, ex.getMessage(),
- "Error detected",
- JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(itsMainFrame, ex.getMessage(),
+ "Error detected",
+ JOptionPane.ERROR_MESSAGE);
logger.error("Plotter created an exception :"+ex.getMessage(),ex);
}
} else {
@@ -211,7 +211,7 @@ public class ParmDBPlotPanel extends javax.swing.JPanel {
}
});
- add(ParamCancelButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 530, -1, -1));
+ add(ParamCancelButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(470, 640, -1, -1));
ParamApplyButton.setText("Apply");
ParamApplyButton.setEnabled(false);
@@ -221,7 +221,7 @@ public class ParmDBPlotPanel extends javax.swing.JPanel {
}
});
- add(ParamApplyButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(90, 530, 70, -1));
+ add(ParamApplyButton, new org.netbeans.lib.awtextra.AbsoluteConstraints(550, 640, 70, -1));
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
jLabel1.setText("ParmDB Plot Panel");
@@ -235,11 +235,11 @@ public class ParmDBPlotPanel extends javax.swing.JPanel {
jTextArea2.setBackground(javax.swing.UIManager.getDefaults().getColor("scrollbar"));
jTextArea2.setColumns(20);
jTextArea2.setEditable(false);
- jTextArea2.setRows(3);
- jTextArea2.setText("To zoom: Click and hold the left mouse button and select a rectangle.\nTo reset the zoom: Press CTRL-LeftMouseButton to reset the zoom.\nTo change colors/etc: Double-Click on a line in the legend.");
+ jTextArea2.setRows(5);
+ jTextArea2.setText("To zoom: Click and hold the left mouse button and select a rectangle.\nTo reset the zoom: Press CTRL-LeftMouseButton to reset the zoom.\nTo change colors/etc: Double-Click on a line in the legend.\nTo change plot/axis labels and tics/etc: Click on an axis or title and press the right mouse button.");
jScrollPane2.setViewportView(jTextArea2);
- add(jScrollPane2, new org.netbeans.lib.awtextra.AbsoluteConstraints(170, 530, 450, 50));
+ add(jScrollPane2, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 530, 610, 80));
}// </editor-fold>//GEN-END:initComponents