Merge branch 'qview_fix' of github.com:AgoinsUSGS/ISIS3 into qview_fix (135afab5) · Commits · aflab / astrogeology / ISIS3

isis/src/base/apps/isis2pds/isis2pds.cpp

+39 −30

Original line number	Diff line number	Diff line
		@@ -38,11 +38,13 @@ void IsisMain() {
		p.SetInputCube("FROM");

		if (ui.GetString("STRETCH") == "LINEAR") {
		if(ui.GetString("BITTYPE") != "32BIT")
		if (ui.GetString("BITTYPE") != "32BIT") {
		p.SetInputRange();
		}
		if(ui.GetString("STRETCH") == "MANUAL")
		}
		if (ui.GetString("STRETCH") == "MANUAL") {
		p.SetInputRange(ui.GetDouble("MINIMUM"), ui.GetDouble("MAXIMUM"));
		}

		double min = -DBL_MAX;
		double max = DBL_MAX;
		@@ -75,13 +77,16 @@ void IsisMain() {
		setRangeAndPixels(ui, p, min, max, NONE);
		}

		if(ui.GetString("ENDIAN") == "MSB")
		if (ui.GetString("ENDIAN") == "MSB") {
		p.SetOutputEndian(Isis::Msb);
		else if(ui.GetString("ENDIAN") == "LSB")
		}
		else if (ui.GetString("ENDIAN") == "LSB") {
		p.SetOutputEndian(Isis::Lsb);
		}

		if(ui.GetString("LABTYPE") == "FIXED")
		if (ui.GetString("LABTYPE") == "FIXED") {
		p.SetExportType(ProcessExportPds::Fixed);
		}

		if (ui.GetBoolean("CHECKSUM")) {
		p.setCanGenerateChecksum(true);
		@@ -130,11 +135,13 @@ void IsisMain() {
		QString outFileName(outFile.expanded());

		if (ui.GetString("STRETCH") == "LINEAR") {
		if(ui.GetString("BITTYPE") != "32BIT")
		if (ui.GetString("BITTYPE") != "32BIT") {
		process.SetInputRange();
		}
		if(ui.GetString("STRETCH") == "MANUAL")
		}
		if (ui.GetString("STRETCH") == "MANUAL") {
		process.SetInputRange(ui.GetDouble("MINIMUM"), ui.GetDouble("MAXIMUM"));
		}

		double min = -DBL_MAX;
		double max = DBL_MAX;
		@@ -167,10 +174,12 @@ void IsisMain() {
		setRangeAndPixels(ui, process, min, max, NONE);
		}

		if(ui.GetString("ENDIAN") == "MSB")
		if (ui.GetString("ENDIAN") == "MSB") {
		process.SetOutputEndian(Isis::Msb);
		else if(ui.GetString("ENDIAN") == "LSB")
		}
		else if (ui.GetString("ENDIAN") == "LSB") {
		process.SetOutputEndian(Isis::Lsb);
		}

		// Records what it did to the print.prt file
		PvlGroup results("DNs Used");

isis/src/base/apps/isis2pds/tsts/pds4/Makefile

+10 −1

Original line number	Diff line number	Diff line
		@@ -7,8 +7,17 @@ commands:

		# Remove parts of output that can occur in any order and convert to txt for comparison
		$(SED) 's+\Product_Observational.*>+\Product_Observational>+' \
		$(OUTPUT)/dawnEqui.xml > $(OUTPUT)/dawnEqui.txt;
		$(OUTPUT)/dawnEqui.xml \
		> $(OUTPUT)/tempLabel1.txt;
		$(SED) 's+\modification_date.*>+\modification_date>+' \
		$(OUTPUT)/tempLabel1.txt \
		> $(OUTPUT)/tempLabel2.txt;
		$(SED) 's+\ISIS version.*<+\ISIS version.<+' \
		$(OUTPUT)/tempLabel2.txt \
		> $(OUTPUT)/dawnEqui.txt;

		$(RM) $(OUTPUT)/dawnEqui.xml > /dev/null;
		$(RM) $(OUTPUT)/tempLabel1.txt > /dev/null;
		$(RM) $(OUTPUT)/tempLabel2.txt > /dev/null;
		$(RM) $(OUTPUT)/dawnEqui.img > /dev/null;

isis/src/base/apps/stats/tsts/default/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,6 @@ commands:
		> /dev/null;

		$(APPNAME) from=$(INPUT)/isisTruth.cub \
		\| grep -v stats \
		\| grep -v "stats:" \
		\| grep -v Processed \
		>& $(OUTPUT)/output.pvl;

isis/src/base/objs/LabelTranslationManager/LabelTranslationManager.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -105,18 +105,18 @@ namespace Isis {
		* Creates all parent PVL containers for an output keyword. If any parent
		* containers already exist then they will not be recreated.
		*
		* @param nName The name of the output keyword. The OutputPosition keyword
		* in the translation group for nName will be used to determine
		* @param translationGroupName The name of the output keyword. The OutputPosition keyword
		* in the translation group for translationGroupName will be used to determine
		* which containers are made.
		* @param pvl The PVL file to create the containers in.
		*
		* @return @b PvlContainer The immediate parent container for nName.
		* @return @b PvlContainer The immediate parent container for translationGroupName.
		*/
		PvlContainer *LabelTranslationManager::CreateContainer(const QString nName,
		PvlContainer *LabelTranslationManager::CreateContainer(const QString translationGroupName,
		Pvl &pvl) {

		// Get the array of Objects/Groups from the OutputName keyword
		PvlKeyword np = OutputPosition(nName);
		PvlKeyword np = OutputPosition(translationGroupName);

		PvlObject *obj = &pvl;

isis/src/base/objs/LabelTranslationManager/LabelTranslationManager.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ namespace Isis {

		// Attempt to translate the requested output name to output value
		// using the input name and value/default value
		virtual QString Translate(QString nName, int findex = 0) = 0;
		virtual QString Translate(QString translationGroupName, int findex = 0) = 0;

		// Translate all translation table groups which contain "Auto"
		virtual void Auto(Pvl &outputLabel);
		@@ -76,8 +76,8 @@ namespace Isis {
		virtual QStringList parseSpecification(QString specification) const;
		protected:

		virtual PvlKeyword DoTranslation(const QString nName);
		virtual PvlContainer *CreateContainer(const QString nName, Pvl &pvl);
		virtual PvlKeyword DoTranslation(const QString translationGroupName);
		virtual PvlContainer *CreateContainer(const QString translationGroupName, Pvl &pvl);
		};
		};