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
a1e7da7b
Commit
a1e7da7b
authored
Jan 16, 2017
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added output of the processing time
parent
db512370
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
3 deletions
+6
-3
EyesisCorrectionParameters.java
src/main/java/EyesisCorrectionParameters.java
+1
-1
EyesisDCT.java
src/main/java/EyesisDCT.java
+4
-1
PixelMapping.java
src/main/java/PixelMapping.java
+1
-1
No files found.
src/main/java/EyesisCorrectionParameters.java
View file @
a1e7da7b
...
@@ -2009,7 +2009,7 @@ public class EyesisCorrectionParameters {
...
@@ -2009,7 +2009,7 @@ public class EyesisCorrectionParameters {
gd
.
addNumericField
(
"dbg_sigma"
,
this
.
dbg_sigma
,
3
);
gd
.
addNumericField
(
"dbg_sigma"
,
this
.
dbg_sigma
,
3
);
gd
.
addStringField
(
"Debug mask (anything but * is false)"
,
this
.
dbg_mask
,
100
);
gd
.
addStringField
(
"Debug mask (anything but * is false)"
,
this
.
dbg_mask
,
100
);
gd
.
addNumericField
(
"LMA implementation: 0 - old, 1 - new"
,
this
.
dbg_mode
,
0
);
gd
.
addNumericField
(
"LMA implementation: 0 - old, 1 - new"
,
this
.
dbg_mode
,
0
);
gd
.
addNumericField
(
"Convolution window: 0 - none,
1 - square, 2 - sin, 3 - sin^2"
,
this
.
dbg_window_mode
,
0
);
gd
.
addNumericField
(
"Convolution window: 0 - none,
[1 - square], 2 - sin, 3 - sin^2"
,
this
.
dbg_window_mode
,
0
);
gd
.
addCheckbox
(
"Center convolution window around target kernel center"
,
this
.
centerWindowToTarget
);
gd
.
addCheckbox
(
"Center convolution window around target kernel center"
,
this
.
centerWindowToTarget
);
gd
.
addNumericField
(
"Color channel to extract kernel (<0 - use synthetic)"
,
this
.
color_channel
,
0
);
gd
.
addNumericField
(
"Color channel to extract kernel (<0 - use synthetic)"
,
this
.
color_channel
,
0
);
gd
.
addNumericField
(
"Convolution kernel decimation (original is normally 2x)"
,
this
.
decimation
,
0
);
gd
.
addNumericField
(
"Convolution kernel decimation (original is normally 2x)"
,
this
.
decimation
,
0
);
...
...
src/main/java/EyesisDCT.java
View file @
a1e7da7b
...
@@ -1029,13 +1029,16 @@ public class EyesisDCT {
...
@@ -1029,13 +1029,16 @@ public class EyesisDCT {
}
}
//pixelMapping
//pixelMapping
Runtime
.
getRuntime
().
gc
();
Runtime
.
getRuntime
().
gc
();
if
(
debugLevel
>
0
)
System
.
out
.
println
(
"Processing image "
+(
iImage
+
1
)+
" (of "
+
fileIndices
.
length
+
") finished at "
+
if
(
debugLevel
>-
1
)
System
.
out
.
println
(
"Processing image "
+(
iImage
+
1
)+
" (of "
+
fileIndices
.
length
+
") finished at "
+
IJ
.
d2s
(
0.000000001
*(
System
.
nanoTime
()-
this
.
startTime
),
3
)+
" sec, --- Free memory="
+
Runtime
.
getRuntime
().
freeMemory
()+
" (of "
+
Runtime
.
getRuntime
().
totalMemory
()+
")"
);
IJ
.
d2s
(
0.000000001
*(
System
.
nanoTime
()-
this
.
startTime
),
3
)+
" sec, --- Free memory="
+
Runtime
.
getRuntime
().
freeMemory
()+
" (of "
+
Runtime
.
getRuntime
().
totalMemory
()+
")"
);
if
(
eyesisCorrections
.
stopRequested
.
get
()>
0
)
{
if
(
eyesisCorrections
.
stopRequested
.
get
()>
0
)
{
System
.
out
.
println
(
"User requested stop"
);
System
.
out
.
println
(
"User requested stop"
);
return
;
return
;
}
}
}
}
System
.
out
.
println
(
"Processing "
+
fileIndices
.
length
+
" files finished at "
+
IJ
.
d2s
(
0.000000001
*(
System
.
nanoTime
()-
this
.
startTime
),
3
)+
" sec, --- Free memory="
+
Runtime
.
getRuntime
().
freeMemory
()+
" (of "
+
Runtime
.
getRuntime
().
totalMemory
()+
")"
);
}
}
...
...
src/main/java/PixelMapping.java
View file @
a1e7da7b
...
@@ -163,7 +163,7 @@ public class PixelMapping {
...
@@ -163,7 +163,7 @@ public class PixelMapping {
if
(!
cam_port
.
contains
(
cp
)){
if
(!
cam_port
.
contains
(
cp
)){
cam_port
.
add
(
cp
);
cam_port
.
add
(
cp
);
}
}
System
.
out
.
println
(
"this.sensors["
+
i
+
"]!=null, this.sensors[i].subcamera="
+
this
.
sensors
[
i
].
subcamera
+
", this.sensors[i].sensor_port="
+
this
.
sensors
[
i
].
sensor_port
);
//
System.out.println("this.sensors["+i+"]!=null, this.sensors[i].subcamera="+this.sensors[i].subcamera+", this.sensors[i].sensor_port="+this.sensors[i].sensor_port);
}
}
Point
[]
cam_port_arr
=
cam_port
.
toArray
(
new
Point
[
0
]);
Point
[]
cam_port_arr
=
cam_port
.
toArray
(
new
Point
[
0
]);
Arrays
.
sort
(
cam_port_arr
,
new
Comparator
<
Point
>()
{
Arrays
.
sort
(
cam_port_arr
,
new
Comparator
<
Point
>()
{
...
...
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