Merged trunk r7822 through r7863. (868de615) · Commits · aflab / astrogeology / ISIS3

isis/IsisPreferences

+1 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,7 @@ Group = DataDirectory
		Tgo = $ISIS3DATA/tgo
		Galileo = $ISIS3DATA/galileo
		Hayabusa = $ISIS3DATA/hayabusa
		Juno = $ISIS3DATA/juno
		Kaguya = $ISIS3DATA/kaguya
		Lo = $ISIS3DATA/lo
		Lro = $ISIS3DATA/lro

isis/scripts/csvdiff.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,8 @@ if len(sys.argv) >= 4:
		for line in tolerances:
		if line.strip() != '':
		column, tolerance = line.strip().upper().split("=")
		tolerance_map[column] = float(tolerance)
		# Strip column and tolerance to allow for whitespace around "=" character
		tolerance_map[column.strip()] = float(tolerance.strip())

		# Close the file
		tolerance_file.close()

isis/src/base/apps/fits2isis/fits2isis.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ void IsisMain() {
		Cube *output = pfits.SetOutputCube("TO");

		// Add instrument group if any keywords were put into it.
		PvlGroup instGrp = pfits.standardInstrumentGroup(pfits.fitsLabel(0));
		PvlGroup instGrp = pfits.standardInstrumentGroup(pfits.fitsImageLabel(0));
		if (instGrp.keywords() > 0) {

		output->label()->findObject("IsisCube") += instGrp;
		@@ -52,7 +52,7 @@ void IsisMain() {

		// Save the input FITS label in the Cube original labels
		Pvl pvl;
		pvl += pfits.fitsLabel(0);
		pvl += pfits.fitsImageLabel(0);
		OriginalLabel originals(pvl);
		output->write(originals);

isis/src/base/apps/fits2isis/fits2isis.xml

+6 −3

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@

		<history>
		<change name="Mackenzie Boyd" date="2009-10-27">
		Original version
		Original version.
		</change>
		<change name="Stuart Sides" date="2014-08-29">
		Added the ability to read image extensions.
		@@ -24,6 +24,9 @@
		Added the ability to set the organization of the input file to BIL, BSQ, or BIP.
		Added tests for these new options.
		</change>
		<change name="Jeannie Backer and Kaj Williams" date="2017-07-07">
		Modified to reflect ProcessImportFits method name change from fitsLabel to fitsImageLabel.
		</change>
		</history>

		<seeAlso>

isis/src/base/objs/Area3D/Area3D.cpp

+20 −0

Original line number	Diff line number	Diff line
		@@ -125,6 +125,8 @@ namespace Isis {

		/**
		* Returns the leftmost X position of the 3D area.
		*
		* @return Displacement The leftmost X position of the 3D area
		*/
		Displacement Area3D::getStartX() const {
		Displacement startX;
		@@ -138,6 +140,8 @@ namespace Isis {

		/**
		* Returns the topmost Y position of the 3D area.
		*
		* @return Displacement The topmost Y position of the 3D area
		*/
		Displacement Area3D::getStartY() const {
		Displacement startY;
		@@ -151,6 +155,8 @@ namespace Isis {

		/**
		* Returns the frontmost Z position of the 3D area.
		*
		* @return Displacement The frontmost Z position of the 3D area
		*/
		Displacement Area3D::getStartZ() const {
		Displacement startZ;
		@@ -164,6 +170,8 @@ namespace Isis {

		/**
		* Returns the width (in the X dimension) of the 3D area.
		*
		* @return Displacement The width (in the X dimension) of the 3D area
		*/
		Distance Area3D::getWidth() const {
		return Distance(
		@@ -174,6 +182,8 @@ namespace Isis {

		/**
		* Returns the height (in the Y dimension) of the 3D area.
		*
		* @return Displacement The height (in the Y dimension) of the 3D area
		*/
		Distance Area3D::getHeight() const {
		return Distance(
		@@ -184,6 +194,8 @@ namespace Isis {

		/**
		* Returns the depth (in the Z dimension) of the 3D area.
		*
		* @return Displacement The depth (in the Z dimension) of the 3D area
		*/
		Distance Area3D::getDepth() const {
		return Distance(
		@@ -194,6 +206,8 @@ namespace Isis {

		/**
		* Returns the rightmost X position of the 3D area.
		*
		* @return Displacement The rightmost X position of the 3D area
		*/
		Displacement Area3D::getEndX() const {
		Displacement endX;
		@@ -207,6 +221,8 @@ namespace Isis {

		/**
		* Returns the bottommost Y position of the 3D area.
		*
		* @return Displacement The bottommost Y position of the 3D area
		*/
		Displacement Area3D::getEndY() const {
		Displacement endY;
		@@ -220,6 +236,8 @@ namespace Isis {

		/**
		* Returns the backmost Z position of the 3D area.
		*
		* @return Displacement The backmost Z position of the 3D area
		*/
		Displacement Area3D::getEndZ() const {
		Displacement endZ;
		@@ -481,6 +499,8 @@ namespace Isis {
		/**
		* Returns true if all of the positions of the 3D area are
		* valid (i.e. they are non-NULL).
		*
		* @return bool True if all of the positions of the 3D area are valid (i.e. they are non-NULL).
		*/
		bool Area3D::isValid() const {
		bool valid = true;