From dd0fc03a69f6ab926917a37c89c70c9013c93170 Mon Sep 17 00:00:00 2001 From: abd Date: Thu, 28 Aug 2008 09:52:33 +0000 Subject: [PATCH] Fix compilation problems on Win32 platform --- src/CONVERTOR/VISU_IDMapper.hxx | 2 +- src/CONVERTOR/VISU_TableReader.hxx | 3 ++- src/PIPELINE/VISU_DeformationPL.cxx | 1 + src/PIPELINE/VISU_ElnoDisassembleFilter.hxx | 4 +++- src/VISUGUI/VisuGUI_CutPlanesDlg.cxx | 2 +- src/VISUGUI/VisuGUI_Table3dDlg.cxx | 9 +++++++++ src/VISU_I/VISU_Result_i.cc | 2 ++ 7 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/CONVERTOR/VISU_IDMapper.hxx b/src/CONVERTOR/VISU_IDMapper.hxx index 4ef68e30..9a711d20 100644 --- a/src/CONVERTOR/VISU_IDMapper.hxx +++ b/src/CONVERTOR/VISU_IDMapper.hxx @@ -53,7 +53,7 @@ namespace VISU //--------------------------------------------------------------- - class TStructuredId + class VISU_CONVERTOR_EXPORT TStructuredId { vtkIdType myData[3]; diff --git a/src/CONVERTOR/VISU_TableReader.hxx b/src/CONVERTOR/VISU_TableReader.hxx index 1b724c34..17082a31 100644 --- a/src/CONVERTOR/VISU_TableReader.hxx +++ b/src/CONVERTOR/VISU_TableReader.hxx @@ -101,7 +101,8 @@ namespace VISU //--------------------------------------------------------------- typedef std::vector TTableContainer; - void ImportTables( const char* theFileName, TTableContainer& theContainer ); + VISU_CONVERTOR_EXPORT + void ImportTables( const char* theFileName, TTableContainer& theContainer ); //--------------------------------------------------------------- diff --git a/src/PIPELINE/VISU_DeformationPL.cxx b/src/PIPELINE/VISU_DeformationPL.cxx index 2189b228..88e29868 100755 --- a/src/PIPELINE/VISU_DeformationPL.cxx +++ b/src/PIPELINE/VISU_DeformationPL.cxx @@ -88,6 +88,7 @@ VISU_DeformationPL::GetMTime(){ aTime = std::max(aTime,myInputPassFilter->GetMTime()); aTime = std::max(aTime,myOutputPassFiler->GetMTime()); aTime = std::max(aTime,myCellDataToPointData->GetMTime()); + return 0; } //---------------------------------------------------------------------------- diff --git a/src/PIPELINE/VISU_ElnoDisassembleFilter.hxx b/src/PIPELINE/VISU_ElnoDisassembleFilter.hxx index 0053c13e..40f41d34 100644 --- a/src/PIPELINE/VISU_ElnoDisassembleFilter.hxx +++ b/src/PIPELINE/VISU_ElnoDisassembleFilter.hxx @@ -20,9 +20,11 @@ #ifndef VISU_ElnoDisassembleFilter_H #define VISU_ElnoDisassembleFilter_H +#include "VISUPipeline.hxx" + #include -class VISU_ElnoDisassembleFilter : public vtkUnstructuredGridAlgorithm +class VISU_PIPELINE_EXPORT VISU_ElnoDisassembleFilter : public vtkUnstructuredGridAlgorithm { public: typedef vtkUnstructuredGridAlgorithm Superclass; diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx index ce7b667a..d16325ac 100644 --- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx +++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx @@ -467,7 +467,7 @@ void VisuGUI_CutPlanesPane::onVectorialFieldChanged(int pos){ } void VisuGUI_CutPlanesPane::onDeformationCheck(bool Flag){ - if(!myCutPlanes || !hasInit) return; + if(!(bool)myCutPlanes || !hasInit) return; myCutPlanes->UseDeformation(Flag); InitVectorialField(); DrawTable(); diff --git a/src/VISUGUI/VisuGUI_Table3dDlg.cxx b/src/VISUGUI/VisuGUI_Table3dDlg.cxx index 6c961fbf..72d1ca18 100644 --- a/src/VISUGUI/VisuGUI_Table3dDlg.cxx +++ b/src/VISUGUI/VisuGUI_Table3dDlg.cxx @@ -580,6 +580,15 @@ void VisuGUI_TableScalarBarPane::XYChanged( double ) } } +//---------------------------------------------------------------------------- +/*! + +*/ +void VisuGUI_TableScalarBarPane::changeScalarMode( int ) +{ +//do nothing +} + //---------------------------------------------------------------------------- /*! Sets size and position diff --git a/src/VISU_I/VISU_Result_i.cc b/src/VISU_I/VISU_Result_i.cc index 4184edbc..2d8e89da 100644 --- a/src/VISU_I/VISU_Result_i.cc +++ b/src/VISU_I/VISU_Result_i.cc @@ -43,6 +43,8 @@ #include "SalomeApp_Study.h" #include "SalomeApp_Application.h" +#include "MED_Factory.hxx" + #include #include -- 2.39.2