Merging with BR_WPdev_For_5_0

diff --git a/src/CONVERTOR/VISU_ConvertorDef_impl.hxx b/src/CONVERTOR/VISU_ConvertorDef_impl.hxx
index eb7fbcd0d484b68ed14644e5137210cebb4cd9de..639119b177e392ec1fa48098e059f76d44e1bcf4 100644 (file)
--- a/src/CONVERTOR/VISU_ConvertorDef_impl.hxx
+++ b/src/CONVERTOR/VISU_ConvertorDef_impl.hxx
@@ -54,10 +54,6 @@ namespace VISU
   typedef vtkSmartPointer<VISU_MergeFilter> PMergeFilter;
   typedef vtkSmartPointer<VISU_CommonCellsFilter> PCommonCellsFilter;
   
-  struct TCommonCellsFilterHolder;
-  typedef MED::SharedPtr<TCommonCellsFilterHolder> PCommonCellsFilterHolder; 
- 
-  
   //---------------------------------------------------------------
   typedef vtkSmartPointer<vtkPolyData> PPolyData;
   typedef vtkSmartPointer<VISU_AppendPolyData> PAppendPolyData;

diff --git a/src/CONVERTOR/VISU_Structures_impl.hxx b/src/CONVERTOR/VISU_Structures_impl.hxx
index 9cd67758b9bd6a95dae4ccd4ad2d82657ff15856..a143f0c57f948b3e56dcc2e3ff3675e61831ccd5 100644 (file)
--- a/src/CONVERTOR/VISU_Structures_impl.hxx
+++ b/src/CONVERTOR/VISU_Structures_impl.hxx
@@ -137,28 +137,6 @@ namespace VISU
   /*!
     This container allow to combine other VTK representation into single one.
   */
