pshell_config/sf-op
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Startup

Browse Source
This commit is contained in:
gobbo_a
2017-06-12 08:33:26 +02:00
parent b0d319b209
commit 02002b5838
4 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/ScreenPanelDev.java
View File

@@ -612,10 +612,10 @@ public class ScreenPanelDev extends Panel {
calibrationDialolg = null;
}
//boolean was_camtool = false;
boolean was_camtool = false;
if (camera != null) {
//camera.removeAllListeners();
//was_camtool = camera instanceof Camtool;
was_camtool = camera instanceof Camtool;
camera.close();
camera = null;
}
@@ -679,11 +679,12 @@ public class ScreenPanelDev extends Panel {
System.out.println("Camera initialization OK");
if (camera instanceof Camtool) {
//Managing no background exception. Can be done in a better way?
//if (changed || !was_camtool) {
((Camtool) camera).startPipeline(cameraName, null);
((Camtool) camera).setBackgroundSubtraction(checkBackground.isSelected());
if (changed) {
((Camtool) camera).startPipeline(cameraName, null);
updateCamtoolControls();
//} else {
} else {
((Camtool) camera).startPipeline(cameraName, null, checkBackground.isSelected(), null, null, null);
}
// HashMap<String, Object> gr = null;
// if (goodRegion){
// gr = new HashMap<>();
@@ -692,6 +693,7 @@ public class ScreenPanelDev extends Panel {
// }
// ((Camtool) camera).startPipeline(cameraName, null, checkBackground.isSelected(), null, checkThreshold.isSelected() ? (Double) spinnerThreshold.getValue() : null, gr);
//}
checkThreshold.setEnabled(true);
checkGoodRegion.setEnabled(true);
@@ -704,6 +706,7 @@ public class ScreenPanelDev extends Panel {
} else {
camera.setPolling(polling);
}
camera.setBackgroundEnabled(checkBackground.isSelected());
}
buttonReticle.setEnabled(camera.getConfig().isCalibrated());
@@ -914,6 +917,7 @@ public class ScreenPanelDev extends Panel {
if ((camera != null) && (camera instanceof Camtool)) {
updatingCamtoolControls = true;
try {
checkBackground.setSelected(((Camtool) camera).getBackgroundSubtraction());
Double threshold = ((Camtool) camera).getThreshold();
checkThreshold.setSelected(threshold != null);
spinnerThreshold.setValue((threshold == null) ? 0 : threshold);
@@ -922,8 +926,7 @@ public class ScreenPanelDev extends Panel {
if (gr != null){
spinnerGrThreshold.setValue(gr.get("threshold"));
spinnerGrScale.setValue(gr.get("gfscale"));
}
checkBackground.setSelected(((Camtool) camera).getBackgroundSubtraction());
}
} catch (Exception ex) {
}
goodRegion = checkGoodRegion.isSelected();
@@ -2229,7 +2232,7 @@ public class ScreenPanelDev extends Panel {
.addComponent(buttonFullRange)
.addComponent(buttonManual)
.addComponent(comboColormap, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 12, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
.addComponent(labelMax)
@@ -2433,7 +2436,7 @@ public class ScreenPanelDev extends Panel {
.addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelScreen2Layout.createSequentialGroup()
.addComponent(checkGoodRegion)
.addGap(18, 18, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(labelGrScale)
.addGap(2, 2, 2)
.addComponent(spinnerGrScale, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
@@ -2447,7 +2450,7 @@ public class ScreenPanelDev extends Panel {
.addGap(0, 0, Short.MAX_VALUE))
.addGroup(panelScreen2Layout.createSequentialGroup()
.addComponent(checkThreshold)
.addGap(18, 18, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(spinnerThreshold, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addContainerGap())
);
@@ -2482,13 +2485,13 @@ public class ScreenPanelDev extends Panel {
.addGroup(jPanel4Layout.createSequentialGroup()
.addContainerGap()
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
.addComponent(jPanel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelScreen, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelScreen1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jPanel3, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jPanel5, javax.swing.GroupLayout.DEFAULT_SIZE, 0, Short.MAX_VALUE)
.addComponent(panelScreen, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 0, Short.MAX_VALUE)
.addComponent(panelScreen1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 0, Short.MAX_VALUE)
.addComponent(jPanel3, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 0, Short.MAX_VALUE)
.addComponent(jPanel2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(pauseSelection, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
.addComponent(panelScreen2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addComponent(panelScreen2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 0, Short.MAX_VALUE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
jPanel4Layout.setVerticalGroup(