From 8711317898789faebd8fab791d9ec1a11b3bcba5 Mon Sep 17 00:00:00 2001 From: sfop Date: Wed, 5 Oct 2016 17:29:24 +0200 Subject: [PATCH] Closedown --- devices/CurrentCamera.properties | 4 ++-- plugins/ScreenPanel.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 631ccfa..8e3fcc1 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,5 +1,5 @@ -#Wed Oct 05 15:18:50 CEST 2016 -colormap=Rainbow +#Wed Oct 05 17:10:02 CEST 2016 +colormap=Grayscale colormapAutomatic=true colormapMax=0.0 colormapMin=0.0 diff --git a/plugins/ScreenPanel.java b/plugins/ScreenPanel.java index bf141cb..1e9f991 100644 --- a/plugins/ScreenPanel.java +++ b/plugins/ScreenPanel.java @@ -675,7 +675,7 @@ public class ScreenPanel extends Panel { double maxPlot = gaussian[0]; yMean = gaussian[1]; ySigma = gaussian[2]; - gaussian[0] += min; + gaussian[0] += min; double[] fit = getFitFunction(gaussian, x); int[] y = new int[x.length]; @@ -697,8 +697,9 @@ public class ScreenPanel extends Panel { new Point(xMean.intValue(), yMean.intValue()), new Dimension(2 * xSigma.intValue(), 2 * ySigma.intValue())); - text = new Overlays.Text(fitPen, - String.format("x = %1.3f \n y = %1.3f" , data.getX((int) Math.round(xMean)), data.getY((int) Math.round(yMean))), + text = new Overlays.Text(fitPen, + String.format("x = %1.3f " + "\u03C3 = %1.3f \ny = %1.3f " + "\u03C3 = %1.3f" , + data.getX((int) Math.round(xMean)), xSigma, data.getY((int) Math.round(yMean)), ySigma), new Font(Font.MONOSPACED, 0, 14), new Point(20,20)); text.setFixed(true); text.setAnchor(Overlay.ANCHOR_VIEWPORT_TOP_LEFT);