move call to calculateFilterValues to DataCygnet

This commit is contained in:
Michael Nilsson
2016-06-28 18:07:51 -04:00
parent e8bbb9e0c5
commit f9738d8356
5 changed files with 7 additions and 6 deletions
+3 -1
View File
@@ -69,8 +69,10 @@ bool DataCygnet::updateTexture(){
if(data.empty())
return false;
if(_autoFilter)
if(_autoFilter){
_dataProcessor->calculateFilterValues(_dataOptions.value());
_backgroundValues.setValue(_dataProcessor->filterValues());
}
bool texturesReady = false;
std::vector<int> selectedOptions = _dataOptions.value();
+1 -1
View File
@@ -70,6 +70,7 @@ public:
* @return Processed data
*/
virtual std::vector<float*> processData(const std::string& data, const properties::SelectionProperty& dataOptions, const glm::size3_t& dimensions) = 0;
void calculateFilterValues(std::vector<int> selectedOptions);
void useLog(bool useLog);
void useHistogram(bool useHistogram);
@@ -82,7 +83,6 @@ public:
protected:
float processDataPoint(float value, int option);
void initializeVectors(int numOptions);
void calculateFilterValues(std::vector<int> selectedOptions);
void add(std::vector<std::vector<float>>& optionValues, std::vector<float>& sum);
std::vector<float> _min;
+1 -2
View File
@@ -134,8 +134,7 @@ std::vector<float*> DataProcessorJson::processData(const std::string& data, cons
}
}
}
calculateFilterValues(selectedOptions);
//calculateFilterValues(selectedOptions);
return dataOptions;
}
return std::vector<float*>();
+1 -1
View File
@@ -130,7 +130,7 @@ std::vector<float*> DataProcessorKameleon::processData(const std::string& path,
}
}
calculateFilterValues(selectedOptions);
//calculateFilterValues(selectedOptions);
return dataOptions;
}
return std::vector<float*>(numOptions, nullptr);
+1 -1
View File
@@ -210,7 +210,7 @@ std::vector<float*> DataProcessorText::processData(const std::string& data, cons
numValues++;
}
calculateFilterValues(selectedOptions);
//calculateFilterValues(selectedOptions);
return dataOptions;
}