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

Merge pull request #141 from TracieSucharski/ipce 

PROG: Backed out previous changes because the read/write control is n…
parents 53cc3033 663173f0

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

+6 −11
Original line number Diff line number Diff line
@@ -276,22 +276,17 @@ namespace Isis { 
    Control *control = NULL;

    try {

      QString cnetFileName = cnetFileNameAndProgress.first.original();

//    ControlNet *cnet = new ControlNet();

//    cnet->SetMutex(m_project->mutex());



//      cnet->ReadControl(cnetFileName, cnetFileNameAndProgress.second);

      ControlNet *cnet = new ControlNet();

      cnet->SetMutex(m_project->mutex());

      cnet->ReadControl(cnetFileName, cnetFileNameAndProgress.second);



      QString baseFilename = FileName(cnetFileName).name();

      QString destination = m_destinationFolder.canonicalPath() + "/" + baseFilename;



      if (!QFile::copy(cnetFileName, destination) ) {

        //m_warning = "Error saving control net.";

      }



//      cnet->Write(destination);

      cnet->Write(destination);



//    delete cnet;

//    cnet = NULL;

      delete cnet;

      cnet = NULL;



      control = new Control(m_project, destination);

      control->closeControlNet();

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

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ namespace Isis { 
   *                           Control is created Fixes #5026

   *   @histroy 2017-10-24 Adam Goins - Removed the undoStack() call that occurred when a

   *                           Failed cnet is imported. Fixes #5186

   *   @history 2018-03-30 Tracie Sucharski - Copy the control net instead of writing.

   */

  class ImportControlNetWorkOrder : public WorkOrder {

      Q_OBJECT