From 2278f2aff77e42105f53a7ddfe9039bd39365d92 Mon Sep 17 00:00:00 2001 From: abd Date: Thu, 17 Jul 2008 11:31:16 +0000 Subject: [PATCH] Executable version on Windows Platform --- src/CONVERTOR/VISU_ConvertorDef_impl.hxx | 4 ---- src/CONVERTOR/VISU_Structures_impl.hxx | 30 ------------------------ src/GUITOOLS/VisuGUI_TableDlg.h | 4 ++-- src/PIPELINE/VISU_PipeLineUtils.hxx | 14 +++++------ src/VISUGUI/VisuGUI_CutLinesDlg.cxx | 10 ++++---- src/VISUGUI/VisuGUI_CutPlanesDlg.cxx | 6 ++--- 6 files changed, 17 insertions(+), 51 deletions(-) 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 fe6a7cc5..b7aa8585 100644 --- a/src/CONVERTOR/VISU_Structures_impl.hxx +++ b/src/CONVERTOR/VISU_Structures_impl.hxx @@ -137,36 +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(); - - //! if false, TIDCommonCellsFilter - same as TIDMapperFilter - //! if true, TIDCommonCellsFilter - use VISU_CommonCellsFilter - bool myIsSpecialKey; - - //! Vector of id mappers, which consist of meshonentity in next sequence: - //! CELL_ENTITY,FACE_ENTITY,EDGE_ENTITY - PNamedIDMapperMap myMappers; - }; - //--------------------------------------------------------------- //! 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 e99b70e5..ea69f668 100644 --- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx +++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx @@ -223,7 +223,7 @@ void VisuGUI_CutPlanesPane::initFromPrsObject (VISU::CutPlanes_i* thePrs) void VisuGUI_CutPlanesPane::createPlanes() { if (VISU::GetActiveViewWindow() == NULL) return; - if (!myCutPlanes) return; + if (!(bool)myCutPlanes) return; if (myPreviewActor != 0) return; vtkAppendPolyData* aPolyData = myCutPlanes->GetSpecificPL()->GetAppendPolyData(); @@ -329,7 +329,7 @@ void VisuGUI_CutPlanesPane::setRotation (const double r1, const double r2) */ void VisuGUI_CutPlanesPane::DrawTable() { - if (!myCutPlanes) return; + if (!(bool)myCutPlanes) return; if (!hasInit) return; int aNbRows = myPosTable->rowCount(); @@ -552,7 +552,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.); -- 2.39.2