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

Moved function body

Browse Source
This commit is contained in:
Sebastian Piwell
2016-05-13 14:29:25 -04:00
parent 1eb0d47fad
commit fec15357e8
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<int> 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

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

@@ -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<int> 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<int> 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> _dataProcessor;
//FOR TESTING
// double _avgBenchmarkTime=0.0;
// int _numOfBenchmarks = 0;
//===========
};
} // namespace openspace