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
b3a35acd
Commit
b3a35acd
authored
May 30, 2019
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added configurable show acquired LWIR images
parent
3f393da8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
7 deletions
+20
-7
Aberration_Calibration.java
...com/elphel/imagej/calibration/Aberration_Calibration.java
+0
-5
LwirReader.java
src/main/java/com/elphel/imagej/lwir/LwirReader.java
+8
-0
LwirReaderParameters.java
...ain/java/com/elphel/imagej/lwir/LwirReaderParameters.java
+12
-2
No files found.
src/main/java/com/elphel/imagej/calibration/Aberration_Calibration.java
View file @
b3a35acd
...
...
@@ -9444,11 +9444,6 @@ if (MORE_BUTTONS) {
}
// ImagePlus [] imps = LWIR_READER.acquire(DISTORTION_PROCESS_CONFIGURATION.sourceDirectory); // directory to save
ImagePlus [] imps = LWIR_READER.acquire("attic/lwir_test_images"); // directory to save
if (imps != null) {
for (ImagePlus imp: imps) {
imp.show();
}
}
return;
}
src/main/java/com/elphel/imagej/lwir/LwirReader.java
View file @
b3a35acd
...
...
@@ -566,6 +566,14 @@ public class LwirReader {
fs
.
saveAsTiff
(
path
);
}
}
if
(
lrp
.
show_images
)
{
if
(
imps_avg
!=
null
)
{
for
(
ImagePlus
imp:
imps_avg
)
{
imp
.
show
();
}
}
}
return
imps_avg
;
}
...
...
src/main/java/com/elphel/imagej/lwir/LwirReaderParameters.java
View file @
b3a35acd
...
...
@@ -71,6 +71,7 @@ public class LwirReaderParameters {
protected
double
max_mismatch_ms
=
0.05
;
protected
int
max_frame_diff
=
2
;
// 1; // 2;
protected
int
debug_level
=
0
;
//-3: OFF, -2:Fatal, -1:ERROR, 0:WARN, 1:INFO,2:DEBUG
protected
boolean
show_images
=
false
;
// --- interface methods
...
...
@@ -106,6 +107,8 @@ public class LwirReaderParameters {
properties
.
setProperty
(
prefix
+
"max_mismatch_ms"
,
this
.
max_mismatch_ms
+
""
);
properties
.
setProperty
(
prefix
+
"max_frame_diff"
,
this
.
max_frame_diff
+
""
);
properties
.
setProperty
(
prefix
+
"debug_level"
,
this
.
debug_level
+
""
);
properties
.
setProperty
(
prefix
+
"show_images"
,
this
.
show_images
+
""
);
}
...
...
@@ -134,6 +137,8 @@ public class LwirReaderParameters {
if
(
properties
.
getProperty
(
prefix
+
"max_mismatch_ms"
)!=
null
)
this
.
max_mismatch_ms
=
Double
.
parseDouble
(
properties
.
getProperty
(
prefix
+
"max_mismatch_ms"
));
if
(
properties
.
getProperty
(
prefix
+
"max_frame_diff"
)!=
null
)
this
.
max_frame_diff
=
Integer
.
parseInt
(
properties
.
getProperty
(
prefix
+
"max_frame_diff"
));
if
(
properties
.
getProperty
(
prefix
+
"debug_level"
)!=
null
)
this
.
debug_level
=
Integer
.
parseInt
(
properties
.
getProperty
(
prefix
+
"debug_level"
));
if
(
properties
.
getProperty
(
prefix
+
"show_images"
)!=
null
)
this
.
show_images
=
Boolean
.
parseBoolean
(
properties
.
getProperty
(
prefix
+
"show_images"
));
parameters_updated
=
true
;
}
@Override
...
...
@@ -163,6 +168,7 @@ public class LwirReaderParameters {
lrp
.
max_mismatch_ms
=
this
.
max_mismatch_ms
;
lrp
.
max_frame_diff
=
this
.
max_frame_diff
;
lrp
.
debug_level
=
this
.
debug_level
;
lrp
.
show_images
=
this
.
show_images
;
return
lrp
;
}
...
...
@@ -198,7 +204,8 @@ public class LwirReaderParameters {
(
lrp
.
vnir_lag
==
this
.
vnir_lag
)
&&
(
lrp
.
max_mismatch_ms
==
this
.
max_mismatch_ms
)
&&
(
lrp
.
max_frame_diff
==
this
.
max_frame_diff
)
&&
(
lrp
.
debug_level
==
this
.
debug_level
);
(
lrp
.
debug_level
==
this
.
debug_level
)
&&
(
lrp
.
show_images
==
this
.
show_images
);
}
@Override
...
...
@@ -257,11 +264,12 @@ public class LwirReaderParameters {
gd
.
addNumericField
(
"Max mismatch"
,
this
.
max_mismatch_ms
,
3
,
6
,
"ms"
,
"Maximal mismatch between image timestamps. Larger mismatch requires LWIR sinsor reinitialization"
);
gd
.
addNumericField
(
"Max frame diff"
,
this
.
max_frame_diff
,
0
,
3
,
""
,
"Maximal difference in frames between simultaneously acquired channels as calculated from the timestamps"
);
gd
.
addNumericField
(
"Debug level"
,
this
.
debug_level
,
0
,
3
,
""
,
"Image acquisition log level: -3: OFF, -2:FATAL, -1:ERROR, 0:WARN, 1:INFO, 2:DEBUG"
);
gd
.
addCheckbox
(
"Show images"
,
this
.
show_images
,
"Show acquired images after averaging)"
);
}
public
void
dialogAnswers
(
GenericJTabbedDialog
gd
)
{
this
.
avg_number
=
(
int
)
gd
.
getNextNumber
();
this
.
lwir_ffc
=
gd
.
getNextBoolean
();
this
.
lwir_ffc
=
gd
.
getNextBoolean
();
this
.
avg_all
=
gd
.
getNextBoolean
();
this
.
lwir_ip
=
gd
.
getNextString
();
this
.
vnir_ip
=
gd
.
getNextString
();
...
...
@@ -284,6 +292,8 @@ public class LwirReaderParameters {
this
.
max_mismatch_ms
=
gd
.
getNextNumber
();
this
.
max_frame_diff
=
(
int
)
gd
.
getNextNumber
();
this
.
debug_level
=
(
int
)
gd
.
getNextNumber
();
this
.
show_images
=
gd
.
getNextBoolean
();
parameters_updated
=
true
;
}
...
...
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