X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Gen_i.hxx;h=1e869462cd65cf08dc9936b82e669d92e7550975;hp=7f642720517fc7d3a7018437cd9877102002de74;hb=5504d02a2237b17b8459bcd3b1fb2a89468598cd;hpb=8ab62ff6f459870aa750e8bc090b75b42e53c2c0

diff --git a/src/SMESH_I/SMESH_Gen_i.hxx b/src/SMESH_I/SMESH_Gen_i.hxx
index 7f6427205..1e869462c 100644
--- a/src/SMESH_I/SMESH_Gen_i.hxx
+++ b/src/SMESH_I/SMESH_Gen_i.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -71,16 +71,16 @@ public:
     mapIdToId.clear();
   }
   // register object in the internal map and return its id
-  int addObject( string theIOR )
+  int addObject( std::string theIOR )
   {
     int nextId = getNextId();
     mapIdToIOR[ nextId ]  = theIOR;
     return nextId;
   }
   // find the object id in the internal map by the IOR
-  int findId( string theIOR )
+  int findId( std::string theIOR )
   {
-    map<int, string>::iterator imap;
+    std::map<int, std::string>::iterator imap;
     for ( imap = mapIdToIOR.begin(); imap != mapIdToIOR.end(); ++imap ) {
       if ( imap->second == theIOR )
         return imap->first;
@@ -88,18 +88,18 @@ public:
     return 0;
   }
   // get object's IOR by id
-  string getIORbyId( const int theId )
+  std::string getIORbyId( const int theId )
   {
     if ( mapIdToIOR.find( theId ) != mapIdToIOR.end() )
       return mapIdToIOR[ theId ];
-    return string( "" );
+    return std::string( "" );
   }
   // get object's IOR by old id
-  string getIORbyOldId( const int theOldId )
+  std::string getIORbyOldId( const int theOldId )
   {
     if ( mapIdToId.find( theOldId ) != mapIdToId.end() )
       return getIORbyId( mapIdToId[ theOldId ] );
-    return string( "" );
+    return std::string( "" );
   }
   // maps old object id to the new one (used when restoring data)
   void mapOldToNew( const int oldId, const int newId ) {
@@ -107,7 +107,7 @@ public:
   }
   // get old id by a new one
   int getOldId( const int newId ) {
-    map<int, int>::iterator imap;
+    std::map<int, int>::iterator imap;
     for ( imap = mapIdToId.begin(); imap != mapIdToId.end(); ++imap ) {
       if ( imap->second == newId )
         return imap->first;
@@ -125,8 +125,8 @@ private:
     return id;
   }
 
-  map<int, string> mapIdToIOR;      // persistent-to-transient map
-  map<int, int>    mapIdToId;       // used to translate object from persistent to transient form
+  std::map<int, std::string> mapIdToIOR; // persistent-to-transient map
+  std::map<int, int>         mapIdToId;  // to translate object from persistent to transient form
 };
 
 // ===========================================================
@@ -568,7 +568,7 @@ public:
   typename TInterface::_var_type GetObjectByOldId( const int oldID )
   {
     if ( StudyContext* myStudyContext = GetCurrentStudyContext() ) {
-      string ior = myStudyContext->getIORbyOldId( oldID );
+      std::string ior = myStudyContext->getIORbyOldId( oldID );
       if ( !ior.empty() )
         return TInterface::_narrow(GetORB()->string_to_object( ior.c_str() ));
     }
@@ -671,13 +671,16 @@ private:
   ::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;
 
   // To load full mesh data from study at hyp modification or not
   bool myToForgetMeshDataOnHypModif;