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
3cb7b435
Commit
3cb7b435
authored
Jun 26, 2021
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debugging illustrations
parent
7c9b8ed9
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
1173 additions
and
380 deletions
+1173
-380
Aberration_Calibration.java
...com/elphel/imagej/calibration/Aberration_Calibration.java
+23
-13
CalibrationIllustration.java
...om/elphel/imagej/calibration/CalibrationIllustration.java
+328
-151
CalibrationIllustrationParameters.java
...imagej/calibration/CalibrationIllustrationParameters.java
+264
-23
MatchSimulatedPattern.java
.../com/elphel/imagej/calibration/MatchSimulatedPattern.java
+556
-191
LwirReader.java
src/main/java/com/elphel/imagej/lwir/LwirReader.java
+1
-1
LwirReaderParameters.java
...ain/java/com/elphel/imagej/lwir/LwirReaderParameters.java
+1
-1
No files found.
src/main/java/com/elphel/imagej/calibration/Aberration_Calibration.java
View file @
3cb7b435
...
@@ -667,7 +667,9 @@ public static MatchSimulatedPattern.DistortionParameters DISTORTION =new MatchSi
...
@@ -667,7 +667,9 @@ public static MatchSimulatedPattern.DistortionParameters DISTORTION =new MatchSi
public static Goniometer GONIOMETER=null;
public static Goniometer GONIOMETER=null;
public static LwirReaderParameters LWIR_PARAMETERS = new LwirReaderParameters();
public static LwirReaderParameters LWIR_PARAMETERS = new LwirReaderParameters();
public static CalibrationIllustrationParameters CALIBRATION_ILLUSTRATION_PARAMETERS = new CalibrationIllustrationParameters(LWIR_PARAMETERS);
public static CalibrationIllustrationParameters CALIBRATION_ILLUSTRATION_PARAMETERS = new CalibrationIllustrationParameters(
LWIR_PARAMETERS,
EYESIS_CAMERA_PARAMETERS);
// new CalibrationHardwareInterface.LaserPointers();
// new CalibrationHardwareInterface.LaserPointers();
public class SyncCommand{
public class SyncCommand{
public boolean isRunning= false;
public boolean isRunning= false;
...
@@ -1069,6 +1071,7 @@ if (MORE_BUTTONS) {
...
@@ -1069,6 +1071,7 @@ if (MORE_BUTTONS) {
panelIllustrations.setLayout(new GridLayout(1, 0, 5, 5)); // rows, columns, vgap, hgap
panelIllustrations.setLayout(new GridLayout(1, 0, 5, 5)); // rows, columns, vgap, hgap
addButton("Illustrations Configure", panelIllustrations,color_configure);
addButton("Illustrations Configure", panelIllustrations,color_configure);
addButton("Illustrations", panelIllustrations,color_bundle);
addButton("Illustrations", panelIllustrations,color_bundle);
addButton("Remove Bad grids", panelIllustrations,color_stop);
add(panelIllustrations);
add(panelIllustrations);
...
@@ -9434,22 +9437,29 @@ if (MORE_BUTTONS) {
...
@@ -9434,22 +9437,29 @@ if (MORE_BUTTONS) {
LENS_DISTORTIONS, // Distortions distortions,
LENS_DISTORTIONS, // Distortions distortions,
SYNC_COMMAND.stopRequested, // AtomicInteger stopRequested,
SYNC_COMMAND.stopRequested, // AtomicInteger stopRequested,
MASTER_DEBUG_LEVEL); // int debug_level);
MASTER_DEBUG_LEVEL); // int debug_level);
/*
CALIBRATION_ILLUSTRATION = new CalibrationIllustration(
LWIR_PARAMETERS, // LwirReaderParameters lwirReaderParameters,
LENS_DISTORTION_PARAMETERS, // LensDistortionParameters lensDistortionParameters,
PATTERN_PARAMETERS, // PatternParameters patternParameters,
REFINE_PARAMETERS, // RefineParameters refineParameters,
DISTORTION_PROCESS_CONFIGURATION, // DistortionProcessConfiguration distortionProcessConfiguration,
EYESIS_CAMERA_PARAMETERS, // EyesisCameraParameters eyesisCameraParameters,
SYNC_COMMAND.stopRequested, // AtomicInteger stopRequested,
MASTER_DEBUG_LEVEL); // int debug_level);
*/
}
}
// CALIBRATION_ILLUSTRATION.selectUsefulGrids();
CALIBRATION_ILLUSTRATION.convertSourceFiles();
CALIBRATION_ILLUSTRATION.convertSourceFiles();
return;
return;
}
}
/* ======================================================================== */
if (label.equals("Remove Bad grids")) {
if (LENS_DISTORTIONS==null) {
IJ.showMessage("LENS_DISTORTION is not set"); // to use all grids imported
return;
}
EYESIS_ABERRATIONS.setDistortions(LENS_DISTORTIONS);
if (CALIBRATION_ILLUSTRATION == null) {
CALIBRATION_ILLUSTRATION = new CalibrationIllustration(
CALIBRATION_ILLUSTRATION_PARAMETERS, // CalibrationIllustrationParameters illustrationParameters,
EYESIS_ABERRATIONS, // EyesisAberrations eyesisAberrations,
LENS_DISTORTIONS, // Distortions distortions,
SYNC_COMMAND.stopRequested, // AtomicInteger stopRequested,
MASTER_DEBUG_LEVEL); // int debug_level);
}
CALIBRATION_ILLUSTRATION.removeBadGrids();
return;
}
/* ======================================================================== */
/* ======================================================================== */
if (label.equals("Manual hint")) {
if (label.equals("Manual hint")) {
src/main/java/com/elphel/imagej/calibration/CalibrationIllustration.java
View file @
3cb7b435
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/calibration/CalibrationIllustrationParameters.java
View file @
3cb7b435
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/calibration/MatchSimulatedPattern.java
View file @
3cb7b435
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/lwir/LwirReader.java
View file @
3cb7b435
...
@@ -748,7 +748,7 @@ public class LwirReader {
...
@@ -748,7 +748,7 @@ public class LwirReader {
* From Stephan Preibisch's Multithreading.java class. See:
* From Stephan Preibisch's Multithreading.java class. See:
* http://repo.or.cz/w/trakem2.git?a=blob;f=mpi/fruitfly/general/MultiThreading.java;hb=HEAD
* http://repo.or.cz/w/trakem2.git?a=blob;f=mpi/fruitfly/general/MultiThreading.java;hb=HEAD
*/
*/
private
Thread
[]
newThreadArray
(
int
maxCPUs
)
{
private
static
Thread
[]
newThreadArray
(
int
maxCPUs
)
{
int
n_cpus
=
Runtime
.
getRuntime
().
availableProcessors
();
int
n_cpus
=
Runtime
.
getRuntime
().
availableProcessors
();
if
(
n_cpus
>
maxCPUs
)
n_cpus
=
maxCPUs
;
if
(
n_cpus
>
maxCPUs
)
n_cpus
=
maxCPUs
;
return
new
Thread
[
n_cpus
];
return
new
Thread
[
n_cpus
];
...
...
src/main/java/com/elphel/imagej/lwir/LwirReaderParameters.java
View file @
3cb7b435
...
@@ -111,7 +111,7 @@ public class LwirReaderParameters {
...
@@ -111,7 +111,7 @@ public class LwirReaderParameters {
return
absolute_chn
;
return
absolute_chn
;
}
}
public
int
[]
get
Absolute
EoChannels
(
boolean
absolote
)
{
public
int
[]
getEoChannels
(
boolean
absolote
)
{
int
[]
absolute_chn
=
new
int
[
eo_channels
.
length
];
int
[]
absolute_chn
=
new
int
[
eo_channels
.
length
];
for
(
int
i
=
0
;
i
<
absolute_chn
.
length
;
i
++)
{
for
(
int
i
=
0
;
i
<
absolute_chn
.
length
;
i
++)
{
absolute_chn
[
i
]
=
eo_channels
[
i
]
+
+
(
absolote
?
getEoChn0
():
0
);
absolute_chn
[
i
]
=
eo_channels
[
i
]
+
+
(
absolote
?
getEoChn0
():
0
);
...
...
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