merge of r7484 through r7552 into 'ipce_FY17-Sprint1' (c787f3c9) · Commits · aflab / astrogeology / ISIS3

isis/src/base/apps/edrget/tsts/http/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,6 +3,6 @@ APPNAME = edrget
		include $(ISISROOT)/make/isismake.tsts

		commands:
		$(APPNAME) URL=http://pds-imaging.jpl.nasa.gov/data/mro/mars_reconnaissance_orbiter/marci/mrom_0209/calib/vis1flat.ddd TOPATH=$(OUTPUT) > /dev/null;
		$(APPNAME) URL=http://pds-imaging.jpl.nasa.gov//data/mro/mars_reconnaissance_orbiter/marci/mrom_0209/calib/vis1flat.ddd TOPATH=$(OUTPUT) > /dev/null;
		ddd2isis from=$(OUTPUT)/vis1flat.ddd to=$(OUTPUT)/vis1flat.cub > /dev/null;
		$(RM) $(OUTPUT)/vis1flat.ddd > /dev/null;

+5 −3

Original line number	Diff line number	Diff line
		@@ -176,8 +176,9 @@ namespace Isis {


		/**
		* @description This method is used to set the latitude/longitude (assumed to be of the
		* correct LatitudeType, LongitudeDirection, and LongitudeDomain. The Set
		* @brief Set lat/lon and attempt to calculate x/y values
		* This method is used to set the latitude/longitude (assumed to be of the
		* correct LatitudeType, LongitudeDirection, and LongitudeDomain). The Set
		* forces an attempted calculation of the projection X/Y values. This may or
		* may not be successful and a status is returned as such.
		*
		@@ -284,7 +285,8 @@ namespace Isis {


		/**
		* @description This method is used to determine the x/y range which completely covers the
		* @brief Find x/y range from lat/lon range
		* This method is used to determine the x/y range which completely covers the
		* area of interest specified by the lat/lon range. The latitude/longitude
		* range may be obtained from the labels. The purpose of this method is to
		* return the x/y range so it can be used to compute how large a map may need

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ namespace Isis {
		class Pvl;
		class PvlGroup;
		/**
		* @description Mollweide Map Projection
		* @brief Mollweide Map Projection
		*
		* This class provides methods for the forward and inverse equations of a
		* Mollweide Equal-Area map projection (for a sphere).

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ namespace Isis {
		/**
		* @brief Create a list of observation numbers from a file or serial number list
		*
		* @description This class allows for creating observation numbers from a provided file or
		* This class allows for creating observation numbers from a provided file or
		* and existing non-empty SerialNumberList. Internally, it will map the observation numbers
		* that are created to the corresponding serial number for a given observation.
		*

+1 −1

Original line number	Diff line number	Diff line
		@@ -201,7 +201,7 @@ namespace Isis {
		/**
		* @brief Overloaded add method that takes char * parameters
		*
		* @description Adds a new filename / serial number pair to the SerialNumberList
		* Adds a new filename / serial number pair to the SerialNumberList
		*
		* @param serialNumber The serial number to be added
		* @param filename The filename to be added