From 6ac43e1cd8b44d2139f5655811a0d16f140b7839 Mon Sep 17 00:00:00 2001 From: Leonardo Florez-Valencia Date: Sun, 4 Oct 2015 21:12:32 -0500 Subject: [PATCH] Widgets 4/6: it compiles on windows. --- cmake/cpPluginsConfig.cmake.in | 1 + lib/cpExtensions/Visualization/ImageSliceActors.h | 2 +- lib/cpPlugins/Interface/BaseProcessObjects.h | 2 +- .../Plugins/BasicFilters/ExtractSliceImageFilter.cxx | 3 ++- lib/cpPlugins/Plugins/IO/ImageWriter.cxx | 3 ++- lib/cpPlugins/Plugins/IO/MeshReader.cxx | 4 ++-- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cmake/cpPluginsConfig.cmake.in b/cmake/cpPluginsConfig.cmake.in index d5e0f39..340489d 100644 --- 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 d51d656..1a5bf49 100644 --- 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 d76d8b6..8ebd4e4 100644 --- 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 ff14aa4..378c5e2 100644 --- 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 9de1fe6..ba94173 100644 --- 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 e6bba2b..2585a73 100644 --- 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 -- 2.47.1