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
af55d764
Commit
af55d764
authored
Jan 16, 2025
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved fillNaNs, tested terrain-only tiles
parent
108cab36
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
814 additions
and
406 deletions
+814
-406
IntersceneMatchParameters.java
...lphel/imagej/tileprocessor/IntersceneMatchParameters.java
+13
-4
TexturedModel.java
...n/java/com/elphel/imagej/tileprocessor/TexturedModel.java
+2
-1
TileProcessor.java
...n/java/com/elphel/imagej/tileprocessor/TileProcessor.java
+203
-7
VegetationLMA.java
...main/java/com/elphel/imagej/vegetation/VegetationLMA.java
+442
-382
VegetationModel.java
...in/java/com/elphel/imagej/vegetation/VegetationModel.java
+154
-12
No files found.
src/main/java/com/elphel/imagej/tileprocessor/IntersceneMatchParameters.java
View file @
af55d764
...
...
@@ -892,6 +892,8 @@ min_str_neib_fpn 0.35
public
int
terr_num_exaggerate
=
3
;
// generate exaggerated rendering
// Experimental reconstruction
public
boolean
terr_rebuild_elev
=
false
;
// rebuild elevations and scales
public
int
terr_elev_grow
=
1024
;
// was 200
public
double
terr_threshold_terrain
=
0.05
;
public
double
terr_min_max_terrain
=
0.1
;
public
double
terr_min_terrain
=
0.001
;
...
...
@@ -2249,6 +2251,9 @@ min_str_neib_fpn 0.35
gd
.
addNumericField
(
"Exagerrate steps"
,
terr_num_exaggerate
,
0
,
3
,
""
,
"."
);
gd
.
addMessage
(
"Experimental"
);
gd
.
addCheckbox
(
"Rebuild elevations"
,
terr_rebuild_elev
,
"Regenerate elevations/scales in *.terrveg-tiff file"
);
gd
.
addNumericField
(
"Grow elevations"
,
terr_elev_grow
,
0
,
3
,
""
,
"Grow elevations over NaNs."
);
gd
.
addNumericField
(
"Terrain threshold alpha"
,
terr_threshold_terrain
,
5
,
7
,
""
,
"."
);
gd
.
addNumericField
(
"Min max terrain"
,
terr_min_max_terrain
,
5
,
7
,
""
,
"."
);
gd
.
addNumericField
(
"Minimal terrain"
,
terr_min_terrain
,
5
,
7
,
""
,
"."
);
...
...
@@ -3021,7 +3026,8 @@ min_str_neib_fpn 0.35
terr_boost_render
=
gd
.
getNextNumber
();
// double
terr_max_render
=
gd
.
getNextNumber
();
// double
terr_num_exaggerate
=
(
int
)
gd
.
getNextNumber
();
// int
terr_rebuild_elev
=
gd
.
getNextBoolean
();
// boolean
terr_elev_grow
=
(
int
)
gd
.
getNextNumber
();
// int
terr_threshold_terrain
=
gd
.
getNextNumber
();
// double
terr_min_max_terrain
=
gd
.
getNextNumber
();
// double
terr_min_terrain
=
gd
.
getNextNumber
();
// double
...
...
@@ -3772,7 +3778,8 @@ min_str_neib_fpn 0.35
properties
.
setProperty
(
prefix
+
"terr_boost_render"
,
terr_boost_render
+
""
);
// double
properties
.
setProperty
(
prefix
+
"terr_max_render"
,
terr_max_render
+
""
);
// double
properties
.
setProperty
(
prefix
+
"terr_num_exaggerate"
,
terr_num_exaggerate
+
""
);
// int
properties
.
setProperty
(
prefix
+
"terr_rebuild_elev"
,
terr_rebuild_elev
+
""
);
// boolean
properties
.
setProperty
(
prefix
+
"terr_elev_grow"
,
terr_elev_grow
+
""
);
// int
properties
.
setProperty
(
prefix
+
"terr_threshold_terrain"
,
terr_threshold_terrain
+
""
);
// double
properties
.
setProperty
(
prefix
+
"terr_min_max_terrain"
,
terr_min_max_terrain
+
""
);
// double
properties
.
setProperty
(
prefix
+
"terr_min_terrain"
,
terr_min_terrain
+
""
);
// double
...
...
@@ -4543,7 +4550,8 @@ min_str_neib_fpn 0.35
if
(
properties
.
getProperty
(
prefix
+
"terr_boost_render"
)!=
null
)
terr_boost_render
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"terr_boost_render"
));
if
(
properties
.
getProperty
(
prefix
+
"terr_max_render"
)!=
null
)
terr_max_render
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"terr_max_render"
));
if
(
properties
.
getProperty
(
prefix
+
"terr_num_exaggerate"
)!=
null
)
terr_num_exaggerate
=
Integer
.
parseInt
(
properties
.
getProperty
(
prefix
+
"terr_num_exaggerate"
));
if
(
properties
.
getProperty
(
prefix
+
"terr_rebuild_elev"
)!=
null
)
terr_rebuild_elev
=
Boolean
.
parseBoolean
(
properties
.
getProperty
(
prefix
+
"terr_rebuild_elev"
));
if
(
properties
.
getProperty
(
prefix
+
"terr_elev_grow"
)!=
null
)
terr_elev_grow
=
Integer
.
parseInt
(
properties
.
getProperty
(
prefix
+
"terr_elev_grow"
));
if
(
properties
.
getProperty
(
prefix
+
"terr_threshold_terrain"
)!=
null
)
terr_threshold_terrain
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"terr_threshold_terrain"
));
if
(
properties
.
getProperty
(
prefix
+
"terr_min_max_terrain"
)!=
null
)
terr_min_max_terrain
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"terr_min_max_terrain"
));
if
(
properties
.
getProperty
(
prefix
+
"terr_min_terrain"
)!=
null
)
terr_min_terrain
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"terr_min_terrain"
));
...
...
@@ -5275,7 +5283,8 @@ min_str_neib_fpn 0.35
imp
.
terr_boost_render
=
this
.
terr_boost_render
;
imp
.
terr_max_render
=
this
.
terr_max_render
;
imp
.
terr_num_exaggerate
=
this
.
terr_num_exaggerate
;
imp
.
terr_rebuild_elev
=
this
.
terr_rebuild_elev
;
imp
.
terr_elev_grow
=
this
.
terr_elev_grow
;
imp
.
terr_threshold_terrain
=
this
.
terr_threshold_terrain
;
imp
.
terr_min_max_terrain
=
this
.
terr_min_max_terrain
;
imp
.
terr_min_terrain
=
this
.
terr_min_terrain
;
...
...
src/main/java/com/elphel/imagej/tileprocessor/TexturedModel.java
View file @
af55d764
...
...
@@ -5531,7 +5531,8 @@ public class TexturedModel {
0.7
,
// double diagonal_weight, // relative to ortho
100
,
// int num_passes,
0.01
,
// final double max_rchange, // = 0.01
THREADS_MAX
);
// final int threadsMax) // maximal number of threads to launch
THREADS_MAX
,
// final int threadsMax) // maximal number of threads to launch
0
);
// final int debugLevel) // 0 - none, 1 - when done, 2 - all iterations
if
(
dbg_img
!=
null
)
dbg_img
[
4
]
=
sky_pixels_filled
.
clone
();
if
(
blur_sigma
>
0.0
)
{
(
new
DoubleGaussianBlur
()).
blurDouble
(
...
...
src/main/java/com/elphel/imagej/tileprocessor/TileProcessor.java
View file @
af55d764
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/vegetation/VegetationLMA.java
View file @
af55d764
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/vegetation/VegetationModel.java
View file @
af55d764
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