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
3a62a4a1
Commit
3a62a4a1
authored
Jul 26, 2018
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Calculating DSI stats over multiple images
parent
848f691d
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
629 additions
and
32 deletions
+629
-32
Eyesis_Correction.java
src/main/java/Eyesis_Correction.java
+41
-17
MLStats.java
src/main/java/MLStats.java
+586
-0
TwoQuadCLT.java
src/main/java/TwoQuadCLT.java
+2
-15
No files found.
src/main/java/Eyesis_Correction.java
View file @
3a62a4a1
...
@@ -104,7 +104,8 @@ private Panel panel1,
...
@@ -104,7 +104,8 @@ private Panel panel1,
panelClt1
,
panelClt1
,
panelClt2
,
panelClt2
,
panelClt3
,
panelClt3
,
panelClt4
panelClt4
,
panelClt5
;
;
JP46_Reader_camera
JP4_INSTANCE
=
null
;
JP46_Reader_camera
JP4_INSTANCE
=
null
;
...
@@ -396,13 +397,14 @@ private Panel panel1,
...
@@ -396,13 +397,14 @@ private Panel panel1,
Color
color_configure
=
new
Color
(
200
,
200
,
160
);
Color
color_configure
=
new
Color
(
200
,
200
,
160
);
Color
color_process
=
new
Color
(
180
,
180
,
240
);
Color
color_process
=
new
Color
(
180
,
180
,
240
);
Color
color_conf_process
=
new
Color
(
180
,
240
,
240
);
Color
color_conf_process
=
new
Color
(
180
,
240
,
240
);
Color
color_restore
=
new
Color
(
1
80
,
240
,
18
0
);
Color
color_restore
=
new
Color
(
1
60
,
240
,
16
0
);
Color
color_stop
=
new
Color
(
255
,
160
,
160
);
Color
color_stop
=
new
Color
(
255
,
160
,
160
);
Color
color_report
=
new
Color
(
180
,
220
,
180
);
instance
=
this
;
instance
=
this
;
addKeyListener
(
IJ
.
getInstance
());
addKeyListener
(
IJ
.
getInstance
());
int
menuRows
=
4
+
(
ADVANCED_MODE
?
4
:
0
)
+
(
MODE_3D
?
3
:
0
)
+
(
DCT_MODE
?
5
:
0
);
int
menuRows
=
4
+
(
ADVANCED_MODE
?
4
:
0
)
+
(
MODE_3D
?
3
:
0
)
+
(
DCT_MODE
?
6
:
0
);
setLayout
(
new
GridLayout
(
menuRows
,
1
));
setLayout
(
new
GridLayout
(
menuRows
,
1
));
panel6
=
new
Panel
();
panel6
=
new
Panel
();
...
@@ -544,7 +546,7 @@ private Panel panel1,
...
@@ -544,7 +546,7 @@ private Panel panel1,
addButton
(
"CLT reset fine corr"
,
panelClt2
,
color_stop
);
addButton
(
"CLT reset fine corr"
,
panelClt2
,
color_stop
);
addButton
(
"CLT reset extrinsic corr"
,
panelClt2
,
color_stop
);
addButton
(
"CLT reset extrinsic corr"
,
panelClt2
,
color_stop
);
addButton
(
"CLT show geometry"
,
panelClt2
,
color_configure
);
addButton
(
"CLT show geometry"
,
panelClt2
,
color_configure
);
addButton
(
"CLT show fine corr"
,
panelClt2
,
color_
configure
);
addButton
(
"CLT show fine corr"
,
panelClt2
,
color_
report
);
addButton
(
"CLT apply fine corr"
,
panelClt2
,
color_process
);
addButton
(
"CLT apply fine corr"
,
panelClt2
,
color_process
);
addButton
(
"CLT test fine corr"
,
panelClt2
,
color_process
);
addButton
(
"CLT test fine corr"
,
panelClt2
,
color_process
);
addButton
(
"CLT process fine corr"
,
panelClt2
,
color_conf_process
);
addButton
(
"CLT process fine corr"
,
panelClt2
,
color_conf_process
);
...
@@ -568,8 +570,8 @@ private Panel panel1,
...
@@ -568,8 +570,8 @@ private Panel panel1,
addButton
(
"Setup CLT Batch parameters"
,
panelClt3
,
color_configure
);
addButton
(
"Setup CLT Batch parameters"
,
panelClt3
,
color_configure
);
addButton
(
"CLT batch process"
,
panelClt3
,
color_process
);
addButton
(
"CLT batch process"
,
panelClt3
,
color_process
);
addButton
(
"CM Test"
,
panelClt3
,
color_stop
);
addButton
(
"CM Test"
,
panelClt3
,
color_stop
);
addButton
(
"Show scan"
,
panelClt3
,
color_
configure
);
addButton
(
"Show scan"
,
panelClt3
,
color_
report
);
addButton
(
"Show all scans"
,
panelClt3
,
color_
configure
);
addButton
(
"Show all scans"
,
panelClt3
,
color_
report
);
addButton
(
"Periodic"
,
panelClt3
,
color_configure
);
addButton
(
"Periodic"
,
panelClt3
,
color_configure
);
add
(
panelClt3
);
add
(
panelClt3
);
}
}
...
@@ -585,8 +587,8 @@ private Panel panel1,
...
@@ -585,8 +587,8 @@ private Panel panel1,
// addButton("CLT 2*4 images - 3", panelClt4, color_conf_process);
// addButton("CLT 2*4 images - 3", panelClt4, color_conf_process);
addButton
(
"Rig offset"
,
panelClt4
,
color_configure
);
addButton
(
"Rig offset"
,
panelClt4
,
color_configure
);
addButton
(
"Save offset"
,
panelClt4
,
color_process
);
addButton
(
"Save offset"
,
panelClt4
,
color_process
);
addButton
(
"SHOW extrinsics"
,
panelClt4
,
color_
configure
);
addButton
(
"SHOW extrinsics"
,
panelClt4
,
color_
report
);
addButton
(
"LIST extrinsics"
,
panelClt4
,
color_configure
);
//
addButton("LIST extrinsics", panelClt4, color_configure);
addButton
(
"RIG DSI"
,
panelClt4
,
color_conf_process
);
addButton
(
"RIG DSI"
,
panelClt4
,
color_conf_process
);
addButton
(
"MAIN extrinsics"
,
panelClt4
,
color_process
);
addButton
(
"MAIN extrinsics"
,
panelClt4
,
color_process
);
addButton
(
"AUX extrinsics"
,
panelClt4
,
color_process
);
addButton
(
"AUX extrinsics"
,
panelClt4
,
color_process
);
...
@@ -599,17 +601,24 @@ private Panel panel1,
...
@@ -599,17 +601,24 @@ private Panel panel1,
// /"Reset GT"
// /"Reset GT"
addButton
(
"Reset GT"
,
panelClt4
,
color_stop
);
addButton
(
"Reset GT"
,
panelClt4
,
color_stop
);
addButton
(
"Ground truth"
,
panelClt4
,
color_conf_process
);
addButton
(
"Ground truth"
,
panelClt4
,
color_conf_process
);
addButton
(
"Show biscan"
,
panelClt4
,
color_
configure
);
addButton
(
"Show biscan"
,
panelClt4
,
color_
report
);
addButton
(
"Poles GT"
,
panelClt4
,
color_process
);
addButton
(
"Poles GT"
,
panelClt4
,
color_process
);
addButton
(
"ML export"
,
panelClt4
,
color_conf_process
);
addButton
(
"ML export"
,
panelClt4
,
color_conf_process
);
addButton
(
"JP4 copy"
,
panelClt4
,
color_conf_process
);
addButton
(
"JP4 copy"
,
panelClt4
,
color_conf_process
);
addButton
(
"DSI show"
,
panelClt4
,
color_
process
);
addButton
(
"DSI show"
,
panelClt4
,
color_
report
);
addButton
(
"Rig batch"
,
panelClt4
,
color_process
);
addButton
(
"Rig batch"
,
panelClt4
,
color_process
);
add
(
panelClt4
);
add
(
panelClt4
);
}
}
if
(
DCT_MODE
)
{
panelClt5
=
new
Panel
();
panelClt5
.
setLayout
(
new
GridLayout
(
1
,
0
,
5
,
5
));
// rows, columns, vgap, hgap
addButton
(
"LIST extrinsics"
,
panelClt5
,
color_report
);
addButton
(
"DSI histogram"
,
panelClt5
,
color_report
);
add
(
panelClt5
);
}
pack
();
pack
();
GUI
.
center
(
this
);
GUI
.
center
(
this
);
...
@@ -4583,6 +4592,10 @@ private Panel panel1,
...
@@ -4583,6 +4592,10 @@ private Panel panel1,
}
else
if
(
label
.
equals
(
"LIST extrinsics"
))
{
}
else
if
(
label
.
equals
(
"LIST extrinsics"
))
{
listExtrinsics
();
listExtrinsics
();
return
;
return
;
/* ======================================================================== */
}
else
if
(
label
.
equals
(
"DSI histogram"
))
{
dsiHistogram
();
return
;
/* ======================================================================== */
/* ======================================================================== */
}
else
if
(
label
.
equals
(
"Reset GT"
))
{
}
else
if
(
label
.
equals
(
"Reset GT"
))
{
...
@@ -5597,11 +5610,22 @@ private Panel panel1,
...
@@ -5597,11 +5610,22 @@ private Panel panel1,
if
(
dir
!=
null
)
{
if
(
dir
!=
null
)
{
System
.
out
.
println
(
"top directory = "
+
dir
);
System
.
out
.
println
(
"top directory = "
+
dir
);
}
}
//listExtrinsics(String dir, String mask)
// return TwoQuadCLT.listExtrinsics(dir); // , mask);
// if (TWO_QUAD_CLT == null) {
return
MLStats
.
listExtrinsics
(
dir
);
// , mask);
// return false;
//(new MLStats).
// }
}
return
TwoQuadCLT
.
listExtrinsics
(
dir
);
// , mask);
public
boolean
dsiHistogram
()
{
String
dir
=
CalibrationFileManagement
.
selectDirectory
(
false
,
// true, // smart,
false
,
// newAllowed, // save
"Model directories to scan"
,
// title
"Select"
,
// button
null
,
// filter
CORRECTION_PARAMETERS
.
x3dDirectory
);
//this.sourceDirectory);
if
(
dir
!=
null
)
{
System
.
out
.
println
(
"top directory = "
+
dir
);
}
return
MLStats
.
dsiHistogram
(
dir
);
// , mask);
}
}
public
boolean
showDSI
()
{
public
boolean
showDSI
()
{
...
...
src/main/java/MLStats.java
0 → 100644
View file @
3a62a4a1
This diff is collapsed.
Click to expand it.
src/main/java/TwoQuadCLT.java
View file @
3a62a4a1
...
@@ -21,34 +21,20 @@
...
@@ -21,34 +21,20 @@
**
**
*/
*/
import
java.io.File
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.FileNotFoundException
;
import
java.io.FileNotFoundException
;
import
java.io.FileOutputStream
;
import
java.io.FileOutputStream
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.InputStream
;
import
java.io.OutputStream
;
import
java.io.OutputStream
;
import
java.nio.file.FileVisitOption
;
import
java.nio.file.FileVisitResult
;
import
java.nio.file.Files
;
import
java.nio.file.Files
;
import
java.nio.file.Path
;
import
java.nio.file.Paths
;
import
java.nio.file.SimpleFileVisitor
;
import
java.nio.file.StandardCopyOption
;
import
java.nio.file.StandardCopyOption
;
import
java.nio.file.attribute.BasicFileAttributes
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.Comparator
;
import
java.util.EnumSet
;
import
java.util.List
;
import
java.util.Properties
;
import
java.util.Properties
;
import
ij.IJ
;
import
ij.IJ
;
import
ij.ImagePlus
;
import
ij.ImagePlus
;
import
ij.ImageStack
;
import
ij.ImageStack
;
import
ij.Prefs
;
import
ij.Prefs
;
import
ij.gui.GenericDialog
;
import
ij.io.FileSaver
;
import
ij.io.FileSaver
;
import
ij.text.TextWindow
;
public
class
TwoQuadCLT
{
public
class
TwoQuadCLT
{
public
static
int
DSI_DISPARITY_MAIN
=
0
;
public
static
int
DSI_DISPARITY_MAIN
=
0
;
...
@@ -6350,6 +6336,7 @@ if (debugLevel > -100) return true; // temporarily !
...
@@ -6350,6 +6336,7 @@ if (debugLevel > -100) return true; // temporarily !
System
.
out
.
println
(
"Configuration parameters are saved to "
+
path
);
System
.
out
.
println
(
"Configuration parameters are saved to "
+
path
);
}
}
}
}
/*
public static boolean listExtrinsics(String dir) // , String mask)
public static boolean listExtrinsics(String dir) // , String mask)
{
{
Path path= Paths.get(dir);
Path path= Paths.get(dir);
...
@@ -6756,5 +6743,5 @@ if (debugLevel > -100) return true; // temporarily !
...
@@ -6756,5 +6743,5 @@ if (debugLevel > -100) return true; // temporarily !
// getAllProperties(properties);
// getAllProperties(properties);
// if (DEBUG_LEVEL>0) System.out.println("Configuration parameters are restored from "+path);
// if (DEBUG_LEVEL>0) System.out.println("Configuration parameters are restored from "+path);
}
}
*/
}
}
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