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

changed function parameters to processData, update ghoul ref

Browse Source
This commit is contained in:
Michael Nilsson
2016-05-02 13:42:10 -04:00
parent 080459d229
commit 7245807a1a
3 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ghoul

Submodule ext/ghoul updated: 11bac4f34a...960bf261b1

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

@@ -78,7 +78,7 @@ DataPlane::DataPlane(const ghoul::Dictionary& dictionary)
loadTexture();});
_useLog.onChange([this](){loadTexture();});
_useHistogram.onChange([this](){loadTexture();});
_dataOptions.onChange([this](){loadTexture();});
_dataOptions.onChange([this](){ loadTexture();} );
_useMultipleTf.onChange([this](){
changeTransferFunctions(_useMultipleTf.value());
@@ -359,18 +359,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;
@@ -378,7 +378,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;
@@ -390,9 +390,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;
@@ -484,7 +483,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

@@ -52,9 +52,8 @@ class DataPlane : public CygnetPlane {
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
@@ -73,7 +72,6 @@ class DataPlane : public CygnetPlane {
properties::BoolProperty _useMultipleTf;
// properties::BoolProperty _averageValues;
// properties::Vec4Property _topColor;
// properties::Vec4Property _midColor;
// properties::Vec4Property _botColor;