This commit is contained in:
gobbo_a
2016-09-19 18:54:05 +02:00
parent d0e19269de
commit 3498abbb53
2 changed files with 4 additions and 9 deletions

View File

@@ -53,6 +53,7 @@ import java.awt.Dimension;
import java.awt.Font;
import java.awt.Point;
import java.awt.image.BufferedImage;
import java.awt.image.DataBufferByte;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
@@ -402,14 +403,11 @@ public class ScreenPanel extends Panel {
onTimer();
}
try {
screen = new DiscretePositioner(cameraName + ":SET_SCREEN1_POS", cameraName + ":GET_SCREEN1_POS");
screen = new DiscretePositioner("CurrentScreen", cameraName + ":SET_SCREEN1_POS", cameraName + ":GET_SCREEN1_POS");
screen.initialize();
DefaultComboBoxModel model = new DefaultComboBoxModel();
for (String pos : screen.getPositions()) {
String aux = pos.toLowerCase();
if (!aux.contains("moving") && !aux.contains("n/a")) {
model.addElement(pos);
};
}
comboScreen.setModel(model);
comboScreen.setSelectedItem(screen.read());
@@ -424,14 +422,11 @@ public class ScreenPanel extends Panel {
valueScreen.setDevice(screen);
try {
filter = new DiscretePositioner(cameraName + ":SET_FILTER", cameraName + ":GET_FILTER");
filter.setTrustedWrite(true);
filter = new DiscretePositioner("CurrentFilter", cameraName + ":SET_FILTER", cameraName + ":GET_FILTER");
filter.initialize();
DefaultComboBoxModel model = new DefaultComboBoxModel();
for (String pos : filter.getPositions()) {
if (!pos.contains("busy")) {
model.addElement(pos);
}
}
comboFilter.setModel(model);
comboFilter.setSelectedItem(filter.read());