Loading include/usgscsm/UsgsAstroPlugin.h +0 −4 Original line number Diff line number Diff line Loading @@ -55,11 +55,7 @@ private: static const std::string _MANUFACTURER_NAME; static const std::string _RELEASE_DATE; static const int _N_SENSOR_MODELS; static const int _NUM_ISD_KEYWORDS; static const std::string _ISD_KEYWORD[]; static const int _NUM_STATE_KEYWORDS; static const std::string _STATE_KEYWORD[]; static const json MODEL_KEYWORDS; typedef csm::Model* (*sensorConstructor)(void); static std::map<std::string, sensorConstructor> MODELS; Loading src/UsgsAstroFrameSensorModel.cpp +16 −12 Original line number Diff line number Diff line Loading @@ -152,9 +152,17 @@ csm::ImageCoordCovar UsgsAstroFrameSensorModel::groundToImage(const csm::EcefCoo double *achievedPrecision, csm::WarningList *warnings) const { throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION, "Unsupported function", "UsgsAstroFrameSensorModel::groundToImage"); csm::EcefCoord gp; gp.x = groundPt.x; gp.y = groundPt.y; gp.z = groundPt.z; csm::ImageCoord ip = groundToImage( gp, desiredPrecision, achievedPrecision, warnings); csm::ImageCoordCovar result(ip.line, ip.samp); // This is a partial, incorrect implementation to test if SocetGXP needs // this method implemented in order to load the sensor. return result; } Loading Loading @@ -215,9 +223,9 @@ csm::EcefCoordCovar UsgsAstroFrameSensorModel::imageToGround(const csm::ImageCoo double heightVariance, double desiredPrecision, double *achievedPrecision, csm::WarningList *warnings) const { throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION, "Unsupported function", "UsgsAstroFrameSensorModel::imageToGround"); // This is an incomplete implementation to see if SocetGXP needs this method implemented. csm::EcefCoordCovar result; return result; } Loading Loading @@ -585,9 +593,7 @@ std::string UsgsAstroFrameSensorModel::getCollectionIdentifier() const { std::string UsgsAstroFrameSensorModel::getTrajectoryIdentifier() const { throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION, "Unsupported function", "UsgsAstroFrameSensorModel::getTrajectoryIdentifier"); return ""; } Loading @@ -602,9 +608,7 @@ std::string UsgsAstroFrameSensorModel::getSensorMode() const { std::string UsgsAstroFrameSensorModel::getReferenceDateAndTime() const { throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION, "Unsupported function", "UsgsAstroFrameSensorModel::getReferenceDateAndTime"); return ""; } Loading src/UsgsAstroPlugin.cpp +0 −7 Original line number Diff line number Diff line Loading @@ -30,7 +30,6 @@ const std::string UsgsAstroPlugin::_PLUGIN_NAME = "UsgsAstroPluginCSM"; const std::string UsgsAstroPlugin::_MANUFACTURER_NAME = "UsgsAstrogeology"; const std::string UsgsAstroPlugin::_RELEASE_DATE = "20170425"; const int UsgsAstroPlugin::_N_SENSOR_MODELS = 2; const int UsgsAstroPlugin::_NUM_ISD_KEYWORDS = 21; const std::string UsgsAstroPlugin::_ISD_KEYWORD[] = { Loading Loading @@ -58,12 +57,6 @@ const std::string UsgsAstroPlugin::_ISD_KEYWORD[] = "sun_position" }; // const json UsgsAstroPlugin::MODEL_KEYWORDS = { // {UsgsAstroFrameSensorModel::_SENSOR_MODEL_NAME, UsgsAstroFrameSensorModel::_STATE_KEYWORD}, // {UsgsAstroLsSensorModel::_SENSOR_MODEL_NAME, UsgsAstroLsSensorModel::_STATE_KEYWORD} // }; // Static Instance of itself const UsgsAstroPlugin UsgsAstroPlugin::m_registeredPlugin; Loading Loading
include/usgscsm/UsgsAstroPlugin.h +0 −4 Original line number Diff line number Diff line Loading @@ -55,11 +55,7 @@ private: static const std::string _MANUFACTURER_NAME; static const std::string _RELEASE_DATE; static const int _N_SENSOR_MODELS; static const int _NUM_ISD_KEYWORDS; static const std::string _ISD_KEYWORD[]; static const int _NUM_STATE_KEYWORDS; static const std::string _STATE_KEYWORD[]; static const json MODEL_KEYWORDS; typedef csm::Model* (*sensorConstructor)(void); static std::map<std::string, sensorConstructor> MODELS; Loading
src/UsgsAstroFrameSensorModel.cpp +16 −12 Original line number Diff line number Diff line Loading @@ -152,9 +152,17 @@ csm::ImageCoordCovar UsgsAstroFrameSensorModel::groundToImage(const csm::EcefCoo double *achievedPrecision, csm::WarningList *warnings) const { throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION, "Unsupported function", "UsgsAstroFrameSensorModel::groundToImage"); csm::EcefCoord gp; gp.x = groundPt.x; gp.y = groundPt.y; gp.z = groundPt.z; csm::ImageCoord ip = groundToImage( gp, desiredPrecision, achievedPrecision, warnings); csm::ImageCoordCovar result(ip.line, ip.samp); // This is a partial, incorrect implementation to test if SocetGXP needs // this method implemented in order to load the sensor. return result; } Loading Loading @@ -215,9 +223,9 @@ csm::EcefCoordCovar UsgsAstroFrameSensorModel::imageToGround(const csm::ImageCoo double heightVariance, double desiredPrecision, double *achievedPrecision, csm::WarningList *warnings) const { throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION, "Unsupported function", "UsgsAstroFrameSensorModel::imageToGround"); // This is an incomplete implementation to see if SocetGXP needs this method implemented. csm::EcefCoordCovar result; return result; } Loading Loading @@ -585,9 +593,7 @@ std::string UsgsAstroFrameSensorModel::getCollectionIdentifier() const { std::string UsgsAstroFrameSensorModel::getTrajectoryIdentifier() const { throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION, "Unsupported function", "UsgsAstroFrameSensorModel::getTrajectoryIdentifier"); return ""; } Loading @@ -602,9 +608,7 @@ std::string UsgsAstroFrameSensorModel::getSensorMode() const { std::string UsgsAstroFrameSensorModel::getReferenceDateAndTime() const { throw csm::Error(csm::Error::UNSUPPORTED_FUNCTION, "Unsupported function", "UsgsAstroFrameSensorModel::getReferenceDateAndTime"); return ""; } Loading
src/UsgsAstroPlugin.cpp +0 −7 Original line number Diff line number Diff line Loading @@ -30,7 +30,6 @@ const std::string UsgsAstroPlugin::_PLUGIN_NAME = "UsgsAstroPluginCSM"; const std::string UsgsAstroPlugin::_MANUFACTURER_NAME = "UsgsAstrogeology"; const std::string UsgsAstroPlugin::_RELEASE_DATE = "20170425"; const int UsgsAstroPlugin::_N_SENSOR_MODELS = 2; const int UsgsAstroPlugin::_NUM_ISD_KEYWORDS = 21; const std::string UsgsAstroPlugin::_ISD_KEYWORD[] = { Loading Loading @@ -58,12 +57,6 @@ const std::string UsgsAstroPlugin::_ISD_KEYWORD[] = "sun_position" }; // const json UsgsAstroPlugin::MODEL_KEYWORDS = { // {UsgsAstroFrameSensorModel::_SENSOR_MODEL_NAME, UsgsAstroFrameSensorModel::_STATE_KEYWORD}, // {UsgsAstroLsSensorModel::_SENSOR_MODEL_NAME, UsgsAstroLsSensorModel::_STATE_KEYWORD} // }; // Static Instance of itself const UsgsAstroPlugin UsgsAstroPlugin::m_registeredPlugin; Loading