Commit 8f8664f3 authored by Kristin Berry's avatar Kristin Berry Committed by Jesse Mapel
Browse files

Remove duplicated member variables and accesor functions from...

Remove duplicated member variables and accesor functions from BundleObservation and add Csm camera type to Camera enum
parent 22f75b69
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ find files of those names at the top level of this repository. **/
/* SPDX-License-Identifier: CC0-1.0 */

#include "CSMCamera.h"
#include "CameraGroundMap.h"
#include "CameraSkyMap.h"

#include <fstream>
@@ -738,8 +737,8 @@ namespace Isis {


  /**
   * Compute the slant distance form the sensor to the ground point at the
   * currently set time.
   * Compute the slant distance from the sensor to the ground
   * point at the currently set time.
   *
   * @returns @b double The distance from the sensor to the ground point in kilometers
   */
+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ namespace Isis {
       * @return CameraType Camera::Point
       */
      virtual CameraType GetCameraType() const {
        return Point;
        return Csm;
      }

      /**
+1 −0
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ namespace Isis {
        Radar,          //!< Radar Camera
        Point,          //!< Point Camera
        RollingShutter, //!< RollingShutter
        Csm             //!< Community Sensor Model Camera
      };

      /**
+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ namespace Isis {
    return p_et;
  }


  /**
   * Accessor method to get current time bias.
   *
+0 −11
Original line number Diff line number Diff line
@@ -233,17 +233,6 @@ namespace Isis {
  }


  /**
   * Returns the number of total parameters there are for solving
   *
   * @return @b int Returns the number of parameters there are
   */
// FIXME: can this work at parent level or should be pure virtual?
  int AbstractBundleObservation::numberParameters() {
    return 0;
  }


  /**
   * Sets the index for the observation
   *
Loading