Commit f711d2a6 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Fix problems importing larger data sets. Removed unused Progress tab. Add... 

Fix problems importing larger data sets. Removed unused Progress tab. Add targets and sensors back on project tree when importing images.Fixes #4955, #5151, #5181.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@8343 41f8697f-d340-4b68-9986-7bafba869bb8
parent a87b348f

isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.h

+4 −1
Original line number Diff line number Diff line
@@ -114,8 +114,11 @@ namespace Isis { 
   *                           create the directory structure.

   *   @history 2017-12-20 Tracie Sucharski - Fixed bug which was saving the bundle adjust input

   *                           control net rather than the output control net.  References #4804.

   *   @history 2017-01-03 Tracie Sucharski - Changed serialization to use relative paths.

   *   @history 2018-01-03 Tracie Sucharski - Changed serialization to use relative paths.

   *                           Fixes #5104.

   *   @history 2018-01-17 Tracie Sucharski - Added conditional code to check for null project in

   *                           xml serialization to allow the unitTest to use xml serialization

   *                           without having a project. References #5104.

   */

  class BundleSolutionInfo : public QObject {

    Q_OBJECT

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

+11 −11
Original line number Diff line number Diff line
@@ -139,17 +139,17 @@ namespace Isis { 
    m_directory->setHistoryContainer(historyDock);

    tabifyDockWidget(m_warningsDock, historyDock);



    QDockWidget *progressDock = new QDockWidget("Progress", this, Qt::SubWindow);

    progressDock->setObjectName("progressDock");

    progressDock->setFeatures(QDockWidget::DockWidgetClosable |

                         QDockWidget::DockWidgetMovable |

                         QDockWidget::DockWidgetFloatable);

    progressDock->setAllowedAreas(Qt::BottomDockWidgetArea);

    //m_directory->setProgressContainer(progressDock);

    addDockWidget(Qt::BottomDockWidgetArea, progressDock);

    tabifyDockWidget(historyDock, progressDock);



    m_warningsDock->raise();

//  QDockWidget *progressDock = new QDockWidget("Progress", this, Qt::SubWindow);

//  progressDock->setObjectName("progressDock");

//  progressDock->setFeatures(QDockWidget::DockWidgetClosable |

//                       QDockWidget::DockWidgetMovable |

//                       QDockWidget::DockWidgetFloatable);

//  progressDock->setAllowedAreas(Qt::BottomDockWidgetArea);

//  //m_directory->setProgressContainer(progressDock);

//  addDockWidget(Qt::BottomDockWidgetArea, progressDock);

//  tabifyDockWidget(historyDock, progressDock);



    historyDock->raise();





    setTabPosition(Qt::TopDockWidgetArea, QTabWidget::North);

isis/src/local/apps/ipce/IpceMainWindow.h

+4 −1
Original line number Diff line number Diff line
@@ -117,7 +117,10 @@ namespace Isis { 
   *                           cleared after it is saved, and not before (which had been the previous

   *                           behavior.  Fixes #5175.

   *   @history 2017-12-08 Tracie Sucharski - Removed project path.  Project root has been

   *                           fixed to correctly show the path.

   *                           fixed to correctly show the path. References #5276, #5289.

   *   @history 2018-01-18 Tracie Sucharski - Commented out progressDock until we decide if it's

   *                           needed.  Currently, it is not being used, the progress bar appears in

   *                           the history dock. Fixes #5151.

   */

  class IpceMainWindow : public QMainWindow {

      Q_OBJECT

isis/src/qisis/objs/Control/Control.cpp

+2 −4
Original line number Diff line number Diff line
@@ -226,10 +226,8 @@ namespace Isis { 
  void Control::copyToNewProjectRoot(const Project *project, FileName newProjectRoot) {

    if (FileName(newProjectRoot).toString() != FileName(project->projectRoot()).toString()) {



      FileName newCnetFileName(project->cnetRoot(newProjectRoot.toString()) + "/" +

          FileName(m_fileName).dir().dirName() + "/" + FileName(m_fileName).name());

      controlNet()->Write(newCnetFileName.toString());

    }

      QString newNetworkPath =  project->cnetRoot(newProjectRoot.toString()) + "/" +

                  FileName(m_fileName).dir().dirName() + "/" + FileName(m_fileName).name();



      QString oldNetworkPath = project->cnetRoot(project->projectRoot()) + "/" +

                  FileName(m_fileName).dir().dirName() + "/" + FileName(m_fileName).name();

isis/src/qisis/objs/Control/Control.h

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ namespace Isis { 
   *                           Fixes #5212.

   *   @history 2017-12-20 Tracie Sucharski - In ::copyToNewProjectRoot use string comparison

   *                           to compare project roots. References #4804, #4849.

   *   @history 2018-01-19 Tracie Sucharski - Do not copy control unless the project root has

   *                           changed. References #5212.

   */

  class Control : public QObject {

    Q_OBJECT