Commit 01195f43 authored by Tyler Wilson's avatar Tyler Wilson
Browse files

Fixed a problem with the Warnings/History/Progress widgets being misplaced in... 

Fixed a problem with the Warnings/History/Progress widgets being misplaced in the GUI upon project load.  Fixes #5075

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

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

+5 −2
Original line number Diff line number Diff line
@@ -718,6 +718,9 @@ namespace Isis { 
   * @internal

   *   @history Ian Humphrey - Settings are now read on a project name basis. References #4358.

   *   @history Tyler Wilson 2017-11-02 - Settings now read recent projects.  References #4492.

   *   @history Tyler Wilson 2017-11-13 - Commented out a resize call near the end because it 

   *                                      was messing with the positions of widgets after a 

   *                                      project was loaded.  Fixes #5075.

   */

  void IpceMainWindow::readSettings(Project *project) {

    // Ensure that the Project pointer is not NULL
@@ -788,7 +791,6 @@ namespace Isis { 
    if (!settings.value("pos").toPoint().isNull())

      move(settings.value("pos").toPoint());



    resize(settings.value("size", QSize(800, 600)).toSize());

    m_maxThreadCount = settings.value("maxThreadCount", m_maxThreadCount).toInt();

    applyMaxThreadCount();
@@ -817,8 +819,9 @@ namespace Isis { 
        m_directory->project()->save();

      }

    }

    m_directory->project()->clear();

    writeSettings(m_directory->project());

    m_directory->project()->clear();



    QMainWindow::closeEvent(event);

  }

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

+5 −0
Original line number Diff line number Diff line
@@ -111,6 +111,11 @@ namespace Isis { 
   *                           detached views from the m_detachedViews list appropriately.

   *                           This fixes an issue where a detached view would appear to be

   *                           open even after it has been closed. Fixes #5109.

   *   @history 2017-11-12  Tyler Wilson - Removed a resize call in readSettings because it 

   *                           was screwing up the display of widgets when a project is loaded.

   *                           Also switched the order in which a project is saved.  A project is

   *                           cleared after it is saved, and not before (which had been the previous

   *                           behavior.  Fixes #5175.

   */

  class IpceMainWindow : public QMainWindow {

      Q_OBJECT