mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-25 22:39:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Modified sbdb file read to handle line errors while keeping other data lines

Browse Source
This commit is contained in:
GPayne
2020-03-20 17:27:39 -06:00
parent f2aea512c1
commit bdf859cd3c
3 changed files with 54 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/space/rendering/renderableorbitalkepler.cpp
View File

@@ -391,20 +391,14 @@ RenderableOrbitalKepler::RenderableOrbitalKepler(const ghoul::Dictionary& dictio
else {
_appearance.lineWidth = 2.0;
}
auto reinitializeTrailBuffers = [this]() {
initializeGL();
};
reinitializeTrailBuffers = std::function<void()>([this] { initializeGL(); });
_path.onChange(reinitializeTrailBuffers);
_nSegments.onChange(reinitializeTrailBuffers);
_upperLimit.onChange(reinitializeTrailBuffers);
addPropertySubOwner(_appearance);
addProperty(_path);
addProperty(_nSegments);
addProperty(_opacity);
addProperty(_upperLimit);
setRenderBin(Renderable::RenderBin::Overlay);
}

3
modules/space/rendering/renderableorbitalkepler.h
View File

@@ -68,6 +68,8 @@ protected:
double epochFromSubstring(const std::string& epochString);
double epochFromYMDdSubstring(const std::string& epochString);
int daysIntoGivenYear(int month, int dayOfMonth);
std::function<void()> reinitializeTrailBuffers;
const std::vector<int> LeapYears = {
1956, 1960, 1964, 1968, 1972, 1976, 1980, 1984, 1988, 1992, 1996,
2000, 2004, 2008, 2012, 2016, 2020, 2024, 2028, 2032, 2036, 2040,
@@ -105,6 +107,7 @@ protected:
const double convertDaysToSecs = 86400.;
std::vector<KeplerParameters> _data;
properties::UIntProperty _upperLimit;
properties::Property::OnChangeHandle _upperLimitCallbackHandle;
private:
struct Vertex {

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

@@ -135,6 +135,8 @@ documentation::Documentation RenderableSmallBody::Documentation() {
RenderableSmallBody::RenderableSmallBody(const ghoul::Dictionary& dictionary)
: RenderableOrbitalKepler(dictionary)
{
_upperLimitCallbackHandle = _upperLimit.onChange(reinitializeTrailBuffers);
addProperty(_upperLimit);
}
void RenderableSmallBody::readDataFile(const std::string& filename) {
@@ -168,8 +170,12 @@ void RenderableSmallBody::readDataFile(const std::string& filename) {
std::getline(file, line); // get rid of first line (header)
numberOfLines -= 1;
if (_upperLimit == 0 || _upperLimit > numberOfLines) {
//If limit wasn't specified in dictionary, set to lines in file (-header)
//If a limit wasn't specified in dictionary, set it to # lines in file
// minus the header line (but temporarily disable callback to avoid 2nd call)
_upperLimit.removeOnChange(_upperLimitCallbackHandle);
_upperLimit.setMaxValue(numberOfLines);
_upperLimit = static_cast<unsigned int>(numberOfLines);
_upperLimitCallbackHandle = _upperLimit.onChange(reinitializeTrailBuffers);
}
else {
lineSkipFraction = static_cast<float>(_upperLimit) /
@@ -184,31 +190,48 @@ void RenderableSmallBody::readDataFile(const std::string& filename) {
return;
}
for (csvLine = 1; csvLine <= numberOfLines; csvLine++) {
unsigned int sequentialLineErrors = 0;
for (csvLine = 1; csvLine <= numberOfLines; csvLine++, sequentialLineErrors++) {
currLineFraction = static_cast<float>(csvLine - 1) * lineSkipFraction;
currLineCount = static_cast<int>(currLineFraction);
if (currLineCount > lastLineCount) {
readOrbitalParamsFromThisLine(fieldCount, csvLine, file);
try {
readOrbitalParamsFromThisLine(fieldCount, csvLine, file);
sequentialLineErrors = 0;
}
catch (std::invalid_argument&) {
const char* errMsg = "Unable to convert field {} to double value "\
"(invalid_argument exception) at line {}/{} of {}";
LERROR(fmt::format(
errMsg,
fieldCount, csvLine + 1, numberOfLines, filename
));
}
catch (std::out_of_range&) {
const char* errMsg = "Unable to convert field {} to double value "\
"(out_of_range exception) at line {}/{} of {}";
LERROR(fmt::format(
errMsg,
fieldCount, csvLine + 1, numberOfLines, filename
));
}
catch (std::ios_base::failure& f) {
throw f;
}
if (sequentialLineErrors == 4) {
_data.clear();
_sbNames.clear();
LERROR(fmt::format(
"Abandoning data file {} (too many sequential line errors).",
filename
));
break;
}
}
lastLineCount = currLineCount;
}
}
catch (std::invalid_argument&) {
const char* errMsg = "Unable to convert field {} to double value "\
"(invalid_argument exception) at line {}/{} of {}";
LERROR(fmt::format(
errMsg,
fieldCount, csvLine + 1, numberOfLines, filename
));
}
catch (std::out_of_range&) {
const char* errMsg = "Unable to convert field {} to double value "\
"(out_of_range exception) at line {}/{} of {}";
LERROR(fmt::format(
errMsg,
fieldCount, csvLine + 1, numberOfLines, filename
));
}
catch (std::ios_base::failure&) {
const char* errMsg = "File read exception (ios_base::failure) while trying "\
"to read field {} at line {}/{} of {}";
@@ -225,11 +248,18 @@ void RenderableSmallBody::readOrbitalParamsFromThisLine(int& fieldCount,
std::streamoff& csvLine,
std::ifstream& file)
{
const int numDataFields = 8;
std::string name;
std::string field;
fieldCount = 0;
KeplerParameters keplerElements;
//If there was a read/conversion error in the previous line, then read the remainder
// of that line and throw it out first before proceeding with the next line.
if (fieldCount != (numDataFields + 1) && csvLine != 1) {
std::getline(file, field);
}
fieldCount = 0;
// Object designator string
std::getline(file, name, ',');
fieldCount++;