From 40067700d8a9363352739a3ff4c379ee63417e08 Mon Sep 17 00:00:00 2001 From: abd Date: Wed, 20 Jun 2007 14:42:29 +0000 Subject: [PATCH] Update environment of windows version: - products; - projects. Porting current version of BR_Dev_For_4_0 branch on Windows. First stable Windows version of BR_Dev_For_4_0 branch. --- src/CONVERTOR/VISU_AppendFilter.hxx | 5 +-- src/CONVERTOR/VISU_AppendFilterUtilities.cxx | 2 +- src/CONVERTOR/VISU_AppendFilterUtilities.hxx | 5 +-- src/CONVERTOR/VISU_ConvertorUtils.hxx | 2 +- src/CONVERTOR/VISU_IDMapper.hxx | 2 +- src/CONVERTOR/VISU_MedConvertor.hxx | 31 ++++++++--------- src/CONVERTOR/VISU_MeshValue.hxx | 4 +-- src/CONVERTOR/VISU_PointCoords.hxx | 7 ++-- src/CONVERTOR/VISU_Structures.hxx | 33 +++++++++--------- src/CONVERTOR/VISU_Structures_impl.hxx | 35 ++++++++++---------- src/PIPELINE/VISU_ColoredPL.hxx | 2 +- src/PIPELINE/VISU_PipeLineUtils.hxx | 4 +-- src/PIPELINE/VISU_UnstructuredGridPL.hxx | 3 +- src/VISUGUI/VisuGUI.cxx | 15 ++++++--- src/VISUGUI/VisuGUI.h | 2 ++ src/VISUGUI/VisuGUI_CacheDlg.cxx | 10 +++++- src/VISUGUI/VisuGUI_CutLinesDlg.cxx | 2 ++ src/VISUGUI/VisuGUI_CutPlanesDlg.cxx | 2 ++ src/VISUGUI/VisuGUI_GaussPointsDlg.cxx | 2 +- src/VISUGUI/VisuGUI_Plot3DDlg.cxx | 2 ++ src/VISUGUI/VisuGUI_Tools.h | 2 -- src/VISUGUI/VisuGUI_ViewTools.h | 4 ++- src/VISU_I/VISU_ColoredPrs3dFactory.hh | 9 ++--- src/VISU_I/VISU_ColoredPrs3d_i.hh | 2 +- src/VISU_I/VISU_CutLines_i.hh | 5 +-- src/VISU_I/VISU_DeformedShape_i.hh | 3 +- src/VISU_I/VISU_Gen_i.cc | 2 +- src/VISU_I/VISU_Gen_i.hh | 1 + src/VISU_I/VISU_I.hxx | 3 +- src/VISU_I/VISU_IsoSurfaces_i.hh | 3 +- src/VISU_I/VISU_Result_i.hh | 9 ++--- src/VISU_I/VISU_ViewManager_i.hh | 4 +-- 32 files changed, 123 insertions(+), 94 deletions(-) diff --git a/src/CONVERTOR/VISU_AppendFilter.hxx b/src/CONVERTOR/VISU_AppendFilter.hxx index 480b623f..3d1377ea 100644 --- a/src/CONVERTOR/VISU_AppendFilter.hxx +++ b/src/CONVERTOR/VISU_AppendFilter.hxx @@ -19,14 +19,15 @@ #ifndef VISU_APPENDFILTER_H #define VISU_APPENDFILTER_H +#include "VISUConvertor.hxx" #include "VISU_AppendFilterUtilities.hxx" #include /*! \brief This class used same as vtkAppendFilter. See documentation on VTK for more information. */ -class VISU_AppendFilter : public vtkAppendFilter, - public VISU::TAppendFilterHelper +class VISU_CONVERTOR_EXPORT VISU_AppendFilter : public vtkAppendFilter, + public VISU::TAppendFilterHelper { public: /*! \fn static VISU_AppendFilter *New() diff --git a/src/CONVERTOR/VISU_AppendFilterUtilities.cxx b/src/CONVERTOR/VISU_AppendFilterUtilities.cxx index d09b24a5..3294684d 100644 --- a/src/CONVERTOR/VISU_AppendFilterUtilities.cxx +++ b/src/CONVERTOR/VISU_AppendFilterUtilities.cxx @@ -252,7 +252,7 @@ namespace for(vtkIdType aCellId = 0; anIter != anEndIter; anIter++, aCellId++){ const TInputCellId& anInputCellId = anIter->second; TInputId anInputId = anInputCellId.first; - TCellId aCellId = anInputCellId.second; + /*TCellId*/ aCellId = anInputCellId.second; aDataArray->SetValue(aTupleId++, anInputId); aDataArray->SetValue(aTupleId++, aCellId); } diff --git a/src/CONVERTOR/VISU_AppendFilterUtilities.hxx b/src/CONVERTOR/VISU_AppendFilterUtilities.hxx index e185dd23..ea5276ac 100644 --- a/src/CONVERTOR/VISU_AppendFilterUtilities.hxx +++ b/src/CONVERTOR/VISU_AppendFilterUtilities.hxx @@ -23,17 +23,18 @@ class vtkInformationVector; class vtkPointSet; class vtkObject; +#include #include namespace VISU { //--------------------------------------------------------------- - class TAppendFilterHelper + class VISU_CONVERTOR_EXPORT TAppendFilterHelper { TAppendFilterHelper(TAppendFilterHelper&); public: - void + void SetSharedPointSet(vtkPointSet* thePointSet); vtkPointSet* diff --git a/src/CONVERTOR/VISU_ConvertorUtils.hxx b/src/CONVERTOR/VISU_ConvertorUtils.hxx index 6455a061..17c12fde 100644 --- a/src/CONVERTOR/VISU_ConvertorUtils.hxx +++ b/src/CONVERTOR/VISU_ConvertorUtils.hxx @@ -59,7 +59,7 @@ namespace VISU { //--------------------------------------------------------------- //! Get number of nodes for defined geometrical type - vtkIdType + vtkIdType VISU_CONVERTOR_EXPORT VISUGeom2NbNodes(EGeometry theGeom); diff --git a/src/CONVERTOR/VISU_IDMapper.hxx b/src/CONVERTOR/VISU_IDMapper.hxx index c947dfa1..635d2f56 100644 --- a/src/CONVERTOR/VISU_IDMapper.hxx +++ b/src/CONVERTOR/VISU_IDMapper.hxx @@ -165,7 +165,7 @@ namespace VISU //--------------------------------------------------------------- - struct TUnstructuredGridIDMapper: virtual TIDMapper + struct VISU_CONVERTOR_EXPORT TUnstructuredGridIDMapper: virtual TIDMapper { //! Get VTK representation of mesh for corresponding MED entity virtual diff --git a/src/CONVERTOR/VISU_MedConvertor.hxx b/src/CONVERTOR/VISU_MedConvertor.hxx index 4b950244..e3834ab2 100644 --- a/src/CONVERTOR/VISU_MedConvertor.hxx +++ b/src/CONVERTOR/VISU_MedConvertor.hxx @@ -19,6 +19,7 @@ #ifndef VISU_MedConvertor_HeaderFile #define VISU_MedConvertor_HeaderFile +#include "VISUConvertor.hxx" #include "VISU_Convertor_impl.hxx" #include "VISU_Structures_impl.hxx" #include "VISU_PointCoords.hxx" @@ -35,7 +36,7 @@ namespace VISU { //--------------------------------------------------------------- - struct TMEDCoordHolder: TCoordHolder + struct VISU_CONVERTOR_EXPORT TMEDCoordHolder: TCoordHolder { virtual const TCoord* @@ -54,7 +55,7 @@ namespace VISU //--------------------------------------------------------------- - struct TMEDGaussCoordHolder: TCoordHolderBase + struct VISU_CONVERTOR_EXPORT TMEDGaussCoordHolder: TCoordHolderBase { MED::PGaussCoord myGaussCoord; @@ -103,7 +104,7 @@ namespace VISU //--------------------------------------------------------------- template - struct TTMEDMeshValue: TTMeshValueHolder > > > { virtual @@ -172,7 +173,7 @@ namespace VISU //--------------------------------------------------------------- - struct TMEDMesh: virtual TMeshImpl + struct VISU_CONVERTOR_EXPORT TMEDMesh: virtual TMeshImpl { MED::PMeshInfo myMeshInfo; MED::TEntityInfo myEntityInfo; @@ -181,7 +182,7 @@ namespace VISU //--------------------------------------------------------------- - struct TMEDSubProfile: virtual TSubProfileImpl + struct VISU_CONVERTOR_EXPORT TMEDSubProfile: virtual TSubProfileImpl { MED::EGeometrieElement myMGeom; @@ -205,13 +206,13 @@ namespace VISU //--------------------------------------------------------------- - struct TMEDProfile: virtual TProfileImpl + struct VISU_CONVERTOR_EXPORT TMEDProfile: virtual TProfileImpl {}; typedef MED::SharedPtr PMEDProfile; //--------------------------------------------------------------- - struct TMEDGauss: virtual TGaussImpl + struct VISU_CONVERTOR_EXPORT TMEDGauss: virtual TGaussImpl { MED::PGaussInfo myGaussInfo; @@ -225,7 +226,7 @@ namespace VISU //--------------------------------------------------------------- - struct TMEDGaussSubMesh: virtual TGaussSubMeshImpl + struct VISU_CONVERTOR_EXPORT TMEDGaussSubMesh: virtual TGaussSubMeshImpl { TMEDGaussSubMesh(): myIsElemNum(MED::eFAUX) @@ -247,13 +248,13 @@ namespace VISU //--------------------------------------------------------------- - struct TMEDGaussMesh: virtual TGaussMeshImpl + struct VISU_CONVERTOR_EXPORT TMEDGaussMesh: virtual TGaussMeshImpl {}; typedef MED::SharedPtr PMEDGaussMesh; //--------------------------------------------------------------- - struct TMEDSubMesh: virtual TSubMeshImpl + struct VISU_CONVERTOR_EXPORT TMEDSubMesh: virtual TSubMeshImpl { TMEDSubMesh(): myIsElemNum(MED::eFAUX), @@ -293,7 +294,7 @@ namespace VISU //--------------------------------------------------------------- typedef std::map TFamilyID2CellsSize; - struct TMEDMeshOnEntity: virtual TMeshOnEntityImpl + struct VISU_CONVERTOR_EXPORT TMEDMeshOnEntity: virtual TMeshOnEntityImpl { TFamilyID2CellsSize myFamilyID2CellsSize; MED::TGeom2Size myGeom2Size; @@ -302,25 +303,25 @@ namespace VISU //--------------------------------------------------------------- - struct TMEDFamily: virtual TFamilyImpl + struct VISU_CONVERTOR_EXPORT TMEDFamily: virtual TFamilyImpl {}; typedef MED::SharedPtr PMEDFamily; //--------------------------------------------------------------- - struct TMEDGroup: virtual TGroupImpl + struct VISU_CONVERTOR_EXPORT TMEDGroup: virtual TGroupImpl {}; typedef MED::SharedPtr PMEDGroup; //--------------------------------------------------------------- - struct TMEDField: virtual TFieldImpl + struct VISU_CONVERTOR_EXPORT TMEDField: virtual TFieldImpl {}; typedef MED::SharedPtr PMEDField; //--------------------------------------------------------------- - struct TMEDValForTime: virtual TValForTimeImpl + struct VISU_CONVERTOR_EXPORT TMEDValForTime: virtual TValForTimeImpl {}; typedef MED::SharedPtr PMEDValForTime; diff --git a/src/CONVERTOR/VISU_MeshValue.hxx b/src/CONVERTOR/VISU_MeshValue.hxx index 70c1df6a..f09fb783 100644 --- a/src/CONVERTOR/VISU_MeshValue.hxx +++ b/src/CONVERTOR/VISU_MeshValue.hxx @@ -42,7 +42,7 @@ namespace VISU { //--------------------------------------------------------------- //! Define a base class for the container to get access to data assigned to mesh - class TMeshValueBase + class VISU_CONVERTOR_EXPORT TMeshValueBase { public: //! To intitilize the data strucutre @@ -83,7 +83,7 @@ namespace VISU //--------------------------------------------------------------- //! Define a container to get access to data assigned to mesh template - class TTMeshValue: public virtual TMeshValueBase + class VISU_CONVERTOR_EXPORT TTMeshValue: public virtual TMeshValueBase { public: typedef MED::TSlice TValueSlice; diff --git a/src/CONVERTOR/VISU_PointCoords.hxx b/src/CONVERTOR/VISU_PointCoords.hxx index dfb30f2a..d6a60902 100644 --- a/src/CONVERTOR/VISU_PointCoords.hxx +++ b/src/CONVERTOR/VISU_PointCoords.hxx @@ -32,6 +32,7 @@ \brief The file contains declarations for basic interfaces that defines point coords of mesh elements */ +#include "VISUConvertor.hxx" #include "VISU_Convertor.hxx" #include "VISU_ConvertorDef_impl.hxx" @@ -53,7 +54,7 @@ namespace VISU //--------------------------------------------------------------- //! This class is responsible for keeping the mesh node coordinates - class TCoordHolderBase: public virtual TBaseStructure + class VISU_CONVERTOR_EXPORT TCoordHolderBase: public virtual TBaseStructure { public: //! To initilize the instance @@ -155,7 +156,7 @@ namespace VISU //--------------------------------------------------------------- //! This class is responsible for representation of mesh nodes - class TPointCoords: public virtual TIsVTKDone + class VISU_CONVERTOR_EXPORT TPointCoords: public virtual TIsVTKDone { public: TPointCoords(); @@ -217,7 +218,7 @@ namespace VISU In additition to its base functionlity it support mapping of VTK to object numeration and keeps names for each of nodes. */ - class TNamedPointCoords: public virtual TPointCoords + class VISU_CONVERTOR_EXPORT TNamedPointCoords: public virtual TPointCoords { public: //! To initilize the class (numeration of the nodes can be missed) diff --git a/src/CONVERTOR/VISU_Structures.hxx b/src/CONVERTOR/VISU_Structures.hxx index 512e941a..590d0800 100644 --- a/src/CONVERTOR/VISU_Structures.hxx +++ b/src/CONVERTOR/VISU_Structures.hxx @@ -32,6 +32,7 @@ \brief The file contains definitions for basic classes of the VISU CONVERTER package */ +#include "VISUConvertor.hxx" #include "VISU_IDMapper.hxx" #include "VISU_ConvertorDef.hxx" @@ -52,7 +53,7 @@ namespace VISU //--------------------------------------------------------------- //! Define a basic class for all MED entites which can be identified by its number - struct TIntId: virtual TBaseStructure + struct VISU_CONVERTOR_EXPORT TIntId: virtual TBaseStructure { vtkIdType myId; @@ -62,7 +63,7 @@ namespace VISU //--------------------------------------------------------------- //! Define an utility base class which is repsonsible for preventing repetion - struct TIsVTKDone: virtual TBaseStructure + struct VISU_CONVERTOR_EXPORT TIsVTKDone: virtual TBaseStructure { mutable bool myIsDone; //!< Say, is the corresponding MED entity already loaded into intermediate data structure mutable bool myIsVTKDone; //!< Say, is the corresponding intermediate data structure already mapped into VTK representation @@ -80,7 +81,7 @@ namespace VISU This class in its turn contains map of TMeshOnEntity and TGroup substructures, also it keeps name and dimention of corresponding MED MESH entity. */ - struct TMesh: virtual TBaseStructure + struct VISU_CONVERTOR_EXPORT TMesh: virtual TBaseStructure { TMeshOnEntityMap myMeshOnEntityMap; //!< Contains corresponding meshes for MED ENTITIES TGroupMap myGroupMap; //!< Contains map of bounded MED GROUPS @@ -100,18 +101,18 @@ namespace VISU //--------------------------------------------------------------- //! Define a basic class which corresponds to MED PROFILE entity - struct TSubProfile: virtual TBaseStructure + struct VISU_CONVERTOR_EXPORT TSubProfile: virtual TBaseStructure {}; //--------------------------------------------------------------- //! Define a containerfor MED PROFILE entities which belongs to the same MED ENTITY - struct TProfile: virtual TNamedIDMapper + struct VISU_CONVERTOR_EXPORT TProfile: virtual TNamedIDMapper {}; //--------------------------------------------------------------- - bool + bool VISU_CONVERTOR_EXPORT operator<(const PSubProfile& theLeft, const PSubProfile& theRight); typedef std::set TProfileKey; @@ -120,13 +121,13 @@ namespace VISU //--------------------------------------------------------------- //! Define a basic class for MED GAUSS entity - struct TGauss: virtual TBaseStructure + struct VISU_CONVERTOR_EXPORT TGauss: virtual TBaseStructure {}; //--------------------------------------------------------------- //! Define a container for mesh generated from MED GAUSS and corresponding MED PROFILE - struct TGaussSubMesh: virtual TBaseStructure + struct VISU_CONVERTOR_EXPORT TGaussSubMesh: virtual TBaseStructure { PSubProfile mySubProfile; //!< Keeps reference on what submesh the Gauss Points are located }; @@ -134,12 +135,12 @@ namespace VISU //--------------------------------------------------------------- //! Define a container for all TGaussSubMesh that belongs to the same MED ENTITY - struct TGaussMesh: virtual TGaussPtsIDMapper + struct VISU_CONVERTOR_EXPORT TGaussMesh: virtual TGaussPtsIDMapper {}; //--------------------------------------------------------------- - bool + bool VISU_CONVERTOR_EXPORT operator<(const PGaussSubMesh& theLeft, const PGaussSubMesh& theRight); typedef std::set TGaussKey; @@ -156,7 +157,7 @@ namespace VISU This class in its turn contains map of TGaussMesh and TProfile substructures, also it keeps corresponding map of MED FAMILIES and FIELDS. */ - struct TMeshOnEntity: virtual TNamedIDMapper + struct VISU_CONVERTOR_EXPORT TMeshOnEntity: virtual TNamedIDMapper { TGaussMeshMap myGaussMeshMap; //!< Contains map of Gauss mesh which exist on it TProfileMap myProfileMap; //!< Contains map of Profile mesh which exist on it @@ -173,7 +174,7 @@ namespace VISU //--------------------------------------------------------------- //! Define a basic class for MED FAMILY entity - struct TFamily: virtual TIntId, + struct VISU_CONVERTOR_EXPORT TFamily: virtual TIntId, virtual TUnstructuredGridIDMapper { TEntity myEntity; //!< Referes to MED ENTITY where the TFamily belongs to. @@ -190,7 +191,7 @@ namespace VISU typedef std::set TFamilySet; //! Define a basic class for MED GROUP entity - struct TGroup: virtual TUnstructuredGridIDMapper + struct VISU_CONVERTOR_EXPORT TGroup: virtual TUnstructuredGridIDMapper { TFamilySet myFamilySet; }; @@ -201,7 +202,7 @@ namespace VISU typedef std::pair TMinMax; //! Define a basic class for MED FIELD entity - struct TField: virtual TIntId + struct VISU_CONVERTOR_EXPORT TField: virtual TIntId { TEntity myEntity; //!< Referes to MED ENTITY where it belongs to. TName myName; //!< Contains name of the corresponding MED FIELD @@ -226,7 +227,7 @@ namespace VISU }; // MULTIPR - struct TPart: virtual TIntId + struct VISU_CONVERTOR_EXPORT TPart: virtual TIntId { vtkIdType myCurrentRes; //!< Keeps current resolution fot this part @@ -238,7 +239,7 @@ namespace VISU typedef std::pair TTime; //! Define a basic class for MED TIMESTAMP entity - struct TValForTime: virtual TIntId + struct VISU_CONVERTOR_EXPORT TValForTime: virtual TIntId { TEntity myEntity; //!< Referes to MED ENTITY where it belongs to. TName myMeshName; //!< Contains name of the MED MESH where it belongs to. diff --git a/src/CONVERTOR/VISU_Structures_impl.hxx b/src/CONVERTOR/VISU_Structures_impl.hxx index 57fc5335..baf47957 100644 --- a/src/CONVERTOR/VISU_Structures_impl.hxx +++ b/src/CONVERTOR/VISU_Structures_impl.hxx @@ -32,6 +32,7 @@ \brief The file contains definitions for basic classes of the implementation of VISU CONVERTER package */ +#include "VISUConvertor.hxx" #include "VISU_Structures.hxx" #include "VISU_ConvertorDef_impl.hxx" @@ -42,7 +43,7 @@ namespace VISU { //--------------------------------------------------------------- //! Define an utility base class which allow to keep calculated number of cells and their size - struct TSizeCounter: virtual TIsVTKDone + struct VISU_CONVERTOR_EXPORT TSizeCounter: virtual TIsVTKDone { TSizeCounter(); vtkIdType myNbCells; //!< Number of cells contained into corresponding sublclass @@ -76,7 +77,7 @@ namespace VISU //--------------------------------------------------------------- //! Define a container for VTK representation - class TUnstructuredGridHolder: public virtual TSizeCounter + class VISU_CONVERTOR_EXPORT TUnstructuredGridHolder: public virtual TSizeCounter { public: TUnstructuredGridHolder(); @@ -101,7 +102,7 @@ namespace VISU //--------------------------------------------------------------- //! Define an intermediate class which unifies memory size calculation - struct TMemoryCheckIDMapper: public virtual TIsVTKDone, + struct VISU_CONVERTOR_EXPORT TMemoryCheckIDMapper: public virtual TIsVTKDone, public virtual TIDMapper { //! Gets memory size used by the instance (bytes). @@ -116,7 +117,7 @@ namespace VISU /*! This container allow to combine other VTK representation into single one. */ - class TAppendFilterHolder: public virtual TMemoryCheckIDMapper + class VISU_CONVERTOR_EXPORT TAppendFilterHolder: public virtual TMemoryCheckIDMapper { protected: mutable PAppendFilter myFilter; @@ -182,7 +183,7 @@ namespace VISU //--------------------------------------------------------------- //! Specialize TMesh to provide VTK mapping for nodes - struct TMeshImpl: virtual TMesh, + struct VISU_CONVERTOR_EXPORT TMeshImpl: virtual TMesh, virtual TIsVTKDone { PNamedPointCoords myNamedPointCoords; //!< Keeps intermediate representation of the nodes @@ -206,7 +207,7 @@ namespace VISU typedef enum {eRemoveAll, eAddAll, eAddPart, eNone} ESubMeshStatus; //! Specialize TSubProfile to provide VTK mapping - struct TSubProfileImpl: virtual TSubProfile, + struct VISU_CONVERTOR_EXPORT TSubProfileImpl: virtual TSubProfile, virtual TUnstructuredGridHolder { TSubProfileImpl(); @@ -240,7 +241,7 @@ namespace VISU typedef std::map TGeom2SubProfile; //! Specialize TProfile to provide VTK mapping for MED TIMESTAMP mesh - struct TProfileImpl: virtual TProfile, + struct VISU_CONVERTOR_EXPORT TProfileImpl: virtual TProfile, virtual TAppendFilterHolder { TProfileImpl(); @@ -417,7 +418,7 @@ namespace VISU //--------------------------------------------------------------- //! Specialize TGauss to provide more detail information of the MED GAUSS entity for VTK mapping - struct TGaussImpl: virtual TGauss + struct VISU_CONVERTOR_EXPORT TGaussImpl: virtual TGauss { EGeometry myGeom; //!< Define, to which geometrical type the MED GAUSS entity belongs std::string myName; //!< Keeps name of the MED GAUSS entity @@ -435,7 +436,7 @@ namespace VISU //--------------------------------------------------------------- //! Specialize TGaussSubMesh to provide VTK mapping for the entity - struct TGaussSubMeshImpl: virtual TGaussSubMesh, + struct VISU_CONVERTOR_EXPORT TGaussSubMeshImpl: virtual TGaussSubMesh, virtual TPolyDataHolder { TGaussSubMeshImpl(); @@ -473,7 +474,7 @@ namespace VISU typedef std::map TGeom2GaussSubMesh; //! Specialize TGaussMesh to provide VTK mapping for the entity - struct TGaussMeshImpl: virtual TGaussMesh, + struct VISU_CONVERTOR_EXPORT TGaussMeshImpl: virtual TGaussMesh, virtual TAppendPolyDataHolder { TGaussMeshImpl(); @@ -506,7 +507,7 @@ namespace VISU //--------------------------------------------------------------- //! Specialize TGaussPtsIDMapper to provide VTK mapping for MED TIMESTAMP mesh - struct TGaussPtsIDFilter: virtual TPolyDataIDMapperImpl, + struct VISU_CONVERTOR_EXPORT TGaussPtsIDFilter: virtual TPolyDataIDMapperImpl, virtual TGaussPtsIDMapper { PGaussPtsIDMapper myGaussPtsIDMapper; @@ -538,7 +539,7 @@ namespace VISU typedef TVector TCell2Connect; //! The class is responsible for mapping of cells of defined geometrical type - struct TSubMeshImpl: virtual TUnstructuredGridHolder + struct VISU_CONVERTOR_EXPORT TSubMeshImpl: virtual TUnstructuredGridHolder { TSubMeshImpl(); @@ -567,7 +568,7 @@ namespace VISU typedef TVector TSubMeshArr; //! Specialize TMeshOnEntity to provide VTK mapping for the entity - struct TMeshOnEntityImpl: virtual TMeshOnEntity, + struct VISU_CONVERTOR_EXPORT TMeshOnEntityImpl: virtual TMeshOnEntity, virtual TAppendFilterHolder, virtual TSizeCounter { @@ -625,7 +626,7 @@ namespace VISU typedef std::map TGeom2SubMeshID; //! Specialize TFamily to provide VTK mapping for the entity - struct TFamilyImpl: virtual TFamily, + struct VISU_CONVERTOR_EXPORT TFamilyImpl: virtual TFamily, virtual TUnstructuredGridHolder { //! Reimplement the TIDMapper::GetNodeObjID @@ -670,7 +671,7 @@ namespace VISU typedef TVector TFamilyArr; //! Specialize TGroup to provide VTK mapping for the entity - struct TGroupImpl: virtual TGroup, + struct VISU_CONVERTOR_EXPORT TGroupImpl: virtual TGroup, virtual TAppendFilterHolder { //! Calculate pair of values - number of cells and its size @@ -717,7 +718,7 @@ namespace VISU typedef TVector TMinMaxArr; //! Specialize TField to provide VTK mapping for the entity - struct TFieldImpl: virtual TField + struct VISU_CONVERTOR_EXPORT TFieldImpl: virtual TField { TFieldImpl(); @@ -775,7 +776,7 @@ namespace VISU typedef std::map TGeom2NbGauss; //! Specialize TValForTime to provide VTK mapping for the entity - struct TValForTimeImpl: virtual TValForTime + struct VISU_CONVERTOR_EXPORT TValForTimeImpl: virtual TValForTime { PGaussPtsIDFilter myGaussPtsIDFilter; //!< Keep VTK representation for mesh and data on Gauss Points PUnstructuredGridIDMapperImpl myUnstructuredGridIDMapper; //!< Keep VTK representation for ordinary mesh and data diff --git a/src/PIPELINE/VISU_ColoredPL.hxx b/src/PIPELINE/VISU_ColoredPL.hxx index bb683e0e..045db348 100644 --- a/src/PIPELINE/VISU_ColoredPL.hxx +++ b/src/PIPELINE/VISU_ColoredPL.hxx @@ -118,7 +118,7 @@ public: protected: //---------------------------------------------------------------------------- VISU_ColoredPL(); - VISU_ColoredPL(const VISU_ColoredPL&); + VISU_ColoredPL(const VISU_ColoredPL&) {}; virtual ~VISU_ColoredPL(); diff --git a/src/PIPELINE/VISU_PipeLineUtils.hxx b/src/PIPELINE/VISU_PipeLineUtils.hxx index 5622c0ed..2fcb4bca 100644 --- a/src/PIPELINE/VISU_PipeLineUtils.hxx +++ b/src/PIPELINE/VISU_PipeLineUtils.hxx @@ -106,7 +106,7 @@ namespace VISU //---------------------------------------------------------------------------- //! Checks whether the float values are the same or not - bool + bool VISU_PIPELINE_EXPORT CheckIsSameValue(vtkFloatingPointType theTarget, vtkFloatingPointType theSource); @@ -122,7 +122,7 @@ namespace VISU bool theIsCopyInput); //! Customizes vtkDataSetMapper::ShallowCopy - void + void VISU_PIPELINE_EXPORT CopyDataSetMapper(vtkDataSetMapper* theTarget, vtkDataSetMapper* theSource, bool theIsCopyInput); diff --git a/src/PIPELINE/VISU_UnstructuredGridPL.hxx b/src/PIPELINE/VISU_UnstructuredGridPL.hxx index dbad21e3..2d76f201 100644 --- a/src/PIPELINE/VISU_UnstructuredGridPL.hxx +++ b/src/PIPELINE/VISU_UnstructuredGridPL.hxx @@ -27,13 +27,14 @@ #ifndef VISU_UnstructuredGridPL_HeaderFile #define VISU_UnstructuredGridPL_HeaderFile +#include "VISUPipeline.hxx" #include "VISU_PipeLine.hxx" class VISU_DataSetMapperHolder; class vtkDataSetMapper; //---------------------------------------------------------------------------- -class VISU_UnstructuredGridPL +class VISU_PIPELINE_EXPORT VISU_UnstructuredGridPL { public: //---------------------------------------------------------------------------- diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index 6f1c7e16..7955acb0 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -3318,7 +3318,7 @@ VisuGUI return getApp()->getViewManager(theType,theIsCreate); } -TViewToPrs3d& +VISU::TViewToPrs3d& VisuGUI ::getScalarBarsMap() { @@ -3458,35 +3458,42 @@ void VisuGUI::OnCacheProperties() aDlg->exec(); } -#ifdef ENABLE_MULTIPR - // MULTIPR void VisuGUI::OnMultiprViewFullRes() { +#ifdef ENABLE_MULTIPR OnMultiprChangeRes('F'); +#endif } // MULTIPR void VisuGUI::OnMultiprViewMediumRes() { +#ifdef ENABLE_MULTIPR OnMultiprChangeRes('M'); +#endif } // MULTIPR void VisuGUI::OnMultiprViewLowRes() { +#ifdef ENABLE_MULTIPR OnMultiprChangeRes('L'); +#endif } // MULTIPR void VisuGUI::OnMultiprViewHide() { +#ifdef ENABLE_MULTIPR OnMultiprChangeRes('H'); +#endif } // MULTIPR void VisuGUI::OnMultiprChangeRes(char resolution) { +#ifdef ENABLE_MULTIPR _PTR(Study) aCStudy = GetCStudy(GetAppStudy(this)); if (CheckLock(aCStudy,GetDesktop(this))) return; @@ -3548,6 +3555,6 @@ void VisuGUI::OnMultiprChangeRes(char resolution) } UpdateObjBrowser(this, false); +#endif } -#endif // ENABLE_MULTIPR diff --git a/src/VISUGUI/VisuGUI.h b/src/VISUGUI/VisuGUI.h index c0c9834d..50be5f8d 100644 --- a/src/VISUGUI/VisuGUI.h +++ b/src/VISUGUI/VisuGUI.h @@ -32,6 +32,8 @@ #include "SalomeApp_Module.h" #include "SALOME_ListIO.hxx" +#include "VISU_Prs3d_i.hh" +#include "SVTK_ViewWindow.h" #include #include diff --git a/src/VISUGUI/VisuGUI_CacheDlg.cxx b/src/VISUGUI/VisuGUI_CacheDlg.cxx index 70007bb2..08b19295 100644 --- a/src/VISUGUI/VisuGUI_CacheDlg.cxx +++ b/src/VISUGUI/VisuGUI_CacheDlg.cxx @@ -49,6 +49,8 @@ #include #include +using namespace std; + VisuGUI_CacheDlg::VisuGUI_CacheDlg( VISU::ColoredPrs3dCache_var theCache, SalomeApp_Module* theModule ) : QDialog( VISU::GetDesktop( theModule ), "VisuGUI_CacheDlg", true, @@ -67,7 +69,13 @@ VisuGUI_CacheDlg::VisuGUI_CacheDlg( VISU::ColoredPrs3dCache_var theCache, double aLimitedMemory = myCache->GetLimitedMemory(); double aFreeMemory = (double)VISU_PipeLine::GetAvailableMemory( 2048 * aMb ) / (double)aMb; double anUsedMemory = myCache->GetMemorySize(); - double aLimitedMemoryMax = std::max(anUsedMemory + aFreeMemory, aLimitedMemory); + double aLimitedMemoryMax = +#ifdef WNT + max +#else + std::max +#endif + (anUsedMemory + aFreeMemory, aLimitedMemory); // Settings QButtonGroup* aMemoryGroup = new QButtonGroup( 2, Qt::Vertical, tr( "MEMORY_MODE" ), this ); diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx index 898b62a3..d7122e5f 100644 --- a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx +++ b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx @@ -55,6 +55,8 @@ #include #include #include +#include +#include #include #include diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx index d332917b..591a413b 100644 --- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx +++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx @@ -61,6 +61,8 @@ #include #include #include +#include +#include #include #include diff --git a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx index 696e75d9..b996cc3a 100644 --- a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx +++ b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx @@ -757,7 +757,7 @@ void VisuGUI_GaussPointsDlg::onToggleDefShape( bool on ) void VisuGUI_GaussPointsDlg::accept() { - if( myPrsCopy && myPrimitiveBox->getPrimitiveType() == VISU_OpenGLPointSpriteMapper::GeomSphere ) + if( (bool)myPrsCopy && myPrimitiveBox->getPrimitiveType() == VISU_OpenGLPointSpriteMapper::GeomSphere ) { int aNumberOfFaces = myPrimitiveBox->getFaceNumber(); int aNumberOfPoints = ( (vtkPolyData*)myPrsCopy->GetSpecificPL()->GetInput() )->GetNumberOfCells(); diff --git a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx index a7d454c8..3c20b0a1 100644 --- a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx +++ b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx @@ -54,6 +54,8 @@ #include #include #include +#include +#include #include #include diff --git a/src/VISUGUI/VisuGUI_Tools.h b/src/VISUGUI/VisuGUI_Tools.h index e0e0eb9c..aa795d80 100644 --- a/src/VISUGUI/VisuGUI_Tools.h +++ b/src/VISUGUI/VisuGUI_Tools.h @@ -166,8 +166,6 @@ namespace VISU VISU_Actor* FindActor(const SalomeApp_Study* theStudy, SVTK_ViewWindow* theViewWindow, const QString& theEntry); - VISU_Actor* FindActor(SVTK_ViewWindow* theViewWindow, - VISU::Prs3d_i* thePrs); void RecreateActor(const SalomeApp_Module* theModule, VISU::Prs3d_i* thePrs); diff --git a/src/VISUGUI/VisuGUI_ViewTools.h b/src/VISUGUI/VisuGUI_ViewTools.h index 0b9d1fb6..3556d534 100644 --- a/src/VISUGUI/VisuGUI_ViewTools.h +++ b/src/VISUGUI/VisuGUI_ViewTools.h @@ -130,12 +130,14 @@ namespace VISU //--------------------------------------------------------------- +#ifndef WNT inline +#endif VISU_Actor* UpdateViewer(VisuGUI* theModule, VISU::Prs3d_i* thePrs, bool theDispOnly = false, - const bool theIsHighlight = false); + const bool theIsHighlight = false); //--------------------------------------------------------------- diff --git a/src/VISU_I/VISU_ColoredPrs3dFactory.hh b/src/VISU_I/VISU_ColoredPrs3dFactory.hh index 140377ff..f77b0d22 100644 --- a/src/VISU_I/VISU_ColoredPrs3dFactory.hh +++ b/src/VISU_I/VISU_ColoredPrs3dFactory.hh @@ -31,6 +31,7 @@ #include CORBA_SERVER_HEADER(VISU_Gen) #include CORBA_SERVER_HEADER(SALOMEDS) +#include "VISU_I.hxx" #include "VISU_ScalarMapOnDeformedShape_i.hh" #include "VISU_Plot3D_i.hh" #include "VISU_GaussPoints_i.hh" @@ -130,7 +131,7 @@ namespace VISU //---------------------------------------------------------------------------- - bool + bool VISU_I_EXPORT CreatColoredPrs3d(ColoredPrs3d_i* theColoredPrs3d, Result_i* theResult, const std::string& theMeshName, @@ -191,7 +192,7 @@ namespace VISU //---------------------------------------------------------------------------- //! Gets the memory required for cache - VISU::ColoredPrs3dCache::EnlargeType + VISU_I_EXPORT VISU::ColoredPrs3dCache::EnlargeType GetRequiredCacheMemory(VISU::VISUType theType, VISU::Result_ptr theResult, const std::string& theMeshName, @@ -229,7 +230,7 @@ namespace VISU //---------------------------------------------------------------------------- //! Creates ColoredPrs3dHolder by enumeration value and gets its first device - ColoredPrs3d_i* + VISU_I_EXPORT ColoredPrs3d_i* CreateHolder2GetDeviceByEnum(VISU::VISUType theType, VISU::Result_ptr theResult, const std::string& theMeshName, @@ -295,7 +296,7 @@ namespace VISU //---------------------------------------------------------------------------- //! Check is possible to create ColoredPrs3dHolder with the given input - size_t + VISU_I_EXPORT size_t CheckIsPossible(VISU::VISUType theType, const VISU::ColoredPrs3dHolder::BasicInput& theInput, bool theMemoryCheck); diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.hh b/src/VISU_I/VISU_ColoredPrs3d_i.hh index de53ef4d..72ddb6fd 100644 --- a/src/VISU_I/VISU_ColoredPrs3d_i.hh +++ b/src/VISU_I/VISU_ColoredPrs3d_i.hh @@ -47,7 +47,7 @@ namespace VISU /*! The enumeration allow to define what mode should be used for the presentation building. */ - enum EPublishInStudyMode {EPublishUnderTimeStamp, EPublishIndependently, ERegisterInCache, EDoNotPublish}; + VISU_I_EXPORT enum EPublishInStudyMode {EPublishUnderTimeStamp, EPublishIndependently, ERegisterInCache, EDoNotPublish}; explicit ColoredPrs3d_i(EPublishInStudyMode thePublishInStudyMode); diff --git a/src/VISU_I/VISU_CutLines_i.hh b/src/VISU_I/VISU_CutLines_i.hh index ab01a4f9..742c1072 100644 --- a/src/VISU_I/VISU_CutLines_i.hh +++ b/src/VISU_I/VISU_CutLines_i.hh @@ -27,6 +27,7 @@ #ifndef VISU_CutLines_i_HeaderFile #define VISU_CutLines_i_HeaderFile +#include "VISU_I.hxx" #include "VISU_ScalarMap_i.hh" class VISU_CutLinesPL; @@ -34,11 +35,11 @@ class VISU_CutLinesPL; namespace VISU { //---------------------------------------------------------------------------- - class CutLines_i : public virtual POA_VISU::CutLines, + class VISU_I_EXPORT CutLines_i : public virtual POA_VISU::CutLines, public virtual ScalarMap_i { static int myNbPresent; - CutLines_i(const CutLines_i&); + CutLines_i(const CutLines_i&); public: //---------------------------------------------------------------------------- diff --git a/src/VISU_I/VISU_DeformedShape_i.hh b/src/VISU_I/VISU_DeformedShape_i.hh index b5f877e1..1f5d90c7 100644 --- a/src/VISU_I/VISU_DeformedShape_i.hh +++ b/src/VISU_I/VISU_DeformedShape_i.hh @@ -27,6 +27,7 @@ #ifndef VISU_DeformedShape_i_HeaderFile #define VISU_DeformedShape_i_HeaderFile +#include #include "VISU_ScalarMap_i.hh" class VISU_DeformedShapePL; @@ -34,7 +35,7 @@ class VISU_DeformedShapePL; namespace VISU { //---------------------------------------------------------------------------- - class DeformedShape_i : public virtual POA_VISU::DeformedShape, + class VISU_I_EXPORT DeformedShape_i : public virtual POA_VISU::DeformedShape, public virtual ScalarMap_i { static int myNbPresent; diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc index 72e23aba..dcd5ae50 100644 --- a/src/VISU_I/VISU_Gen_i.cc +++ b/src/VISU_I/VISU_Gen_i.cc @@ -93,7 +93,7 @@ static int MYDEBUG = 0; #endif extern "C" -VISU::VISU_Gen_ptr +VISU_I_EXPORT VISU::VISU_Gen_ptr GetImpl(CORBA::ORB_ptr theORB, PortableServer::POA_ptr thePOA, SALOME_NamingService* theNamingService, diff --git a/src/VISU_I/VISU_Gen_i.hh b/src/VISU_I/VISU_Gen_i.hh index 25dfda98..1f38e06e 100644 --- a/src/VISU_I/VISU_Gen_i.hh +++ b/src/VISU_I/VISU_Gen_i.hh @@ -26,6 +26,7 @@ #include "VISUConfig.hh" +#include "VISU_I.hxx" #include "SALOME_Component_i.hxx" #include "SALOME_NamingService.hxx" #include "VISU_ColoredPrs3d_i.hh" diff --git a/src/VISU_I/VISU_I.hxx b/src/VISU_I/VISU_I.hxx index 58f0a6de..febd82d8 100755 --- a/src/VISU_I/VISU_I.hxx +++ b/src/VISU_I/VISU_I.hxx @@ -32,6 +32,7 @@ # else # define VISU_I_EXPORT __declspec( dllimport ) # endif + # define COPY_COMMAND "copy /Y" # define MOVE_COMMAND "move /Y" # define DELETE_COMMAND "del /F" @@ -43,5 +44,3 @@ #endif - -#endif diff --git a/src/VISU_I/VISU_IsoSurfaces_i.hh b/src/VISU_I/VISU_IsoSurfaces_i.hh index c3820a13..74cc1c3d 100644 --- a/src/VISU_I/VISU_IsoSurfaces_i.hh +++ b/src/VISU_I/VISU_IsoSurfaces_i.hh @@ -27,6 +27,7 @@ #ifndef VISU_IsoSurfaces_i_HeaderFile #define VISU_IsoSurfaces_i_HeaderFile +#include "VISU_I.hxx" #include "VISU_ScalarMap_i.hh" class VISU_IsoSurfacesPL; @@ -34,7 +35,7 @@ class VISU_IsoSurfacesPL; namespace VISU { //---------------------------------------------------------------------------- - class IsoSurfaces_i : public virtual POA_VISU::IsoSurfaces, + class VISU_I_EXPORT IsoSurfaces_i : public virtual POA_VISU::IsoSurfaces, public virtual ScalarMap_i { static int myNbPresent; diff --git a/src/VISU_I/VISU_Result_i.hh b/src/VISU_I/VISU_Result_i.hh index ee66e697..4ef575d0 100644 --- a/src/VISU_I/VISU_Result_i.hh +++ b/src/VISU_I/VISU_Result_i.hh @@ -42,12 +42,7 @@ class VISU_Convertor; namespace VISU { //---------------------------------------------------------------------------- - class VISU_I_EXPORT MinMaxCunsomer: public virtual -#ifdef WNT - boost::bsignals::trackable -#else - boost::signalslib::trackable -#endif + class VISU_I_EXPORT MinMaxCunsomer: public virtual boost::signalslib::trackable { protected: bool myMinMaxIsInitilized; @@ -224,7 +219,7 @@ namespace VISU }; //! To find Result object as published on father of the given SObject - Result_var + VISU_I_EXPORT Result_var FindResult(SALOMEDS::SObject_ptr theSObject); //! To get VISU::Result object published on the given SALOMEDS::SObject diff --git a/src/VISU_I/VISU_ViewManager_i.hh b/src/VISU_I/VISU_ViewManager_i.hh index fef5890b..607e750e 100644 --- a/src/VISU_I/VISU_ViewManager_i.hh +++ b/src/VISU_I/VISU_ViewManager_i.hh @@ -70,10 +70,10 @@ namespace VISU { void RepaintView (SUIT_ViewWindow* theViewWindow); enum Displaing {eDisplayAll, eDisplay, eDisplayOnly, eErase, eEraseAll}; - VISU_Actor* UpdateViewer (SUIT_ViewWindow* theViewWindow, int theDisplaing, Prs3d_i* thePrs = NULL); + VISU_I_EXPORT VISU_Actor* UpdateViewer (SUIT_ViewWindow* theViewWindow, int theDisplaing, Prs3d_i* thePrs = NULL); void UpdatePlot2d (Plot2d_ViewFrame *theView, int theDisplaying, Curve_i* theCurve); - VISU_Actor* VISU_I_EXPORT FindActor(SVTK_ViewWindow* theViewWindow, VISU::Prs3d_i* thePrs3d); + VISU_I_EXPORT VISU_Actor* FindActor(SVTK_ViewWindow* theViewWindow, VISU::Prs3d_i* thePrs3d); void DeleteActors (VISU::Prs3d_i* thePrs); void DeleteActors (VISU::Curve_i* thePrs); -- 2.39.2