From b42ba9a9f6be23a05e7e944ed677585e7f97fbd3 Mon Sep 17 00:00:00 2001 From: env Date: Tue, 26 Jul 2005 06:16:19 +0000 Subject: [PATCH] ENV: Windows porting. --- src/Communication/SALOMEMultiComm.cxx | 2 + src/Communication/SALOME_Comm_i.cxx | 4 + src/Communication/SALOME_Comm_i.hxx | 2 + src/GenericObj/SALOME_GenericObj_i.hh | 16 ++- .../SALOMEDSImpl_AttributePythonObject.hxx | 4 +- .../SALOMEDSImpl_ChildIterator.hxx | 24 ++-- .../SALOMEDSImpl_SComponentIterator.hxx | 2 +- src/SALOMEDSImpl/SALOMEDSImpl_SObject.hxx | 38 +++--- src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx | 126 +++++++++--------- .../SALOMEDSImpl_StudyBuilder.hxx | 80 +++++------ .../SALOMEDSImpl_StudyManager.hxx | 52 ++++---- .../SALOMEDSImpl_UseCaseBuilder.hxx | 32 ++--- 12 files changed, 203 insertions(+), 179 deletions(-) diff --git a/src/Communication/SALOMEMultiComm.cxx b/src/Communication/SALOMEMultiComm.cxx index c832478ab..bcdf9cbec 100644 --- a/src/Communication/SALOMEMultiComm.cxx +++ b/src/Communication/SALOMEMultiComm.cxx @@ -1,5 +1,7 @@ #include "SALOMEMultiComm.hxx" +#ifndef WNT using namespace std; +#endif SALOMEMultiComm::SALOMEMultiComm():_type(SALOME::CORBA_) { diff --git a/src/Communication/SALOME_Comm_i.cxx b/src/Communication/SALOME_Comm_i.cxx index aed4140b5..71fbdadf8 100644 --- a/src/Communication/SALOME_Comm_i.cxx +++ b/src/Communication/SALOME_Comm_i.cxx @@ -1,4 +1,6 @@ +#ifndef WNT #include +#endif #include "SALOME_Comm_i.hxx" #include "poa.h" #include "omnithread.h" @@ -9,11 +11,13 @@ #include "SenderFactory.hxx" using namespace std; +#ifndef WNT CORBA::ORB_var &getGlobalORB(){ ORB_INIT &init = *SINGLETON_::Instance(); CORBA::ORB_var &orb = init(0,0); return orb; } +#endif /*! Return the C++ data associated to the array to transmit. Used when sender and receiver are collocalized. diff --git a/src/Communication/SALOME_Comm_i.hxx b/src/Communication/SALOME_Comm_i.hxx index 485b4ea8d..f7f196c62 100644 --- a/src/Communication/SALOME_Comm_i.hxx +++ b/src/Communication/SALOME_Comm_i.hxx @@ -109,7 +109,9 @@ public: ~SALOME_CorbaLongCSender_i(); CORBA::ULong getSize(); SALOME::vectorOfLong* sendPart(CORBA::ULong offset, CORBA::ULong length); +#ifndef WNT SALOME::CorbaLongCSender_ptr _this(); +#endif }; #ifdef HAVE_MPI2 diff --git a/src/GenericObj/SALOME_GenericObj_i.hh b/src/GenericObj/SALOME_GenericObj_i.hh index 715b0a98a..550f8e334 100644 --- a/src/GenericObj/SALOME_GenericObj_i.hh +++ b/src/GenericObj/SALOME_GenericObj_i.hh @@ -31,8 +31,22 @@ #include "SALOMEconfig.h" #include CORBA_SERVER_HEADER(SALOME_GenericObj) +#if defined GENERICOBJ_EXPORTS +#if defined WIN32 +#define GENERICOBJ_EXPORT __declspec( dllexport ) +#else +#define GENERICOBJ_EXPORT +#endif +#else +#if defined WNT +#define GENERICOBJ_EXPORT __declspec( dllimport ) +#else +#define GENERICOBJ_EXPORT +#endif +#endif + namespace SALOME{ - class GenericObj_i : + class GENERICOBJ_EXPORT GenericObj_i : public virtual POA_SALOME::GenericObj, public virtual PortableServer::RefCountServantBase { diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_AttributePythonObject.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_AttributePythonObject.hxx index 460e3023e..00d492778 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_AttributePythonObject.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_AttributePythonObject.hxx @@ -19,7 +19,9 @@ class Handle(TDF_RelocationTable); DEFINE_STANDARD_HANDLE( SALOMEDSImpl_AttributePythonObject, SALOMEDSImpl_GenericAttribute ) - +#ifdef GetObject +#undef GetObject +#endif class SALOMEDSImpl_AttributePythonObject : public SALOMEDSImpl_GenericAttribute { diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_ChildIterator.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_ChildIterator.hxx index 7ee1d8974..6cbb18540 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_ChildIterator.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_ChildIterator.hxx @@ -22,18 +22,18 @@ private: public: - SALOMEDSImpl_ChildIterator(const Handle(SALOMEDSImpl_SObject)& theSO); - SALOMEDSImpl_ChildIterator(const TDF_Label& theLabel); - ~SALOMEDSImpl_ChildIterator() {}; - - virtual void Init(); - virtual void Init(const TDF_Label& theLabel); - virtual void InitEx(bool theAllLevels); - virtual void InitEx(const TDF_Label& theLabel, bool theAllLevels); - virtual bool More(); - virtual void Next(); - virtual Handle(SALOMEDSImpl_SObject) Value(); - virtual TDF_Label Label(); + Standard_EXPORT SALOMEDSImpl_ChildIterator(const Handle(SALOMEDSImpl_SObject)& theSO); + Standard_EXPORT SALOMEDSImpl_ChildIterator(const TDF_Label& theLabel); + Standard_EXPORT ~SALOMEDSImpl_ChildIterator() {}; + + Standard_EXPORT virtual void Init(); + Standard_EXPORT virtual void Init(const TDF_Label& theLabel); + Standard_EXPORT virtual void InitEx(bool theAllLevels); + Standard_EXPORT virtual void InitEx(const TDF_Label& theLabel, bool theAllLevels); + Standard_EXPORT virtual bool More(); + Standard_EXPORT virtual void Next(); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SObject) Value(); + Standard_EXPORT virtual TDF_Label Label(); public: DEFINE_STANDARD_RTTI( SALOMEDSImpl_SObject ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_SComponentIterator.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_SComponentIterator.hxx index 42ca6ffe8..b16584481 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_SComponentIterator.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_SComponentIterator.hxx @@ -15,7 +15,7 @@ #include #include -class SALOMEDSImpl_SComponentIterator +class Standard_EXPORT SALOMEDSImpl_SComponentIterator { private: diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_SObject.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_SObject.hxx index a69e6191f..0e01455e3 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_SObject.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_SObject.hxx @@ -34,31 +34,31 @@ protected: public: - SALOMEDSImpl_SObject(const TDF_Label& theLabel); - ~SALOMEDSImpl_SObject(); + Standard_EXPORT SALOMEDSImpl_SObject(const TDF_Label& theLabel); + Standard_EXPORT ~SALOMEDSImpl_SObject(); - virtual TCollection_AsciiString GetID(); - virtual Handle(SALOMEDSImpl_SComponent) GetFatherComponent(); - virtual Handle(SALOMEDSImpl_SObject) GetFather() ; - virtual bool FindAttribute(Handle(TDF_Attribute)& theAttribute, const TCollection_AsciiString& theTypeOfAttribute); - virtual bool ReferencedObject(Handle(SALOMEDSImpl_SObject)& theObject) ; - virtual bool FindSubObject(int theTag, Handle(SALOMEDSImpl_SObject)& theObject); + Standard_EXPORT virtual TCollection_AsciiString GetID(); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SComponent) GetFatherComponent(); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SObject) GetFather() ; + Standard_EXPORT virtual bool FindAttribute(Handle(TDF_Attribute)& theAttribute, const TCollection_AsciiString& theTypeOfAttribute); + Standard_EXPORT virtual bool ReferencedObject(Handle(SALOMEDSImpl_SObject)& theObject) ; + Standard_EXPORT virtual bool FindSubObject(int theTag, Handle(SALOMEDSImpl_SObject)& theObject); - virtual Handle(SALOMEDSImpl_Study) GetStudy() ; - virtual TCollection_AsciiString Name() { return _name; } - virtual void Name(const TCollection_AsciiString& theName) { _name = theName; } - virtual Handle(TColStd_HSequenceOfTransient) GetAllAttributes(); + Standard_EXPORT virtual Handle(SALOMEDSImpl_Study) GetStudy() ; + Standard_EXPORT virtual TCollection_AsciiString Name() { return _name; } + Standard_EXPORT virtual void Name(const TCollection_AsciiString& theName) { _name = theName; } + Standard_EXPORT virtual Handle(TColStd_HSequenceOfTransient) GetAllAttributes(); - virtual TCollection_AsciiString GetName(); - virtual TCollection_AsciiString GetComment(); - virtual TCollection_AsciiString GetIOR(); + Standard_EXPORT virtual TCollection_AsciiString GetName(); + Standard_EXPORT virtual TCollection_AsciiString GetComment(); + Standard_EXPORT virtual TCollection_AsciiString GetIOR(); - virtual int Tag() { return _lab.Tag(); } - virtual int Depth() { return _lab.Depth(); } + Standard_EXPORT virtual int Tag() { return _lab.Tag(); } + Standard_EXPORT virtual int Depth() { return _lab.Depth(); } - virtual TDF_Label GetLabel() { return _lab; } + Standard_EXPORT virtual TDF_Label GetLabel() { return _lab; } - static Standard_GUID GetGUID(const TCollection_AsciiString& theTypeOfAttribute); + Standard_EXPORT static Standard_GUID GetGUID(const TCollection_AsciiString& theTypeOfAttribute); public: DEFINE_STANDARD_RTTI( SALOMEDSImpl_SObject ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx index 3696401a2..e617f3e1e 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx @@ -78,164 +78,164 @@ private: public: - static Handle(SALOMEDSImpl_Study) GetStudy(const TDF_Label& theLabel); - static Handle(SALOMEDSImpl_SObject) SObject(const TDF_Label& theLabel); - static Handle(SALOMEDSImpl_SComponent) SComponent(const TDF_Label& theLabel); - static void IORUpdated(const Handle(SALOMEDSImpl_AttributeIOR)& theAttribute); + Standard_EXPORT static Handle(SALOMEDSImpl_Study) GetStudy(const TDF_Label& theLabel); + Standard_EXPORT static Handle(SALOMEDSImpl_SObject) SObject(const TDF_Label& theLabel); + Standard_EXPORT static Handle(SALOMEDSImpl_SComponent) SComponent(const TDF_Label& theLabel); + Standard_EXPORT static void IORUpdated(const Handle(SALOMEDSImpl_AttributeIOR)& theAttribute); //! standard constructor - SALOMEDSImpl_Study(const Handle(TDocStd_Document)&, const TCollection_AsciiString& study_name); + Standard_EXPORT SALOMEDSImpl_Study(const Handle(TDocStd_Document)&, const TCollection_AsciiString& study_name); //! standard destructor - virtual ~SALOMEDSImpl_Study(); + Standard_EXPORT virtual ~SALOMEDSImpl_Study(); //! method to Get persistent reference of study (idem URL()) - virtual TCollection_AsciiString GetPersistentReference(); + Standard_EXPORT virtual TCollection_AsciiString GetPersistentReference(); //! method to Get transient reference of study - virtual TCollection_AsciiString GetTransientReference(); + Standard_EXPORT virtual TCollection_AsciiString GetTransientReference(); - virtual void SetTransientReference(const TCollection_AsciiString& theIOR); + Standard_EXPORT virtual void SetTransientReference(const TCollection_AsciiString& theIOR); //! method to detect if a study is empty - virtual bool IsEmpty(); + Standard_EXPORT virtual bool IsEmpty(); //! method to Find a Component with ComponentDataType = aComponentName - virtual Handle(SALOMEDSImpl_SComponent) FindComponent (const TCollection_AsciiString& aComponentName); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SComponent) FindComponent (const TCollection_AsciiString& aComponentName); //! method to Find a Component Find a Component from it's ID - virtual Handle(SALOMEDSImpl_SComponent) FindComponentID(const TCollection_AsciiString& aComponentID); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SComponent) FindComponentID(const TCollection_AsciiString& aComponentID); //! method to Find an Object with SALOMEDSImpl::Name = anObjectName - virtual Handle(SALOMEDSImpl_SObject) FindObject(const TCollection_AsciiString& anObjectName); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SObject) FindObject(const TCollection_AsciiString& anObjectName); //! method to Find Object(s) with SALOMEDSImpl::Name=anObjectName in a component with ComponentDataType = aComponentName - virtual Handle(TColStd_HSequenceOfTransient) FindObjectByName( const TCollection_AsciiString& anObjectName, + Standard_EXPORT virtual Handle(TColStd_HSequenceOfTransient) FindObjectByName( const TCollection_AsciiString& anObjectName, const TCollection_AsciiString& aComponentName ) ; //! method to Find an Object with ID = anObjectID - virtual Handle(SALOMEDSImpl_SObject) FindObjectID(const TCollection_AsciiString& anObjectID); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SObject) FindObjectID(const TCollection_AsciiString& anObjectID); //! method to Create an Object with ID = anObjectID - virtual Handle(SALOMEDSImpl_SObject) CreateObjectID(const TCollection_AsciiString& anObjectID); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SObject) CreateObjectID(const TCollection_AsciiString& anObjectID); //! method to Find an Object with ID = anObjectIOR - virtual Handle(SALOMEDSImpl_SObject) FindObjectIOR(const TCollection_AsciiString& anObjectIOR); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SObject) FindObjectIOR(const TCollection_AsciiString& anObjectIOR); //! method to Find an Object by its path - virtual Handle(SALOMEDSImpl_SObject) FindObjectByPath(const TCollection_AsciiString& thePath); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SObject) FindObjectByPath(const TCollection_AsciiString& thePath); //! method to get a path of SObject - virtual TCollection_AsciiString GetObjectPath(const Handle(SALOMEDSImpl_SObject)& theObject); + Standard_EXPORT virtual TCollection_AsciiString GetObjectPath(const Handle(SALOMEDSImpl_SObject)& theObject); - TCollection_AsciiString GetObjectPathByIOR(const TCollection_AsciiString& theIOR); + Standard_EXPORT TCollection_AsciiString GetObjectPathByIOR(const TCollection_AsciiString& theIOR); //! method to set a context: root ('/') is UserData component - virtual bool SetContext(const TCollection_AsciiString& thePath); + Standard_EXPORT virtual bool SetContext(const TCollection_AsciiString& thePath); //! method to get a context - virtual TCollection_AsciiString GetContext(); + Standard_EXPORT virtual TCollection_AsciiString GetContext(); //! method to get all object names in the given context (or in the current context, if 'theContext' is empty) - virtual Handle(TColStd_HSequenceOfAsciiString) GetObjectNames(const TCollection_AsciiString& theContext); + Standard_EXPORT virtual Handle(TColStd_HSequenceOfAsciiString) GetObjectNames(const TCollection_AsciiString& theContext); //! method to get all directory names in the given context (or in the current context, if 'theContext' is empty) - virtual Handle(TColStd_HSequenceOfAsciiString) GetDirectoryNames(const TCollection_AsciiString& theContext); + Standard_EXPORT virtual Handle(TColStd_HSequenceOfAsciiString) GetDirectoryNames(const TCollection_AsciiString& theContext); //! method to get all file names in the given context (or in the current context, if 'theContext' is empty) - virtual Handle(TColStd_HSequenceOfAsciiString) GetFileNames(const TCollection_AsciiString& theContext); + Standard_EXPORT virtual Handle(TColStd_HSequenceOfAsciiString) GetFileNames(const TCollection_AsciiString& theContext); //! method to get all components names - virtual Handle(TColStd_HSequenceOfAsciiString) GetComponentNames(const TCollection_AsciiString& theContext); + Standard_EXPORT virtual Handle(TColStd_HSequenceOfAsciiString) GetComponentNames(const TCollection_AsciiString& theContext); //! method to Create a ChildIterator from an SObject - virtual Handle(SALOMEDSImpl_ChildIterator) NewChildIterator(const Handle(SALOMEDSImpl_SObject)& aSO); + Standard_EXPORT virtual Handle(SALOMEDSImpl_ChildIterator) NewChildIterator(const Handle(SALOMEDSImpl_SObject)& aSO); //! method to Create a SComponentIterator - virtual SALOMEDSImpl_SComponentIterator NewComponentIterator(); + Standard_EXPORT virtual SALOMEDSImpl_SComponentIterator NewComponentIterator(); //! method to Create a StudyBuilder - virtual Handle(SALOMEDSImpl_StudyBuilder) NewBuilder(); + Standard_EXPORT virtual Handle(SALOMEDSImpl_StudyBuilder) NewBuilder(); //! method to get study name - virtual TCollection_AsciiString Name(); + Standard_EXPORT virtual TCollection_AsciiString Name(); //! method to set study name - virtual void Name(const TCollection_AsciiString& name); + Standard_EXPORT virtual void Name(const TCollection_AsciiString& name); //! method to get if study has been saved - virtual bool IsSaved(); + Standard_EXPORT virtual bool IsSaved(); //! method to set if study has been saved - virtual void IsSaved(bool save); + Standard_EXPORT virtual void IsSaved(bool save); //! method to Detect if a Study has been modified since it has been saved - virtual bool IsModified(); + Standard_EXPORT virtual bool IsModified(); //! method to get URL of the study (idem GetPersistentReference) - virtual TCollection_AsciiString URL(); + Standard_EXPORT virtual TCollection_AsciiString URL(); //! method to set URL of the study - virtual void URL(const TCollection_AsciiString& url); + Standard_EXPORT virtual void URL(const TCollection_AsciiString& url); - virtual bool IsLocked(); + Standard_EXPORT virtual bool IsLocked(); - virtual int StudyId(); + Standard_EXPORT virtual int StudyId(); - virtual void StudyId(int id); + Standard_EXPORT virtual void StudyId(int id); - virtual void UpdateIORLabelMap(const TCollection_AsciiString& anIOR, const TCollection_AsciiString& aLabel); + Standard_EXPORT virtual void UpdateIORLabelMap(const TCollection_AsciiString& anIOR, const TCollection_AsciiString& aLabel); - virtual Handle(TColStd_HSequenceOfTransient) FindDependances(const Handle(SALOMEDSImpl_SObject)& anObject); + Standard_EXPORT virtual Handle(TColStd_HSequenceOfTransient) FindDependances(const Handle(SALOMEDSImpl_SObject)& anObject); - virtual Handle(SALOMEDSImpl_AttributeStudyProperties) SALOMEDSImpl_Study::GetProperties(); + Standard_EXPORT virtual Handle(SALOMEDSImpl_AttributeStudyProperties) SALOMEDSImpl_Study::GetProperties(); - virtual TCollection_AsciiString GetLastModificationDate(); + Standard_EXPORT virtual TCollection_AsciiString GetLastModificationDate(); - virtual Handle(TColStd_HSequenceOfAsciiString) GetModificationsDate(); + Standard_EXPORT virtual Handle(TColStd_HSequenceOfAsciiString) GetModificationsDate(); - virtual Handle(SALOMEDSImpl_UseCaseBuilder) GetUseCaseBuilder(); + Standard_EXPORT virtual Handle(SALOMEDSImpl_UseCaseBuilder) GetUseCaseBuilder(); - virtual void Close(); + Standard_EXPORT virtual void Close(); - void EnableUseCaseAutoFilling(bool isEnabled) { _errorCode = ""; _autoFill = isEnabled; } + Standard_EXPORT void EnableUseCaseAutoFilling(bool isEnabled) { _errorCode = ""; _autoFill = isEnabled; } // postponed destroying of object functionality - virtual void AddPostponed(const TCollection_AsciiString& theIOR); + Standard_EXPORT virtual void AddPostponed(const TCollection_AsciiString& theIOR); - virtual void AddCreatedPostponed(const TCollection_AsciiString& theIOR); + Standard_EXPORT virtual void AddCreatedPostponed(const TCollection_AsciiString& theIOR); - virtual Handle(TColStd_HSequenceOfAsciiString) RemovePostponed(const int theUndoLimit); + Standard_EXPORT virtual Handle(TColStd_HSequenceOfAsciiString) RemovePostponed(const int theUndoLimit); // removes postponed IORs of old transaction // if theUndoLimit==0, removes all - virtual void UndoPostponed(const int theWay); // theWay = 1: resurrect objects, + Standard_EXPORT virtual void UndoPostponed(const int theWay); // theWay = 1: resurrect objects, // theWay = -1: get back to the list of postponed - virtual TCollection_AsciiString GetErrorCode() { return _errorCode; } - virtual bool IsError() { return _errorCode != ""; } + Standard_EXPORT virtual TCollection_AsciiString GetErrorCode() { return _errorCode; } + Standard_EXPORT virtual bool IsError() { return _errorCode != ""; } - virtual Handle(SALOMEDSImpl_SComponent) GetSComponent(const TCollection_AsciiString& theEntry); - virtual Handle(SALOMEDSImpl_SComponent) GetSComponent(const TDF_Label& theLabel); - virtual Handle(SALOMEDSImpl_SObject) GetSObject(const TCollection_AsciiString& theEntry); - virtual Handle(SALOMEDSImpl_SObject) GetSObject(const TDF_Label& theEntryLabel); - virtual Handle(TDF_Attribute) GetAttribute(const TCollection_AsciiString& theEntry, + Standard_EXPORT virtual Handle(SALOMEDSImpl_SComponent) GetSComponent(const TCollection_AsciiString& theEntry); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SComponent) GetSComponent(const TDF_Label& theLabel); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SObject) GetSObject(const TCollection_AsciiString& theEntry); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SObject) GetSObject(const TDF_Label& theEntryLabel); + Standard_EXPORT virtual Handle(TDF_Attribute) GetAttribute(const TCollection_AsciiString& theEntry, const TCollection_AsciiString& theType); - virtual bool HasCurrentContext() { return !_current.IsNull(); } + Standard_EXPORT virtual bool HasCurrentContext() { return !_current.IsNull(); } - virtual bool DumpStudy(const TCollection_AsciiString& thePath, + Standard_EXPORT virtual bool DumpStudy(const TCollection_AsciiString& thePath, const TCollection_AsciiString& theBaseName, bool isPublished, SALOMEDSImpl_DriverFactory* theFactory); - static TCollection_AsciiString GetDumpStudyComment(const char* theComponentName = 0); + Standard_EXPORT static TCollection_AsciiString GetDumpStudyComment(const char* theComponentName = 0); - virtual Handle(TDocStd_Document) GetDocument() { return _doc; } + Standard_EXPORT virtual Handle(TDocStd_Document) GetDocument() { return _doc; } //The method dump creates a txt file that contain a dump of the study, for debug use - void dump(const TCollection_AsciiString& theFileName); + Standard_EXPORT void dump(const TCollection_AsciiString& theFileName); public: DEFINE_STANDARD_RTTI( SALOMEDSImpl_Study ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.hxx index 0d81f4209..619ed7e56 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyBuilder.hxx @@ -31,74 +31,74 @@ private: public: - SALOMEDSImpl_StudyBuilder(const Handle(Standard_Transient)& theOwner); + Standard_EXPORT SALOMEDSImpl_StudyBuilder(const Handle(Standard_Transient)& theOwner); - ~SALOMEDSImpl_StudyBuilder(); + Standard_EXPORT ~SALOMEDSImpl_StudyBuilder(); - virtual Handle(SALOMEDSImpl_SComponent) NewComponent(const TCollection_AsciiString& ComponentDataType); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SComponent) NewComponent(const TCollection_AsciiString& ComponentDataType); - virtual bool DefineComponentInstance (const Handle(SALOMEDSImpl_SComponent)&, const TCollection_AsciiString& ComponentIOR); + Standard_EXPORT virtual bool DefineComponentInstance (const Handle(SALOMEDSImpl_SComponent)&, const TCollection_AsciiString& ComponentIOR); - virtual bool RemoveComponent(const Handle(SALOMEDSImpl_SComponent)& aComponent); + Standard_EXPORT virtual bool RemoveComponent(const Handle(SALOMEDSImpl_SComponent)& aComponent); - virtual Handle(SALOMEDSImpl_SObject) NewObject(const Handle(SALOMEDSImpl_SObject)& theFatherObject); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SObject) NewObject(const Handle(SALOMEDSImpl_SObject)& theFatherObject); - virtual Handle(SALOMEDSImpl_SObject) NewObjectToTag(const Handle(SALOMEDSImpl_SObject)& theFatherObject, + Standard_EXPORT virtual Handle(SALOMEDSImpl_SObject) NewObjectToTag(const Handle(SALOMEDSImpl_SObject)& theFatherObject, const int theTag); //! The methods adds a new subdirectory, the path can be absolute or relative (then the current context is used) - virtual bool AddDirectory(const TCollection_AsciiString& thePath); + Standard_EXPORT virtual bool AddDirectory(const TCollection_AsciiString& thePath); - virtual bool LoadWith(const Handle(SALOMEDSImpl_SComponent)& sco, SALOMEDSImpl_Driver* Engine); - virtual bool Load(const Handle(SALOMEDSImpl_SObject)& sco); + Standard_EXPORT virtual bool LoadWith(const Handle(SALOMEDSImpl_SComponent)& sco, SALOMEDSImpl_Driver* Engine); + Standard_EXPORT virtual bool Load(const Handle(SALOMEDSImpl_SObject)& sco); - virtual bool RemoveObject(const Handle(SALOMEDSImpl_SObject)& anObject); - virtual bool RemoveObjectWithChildren(const Handle(SALOMEDSImpl_SObject)& anObject); + Standard_EXPORT virtual bool RemoveObject(const Handle(SALOMEDSImpl_SObject)& anObject); + Standard_EXPORT virtual bool RemoveObjectWithChildren(const Handle(SALOMEDSImpl_SObject)& anObject); - virtual Handle(TDF_Attribute) FindOrCreateAttribute(const Handle(SALOMEDSImpl_SObject)& anObject, + Standard_EXPORT virtual Handle(TDF_Attribute) FindOrCreateAttribute(const Handle(SALOMEDSImpl_SObject)& anObject, const TCollection_AsciiString& aTypeOfAttribute); - virtual bool FindAttribute(const Handle(SALOMEDSImpl_SObject)& anObject, + Standard_EXPORT virtual bool FindAttribute(const Handle(SALOMEDSImpl_SObject)& anObject, Handle(TDF_Attribute)& anAttribute, const TCollection_AsciiString& aTypeOfAttribute); - virtual bool RemoveAttribute(const Handle(SALOMEDSImpl_SObject)& anObject, const TCollection_AsciiString& aTypeOfAttribute); + Standard_EXPORT virtual bool RemoveAttribute(const Handle(SALOMEDSImpl_SObject)& anObject, const TCollection_AsciiString& aTypeOfAttribute); - virtual bool Addreference(const Handle(SALOMEDSImpl_SObject)& me, + Standard_EXPORT virtual bool Addreference(const Handle(SALOMEDSImpl_SObject)& me, const Handle(SALOMEDSImpl_SObject)& thereferencedObject); - virtual bool RemoveReference(const Handle(SALOMEDSImpl_SObject)& me); + Standard_EXPORT virtual bool RemoveReference(const Handle(SALOMEDSImpl_SObject)& me); - virtual bool SetGUID(const Handle(SALOMEDSImpl_SObject)& anObject, const TCollection_AsciiString& theGUID); - virtual bool IsGUID(const Handle(SALOMEDSImpl_SObject)& anObject, const TCollection_AsciiString& theGUID); + Standard_EXPORT virtual bool SetGUID(const Handle(SALOMEDSImpl_SObject)& anObject, const TCollection_AsciiString& theGUID); + Standard_EXPORT virtual bool IsGUID(const Handle(SALOMEDSImpl_SObject)& anObject, const TCollection_AsciiString& theGUID); - virtual void NewCommand(); - virtual void CommitCommand(); - virtual bool HasOpenCommand(); - virtual void AbortCommand(); - virtual void Undo(); - virtual void Redo(); - bool GetAvailableUndos(); - bool GetAvailableRedos(); - bool IsSaved(); - bool IsModified(); - virtual int UndoLimit(); - virtual void UndoLimit(const int); + Standard_EXPORT virtual void NewCommand(); + Standard_EXPORT virtual void CommitCommand(); + Standard_EXPORT virtual bool HasOpenCommand(); + Standard_EXPORT virtual void AbortCommand(); + Standard_EXPORT virtual void Undo(); + Standard_EXPORT virtual void Redo(); + Standard_EXPORT bool GetAvailableUndos(); + Standard_EXPORT bool GetAvailableRedos(); + Standard_EXPORT bool IsSaved(); + Standard_EXPORT bool IsModified(); + Standard_EXPORT virtual int UndoLimit(); + Standard_EXPORT virtual void UndoLimit(const int); - void CheckLocked(); + Standard_EXPORT void CheckLocked(); - virtual Handle(SALOMEDSImpl_Callback) SetOnAddSObject(const Handle(SALOMEDSImpl_Callback)& theCallback); - virtual Handle(SALOMEDSImpl_Callback) SetOnRemoveSObject(const Handle(SALOMEDSImpl_Callback)& theCallback); + Standard_EXPORT virtual Handle(SALOMEDSImpl_Callback) SetOnAddSObject(const Handle(SALOMEDSImpl_Callback)& theCallback); + Standard_EXPORT virtual Handle(SALOMEDSImpl_Callback) SetOnRemoveSObject(const Handle(SALOMEDSImpl_Callback)& theCallback); - virtual bool SetName(const Handle(SALOMEDSImpl_SObject)& theSO, const TCollection_AsciiString& theValue); + Standard_EXPORT virtual bool SetName(const Handle(SALOMEDSImpl_SObject)& theSO, const TCollection_AsciiString& theValue); - virtual bool SetComment(const Handle(SALOMEDSImpl_SObject)& theSO, const TCollection_AsciiString& theValue); + Standard_EXPORT virtual bool SetComment(const Handle(SALOMEDSImpl_SObject)& theSO, const TCollection_AsciiString& theValue); - virtual bool SetIOR(const Handle(SALOMEDSImpl_SObject)& theSO, const TCollection_AsciiString& theValue); + Standard_EXPORT virtual bool SetIOR(const Handle(SALOMEDSImpl_SObject)& theSO, const TCollection_AsciiString& theValue); - virtual TCollection_AsciiString GetErrorCode() { return _errorCode; } - virtual bool IsError() { return _errorCode != ""; } + Standard_EXPORT virtual TCollection_AsciiString GetErrorCode() { return _errorCode; } + Standard_EXPORT virtual bool IsError() { return _errorCode != ""; } - virtual Handle(Standard_Transient) GetOwner() { return _study; } + Standard_EXPORT virtual Handle(Standard_Transient) GetOwner() { return _study; } public: DEFINE_STANDARD_RTTI( SALOMEDSImpl_StudyBuilder ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.hxx index 7f8709f81..23fea1903 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_StudyManager.hxx @@ -39,87 +39,87 @@ private: public: //! standard constructor - SALOMEDSImpl_StudyManager(); + Standard_EXPORT SALOMEDSImpl_StudyManager(); //! standard destructor - virtual ~SALOMEDSImpl_StudyManager(); + Standard_EXPORT virtual ~SALOMEDSImpl_StudyManager(); //! method to Create a New Study of name study_name - virtual Handle(SALOMEDSImpl_Study) NewStudy(const TCollection_AsciiString& study_name); + Standard_EXPORT virtual Handle(SALOMEDSImpl_Study) NewStudy(const TCollection_AsciiString& study_name); //! method to Open a Study from it's persistent reference - virtual Handle(SALOMEDSImpl_Study) Open(const TCollection_AsciiString& aStudyUrl); + Standard_EXPORT virtual Handle(SALOMEDSImpl_Study) Open(const TCollection_AsciiString& aStudyUrl); //! method to close a Study - virtual void Close(const Handle(SALOMEDSImpl_Study)& aStudy); + Standard_EXPORT virtual void Close(const Handle(SALOMEDSImpl_Study)& aStudy); //! method to save a Study - virtual bool Save(const Handle(SALOMEDSImpl_Study)& aStudy, SALOMEDSImpl_DriverFactory* aFactory, bool theMultiFile); + Standard_EXPORT virtual bool Save(const Handle(SALOMEDSImpl_Study)& aStudy, SALOMEDSImpl_DriverFactory* aFactory, bool theMultiFile); - virtual bool SaveASCII(const Handle(SALOMEDSImpl_Study)& aStudy, + Standard_EXPORT virtual bool SaveASCII(const Handle(SALOMEDSImpl_Study)& aStudy, SALOMEDSImpl_DriverFactory* aFactory, bool theMultiFile); //! method to save a Study to the persistent reference aUrl - virtual bool SaveAs(const TCollection_AsciiString& aUrl, + Standard_EXPORT virtual bool SaveAs(const TCollection_AsciiString& aUrl, const Handle(SALOMEDSImpl_Study)& aStudy, SALOMEDSImpl_DriverFactory* aFactory, bool theMultiFile); - virtual bool SaveAsASCII(const TCollection_AsciiString& aUrl, + Standard_EXPORT virtual bool SaveAsASCII(const TCollection_AsciiString& aUrl, const Handle(SALOMEDSImpl_Study)& aStudy, SALOMEDSImpl_DriverFactory* aFactory, bool theMultiFile); //! method to Get name list of open studies in the session - virtual Handle(TColStd_HSequenceOfTransient) GetOpenStudies(); + Standard_EXPORT virtual Handle(TColStd_HSequenceOfTransient) GetOpenStudies(); //! method to get a Study from it's name - virtual Handle(SALOMEDSImpl_Study) GetStudyByName(const TCollection_AsciiString& aStudyName) ; + Standard_EXPORT virtual Handle(SALOMEDSImpl_Study) GetStudyByName(const TCollection_AsciiString& aStudyName) ; //! method to get a Study from it's ID - virtual Handle(SALOMEDSImpl_Study) GetStudyByID(int aStudyID) ; + Standard_EXPORT virtual Handle(SALOMEDSImpl_Study) GetStudyByID(int aStudyID) ; - Handle(TDocStd_Document) GetDocumentOfStudy(const Handle(SALOMEDSImpl_Study)& theStudy); + Standard_EXPORT Handle(TDocStd_Document) GetDocumentOfStudy(const Handle(SALOMEDSImpl_Study)& theStudy); - Handle(TDocStd_Document) GetClipboard() { return _clipboard; } + Standard_EXPORT Handle(TDocStd_Document) GetClipboard() { return _clipboard; } - bool CopyLabel(const Handle(SALOMEDSImpl_Study)& theSourceStudy, + Standard_EXPORT bool CopyLabel(const Handle(SALOMEDSImpl_Study)& theSourceStudy, SALOMEDSImpl_Driver* theEngine, const int theSourceStartDepth, const TDF_Label& theSource, const TDF_Label& theDestinationMain); - TDF_Label PasteLabel(const Handle(SALOMEDSImpl_Study)& theDestinationStudy, + Standard_EXPORT TDF_Label PasteLabel(const Handle(SALOMEDSImpl_Study)& theDestinationStudy, SALOMEDSImpl_Driver* theEngine, const TDF_Label& theSource, const TDF_Label& theDestinationStart, const int theCopiedStudyID, const bool isFirstElement); - virtual bool CanCopy(const Handle(SALOMEDSImpl_SObject)& theObject, SALOMEDSImpl_Driver* Engine); - virtual bool Copy(const Handle(SALOMEDSImpl_SObject)& theObject, SALOMEDSImpl_Driver* Engine); - virtual bool CanPaste(const Handle(SALOMEDSImpl_SObject)& theObject, SALOMEDSImpl_Driver* Engine); - virtual Handle(SALOMEDSImpl_SObject) Paste(const Handle(SALOMEDSImpl_SObject)& theObject, SALOMEDSImpl_Driver* Engine); + Standard_EXPORT virtual bool CanCopy(const Handle(SALOMEDSImpl_SObject)& theObject, SALOMEDSImpl_Driver* Engine); + Standard_EXPORT virtual bool Copy(const Handle(SALOMEDSImpl_SObject)& theObject, SALOMEDSImpl_Driver* Engine); + Standard_EXPORT virtual bool CanPaste(const Handle(SALOMEDSImpl_SObject)& theObject, SALOMEDSImpl_Driver* Engine); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SObject) Paste(const Handle(SALOMEDSImpl_SObject)& theObject, SALOMEDSImpl_Driver* Engine); // _SaveAs private function called by Save and SaveAs - virtual bool Impl_SaveAs(const TCollection_AsciiString& aUrl, + Standard_EXPORT virtual bool Impl_SaveAs(const TCollection_AsciiString& aUrl, const Handle(SALOMEDSImpl_Study)& aStudy, SALOMEDSImpl_DriverFactory* aFactory, bool theMultiFile, bool theASCII); // _SaveObject private function called by _SaveAs - virtual bool Impl_SaveObject(const Handle(SALOMEDSImpl_SObject)& SC, HDFgroup *hdf_group_datatype); + Standard_EXPORT virtual bool Impl_SaveObject(const Handle(SALOMEDSImpl_SObject)& SC, HDFgroup *hdf_group_datatype); // _SubstituteSlash function called by Open and GetStudyByName - virtual TCollection_AsciiString Impl_SubstituteSlash(const TCollection_AsciiString& aUrl); + Standard_EXPORT virtual TCollection_AsciiString Impl_SubstituteSlash(const TCollection_AsciiString& aUrl); - virtual bool Impl_SaveProperties(const Handle(SALOMEDSImpl_Study)& aStudy, HDFgroup *hdf_group); + Standard_EXPORT virtual bool Impl_SaveProperties(const Handle(SALOMEDSImpl_Study)& aStudy, HDFgroup *hdf_group); - TCollection_AsciiString GetErrorCode() { return _errorCode; } - virtual bool IsError() { return _errorCode != ""; } + Standard_EXPORT TCollection_AsciiString GetErrorCode() { return _errorCode; } + Standard_EXPORT virtual bool IsError() { return _errorCode != ""; } public: DEFINE_STANDARD_RTTI( SALOMEDSImpl_StudyManager ) diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.hxx index 12e46468f..a0a0d938b 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.hxx @@ -28,38 +28,38 @@ private: public: //! standard constructor - SALOMEDSImpl_UseCaseBuilder(const Handle(TDocStd_Document)& theDocument); + Standard_EXPORT SALOMEDSImpl_UseCaseBuilder(const Handle(TDocStd_Document)& theDocument); //! standard destructor - ~SALOMEDSImpl_UseCaseBuilder(); + Standard_EXPORT ~SALOMEDSImpl_UseCaseBuilder(); - virtual bool Append(const Handle(SALOMEDSImpl_SObject)& theObject); + Standard_EXPORT virtual bool Append(const Handle(SALOMEDSImpl_SObject)& theObject); - virtual bool Remove(const Handle(SALOMEDSImpl_SObject)& theObject); + Standard_EXPORT virtual bool Remove(const Handle(SALOMEDSImpl_SObject)& theObject); - virtual bool AppendTo(const Handle(SALOMEDSImpl_SObject)& theFather, const Handle(SALOMEDSImpl_SObject)& theObject); + Standard_EXPORT virtual bool AppendTo(const Handle(SALOMEDSImpl_SObject)& theFather, const Handle(SALOMEDSImpl_SObject)& theObject); - virtual bool InsertBefore(const Handle(SALOMEDSImpl_SObject)& theFirst, const Handle(SALOMEDSImpl_SObject)& theNext); + Standard_EXPORT virtual bool InsertBefore(const Handle(SALOMEDSImpl_SObject)& theFirst, const Handle(SALOMEDSImpl_SObject)& theNext); - virtual bool SetCurrentObject(const Handle(SALOMEDSImpl_SObject)& theObject); + Standard_EXPORT virtual bool SetCurrentObject(const Handle(SALOMEDSImpl_SObject)& theObject); - virtual bool SetRootCurrent(); + Standard_EXPORT virtual bool SetRootCurrent(); - virtual bool HasChildren(const Handle(SALOMEDSImpl_SObject)& theObject); + Standard_EXPORT virtual bool HasChildren(const Handle(SALOMEDSImpl_SObject)& theObject); - virtual bool IsUseCase(const Handle(SALOMEDSImpl_SObject)& theObject); + Standard_EXPORT virtual bool IsUseCase(const Handle(SALOMEDSImpl_SObject)& theObject); - virtual bool SetName(const TCollection_AsciiString& theName); + Standard_EXPORT virtual bool SetName(const TCollection_AsciiString& theName); - virtual Handle(SALOMEDSImpl_SObject) GetCurrentObject(); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SObject) GetCurrentObject(); - virtual TCollection_AsciiString GetName(); + Standard_EXPORT virtual TCollection_AsciiString GetName(); - virtual Handle(SALOMEDSImpl_SObject) AddUseCase(const TCollection_AsciiString& theName); + Standard_EXPORT virtual Handle(SALOMEDSImpl_SObject) AddUseCase(const TCollection_AsciiString& theName); - virtual Handle(SALOMEDSImpl_UseCaseIterator) GetUseCaseIterator(const Handle(SALOMEDSImpl_SObject)& anObject); + Standard_EXPORT virtual Handle(SALOMEDSImpl_UseCaseIterator) GetUseCaseIterator(const Handle(SALOMEDSImpl_SObject)& anObject); - Handle(SALOMEDSImpl_SObject) GetSObject(const TCollection_AsciiString& theEntry); + Standard_EXPORT Handle(SALOMEDSImpl_SObject) GetSObject(const TCollection_AsciiString& theEntry); public: DEFINE_STANDARD_RTTI( SALOMEDSImpl_UseCaseBuilder ) -- 2.39.2