Removed the save control net button. (992742cb) · Commits · aflab / astrogeology / ISIS3

isis/src/qisis/apps/ipce/IpceMainWindow.cpp

+24 −24

Original line number	Diff line number	Diff line
		@@ -338,16 +338,16 @@ namespace Isis {
		m_fileMenuActions.append(exitAction);
		m_permToolBarActions.append(exitAction);

		QAction *saveNet = new QAction("&Save Active Control Network", this);
		saveNet->setIcon( QIcon::fromTheme("document-save") );
		saveNet->setShortcut(Qt::CTRL + Qt::Key_S);
		saveNet->setToolTip("Save current active control network");
		saveNet->setStatusTip("Save current active control network");
		QString whatsThis = "<b>Function:</b> Saves the current active<i>"
		"control network</i>";
		saveNet->setWhatsThis(whatsThis);
		connect(saveNet, SIGNAL(triggered()), m_directory, SLOT(saveActiveControl()));
		m_permToolBarActions.append(saveNet);
		// QAction *saveNet = new QAction("&Save Active Control Network", this);
		// saveNet->setIcon( QIcon::fromTheme("document-save") );
		// saveNet->setShortcut(Qt::CTRL + Qt::Key_S);
		// saveNet->setToolTip("Save current active control network");
		// saveNet->setStatusTip("Save current active control network");
		// QString whatsThis = "<b>Function:</b> Saves the current active<i>"
		// "control network</i>";
		// saveNet->setWhatsThis(whatsThis);
		// connect(saveNet, SIGNAL(triggered()), m_directory, SLOT(saveActiveControl()));
		// m_permToolBarActions.append(saveNet);

		// m_saveAsNet = new QAction(QPixmap(toolIconDir() + "/mActionFileSaveAs.png"),
		// "Save Control Network &As...",
		@@ -485,22 +485,22 @@ namespace Isis {
		*/
		void IpceMainWindow::createToolBars() {
		m_permToolBar = new QToolBar(this);
		m_activeToolBar = new QToolBar(this);
		m_toolPad = new QToolBar(this);
		//m_activeToolBar = new QToolBar(this);
		//m_toolPad = new QToolBar(this);

		QSize iconSize(25, 45);

		m_permToolBar->setIconSize(iconSize);
		m_activeToolBar->setIconSize(iconSize);
		m_toolPad->setIconSize(iconSize);
		//m_activeToolBar->setIconSize(iconSize);
		//m_toolPad->setIconSize(iconSize);

		m_permToolBar->setObjectName("PermanentToolBar");
		m_activeToolBar->setObjectName("ActiveToolBar");
		m_toolPad->setObjectName("ToolPad");
		//m_activeToolBar->setObjectName("ActiveToolBar");
		//m_toolPad->setObjectName("ToolPad");

		addToolBar(m_permToolBar);
		addToolBar(m_activeToolBar);
		addToolBar(m_toolPad);
		//addToolBar(m_activeToolBar);
		//addToolBar(m_toolPad);

		foreach ( QAction *action, m_directory->permToolBarActions() ) {
		m_permToolBar->addAction(action);

isis/src/qisis/apps/ipce/IpceMainWindow.h

+6 −4

Original line number	Diff line number	Diff line
		@@ -137,6 +137,8 @@ namespace Isis {
		* for cleanup because there is no way to get the dock from the view.
		* Cleanup connections are made for the views and the docks to ensure
		* that cleanup happens for both. Fixes #5433.
		* @history 2018-06-13 Kaitlyn Lee - Commented out code adding the save active control net button and
		* the toolpad, since they are not currently being used.
		*
		*/
		class IpceMainWindow : public QMainWindow {
		@@ -197,8 +199,8 @@ namespace Isis {
		static const int m_maxRecentProjects = 5;

		QToolBar *m_permToolBar; //!< The toolbar for actions that rarely need to be changed.
		QToolBar *m_activeToolBar; //<! The toolbar for the actions of the current tool.
		QToolBar *m_toolPad; //<! The toolbar for the actions that activate tools.
		//QToolBar *m_activeToolBar; //<! The toolbar for the actions of the current tool.
		//QToolBar *m_toolPad; //<! The toolbar for the actions that activate tools.

		QMenu *m_fileMenu; //!< Menu for the file actions
		QMenu *m_projectMenu; //!< Menu for the project actions

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

+27 −27

Original line number	Diff line number	Diff line
		@@ -1797,21 +1797,21 @@ namespace Isis {
		* Save the current active control.
		*
		*/
		void Directory::saveActiveControl() {

		if (project()->activeControl()) {
		project()->activeControl()->write();
		// add to HistoryTreeWidget
		QString saveCnetHistoryEntry = project()->activeControl()->fileName() +
		"has been saved.";
		m_historyTreeWidget->addToHistory(saveCnetHistoryEntry);
		}

		// Make sure the ControlPointEditView "Save Net" button is no longer red
		if (controlPointEditView()) {
		controlPointEditView()->controlPointEditWidget()->colorizeSaveNetButton(true);
		}
		}
		// void Directory::saveActiveControl() {
		//
		// if (project()->activeControl()) {
		// project()->activeControl()->write();
		// // add to HistoryTreeWidget
		// QString saveCnetHistoryEntry = project()->activeControl()->fileName() +
		// "has been saved.";
		// m_historyTreeWidget->addToHistory(saveCnetHistoryEntry);
		// }
		//
		// // Make sure the ControlPointEditView "Save Net" button is no longer red
		// if (controlPointEditView()) {
		// controlPointEditView()->controlPointEditWidget()->colorizeSaveNetButton(true);
		// }
		// }


		/**

isis/src/qisis/objs/Directory/Directory.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -238,6 +238,7 @@ namespace Isis {
		* @history 2018-05-14 Tracie Sucharski - Serialize Footprint2DView rather than
		* MosaicSceneWidget. This will allow all parts of Footprint2DView to be
		* saved/restored including the ImageFileListWidget. Fixes #5422.
		* @history 2018-06-13 Kaitlyn Lee - Commented out saveActiveControl() since it is not currently being used.
		*/
		class Directory : public QObject {
		Q_OBJECT
		@@ -380,7 +381,7 @@ namespace Isis {
		//void imagesAddedToProject(ImageList *images);
		void updateControlNetEditConnections();

		void saveActiveControl();
		//void saveActiveControl();
		// TODO temporary slot until autosave is implemented
		void makeBackupActiveControl();