-  class VISU_CONVERTOR_EXPORT TCommonCellsFilterHolder: public virtual TMemoryCheckIDMapper
-  {
-  protected:
-    mutable PCommonCellsFilter myFilter;
-    mutable PMergeFilter myMergeFilter;
-  public:
-    TCommonCellsFilterHolder();
-
-    //! This method allow to create corresponding VTK filter by demand (not at once)
-    const PCommonCellsFilter& 
-    GetFilter() const;
-
-    //! Reimplement the TNamedIDMapper::GetUnstructuredGridOutput
-    virtual
-    vtkUnstructuredGrid* 
-    GetUnstructuredGridOutput();
-
-    virtual
-    unsigned long int
-    GetMemorySize();
-  };
-
   //---------------------------------------------------------------
   //! Define a container for VTK representation
   /*!

diff --git a/src/GUITOOLS/VisuGUI_TableDlg.h b/src/GUITOOLS/VisuGUI_TableDlg.h
index d36731ee0a2e7e395ab969a9a2715b07a77eceb4..1389a9ef3f11eff1d0d59857f7e301383c67e922 100644 (file)
--- a/src/GUITOOLS/VisuGUI_TableDlg.h
+++ b/src/GUITOOLS/VisuGUI_TableDlg.h
@@ -72,7 +72,7 @@ private:
   _PTR(SObject) myObject;
 };
  
-class VisuGUI_TableWidget : public QWidget
+class VISU_GUITOOLS_EXPORT VisuGUI_TableWidget : public QWidget
 {
   Q_OBJECT
 public:
@@ -127,7 +127,7 @@ private:
   Qt::Orientation  myOrientation;
 };
 
-class NumDelegateItem: public QItemDelegate
+class VISU_GUITOOLS_EXPORT NumDelegateItem: public QItemDelegate
 {
 public:
   enum NumValidator{ NV_Int, NV_Real };

diff --git a/src/PIPELINE/VISU_PipeLineUtils.hxx b/src/PIPELINE/VISU_PipeLineUtils.hxx
index 65909900e69c2d219a4221c578b75ac603e38522..564586ab18800ff29d916b9ce24781ab7318306e 100644 (file)
--- a/src/PIPELINE/VISU_PipeLineUtils.hxx
+++ b/src/PIPELINE/VISU_PipeLineUtils.hxx
@@ -95,12 +95,12 @@ namespace VISU
                   vtkFloatingPointType theSource);
 
   //! Checks whether the scalar range is the same or not
-  bool
+  bool VISU_PIPELINE_EXPORT
   CheckIsSameRange(vtkFloatingPointType* theTarget,
                   vtkFloatingPointType* theSource);
 
   //! Customizes vtkMapper::ShallowCopy
-  void
+  void VISU_PIPELINE_EXPORT
   CopyMapper(vtkMapper* theTarget, 
             vtkMapper* theSource,
             bool theIsCopyInput);
@@ -112,20 +112,20 @@ namespace VISU
                    bool theIsCopyInput);
 
   //! Customizes vtkPolyDataMapper::ShallowCopy
-  void
+  void VISU_PIPELINE_EXPORT
   CopyPolyDataMapper(vtkPolyDataMapper* theTarget, 
                     vtkPolyDataMapper* theSource,
                     bool theIsCopyInput);
 
   //! Customizes VISU_OpenGLPointSpriteMapper::ShallowCopy
-  void
+  void VISU_PIPELINE_EXPORT
   CopyPointSpriteDataMapper(VISU_OpenGLPointSpriteMapper* theTarget, 
                            VISU_OpenGLPointSpriteMapper* theSource,
                            bool theIsCopyInput);
 
 
   //----------------------------------------------------------------------------
-  void
+  void VISU_PIPELINE_EXPORT
   ComputeBoundsParam(vtkDataSet* theDataSet,
                     vtkFloatingPointType theDirection[3], 
                     vtkFloatingPointType theMinPnt[3],
@@ -134,7 +134,7 @@ namespace VISU
 
 
   //----------------------------------------------------------------------------
-  void
+  void VISU_PIPELINE_EXPORT
   DistanceToPosition(vtkDataSet* theDataSet,
                     vtkFloatingPointType theDirection[3], 
                     vtkFloatingPointType theDist, 
@@ -142,7 +142,7 @@ namespace VISU
 
 
   //----------------------------------------------------------------------------
-  void
+  void VISU_PIPELINE_EXPORT
   PositionToDistance(vtkDataSet* theDataSet,
                     vtkFloatingPointType theDirection[3], 
                     vtkFloatingPointType thePos[3], 

diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
index a659f464a6442e5a99c39133594b399a46150db2..de7720639a3f040cc26dc4bf2378509fab6c8d1c 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
@@ -438,7 +438,7 @@ void VisuGUI_CutLinesDlg::createPlanes()
 {
   SVTK_ViewWindow* aView = VISU::GetActiveViewWindow<SVTK_ViewWindow>();
   if (aView == NULL) return;
-  if (!myCutLines) return;
+  if (!(bool)myCutLines) return;
   if (myPreviewActor != 0) return;
 
   storeToPrsObject(myCutLines);
@@ -534,7 +534,7 @@ void VisuGUI_CutLinesDlg::onCutSelect (int theId, bool theUpdate)
   }
   SVTK_ViewWindow* aView = VISU::GetActiveViewWindow<SVTK_ViewWindow>();
   if (aView) {
-    if (theUpdate && myPreviewCheck->isChecked() && myCutLines) {
+    if (theUpdate && myPreviewCheck->isChecked() && (bool)myCutLines) {
       deletePlanes();
       createPlanes();
     }
@@ -551,7 +551,7 @@ void VisuGUI_CutLinesDlg::setBaseDefault (bool theUpdate)
     myCutLines->SetDisplacement(myPosSpn->value());
     SVTK_ViewWindow* aView = VISU::GetActiveViewWindow<SVTK_ViewWindow>();
     if (aView) {
-      if (theUpdate && myPreviewCheck->isChecked() && myCutLines) {
+      if (theUpdate && myPreviewCheck->isChecked() && (bool)myCutLines) {
         deletePlanes();
         createPlanes();
       }
@@ -956,7 +956,7 @@ void VisuGUI_CutLinesDlg::onAllCurvesInvertedCheck(bool theInvert)
 
 void VisuGUI_CutLinesDlg::onRotation (double theValue)
 {
-  if (!myCutLines) return;
+  if (!(bool)myCutLines) return;
   SVTK_ViewWindow* aView = VISU::GetActiveViewWindow<SVTK_ViewWindow>();
   if (aView) {
     if (myPreviewCheck->isChecked()) {
@@ -968,7 +968,7 @@ void VisuGUI_CutLinesDlg::onRotation (double theValue)
 
 void VisuGUI_CutLinesDlg::onPlanePos (const QString& theValue)
 {
-  if (!myCutLines) return;
+  if (!(bool)myCutLines) return;
   SVTK_ViewWindow* aView = VISU::GetActiveViewWindow<SVTK_ViewWindow>();
   if (aView) {
     if (myPreviewCheck->isChecked()) {

diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
index 6eef1a4964d824b0bc09f0b0c7edf18f57f1af09..1da83624fe865329ebc71a3ae37adb617e47dc16 100644 (file)
--- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
@@ -330,7 +330,7 @@ void VisuGUI_CutPlanesPane::setScaleFactor(double theFactor){
 void VisuGUI_CutPlanesPane::createPlanes()
 {
   if (VISU::GetActiveViewWindow<SVTK_ViewWindow>() == NULL) return;
-  if (!myCutPlanes) return;
+  if (!(bool)myCutPlanes) return;
   if (myPreviewActor != 0) return;
 
   vtkDataSet* aDataSet = myCutPlanes->GetSpecificPL()->GetWarpVectorOutput();
@@ -500,7 +500,7 @@ void VisuGUI_CutPlanesPane::InitVectorialField(){
 */
 void VisuGUI_CutPlanesPane::DrawTable()
 {
-  if (!myCutPlanes) return;
+  if (!(bool)myCutPlanes) return;
   if (!hasInit) return;
 
   int aNbRows = myPosTable->rowCount();
@@ -724,7 +724,7 @@ void VisuGUI_CutPlanesPane::deletePlanes()
 
 void VisuGUI_CutPlanesPane::onRotation (double theValue)
 {
-  if (!myCutPlanes) return;
+  if (!(bool)myCutPlanes) return;
   if (myPreviewCheck->isChecked()) {
     if (SVTK_ViewWindow* vf = VISU::GetActiveViewWindow<SVTK_ViewWindow>()) {
       myCutPlanes->SetOrientation(getOrientaion(),getRotation1()*PI/180.,getRotation2()*PI/180.);