Commit 1c783aef authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Moved RegistrationDemo and SegmentationDemo pipelines from VIS to ITK module...

Moved RegistrationDemo and SegmentationDemo pipelines from VIS to ITK module to avoid linking errors if ITK module is disabled. Furthermore, renamed classes to ItkRegistrationDemo and ItkSegmentationDemo.
parent c8f587ed
......@@ -27,7 +27,7 @@
//
// ================================================================================================
#include "registrationdemo.h"
#include "itkregistrationdemo.h"
#include "tgt/event/keyevent.h"
#include "core/datastructures/imagedata.h"
......@@ -37,7 +37,7 @@
namespace campvis {
RegistrationDemo::RegistrationDemo(DataContainer* dc)
ItkRegistrationDemo::ItkRegistrationDemo(DataContainer* dc)
: AutoEvaluationPipeline(dc)
, _lsp()
, _imageReader()
......@@ -52,10 +52,10 @@ namespace campvis {
addEventListenerToBack(&_ve);
}
RegistrationDemo::~RegistrationDemo() {
ItkRegistrationDemo::~ItkRegistrationDemo() {
}
void RegistrationDemo::init() {
void ItkRegistrationDemo::init() {
AutoEvaluationPipeline::init();
_ve.p_outputImage.setValue("result");
......@@ -78,7 +78,7 @@ namespace campvis {
static_cast<FloatProperty*>(_ve.getNestedProperty("VolumeRendererProperties::RaycasterProps::SamplingRate"))->setValue(4.f);
}
void RegistrationDemo::deinit() {
void ItkRegistrationDemo::deinit() {
_canvasSize.s_changed.disconnect(this);
AutoEvaluationPipeline::deinit();
}
......
......@@ -22,8 +22,8 @@
//
// ================================================================================================
#ifndef RegistrationDemo_H__
#define RegistrationDemo_H__
#ifndef ITKREGISTRATIONDEMO_H__
#define ITKREGISTRATIONDEMO_H__
#include "core/pipeline/autoevaluationpipeline.h"
#include "modules/base/processors/lightsourceprovider.h"
......@@ -33,17 +33,17 @@
#include "modules/itk/processors/itkregistration.h"
namespace campvis {
class RegistrationDemo : public AutoEvaluationPipeline {
class ItkRegistrationDemo : public AutoEvaluationPipeline {
public:
/**
* Creates a AutoEvaluationPipeline.
*/
RegistrationDemo(DataContainer* dc);
ItkRegistrationDemo(DataContainer* dc);
/**
* Virtual Destructor
**/
virtual ~RegistrationDemo();
virtual ~ItkRegistrationDemo();
/// \see AutoEvaluationPipeline::init()
virtual void init();
......@@ -54,7 +54,7 @@ namespace campvis {
/// \see AbstractPipeline::getName()
virtual const std::string getName() const { return getId(); };
/// \see AbstractPipeline::getId()
static const std::string getId() { return "RegistrationDemo"; };
static const std::string getId() { return "ItkRegistrationDemo"; };
protected:
LightSourceProvider _lsp;
......@@ -65,4 +65,4 @@ namespace campvis {
}
#endif // RegistrationDemo_H__
#endif // ITKREGISTRATIONDEMO_H__
......@@ -27,7 +27,7 @@
//
// ================================================================================================
#include "segmentationdemo.h"
#include "itksegmentationdemo.h"
#include "tgt/event/keyevent.h"
#include "core/datastructures/imagedata.h"
......@@ -37,7 +37,7 @@
namespace campvis {
SegmentationDemo::SegmentationDemo(DataContainer* dc)
ItkSegmentationDemo::ItkSegmentationDemo(DataContainer* dc)
: AutoEvaluationPipeline(dc)
, _lsp()
, _imageReader()
......@@ -52,10 +52,10 @@ namespace campvis {
addEventListenerToBack(&_itkSegmentation);
}
SegmentationDemo::~SegmentationDemo() {
ItkSegmentationDemo::~ItkSegmentationDemo() {
}
void SegmentationDemo::init() {
void ItkSegmentationDemo::init() {
AutoEvaluationPipeline::init();
_itkSegmentation.p_outputImage.setValue("result");
......@@ -79,7 +79,7 @@ namespace campvis {
static_cast<FloatProperty*>(_itkSegmentation.getNestedProperty("VolumeRendererProperties::RaycasterProps::SamplingRate"))->setValue(4.f);
}
void SegmentationDemo::deinit() {
void ItkSegmentationDemo::deinit() {
_canvasSize.s_changed.disconnect(this);
AutoEvaluationPipeline::deinit();
}
......
......@@ -22,8 +22,8 @@
//
// ================================================================================================
#ifndef SegmentationDemo_H__
#define SegmentationDemo_H__
#ifndef ITKSEGMENTATIONDEMO_H__
#define ITKSEGMENTATIONDEMO_H__
#include "core/pipeline/autoevaluationpipeline.h"
#include "modules/base/processors/lightsourceprovider.h"
......@@ -32,17 +32,17 @@
#include "modules/itk/processors/itksegmentation.h"
namespace campvis {
class SegmentationDemo : public AutoEvaluationPipeline {
class ItkSegmentationDemo : public AutoEvaluationPipeline {
public:
/**
* Creates a AutoEvaluationPipeline.
*/
SegmentationDemo(DataContainer* dc);
ItkSegmentationDemo(DataContainer* dc);
/**
* Virtual Destructor
**/
virtual ~SegmentationDemo();
virtual ~ItkSegmentationDemo();
/// \see AutoEvaluationPipeline::init()
virtual void init();
......@@ -53,7 +53,7 @@ namespace campvis {
/// \see AbstractPipeline::getName()
virtual const std::string getName() const { return getId(); };
/// \see AbstractPipeline::getId()
static const std::string getId() { return "SegmentationDemo"; };
static const std::string getId() { return "ItkSegmentationDemo"; };
protected:
LightSourceProvider _lsp;
......@@ -64,4 +64,4 @@ namespace campvis {
}
#endif // SegmentationDemo_H__
#endif // ITKSEGMENTATIONDEMO_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