renamed module dataplane to iswa

This commit is contained in:
Sebastian Piwell
2016-03-30 15:27:31 -04:00
29 changed files with 1657 additions and 8 deletions
+13 -1
View File
@@ -30,6 +30,9 @@
#include <openspace/rendering/renderable.h>
#include <openspace/scene/scene.h>
#include <openspace/scene/scenegraphnode.h>
#include <modules/iswa/rendering/iswacygnet.h>
#include <modules/iswa/rendering/iswamanager.h>
namespace openspace {
@@ -60,6 +63,7 @@ properties::Property* property(const std::string& uri) {
// The URI consists of the following form at this stage:
// <node name>.{<property owner>.}^(0..n)<property id>
const size_t nodeNameSeparator = uri.find(properties::PropertyOwner::URISeparator);
if (nodeNameSeparator == std::string::npos) {
LERROR("Malformed URI '" << uri << "': At least one '" << nodeNameSeparator
@@ -69,7 +73,15 @@ properties::Property* property(const std::string& uri) {
const std::string nodeName = uri.substr(0, nodeNameSeparator);
const std::string remainingUri = uri.substr(nodeNameSeparator + 1);
SceneGraphNode* node = sceneGraphNode(nodeName);
SceneGraphNode* node = sceneGraphNode("DataSurfaces");
if(node){
std::shared_ptr<ISWACygnet> ds = static_cast <ISWAManager*>(node->renderable())->dataSurface(nodeName);
if(ds){
return ds->property(remainingUri);
}
}
node = sceneGraphNode(nodeName);
if (!node) {
LERROR("Node '" << nodeName << "' did not exist");
return nullptr;