Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'occ/shaper2smesh'
[modules/kernel.git]
/
src
/
SALOMEDS
/
SALOMEDS_Study_i.hxx
diff --git
a/src/SALOMEDS/SALOMEDS_Study_i.hxx
b/src/SALOMEDS/SALOMEDS_Study_i.hxx
index 232b0fb4cadfaaae13362c299e5f5bd91402d9fe..330f54b7c1f9f62560c051a4184d491298bbd5a0 100644
(file)
--- a/
src/SALOMEDS/SALOMEDS_Study_i.hxx
+++ b/
src/SALOMEDS/SALOMEDS_Study_i.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-66,17
+66,27
@@
public:
SALOMEDS_Study_i(CORBA::ORB_ptr);
//! standard destructor
SALOMEDS_Study_i(CORBA::ORB_ptr);
//! standard destructor
+
virtual ~SALOMEDS_Study_i();
virtual ~SALOMEDS_Study_i();
-
+
+ virtual PortableServer::POA_ptr _default_POA();
+
virtual void Init();
virtual void Clear();
virtual void Init();
virtual void Clear();
- //! method to
O
pen a Study
+ //! method to
o
pen a Study
/*!
\param char* arguments, the study URL
/*!
\param char* arguments, the study URL
- \return
Study_ptr
arguments
+ \return
bool
arguments
*/
*/
- virtual bool Open(const char* aStudyUrl) throw (SALOME::SALOME_Exception);
+ virtual bool Open(const wchar_t* aStudyUrl) throw (SALOME::SALOME_Exception);
+
+ //! method to check that a Study can be opened
+ /*!
+ \param char* arguments, the study URL
+ \return bool arguments
+ */
+ virtual bool CanOpen(const wchar_t* aStudyUrl);
//! method to save a Study
virtual CORBA::Boolean Save(CORBA::Boolean theMultiFile, CORBA::Boolean theASCII);
//! method to save a Study
virtual CORBA::Boolean Save(CORBA::Boolean theMultiFile, CORBA::Boolean theASCII);
@@
-85,7
+95,7
@@
public:
/*!
\param char* arguments, the new URL of the study
*/
/*!
\param char* arguments, the new URL of the study
*/
- virtual CORBA::Boolean SaveAs(const
char
* aUrl, CORBA::Boolean theMultiFile, CORBA::Boolean theASCII);
+ virtual CORBA::Boolean SaveAs(const
wchar_t
* aUrl, CORBA::Boolean theMultiFile, CORBA::Boolean theASCII);
//! method to copy the object
/*!
//! method to copy the object
/*!
@@
-202,7
+212,13
@@
public:
/*!
\return char* arguments, the study name
*/
/*!
\return char* arguments, the study name
*/
- virtual char* Name();
+ virtual wchar_t* Name();
+
+ //! method to set study name
+ /*!
+ \param name char* arguments, the study name
+ */
+ virtual void Name(const wchar_t* name);
//! method to get if study has been saved
/*!
//! method to get if study has been saved
/*!
@@
-229,13
+245,13
@@
public:
/*!
\return char* arguments, the study URL
*/
/*!
\return char* arguments, the study URL
*/
- virtual
char
* URL();
+ virtual
wchar_t
* URL();
//! method to set URL of the study
/*!
\param url char* arguments, the study URL
*/
//! method to set URL of the study
/*!
\param url char* arguments, the study URL
*/
- virtual void
URL(const char
* url);
+ virtual void
URL(const wchar_t
* url);
static void IORUpdated(SALOMEDSImpl_AttributeIOR* theAttribute);
static void IORUpdated(SALOMEDSImpl_AttributeIOR* theAttribute);
@@
-324,10
+340,15
@@
public:
CORBA::Boolean isPublished,
CORBA::Boolean isMultiFile);
CORBA::Boolean isPublished,
CORBA::Boolean isMultiFile);
+ virtual char* GetDumpPath();
+
virtual SALOMEDSImpl_Study* GetImpl() { return _impl; }
virtual CORBA::LongLong GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal);
virtual SALOMEDSImpl_Study* GetImpl() { return _impl; }
virtual CORBA::LongLong GetLocalImpl(const char* theHostname, CORBA::Long thePID, CORBA::Boolean& isLocal);
+ static void SetThePOA(PortableServer::POA_ptr);
+ static PortableServer::POA_ptr GetThePOA();
+
void ping(){};
CORBA::Long getPID();
void ShutdownWithExit();
void ping(){};
CORBA::Long getPID();
void ShutdownWithExit();