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:
voulot_d
2016-09-22 14:42:11 +02:00
parent 9b660c8918
commit 6d1767e2ac
4 changed files with 71 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
plugins/ScreenPanel.java
View File

@@ -14,7 +14,7 @@ import ch.psi.utils.IO;
import ch.psi.utils.swing.SwingUtils;
import ch.psi.utils.swing.TextEditor;
import ch.psi.pshell.epics.PsiCamera;
//import ch.psi.pshell.epics.Camtool;
import ch.psi.pshell.epics.Camtool;
import ch.psi.pshell.core.JsonSerializer;
import ch.psi.pshell.device.Device;
import ch.psi.pshell.epics.ArraySource;
@@ -690,7 +690,7 @@ public class ScreenPanel extends Panel {
}
return fit;
}
/*
public class Camtool extends ArraySource {
final String prefix;
@@ -802,14 +802,14 @@ public class ScreenPanel extends Panel {
ex.printStackTrace();
}
/*
if (roiEnabled.read() > 0) {
int[] s = roiShape.read();
//for (int x : s) System.out.println(x);
getConfig().imageHeight = s[3];
getConfig().imageWidth = s[2];
} else {
*/
//if (roiEnabled.read() > 0) {
// int[] s = roiShape.read();
// //for (int x : s) System.out.println(x);
// getConfig().imageHeight = s[3];
// getConfig().imageWidth = s[2];
//} else {
//
int[] s = shape.read();
//for (int x : s){ System.out.println(x);}
getConfig().imageHeight = s[0];
@@ -908,6 +908,7 @@ public class ScreenPanel extends Panel {
}
}
*/
void setHistogramVisible(boolean value) {
if (value) {