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

isis/src/base/objs/ProcessImportPds/unitTest.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@ using namespace Isis;
		* @internal
		* @history 2012-05-08 Tracie Sucharski - Moved test data to /usgs/cpks/mer/testData and
		* /usgs/cpkgs/clementine1/testData. Added test for invalid label.z
		* @history 2018-01-25 Ian Humphrey - Moved .img file out of ISIS tree (since we are not
		* storing .img's on GitHub).
		*/
		void IsisMain() {

		@@ -111,7 +113,8 @@ void IsisMain() {
		cout << "Testing PDS file containing an ^IMAGE pointer and ^TABLE pointer" << endl;
		Isis::ProcessImportPds p;
		Isis::Pvl plab;
		p.SetPdsFile("data/pdsImageWithTables.lbl", "data/pdsImageWithTables.img", plab);
		p.SetPdsFile("data/pdsImageWithTables.lbl",
		"$ISIS3TESTDATA/isis/src/base/objs/ProcessImportPds/pdsImageWithTables.img", plab);
		p.SetOutputCube("TO");
		p.ImportTable("SUN_POSITION_TABLE");
		p.StartProcess();

isis/src/base/objs/ProcessImportVicar/unitTest.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		#include "ProcessImportVicar.h"
		#include "Application.h"
		#include "Cube.h"
		#include "FileName.h"
		#include "Statistics.h"

		using namespace Isis;
		@@ -16,7 +17,7 @@ void IsisMain() {

		ProcessImportVicar p;
		Pvl vlab;
		p.SetVicarFile("unitTest.img", vlab);
		p.SetVicarFile(FileName("$ISIS3TESTDATA/isis/src/base/objs/ProcessImportVicar/unitTest.img").expanded(), vlab);
		p.SetOutputCube("TO");
		p.StartProcess();
		p.EndProcess();

isis/src/control/apps/jigsaw/tsts/errors/Makefile

+10 −9

Original line number	Diff line number	Diff line
		@@ -15,14 +15,14 @@ include $(ISISROOT)/make/isismake.tsts

		commands:
		# TEST A: CAMSOLVE=None and SPSOLVE=None
		echo -e "Error Test A:" > $(OUTPUT)/error.txt;
		echo -e "Error Test A:" > $(OUTPUT)/error_temp.txt;
		if [[ `$(APPNAME) \
		fromlist=$(INPUT)/empty.lis \
		cnet=$(INPUT)/empty.net \
		onet=$(OUTPUT)/out.net \
		camsolve=None \
		spsolve=None \
		2>> $(OUTPUT)/error.txt \
		2>> $(OUTPUT)/error_temp.txt \
		> /dev/null` ]]; \
		then \
		true; \
		@@ -30,33 +30,33 @@ commands:
		# TEST B: exception occurs when performing bundle adjust
		# TODO: This still needs to be tested.
		# TEST C: SOLVETARGETBODY=yes and TBPARAMETERS file missing Target object
		echo -e "Error Test C:" >> $(OUTPUT)/error.txt;
		echo -e "Error Test C:" >> $(OUTPUT)/error_temp.txt;
		if [[ `$(APPNAME) \
		fromlist=$(INPUT)/empty.lis \
		cnet=$(INPUT)/empty.net \
		onet=$(OUTPUT)/out.net \
		solvetargetbody=yes \
		tbparameters=$(INPUT)/invalidTargetParameters.pvl \
		2>> $(OUTPUT)/error.txt \
		2>> $(OUTPUT)/error_temp.txt \
		> /dev/null` ]]; \
		then \
		true; \
		fi;
		# TEST D: SOLVETARGETBODY=yes and # of parameters to solve is 0
		echo -e "Error Test D:" >> $(OUTPUT)/error.txt;
		echo -e "Error Test D:" >> $(OUTPUT)/error_temp.txt;
		if [[ `$(APPNAME) \
		fromlist=$(INPUT)/empty.lis \
		cnet=$(INPUT)/empty.net \
		onet=$(OUTPUT)/out.net \
		solvetargetbody=yes \
		tbparameters=$(INPUT)/zeroTargetParameters.pvl \
		2>> $(OUTPUT)/error.txt \
		2>> $(OUTPUT)/error_temp.txt \
		> /dev/null` ]]; \
		then \
		true; \
		fi;
		# TEST F: CNET=[invalid control net file]
		echo -e "Error Test F:" >> $(OUTPUT)/error.txt;
		echo -e "Error Test F:" >> $(OUTPUT)/error_temp.txt;
		if [[ `$(APPNAME) \
		fromlist=$(INPUT)/empty.lis \
		cnet=$(INPUT)/notacnet.net \
		@@ -66,10 +66,11 @@ commands:
		point_radius_sigma=500 \
		spacecraft_position_sigma=500 \
		camera_angles_sigma=2 \
		2>> $(OUTPUT)/error.txt \
		2>> $(OUTPUT)/error_temp.txt \
		> /dev/null` ]]; \
		then \
		true; \
		fi;
		# Remove paths from errors file
		sed -i 's/$\[$\/.*$input$/\1\2/g' $(OUTPUT)/error.txt;
		$(SED) 's/$\[$\/.*$input$/\1\2/g' $(OUTPUT)/error_temp.txt > $(OUTPUT)/error.txt;
		$(RM) $(OUTPUT)/error_temp.txt;

isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -1354,14 +1354,14 @@ namespace Isis {
		switch ( protoPoint.type() ) {
		case ControlPointFileEntryV0002_PointType_obsolete_Tie:
		case ControlPointFileEntryV0002_PointType_Free:
		pointType = ControlPoint::PointType::Free;
		pointType = ControlPoint::Free;
		break;
		case ControlPointFileEntryV0002_PointType_Constrained:
		pointType = ControlPoint::PointType::Constrained;
		pointType = ControlPoint::Constrained;
		break;
		case ControlPointFileEntryV0002_PointType_obsolete_Ground:
		case ControlPointFileEntryV0002_PointType_Fixed:
		pointType = ControlPoint::PointType::Fixed;
		pointType = ControlPoint::Fixed;
		break;
		default:
		QString msg = "Unable to create ControlPoint [" + toString(protoPoint.id().c_str()) + "] from file. "
		@@ -1808,13 +1808,13 @@ namespace Isis {

		ControlPointFileEntryV0002_PointType pointType;
		switch ( controlPoint->GetType() ) {
		case ControlPoint::PointType::Free:
		case ControlPoint::Free:
		pointType = ControlPointFileEntryV0002_PointType_Free;
		break;
		case ControlPoint::PointType::Constrained:
		case ControlPoint::Constrained:
		pointType = ControlPointFileEntryV0002_PointType_Constrained;
		break;
		case ControlPoint::PointType::Fixed:
		case ControlPoint::Fixed:
		pointType = ControlPointFileEntryV0002_PointType_Fixed;
		break;
		default:
		@@ -1965,11 +1965,11 @@ namespace Isis {
		protoMeasure.set_serialnumber(controlMeasure.GetCubeSerialNumber().toLatin1().data());

		switch ( controlMeasure.GetType() ) {
		case (ControlMeasure::MeasureType::Candidate):
		case (ControlMeasure::Candidate):
		protoMeasure.set_type(ControlPointFileEntryV0002_Measure_MeasureType_Candidate);
		break;

		case (ControlMeasure::MeasureType::Manual):
		case (ControlMeasure::Manual):
		protoMeasure.set_type(ControlPointFileEntryV0002_Measure_MeasureType_Manual);
		break;

isis/src/control/objs/ControlNetVersioner/ControlNetVersioner.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -199,6 +199,7 @@ namespace Isis {
		* @history 2018-01-12 Adam Goins - Added the ControlPoint radii to the header to avoid
		* Target::GetRadii calls to speed up createPoint().
		* @history 2018-01-12 Adam Goins - Added Progress during reads.
		* @history 2018-01-24 Jesse Mapel - Fixed c++11 build warnings.
		*/
		class ControlNetVersioner {