X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Gen_i.hxx;h=e2be6042d64755912c884bd8cbd906028fcf0615;hb=5b3023e6cb8002da05c9cbd36fac7ce1b67bc461;hp=1306b65bec1936b2506709e04beafdde2531bf8d;hpb=938ed6ac356db6e61606ecc89b11f594057f0d28;p=modules%2Fsmesh.git

diff --git a/src/SMESH_I/SMESH_Gen_i.hxx b/src/SMESH_I/SMESH_Gen_i.hxx
index 1306b65be..e2be6042d 100644
--- a/src/SMESH_I/SMESH_Gen_i.hxx
+++ b/src/SMESH_I/SMESH_Gen_i.hxx
@@ -491,13 +491,6 @@ public:
 
   void CleanPythonTrace (int theStudyID);
 
-  // SIMAN-related functions (check out/check in) : import data to study
-  virtual Engines::ListOfIdentifiers* importData(CORBA::Long studyId,
-                                                 Engines::DataContainer_ptr data,
-                                                 const Engines::ListOfOptions& options);
-  // SIMAN-related functions (check out/check in) : get modified data
-  virtual Engines::ListOfData* getModifiedData(CORBA::Long studyId);
-
   // *****************************************
   // Internal methods
   // *****************************************
@@ -609,36 +602,36 @@ public:
                                 CORBA::Boolean        toCheckAll);
 
   SMESH::long_array* GetInsideSphere( SMESH::SMESH_IDSource_ptr meshPart,
-				      SMESH::ElementType        theElemType,
-				      CORBA::Double             theX,
-				      CORBA::Double             theY,
-				      CORBA::Double             theZ,
-				      CORBA::Double             theR);
+                                      SMESH::ElementType        theElemType,
+                                      CORBA::Double             theX,
+                                      CORBA::Double             theY,
+                                      CORBA::Double             theZ,
+                                      CORBA::Double             theR);
 
   SMESH::long_array* GetInsideBox( SMESH::SMESH_IDSource_ptr meshPart,
-				   SMESH::ElementType        theElemType,
-				   CORBA::Double             theX1, 
-				   CORBA::Double             theY1, 
-				   CORBA::Double             theZ1,
-				   CORBA::Double             theX2,
-				   CORBA::Double             theY2,
-				   CORBA::Double             theZ2);    
+                                   SMESH::ElementType        theElemType,
+                                   CORBA::Double             theX1,
+                                   CORBA::Double             theY1,
+                                   CORBA::Double             theZ1,
+                                   CORBA::Double             theX2,
+                                   CORBA::Double             theY2,
+                                   CORBA::Double             theZ2);
 
   SMESH::long_array* GetInsideCylinder( SMESH::SMESH_IDSource_ptr meshPart,
-					SMESH::ElementType        theElemType,
-					CORBA::Double             theX, 
-					CORBA::Double             theY, 
-					CORBA::Double             theZ,
-					CORBA::Double             theDX, 
-					CORBA::Double             theDY, 
-					CORBA::Double             theDZ,
-					CORBA::Double             theH,
-					CORBA::Double             theR );
+                                        SMESH::ElementType        theElemType,
+                                        CORBA::Double             theX,
+                                        CORBA::Double             theY,
+                                        CORBA::Double             theZ,
+                                        CORBA::Double             theDX,
+                                        CORBA::Double             theDY,
+                                        CORBA::Double             theDZ,
+                                        CORBA::Double             theH,
+                                        CORBA::Double             theR );
 
   SMESH::long_array* GetInside( SMESH::SMESH_IDSource_ptr meshPart,
-				SMESH::ElementType        theElemType,
-				GEOM::GEOM_Object_ptr     theGeom,
-				CORBA::Double             theTolerance );
+                                SMESH::ElementType        theElemType,
+                                GEOM::GEOM_Object_ptr     theGeom,
+                                CORBA::Double             theTolerance );
 
 private:
   // Get hypothesis creator
@@ -664,9 +657,9 @@ private:
                         bool                theStudyIsBeingClosed=false);
 
   std::vector<long> _GetInside(SMESH::SMESH_IDSource_ptr meshPart,
-			       SMESH::ElementType     theElemType,
-			       TopoDS_Shape& aShape,
-			       double* theTolerance = NULL);
+                               SMESH::ElementType     theElemType,
+                               TopoDS_Shape& aShape,
+                               double* theTolerance = NULL);
 
 private:
   static GEOM::GEOM_Gen_var      myGeomGen;
@@ -686,6 +679,9 @@ private:
   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;
 
@@ -695,8 +691,6 @@ private:
   std::vector< int >                                       myLastParamIndex;
   std::vector< std::string >                               myLastParameters;
   std::string                                              myLastObj;
-  int                                                      myImportedStudyId;      // SIMAN: identifier of the imported in importData study to keep no-modifiection flag for getModifiedData method
-  int                                                      myImportedStudyChanged; // SIMAN: flag that indicates that the imported study has been changed (by creation of the additional mesh)
 };