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
3fd21c81
Commit
3fd21c81
authored
Jun 18, 2021
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing bugs for variable images per set (e.g. eo only)
parent
9c63f90b
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
270 additions
and
72 deletions
+270
-72
Aberration_Calibration.java
...com/elphel/imagej/calibration/Aberration_Calibration.java
+141
-24
DistortionCalibrationData.java
.../elphel/imagej/calibration/DistortionCalibrationData.java
+74
-24
Distortions.java
src/main/java/com/elphel/imagej/calibration/Distortions.java
+40
-20
FittingStrategy.java
...n/java/com/elphel/imagej/calibration/FittingStrategy.java
+5
-2
LwirReaderParameters.java
...ain/java/com/elphel/imagej/lwir/LwirReaderParameters.java
+10
-2
No files found.
src/main/java/com/elphel/imagej/calibration/Aberration_Calibration.java
View file @
3fd21c81
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/calibration/DistortionCalibrationData.java
View file @
3fd21c81
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/calibration/Distortions.java
View file @
3fd21c81
This diff is collapsed.
Click to expand it.
src/main/java/com/elphel/imagej/calibration/FittingStrategy.java
View file @
3fd21c81
...
@@ -1583,7 +1583,10 @@ I* - special case when the subcamera is being adjusted/replaced. How to deal wit
...
@@ -1583,7 +1583,10 @@ I* - special case when the subcamera is being adjusted/replaced. How to deal wit
System
.
out
.
println
(
"BUG: selectIndividualImages(): selection.length!=enabled.length!"
);
System
.
out
.
println
(
"BUG: selectIndividualImages(): selection.length!=enabled.length!"
);
return
false
;
return
false
;
}
}
int
[][]
imageSets
=
this
.
distortionCalibrationData
.
listImages
(!
allImages
);
// true - only enabled images
int
[][]
imageSets
=
this
.
distortionCalibrationData
.
listImages
(
!
allImages
,
// true - only enabled images
null
);
// do not filter by eo/lwir?
boolean
[]
enabledSets
=
new
boolean
[
imageSets
.
length
];
boolean
[]
enabledSets
=
new
boolean
[
imageSets
.
length
];
boolean
[]
selectedSets
=
new
boolean
[
imageSets
.
length
];
// at least one image selected in the series
boolean
[]
selectedSets
=
new
boolean
[
imageSets
.
length
];
// at least one image selected in the series
for
(
int
i
=
0
;
i
<
imageSets
.
length
;
i
++){
for
(
int
i
=
0
;
i
<
imageSets
.
length
;
i
++){
...
@@ -2483,7 +2486,7 @@ I* - special case when the subcamera is being adjusted/replaced. How to deal wit
...
@@ -2483,7 +2486,7 @@ I* - special case when the subcamera is being adjusted/replaced. How to deal wit
this
.
selectedImages
[
numSeries
][
i
]=
selectAllImages
||
((
i
==
0
)
&&
removeAllImages
);
// invalidate - all, regardless of .enabled
this
.
selectedImages
[
numSeries
][
i
]=
selectAllImages
||
((
i
==
0
)
&&
removeAllImages
);
// invalidate - all, regardless of .enabled
this
.
selectedImages
[
numSeries
][
i
]
&=
constrainByStation
[
this
.
distortionCalibrationData
.
gIP
[
i
].
getStationNumber
()];
this
.
selectedImages
[
numSeries
][
i
]
&=
constrainByStation
[
this
.
distortionCalibrationData
.
gIP
[
i
].
getStationNumber
()];
if
(
selectHiLowRes
!=
null
)
{
if
(
selectHiLowRes
!=
null
)
{
int
small_01
=
this
.
distortionCalibrationData
.
isSmallSensor
(
i
)?
1
:
0
;
int
small_01
=
this
.
distortionCalibrationData
.
isSmallSensor
(
i
)?
1
:
0
;
//OK, i here is image number, not channel number
// System.out.println(i+":"+small_01);
// System.out.println(i+":"+small_01);
this
.
selectedImages
[
numSeries
][
i
]
&=
selectHiLowRes
[
small_01
];
this
.
selectedImages
[
numSeries
][
i
]
&=
selectHiLowRes
[
small_01
];
}
}
...
...
src/main/java/com/elphel/imagej/lwir/LwirReaderParameters.java
View file @
3fd21c81
...
@@ -142,9 +142,17 @@ public class LwirReaderParameters {
...
@@ -142,9 +142,17 @@ public class LwirReaderParameters {
}
}
public
int
getNumChannels
()
{
public
int
getNumChannels
()
{
return
20
;
return
isLwir16
()?
20
:
8
;
}
}
public
int
[]
getTypeMap
()
{
// eo - 0, lwir - 1
int
[]
types
=
new
int
[
getNumChannels
()];
for
(
int
i
=
0
;
i
<
types
.
length
;
i
++)
{
types
[
i
]
=
(
i
>=
getEoChn0
())?
0
:
1
;
}
return
types
;
}
public
static
boolean
is_LWIR
(
int
width
)
{
public
static
boolean
is_LWIR
(
int
width
)
{
return
width
<=
MAX_LWIR_WIDTH
;
return
width
<=
MAX_LWIR_WIDTH
;
}
}
...
...
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