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 branch 'V8_4_BR'
[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 e2be6042d64755912c884bd8cbd906028fcf0615..7f3765e8da804950228a2ccc700adb6dda331a9a 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
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-49,6
+49,7
@@
#include <TCollection_AsciiString.hxx>
#include <Resource_DataMapOfAsciiStringAsciiString.hxx>
#include <TColStd_HSequenceOfAsciiString.hxx>
#include <TCollection_AsciiString.hxx>
#include <Resource_DataMapOfAsciiStringAsciiString.hxx>
#include <TColStd_HSequenceOfAsciiString.hxx>
+#include <NCollection_DataMap.hxx>
#include <map>
#include <sstream>
#include <map>
#include <sstream>
@@
-61,56
+62,53
@@
class SALOME_LifeCycleCORBA;
// ==========================================================
class SMESH_I_EXPORT StudyContext
{
// ==========================================================
class SMESH_I_EXPORT StudyContext
{
+ typedef NCollection_DataMap< int, std::string > TInt2StringMap;
+ typedef NCollection_DataMap< int, int > TInt2IntMap;
public:
// constructor
StudyContext() {}
public:
// constructor
StudyContext() {}
- // destructor
- ~StudyContext()
- {
- mapIdToIOR.clear();
- mapIdToId.clear();
- }
+
// register object in the internal map and return its id
// register object in the internal map and return its id
- int addObject( string theIOR )
+ int addObject( st
d::st
ring theIOR )
{
int nextId = getNextId();
{
int nextId = getNextId();
- mapIdToIOR
[ nextId ] = theIOR
;
+ mapIdToIOR
.Bind( nextId, theIOR )
;
return nextId;
}
// find the object id in the internal map by the IOR
return nextId;
}
// find the object id in the internal map by the IOR
- int findId( string theIOR )
+ int findId( st
d::st
ring theIOR )
{
{
-
map<int, string>
::iterator imap;
+
TInt2StringMap
::iterator imap;
for ( imap = mapIdToIOR.begin(); imap != mapIdToIOR.end(); ++imap ) {
for ( imap = mapIdToIOR.begin(); imap != mapIdToIOR.end(); ++imap ) {
- if (
imap->second
== theIOR )
- return imap
->first
;
+ if (
*imap
== theIOR )
+ return imap
.Iterator().Key()
;
}
return 0;
}
// get object's IOR by id
}
return 0;
}
// get object's IOR by id
- string getIORbyId( const int theId )
+ st
d::st
ring getIORbyId( const int theId )
{
{
- if ( mapIdToIOR.
find( theId ) != mapIdToIOR.end(
) )
- return mapIdToIOR
[ theId ]
;
- return st
ring( ""
);
+ if ( mapIdToIOR.
IsBound( theId
) )
+ return mapIdToIOR
( theId )
;
+ return st
d::string(
);
}
// get object's IOR by old id
}
// get object's IOR by old id
- string getIORbyOldId( const int theOldId )
+ st
d::st
ring getIORbyOldId( const int theOldId )
{
{
- if ( mapIdToId.
find( theOldId ) != mapIdToId.end(
) )
- return getIORbyId( mapIdToId
[ theOldId ]
);
- return st
ring( ""
);
+ if ( mapIdToId.
IsBound( theOldId
) )
+ return getIORbyId( mapIdToId
( theOldId )
);
+ return st
d::string(
);
}
// maps old object id to the new one (used when restoring data)
void mapOldToNew( const int oldId, const int newId ) {
}
// maps old object id to the new one (used when restoring data)
void mapOldToNew( const int oldId, const int newId ) {
- mapIdToId
[ oldId ] = newId
;
+ mapIdToId
.Bind( oldId, newId )
;
}
// get old id by a new one
int getOldId( const int newId ) {
}
// get old id by a new one
int getOldId( const int newId ) {
-
map<int, int>
::iterator imap;
+
TInt2IntMap
::iterator imap;
for ( imap = mapIdToId.begin(); imap != mapIdToId.end(); ++imap ) {
for ( imap = mapIdToId.begin(); imap != mapIdToId.end(); ++imap ) {
- if (
imap->second
== newId )
- return imap
->first
;
+ if (
*imap
== newId )
+ return imap
.Iterator().Key()
;
}
return 0;
}
}
return 0;
}
@@
-119,14
+117,11
@@
private:
// get next free object identifier
int getNextId()
{
// get next free object identifier
int getNextId()
{
- int id = 1;
- while( mapIdToIOR.find( id ) != mapIdToIOR.end() )
- id++;
- return id;
+ return mapIdToIOR.Extent() + 1;
}
}
-
map<int, string> mapIdToIOR;
// persistent-to-transient map
-
map<int, int> mapIdToId; // used
to translate object from persistent to transient form
+
TInt2StringMap mapIdToIOR;
// persistent-to-transient map
+
TInt2IntMap mapIdToId; //
to translate object from persistent to transient form
};
// ===========================================================
};
// ===========================================================
@@
-156,9
+151,9
@@
public:
// Get the SALOMEDS::SObject corresponding to a CORBA object
static SALOMEDS::SObject_ptr ObjectToSObject(SALOMEDS::Study_ptr theStudy,
CORBA::Object_ptr theObject);
// Get the SALOMEDS::SObject corresponding to a CORBA object
static SALOMEDS::SObject_ptr ObjectToSObject(SALOMEDS::Study_ptr theStudy,
CORBA::Object_ptr theObject);
- // Get GEOM Object correspoding to TopoDS_Shape
+ // Get GEOM Object correspo
n
ding to TopoDS_Shape
GEOM::GEOM_Object_ptr ShapeToGeomObject (const TopoDS_Shape& theShape );
GEOM::GEOM_Object_ptr ShapeToGeomObject (const TopoDS_Shape& theShape );
- // Get TopoDS_Shape correspoding to GEOM_Object
+ // Get TopoDS_Shape correspo
n
ding to GEOM_Object
TopoDS_Shape GeomObjectToShape(GEOM::GEOM_Object_ptr theGeomObject);
// Default constructor
TopoDS_Shape GeomObjectToShape(GEOM::GEOM_Object_ptr theGeomObject);
// Default constructor
@@
-323,7
+318,7
@@
public:
SMESH::long_array& theShapesId )
throw ( SALOME::SALOME_Exception );
SMESH::long_array& theShapesId )
throw ( SALOME::SALOME_Exception );
- // Returns errors of hypotheses defini
n
tion
+ // Returns errors of hypotheses definition
SMESH::algo_error_array* GetAlgoState( SMESH::SMESH_Mesh_ptr theMesh,
GEOM::GEOM_Object_ptr theSubObject )
throw ( SALOME::SALOME_Exception );
SMESH::algo_error_array* GetAlgoState( SMESH::SMESH_Mesh_ptr theMesh,
GEOM::GEOM_Object_ptr theSubObject )
throw ( SALOME::SALOME_Exception );
@@
-565,10
+560,10
@@
public:
// Return an object that previously had an oldID
template<class TInterface>
// Return an object that previously had an oldID
template<class TInterface>
- typename TInterface::_var_type GetObjectByOldId( const int oldID )
+
typename TInterface::_var_type GetObjectByOldId( const int oldID )
{
if ( StudyContext* myStudyContext = GetCurrentStudyContext() ) {
{
if ( StudyContext* myStudyContext = GetCurrentStudyContext() ) {
- string ior = myStudyContext->getIORbyOldId( oldID );
+ st
d::st
ring ior = myStudyContext->getIORbyOldId( oldID );
if ( !ior.empty() )
return TInterface::_narrow(GetORB()->string_to_object( ior.c_str() ));
}
if ( !ior.empty() )
return TInterface::_narrow(GetORB()->string_to_object( ior.c_str() ));
}
@@
-671,13
+666,13
@@
private:
::SMESH_Gen myGen; // SMESH_Gen local implementation
// hypotheses managing
::SMESH_Gen myGen; // SMESH_Gen local implementation
// hypotheses managing
-
map<
string, GenericHypothesisCreator_i*> myHypCreatorMap;
+
std::map<std::
string, GenericHypothesisCreator_i*> myHypCreatorMap;
- map<int, StudyContext*> myStudyContextMap; // Map of study context objects
+
std::
map<int, StudyContext*> myStudyContextMap; // Map of study context objects
- GEOM_Client* myShapeReader; // Shape reader
- SALOMEDS::Study_var myCurrentStudy; // Current study
- CORBA::Boolean myIsEmbeddedMode; // Current mode
+ GEOM_Client*
myShapeReader; // Shape reader
+ SALOMEDS::Study_var
myCurrentStudy; // Current study
+ CORBA::Boolean
myIsEmbeddedMode; // Current mode
// Default color of groups
std::string myDefaultGroupColor;
// Default color of groups
std::string myDefaultGroupColor;