mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 17:09:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge fix

Browse Source
This commit is contained in:
Sebastian Piwell
2016-05-02 17:34:10 -04:00
parent 8bde97fdfa 40cd7e98ec
commit f5ab620398
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ DataPlane::DataPlane(const ghoul::Dictionary& dictionary)
loadTexture();});
_useLog.onChange([this](){loadTexture();});
_useHistogram.onChange([this](){loadTexture();});
_dataOptions.onChange([this](){loadTexture();});
_dataOptions.onChange([this](){ loadTexture();} );
_transferFunctionsFile.onChange([this](){
@@ -372,18 +372,18 @@ std::vector<float*> DataPlane::readData(){
return std::vector<float*>();
}
// // FOR TESTING
// // ===========
// FOR TESTING
// ===========
// std::chrono::time_point<std::chrono::system_clock> start, end;
// start = std::chrono::system_clock::now();
// // ===========
// ===========
for(int i=0; i<numSelected; i++){
processData(data, selectedOptions[i], optionValues[i], min[i], max[i], sum[i]);
processData(data[ selectedOptions[i] ], optionValues[i], min[i], max[i], sum[i]);
}
// // FOR TESTING
// // ===========
// FOR TESTING
// ===========
// end = std::chrono::system_clock::now();
// _numOfBenchmarks++;
// std::chrono::duration<double> elapsed_seconds = end-start;
@@ -391,7 +391,7 @@ std::vector<float*> DataPlane::readData(){
// std::cout << " readData():" << std::endl;
// std::cout << "avg elapsed time: " << _avgBenchmarkTime << "s\n";
// std::cout << "num Benchmarks: " << _numOfBenchmarks << "\n";
// // ===========
// ===========
return data;
@@ -403,9 +403,8 @@ std::vector<float*> DataPlane::readData(){
}
void DataPlane::processData(std::vector<float*> outputData, int inputChannel, std::vector<float> inputData, float min, float max,float sum){
void DataPlane::processData(float* outputData, std::vector<float>& inputData, float min, float max,float sum){
float* output = outputData[inputChannel];
// HISTOGRAM
// number of levels/bins/values
const int levels = 512;
@@ -497,7 +496,7 @@ void DataPlane::processData(std::vector<float*> outputData, int inputChannel, st
}
v = normalizeWithStandardScore(v, mean, standardDeviation);
output[i] += v;
outputData[i] += v;
}

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

@@ -64,9 +64,8 @@ friend class ISWAGroup;
void readHeader();
std::vector<float*> readData();
void processData(
std::vector<float*> outputData, // Where you want your processed data to go
int inputChannel, // index of the data channel
std::vector<float> inputData, //data that needs processing
float* outputData, // Where you want your processed data to go
std::vector<float>& inputData, //data that needs processing
float min, // min value of the input data
float max, // max valye of the input data
float sum // sum of the input data
@@ -83,7 +82,6 @@ friend class ISWAGroup;
properties::Vec2Property _backgroundValues;
properties::BoolProperty _useLog;
properties::BoolProperty _useHistogram;
glm::size3_t _dimensions;
// std::shared_ptr<ColorBar> _colorbar;