Commit 28902b4a authored by Makayla Shepherd's avatar Makayla Shepherd
Browse files

Updating to be closer to ISIS coding standards

parent 84d14eca
Loading
Loading
Loading
Loading
+36 −0
Original line number Diff line number Diff line
@@ -31,5 +31,41 @@ namespace Isis {
   */
  SampleScanCamera::SampleScanCamera(Isis::Cube &cube) : Camera(cube) {
  }
  
  /** 
   * Returns the SampleScan type of camera, as enumerated in the Camera
   * class. 
   * @return CameraType SampleScan camera type.
   */
  virtual CameraType GetCameraType() const {
    return SampleScan;
  }
  
  /**
   * Returns a pointer to the SampleScanCameraGroundMap object
   *
   * @return SampleScanCameraGroundMap*
   */
  SampleScanCameraGroundMap *GroundMap() {
    return (SampleScanCameraGroundMap *)Camera::GroundMap();
  };
  
  /**
   * Returns a pointer to the SampleScanCameraSkyMap object
   *
   * @return SampleScanCameraSkyMap*
   */
  SampleScanCameraSkyMap *SkyMap() {
    return (SampleScanCameraSkyMap *)Camera::SkyMap();
  };
  
  /**
   * Returns a pointer to the SampleScanCameraDetectorMap object
   *
   * @return SampleScanCameraDetectorMap*
   */
  SampleScanCameraDetectorMap *DetectorMap() {
    return (SampleScanCameraDetectorMap *)Camera::DetectorMap();
  };
};
+6 −39
Original line number Diff line number Diff line
@@ -49,47 +49,14 @@ namespace Isis {
    public:
      SampleScanCamera(Isis::Cube &cube);

      /** 
       * Returns the SampleScan type of camera, as enumerated in the Camera
       * class. 
       * @return @b CameraType SampleScan camera type.
       */
      virtual CameraType GetCameraType() const {
        return SampleScan;
      }

      /**
       * Returns a pointer to the SampleScanCameraGroundMap object
       *
       * @return SampleScanCameraGroundMap*
       */
      SampleScanCameraGroundMap *GroundMap() {
        return (SampleScanCameraGroundMap *)Camera::GroundMap();
      };

      /**
       * Returns a pointer to the SampleScanCameraSkyMap object
       *
       * @return SampleScanCameraSkyMap*
       */
      SampleScanCameraSkyMap *SkyMap() {
        return (SampleScanCameraSkyMap *)Camera::SkyMap();
      };

      /**
       * Returns a pointer to the SampleScanCameraDetectorMap object
       *
       * @return SampleScanCameraDetectorMap*
       */
      SampleScanCameraDetectorMap *DetectorMap() {
        return (SampleScanCameraDetectorMap *)Camera::DetectorMap();
      };
      virtual CameraType GetCameraType();
      SampleScanCameraGroundMap *GroundMap();
      SampleScanCameraSkyMap *SkyMap();
      SampleScanCameraDetectorMap *DetectorMap();

    private:
      //! Copying cameras is not allowed
      SampleScanCamera(const SampleScanCamera &);
      //! Assigning cameras is not allowed
      SampleScanCamera &operator=(const SampleScanCamera &);
      SampleScanCamera(const SampleScanCamera &); //!< Copying cameras is not allowed
      SampleScanCamera &operator=(const SampleScanCamera &); //!< Assigning cameras is not allowed
  };
};

+13 −0
Original line number Diff line number Diff line
@@ -28,6 +28,19 @@
#include "SampleScanCameraDetectorMap.h"

namespace Isis {
  
  /**
   * Constructor
   * 
   * @param parent The parent camera
   */
  SampleScanCameraSkyMap(Camera *parent) : CameraSkyMap(parent) {};

  /**
   * Destructor
   */
  ~SampleScanCameraSkyMap() {};
      
  /** Compute undistorted focal plane coordinate from ra/dec
   *
   * @param ra    right ascension in degrees
+3 −4
Original line number Diff line number Diff line
@@ -45,11 +45,10 @@ namespace Isis {
   */
  class SampleScanCameraSkyMap : public CameraSkyMap {
    public:
      //! Constructor
      SampleScanCameraSkyMap(Camera *parent) : CameraSkyMap(parent) {};

      //! Destructor
      virtual ~SampleScanCameraSkyMap() {};
      SampleScanCameraSkyMap(Camera *parent) : CameraSkyMap(parent);

      virtual ~SampleScanCameraSkyMap();

      virtual bool SetSky(const double ra, const double dec);
  };