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

Move file reading to initialize instead of constructor

Browse Source
This commit is contained in:
Malin E
2022-08-05 14:08:36 +02:00
parent ca203c425a
commit 62aaa45ff5
2 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
modules/space/rendering/renderableconstellation.cpp
View File

@@ -181,8 +181,9 @@ RenderableConstellation::RenderableConstellation(const ghoul::Dictionary& dictio
}
addProperty(_renderOption);
_constellationNamesFilename.onChange([&]() { loadConstellationFile(); });
// Read all files in the initialize() instead, multithreaded
_constellationNamesFilename = p.constellationNamesFile;
_constellationNamesFilename.onChange([&]() { loadConstellationFile(); });
addProperty(_constellationNamesFilename);
_lineWidth = p.lineWidth.value_or(_lineWidth);
@@ -212,36 +213,21 @@ RenderableConstellation::RenderableConstellation(const ghoul::Dictionary& dictio
addProperty(_textMinMaxSize);
}
fillSelectionProperty();
_constellationSelection.onChange([this]() { selectionPropertyHasChanged(); });
addProperty(_constellationSelection);
if (p.constellationSelection.has_value()) {
const std::vector<std::string> options = _constellationSelection.options();
std::set<std::string> selectedNames;
for (const std::string& s : *p.constellationSelection) {
const auto it = std::find(options.begin(), options.end(), s);
if (it == options.end()) {
// The user has specified a constellation name that doesn't exist
LWARNINGC(
"RenderableConstellation",
fmt::format("Option '{}' not found in list of constellations", s)
);
}
else {
selectedNames.insert(s);
}
}
_constellationSelection = selectedNames;
}
_assetSelectedMeshes = p.constellationSelection.value_or(_assetSelectedMeshes);
}
bool RenderableConstellation::loadConstellationFile() {
void RenderableConstellation::loadConstellationFile() {
if (_constellationNamesFilename.value().empty()) {
return true;
return;
}
// Reset
_constellationSelection.clearOptions();
_constellationNamesTranslation.clear();
std::ifstream file;
file.exceptions(std::ifstream::goodbit);
file.open(absPath(_constellationNamesFilename));
@@ -266,7 +252,7 @@ bool RenderableConstellation::loadConstellationFile() {
++index;
}
return true;
fillSelectionProperty();
}
void RenderableConstellation::fillSelectionProperty() {
@@ -276,6 +262,28 @@ void RenderableConstellation::fillSelectionProperty() {
}
void RenderableConstellation::initialize() {
loadConstellationFile();
if (!_assetSelectedMeshes.empty()) {
const std::vector<std::string> options = _constellationSelection.options();
std::set<std::string> selectedConstellations;
for (const std::string& s : _assetSelectedMeshes) {
const auto it = std::find(options.begin(), options.end(), s);
if (it == options.end()) {
// The user has specified a mesh name that doesn't exist
LWARNINGC(
"RenderableConstellation",
fmt::format("Option '{}' not found in list of meshes", s)
);
}
else {
selectedConstellations.insert(s);
}
}
_constellationSelection = selectedConstellations;
}
if (!_hasLabel) {
return;
}

4
modules/space/rendering/renderableconstellation.h
View File

@@ -89,13 +89,15 @@ protected:
speck::Labelset _labelset;
private:
std::vector<std::string> _assetSelectedMeshes;
/**
* Loads the file specified in _constellationNamesFilename that contains the mapping
* between abbreviations and full names of constellations.
*
* \return <code>true</code> if the loading succeeded, <code>false</code> otherwise
*/
bool loadConstellationFile();
void loadConstellationFile();
/// Fills the <code>_constellationSelection</code> property with all constellations
void fillSelectionProperty();