mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-02 00:44:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move loading of data error handling

Browse Source
This commit is contained in:
Malin E
2022-08-29 13:13:47 +02:00
parent 53b2d0e76c
commit dc55105000
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/space/rendering/renderableconstellationlines.cpp
+7 -5
View File
@@ -101,6 +101,7 @@ RenderableConstellationLines::RenderableConstellationLines(
const Parameters p = codegen::bake<Parameters>(dictionary);
_speckFile = absPath(p.file);
addProperty(_drawElements);
if (p.lineUnit.has_value()) {
@@ -150,10 +151,7 @@ bool RenderableConstellationLines::isReady() const {
void RenderableConstellationLines::initialize() {
RenderableConstellationsBase::initialize();
bool success = loadData();
if (!success) {
throw ghoul::RuntimeError("Error loading data");
}
loadData();
if (!_assetSelection.empty()) {
const std::vector<std::string> options = _selection.options();
@@ -268,7 +266,11 @@ void RenderableConstellationLines::update(const UpdateData&) {
}
bool RenderableConstellationLines::loadData() {
return readSpeckFile();
bool success = readSpeckFile();
if (!success) {
throw ghoul::RuntimeError("Error loading data");
}
return success;
}
bool RenderableConstellationLines::readSpeckFile() {