Commit 4da87a05 authored by Mathias Goldau's avatar Mathias Goldau

[CHANGE] Now every module calls the inherited properties member function of...

[CHANGE] Now every module calls the inherited properties member function of WModule at the end as intended.
parent 654c6b1f
......@@ -182,6 +182,7 @@ void WMApplyMask::connectors()
void WMApplyMask::properties()
{
WModule::properties();
}
template< typename T > void WMApplyMask::applyMask( boost::shared_ptr< WValueSet< T > > valSet, dataType type )
......
......@@ -102,6 +102,8 @@ void WMArbitraryPlane::properties()
m_buttonReset2Axial = m_properties->addProperty( "Axial", "Resets and aligns the plane", WPVBaseTypes::PV_TRIGGER_READY, m_propCondition );
m_buttonReset2Coronal = m_properties->addProperty( "Coronal", "Resets and aligns the plane", WPVBaseTypes::PV_TRIGGER_READY, m_propCondition );
m_buttonReset2Sagittal = m_properties->addProperty( "Sagittal", "Resets and aligns the plane", WPVBaseTypes::PV_TRIGGER_READY, m_propCondition );
WModule::properties();
}
void WMArbitraryPlane::moduleMain()
......
......@@ -105,6 +105,8 @@ void WMArbitraryRois::properties()
m_bTrigger = m_properties->addProperty( "Finalize", "Finalize and add to ROI manager", WPVBaseTypes::PV_TRIGGER_READY );
m_threshold = m_properties->addProperty( "Threshold", "", 0. );
m_surfaceColor = m_properties->addProperty( "Surface color", "", WColor( 1.0, 0.3, 0.3, 1.0 ) );
WModule::properties();
}
void WMArbitraryRois::moduleMain()
......
......@@ -103,6 +103,8 @@ void WMAtlasSurfaces::properties()
{
WPropertyBase::PropertyChangeNotifierType propertyCallback = boost::bind( &WMAtlasSurfaces::propertyChanged, this );
m_propCondition = boost::shared_ptr< WCondition >( new WCondition() );
WModule::properties();
}
void WMAtlasSurfaces::moduleMain()
......
......@@ -149,6 +149,8 @@ void WMBermanTracking::properties()
m_ratio = m_properties->addProperty( "Ratio?", "Temporary", 3.0, m_propCondition );
m_epsImpr = m_properties->addProperty( "EpsImpr?", "Temporary", 1.0, m_propCondition );
WModule::properties();
}
void WMBermanTracking::moduleMain()
......
......@@ -169,10 +169,7 @@ void WMBoundingBox::connectors()
void WMBoundingBox::properties()
{
// ( m_properties->addInt( "Thickness", 1 ) )->connect( boost::bind( &WMBoundingBox::slotPropertyChanged, this, _1 ) );
// m_active gets initialized in WModule and is available for all modules. Overwrite activate() to have a special callback for m_active
// changes.
WModule::properties();
}
void WMBoundingBox::activate()
......
......@@ -86,6 +86,8 @@ void WMCalculateGFA::connectors()
void WMCalculateGFA::properties()
{
m_exceptionCondition = boost::shared_ptr< WCondition >( new WCondition() );
WModule::properties();
}
void WMCalculateGFA::moduleMain()
......
......@@ -364,6 +364,8 @@ void WMClusterDisplay::properties()
WPropertyHelper::PC_PATHEXISTS::addTo( m_propTreeFile );
m_createRoiTrigger = m_properties->addProperty( "Create Roi", "Press!", WPVBaseTypes::PV_TRIGGER_READY, m_propCondition );
WModule::properties();
}
void WMClusterDisplay::moduleMain()
......
......@@ -71,6 +71,8 @@ void WMClusterParamDisplay::properties()
m_isoValue->setMin( 0.0 );
m_isoValue->setMax( 100.0 );
m_drawIsoSurface = m_properties->addProperty( "Iso Surface", "En/Disables the display of the iso surface", true );
WModule::properties();
}
void WMClusterParamDisplay::moduleMain()
......
......@@ -140,6 +140,8 @@ void WMClusterSlicer::properties()
m_maxScale->setMax( 1.0 );
m_minScaleColor = m_properties->addProperty( "MinScaleColor", "", WColor( 1.0, 0.0, 0.0, 1.0 ), m_fullUpdate );
m_maxScaleColor = m_properties->addProperty( "MaxScaleColor", "", WColor( 1.0, 0.0, 0.0, 1.0 ), m_fullUpdate );
WModule::properties();
}
void WMClusterSlicer::moduleMain()
......
......@@ -96,8 +96,9 @@ void WMCoordinateHUD::properties()
WPropertyHelper::PC_SELECTONLYONE::addTo( m_aSingleSelection );
WPropertyHelper::PC_NOTEMPTY::addTo( m_aSingleSelection );
// set the x axis color if in color axis or color cube mode
WModule::properties();
}
void WMCoordinateHUD::moduleMain()
......
......@@ -159,6 +159,8 @@ void WMCoordinateSystem::properties()
m_acTrigger = m_properties->addProperty( "Set AC", "Press me.", WPVBaseTypes::PV_TRIGGER_READY, propertyCallback );
m_pcTrigger = m_properties->addProperty( "Set PC", "Press me.", WPVBaseTypes::PV_TRIGGER_READY, propertyCallback );
m_ihpTrigger = m_properties->addProperty( "Set IHP", "Press me.", WPVBaseTypes::PV_TRIGGER_READY, propertyCallback );
WModule::properties();
}
void WMCoordinateSystem::propertyChanged()
......
......@@ -177,6 +177,7 @@ void WMDataTypeConversion::connectors()
void WMDataTypeConversion::properties()
{
WModule::properties();
}
......
......@@ -150,6 +150,8 @@ void WMDetTractClustering::properties()
m_numValidClusters->setMin( 0 );
m_numValidClusters->setMax( wlimits::MAX_INT32_T );
m_clusterSizes = m_infoProperties->addProperty( "Cluster sizes:", "Size of each valid cluster", std::string() );
WModule::properties();
}
void WMDetTractClustering::updateOutput()
......
......@@ -135,6 +135,8 @@ void WMDetTractCulling::properties()
m_numTracts = m_infoProperties->addProperty( "#Tracts", "Number of tracts beeing processed", 0 );
m_numTracts->setMin( 0 );
m_numTracts->setMax( wlimits::MAX_INT32_T );
WModule::properties();
}
void WMDetTractCulling::cullOutTracts()
......
......@@ -211,6 +211,8 @@ void WMDeterministicFTMori::properties()
" adjacent fiber segments.", 0.80, m_propCondition );
m_minCos->setMax( 1.0 );
m_minCos->setMin( 0.0 );
WModule::properties();
}
void WMDeterministicFTMori::activate()
......
......@@ -139,7 +139,7 @@ void WMDistanceMap::connectors()
void WMDistanceMap::properties()
{
// no properties
WModule::properties();
}
template< typename T > boost::shared_ptr< WValueSet< float > > makeFloatValueSetHelper( boost::shared_ptr< WValueSet< T > > inSet )
......
......@@ -152,6 +152,8 @@ void WMEEGView::properties()
m_ySensitivity->setMax( 100.0 );
m_colorSensitivity->setMin( 0.01 );
m_colorSensitivity->setMax( 10000.0 );
WModule::properties();
}
void WMEEGView::notifyConnectionEstablished(
......
......@@ -404,6 +404,8 @@ void WMEffectiveConnectivityCluster::properties()
m_voi2Name = m_properties->addProperty( "Name of VOI2", "The name of the VOI2.", std::string( "" ), m_propCondition );
m_labelCharacterSize = m_properties->addProperty( "Font size", "The size of the label fonts.", 20, m_propCondition );
WModule::properties();
}
void WMEffectiveConnectivityCluster::activate()
......
......@@ -84,6 +84,8 @@ void WMExportGeometry::properties()
{
m_savePath = m_properties->addProperty( "Save Path", "Where to save the result", boost::filesystem::path( "/tmp/test.wrl" ) );
WPropertyHelper::PC_NOTEMPTY::addTo( m_savePath );
WModule::properties();
}
void WMExportGeometry::moduleMain()
......
......@@ -140,6 +140,8 @@ void WMFiberSelection::properties()
m_preferShortestPath = m_properties->addProperty( "Prefer shortest path", "Determines whether the fibers should be cut on the entry and "
"exit of a VOI. This should prevent the fibers from going deep into the VOI's.", false, m_propCondition );
WModule::properties();
}
/**
......
......@@ -92,6 +92,8 @@ void WMFiberTransform::properties()
m_matrix2Prop = m_properties->addProperty( "M Row 2",
"Row 2 of matrix part of the transformation. You need to press enter to make the values effective.",
wmath::WPosition( 0.0, 0.0, 1.0 ) );
WModule::properties();
}
void WMFiberTransform::moduleMain()
......
......@@ -85,6 +85,8 @@ void WMFunctionalMRIViewer::properties()
m_time->setMin( 0.0 );
m_texScaleNormalized = m_properties->addProperty( "Norm. Tex Scale", "Use the same texture scaling for all textures.", true, m_propCondition );
WModule::properties();
}
void WMFunctionalMRIViewer::moduleMain()
......
......@@ -390,4 +390,6 @@ void WMGaussFiltering::properties()
m_iterations->setMax( 100 );
m_mode = m_properties->addProperty( "Mode", "", false, m_propCondition );
WModule::properties();
}
......@@ -76,7 +76,7 @@ void WMGridRenderer::connectors()
void WMGridRenderer::properties()
{
// Put the code for your properties here. See "src/modules/template/" for an extensively documented example.
WModule::properties();
}
void WMGridRenderer::moduleMain()
......
......@@ -71,8 +71,7 @@ void WMHud::connectors()
void WMHud::properties()
{
// m_active gets initialized in WModule and is available for all modules. Overwrite activate() to have a special callback for m_active
// changes or add a callback manually.
WModule::properties();
}
void WMHud::moduleMain()
......
......@@ -111,6 +111,8 @@ void WMImageExtractor::properties()
m_colorMapSelection = m_properties->addProperty( "Colormap", "Colormap type.", m_colorMapSelectionsList->getSelectorFirst(), m_propCondition );
WPropertyHelper::PC_SELECTONLYONE::addTo( m_colorMapSelection );
WModule::properties();
}
void WMImageExtractor::activate()
......
......@@ -120,6 +120,8 @@ void WMIsosurfaceRaytracer::properties()
WPropertyHelper::PC_SELECTONLYONE::addTo( m_shadingAlgo );
WPropertyHelper::PC_NOTEMPTY::addTo( m_shadingAlgo );
WModule::properties();
}
void WMIsosurfaceRaytracer::moduleMain()
......
......@@ -82,6 +82,8 @@ void WMJoinTreeTester::properties()
m_dbl = m_properties->addProperty( "Iso", "", 0.0 );
m_dbl->setMin( -1000000 );
m_dbl->setMax( 1000000 );
WModule::properties();
}
void WMJoinTreeTester::moduleMain()
......
......@@ -102,6 +102,7 @@ void WMLIC::connectors()
void WMLIC::properties()
{
WModule::properties();
}
void WMLIC::renderMesh( boost::shared_ptr< WTriangleMesh2 > mesh )
......
......@@ -90,6 +90,8 @@ void WMLineGuidedSlice::properties()
m_pos = m_properties->addProperty( "Slice Position", "Position of ths slice along the line.", 0., true );
m_pos->setMin( 0. );
m_pos->setMax( 1. );
WModule::properties();
}
void WMLineGuidedSlice::moduleMain()
......
......@@ -225,6 +225,8 @@ void WMMarchingCubes::properties()
m_saveTriggerProp->getCondition()->subscribeSignal( boost::bind( &WMMarchingCubes::save, this ) );
m_meshFile = m_savePropGroup->addProperty( "Mesh File", "", WPathHelper::getAppPath() );
WModule::properties();
}
void WMMarchingCubes::generateSurfacePre( double isoValue )
......
......@@ -90,6 +90,8 @@ void WMMeshReader::properties()
m_readTriggerProp = m_properties->addProperty( "Do read", "Press!",
WPVBaseTypes::PV_TRIGGER_READY, m_propCondition );
WPropertyHelper::PC_PATHEXISTS::addTo( m_meshFile );
WModule::properties();
}
void WMMeshReader::moduleMain()
......
......@@ -133,6 +133,8 @@ void WMPaintTexture::properties()
WPVBaseTypes::PV_TRIGGER_READY, m_propCondition );
m_buttonCreateRoi = m_properties->addProperty( "Create ROI", "Create a ROI from the currently selected paint value",
WPVBaseTypes::PV_TRIGGER_READY, m_propCondition );
WModule::properties();
}
void WMPaintTexture::propertyChanged( boost::shared_ptr< WPropertyBase > property )
......
......@@ -75,6 +75,7 @@ void WMProbTractDisplay::connectors()
void WMProbTractDisplay::properties()
{
WModule::properties();
}
void WMProbTractDisplay::moduleMain()
......
......@@ -98,6 +98,8 @@ void WMScalarSegmentation::properties()
m_threshold = m_propGroups[ 0 ]->addProperty( "Threshold", "Threshold value for segmentation.", 0.8, m_propCondition );
m_threshold->setMax( 255.0 );
m_threshold->setMin( 0.0 );
WModule::properties();
}
void WMScalarSegmentation::moduleMain()
......
......@@ -190,6 +190,8 @@ void WMSplineSurface::properties()
m_saveTriggerProp->getCondition()->subscribeSignal( boost::bind( &WMSplineSurface::save, this ) );
m_meshFile = m_savePropGroup->addProperty( "Mesh file", "", WPathHelper::getAppPath() );
WModule::properties();
}
void WMSplineSurface::renderMesh()
......
......@@ -130,6 +130,8 @@ void WMSurfaceParameterAnimator::properties()
m_speed2 = m_properties->addProperty( "Beam2 speed", "The relative speed of the beam. This speed relates to the clock used.", 25 );
m_parameterScale = m_properties->addProperty( "Parameter scale", "Scaling the parameter space on the fly creates consistently sized and fast "
"beams over multiple WMSurfaceParameterAnimator instances.", 1.0 );
WModule::properties();
}
osg::ref_ptr< osg::Node > WMSurfaceParameterAnimator::renderSurface( std::pair< wmath::WPosition, wmath::WPosition > bbox )
......
......@@ -182,6 +182,8 @@ void WMTeemGlyphs::properties()
m_usePolarPlotProp = m_properties->addProperty( "Use polar plot", "Use polar plot for glyph instead of HOME?", true, m_recompute );
m_useNormalizationProp = m_properties->addProperty( "Radius normalization", "Scale the radius of each glyph to be in [0,1].", true, m_recompute );
WModule::properties();
}
void WMTeemGlyphs::moduleMain()
......
......@@ -327,6 +327,8 @@ void WMTemplate::properties()
m_aColorOutput = m_infoProperties->addProperty( "A color", "Some Color. Nice isn't it?", WColor( 0.5, 0.5, 1.0, 1.0 ) );
m_aFilenameOutput = m_infoProperties->addProperty( "Nice file", "a Double. Nice isn't it?", WPathHelper::getAppPath() );
m_aSelectionOutput = m_infoProperties->addProperty( "A selection", "Selection As String", m_possibleSelections->getSelectorFirst() );
WModule::properties();
}
void WMTemplate::moduleMain()
......
......@@ -97,6 +97,8 @@ void WMTriangleMeshRenderer::properties()
m_opacityProp = m_properties->addProperty( "Opacity %", "Opaqueness of surface.", 100 );
m_opacityProp->setMin( 0 );
m_opacityProp->setMax( 100 );
WModule::properties();
}
/**
......
......@@ -114,6 +114,8 @@ void WMVectorPlot::properties()
m_ySlice->setMax( 200 );
m_zSlice->setMin( 0 );
m_zSlice->setMax( 160 );
WModule::properties();
}
void WMVectorPlot::moduleMain()
......
......@@ -168,6 +168,8 @@ void WMVoxelizer::properties()
m_fiberTransparency->setMin( 0.0 );
m_fiberTransparency->setMax( 1.0 );
m_explicitFiberColor = m_properties->addProperty( "Explicit Fiber Color", "", WColor( 0.2, 0.2, 0.2 ), m_fullUpdate );
WModule::properties();
}
void WMVoxelizer::activate()
......
......@@ -137,6 +137,8 @@ void WMWriteNIfTI::properties()
m_saveTriggerProp = m_properties->addProperty( "Do save", "Press!",
WPVBaseTypes::PV_TRIGGER_READY );
m_saveTriggerProp->getCondition()->subscribeSignal( boost::bind( &WMWriteNIfTI::writeToFile, this ) );
WModule::properties();
}
template< typename T > void WMWriteNIfTI::castData( void*& returnData )
......
......@@ -81,6 +81,8 @@ void WMWriteTracts::properties()
{
m_savePath = m_properties->addProperty( "Save Path", "Where to save the result", boost::filesystem::path( "/no/such/file" ) );
WPropertyHelper::PC_NOTEMPTY::addTo( m_savePath );
WModule::properties();
}
void WMWriteTracts::moduleMain()
......
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