[OpenWalnut-Dev] [OWci] r5271: [ADD #83] added new handled data types

Sebastian Eichelbaum eichelbaum at informatik.uni-leipzig.de
Tue Oct 4 18:06:29 CEST 2011


Hi

Nice. But please be so kind to check whether marching cubes now supports ALL integral/float types we support and please add them if missing.

Thank You
Sebastian

On Tue, 04 Oct 2011, Alexander Wiebel wrote:

> *Branch default*
> [ADD #83] added new handled data types
> 
> changeset 5271:ab06c7fef65e in /srv/hg/ow (Tue Oct 04 17:31:28 2011 +0200):
> 
> http://www.openwalnut.org/projects/openwalnut/repository/revisions/5271
> 
> diffstat:
> 
>  src/modules/data/WMData.cpp                   |   1 +
>  src/modules/marchingCubes/WMMarchingCubes.cpp |  44 +++++++++++++++++++++++++++
>  2 files changed, 45 insertions(+), 0 deletions(-)
> 
> diffs (72 lines):
> 
> diff -r 738aff79abae -r ab06c7fef65e src/modules/data/WMData.cpp
> --- a/src/modules/data/WMData.cpp	Mon Oct 03 13:39:21 2011 +0200
> +++ b/src/modules/data/WMData.cpp	Tue Oct 04 17:31:28 2011 +0200
> @@ -223,6 +223,7 @@
>                      case W_DT_UNSIGNED_CHAR:
>                      case W_DT_INT16:
>                      case W_DT_UINT16:
> +                    case W_DT_UINT32:
>                      case W_DT_SIGNED_INT:
>                          m_dataSet->getTexture()->colormap()->set(
>                              m_dataSet->getTexture()->colormap()->get().newSelector( WItemSelector::IndexList( 1, 0 ) )
> diff -r 738aff79abae -r ab06c7fef65e src/modules/marchingCubes/WMMarchingCubes.cpp
> --- a/src/modules/marchingCubes/WMMarchingCubes.cpp	Mon Oct 03 13:39:21 2011 +0200
> +++ b/src/modules/marchingCubes/WMMarchingCubes.cpp	Tue Oct 04 17:31:28 2011 +0200
> @@ -283,6 +283,28 @@
>              }
>              break;
>          }
> +        case W_DT_INT8:
> +        {
> +            boost::shared_ptr< WValueSet< int8_t > > vals;
> +            vals =  boost::shared_dynamic_cast< WValueSet< int8_t > >( ( *m_dataSet ).getValueSet() );
> +            WAssert( vals, "Data type and data type indicator must fit." );
> +            if( m_useMarchingLego->get( true ) )
> +            {
> +                m_triMesh = mlAlgo.generateSurface( m_grid->getNbCoordsX(), m_grid->getNbCoordsY(), m_grid->getNbCoordsZ(),
> +                                                    m_grid->getTransformationMatrix(),
> +                                                    vals->rawDataVectorPointer(),
> +                                                    isoValue );
> +            }
> +            else
> +            {
> +                m_triMesh = mcAlgo.generateSurface( m_grid->getNbCoordsX(), m_grid->getNbCoordsY(), m_grid->getNbCoordsZ(),
> +                                                    m_grid->getTransformationMatrix(),
> +                                                    vals->rawDataVectorPointer(),
> +                                                    isoValue,
> +                                                    m_progress );
> +            }
> +            break;
> +        }
>          case W_DT_UINT16:
>          {
>              boost::shared_ptr< WValueSet< uint16_t > > vals;
> @@ -305,6 +327,28 @@
>              }
>              break;
>          }
> +        case W_DT_UINT32:
> +        {
> +            boost::shared_ptr< WValueSet< uint32_t > > vals;
> +            vals =  boost::shared_dynamic_cast< WValueSet< uint32_t > >( ( *m_dataSet ).getValueSet() );
> +            WAssert( vals, "Data type and data type indicator must fit." );
> +            if( m_useMarchingLego->get( true ) )
> +            {
> +                m_triMesh = mlAlgo.generateSurface( m_grid->getNbCoordsX(), m_grid->getNbCoordsY(), m_grid->getNbCoordsZ(),
> +                                                    m_grid->getTransformationMatrix(),
> +                                                    vals->rawDataVectorPointer(),
> +                                                    isoValue );
> +            }
> +            else
> +            {
> +                m_triMesh = mcAlgo.generateSurface( m_grid->getNbCoordsX(), m_grid->getNbCoordsY(), m_grid->getNbCoordsZ(),
> +                                                    m_grid->getTransformationMatrix(),
> +                                                    vals->rawDataVectorPointer(),
> +                                                    isoValue,
> +                                                    m_progress );
> +            }
> +            break;
> +        }
>          case W_DT_SIGNED_INT:
>          {
>              boost::shared_ptr< WValueSet< int32_t > > vals;
> _______________________________________________
> All-openwalnut-commits mailing list
> All-openwalnut-commits at lists.informatik.uni-leipzig.de
> http://lists.informatik.uni-leipzig.de/mailman/listinfo/all-openwalnut-commits
> 

-- 
Dipl.-Inf. Sebastian Eichelbaum
Universität Leipzig
Institut für Informatik
Abteilung Bild- und Signalverarbeitung
PF 100920
D-04009 Leipzig


More information about the OpenWalnut-Dev mailing list