Commit 686c6988 authored Jul 18, 2016 by Marjorie Hahn

PROG Reverse commited revision r6912 (Ticket #2149)

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6916 41f8697f-d340-4b68-9986-7bafba869bb8

parent b270407c

isis/src/control/apps/cnetref/tsts/resolutionHigh/Makefile

+0 −6

Original line number	Diff line number	Diff line
		@@ -15,9 +15,3 @@ commands:
		networkid=DefaultTruth \
		Description=RefByResolutionHigh > /dev/null;
		$(RM) $(OUTPUT)/cube.lis;
		$(APPNAME) fromlist=$(INPUT)/apolloList.lis \
		cnet=$(INPUT)/apolloSeed.net \
		criteria=resolution \
		type=high \
		onet=$(OUTPUT)/apolloTruth.net > /dev/null;
		# cnetref fromlist=/home/acpaquette/REV71.lis cnet=/home/acpaquette/AS15-REV71_Add-SPLT10.net onet=/home/acpaquette/temp.net criteria=resolution
		No newline at end of file

isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.cpp

+4 −6

Original line number	Diff line number	Diff line
		@@ -208,13 +208,11 @@ namespace Isis {

		if (measureCamera != NULL) {
		measureCamera->SetImage(pSample, pLine);
		bool success = measureCamera->SetImage(pSample, pLine);
		if (success) {

		mdEmissionAngle = measureCamera->EmissionAngle();
		mdIncidenceAngle = measureCamera->IncidenceAngle();
		mdResolution = measureCamera->PixelResolution();
		}
		}

		if (pMeasure != NULL) {
		double temp = pMeasure->GetSampleResidual();

isis/src/control/objs/ControlNetValidMeasure/ControlNetValidMeasure.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -74,9 +74,6 @@ namespace Isis {
		* Fixes #1436.
		* @history 2014-03-03 Janet Barrett - Initialize the mdDnValue variable in
		* the ValidStandardOptions method. Fixes #2040.
		* @history 2016-07-13 Adam Paquette - Updated ValidStandardOptions to only
		* get the EmissionAngle, IncidenceAngle, and PixelResolution
		* if an image was properly set.
		*/

		class ControlNetValidMeasure {