Changed map to QList and added getIndex. (6ed92777) · Commits · aflab / astrogeology / ISIS3

isis/src/base/apps/caminfo/CamTools.cpp

+14 −0

Original line number	Diff line number	Diff line
		@@ -215,6 +215,11 @@ namespace Isis {
		g.sampRes = camera.SampleResolution();
		g.lineRes = camera.LineResolution();

		g.obliqueSampRes = camera.ObliqueSampleResolution();
		g.obliqueLineRes = camera.ObliqueLineResolution();
		g.obliquePixelRes = camera.ObliquePixelResolution();
		g.obliqueDetectorRes = camera.ObliqueDetectorResolution();

		g.solarLongitude = camera.solarLongitude().degrees();
		g.northAzimuth = camera.NorthAzimuth();
		g.offNader = camera.OffNadirAngle();
		@@ -418,6 +423,11 @@ namespace Isis {
		pband += ValidateKey("PixelResolution", aveRes);
		pband += ValidateKey("MeanGroundResolution", g.grRes);

		pband += ValidateKey("ObliqueSampleResolution", g.obliqueSampRes);
		pband += ValidateKey("ObliqueLineResolution", g.obliqueLineRes);
		pband += ValidateKey("ObliquePixelResolution", g.obliquePixelRes);
		pband += ValidateKey("ObliqueDetectorResolution", g.obliqueDetectorRes);

		pband += ValidateKey("SubSolarAzimuth", g.subSolarAzimuth);
		pband += ValidateKey("SubSolarGroundAzimuth", g.subSolarGroundAzimuth);
		pband += ValidateKey("SubSolarLatitude", g.subSolarLatitude);
		@@ -684,6 +694,10 @@ namespace Isis {
		pixelRes.AddData(b->sampRes);
		pixelRes.AddData(b->lineRes);
		groundRes.AddData(b->grRes);
		pixelRes.AddData(b->obliqueLineRes);
		pixelRes.AddData(b->obliqueSampRes);
		pixelRes.AddData(b->obliquePixelRes);
		pixelRes.AddData(b->obliqueDetectorRes);
		}

		double res = groundRes.Average();

isis/src/base/apps/caminfo/CamTools.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -201,7 +201,8 @@ namespace Isis {
		centroidLatitude(Null), centroidLongitude(Null),
		centroidLine(Null), centroidSample(Null), centroidRadius(Null),
		surfaceArea(Null), phase(Null), emi(Null), inc(Null),
		sampRes(Null), lineRes(Null), grRes(Null),
		sampRes(Null), lineRes(Null), grRes(Null), obliqueSampRes(Null),
		obliqueLineRes(Null), obliquePixelRes(Null), obliqueDetectorRes(Null),
		solarLongitude(Null), northAzimuth(Null), offNader(Null),
		subSolarAzimuth(Null), subSolarGroundAzimuth(Null),
		subSpacecraftAzimuth(Null), subSpacecraftGroundAzimuth(Null),
		@@ -230,6 +231,7 @@ namespace Isis {
		double centroidRadius, surfaceArea;
		double phase, emi, inc;
		double sampRes, lineRes, grRes;
		double obliqueSampRes, obliqueLineRes, obliquePixelRes, obliqueDetectorRes;
		double solarLongitude, northAzimuth, offNader;
		double subSolarAzimuth, subSolarGroundAzimuth;
		double subSpacecraftAzimuth, subSpacecraftGroundAzimuth;

isis/src/base/apps/caminfo/caminfo.cpp

+69 −56

Original line number	Diff line number	Diff line
		@@ -44,7 +44,9 @@ void IsisMain() {
		const QString caminfo_program = "caminfo";
		UserInterface &ui = Application::GetUserInterface();

		QList< QPair<QString, QString> > general = NULL, camstats = NULL, *statistics = NULL;
		QList< QPair<QString, QString> > *general = NULL;
		QList< QPair<QString, QString> > *camstats = NULL;
		QList< QPair<QString, QString> > *statistics = NULL;
		BandGeometry *bandGeom = NULL;

		// Get input filename
		@@ -174,14 +176,18 @@ void IsisMain() {
		}
		else {
		polySinc = (int)( 0.5 + 0.10 * incube->sampleCount() );
		if(polySinc == 0) polySinc = 1;
		if (polySinc == 0) {
		polySinc = 1;
		}
		}
		if ( ui.WasEntered("POLYLINC") ) {
		polyLinc = ui.GetInteger("POLYLINC");
		}
		else {
		polyLinc = (int)( 0.5 + 0.10 * incube->lineCount() );
		if(polyLinc == 0) polyLinc = 1;
		if (polyLinc == 0) {
		polyLinc = 1;
		}
		}
		}
		else {
		@@ -258,10 +264,12 @@ void IsisMain() {
		}
		}

		if(sFormat.toUpper() == "PVL")
		if (sFormat.toUpper() == "PVL") {
		GeneratePVLOutput(incube, general, camstats, statistics, bandGeom);
		else
		}
		else {
		GenerateCSVOutput(incube, general, camstats, statistics, bandGeom);
		}

		// Clean the data
		delete general;
		@@ -303,8 +311,9 @@ void GeneratePVLOutput(Cube *incube,
		// Add some common/general things
		PvlObject params("Caminfo");
		PvlObject common("Parameters");
		for(int i = 0; i < general->size(); i++)
		for (int i = 0; i < general->size(); i++) {
		common += PvlKeyword((general)[i].first, (general)[i].second);
		}
		params.addObject(common);

		// Add the camstats
		@@ -359,11 +368,13 @@ void GeneratePVLOutput(Cube *incube,
		QString outFile = ui.GetFileName("TO");
		pout.addObject(params);

		if(ui.GetBoolean("APPEND"))
		if (ui.GetBoolean("APPEND")) {
		pout.append(outFile);
		else
		}
		else {
		pout.write(outFile);
		}
		}


		/**
		@@ -386,10 +397,12 @@ void GenerateCSVOutput(Cube *incube,
		fstream outFile;
		QString sOutFile = ui.GetAsString("TO");
		bool appending = ui.GetBoolean("APPEND") && FileName(sOutFile).fileExists();
		if(appending)
		if (appending) {
		outFile.open(sOutFile.toLatin1().data(), std::ios::out \| std::ios::app);
		else
		}
		else {
		outFile.open(sOutFile.toLatin1().data(), std::ios::out);
		}

		// Add some common/general things
		for (int i = 0; i < general->size(); i++)

isis/src/base/apps/caminfo/caminfo.xml

+120 −116

Original line number	Diff line number	Diff line
		@@ -362,6 +362,10 @@ End
		<change name="Janet Richie" date="2013-02-25">
		Reviewed documentation. References #1452.
		</change>
		<change name="Kaitlyn Lee" date="2018-03-06">
		Added oblique sample, line, detector, and pixel resolutions to the
		geometry PVL group. Fixes #4100.
		</change>
		</history>

		<category>

isis/src/qisis/objs/AdvancedTrackTool/AdvancedTrackTool.cpp

+225 −135

File changed.

Preview size limit exceeded, changes collapsed.