diff --git a/modules/space/CMakeLists.txt b/modules/space/CMakeLists.txt index d17204258a..dc2f0f7e79 100644 --- a/modules/space/CMakeLists.txt +++ b/modules/space/CMakeLists.txt @@ -25,6 +25,7 @@ include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake) set(HEADER_FILES + ${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 @@ -36,10 +37,12 @@ set(HEADER_FILES ${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/renderablesatellites.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rendering/planetgeometry.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableconstellationbounds.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rendering/renderableplanet.cpp 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(KeyLineNumber) { - lineNumber = static_cast(dictionary.value(KeyLineNumber)); + const std::string& file = dictionary.value(KeyLineNum) { + lineNum = static_cast(dictionary.value(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 #include -#include +//#include #include #include @@ -116,4 +116,4 @@ private: #endif // __OPENSPACE_MODULE_BASE___RenderableSatellites___H__ -} \ No newline at end of file +}