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

Fixed the default naming tag. Fixes #5069 

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

isis/src/control/objs/BundleSolutionInfo/BundleSolutionInfo.cpp

+10 −2
Original line number Diff line number Diff line
@@ -131,7 +131,12 @@ namespace Isis { 


      m_runTime = src.m_runTime;

      

      if (src.m_name == "" || src.m_name == src.m_runTime) {

        m_name = m_runTime;

      }

      else {

        m_name = src.m_name;

      }



      delete m_controlNetworkFileName;

      m_controlNetworkFileName = new FileName(src.m_controlNetworkFileName->expanded());
@@ -203,7 +208,7 @@ namespace Isis { 




  /**

   * Sets the run time

   * Sets the run time, and the name if a name is not already set.

   *

   * @param runTime The run time.

   */
@@ -218,6 +223,9 @@ namespace Isis { 
    //                    _FILEINFO_);

    // }

    m_runTime = runTime;

    if (m_name == m_runTime || m_name == "") {

      m_name = runTime;

    }

  }

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

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ namespace Isis { 
   *                           solution info images to the correct directory in the project on disk.

   *                           Fixes #4804, #4837.

   *   @history 2017-07-11 Makayla Shepherd - Added bundle naming capabilities. Fixes #4855.

   *   @history 2017-07-28 Makayla Shepherd - Fixed the default naming tag. Fixes #5069.

   */

  class BundleSolutionInfo : public QObject {

    Q_OBJECT