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
d3429417
Commit
d3429417
authored
Dec 14, 2016
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
suppressed some warnings, some fixed
parent
d93d350f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
17 deletions
+31
-17
CalibrationHardwareInterface.java
src/main/java/CalibrationHardwareInterface.java
+6
-3
DebayerScissors.java
src/main/java/DebayerScissors.java
+0
-1
DenseCorrespondence.java
src/main/java/DenseCorrespondence.java
+1
-1
PixelMapping.java
src/main/java/PixelMapping.java
+24
-12
No files found.
src/main/java/CalibrationHardwareInterface.java
View file @
d3429417
...
@@ -3120,7 +3120,7 @@ public class CalibrationHardwareInterface {
...
@@ -3120,7 +3120,7 @@ public class CalibrationHardwareInterface {
}
catch
(
IOException
e
)
{
}
catch
(
IOException
e
)
{
String
msg
=
"Failed to write XML motor state file: "
+
path
;
String
msg
=
"Failed to write XML motor state file: "
+
path
;
IJ
.
showMessage
(
"Error"
,
msg
);
IJ
.
showMessage
(
"Error"
,
msg
);
throw
new
IOException
(
msg
);
extracted
(
msg
);
}
}
try
{
try
{
os
.
close
();
os
.
close
();
...
@@ -3146,7 +3146,7 @@ public class CalibrationHardwareInterface {
...
@@ -3146,7 +3146,7 @@ public class CalibrationHardwareInterface {
}
catch
(
IOException
e
)
{
}
catch
(
IOException
e
)
{
String
msg
=
"Failed to read XML configuration file: "
+
path
;
String
msg
=
"Failed to read XML configuration file: "
+
path
;
IJ
.
showMessage
(
"Error"
,
msg
);
IJ
.
showMessage
(
"Error"
,
msg
);
throw
new
IOException
(
msg
);
extracted
(
msg
);
}
}
try
{
try
{
is
.
close
();
is
.
close
();
...
@@ -3164,11 +3164,14 @@ public class CalibrationHardwareInterface {
...
@@ -3164,11 +3164,14 @@ public class CalibrationHardwareInterface {
}
else
{
}
else
{
String
msg
=
"motor"
+(
i
+
1
)+
" is undefined in "
+
path
+
". If the file is corrupted you may delete it."
;
String
msg
=
"motor"
+(
i
+
1
)+
" is undefined in "
+
path
+
". If the file is corrupted you may delete it."
;
IJ
.
showMessage
(
"Error"
,
msg
);
IJ
.
showMessage
(
"Error"
,
msg
);
throw
new
IOException
(
msg
);
extracted
(
msg
);
}
}
}
}
return
savedPosition
;
return
savedPosition
;
}
}
private
void
extracted
(
String
msg
)
throws
IOException
{
throw
new
IOException
(
msg
);
}
public
void
checkEnabled
(){
public
void
checkEnabled
(){
if
(
isEnabled
())
return
;
if
(
isEnabled
())
return
;
GenericDialog
gd
=
new
GenericDialog
(
"Enable motors"
);
GenericDialog
gd
=
new
GenericDialog
(
"Enable motors"
);
...
...
src/main/java/DebayerScissors.java
View file @
d3429417
...
@@ -28,7 +28,6 @@
...
@@ -28,7 +28,6 @@
import
ij.IJ
;
import
ij.IJ
;
import
ij.ImageStack
;
import
ij.ImageStack
;
import
java.lang.reflect.InvocationTargetException
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
javax.swing.SwingUtilities
;
import
javax.swing.SwingUtilities
;
...
...
src/main/java/DenseCorrespondence.java
View file @
d3429417
...
@@ -39,7 +39,7 @@ public class DenseCorrespondence {
...
@@ -39,7 +39,7 @@ public class DenseCorrespondence {
p
rivate
void
disparitySweepTile
(
p
ublic
void
disparitySweepTile
(
// never used so far
int
tileX
,
int
tileX
,
int
tileY
,
int
tileY
,
CyclopeanTile
[][]
allCyclopeanMap
,
CyclopeanTile
[][]
allCyclopeanMap
,
...
...
src/main/java/PixelMapping.java
View file @
d3429417
...
@@ -9410,6 +9410,7 @@ public class PixelMapping {
...
@@ -9410,6 +9410,7 @@ public class PixelMapping {
private
BitSet
innerMask
=
null
;
private
BitSet
innerMask
=
null
;
private
int
[]
borderMask
=
null
;
private
int
[]
borderMask
=
null
;
public
int
getNumberOfPlanes
(){
return
this
.
maximums
.
length
;}
public
int
getNumberOfPlanes
(){
return
this
.
maximums
.
length
;}
@SuppressWarnings
(
"unused"
)
public
int
getForegroundPlane
(){
return
this
.
foregroundIndex
;}
public
int
getForegroundPlane
(){
return
this
.
foregroundIndex
;}
public
double
getPlaneDisparity
(
int
plane
){
return
this
.
maximums
[
plane
][
0
];}
public
double
getPlaneDisparity
(
int
plane
){
return
this
.
maximums
[
plane
][
0
];}
public
void
setPlaneDisparity
(
double
disparity
,
int
plane
){
this
.
maximums
[
plane
][
0
]=
disparity
;}
public
void
setPlaneDisparity
(
double
disparity
,
int
plane
){
this
.
maximums
[
plane
][
0
]=
disparity
;}
...
@@ -9448,6 +9449,7 @@ public class PixelMapping {
...
@@ -9448,6 +9449,7 @@ public class PixelMapping {
this
.
auxData
=
new
float
[
n
][];
this
.
auxData
=
new
float
[
n
][];
for
(
int
i
=
0
;
i
<
n
;
i
++)
this
.
auxData
[
i
]=
null
;
for
(
int
i
=
0
;
i
<
n
;
i
++)
this
.
auxData
[
i
]=
null
;
}
}
@SuppressWarnings
(
"unused"
)
public
void
resetAux
(){
public
void
resetAux
(){
this
.
auxData
=
null
;
this
.
auxData
=
null
;
}
}
...
@@ -9455,6 +9457,7 @@ public class PixelMapping {
...
@@ -9455,6 +9457,7 @@ public class PixelMapping {
if
(
this
.
auxData
==
null
)
initAux
(
n
+
1
);
if
(
this
.
auxData
==
null
)
initAux
(
n
+
1
);
this
.
auxData
[
n
]=
data
;
this
.
auxData
[
n
]=
data
;
}
}
@SuppressWarnings
(
"unused"
)
public
float
[][]
getAux
(){
public
float
[][]
getAux
(){
return
this
.
auxData
;
return
this
.
auxData
;
}
}
...
@@ -9467,16 +9470,20 @@ public class PixelMapping {
...
@@ -9467,16 +9470,20 @@ public class PixelMapping {
this
.
likely
=
new
float
[
this
.
numPlanes
][];
this
.
likely
=
new
float
[
this
.
numPlanes
][];
for
(
int
i
=
0
;
i
<
this
.
numPlanes
;
i
++)
this
.
likely
[
i
]=
null
;
for
(
int
i
=
0
;
i
<
this
.
numPlanes
;
i
++)
this
.
likely
[
i
]=
null
;
}
}
@SuppressWarnings
(
"unused"
)
public
void
resetLikely
(){
public
void
resetLikely
(){
this
.
likely
=
null
;
this
.
likely
=
null
;
}
}
@SuppressWarnings
(
"unused"
)
public
void
setLikely
(
int
n
,
float
[]
data
){
public
void
setLikely
(
int
n
,
float
[]
data
){
if
(
this
.
likely
==
null
)
initLikely
();
if
(
this
.
likely
==
null
)
initLikely
();
this
.
likely
[
n
]=
data
;
this
.
likely
[
n
]=
data
;
}
}
@SuppressWarnings
(
"unused"
)
public
float
[][]
getLikely
(){
public
float
[][]
getLikely
(){
return
this
.
likely
;
return
this
.
likely
;
}
}
@SuppressWarnings
(
"unused"
)
public
float
[]
getLikely
(
int
n
){
public
float
[]
getLikely
(
int
n
){
if
((
this
.
likely
==
null
)
||
(
this
.
likely
.
length
<=
n
))
return
null
;
if
((
this
.
likely
==
null
)
||
(
this
.
likely
.
length
<=
n
))
return
null
;
return
this
.
likely
[
n
];
return
this
.
likely
[
n
];
...
@@ -9486,16 +9493,20 @@ public class PixelMapping {
...
@@ -9486,16 +9493,20 @@ public class PixelMapping {
this
.
unlikely
=
new
float
[
this
.
numPlanes
][];
this
.
unlikely
=
new
float
[
this
.
numPlanes
][];
for
(
int
i
=
0
;
i
<
this
.
numPlanes
;
i
++)
this
.
unlikely
[
i
]=
null
;
for
(
int
i
=
0
;
i
<
this
.
numPlanes
;
i
++)
this
.
unlikely
[
i
]=
null
;
}
}
@SuppressWarnings
(
"unused"
)
public
void
resetUnlikely
(){
public
void
resetUnlikely
(){
this
.
unlikely
=
null
;
this
.
unlikely
=
null
;
}
}
@SuppressWarnings
(
"unused"
)
public
void
setUnlikely
(
int
n
,
float
[]
data
){
public
void
setUnlikely
(
int
n
,
float
[]
data
){
if
(
this
.
unlikely
==
null
)
initUnlikely
();
if
(
this
.
unlikely
==
null
)
initUnlikely
();
this
.
unlikely
[
n
]=
data
;
this
.
unlikely
[
n
]=
data
;
}
}
@SuppressWarnings
(
"unused"
)
public
float
[][]
getUnlikely
(){
public
float
[][]
getUnlikely
(){
return
this
.
unlikely
;
return
this
.
unlikely
;
}
}
@SuppressWarnings
(
"unused"
)
public
float
[]
getUnlikely
(
int
n
){
public
float
[]
getUnlikely
(
int
n
){
if
((
this
.
unlikely
==
null
)
||
(
this
.
unlikely
.
length
<=
n
))
return
null
;
if
((
this
.
unlikely
==
null
)
||
(
this
.
unlikely
.
length
<=
n
))
return
null
;
return
this
.
unlikely
[
n
];
return
this
.
unlikely
[
n
];
...
@@ -9584,6 +9595,7 @@ public class PixelMapping {
...
@@ -9584,6 +9595,7 @@ public class PixelMapping {
* @param disparityTolerance - consider "this" as being withing disparityTolerance of disparity. NaN - do not filter by this
* @param disparityTolerance - consider "this" as being withing disparityTolerance of disparity. NaN - do not filter by this
* @return
* @return
*/
*/
@SuppressWarnings
(
"unused"
)
public
boolean
[]
getEnabledNonOccluded
(
public
boolean
[]
getEnabledNonOccluded
(
double
disparityFG
,
double
disparityFG
,
double
disparity
,
double
disparity
,
...
...
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