Commit 33db34ee authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[CHANGE] - added some dprecation markers

parent fdfe4bb0
......@@ -95,6 +95,7 @@ public:
* Returns the texture- representation of the dataset. May throw an exception if no texture is available.
*
* \return The texture.
* \deprecated
*/
virtual boost::shared_ptr< WDataTexture3D > getTexture();
......@@ -102,6 +103,7 @@ public:
* Returns the texture- representation of the dataset. May throw an exception if no texture is available.
*
* \return The texture.
* \deprecated
*/
virtual osg::ref_ptr< WDataTexture3D_2 > getTexture2() const;
......@@ -178,3 +180,4 @@ private:
};
#endif // WDATASET_H
......@@ -145,6 +145,7 @@ public:
* Returns the texture- representation of the dataset. May throw an exception if no texture is available.
*
* \return The texture.
* \deprecated
*/
virtual boost::shared_ptr< WDataTexture3D > getTexture();
......
......@@ -149,6 +149,7 @@ public:
*
* \param onlyActive true whenever only textures should be returned where isGloballyActive() == true.
* \return the list of textures.
* \deprecated
*/
std::vector< boost::shared_ptr< WDataTexture3D > > getDataTextures( bool onlyActive = false );
......
......@@ -398,7 +398,7 @@ void WMData::moduleMain()
if ( m_dataSet->isTexture() )
{
WGEColormapping::registerTexture( m_dataSet->getTexture2(), m_dataName->get() );
// m_properties->addProperty( m_dataSet->getTexture2()->getProperties() );
m_properties->addProperty( m_dataSet->getTexture2()->getProperties() );
m_infoProperties->addProperty( m_dataSet->getTexture2()->getInformationProperties() );
}
......@@ -472,7 +472,7 @@ void WMData::moduleMain()
// if ( m_dataSet->isTexture() )
{
WGEColormapping::registerTexture( m_dataSet->getTexture2(), m_dataName->get() );
// m_properties->addProperty( m_dataSet->getTexture2()->getProperties() );
m_properties->addProperty( m_dataSet->getTexture2()->getProperties() );
m_infoProperties->addProperty( m_dataSet->getTexture2()->getInformationProperties() );
}
......@@ -491,7 +491,7 @@ void WMData::moduleMain()
// }
if ( m_dataSet->isTexture() )
{
// m_properties->removeProperty( m_dataSet->getTexture2()->getProperties() );
m_properties->removeProperty( m_dataSet->getTexture2()->getProperties() );
m_infoProperties->removeProperty( m_dataSet->getTexture2()->getInformationProperties() );
WGEColormapping::deregisterTexture( m_dataSet->getTexture2() );
}
......
......@@ -297,6 +297,7 @@ void WMArbitraryPlane::updatePlane()
quad->push_back( 0 );
planeGeometry->addPrimitiveSet( quad );
// { TODO(all): this is deprecated.
// grab a list of data textures
std::vector< boost::shared_ptr< WDataTexture3D > > tex = WDataHandler::getDefaultSubject()->getDataTextures( true );
......@@ -330,6 +331,7 @@ void WMArbitraryPlane::updatePlane()
planeGeometry->setTexCoordArray( c, texCoords );
++c;
}
// }
m_geode->addDrawable( planeGeometry );
......@@ -376,6 +378,7 @@ void WMArbitraryPlane::updateTextures()
{
m_textureChanged = false;
// { TODO(all): this is deprecated.
// grab a list of data textures
std::vector< boost::shared_ptr< WDataTexture3D > > tex = WDataHandler::getDefaultSubject()->getDataTextures( true );
......@@ -443,6 +446,7 @@ void WMArbitraryPlane::updateTextures()
}
}
}
// }
}
m_showCompleteUniform->set( m_showComplete->get() );
......
......@@ -394,6 +394,7 @@ void WMFiberDisplay::updateTexture()
{
osg::StateSet* rootState = m_osgNode->getOrCreateStateSet();
// { TODO(all): this is deprecated.
// grab a list of data textures
std::vector< boost::shared_ptr< WDataTexture3D > > tex = WDataHandler::getDefaultSubject()->getDataTextures();
......@@ -426,6 +427,7 @@ void WMFiberDisplay::updateTexture()
m_uniformDimY->set( static_cast<int>( tex[0]->getGrid()->getNbCoordsY() ) );
m_uniformDimZ->set( static_cast<int>( tex[0]->getGrid()->getNbCoordsZ() ) );
}
// }
}
void WMFiberDisplay::notifyTextureChange()
......
......@@ -240,6 +240,7 @@ osg::ref_ptr<osg::Geometry> WMLineGuidedSlice::createGeometry()
osg::Vec3Array* sliceVertices = new osg::Vec3Array;
// { TODO(all): this is deprecated.
// grab a list of data textures
std::vector< boost::shared_ptr< WDataTexture3D > > tex = WDataHandler::getDefaultSubject()->getDataTextures( true );
......@@ -274,6 +275,7 @@ osg::ref_ptr<osg::Geometry> WMLineGuidedSlice::createGeometry()
++counter;
}
}
// }
osg::DrawElementsUInt* quad = new osg::DrawElementsUInt( osg::PrimitiveSet::QUADS, 0 );
quad->push_back( 3 );
......@@ -295,7 +297,9 @@ void WMLineGuidedSlice::updateGeometry()
osg::ref_ptr<osg::Drawable> old = osg::ref_ptr<osg::Drawable>( m_sliceNode->getDrawable( 0 ) );
m_sliceNode->replaceDrawable( old, sliceGeometry );
// { TODO(all): this is deprecated.
std::vector< boost::shared_ptr< WDataTexture3D > > tex = WDataHandler::getDefaultSubject()->getDataTextures( true );
// }
slock.unlock();
}
......@@ -307,7 +311,7 @@ void WMLineGuidedSlice::updateTextures()
if( m_textureChanged )
{
m_textureChanged = false;
// { TODO(all): this is deprecated.
// grab a list of data textures
std::vector< boost::shared_ptr< WDataTexture3D > > tex = WDataHandler::getDefaultSubject()->getDataTextures( true );
......@@ -340,6 +344,7 @@ void WMLineGuidedSlice::updateTextures()
bool useTexture = m_properties->getProperty( "Use texture" )->toPropBool()->get();
sliceState->addUniform( osg::ref_ptr<osg::Uniform>( new osg::Uniform( "useTexture", useTexture ) ) );
}
// }
}
m_highlightUniform->set( m_isPicked );
......
......@@ -580,6 +580,7 @@ void WMMarchingCubes::updateGraphicsCallback()
bool localTextureChangedFlag = m_textureChanged || m_useTextureProp->changed();
m_textureChanged = false;
// { TODO(all): this is deprecated.
// grab a list of data textures
std::vector< boost::shared_ptr< WDataTexture3D > > tex = WDataHandler::getDefaultSubject()->getDataTextures( true );
......@@ -675,6 +676,7 @@ void WMMarchingCubes::updateGraphicsCallback()
}
}
}
// }
}
lock.unlock();
}
......@@ -350,6 +350,7 @@ void WMOverlayAtlas::updatePlane()
quad->push_back( 0 );
planeGeometry->addPrimitiveSet( quad );
// { TODO(all): this is deprecated.
// grab a list of data textures
std::vector< boost::shared_ptr< WDataTexture3D > > tex = WDataHandler::getDefaultSubject()->getDataTextures( true );
......@@ -402,6 +403,7 @@ void WMOverlayAtlas::updatePlane()
break;
}
}
// }
m_geode->addDrawable( planeGeometry );
......@@ -415,6 +417,7 @@ void WMOverlayAtlas::updateTextures()
{
m_textureChanged = false;
// { TODO(all): this is deprecated.
// grab a list of data textures
std::vector< boost::shared_ptr< WDataTexture3D > > tex = WDataHandler::getDefaultSubject()->getDataTextures( true );
......@@ -499,6 +502,7 @@ void WMOverlayAtlas::updateTextures()
}
}
}
// }
}
m_showCompleteUniform->set( m_showComplete->get() );
......
......@@ -449,6 +449,7 @@ void WMSplineSurface::updateGraphics()
m_opacityProp->get( true );
m_useTextureProp->get( true );
// { TODO(all): this is deprecated.
// grab a list of data textures
std::vector< boost::shared_ptr< WDataTexture3D > > tex = WDataHandler::getDefaultSubject()->getDataTextures( true );
......@@ -513,5 +514,6 @@ void WMSplineSurface::updateGraphics()
}
}
}
// }
}
}
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