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
c8f99e6d
Commit
c8f99e6d
authored
Apr 01, 2024
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Worked on 100m
parent
dc9a97a8
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
49 deletions
+34
-49
ComboMatch.java
src/main/java/com/elphel/imagej/orthomosaic/ComboMatch.java
+8
-4
OrthoMapsCollection.java
...va/com/elphel/imagej/orthomosaic/OrthoMapsCollection.java
+26
-45
No files found.
src/main/java/com/elphel/imagej/orthomosaic/ComboMatch.java
View file @
c8f99e6d
...
@@ -1161,6 +1161,7 @@ adjusted affines[1] for a pair: 1694564291_293695/1694564778_589341
...
@@ -1161,6 +1161,7 @@ adjusted affines[1] for a pair: 1694564291_293695/1694564778_589341
return
null
;
return
null
;
}
}
int
pair
=
0
;
int
pair
=
0
;
boolean
flip_pair
=
false
;
if
(
fp
.
npoints
>
2
)
{
// select pair
if
(
fp
.
npoints
>
2
)
{
// select pair
int
[][]
pairs
=
new
int
[
fp
.
npoints
/
2
][
2
];
int
[][]
pairs
=
new
int
[
fp
.
npoints
/
2
][
2
];
for
(
int
j
=
0
;
j
<
pairs
.
length
;
j
++)
{
for
(
int
j
=
0
;
j
<
pairs
.
length
;
j
++)
{
...
@@ -1174,19 +1175,22 @@ adjusted affines[1] for a pair: 1694564291_293695/1694564778_589341
...
@@ -1174,19 +1175,22 @@ adjusted affines[1] for a pair: 1694564291_293695/1694564778_589341
GenericJTabbedDialog
gds
=
new
GenericJTabbedDialog
(
"Select image pair from the image"
,
1200
,
400
);
GenericJTabbedDialog
gds
=
new
GenericJTabbedDialog
(
"Select image pair from the image"
,
1200
,
400
);
gds
.
addChoice
(
"Image pair in the marked image:"
,
choices
,
choices
[
choices
.
length
-
1
]);
gds
.
addChoice
(
"Image pair in the marked image:"
,
choices
,
choices
[
choices
.
length
-
1
]);
gds
.
addCheckbox
(
"Flip order"
,
false
,
"Match first to second."
);
gds
.
showDialog
();
gds
.
showDialog
();
if
(
gds
.
wasCanceled
())
return
null
;
if
(
gds
.
wasCanceled
())
return
null
;
pair
=
gds
.
getNextChoiceIndex
();
pair
=
gds
.
getNextChoiceIndex
();
flip_pair
=
gds
.
getNextBoolean
();
}
}
double
[][]
points_xy
=
new
double
[
2
][
2
];
double
[][]
points_xy
=
new
double
[
2
][
2
];
int
[]
pair_slices
=
new
int
[
2
];
int
[]
pair_slices
=
new
int
[
2
];
for
(
int
n
=
0
;
n
<
points_xy
.
length
;
n
++)
{
for
(
int
nn
=
0
;
nn
<
points_xy
.
length
;
nn
++)
{
int
n
=
flip_pair
?
(
points_xy
.
length
-
nn
-
1
)
:
nn
;
int
p
=
2
*
pair
+
n
;
// fp.npoints-2+n;
int
p
=
2
*
pair
+
n
;
// fp.npoints-2+n;
points_xy
[
n
][
0
]
=
fp
.
xpoints
[
p
];
points_xy
[
n
n
][
0
]
=
fp
.
xpoints
[
p
];
points_xy
[
n
][
1
]
=
fp
.
ypoints
[
p
];
points_xy
[
n
n
][
1
]
=
fp
.
ypoints
[
p
];
pair_slices
[
n
]
=
pRoi
.
getPointPosition
(
p
);
// works
pair_slices
[
n
n
]
=
pRoi
.
getPointPosition
(
p
);
// works
}
}
PairwiseOrthoMatch
match
=
new
PairwiseOrthoMatch
();
PairwiseOrthoMatch
match
=
new
PairwiseOrthoMatch
();
match
.
affine
=
new
double
[][]
{
match
.
affine
=
new
double
[][]
{
...
...
src/main/java/com/elphel/imagej/orthomosaic/OrthoMapsCollection.java
View file @
c8f99e6d
This diff is collapsed.
Click to expand it.
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