Commit 83307128 authored by Hossain Mahmud's avatar Hossain Mahmud
Browse files

rebased and cleaned

parent 4994c746
...@@ -44,12 +44,6 @@ namespace campvis { ...@@ -44,12 +44,6 @@ namespace campvis {
void AutoEvaluationPipeline::init() { void AutoEvaluationPipeline::init() {
AbstractPipeline::init(); AbstractPipeline::init();
// connect invalidation of each processor
//for (std::vector<AbstractProcessor*>::iterator it = _processors.begin(); it != _processors.end(); ++it) {
// (*it)->s_invalidated.connect(this, &AutoEvaluationPipeline::onProcessorInvalidated);
//}
_data->s_dataAdded.connect(this, &AutoEvaluationPipeline::onDataContainerDataAdded); _data->s_dataAdded.connect(this, &AutoEvaluationPipeline::onDataContainerDataAdded);
} }
......
...@@ -52,6 +52,7 @@ namespace campvis { ...@@ -52,6 +52,7 @@ namespace campvis {
, p_eepProps("EEPProps", "Entry/Exit Points Generator") , p_eepProps("EEPProps", "Entry/Exit Points Generator")
, p_raycasterProps("RaycasterProps", "Raycaster") , p_raycasterProps("RaycasterProps", "Raycaster")
, p_orientationOverlayProps("OrientationOverlayProps", "Orientation Overlay") , p_orientationOverlayProps("OrientationOverlayProps", "Orientation Overlay")
, p_raycastingProcSelector("RaycasterSelector", "RaycasterSelector", new GenericOption<std::string>("select", "Select Processor"), 1)
, _pgGenerator() , _pgGenerator()
, _eepGenerator(viewportSizeProp) , _eepGenerator(viewportSizeProp)
, _raycaster(raycaster) , _raycaster(raycaster)
......
...@@ -107,7 +107,9 @@ namespace campvis { ...@@ -107,7 +107,9 @@ namespace campvis {
MetaProperty p_eepProps; ///< MetaProperty for properties of the EEPGenerator processor MetaProperty p_eepProps; ///< MetaProperty for properties of the EEPGenerator processor
MetaProperty p_raycasterProps; ///< MetaProperty for properties of the raycasting processor MetaProperty p_raycasterProps; ///< MetaProperty for properties of the raycasting processor
MetaProperty p_orientationOverlayProps; ///< MetaProperty for properties of the OrientationOverlay processor MetaProperty p_orientationOverlayProps; ///< MetaProperty for properties of the OrientationOverlay processor
GenericOptionProperty<std::string> p_raycastingProcSelector; ///< Name of the RaycastingProcessor to be used
sigslot::signal2<RaycastingProcessor*, RaycastingProcessor*> s_raycasterChanged; ///< Signal emited when the raycaster is changed sigslot::signal2<RaycastingProcessor*, RaycastingProcessor*> s_raycasterChanged; ///< Signal emited when the raycaster is changed
protected: protected:
......
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