Commit 4e2d2561 authored by Viktor Leonhardt's avatar Viktor Leonhardt

replaced QWeb to QWebEngine & adjusted function calls from QWebFrame to QWebEnginePage

parent 29eacb9a
......@@ -133,7 +133,7 @@ void WFlagForwarder< T >::forward( boost::shared_ptr< WFlag< T > > to )
to->set( m_source->get() );
// NOTE: we do not need to store the signals2::connection here as the destructor disconnects ALL slots
signal_forward.connect( boost::bind( &WFlag< T >::set, to.get(), _1, false ) );
signal_forward.connect( boost::bind( &WFlag< T >::set, to.get(), boost::placeholders::_1, false ) );
}
template < typename T >
......
......@@ -203,7 +203,7 @@ void WPropertyGroupBase::addArbitraryProperty( WPropertyBase::SPtr prop )
// check uniqueness:
if( std::count_if( l->get().begin(), l->get().end(),
boost::bind( boost::mem_fn( &WPropertyGroupBase::propNamePredicate ), this, prop, _1 ) ) )
boost::bind( boost::mem_fn( &WPropertyGroupBase::propNamePredicate ), this, prop, boost::placeholders::_1 ) ) )
{
// unlock explicitly
l.reset();
......
......@@ -284,7 +284,7 @@ WThreadedFunction< Function_T >::WThreadedFunction( std::size_t numThreads, boos
{
boost::shared_ptr< WWorkerThread< Function_T > > t( new WWorkerThread< Function_T >( m_func, k, m_numThreads ) );
t->subscribeStopSignal( boost::bind( &WThreadedFunction::handleThreadDone, this ) );
t->subscribeExceptionSignal( boost::bind( &WThreadedFunction::handleThreadException, this, _1 ) );
t->subscribeExceptionSignal( boost::bind( &WThreadedFunction::handleThreadException, this, boost::placeholders::_1 ) );
m_threads.push_back( t );
}
}
......
......@@ -243,7 +243,7 @@ public:
{
boost::shared_ptr< ExceptionalFuncType > func( new ExceptionalFuncType );
WThreadedFunction< ExceptionalFuncType > f( 7, func );
f.subscribeExceptionSignal( boost::bind( &WThreadedFunctionTest::handleException, this, _1 ) );
f.subscribeExceptionSignal( boost::bind( &WThreadedFunctionTest::handleException, this, boost::placeholders::_1 ) );
m_exceptionCounter.getWriteTicket()->get() = 0;
......
......@@ -228,7 +228,7 @@ public:
boost::shared_ptr< ExceptionalFuncType > func( new ExceptionalFuncType );
WWorkerThread< ExceptionalFuncType > w( func, 0, 1 );
w.subscribeExceptionSignal( boost::bind( &WWorkerThreadTest::handleException, this, _1 ) );
w.subscribeExceptionSignal( boost::bind( &WWorkerThreadTest::handleException, this, boost::placeholders::_1 ) );
w.run();
w.wait();
......
......@@ -72,18 +72,18 @@ public:
boost::shared_ptr< WDataSetSingle > ds = buildTestData();
TS_ASSERT_THROWS( TPVO t( boost::shared_ptr< WDataSetSingle >(),
boost::bind( &WThreadedPerVoxelOperationTest::func, this, _1 ) ), const WException& );
boost::bind( &WThreadedPerVoxelOperationTest::func, this, boost::placeholders::_1 ) ), const WException& );
TS_ASSERT_THROWS( TPVO t( ds, TPVO::FunctionType() ), const WException& );
TS_ASSERT_THROWS( TPVO t( boost::shared_ptr< WDataSetSingle >( new WDataSetSingle( ds->getValueSet(),
boost::shared_ptr< WGrid >() ) ),
boost::bind( &WThreadedPerVoxelOperationTest::func, this, _1 ) ), const WException& );
boost::bind( &WThreadedPerVoxelOperationTest::func, this, boost::placeholders::_1 ) ), const WException& );
TS_ASSERT_THROWS( TPVO t( boost::shared_ptr< WDataSetSingle >( new WDataSetSingle( boost::shared_ptr< WValueSetBase >(),
ds->getGrid() ) ),
boost::bind( &WThreadedPerVoxelOperationTest::func, this, _1 ) ), const WException& );
boost::bind( &WThreadedPerVoxelOperationTest::func, this, boost::placeholders::_1 ) ), const WException& );
TS_ASSERT_THROWS_NOTHING( TPVO t( ds, boost::bind( &WThreadedPerVoxelOperationTest::func, this, _1 ) ) );
TS_ASSERT_THROWS_NOTHING( TPVO t( ds, boost::bind( &WThreadedPerVoxelOperationTest::func, this, boost::placeholders::_1 ) ) );
TPVO t( ds, boost::bind( &WThreadedPerVoxelOperationTest::func, this, _1 ) );
TPVO t( ds, boost::bind( &WThreadedPerVoxelOperationTest::func, this, boost::placeholders::_1 ) );
TS_ASSERT_EQUALS( ds->getGrid(), t.m_grid );
}
......@@ -94,14 +94,14 @@ public:
void testMultithreadedFunction()
{
boost::shared_ptr< WDataSetSingle > ds = buildTestData();
boost::shared_ptr< TPVO > t( new TPVO( ds, boost::bind( &WThreadedPerVoxelOperationTest::func, this, _1 ) ) );
boost::shared_ptr< TPVO > t( new TPVO( ds, boost::bind( &WThreadedPerVoxelOperationTest::func, this, boost::placeholders::_1 ) ) );
m_exception = false;
m_threadsDone = false;
WThreadedFunction< TPVO > f( 5, t );
f.getThreadsDoneCondition()->subscribeSignal( boost::bind( &WThreadedPerVoxelOperationTest::handleThreadsDone, this ) );
f.subscribeExceptionSignal( boost::bind( &WThreadedPerVoxelOperationTest::handleException, this, _1 ) );
f.subscribeExceptionSignal( boost::bind( &WThreadedPerVoxelOperationTest::handleException, this, boost::placeholders::_1 ) );
TS_ASSERT_THROWS_NOTHING( f.run() );
TS_ASSERT_THROWS_NOTHING( f.wait() );
......
......@@ -179,7 +179,7 @@ public:
WVector3d v = j.first;
TS_ASSERT( wtracking::WTrackingUtility::followToNextVoxel( ds, j, boost::bind( &This::simpleDirFunc, this, _1, _2 ) ) );
TS_ASSERT( wtracking::WTrackingUtility::followToNextVoxel( ds, j, boost::bind( &This::simpleDirFunc, this, boost::placeholders::_1, boost::placeholders::_2 ) ) );
TS_ASSERT( !wtracking::WTrackingUtility::onBoundary( g, j.first ) );
TS_ASSERT( g->encloses( j.first ) );
v += x * 0.8;
......@@ -500,10 +500,10 @@ public:
TS_ASSERT_THROWS_NOTHING(
wtracking::WThreadedTrackingFunction w( ds,
boost::bind( &This::dirFunc, this, _1, _2, WVector3d( 1.0, 0.0, 0.0 ) ),
boost::bind( &wtracking::WTrackingUtility::followToNextVoxel, _1, _2, _3 ),
boost::bind( &This::fibVis, this, _1 ),
boost::bind( &This::pntVis, this, _1 ) ) );
boost::bind( &This::dirFunc, this, boost::placeholders::_1, boost::placeholders::_2, WVector3d( 1.0, 0.0, 0.0 ) ),
boost::bind( &wtracking::WTrackingUtility::followToNextVoxel, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3 ),
boost::bind( &This::fibVis, this, boost::placeholders::_1 ),
boost::bind( &This::pntVis, this, boost::placeholders::_1 ) ) );
}
/**
......@@ -515,10 +515,10 @@ public:
boost::shared_ptr< WGridRegular3D > g = boost::dynamic_pointer_cast< WGridRegular3D >( ds->getGrid() );
TS_ASSERT( g );
wtracking::WThreadedTrackingFunction w( ds, boost::bind( &This::dirFunc, this, _1, _2, WVector3d( 1.0, 0.0, 0.0 ) ),
boost::bind( &wtracking::WTrackingUtility::followToNextVoxel, _1, _2, _3 ),
boost::bind( &This::fibVis, this, _1 ),
boost::bind( &This::pntVis, this, _1 ) );
wtracking::WThreadedTrackingFunction w( ds, boost::bind( &This::dirFunc, this, boost::placeholders::_1, boost::placeholders::_2, WVector3d( 1.0, 0.0, 0.0 ) ),
boost::bind( &wtracking::WTrackingUtility::followToNextVoxel, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3 ),
boost::bind( &This::fibVis, this, boost::placeholders::_1 ),
boost::bind( &This::pntVis, this, boost::placeholders::_1 ) );
wtracking::WThreadedTrackingFunction::JobType job;
for( int i = 0; i < 125; ++i )
{
......@@ -542,10 +542,10 @@ public:
boost::shared_ptr< WGridRegular3D > g = boost::dynamic_pointer_cast< WGridRegular3D >( ds->getGrid() );
TS_ASSERT( g );
{
wtracking::WThreadedTrackingFunction w( ds, boost::bind( &This::dirFunc, this, _1, _2, x ),
boost::bind( &wtracking::WTrackingUtility::followToNextVoxel, _1, _2, _3 ),
boost::bind( &This::fibVis, this, _1 ),
boost::bind( &This::pntVis, this, _1 ) );
wtracking::WThreadedTrackingFunction w( ds, boost::bind( &This::dirFunc, this, boost::placeholders::_1, boost::placeholders::_2, x ),
boost::bind( &wtracking::WTrackingUtility::followToNextVoxel, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3 ),
boost::bind( &This::fibVis, this, boost::placeholders::_1 ),
boost::bind( &This::pntVis, this, boost::placeholders::_1 ) );
wtracking::WThreadedTrackingFunction::JobType job;
m_points.getWriteTicket()->get() = 0;
w.getJob( job );
......@@ -553,10 +553,10 @@ public:
TS_ASSERT_EQUALS( m_points.getReadTicket()->get(), 7 );
}
{
wtracking::WThreadedTrackingFunction w( ds, boost::bind( &This::dirFunc, this, _1, _2, y ),
boost::bind( &wtracking::WTrackingUtility::followToNextVoxel, _1, _2, _3 ),
boost::bind( &This::fibVis, this, _1 ),
boost::bind( &This::pntVis, this, _1 ) );
wtracking::WThreadedTrackingFunction w( ds, boost::bind( &This::dirFunc, this, boost::placeholders::_1, boost::placeholders::_2, y ),
boost::bind( &wtracking::WTrackingUtility::followToNextVoxel, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3 ),
boost::bind( &This::fibVis, this, boost::placeholders::_1 ),
boost::bind( &This::pntVis, this, boost::placeholders::_1 ) );
wtracking::WThreadedTrackingFunction::JobType job;
m_points.getWriteTicket()->get() = 0;
w.getJob( job );
......
......@@ -166,7 +166,7 @@ void WGEColormapping::applyInst( NodeList nodes, WMatrix4d preTransform, osg::re
info->m_preTransform = preTransform;
m_nodeInfo.insert( std::make_pair( *i, info ) );
( *i )->addUpdateCallback( new WGEFunctorCallback< osg::Node >( boost::bind( &WGEColormapping::callback, this, _1 ) ) );
( *i )->addUpdateCallback( new WGEFunctorCallback< osg::Node >( boost::bind( &WGEColormapping::callback, this, boost::placeholders::_1 ) ) );
// add the default shader if no other shader has been specified.
s->apply( *i );
......
......@@ -575,7 +575,7 @@ void WGETexture< TextureType >::setupProperties( double scale, double min )
TextureType::setResizeNonPowerOfTwoHint( false );
TextureType::setUpdateCallback( new WGEFunctorCallback< osg::StateAttribute >(
boost::bind( &WGETexture< TextureType >::updateCallback, this, _1 ) )
boost::bind( &WGETexture< TextureType >::updateCallback, this, boost::placeholders::_1 ) )
);
// init filters
......
......@@ -157,7 +157,7 @@ void WGETextureHud::removeTexture( osg::ref_ptr< osg::Texture > texture )
m_group->remove_if(
boost::shared_ptr< WGEGroupNode::NodePredicate >(
new TexCheck( boost::bind( &hudEntryPredicate, texture, _1 ) )
new TexCheck( boost::bind( &hudEntryPredicate, texture, boost::placeholders::_1 ) )
)
);
}
......
......@@ -51,9 +51,9 @@ WROIBox::WROIBox( WPosition minPos, WPosition maxPos ) :
{
m_propGrp = m_properties->addPropertyGroup( "ROI Box", "Properties of this ROI Box" );
m_minPos = m_propGrp->addProperty( "Min Position", "When a box is described by its diagonal, this is the lower, left, front corner of it.",
minPos, boost::bind( &WROIBox::boxPropertiesChanged, this, _1 ) );
minPos, boost::bind( &WROIBox::boxPropertiesChanged, this, boost::placeholders::_1 ) );
m_maxPos = m_propGrp->addProperty( "Max Position", "When a box is described by its diagonal, this is the upper, right, back corner of it.",
maxPos, boost::bind( &WROIBox::boxPropertiesChanged, this, _1 ) );
maxPos, boost::bind( &WROIBox::boxPropertiesChanged, this, boost::placeholders::_1 ) );
boost::shared_ptr< WGraphicsEngine > ge = WGraphicsEngine::getGraphicsEngine();
assert( ge );
......@@ -61,7 +61,7 @@ WROIBox::WROIBox( WPosition minPos, WPosition maxPos ) :
assert( viewer );
m_viewer = viewer;
m_pickHandler = m_viewer->getPickHandler();
m_pickHandler->getPickSignal()->connect( boost::bind( &WROIBox::registerRedrawRequest, this, _1 ) );
m_pickHandler->getPickSignal()->connect( boost::bind( &WROIBox::registerRedrawRequest, this, boost::placeholders::_1 ) );
std::stringstream ss;
ss << "ROIBox" << boxId;
......
......@@ -60,7 +60,7 @@ WROISphere::WROISphere( WPosition position, float radius ) :
assert( viewer );
m_viewer = viewer;
m_pickHandler = m_viewer->getPickHandler();
m_pickHandler->getPickSignal()->connect( boost::bind( &WROISphere::registerRedrawRequest, this, _1 ) );
m_pickHandler->getPickSignal()->connect( boost::bind( &WROISphere::registerRedrawRequest, this, boost::placeholders::_1 ) );
redrawSphere();
//**********************************************************
......
......@@ -114,7 +114,7 @@ WGEGridNode::WGEGridNode( WGridRegular3D::ConstSPtr grid ):
m_boundaryGeode->getOrCreateStateSet()->setAttributeAndModes( new osg::LineWidth( m_boxLineWidth ), osg::StateAttribute::ON );
m_innerGridGeode->getOrCreateStateSet()->setAttributeAndModes( new osg::LineWidth( m_gridLineWidth ), osg::StateAttribute::ON );
addUpdateCallback( new WGEFunctorCallback< osg::Node >( boost::bind( &WGEGridNode::callback, this, _1 ) ) );
addUpdateCallback( new WGEFunctorCallback< osg::Node >( boost::bind( &WGEGridNode::callback, this, boost::placeholders::_1 ) ) );
// no blending
getOrCreateStateSet()->setMode( GL_BLEND, osg::StateAttribute::OFF );
......
......@@ -50,18 +50,18 @@ WFiberSelector::WFiberSelector( boost::shared_ptr< const WDataSetFibers > fibers
m_assocRoiSignal =
boost::shared_ptr< boost::function< void( osg::ref_ptr< WROI > ) > >(
new boost::function< void( osg::ref_ptr< WROI > ) > ( boost::bind( &WFiberSelector::slotAddRoi, this, _1 ) ) );
new boost::function< void( osg::ref_ptr< WROI > ) > ( boost::bind( &WFiberSelector::slotAddRoi, this, boost::placeholders::_1 ) ) );
WKernel::getRunningKernel()->getRoiManager()->addAddNotifier( m_assocRoiSignal );
m_removeRoiSignal =
boost::shared_ptr< boost::function< void( osg::ref_ptr< WROI > ) > >(
new boost::function< void( osg::ref_ptr< WROI > ) > ( boost::bind( &WFiberSelector::slotRemoveRoi, this, _1 ) ) );
new boost::function< void( osg::ref_ptr< WROI > ) > ( boost::bind( &WFiberSelector::slotRemoveRoi, this, boost::placeholders::_1 ) ) );
WKernel::getRunningKernel()->getRoiManager()->addRemoveNotifier( m_removeRoiSignal );
m_removeBranchSignal =
boost::shared_ptr< boost::function< void( boost::shared_ptr< WRMBranch > ) > >(
new boost::function< void( boost::shared_ptr< WRMBranch > ) > (
boost::bind( &WFiberSelector::slotRemoveBranch, this, _1 ) ) );
boost::bind( &WFiberSelector::slotRemoveBranch, this, boost::placeholders::_1 ) ) );
WKernel::getRunningKernel()->getRoiManager()->addRemoveBranchNotifier( m_removeBranchSignal );
for( size_t i = 0; i < rois.size(); ++i )
......
......@@ -414,11 +414,11 @@ const t_GenericSignalHandlerType WModule::getSignalHandler( MODULE_CONNECTOR_SIG
switch( signal )
{
case CONNECTION_ESTABLISHED:
return boost::bind( &WModule::notifyConnectionEstablished, this, _1, _2 );
return boost::bind( &WModule::notifyConnectionEstablished, this, boost::placeholders::_1, boost::placeholders::_2 );
case CONNECTION_CLOSED:
return boost::bind( &WModule::notifyConnectionClosed, this, _1, _2 );
return boost::bind( &WModule::notifyConnectionClosed, this, boost::placeholders::_1, boost::placeholders::_2 );
case DATA_CHANGED:
return boost::bind( &WModule::notifyDataChange, this, _1, _2 );
return boost::bind( &WModule::notifyDataChange, this, boost::placeholders::_1, boost::placeholders::_2 );
default:
std::ostringstream s;
s << "Could not subscribe to unknown signal. You need to implement this signal type explicitly in your module.";
......
......@@ -64,8 +64,8 @@ WModuleConnector::WModuleConnector( boost::shared_ptr< WModule > module, std::st
// connect standard signals
// NOTE: these signals are NOT emitted by the connector this one is connected to, since a module can't send a "connection
// closed" message if the connection is closed.
subscribeSignal( CONNECTION_ESTABLISHED, boost::bind( &WModuleConnector::notifyConnectionEstablished, this, _1, _2 ) );
subscribeSignal( CONNECTION_CLOSED, boost::bind( &WModuleConnector::notifyConnectionClosed, this, _1, _2 ) );
subscribeSignal( CONNECTION_ESTABLISHED, boost::bind( &WModuleConnector::notifyConnectionEstablished, this, boost::placeholders::_1, boost::placeholders::_2 ) );
subscribeSignal( CONNECTION_CLOSED, boost::bind( &WModuleConnector::notifyConnectionClosed, this, boost::placeholders::_1, boost::placeholders::_2 ) );
signal_ConnectionEstablished.connect( getSignalHandler( CONNECTION_ESTABLISHED ) );
signal_ConnectionClosed.connect( getSignalHandler( CONNECTION_CLOSED ) );
......
......@@ -122,7 +122,7 @@ void WModuleContainer::add( boost::shared_ptr< WModule > module, bool run )
ModuleSubscriptionsSharedType::WriteTicket subscriptionsLock = m_moduleSubscriptions.getWriteTicket();
// connect the containers signal handler explicitly
t_ModuleErrorSignalHandlerType func = boost::bind( &WModuleContainer::moduleError, this, _1, _2 );
t_ModuleErrorSignalHandlerType func = boost::bind( &WModuleContainer::moduleError, this, boost::placeholders::_1, boost::placeholders::_2 );
boost::signals2::connection signalCon = module->subscribeSignal( WM_ERROR, func );
subscriptionsLock->get().insert( ModuleSubscription( module, signalCon ) );
......
......@@ -78,7 +78,7 @@ void WModuleInputConnector::connectSignals( boost::shared_ptr<WModuleConnector>
// connector does not set this information.
// NOTE: con will be a WModuleOutputConnector
m_DataChangedConnection = con->subscribeSignal( DATA_CHANGED,
boost::bind( &WModuleInputConnector::notifyDataChange, this, _1, _2 )
boost::bind( &WModuleInputConnector::notifyDataChange, this, boost::placeholders::_1, boost::placeholders::_2 )
);
}
......
......@@ -107,8 +107,8 @@ public:
m_in = boost::shared_ptr< WModuleInputData< T > >( new WModuleInputData< T >( module, "[FWD]" + name, description ) );
// subscribe both signals
m_in->subscribeSignal( CONNECTION_ESTABLISHED, boost::bind( &WModuleOutputForwardData::inputNotifyDataChange, this, _1, _2 ) );
m_in->subscribeSignal( DATA_CHANGED, boost::bind( &WModuleOutputForwardData::inputNotifyDataChange, this, _1, _2 ) );
m_in->subscribeSignal( CONNECTION_ESTABLISHED, boost::bind( &WModuleOutputForwardData::inputNotifyDataChange, this, boost::placeholders::_1, boost::placeholders::_2 ) );
m_in->subscribeSignal( DATA_CHANGED, boost::bind( &WModuleOutputForwardData::inputNotifyDataChange, this, boost::placeholders::_1, boost::placeholders::_2 ) );
};
/**
......
......@@ -469,7 +469,7 @@ boost::shared_ptr< WModule > WModuleProjectFileCombiner::mapToModule( unsigned i
unsigned int WModuleProjectFileCombiner::mapFromModule( boost::shared_ptr< WModule > module ) const
{
ModuleIDMap::const_iterator it = std::find_if( m_modules.begin(), m_modules.end(),
boost::bind( &ModuleIDMap::value_type::second, _1 ) == module
boost::bind( &ModuleIDMap::value_type::second, boost::placeholders::_1 ) == module
);
if( it == m_modules.end() )
{
......
......@@ -186,9 +186,9 @@ void WMCalculateGFA::resetGFAPool()
resetProgress( g->getNbCoordsX() * g->getNbCoordsY() * g->getNbCoordsZ() );
// create a new one
m_gfaFunc = boost::shared_ptr< GFAFuncType >( new GFAFuncType( m_dataSet, boost::bind( &This::perVoxelGFAFunc, this, _1 ) ) );
m_gfaFunc = boost::shared_ptr< GFAFuncType >( new GFAFuncType( m_dataSet, boost::bind( &This::perVoxelGFAFunc, this, boost::placeholders::_1 ) ) );
m_gfaPool = boost::shared_ptr< GFAPoolType >( new GFAPoolType( 0, m_gfaFunc ) );
m_gfaPool->subscribeExceptionSignal( boost::bind( &This::handleException, this, _1 ) );
m_gfaPool->subscribeExceptionSignal( boost::bind( &This::handleException, this, boost::placeholders::_1 ) );
m_moduleState.add( m_gfaPool->getThreadsDoneCondition() );
}
......
......@@ -182,9 +182,9 @@ void WMCalculateTensors::resetTensorPool()
resetProgress( g->getNbCoordsX() * g->getNbCoordsY() * g->getNbCoordsZ() );
// create a new one
m_tensorFunc = boost::shared_ptr< TensorFuncType >( new TensorFuncType( m_dataSet, boost::bind( &This::perVoxelTensorFunc, this, _1 ) ) );
m_tensorFunc = boost::shared_ptr< TensorFuncType >( new TensorFuncType( m_dataSet, boost::bind( &This::perVoxelTensorFunc, this, boost::placeholders::_1 ) ) );
m_tensorPool = boost::shared_ptr< TensorPoolType >( new TensorPoolType( 0, m_tensorFunc ) );
m_tensorPool->subscribeExceptionSignal( boost::bind( &This::handleException, this, _1 ) );
m_tensorPool->subscribeExceptionSignal( boost::bind( &This::handleException, this, boost::placeholders::_1 ) );
m_moduleState.add( m_tensorPool->getThreadsDoneCondition() );
}
else
......
......@@ -388,7 +388,7 @@ void WMClusterDisplay::properties()
void WMClusterDisplay::moduleMain()
{
osg::ref_ptr< MainViewEventHandler > eh( new MainViewEventHandler );
eh->subscribeLeftButtonPush( boost::bind( &WMClusterDisplay::dendrogramClick, this, _1 ) );
eh->subscribeLeftButtonPush( boost::bind( &WMClusterDisplay::dendrogramClick, this, boost::placeholders::_1 ) );
WKernel::getRunningKernel()->getGraphicsEngine()->getViewer()->getView()->addEventHandler( eh );
......
......@@ -260,7 +260,7 @@ void WMClusterDisplayVoxels::setPropertyBoundaries()
void WMClusterDisplayVoxels::moduleMain()
{
boost::signals2::connection con = WKernel::getRunningKernel()->getGraphicsEngine()->getViewer()->getPickHandler()->getPickSignal()->
connect( boost::bind( &WMClusterDisplayVoxels::dendrogramClick, this, _1 ) );
connect( boost::bind( &WMClusterDisplayVoxels::dendrogramClick, this, boost::placeholders::_1 ) );
m_moduleState.setResetable( true, true );
......
......@@ -237,7 +237,7 @@ void WMColormapper::moduleMain()
osg::Vec3( 0.025 + 2.0 * borderWidth, 0.0, -0.1 ),
osg::Vec3( 0.0, 0.8 + 2.0 * borderWidth, -0.1 ) );
colorBarBorder->getDrawable( 0 )->setUpdateCallback( new WGEFunctorCallback< osg::Drawable >(
boost::bind( &WMColormapper::updateColorbarBorder, this, _1 ) )
boost::bind( &WMColormapper::updateColorbarBorder, this, boost::placeholders::_1 ) )
);
m_colorBar->getOrCreateStateSet()->addUniform( new WGEPropertyUniform< WPropSelection >( "u_colormap",
......@@ -252,7 +252,7 @@ void WMColormapper::moduleMain()
nameLabel->setLayout( osgText::TextBase::LEFT_TO_RIGHT );
nameLabel->setAlignment( osgText::Text::BASE_LINE );
nameLabel->setUpdateCallback( new WGEFunctorCallback< osg::Drawable >(
boost::bind( &WMColormapper::updateColorbarName, this, _1 ) )
boost::bind( &WMColormapper::updateColorbarName, this, boost::placeholders::_1 ) )
);
// the bar and the labels need to be added in an identity modelview matrix node
......@@ -266,7 +266,7 @@ void WMColormapper::moduleMain()
labels->addDrawable( nameLabel );
m_scaleLabels = new osg::Geode();
m_scaleLabels->addUpdateCallback( new WGEFunctorCallback< osg::Node >(
boost::bind( &WMColormapper::updateColorbarScale, this, _1 )
boost::bind( &WMColormapper::updateColorbarScale, this, boost::placeholders::_1 )
) );
// we need to adapt the labels to the window level
......
......@@ -149,7 +149,7 @@ void WMData::properties()
WPropertyHelper::PC_SELECTONLYONE::addTo( m_matrixSelection );
// use this callback for the other properties
WPropertyBase::PropertyChangeNotifierType propertyCallback = boost::bind( &WMData::propertyChanged, this, _1 );
WPropertyBase::PropertyChangeNotifierType propertyCallback = boost::bind( &WMData::propertyChanged, this, boost::placeholders::_1 );
}
void WMData::propertyChanged( boost::shared_ptr< WPropertyBase > property )
......
......@@ -263,14 +263,14 @@ void WMDeterministicFTMori::resetEigenFunction()
if( m_dataSet->getValueSet()->getDataType() == W_DT_DOUBLE )
{
m_eigenOperationDouble = boost::shared_ptr< TPVODouble >( new TPVODouble( m_dataSet,
boost::bind( &WMDeterministicFTMori::eigenFuncDouble, this, _1 ) ) );
boost::bind( &WMDeterministicFTMori::eigenFuncDouble, this, boost::placeholders::_1 ) ) );
m_eigenPool = boost::shared_ptr< WThreadedFunctionBase >( new EigenFunctionTypeDouble( WM_MORI_NUM_CORES, m_eigenOperationDouble ) );
m_moduleState.add( m_eigenPool->getThreadsDoneCondition() );
}
else if( m_dataSet->getValueSet()->getDataType() == W_DT_FLOAT )
{
m_eigenOperationFloat = boost::shared_ptr< TPVOFloat >( new TPVOFloat( m_dataSet,
boost::bind( &WMDeterministicFTMori::eigenFuncFloat, this, _1 ) ) );
boost::bind( &WMDeterministicFTMori::eigenFuncFloat, this, boost::placeholders::_1 ) ) );
m_eigenPool = boost::shared_ptr< WThreadedFunctionBase >( new EigenFunctionTypeFloat( WM_MORI_NUM_CORES, m_eigenOperationFloat ) );
m_moduleState.add( m_eigenPool->getThreadsDoneCondition() );
}
......@@ -303,10 +303,10 @@ void WMDeterministicFTMori::resetTracking()
// create a new one
boost::shared_ptr< Tracking > t( new Tracking( m_eigenField,
boost::bind( &This::getEigenDirection, this, _1, _2 ),
boost::bind( &wtracking::WTrackingUtility::followToNextVoxel, _1, _2, _3 ),
boost::bind( &This::fiberVis, this, _1 ),
boost::bind( &This::pointVis, this, _1 ) ) );
boost::bind( &This::getEigenDirection, this, boost::placeholders::_1, boost::placeholders::_2 ),
boost::bind( &wtracking::WTrackingUtility::followToNextVoxel, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3 ),
boost::bind( &This::fiberVis, this, boost::placeholders::_1 ),
boost::bind( &This::pointVis, this, boost::placeholders::_1 ) ) );
m_trackingPool = boost::shared_ptr< TrackingFuncType >( new TrackingFuncType( WM_MORI_NUM_CORES, t ) );
m_moduleState.add( m_trackingPool->getThreadsDoneCondition() );
}
......
......@@ -155,7 +155,7 @@ void WMEffectiveConnectivityCluster::moduleMain()
// as this module needs the centerline / longest line -> subscribe to the output connector DATA_CHANGE signal
m_fiberSelection->getOutputConnector( "cluster" )->subscribeSignal( DATA_CHANGED,
boost::bind( &WMEffectiveConnectivityCluster::fiberDataChange, this, _1, _2 )
boost::bind( &WMEffectiveConnectivityCluster::fiberDataChange, this, boost::placeholders::_1, boost::placeholders::_2 )
);
//////////////////////////////////////////////////////////////////////
......
......@@ -334,11 +334,11 @@ void WMEigenSystem::resetEigenFunction( boost::shared_ptr< WDataSetDTI > tensors
{
if( m_strategySelector->get().at( 0 )->getName() == "LibEigen" )
{
m_eigenOperationDouble = boost::shared_ptr< TPVODouble >( new TPVODouble( tensors, boost::bind( &WMEigenSystem::eigenSolverDouble, this, _1 ) ) ); // NOLINT line length
m_eigenOperationDouble = boost::shared_ptr< TPVODouble >( new TPVODouble( tensors, boost::bind( &WMEigenSystem::eigenSolverDouble, this, boost::placeholders::_1 ) ) ); // NOLINT line length
}
else if( m_strategySelector->get().at( 0 )->getName() == "Jacobi" )
{
m_eigenOperationDouble = boost::shared_ptr< TPVODouble >( new TPVODouble( tensors, boost::bind( &WMEigenSystem::eigenFuncDouble, this, _1 ) ) ); // NOLINT line length
m_eigenOperationDouble = boost::shared_ptr< TPVODouble >( new TPVODouble( tensors, boost::bind( &WMEigenSystem::eigenFuncDouble, this, boost::placeholders::_1 ) ) ); // NOLINT line length
}
else
{
......@@ -351,11 +351,11 @@ void WMEigenSystem::resetEigenFunction( boost::shared_ptr< WDataSetDTI > tensors
{
if( m_strategySelector->get().at( 0 )->getName() == "LibEigen" )
{
m_eigenOperationFloat = boost::shared_ptr< TPVOFloat >( new TPVOFloat( tensors, boost::bind( &WMEigenSystem::eigenSolverFloat, this, _1 ) ) ); // NOLINT line length
m_eigenOperationFloat = boost::shared_ptr< TPVOFloat >( new TPVOFloat( tensors, boost::bind( &WMEigenSystem::eigenSolverFloat, this, boost::placeholders::_1 ) ) ); // NOLINT line length
}
else if( m_strategySelector->get().at( 0 )->getName() == "Jacobi" )
{
m_eigenOperationFloat = boost::shared_ptr< TPVOFloat >( new TPVOFloat( tensors, boost::bind( &WMEigenSystem::eigenFuncFloat, this, _1 ) ) ); // NOLINT line length
m_eigenOperationFloat = boost::shared_ptr< TPVOFloat >( new TPVOFloat( tensors, boost::bind( &WMEigenSystem::eigenFuncFloat, this, boost::placeholders::_1 ) ) ); // NOLINT line length
}
else
{
......
......@@ -416,7 +416,7 @@ void WMFiberDisplay::moduleMain()
// for line smoothing and width features
geode->getOrCreateStateSet()->setUpdateCallback( new WGEFunctorCallback< osg::StateSet >(
boost::bind( &WMFiberDisplay::lineGeodeStateCallback, this, _1 ) )
boost::bind( &WMFiberDisplay::lineGeodeStateCallback, this, boost::placeholders::_1 ) )
);
// Add geometry
......@@ -480,7 +480,7 @@ osg::ref_ptr< osg::Node > WMFiberDisplay::createClipPlane() const
planeTransform->addUpdateCallback( new WGENodeMaskCallback( m_clipPlaneShowPlane ) );
// add a callback which actually moves, scales and rotates the plane according to the plane parameter
planeTransform->addUpdateCallback( new WGEFunctorCallback< osg::Node >(
boost::bind( &WMFiberDisplay::clipPlaneCallback, this, _1 ) )
boost::bind( &WMFiberDisplay::clipPlaneCallback, this, boost::placeholders::_1 ) )
);
// add the geode to the root and provide an callback
......@@ -735,7 +735,7 @@ void WMFiberDisplay::createFiberGeode( boost::shared_ptr< WDataSetFibers > fiber
}
// add an update callback which later handles several things like the filter attribute array
geometry->setUpdateCallback( new WGEFunctorCallback< osg::Drawable >( boost::bind( &WMFiberDisplay::geometryUpdate, this, _1 ) ) );
geometry->setUpdateCallback( new WGEFunctorCallback< osg::Drawable >( boost::bind( &WMFiberDisplay::geometryUpdate, this, boost::placeholders::_1 ) ) );
// set drawable
fibGeode->addDrawable( geometry );
......
......@@ -207,7 +207,7 @@ void WMGridRenderer::connectors()
void WMGridRenderer::properties()
{
WPropertyBase::PropertyChangeNotifierType notifier = boost::bind( &WMGridRenderer::updateNode, this, _1 );
WPropertyBase::PropertyChangeNotifierType notifier = boost::bind( &WMGridRenderer::updateNode, this, boost::placeholders::_1 );
m_bboxColor = m_properties->addProperty( "Bounding box color", "The color of the bounding box.", WColor( 0.3, 0.3, 0.3, 1.0 ), notifier );
m_boxLineWidth = m_properties->addProperty( "Bounding box line width", "The width of the grid lines.", 4, notifier );
......
......@@ -852,12 +852,12 @@ void WMHierchClustDisplay::initTexture()
void WMHierchClustDisplay::moduleMain()
{
// DEPRECATED boost::signals2::connection con = WKernel::getRunningKernel()->getGraphicsEngine()->getViewer()->getPickHandler()->getPickSignal()->
// DEPRECATED connect( boost::bind( &WMHierchClustDisplay::dendrogramClick, this, _1 ) );
// DEPRECATED connect( boost::bind( &WMHierchClustDisplay::dendrogramClick, this, boost::placeholders::_1 ) );
osg::ref_ptr< MainViewEventHandler > eh( new MainViewEventHandler );
eh->subscribeLeftButtonPush( boost::bind( &WMHierchClustDisplay::dendrogramClick, this, _1 ) );
eh->subscribeLeftButtonPush( boost::bind( &WMHierchClustDisplay::dendrogramClick, this, boost::placeholders::_1 ) );
eh->subscribeRightButtonPush( boost::bind( &WMHierchClustDisplay::dendrogramClickRight, this, _1 ) );
eh->subscribeRightButtonPush( boost::bind( &WMHierchClustDisplay::dendrogramClickRight, this, boost::placeholders::_1 ) );
WKernel::getRunningKernel()->getGraphicsEngine()->getViewer()->getView()->addEventHandler( eh );
......
......@@ -180,8 +180,8 @@ void WMHistogramView::moduleMain()
getName() + string_utils::toString( m_instanceID ),
WGECamera::TWO_D, m_shutdownFlag.getValueChangeCondition() );
osg::ref_ptr< WUIViewEventHandler > eh = new WUIViewEventHandler( m_widget );
eh->subscribeMove( boost::bind( &WMHistogramView::handleMouseMove, this, _1 ) );
eh->subscribeResize( boost::bind( &WMHistogramView::handleResize, this, _1, _2, _3, _4 ) );
eh->subscribeMove( boost::bind( &WMHistogramView::handleMouseMove, this, boost::placeholders::_1 ) );
eh->subscribeResize( boost::bind( &WMHistogramView::handleResize, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4 ) );
m_widget->addEventHandler( eh );
m_widget->show();
......
......@@ -220,8 +220,8 @@ void WMMultiHistogramView::moduleMain()
getName() + string_utils::toString( m_instanceID ),
WGECamera::TWO_D, m_shutdownFlag.getValueChangeCondition() );
osg::ref_ptr< WUIViewEventHandler > eh = new WUIViewEventHandler( m_widget );
eh->subscribeMove( boost::bind( &WMMultiHistogramView::handleMouseMove, this, _1 ) );
eh->subscribeResize( boost::bind( &WMMultiHistogramView::handleResize, this, _1, _2, _3, _4 ) );
eh->subscribeMove( boost::bind( &WMMultiHistogramView::handleMouseMove, this, boost::placeholders::_1 ) );
eh->subscribeResize( boost::bind( &WMMultiHistogramView::handleResize, this, boost::placeholders::_1, boost::placeholders::_2, boost::placeholders::_3, boost::placeholders::_4 ) );
m_widget->addEventHandler( eh );
m_widget->show();
......