Commit 205636a5 authored by jlaura's avatar jlaura Committed by Trent Hare
Browse files

Adds Cassini ISS Support and Makes MDIS Generic (#7) 

* Adds Cassini-ISS supports and begins refactor to generic.

* Finalizes refactor to generic framer

* Refactors out bad class attribute

* mend
parent 3f4bc1fa

include/mdis/MdisPlugin.h→include/genericframe/UsgsAstroFramePlugin.h

+10 −10
Original line number Diff line number Diff line 
#ifndef MdisPlugin_h

#define MdisPlugin_h

#ifndef UsgsAstroFramePlugin_h

#define UsgsAstroFramePlugin_h



#ifdef _WIN32

#  ifdef MDIS_LIBRARY

#    define MDIS_EXPORT_API __declspec(dllexport)

#  ifdef FRAME_LIBRARY

#    define  USGSASTROFRAME_EXPORT_API __declspec(dllexport)

#  else

#    define MDIS_EXPORT_API __declspec(dllimport)

#    define  USGSASTROFRAME_EXPORT_API __declspec(dllimport)

# endif

#else

#  define MDIS_EXPORT_API

#  define  USGSASTROFRAME_EXPORT_API

#endif



#include <string>
@@ -17,11 +17,11 @@ 
#include <csm/Version.h>





class MDIS_EXPORT_API MdisPlugin : public csm::Plugin {

class USGSASTROFRAME_EXPORT_API UsgsAstroFramePlugin : public csm::Plugin {



  public:

    MdisPlugin();

    ~MdisPlugin();

    UsgsAstroFramePlugin();

    ~UsgsAstroFramePlugin();



    virtual std::string getPluginName() const;

    virtual std::string getManufacturer() const;
@@ -54,7 +54,7 @@ class MDIS_EXPORT_API MdisPlugin : public csm::Plugin { 
    // TODO when implementing, add any other necessary members.



private:

    static const MdisPlugin m_registeredPlugin;

    static const UsgsAstroFramePlugin m_registeredPlugin;

    static const std::string _PLUGIN_NAME;

    static const std::string _MANUFACTURER_NAME;

    static const std::string _RELEASE_DATE;

include/mdis/MdisNacSensorModel.h→include/genericframe/UsgsAstroFrameSensorModel.h

+7 −7
Original line number Diff line number Diff line 


#ifndef MdisNacSensorModel_h

#define MdisNacSensorModel_h

#ifndef UsgsAstroFrameSensorModel_h

#define UsgsAstroFrameSensorModel_h



#include <cmath>

#include <iostream>
@@ -9,13 +9,13 @@ 
#include "csm/RasterGM.h"

#include "csm/CorrelationModel.h"



class MdisNacSensorModel : public csm::RasterGM {

  // MdisPlugin needs to access private members

  friend class MdisPlugin;

class UsgsAstroFrameSensorModel : public csm::RasterGM {

  // UsgsAstroFramePlugin needs to access private members

  friend class UsgsAstroFramePlugin;



  public:

    MdisNacSensorModel();

    ~MdisNacSensorModel();

    UsgsAstroFrameSensorModel();

    ~UsgsAstroFrameSensorModel();



    virtual csm::ImageCoord groundToImage(const csm::EcefCoord &groundPt,

                                     double desiredPrecision=0.001,

setup.py

+4 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ from Cython.Build import cythonize 
# Look for the csmapi headers in the standard location

incdir = os.path.dirname(sysconfig.get_path('include'))



INCLUDE_DIRS = ['include/json', 'include/mdis', 'include/orex',

INCLUDE_DIRS = ['include/json', 'include/genericframe', 'include/orex',

                'include/genericls',

                'include/', incdir, os.path.join(incdir, 'csm')]

LIBRARY_DIRS = []  # This assumes that libcsmapi is installed in a standard place
@@ -33,9 +33,9 @@ def generate_extension(path_name, sources): 
                libraries=LIBRARIES)



# Create the extensions

extensions = [generate_extension('usgscam.mdis', ['usgscam/mdis.pyx',

                                                  'src/MdisPlugin.cpp',

                                                  'src/MdisSensorModel.cpp']),

extensions = [generate_extension('usgscam.genericframe', ['usgscam/genericframe.pyx',

                                                  'src/UsgsAstroFramePlugin.cpp',

                                                  'src/UsgsAstroFrameSensorModel.cpp']),

              generate_extension('usgscam.orex', ['usgscam/orex.pyx',

                                                  'src/ORexPlugin.cpp',

                                                  'src/ORexSensorModel.cpp']),

src/ORexSensorModel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ csm::Version ORexSensorModel::getVersion() const { 




std::string ORexSensorModel::getModelName() const {

  return "UsgsAstroFrameMdisPluginCSM";

  return "UsgsAstroFramePluginCSM";

}

src/MdisPlugin.cpp→src/UsgsAstroFramePlugin.cpp

+43 −43
Original line number Diff line number Diff line 
#include "MdisPlugin.h"

#include "MdisNacSensorModel.h"

#include "UsgsAstroFramePlugin.h"

#include "UsgsAstroFrameSensorModel.h"



#include <cstdlib>

#include <string>
@@ -16,13 +16,13 @@ 
using json = nlohmann::json;



// Declaration of static variables

const std::string MdisPlugin::_PLUGIN_NAME = "UsgsAstroFrameMdisPluginCSM";

const std::string MdisPlugin::_MANUFACTURER_NAME = "UsgsAstrogeology";

const std::string MdisPlugin::_RELEASE_DATE = "20170425";

const int         MdisPlugin::_N_SENSOR_MODELS = 1;

const std::string UsgsAstroFramePlugin::_PLUGIN_NAME = "UsgsAstroFramePluginCSM";

const std::string UsgsAstroFramePlugin::_MANUFACTURER_NAME = "UsgsAstrogeology";

const std::string UsgsAstroFramePlugin::_RELEASE_DATE = "20170425";

const int         UsgsAstroFramePlugin::_N_SENSOR_MODELS = 1;



const int         MdisPlugin::_NUM_ISD_KEYWORDS = 36;

const std::string MdisPlugin::_ISD_KEYWORD[] =

const int         UsgsAstroFramePlugin::_NUM_ISD_KEYWORDS = 36;

const std::string UsgsAstroFramePlugin::_ISD_KEYWORD[] =

{

    "boresight",

    "ccd_center",
@@ -65,8 +65,8 @@ const std::string MdisPlugin::_ISD_KEYWORD[] = 
    "z_sun_position"

};



const int         MdisPlugin::_NUM_STATE_KEYWORDS = 32;

const std::string MdisPlugin::_STATE_KEYWORD[] =

const int         UsgsAstroFramePlugin::_NUM_STATE_KEYWORDS = 32;

const std::string UsgsAstroFramePlugin::_STATE_KEYWORD[] =

{

    "m_focalLength",

    "m_iTransS",
@@ -104,58 +104,58 @@ const std::string MdisPlugin::_STATE_KEYWORD[] = 




// Static Instance of itself

const MdisPlugin MdisPlugin::m_registeredPlugin;

const UsgsAstroFramePlugin UsgsAstroFramePlugin::m_registeredPlugin;



MdisPlugin::MdisPlugin() {

UsgsAstroFramePlugin::UsgsAstroFramePlugin() {

}





MdisPlugin::~MdisPlugin() {

UsgsAstroFramePlugin::~UsgsAstroFramePlugin() {

}





std::string MdisPlugin::getPluginName() const {

std::string UsgsAstroFramePlugin::getPluginName() const {

  return _PLUGIN_NAME;

}





std::string MdisPlugin::getManufacturer() const {

std::string UsgsAstroFramePlugin::getManufacturer() const {

  return _MANUFACTURER_NAME;

}





std::string MdisPlugin::getReleaseDate() const {

std::string UsgsAstroFramePlugin::getReleaseDate() const {

  return _RELEASE_DATE;

}





csm::Version MdisPlugin::getCsmVersion() const {

csm::Version UsgsAstroFramePlugin::getCsmVersion() const {

  return CURRENT_CSM_VERSION;

}





size_t MdisPlugin::getNumModels() const {

size_t UsgsAstroFramePlugin::getNumModels() const {

  return _N_SENSOR_MODELS;

}





std::string MdisPlugin::getModelName(size_t modelIndex) const {

std::string UsgsAstroFramePlugin::getModelName(size_t modelIndex) const {



  return MdisNacSensorModel::_SENSOR_MODEL_NAME;

  return UsgsAstroFrameSensorModel::_SENSOR_MODEL_NAME;

}





std::string MdisPlugin::getModelFamily(size_t modelIndex) const {

std::string UsgsAstroFramePlugin::getModelFamily(size_t modelIndex) const {

  return CSM_RASTER_FAMILY;

}





csm::Version MdisPlugin::getModelVersion(const std::string &modelName) const {

csm::Version UsgsAstroFramePlugin::getModelVersion(const std::string &modelName) const {

  return csm::Version(1, 0, 0);

}





bool MdisPlugin::canModelBeConstructedFromState(const std::string &modelName,

bool UsgsAstroFramePlugin::canModelBeConstructedFromState(const std::string &modelName,

                                                const std::string &modelState,

                                                csm::WarningList *warnings) const {

  bool constructible = true;
@@ -166,7 +166,7 @@ bool MdisPlugin::canModelBeConstructedFromState(const std::string &modelName, 


  // Check that the plugin supports the model

  if (modelName != model_name_from_state ||

      modelName != MdisNacSensorModel::_SENSOR_MODEL_NAME){

      modelName != UsgsAstroFrameSensorModel::_SENSOR_MODEL_NAME){

          constructible = false;

      }

  // Check that the necessary keys are there (this does not chek values at all.)
@@ -181,36 +181,36 @@ bool MdisPlugin::canModelBeConstructedFromState(const std::string &modelName, 
}





bool MdisPlugin::canModelBeConstructedFromISD(const csm::Isd &imageSupportData,

bool UsgsAstroFramePlugin::canModelBeConstructedFromISD(const csm::Isd &imageSupportData,

                                              const std::string &modelName,

                                              csm::WarningList *warnings) const {

  return canISDBeConvertedToModelState(imageSupportData, modelName, warnings);

}





csm::Model *MdisPlugin::constructModelFromState(const std::string& modelState,

csm::Model *UsgsAstroFramePlugin::constructModelFromState(const std::string& modelState,

                                                csm::WarningList *warnings) const {

    csm::Model *sensor_model = 0;



    // Get the sensor model name from the sensor model state

    std::string model_name_from_state = getModelNameFromModelState(modelState);



    if (model_name_from_state != MdisNacSensorModel::_SENSOR_MODEL_NAME){

    if (model_name_from_state != UsgsAstroFrameSensorModel::_SENSOR_MODEL_NAME){

        csm::Error::ErrorType aErrorType = csm::Error::INVALID_SENSOR_MODEL_STATE;

        std::string aMessage = "Model name from state is not recognized.";

        std::string aFunction = "MdisPlugin::constructModelFromState()";

        std::string aFunction = "UsgsAstroFramePlugin::constructModelFromState()";

        throw csm::Error(aErrorType, aMessage, aFunction);

    }



    if (!canModelBeConstructedFromState(model_name_from_state, modelState)){

        csm::Error::ErrorType aErrorType = csm::Error::INVALID_SENSOR_MODEL_STATE;

        std::string aMessage = "Model state is not valid.";

        std::string aFunction = "MdisPlugin::constructModelFromState()";

        std::string aFunction = "UsgsAstroFramePlugin::constructModelFromState()";

        throw csm::Error(aErrorType, aMessage, aFunction);

    }



    // Create the model from the state

    MdisNacSensorModel* mdsensor_model = new MdisNacSensorModel();

    UsgsAstroFrameSensorModel* mdsensor_model = new UsgsAstroFrameSensorModel();



    auto state = json::parse(modelState);
@@ -261,7 +261,7 @@ return sensor_model; 
}





csm::Model *MdisPlugin::constructModelFromISD(const csm::Isd &imageSupportData,

csm::Model *UsgsAstroFramePlugin::constructModelFromISD(const csm::Isd &imageSupportData,

                                              const std::string &modelName,

                                              csm::WarningList *warnings) const {
@@ -269,9 +269,9 @@ csm::Model *MdisPlugin::constructModelFromISD(const csm::Isd &imageSupportData, 
  if (!canModelBeConstructedFromISD(imageSupportData, modelName)) {

    throw csm::Error(csm::Error::ISD_NOT_SUPPORTED,

                     "Sensor model support data provided is not supported by this plugin",

                     "MdisPlugin::constructModelFromISD");

                     "UsgsAstroFramePlugin::constructModelFromISD");

  }

  MdisNacSensorModel *sensorModel = new MdisNacSensorModel();

  UsgsAstroFrameSensorModel *sensorModel = new UsgsAstroFrameSensorModel();



  // Keep track of necessary keywords that are missing from the ISD.

  std::vector<std::string> missingKeywords;
@@ -482,14 +482,14 @@ csm::Model *MdisPlugin::constructModelFromISD(const csm::Isd &imageSupportData, 


    throw csm::Error(csm::Error::SENSOR_MODEL_NOT_CONSTRUCTIBLE,

                     errorMessage,

                     "MdisPlugin::constructModelFromISD");

                     "UsgsAstroFramePlugin::constructModelFromISD");

  }



  return sensorModel;

}





std::string MdisPlugin::getModelNameFromModelState(const std::string &modelState,

std::string UsgsAstroFramePlugin::getModelNameFromModelState(const std::string &modelState,

                                                   csm::WarningList *warnings) const {

  std::string name;

  auto state = json::parse(modelState);
@@ -499,29 +499,29 @@ std::string MdisPlugin::getModelNameFromModelState(const std::string &modelState 
  else{

      csm::Error::ErrorType aErrorType = csm::Error::INVALID_SENSOR_MODEL_STATE;

      std::string aMessage = "No 'model_name' key in the model state object.";

      std::string aFunction = "MdisPlugin::getModelNameFromModelState";

      std::string aFunction = "UsgsAstroFramePlugin::getModelNameFromModelState";

      csm::Error csmErr(aErrorType, aMessage, aFunction);

      throw(csmErr);

  }



  if (name != MdisNacSensorModel::_SENSOR_MODEL_NAME){

  if (name != UsgsAstroFrameSensorModel::_SENSOR_MODEL_NAME){

      csm::Error::ErrorType aErrorType = csm::Error::SENSOR_MODEL_NOT_SUPPORTED;

      std::string aMessage = "Sensor model not supported.";

      std::string aFunction = "MdisPlugin::getModelNameFromModelState()";

      std::string aFunction = "UsgsAstroFramePlugin::getModelNameFromModelState()";

      csm::Error csmErr(aErrorType, aMessage, aFunction);

      throw(csmErr);

  }





  return MdisNacSensorModel::_SENSOR_MODEL_NAME;

  return UsgsAstroFrameSensorModel::_SENSOR_MODEL_NAME;

}





bool MdisPlugin::canISDBeConvertedToModelState(const csm::Isd &imageSupportData,

bool UsgsAstroFramePlugin::canISDBeConvertedToModelState(const csm::Isd &imageSupportData,

                                               const std::string &modelName,

                                               csm::WarningList *warnings) const {

  bool convertible = true;

  if (modelName !=MdisNacSensorModel::_SENSOR_MODEL_NAME){

  if (modelName !=UsgsAstroFrameSensorModel::_SENSOR_MODEL_NAME){

      convertible = false;

  }
@@ -536,7 +536,7 @@ bool MdisPlugin::canISDBeConvertedToModelState(const csm::Isd &imageSupportData, 
}





std::string MdisPlugin::convertISDToModelState(const csm::Isd &imageSupportData,

std::string UsgsAstroFramePlugin::convertISDToModelState(const csm::Isd &imageSupportData,

                                               const std::string &modelName,

                                               csm::WarningList *warnings) const {

  csm::Model* sensor_model = constructModelFromISD(
@@ -545,7 +545,7 @@ std::string MdisPlugin::convertISDToModelState(const csm::Isd &imageSupportData, 
  if (sensor_model == 0){

      csm::Error::ErrorType aErrorType = csm::Error::ISD_NOT_SUPPORTED;

      std::string aMessage = "ISD not supported: ";

      std::string aFunction = "MdisPlugin::convertISDToModelState()";

      std::string aFunction = "UsgsAstroFramePlugin::convertISDToModelState()";

      throw csm::Error(aErrorType, aMessage, aFunction);

  }

  return sensor_model->getModelState();