pshell_config/sf-op
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Startup

Browse Source
This commit is contained in:
voulot_d
2017-06-02 17:16:51 +02:00
parent 0720a1e5f2
commit 458d95e222
3 changed files with 28 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/ScreenPanel.java
View File

@@ -1123,9 +1123,7 @@ public class ScreenPanel extends Panel {
Overlays.Text textFit = null;
if ((xMean != null) && (yMean != null)) {
textFit = new Overlays.Text(penFit,
String.format("x: m=%1.3f \u03C3=%1.3f\ny: m=%1.3f \u03C3=%1.3f",
xMean, xSigma,
yMean, ySigma),
String.format("x: m=%1.1f \u03C3=%1.1f\ny: m=%1.1f \u03C3=%1.1f",xMean, xSigma, yMean, ySigma),
new Font(Font.MONOSPACED, 0, 14), new Point(20, 20));
textFit.setFixed(true);
textFit.setAnchor(Overlay.ANCHOR_VIEWPORT_TOP_LEFT);
@@ -1138,24 +1136,16 @@ public class ScreenPanel extends Panel {
}
cross = new Overlays.Crosshairs(penCross, center, new Dimension(Math.abs(2 * xSigma.intValue()), 2 * Math.abs(ySigma.intValue())));
}
Overlays.Text textCom = null;
if ((xCom != null) && (yCom != null)) {
textFit = new Overlays.Text(penFit,
String.format("x: m=%1.3f \u03C3=%1.3f\ny: m=%1.3f \u03C3=%1.3f",
xMean, xSigma,
yMean, ySigma),
new Font(Font.MONOSPACED, 0, 14), new Point(20, 20));
textFit.setFixed(true);
textFit.setAnchor(Overlay.ANCHOR_VIEWPORT_TOP_LEFT);
Point center = new Point(xMean.intValue(), yMean.intValue());
if (renderer.getCalibration() != null) {
center = renderer.getCalibration().convertToImagePosition(new PointDouble(xMean, yMean));
xSigma /= renderer.getCalibration().getScaleX();
ySigma /= renderer.getCalibration().getScaleY();
}
cross = new Overlays.Crosshairs(penCross, center, new Dimension(Math.abs(2 * xSigma.intValue()), 2 * Math.abs(ySigma.intValue())));
textCom = new Overlays.Text(renderer.getPenProfile(),
String.format("x: m=%1.1f \u03C3=%1.1f\ny: m=%1.1f \u03C3=%1.1f",xCom, xRms,yCom, yRms),
new Font(Font.MONOSPACED, 0, 14), new Point(20, 60));
textCom.setFixed(true);
textCom.setAnchor(Overlay.ANCHOR_VIEWPORT_TOP_LEFT);
}
return new Overlay[]{hprofile, vprofile, hgaussian, vgaussian, cross, textFit};
return new Overlay[]{hprofile, vprofile, hgaussian, vgaussian, cross, textFit, textCom};
}
return null;
}