Merge branch 'ipce' into dev (61703d0d) · Commits · aflab / astrogeology / ISIS3

isis/src/base/objs/Cube/Cube.cpp

+16 −3

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,7 @@
	#include <unistd.h>		#include <unistd.h>

	#include <QDebug>		#include <QDebug>
			#include <QDir>
	#include <QFile>		#include <QFile>
	#include <QFileInfo>		#include <QFileInfo>
	#include <QMutex>		#include <QMutex>
	@@ -552,6 +553,7 @@ namespace Isis {
	// Figure out the name of the data file		// Figure out the name of the data file
	try {		try {
	PvlObject &core = m_label->findObject("IsisCube").findObject("Core");		PvlObject &core = m_label->findObject("IsisCube").findObject("Core");
			// Detached labels
	if (core.hasKeyword("^Core")) {		if (core.hasKeyword("^Core")) {
	FileName temp(core["^Core"][0]);		FileName temp(core["^Core"][0]);

	@@ -567,6 +569,7 @@ namespace Isis {

	m_dataFile = new QFile(realDataFileName().expanded());		m_dataFile = new QFile(realDataFileName().expanded());
	}		}
			// External cube files (ecub), ecub contains all labels and SPICE blobs, history
	else if (core.hasKeyword("^DnFile")) {		else if (core.hasKeyword("^DnFile")) {
	FileName dataFileName(core["^DnFile"][0]);		FileName dataFileName(core["^DnFile"][0]);

	@@ -579,9 +582,10 @@ namespace Isis {

	m_attached = true;		m_attached = true;
	m_storesDnData = false;		m_storesDnData = false;
			*m_dataFileName = FileName(realDataFileName().expanded());
	m_dataFile = new QFile(realDataFileName().expanded());		m_dataFile = new QFile(realDataFileName().expanded());
	}		}
			// Typical cube containing labels, SPICE, history and dn data
	else {		else {
	m_dataFileName = new FileName(*m_labelFileName);		m_dataFileName = new FileName(*m_labelFileName);
	m_attached = true;		m_attached = true;
	@@ -1841,7 +1845,16 @@ namespace Isis {
	else if (!m_storesDnData) {		else if (!m_storesDnData) {
	ASSERT(m_dataFileName);		ASSERT(m_dataFileName);
	FileName guess = *m_dataFileName;		FileName guess = *m_dataFileName;
			QDir dir(guess.toString());

			// If path is relative and there is a labelFileName, start in directory of the ecub, then
			// cd to the directory containing the DnFile, since it is relative to the location of the ecub.
			// We need to turn the relative path into an absolute path.
			if (dir.isRelative() && m_labelFileName) {
			QDir dir2(m_labelFileName->originalPath());
			dir2.cd(guess.path());
			guess = dir2.absolutePath() + "/" + guess.name();
			}
	do {		do {
	Pvl guessLabel(guess.expanded());		Pvl guessLabel(guess.expanded());

	@@ -2080,7 +2093,7 @@ namespace Isis {

	FileName temp((*core)["^DnFile"][0]);		FileName temp((*core)["^DnFile"][0]);
	if (!temp.expanded().startsWith("/")) {		if (!temp.expanded().startsWith("/")) {
	temp = FileName(FileName(label.fileName()).path() + "/" + temp.original());		temp = realDataFileName();
	}		}

	label = Pvl(temp.toString());		label = Pvl(temp.toString());

isis/src/base/objs/Cube/Cube.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -157,6 +157,11 @@ namespace Isis {
	* @history 2017-06-08 Chris Combs - Made "Failed to create" error messages more descriptive.		* @history 2017-06-08 Chris Combs - Made "Failed to create" error messages more descriptive.
	* Fixes #833.		* Fixes #833.
	* @history 2017-09-22 Cole Neubauer - Fixed documentation. References #4807		* @history 2017-09-22 Cole Neubauer - Fixed documentation. References #4807
			* @history 2018-01-04 Tracie Sucharski - Allow relative paths that are not "." in the DnFile
			* keyword for ecubs. Changes to ::open to set m_dataFileName for ecubs,
			* and changed ::realDataFileName() to return the absolute path if it is
			* relative. Changed ::realDataFileLabel to call realDataFileName to
			* make sure we get absolute path. Fixes #5276.
	* @history 2018-01-18 Summer Stapleton - Updated error message in ::create() to address when		* @history 2018-01-18 Summer Stapleton - Updated error message in ::create() to address when
	* an IsisPreference file cannot be found. Fixes #5145.		* an IsisPreference file cannot be found. Fixes #5145.
	*/		*/

isis/src/cassini/apps/ciss2isis/ciss2isis.cpp

+13 −9

Original line number	Original line	Diff line number	Diff line
	@@ -229,12 +229,17 @@ void CreateStretchPairs() {
	return;		return;
	}		}

	// The input buffer has a raw 16 bit buffer but the values are still 0 to 255.		/**
	// We know that 255 (stretched to 4095 if Table converted) is saturated.		* The input buffer has a raw 16 bit buffer but the values are still 0 to 255.
	// Sky pixels could have valid DN of 0, but missing pixels are also saved as 0,		* We know that 255 (stretched to 4095 if Table converted) is saturated.
	// so it is impossible to distinguish between them.		* Sky pixels could have valid DN of 0, but missing pixels are also saved as 0,
	// This method is used by ConvertLinePrefixPixels() and IsisMain() for ProcessByLine p2.		* so it is impossible to distinguish between them.
	// author Jeannie Walldren 2008-08-21		* This method is used by ConvertLinePrefixPixels() and IsisMain() for ProcessByLine p2.
			* author Jeannie Walldren 2008-08-21
			*
			* @history 2017-11-22 Summer Stapleton - Changed returned max value from HRS to HIS.
			* Fixes #5106.
			*/
	void FixDns(Buffer &buf) {		void FixDns(Buffer &buf) {
	for(int i = 0; i < buf.size(); i++) {		for(int i = 0; i < buf.size(); i++) {
	// zeros and negatives are valid DN values, according to scientists,		// zeros and negatives are valid DN values, according to scientists,
	@@ -246,9 +251,9 @@ void FixDns(Buffer &buf) {
	else if(dataConversionType == "Table") {		else if(dataConversionType == "Table") {
	buf[i] = stretch.Map((int)buf[i]);		buf[i] = stretch.Map((int)buf[i]);
	}		}
	// save max values (4095 for table-converted images and 255 for others) as HRS		// save max values (4095 for table-converted images and 255 for others) as HIS
	if(buf[i] == validMax) {		if(buf[i] == validMax) {
	buf[i] = Hrs;		buf[i] = His;
	}		}
	}		}
	}		}
	@@ -452,4 +457,3 @@ double ComputeOverclockAvg(vector <double> pixel) {
	// IDL cisscal application files: cassimg_subtractdark.pro and linetime.pro		// IDL cisscal application files: cassimg_subtractdark.pro and linetime.pro
	// -Jeannie Walldren 08/06/2008		// -Jeannie Walldren 08/06/2008
	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

isis/src/cassini/apps/ciss2isis/ciss2isis.xml

+27 −24

Original line number	Original line	Diff line number	Diff line
	@@ -64,6 +64,9 @@
	<change name="Tracie Sucharski" date="2012-05-04">		<change name="Tracie Sucharski" date="2012-05-04">
	Added error message when input image does not contain Pds labels.		Added error message when input image does not contain Pds labels.
	</change>		</change>
			<change name="Summer Stapleton" date="2017-11-22">
			Changed returned max value from HRS to HIS in FixDns method.
			</change>
	<change name="Christopher Combs" date="2018-01-30">		<change name="Christopher Combs" date="2018-01-30">
	Changed documentation to reflect newly added and unsupported target names		Changed documentation to reflect newly added and unsupported target names
	in translation files. Fixes #4970.		in translation files. Fixes #4970.

isis/src/control/apps/jigsaw/tsts/errors/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -60,7 +60,7 @@ commands:
	if [[ `$(APPNAME) \		if [[ `$(APPNAME) \
	fromlist=$(INPUT)/empty.lis \		fromlist=$(INPUT)/empty.lis \
	cnet=$(INPUT)/notacnet.net \		cnet=$(INPUT)/notacnet.net \
	onet=$(output)/out.net \		onet=$(OUTPUT)/out.net \
	radius=yes \		radius=yes \
	spsolve=positions \		spsolve=positions \
	point_radius_sigma=500 \		point_radius_sigma=500 \