merge dev into clone branch (76293c85) · Commits · aflab / astrogeology / ISIS3

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

+19 −13

Original line number	Diff line number	Diff line
		@@ -35,11 +35,9 @@ using namespace std;
		namespace Isis {

		/**
		* Constructs and initializes a PvlTranslationTable object
		*
		* @param transFile The translation file to be used
		* Constructs and initializes a PvlTranslationTable object.
		*
		* @throws IException::Io
		* @param transFile The translation file to be used.
		*/
		PvlTranslationTable::PvlTranslationTable(FileName transFile) {
		AddTable(transFile.expanded());
		@@ -95,11 +93,9 @@ namespace Isis {


		/**
		* Adds the contents of a translation table to the searchable groups/keys
		* Adds the contents of a translation table to the searchable groups/keys.
		*
		* @param transFile The name of the translation file to be added.
		*
		* @throws IException::Io
		*/
		void PvlTranslationTable::AddTable(const QString &transFile) {
		p_trnsTbl.read(FileName(transFile).expanded());
		@@ -109,9 +105,15 @@ namespace Isis {
		/**
		* Adds the contents of a translation table to the searchable groups/keys
		* Also performs a verification, to ensure that the translation table
		* is valid
		* is valid.
		*
		* @param transStm The stream to be added.
		*
		* @throws IException::User - "Unable to find InputKey for group
		in translation file."
		* @throws IException::User - "Keyword is not valid. Error in file."
		* @throws IException::User - "Keyword does not have correct number of elements.
		Error in file."
		*/
		void PvlTranslationTable::AddTable(std::istream &transStm) {
		transStm >> p_trnsTbl;
		@@ -223,7 +225,9 @@ namespace Isis {
		* @return QString The translated value, for the
		* output keyword.
		*
		* @throws IException::Programmer
		* @throws IException::Programmer - "No value or default value to translate
		for translation group."
		* @throws IException::Programmer - "Unable to find translation value in file."
		*/
		QString PvlTranslationTable::Translate(const QString translationGroupName,
		const QString inputKeyValue) const {
		@@ -291,7 +295,8 @@ namespace Isis {
		*
		* @return QString The input group name
		*
		* @throws IException::Programmer
		* @throws IException::Programmer - "Keyword [InputPosition] cannot have a comma [,]
		in the value."
		*/
		PvlKeyword PvlTranslationTable::InputGroup(const QString translationGroupName,
		const int inst) const {
		@@ -388,9 +393,7 @@ namespace Isis {
		* translated. Often, this is the
		* same as the output keyword name.
		*
		* @return QString The input default value
		*
		* @throws IException::Programmer
		* @return QString The input default value.
		*/
		QString PvlTranslationTable::InputDefault(const QString translationGroupName) const {

		@@ -489,6 +492,9 @@ namespace Isis {
		*
		* @return PvlKeyword The OutputPosition keyword from the given
		* translation group.
		*
		* @throws IException::Programmer - "Unable to find translation keyword [OutputPostion]
		in translation group in file."
		*/
		PvlKeyword PvlTranslationTable::OutputPosition(const QString translationGroupName) {

isis/src/control/apps/sumspice/sumspice.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -314,6 +314,10 @@ sumspice from=st_2395699394_v.lev0.cub sumfile=N2395699394.SUM update=spice sum
		Changed pvl.DIFF of input for hayabusa app test to ignore file names. Allows test to pass when
		not using default data area. Fixes #4738.
		</change>
		<change name="Kaitlyn Lee" date="2018-04-08">
		Updated the pvl.DIFF's of the input for the dawn test to ignore the
		InstrumentPointing keyword. Fixes #5379.
		</change>
		</history>

		<category>