From 2d918315dab199db3a879cc7d523ea72f5cbffe8 Mon Sep 17 00:00:00 2001
From: Jonathan Fransson <jonfr864@student.liu.se>
Date: Fri, 29 Mar 2019 09:39:46 -0600
Subject: [PATCH] push latest

---
 ext/ghoul                                     |  2 +-
 .../space/rendering/renderablesatellites.cpp  | 21 ++++++++++++++++---
 .../space/rendering/renderablesatellites.h    |  9 ++------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index a257709d73..9045871f1e 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit a257709d73c9f6ff5b9af538b3eb71bc0e8bb4d3
+Subproject commit 9045871f1e9a387708e8235c3bb809da7d860e6f
diff --git a/modules/space/rendering/renderablesatellites.cpp b/modules/space/rendering/renderablesatellites.cpp
index f8b9ba96b3..43384d491e 100644
--- a/modules/space/rendering/renderablesatellites.cpp
+++ b/modules/space/rendering/renderablesatellites.cpp
@@ -28,6 +28,7 @@
 
 #include <modules/space/rendering/renderablesatellites.h>
 #include <modules/space/translation/keplertranslation.h>
+#include <modules/space/translation/TLEtranslation.h>
 #include <modules/space/spacemodule.h>
 
 
@@ -550,11 +551,25 @@ void RenderableSatellites::readTLEFile(const std::string& filename, int lineNum)
 
     // Converting the mean motion (revolutions per day) to period (seconds per revolution)
     using namespace std::chrono;
-    double period = seconds(hours(24)).count() / keplerElements.meanMotion;
+    double period = seconds(hours(24)).count() / keplerElements.meanMotion;      
+    
+
+    //TODO: fix obv
+    size_t i = 0;
+
+    _orbits[i++] = KeplerTranslation::KeplerOrbit{
+        keplerElements.eccentricity,
+        keplerElements.semiMajorAxis,
+        keplerElements.inclination,
+        keplerElements.ascendingNode,
+        keplerElements.argumentOfPeriapsis,
+        keplerElements.meanAnomaly,
+        period,
+        keplerElements.epoch
+    };
 
-  
     /*
-    setKeplerElements(
+    KeplerTranslation setKeplerElements(
         keplerElements.eccentricity,
         keplerElements.semiMajorAxis,
         keplerElements.inclination,
diff --git a/modules/space/rendering/renderablesatellites.h b/modules/space/rendering/renderablesatellites.h
index 1bd4c9db4e..8b8cdd6815 100644
--- a/modules/space/rendering/renderablesatellites.h
+++ b/modules/space/rendering/renderablesatellites.h
@@ -26,6 +26,8 @@
 
 #include <modules/base/rendering/renderabletrail.h>
 #include <modules/space/translation/keplertranslation.h>
+#include <modules/space/translation/TLEtranslation.h>
+
 
 // #include <openspace/util/circlegeometry.h>
 #include <openspace/properties/stringproperty.h>
@@ -53,12 +55,6 @@ public:
     
     void render(const RenderData& data, RendererTasks& rendererTask) override;
     void update(const UpdateData& data) override;
-
-    /*
-    void setKeplerElements(double eccentricity, double semiMajorAxis, double inclination,
-        double ascendingNode, double argumentOfPeriapsis, double meanAnomalyAtEpoch,
-        double orbitalPeriod, double epoch);
-    */
     
     static documentation::Documentation Documentation();
 
@@ -86,7 +82,6 @@ private:
     std::vector<KeplerTranslation::KeplerOrbit> _orbits;
     ghoul::opengl::ProgramObject* _programObject;
     //ghoul::ObjectManager* _objectManager;
-
     
     properties::StringProperty _path;
     properties::UIntProperty _nSegments;