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
4e085f32
Commit
4e085f32
authored
Jul 04, 2014
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Plain Diff
Merge commit '
ff9c8b72
'
parents
eebf08ba
ff9c8b72
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
Aberration_Calibration.java
src/main/java/Aberration_Calibration.java
+1
-1
No files found.
src/main/java/Aberration_Calibration.java
View file @
4e085f32
...
@@ -9940,7 +9940,7 @@ if (MORE_BUTTONS) {
...
@@ -9940,7 +9940,7 @@ if (MORE_BUTTONS) {
focusingMotors
.
addToHistory
(
ts
,
focusMeasurementParameters
.
sensorTemperature
,
metrics
,
rFullResults
[
0
]);
focusingMotors
.
addToHistory
(
ts
,
focusMeasurementParameters
.
sensorTemperature
,
metrics
,
rFullResults
[
0
]);
// System.out.println("focusMeasurementParameters.lensDistanceWeightK="+focusMeasurementParameters.lensDistanceWeightK);
// System.out.println("focusMeasurementParameters.lensDistanceWeightK="+focusMeasurementParameters.lensDistanceWeightK);
// System.out.println("focusMeasurementParameters.lensDistanceWeightY="+focusMeasurementParameters.lensDistanceWeightY);
// System.out.println("focusMeasurementParameters.lensDistanceWeightY="+focusMeasurementParameters.lensDistanceWeightY);
if
(
debugLevel
>
0
){
if
(
(
debugLevel
>
0
)
&&
(
metrics
!=
null
)
){
// see if lens is calibrated
// see if lens is calibrated
double
[]
resolutions
={
1.0
/
metrics
[
1
][
6
],
1.0
/
metrics
[
5
][
6
],
1.0
/
metrics
[
2
][
6
]};
// R,G,B
double
[]
resolutions
={
1.0
/
metrics
[
1
][
6
],
1.0
/
metrics
[
5
][
6
],
1.0
/
metrics
[
2
][
6
]};
// R,G,B
double
fDistance
=
focusingMotors
.
focusingHistory
.
getLensDistance
(
double
fDistance
=
focusingMotors
.
focusingHistory
.
getLensDistance
(
...
...
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