Commit 70501121 authored by Kristin Berry's avatar Kristin Berry
Browse files

Updated iTime constructor to take the Z off of the end of PDS4-formatted UTC... 

Updated iTime constructor to take the Z off of the end of PDS4-formatted UTC time strings for NAIF compatability
parent dc8b2098

isis/src/base/objs/iTime/iTime.cpp

+15 −4
Original line number Diff line number Diff line
@@ -49,16 +49,27 @@ namespace Isis { 
  /**

   * Constructs a iTime object and initializes it to the time from the argument.

   *  

   * This constructor will (temporarily) strip the Z off of the end of an input UTC-formatted time 

   * if it is present. This time format is used by PDS4, but not presently supported by NAIF calls, 

   * in particular str2et_c, which is used by this class.  

   *  

   * @param time A time string formatted in standard UTC or similar format.

   *             Example:"2000/12/31 23:59:01.6789" or "2000-12-31T23:59:01.6789"

   *             Example:"2000/12/31 23:59:01.6789" or "2000-12-31T23:59:01.6789" or

   *             "2000-12-31T23:59:01.6789Z"

   */

  iTime::iTime(const QString &time) {

    LoadLeapSecondKernel();

    

    QString tempTime = time; 

    if (QString::compare(time.at(time.size() - 1), "Z", Qt::CaseInsensitive) == 0) {

      tempTime = time.left(time.size() - 1);

    }



    NaifStatus::CheckErrors();



    // Convert the time string to a double ephemeris time

    SpiceDouble et; 

    str2et_c(time.toLatin1().data(), &et);

    str2et_c(tempTime.toLatin1().data(), &et); 



    p_et = et;

    NaifStatus::CheckErrors();

isis/src/base/objs/iTime/iTime.h

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ namespace Isis { 
   *           were signaled. References #2248.

   *  @history 2018-03-15 Adam Goins - Removed deprecated function iTime::UnloadLeapSecondKernel().

   *                          Fixes #5325.

   *  @history 2018-05-11 Kristin Berry and Makayla Shepherd - Added UTC time format that ends in Z,

   *                          as this format is used by PDS4 (and the TGO CaSSIS mission.) 

   */

  class iTime {

    public: