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
360eb591
Commit
360eb591
authored
Feb 25, 2024
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improving fitting
parent
24a92f5c
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
782 additions
and
89 deletions
+782
-89
GpuQuad.java
src/main/java/com/elphel/imagej/gpu/GpuQuad.java
+2
-2
ComboMatch.java
src/main/java/com/elphel/imagej/orthomosaic/ComboMatch.java
+101
-36
FloatImageData.java
...in/java/com/elphel/imagej/orthomosaic/FloatImageData.java
+11
-4
OrthoMap.java
src/main/java/com/elphel/imagej/orthomosaic/OrthoMap.java
+575
-0
OrthoMapsCollection.java
...va/com/elphel/imagej/orthomosaic/OrthoMapsCollection.java
+92
-46
TexturedModel.java
...n/java/com/elphel/imagej/tileprocessor/TexturedModel.java
+1
-1
No files found.
src/main/java/com/elphel/imagej/gpu/GpuQuad.java
View file @
360eb591
...
@@ -4509,8 +4509,8 @@ public class GpuQuad{ // quad camera description
...
@@ -4509,8 +4509,8 @@ public class GpuQuad{ // quad camera description
double
[][]
cxy
=
new
double
[
2
][
2
];
// image number, {x,y}
double
[][]
cxy
=
new
double
[
2
][
2
];
// image number, {x,y}
int
[][]
icxy
=
new
int
[
2
][
2
];
int
[][]
icxy
=
new
int
[
2
][
2
];
for
(
int
nTile
=
ai
.
getAndIncrement
();
nTile
<
tiles
;
nTile
=
ai
.
getAndIncrement
())
{
for
(
int
nTile
=
ai
.
getAndIncrement
();
nTile
<
tiles
;
nTile
=
ai
.
getAndIncrement
())
{
int
tileY
=
nTile
/
tiles_woi
.
width
+
tiles_woi
.
x
;
int
tileY
=
nTile
/
tiles_woi
.
width
+
tiles_woi
.
y
;
int
tileX
=
nTile
%
tiles_woi
.
width
+
tiles_woi
.
y
;
int
tileX
=
nTile
%
tiles_woi
.
width
+
tiles_woi
.
x
;
double
[]
cxy0
=
{
double
[]
cxy0
=
{
(
tileX
+
0.5
)
*
GPUTileProcessor
.
DTT_SIZE
,
(
tileX
+
0.5
)
*
GPUTileProcessor
.
DTT_SIZE
,
(
tileY
+
0.5
)
*
GPUTileProcessor
.
DTT_SIZE
};
(
tileY
+
0.5
)
*
GPUTileProcessor
.
DTT_SIZE
};
...
...
src/main/java/com/elphel/imagej/orthomosaic/ComboMatch.java
View file @
360eb591
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/orthomosaic/FloatImageData.java
View file @
360eb591
package
com
.
elphel
.
imagej
.
orthomosaic
;
package
com
.
elphel
.
imagej
.
orthomosaic
;
import
java.awt.Rectangle
;
import
java.util.Arrays
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
com.elphel.imagej.common.PolynomialApproximation
;
import
com.elphel.imagej.tileprocessor.ImageDtt
;
public
class
FloatImageData
{
public
class
FloatImageData
{
public
int
width
;
public
int
width
;
public
int
height
;
public
int
height
;
...
@@ -66,12 +73,12 @@ public class FloatImageData {
...
@@ -66,12 +73,12 @@ public class FloatImageData {
ze
=
2.0
*
pix_size_in_cm
;
ze
=
2.0
*
pix_size_in_cm
;
}
}
}
else
{
// high resolution, pixel size < 1
}
else
{
// high resolution, pixel size < 1
zl
--;
//
zl--;
while
(
pix_size_in_cm
<=
(
1.0
-
e
))
{
while
(
pix_size_in_cm
<=
(
1.0
-
e
))
{
zl
++;
zl
++;
pix_size_in_cm
*=
2
;
pix_size_in_cm
*=
2
;
}
// exits with (2-2*e) >= pix_in_cm > (1-e)
}
// exits with (2-2*e) >= pix_in_cm > (1-e)
vz
=
pix_size_in_cm
>
(
2.0
-
e
);
vz
=
pix_size_in_cm
<
(
1.0
+
e
);
if
(!
vz
)
{
if
(!
vz
)
{
ze
=
pix_size_in_cm
;
ze
=
pix_size_in_cm
;
}
}
...
@@ -82,9 +89,9 @@ public class FloatImageData {
...
@@ -82,9 +89,9 @@ public class FloatImageData {
if
(
zoom_in_extra
!=
null
)
{
if
(
zoom_in_extra
!=
null
)
{
zoom_in_extra
[
0
]
=
ze
;
zoom_in_extra
[
0
]
=
ze
;
}
}
return
zl
;
return
zl
;
}
}
// processing altitudes to remove non-flat surfaces from fitting ortho maps
}
}
src/main/java/com/elphel/imagej/orthomosaic/OrthoMap.java
View file @
360eb591
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/orthomosaic/OrthoMapsCollection.java
View file @
360eb591
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/tileprocessor/TexturedModel.java
View file @
360eb591
...
@@ -3294,7 +3294,7 @@ public class TexturedModel {
...
@@ -3294,7 +3294,7 @@ public class TexturedModel {
}
}
double
avg_z
=
sum_z
/
num_pix
;
double
avg_z
=
sum_z
/
num_pix
;
LocalDateTime
dt
=
scenes
[
ref_index
].
getLocalDateTime
();
LocalDateTime
dt
=
scenes
[
ref_index
].
getLocalDateTime
();
corrected_lla
[
2
]
=
avg_z
;
// average altitude. Maybe keep drone altitude?
// corrected_lla[2] = avg_z; // average altitude. Maybe keep drone altitude? - yes
if
(
gmap_save_alt
)
{
if
(
gmap_save_alt
)
{
...
...
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