Removed virtual isUndoable() and isSynchronous() methods in favor of base call implementation. (72ea45a0) · Commits · aflab / astrogeology / ISIS3

isis/src/qisis/objs/Directory/Footprint2DViewWorkOrder.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -46,8 +46,8 @@ namespace Isis {
		*/
		Footprint2DViewWorkOrder::Footprint2DViewWorkOrder(Project *project) :
		WorkOrder(project) {
		m_isUndoable = false;
		QAction::setText(tr("View &Footprints..."));
		setUndoable(false);
		}

		/**
		@@ -55,7 +55,7 @@ namespace Isis {
		*/
		Footprint2DViewWorkOrder::Footprint2DViewWorkOrder(const Footprint2DViewWorkOrder &other) :
		WorkOrder(other) {
		setUndoable(false);
		m_isUndoable = false;
		}

		/**

+4 −13

Original line number	Diff line number	Diff line
		@@ -39,6 +39,10 @@ namespace Isis {

		ImportControlNetWorkOrder::ImportControlNetWorkOrder(Project *project) :
		WorkOrder(project) {

		// This is an asynchronous workorder
		m_isSynchronous = false;

		m_watcher = NULL;

		QAction::setText(tr("Import &Control Networks..."));
		@@ -70,19 +74,6 @@ namespace Isis {
		return new ImportControlNetWorkOrder(*this);
		}

		/**
		* @brief Returns if the WorkOrder is synchronous
		*
		* @description This method overrides WorkOrder's isSynchronous. This will return false as this
		* WorkOrder is asynchronous.
		*
		* @see WorkOrder::isSynchronous()
		*
		* @return bool Returns false because this WorkOrder is asynchronous.
		*/
		bool ImportControlNetWorkOrder::isSynchronous() const {
		return false;
		}

		/**
		* @brief Sets up the work order for execution.

+0 −2

Original line number	Diff line number	Diff line
		@@ -57,8 +57,6 @@ namespace Isis {

		virtual ImportControlNetWorkOrder *clone() const;

		virtual bool isSynchronous() const;

		bool setupExecution();
		void execute();

+2 −22

Original line number	Diff line number	Diff line
		@@ -38,6 +38,8 @@ namespace Isis {
		*/
		SetActiveControlWorkOrder::SetActiveControlWorkOrder(Project *project) :
		WorkOrder(project) {
		// This workorder is not undoable
		m_isUndoable = false;

		QAction::setText(tr("Set Active Control Network") );
		QUndoCommand::setText(tr("Set Active Control Network"));
		@@ -85,28 +87,6 @@ namespace Isis {
		}


		/**
		* @brief Indicates whether this work order is undoable.
		*
		* @return bool Returns false indicating that setting the active control net is not undoable.
		*/
		bool SetActiveControlWorkOrder::isUndoable() const {

		return false;
		}


		/**
		* @brief Indicates that setting the active control net is a synchronous process
		*
		* @return bool Returns true indicating that setting the active control net is syncronous.
		*/
		bool SetActiveControlWorkOrder::isSynchronous() const {

		return true;
		}


		/**
		* @desc Make sure an active ImageList has been chosen.
		*

+0 −2

Original line number	Diff line number	Diff line
		@@ -51,8 +51,6 @@ namespace Isis {
		virtual SetActiveControlWorkOrder *clone() const;

		virtual bool isExecutable(ControlList *controls);
		virtual bool isUndoable() const;
		virtual bool isSynchronous() const;

		bool setupExecution();
		void execute();