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=fb16909b89743ceb7c0822599a0afd0ef66409a9;hp=7f642720517fc7d3a7018437cd9877102002de74;hb=cb55604f37e3d2583272fd436bb6557b041948b5;hpb=193c49c87753b6ccabb2b5e6dc935aa480d2d43e diff --git a/src/SMESH_I/SMESH_Gen_i.hxx b/src/SMESH_I/SMESH_Gen_i.hxx index 7f6427205..fb16909b8 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-2020 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 @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -57,76 +58,36 @@ class SMESH_Mesh_i; class SALOME_LifeCycleCORBA; // =========================================================== -// Study context - stores study-connected objects references +// Study context - store study-connected objects references // ========================================================== class SMESH_I_EXPORT StudyContext { + typedef NCollection_DataMap< int, std::string > TInt2StringMap; + typedef NCollection_DataMap< int, int > TInt2IntMap; public: // constructor StudyContext() {} - // destructor - ~StudyContext() - { - mapIdToIOR.clear(); - mapIdToId.clear(); - } // register object in the internal map and return its id - int addObject( string theIOR ) - { - int nextId = getNextId(); - mapIdToIOR[ nextId ] = theIOR; - return nextId; - } + int addObject( const std::string& theIOR ); // find the object id in the internal map by the IOR - int findId( string theIOR ) - { - map::iterator imap; - for ( imap = mapIdToIOR.begin(); imap != mapIdToIOR.end(); ++imap ) { - if ( imap->second == theIOR ) - return imap->first; - } - return 0; - } + int findId( const std::string& theIOR ); // get object's IOR by id - string getIORbyId( const int theId ) - { - if ( mapIdToIOR.find( theId ) != mapIdToIOR.end() ) - return mapIdToIOR[ theId ]; - return string( "" ); - } + std::string getIORbyId( const int theId ); // get object's IOR by old id - string getIORbyOldId( const int theOldId ) - { - if ( mapIdToId.find( theOldId ) != mapIdToId.end() ) - return getIORbyId( mapIdToId[ theOldId ] ); - return string( "" ); - } + std::string getIORbyOldId( const int theOldId ); // maps old object id to the new one (used when restoring data) - void mapOldToNew( const int oldId, const int newId ) { - mapIdToId[ oldId ] = newId; - } + void mapOldToNew( const int oldId, const int newId ); // get old id by a new one - int getOldId( const int newId ) { - map::iterator imap; - for ( imap = mapIdToId.begin(); imap != mapIdToId.end(); ++imap ) { - if ( imap->second == newId ) - return imap->first; - } - return 0; - } + int getOldId( const int newId ); + // clear data + void Clear(); private: // get next free object identifier - int getNextId() - { - int id = 1; - while( mapIdToIOR.find( id ) != mapIdToIOR.end() ) - id++; - return id; - } + int getNextId() { return mapIdToIOR.Extent() + 1; } - map mapIdToIOR; // persistent-to-transient map - map 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 }; // =========================================================== @@ -148,18 +109,22 @@ public: // Get SALOME_LifeCycleCORBA object static SALOME_LifeCycleCORBA* GetLCC(); // Retrieve and get GEOM engine reference - static GEOM::GEOM_Gen_var GetGeomEngine(); + static GEOM::GEOM_Gen_var GetGeomEngine( bool isShaper ); + static GEOM::GEOM_Gen_var GetGeomEngine( GEOM::GEOM_Object_ptr ); // Get object of the CORBA reference static PortableServer::ServantBase_var GetServant( CORBA::Object_ptr theObject ); // Get CORBA object corresponding to the SALOMEDS::SObject static CORBA::Object_var SObjectToObject( SALOMEDS::SObject_ptr theSObject ); // 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 - GEOM::GEOM_Object_ptr ShapeToGeomObject (const TopoDS_Shape& theShape ); - // Get TopoDS_Shape correspoding to GEOM_Object - TopoDS_Shape GeomObjectToShape(GEOM::GEOM_Object_ptr theGeomObject); + static SALOMEDS::SObject_ptr ObjectToSObject( CORBA::Object_ptr theObject ); + // Get the SALOMEDS::Study from naming service + static SALOMEDS::Study_var getStudyServant(); + // Get GEOM Object corresponding to TopoDS_Shape + static GEOM::GEOM_Object_ptr ShapeToGeomObject( const TopoDS_Shape& theShape ); + // Get TopoDS_Shape corresponding to GEOM_Object + static TopoDS_Shape GeomObjectToShape( GEOM::GEOM_Object_ptr theGeomObject ); + // Get GEOM Object by its study entry + static GEOM::GEOM_Object_ptr GetGeomObjectByEntry( const std::string& entry ); // Default constructor SMESH_Gen_i(); @@ -182,28 +147,42 @@ public: //GEOM::GEOM_Gen_ptr SetGeomEngine( const char* containerLoc ); void SetGeomEngine( GEOM::GEOM_Gen_ptr geomcompo ); - // Set current study + // Set embedded mode void SetEmbeddedMode( CORBA::Boolean theMode ); - // Get current study + // Check embedded mode CORBA::Boolean IsEmbeddedMode(); - // Set current study - void SetCurrentStudy( SALOMEDS::Study_ptr theStudy ); - // Get current study - SALOMEDS::Study_ptr GetCurrentStudy(); + // Set enable publishing in the study + void SetEnablePublish( CORBA::Boolean theIsEnablePublish ); - // Create hypothesis/algorothm of given type + // Check enable publishing + CORBA::Boolean IsEnablePublish(); + + // Update study + void UpdateStudy(); + + // Do provide info on objects + bool hasObjectInfo(); + + // Return an information for a given object + char* getObjectInfo(const char* entry); + + // Create hypothesis/algorithm of given type SMESH::SMESH_Hypothesis_ptr CreateHypothesis (const char* theHypType, - const char* theLibName) - throw ( SALOME::SALOME_Exception ); + const char* theLibName); + + SMESH::SMESH_Hypothesis_ptr CreateHypothesisByAverageLength( const char* theHypType, + const char* theLibName, + CORBA::Double theAverageLength, + CORBA::Boolean theQuadDominated); // Return hypothesis of given type holding parameter values of the existing mesh - SMESH::SMESH_Hypothesis_ptr GetHypothesisParameterValues (const char* theHypType, - const char* theLibName, - SMESH::SMESH_Mesh_ptr theMesh, - GEOM::GEOM_Object_ptr theGeom, - CORBA::Boolean byMesh) - throw ( SALOME::SALOME_Exception ); + SMESH::SMESH_Hypothesis_ptr + GetHypothesisParameterValues (const char* theHypType, + const char* theLibName, + SMESH::SMESH_Mesh_ptr theMesh, + GEOM::GEOM_Object_ptr theGeom, + const SMESH::HypInitParams& theWay); /* * Returns True if a hypothesis is assigned to a sole sub-mesh in a current Study @@ -218,11 +197,11 @@ public: * Sets number of segments per diagonal of boundary box of geometry by which * default segment length of appropriate 1D hypotheses is defined */ - void SetBoundaryBoxSegmentation( CORBA::Long theNbSegments ) throw ( SALOME::SALOME_Exception ); + void SetBoundaryBoxSegmentation( CORBA::Long theNbSegments ); /*! * \brief Sets default number of segments per edge */ - void SetDefaultNbSegments(CORBA::Long theNbSegments) throw ( SALOME::SALOME_Exception ); + void SetDefaultNbSegments(CORBA::Long theNbSegments); /*! Set an option value @@ -240,41 +219,33 @@ public: // Create empty mesh on a shape - SMESH::SMESH_Mesh_ptr CreateMesh( GEOM::GEOM_Object_ptr theShapeObject ) - throw ( SALOME::SALOME_Exception ); + SMESH::SMESH_Mesh_ptr CreateMesh( GEOM::GEOM_Object_ptr theShapeObject ); // Create empty mesh - SMESH::SMESH_Mesh_ptr CreateEmptyMesh() - throw ( SALOME::SALOME_Exception ); + SMESH::SMESH_Mesh_ptr CreateEmptyMesh(); // Create a mesh and import data from an UNV file - SMESH::SMESH_Mesh_ptr CreateMeshesFromUNV( const char* theFileName ) - throw ( SALOME::SALOME_Exception ); + SMESH::SMESH_Mesh_ptr CreateMeshesFromUNV( const char* theFileName ); // Create mesh(es) and import data from MED file SMESH::mesh_array* CreateMeshesFromMED( const char* theFileName, - SMESH::DriverMED_ReadStatus& theStatus ) - throw ( SALOME::SALOME_Exception ); + SMESH::DriverMED_ReadStatus& theStatus ); // Create mesh(es) and import data from MED file SMESH::mesh_array* CreateMeshesFromSAUV( const char* theFileName, - SMESH::DriverMED_ReadStatus& theStatus ) - throw ( SALOME::SALOME_Exception ); + SMESH::DriverMED_ReadStatus& theStatus ); // Create a mesh and import data from a STL file - SMESH::SMESH_Mesh_ptr CreateMeshesFromSTL( const char* theFileName ) - throw ( SALOME::SALOME_Exception ); + SMESH::SMESH_Mesh_ptr CreateMeshesFromSTL( const char* theFileName ); // Create mesh(es) and import data from CGNS file SMESH::mesh_array* CreateMeshesFromCGNS( const char* theFileName, - SMESH::DriverMED_ReadStatus& theStatus ) - throw ( SALOME::SALOME_Exception ); + SMESH::DriverMED_ReadStatus& theStatus ); // Create a mesh and import data from a GMF file SMESH::SMESH_Mesh_ptr CreateMeshesFromGMF( const char* theFileName, CORBA::Boolean theMakeRequiredGroups, - SMESH::ComputeError_out theError) - throw ( SALOME::SALOME_Exception ); + SMESH::ComputeError_out theError); // Copy a part of mesh SMESH::SMESH_Mesh_ptr CopyMesh(SMESH::SMESH_IDSource_ptr meshPart, @@ -282,10 +253,22 @@ public: CORBA::Boolean toCopyGroups, CORBA::Boolean toKeepIDs); - // Compute mesh on a shape + // Create a mesh by copying definitions of another mesh to a given geometry + CORBA::Boolean CopyMeshWithGeom( SMESH::SMESH_Mesh_ptr sourceMesh, + GEOM::GEOM_Object_ptr newGeometry, + const char* meshName, + CORBA::Boolean toCopyGroups, + CORBA::Boolean toReuseHypotheses, + CORBA::Boolean toCopyElements, + SMESH::SMESH_Mesh_out newMesh, + SMESH::ListOfGroups_out newGroups, + SMESH::submesh_array_out newSubmeshes, + SMESH::ListOfHypothesis_out newHypotheses, + SMESH::string_array_out invalidEntries); + + // Compute mesh on a shape CORBA::Boolean Compute( SMESH::SMESH_Mesh_ptr theMesh, - GEOM::GEOM_Object_ptr theShapeObject ) - throw ( SALOME::SALOME_Exception ); + GEOM::GEOM_Object_ptr theShapeObject ); // Cancel Compute mesh on a shape void CancelCompute( SMESH::SMESH_Mesh_ptr theMesh, @@ -295,8 +278,7 @@ public: * \brief Return errors of mesh computation */ SMESH::compute_error_array* GetComputeErrors(SMESH::SMESH_Mesh_ptr theMesh, - GEOM::GEOM_Object_ptr theShapeObject ) - throw ( SALOME::SALOME_Exception ); + GEOM::GEOM_Object_ptr theShapeObject ); /*! * Evaluate mesh on a shape and @@ -304,13 +286,11 @@ public: * Result array of number enityties */ SMESH::long_array* Evaluate(SMESH::SMESH_Mesh_ptr theMesh, - GEOM::GEOM_Object_ptr theShapeObject) - throw ( SALOME::SALOME_Exception ); + GEOM::GEOM_Object_ptr theShapeObject); // Returns true if mesh contains enough data to be computed CORBA::Boolean IsReadyToCompute( SMESH::SMESH_Mesh_ptr theMesh, - GEOM::GEOM_Object_ptr theShapeObject ) - throw ( SALOME::SALOME_Exception ); + GEOM::GEOM_Object_ptr theShapeObject ); /*! * Calculate Mesh as preview till indicated dimension on shape @@ -320,67 +300,68 @@ public: SMESH::MeshPreviewStruct* Precompute( SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theSubObject, SMESH::Dimension theDimension, - SMESH::long_array& theShapesId ) - throw ( SALOME::SALOME_Exception ); + SMESH::long_array& theShapesId ); - // Returns errors of hypotheses definintion + // Returns errors of hypotheses definition SMESH::algo_error_array* GetAlgoState( SMESH::SMESH_Mesh_ptr theMesh, - GEOM::GEOM_Object_ptr theSubObject ) - throw ( SALOME::SALOME_Exception ); + GEOM::GEOM_Object_ptr theSubObject ); // Return mesh elements preventing computation of a subshape SMESH::MeshPreviewStruct* GetBadInputElements( SMESH::SMESH_Mesh_ptr theMesh, - CORBA::Short theSubShapeID ) - throw ( SALOME::SALOME_Exception ); + CORBA::Short theSubShapeID ); // Create groups of elements preventing computation of a sub-shape SMESH::ListOfGroups* MakeGroupsOfBadInputElements( SMESH::SMESH_Mesh_ptr theMesh, CORBA::Short theSubShapeID, - const char* theGroupName) - throw ( SALOME::SALOME_Exception ); + const char* theGroupName); // Get sub-shapes unique ID's list SMESH::long_array* GetSubShapesId( GEOM::GEOM_Object_ptr theMainShapeObject, - const SMESH::object_array& theListOfSubShape ) - throw ( SALOME::SALOME_Exception ); + const SMESH::object_array& theListOfSubShape ); // Return geometrical object the given element is built on. Publish it in study. GEOM::GEOM_Object_ptr GetGeometryByMeshElement( SMESH::SMESH_Mesh_ptr theMesh, CORBA::Long theElementID, - const char* theGeomName) - throw ( SALOME::SALOME_Exception ); + const char* theGeomName); // Return geometrical object the given element is built on. Don't publish it in study. GEOM::GEOM_Object_ptr FindGeometryByMeshElement( SMESH::SMESH_Mesh_ptr theMesh, - CORBA::Long theElementID) - throw ( SALOME::SALOME_Exception ); + CORBA::Long theElementID); // Concatenate the given meshes into one mesh SMESH::SMESH_Mesh_ptr ConcatenateCommon(const SMESH::ListOfIDSources& meshesArray, CORBA::Boolean uniteIdenticalGroups, CORBA::Boolean mergeNodesAndElements, CORBA::Double mergeTolerance, - CORBA::Boolean commonGroups) - throw ( SALOME::SALOME_Exception ); + CORBA::Boolean commonGroups, + SMESH::SMESH_Mesh_ptr meshToAppendTo); // Concatenate the given meshes into one mesh SMESH::SMESH_Mesh_ptr Concatenate(const SMESH::ListOfIDSources& meshesArray, CORBA::Boolean uniteIdenticalGroups, CORBA::Boolean mergeNodesAndElements, - CORBA::Double mergeTolerance) - throw ( SALOME::SALOME_Exception ); + CORBA::Double mergeTolerance, + SMESH::SMESH_Mesh_ptr meshToAppendTo); // Concatenate the given meshes into one mesh // Create the groups of all elements from initial meshes SMESH::SMESH_Mesh_ptr ConcatenateWithGroups(const SMESH::ListOfIDSources& meshesArray, CORBA::Boolean uniteIdenticalGroups, CORBA::Boolean mergeNodesAndElements, - CORBA::Double mergeTolerance) - throw ( SALOME::SALOME_Exception ); + CORBA::Double mergeTolerance, + SMESH::SMESH_Mesh_ptr meshToAppendTo); + + // Get version of MED format being used. + char* GetMEDFileVersion(); // Get MED version of the file by its name - CORBA::Boolean GetMEDVersion(const char* theFileName, - SMESH::MED_VERSION& theVersion); + char* GetMEDVersion(const char* theFileName); + + // Check compatibility of file with MED format being used, read only. + CORBA::Boolean CheckCompatibility(const char* theFileName); + + // Check compatibility of file with MED format being used, for append on write. + CORBA::Boolean CheckWriteCompatibility(const char* theFileName); // Get names of meshes defined in file with the specified name SMESH::string_array* GetMeshNames(const char* theFileName); @@ -437,22 +418,20 @@ public: // Returns true if object can be published in the study bool CanPublishInStudy( CORBA::Object_ptr theIOR ); // Publish object in the study - SALOMEDS::SObject_ptr PublishInStudy( SALOMEDS::Study_ptr theStudy, - SALOMEDS::SObject_ptr theSObject, + SALOMEDS::SObject_ptr PublishInStudy( SALOMEDS::SObject_ptr theSObject, CORBA::Object_ptr theObject, - const char* theName ) - throw ( SALOME::SALOME_Exception ); + const char* theName ); // Copy-paste methods - returns true if object can be copied to the clipboard - CORBA::Boolean CanCopy( SALOMEDS::SObject_ptr theObject ) { return false; } + CORBA::Boolean CanCopy( SALOMEDS::SObject_ptr /*theObject*/ ) { return false; } // Copy-paste methods - copy object to the clipboard - SALOMEDS::TMPFile* CopyFrom( SALOMEDS::SObject_ptr theObject, CORBA::Long& theObjectID ) { return NULL; } + SALOMEDS::TMPFile* CopyFrom( SALOMEDS::SObject_ptr /*theObject*/, CORBA::Long& /*theObjectID*/ ) { return NULL; } // Copy-paste methods - returns true if object can be pasted from the clipboard - CORBA::Boolean CanPaste( const char* theComponentName, CORBA::Long theObjectID ) { return false; } + CORBA::Boolean CanPaste( const char* /*theComponentName*/, CORBA::Long /*theObjectID*/ ) { return false; } // Copy-paste methods - paste object from the clipboard - SALOMEDS::SObject_ptr PasteInto( const SALOMEDS::TMPFile& theStream, - CORBA::Long theObjectID, - SALOMEDS::SObject_ptr theObject ) { + SALOMEDS::SObject_ptr PasteInto( const SALOMEDS::TMPFile& /*theStream*/, + CORBA::Long /*theObjectID*/, + SALOMEDS::SObject_ptr /*theObject*/ ) { SALOMEDS::SObject_var aResultSO; return aResultSO._retn(); } @@ -467,19 +446,17 @@ public: // Dump python // ============ - virtual Engines::TMPFile* DumpPython(CORBA::Object_ptr theStudy, - CORBA::Boolean isPublished, + virtual Engines::TMPFile* DumpPython(CORBA::Boolean isPublished, CORBA::Boolean isMultiFile, CORBA::Boolean& isValidScript); - void AddToPythonScript (int theStudyID, const TCollection_AsciiString& theString); + void AddToPythonScript (const TCollection_AsciiString& theString); - void RemoveLastFromPythonScript (int theStudyID); + void RemoveLastFromPythonScript(); - void SavePython (SALOMEDS::Study_ptr theStudy); + void SavePython(); - TCollection_AsciiString DumpPython_impl (SALOMEDS::Study_ptr theStudy, - Resource_DataMapOfAsciiStringAsciiString& theObjectNames, + TCollection_AsciiString DumpPython_impl (Resource_DataMapOfAsciiStringAsciiString& theObjectNames, Resource_DataMapOfAsciiStringAsciiString& theNames, bool isPublished, bool isMultiFile, @@ -487,9 +464,11 @@ public: bool& aValidScript, TCollection_AsciiString& theSavedTrace); - TCollection_AsciiString GetNewPythonLines (int theStudyID); + TCollection_AsciiString GetNewPythonLines(); + + void CleanPythonTrace(); - void CleanPythonTrace (int theStudyID); + static int CountInPyDump(const TCollection_AsciiString& text); // ***************************************** // Internal methods @@ -519,33 +498,29 @@ public: static long GetBallElementsGroupsTag(); // publishing methods - SALOMEDS::SComponent_ptr PublishComponent(SALOMEDS::Study_ptr theStudy); - SALOMEDS::SObject_ptr PublishMesh (SALOMEDS::Study_ptr theStudy, - SMESH::SMESH_Mesh_ptr theMesh, + SALOMEDS::SComponent_ptr PublishComponent(); + SALOMEDS::SObject_ptr PublishMesh (SMESH::SMESH_Mesh_ptr theMesh, const char* theName = 0); - SALOMEDS::SObject_ptr PublishHypothesis (SALOMEDS::Study_ptr theStudy, - SMESH::SMESH_Hypothesis_ptr theHyp, + SALOMEDS::SObject_ptr PublishHypothesis (SMESH::SMESH_Hypothesis_ptr theHyp, const char* theName = 0); - SALOMEDS::SObject_ptr PublishSubMesh (SALOMEDS::Study_ptr theStudy, - SMESH::SMESH_Mesh_ptr theMesh, + SALOMEDS::SObject_ptr PublishSubMesh (SMESH::SMESH_Mesh_ptr theMesh, SMESH::SMESH_subMesh_ptr theSubMesh, GEOM::GEOM_Object_ptr theShapeObject, const char* theName = 0); - SALOMEDS::SObject_ptr PublishGroup (SALOMEDS::Study_ptr theStudy, - SMESH::SMESH_Mesh_ptr theMesh, + SALOMEDS::SObject_ptr PublishGroup (SMESH::SMESH_Mesh_ptr theMesh, SMESH::SMESH_GroupBase_ptr theGroup, GEOM::GEOM_Object_ptr theShapeObject, const char* theName = 0); - bool AddHypothesisToShape(SALOMEDS::Study_ptr theStudy, - SMESH::SMESH_Mesh_ptr theMesh, + void UpdateIcons(SMESH::SMESH_Mesh_ptr theMesh); + void HighLightInvalid(CORBA::Object_ptr theObject, bool isInvalid); + bool IsInvalid(SALOMEDS::SObject_ptr theObject); + bool AddHypothesisToShape(SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theShapeObject, SMESH::SMESH_Hypothesis_ptr theHyp); - bool RemoveHypothesisFromShape(SALOMEDS::Study_ptr theStudy, - SMESH::SMESH_Mesh_ptr theMesh, + bool RemoveHypothesisFromShape(SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theShapeObject, SMESH::SMESH_Hypothesis_ptr theHyp); - SALOMEDS::SObject_ptr GetMeshOrSubmeshByShape (SALOMEDS::Study_ptr theStudy, - SMESH::SMESH_Mesh_ptr theMesh, + SALOMEDS::SObject_ptr GetMeshOrSubmeshByShape (SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theShape); static void SetName(SALOMEDS::SObject_ptr theSObject, const char* theName, @@ -555,7 +530,7 @@ public: const char* thePixMap); // Get study context - StudyContext* GetCurrentStudyContext(); + StudyContext* GetStudyContext(); // Register an object in a StudyContext; return object id int RegisterObject(CORBA::Object_ptr theObject); @@ -565,19 +540,16 @@ public: // Return an object that previously had an oldID template - typename TInterface::_var_type GetObjectByOldId( const int oldID ) + typename TInterface::_var_type GetObjectByOldId( const int oldID ) { - if ( StudyContext* myStudyContext = GetCurrentStudyContext() ) { - string ior = myStudyContext->getIORbyOldId( oldID ); + if ( myStudyContext ) { + std::string ior = myStudyContext->getIORbyOldId( oldID ); if ( !ior.empty() ) return TInterface::_narrow(GetORB()->string_to_object( ior.c_str() )); } return TInterface::_nil(); } - // Get current study ID - int GetCurrentStudyID(); - /*! * \brief Find SObject for an algo */ @@ -637,29 +609,33 @@ private: // Get hypothesis creator GenericHypothesisCreator_i* getHypothesisCreator( const char* theHypName, const char* theLibName, - std::string& thePlatformLibName) - throw ( SALOME::SALOME_Exception ); + std::string& thePlatformLibName); // Create hypothesis of given type SMESH::SMESH_Hypothesis_ptr createHypothesis( const char* theHypName, const char* theLibName); // Create empty mesh on shape - SMESH::SMESH_Mesh_ptr createMesh() - throw ( SALOME::SALOME_Exception ); + SMESH::SMESH_Mesh_ptr createMesh(); + + // Check mesh icon + bool isGeomModifIcon( SMESH::SMESH_Mesh_ptr mesh ); - static void loadGeomData( SALOMEDS::SComponent_ptr theCompRoot ); + // Create a sub-mesh on a geometry that is not a sub-shape of the main shape + // for the case where a valid sub-shape not found by CopyMeshWithGeom() + SMESH::SMESH_subMesh_ptr createInvalidSubMesh( SMESH::SMESH_Mesh_ptr mesh, + GEOM::GEOM_Object_ptr strangerGeom, + const char* name ); + + void highLightInvalid( SALOMEDS::SObject_ptr theSObject, bool isInvalid ); SMESH::mesh_array* CreateMeshesFromMEDorSAUV( const char* theFileName, SMESH::DriverMED_ReadStatus& theStatus, const char* theCommandNameForPython, const char* theFileNameForPython); - void setCurrentStudy( SALOMEDS::Study_ptr theStudy, - bool theStudyIsBeingClosed=false); - std::vector _GetInside(SMESH::SMESH_IDSource_ptr meshPart, - SMESH::ElementType theElemType, - TopoDS_Shape& aShape, - double* theTolerance = NULL); + SMESH::ElementType ElemType, + const TopoDS_Shape& Shape, + double* Tolerance = NULL); private: static GEOM::GEOM_Gen_var myGeomGen; @@ -671,23 +647,26 @@ private: ::SMESH_Gen myGen; // SMESH_Gen local implementation // hypotheses managing - map myHypCreatorMap; + std::map myHypCreatorMap; + + StudyContext* myStudyContext; // study context - map myStudyContextMap; // Map of study context objects + GEOM_Client* myShapeReader; // Shape reader + CORBA::Boolean myIsEmbeddedMode; // Current mode + CORBA::Boolean myIsEnablePublish; // Enable publishing - 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; // 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::string myLastObj; + Handle(TColStd_HSequenceOfAsciiString) myPythonScript; + bool myIsHistoricalPythonDump; + std::vector< int > myLastParamIndex; + std::vector< std::string > myLastParameters; + std::string myLastObj; };