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

Multiple data values on the same plane

Browse Source
This commit is contained in:
Sebastian Piwell
2016-04-19 15:14:23 -04:00
parent 4d487fc810
commit b2f25b5ca7
4 changed files with 3872 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3730
data/20150315_000000.txt Normal file
View File

File diff suppressed because it is too large Load Diff

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

@@ -43,6 +43,7 @@ namespace openspace {
DataPlane::DataPlane(const ghoul::Dictionary& dictionary)
:CygnetPlane(dictionary)
,_dataOptions("dataOptions", "Data Options")
,_topColor("topColor", "Top Color", glm::vec4(1,0,0,1), glm::vec4(0), glm::vec4(1))
,_midColor("midColor", "Mid Color", glm::vec4(0,0,0,0), glm::vec4(0), glm::vec4(1))
,_botColor("botColor", "Bot Color", glm::vec4(0,0,1,1), glm::vec4(0), glm::vec4(1))
@@ -54,18 +55,22 @@ DataPlane::DataPlane(const ghoul::Dictionary& dictionary)
_id = id();
setName("DataPlane" + std::to_string(_id));
addProperty(_dataOptions);
// addProperty(_topColor);
// addProperty(_midColor);
// addProperty(_botColor);
// addProperty(_tfValues);
registerProperties();
OsEng.gui()._iSWAproperty.registerProperty(&_dataOptions);
// OsEng.gui()._iSWAproperty.registerProperty(&_topColor);
// OsEng.gui()._iSWAproperty.registerProperty(&_midColor);
// OsEng.gui()._iSWAproperty.registerProperty(&_botColor);
// OsEng.gui()._iSWAproperty.registerProperty(&_tfValues);
// dictionary.getValue("kwPath", _kwPath);
_dataOptions.onChange([this](){loadTexture();});
}
DataPlane::~DataPlane(){}
@@ -223,69 +228,146 @@ void DataPlane::update(const UpdateData& data){
}
if(_futureData && _futureData->isFinished){
// std::cout << _memorybuffer << std::endl;
if(!_dataOptions.options().size()){
readHeader();
}
loadTexture();
_futureData = nullptr;
}
}
void DataPlane::loadTexture() {
void DataPlane::readHeader(){
// std::cout << "In the read header function" << std::endl;
if(!_memorybuffer.empty()){
std::stringstream ss(_memorybuffer);
std::stringstream memorystream(_memorybuffer);
std::string line;
// _dimensions = glm::size3_t(61, 61, 1);
float* values = new float[3721];
// for(int i=0; i<3721; i++){
// values[i] = 0.0f;
// }
int i = 0;
ss >> std::ws;
float min = std::numeric_limits<float>::max();
float max = std::numeric_limits<float>::min();
while(getline(ss,line)){
int numOptions = 0;
while(getline(memorystream,line)){
if(line.find("#") == 0){
// std::cout << line << std::endl;
// std::cout << "Comment line" << std::endl;
if(line.find("# Output data:") == 0){
// std::cout << "the line with the good stuff" << std::endl;
line = line.substr(26);
std::stringstream ss(line);
std::string token;
getline(ss, token, 'x');
int x = std::stoi(token);
getline(ss, token, '=');
int y = std::stoi(token);
_dimensions = glm::size3_t(x, y, 1);
getline(memorystream, line);
line = line.substr(1);
ss = std::stringstream(line);
std::string option;
while(ss >> option){
// std::cout << option << std::endl;
if(option != "x" && option != "y" && option != "z"){
_dataOptions.addOption({numDataOptions, option});
numDataOptions++;
}
}
std::vector<int> v(1,0);
_dataOptions.setValue(v);
}
}else{
break;
}
}
}else{
LERROR("Noting in memory buffer, are you connected to the information super highway?");
}
}
float* DataPlane::readData(){
if(!_memorybuffer.empty()){
std::stringstream memorystream(_memorybuffer);
std::string line;
std::vector<int> selectedOptions = _dataOptions.value();
std::vector<float> min;
std::vector<float> max;
std::vector<std::vector<float>> optionValues;
for(int i=0; i < selectedOptions.size(); i++){
min.push_back(std::numeric_limits<float>::max());
max.push_back(std::numeric_limits<float>::min());
std::vector<float> v;
optionValues.push_back(v);
}
float* combinedValues = new float[_dimensions.x*_dimensions.y];
int numValues = 0;
while(getline(memorystream, line)){
if(line.find("#") == 0){
//part of the header
continue;
}
float x, y, z, N, V, B;
std::stringstream sl(line);
sl >> std::ws >> x >> y >> z >> N >> V >> B;
values[i] = N;
// std::cout << N << ", ";
min = std::min(min,values[i]);
max = std::max(max,values[i]);
i++;
}
// std::cout << min << ", " << max << std::endl;
for(int j=0; j<i; j++){
float normValue = (values[j]-min)/(max-min);
values[j] = glm::clamp(normValue, 0.0f, 1.0f);
}
if (!_texture) {
ghoul::opengl::Texture::FilterMode filtermode = ghoul::opengl::Texture::FilterMode::Linear;
ghoul::opengl::Texture::WrappingMode wrappingmode = ghoul::opengl::Texture::WrappingMode::ClampToEdge;
std::unique_ptr<ghoul::opengl::Texture> texture =
std::make_unique<ghoul::opengl::Texture>(values,glm::size3_t(61, 61, 1), ghoul::opengl::Texture::Format::Red, GL_RED, GL_FLOAT, filtermode, wrappingmode);
if(texture){
texture->uploadTexture();
texture->setFilter(ghoul::opengl::Texture::FilterMode::Linear);
_texture = std::move(texture);
std::stringstream ss(line);
std::vector<float> value;
float v;
while(ss >> v){
value.push_back(v);
}
if(value.size()){
for(int i=0; i<optionValues.size(); i++){
optionValues[i].push_back(value[selectedOptions[i]+3]); //+3 because "options" x, y and z.
min[i] = std::min(min[i], optionValues[i][numValues]);
max[i] = std::max(max[i], optionValues[i][numValues]);
}
numValues++;
}
}else{
_texture->setPixelData(values);
_texture->uploadTexture();
}
if(numValues != _dimensions.x*_dimensions.y)
LERROR("Number of values read and expected are not the same");
for(int i=0; i< numValues; i++){
combinedValues[i] = 0;
for(int j=0; j<optionValues.size(); j++){
float normValue = (optionValues[j][i]-min[j])/(max[j]-min[j]);
combinedValues[i] += glm::clamp(normValue, 0.0f, 1.0f);
}
combinedValues[i] /= selectedOptions.size();
}
return combinedValues;
}else{
LERROR("Noting in memory buffer, are you connected to the information super highway?");
}
}
void DataPlane::loadTexture() {
float* values = readData();
if (!_texture) {
ghoul::opengl::Texture::FilterMode filtermode = ghoul::opengl::Texture::FilterMode::Linear;
ghoul::opengl::Texture::WrappingMode wrappingmode = ghoul::opengl::Texture::WrappingMode::ClampToEdge;
std::unique_ptr<ghoul::opengl::Texture> texture =
std::make_unique<ghoul::opengl::Texture>(values, _dimensions, ghoul::opengl::Texture::Format::Red, GL_RED, GL_FLOAT, filtermode, wrappingmode);
if(texture){
texture->uploadTexture();
texture->setFilter(ghoul::opengl::Texture::FilterMode::Linear);
_texture = std::move(texture);
}
}else{
_texture->setPixelData(values);
_texture->uploadTexture();
}
}

14
modules/iswa/rendering/dataplane.h
View File

@@ -29,6 +29,7 @@
#include <modules/kameleon/include/kameleonwrapper.h>
#include <openspace/properties/vectorproperty.h>
#include <modules/iswa/rendering/colorbar.h>
#include <openspace/properties/selectionproperty.h>
namespace openspace{
@@ -45,22 +46,27 @@ class DataPlane : public CygnetPlane {
private:
virtual void loadTexture() override;
virtual void updateTexture() override;
void readHeader();
float* readData();
static int id();
properties::SelectionProperty _dataOptions;
properties::Vec4Property _topColor;
properties::Vec4Property _midColor;
properties::Vec4Property _botColor;
properties::Vec2Property _tfValues;
std::shared_ptr<KameleonWrapper> _kw;
std::string _kwPath;
// std::shared_ptr<KameleonWrapper> _kw;
// std::string _kwPath;
glm::size3_t _dimensions;
int numDataValues;
int numDataOptions = 0;
float* _dataSlice;
std::string _var;
std::shared_ptr<float> _values;
std::shared_ptr<ColorBar> _colorbar;
std::shared_ptr<DownloadManager::FileFuture> _futureData;
};

2
modules/onscreengui/src/guipropertycomponent.cpp
View File

@@ -86,7 +86,7 @@ namespace {
std::vector<int> newSelectedIndices;
std::vector<int> selectedIndices = p->value();
for (int i = 0; i < options.size(); ++i) {
std::string description = options[i].description;
bool selected = std::find(selectedIndices.begin(), selectedIndices.end(), i) != selectedIndices.end();