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

36
plugins/ScreenPanel5.java
View File

@@ -1024,6 +1024,7 @@ public class ScreenPanel5 extends Panel {
if (changed || buttonDirect.isSelected()) {
spinnerThreshold.setVisible(false);
checkThreshold.setEnabled(false);
checkRotation.setEnabled(false);
checkGoodRegion.setEnabled(false);
setGoodRegionOptionsVisible(false);
setSlicingOptionsVisible(false);
@@ -1094,9 +1095,11 @@ public class ScreenPanel5 extends Panel {
updatePipelineControls();
checkThreshold.setEnabled(true);
checkRotation.setEnabled(true);
checkGoodRegion.setEnabled(true);
} else {
checkThreshold.setSelected(false);
checkRotation.setSelected(false);
checkGoodRegion.setSelected(false);
if (polling <= 0) {
camera.setMonitored(true);
@@ -1501,6 +1504,21 @@ public class ScreenPanel5 extends Panel {
spinnerGrThreshold.setValue(((Number) gr.get("threshold")).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());
checkSlicing.setSelected(slicing != null);
if (slicing != null) {
@@ -3360,16 +3378,18 @@ public class ScreenPanel5 extends Panel {
.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(labelSlNumber))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGap(0, 0, 0)
.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(labelSlScale))))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGap(0, 0, 0)
.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(labelSlOrientation)))
);
panelSlicingLayout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerSlNumber, spinnerSlOrientation, spinnerSlScale});
checkRotation.setText("Rotation");
checkRotation.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -3478,15 +3498,15 @@ public class ScreenPanel5 extends Panel {
.addComponent(checkRotation)
.addComponent(spinnerRotationAngle, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelAngle))
.addGap(2, 2, 2)
.addGap(0, 0, 0)
.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(labelOrder))
.addGap(2, 2, 2)
.addGap(0, 0, 0)
.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(labelMode))
.addGap(2, 2, 2)
.addGap(0, 0, 0)
.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(labelConstant))
@@ -3495,15 +3515,17 @@ public class ScreenPanel5 extends Panel {
.addComponent(checkGoodRegion)
.addComponent(spinnerGrScale, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(labelGrScale))
.addGap(2, 2, 2)
.addGap(0, 0, 0)
.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(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)
.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);
sidePanel.setLayout(sidePanelLayout);
sidePanelLayout.setHorizontalGroup(