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

Closedown

Browse Source
This commit is contained in:
gobbo_a
2017-03-17 11:30:10 +01:00
parent 6565e930be
commit 9085c9030b
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/ScreenPanel.java
View File

@@ -102,6 +102,7 @@ public class ScreenPanel extends Panel {
Overlay[] fitOv;
Overlay errorOverlay;
boolean requestCameraListUpdate;
Integer localServerPort;
Double getCamtoolDouble(String name) {
return (Double) Convert.toDouble(((Camtool) camera).getValue(name));
@@ -176,7 +177,16 @@ public class ScreenPanel extends Panel {
ex.printStackTrace();
}
}
if (App.hasArgument("priv_srv")) {
localServerPort = 1000;
}
if (App.hasArgument("srv_port")) {
localServerPort = Integer.valueOf(App.getArgumentValue("srv_port"));
}
if (App.hasArgument("calc")) {
useCamtoolStats = false;
}
@@ -355,7 +365,7 @@ public class ScreenPanel extends Panel {
DefaultComboBoxModel getCameraListFromCamtool() throws IOException, InterruptedException {
DefaultComboBoxModel model = new DefaultComboBoxModel();
Camtool camtool = new Camtool(CAMERA_DEVICE_NAME);
Camtool camtool = (localServerPort != null) ? new Camtool(CAMERA_DEVICE_NAME, "localhost:"+localServerPort) : new Camtool(CAMERA_DEVICE_NAME);
try {
camtool.initialize();
List<String> cameras = camtool.getCameras();