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

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

+1 −2

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

	// Use the name supplied by the application if it is there		// Use the name supplied by the application if it is there
	if (pdsDataFile.length() > 0) {		if (pdsDataFile.length() > 0) {
	SetInputFile(pdsDataFile);		ProcessDataFilePointer(pdsXlater, false);
	ProcessDataFilePointer(pdsXlater, true);
	}		}
	// If the data is in JPEG 2000 format, then use the name of the file		// If the data is in JPEG 2000 format, then use the name of the file
	// from the label		// from the label

isis/src/base/objs/ProcessImportPds/ProcessImportPds.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -223,6 +223,8 @@ namespace Isis {
	* the default projection offsets and multipliers. Fixes #4887.		* the default projection offsets and multipliers. Fixes #4887.
	* @history 2017-12-20 Summer Stapleton - Modified error message in		* @history 2017-12-20 Summer Stapleton - Modified error message in
	* ProcessImportPds::ProcessLabel() to be more discriptive. Fixes #4883.		* ProcessImportPds::ProcessLabel() to be more discriptive. Fixes #4883.
			* @history 2018-01-19 Christopher Combs - Changed ProcessDataFilePointer call to reflect
			* changes made to voy2isis. Fixes #4345, #4421.
	*		*
	*/		*/
	class ProcessImportPds : public ProcessImport {		class ProcessImportPds : public ProcessImport {

isis/src/base/objs/PvlToPvlTranslationManager/PvlToPvlTranslationManager.cpp

+38 −27

Original line number	Original line	Diff line number	Diff line
	@@ -148,21 +148,32 @@ namespace Isis {
	PvlKeyword key;		PvlKeyword key;

	int inst = 0;		int inst = 0;
			PvlGroup transGroup;
	PvlKeyword grp;		PvlKeyword grp;

	while((grp = InputGroup(nName, inst++)).name() != "") {		while((grp = InputGroup(nName, inst++)).name() != "") {
	if((con = GetContainer(grp)) != NULL) {		if((con = GetContainer(grp)) != NULL) {
	if(con->hasKeyword(InputKeywordName(nName))) {		transGroup = TranslationTable().findGroup(nName);
			Pvl::ConstPvlKeywordIterator it = transGroup.findKeyword("InputKey",
			transGroup.begin(),
			transGroup.end());
			// Loop through potential InputKeys in the translation file group currently beginning
			// translated.
			while(it != transGroup.end()) {
			const PvlKeyword &result = *it;
			if(con->hasKeyword(result[0])) {
	key.setName(OutputName(nName));		key.setName(OutputName(nName));

	for(int v = 0; v < (*con)[(InputKeywordName(nName))].size(); v++) {		for(int v = 0; v < (*con)[(result[0])].size(); v++) {
	key.addValue(PvlTranslationTable::Translate(nName,		key.addValue(PvlTranslationTable::Translate(nName,
	(*con)[InputKeywordName(nName)][v]),		(*con)[result[0]][v]),
	(*con)[InputKeywordName(nName)].unit(v));		(*con)[result[0]].unit(v));
	}		}

	return key;		return key;
	}		}
			it = transGroup.findKeyword("InputKey", it + 1, transGroup.end());
			}
	}		}
	}		}

	@@ -209,7 +220,7 @@ namespace Isis {


	/**		/**
	* Returns the ith input value assiciated with the output name argument.		* Returns the ith input value associated with the output name argument.
	*		*
	* @param nName The output name used to identify the input keyword.		* @param nName The output name used to identify the input keyword.
	*		*

isis/src/base/objs/PvlToPvlTranslationManager/PvlToPvlTranslationManager.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -75,6 +75,8 @@ namespace Isis {
	* parent class, LabelTranslationManager. Fixes #4584.		* parent class, LabelTranslationManager. Fixes #4584.
	* @history 2017-06-13 Adam Paquette - Changed PvlTranslationManager file name to		* @history 2017-06-13 Adam Paquette - Changed PvlTranslationManager file name to
	* PvlToPvlTranslationManager. Fixes #4901.		* PvlToPvlTranslationManager. Fixes #4901.
			* @history 2018-01-10 Christopher Combs - Changed ProcessDataFilePointer call to reflect
			* changes made to voy2isis. Fixes #4345, #4421.
	* @todo 2005-02-15 Stuart Sides - add coded example and implementation example		* @todo 2005-02-15 Stuart Sides - add coded example and implementation example
	* to class documentation, and finish		* to class documentation, and finish
	* documentation		* documentation

isis/src/base/objs/PvlTranslationTable/PvlTranslationTable.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -234,7 +234,7 @@ namespace Isis {
	const PvlKeyword &key = *it;		const PvlKeyword &key = *it;
	// compare the value from the input file to the second value of each Translation in the trans file.		// compare the value from the input file to the second value of each Translation in the trans file.
	// ignore cases for input values		// ignore cases for input values
	if(QString::compare((QString) key[1], tmpFValue, Qt::CaseInsensitive) == 0) {		if((QString) key[1] == tmpFValue) {
	return key[0];		return key[0];
	}		}
	else if((QString) key[1] == "*") {		else if((QString) key[1] == "*") {