diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 71986cb..fae8b48 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,4 +1,4 @@ -#Mon Sep 19 15:26:07 CEST 2016 +#Mon Sep 19 17:59:05 CEST 2016 colormap=Grayscale colormapAutomatic=true colormapMax=0.0 diff --git a/plugins/ScreenPanel.java b/plugins/ScreenPanel.java index 3a9e5a6..dbe6952 100644 --- a/plugins/ScreenPanel.java +++ b/plugins/ScreenPanel.java @@ -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());