Merge pull request #7 from jcwbacker/CNetImprovements (b10fcf22) · Commits · aflab / astrogeology / ISIS3

.gitignore

+36 −0

Original line number	Original line	Diff line number	Diff line
			# Ignore all
			*

			# Unignore all with extensions
			!.

			# Unignore all dirs
			!*/

			!Makefile

			*.cub
	*.o		*.o
			*.so
			.so.
			*.a
	moc_*		moc_*
			.pb.
			*.lbl
			*.img

			!TestPreferences

	print.prt		print.prt

	object_script.*.Release		object_script.*.Release
	object_script.*.Debug		object_script.*.Debug
	*_plugin_import.cpp		*_plugin_import.cpp
	*.moc		*.moc
	ui_*.h		ui_*.h

			/3rdParty/
			!*/3rdParty/Makefile

			/inc/

			/bin/

			/lib/

			/tsts//input/*
			/tsts//truth/*
			/tsts//output/*

README.md

0 → 100644

+2 −0

Original line number	Original line	Diff line number	Diff line
			# ISIS3
			Integrated Software for Imagers and Spectrometers ISIS3 public release site

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

+153 −143

Original line number	Original line	Diff line number	Diff line
	@@ -470,6 +470,10 @@
	<change name="Jeannie Backer, Tammy Becker, and Kimberly Oyama" date="2014-04-07">		<change name="Jeannie Backer, Tammy Becker, and Kimberly Oyama" date="2014-04-07">
	Updated user documentation. Fixes #1617. Fixes #1620. References #1623. References #1550.		Updated user documentation. Fixes #1617. Fixes #1620. References #1623. References #1550.
	</change>		</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>		</history>

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

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

+1 −1

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