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

ScreenPanel7

Browse Source
This commit is contained in:
gobbo_a
2020-10-13 10:42:35 +02:00
parent 5d24fc188b
commit 84e20e54cc
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/ScreenPanel7.java
View File

@@ -121,6 +121,9 @@ import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
*
*/
public class ScreenPanel7 extends Panel {
public static final String ARG_TYPE = "cam_type";
public static final String ARG_LIST = "cam_list";
public static final String LASER_TYPE = "Laser";
public static final String ELECTRONS_TYPE = "Electrons";
@@ -404,7 +407,7 @@ public class ScreenPanel7 extends Panel {
setPersistedComponents(new Component[]{buttonTitle});
comboCameras.setEnabled(false);
comboType.setEnabled(false);
if (App.hasArgument("list")){
if (App.hasArgument(ARG_LIST) || App.hasArgument(ARG_TYPE)){
comboType.setVisible(false);
labelType.setVisible(false);
}
@@ -850,13 +853,16 @@ public class ScreenPanel7 extends Panel {
}
boolean isVisible(String camera) {
if (App.hasArgument(ARG_TYPE)){
return getCameraTypes(camera).contains(App.getArgumentValue(ARG_TYPE));
}
return ((comboType.getSelectedIndex() == 0) || (getCameraTypes(camera).contains(comboType.getSelectedItem())));
}
DefaultComboBoxModel getCameraList(boolean fromServer) throws Exception {
DefaultComboBoxModel model = new DefaultComboBoxModel();
if (App.hasArgument("list")){
List<String> lists = App.getArgumentValues("list");
if (App.hasArgument(ARG_LIST)){
List<String> lists = App.getArgumentValues(ARG_LIST);
for (String list: lists){
String[] tokens = list.split(",");
for (String token : tokens){