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
695f5cda
Commit
695f5cda
authored
Feb 26, 2017
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
working on fine correction - not clear where mismatch comes form
parent
75365299
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
936 additions
and
131 deletions
+936
-131
EyesisCorrectionParameters.java
src/main/java/EyesisCorrectionParameters.java
+92
-2
EyesisDCT.java
src/main/java/EyesisDCT.java
+533
-6
Eyesis_Correction.java
src/main/java/Eyesis_Correction.java
+101
-0
GeometryCorrection.java
src/main/java/GeometryCorrection.java
+1
-1
ImageDtt.java
src/main/java/ImageDtt.java
+209
-122
No files found.
src/main/java/EyesisCorrectionParameters.java
View file @
695f5cda
This diff is collapsed.
Click to expand it.
src/main/java/EyesisDCT.java
View file @
695f5cda
This diff is collapsed.
Click to expand it.
src/main/java/Eyesis_Correction.java
View file @
695f5cda
...
@@ -497,6 +497,8 @@ private Panel panel1,
...
@@ -497,6 +497,8 @@ private Panel panel1,
addButton
(
"CLT process sets"
,
panelClt1
,
color_process
);
addButton
(
"CLT process sets"
,
panelClt1
,
color_process
);
addButton
(
"CLT process quads"
,
panelClt1
,
color_process
);
addButton
(
"CLT process quads"
,
panelClt1
,
color_process
);
addButton
(
"CLT process corr"
,
panelClt1
,
color_process
);
addButton
(
"CLT process corr"
,
panelClt1
,
color_process
);
addButton
(
"CLT disparity scan"
,
panelClt1
,
color_conf_process
);
add
(
panelClt1
);
add
(
panelClt1
);
}
}
pack
();
pack
();
...
@@ -4513,9 +4515,108 @@ private Panel panel1,
...
@@ -4513,9 +4515,108 @@ private Panel panel1,
return
;
return
;
}
else
if
(
label
.
equals
(
"CLT disparity scan"
))
{
DEBUG_LEVEL
=
MASTER_DEBUG_LEVEL
;
EYESIS_CORRECTIONS
.
setDebug
(
DEBUG_LEVEL
);
if
(
EYESIS_DCT
==
null
){
EYESIS_DCT
=
new
EyesisDCT
(
EYESIS_CORRECTIONS
,
CORRECTION_PARAMETERS
,
DCT_PARAMETERS
);
if
(
DEBUG_LEVEL
>
0
){
System
.
out
.
println
(
"Created new EyesisDCT instance, will need to read CLT kernels"
);
}
}
String
configPath
=
null
;
if
(
EYESIS_CORRECTIONS
.
correctionsParameters
.
saveSettings
)
{
configPath
=
EYESIS_CORRECTIONS
.
correctionsParameters
.
selectResultsDirectory
(
true
,
true
);
if
(
configPath
==
null
){
String
msg
=
"No results directory selected, command aborted"
;
System
.
out
.
println
(
"Warning: "
+
msg
);
IJ
.
showMessage
(
"Warning"
,
msg
);
return
;
}
configPath
+=
Prefs
.
getFileSeparator
()+
"autoconfig"
;
try
{
saveTimestampedProperties
(
configPath
,
// full path or null
null
,
// use as default directory if path==null
true
,
PROPERTIES
);
}
catch
(
Exception
e
){
String
msg
=
"Failed to save configuration to "
+
configPath
+
", command aborted"
;
System
.
out
.
println
(
"Error: "
+
msg
);
IJ
.
showMessage
(
"Error"
,
msg
);
return
;
}
}
EYESIS_CORRECTIONS
.
initSensorFiles
(
DEBUG_LEVEL
);
int
numChannels
=
EYESIS_CORRECTIONS
.
getNumChannels
();
NONLIN_PARAMETERS
.
modifyNumChannels
(
numChannels
);
CHANNEL_GAINS_PARAMETERS
.
modifyNumChannels
(
numChannels
);
if
(!
EYESIS_DCT
.
CLTKernelsAvailable
()){
if
(
DEBUG_LEVEL
>
0
){
System
.
out
.
println
(
"Reading CLT kernels"
);
}
EYESIS_DCT
.
readCLTKernels
(
CLT_PARAMETERS
,
THREADS_MAX
,
UPDATE_STATUS
,
// update status info
DEBUG_LEVEL
);
if
(
DEBUG_LEVEL
>
1
){
EYESIS_DCT
.
showCLTKernels
(
THREADS_MAX
,
UPDATE_STATUS
,
// update status info
DEBUG_LEVEL
);
}
}
if
(!
EYESIS_DCT
.
geometryCorrectionAvailable
()){
if
(
DEBUG_LEVEL
>
0
){
System
.
out
.
println
(
"Calculating geometryCorrection"
);
}
if
(!
EYESIS_DCT
.
initGeometryCorrection
(
DEBUG_LEVEL
+
2
)){
return
;
}
}
///========================================
EYESIS_DCT
.
cltDisparityScans
(
CLT_PARAMETERS
,
// EyesisCorrectionParameters.DCTParameters dct_parameters,
DEBAYER_PARAMETERS
,
//EyesisCorrectionParameters.DebayerParameters debayerParameters,
NONLIN_PARAMETERS
,
//EyesisCorrectionParameters.NonlinParameters nonlinParameters,
COLOR_PROC_PARAMETERS
,
//EyesisCorrectionParameters.ColorProcParameters colorProcParameters,
CHANNEL_GAINS_PARAMETERS
,
//CorrectionColorProc.ColorGainsParameters channelGainParameters,
RGB_PARAMETERS
,
//EyesisCorrectionParameters.RGBParameters rgbParameters,
EQUIRECTANGULAR_PARAMETERS
,
// EyesisCorrectionParameters.EquirectangularParameters equirectangularParameters,
CONVOLVE_FFT_SIZE
,
//int convolveFFTSize, // 128 - fft size, kernel size should be size/2
THREADS_MAX
,
//final int threadsMax, // maximal number of threads to launch
UPDATE_STATUS
,
//final boolean updateStatus,
DEBUG_LEVEL
);
//final int debugLevel);
if
(
configPath
!=
null
)
{
saveTimestampedProperties
(
// save config again
configPath
,
// full path or null
null
,
// use as default directory if path==null
true
,
PROPERTIES
);
}
return
;
//
// End of buttons code
// End of buttons code
}
}
DEBUG_LEVEL
=
MASTER_DEBUG_LEVEL
;
DEBUG_LEVEL
=
MASTER_DEBUG_LEVEL
;
...
...
src/main/java/GeometryCorrection.java
View file @
695f5cda
...
@@ -311,7 +311,7 @@ public class GeometryCorrection {
...
@@ -311,7 +311,7 @@ public class GeometryCorrection {
}
}
/*
/*
* Calculate pixel coordinates for each of numSensors images, for a given (px,py) of the ide
la
ized "center" (still distorted) image
* Calculate pixel coordinates for each of numSensors images, for a given (px,py) of the ide
al
ized "center" (still distorted) image
* and generic diparity, measured in pixels
* and generic diparity, measured in pixels
*/
*/
...
...
src/main/java/ImageDtt.java
View file @
695f5cda
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