diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index c3063b5..71986cb 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,10 +1,10 @@ -#Mon Sep 19 14:03:39 CEST 2016 +#Mon Sep 19 15:26:07 CEST 2016 colormap=Grayscale colormapAutomatic=true colormapMax=0.0 colormapMin=0.0 flipHorizontally=false -flipVertically=true +flipVertically=false grayscale=false imageHeight=1200 imageWidth=1246 diff --git a/plugins/ScreenPanel.java b/plugins/ScreenPanel.java index b4417bf..3a9e5a6 100644 --- a/plugins/ScreenPanel.java +++ b/plugins/ScreenPanel.java @@ -53,7 +53,6 @@ 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; @@ -426,6 +425,7 @@ public class ScreenPanel extends Panel { try { filter = new DiscretePositioner(cameraName + ":SET_FILTER", cameraName + ":GET_FILTER"); + filter.setTrustedWrite(true); filter.initialize(); DefaultComboBoxModel model = new DefaultComboBoxModel(); for (String pos : filter.getPositions()) { @@ -1629,10 +1629,11 @@ public class ScreenPanel extends Panel { renderer.saveSnapshot(snapshotFile, "png", true); getController().setExecutionContext("snapshot", null, null, null, null, null, null, null); getController().getDataManager().setDataset("/data", renderer.getData().getMatrix(), renderer.getData().isUnsigned()); + getController().getDataManager().closeOutput(); //byte[] arr = (byte[]) (((DataBufferByte)(Utils.grayscale(renderer.getImage()).getRaster().getDataBuffer())).getData()); //Object image = Convert.toBidimensional(arr, renderer.getImage().getWidth(), renderer.getImage().getHeight()); //getController().getDataManager().setDataset("/image", image); - elog("ScreenPanel Snapshot", "Data file: " + getController().getExecutionContext().getPath(), new String[]{snapshotFile}); + //elog("ScreenPanel Snapshot", "Data file: " + getController().getExecutionContext().getPath(), new String[]{snapshotFile}); } catch (Exception ex) { ex.printStackTrace(); @@ -1755,7 +1756,6 @@ public class ScreenPanel extends Panel { String setpoint = (String) comboFilter.getSelectedItem(); if (!setpoint.equals(filter.read())) { filter.write(setpoint); - } } catch (Exception ex) { showException(ex);