Skip to content

Commit

Permalink
Eye calibrator sample announcements now contain the correct values fo…
Browse files Browse the repository at this point in the history
…r sampled and desired data (previously they contained copies of the calibrated data)
  • Loading branch information
cstawarz committed Feb 5, 2015
1 parent 26834a8 commit 6d62079
Showing 1 changed file with 20 additions and 12 deletions.
32 changes: 20 additions & 12 deletions core/Core/Transforms/EyeCalibrators.cpp
Expand Up @@ -732,18 +732,26 @@ void EyeCalibrator::announceCalibrationSample(int outputIndex, Datum SampledData
announceData.addElement(CALIBRATOR_NAME,uniqueCalibratorName); // char
announceData.addElement(CALIBRATOR_ACTION,CALIBRATOR_ACTION_SAMPLE);

Datum temp(M_LIST, 2);
temp.setElement(0,sampledH);
temp.setElement(1,sampledV);
announceData.addElement(CALIBRATOR_SAMPLE_SAMPLED_HV,temp); // input values

temp.setElement(0,desiredH);
temp.setElement(1,desiredV);
announceData.addElement(CALIBRATOR_SAMPLE_DESIRED_HV,temp); // gold standard values

temp.setElement(0,calibratedH);
temp.setElement(1,calibratedV);
announceData.addElement(CALIBRATOR_SAMPLE_CALIBRATED_HV,temp); // values produced from input values using current calibration
{
Datum temp(M_LIST, 2);
temp.setElement(0,sampledH);
temp.setElement(1,sampledV);
announceData.addElement(CALIBRATOR_SAMPLE_SAMPLED_HV,temp); // input values
}

{
Datum temp(M_LIST, 2);
temp.setElement(0,desiredH);
temp.setElement(1,desiredV);
announceData.addElement(CALIBRATOR_SAMPLE_DESIRED_HV,temp); // gold standard values
}

{
Datum temp(M_LIST, 2);
temp.setElement(0,calibratedH);
temp.setElement(1,calibratedV);
announceData.addElement(CALIBRATOR_SAMPLE_CALIBRATED_HV,temp); // values produced from input values using current calibration
}

//announceData.addElement("JJDtest",desiredH); // values produced from input values using current calibration

Expand Down

0 comments on commit 6d62079

Please sign in to comment.