* Fixes #361: wrong case in TensorGlyphRenderer include

* Fixes #362: assignment used instead of comparison
* slight update in GlMorphologyFilter
parent ae20eee4
......@@ -78,6 +78,12 @@ namespace campvis {
template<>
struct GenericOption<std::string> {
public:
GenericOption(const std::string& id, const std::string& title, const std::string& value)
: _id(id)
, _title(title)
, _value(value)
{};
GenericOption(const std::string& id, const std::string& title)
: _id(id)
, _title(title)
......
......@@ -228,7 +228,7 @@ namespace campvis {
}
void AdvancedUsVis::onProcessorValidated(AbstractProcessor* processor) {
if (processor = &_usReader) {
if (processor == &_usReader) {
// convert data
ScopedTypedData<ImageData> img(*_data, _usReader.p_targetImageID.getValue());
if (img != 0) {
......
......@@ -42,8 +42,8 @@
namespace campvis {
GenericOption<std::string> structuringElementOptions[2] = {
GenericOption<std::string>("CROSS_ELEMENT", "Cross"),
GenericOption<std::string>("CUBE_ELEMENT", "Cube")
GenericOption<std::string>("cross", "Cross", "CROSS_ELEMENT"),
GenericOption<std::string>("cube", "Cube", "CUBE_ELEMENT")
};
const std::string GlMorphologyFilter::loggerCat_ = "CAMPVis.modules.classification.GlMorphologyFilter";
......
......@@ -22,7 +22,7 @@
//
// ================================================================================================
#include "TensorGlyphRenderer.h"
#include "tensorglyphrenderer.h"
#include "tgt/tgt_math.h"
#include "tgt/logmanager.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment