mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-19 18:49:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Created an initializing function in webfieldlinesmanager

Browse Source
This commit is contained in:
Kollberg
2019-07-09 13:11:25 -04:00
parent 13b753758b
commit 112a0ecb57
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp
View File

@@ -420,11 +420,11 @@ bool RenderableFieldlinesSequence::extractMandatoryInfoFromDictionary(
}
std::string sourceFolderPath;
bool webFieldLines;
if (!_dictionary->getValue(KeySourceFolder, sourceFolderPath)) {
// If this is a web-fieldline, we don't need no sourcefolder
if (!_dictionary->getValue(KeyWebFieldlines, webFieldLines)) {
if (!_dictionary->getValue(KeyWebFieldlines, _webFieldlines)) {
LERROR(fmt::format("{}: The field {} is missing", _identifier, KeyWebFieldlines));
return false;
}
@@ -434,7 +434,7 @@ bool RenderableFieldlinesSequence::extractMandatoryInfoFromDictionary(
}
}
if (webFieldLines) {
if (_webFieldlines) {
initializeWebManager();
sourceFolderPath = _webFieldlinesManager.getDirectory();
}
@@ -1182,7 +1182,7 @@ void RenderableFieldlinesSequence::render(const RenderData& data, RendererTasks&
}
void RenderableFieldlinesSequence::initializeWebManager() {
_webFieldlinesManager(_identifier, "PfssIo", _activeTriggerTimeIndex, _nStates, _sourceFiles, _startTimes);
_webFieldlinesManager.initializeWebFieldlinesManager(_identifier, "PfssIo", _activeTriggerTimeIndex, _nStates, _sourceFiles, _startTimes);
}
void RenderableFieldlinesSequence::update(const UpdateData& data) {
@@ -1192,12 +1192,8 @@ void RenderableFieldlinesSequence::update(const UpdateData& data) {
const double currentTime = data.time.j2000Seconds();
// en liten fuling för att testa att trigga nedladdning
// if(currentTime > 610056120.0 && currentTime < 610056120.2){
// LERROR("downloading is starting");
// _webFieldlinesManager.downloadFieldlines();
// computeSequenceEndTime();
// }
// Webfieldlines is activated
const bool isInInterval = (currentTime >= _startTimes[0]) &&
(currentTime < _sequenceEndTime);