Added shortcuts for Qnet Tool, Qtie Tool, and qview's Match Tool. Fixes #2324. (54334232) · Commits · aflab / astrogeology / ISIS3

isis/src/qisis/apps/qnet/qnet.xml

+15 −6

Original line number	Diff line number	Diff line
		@@ -177,7 +177,8 @@
		chosen from the combo-boxes under the labels "Left Measure" and
		"Right Measure". Only the control measure in the right view can be
		moved, so if you want to move the reference measure, you must display it
		in the right view.
		in the right view. You can select the previous or next right measure with the
		shortcuts <strong>PageUp</strong> and <strong>PageDown</strong>, respectively.
		</p>
		<h4>Changing Measure Locations</h4>
		<p>
		@@ -211,23 +212,26 @@
		and the keyboard arrow keys may be used to move the right view while
		blinking.</li>
		<li><strong>Find:</strong> Center the right view so that the same latitude /
		longitude is under the crosshair as the left view.</li>
		longitude is under the crosshair as the left view. <strong>Shortcut: F</strong></li>
		</ul>
		<p>Below the right view:</p>
		<ul>
		<li><strong>Register:</strong> Sub-pixel register the the right view to
		the left view.</li>
		the left view. <strong>Shortcut: R</strong></li>
		<li><strong>Undo Registration:</strong> Undo the sub-pixel registration.
		<strong>Shortcut: U</strong></li>
		<li><strong>Save Measure:</strong> Save the control measure under the
		right view to the edit control point.</li>
		right view to the edit control point. <strong>Shortcut: M</strong></li>
		</ul>
		<p>Along the bottom:</p>
		<ul>
		<li><strong>Add Measure(s) to Point:</strong> Add control measure(s) to the
		current control point. A dialog will show all cubes in the network with
		those that fall at this control point's latitude and longitude highlighted.
		All cubes chosen will be added as control measures to this control point.</li>
		All cubes chosen will be added as control measures to this control point.
		<strong>Shortcut: A</strong></li>
		<li><strong>Save Point:</strong> Save the edit control point to the control
		network.</li>
		network. <strong>Shortcut: P</strong></li>
		</ul>
		<h3>Measure Table window</h3>
		<p>This window will show all control measure data for the current edit control
		@@ -538,5 +542,10 @@
		<change name="Ian Humphrey" date="2015-10-07">
		Updated icons. Fixes #1041.
		</change>
		<change name="Ian Humphrey" date="2015-11-19">
		Added shortcuts to Qnet Tool window for selecting right measures, registration, saving
		measures, saving a point, adding a new measure, find, and saving the control network. Fixes
		#2324.
		</change>
		</history>
		</application>

isis/src/qisis/apps/qtie/qtie.xml

+9 −3

Original line number	Diff line number	Diff line
		@@ -127,14 +127,16 @@
		and the keyboard arrow keys may be used to move the right view while
		blinking.</li>
		<li><strong>Find:</strong> Center the right view so that the same latitude /
		longitude is under the crosshair as the left view.</li>
		longitude is under the crosshair as the left view. <strong>Shortcut: F</strong></li>
		</ul>
		<p>Below the right view:</p>
		<ul>
		<li><strong>Register:</strong> Sub-pixel register the right view to
		the left view.</li>
		the left view. <strong>Shortcut: R</strong></li>
		<li><strong>Undo Registration:</strong> Undo the sub-pixel registration.
		<strong>Shortcut: U</strong></li>
		<li><strong>Save Measure:</strong> Save the control measure under the
		right view to the edit control point.</li>
		right view to the edit control point. <strong>Shortcut: M</strong></li>
		</ul>
		<p>Along the bottom:</p>
		<ul>
		@@ -202,5 +204,9 @@
		<change name="Ian Humphrey" date="2015-10-07">
		Updated icons. Fixes #1041.
		</change>
		<change name="Ian Humphrey" date="2015-11-19">
		Added shortcuts to Qtie Tool window for selecting right measures, registration, saving
		measures, and find. Fixes #2324.
		</change>
		</history>
		</application>

isis/src/qisis/apps/qview/qview.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -152,5 +152,9 @@
		<change name="Ian Humphrey" date="2015-10-07">
		Updated icons. Fixes #1041.
		</change>
		<change name="Ian Humphrey" date="2015-11-19">
		Added shortcuts to Match Tool window for selecting right measures, registration, undo
		registration, saving measures, saving the point, and saving the control network. Fixes #2324.
		</change>
		</history>
		</application>

isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.cpp

+31 −2

