ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-25 08:50:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Rename Engines::Component to Engines::EngineComponent

Browse Source
This commit is contained in:
jfa 2011-02-28 14:55:52 +00:00
parent b9918993a1
commit b21fc186af
4 changed files with 195 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
idl/SMESH_Gen.idl
View File

@ -19,10 +19,9 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// File : SMESH_Gen.idl // File : SMESH_Gen.idl
// Author : Paul RASCLE, EDF // Author : Paul RASCLE, EDF
//
#ifndef _SMESH_GEN_IDL_ #ifndef _SMESH_GEN_IDL_
#define _SMESH_GEN_IDL_ #define _SMESH_GEN_IDL_
@ -111,7 +110,7 @@ module SMESH
typedef sequence<ComputeError> compute_error_array; typedef sequence<ComputeError> compute_error_array;
interface SMESH_Gen : Engines::Component, SALOMEDS::Driver interface SMESH_Gen : Engines::EngineComponent, SALOMEDS::Driver
{ {
//GEOM::GEOM_Gen SetGeomEngine( in string containerLoc ); //GEOM::GEOM_Gen SetGeomEngine( in string containerLoc );
void SetGeomEngine( in GEOM::GEOM_Gen geomcompo ); void SetGeomEngine( in GEOM::GEOM_Gen geomcompo );
@ -150,7 +149,7 @@ module SMESH
* Algorithms are 1D, 2D or 3D. * Algorithms are 1D, 2D or 3D.
*/ */
SMESH_Hypothesis CreateHypothesis( in string theHypName, SMESH_Hypothesis CreateHypothesis( in string theHypName,
in string theLibName ) in string theLibName )
raises ( SALOME::SALOME_Exception ); raises ( SALOME::SALOME_Exception );
/*! /*!
@ -181,7 +180,7 @@ module SMESH
* Set the object name * Set the object name
*/ */
void SetName( in string theObjectIOR, void SetName( in string theObjectIOR,
in string theObjectName ) in string theObjectName )
raises ( SALOME::SALOME_Exception ); raises ( SALOME::SALOME_Exception );
/*! /*!
@ -211,7 +210,7 @@ module SMESH
* Create Mesh object(s) importing data from given MED file * Create Mesh object(s) importing data from given MED file
*/ */
mesh_array CreateMeshesFromMED( in string theFileName, mesh_array CreateMeshesFromMED( in string theFileName,
out SMESH::DriverMED_ReadStatus theStatus ) out SMESH::DriverMED_ReadStatus theStatus )
raises ( SALOME::SALOME_Exception ); raises ( SALOME::SALOME_Exception );
/*! /*!
@ -242,9 +241,9 @@ module SMESH
* theMergeNodesAndElements flag is true. * theMergeNodesAndElements flag is true.
*/ */
SMESH_Mesh Concatenate(in mesh_array theMeshesArray, SMESH_Mesh Concatenate(in mesh_array theMeshesArray,
in boolean theUniteIdenticalGroups, in boolean theUniteIdenticalGroups,
in boolean theMergeNodesAndElements, in boolean theMergeNodesAndElements,
in double theMergeTolerance) in double theMergeTolerance)
raises ( SALOME::SALOME_Exception ); raises ( SALOME::SALOME_Exception );
/*! /*!
@ -256,7 +255,7 @@ module SMESH
* Create the groups of all elements from initial meshes. * Create the groups of all elements from initial meshes.
*/ */
SMESH_Mesh ConcatenateWithGroups(in mesh_array theMeshesArray, SMESH_Mesh ConcatenateWithGroups(in mesh_array theMeshesArray,
in boolean theUniteIdenticalGroups, in boolean theUniteIdenticalGroups,
in boolean theMergeNodesAndElements, in boolean theMergeNodesAndElements,
in double theMergeTolerance) in double theMergeTolerance)
raises ( SALOME::SALOME_Exception ); raises ( SALOME::SALOME_Exception );
@ -267,21 +266,21 @@ module SMESH
* return NOK if hypothesis are not sufficient * return NOK if hypothesis are not sufficient
*/ */
boolean Compute( in SMESH_Mesh theMesh, boolean Compute( in SMESH_Mesh theMesh,
in GEOM::GEOM_Object theSubObject ) in GEOM::GEOM_Object theSubObject )
raises ( SALOME::SALOME_Exception ); raises ( SALOME::SALOME_Exception );
/*! /*!
* Return true if hypotheses are defined well * Return true if hypotheses are defined well
*/ */
boolean IsReadyToCompute( in SMESH_Mesh theMesh, boolean IsReadyToCompute( in SMESH_Mesh theMesh,
in GEOM::GEOM_Object theSubObject ) in GEOM::GEOM_Object theSubObject )
raises ( SALOME::SALOME_Exception ); raises ( SALOME::SALOME_Exception );
/*! /*!
* Evaluates size of prospective mesh on a shape * Evaluates size of prospective mesh on a shape
*/ */
long_array Evaluate(in SMESH_Mesh theMesh, long_array Evaluate(in SMESH_Mesh theMesh,
in GEOM::GEOM_Object theSubObject) in GEOM::GEOM_Object theSubObject)
raises ( SALOME::SALOME_Exception ); raises ( SALOME::SALOME_Exception );
/*! /*!
@ -290,9 +289,9 @@ module SMESH
* Return mesh preview structure * Return mesh preview structure
*/ */
MeshPreviewStruct Precompute( in SMESH_Mesh theMesh, MeshPreviewStruct Precompute( in SMESH_Mesh theMesh,
in GEOM::GEOM_Object theSubObject, in GEOM::GEOM_Object theSubObject,
in Dimension theDimension, in Dimension theDimension,
inout long_array theShapesId ) inout long_array theShapesId )
raises ( SALOME::SALOME_Exception ); raises ( SALOME::SALOME_Exception );
/*! /*!
@ -341,7 +340,7 @@ module SMESH
* The returned geometrical object not published in study by this method. * The returned geometrical object not published in study by this method.
*/ */
GEOM::GEOM_Object FindGeometryByMeshElement( in SMESH_Mesh theMesh, GEOM::GEOM_Object FindGeometryByMeshElement( in SMESH_Mesh theMesh,
in long theElementID) in long theElementID)
raises ( SALOME::SALOME_Exception ); raises ( SALOME::SALOME_Exception );
/*! /*!

4
src/PluginUtils/GeomSelectionTools.cxx
View File

@ -15,7 +15,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// --- // ---
// File : GeomSelectionTools.cxx // File : GeomSelectionTools.cxx
@ -219,7 +218,7 @@ TopAbs_ShapeEnum GeomSelectionTools::entryToShapeType(std::string entry){
SalomeApp_Application* anApp = GetSalomeApplication(); SalomeApp_Application* anApp = GetSalomeApplication();
if (anApp) { if (anApp) {
// MESSAGE("Got Application"); // MESSAGE("Got Application");
Engines::Component_var component = anApp->lcc()->FindOrLoad_Component( "FactoryServer","GEOM" ); Engines::EngineComponent_var component = anApp->lcc()->FindOrLoad_Component( "FactoryServer","GEOM" );
GEOM::GEOM_Gen_var _geomEngine = GEOM::GEOM_Gen::_narrow(component); GEOM::GEOM_Gen_var _geomEngine = GEOM::GEOM_Gen::_narrow(component);
// MESSAGE("Got GEOM engine"); // MESSAGE("Got GEOM engine");
// if the Geom Object is a group // if the Geom Object is a group
@ -340,4 +339,3 @@ QString PluginUtils::PrintDoubleValue( double theValue, int thePrecision )
return aRes == "-0" ? QString( "0" ) : aRes + aResExp; return aRes == "-0" ? QString( "0" ) : aRes + aResExp;
} }

5
src/SMESHClient/SMESH_Client.cxx
View File

@ -19,12 +19,11 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// SMESH SMESHClient : tool to update client mesh structure by mesh from server // SMESH SMESHClient : tool to update client mesh structure by mesh from server
// File : SMESH_Client.cxx // File : SMESH_Client.cxx
// Author : Pavel TELKOV // Author : Pavel TELKOV
// Module : SMESH // Module : SMESH
//
#include "SMESH_Client.hxx" #include "SMESH_Client.hxx"
#include "SMESH_Mesh.hxx" #include "SMESH_Mesh.hxx"
@ -610,7 +609,7 @@ SMESH_Client::GetSMESHGen(CORBA::ORB_ptr theORB,
SALOME_NamingService aNamingService(theORB); SALOME_NamingService aNamingService(theORB);
SALOME_LifeCycleCORBA aLifeCycleCORBA(&aNamingService); SALOME_LifeCycleCORBA aLifeCycleCORBA(&aNamingService);
Engines::Component_var aComponent = aLifeCycleCORBA.FindOrLoad_Component("FactoryServer","SMESH"); Engines::EngineComponent_var aComponent = aLifeCycleCORBA.FindOrLoad_Component("FactoryServer","SMESH");
aMeshGen = SMESH::SMESH_Gen::_narrow(aComponent); aMeshGen = SMESH::SMESH_Gen::_narrow(aComponent);
std::string aClientHostName = Kernel_Utils::GetHostname(); std::string aClientHostName = Kernel_Utils::GetHostname();

5
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -19,12 +19,11 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses // SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
// File : SMESH_Gen_i.cxx // File : SMESH_Gen_i.cxx
// Author : Paul RASCLE, EDF // Author : Paul RASCLE, EDF
// Module : SMESH // Module : SMESH
//
#include <TopExp.hxx> #include <TopExp.hxx>
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>
#include <TopoDS.hxx> #include <TopoDS.hxx>
@ -237,7 +236,7 @@ GEOM::GEOM_Gen_ptr SMESH_Gen_i::GetGeomEngine() {
//CCRT return aGeomEngine._retn(); //CCRT return aGeomEngine._retn();
if(CORBA::is_nil(myGeomGen)) if(CORBA::is_nil(myGeomGen))
{ {
Engines::Component_ptr temp=GetLCC()->FindOrLoad_Component("FactoryServer","GEOM"); Engines::EngineComponent_ptr temp=GetLCC()->FindOrLoad_Component("FactoryServer","GEOM");
myGeomGen=GEOM::GEOM_Gen::_narrow(temp); myGeomGen=GEOM::GEOM_Gen::_narrow(temp);
} }
return myGeomGen; return myGeomGen;