Commit 94de636a authored by Adam Goins's avatar Adam Goins
Browse files

Fixed Merge conflicts

parents b34b68bf 3c6c554f

isis/src/tgo/apps/tgocassisunstitch/tgocassisunstitch.cpp

+0 −1
Original line number Diff line number Diff line
@@ -235,7 +235,6 @@ void IsisMain() { 
 *

 *   @history 2018-02-14 Adam Goins - Modified the copying of the data in the buffer to include

 *                           the sample offset (m_startSample) for a cube.

 *

 */

void unstitchFullFrame(Buffer &in) {

  for (int i=0; i < g_frameletInfoList.size(); i++) {

isis/src/tgo/apps/tgocassisunstitch/tgocassisunstitch.xml

+5 −0
Original line number Diff line number Diff line
@@ -23,9 +23,14 @@ 
      but containing other '.'s  in the string to not strip off everything after the last period. For example, if the

      user inputs CAS-MCO-2016-11-22T16:10:43.505 as the OUTPUTPREFIX, now the 505 will now be retained.

    </change>

    <change name="Adam Goins" date="2018-02-15">

      Updated the application to include the sample offsets when processing lines from the stitched

      frame into output cubes.

    </change>

    <change name="Adam Goins" date="2018-02-15">

     Modified unstitchFrame to parse the Archive group for each framelet.

   </change>



  </history>



  <category>