ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-15 21:21:22 +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:44:44 +00:00
parent 4f33724a37
commit e0257a3b5c
5 changed files with 952 additions and 943 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
idl/GEOM_Gen.idl
View File

@ -619,7 +619,8 @@ module GEOM
* \param theYVec Vector of Y direction. * \param theYVec Vector of Y direction.
* \return New GEOM_Object, containing the created coordinate system. * \return New GEOM_Object, containing the created coordinate system.
*/ */
GEOM_Object MakeMarkerPntTwoVec (in GEOM_Object theOrigin, in GEOM_Object theXVec, in GEOM_Object theYVec); GEOM_Object MakeMarkerPntTwoVec (in GEOM_Object theOrigin,
in GEOM_Object theXVec, in GEOM_Object theYVec);
/*! /*!
* Create a tangent plane to specified face in the point with specified parameters. * Create a tangent plane to specified face in the point with specified parameters.
@ -2471,7 +2472,8 @@ module GEOM
* Create an arc of ellipse of center C and two points P1 P2. * Create an arc of ellipse of center C and two points P1 P2.
* \param theCenter Center point of the arc. * \param theCenter Center point of the arc.
* \param thePnt1 Major radius is distance from center to Pnt1. * \param thePnt1 Major radius is distance from center to Pnt1.
* \param thePnt2 define a plane and Minor radius as a shortest distance from Pnt2 to vector Center->Pnt1. * \param thePnt2 define a plane and Minor radius as a shortest
* distance from Pnt2 to vector Center->Pnt1.
* \return New GEOM_Object, containing the created arc. * \return New GEOM_Object, containing the created arc.
*/ */
GEOM_Object MakeArcOfEllipse (in GEOM_Object theCenter, GEOM_Object MakeArcOfEllipse (in GEOM_Object theCenter,
@ -3441,7 +3443,7 @@ module GEOM
* GEOM_Gen: Interface to access other GEOM interfaces. * GEOM_Gen: Interface to access other GEOM interfaces.
* Also contains some methods to access and manage GEOM objects. * Also contains some methods to access and manage GEOM objects.
*/ */
interface GEOM_Gen : Engines::Component,SALOMEDS::Driver interface GEOM_Gen : Engines::EngineComponent,SALOMEDS::Driver
{ {
/*! /*!
* Undo/Redo Management * Undo/Redo Management

9
idl/GEOM_Superv.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 : GEOM_Superv.idl // File : GEOM_Superv.idl
// Author : Lucien PIGNOLONI // Author : Lucien PIGNOLONI
//
#ifndef __GEOM_SUPERV__ #ifndef __GEOM_SUPERV__
#define __GEOM_SUPERV__ #define __GEOM_SUPERV__
@ -33,7 +32,7 @@ module GEOM
interface GEOM_List interface GEOM_List
{ }; { };
interface GEOM_Superv : Engines::Component,SALOMEDS::Driver interface GEOM_Superv : Engines::EngineComponent,SALOMEDS::Driver
{ {
//-----------------------------------------------------------// //-----------------------------------------------------------//
// Set current study ID // // Set current study ID //
@ -107,7 +106,9 @@ module GEOM
GEOM_Object MakeMarkerFromShape (in GEOM_Object theShape) ; GEOM_Object MakeMarkerFromShape (in GEOM_Object theShape) ;
GEOM_Object MakeMarkerPntTwoVec (in GEOM_Object theOrigin, in GEOM_Object theXVec, in GEOM_Object theYVec) ; GEOM_Object MakeMarkerPntTwoVec (in GEOM_Object theOrigin,
in GEOM_Object theXVec,
in GEOM_Object theYVec) ;
/*! /*!
* Create a tangent plane to specified face in the point with specified parameters. * Create a tangent plane to specified face in the point with specified parameters.

3
src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
View File

@ -18,7 +18,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
//
#include "GEOM_SelectionFilter.h" #include "GEOM_SelectionFilter.h"
@ -134,7 +133,7 @@ bool GEOM_SelectionFilter::getShape (const GEOM::GEOM_Object_ptr& theObject,
SALOME_LifeCycleCORBA* ls = new SALOME_LifeCycleCORBA( app->namingService() ); SALOME_LifeCycleCORBA* ls = new SALOME_LifeCycleCORBA( app->namingService() );
static GEOM::GEOM_Gen_var geomGen; static GEOM::GEOM_Gen_var geomGen;
if(CORBA::is_nil( geomGen )) { if(CORBA::is_nil( geomGen )) {
Engines::Component_var comp = ls->FindOrLoad_Component( "FactoryServer", "GEOM" ); Engines::EngineComponent_var comp = ls->FindOrLoad_Component( "FactoryServer", "GEOM" );
geomGen = GEOM::GEOM_Gen::_narrow( comp ); geomGen = GEOM::GEOM_Gen::_narrow( comp );
} }
if ( !CORBA::is_nil( geomGen ) ) if ( !CORBA::is_nil( geomGen ) )

5
src/GEOMGUI/GeometryGUI.cxx
View File

@ -172,7 +172,8 @@ GeometryGUI::GeometryGUI() :
{ {
if ( CORBA::is_nil( myComponentGeom ) ) if ( CORBA::is_nil( myComponentGeom ) )
{ {
Engines::Component_var comp = SalomeApp_Application::lcc()->FindOrLoad_Component( "FactoryServer", "GEOM" ); Engines::EngineComponent_var comp =
SalomeApp_Application::lcc()->FindOrLoad_Component( "FactoryServer", "GEOM" );
myComponentGeom = GEOM::GEOM_Gen::_narrow( comp ); myComponentGeom = GEOM::GEOM_Gen::_narrow( comp );
} }
@ -1886,7 +1887,7 @@ void GeometryGUI::restoreVisualParameters (int savePoint)
QColor c = aListOfMap[index].value(COLOR_PROP).value<QColor>(); QColor c = aListOfMap[index].value(COLOR_PROP).value<QColor>();
//Get Visibility property of the current PropMap //Get Visibility property of the current PropMap
if(aListOfMap[index].value(VISIBILITY_PROP) == 1) { if (aListOfMap[index].value(VISIBILITY_PROP) == 1) {
SUIT_ViewManager* vman = lst.at(index); SUIT_ViewManager* vman = lst.at(index);
SUIT_ViewModel* vmodel = vman->getViewModel(); SUIT_ViewModel* vmodel = vman->getViewModel();
displayer()->Display(entry, true, dynamic_cast<SALOME_View*>(vmodel)); displayer()->Display(entry, true, dynamic_cast<SALOME_View*>(vmodel));

24
src/GEOM_I_Superv/GEOM_Superv_i.cc
View File

@ -18,7 +18,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
//
#include "GEOM_Superv_i.hh" #include "GEOM_Superv_i.hh"
#include "SALOME_LifeCycleCORBA.hxx" #include "SALOME_LifeCycleCORBA.hxx"
@ -104,7 +103,7 @@ void GEOM_Superv_i::setGeomEngine()
std::string shortName=container_name.in(); std::string shortName=container_name.in();
shortName=shortName.substr(12); // substract "/Containers/" shortName=shortName.substr(12); // substract "/Containers/"
SALOME_LifeCycleCORBA* lcc = new SALOME_LifeCycleCORBA( name_service ); SALOME_LifeCycleCORBA* lcc = new SALOME_LifeCycleCORBA( name_service );
Engines::Component_var comp = lcc->FindOrLoad_Component( shortName.c_str(), "GEOM" ); Engines::EngineComponent_var comp = lcc->FindOrLoad_Component( shortName.c_str(), "GEOM" );
delete lcc; delete lcc;
myGeomEngine = GEOM::GEOM_Gen::_narrow(comp); myGeomEngine = GEOM::GEOM_Gen::_narrow(comp);
@ -3225,8 +3224,10 @@ GEOM::GEOM_List_ptr GEOM_Superv_i::GetObjects (GEOM::GEOM_Object_ptr theGroup)
//============================================================================= //=============================================================================
// MakePipeTShape // MakePipeTShape
//============================================================================= //=============================================================================
GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShape (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1, GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShape
CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2, CORBA::Boolean theHexMesh) (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1,
CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
CORBA::Boolean theHexMesh)
{ {
beginService( " GEOM_Superv_i::MakePipeTShape" ); beginService( " GEOM_Superv_i::MakePipeTShape" );
MESSAGE("GEOM_Superv_i::MakePipeTShape"); MESSAGE("GEOM_Superv_i::MakePipeTShape");
@ -3242,7 +3243,8 @@ GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShape (CORBA::Double theR1, CORBA::D
//============================================================================= //=============================================================================
// MakePipeTShapeWithPosition // MakePipeTShapeWithPosition
//============================================================================= //=============================================================================
GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeWithPosition (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1, GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeWithPosition
(CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1,
CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2, CORBA::Boolean theHexMesh, CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2, CORBA::Boolean theHexMesh,
GEOM::GEOM_Object_ptr theP1, GEOM::GEOM_Object_ptr theP2, GEOM::GEOM_Object_ptr theP3) GEOM::GEOM_Object_ptr theP1, GEOM::GEOM_Object_ptr theP2, GEOM::GEOM_Object_ptr theP3)
{ {
@ -3260,7 +3262,8 @@ GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeWithPosition (CORBA::Double the
//============================================================================= //=============================================================================
// MakePipeTShapeChamfer // MakePipeTShapeChamfer
//============================================================================= //=============================================================================
GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeChamfer (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1, GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeChamfer
(CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1,
CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2, CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
CORBA::Double theH, CORBA::Double theW, CORBA::Boolean theHexMesh) CORBA::Double theH, CORBA::Double theW, CORBA::Boolean theHexMesh)
{ {
@ -3278,7 +3281,8 @@ GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeChamfer (CORBA::Double theR1, C
//============================================================================= //=============================================================================
// MakePipeTShapeChamferWithPosition // MakePipeTShapeChamferWithPosition
//============================================================================= //=============================================================================
GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeChamferWithPosition (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1, GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeChamferWithPosition
(CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1,
CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2, CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
CORBA::Double theH, CORBA::Double theW, CORBA::Boolean theHexMesh, CORBA::Double theH, CORBA::Double theW, CORBA::Boolean theHexMesh,
GEOM::GEOM_Object_ptr theP1, GEOM::GEOM_Object_ptr theP2, GEOM::GEOM_Object_ptr theP3) GEOM::GEOM_Object_ptr theP1, GEOM::GEOM_Object_ptr theP2, GEOM::GEOM_Object_ptr theP3)
@ -3297,7 +3301,8 @@ GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeChamferWithPosition (CORBA::Dou
//============================================================================= //=============================================================================
// MakePipeTShapeFillet // MakePipeTShapeFillet
//============================================================================= //=============================================================================
GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeFillet (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1, GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeFillet
(CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1,
CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2, CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
CORBA::Double theRF, CORBA::Boolean theHexMesh) CORBA::Double theRF, CORBA::Boolean theHexMesh)
{ {
@ -3315,7 +3320,8 @@ GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeFillet (CORBA::Double theR1, CO
//============================================================================= //=============================================================================
// MakePipeTShapeFilletWithPosition // MakePipeTShapeFilletWithPosition
//============================================================================= //=============================================================================
GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeFilletWithPosition (CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1, GEOM::GEOM_List_ptr GEOM_Superv_i::MakePipeTShapeFilletWithPosition
(CORBA::Double theR1, CORBA::Double theW1, CORBA::Double theL1,
CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2, CORBA::Double theR2, CORBA::Double theW2, CORBA::Double theL2,
CORBA::Double theRF, CORBA::Boolean theHexMesh, CORBA::Double theRF, CORBA::Boolean theHexMesh,
GEOM::GEOM_Object_ptr theP1, GEOM::GEOM_Object_ptr theP2, GEOM::GEOM_Object_ptr theP3) GEOM::GEOM_Object_ptr theP1, GEOM::GEOM_Object_ptr theP2, GEOM::GEOM_Object_ptr theP3)