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
7135cb85
Commit
7135cb85
authored
Sep 08, 2021
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated TileProcessor:getShowScan for variable number of sensors
parent
6346b15e
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
124 additions
and
63 deletions
+124
-63
CLTPass3d.java
src/main/java/com/elphel/imagej/tileprocessor/CLTPass3d.java
+7
-3
ImageDttCPU.java
...ain/java/com/elphel/imagej/tileprocessor/ImageDttCPU.java
+1
-1
MacroCorrelation.java
...ava/com/elphel/imagej/tileprocessor/MacroCorrelation.java
+1
-1
TileProcessor.java
...n/java/com/elphel/imagej/tileprocessor/TileProcessor.java
+115
-58
No files found.
src/main/java/com/elphel/imagej/tileprocessor/CLTPass3d.java
View file @
7135cb85
...
...
@@ -73,7 +73,11 @@ public class CLTPass3d{
public
double
[][]
tiles_RBGA
=
null
;
SuperTiles
superTiles
=
null
;
TileProcessor
tileProcessor
;
final
TileProcessor
tileProcessor
;
public
int
getNumSensors
()
{
return
tileProcessor
.
getNumSensors
();
}
public
CLTPass3d
(
TileProcessor
tileProcessor
)
{
this
.
tileProcessor
=
tileProcessor
;
...
...
@@ -304,8 +308,8 @@ public class CLTPass3d{
public
double
[][]
getDiffs
(){
if
(
disparity_map
==
null
)
return
null
;
double
[][]
these_diffs
=
new
double
[
ImageDtt
.
QUAD
][];
for
(
int
i
=
0
;
i
<
ImageDtt
.
QUAD
;
i
++)
these_diffs
[
i
]
=
disparity_map
[
ImageDtt
.
IMG_DIFF0_INDEX
+
i
];
double
[][]
these_diffs
=
new
double
[
getNumSensors
()
][];
for
(
int
i
=
0
;
i
<
these_diffs
.
length
;
i
++)
these_diffs
[
i
]
=
disparity_map
[
ImageDtt
.
IMG_DIFF0_INDEX
+
i
];
// IMG_DIFF0_INDEX does not depend on num sensors
return
these_diffs
;
}
...
...
src/main/java/com/elphel/imagej/tileprocessor/ImageDttCPU.java
View file @
7135cb85
...
...
@@ -85,7 +85,7 @@ public class ImageDttCPU {
{
0
,
1
,
3
,
4
}};
// bottom right
// public static int FORCE_DISPARITY_BIT = 8; // move to parameters?
static
int
QUAD
=
4
;
// number of cameras in camera
//
static int QUAD = 4; // number of cameras in camera
static
int
GREEN_CHN
=
2
;
// index of green channel
static
int
MONO_CHN
=
2
;
// index of channel used in monochrome mode
...
...
src/main/java/com/elphel/imagej/tileprocessor/MacroCorrelation.java
View file @
7135cb85
...
...
@@ -194,7 +194,7 @@ public class MacroCorrelation {
final
int
mTilesY
=
(
pTilesY
+
tileSize
-
1
)
/
tileSize
;
final
int
mTiles
=
mTilesX
*
mTilesY
;
final
int
num_chn
=
tmp_input
?
3
:
(
1
+
((
other_channels
==
null
)
?
0
:
(
other_channels
[
0
].
length
)));
final
double
[][][]
input_data
=
new
double
[
ImageDtt
.
QUAD
][
num_chn
][
mTiles
*
tileSize
*
tileSize
];
final
double
[][][]
input_data
=
new
double
[
src_scan
.
getNumSensors
()
][
num_chn
][
mTiles
*
tileSize
*
tileSize
];
// double [][] tiles_tone = src_scan.getTileRBGA( No, we need individual subcameras
// 4); // int num_layers);
// TODO: add other channels (average tone)
...
...
src/main/java/com/elphel/imagej/tileprocessor/TileProcessor.java
View file @
7135cb85
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