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

added sequenceTypeImageAndInstrumentTimes as option for patially complete missions

Browse Source
This commit is contained in:
Micah
2020-01-26 12:35:27 -05:00
parent b73b4270ed
commit ba4972310d
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/spacecraftinstruments/util/imagesequencer.cpp
View File

@@ -416,6 +416,8 @@ void ImageSequencer::runSequenceParser(SequenceParser& parser) {
source.begin(),
source.end()
);
_subsetMap[key]._range.include(it.second._range);
}
_instrumentTimes.insert(

26
modules/spacecraftinstruments/util/projectioncomponent.cpp
View File

@@ -51,12 +51,14 @@ namespace {
constexpr const char* keyInstrumentAspect = "Instrument.Aspect";
constexpr const char* keyTranslation = "DataInputTranslation";
constexpr const char* keyTimesTranslation = "TimesDataInputTranslation";
constexpr const char* keyProjObserver = "Observer";
constexpr const char* keyProjTarget = "Target";
constexpr const char* keyProjAberration = "Aberration";
constexpr const char* keySequenceDir = "Sequence";
constexpr const char* keyTimesSequenceDir = "TimesSequence";
constexpr const char* keySequenceType = "SequenceType";
constexpr const char* keyNeedsTextureMapDilation = "TextureMap";
@@ -67,6 +69,7 @@ namespace {
constexpr const char* sequenceTypePlaybook = "playbook";
constexpr const char* sequenceTypeHybrid = "hybrid";
constexpr const char* sequenceTypeInstrumentTimes = "instrument-times";
constexpr const char* sequenceTypeImageAndInstrumentTimes = "image-and-instrument-times";
constexpr const char* placeholderFile = "${DATA}/placeholder.png";
@@ -149,7 +152,7 @@ documentation::Documentation ProjectionComponent::Documentation() {
keySequenceType,
new StringInListVerifier(
{ sequenceTypeImage, sequenceTypePlaybook, sequenceTypeHybrid,
sequenceTypeInstrumentTimes }
sequenceTypeInstrumentTimes, sequenceTypeImageAndInstrumentTimes }
),
Optional::Yes,
"This value determines which type of sequencer is used for generating "
@@ -369,6 +372,27 @@ void ProjectionComponent::initialize(const std::string& identifier,
)
);
}
else if (sequenceType == sequenceTypeImageAndInstrumentTimes) {
parsers.push_back(
std::make_unique<LabelParser>(
identifier,
std::move(sequenceSource),
translationDictionary
)
);
std::string timesSequenceSource = absPath(dictionary.value<std::string>(keyTimesSequenceDir));
ghoul::Dictionary timesTranslationDictionary;
dictionary.getValue(keyTimesTranslation, timesTranslationDictionary);
parsers.push_back(
std::make_unique<InstrumentTimesParser>(
identifier,
std::move(timesSequenceSource),
timesTranslationDictionary
)
);
}
}
for (std::unique_ptr<SequenceParser>& parser : parsers) {