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
8946631f
Commit
8946631f
authored
Oct 27, 2025
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implemented legend, clean up
parent
d0583386
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
657 additions
and
764 deletions
+657
-764
CuasMotion.java
src/main/java/com/elphel/imagej/cuas/CuasMotion.java
+208
-685
CuasMultiSeries.java
src/main/java/com/elphel/imagej/cuas/CuasMultiSeries.java
+329
-13
CuasRanging.java
src/main/java/com/elphel/imagej/cuas/CuasRanging.java
+13
-9
IntersceneMatchParameters.java
...lphel/imagej/tileprocessor/IntersceneMatchParameters.java
+86
-57
QuadCLTCPU.java
...main/java/com/elphel/imagej/tileprocessor/QuadCLTCPU.java
+21
-0
No files found.
src/main/java/com/elphel/imagej/cuas/CuasMotion.java
View file @
8946631f
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/cuas/CuasMultiSeries.java
View file @
8946631f
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/cuas/CuasRanging.java
View file @
8946631f
...
...
@@ -2762,18 +2762,21 @@ public class CuasRanging {
sb
.
append
(
"\n"
);
// there will be 1 extra blank column
String
[]
slice_titles
=
cuasMotion
.
getSliceTitles
();
// timestamps
UasLogReader
uasLogReader
=
cuasMotion
.
getUasLogReader
();
ErsCorrection
ersCorrection
=
center_CLT
.
getErsCorrection
();
for
(
int
nseq
=
0
;
nseq
<
num_seq
;
nseq
++)
{
String
timestamp
=
slice_titles
[
nseq
];
sb
.
append
(
nseq
+
"\t"
+
timestamp
+
"\t"
);
// get azimuth, elevation, target disparity from the log plus infinity, log range
double
[]
uas_pXpYDRange
=
uasLogReader
.
getUasPxPyDRange
(
timestamp
);
// px, py, d- cuas_infinity (true disparity), range
double
[][]
az_el_oaz_oel
=
CuasMotion
.
getPixToAzElev
(
clt_parameters
,
// CLTParameters clt_parameters,
gc
,
// GeometryCorrection gc,
ersCorrection
,
// ErsCorrection ersCorrection,
uasLogReader
,
// UasLogReader uasLogReader,
Double
.
NaN
,
// double fps, // if NaN, will use default 60Hz. Used only for omegas
uas_pXpYDRange
[
0
],
// double target_x,
uas_pXpYDRange
[
1
],
// double target_y,
0
,
// double target_vx,
0
);
// double target_vy);
sb
.
append
(
uas_pXpYDRange
[
0
]+
"\t"
+
uas_pXpYDRange
[
1
]+
"\t"
+
az_el_oaz_oel
[
0
][
0
]+
"\t"
+
az_el_oaz_oel
[
0
][
1
]+
"\t"
+(
uas_pXpYDRange
[
2
]+
cuas_infinity
)+
"\t"
+
uas_pXpYDRange
[
3
]+
"\t"
);
for
(
int
ntarg
=
0
;
ntarg
<
num_targets
;
ntarg
++)
{
...
...
@@ -2794,15 +2797,16 @@ public class CuasRanging {
double
yc
=
tileSize
*
tileY
+
tileSize
/
2
+
target
[
CuasMotionLMA
.
RSLT_Y
];
double
vx
=
target
[
CuasMotionLMA
.
RSLT_VX
];
double
vy
=
target
[
CuasMotionLMA
.
RSLT_VY
];
// calculate and output target azimuth, elevation, disparity (full) and range
az_el_oaz_oel
=
CuasMotion
.
getPixToAzElev
(
clt_parameters
,
// CLTParameters clt_parameters,
gc
,
// GeometryCorrection gc,
xc
,
// double target_x, // null
yc
,
// double target_y,
vx
,
// double target_vx,
vy
);
// double target_vy);
ersCorrection
,
// ErsCorrection ersCorrection,
uasLogReader
,
// UasLogReader uasLogReader,
Double
.
NaN
,
// double fps, // if NaN, will use default 60Hz. Used only for omegas
xc
,
// double px, // null
yc
,
// double py,
vx
,
// double vx,
vy
);
// double vy);
sb
.
append
(
xc
+
"\t"
+
yc
+
"\t"
+
az_el_oaz_oel
[
0
][
0
]+
"\t"
+
az_el_oaz_oel
[
0
][
1
]+
"\t"
+
target
[
CuasMotionLMA
.
RSLT_DISPARITY
]+
"\t"
+
target
[
CuasMotionLMA
.
RSLT_RANGE
]+
"\t"
);
if
(
target
[
CuasMotionLMA
.
RSLT_GLENGTH
]
>
0
)
{
...
...
src/main/java/com/elphel/imagej/tileprocessor/IntersceneMatchParameters.java
View file @
8946631f
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/tileprocessor/QuadCLTCPU.java
View file @
8946631f
...
...
@@ -6063,7 +6063,28 @@ public class QuadCLTCPU {
System
.
out
.
println
(
"saveDoubleArrayInModelDirectory(): saved "
+
file_path
);
return
file_path
;
}
public
static
String
saveImagePlusInDirectory
(
ImagePlus
imp
,
String
dir
)
{
String
file_name
=
imp
.
getTitle
();
if
(!
file_name
.
endsWith
(
".tiff"
))
{
file_name
+=
".tiff"
;
}
if
(!
dir
.
endsWith
(
Prefs
.
getFileSeparator
()))
{
dir
+=
Prefs
.
getFileSeparator
();
}
String
file_path
=
dir
+
file_name
;
// + ".tiff";
FileSaver
fs
=
new
FileSaver
(
imp
);
fs
.
saveAsTiff
(
file_path
);
// image processor null?
System
.
out
.
println
(
"saveImagePlusInDirectory(): saved "
+
file_path
);
return
file_path
;
}
/*
File list_to_concat = new File (video_dir,concat_list_name);
*/
public
String
saveConfInModelDirectory
()
{
String
x3d_path
=
getX3dDirectory
();
...
...
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