Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
imagej-elphel
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
imagej-elphel
Commits
b04837e7
Commit
b04837e7
authored
Jan 20, 2021
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Working with 14Mpix sensor
parent
fafa9362
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
MatchSimulatedPattern.java
.../com/elphel/imagej/calibration/MatchSimulatedPattern.java
+5
-1
CamerasInterface.java
.../elphel/imagej/calibration/hardware/CamerasInterface.java
+6
-0
No files found.
src/main/java/com/elphel/imagej/calibration/MatchSimulatedPattern.java
View file @
b04837e7
...
...
@@ -6914,7 +6914,7 @@ public class MatchSimulatedPattern {
return
combineGridCalibration
(
laserPointer
,
// LaserPointer object or null
pointersXY
,
removeOutOfGridPointers
,
//
hintGrid
,
// predicted grid array (or null)
hintGridTolerance
,
// all
l
owed mismatch (fraction of period) or 0 - orientation only
hintGridTolerance
,
// allowed mismatch (fraction of period) or 0 - orientation only
global_debug_level
,
// DEBUG_LEVEL
noMessageBoxes
);
}
...
...
@@ -7301,6 +7301,10 @@ public class MatchSimulatedPattern {
pointersXY
[
i
]
=
new
double
[
4
];
pointersXY
[
i
][
2
]
=
Double
.
parseDouble
((
String
)
imp
.
getProperty
(
"POINTER_U_"
+
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
{
pointersXY
[
i
]
=
new
double
[
2
];
}
...
...
src/main/java/com/elphel/imagej/calibration/hardware/CamerasInterface.java
View file @
b04837e7
...
...
@@ -1785,6 +1785,12 @@ public class CamerasInterface{
", X="
+
pontersXY
[
nPointer
][
0
]+
", Y="
+
pontersXY
[
nPointer
][
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
));
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
++;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment