PROG: fixed merge conflicts (3d462238) · Commits · aflab / astrogeology / ISIS3

isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.cpp

+10 −0

Original line number	Diff line number	Diff line
		@@ -340,6 +340,16 @@ namespace Isis {
		}


		/**
		* Returns the name of the output control network.
		*
		* @return @b QString The name of the output control network.
		*/
		void BundleSolutionInfo::setOutputControl(Control *outputControl) {
		m_outputControl = outputControl;
		}


		/**
		* Returns bundle output Control object.
		*

+1 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@ namespace Isis {

		void addAdjustedImages(ImageList *images);
		void setOutputStatistics(BundleResults statisticsResults);
		void setOutputControl(Control *outputControl) {m_outputControl = outputControl;}
		void setOutputControl(Control *outputControl);
		void setRunTime(QString runTime);
		void setName(QString name);

+4 −4

Original line number	Diff line number	Diff line
		@@ -35,9 +35,9 @@ using namespace std;

		namespace Isis {
		/**
		* Ipce (Qnet) tool - Handles mouse button actions and drawing control points on viewports
		* ControlNet (Qnet) tool - Handles mouse button actions and drawing control points on viewports
		*
		* @param parent Pointer to the parent widget for the Ipce tool
		* @param parent Pointer to the parent widget for the ControlNet tool
		*
		* @author 2016-09-01 Tracie Sucharski
		*
		@@ -56,10 +56,10 @@ namespace Isis {


		/**
		* Adds the Ipce tool action to the tool pad.
		* Adds the ControlNet tool action to the tool pad.
		*
		* @param pad Tool pad
		* @return @b QAction* Pointer to Tie tool action
		* @return @b QAction* Pointer to ControlNet tool action
		*
		* @internal
		* @history 2017-07-25 Tyler Wilson - Set the

+4 −2

Original line number	Diff line number	Diff line
		@@ -29,8 +29,8 @@ namespace Isis {
		class UniversalGroundMap;

		/**
		* @brief ControlNetTool operations ipce, handles mouse events on views for control point editing
		* for the ipce app.
		* @brief ControlNetTool Handles mouse events on CubeDnViews for control point editing for the
		* ipce app.
		*
		* @ingroup Visualization Tools
		*
		@@ -52,6 +52,8 @@ namespace Isis {
		* @history 2017-08-08 Cole Neubauer - Renamed from IpceTool. Fixes #5090.
		* @history 2017-08-09 Cole Neubauer - Added loadNetwork() for changing inbetween active
		* networks Fixes #4567
		* @history 2018-03-12 Tracie Sucharski - Fixed some documentation leftover from renaming from
		* IpceTool. References #5090.
		*/
		class ControlNetTool : public Tool {
		Q_OBJECT

+5 −4

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@
		#include "ControlDisplayProperties.h"
		#include "ControlList.h"
		#include "ControlNet.h"
		#include "ControlNetTool.h"
		#include "ControlPointEditView.h"
		#include "ControlPointEditWidget.h"
		#include "CubeDnView.h"
		@@ -745,13 +746,13 @@ namespace Isis {
		if (!project()->activeControl()) {
		QList<QAction *> toolbar = result->toolPadActions();
		QAction* cnetAction = toolbar[0];
		MosaicControlNetTool cnetButton = static_cast<MosaicControlNetTool >(cnetAction->parent());
		ControlNetTool cnetTool = static_cast<ControlNetTool >(cnetAction->parent());

		cnetAction->setEnabled(false);
		connect (project(), SIGNAL(activeControlSet(bool)),
		cnetAction, SLOT(setEnabled(bool)));
		connect (project(), SIGNAL(activeControlSet(bool)),
		cnetButton, SLOT(loadNetwork()));
		cnetTool, SLOT(loadNetwork()));
		}

		return result;