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
1ac965a0
Commit
1ac965a0
authored
Jul 10, 2014
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debugging
parent
3479dfe6
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
608 additions
and
301 deletions
+608
-301
Aberration_Calibration.java
src/main/java/Aberration_Calibration.java
+4
-1
FocusingField.java
src/main/java/FocusingField.java
+604
-300
No files found.
src/main/java/Aberration_Calibration.java
View file @
1ac965a0
...
@@ -4060,7 +4060,7 @@ if (MORE_BUTTONS) {
...
@@ -4060,7 +4060,7 @@ if (MORE_BUTTONS) {
pY0
,
pY0
,
sampleCoord
,
sampleCoord
,
this
.
SYNC_COMMAND
.
stopRequested
);
this
.
SYNC_COMMAND
.
stopRequested
);
if
(
PROPERTIES
!=
null
)
FOCUSING_FIELD
.
getProperties
(
"FOCUSING_FIELD."
,
PROPERTIES
);
System
.
out
.
println
(
"Saving measurement history to "
+
path
);
System
.
out
.
println
(
"Saving measurement history to "
+
path
);
MOTORS
.
addCurrentHistoryToFocusingField
(
FOCUSING_FIELD
);
MOTORS
.
addCurrentHistoryToFocusingField
(
FOCUSING_FIELD
);
FOCUSING_FIELD
.
saveXML
(
path
);
FOCUSING_FIELD
.
saveXML
(
path
);
...
@@ -4383,6 +4383,7 @@ if (MORE_BUTTONS) {
...
@@ -4383,6 +4383,7 @@ if (MORE_BUTTONS) {
""
,
//); //String defaultPath); // AtomicInteger stopRequested
""
,
//); //String defaultPath); // AtomicInteger stopRequested
this
.
SYNC_COMMAND
.
stopRequested
);
this
.
SYNC_COMMAND
.
stopRequested
);
FOCUSING_FIELD
.
setDebugLevel
(
DEBUG_LEVEL
);
FOCUSING_FIELD
.
setDebugLevel
(
DEBUG_LEVEL
);
if
(
PROPERTIES
!=
null
)
FOCUSING_FIELD
.
getProperties
(
"FOCUSING_FIELD."
,
PROPERTIES
);
System
.
out
.
println
(
"Loaded FocusingField"
);
System
.
out
.
println
(
"Loaded FocusingField"
);
if
(!
FOCUSING_FIELD
.
configureDataVector
(
"Configure curvature"
,
true
))
return
;
if
(!
FOCUSING_FIELD
.
configureDataVector
(
"Configure curvature"
,
true
))
return
;
FOCUSING_FIELD
.
setDataVector
(
FOCUSING_FIELD
.
createDataVector
());
FOCUSING_FIELD
.
setDataVector
(
FOCUSING_FIELD
.
createDataVector
());
...
@@ -12862,6 +12863,7 @@ private double [][] jacobianByJacobian(double [][] jacobian, boolean [] mask) {
...
@@ -12862,6 +12863,7 @@ private double [][] jacobianByJacobian(double [][] jacobian, boolean [] mask) {
MOTORS
.
focusingHistory
.
setProperties
(
"FOCUSING_HISTORY."
,
properties
);
MOTORS
.
focusingHistory
.
setProperties
(
"FOCUSING_HISTORY."
,
properties
);
GONIOMETER_PARAMETERS
.
setProperties
(
"GONIOMETER_PARAMETERS."
,
properties
);
GONIOMETER_PARAMETERS
.
setProperties
(
"GONIOMETER_PARAMETERS."
,
properties
);
ABERRATIONS_PARAMETERS
.
setProperties
(
"ABERRATIONS_PARAMETERS."
,
properties
);
ABERRATIONS_PARAMETERS
.
setProperties
(
"ABERRATIONS_PARAMETERS."
,
properties
);
if
(
FOCUSING_FIELD
!=
null
)
FOCUSING_FIELD
.
setProperties
(
"FOCUSING_FIELD."
,
properties
);
}
}
/* ======================================================================== */
/* ======================================================================== */
public
void
getAllProperties
(
Properties
properties
){
public
void
getAllProperties
(
Properties
properties
){
...
@@ -12900,6 +12902,7 @@ private double [][] jacobianByJacobian(double [][] jacobian, boolean [] mask) {
...
@@ -12900,6 +12902,7 @@ private double [][] jacobianByJacobian(double [][] jacobian, boolean [] mask) {
MOTORS
.
focusingHistory
.
getProperties
(
"FOCUSING_HISTORY."
,
properties
);
MOTORS
.
focusingHistory
.
getProperties
(
"FOCUSING_HISTORY."
,
properties
);
GONIOMETER_PARAMETERS
.
getProperties
(
"GONIOMETER_PARAMETERS."
,
properties
);
GONIOMETER_PARAMETERS
.
getProperties
(
"GONIOMETER_PARAMETERS."
,
properties
);
ABERRATIONS_PARAMETERS
.
getProperties
(
"ABERRATIONS_PARAMETERS."
,
properties
);
ABERRATIONS_PARAMETERS
.
getProperties
(
"ABERRATIONS_PARAMETERS."
,
properties
);
if
(
FOCUSING_FIELD
!=
null
)
FOCUSING_FIELD
.
getProperties
(
"FOCUSING_FIELD."
,
properties
);
}
}
...
...
src/main/java/FocusingField.java
View file @
1ac965a0
This diff is collapsed.
Click to expand it.
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