pshell_config/dev
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Startup

Browse Source
This commit is contained in:
gobbo_a
2019-08-08 13:59:31 +02:00
parent 67a904050a
commit 2eadbf6107
3 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devices/CurrentCamera.properties
+2 -2
View File
@@ -1,5 +1,5 @@
#Thu Jun 06 15:17:49 CEST 2019 #Thu Aug 08 11:28:24 CEST 2019
colormap=Grayscale colormap=Temperature
colormapAutomatic=true colormapAutomatic=true
colormapLogarithmic=false colormapLogarithmic=false
colormapMax=58981.0 colormapMax=58981.0
plugins/ScreenPanel5.form
+18 -18
View File
@@ -651,7 +651,7 @@
</Group> </Group>
</Group> </Group>
</Group> </Group>
<EmptySpace min="2" pref="2" max="-2" attributes="0"/> <EmptySpace min="-2" pref="2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0"> <Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="spinnerGrThreshold" linkSize="8" alignment="0" max="32767" attributes="0"/> <Component id="spinnerGrThreshold" linkSize="8" alignment="0" max="32767" attributes="0"/>
<Component id="spinnerGrScale" linkSize="8" alignment="0" max="32767" attributes="0"/> <Component id="spinnerGrScale" linkSize="8" alignment="0" max="32767" attributes="0"/>
@@ -679,41 +679,41 @@
<EmptySpace min="-2" pref="2" max="-2" attributes="0"/> <EmptySpace min="-2" pref="2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="checkThreshold" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="checkThreshold" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="spinnerThreshold" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="spinnerThreshold" linkSize="11" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="-2" pref="2" max="-2" attributes="0"/> <EmptySpace min="-2" pref="2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="checkRotation" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="checkRotation" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="spinnerRotationAngle" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="spinnerRotationAngle" linkSize="11" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="labelAngle" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="labelAngle" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="-2" pref="2" max="-2" attributes="0"/> <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="spinnerRotationOrder" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="spinnerRotationOrder" linkSize="11" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="labelOrder" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="labelOrder" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="-2" pref="2" max="-2" attributes="0"/> <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="spinnerRotationMode" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="spinnerRotationMode" linkSize="11" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="labelMode" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="labelMode" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="-2" pref="2" max="-2" attributes="0"/> <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="spinnerRotationConstant" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="spinnerRotationConstant" linkSize="11" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="labelConstant" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="labelConstant" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="-2" pref="2" max="-2" attributes="0"/> <EmptySpace min="-2" pref="2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="checkGoodRegion" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="checkGoodRegion" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="spinnerGrScale" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="spinnerGrScale" linkSize="11" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="labelGrScale" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="labelGrScale" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="-2" pref="2" max="-2" attributes="0"/> <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="spinnerGrThreshold" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="spinnerGrThreshold" linkSize="11" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="labelGrThreshold" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="labelGrThreshold" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace min="-2" pref="2" max="-2" attributes="0"/>
<Component id="panelSlicing" min="-2" max="-2" attributes="0"/> <Component id="panelSlicing" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
@@ -832,19 +832,19 @@
<Component id="checkSlicing" min="-2" max="-2" attributes="0"/> <Component id="checkSlicing" min="-2" max="-2" attributes="0"/>
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="spinnerSlNumber" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="spinnerSlNumber" linkSize="12" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="labelSlNumber" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="labelSlNumber" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="spinnerSlScale" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="spinnerSlScale" linkSize="12" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="labelSlScale" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="labelSlScale" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</Group> </Group>
<EmptySpace max="-2" attributes="0"/> <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="spinnerSlOrientation" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="spinnerSlOrientation" linkSize="12" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="labelSlOrientation" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="labelSlOrientation" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
plugins/ScreenPanel5.java
+29 -7
View File
@@ -1024,6 +1024,7 @@ public class ScreenPanel5 extends Panel {
if (changed || buttonDirect.isSelected()) { if (changed || buttonDirect.isSelected()) {
spinnerThreshold.setVisible(false); spinnerThreshold.setVisible(false);
checkThreshold.setEnabled(false); checkThreshold.setEnabled(false);
checkRotation.setEnabled(false);
checkGoodRegion.setEnabled(false); checkGoodRegion.setEnabled(false);
setGoodRegionOptionsVisible(false); setGoodRegionOptionsVisible(false);
setSlicingOptionsVisible(false); setSlicingOptionsVisible(false);
@@ -1094,9 +1095,11 @@ public class ScreenPanel5 extends Panel {
updatePipelineControls(); updatePipelineControls();
checkThreshold.setEnabled(true); checkThreshold.setEnabled(true);
checkRotation.setEnabled(true);
checkGoodRegion.setEnabled(true); checkGoodRegion.setEnabled(true);
} else { } else {
checkThreshold.setSelected(false); checkThreshold.setSelected(false);
checkRotation.setSelected(false);
checkGoodRegion.setSelected(false); checkGoodRegion.setSelected(false);
if (polling <= 0) { if (polling <= 0) {
camera.setMonitored(true); camera.setMonitored(true);
@@ -1501,6 +1504,21 @@ public class ScreenPanel5 extends Panel {
spinnerGrThreshold.setValue(((Number) gr.get("threshold")).doubleValue()); spinnerGrThreshold.setValue(((Number) gr.get("threshold")).doubleValue());
spinnerGrScale.setValue(((Number) gr.get("gfscale")).doubleValue()); spinnerGrScale.setValue(((Number) gr.get("gfscale")).doubleValue());
} }
Map rotation = server.getRotation();
checkRotation.setSelected(rotation != null);
if (rotation!=null){
spinnerRotationAngle.setValue(((Number) rotation.get("angle")).doubleValue());
spinnerRotationOrder.setValue(((Number) rotation.get("order")).intValue());
String mode = (String) rotation.get("mode");
try{
spinnerRotationConstant.setValue(Double.valueOf(mode));
spinnerRotationMode.setValue("constant");
} catch (Exception ex){
spinnerRotationConstant.setValue(0);
spinnerRotationMode.setValue(mode);
}
}
Map<String, Object> slicing = (server.getSlicing()); Map<String, Object> slicing = (server.getSlicing());
checkSlicing.setSelected(slicing != null); checkSlicing.setSelected(slicing != null);
if (slicing != null) { if (slicing != null) {
@@ -3360,16 +3378,18 @@ public class ScreenPanel5 extends Panel {
.addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerSlNumber, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(spinnerSlNumber, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelSlNumber)) .addComponent(labelSlNumber))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGap(0, 0, 0)
.addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerSlScale, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(spinnerSlScale, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelSlScale)))) .addComponent(labelSlScale))))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGap(0, 0, 0)
.addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerSlOrientation, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(spinnerSlOrientation, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelSlOrientation))) .addComponent(labelSlOrientation)))
); );
panelSlicingLayout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerSlNumber, spinnerSlOrientation, spinnerSlScale});
checkRotation.setText("Rotation"); checkRotation.setText("Rotation");
checkRotation.addActionListener(new java.awt.event.ActionListener() { checkRotation.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -3478,15 +3498,15 @@ public class ScreenPanel5 extends Panel {
.addComponent(checkRotation) .addComponent(checkRotation)
.addComponent(spinnerRotationAngle, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(spinnerRotationAngle, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelAngle)) .addComponent(labelAngle))
.addGap(2, 2, 2) .addGap(0, 0, 0)
.addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerRotationOrder, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(spinnerRotationOrder, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelOrder)) .addComponent(labelOrder))
.addGap(2, 2, 2) .addGap(0, 0, 0)
.addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerRotationMode, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(spinnerRotationMode, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelMode)) .addComponent(labelMode))
.addGap(2, 2, 2) .addGap(0, 0, 0)
.addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerRotationConstant, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(spinnerRotationConstant, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelConstant)) .addComponent(labelConstant))
@@ -3495,15 +3515,17 @@ public class ScreenPanel5 extends Panel {
.addComponent(checkGoodRegion) .addComponent(checkGoodRegion)
.addComponent(spinnerGrScale, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(spinnerGrScale, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelGrScale)) .addComponent(labelGrScale))
.addGap(2, 2, 2) .addGap(0, 0, 0)
.addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(spinnerGrThreshold, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(spinnerGrThreshold, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelGrThreshold)) .addComponent(labelGrThreshold))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGap(2, 2, 2)
.addComponent(panelSlicing, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(panelSlicing, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap()) .addContainerGap())
); );
panelScreen2Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerGrScale, spinnerGrThreshold, spinnerRotationAngle, spinnerRotationConstant, spinnerRotationMode, spinnerRotationOrder, spinnerThreshold});
javax.swing.GroupLayout sidePanelLayout = new javax.swing.GroupLayout(sidePanel); javax.swing.GroupLayout sidePanelLayout = new javax.swing.GroupLayout(sidePanel);
sidePanel.setLayout(sidePanelLayout); sidePanel.setLayout(sidePanelLayout);
sidePanelLayout.setHorizontalGroup( sidePanelLayout.setHorizontalGroup(