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

isis/src/base/objs/Camera/Camera.cpp

+4 −3

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@
		#include "ProjectionFactory.h"
		#include "RingPlaneProjection.h"
		#include "ShapeModel.h"
		#include "SpecialPixel.h"
		#include "SurfacePoint.h"
		#include "Target.h"
		#include "TProjection.h"
		@@ -476,7 +477,7 @@ namespace Isis {
		double dist = sqrt(a * a + b * b + c * c) * 1000.0;
		return dist / (p_focalLength / p_pixelPitch);
		}
		return -1.0;
		return Isis::Null;
		}

		/**
		@@ -505,8 +506,8 @@ namespace Isis {
		double Camera::PixelResolution() {
		double lineRes = LineResolution();
		double sampRes = SampleResolution();
		if (lineRes < 0.0) return -1.0;
		if (sampRes < 0.0) return -1.0;
		if (lineRes < 0.0) return Isis::Null;
		if (sampRes < 0.0) return Isis::Null;
		return (lineRes + sampRes) / 2.0;
		}

isis/src/base/objs/Camera/Camera.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -220,6 +220,8 @@ namespace Isis {
		* References #2335.
		* @history 2016-06-27 Kelvin Rodriguez - Added member function to compute celestial north
		* clock angle. References #2365
		* @history 2016-08-01 Curtis Rose - Changed return values of resolutions from -1 to Isis::Null.
		* Fixes #2065.
		*/

		class Camera : public Sensor {

isis/src/qisis/apps/qtie/QtieFileTool.cpp

+5 −15

Original line number	Diff line number	Diff line
		@@ -35,14 +35,14 @@ namespace Isis {
		// Constructor
		QtieFileTool::QtieFileTool(QWidget *parent) : FileTool(parent) {
		openAction()->setToolTip("Open images");
		QString whatsThis =
		"<b>Function:</b> Open a <i>images</i> \
		QString whatsThis = "<b>Function:</b> Open a <i>images</i> \
		<p><b>Shortcut:</b> Ctrl+O\n</p>";
		openAction()->setWhatsThis(whatsThis);

		saveAction()->setEnabled(false);
		}


		/**
		* Open base image and image to be adjusted
		*
		@@ -63,7 +63,6 @@ namespace Isis {
		*/
		void QtieFileTool::open() {


		// If we've already opened files, clear before starting over
		if (cubeViewportList()->size() > 0) {
		// Close viewport containing ground source
		@@ -341,14 +340,5 @@ namespace Isis {
		p.Add(mB);
		}
		return true;

		}


		}
		No newline at end of file

isis/src/qisis/apps/qtie/QtieTool.cpp

+15 −20

Original line number	Diff line number	Diff line
		@@ -183,8 +183,7 @@ namespace Isis {
		"coordinate of each sample/line of the control points from "
		"the \"Match\" level 1 cube with the latitude/longitude from "
		"the \"Base\" map projected cube. To solve for all three "
		"camera angles, select the <strong>Twist</strong> check "
		"box.");
		"camera angles, select the <strong>Twist</strong> check box.");
		connect(solve, SIGNAL(clicked()), this, SLOT(solve()));
		gridLayout->addWidget(solve, row++, 0);

		@@ -208,8 +207,8 @@ namespace Isis {
		*/
		void QtieTool::createMenus() {

		p_saveNet = new QAction(QIcon(FileName(
		"$base/icons/mActionFileSaveAs.png").expanded()), "Save Control Network &As...",
		p_saveNet = new QAction(QIcon(FileName("$base/icons/mActionFileSaveAs.png").expanded()),
		"Save Control Network &As...",
		p_tieTool);
		p_saveNet->setToolTip("Save current control network to chosen file");
		p_saveNet->setStatusTip("Save current control network to chosen file");
		@@ -221,8 +220,7 @@ namespace Isis {
		QAction *closeQtieTool = new QAction(p_tieTool);
		closeQtieTool->setText("&Close");
		closeQtieTool->setShortcut(Qt::ALT + Qt::Key_F4);
		whatsThis =
		"<b>Function:</b> Closes the Qtie Tool window for this point \
		whatsThis = "<b>Function:</b> Closes the Qtie Tool window for this point \
		<p><b>Shortcut:</b> Alt+F4 </p>";
		closeQtieTool->setWhatsThis(whatsThis);
		connect(closeQtieTool, SIGNAL(triggered()), p_tieTool, SLOT(close()));
		@@ -240,8 +238,7 @@ namespace Isis {

		QAction *viewTemplate = new QAction(p_tieTool);
		viewTemplate->setText("&View/edit registration template");
		whatsThis =
		"<b>Function:</b> Displays the curent registration template. \
		whatsThis = "<b>Function:</b> Displays the curent registration template. \
		The user may edit and save changes under a chosen filename.";
		viewTemplate->setWhatsThis(whatsThis);
		connect(viewTemplate, SIGNAL(triggered()), this, SLOT(viewTemplateFile()));
		@@ -254,9 +251,9 @@ namespace Isis {
		regMenu->addAction(viewTemplate);
		// registrationMenu->addAction(interestOp);


		p_whatsThis = new QAction(QIcon(FileName(
		"$base/icons/contexthelp.png").expanded()),"&Whats's This", p_tieTool);
		p_whatsThis = new QAction(QIcon(FileName("$base/icons/contexthelp.png").expanded()),
		"&Whats's This",
		p_tieTool);
		p_whatsThis->setShortcut(Qt::SHIFT \| Qt::Key_F1);
		p_whatsThis->setToolTip("Activate What's This and click on items on "
		"user interface to see more information.");
		@@ -286,7 +283,6 @@ namespace Isis {
		* @param pad Input Toolpad for the main window
		*
		*/

		QAction QtieTool::toolPadAction(ToolPad pad) {
		QAction *action = new QAction(pad);
		action->setIcon(QPixmap(toolIconDir() + "/stock_draw-connector-with-arrows.png"));
		@@ -389,8 +385,7 @@ namespace Isis {
		// TODO: Do not know if radius came from DEM (if cube spiceinit'ed
		// with DEM) or from ellipsoid. Once change made to camera to return
		// DEM filename, update the point aprioiRadiusSource parameters.
		p_matchGM->SetGround(
		Latitude(lat, Angle::Degrees), Longitude(lon, Angle::Degrees));
		p_matchGM->SetGround(Latitude(lat, Angle::Degrees), Longitude(lon, Angle::Degrees));
		Distance radius = p_matchGM->Camera()->LocalRadius();
		if (!radius.isValid()) {
		QString message = "Could not determine radius from DEM at lat/lon ["
		@@ -946,7 +941,8 @@ namespace Isis {
		*/

		void QtieTool::setTemplateFile() {
		QString filename = QFileDialog::getOpenFileName(p_mw,

		QString filename = QFileDialog::getOpenFileName(p_tieTool,
		"Select a registration template", ".",
		"Registration template files (.def .pvl);;All files (*)");

		@@ -1038,7 +1034,6 @@ namespace Isis {
		}



		void QtieTool::enterWhatsThisMode() {
		QWhatsThis::enterWhatsThisMode();
		}

isis/src/qisis/apps/qtie/QtieTool.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -130,7 +130,7 @@ namespace Isis {
		QAction *p_deletePoint;
		QAction *p_saveNet;

		QMainWindow *p_mw;
		//QMainWindow *p_mw; Value never initialized
		ControlPointEdit *p_pointEditor;
		QLineEdit *p_tolValue;
		QLabel *p_ptIdValue;