Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into dev (a7148572) · Commits · aflab / astrogeology / ISIS3

isis/src/base/objs/CameraPointInfo/CameraPointInfo.truth

+79 −78

Original line number	Diff line number	Diff line
		Group = GroundPoint
		Sample = 1.0
		Line = 1.0
		PixelValue = 0.014452569
		RightAscension = 261.12240102162 <DEGREE>
		Declination = 65.057158287883 <DEGREE>
		PlanetocentricLatitude = -84.741291512608 <DEGREE>
		PlanetographicLatitude = -84.741291512608 <DEGREE>
		PositiveEast360Longitude = 12.469820542285 <DEGREE>
		PositiveEast180Longitude = 12.469820542285 <DEGREE>
		PositiveWest360Longitude = 347.53017945771 <DEGREE>
		PositiveWest180Longitude = -12.469820542285 <DEGREE>
		BodyFixedCoordinate = (155.48143215269, 34.383491686879,
		-1730.0872983047) <km>
		LocalRadius = 1737400.0 <meters>
		SampleResolution = 187.48511798825 <meters/pixel>
		LineResolution = 187.48511798825 <meters/pixel>
		ObliqueDetectorResolution = 187.49354707291 <meters>
		ObliquePixelResolution = 187.49354707291 <meters/pix>
		ObliqueLineResolution = 187.49354707291 <meters>
		ObliqueSampleResolution = 187.49354707291 <meters>
		PixelValue = 21
		RightAscension = 254.44877411829 <DEGREE>
		Declination = 67.288137235407 <DEGREE>
		PlanetocentricLatitude = -85.539935681585 <DEGREE>
		PlanetographicLatitude = -85.539935681585 <DEGREE>
		PositiveEast360Longitude = 27.089555271673 <DEGREE>
		PositiveEast180Longitude = 27.089555271673 <DEGREE>
		PositiveWest360Longitude = 332.91044472833 <DEGREE>
		PositiveWest180Longitude = -27.089555271672 <DEGREE>
		BodyFixedCoordinate = (120.6493939079, 61.711663528734,
		-1737.3762050934) <km>
		LocalRadius = 1742653.345818 <meters>
		SampleResolution = 186.88473742666 <meters/pixel>
		LineResolution = 186.88473742666 <meters/pixel>
		ObliqueDetectorResolution = 187.44583818806 <meters>
		ObliquePixelResolution = 187.44583818806 <meters/pix>
		ObliqueLineResolution = 187.44583818806 <meters>
		ObliqueSampleResolution = 187.44583818806 <meters>

		# Spacecraft Information
		SpacecraftPosition = (216.76438021037, 54.256829538645,
		-2462.1179579968) <km>
		SpacecraftAzimuth = 211.304 <DEGREE>
		SlantDistance = 734.86014724525 <km>
		TargetCenterDistance = 2472.2369302253 <km>
		SubSpacecraftLatitude = -84.814280390523 <DEGREE>
		SubSpacecraftLongitude = 14.052595361351 <DEGREE>
		SpacecraftAltitude = 734.83693022532 <km>
		OffNadirAngle = 0.382 <DEGREE>
		SubSpacecraftGroundAzimuth = 117.656 <DEGREE>
		SpacecraftPosition = (216.77599432924, 54.260221515166,
		-2462.1104393388) <km>
		SpacecraftAzimuth = 38.331 <DEGREE>
		SlantDistance = 731.11938668312 <km>
		TargetCenterDistance = 2472.2305351357 <km>
		SubSpacecraftLatitude = -84.813985589411 <DEGREE>
		SubSpacecraftLongitude = 14.052715974499 <DEGREE>
		SpacecraftAltitude = 735.29826910549 <km>
		OffNadirAngle = 3.124 <DEGREE>
		SubSpacecraftGroundAzimuth = 296.906 <DEGREE>

		# Sun Information
		SunPosition = (142092302.24738, 46513072.418956,
		3175615.049146) <km>
		SubSolarAzimuth = 91.898 <DEGREE>
		SolarDistance = 0.99964723782732 <AU>
		SubSolarAzimuth = 92.425 <DEGREE>
		SolarDistance = 0.99964740327808 <AU>
		SubSolarLatitude = 1.2167758823866 <DEGREE>
		SubSolarLongitude = 18.125552305876 <DEGREE>
		SubSolarGroundAzimuth = 5.668 <DEGREE>
		SubSolarGroundAzimuth = 351.024 <DEGREE>

		# Illumination and Other
		Phase = 86.187914936426 <DEGREE>
		Incidence = 85.984352390204 <DEGREE>
		Emission = 0.543 <DEGREE>
		NorthAzimuth = 87.646 <DEGREE>
		Phase = 84.220811487257 <DEGREE>
		Incidence = 86.811870068915 <DEGREE>
		Emission = 4.434 <DEGREE>
		NorthAzimuth = 101.407 <DEGREE>

		# Time
		EphemerisTime = -182103311.79772 <seconds>
		UTC = 1994-03-25T19:43:48.0166464
		LocalSolarTime = 11.622951215761 <hour>
		LocalSolarTime = 12.59760019772 <hour>
		SolarLongitude = 129.01790468942 <DEGREE>

		# Look Direction Unit Vectors in Body Fixed, J2000, and Camera Coordinate Systems.
		LookDirectionBodyFixed = (-0.083394028492917, -0.027043700663677,
		0.99614962443708) <DEGREE>
		LookDirectionJ2000 = (-0.065080625277796, -0.41666190298971,
		0.90672894009756) <DEGREE>
		LookDirectionCamera = (0.0, 0.0, 1.0) <DEGREE>
		LookDirectionBodyFixed = (-0.13147866432244, 0.010191826600814,
		0.99126660767854) <DEGREE>
		LookDirectionJ2000 = (-0.10351254426163, -0.37196246815074,
		0.92245817003683) <DEGREE>
		LookDirectionCamera = (-0.0488021669, -0.0365697261,
		0.9981387697) <DEGREE>
		End_Group
		Group = GroundPoint
		Sample = 0.90348451909767
		Line = 1.1397670004594
		PixelValue = 0.014452569
		RightAscension = 262.28734450187 <DEGREE>
		Declination = 65.692832609474 <DEGREE>
		Sample = 155.47884244269
		Line = 184.71817081965
		PixelValue = 29
		RightAscension = 262.28855950942 <DEGREE>
		Declination = 65.693319737566 <DEGREE>
		PlanetocentricLatitude = -84.5 <DEGREE>
		PlanetographicLatitude = -84.5 <DEGREE>
		PositiveEast360Longitude = 15.0 <DEGREE>
		PositiveEast180Longitude = 15.0 <DEGREE>
		PositiveWest360Longitude = 345.0 <DEGREE>
		PositiveWest180Longitude = -15.0 <DEGREE>
		BodyFixedCoordinate = (160.84829688893, 43.09917125531,
		-1729.4013550431) <km>
		LocalRadius = 1737400.0 <meters>
		SampleResolution = 187.50339379912 <meters/pixel>
		LineResolution = 187.50339379912 <meters/pixel>
		ObliqueDetectorResolution = 187.53783505388 <meters>
		ObliquePixelResolution = 187.53783505388 <meters/pix>
		ObliqueLineResolution = 187.53783505388 <meters>
		ObliqueSampleResolution = 187.53783505388 <meters>
		BodyFixedCoordinate = (160.94807486378, 43.125906683093,
		-1730.4741433054) <km>
		LocalRadius = 1738477.7500095 <meters>
		SampleResolution = 187.58212566559 <meters/pixel>
		LineResolution = 187.58212566559 <meters/pixel>
		ObliqueDetectorResolution = 187.61662252249 <meters>
		ObliquePixelResolution = 187.61662252249 <meters/pix>
		ObliqueLineResolution = 187.61662252249 <meters>
		ObliqueSampleResolution = 187.61662252249 <meters>

		# Spacecraft Information
		SpacecraftPosition = (216.76438021037, 54.256829538645,
		-2462.1179579968) <km>
		SpacecraftAzimuth = 281.045 <DEGREE>
		SlantDistance = 734.93178063402 <km>
		TargetCenterDistance = 2472.2369302253 <km>
		SubSpacecraftLatitude = -84.814280390523 <DEGREE>
		SubSpacecraftLongitude = 14.052595361351 <DEGREE>
		SpacecraftAltitude = 734.83693022532 <km>
		OffNadirAngle = 0.772 <DEGREE>
		SubSpacecraftGroundAzimuth = 195.208 <DEGREE>
		SpacecraftPosition = (216.77599432924, 54.260221515166,
		-2462.1104393388) <km>
		SpacecraftAzimuth = 284.604 <DEGREE>
		SlantDistance = 733.84767049682 <km>
		TargetCenterDistance = 2472.2305351357 <km>
		SubSpacecraftLatitude = -84.813985589411 <DEGREE>
		SubSpacecraftLongitude = 14.052715974499 <DEGREE>
		SpacecraftAltitude = 735.29826910549 <km>
		OffNadirAngle = 0.773 <DEGREE>
		SubSpacecraftGroundAzimuth = 195.221 <DEGREE>

		# Sun Information
		SunPosition = (142092302.24738, 46513072.418956,
		3175615.049146) <km>
		SubSolarAzimuth = 91.887 <DEGREE>
		SolarDistance = 0.99964718552167 <AU>
		SubSolarAzimuth = 92.516 <DEGREE>
		SolarDistance = 0.99964718498476 <AU>
		SubSolarLatitude = 1.2167758823866 <DEGREE>
		SubSolarLongitude = 18.125552305876 <DEGREE>
		SubSolarGroundAzimuth = 3.134 <DEGREE>

		# Illumination and Other
		Phase = 86.799461484504 <DEGREE>
		Incidence = 85.725629389695 <DEGREE>
		Emission = 1.098 <DEGREE>
		NorthAzimuth = 89.531 <DEGREE>
		Phase = 86.800051779927 <DEGREE>
		Incidence = 85.72563003251 <DEGREE>
		Emission = 1.099 <DEGREE>
		NorthAzimuth = 89.382 <DEGREE>

		# Time
		EphemerisTime = -182103311.79772 <seconds>
		UTC = 1994-03-25T19:43:48.0166464
		LocalSolarTime = 11.791629991401 <hour>
		LocalSolarTime = 11.791629846611 <hour>
		SolarLongitude = 129.01790468942 <DEGREE>

		# Look Direction Unit Vectors in Body Fixed, J2000, and Camera Coordinate Systems.
		LookDirectionBodyFixed = (-0.07608335898211, -0.015181885902405,
		0.99698587393526) <DEGREE>
		LookDirectionJ2000 = (-0.055242605204482, -0.4079045962425,
		0.91135179537568) <DEGREE>
		LookDirectionCamera = (-0.0094547053, 0.0102687345,
		0.9999025761) <DEGREE>
		LookDirectionBodyFixed = (-0.076075624316564, -0.015172515119546,
		0.99698660681566) <DEGREE>
		LookDirectionJ2000 = (-0.055232924372436, -0.40789809729026,
		0.9113552909224) <DEGREE>
		LookDirectionCamera = (-0.0094616465, 0.0102787327,
		0.9999024077) <DEGREE>
		End_Group

