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

Adding support for imageplanes for multiple instruments

Browse Source
This commit is contained in:
Anton Arbring
2015-06-25 20:08:35 -04:00
parent 4e72e248c3
commit 901ed6053e
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/newhorizons/util/imagesequencer2.cpp
View File

@@ -46,8 +46,7 @@ namespace openspace {
ImageSequencer2* ImageSequencer2::_instance = nullptr;
ImageSequencer2::ImageSequencer2()
: _latestImage()
, _hasData(false)
: _hasData(false)
{}
ImageSequencer2& ImageSequencer2::ref() {
@@ -161,8 +160,13 @@ double ImageSequencer2::getNextCaptureTime(){
return nextCaptureTime;
}
const Image ImageSequencer2::getLatestImageForInstrument(const std::string _instrumentID){
return _latestImage;
auto it = _latestImages.find(_instrumentID);
if (it != _latestImages.end())
return _latestImages[_instrumentID];
else {
Image dummyImage = { 0, 0, "", std::vector<std::string>(), "", false };
return dummyImage;
}
}
std::map<std::string, bool> ImageSequencer2::getActiveInstruments(){
@@ -270,7 +274,7 @@ bool ImageSequencer2::getImagePaths(std::vector<Image>& captures,
std::reverse(captureTimes.begin(), captureTimes.end());
captures = captureTimes;
if (!captures.empty())
_latestImage = captures.back();
_latestImages[captures.back().activeInstruments.front()] = captures.back();
return true;
}

2
modules/newhorizons/util/imagesequencer2.h
View File

@@ -196,7 +196,7 @@ private:
// default capture image
std::string _defaultCaptureImage;
Image _latestImage;
std::map<std::string, Image> _latestImages;
// if no data, no run
bool _hasData;
};