mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 03:00:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed order of parsing elements from csv file

Browse Source
This commit is contained in:
GPayne
2019-12-18 17:53:17 -06:00
parent 72d2dfb7ed
commit bd8ade16f4
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/space/rendering/renderablesmallbody.cpp
View File

@@ -280,8 +280,9 @@ void RenderableSmallBody::readJplSbDb(const std::string& filename) {
std::getline(file, ignore, ',');
std::getline(file, ignore, ',');
// Ignore date
// Epoch
std::getline(file, ignore, ',');
keplerElements.epoch = epochFromYMDdSubstring(ignore);
// Eccentricity (unit-less)
std::getline(file, ignore, ',');
@@ -308,10 +309,6 @@ void RenderableSmallBody::readJplSbDb(const std::string& filename) {
std::getline(file, ignore, ',');
keplerElements.meanAnomaly = std::stod(ignore);
// Epoch (MJD)
std::getline(file, ignore, ',');
keplerElements.epoch = epochFromYMDdSubstring(ignore);
// Period (days)
std::getline(file, ignore);
keplerElements.period = std::stod(ignore);
@@ -324,13 +321,13 @@ void RenderableSmallBody::readJplSbDb(const std::string& filename) {
catch (std::invalid_argument&) {
LERROR(fmt::format(
"invalid_argument exception on line {} of {}",
csvLine - 1, filename
csvLine + 1, filename
));
}
catch (std::out_of_range&) {
LERROR(fmt::format(
"out_of_range exception on line {} of {}",
csvLine - 1, filename
csvLine + 1, filename
));
}