Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V6_main 01/04/2013
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_Gen_i.hxx
diff --git
a/src/SMESH_I/SMESH_Gen_i.hxx
b/src/SMESH_I/SMESH_Gen_i.hxx
index 746f73765029ed22d53a0120bdb47e062615a90c..798670f6bf54a72a9c060b7ebcba846f0b117980 100644
(file)
--- a/
src/SMESH_I/SMESH_Gen_i.hxx
+++ b/
src/SMESH_I/SMESH_Gen_i.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
3
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
@@
-36,13
+36,15
@@
#include CORBA_CLIENT_HEADER(SALOMEDS)
#include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
#include CORBA_CLIENT_HEADER(SALOMEDS)
#include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
+#include "SMESH_Gen.hxx"
#include "SMESH_Mesh_i.hxx"
#include "SMESH_Hypothesis_i.hxx"
#include "SMESH_Mesh_i.hxx"
#include "SMESH_Hypothesis_i.hxx"
-#include "SALOME_Component_i.hxx"
-#include "SALOME_NamingService.hxx"
-#include "SMESH_Gen.hxx"
-#include "GEOM_Client.hxx"
+#include <SALOME_Component_i.hxx>
+#include <SALOME_NamingService.hxx>
+#include <Utils_CorbaException.hxx>
+
+#include <GEOM_Client.hxx>
#include <TCollection_AsciiString.hxx>
#include <Resource_DataMapOfAsciiStringAsciiString.hxx>
#include <TCollection_AsciiString.hxx>
#include <Resource_DataMapOfAsciiStringAsciiString.hxx>
@@
-146,7
+148,7
@@
public:
// Get SALOME_LifeCycleCORBA object
static SALOME_LifeCycleCORBA* GetLCC();
// Retrieve and get GEOM engine reference
// Get SALOME_LifeCycleCORBA object
static SALOME_LifeCycleCORBA* GetLCC();
// Retrieve and get GEOM engine reference
- static GEOM::GEOM_Gen_
pt
r GetGeomEngine();
+ static GEOM::GEOM_Gen_
va
r GetGeomEngine();
// Get object of the CORBA reference
static PortableServer::ServantBase_var GetServant( CORBA::Object_ptr theObject );
// Get CORBA object corresponding to the SALOMEDS::SObject
// Get object of the CORBA reference
static PortableServer::ServantBase_var GetServant( CORBA::Object_ptr theObject );
// Get CORBA object corresponding to the SALOMEDS::SObject
@@
-569,10
+571,13
@@
public:
*/
SALOMEDS::SObject_ptr GetAlgoSO(const ::SMESH_Algo* algo);
*/
SALOMEDS::SObject_ptr GetAlgoSO(const ::SMESH_Algo* algo);
- void UpdateParameters(
/*CORBA::Object_ptr theObject,*/
const char* theParameters);
+ void UpdateParameters(
CORBA::Object_ptr theObject,
const char* theParameters);
char* GetParameters(CORBA::Object_ptr theObject);
char* GetParameters(CORBA::Object_ptr theObject);
- char* ParseParameters(const char* theParameters);
+ //char* ParseParameters(const char* theParameters);
+ const std::vector< int >& GetLastParamIndices() const { return myLastParamIndex; }
const std::vector< std::string >& GetLastParameters() const { return myLastParameters; }
const std::vector< std::string >& GetLastParameters() const { return myLastParameters; }
+ const std::string & GetLastObjEntry() const { return myLastObj; }
+ std::vector< std::string > GetAllParameters(const std::string& theObjectEntry) const;
private:
// Create hypothesis of given type
private:
// Create hypothesis of given type
@@
-618,7
+623,9
@@
private:
// Dump Python: trace of API methods calls
std::map < int, Handle(TColStd_HSequenceOfAsciiString) > myPythonScripts;
bool myIsHistoricalPythonDump;
// Dump Python: trace of API methods calls
std::map < int, Handle(TColStd_HSequenceOfAsciiString) > myPythonScripts;
bool myIsHistoricalPythonDump;
+ std::vector< int > myLastParamIndex;
std::vector< std::string > myLastParameters;
std::vector< std::string > myLastParameters;
+ std::string myLastObj;
};
};
@@
-630,6
+637,15
@@
namespace SMESH
{
return dynamic_cast<T>(SMESH_Gen_i::GetServant(theArg).in());
}
{
return dynamic_cast<T>(SMESH_Gen_i::GetServant(theArg).in());
}
+
+ /*!
+ * \brief Function used in SMESH_CATCH to convert a caught exception to
+ * SALOME::SALOME_Exception
+ */
+ inline void throwCorbaException(const char* excText)
+ {
+ THROW_SALOME_CORBA_EXCEPTION( excText, SALOME::INTERNAL_ERROR );
+ }
}
}