From ed20ffb991ee792b712788b5e0f14f44ea838d87 Mon Sep 17 00:00:00 2001 From: sfop Date: Wed, 5 Oct 2016 14:13:26 +0200 Subject: [PATCH] Startup --- devices/CurrentCamera.properties | 6 +++--- plugins/ScreenPanel.form | 15 +++++---------- plugins/ScreenPanel.java | 7 ++++++- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 70e3915..5e998b8 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,8 +1,8 @@ -#Wed Oct 05 10:02:36 CEST 2016 +#Wed Oct 05 11:28:53 CEST 2016 colormap=Grayscale colormapAutomatic=true -colormapMax=0.0 -colormapMin=19.0 +colormapMax=255.0 +colormapMin=0.0 flipHorizontally=false flipVertically=false grayscale=false diff --git a/plugins/ScreenPanel.form b/plugins/ScreenPanel.form index 4aaa3cc..1ebacf3 100644 --- a/plugins/ScreenPanel.form +++ b/plugins/ScreenPanel.form @@ -275,16 +275,11 @@ - - - - - - - - - - + + + + + diff --git a/plugins/ScreenPanel.java b/plugins/ScreenPanel.java index 61ebbe2..c5c49a3 100644 --- a/plugins/ScreenPanel.java +++ b/plugins/ScreenPanel.java @@ -628,6 +628,7 @@ public class ScreenPanel extends Panel { if (data != null) { //img = Utils.grayscale(img); int profileSize = Math.min(data.getWidth(), data.getHeight())/4; + //int profileSize = 50; try { double[] sum = (double[]) Convert.toDouble(data.integrateVertically(true)); @@ -649,6 +650,7 @@ public class ScreenPanel extends Panel { int[] y = new int[x.length]; for (int i = 0; i < x.length; i++) { y[i] = (int) (data.getHeight() - 1 - ((fit[i] / maxPlot) * profileSize)); + // y[i] = (int) (- 1 - ((fit[i] / maxPlot) * profileSize)); } vpoly = new Overlays.Polyline(fitPen, x, y); } @@ -701,7 +703,10 @@ public class ScreenPanel extends Panel { text.setFixed(true); text.setAnchor(Overlay.ANCHOR_VIEWPORT_TOP_LEFT); } - + //hpoly.setPassive(false); + //vpoly.setPassive(false); + //hpoly.setAnchor(Overlay.ANCHOR_VIEWPORT_LEFT); + //vpoly.setAnchor(Overlay.ANCHOR_VIEWPORT_BOTTOM); return new Overlay[]{hpoly, vpoly, cross, text}; } return null;