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

finish merge + manual time offset property

Browse Source
This commit is contained in:
ElonOlsson
2021-05-12 15:37:22 -04:00
parent a5e577eb54 9166abab45
commit 9d1ece1163
965 changed files with 69303 additions and 52573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/fieldlinessequence/util/kameleonfieldlinehelper.cpp
View File

@@ -91,6 +91,7 @@ namespace openspace::fls {
bool convertCdfToFieldlinesState(FieldlinesState& state, const std::string& cdfPath,
const std::unordered_map<std::string,
std::vector<glm::vec3>>& seedMap,
double manualTimeOffset,
const std::string& tracingVar,
std::vector<std::string>& extraVars,
std::vector<std::string>& extraMagVars)
@@ -106,12 +107,12 @@ bool convertCdfToFieldlinesState(FieldlinesState& state, const std::string& cdfP
);
state.setModel(fls::stringToModel(kameleon->getModelName()));
double cdfDoubleTime = kameleonHelper::getTime(kameleon.get());
double cdfDoubleTime = kameleonHelper::getTime(kameleon.get(), manualTimeOffset);
state.setTriggerTime(cdfDoubleTime);
//get time as string.
std::string cdfStringTime = SpiceManager::ref().dateFromEphemerisTime(cdfDoubleTime,
"YYYYMMDDHRMNSC::RND"); //YYYY MM DD HOUR MIN SEC ROUNDED
"YYYYMMDDHRMNSC::RND"); //YYYY MM DD HOUR MIN SEC ROUNDED
// use time as string for picking seedpoints from seedm
std::vector<glm::vec3> seedPoints = seedMap.at(cdfStringTime);

4
modules/fieldlinessequence/util/kameleonfieldlinehelper.h
View File

@@ -37,8 +37,8 @@ namespace fls {
bool convertCdfToFieldlinesState(FieldlinesState& state, const std::string& cdfPath,
const std::unordered_map<std::string, std::vector<glm::vec3>>& seedMap,
const std::string& tracingVar, std::vector<std::string>& extraVars,
std::vector<std::string>& extraMagVars);
double manualTimeOffset, const std::string& tracingVar,
std::vector<std::string>& extraVars, std::vector<std::string>& extraMagVars);
} // namespace fls
} // namespace openspace