From: abd Date: Fri, 8 Aug 2008 07:50:09 +0000 (+0000) Subject: Merging with BR_WPdev_For_5_0 X-Git-Tag: mergefrom_BR_WPdev_For_5_0_08Aug2008 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=647e134f4663b35cc992bf570fffb093c817d0f9;p=modules%2Fvisu.git Merging with BR_WPdev_For_5_0 --- diff --git a/src/CONVERTOR/VISU_ConvertorDef_impl.hxx b/src/CONVERTOR/VISU_ConvertorDef_impl.hxx index eb7fbcd0..639119b1 100644 --- a/src/CONVERTOR/VISU_ConvertorDef_impl.hxx +++ b/src/CONVERTOR/VISU_ConvertorDef_impl.hxx @@ -54,10 +54,6 @@ namespace VISU typedef vtkSmartPointer PMergeFilter; typedef vtkSmartPointer PCommonCellsFilter; - struct TCommonCellsFilterHolder; - typedef MED::SharedPtr PCommonCellsFilterHolder; - - //--------------------------------------------------------------- typedef vtkSmartPointer PPolyData; typedef vtkSmartPointer PAppendPolyData; diff --git a/src/CONVERTOR/VISU_Structures_impl.hxx b/src/CONVERTOR/VISU_Structures_impl.hxx index 9cd67758..a143f0c5 100644 --- 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 d36731ee..1389a9ef 100644 --- 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 65909900..564586ab 100644 --- 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 a659f464..de772063 100644 --- 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(); 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(); 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(); 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(); 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(); if (aView) { if (myPreviewCheck->isChecked()) { diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx index 6eef1a49..1da83624 100644 --- 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() == 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()) { myCutPlanes->SetOrientation(getOrientaion(),getRotation1()*PI/180.,getRotation2()*PI/180.);