Merge pull request #136 from jessemapel/rosetta (ecc8c4e1) · Commits · aflab / astrogeology / ISIS3

isis/src/rosetta/objs/RosettaOsirisCamera/RosettaOsirisCamera.cpp

+19 −13

Original line number	Diff line number	Diff line
		@@ -56,6 +56,9 @@ namespace Isis {

		NaifStatus::CheckErrors();

		Pvl &lab = *cube.label();
		PvlGroup &inst = lab.findGroup("Instrument", Pvl::Traverse);

		// The Osiris focal length is fixed and is designed not to change throught the operational
		// temperature. For OSIRIS, the focal length is in mm, so we shouldn't need the unit conversion

		@@ -77,7 +80,12 @@ namespace Isis {
		// out the affine transforms from detector samp,line to focal plane x,y.
		CameraFocalPlaneMap *focalMap = new CameraFocalPlaneMap(this, naifIkCode());

		new CameraDetectorMap(this);
		CameraDetectorMap *detectorMap = new CameraDetectorMap(this);
		detectorMap->SetStartingDetectorSample((double) inst["FirstLineSample"]);
		// Because images are flipped on ingestion,
		// the first line on the label is actually the last line.
		detectorMap->SetStartingDetectorLine(2050 - cube.lineCount() - (double) inst["FirstLine"]);

		RosettaOsirisCameraDistortionMap* distortionMap = new RosettaOsirisCameraDistortionMap(this);

		// Setup the ground and sky map
		@@ -85,8 +93,6 @@ namespace Isis {
		new CameraSkyMap(this);

		// Setup clock start and stop times.
		Pvl &lab = *cube.label();
		PvlGroup &inst = lab.findGroup("Instrument", Pvl::Traverse);
		QString clockStartCount = inst["SpacecraftClockStartCount"];
		double start = getClockTime(clockStartCount).Et();
		// QString clockStopCount = inst["SpacecraftClockStopCount"];

+14 −13

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ namespace Isis {
		* @internal
		* @history 2015-05-21 Sasha Brownsberger - Original Version.
		* @history 2017-06-02 Jesse Mapel - Added a distortion map Fixes #4496.
		* @history 2017-04-11 Jesse Mapel - Added subwindowing. Fixes #5394.
		*/
		class RosettaOsirisCamera : public FramingCamera {
		public: