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
48ba44a4
Commit
48ba44a4
authored
Jul 18, 2018
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
handling error (probably cons. of fronto)
parent
b0857154
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
7 deletions
+16
-7
TilePlanes.java
src/main/java/TilePlanes.java
+16
-7
No files found.
src/main/java/TilePlanes.java
View file @
48ba44a4
...
...
@@ -22,6 +22,7 @@
**
*/
import
java.awt.Point
;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.Comparator
;
...
...
@@ -3498,13 +3499,21 @@ public class TilePlanes {
PlaneData
otherPd
,
boolean
correct_distortions
)
{
Matrix
this_wv
=
new
Matrix
(
this
.
getWorldXYZ
(
correct_distortions
,
0
),
3
);
Matrix
other_wv
=
new
Matrix
(
otherPd
.
getWorldXYZ
(
correct_distortions
,
0
),
3
);
Matrix
cp
=
cross3d
(
this_wv
,
other_wv
);
double
cp2
=
cp
.
transpose
().
times
(
cp
).
get
(
0
,
0
);
double
this_wv2
=
this_wv
.
transpose
().
times
(
this_wv
).
get
(
0
,
0
);
double
other_wv2
=
other_wv
.
transpose
().
times
(
other_wv
).
get
(
0
,
0
);
return
cp2
/(
this_wv2
*
other_wv2
);
try
{
Matrix
this_wv
=
new
Matrix
(
this
.
getWorldXYZ
(
correct_distortions
,
0
),
3
);
Matrix
other_wv
=
new
Matrix
(
otherPd
.
getWorldXYZ
(
correct_distortions
,
0
),
3
);
// FIXME: this caused null pointer
Matrix
cp
=
cross3d
(
this_wv
,
other_wv
);
double
cp2
=
cp
.
transpose
().
times
(
cp
).
get
(
0
,
0
);
double
this_wv2
=
this_wv
.
transpose
().
times
(
this_wv
).
get
(
0
,
0
);
double
other_wv2
=
other_wv
.
transpose
().
times
(
other_wv
).
get
(
0
,
0
);
return
cp2
/(
this_wv2
*
other_wv2
);
}
catch
(
Exception
e
)
{
System
.
out
.
println
(
"Problem in getWorldSin2():"
);
// TODO Auto-generated catch block
e
.
printStackTrace
();
// do nothing, just keep
return
1.0
;
}
}
public
double
getWorldSin2
(
PlaneData
otherPd
)
...
...
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