Original line number	Diff line number	Diff line
		#include "ControlPointEdit.h"

		//TEST
		#include <QDebug>

		#include <QApplication>
		#include <QButtonGroup>
		#include <QCheckBox>
		@@ -113,6 +116,9 @@ namespace Isis {
		* value of the new private variable,
		* p_templateFileName, to the previously hard-coded
		* template filename.
		* @history 2015-10-29 Ian Humphrey - Added shortcuts for Find (F), Register (R),
		* Undo Registration (U), and Save Measure (M) buttons.
		* Fixes #2324.
		*/
		void ControlPointEdit::createPointEditor(QWidget *parent) {
		// Place everything in a grid
		@@ -576,7 +582,9 @@ namespace Isis {

		if (p_useGeometry) {
		QPushButton *find = new QPushButton("Find");
		find->setToolTip("Move right measure to same Latitude/Longitude as left.");
		find->setShortcut(Qt::Key_F);
		find->setToolTip("Move right measure to same Latitude/Longitude as left. "
		"<strong>Shortcut: F</strong>");
		find->setWhatsThis("Find the Latitude/Longitude under the crosshair in the "
		"left measure and move the right measure to the same "
		"latitude/longitude.");
		@@ -589,7 +597,9 @@ namespace Isis {

		QHBoxLayout *rightLayout = new QHBoxLayout();
		p_autoReg = new QPushButton("Register");
		p_autoReg->setToolTip("Sub-pixel register the right measure to the left");
		p_autoReg->setShortcut(Qt::Key_R);
		p_autoReg->setToolTip("Sub-pixel register the right measure to the left. "
		"<strong>Shortcut: R</strong>");
		p_autoReg->setWhatsThis("Sub-pixel register the right measure to the left "
		"and move the result under the crosshair. After "
		"viewing the results, the option exists to move the "
		@@ -599,6 +609,7 @@ namespace Isis {
		p_saveMeasure = new QPushButton("Save Measures");
		p_saveMeasure->setToolTip("Save the both the left and right measure to the edit control "
		"point (control point currently being edited). "
		"<strong>Shortcut: M</strong>. "
		" <strong>Note: The edit control point "
		"will not be saved to the network until you select "
		"<strong>\"Save Point\"</strong>");
		@@ -607,10 +618,12 @@ namespace Isis {
		p_saveMeasure = new QPushButton("Save Measure");
		p_saveMeasure->setToolTip("Save the right measure to the edit control "
		"point (control point currently being edited). "
		"<strong>Shortcut: M</strong>. "
		" <strong>Note: The edit control point "
		"will not be saved to the network until you select "
		"<strong>\"Save Point\"</strong>");
		}
		p_saveMeasure->setShortcut(Qt::Key_M);
		p_saveDefaultPalette = p_saveMeasure->palette();

		rightLayout->addWidget(p_autoReg);
		@@ -663,6 +676,9 @@ namespace Isis {
		p_autoRegShown = false;
		p_autoRegExtension->hide();
		p_autoReg->setText("Register");
		p_autoReg->setToolTip("Sub-pixel register the right measure to the left."
		"<strong>Shortcut: R</strong>");
		p_autoReg->setShortcut(Qt::Key_R);
		}

		p_leftMeasure = leftMeasure;
		@@ -721,6 +737,7 @@ namespace Isis {
		p_autoRegShown = false;
		p_autoRegExtension->hide();
		p_autoReg->setText("Register");
		p_autoReg->setShortcut(Qt::Key_R);
		}
		p_autoRegAttempted = false;

		@@ -822,6 +839,9 @@ namespace Isis {
		p_autoRegShown = false;
		p_autoRegExtension->hide();
		p_autoReg->setText("Register");
		p_autoReg->setToolTip("Sub-pixel register the right measure to the left. "
		"<strong>Shortcut: R</strong>");
		p_autoReg->setShortcut(Qt::Key_R);
		}

		QString pos = "Sample: " + QString::number(p_rightView->tackSample()) +
		@@ -932,6 +952,9 @@ namespace Isis {
		p_autoRegShown = false;
		p_autoRegExtension->hide();
		p_autoReg->setText("Register");
		p_autoReg->setToolTip("Sub-pixel register the right measure to the left. "
		"<strong>Shortcut: R</strong>");
		p_autoReg->setShortcut(Qt::Key_R);

		// Reload chip with original measure
		emit updateRightView(p_rightMeasure->GetSample(),
		@@ -1046,6 +1069,9 @@ namespace Isis {
		p_autoRegExtension->show();
		p_autoRegShown = true;
		p_autoReg->setText("Undo Registration");
		p_autoReg->setToolTip("Undo sub-pixel registration. "
		"<strong>Shortcut: U</strong>");
		p_autoReg->setShortcut(Qt::Key_U);
		}


		@@ -1129,6 +1155,9 @@ namespace Isis {
		p_autoRegShown = false;
		p_autoRegExtension->hide();
		p_autoReg->setText("Register");
		p_autoReg->setToolTip("Sub-pixel register the right measure to the left. "
		"<strong>Shortcut: R</strong>");
		p_autoReg->setShortcut(Qt::Key_R);
		}
		else {
		p_rightMeasure->SetChooserName(Application::UserName());

isis/src/qisis/objs/ControlPointEdit/ControlPointEdit.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -134,6 +134,8 @@ namespace Isis {
		* will undo registration if a point is already registered. Modified
		* saveMeasure() to handle exception thrown by
		* ControlMeasure::SetLogData(). Fixes #2041.
		* @history 2015-10-29 Ian Humphrey - Added shortcuts for Register (R), Save Measure (M),
		* Undo Registration (U), and Find (F). Fixes #2324.
		*
		* @todo Re-think design of the change made on 2012-07-26. The linking was put into
		* ::updateLeftPositionLabel because it was the fastest solution, but