Verified and modified hard-coded /usgs paths to variable relative paths. Fixes #2054. (82c2a6fa) · Commits · aflab / astrogeology / ISIS3

isis/src/base/apps/makeflat/makeflat.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,9 @@
		<change name="Steven Lambright" date="2008-06-11">
		Changed algorithm and added support for framing and push frame cameras.
		</change>
		<change name="Ian Humphrey" date="2014-06-23">
		Cleaned up spacing in pushframe test Makefile
		</change>
		</history>

		<category>

+1 −1

Original line number	Diff line number	Diff line
		Input Cube: /usgs/cpkgs/isis3.0.0/data/base/testData/isisTruth.cub
		Input Cube: $ISIS3DATA/base/testData/isisTruth.cub
		Samples:Lines:Bands: 126:126:2
		0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
		20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20

+4 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,9 @@
		<change name="Jeannie Backer" date="2011-08-19">
		Replaced test cube path /tmp/... with $temporary/...
		</change>
		<change name="Ian Humphrey" date="2014-06-23">
		Replaced test cube path /ISISROOT/testData/... with $base/... #2054
		</change>
		</history>

		<groups>
		@@ -37,7 +40,7 @@
		<filter>
		*.cub
		</filter>
		<default><item>/ISISROOT/testData/base/isisTruth.cub</item></default>
		<default><item>$base/isisTruth.cub</item></default>
		</parameter>
		<parameter name="TO">
		<type>filename</type>

+3 −1

Original line number	Diff line number	Diff line
		@@ -46,6 +46,8 @@ void TestLineSamp(Camera *cam, double samp, double line);
		* calculated in code-the label keywords for Ir exposure and interline
		* delay is incorrect. The camera model is also now doing calculations
		* in x, y, z instead of lat, lon.
		* @history 2014-06-23 Ian Humphrey - Modified hard coded /usgs/cpkgs/ paths to
		* relative pathnames. Fixes #2054.
		*/
		int main(void) {
		Preference::Preferences(true);
		@@ -184,7 +186,7 @@ int main(void) {

		// Test C1465336166_1.ir.cub
		//string file = "/usgs/cpkgs/isis3/data/cassini/testData/C1465336166_1.ir.cub";
		Cube c("/usgs/cpkgs/isis3/data/cassini/testData/C1465336166_1.ir.cub", "r");
		Cube c("$cassini/testData/C1465336166_1.ir.cub", "r");
		Camera *cam = CameraFactory::Create(c);
		cout << "FileName: " << FileName(c.fileName()).name() << endl;
		cout << "CK Frame: " << cam->instrumentRotation()->Frame() << endl << endl;

+3 −0

Original line number	Diff line number	Diff line
		@@ -145,6 +145,9 @@
		<change name="Steven Koechle" date="2008-12-04">
		Removed hard coded flatfile, now searchs for highest version
		</change>
		<change name="Ian Humphrey" date="2014-06-23">
		Modified hard coded flatfile in app tests to relative paths using $ISIS3DATA. Fixes #2054.
		</change>
		</history>

		<category>