From c2fca8be46039ce91bb5e1e6a7c50ad71d6800ba Mon Sep 17 00:00:00 2001 From: Jonathan Grangien Date: Wed, 16 May 2018 14:55:03 -0400 Subject: [PATCH] Comment out lowerValueBound/lowerUpperBound until further revision --- modules/volume/rendering/renderabletimevaryingvolume.cpp | 9 ++++----- modules/volume/rendering/renderabletimevaryingvolume.h | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/volume/rendering/renderabletimevaryingvolume.cpp b/modules/volume/rendering/renderabletimevaryingvolume.cpp index fa9d69b25a..506780724c 100644 --- a/modules/volume/rendering/renderabletimevaryingvolume.cpp +++ b/modules/volume/rendering/renderabletimevaryingvolume.cpp @@ -176,7 +176,6 @@ namespace openspace::volume { }; } - //documentation::Documentation RenderableTimeVaryingVolume::TimestepDocumentation() { // using namespace documentation; // return { @@ -235,8 +234,8 @@ RenderableTimeVaryingVolume::RenderableTimeVaryingVolume( , _secondsAfter(SecondsAfterInfo, 0.f, 0.01f, SecondsInOneDay) , _sourceDirectory(SourceDirectoryInfo) , _transferFunctionPath(TransferFunctionInfo) - , _lowerValueBound(lowerValueBoundInfo, 0.f, 0.f, 1000000.f) - , _upperValueBound(upperValueBoundInfo, 0.f, 0.f, 1000000.f) + // , _lowerValueBound(lowerValueBoundInfo, 0.f, 0.f, 1000000.f) + // , _upperValueBound(upperValueBoundInfo, 0.f, 0.f, 1000000.f) , _triggerTimeJump(TriggerTimeJumpInfo) , _jumpToTimestep(JumpToTimestepInfo, 0, 0, 256) , _currentTimestep(CurrentTimeStepInfo, 0, 0, 256) @@ -248,8 +247,8 @@ RenderableTimeVaryingVolume::RenderableTimeVaryingVolume( ); _sourceDirectory = absPath(dictionary.value(KeySourceDirectory)); - _lowerValueBound = dictionary.value(KeyLowerValueBound); - _upperValueBound = dictionary.value(KeyUpperValueBound); + // _lowerValueBound = dictionary.value(KeyLowerValueBound); + // _upperValueBound = dictionary.value(KeyUpperValueBound); _transferFunctionPath = absPath(dictionary.value(KeyTransferFunction)); _transferFunction = std::make_shared( _transferFunctionPath, diff --git a/modules/volume/rendering/renderabletimevaryingvolume.h b/modules/volume/rendering/renderabletimevaryingvolume.h index de8631bf20..b68932cb07 100644 --- a/modules/volume/rendering/renderabletimevaryingvolume.h +++ b/modules/volume/rendering/renderabletimevaryingvolume.h @@ -95,8 +95,8 @@ private: properties::FloatProperty _secondsAfter; properties::StringProperty _sourceDirectory; properties::StringProperty _transferFunctionPath; - properties::FloatProperty _lowerValueBound; - properties::FloatProperty _upperValueBound; + // properties::FloatProperty _lowerValueBound; + // properties::FloatProperty _upperValueBound; properties::TriggerProperty _triggerTimeJump; properties::IntProperty _jumpToTimestep;