Unverified Commit e978ab00 authored by kledmundson's avatar kledmundson Committed by GitHub
Browse files

Merge pull request #395 from TracieSucharski/ipce 

Ipce- Remove the autosave of active control which was a temporary fix & likely causing problems for large nets.
parents edc8030e 645db323

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

+2 −1
Original line number Diff line number Diff line
@@ -802,7 +802,8 @@ namespace Isis { 
      m_maxThreadCount = globalSettings.value("maxThreadCount", m_maxThreadCount).toInt();

      applyMaxThreadCount();

    }

  //  m_directory->project()->setClean(true);



    m_directory->project()->setClean(true);

  }

isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.cpp

+0 −7
Original line number Diff line number Diff line
@@ -800,8 +800,6 @@ namespace Isis { 
      groundFile = newFile.absoluteFilePath();

      m_controlNet->GetPoint(i)->SetAprioriSurfacePointSourceFile(groundFile.expanded());

    }

    //  TODO:  Temporary until autosave is implemented Save control net to Backup file

    emit saveControlNet();

  }
@@ -1290,7 +1288,6 @@ namespace Isis { 
      // emit a signal to alert user to save when exiting

      m_control->setModified(true);

      emit cnetModified();

      emit saveControlNet();



      if (m_editPoint != NULL) {

        //  Change Save Point button text to red
@@ -1687,8 +1684,6 @@ namespace Isis { 
    emit cnetModified();

    //   Refresh chipViewports to show new positions of controlPoints

    m_measureEditor->refreshChips();



    emit saveControlNet();

  }
@@ -2616,8 +2611,6 @@ namespace Isis { 


    //  Change Save Measure button text back to default

    m_saveNet->setPalette(m_saveDefaultPalette);



    emit saveControlNet();

  }

isis/src/qisis/objs/ControlPointEditWidget/ControlPointEditWidget.h

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ namespace Isis { 
   *                           the active registration template from the widget itself.

   *   @history 2018-07-13 Kaitlyn Lee - Added calls to setModified(true) when a cnet is modified.

   *                           References #5396.

   *   @history 2018-08-08 Tracie Sucharski - Removed temporary autosave of active control, most

   *                           likely causing problems with large networks.

   */

  class ControlPointEditWidget : public QWidget {

    Q_OBJECT

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

+0 −13
Original line number Diff line number Diff line
@@ -899,8 +899,6 @@ namespace Isis { 
      connect(result->controlPointEditWidget(), SIGNAL(cnetModified()),

              this, SIGNAL(cnetModified()));



      connect(result->controlPointEditWidget(), SIGNAL(saveControlNet()),

              this, SLOT(makeBackupActiveControl()));

      connect (project(), SIGNAL(activeControlSet(bool)),

              result->controlPointEditWidget(), SLOT(setControlFromActive()));
@@ -1917,17 +1915,6 @@ namespace Isis { 
  }





  /**

   * Autosave for control net.  The control net is auto saved to the same directory as the input

   * net.  It is saved to controlNetFilename.net.bak.

   *

   */

  void Directory::makeBackupActiveControl() {



    project()->activeControl()->controlNet()->Write(project()->activeControl()->fileName()+".bak");

  }





  /**

   * Return the current control point id loaded in the ControlPointEditWidget

   *

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

+3 −3
Original line number Diff line number Diff line
@@ -278,6 +278,9 @@ namespace Isis { 
   *                           activeControlModified() is signaled, instead of cnetModified(). This

   *                           stops views from being redrawn when any cnet is modified, but still

   *                           occurs when the active is modified. Fixes #5396.

   *   @history 2018-08-08 Tracie Sucharski - Removed makeBackupActive slot which was a temporary

   *                           autosave of active control, most likely causing problems with large

   *                           networks.

   */

  class Directory : public QObject {

    Q_OBJECT
@@ -431,9 +434,6 @@ namespace Isis { 
      //void imagesAddedToProject(ImageList *images);

      void updateControlNetEditConnections();



      // TODO temporary slot until autosave is implemented

      void makeBackupActiveControl();



      //  Slots in response to mouse clicks on CubeDnView (ControlNetTool) and

      //    Footprint2DView (MosaicControlNetTool)

      void modifyControlPoint(ControlPoint *controlPoint, QString serialNumber = "");