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

Compile fixes for PresentationSlideProvider

Browse Source
This commit is contained in:
Alexander Bock
2017-04-14 18:06:46 -04:00
parent d90a51297d
commit 889545bd45
3 changed files with 79 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
modules/globebrowsing/tile/tileprovider/presentationslideprovider.cpp
View File

@@ -43,74 +43,74 @@ namespace {
namespace openspace {
namespace globebrowsing {
namespace tileprovider {
PresentationSlideProvider::PresentationSlideProvider(const ghoul::Dictionary& dictionary) {
setName("SlideProvider");
ghoul::Dictionary defaultProviderDict = dictionary.value<ghoul::Dictionary>(KeyDefaultProvider);
TileProvider* defaultProvider = TileProvider::createFromDictionary(defaultProviderDict);
_defaultProvider = std::unique_ptr<TileProvider>(defaultProvider);
PresentationSlideProvider::PresentationSlideProvider(const ghoul::Dictionary& dictionary)
: _slideIndex("slideIndex", "slideIndex", 0, 0, _slideProviders.size() - 1)
{
setName("SlideProvider");
ghoul::Dictionary defaultProviderDict = dictionary.value<ghoul::Dictionary>(KeyDefaultProvider);
_defaultProvider = TileProvider::createFromDictionary(defaultProviderDict);
ghoul::Dictionary tileIndexDict = dictionary.value<ghoul::Dictionary>(KeyTileIndex);
_tileIndex = TileIndex(tileIndexDict);
ghoul::Dictionary tileIndexDict = dictionary.value<ghoul::Dictionary>(KeyTileIndex);
_tileIndex = TileIndex(tileIndexDict);
ghoul::Dictionary slideProvidersDict = dictionary.value<ghoul::Dictionary>(KeySlideProviders);
_slideProviders.resize(slideProvidersDict.size());
for (size_t i = 0; i < slideProvidersDict.size(); i++) {
std::string dictKey = std::to_string(i + 1);
ghoul::Dictionary providerDict = slideProvidersDict.value<ghoul::Dictionary>(dictKey);
TileProvider* tileProvider = TileProvider::createFromDictionary(providerDict);
_slideProviders[i].reset(tileProvider);
}
ghoul::Dictionary slideProvidersDict = dictionary.value<ghoul::Dictionary>(KeySlideProviders);
_slideProviders.resize(slideProvidersDict.size());
for (size_t i = 0; i < slideProvidersDict.size(); i++) {
std::string dictKey = std::to_string(i + 1);
ghoul::Dictionary providerDict = slideProvidersDict.value<ghoul::Dictionary>(dictKey);
_slideProviders[i] = TileProvider::createFromDictionary(providerDict);
}
_slideIndex.setMaxValue(_slideProviders.size() - 1);
addProperty(_slideIndex);
}
Tile PresentationSlideProvider::getTile(const TileIndex& tileIndex) {
if(tileIndex == _tileIndex){
return slideProvider()->getTile(tileIndex);
}
return Tile::TileUnavailable;
_slideIndex = std::make_unique<properties::IntProperty>("slideIndex", "slideIndex", 0, 0, _slideProviders.size()-1);
addProperty(_slideIndex.get());
}
}
Tile PresentationSlideProvider::getTile(const TileIndex& tileIndex) {
if(tileIndex == _tileIndex){
return slideProvider()->getTile(tileIndex);
}
return Tile::TileUnavailable;
}
Tile PresentationSlideProvider::getDefaultTile() {
return _defaultProvider->getDefaultTile();
}
Tile PresentationSlideProvider::getDefaultTile() {
return _defaultProvider->getDefaultTile();
Tile::Status PresentationSlideProvider::getTileStatus(const TileIndex& tileIndex) {
if(tileIndex == _tileIndex){
return slideProvider()->getTileStatus(tileIndex);
}
return Tile::Status::Unavailable;
}
Tile::Status PresentationSlideProvider::getTileStatus(const TileIndex& tileIndex) {
if(tileIndex == _tileIndex){
return slideProvider()->getTileStatus(tileIndex);
}
return Tile::Status::Unavailable;
}
TileDepthTransform PresentationSlideProvider::depthTransform() {
return slideProvider()->depthTransform();
}
TileDepthTransform PresentationSlideProvider::depthTransform() {
slideProvider()->depthTransform();
}
void PresentationSlideProvider::update() {
slideProvider()->update();
_defaultProvider->update();
}
void PresentationSlideProvider::update() {
slideProvider()->update();
_defaultProvider->update();
void PresentationSlideProvider::reset() {
for(auto& tp : _slideProviders){
tp->reset();
}
_defaultProvider->reset();
}
void PresentationSlideProvider::reset() {
for(auto& tp : _slideProviders){
tp->reset();
}
_defaultProvider->reset();
}
int PresentationSlideProvider::maxLevel() {
return _defaultProvider->maxLevel();
}
int PresentationSlideProvider::maxLevel() {
return _defaultProvider->maxLevel();
}
TileProvider* PresentationSlideProvider::slideProvider(){
int maxIndex = (int)_slideProviders.size() - 1;
return _slideProviders[std::max(0, std::min(_slideIndex->value(), maxIndex))].get();
}
TileProvider* PresentationSlideProvider::slideProvider(){
int maxIndex = (int)_slideProviders.size() - 1;
return _slideProviders[std::max(0, std::min(_slideIndex.value(), maxIndex))].get();
}
} // namespace tileprovider
} // namespace globebrowsing
} // namespace openspace

44
modules/globebrowsing/tile/tileprovider/presentationslideprovider.h
View File

@@ -38,34 +38,32 @@
namespace openspace {
namespace globebrowsing {
namespace tileprovider {
using namespace ghoul::opengl;
class PresentationSlideProvider : public TileProvider {
public:
PresentationSlideProvider(const ghoul::Dictionary& dictionary);
PresentationSlideProvider(const std::string& imagePath);
virtual ~PresentationSlideProvider() { }
class PresentationSlideProvider : public TileProvider {
public:
PresentationSlideProvider(const ghoul::Dictionary& dictionary);
PresentationSlideProvider(const std::string& imagePath);
virtual ~PresentationSlideProvider() { }
virtual Tile getTile(const TileIndex& tileIndex);
virtual Tile getDefaultTile();
virtual Tile::Status getTileStatus(const TileIndex& index);
virtual TileDepthTransform depthTransform();
virtual void update();
virtual void reset();
virtual int maxLevel();
virtual Tile getTile(const TileIndex& tileIndex);
virtual Tile getDefaultTile();
virtual Tile::Status getTileStatus(const TileIndex& index);
virtual TileDepthTransform depthTransform();
virtual void update();
virtual void reset();
virtual int maxLevel();
private:
TileProvider* slideProvider();
private:
TileProvider* slideProvider();
TileIndex _tileIndex;
std::unique_ptr<properties::IntProperty> _slideIndex;
std::vector<std::unique_ptr<TileProvider>> _slideProviders;
std::unique_ptr<TileProvider> _defaultProvider;
};
TileIndex _tileIndex;
properties::IntProperty _slideIndex;
std::vector<std::unique_ptr<TileProvider>> _slideProviders;
std::unique_ptr<TileProvider> _defaultProvider;
};
} // namespace tileprovider
} // namespace globebrowsing
} // namespace openspace

15
modules/globebrowsing/tile/tileprovider/tileprovider.cpp
View File

@@ -34,8 +34,6 @@
#include <climits>
namespace {
const std::string _loggerCat = "TileProvider";
const char* KeyType = "Type";
}
@@ -50,18 +48,13 @@ std::unique_ptr<TileProvider> TileProvider::createFromDictionary(const ghoul::Di
dictionary.getValue(KeyType, type);
auto factory = FactoryManager::ref().factory<TileProvider>();
std::unique_ptr<TileProvider> result = factory->create(type, dictionary);
if (result == nullptr) {
LERROR("Failed creating TileProvider of type '" << type << "'");
return nullptr;
}
return result;
}
TileProvider::TileProvider() :
properties::PropertyOwner("tileProvider"),
_initialized(false) {
TileProvider::TileProvider()
: properties::PropertyOwner("tileProvider")
, _initialized(false)
{
initialize();
}