Commit 8c38e309 authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

Trying to call the readsettings later after opening the project

parent 11272b9d

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

+8 −4
Original line number Diff line number Diff line
@@ -1388,7 +1388,6 @@ namespace Isis { 
    m_isOpen = true;

    // TODO: TLS 2018-06-07  Why writeSettings here?

    emit projectSave((const Project *)this);

    emit projectLoaded(this);

  }
@@ -2198,7 +2197,7 @@ namespace Isis { 
        relocateProjectRoot(newDestination);

        m_isTemporaryProject = false;



//         emit projectSave((const Project *)this);

        emit projectSave((const Project *)this);

        

        // 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
@@ -2218,7 +2217,7 @@ namespace Isis { 
      }



      save(m_projectRoot->absolutePath(), false);

//       emit projectSave((const Project *)this);

      emit projectSave((const Project *)this);

    }



    return saveDialogCompleted;
@@ -2510,6 +2509,11 @@ namespace Isis { 
  }

  

  

  void Project::loadProjectSettings() {

    emit projectLoaded(this);

  }

  



  void Project::storeWarning(QString text) {

    m_warnings->append(text);

  }

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

+2 −0
Original line number Diff line number Diff line
@@ -372,6 +372,8 @@ namespace Isis { 


      void warn(QString text);

      

      void loadProjectSettings();



    signals:

      /**

       * apparently not used?

isis/src/qisis/objs/WorkOrder/WorkOrder.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1467,6 +1467,7 @@ namespace Isis { 
  void WorkOrder::addCloneToProject() {

    if (project()) {

      project()->addToProject(clone());

      project()->loadProjectSettings();

    }

  }