Commit 2b016bc2 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Fix serialization of FootprintView so that ImageFileList is also saved to... 

Fix serialization of FootprintView so that ImageFileList is also saved to project.  References #5422.
parent 873f35b3

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

+2 −7
Original line number Diff line number Diff line
@@ -1432,7 +1432,7 @@ namespace Isis { 
      stream.writeStartElement("footprintViews");



      foreach (Footprint2DView *footprint2DViewWidget, m_footprint2DViewWidgets) {

        footprint2DViewWidget->mosaicSceneWidget()->save(stream, project(), newProjectRoot);

        footprint2DViewWidget->save(stream, project(), newProjectRoot);

      }



      stream.writeEndElement();
@@ -1502,7 +1502,7 @@ namespace Isis { 


    if (result) {

      if (localName == "footprint2DView") {

        m_directory->addFootprint2DView()->mosaicSceneWidget()->load(reader());

        m_directory->addFootprint2DView()->load(reader());

      }

      else if (localName == "imageFileList") {

        m_directory->addImageFileListView()->load(reader());
@@ -1804,11 +1804,6 @@ namespace Isis { 
        "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

+4 −1
Original line number Diff line number Diff line
@@ -233,6 +233,9 @@ namespace Isis { 
   *                           stored in m_cnetEditorViewWidgets.

   *   @history 2018-05-08 Tracie Sucharski - When saving active control, reset the "Save Net"

   *                           button to black in the ControlPointEditorWidget.

   *   @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.

   */

  class Directory : public QObject {

    Q_OBJECT