Commit b04837e7 authored by Andrey Filippov's avatar Andrey Filippov

Working with 14Mpix sensor

parent fafa9362
...@@ -6914,7 +6914,7 @@ public class MatchSimulatedPattern { ...@@ -6914,7 +6914,7 @@ public class MatchSimulatedPattern {
return combineGridCalibration(laserPointer, // LaserPointer object or null return combineGridCalibration(laserPointer, // LaserPointer object or null
pointersXY, removeOutOfGridPointers, // pointersXY, removeOutOfGridPointers, //
hintGrid, // predicted grid array (or null) hintGrid, // predicted grid array (or null)
hintGridTolerance, // alllowed mismatch (fraction of period) or 0 - orientation only hintGridTolerance, // allowed mismatch (fraction of period) or 0 - orientation only
global_debug_level, // DEBUG_LEVEL global_debug_level, // DEBUG_LEVEL
noMessageBoxes); noMessageBoxes);
} }
...@@ -7301,6 +7301,10 @@ public class MatchSimulatedPattern { ...@@ -7301,6 +7301,10 @@ public class MatchSimulatedPattern {
pointersXY[i] = new double[4]; pointersXY[i] = new double[4];
pointersXY[i][2] = Double.parseDouble((String) imp.getProperty("POINTER_U_" + i)); pointersXY[i][2] = Double.parseDouble((String) imp.getProperty("POINTER_U_" + i));
pointersXY[i][3] = Double.parseDouble((String) imp.getProperty("POINTER_V_" + i)); pointersXY[i][3] = Double.parseDouble((String) imp.getProperty("POINTER_V_" + i));
} else if ((laserPointer != null) &&(laserPointer.laserUVMap[i] != null)) {
pointersXY[i] = new double[4];
pointersXY[i][2] = laserPointer.laserUVMap[i][0];
pointersXY[i][3] = laserPointer.laserUVMap[i][1];
} else { } else {
pointersXY[i] = new double[2]; pointersXY[i] = new double[2];
} }
......
...@@ -1785,6 +1785,12 @@ public class CamerasInterface{ ...@@ -1785,6 +1785,12 @@ public class CamerasInterface{
", X="+pontersXY[nPointer][0]+", Y="+pontersXY[nPointer][1]); ", X="+pontersXY[nPointer][0]+", Y="+pontersXY[nPointer][1]);
images[sensorNum].setProperty("POINTER_X_"+nPointer, IJ.d2s(pontersXY[nPointer][0],1)); images[sensorNum].setProperty("POINTER_X_"+nPointer, IJ.d2s(pontersXY[nPointer][0],1));
images[sensorNum].setProperty("POINTER_Y_"+nPointer, IJ.d2s(pontersXY[nPointer][1],1)); images[sensorNum].setProperty("POINTER_Y_"+nPointer, IJ.d2s(pontersXY[nPointer][1],1));
if ((laserPointers.laserPointer.laserUVMap!=null) && (laserPointers.laserPointer.laserUVMap[nPointer]!=null)) {
images[sensorNum].setProperty("POINTER_U_"+nPointer, IJ.d2s(laserPointers.laserPointer.laserUVMap[nPointer][0],1));
images[sensorNum].setProperty("POINTER_V_"+nPointer, IJ.d2s(laserPointers.laserPointer.laserUVMap[nPointer][1],1));
}
pointersDetected++; pointersDetected++;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment