Commit a4a3d7fb authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[MERGE]

parents 248e8492 82c1b3e7
......@@ -151,11 +151,29 @@ void WMAtlasSurfaces::moduleMain()
if( m_labelFile->get( true ) == boost::filesystem::path( "" ) )
{
std::string fn = m_dataSet->getFilename();
std::string ext( ".nii.gz" );
std::string ext( "" );
if( fn.find( ".nii.gz" ) != std::string::npos )
{
ext = ".nii.gz";
}
else if( fn.find( ".nii" ) != std::string::npos )
{
ext = ".nii";
}
std::string csvExt( ".csv" );
fn.replace( fn.find( ext ), ext.size(), csvExt );
if( ext != "" )
{
// fn.replace( fn.find( ext ), ext.size(), csvExt );
}
else
{
fn.append( csvExt );
}
m_labelFile->set( fn );
}
if( !boost::filesystem::exists( m_labelFile->get() ) )
{
wlog::warn( "Atlas Surfaces" ) << "Expected label file does not exist! (" << m_labelFile->get().string() << ")";
......@@ -225,8 +243,12 @@ void WMAtlasSurfaces::createSurfaces()
new WCreateSurfaceJob<unsigned char>( m_dataSet, m_regionMeshes2, newProgress, pro ) );
break;
case W_DT_INT16:
job = boost::shared_ptr<WCreateSurfaceJob<int16_t> >(
new WCreateSurfaceJob<int16_t>( m_dataSet, m_regionMeshes2, newProgress, pro ) );
break;
case W_DT_SIGNED_INT:
job = boost::shared_ptr<WCreateSurfaceJob<int> >(
new WCreateSurfaceJob<int>( m_dataSet, m_regionMeshes2, newProgress, pro ) );
break;
case W_DT_FLOAT:
case W_DT_DOUBLE:
......
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