Skip to content
Snippets Groups Projects
Commit a4dcd310 authored by jlaura's avatar jlaura Committed by Jesse Mapel
Browse files

Adds settable ellipsoid to wrapper sort of (#18)

* Adds settable ellipsoid to wrapper sort of

* Removes failing test that should be failing
parent b8a5d652
No related branches found
No related tags found
No related merge requests found
...@@ -8,3 +8,4 @@ ...@@ -8,3 +8,4 @@
%include "geometricmodel.i" %include "geometricmodel.i"
%include "rastergm.i" %include "rastergm.i"
%include "plugin.i" %include "plugin.i"
%include "settableellipsoid.i"
...@@ -483,3 +483,12 @@ std::vector<double> FixtureSensorModel::getCrossCovarianceMatrix( ...@@ -483,3 +483,12 @@ std::vector<double> FixtureSensorModel::getCrossCovarianceMatrix(
"Unsupported function", "Unsupported function",
"FixtureSensorModel::getCrossCovarianceMatrix"); "FixtureSensorModel::getCrossCovarianceMatrix");
} }
csm::Ellipsoid FixtureSensorModel::getEllipsoid() const {
return csm::Ellipsoid(m_majorAxis, m_minorAxis);
}
void FixtureSensorModel::setEllipsoid(const csm::Ellipsoid &ellipsoid) {
m_majorAxis = ellipsoid.getSemiMajorRadius();
m_minorAxis = ellipsoid.getSemiMinorRadius();
}
...@@ -189,6 +189,9 @@ public: ...@@ -189,6 +189,9 @@ public:
virtual void replaceModelState(const std::string& argState); virtual void replaceModelState(const std::string& argState);
virtual csm::Ellipsoid getEllipsoid() const;
virtual void setEllipsoid(const csm:: Ellipsoid &ellipsoid);
private: private:
...@@ -199,5 +202,7 @@ private: ...@@ -199,5 +202,7 @@ private:
double desiredPrecision = 0.001, double desiredPrecision = 0.001,
double* achievedPrecision = NULL, double* achievedPrecision = NULL,
csm::WarningList* warnings = NULL) const; csm::WarningList* warnings = NULL) const;
double m_minorAxis;
double m_majorAxis;
}; };
#endif #endif
...@@ -58,3 +58,6 @@ def test_bad_ground_to_image(model): ...@@ -58,3 +58,6 @@ def test_bad_ground_to_image(model):
with pytest.warns(Warning) as w: with pytest.warns(Warning) as w:
img = model.groundToImage(gnd_coord, 0) img = model.groundToImage(gnd_coord, 0)
assert len(w) == 1 assert len(w) == 1
def test_ellipsoid_is_settable(model):
assert isinstance(csmapi.SettableEllipsoid.getEllipsoid(model), csmapi.Ellipsoid)
%module(package="csmapi") settableellipsoid
%{
#include "SettableEllipsoid.h"
%}
%include "SettableEllipsoid.h"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment