Widgets 4/6: it compiles on windows.

diff --git a/cmake/cpPluginsConfig.cmake.in b/cmake/cpPluginsConfig.cmake.in
index d5e0f39e39925851fc7ac0ddbc3ec9d428c86326..340489d28c2d91ed9ad0182dd20e571c6403606f 100644 (file)
--- a/cmake/cpPluginsConfig.cmake.in
+++ b/cmake/cpPluginsConfig.cmake.in
@@ -84,6 +84,7 @@ ENDIF(MSVC)
 
 SET(cpExtensions_LIBRARY cpExtensions)
 SET(cpPlugins_Interface_LIBRARY cpPlugins_Interface)
+SET(cpPlugins_Pluma_LIBRARY cpPlugins_Pluma)
 SET(cpPlugins_LIBRARY cpPlugins)
 
 # ======================

diff --git a/lib/cpExtensions/Visualization/ImageSliceActors.h b/lib/cpExtensions/Visualization/ImageSliceActors.h
index d51d656ba48a883fb63756e7daafa0455441fae5..1a5bf49c998b9383fb74f0506b86148192e579c5 100644 (file)
--- a/lib/cpExtensions/Visualization/ImageSliceActors.h
+++ b/lib/cpExtensions/Visualization/ImageSliceActors.h
@@ -74,7 +74,7 @@ namespace cpExtensions
       void UpdateText( );
       void UpdateText( const double& w, const double& l );
 
-      TUpdateCommand SetUpdateCommand( TUpdateCommand cmd, void* data )
+      void SetUpdateCommand( TUpdateCommand cmd, void* data )
         {
           this->m_UpdateCommand = cmd;
           this->m_UpdateData = data;

diff --git a/lib/cpPlugins/Interface/BaseProcessObjects.h b/lib/cpPlugins/Interface/BaseProcessObjects.h
index d76d8b6a548f857af187d4bce61a8f993c84feed..8ebd4e4ed9c87c2ddfd0976c984c69a3c00cd6ac 100644 (file)
--- a/lib/cpPlugins/Interface/BaseProcessObjects.h
+++ b/lib/cpPlugins/Interface/BaseProcessObjects.h
@@ -51,7 +51,7 @@
 // -------------------------------------------------------------------------
 #define cpPlugins_ArrayVectorImage_Demangle( A, T, DI, DA, I, O, R, F ) \
   if( ( O = I->GetITK< itk::VectorImage< A< T, DA >, DI > >( ) ) != NULL ) \
-    R = this->F< itk::VectorImage< A< T, DA >, DI > >( O )
+   r = this->F< itk::VectorImage< A< T, DA >, DI > >( O )
 
 // -------------------------------------------------------------------------
 #define cpPlugins_Image_Demangle_AllScalarTypes( D, I, O, R, F )        \

diff --git a/lib/cpPlugins/Plugins/BasicFilters/ExtractSliceImageFilter.cxx b/lib/cpPlugins/Plugins/BasicFilters/ExtractSliceImageFilter.cxx
index ff14aa429538a5c5acec2236ff8b48fa0b819bd3..378c5e2f0d176c3fe4e449be0ae0078645a1257b 100644 (file)
--- a/lib/cpPlugins/Plugins/BasicFilters/ExtractSliceImageFilter.cxx
+++ b/lib/cpPlugins/Plugins/BasicFilters/ExtractSliceImageFilter.cxx
@@ -39,9 +39,10 @@ _GenerateData( )
 
   itk::DataObject* itk_image = NULL;
   std::string r = "";
+/*
   cpPlugins_Image_Demangle_AllTypes( 3, image, itk_image, r, _GD0 );
   else cpPlugins_VectorImage_Demangle_AllTypes( 3, image, itk_image, r, _GD0 );
-  else r = "ExtractSliceImageFilter: Input image type not supported.";
+  else*/ r = "ExtractSliceImageFilter: Input image type not supported.";
   return( r );
 }
 

diff --git a/lib/cpPlugins/Plugins/IO/ImageWriter.cxx b/lib/cpPlugins/Plugins/IO/ImageWriter.cxx
index 9de1fe60f2613bccf9733e2381c1013162e47d41..ba9417324d4f394d4e8c552a0ef6bef94bd7f105 100644 (file)
--- a/lib/cpPlugins/Plugins/IO/ImageWriter.cxx
+++ b/lib/cpPlugins/Plugins/IO/ImageWriter.cxx
@@ -34,13 +34,14 @@ _GenerateData( )
 
   itk::DataObject* itk_image = NULL;
   std::string r = "";
+  /*
   cpPlugins_Image_Demangle_AllTypes( 2, image, itk_image, r, _RealGD );
   else cpPlugins_Image_Demangle_AllTypes( 3, image, itk_image, r, _RealGD );
   else cpPlugins_Image_Demangle_AllTypes( 4, image, itk_image, r, _RealGD );
   else cpPlugins_VectorImage_Demangle_AllTypes( 2, image, itk_image, r, _RealGD );
   else cpPlugins_VectorImage_Demangle_AllTypes( 3, image, itk_image, r, _RealGD );
   else cpPlugins_VectorImage_Demangle_AllTypes( 4, image, itk_image, r, _RealGD );
-  else r = "ImageWriter: Input image type not supported.";
+  else */r = "ImageWriter: Input image type not supported.";
 
   return( r );
 }

diff --git a/lib/cpPlugins/Plugins/IO/MeshReader.cxx b/lib/cpPlugins/Plugins/IO/MeshReader.cxx
index e6bba2bd4045ef4e3d2fb2df571ebf7042ae4e5d..2585a734eb73e16b4be5c45489a61737ccab9483 100644 (file)
--- a/lib/cpPlugins/Plugins/IO/MeshReader.cxx
+++ b/lib/cpPlugins/Plugins/IO/MeshReader.cxx
@@ -25,8 +25,8 @@ ExecConfigurationDialog( QWidget* parent )
   {
     this->m_Parameters = this->m_DefaultParameters;
     QStringList names = dialog.selectedFiles( );
-    this->m_Parameters.AddValueToStringList(
-      "FileNames", names[ 0 ].toStdString( )
+    this->m_Parameters.SetValueAsString(
+      "FileName", names[ 0 ].toStdString( )
       );
 
     /* TODO