Rename Ephemeris to Translation

modules/base/basemodule.cpp

@@ -108,11 +108,11 @@ void BaseModule::internalInitialize() {
     fRenderable->registerClass<RenderableTrail>("RenderableTrail");
     fRenderable->registerClass<RenderableTrailNew>("RenderableTrailNew");
 
-    auto fEphemeris = FactoryManager::ref().factory<Ephemeris>();
-    ghoul_assert(fEphemeris, "Ephemeris factory was not created");
+    auto fTranslation = FactoryManager::ref().factory<Translation>();
+    ghoul_assert(fTranslation, "Ephemeris factory was not created");
 
-    fEphemeris->registerClass<StaticEphemeris>("StaticEphemeris");
-    fEphemeris->registerClass<SpiceEphemeris>("SpiceEphemeris");
+    fTranslation->registerClass<StaticTranslation>("StaticTranslation");
+    fTranslation->registerClass<SpiceTranslation>("SpiceTranslation");
 
     auto fRotation = FactoryManager::ref().factory<Rotation>();
     ghoul_assert(fRotation, "Rotation factory was not created");
@@ -137,8 +137,8 @@ void BaseModule::internalInitialize() {
 std::vector<Documentation> BaseModule::documentations() const {
     return {
         StaticScale::Documentation(),
-        StaticEphemeris::Documentation(),
-        SpiceEphemeris::Documentation()
+        StaticTranslation::Documentation(),
+        SpiceTranslation::Documentation()
     };
 }
 

modules/base/ephemeris/spiceephemeris.cpp

@@ -41,7 +41,7 @@ namespace {
 
 namespace openspace {
     
-Documentation SpiceEphemeris::Documentation() {
+Documentation SpiceTranslation::Documentation() {
     using namespace openspace::documentation;
 
     return {
@@ -50,7 +50,7 @@ Documentation SpiceEphemeris::Documentation() {
         {
             {
                 "Type",
-                new StringEqualVerifier("SpiceEphemeris"),
+                new StringEqualVerifier("SpiceTranslation"),
                 "",
                 Optional::No
             },
@@ -89,7 +89,7 @@ Documentation SpiceEphemeris::Documentation() {
     };
 }
 
-SpiceEphemeris::SpiceEphemeris(const ghoul::Dictionary& dictionary)
+SpiceTranslation::SpiceTranslation(const ghoul::Dictionary& dictionary)
     : _target("target", "Target", "")
     , _origin("origin", "Origin", "")
     , _kernelsLoadedSuccessfully(true)
@@ -97,7 +97,7 @@ SpiceEphemeris::SpiceEphemeris(const ghoul::Dictionary& dictionary)
     documentation::testSpecificationAndThrow(
         Documentation(),
         dictionary,
-        "SpiceEphemeris"
+        "SpiceTranslation"
     );
 
     _target = dictionary.value<std::string>(KeyBody);
@@ -132,11 +132,11 @@ SpiceEphemeris::SpiceEphemeris(const ghoul::Dictionary& dictionary)
     }
 }
     
-glm::dvec3 SpiceEphemeris::position() const {
+glm::dvec3 SpiceTranslation::position() const {
     return _position;
 }
 
-void SpiceEphemeris::update(const UpdateData& data) {
+void SpiceTranslation::update(const UpdateData& data) {
     double lightTime = 0.0;
     _position = SpiceManager::ref().targetPosition(
         _target, _origin, ReferenceFrame, {}, data.time, lightTime

modules/base/ephemeris/spiceephemeris.h

@@ -32,9 +32,9 @@
 
 namespace openspace {
     
-class SpiceEphemeris : public Ephemeris {
+class SpiceTranslation : public Translation {
 public:
-    SpiceEphemeris(const ghoul::Dictionary& dictionary);
+    SpiceTranslation(const ghoul::Dictionary& dictionary);
     glm::dvec3 position() const;
     void update(const UpdateData& data) override;
 

modules/base/ephemeris/staticephemeris.cpp

@@ -32,7 +32,7 @@ namespace {
 
 namespace openspace {
 
-Documentation StaticEphemeris::Documentation() {
+Documentation StaticTranslation::Documentation() {
     using namespace openspace::documentation;
     return {
         "Static Translation",
@@ -40,7 +40,7 @@ Documentation StaticEphemeris::Documentation() {
         {
             {
                 "Type",
-                new StringEqualVerifier("StaticEphemeris"),
+                new StringEqualVerifier("StaticTranslation"),
                 "",
                 Optional::No
             },
@@ -57,7 +57,7 @@ Documentation StaticEphemeris::Documentation() {
 }
 
 
-StaticEphemeris::StaticEphemeris()
+StaticTranslation::StaticTranslation()
     : _position(
         "position",
         "Position",
@@ -69,8 +69,8 @@ StaticEphemeris::StaticEphemeris()
     addProperty(_position);
 }
 
-StaticEphemeris::StaticEphemeris(const ghoul::Dictionary& dictionary)
-    : StaticEphemeris()
+StaticTranslation::StaticTranslation(const ghoul::Dictionary& dictionary)
+    : StaticTranslation()
 {
     documentation::testSpecificationAndThrow(
         Documentation(),
@@ -81,12 +81,12 @@ StaticEphemeris::StaticEphemeris(const ghoul::Dictionary& dictionary)
     _position = dictionary.value<glm::dvec3>(KeyPosition);
 }
 
-StaticEphemeris::~StaticEphemeris() {}
+StaticTranslation::~StaticTranslation() {}
 
-glm::dvec3 StaticEphemeris::position() const {
+glm::dvec3 StaticTranslation::position() const {
     return _position;
 }
 
-void StaticEphemeris::update(const UpdateData&) {}
+void StaticTranslation::update(const UpdateData&) {}
 
 } // namespace openspace

modules/base/ephemeris/staticephemeris.h

@@ -32,11 +32,11 @@
 
 namespace openspace {
     
-class StaticEphemeris : public Ephemeris {
+class StaticTranslation : public Translation {
 public:
-    StaticEphemeris();
-    StaticEphemeris(const ghoul::Dictionary& dictionary);
-    virtual ~StaticEphemeris();
+    StaticTranslation();
+    StaticTranslation(const ghoul::Dictionary& dictionary);
+    virtual ~StaticTranslation();
     virtual glm::dvec3 position() const;
     virtual void update(const UpdateData& data) override;