From b4dd5e9b4b213bbe2d21f04f00d67866481f33c9 Mon Sep 17 00:00:00 2001
From: Jonathan Fransson <jonfr864@student.liu.se>
Date: Mon, 25 Mar 2019 14:37:10 -0600
Subject: [PATCH] merge

---
 modules/space/CMakeLists.txt                  | 47 ++++++++++---------
 .../space/rendering/renderablesatellites.cpp  | 14 +++---
 .../space/rendering/renderablesatellites.h    |  4 +-
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/modules/space/CMakeLists.txt b/modules/space/CMakeLists.txt
index 107c86614b..4a403a3ffc 100644
--- a/modules/space/CMakeLists.txt
+++ b/modules/space/CMakeLists.txt
@@ -25,32 +25,35 @@
 include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
 
 set(HEADER_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/planetgeometry.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableconstellationbounds.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanet.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablerings.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablestars.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/keplertranslation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/spicetranslation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/tletranslation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/horizonstranslation.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/rotation/spicerotation.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesatellites.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/planetgeometry.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableconstellationbounds.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanet.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablerings.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablestars.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/translation/keplertranslation.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/translation/spicetranslation.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/translation/tletranslation.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/translation/horizonstranslation.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/rotation/spicerotation.h
+    
 )
 source_group("Header Files" FILES ${HEADER_FILES})
 
 set(SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/planetgeometry.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableconstellationbounds.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanet.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablerings.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablestars.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/keplertranslation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/spicetranslation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/tletranslation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/translation/horizonstranslation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/rotation/spicerotation.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablesatellites.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/planetgeometry.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableconstellationbounds.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanet.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablerings.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderablestars.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/rendering/simplespheregeometry.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/translation/keplertranslation.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/translation/spicetranslation.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/translation/tletranslation.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/translation/horizonstranslation.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/rotation/spicerotation.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})
 
diff --git a/modules/space/rendering/renderablesatellites.cpp b/modules/space/rendering/renderablesatellites.cpp
index 626faeca35..26c2d4ac83 100644
--- a/modules/space/rendering/renderablesatellites.cpp
+++ b/modules/space/rendering/renderablesatellites.cpp
@@ -228,16 +228,16 @@ RenderableSatellites::RenderableSatellites(const ghoul::Dictionary& dictionary)
 * test
 */
 
-    const std::string& file = dictionary.value<str::string(KeyFile);
-    int lineNumber = 1;
-    if (dictionary.hasKeyAndValue)<double>(KeyLineNumber) {
-        lineNumber = static_cast<int>(dictionary.value<double>(KeyLineNumber));
+    const std::string& file = dictionary.value<std::string(KeyFile);
+    int lineNum = 1;
+    if (dictionary.hasKeyAndValue)<double>(KeyLineNum) {
+        lineNum = static_cast<int>(dictionary.value<double>(KeyLineNum));
     }
-    readTLEFile(file, lineNumber);
+    readTLEFile(file, lineNum);
 
 }
 
-void RenderableSatellites::readTLEFile(const std::string& filename, int lineNumber){
+void RenderableSatellites::readTLEFile(const std::string& filename, int lineNum){
     ghoul_assert(FileSys.fileExists(filename), "The filename must exist");
 
     std::ifstream file;
@@ -737,4 +737,4 @@ void RenderableSatellites::readFromCsvFile() {
     }
 }
     
-}
\ No newline at end of file
+}
diff --git a/modules/space/rendering/renderablesatellites.h b/modules/space/rendering/renderablesatellites.h
index e9e3dae852..0eb815a630 100644
--- a/modules/space/rendering/renderablesatellites.h
+++ b/modules/space/rendering/renderablesatellites.h
@@ -27,7 +27,7 @@
 #include <modules/base/rendering/renderabletrail.h>
 #include <modules/space/translation/keplertranslation.h>
 
-#include <openspace/util/circlegeometry.h>
+//#include <openspace/util/circlegeometry.h>
 #include <openspace/properties/stringproperty.h>
 #include <openspace/properties/scalar/uintproperty.h>
 
@@ -116,4 +116,4 @@ private:
     
 #endif // __OPENSPACE_MODULE_BASE___RenderableSatellites___H__
 
-}
\ No newline at end of file
+}