Updated msi2isis to save OriginalLabels from the input PDS label file. Fixes #2088 (dd6d11d3) · Commits · aflab / astrogeology / ISIS3

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

+12 −4

Original line number	Diff line number	Diff line
		@@ -1217,18 +1217,26 @@ namespace Isis {


		/**
		* End the processing sequence and cleans up by closing cubes,
		* freeing memory, etc. Adds the OriginalLabel data to the end
		* of the cube file, unless OmitOriginalLabel() has been called.
		* @deprecated. Please use Finalize.
		*/
		void ProcessImportPds::EndProcess() {
		ProcessImportPds::Finalize();
		}


		/**
		* End the processing sequence and cleans up by closing cubes,
		* freeing memory, etc. Adds the OriginalLabel data to the end of
		* the cube file, unless OmitOriginalLabel() has been called.
		*/
		void ProcessImportPds::Finalize() {
		if (p_keepOriginalLabel) {
		OriginalLabel ol(p_pdsLabel);
		for (unsigned int i = 0; i < OutputCubes.size(); i++) {
		OutputCubes[i]->write(ol);
		}
		}
		Process::EndProcess();
		Process::Finalize();
		}

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -195,6 +195,14 @@ namespace Isis {
		* This also required moving some of the code from the
		* SetPdsFile method to a new method, ProcessLabel. Fixes
		* #2036.
		* @history 2014-03-19 Kristin Berry - Added a Finalize method
		* identical to the old EndProcess
		* method so that
		* ProcessImportPds::Finalize is
		* called, rather than
		* Process::Finalize on
		* ProcessImportPds objects. Marked
		* EndProcess as deprecated.
		*
		* @todo 2005-02-09 Finish documentation-lots of holes with variable
		* definitions in .h file and .cpp methods, and insert
		@@ -236,7 +244,7 @@ namespace Isis {
		using ProcessImport::StartProcess;
		void StartProcess();
		void EndProcess();

		void Finalize();
		private:

isis/src/near/apps/msi2isis/msi2isis.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ void IsisMain() {
		// The first process will import the image into Cube format as is.
		ProcessImportPds importPds;
		Pvl inputLabelPvl;

		importPds.SetPdsFile(from.expanded(), "", inputLabelPvl);

		// from the pds label, verfify that the image is valid before continuing
		@@ -248,7 +249,6 @@ void translateMsiLabels(Pvl inputLabelPvl, Pvl *isisLabelPvl) {
		inputLabelPvl["INSTRUMENT_TEMPERATURE"][1],
		inputLabelPvl["INSTRUMENT_TEMPERATURE"].unit());


		// we might want to read values from the FITS header in the future. For
		// example...
		//

isis/src/near/apps/msi2isis/msi2isis.xml

+13 −10

Original line number	Diff line number	Diff line
		@@ -11,8 +11,7 @@
		(MSI) instrument, to ISIS3 data file format.

		The raw image must be in FITS (Flexible Image Transport) format and
		have a PDS label file that points to the location of the FITS image. The
		user must input either the label file or the FITS file for the "TO" input
		have a PDS label file that points to the location of the FITS image. You must input either the label file or the FITS file for the "TO" input
		parameter. Please note if the FITS file is given, the label file must
		exist in the same directory or the program will throw an error.

		@@ -27,9 +26,10 @@
		<li>LINE_DISPLAY_DIRECTION = UP</li>
		</ul>

		The output cube- successfully imported into ISIS3 will have gone through the following processes
		The output cube- successfully imported into ISIS3 goes through the following processes:
		<ul>
		<li>Convert the raw FITS format to ISIS3 format.</li>
		<li>Convert the raw FITS image data to an ISIS3 Cube.</li>
		<li> Save the labels from the input PDS label file to the output ISIS3 Cube. Note that FITS labels are not transferred. </li>
		<li>Enlarge the image from 537 samples x 244 lines to 537 x 412 using the user-specified interpolation algorithm. Defaults to cubic convolution.</li>
		<li>Flip the image vertically, i.e. across the horizontal axis.</li>
		<li>Trim 33 pixels from the top, bottom, left and right sides. These
		@@ -42,6 +42,9 @@
		<change name="Jeannie Backer" date="2013-03-27">
		Original version of msi2isis. References #1248.
		</change>
		<change name="Kristin Berry" date="2014-05-19">
		Updated to add labels from the input PDS label file to the output ISIS3 cube. References #2088.
		</change>
		</history>

		<seeAlso>
		@@ -68,7 +71,7 @@
		</brief>
		<description>
		Name of the input NEAR MSI image file to be imported into ISIS3
		format. The user may enter the label or the image file. If the image
		format. You may enter the label or the image file. If the image
		file is given, the program will search in the same directory for a
		label file with the same base name as the image file base name.
		</description>
		@@ -109,21 +112,21 @@
		<option value="CUBICCONVOLUTION">
		<brief>Cubic Convolution interpolation</brief>
		<description>
		Each output pixel will be set to the value calculated by
		Each output pixel is set to the value calculated by
		a cubic convolution interpolation of the calculated input pixel.
		</description>
		</option>
		<option value="NEARESTNEIGHBOR">
		<brief>Nearest Neighbor</brief>
		<description>
		Each output pixel will be set to the pixel nearest the
		Each output pixel is set to the pixel nearest the
		calculated input pixel.
		</description>
		</option>
		<option value="BILINEAR">
		<brief>Bi-Linear interpolation</brief>
		<description>
		Each output pixel will be set to the value calculated by
		Each output pixel is set to the value calculated by
		a bi-linear interpolation of the calculated input pixel.
		</description>
		</option>
		@@ -169,7 +172,7 @@
		<description>
		Example of raw NEAR MSI image without the enlarge, flip, and trim processes performed by msi2isis.
		</description>
		<thumbnail width="183" height="200" caption="Raw image" src="assets/thumgs/fits2isis.cub.jpg" />
		<thumbnail width="183" height="200" caption="Raw image" src="assets/thumbs/fits2isis.cub.jpg" />
		<parameterName>FROM</parameterName>
		</image>
		</inputImages>
		@@ -181,7 +184,7 @@
		<description>
		Example of imported NEAR MSI image with the enlarge, flip, and trim processes applied.
		</description>
		<thumbnail width="182" height="200" caption="Imported cube" src="assets/thumgs/imported.cub.jpg" />
		<thumbnail width="182" height="200" caption="Imported cube" src="assets/thumbs/imported.cub.jpg" />
		<parameterName>TO</parameterName>
		</image>
		</outputImages>

isis/src/near/apps/msi2isis/tsts/bilinear/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,4 +6,5 @@ commands:
		$(APPNAME) from=$(INPUT)/m0126865998f4_2p_iof.fit \
		to=$(OUTPUT)/truth.cub \
		interp=bilinear > /dev/null;
		catoriglab from=$(OUTPUT)/truth.cub to=$(OUTPUT)/origLabels.pvl > /dev/null;
		catlab from=$(OUTPUT)/truth.cub to=$(OUTPUT)/truth.pvl > /dev/null;