diff --git a/modules/iswa/rendering/dataplane.cpp b/modules/iswa/rendering/dataplane.cpp index 7a49815065..89083bd65d 100644 --- a/modules/iswa/rendering/dataplane.cpp +++ b/modules/iswa/rendering/dataplane.cpp @@ -107,6 +107,13 @@ DataPlane::DataPlane(const ghoul::Dictionary& dictionary) DataPlane::~DataPlane(){} +void DataPlane::useLog(bool useLog){ _useLog.setValue(useLog); }; +void DataPlane::normValues(glm::vec2 normValues){ _normValues.setValue(normValues); }; +void DataPlane::useHistogram(bool useHistogram){ _useHistogram.setValue(useHistogram); }; +void DataPlane::dataOptions(std::vector options){ _dataOptions.setValue(options); }; +void DataPlane::transferFunctionsFile(std::string tfPath){ _transferFunctionsFile.setValue(tfPath); }; +void DataPlane::backgroundValues(glm::vec2 backgroundValues){ _backgroundValues.setValue(backgroundValues); }; + bool DataPlane::loadTexture() { // if The future is done then get the new dataFile diff --git a/modules/iswa/rendering/dataplane.h b/modules/iswa/rendering/dataplane.h index 2612ef6a85..4bd28942ad 100644 --- a/modules/iswa/rendering/dataplane.h +++ b/modules/iswa/rendering/dataplane.h @@ -41,12 +41,12 @@ friend class IswaGroup; ~DataPlane(); protected: - void useLog(bool useLog){ _useLog.setValue(useLog); }; - void normValues(glm::vec2 normValues){ _normValues.setValue(normValues); }; - void useHistogram(bool useHistogram){ _useHistogram.setValue(useHistogram); }; - void dataOptions(std::vector options){ _dataOptions.setValue(options); }; - void transferFunctionsFile(std::string tfPath){ _transferFunctionsFile.setValue(tfPath); }; - void backgroundValues(glm::vec2 backgroundValues){ _backgroundValues.setValue(backgroundValues); }; + void useLog(bool useLog); + void normValues(glm::vec2 normValues); + void useHistogram(bool useHistogram); + void dataOptions(std::vector options); + void transferFunctionsFile(std::string tfPath); + void backgroundValues(glm::vec2 backgroundValues); private: virtual bool loadTexture() override; @@ -60,18 +60,14 @@ friend class IswaGroup; properties::SelectionProperty _dataOptions; properties::StringProperty _transferFunctionsFile; - properties::Vec2Property _normValues; properties::Vec2Property _backgroundValues; + + properties::Vec2Property _normValues; properties::BoolProperty _useLog; properties::BoolProperty _useHistogram; std::string _dataBuffer; std::shared_ptr _dataProcessor; - - //FOR TESTING - // double _avgBenchmarkTime=0.0; - // int _numOfBenchmarks = 0; - //=========== }; } // namespace openspace