pshell/psss
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various changes 2

Browse Source
This commit is contained in:
arrell_c
2022-03-07 17:14:00 +01:00
parent 998c96518a
commit a2b1a7693e
12 changed files with 95 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/PSSS.form
+13 -3
View File
@@ -57,7 +57,7 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="spinnerAverage" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="history" alignment="0" pref="453" max="32767" attributes="0"/>
<Component id="history" alignment="0" pref="461" max="32767" attributes="0"/>
<Component id="plot" alignment="0" max="32767" attributes="0"/>
</Group>
<EmptySpace min="-2" max="-2" attributes="0"/>
@@ -97,10 +97,20 @@
<SubComponents>
<Component class="ch.psi.pshell.plot.LinePlotJFree" name="plot">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="14" style="0"/>
</Property>
<Property name="title" type="java.lang.String" value=""/>
</Properties>
</Component>
<Component class="ch.psi.pshell.plot.TimePlotJFree" name="history">
<Properties>
<Property name="durationMillis" type="int" value="1800000"/>
<Property name="focusable" type="boolean" value="false"/>
<Property name="tickLabelFont" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="SansSerif" size="14" style="0"/>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="jLabel1">
<Properties>
@@ -141,9 +151,9 @@
<Layout>
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<EmptySpace min="0" pref="843" max="32767" attributes="0"/>
<EmptySpace min="0" pref="851" max="32767" attributes="0"/>
<Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
<Component id="renderer" alignment="0" pref="843" max="32767" attributes="0"/>
<Component id="renderer" alignment="0" pref="851" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
plugins/PSSS.java
+14 -3
View File
@@ -9,6 +9,7 @@ import ch.psi.utils.Convert;
import ch.psi.utils.State;
import ch.psi.utils.Str;
import java.awt.CardLayout;
import java.awt.Color;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
@@ -25,12 +26,17 @@ public class PSSS extends Panel {
PipelineServer pipelineServer;
volatile boolean updatingPlot;
volatile boolean updatingImage;
final Color PLOT_BACKGROUND =Color.WHITE;
public PSSS() {
initComponents();
plot.getAxis(Plot.AxisId.X).setLabel(null);
plot.getAxis(Plot.AxisId.Y).setLabel(null);
renderer.setMode(RendererMode.Stretch);
plot.setPlotBackgroundColor(PLOT_BACKGROUND);
history.setPlotBackgroundColor(PLOT_BACKGROUND);
histogramGeneratorPanelCenter.getPlot().setPlotBackgroundColor(PLOT_BACKGROUND);
histogramGeneratorFwhm.getPlot().setPlotBackgroundColor(PLOT_BACKGROUND);
}
//Overridable callbacks
@@ -205,8 +211,13 @@ public class PSSS extends Panel {
}
});
plot.setFont(new java.awt.Font("Dialog", 0, 14)); // NOI18N
plot.setTitle("");
history.setDurationMillis(1800000);
history.setFocusable(false);
history.setTickLabelFont(new java.awt.Font("SansSerif", 0, 14)); // NOI18N
jLabel1.setText("Average:");
spinnerAverage.setModel(new javax.swing.SpinnerNumberModel(1, 1, 100, 1));
@@ -231,7 +242,7 @@ public class PSSS extends Panel {
.addComponent(jLabel1)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(spinnerAverage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addComponent(history, javax.swing.GroupLayout.DEFAULT_SIZE, 453, Short.MAX_VALUE)
.addComponent(history, javax.swing.GroupLayout.DEFAULT_SIZE, 461, Short.MAX_VALUE)
.addComponent(plot, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -264,9 +275,9 @@ public class PSSS extends Panel {
jPanel4.setLayout(jPanel4Layout);
jPanel4Layout.setHorizontalGroup(
jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGap(0, 843, Short.MAX_VALUE)
.addGap(0, 851, Short.MAX_VALUE)
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(renderer, javax.swing.GroupLayout.DEFAULT_SIZE, 843, Short.MAX_VALUE))
.addComponent(renderer, javax.swing.GroupLayout.DEFAULT_SIZE, 851, Short.MAX_VALUE))
);
jPanel4Layout.setVerticalGroup(
jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)