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

GUI style updates

Browse Source
This commit is contained in:
sander_m
2022-03-21 10:12:39 +01:00
parent a2b1a7693e
commit 54383de1c3
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nb/PSSS/nbproject/project.properties
View File

@@ -35,13 +35,13 @@ dist.jlink.dir=${dist.dir}/jlink
dist.jlink.output=${dist.jlink.dir}/PSSS
endorsed.classpath=
excludes=
file.reference.v1_17.jar=/opt/gfa/pshell/v1_17
file.reference.latest.jar=/opt/gfa/pshell/latest
file.reference.psss_panel-plugins=../../plugins
file.reference.psss_panel-script=../../script
includes=**/*.java
jar.compress=false
javac.classpath=\
${file.reference.v1_17.jar}
${file.reference.latest.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false

5
plugins/PSSS.form
View File

@@ -107,9 +107,6 @@
<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">
@@ -210,7 +207,7 @@
<Component id="radioCrystalScan" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="radioCameraScan" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="radioEnergyScan" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="btAbort" alignment="0" pref="213" max="32767" attributes="0"/>
<Component id="btAbort" alignment="0" pref="218" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>

9
plugins/PSSS.java
View File

@@ -10,6 +10,7 @@ import ch.psi.utils.State;
import ch.psi.utils.Str;
import java.awt.CardLayout;
import java.awt.Color;
import java.awt.Font;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
@@ -27,6 +28,7 @@ public class PSSS extends Panel {
volatile boolean updatingPlot;
volatile boolean updatingImage;
final Color PLOT_BACKGROUND =Color.WHITE;
final Font TICK_LABEL_FONT = new Font("Arial", 0, 14);
public PSSS() {
initComponents();
@@ -37,6 +39,10 @@ public class PSSS extends Panel {
history.setPlotBackgroundColor(PLOT_BACKGROUND);
histogramGeneratorPanelCenter.getPlot().setPlotBackgroundColor(PLOT_BACKGROUND);
histogramGeneratorFwhm.getPlot().setPlotBackgroundColor(PLOT_BACKGROUND);
plot.setTickLabelFont(TICK_LABEL_FONT);
history.setTickLabelFont(TICK_LABEL_FONT);
histogramGeneratorPanelCenter.getPlot().setTickLabelFont(TICK_LABEL_FONT);
histogramGeneratorFwhm.getPlot().setTickLabelFont(TICK_LABEL_FONT);
}
//Overridable callbacks
@@ -216,7 +222,6 @@ public class PSSS extends Panel {
history.setDurationMillis(1800000);
history.setFocusable(false);
history.setTickLabelFont(new java.awt.Font("SansSerif", 0, 14)); // NOI18N
jLabel1.setText("Average:");
@@ -606,7 +611,7 @@ public class PSSS extends Panel {
.addComponent(radioCrystalScan)
.addComponent(radioCameraScan)
.addComponent(radioEnergyScan)
.addComponent(btAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 213, Short.MAX_VALUE))
.addComponent(btAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 218, Short.MAX_VALUE))
.addContainerGap())
);
jPanel2Layout.setVerticalGroup(