Commit 40a83ad9 authored by Summer Stapleton's avatar Summer Stapleton
Browse files

Removed full path from instrumentId and spcaecraftName as saved in the .xml file. Fixes #5179. 

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

isis/src/qisis/objs/Image/Image.cpp

+2 −2
Original line number Diff line number Diff line
@@ -818,11 +818,11 @@ namespace Isis { 
        }



        if (!instrumentId.isEmpty()) {

          m_image->m_instrumentId = m_imageFolder.expanded() + "/" + instrumentId;

          m_image->m_instrumentId = instrumentId;

        }



        if (!spacecraftName.isEmpty()) {

          m_image->m_spacecraftName = m_imageFolder.expanded() + "/" + spacecraftName;

          m_image->m_spacecraftName = spacecraftName;

        }



        if (!aspectRatioStr.isEmpty()) {

isis/src/qisis/objs/Image/Image.h

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ namespace Isis { 
   *                           (the Spacecraft name associated with this image).

   *   @history 2016-06-22 Tyler Wilson - Added documentation to member functions/variables.

   *                           Fixes #3950.

   *   @history 2017-10-11 Summer Stapleton - Removed path to instrumentId and spacecraftName in

   *                           the startElement method. Fixes #5179.

   *

   */