Commit 85588300 authored by Tracie Sucharski's avatar Tracie Sucharski
Browse files

Merge branch 'dev' into ipce

parents 4bc9e5f1 9efec548

isis/src/juno/objs/JunoCamera/JunoCamera.cpp

+20 −20
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ namespace Isis { 


    // get start et for this frame, in seconds

    double frameStartEt = observationStartEt + startTimeBias + (frameNumber - 1)

                             * (exposureDur + interFrameDelay + interFrameDelayBias);

                             * (interFrameDelay + interFrameDelayBias);

    // Set start time to center of exposure time to ensure the proper SPICE data is cached.

    setTime(frameStartEt + exposureDur / 2.0);

isis/src/juno/objs/JunoCamera/JunoCamera.h

+5 −3
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ namespace Isis { 
   *

   * @internal

   *   @history 2017-07-22 Jeannie Backer - Original version.

   *   @history 2018-04-25 Jesse Mapel - Modified frame start calculation to not

   *                           use exposure duration. Fixes #5236.

   */

  class JunoCamera : public FramingCamera {

    public:

isis/src/qisis/objs/Workspace/Workspace.cpp

+5 −5
Original line number Diff line number Diff line
@@ -338,13 +338,13 @@ namespace Isis { 
    QList<QString> cubesToOpen;



    // If the file is a cub file, we add the path to it to our list of cubes to open.

    if ( cubeFileName.suffix() == "cub" || cubeFileName.suffix() == "cube" ) {

    if ( cubeFileName.suffix() == "cub" || cubeFileName.suffix() == "cube" || cubeFileName.suffix() == "lbl") {

      // cubesToOpen.append(cubeFileName.absoluteFilePath());

      cubesToOpen.append(cubeFileName.filePath());

    }

    else {

      // If the file received isn't a .cub, it has to be a cubelist. We read every cube in the cubelist

      // And append it to the cubesToOpen QList so that we can open them.

      // If the file received isn't a cube or label, it has to be a cubelist. We read every cube in

      // the cubelist and append it to the cubesToOpen QList so that we can open them.

      QFile file(cubename);

      file.open(QIODevice::ReadOnly);

isis/src/qisis/objs/Workspace/Workspace.h

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ namespace Isis { 
  *                           class, Shape, which also contains a cube, but not an Image.

  *   @history 2017-09-11 Adam Goins - Added the ability to accept cubelists under any file format.

  *                           Fixes #5099.

  *   @history 2018-04-13 Christopher Combs - Added .lbl files to the list of single-cube file-extensions

  *                           to check before reading a cube list in addCubeViewport. Fixes #5350.

  */

  class Workspace : public QWidget {

      Q_OBJECT

isis/src/rosetta/apps/rosvirtis2isis/rosvirtis2isis.cpp

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ void IsisMain () 
  if (procLevel == 2) {

    p.SetDataTrailerBytes(864);

  }

  else if ((procLevel == 3)) {

  else if (procLevel == 3) {

    p.SetDataTrailerBytes(0);

    p.SetDataSuffixBytes(4);

  }