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
e59c6d14
Commit
e59c6d14
authored
May 10, 2018
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added code
parent
0648b656
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
1504 additions
and
56 deletions
+1504
-56
EyesisCorrectionParameters.java
src/main/java/EyesisCorrectionParameters.java
+1
-1
Eyesis_Correction.java
src/main/java/Eyesis_Correction.java
+46
-43
ImageDtt.java
src/main/java/ImageDtt.java
+897
-0
QuadCLT.java
src/main/java/QuadCLT.java
+6
-1
TwoQuadCLT.java
src/main/java/TwoQuadCLT.java
+554
-11
No files found.
src/main/java/EyesisCorrectionParameters.java
View file @
e59c6d14
...
@@ -2355,7 +2355,7 @@ public class EyesisCorrectionParameters {
...
@@ -2355,7 +2355,7 @@ public class EyesisCorrectionParameters {
public
double
vignetting_range
=
5.0
;
// do not try to correct vignetting less than vignetting_max/vignetting_range
public
double
vignetting_range
=
5.0
;
// do not try to correct vignetting less than vignetting_max/vignetting_range
public
int
kernel_step
=
16
;
// source kernels step in pixels (have 1 kernel margin on each side)
public
int
kernel_step
=
16
;
// source kernels step in pixels (have 1 kernel margin on each side)
public
double
disparity
=
0.0
;
// nominal disparity between side of square cameras (pix)
public
double
disparity
=
0.0
;
// nominal disparity between side of square cameras (pix)
public
double
z_correction
=
0.0
;
// Inverse distance to infinity (misalignment cor
t
rection)
public
double
z_correction
=
0.0
;
// Inverse distance to infinity (misalignment correction)
public
boolean
correlate
=
true
;
// calculate correlation
public
boolean
correlate
=
true
;
// calculate correlation
public
int
corr_mask
=
15
;
// bitmask of pairs to combine in the composite
public
int
corr_mask
=
15
;
// bitmask of pairs to combine in the composite
public
boolean
corr_sym
=
false
;
// combine correlation with mirrored around disparity direction
public
boolean
corr_sym
=
false
;
// combine correlation with mirrored around disparity direction
...
...
src/main/java/Eyesis_Correction.java
View file @
e59c6d14
...
@@ -580,6 +580,7 @@ private Panel panel1,
...
@@ -580,6 +580,7 @@ private Panel panel1,
addButton
(
"Setup CLT Batch parameters"
,
panelClt4
,
color_configure
);
addButton
(
"Setup CLT Batch parameters"
,
panelClt4
,
color_configure
);
addButton
(
"CLT 2*4 images"
,
panelClt4
,
color_conf_process
);
addButton
(
"CLT 2*4 images"
,
panelClt4
,
color_conf_process
);
addButton
(
"CLT 2*4 images - 2"
,
panelClt4
,
color_conf_process
);
addButton
(
"CLT 2*4 images - 2"
,
panelClt4
,
color_conf_process
);
addButton
(
"CLT 2*4 images - 3"
,
panelClt4
,
color_conf_process
);
addButton
(
"AUX show fine"
,
panelClt4
,
color_configure
);
addButton
(
"AUX show fine"
,
panelClt4
,
color_configure
);
add
(
panelClt4
);
add
(
panelClt4
);
...
@@ -4454,7 +4455,13 @@ private Panel panel1,
...
@@ -4454,7 +4455,13 @@ private Panel panel1,
}
else
if
(
label
.
equals
(
"CLT 2*4 images - 2"
))
{
}
else
if
(
label
.
equals
(
"CLT 2*4 images - 2"
))
{
DEBUG_LEVEL
=
MASTER_DEBUG_LEVEL
;
DEBUG_LEVEL
=
MASTER_DEBUG_LEVEL
;
EYESIS_CORRECTIONS
.
setDebug
(
DEBUG_LEVEL
);
EYESIS_CORRECTIONS
.
setDebug
(
DEBUG_LEVEL
);
getPairImages2
();
getPairImages2
(
false
);
return
;
/* ======================================================================== */
}
else
if
(
label
.
equals
(
"CLT 2*4 images - 3"
))
{
DEBUG_LEVEL
=
MASTER_DEBUG_LEVEL
;
EYESIS_CORRECTIONS
.
setDebug
(
DEBUG_LEVEL
);
getPairImages2
(
true
);
return
;
return
;
/* ======================================================================== */
/* ======================================================================== */
}
else
if
(
label
.
equals
(
"AUX show fine"
))
{
}
else
if
(
label
.
equals
(
"AUX show fine"
))
{
...
@@ -4723,7 +4730,7 @@ private Panel panel1,
...
@@ -4723,7 +4730,7 @@ private Panel panel1,
public
boolean
getPairImages2
()
{
public
boolean
getPairImages2
(
boolean
new_mode
)
{
if
(
QUAD_CLT
==
null
){
if
(
QUAD_CLT
==
null
){
QUAD_CLT
=
new
QuadCLT
(
QUAD_CLT
=
new
QuadCLT
(
QuadCLT
.
PREFIX
,
QuadCLT
.
PREFIX
,
...
@@ -4826,9 +4833,9 @@ private Panel panel1,
...
@@ -4826,9 +4833,9 @@ private Panel panel1,
if
(
TWO_QUAD_CLT
==
null
)
{
if
(
TWO_QUAD_CLT
==
null
)
{
TWO_QUAD_CLT
=
new
TwoQuadCLT
();
TWO_QUAD_CLT
=
new
TwoQuadCLT
();
}
}
if
(
new_mode
)
{
try
{
try
{
TWO_QUAD_CLT
.
processCLTQuadCor
rs
(
TWO_QUAD_CLT
.
processCLTQuadCorrPai
rs
(
QUAD_CLT
,
// QuadCLT quadCLT_main,
QUAD_CLT
,
// QuadCLT quadCLT_main,
QUAD_CLT_AUX
,
// QuadCLT quadCLT_aux,
QUAD_CLT_AUX
,
// QuadCLT quadCLT_aux,
CLT_PARAMETERS
,
// EyesisCorrectionParameters.DCTParameters dct_parameters,
CLT_PARAMETERS
,
// EyesisCorrectionParameters.DCTParameters dct_parameters,
...
@@ -4844,31 +4851,27 @@ private Panel panel1,
...
@@ -4844,31 +4851,27 @@ private Panel panel1,
// TODO Auto-generated catch block
// TODO Auto-generated catch block
e
.
printStackTrace
();
e
.
printStackTrace
();
}
//final int debugLevel);
}
//final int debugLevel);
}
else
{
/*
try
{
QUAD_CLT.processCLTQuadCorrs(
TWO_QUAD_CLT
.
processCLTQuadCorrs
(
QUAD_CLT
,
// QuadCLT quadCLT_main,
QUAD_CLT_AUX
,
// QuadCLT quadCLT_aux,
CLT_PARAMETERS
,
// EyesisCorrectionParameters.DCTParameters dct_parameters,
CLT_PARAMETERS
,
// EyesisCorrectionParameters.DCTParameters dct_parameters,
DEBAYER_PARAMETERS
,
//EyesisCorrectionParameters.DebayerParameters debayerParameters,
DEBAYER_PARAMETERS
,
//EyesisCorrectionParameters.DebayerParameters debayerParameters,
COLOR_PROC_PARAMETERS
,
//EyesisCorrectionParameters.ColorProcParameters colorProcParameters,
COLOR_PROC_PARAMETERS
,
//EyesisCorrectionParameters.ColorProcParameters colorProcParameters,
CHANNEL_GAINS_PARAMETERS
,
//CorrectionColorProc.ColorGainsParameters channelGainParameters,
CHANNEL_GAINS_PARAMETERS
,
//CorrectionColorProc.ColorGainsParameters channelGainParameters,
CHANNEL_GAINS_PARAMETERS_AUX
,
//CorrectionColorProc.ColorGainsParameters channelGainParameters_aux,
RGB_PARAMETERS
,
//EyesisCorrectionParameters.RGBParameters rgbParameters,
RGB_PARAMETERS
,
//EyesisCorrectionParameters.RGBParameters rgbParameters,
false, // apply_corr,
false, // infinity_corr, // calculate and apply geometry correction at infinity
THREADS_MAX, //final int threadsMax, // maximal number of threads to launch
UPDATE_STATUS, //final boolean updateStatus,
DEBUG_LEVEL); //final int debugLevel);
QUAD_CLT_AUX.processCLTQuadCorrs(
CLT_PARAMETERS, // EyesisCorrectionParameters.DCTParameters dct_parameters,
DEBAYER_PARAMETERS, //EyesisCorrectionParameters.DebayerParameters debayerParameters,
COLOR_PROC_PARAMETERS, //EyesisCorrectionParameters.ColorProcParameters colorProcParameters,
CHANNEL_GAINS_PARAMETERS_AUX, //CorrectionColorProc.ColorGainsParameters channelGainParameters,
RGB_PARAMETERS, //EyesisCorrectionParameters.RGBParameters rgbParameters,
false, // apply_corr,
false, // infinity_corr, // calculate and apply geometry correction at infinity
THREADS_MAX
,
//final int threadsMax, // maximal number of threads to launch
THREADS_MAX
,
//final int threadsMax, // maximal number of threads to launch
UPDATE_STATUS
,
//final boolean updateStatus,
UPDATE_STATUS
,
//final boolean updateStatus,
DEBUG_LEVEL); //final int debugLevel);
DEBUG_LEVEL
);
*/
}
catch
(
Exception
e
)
{
// TODO Auto-generated catch block
e
.
printStackTrace
();
}
//final int debugLevel);
}
if
(
configPath
!=
null
)
{
if
(
configPath
!=
null
)
{
saveTimestampedProperties
(
// save config again
saveTimestampedProperties
(
// save config again
configPath
,
// full path or null
configPath
,
// full path or null
...
...
src/main/java/ImageDtt.java
View file @
e59c6d14
This diff is collapsed.
Click to expand it.
src/main/java/QuadCLT.java
View file @
e59c6d14
...
@@ -161,7 +161,12 @@ public class QuadCLT {
...
@@ -161,7 +161,12 @@ public class QuadCLT {
// System.out.println("Done copyPropertiesFrom");
// System.out.println("Done copyPropertiesFrom");
}
}
public
GeometryCorrection
getGeometryCorrection
()
{
return
geometryCorrection
;
}
public
double
[][][][][][]
getCLTKernels
(){
return
clt_kernels
;
}
public
void
listGeometryCorrection
(
boolean
full
){
public
void
listGeometryCorrection
(
boolean
full
){
GeometryCorrection
gc
=
geometryCorrection
;
GeometryCorrection
gc
=
geometryCorrection
;
if
(
gc
==
null
)
{
// if it was not yet created
if
(
gc
==
null
)
{
// if it was not yet created
...
...
src/main/java/TwoQuadCLT.java
View file @
e59c6d14
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