isis/src/clementine/objs/UvvisCamera/UvvisCamera.truth

+1 −1

Original line number	Diff line number	Diff line
		Unit Test for UvvisCamera...
		FileName: lub0428b.cub
		CK Frame: -40002
		CK Frame: -40022

		Kernel IDs:
		CK Frame ID = -40000

isis/src/clementine/objs/UvvisCamera/unitTest.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -45,8 +45,10 @@ int main(void) {
		// These should be lat/lon at center of image. To obtain these numbers for a new cube/camera,
		// set both the known lat and known lon to zero and copy the unit test output "Latitude off by: "
		// and "Longitude off by: " values directly into these variables.
		double knownLat = -78.45421507741148;
		double knownLon = 126.8232718994049;
		// double knownLat = -78.45421507741148;
		// double knownLon = 126.8232718994049;
		double knownLat = -78.5596210979503127;
		double knownLon = 126.7917803447135014;

		Cube c("$clementine1/testData/lub0428b.cub", "r");
		UvvisCamera cam = (UvvisCamera ) CameraFactory::Create(c);

isis/src/qisis/objs/MosaicSceneWidget/ControlPointGraphicsItem.cpp

+11 −17

Original line number	Diff line number	Diff line
		@@ -50,20 +50,15 @@ namespace Isis {

		// Providing a width of 0 makes pens cosmetic (i.e. always appear as 1 pixel on screen)
		if (cp->IsIgnored()) {
		setPen(QPen(Qt::red, 0.0));
		setPen(QPen(Qt::yellow, 0.0));
		}
		else if (cp->IsEditLocked()) {
		else if ( (cp->GetType() == ControlPoint::Fixed)
		\|\| (cp->GetType() == ControlPoint::Constrained) ) {
		setPen(QPen(Qt::magenta, 0.0));
		}
		else if (cp->GetType() == ControlPoint::Fixed) {
		setPen(QPen(Qt::green, 0.0));
		}
		else if (cp->GetType() == ControlPoint::Constrained) {
		else { // Free and editLocked
		setPen(QPen(Qt::darkGreen, 0.0));
		}
		else {// Free
		setPen(QPen(Qt::blue, 0.0));
		}

		setBrush(Qt::NoBrush);

		@@ -374,4 +369,3 @@ namespace Isis {


		}

isis/src/qisis/objs/MosaicSceneWidget/ControlPointGraphicsItem.h

+9 −5

Original line number	Diff line number	Diff line
		@@ -35,6 +35,11 @@ namespace Isis {
		* Fixes #4479.
		* @history 2017-08-02 Tracie Sucharski - Draw the current edit Control Point as a circle with
		* center crosshair in red. Fixes #5007, #5008.
		* @history 2018-05-01 Kaitlyn Lee - Changed colors of control points to match qnet.
		* Colors Changed: free from blue to darkGreen, locked from magenta
		* to darkGreen, ignored from red to yellow,
		* and constrained (was dark green) and fixed (was green)
		* are now both represented with magenta. Fixes #5401.
		*
		*/
		class ControlPointGraphicsItem : public QGraphicsRectItem {
		@@ -78,4 +83,3 @@ namespace Isis {
		}

		#endif