Commit cdb552dd authored by Ian Humphrey's avatar Ian Humphrey
Browse files

PROG Updated Resource to reflect subtle change to PvlFlatMap API. Ref #2406. 

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6581 41f8697f-d340-4b68-9986-7bafba869bb8
parent acc2d15a

isis/src/base/objs/Resource/Resource.cpp

+30 −2
Original line number Diff line number Diff line
@@ -107,9 +107,37 @@ namespace Isis { 
   * Discard is set to false. The asset list is left empty.

   *

   * @param name     A string containing the resource name.

   * @param profile  A PVL container of keywords.

   * @param profile  A PvlContainer of keywords.

   */

  Resource::Resource(const QString &name, const PvlContainer &profile) :

  /*Resource::Resource(const QString &name, const PvlContainer &profile) :

                     m_data( new ResourceData(name, PvlFlatMap(profile) ) ),

                     m_discard(false) {

    setName(name);

  }*/





  /**

   * Constructs a Resource object with the given name and profile of keywords.

   * Discard is set to false. The asset list is left empty.

   *

   * @param name     A string containing the resource name.

   * @param profile  A PvlGroup of keywords.

   */

  Resource::Resource(const QString &name, const PvlGroup &profile) :

                     m_data( new ResourceData(name, PvlFlatMap(profile) ) ),

                     m_discard(false) {

    setName(name);

  }



  

  /**

   * Constructs a Resource object with the given name and profile of keywords.

   * Discard is set to false. The asset list is left empty.

   *

   * @param name     A string containing the resource name.

   * @param profile  A PvlObject of keywords.

   */ 

  Resource::Resource(const QString &name, const PvlObject &profile) :

                     m_data( new ResourceData(name, PvlFlatMap(profile) ) ),

                     m_discard(false) {

    setName(name);

isis/src/base/objs/Resource/Resource.h

+3 −1
Original line number Diff line number Diff line
@@ -74,7 +74,9 @@ namespace Isis { 
      Resource();

      Resource(const QString &name);

      Resource(const QString &name, const PvlFlatMap &profile);

      Resource(const QString &name, const PvlContainer &profile);

      //Resource(const QString &name, const PvlContainer &profile);

      Resource(const QString &name, const PvlGroup &profile);

      Resource(const QString &name, const PvlObject &profile);

      Resource(const Resource &other);

      virtual ~Resource();