Loading isis/src/apollo/objs/ApolloPanTile/ApolloPanTile.cpp +1 −150 Original line number Original line Diff line number Diff line Loading @@ -528,156 +528,7 @@ namespace Isis { * @TODO save rejected marks. * @TODO save rejected marks. */ */ PvlObject ApolloPanTile::toPvlNew() { PvlObject ApolloPanTile::toPvlNew() { return toPvl(); // Create Fiducial Mark group PvlKeyword fiducialNumber("Number"); PvlKeyword fiducialLine("Line"); PvlKeyword fiducialSample("Sample"); PvlKeyword fiducialValid("Valid"); PvlKeyword fiducialLength("Length"); PvlKeyword fiducialHeight("Height"); PvlKeyword fiducialCalibratedX("Calibrated_X"); PvlKeyword fiducialCalibratedY("Calibrated_Y"); PvlKeyword fiducialResidualX("Residual_X"); PvlKeyword fiducialResidualY("Residual_Y"); PvlKeyword fiducialResidualMagnitude("Residual_Magnitude"); for (size_t i = 0; i < m_fiducialMarks.size(); i++) { fiducialNumber += QString::number(m_fiducialMarks[i].number()); fiducialLine += QString::number(m_fiducialMarks[i].line()); fiducialSample += QString::number(m_fiducialMarks[i].sample()); fiducialValid += QString::number(m_fiducialMarks[i].valid()); fiducialLength += QString::number(m_fiducialMarks[i].length()); fiducialHeight += QString::number(m_fiducialMarks[i].height()); fiducialCalibratedX += QString::number(m_fiducialMarks[i].calibratedX()); fiducialCalibratedY += QString::number(m_fiducialMarks[i].calibratedY()); fiducialResidualX += QString::number(m_fiducialMarks[i].residualX()); fiducialResidualY += QString::number(m_fiducialMarks[i].residualY()); fiducialResidualMagnitude += QString::number(m_fiducialMarks[i].residualMagnitude()); } QString str = "Fiducial_Marks"; PvlGroup fiducialGroup(str); fiducialGroup += fiducialNumber; fiducialGroup += fiducialLine; fiducialGroup += fiducialSample; fiducialGroup += fiducialValid; fiducialGroup += fiducialLength; fiducialGroup += fiducialHeight; fiducialGroup += fiducialCalibratedX; fiducialGroup += fiducialCalibratedY; fiducialGroup += fiducialResidualX; fiducialGroup += fiducialResidualY; fiducialGroup += fiducialResidualMagnitude; // Create Timing Mark group PvlKeyword timingNumber("Number"); PvlKeyword timingLine("Line"); PvlKeyword timingSample("Sample"); PvlKeyword timingLength("Length"); PvlKeyword timingHeight("Height"); PvlKeyword timingValid("Valid"); PvlKeyword timingValue("Value"); for (size_t i = 0; i < m_timingMarks.size(); i++) { TimingMark tm = m_timingMarks[i]; timingNumber += QString::number(m_timingMarks[i].number()); timingLine += QString::number((m_timingMarks[i].topLine() + m_timingMarks[i].bottomLine())/2); timingSample += QString::number(m_timingMarks[i].leftSample()); timingLength += QString::number(m_timingMarks[i].length()); timingHeight += QString::number(m_timingMarks[i].height()); timingValid += QString::number(m_timingMarks[i].valid()); timingValue += QString::number(m_timingMarks[i].value()); } str = "Timing_Marks"; PvlGroup timingGroup(str); timingGroup += timingNumber; timingGroup += timingLine; timingGroup += timingSample; timingGroup += timingLength; timingGroup += timingHeight; timingGroup += timingValid; timingGroup += timingValue; // Create trimming group str = "Trimming"; PvlGroup trimmingGroup(str); trimmingGroup += PvlKeyword("Top_Trim", QString::number(m_topTrim)); trimmingGroup += PvlKeyword("Bottom_Trim", QString::number(m_bottomTrim)); trimmingGroup += PvlKeyword("Left_Trim", QString::number(m_leftTrim)); trimmingGroup += PvlKeyword("Right_Trim", QString::number(m_rightTrim)); // Create results object that wraps everything PvlObject results("AS15-P-" + m_imageNumber + "_000" + QString::number(m_tileNumber)); str = "General"; PvlGroup generalGroup(str); generalGroup += PvlKeyword("Rows", QString::number(m_rows)); generalGroup += PvlKeyword("Columns", QString::number(m_columns)); generalGroup += PvlKeyword("Timing_Offset", QString::number(m_timingOffset)); generalGroup += PvlKeyword("Sample_Offset", QString::number(m_sampleOffset)); PvlKeyword affineX("Affine_X"); for (size_t i = 0; i < m_transX.size(); i++) { affineX += QString::number(m_transX[i]); } generalGroup += affineX; PvlKeyword affineY("Affine_Y"); for (size_t i = 0; i < m_transY.size(); i++) { affineY += QString::number(m_transY[i]); } generalGroup += affineY; generalGroup += m_leftClockCount; generalGroup += m_rightClockCount; generalGroup += m_leftTime; generalGroup += m_rightTime; PvlKeyword etimes("Ephemeris_Time"); for (size_t i = 0; i < m_etimes.size(); i++) { etimes += QString::number(m_etimes[i],'f',5); } generalGroup += etimes; PvlKeyword exptimes("Exposure_Time"); for (size_t i = 0; i < m_exptimes.size(); i++) { exptimes += QString::number(m_exptimes[i],'g',16); } generalGroup += exptimes; PvlKeyword expSampleTimes("Exposure_Sample"); for (size_t i = 0; i < m_expSampleTimes.size(); i++) { expSampleTimes += QString::number(m_expSampleTimes[i]); } generalGroup += expSampleTimes; // set values for first sample in image in fiducial space PvlKeyword ephemerisTime("Ephemeris_Time", toString(m_stopTime)); PvlKeyword exposureTime("Exposure_Time", toString(m_timingMarks[0].exposureTime())); // TODO: describe better - to handle tile 8 // double expSamp1 = 0.5 * m_transY[0] + 0.5 * m_transY[1] + m_transY[2]; // if (expSamp1 <= 0.0) // expSamp1 = 1.0; // PvlKeyword exposureSample("Exposure_Sample", toString((int)(expSamp1))); // PvlKeyword exposureSample("Exposure_Sample", "1"); // for (int i = 0; i < (int)m_timingMarks.size() - 1; i++) { // ephemerisTime += toString(m_timingMarks[i].time()); // exposureTime += toString(m_timingMarks[i+1].exposureTime()); // exposureSample += QString::number(m_timingMarks[i].rightSample()); // exposureSample += QString::number((int)(m_timingMarks[i].rightSampleFiducialSpace())); // } // generalGroup += ephemerisTime; // generalGroup += exposureTime; // generalGroup += exposureSample; results += generalGroup; results += trimmingGroup; results += fiducialGroup; results += timingGroup; return results; } } Loading Loading
isis/src/apollo/objs/ApolloPanTile/ApolloPanTile.cpp +1 −150 Original line number Original line Diff line number Diff line Loading @@ -528,156 +528,7 @@ namespace Isis { * @TODO save rejected marks. * @TODO save rejected marks. */ */ PvlObject ApolloPanTile::toPvlNew() { PvlObject ApolloPanTile::toPvlNew() { return toPvl(); // Create Fiducial Mark group PvlKeyword fiducialNumber("Number"); PvlKeyword fiducialLine("Line"); PvlKeyword fiducialSample("Sample"); PvlKeyword fiducialValid("Valid"); PvlKeyword fiducialLength("Length"); PvlKeyword fiducialHeight("Height"); PvlKeyword fiducialCalibratedX("Calibrated_X"); PvlKeyword fiducialCalibratedY("Calibrated_Y"); PvlKeyword fiducialResidualX("Residual_X"); PvlKeyword fiducialResidualY("Residual_Y"); PvlKeyword fiducialResidualMagnitude("Residual_Magnitude"); for (size_t i = 0; i < m_fiducialMarks.size(); i++) { fiducialNumber += QString::number(m_fiducialMarks[i].number()); fiducialLine += QString::number(m_fiducialMarks[i].line()); fiducialSample += QString::number(m_fiducialMarks[i].sample()); fiducialValid += QString::number(m_fiducialMarks[i].valid()); fiducialLength += QString::number(m_fiducialMarks[i].length()); fiducialHeight += QString::number(m_fiducialMarks[i].height()); fiducialCalibratedX += QString::number(m_fiducialMarks[i].calibratedX()); fiducialCalibratedY += QString::number(m_fiducialMarks[i].calibratedY()); fiducialResidualX += QString::number(m_fiducialMarks[i].residualX()); fiducialResidualY += QString::number(m_fiducialMarks[i].residualY()); fiducialResidualMagnitude += QString::number(m_fiducialMarks[i].residualMagnitude()); } QString str = "Fiducial_Marks"; PvlGroup fiducialGroup(str); fiducialGroup += fiducialNumber; fiducialGroup += fiducialLine; fiducialGroup += fiducialSample; fiducialGroup += fiducialValid; fiducialGroup += fiducialLength; fiducialGroup += fiducialHeight; fiducialGroup += fiducialCalibratedX; fiducialGroup += fiducialCalibratedY; fiducialGroup += fiducialResidualX; fiducialGroup += fiducialResidualY; fiducialGroup += fiducialResidualMagnitude; // Create Timing Mark group PvlKeyword timingNumber("Number"); PvlKeyword timingLine("Line"); PvlKeyword timingSample("Sample"); PvlKeyword timingLength("Length"); PvlKeyword timingHeight("Height"); PvlKeyword timingValid("Valid"); PvlKeyword timingValue("Value"); for (size_t i = 0; i < m_timingMarks.size(); i++) { TimingMark tm = m_timingMarks[i]; timingNumber += QString::number(m_timingMarks[i].number()); timingLine += QString::number((m_timingMarks[i].topLine() + m_timingMarks[i].bottomLine())/2); timingSample += QString::number(m_timingMarks[i].leftSample()); timingLength += QString::number(m_timingMarks[i].length()); timingHeight += QString::number(m_timingMarks[i].height()); timingValid += QString::number(m_timingMarks[i].valid()); timingValue += QString::number(m_timingMarks[i].value()); } str = "Timing_Marks"; PvlGroup timingGroup(str); timingGroup += timingNumber; timingGroup += timingLine; timingGroup += timingSample; timingGroup += timingLength; timingGroup += timingHeight; timingGroup += timingValid; timingGroup += timingValue; // Create trimming group str = "Trimming"; PvlGroup trimmingGroup(str); trimmingGroup += PvlKeyword("Top_Trim", QString::number(m_topTrim)); trimmingGroup += PvlKeyword("Bottom_Trim", QString::number(m_bottomTrim)); trimmingGroup += PvlKeyword("Left_Trim", QString::number(m_leftTrim)); trimmingGroup += PvlKeyword("Right_Trim", QString::number(m_rightTrim)); // Create results object that wraps everything PvlObject results("AS15-P-" + m_imageNumber + "_000" + QString::number(m_tileNumber)); str = "General"; PvlGroup generalGroup(str); generalGroup += PvlKeyword("Rows", QString::number(m_rows)); generalGroup += PvlKeyword("Columns", QString::number(m_columns)); generalGroup += PvlKeyword("Timing_Offset", QString::number(m_timingOffset)); generalGroup += PvlKeyword("Sample_Offset", QString::number(m_sampleOffset)); PvlKeyword affineX("Affine_X"); for (size_t i = 0; i < m_transX.size(); i++) { affineX += QString::number(m_transX[i]); } generalGroup += affineX; PvlKeyword affineY("Affine_Y"); for (size_t i = 0; i < m_transY.size(); i++) { affineY += QString::number(m_transY[i]); } generalGroup += affineY; generalGroup += m_leftClockCount; generalGroup += m_rightClockCount; generalGroup += m_leftTime; generalGroup += m_rightTime; PvlKeyword etimes("Ephemeris_Time"); for (size_t i = 0; i < m_etimes.size(); i++) { etimes += QString::number(m_etimes[i],'f',5); } generalGroup += etimes; PvlKeyword exptimes("Exposure_Time"); for (size_t i = 0; i < m_exptimes.size(); i++) { exptimes += QString::number(m_exptimes[i],'g',16); } generalGroup += exptimes; PvlKeyword expSampleTimes("Exposure_Sample"); for (size_t i = 0; i < m_expSampleTimes.size(); i++) { expSampleTimes += QString::number(m_expSampleTimes[i]); } generalGroup += expSampleTimes; // set values for first sample in image in fiducial space PvlKeyword ephemerisTime("Ephemeris_Time", toString(m_stopTime)); PvlKeyword exposureTime("Exposure_Time", toString(m_timingMarks[0].exposureTime())); // TODO: describe better - to handle tile 8 // double expSamp1 = 0.5 * m_transY[0] + 0.5 * m_transY[1] + m_transY[2]; // if (expSamp1 <= 0.0) // expSamp1 = 1.0; // PvlKeyword exposureSample("Exposure_Sample", toString((int)(expSamp1))); // PvlKeyword exposureSample("Exposure_Sample", "1"); // for (int i = 0; i < (int)m_timingMarks.size() - 1; i++) { // ephemerisTime += toString(m_timingMarks[i].time()); // exposureTime += toString(m_timingMarks[i+1].exposureTime()); // exposureSample += QString::number(m_timingMarks[i].rightSample()); // exposureSample += QString::number((int)(m_timingMarks[i].rightSampleFiducialSpace())); // } // generalGroup += ephemerisTime; // generalGroup += exposureTime; // generalGroup += exposureSample; results += generalGroup; results += trimmingGroup; results += fiducialGroup; results += timingGroup; return results; } } Loading