Updated from trunk. (177b58a2) · Commits · aflab / astrogeology / ISIS3

isis/src/base/apps/findimageoverlaps/findimageoverlaps.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ void IsisMain() {

		// Add the serial numbers in sorted order now
		for(unsigned int i = 0; i < sortedList.size(); i++) {
		serialNumbers.Add(sortedList[i].second);
		serialNumbers.add(sortedList[i].second);
		}

		// Now we want the ImageOverlapSet to calculate our overlaps

isis/src/base/apps/overlapstats/overlapstats.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ void IsisMain() {
		ImageOverlap const * currOverlap = overlaps[i];
		for (int j = 0; j < currOverlap->Size(); j++) {
		QString currSerialNum = (*currOverlap)[j];
		if (!serialNumbers.HasSerialNumber(currSerialNum)) {
		if (!serialNumbers.hasSerialNumber(currSerialNum)) {
		IString msg = "Found serial number [" + currSerialNum + "] in overlap "
		"list that was not in the provided cube list. Please ensure that "
		"the cube list is the same one used to generate your overlap list "
		@@ -57,8 +57,8 @@ void IsisMain() {

		// Sets up the no overlap list
		set<QString> nooverlap;
		for(int i = 0; i < serialNumbers.Size(); i ++) {
		nooverlap.insert(serialNumbers.SerialNumber(i));
		for(int i = 0; i < serialNumbers.size(); i ++) {
		nooverlap.insert(serialNumbers.serialNumber(i));
		}

		// Create the output
		@@ -113,7 +113,7 @@ void IsisMain() {
		const geos::geom::MultiPolygon *mpLatLon = overlaps[index]->Polygon();

		// Construct a Projection for converting between Lon/Lat and X/Y
		Pvl cubeLab(serialNumbers.FileName(0));
		Pvl cubeLab(serialNumbers.fileName(0));
		PvlGroup inst = cubeLab.findGroup("Instrument", Pvl::Traverse);
		QString target = inst["TargetName"];
		PvlGroup radii = TProjection::TargetRadii(target);
		@@ -161,14 +161,14 @@ void IsisMain() {
		}
		output << delim << overlaps[index]->Size() << pretty;
		output << delim << (*overlaps[index])[0];
		output << delim << serialNumbers.FileName((*overlaps[index])[0]);
		output << delim << serialNumbers.fileName((*overlaps[index])[0]);
		for(int sn = 1; sn < overlaps[index]->Size(); sn ++) {
		if(!singleLine) {
		output << endl << pretty << delim << pretty << delim << pretty << delim;
		output << pretty << pretty;
		}
		output << delim << pretty << (*overlaps[index])[sn];
		output << delim << serialNumbers.FileName((*overlaps[index])[sn]);
		output << delim << serialNumbers.fileName((*overlaps[index])[sn]);
		}
		output << endl;
		}
		@@ -240,7 +240,7 @@ void IsisMain() {
		// Add non-overlapping cubes to the output
		if(!nooverlap.empty()) {
		for(set<QString>::iterator itt = nooverlap.begin(); itt != nooverlap.end(); itt ++) {
		brief += PvlKeyword("NoOverlap", serialNumbers.FileName(*itt));
		brief += PvlKeyword("NoOverlap", serialNumbers.fileName(*itt));
		}
		}

isis/src/base/objs/ImageOverlapSet/ImageOverlapSet.cpp

+13 −13

Original line number	Diff line number	Diff line
		@@ -65,15 +65,15 @@ namespace Isis {
		*/
		void ImageOverlapSet::FindImageOverlaps(SerialNumberList &sns) {
		// Create an ImageOverlap for each image boundary
		for(int i = 0; i < sns.Size(); i++) {
		for(int i = 0; i < sns.size(); i++) {
		// Open the cube
		Cube cube;
		try {
		cube.open(sns.FileName(i));
		cube.open(sns.fileName(i));
		}
		catch(IException &error) {
		QString msg = "Unable to open cube for serial number [";
		msg += sns.SerialNumber(i) + "] filename [" + sns.FileName(i) + "]";
		msg += sns.serialNumber(i) + "] filename [" + sns.fileName(i) + "]";

		HandleError(error, &sns, msg);
		}
		@@ -97,7 +97,7 @@ namespace Isis {
		if(!tmp->isValid()) {
		delete tmp;
		tmp = NULL;
		IString msg = "The image [" + sns.FileName(sns.SerialNumber(i)) +
		IString msg = "The image [" + sns.fileName(sns.serialNumber(i)) +
		"] has an invalid footprint";
		throw IException(IException::Programmer, msg, _FILEINFO_);
		}
		@@ -118,7 +118,7 @@ namespace Isis {
		}
		}

		p_lonLatOverlaps.push_back(CreateNewOverlap(sns.SerialNumber(i), mp));
		p_lonLatOverlaps.push_back(CreateNewOverlap(sns.serialNumber(i), mp));

		if(mp) {
		delete mp;
		@@ -507,7 +507,7 @@ namespace Isis {
		p_calculatedSoFar = outside - 1;

		// unblock the writing process after every 10 polygons if we need to write
		if(p_calculatedSoFar % 10 == 0 && (!snlist \|\| p_lonLatOverlaps.size() > snlist->Size())) {
		if(p_calculatedSoFar % 10 == 0 && (!snlist \|\| p_lonLatOverlaps.size() > snlist->size())) {
		if(p_threadedCalculate) p_calculatePolygonMutex.unlock();
		}

		@@ -733,7 +733,7 @@ namespace Isis {

		// Do not write empty overlap files
		if(snlist) {
		if(p_lonLatOverlaps.size() == snlist->Size()) {
		if(p_lonLatOverlaps.size() == snlist->size()) {
		p_lonLatOverlaps.clear();
		}
		}
		@@ -826,7 +826,7 @@ namespace Isis {
		serialNumbers += (*p_lonLatOverlaps.at(overlap1))[i];

		if(snlist != NULL) {
		filename += snlist->FileName((*p_lonLatOverlaps.at(overlap1))[i]);
		filename += snlist->fileName((*p_lonLatOverlaps.at(overlap1))[i]);
		}
		}
		polygon += p_lonLatOverlaps.at(overlap1)->Polygon()->toString().c_str();
		@@ -849,7 +849,7 @@ namespace Isis {
		serialNumbers += (*p_lonLatOverlaps.at(overlap2))[i];

		if(snlist != NULL) {
		filename += snlist->FileName((*p_lonLatOverlaps.at(overlap2))[i]);
		filename += snlist->fileName((*p_lonLatOverlaps.at(overlap2))[i]);
		}
		}
		polygon += p_lonLatOverlaps.at(overlap2)->Polygon()->toString().c_str();
		@@ -895,7 +895,7 @@ namespace Isis {
		serialNumbers += (*p_lonLatOverlaps.at(overlap1))[i];

		if(snlist != NULL) {
		filename += snlist->FileName((*p_lonLatOverlaps.at(overlap1))[i]);
		filename += snlist->fileName((*p_lonLatOverlaps.at(overlap1))[i]);
		}
		}

		@@ -914,7 +914,7 @@ namespace Isis {
		serialNumbers += (*p_lonLatOverlaps.at(overlap2))[i];

		if(snlist != NULL) {
		filename += snlist->FileName((*p_lonLatOverlaps.at(overlap2))[i]);
		filename += snlist->fileName((*p_lonLatOverlaps.at(overlap2))[i]);
		}
		}

		@@ -963,7 +963,7 @@ namespace Isis {
		serialNumbers += (*p_lonLatOverlaps.at(overlap1))[i];

		if(snlist != NULL) {
		filename += snlist->FileName((*p_lonLatOverlaps.at(overlap1))[i]);
		filename += snlist->fileName((*p_lonLatOverlaps.at(overlap1))[i]);
		}
		}

		@@ -982,7 +982,7 @@ namespace Isis {
		serialNumbers += (*p_lonLatOverlaps.at(overlap2))[i];

		if(snlist != NULL) {
		filename += snlist->FileName((*p_lonLatOverlaps.at(overlap2))[i]);
		filename += snlist->fileName((*p_lonLatOverlaps.at(overlap2))[i]);
		}
		}

isis/src/base/objs/ObservationNumber/ObservationNumber.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -145,9 +145,9 @@ namespace Isis {
		*/
		std::vector<QString> ObservationNumber::PossibleSerial(const QString &on, SerialNumberList &list) {
		std::vector<QString> sn;
		for(int i = 0; i < list.Size(); i++) {
		if(list.SerialNumber(i).startsWith(on)) {
		sn.push_back(list.SerialNumber(i));
		for(int i = 0; i < list.size(); i++) {
		if(list.serialNumber(i).startsWith(on)) {
		sn.push_back(list.serialNumber(i));
		}
		}
		return sn;

isis/src/base/objs/ObservationNumberList/ObservationNumberList.cpp

+17 −17

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ namespace Isis {
		*/
		void ObservationNumberList::init(Isis::SerialNumberList *snlist) {

		if(snlist->Size() == 0) {
		if(snlist->size() == 0) {
		QString msg = "Serial number list is empty";
		throw IException(IException::User, msg, _FILEINFO_);
		}
		@@ -49,8 +49,8 @@ namespace Isis {
		int observationIndex;

		// Fill the temporary map to generate observation sets
		for(int isn = 0; isn < snlist->Size(); isn++) {
		observationNumber = snlist->ObservationNumber(isn);
		for(int isn = 0; isn < snlist->size(); isn++) {
		observationNumber = snlist->observationNumber(isn);

		if(observationMap.find(observationNumber) == observationMap.end()) {
		observationMap.insert(std::pair<QString, int>(observationNumber, currentIndex));
		@@ -60,7 +60,7 @@ namespace Isis {
		observationIndex = observationMap.find(observationNumber)->second;
		}

		Add(isn, observationIndex, observationNumber);
		add(isn, observationIndex, observationNumber);
		}
		p_numberObservations = currentIndex;
		}
		@@ -78,7 +78,7 @@ namespace Isis {
		*/
		void ObservationNumberList::Remove(Isis::SerialNumberList *snlist) {

		if(snlist->Size() == 0) {
		if(snlist->size() == 0) {
		QString msg = "Removing serial number list is empty";
		throw IException(IException::User, msg, _FILEINFO_);
		}
		@@ -92,9 +92,9 @@ namespace Isis {
		int observationIndex;

		// Fill the temporary map to generate observation sets
		for(int isn = 0; isn < this->Size(); isn++) {
		if((snlist->HasSerialNumber(this->SerialNumber(isn)))) continue;
		observationNumber = this->ObservationNumber(isn);
		for(int isn = 0; isn < this->size(); isn++) {
		if((snlist->hasSerialNumber(this->serialNumber(isn)))) continue;
		observationNumber = this->observationNumber(isn);

		if(observationMap.find(observationNumber) == observationMap.end()) {
		observationMap.insert(std::pair<QString, int>(observationNumber, currentIndex));
		@@ -104,7 +104,7 @@ namespace Isis {
		observationIndex = observationMap.find(observationNumber)->second;
		}

		Add(isn, observationIndex, observationNumber);
		add(isn, observationIndex, observationNumber);
		}
		p_numberObservations = currentIndex;
		}
		@@ -132,7 +132,7 @@ namespace Isis {
		* be added
		*
		*/
		void ObservationNumberList::Add(const int isn, const int observationIndex,
		void ObservationNumberList::add(const int isn, const int observationIndex,
		QString observationNumber) {

		ObservationSet nextset;
		@@ -149,7 +149,7 @@ namespace Isis {
		*
		* @return int Returns number of unique observations currently in the list
		*/
		int ObservationNumberList::ObservationSize() const {
		int ObservationNumberList::observationSize() const {
		return p_numberObservations;
		}

		@@ -162,7 +162,7 @@ namespace Isis {
		*
		* @return bool
		*/
		bool ObservationNumberList::HasObservationNumber(const QString &on) {
		bool ObservationNumberList::hasObservationNumber(const QString &on) {
		for(unsigned index = 0; index < p_pairs.size(); index++) {
		if(p_pairs[index].observationNumber == on) {
		return true;
		@@ -178,7 +178,7 @@ namespace Isis {
		*
		* @return int The observation index mapped to the serial number
		*/
		int ObservationNumberList::ObservationNumberMapIndex(int serialNumberIndex) {
		int ObservationNumberList::observationNumberMapIndex(int serialNumberIndex) {
		// if (serialNumberIndex >= 0 && serialNumberIndex < (int) p_indexMap.size()) {
		if(serialNumberIndex >= 0) {
		return p_indexMap.find(serialNumberIndex)->second;
		@@ -198,14 +198,14 @@ namespace Isis {
		* @return QString The observation number corresponding to
		* the input filename
		*/
		QString ObservationNumberList::ObservationNumber(const QString &filename) {
		QString ObservationNumberList::observationNumber(const QString &filename) {
		if(p_fileMap.find(Isis::FileName(filename).expanded()) == p_fileMap.end()) {
		QString msg = "Requested filename [" +
		Isis::FileName(filename).expanded() + "]";
		msg += "does not exist in the list";
		throw IException(IException::Programmer, msg, _FILEINFO_);
		}
		int index = FileNameIndex(filename);
		int index = fileNameIndex(filename);
		return p_pairs[index].observationNumber;
		}

		@@ -216,7 +216,7 @@ namespace Isis {
		*
		* @return QString The observation number returned
		*/
		QString ObservationNumberList::ObservationNumber(int index) {
		QString ObservationNumberList::observationNumber(int index) {
		if(index >= 0 && index < (int) p_pairs.size()) {
		return p_pairs[index].observationNumber;
		}
		@@ -234,7 +234,7 @@ namespace Isis {
		* @return vector<QString> The list of possible filenames
		* matching the input observation number
		*/
		std::vector<QString> ObservationNumberList::PossibleFileNames(const QString &on) {
		std::vector<QString> ObservationNumberList::possibleFileNames(const QString &on) {
		std::vector<QString> filenames;
		for(unsigned index = 0; index < p_pairs.size(); index++) {
		if(p_pairs[index].observationNumber == on) {