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 c78122345a1a3040e423c272cb2a78752622919f..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
@@
-571,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
@@
-620,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;
};
};