mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 12:39:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added graceful exit and logging for case of missing or corrupt TLE file, and removed some commented-out code.

Browse Source
This commit is contained in:
GPayne
2019-08-15 10:21:57 -06:00
parent c01e59635c
commit e60c77b415
2 changed files with 16 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/space/rendering/renderablesatellites.cpp
+11 -44
View File
@@ -86,8 +86,6 @@ namespace {
constexpr const char* KeyFile = "Path";
constexpr const char* KeyLineNum = "LineNumber";
// LINFO("Keyfile: " + KeyFile);
}
namespace openspace {
@@ -267,7 +265,7 @@ double epochFromSubstring(const std::string& epochString) {
const double nSecondsSince2000 = (daysSince2000 + daysInYear - 1) * SecondsPerDay;
// 4
// We need to remove additionbal leap seconds past 2000 and add them prior to
// We need to remove additional leap seconds past 2000 and add them prior to
// 2000 to sync up the time zones
const double nLeapSecondsOffset = -countLeapSeconds(
year,
@@ -355,8 +353,12 @@ RenderableSatellites::RenderableSatellites(const ghoul::Dictionary& dictionary)
}
std::vector<KeplerParameters> RenderableSatellites::readTLEFile(const std::string& filename) {
ghoul_assert(FileSys.fileExists(filename), "The filename must exist");
void RenderableSatellites::readTLEFile(const std::string& filename) {
if (!FileSys.fileExists(filename)) {
throw ghoul::RuntimeError(fmt::format(
"Satellite TLE file {} does not exist.", filename
));
}
std::ifstream file;
file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
@@ -398,7 +400,7 @@ std::vector<KeplerParameters> RenderableSatellites::readTLEFile(const std::strin
}
else {
throw ghoul::RuntimeError(fmt::format(
"File {} @ line {} does not have '1' header", filename // linNum + 1
"File {} entry {} does not have '1' header", filename, i + 1
));
}
@@ -451,7 +453,7 @@ std::vector<KeplerParameters> RenderableSatellites::readTLEFile(const std::strin
}
else {
throw ghoul::RuntimeError(fmt::format(
"File {} @ line {} does not have '2' header", filename // , lineNum + 2
"File {} entry {} does not have '2' header", filename, i + 1
));
}
@@ -464,35 +466,12 @@ std::vector<KeplerParameters> RenderableSatellites::readTLEFile(const std::strin
_TLEData.push_back(keplerElements);
} // !for loop
}
file.close();
return _TLEData;
}
/*
RenderableSatellites::~RenderableSatellites() {
}
*/
void RenderableSatellites::initialize() {
// updateBuffers();
//_path.onChange([this]() {
// readTLEFile(_path);
// updateBuffers();
//});
//
//_semiMajorAxisUnit.onChange([this]() {
// readTLEFile(_path);
// updateBuffers();
//});
//_nSegments.onChange([this]() {
// updateBuffers();
//});
}
void RenderableSatellites::deinitialize() {
@@ -590,7 +569,7 @@ void RenderableSatellites::render(const RenderData& data, RendererTasks&) {
}
void RenderableSatellites::updateBuffers() {
_TLEData = readTLEFile(_path);
readTLEFile(_path);
const size_t nVerticesPerOrbit = _nSegments + 1;
_vertexBufferData.resize(_TLEData.size() * nVerticesPerOrbit);
@@ -626,18 +605,6 @@ void RenderableSatellites::updateBuffers() {
_vertexBufferData[index].time = static_cast<float>(timeOffset);
_vertexBufferData[index].epoch = orbit.epoch;
_vertexBufferData[index].period = orbit.period;
// The difference in the print below resulted in large differences, up to 0.35.
// LINFO(fmt::format("diff : {} ", position.x - _vertexBufferData[index].x));
// So one idea was to make it very small before casting it to a float.
// auto print = positionX-(static_cast<float>(positionX) / 10000000);
// LINFO(fmt::format(" smaller distance? :{}", print));
// LINFO(fmt::format(" x-positions float :{}", static_cast<float>(position.x)));
// LINFO(fmt::format(" x-positions float * 10000 :{}", static_cast<float>(position.x * 10000)));
// LINFO(fmt::format(" x-positions float * 10000 /10000 :{}", static_cast<float>(position.x * 10000)/10000));
}
++orbitindex;
modules/space/rendering/renderablesatellites.h
+5 -10
View File
@@ -75,22 +75,19 @@ namespace openspace {
void update(const UpdateData& data) override;
static documentation::Documentation Documentation();
/**
* Reads the provided TLE file and calles the KeplerTranslation::setKeplerElments
/**
* Reads the provided TLE file and calls the KeplerTranslation::setKeplerElments
* method with the correct values. If \p filename is a valid TLE file but contains
* disallowed values (see KeplerTranslation::setKeplerElements), a
* KeplerTranslation::RangeError is thrown.
*
* \param filename The path to the file that contains the TLE file.
* \param lineNum The line number in the file where the set of 3 TLE lines starts
*
* \throw std::system_error if the TLE file is malformed (does not contain at least
* two lines that start with \c 1 and \c 2.
* \throw KeplerTranslation::RangeError If the Keplerian elements are outside of
* the valid range supported by Kepler::setKeplerElements
* \throw ghoul::RuntimeError if the TLE file does not exist or there is a
* problem with its format.
* \pre The \p filename must exist
*/
std::vector<KeplerParameters> readTLEFile(const std::string& filename);
void readTLEFile(const std::string& filename);
private:
/// The layout of the VBOs
@@ -103,8 +100,6 @@ namespace openspace {
KeplerTranslation _keplerTranslator;
std::vector<KeplerParameters> _TLEData;
/// The backend storage for the vertex buffer object containing all points for this
/// trail.
std::vector<TrailVBOLayout> _vertexBufferData;