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

Chose ISWAGroup in GUI

Browse Source
This commit is contained in:
Sebastian Piwell
2016-05-03 11:06:17 -04:00
parent c57a9b7be1
commit c17bfbba02
4 changed files with 104 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/iswa/rendering/dataplane.cpp
View File

@@ -46,7 +46,7 @@ DataPlane::DataPlane(const ghoul::Dictionary& dictionary)
,_useHistogram("_useHistogram", "Use Histogram", true)
,_normValues("normValues", "Normalize Values", glm::vec2(1.0,1.0), glm::vec2(0), glm::vec2(5.0))
,_backgroundValues("backgroundValues", "Background Values", glm::vec2(0.0), glm::vec2(0), glm::vec2(1.0))
,_transferFunctionsFile("transferfunctions", "Transfer Functions", "${SCENE}/iswa/tfs/parula.tf")
,_transferFunctionsFile("transferfunctions", "Transfer Functions", "${SCENE}/iswa/tfs/hot.tf")
,_dataOptions("dataOptions", "Data Options")
// ,_colorbar(nullptr)
{
@@ -118,7 +118,8 @@ bool DataPlane::initialize(){
// }
// _textures.push_back(nullptr);
ISWAManager::ref().registerToGroup(_data->groupId, this, _type);
if(_data->groupId > 0)
ISWAManager::ref().registerToGroup(_data->groupId, this, _type);
return isReady();
@@ -397,10 +398,10 @@ std::vector<float*> DataPlane::readData(){
return data;
}
// else {
else {
// LWARNING("Nothing in memory buffer, are you connected to the information super highway?");
// return std::vector<float*>();
// }
return std::vector<float*>();
}
}

2
modules/iswa/rendering/iswagroup.cpp
View File

@@ -36,7 +36,7 @@ ISWAGroup::ISWAGroup(int id, ISWAManager::CygnetType type)
,_useHistogram("_useHistogram", "Use Histogram", true)
,_normValues("normValues", "Normalize Values", glm::vec2(1.0,1.0), glm::vec2(0), glm::vec2(5.0))
,_backgroundValues("backgroundValues", "Background Values", glm::vec2(0.0), glm::vec2(0), glm::vec2(1.0))
,_transferFunctionsFile("transferfunctions", "Transfer Functions", "${SCENE}/iswa/tfs/parula.tf")
,_transferFunctionsFile("transferfunctions", "Transfer Functions", "${SCENE}/iswa/tfs/hot.tf")
,_dataOptions("dataOptions", "Data Options")
,_type(type)
{

135
modules/iswa/util/iswamanager.cpp
View File

@@ -55,6 +55,13 @@ namespace openspace{
_month["OCT"] = "10";
_month["NOV"] = "11";
_month["DEC"] = "12";
_type[CygnetType::Texture] = "Texture";
_type[CygnetType::Data] = "Data";
_type[CygnetType::Kameleon] = "Kameleon";
_geom[CygnetGeometry::Plane] = "Plane";
_geom[CygnetGeometry::Sphere] = "Sphere";
}
ISWAManager::~ISWAManager(){}
@@ -68,23 +75,34 @@ namespace openspace{
if(!ss.eof()){
getline(ss,token,',');
std::string data = token;
if(!ss.eof()){
getline(ss, token, ',');
int group = std::stoi(token);
addISWACygnet(cygnetId, data, group);
return;
}
addISWACygnet(cygnetId, data);
} else{
addISWACygnet(cygnetId);
return;
}
addISWACygnet(cygnetId);
/*if(data == "")
else*/
}
void ISWAManager::addISWACygnet(int id, std::string info){
void ISWAManager::addISWACygnet(int id, std::string info, int group){
if(id > 0){
createScreenSpace(id);
}else if(id < 0){
//download metadata to texture plane
std::shared_ptr<MetadataFuture> metadataFuture = downloadMetadata(id);
metadataFuture->type = info;
metadataFuture->guiType = info;
metadataFuture->id = id;
metadataFuture->group = group;
_metadataFutures.push_back(metadataFuture);
}else{
//create kameleonplane
@@ -130,13 +148,19 @@ namespace openspace{
void ISWAManager::update(){
for (auto it = _metadataFutures.begin(); it != _metadataFutures.end(); ){
if((*it)->isFinished) {
if((*it)->type == "TEXTURE"){
createPlane((*it)->id,(*it)->json, std::string("TexturePlane"));
}else if ((*it)->type == "DATA"){
createPlane((*it)->id,(*it)->json,std::string("DataPlane"), 1);
if((*it)->guiType == "TEXTURE"){
(*it)->type = CygnetType::Texture;
(*it)->geom = CygnetGeometry::Plane;
// (*it)->group = -1;
}else if ((*it)->guiType == "DATA"){
(*it)->type = CygnetType::Data;
(*it)->geom = CygnetGeometry::Plane;
// (*it)->group = 1;
} else {
LERROR("\""+ (*it)->type + "\" is not a valid type");
LERROR("\""+ (*it)->guiType + "\" is not a valid type");
return;
}
createPlane((*it));
it = _metadataFutures.erase( it );
}else{
++it;
@@ -185,10 +209,33 @@ namespace openspace{
return metaFuture;
}
void ISWAManager::createScreenSpace(int id){
OsEng.renderEngine().registerScreenSpaceRenderable(std::make_shared<ScreenSpaceCygnet>(id));
}
std::string ISWAManager::parseJSONToLuaTable(int id, std::string name, std::string jsonString, std::string type, int group){
if(jsonString != ""){
json j = json::parse(jsonString);
void ISWAManager::createPlane(std::shared_ptr<MetadataFuture> data){
// check if this plane already exist
std::string name = _type[data->type] + _geom[data->geom] + std::to_string(data->id);
if(data->group > 0)
name += "_Group" + std::to_string(data->group);
data->name = name;
if( OsEng.renderEngine().scene()->sceneGraphNode(name) ){
LERROR("A node with name \"" + name +"\" already exist");
return;
}
std::string luaTable = parseJSONToLuaTable(data);
if(luaTable != ""){
std::string script = "openspace.addSceneGraphNode(" + luaTable + ");";
OsEng.scriptEngine().queueScript(script);
}
}
std::string ISWAManager::parseJSONToLuaTable(std::shared_ptr<MetadataFuture> data){
if(data->json != ""){
json j = json::parse(data->json);
std::string parent = j["Central Body"];
std::string frame = j["Coordinates"];
@@ -216,19 +263,20 @@ namespace openspace{
spatialScale.w = 6;
}
std::string table = "{"
"Name = '" + name +"' , "
"Name = '" + data->name +"' , "
"Parent = '" + parent + "', "
"Renderable = {"
"Type = '" + type + "', "
"Id = " + std::to_string(id) + ", "
"Type = '" + _type[data->type] + _geom[data->geom] + "', "
"Id = " + std::to_string(data->id) + ", "
"Frame = '" + frame + "' , "
"GridMin = " + std::to_string(min) + ", "
"GridMax = " + std::to_string(max) + ", "
"SpatialScale = " + std::to_string(spatialScale) + ", "
"UpdateTime = " + std::to_string(updateTime) + ", "
"CoordinateType = '" + coordinateType + "', "
"Group = "+ std::to_string(group) + " ,"
"Group = "+ std::to_string(data->group) + " ,"
"}"
"}";
@@ -237,6 +285,22 @@ namespace openspace{
return "";
}
void ISWAManager::createKameleonPlane(std::string kwPath, int group){
kwPath = "${OPENSPACE_DATA}/" + kwPath;
const std::string& extension = ghoul::filesystem::File(absPath(kwPath)).fileExtension();
if(FileSys.fileExists(absPath(kwPath)) && extension == "cdf"){
std::string luaTable = parseKWToLuaTable(kwPath, group);
if(!luaTable.empty()){
std::cout << luaTable << std::endl;
std::string script = "openspace.addSceneGraphNode(" + luaTable + ");";
OsEng.scriptEngine().queueScript(script);
}
}else{
LWARNING( kwPath + " is not a cdf file or can't be found.");
}
}
std::string ISWAManager::parseKWToLuaTable(std::string kwPath, int group){
if(kwPath != ""){
const std::string& extension = ghoul::filesystem::File(absPath(kwPath)).fileExtension();
@@ -291,45 +355,6 @@ namespace openspace{
return "";
}
void ISWAManager::createPlane(int id, std::string json, std::string type, int group){
// check if this plane already exist
std::string name = type + std::to_string(id);
if(group > 0)
name += "_Group" + std::to_string(group);
if( OsEng.renderEngine().scene()->sceneGraphNode(name) ){
LERROR("A node with name \"" + name +"\" already exist");
return;
}
std::string luaTable = parseJSONToLuaTable(id, name, json, type, group);
if(luaTable != ""){
std::string script = "openspace.addSceneGraphNode(" + luaTable + ");";
OsEng.scriptEngine().queueScript(script);
}
}
void ISWAManager::createScreenSpace(int id){
OsEng.renderEngine().registerScreenSpaceRenderable(std::make_shared<ScreenSpaceCygnet>(id));
}
void ISWAManager::createKameleonPlane(std::string kwPath, int group){
kwPath = "${OPENSPACE_DATA}/" + kwPath;
const std::string& extension = ghoul::filesystem::File(absPath(kwPath)).fileExtension();
if(FileSys.fileExists(absPath(kwPath)) && extension == "cdf"){
std::string luaTable = parseKWToLuaTable(kwPath, group);
if(!luaTable.empty()){
std::cout << luaTable << std::endl;
std::string script = "openspace.addSceneGraphNode(" + luaTable + ");";
OsEng.scriptEngine().queueScript(script);
}
}else{
LWARNING( kwPath + " is not a cdf file or can't be found.");
}
}
void ISWAManager::registerToGroup(int id, ISWACygnet* cygnet, CygnetType type){
if(_groups.find(id) != _groups.end()){
_groups[id]->registerCygnet(cygnet, type);

25
modules/iswa/util/iswamanager.h
View File

@@ -43,8 +43,12 @@ class ISWACygnet;
struct MetadataFuture {
int id;
std::string type;
int group;
std::string guiType;
std::string name;
std::string json;
int type;
int geom;
bool isFinished;
};
@@ -53,13 +57,14 @@ class ISWAManager : public ghoul::Singleton<ISWAManager> {
friend class ghoul::Singleton<ISWAManager>;
public:
enum CygnetType {Texture, Data};
enum CygnetType {Texture, Data, Kameleon};
enum CygnetGeometry {Plane, Sphere};
ISWAManager();
~ISWAManager();
void addISWACygnet(std::string info);
void addISWACygnet(int id, std::string info = "TEXTURE");
void addISWACygnet(int id, std::string info = "TEXTURE", int group = -1);
void deleteISWACygnet(std::string);
// std::shared_ptr<DownloadManager::FileFuture> downloadImage(int, std::string);
@@ -76,14 +81,18 @@ public:
private:
std::string iSWAurl(int id, std::string type = "image");
std::shared_ptr<MetadataFuture> downloadMetadata(int id);
std::string parseJSONToLuaTable(int id, std::string name, std::string json, std::string type, int group);
void createScreenSpace(int id);
void createPlane(std::shared_ptr<MetadataFuture> data);
std::string parseJSONToLuaTable(std::shared_ptr<MetadataFuture> data);
void createKameleonPlane(std::string kwPath, int group = -1);
std::string parseKWToLuaTable(std::string kwPath, int group);
void createPlane(int id, std::string json, std::string type, int group = -1);
void createScreenSpace(int id);
void createKameleonPlane(std::string kwPath, int group = -1);
std::map<std::string, std::string> _month;
std::map<int, std::string> _type;
std::map<int, std::string> _geom;
std::vector<std::shared_ptr<MetadataFuture>> _metadataFutures;
std::map<int, std::shared_ptr<ISWAGroup>> _groups;