This commit is contained in:
sfop
2016-10-05 14:13:26 +02:00
parent 1e9ba56813
commit ed20ffb991
3 changed files with 14 additions and 14 deletions

View File

@@ -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

View File

@@ -275,16 +275,11 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="1" max="-2" attributes="0">
<Component id="jPanel5" max="32767" attributes="0"/>
<Group type="103" groupAlignment="1" max="-2" attributes="0">
<Component id="panelScreen" alignment="0" max="32767" attributes="0"/>
<Component id="panelScreen1" alignment="0" max="32767" attributes="0"/>
<Component id="jPanel3" alignment="0" max="32767" attributes="0"/>
<Component id="jPanel2" alignment="0" max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="pauseSelection" pref="0" max="32767" attributes="0"/>
</Group>
</Group>
<Component id="panelScreen" alignment="0" max="32767" attributes="0"/>
<Component id="panelScreen1" alignment="0" max="32767" attributes="0"/>
<Component id="jPanel3" alignment="0" max="32767" attributes="0"/>
<Component id="jPanel2" alignment="0" max="32767" attributes="0"/>
<Component id="pauseSelection" alignment="1" pref="0" max="32767" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>

View File

@@ -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;