Commit bf7e049b authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

Fixed merge conflict

parents fd2e7cba 8c00fe11

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -42,3 +42,4 @@ print.prt 
*/tsts/*/input/*

*/tsts/*/truth/*

*/tsts/*/output/*

data/

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

+6 −4
Original line number Diff line number Diff line
@@ -170,6 +170,9 @@ namespace Isis { 
    createMenus();

    createToolBars();



    // Read default app settings

    readSettings(m_directory->project() );



    QStringList args = QCoreApplication::arguments();



    if (args.count() == 2) {
@@ -610,8 +613,8 @@ namespace Isis { 
   *   @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.

   *                was messing with the positions of widgets after a project was loaded.  

   *                Fixes #5075.

   *   @history Makayla Shepherd 2018-06-10 - Settings are read from the project root ipce.config.

   *                If that does not exist then we read from .Isis/ipce/ipce.config.

   */
@@ -633,7 +636,7 @@ namespace Isis { 
      filePath = "$HOME/.Isis/" + appName + "/ipce.config";

      

      // If the $HOME/.Isis/ipce/ipce.config does not exist then we want ipce to show up in 

      // in full screen. Meaning the default geometry is full screen

      // in full screen. In other words the default geometry is full screen

      if (!FileName(filePath).fileExists()) {

        setFullScreen = true;

      }
@@ -646,7 +649,6 @@ namespace Isis { 
      setWindowTitle( project->name() );

    }

    

    

    QSettings settings(FileName(filePath).expanded(), QSettings::NativeFormat);



    if (!setFullScreen) {

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

+10 −2
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ namespace Isis { 
   *                           Fixes #5412.

   *   @history 2018-05-30 Tracie Sucharski - Fix to handle the re-factored docked views.

   *                           Changed from MDI to SDI, changing the centralWidget to a dumy, unused

   *                           widget. Added addDock method. Remove all methods having to do with

   *                           MDI sub-windows, detached views.

   *                           widget. Remove all methods having to do with MDI sub-windows,

   *                           detached views.  The dock widgets holding the views are saved off

   *                           for cleanup because there is no way to get the dock from the view.
@@ -142,6 +144,11 @@ namespace Isis { 
   *                           view has its own toolbar, so having an active toolbar and tool pad is

   *                           not needed. Removed code adding the save active control net button and

   *                           the toolpad, since control nets can be saved with the project save button.

   *   @history 2018-06-14 Makayla Shepherd - ipce now defaults to full screen if there is not an

   *                           ipce.config in the project or in ~/.Isis/ipce.

   *   @history 2018-06-14 Makayla Shepherd - Stopped saving the state of a temporary project.

   *   @history 2018-06-14 Makayla Shepherd - Save and Save As now save the geometry and state of 

   *                           the project. 

   *   @history 2018-06-15 Tracie Sucharski - Fixed break to recent projects.  The readSettings

   *                           must be called before initializeActions to get the recent projects

   *                           from the config file.
@@ -165,7 +172,6 @@ namespace Isis { 
      void removeAllViews();



      void readSettings(Project *);

      void writeSettings(Project *project);



    protected:

      void closeEvent(QCloseEvent *event);
@@ -178,6 +184,9 @@ namespace Isis { 
      void tabAllViews();



      void raiseWarningTab();

      

      void writeSettings(Project *project);



      void cleanupViewDockList(QObject *obj);

    private:

      Q_DISABLE_COPY(IpceMainWindow);
@@ -188,7 +197,6 @@ namespace Isis { 
      void createMenus();

      void createToolBars();





    private:

      /**

       * The directory stores all of the work orders that this program is capable of doing. This

isis/src/qisis/objs/Project/Project.h

+2 −0
Original line number Diff line number Diff line
@@ -376,6 +376,8 @@ namespace Isis { 


      void warn(QString text);

      

      void loadProjectSettings();



    signals:

      /**

       * apparently not used?

isis/src/qisis/objs/Project/Project.cpp

+1 −1

File changed.

Contains only whitespace changes.