Commit f9d3ea65 authored by schurade's avatar schurade
Browse files

[FIX] fixed merge zeugs

parent 7b0c1c94
......@@ -245,18 +245,13 @@ void WMCoordinateSystem::findBoundingBox()
if ( datasetList.size() > 0 )
{
boost::shared_ptr< WMData< int > > module = boost::shared_dynamic_cast< WMData< int > >( datasetList[0] );
boost::shared_ptr< WMData > module = boost::shared_dynamic_cast< WMData >( datasetList[0] );
boost::shared_ptr< WDataSetSingle > ds = boost::shared_dynamic_cast< WDataSetSingle >( module->getDataSet() );
if ( ds->getValueSet()->getDataType() != 2 )
{
<<<<<<< /SCR/schurade/workspace/walnut-hg/src/modules/coordinateSystem/WMCoordinateSystem.cpp
return;
}
=======
boost::shared_ptr< WMData > module = boost::shared_dynamic_cast< WMData >( datasetList[0] );
boost::shared_ptr< WDataSetSingle > ds = boost::shared_dynamic_cast< WDataSetSingle >( module->getDataSet() );
>>>>>>> /tmp/WMCoordinateSystem.cpp~other.C9uhPL
boost::shared_ptr< WGridRegular3D > grid = boost::shared_dynamic_cast< WGridRegular3D >( ds->getGrid() );
......
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