Merge dev into ipce (683d80d1) · Commits · aflab / astrogeology / ISIS3

isis/src/base/apps/automos/automos.xml

+153 −143

Original line number	Diff line number	Diff line
		@@ -470,6 +470,10 @@
		<change name="Jeannie Backer, Tammy Becker, and Kimberly Oyama" date="2014-04-07">
		Updated user documentation. Fixes #1617. Fixes #1620. References #1623. References #1550.
		</change>
		<change name="Cole Neubauer" date="2017-11-20">
		Added parameter checking to XML MAXLON and MAXLAT to check if they are greater than their
		minimum counterpart. Fixes #5148
		</change>
		</history>

		<groups>
		@@ -805,6 +809,9 @@
		<description>
		The maximum latitude value boundary extent for the output mosaic.
		</description>
		<greaterThan>
		<item>MINLAT</item>
		</greaterThan>
		</parameter>
		<parameter name="MINLON">
		<type>double</type>
		@@ -819,6 +826,9 @@
		<description>
		The maximum longitude value bounary extent for the output mosaic.
		</description>
		<greaterThan>
		<item>MINLON</item>
		</greaterThan>
		</parameter>
		</group>

isis/src/base/apps/caminfo/tsts/csv/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ commands:
		STATISTICS=true CAMSTATS=true GEOMETRY=true spice=true > /dev/null;
		cat $(OUTPUT)/temp.txt \| \
		sed 's/$[0-9]\.[0-9]\{4\}$$[0-9]$/\1/g' \| \
		sed 's/$[a-z]\,$$[0-9]\.[0-9]\.[0-9]\.[0-9] [a-z]* \| [0-9]\{4\}\-[0-9]\{2\}\-[0-9]\{2\}$/\1/g' \
		sed 's/$[a-z]\,$$[0-9]\.[0-9]\.[0-9]\.[A-Za-z0-9] [a-z]* \| [0-9]\{4\}\-[0-9]\{2\}\-[0-9]\{2\}$/\1/g' \
		> $(OUTPUT)/truth.txt;
		$(RM) $(OUTPUT)/temp.txt;
		$(RM) $(OUTPUT)/input.cub;

isis/src/base/apps/isis2fits/tsts/infoAll/truth/labels.txt

deleted100644 → 0

+0 −1

SIMPLE  =                    T /                                                BITPIX  =                  -32 /                                                NAXIS   =                    2 /                                                NAXIS1  =                   90 /                                                NAXIS2  =                   14 /                                                BZERO   =                  0.0 /                                                BSCALE  =                  1.0 /                                                OBJCTRA =                180.0 /                                                OBJCTDEC=     -36.553241445319 /                                                INSTRUME=             'MOC-WA' /                                                OBSERVER= 'MARS GLOBAL SURVEYOR' /                                              OBJECT  =               'Mars' /                                                DATE-OBS= '1997-10-20T10:58:37.46' /                                            TIME_END= '1997-10-20T11:03:44.66' /                                            END

 No newline at end of file

isis/src/base/apps/isisminer/CnetReaderStrategy.cpp

+83 −84

Original line number	Diff line number	Diff line
		@@ -116,10 +116,9 @@ namespace Isis {

		int nrows = pointNum;

		QString cfile = translateKeywordArgs("CnetFile", globals);
		QScopedPointer<LatestControlNetFile> netFile(ControlNetVersioner::Read(FileName(cfile)));
		Pvl pvl(netFile->toPvl());
		netFile.reset();
		FileName netfile(translateKeywordArgs("CnetFile", globals));
		ControlNetVersioner cnetReader(netfile);
		Pvl pvl(cnetReader.toPvl());

		PvlObject &network(pvl.findObject("ControlNetwork"));
		PvlFlatMap netkeys(loadkeys(network));

isis/src/base/apps/spiceinit/spiceinit.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -418,7 +418,7 @@ bool tryKernels(Cube *icube, Process &p,

		Application::Log(currentKernels);
		icube->putGroup(originalKernels);
		throw;
		throw IException(e);
		}

		if (ui.GetBoolean("ATTACH")) {