Commit 36e4434d authored by Ken Edmundson's avatar Ken Edmundson
Browse files

Merge branch 'ipce' of github.com:kledmundson/ISIS3 into ipce

parents fca7243c 75fec6e7

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

+2 −1
Original line number Diff line number Diff line
@@ -679,6 +679,7 @@ namespace Isis { 
      mainWidget->measureTableView()->content()->setActiveControlNet(true);

    }



    // connect destroyed signal for mainWidget to cleanupCnetEditorViewWidgets slot

    connect(mainWidget, SIGNAL( destroyed(QObject *) ),

            this, SLOT( cleanupCnetEditorViewWidgets(QObject *) ) );

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

+5 −5
Original line number Diff line number Diff line
@@ -206,11 +206,11 @@ namespace Isis { 
   *                           projects. Fixes #5216.

   *   @history 2017-12-05 Christopher Combs - Added support for TemplateEditorWidget and

   *                           TemplateEditViewWorkOrder. Fixes #5168.

   *   @history 2018-03-22 Ken Edmundson - Modified m_controlMap value from QWidget to

   *                           CnetEditorWidget. Added ability to view bundleout.txt file in method

   *                           addBundleObservationView. Changed connection  to take signal from

   *                           a CnetEditorWidget instead of a QWidget for destruction of a

   *                           CnetEditorWidget.

   *   @history 2018-03-14 Ken Edmundson - Modified m_controlMap value from QWidget to

   *                           CnetEditorWidget and changed connection  to take signal from

   *                           a CnetEditorWidget instead of a QWidget for destruction of

   *                           CnetEditorWidgets. Added ability to view bundleout.txt file in method

   *                           addBundleObservationView.

   */

  class Directory : public QObject {

    Q_OBJECT

isis/src/qisis/objs/Project/Project.cpp

+6 −0
Original line number Diff line number Diff line
@@ -2145,6 +2145,12 @@ namespace Isis { 
        deleteAllProjectFiles();

        relocateProjectRoot(newDestination);

        m_isTemporaryProject = false;



        // 2014-03-14 kle This is a lame kludge because we think that relocateProjectRoot is not

        // working properly. For example, when we save a new project and try to view a control net

        // the it thinks it's still in the /tmp area

        // see ticket #5292

        open(newDestination);

      }

      // Dialog was cancelled

      else {

isis/src/qisis/objs/Project/Project.h

+4 −0
Original line number Diff line number Diff line
@@ -221,6 +221,10 @@ namespace Isis { 
   *                           Corrected the setting of the project root when pening a project from

   *                           the command line. Removed m_projectPath, it is no longer needed since

   *                           m_projectRoot contains the correct path. References #5104.

   *   @history 2018-03-14 Ken Edmundson - Modified save method to reopen project if we are saving

   *                           a temporary project to ensure all project files are pointing to the

   *                           correct directory. Note that this is NOT ideal, particularly it the

   *                           project has many files.

   */

  class Project : public QObject {

    Q_OBJECT