mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2024-11-15 10:08:35 +05:00
Rename Engines::Component to Engines::EngineComponent
This commit is contained in:
jfa
parent
4f33724a37
commit
e0257a3b5c
@ -198,7 +198,7 @@ module GEOM
|
||||
* \sa GetShapeType(), GetTopologyType(), GetMinShapeType()
|
||||
*/
|
||||
shape_type GetMaxShapeType();
|
||||
|
||||
|
||||
/*!
|
||||
* Set name of the object.
|
||||
* \param theName is a name which will be associated with this object.
|
||||
@ -331,7 +331,7 @@ module GEOM
|
||||
* \param other object being compared with this one
|
||||
*/
|
||||
boolean IsSame(in GEOM_Object other);
|
||||
|
||||
|
||||
/*!
|
||||
* Set list of parameters
|
||||
* \param theParameters is a string containing the notebook variables separated by ":" symbol,
|
||||
@ -619,7 +619,8 @@ module GEOM
|
||||
* \param theYVec Vector of Y direction.
|
||||
* \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.
|
||||
@ -985,9 +986,9 @@ module GEOM
|
||||
* Modify the Location of the given object by Path,
|
||||
* \param theObject The object to be displaced.
|
||||
* \param thePath Wire or Edge along that the object will be translated.
|
||||
* \param theDistance progress of Path (0 = actual location, 1 = end of path location).
|
||||
* \param theCopy is a true or false parameter. true is to create a copy, false to move the object.
|
||||
* \param theCopy is a true or false parameter. true is to reverse direction, false is to move normal direction.
|
||||
* \param theDistance progress of Path (0 = actual location, 1 = end of path location).
|
||||
* \param theCopy is a true or false parameter. true is to create a copy, false to move the object.
|
||||
* \param theCopy is a true or false parameter. true is to reverse direction, false is to move normal direction.
|
||||
* \return New GEOM_Object, containing the displaced shape.
|
||||
*/
|
||||
GEOM_Object PositionAlongPath (in GEOM_Object theObject,
|
||||
@ -1372,8 +1373,8 @@ module GEOM
|
||||
* \return New GEOM_Object, containing the created edge.
|
||||
*/
|
||||
GEOM_Object MakeEdgeWire (in GEOM_Object theWire,
|
||||
in double theLinearTolerance,
|
||||
in double theAngularTolerance);
|
||||
in double theLinearTolerance,
|
||||
in double theAngularTolerance);
|
||||
|
||||
/*!
|
||||
* Create a wire from the set of edges and wires.
|
||||
@ -1475,8 +1476,8 @@ module GEOM
|
||||
* Deprecated method. Use MakeAllSubShapes() instead.
|
||||
*/
|
||||
ListOfGO MakeExplode (in GEOM_Object theShape,
|
||||
in long theShapeType,
|
||||
in boolean isSorted);
|
||||
in long theShapeType,
|
||||
in boolean isSorted);
|
||||
|
||||
/*!
|
||||
* Explode a shape on subshapes of a given type. If the
|
||||
@ -1508,8 +1509,8 @@ module GEOM
|
||||
* Deprecated method. Use GetAllSubShapesIDs() instead.
|
||||
*/
|
||||
ListOfLong SubShapeAllIDs (in GEOM_Object theShape,
|
||||
in long theShapeType,
|
||||
in boolean isSorted);
|
||||
in long theShapeType,
|
||||
in boolean isSorted);
|
||||
|
||||
/*!
|
||||
* Explode a shape on subshapes of a given type.
|
||||
@ -2471,7 +2472,8 @@ module GEOM
|
||||
* Create an arc of ellipse of center C and two points P1 P2.
|
||||
* \param theCenter Center point of the arc.
|
||||
* \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.
|
||||
*/
|
||||
GEOM_Object MakeArcOfEllipse (in GEOM_Object theCenter,
|
||||
@ -3327,8 +3329,8 @@ module GEOM
|
||||
* \return List of GEOM_Objects, containing the created shape and propagation groups.
|
||||
*/
|
||||
ListOfGO MakePipeTShape (in double theR1, in double theW1, in double theL1,
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
in boolean theHexMesh);
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
in boolean theHexMesh);
|
||||
/*!
|
||||
* Create a T-shape object with specified caracteristics for the main and
|
||||
* the incident pipes (radius, width, half-length).
|
||||
@ -3347,9 +3349,9 @@ module GEOM
|
||||
* \return List of GEOM_Objects, containing the created shape and propagation groups.
|
||||
*/
|
||||
ListOfGO MakePipeTShapeWithPosition (in double theR1, in double theW1, in double theL1,
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
in boolean theHexMesh,
|
||||
in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3);
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
in boolean theHexMesh,
|
||||
in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3);
|
||||
/*!
|
||||
* Create a T-shape object with specified caracteristics for the main and
|
||||
* the incident pipes (radius, width, half-length). A chamfer is created
|
||||
@ -3390,9 +3392,9 @@ module GEOM
|
||||
* \return List of GEOM_Objects, containing the created shape and propagation groups.
|
||||
*/
|
||||
ListOfGO MakePipeTShapeChamferWithPosition (in double theR1, in double theW1, in double theL1,
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
in double theH, in double theW, in boolean theHexMesh,
|
||||
in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3);
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
in double theH, in double theW, in boolean theHexMesh,
|
||||
in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3);
|
||||
/*!
|
||||
* Create a T-shape object with specified caracteristics for the main and
|
||||
* the incident pipes (radius, width, half-length). A fillet is created
|
||||
@ -3409,8 +3411,8 @@ module GEOM
|
||||
* \return List of GEOM_Objects, containing the created shape and propagation groups.
|
||||
*/
|
||||
ListOfGO MakePipeTShapeFillet (in double theR1, in double theW1, in double theL1,
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
in double theRF, in boolean theHexMesh);
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
in double theRF, in boolean theHexMesh);
|
||||
/*!
|
||||
* Create a T-shape object with specified caracteristics for the main and
|
||||
* the incident pipes (radius, width, half-length). A fillet is created
|
||||
@ -3431,9 +3433,9 @@ module GEOM
|
||||
* \return List of GEOM_Objects, containing the created shape and propagation groups.
|
||||
*/
|
||||
ListOfGO MakePipeTShapeFilletWithPosition (in double theR1, in double theW1, in double theL1,
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
in double theRF, in boolean theHexMesh,
|
||||
in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3);
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
in double theRF, in boolean theHexMesh,
|
||||
in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3);
|
||||
/*@@ insert new functions before this line @@ do not remove this line @@*/
|
||||
};
|
||||
|
||||
@ -3441,7 +3443,7 @@ module GEOM
|
||||
* GEOM_Gen: Interface to access other GEOM interfaces.
|
||||
* 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
|
||||
@ -3486,7 +3488,7 @@ module GEOM
|
||||
* \return list of published sub-shapes
|
||||
*/
|
||||
ListOfGO RestoreSubShapesO (in SALOMEDS::Study theStudy,
|
||||
in GEOM_Object theObject,
|
||||
in GEOM_Object theObject,
|
||||
in ListOfGO theArgs,
|
||||
in find_shape_method theFindMethod,
|
||||
in boolean theInheritFirstArg,
|
||||
|
||||
@ -19,10 +19,9 @@
|
||||
//
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
// File : GEOM_Superv.idl
|
||||
// Author : Lucien PIGNOLONI
|
||||
//
|
||||
|
||||
#ifndef __GEOM_SUPERV__
|
||||
#define __GEOM_SUPERV__
|
||||
|
||||
@ -33,220 +32,222 @@ module GEOM
|
||||
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 //
|
||||
//-----------------------------------------------------------//
|
||||
void SetStudyID (in long theStudyID) ;
|
||||
|
||||
|
||||
//-----------------------------------------------------------//
|
||||
// Create ListOfGO and add items to it //
|
||||
// Create ListOfGO and add items to it //
|
||||
//-----------------------------------------------------------//
|
||||
GEOM_List CreateListOfGO();
|
||||
void AddItemToListOfGO( inout GEOM_List theList,
|
||||
in GEOM_Object theObject);
|
||||
void AddItemToListOfGO( inout GEOM_List theList,
|
||||
in GEOM_Object theObject);
|
||||
|
||||
//-----------------------------------------------------------//
|
||||
// Create ListOfLong and add items to it //
|
||||
// Create ListOfLong and add items to it //
|
||||
//-----------------------------------------------------------//
|
||||
GEOM_List CreateListOfLong();
|
||||
void AddItemToListOfLong( inout GEOM_List theList,
|
||||
in long theObject);
|
||||
void AddItemToListOfLong( inout GEOM_List theList,
|
||||
in long theObject);
|
||||
|
||||
//-----------------------------------------------------------//
|
||||
// Create ListOfDouble and add items to it //
|
||||
// Create ListOfDouble and add items to it //
|
||||
//-----------------------------------------------------------//
|
||||
GEOM_List CreateListOfDouble();
|
||||
void AddItemToListOfDouble( inout GEOM_List theList,
|
||||
in double theObject);
|
||||
void AddItemToListOfDouble( inout GEOM_List theList,
|
||||
in double theObject);
|
||||
|
||||
//-----------------------------------------------------------//
|
||||
// Primitives Construction : BasicOperations //
|
||||
// Primitives Construction : BasicOperations //
|
||||
//-----------------------------------------------------------//
|
||||
GEOM_Object MakePointXYZ (in double theX,
|
||||
in double theY,
|
||||
in double theZ) ;
|
||||
in double theY,
|
||||
in double theZ) ;
|
||||
GEOM_Object MakePointWithReference (in GEOM_Object theReference,
|
||||
in double theX,
|
||||
in double theY,
|
||||
in double theZ) ;
|
||||
in double theX,
|
||||
in double theY,
|
||||
in double theZ) ;
|
||||
GEOM_Object MakePointOnCurve (in GEOM_Object theRefCurve,
|
||||
in double theParameter) ;
|
||||
in double theParameter) ;
|
||||
|
||||
GEOM_Object MakeTangentOnCurve (in GEOM_Object theRefCurve,
|
||||
in double theParameter);
|
||||
in double theParameter);
|
||||
|
||||
GEOM_Object MakeVectorDXDYDZ (in double theDX,
|
||||
in double theDY,
|
||||
in double theDZ) ;
|
||||
in double theDY,
|
||||
in double theDZ) ;
|
||||
GEOM_Object MakeVectorTwoPnt (in GEOM_Object thePnt1,
|
||||
in GEOM_Object thePnt2) ;
|
||||
in GEOM_Object thePnt2) ;
|
||||
GEOM_Object MakeLineTwoPnt (in GEOM_Object thePnt1,
|
||||
in GEOM_Object thePnt2) ;
|
||||
in GEOM_Object thePnt2) ;
|
||||
GEOM_Object MakeLineTwoFaces (in GEOM_Object theFace1,
|
||||
in GEOM_Object theFace2) ;
|
||||
in GEOM_Object theFace2) ;
|
||||
GEOM_Object MakePlaneThreePnt (in GEOM_Object thePnt1,
|
||||
in GEOM_Object thePnt2,
|
||||
in GEOM_Object thePnt3,
|
||||
in double theTrimSize) ;
|
||||
in GEOM_Object thePnt2,
|
||||
in GEOM_Object thePnt3,
|
||||
in double theTrimSize) ;
|
||||
GEOM_Object MakePlanePntVec (in GEOM_Object thePnt,
|
||||
in GEOM_Object theVec,
|
||||
in double theTrimSize) ;
|
||||
in GEOM_Object theVec,
|
||||
in double theTrimSize) ;
|
||||
GEOM_Object MakePlaneFace (in GEOM_Object theFace,
|
||||
in double theTrimSize) ;
|
||||
in double theTrimSize) ;
|
||||
GEOM_Object MakePlane2Vec (in GEOM_Object theVec1,
|
||||
in GEOM_Object theVec2,
|
||||
in double theTrimSize) ;
|
||||
in GEOM_Object theVec2,
|
||||
in double theTrimSize) ;
|
||||
GEOM_Object MakePlaneLCS (in GEOM_Object theLCS,
|
||||
in double theTrimSize,
|
||||
in double theOrientation) ;
|
||||
in double theTrimSize,
|
||||
in double theOrientation) ;
|
||||
GEOM_Object MakeMarker (in double theOX , in double theOY , in double theOZ,
|
||||
in double theXDX, in double theXDY, in double theXDZ,
|
||||
in double theYDX, in double theYDY, in double theYDZ) ;
|
||||
|
||||
in double theXDX, in double theXDY, in double theXDZ,
|
||||
in double theYDX, in double theYDY, in double theYDZ) ;
|
||||
|
||||
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.
|
||||
* Values of parameters should be between 0. and 1.0
|
||||
* \param theFace - face for which tangent plane shuold be built.
|
||||
* \param theFace - face for which tangent plane shuold be built.
|
||||
* \param theParameterU - value of parameter by U
|
||||
* \param theParameterV - value of parameter Vthe
|
||||
* \param theTrimSize - defines sizes of created face
|
||||
* \return New GEOM_Object, containing the face built on tangent plane.
|
||||
*/
|
||||
GEOM_Object MakeTangentPlaneOnFace(in GEOM_Object theFace,
|
||||
in double theParameterU,
|
||||
in double theParameterV,
|
||||
in double theTrimSize);
|
||||
in double theParameterU,
|
||||
in double theParameterV,
|
||||
in double theTrimSize);
|
||||
|
||||
//-----------------------------------------------------------//
|
||||
// Primitives Construction : 3DPrimOperations //
|
||||
//-----------------------------------------------------------//
|
||||
GEOM_Object MakeBox (in double theX1,
|
||||
in double theY1,
|
||||
in double theZ1,
|
||||
in double theX2,
|
||||
in double theY2,
|
||||
in double theZ2) ;
|
||||
GEOM_Object MakeBoxDXDYDZ (in double theDX,
|
||||
in double theDY,
|
||||
in double theDZ) ;
|
||||
GEOM_Object MakeBoxTwoPnt (in GEOM_Object thePnt1,
|
||||
in GEOM_Object thePnt2) ;
|
||||
GEOM_Object MakeFaceHW (in double theH,
|
||||
in double theW,
|
||||
in short theOrientation) ;
|
||||
GEOM_Object MakeFaceObjHW (in GEOM_Object theObj,
|
||||
in double theH,
|
||||
in double theW) ;
|
||||
in double theY1,
|
||||
in double theZ1,
|
||||
in double theX2,
|
||||
in double theY2,
|
||||
in double theZ2) ;
|
||||
GEOM_Object MakeBoxDXDYDZ (in double theDX,
|
||||
in double theDY,
|
||||
in double theDZ) ;
|
||||
GEOM_Object MakeBoxTwoPnt (in GEOM_Object thePnt1,
|
||||
in GEOM_Object thePnt2) ;
|
||||
GEOM_Object MakeFaceHW (in double theH,
|
||||
in double theW,
|
||||
in short theOrientation) ;
|
||||
GEOM_Object MakeFaceObjHW (in GEOM_Object theObj,
|
||||
in double theH,
|
||||
in double theW) ;
|
||||
GEOM_Object MakeDiskPntVecR (in GEOM_Object thePnt,
|
||||
in GEOM_Object theVec,
|
||||
in double theR) ;
|
||||
in GEOM_Object theVec,
|
||||
in double theR) ;
|
||||
GEOM_Object MakeDiskThreePnt (in GEOM_Object thePnt1,
|
||||
in GEOM_Object thePnt2,
|
||||
in GEOM_Object thePnt3) ;
|
||||
GEOM_Object MakeDiskR (in double theR,
|
||||
in short theOrientation) ;
|
||||
in GEOM_Object thePnt2,
|
||||
in GEOM_Object thePnt3) ;
|
||||
GEOM_Object MakeDiskR (in double theR,
|
||||
in short theOrientation) ;
|
||||
GEOM_Object MakeCylinderPntVecRH (in GEOM_Object thePnt,
|
||||
in GEOM_Object theAxis,
|
||||
in double theRadius,
|
||||
in double theHeight) ;
|
||||
GEOM_Object MakeCylinderRH (in double theR,
|
||||
in double theH) ;
|
||||
in GEOM_Object theAxis,
|
||||
in double theRadius,
|
||||
in double theHeight) ;
|
||||
GEOM_Object MakeCylinderRH (in double theR,
|
||||
in double theH) ;
|
||||
GEOM_Object MakeSphere (in double theX,
|
||||
in double theY,
|
||||
in double theZ,
|
||||
in double theRadius) ;
|
||||
in double theY,
|
||||
in double theZ,
|
||||
in double theRadius) ;
|
||||
GEOM_Object MakeSphereR (in double theR) ;
|
||||
GEOM_Object MakeSpherePntR (in GEOM_Object thePnt,
|
||||
in double theR) ;
|
||||
GEOM_Object MakeSpherePntR (in GEOM_Object thePnt,
|
||||
in double theR) ;
|
||||
GEOM_Object MakeTorusPntVecRR (in GEOM_Object thePnt,
|
||||
in GEOM_Object theVec,
|
||||
in double theRMajor,
|
||||
in double theRMinor) ;
|
||||
in GEOM_Object theVec,
|
||||
in double theRMajor,
|
||||
in double theRMinor) ;
|
||||
GEOM_Object MakeTorusRR (in double theRMajor,
|
||||
in double theRMinor) ;
|
||||
in double theRMinor) ;
|
||||
GEOM_Object MakeConePntVecR1R2H (in GEOM_Object thePnt,
|
||||
in GEOM_Object theAxis,
|
||||
in double theR1,
|
||||
in double theR2,
|
||||
in double theHeight) ;
|
||||
GEOM_Object MakeConeR1R2H (in double theR1,
|
||||
in double theR2,
|
||||
in double theHeight) ;
|
||||
in GEOM_Object theAxis,
|
||||
in double theR1,
|
||||
in double theR2,
|
||||
in double theHeight) ;
|
||||
GEOM_Object MakeConeR1R2H (in double theR1,
|
||||
in double theR2,
|
||||
in double theHeight) ;
|
||||
GEOM_Object MakePrismVecH (in GEOM_Object theBase,
|
||||
in GEOM_Object theVec,
|
||||
in double theH) ;
|
||||
in GEOM_Object theVec,
|
||||
in double theH) ;
|
||||
GEOM_Object MakePrismVecH2Ways (in GEOM_Object theBase,
|
||||
in GEOM_Object theVec,
|
||||
in double theH) ;
|
||||
in GEOM_Object theVec,
|
||||
in double theH) ;
|
||||
GEOM_Object MakePrismTwoPnt (in GEOM_Object theBase,
|
||||
in GEOM_Object thePoint1,
|
||||
in GEOM_Object thePoint2) ;
|
||||
in GEOM_Object thePoint1,
|
||||
in GEOM_Object thePoint2) ;
|
||||
GEOM_Object MakePrismTwoPnt2Ways (in GEOM_Object theBase,
|
||||
in GEOM_Object thePoint1,
|
||||
in GEOM_Object thePoint2) ;
|
||||
GEOM_Object MakePipe (in GEOM_Object theBase,
|
||||
in GEOM_Object thePath) ;
|
||||
in GEOM_Object thePoint1,
|
||||
in GEOM_Object thePoint2) ;
|
||||
GEOM_Object MakePipe (in GEOM_Object theBase,
|
||||
in GEOM_Object thePath) ;
|
||||
GEOM_Object MakeRevolutionAxisAngle (in GEOM_Object theBase,
|
||||
in GEOM_Object theAxis,
|
||||
in double theAngle) ;
|
||||
in GEOM_Object theAxis,
|
||||
in double theAngle) ;
|
||||
GEOM_Object MakeRevolutionAxisAngle2Ways (in GEOM_Object theBase,
|
||||
in GEOM_Object theAxis,
|
||||
in double theAngle) ;
|
||||
in GEOM_Object theAxis,
|
||||
in double theAngle) ;
|
||||
GEOM_Object MakeFilling (in GEOM_Object theShape,
|
||||
in long theMinDeg, in long theMaxDeg,
|
||||
in double theTol2D, in double theTol3D,
|
||||
in long theNbIter,
|
||||
in long theMinDeg, in long theMaxDeg,
|
||||
in double theTol2D, in double theTol3D,
|
||||
in long theNbIter,
|
||||
in filling_oper_method theMethod,
|
||||
in boolean theApprox) ;
|
||||
GEOM_Object MakeThruSections(in ListOfGO theSeqSections,
|
||||
in boolean theModeSolid,
|
||||
in double thePreci,
|
||||
in boolean theModeSolid,
|
||||
in double thePreci,
|
||||
in boolean theRuled);
|
||||
|
||||
GEOM_Object MakePipeWithDifferentSections (in ListOfGO theSeqBases,
|
||||
in ListOfGO theLocations,
|
||||
in GEOM_Object thePath,
|
||||
in boolean theWithContact ,
|
||||
in boolean theWithCorrection );
|
||||
|
||||
GEOM_Object MakePipeWithShellSections (in ListOfGO theSeqBases,
|
||||
in ListOfGO theSeqSubBases,
|
||||
in ListOfGO theLocations,
|
||||
in GEOM_Object thePath,
|
||||
in boolean theWithContact ,
|
||||
in boolean theWithCorrection );
|
||||
|
||||
GEOM_Object MakePipeShellsWithoutPath (in ListOfGO theSeqBases,
|
||||
in ListOfGO theLocations );
|
||||
in ListOfGO theLocations,
|
||||
in GEOM_Object thePath,
|
||||
in boolean theWithContact ,
|
||||
in boolean theWithCorrection );
|
||||
|
||||
GEOM_Object MakePipeBiNormalAlongVector (in GEOM_Object theBase,
|
||||
in GEOM_Object thePath,
|
||||
in GEOM_Object theVec);
|
||||
GEOM_Object MakePipeWithShellSections (in ListOfGO theSeqBases,
|
||||
in ListOfGO theSeqSubBases,
|
||||
in ListOfGO theLocations,
|
||||
in GEOM_Object thePath,
|
||||
in boolean theWithContact ,
|
||||
in boolean theWithCorrection );
|
||||
|
||||
GEOM_Object MakePipeShellsWithoutPath (in ListOfGO theSeqBases,
|
||||
in ListOfGO theLocations );
|
||||
|
||||
GEOM_Object MakePipeBiNormalAlongVector (in GEOM_Object theBase,
|
||||
in GEOM_Object thePath,
|
||||
in GEOM_Object theVec);
|
||||
|
||||
//-----------------------------------------------------------//
|
||||
// BooleanOperations //
|
||||
//-----------------------------------------------------------//
|
||||
GEOM_Object MakeBoolean (in GEOM_Object theShape1,
|
||||
in GEOM_Object theShape2,
|
||||
in long theOperation) ;
|
||||
in GEOM_Object theShape2,
|
||||
in long theOperation) ;
|
||||
GEOM_Object MakeFuse (in GEOM_Object theShape1,
|
||||
in GEOM_Object theShape2) ;
|
||||
in GEOM_Object theShape2) ;
|
||||
GEOM_Object MakePartition (in GEOM_List theShapes,
|
||||
in GEOM_List theTools,
|
||||
in GEOM_List theKeepInside,
|
||||
in GEOM_List theRemoveInside,
|
||||
in short theLimit,
|
||||
in boolean theRemoveWebs,
|
||||
in GEOM_List theMaterials,
|
||||
in short theKeepNonlimitShapes);
|
||||
in GEOM_List theTools,
|
||||
in GEOM_List theKeepInside,
|
||||
in GEOM_List theRemoveInside,
|
||||
in short theLimit,
|
||||
in boolean theRemoveWebs,
|
||||
in GEOM_List theMaterials,
|
||||
in short theKeepNonlimitShapes);
|
||||
GEOM_Object MakeHalfPartition (in GEOM_Object theShape,
|
||||
in GEOM_Object thePlane) ;
|
||||
in GEOM_Object thePlane) ;
|
||||
|
||||
//-----------------------------------------------------------//
|
||||
// InsertOperations //
|
||||
@ -255,91 +256,91 @@ module GEOM
|
||||
void Export (in GEOM_Object theObject, in string theFileName, in string theFormatName) ;
|
||||
GEOM_Object Import (in string theFileName, in string theFormatName) ;
|
||||
void ImportTranslators (out string_array theFormats,
|
||||
out string_array thePatterns) ;
|
||||
out string_array thePatterns) ;
|
||||
void ExportTranslators (out string_array theFormats,
|
||||
out string_array thePatterns) ;
|
||||
out string_array thePatterns) ;
|
||||
|
||||
//-----------------------------------------------------------//
|
||||
// TransformOperations //
|
||||
//-----------------------------------------------------------//
|
||||
GEOM_Object TranslateTwoPoints (in GEOM_Object theObject,
|
||||
in GEOM_Object thePoint1,
|
||||
in GEOM_Object thePoint2) ;
|
||||
in GEOM_Object thePoint1,
|
||||
in GEOM_Object thePoint2) ;
|
||||
GEOM_Object TranslateTwoPointsCopy (in GEOM_Object theObject,
|
||||
in GEOM_Object thePoint1,
|
||||
in GEOM_Object thePoint1,
|
||||
in GEOM_Object thePoint2) ;
|
||||
GEOM_Object TranslateDXDYDZ (in GEOM_Object theObject,
|
||||
in double theDX,
|
||||
in double theDY,
|
||||
in double theDZ) ;
|
||||
in double theDX,
|
||||
in double theDY,
|
||||
in double theDZ) ;
|
||||
GEOM_Object TranslateDXDYDZCopy (in GEOM_Object theObject,
|
||||
in double theDX,
|
||||
in double theDY,
|
||||
in double theDZ) ;
|
||||
in double theDX,
|
||||
in double theDY,
|
||||
in double theDZ) ;
|
||||
GEOM_Object TranslateVector (in GEOM_Object theObject,
|
||||
in GEOM_Object theVector) ;
|
||||
in GEOM_Object theVector) ;
|
||||
GEOM_Object TranslateVectorCopy (in GEOM_Object theObject,
|
||||
in GEOM_Object theVector) ;
|
||||
in GEOM_Object theVector) ;
|
||||
GEOM_Object TranslateVectorDistance (in GEOM_Object theObject,
|
||||
in GEOM_Object theVector,
|
||||
in double theDistance,
|
||||
in boolean theCopy) ;
|
||||
in GEOM_Object theVector,
|
||||
in double theDistance,
|
||||
in boolean theCopy) ;
|
||||
GEOM_Object MultiTranslate1D (in GEOM_Object theObject,
|
||||
in GEOM_Object theVector,
|
||||
in double theStep,
|
||||
in long theNbTimes) ;
|
||||
in GEOM_Object theVector,
|
||||
in double theStep,
|
||||
in long theNbTimes) ;
|
||||
GEOM_Object MultiTranslate2D (in GEOM_Object theObject,
|
||||
in GEOM_Object theVector1,
|
||||
in double theStep1,
|
||||
in long theNbTimes1,
|
||||
in GEOM_Object theVector2,
|
||||
in double theStep2,
|
||||
in long theNbTimes2) ;
|
||||
in GEOM_Object theVector1,
|
||||
in double theStep1,
|
||||
in long theNbTimes1,
|
||||
in GEOM_Object theVector2,
|
||||
in double theStep2,
|
||||
in long theNbTimes2) ;
|
||||
GEOM_Object Rotate (in GEOM_Object theObject,
|
||||
in GEOM_Object theAxis,
|
||||
in double theAngle) ;
|
||||
in GEOM_Object theAxis,
|
||||
in double theAngle) ;
|
||||
GEOM_Object RotateCopy (in GEOM_Object theObject,
|
||||
in GEOM_Object theAxis,
|
||||
in double theAngle) ;
|
||||
in GEOM_Object theAxis,
|
||||
in double theAngle) ;
|
||||
GEOM_Object RotateThreePoints (in GEOM_Object theObject,
|
||||
in GEOM_Object theCentPoint,
|
||||
in GEOM_Object thePoint1,
|
||||
in GEOM_Object thePoint2);
|
||||
in GEOM_Object theCentPoint,
|
||||
in GEOM_Object thePoint1,
|
||||
in GEOM_Object thePoint2);
|
||||
GEOM_Object RotateThreePointsCopy (in GEOM_Object theObject,
|
||||
in GEOM_Object theCentPoint,
|
||||
in GEOM_Object thePoint1,
|
||||
in GEOM_Object thePoint2);
|
||||
in GEOM_Object theCentPoint,
|
||||
in GEOM_Object thePoint1,
|
||||
in GEOM_Object thePoint2);
|
||||
GEOM_Object MultiRotate1D (in GEOM_Object theObject,
|
||||
in GEOM_Object theAxis,
|
||||
in long theNbTimes) ;
|
||||
in GEOM_Object theAxis,
|
||||
in long theNbTimes) ;
|
||||
GEOM_Object MultiRotate2D (in GEOM_Object theObject,
|
||||
in GEOM_Object theAxis,
|
||||
in double theAngle,
|
||||
in long theNbTimes1,
|
||||
in double theStep,
|
||||
in long theNbTimes2) ;
|
||||
GEOM_Object MirrorPlane (in GEOM_Object theObject,
|
||||
in GEOM_Object thePlane) ;
|
||||
GEOM_Object MirrorPlaneCopy (in GEOM_Object theObject,
|
||||
in GEOM_Object thePlane) ;
|
||||
GEOM_Object MirrorAxis (in GEOM_Object theObject,
|
||||
in GEOM_Object theAxis) ;
|
||||
GEOM_Object MirrorAxisCopy (in GEOM_Object theObject,
|
||||
in GEOM_Object theAxis) ;
|
||||
GEOM_Object MirrorPoint (in GEOM_Object theObject,
|
||||
in GEOM_Object thePoint) ;
|
||||
GEOM_Object MirrorPointCopy (in GEOM_Object theObject,
|
||||
in GEOM_Object thePoint) ;
|
||||
GEOM_Object OffsetShape (in GEOM_Object theObject,
|
||||
in double theOffset) ;
|
||||
GEOM_Object OffsetShapeCopy (in GEOM_Object theObject,
|
||||
in double theOffset) ;
|
||||
GEOM_Object ScaleShape (in GEOM_Object theObject,
|
||||
in GEOM_Object thePoint,
|
||||
in double theFactor) ;
|
||||
GEOM_Object ScaleShapeCopy (in GEOM_Object theObject,
|
||||
in GEOM_Object thePoint,
|
||||
in double theFactor) ;
|
||||
in GEOM_Object theAxis,
|
||||
in double theAngle,
|
||||
in long theNbTimes1,
|
||||
in double theStep,
|
||||
in long theNbTimes2) ;
|
||||
GEOM_Object MirrorPlane (in GEOM_Object theObject,
|
||||
in GEOM_Object thePlane) ;
|
||||
GEOM_Object MirrorPlaneCopy (in GEOM_Object theObject,
|
||||
in GEOM_Object thePlane) ;
|
||||
GEOM_Object MirrorAxis (in GEOM_Object theObject,
|
||||
in GEOM_Object theAxis) ;
|
||||
GEOM_Object MirrorAxisCopy (in GEOM_Object theObject,
|
||||
in GEOM_Object theAxis) ;
|
||||
GEOM_Object MirrorPoint (in GEOM_Object theObject,
|
||||
in GEOM_Object thePoint) ;
|
||||
GEOM_Object MirrorPointCopy (in GEOM_Object theObject,
|
||||
in GEOM_Object thePoint) ;
|
||||
GEOM_Object OffsetShape (in GEOM_Object theObject,
|
||||
in double theOffset) ;
|
||||
GEOM_Object OffsetShapeCopy (in GEOM_Object theObject,
|
||||
in double theOffset) ;
|
||||
GEOM_Object ScaleShape (in GEOM_Object theObject,
|
||||
in GEOM_Object thePoint,
|
||||
in double theFactor) ;
|
||||
GEOM_Object ScaleShapeCopy (in GEOM_Object theObject,
|
||||
in GEOM_Object thePoint,
|
||||
in double theFactor) ;
|
||||
GEOM_Object ScaleShapeAlongAxes (in GEOM_Object theObject,
|
||||
in GEOM_Object thePoint,
|
||||
in double theFactorX,
|
||||
@ -351,227 +352,227 @@ module GEOM
|
||||
in double theFactorY,
|
||||
in double theFactorZ);
|
||||
GEOM_Object PositionShape (in GEOM_Object theObject,
|
||||
in GEOM_Object theStartLCS,
|
||||
in GEOM_Object theEndLCS) ;
|
||||
in GEOM_Object theStartLCS,
|
||||
in GEOM_Object theEndLCS) ;
|
||||
GEOM_Object PositionShapeCopy (in GEOM_Object theObject,
|
||||
in GEOM_Object theStartLCS,
|
||||
in GEOM_Object theEndLCS) ;
|
||||
in GEOM_Object theStartLCS,
|
||||
in GEOM_Object theEndLCS) ;
|
||||
GEOM_Object PositionAlongPath (in GEOM_Object theObject,
|
||||
in GEOM_Object thePath,
|
||||
in double theDistance,
|
||||
in boolean theCopy,
|
||||
in boolean theReverse);
|
||||
in GEOM_Object thePath,
|
||||
in double theDistance,
|
||||
in boolean theCopy,
|
||||
in boolean theReverse);
|
||||
|
||||
//-----------------------------------------------------------//
|
||||
// ShapesOperations //
|
||||
//-----------------------------------------------------------//
|
||||
GEOM_Object MakeEdge (in GEOM_Object thePnt1,
|
||||
in GEOM_Object thePnt2) ;
|
||||
GEOM_Object MakeEdge (in GEOM_Object thePnt1,
|
||||
in GEOM_Object thePnt2) ;
|
||||
GEOM_Object MakeWire (in GEOM_List theEdgesAndWires,
|
||||
in double theTolerance) ;
|
||||
GEOM_Object MakeFace (in GEOM_Object theWire,
|
||||
in boolean isPlanarWanted) ;
|
||||
GEOM_Object MakeFaceWires (in GEOM_List theWires,
|
||||
in boolean isPlanarWanted) ;
|
||||
GEOM_Object MakeFace (in GEOM_Object theWire,
|
||||
in boolean isPlanarWanted) ;
|
||||
GEOM_Object MakeFaceWires (in GEOM_List theWires,
|
||||
in boolean isPlanarWanted) ;
|
||||
GEOM_Object MakeShell (in GEOM_List theFacesAndShells) ;
|
||||
GEOM_Object MakeSolidShell (in GEOM_Object theShell) ;
|
||||
GEOM_Object MakeSolidShells (in GEOM_List theShells) ;
|
||||
GEOM_Object MakeCompound (in GEOM_List theShapes) ;
|
||||
GEOM_Object MakeGlueFaces (in GEOM_Object theShape,
|
||||
in double theTolerance,
|
||||
in boolean doKeepNonSolids);
|
||||
GEOM_List GetGlueFaces (in GEOM_Object theShape,
|
||||
in double theTolerance);
|
||||
GEOM_Object MakeGlueFacesByList (in GEOM_Object theShape,
|
||||
in double theTolerance,
|
||||
in ListOfGO theFaces,
|
||||
in boolean doKeepNonSolids);
|
||||
GEOM_Object MakeGlueFaces (in GEOM_Object theShape,
|
||||
in double theTolerance,
|
||||
in boolean doKeepNonSolids);
|
||||
GEOM_List GetGlueFaces (in GEOM_Object theShape,
|
||||
in double theTolerance);
|
||||
GEOM_Object MakeGlueFacesByList (in GEOM_Object theShape,
|
||||
in double theTolerance,
|
||||
in ListOfGO theFaces,
|
||||
in boolean doKeepNonSolids);
|
||||
GEOM_List MakeExplode (in GEOM_Object theShape,
|
||||
in long theShapeType,
|
||||
in boolean isSorted) ;
|
||||
in long theShapeType,
|
||||
in boolean isSorted) ;
|
||||
long NumberOfFaces (in GEOM_Object theShape) ;
|
||||
long NumberOfEdges (in GEOM_Object theShape) ;
|
||||
GEOM_Object ChangeOrientation (in GEOM_Object theShape) ;
|
||||
|
||||
GEOM_List GetShapesOnShape (in GEOM_Object theCheckShape,
|
||||
in GEOM_Object theShape,
|
||||
in short theShapeType,
|
||||
in shape_state theState);
|
||||
in GEOM_Object theShape,
|
||||
in short theShapeType,
|
||||
in shape_state theState);
|
||||
GEOM_Object GetShapesOnShapeAsCompound (in GEOM_Object theCheckShape,
|
||||
in GEOM_Object theShape,
|
||||
in short theShapeType,
|
||||
in shape_state theState);
|
||||
in GEOM_Object theShape,
|
||||
in short theShapeType,
|
||||
in shape_state theState);
|
||||
|
||||
//-----------------------------------------------------------//
|
||||
// BlocksOperations //
|
||||
//-----------------------------------------------------------//
|
||||
GEOM_Object MakeQuad4Vertices (in GEOM_Object thePnt1,
|
||||
in GEOM_Object thePnt2,
|
||||
in GEOM_Object thePnt3,
|
||||
in GEOM_Object thePnt4) ;
|
||||
in GEOM_Object thePnt2,
|
||||
in GEOM_Object thePnt3,
|
||||
in GEOM_Object thePnt4) ;
|
||||
GEOM_Object MakeQuad (in GEOM_Object theEdge1,
|
||||
in GEOM_Object theEdge2,
|
||||
in GEOM_Object theEdge3,
|
||||
in GEOM_Object theEdge4) ;
|
||||
in GEOM_Object theEdge2,
|
||||
in GEOM_Object theEdge3,
|
||||
in GEOM_Object theEdge4) ;
|
||||
GEOM_Object MakeQuad2Edges (in GEOM_Object theEdge1,
|
||||
in GEOM_Object theEdge2) ;
|
||||
in GEOM_Object theEdge2) ;
|
||||
GEOM_Object MakeHexa (in GEOM_Object theFace1,
|
||||
in GEOM_Object theFace2,
|
||||
in GEOM_Object theFace3,
|
||||
in GEOM_Object theFace4,
|
||||
in GEOM_Object theFace5,
|
||||
in GEOM_Object theFace6) ;
|
||||
in GEOM_Object theFace2,
|
||||
in GEOM_Object theFace3,
|
||||
in GEOM_Object theFace4,
|
||||
in GEOM_Object theFace5,
|
||||
in GEOM_Object theFace6) ;
|
||||
GEOM_Object MakeHexa2Faces (in GEOM_Object theFace1,
|
||||
in GEOM_Object theFace2) ;
|
||||
in GEOM_Object theFace2) ;
|
||||
GEOM_Object GetPoint (in GEOM_Object theShape,
|
||||
in double theX,
|
||||
in double theY,
|
||||
in double theZ,
|
||||
in double theEpsilon) ;
|
||||
in double theX,
|
||||
in double theY,
|
||||
in double theZ,
|
||||
in double theEpsilon) ;
|
||||
GEOM_Object GetEdge (in GEOM_Object theShape,
|
||||
in GEOM_Object thePoint1,
|
||||
in GEOM_Object thePoint2) ;
|
||||
in GEOM_Object thePoint1,
|
||||
in GEOM_Object thePoint2) ;
|
||||
GEOM_Object GetEdgeNearPoint (in GEOM_Object theShape,
|
||||
in GEOM_Object thePoint) ;
|
||||
in GEOM_Object thePoint) ;
|
||||
GEOM_Object GetFaceByPoints (in GEOM_Object theShape,
|
||||
in GEOM_Object thePoint1,
|
||||
in GEOM_Object thePoint2,
|
||||
in GEOM_Object thePoint3,
|
||||
in GEOM_Object thePoint4) ;
|
||||
in GEOM_Object thePoint1,
|
||||
in GEOM_Object thePoint2,
|
||||
in GEOM_Object thePoint3,
|
||||
in GEOM_Object thePoint4) ;
|
||||
GEOM_Object GetFaceByEdges (in GEOM_Object theShape,
|
||||
in GEOM_Object theEdge1,
|
||||
in GEOM_Object theEdge2) ;
|
||||
in GEOM_Object theEdge1,
|
||||
in GEOM_Object theEdge2) ;
|
||||
GEOM_Object GetOppositeFace (in GEOM_Object theBlock,
|
||||
in GEOM_Object theFace) ;
|
||||
in GEOM_Object theFace) ;
|
||||
GEOM_Object GetFaceNearPoint (in GEOM_Object theShape,
|
||||
in GEOM_Object thePoint) ;
|
||||
in GEOM_Object thePoint) ;
|
||||
GEOM_Object GetFaceByNormale (in GEOM_Object theBlock,
|
||||
in GEOM_Object theVector) ;
|
||||
in GEOM_Object theVector) ;
|
||||
boolean IsCompoundOfBlocks (in GEOM_Object theCompound,
|
||||
in long theMinNbFaces,
|
||||
in long theMaxNbFaces,
|
||||
out long theNbBlocks) ;
|
||||
in long theMinNbFaces,
|
||||
in long theMaxNbFaces,
|
||||
out long theNbBlocks) ;
|
||||
boolean CheckCompoundOfBlocks (in GEOM_Object theCompound,
|
||||
out GEOM_IBlocksOperations::BCErrors theErrors) ;
|
||||
out GEOM_IBlocksOperations::BCErrors theErrors) ;
|
||||
string PrintBCErrors (in GEOM_Object theCompound,
|
||||
in GEOM_IBlocksOperations::BCErrors theErrors) ;
|
||||
in GEOM_IBlocksOperations::BCErrors theErrors) ;
|
||||
GEOM_List ExplodeCompoundOfBlocks (in GEOM_Object theCompound,
|
||||
in long theMinNbFaces,
|
||||
in long theMaxNbFaces) ;
|
||||
in long theMinNbFaces,
|
||||
in long theMaxNbFaces) ;
|
||||
GEOM_Object GetBlockNearPoint (in GEOM_Object theCompound,
|
||||
in GEOM_Object thePoint) ;
|
||||
in GEOM_Object thePoint) ;
|
||||
GEOM_Object GetBlockByParts (in GEOM_Object theCompound,
|
||||
in GEOM_List theParts) ;
|
||||
in GEOM_List theParts) ;
|
||||
GEOM_List GetBlocksByParts (in GEOM_Object theCompound,
|
||||
in GEOM_List theParts) ;
|
||||
in GEOM_List theParts) ;
|
||||
GEOM_Object MakeMultiTransformation1D (in GEOM_Object theBlock,
|
||||
in long theDirFace1,
|
||||
in long theDirFace2,
|
||||
in long theNbTimes) ;
|
||||
in long theDirFace1,
|
||||
in long theDirFace2,
|
||||
in long theNbTimes) ;
|
||||
GEOM_Object MakeMultiTransformation2D (in GEOM_Object theBlock,
|
||||
in long theDirFace1U,
|
||||
in long theDirFace2U,
|
||||
in long theNbTimesU,
|
||||
in long theDirFace1V,
|
||||
in long theDirFace2V,
|
||||
in long theNbTimesV) ;
|
||||
in long theDirFace1U,
|
||||
in long theDirFace2U,
|
||||
in long theNbTimesU,
|
||||
in long theDirFace1V,
|
||||
in long theDirFace2V,
|
||||
in long theNbTimesV) ;
|
||||
|
||||
//-----------------------------------------------------------//
|
||||
// CurvesOperations //
|
||||
//-----------------------------------------------------------//
|
||||
GEOM_Object MakeCirclePntVecR (in GEOM_Object thePnt,
|
||||
in GEOM_Object theVec,
|
||||
in double theR) ;
|
||||
in GEOM_Object theVec,
|
||||
in double theR) ;
|
||||
GEOM_Object MakeCircleThreePnt (in GEOM_Object thePnt1,
|
||||
in GEOM_Object thePnt2,
|
||||
in GEOM_Object thePnt3) ;
|
||||
in GEOM_Object thePnt2,
|
||||
in GEOM_Object thePnt3) ;
|
||||
GEOM_Object MakeCircleCenter2Pnt (in GEOM_Object thePnt1,
|
||||
in GEOM_Object thePnt2,
|
||||
in GEOM_Object thePnt3) ;
|
||||
in GEOM_Object thePnt2,
|
||||
in GEOM_Object thePnt3) ;
|
||||
GEOM_Object MakeEllipse (in GEOM_Object thePnt,
|
||||
in GEOM_Object theVec,
|
||||
in double theRMajor,
|
||||
in double theRMinor) ;
|
||||
in GEOM_Object theVec,
|
||||
in double theRMajor,
|
||||
in double theRMinor) ;
|
||||
GEOM_Object MakeEllipseVec (in GEOM_Object thePnt,
|
||||
in GEOM_Object theVec,
|
||||
in double theRMajor,
|
||||
in double theRMinor,
|
||||
in GEOM_Object theVecMaj) ;
|
||||
in GEOM_Object theVec,
|
||||
in double theRMajor,
|
||||
in double theRMinor,
|
||||
in GEOM_Object theVecMaj) ;
|
||||
GEOM_Object MakeArc (in GEOM_Object thePnt1,
|
||||
in GEOM_Object thePnt2,
|
||||
in GEOM_Object thePnt3) ;
|
||||
in GEOM_Object thePnt2,
|
||||
in GEOM_Object thePnt3) ;
|
||||
GEOM_Object MakeArcCenter (in GEOM_Object theCenter,
|
||||
in GEOM_Object thePnt1,
|
||||
in GEOM_Object thePnt2,
|
||||
in boolean theSense) ;
|
||||
GEOM_Object MakeArcOfEllipse (in GEOM_Object theCenter,
|
||||
in GEOM_Object thePnt1,
|
||||
in GEOM_Object thePnt2) ;
|
||||
in GEOM_Object thePnt1,
|
||||
in GEOM_Object thePnt2) ;
|
||||
GEOM_Object MakePolyline (in GEOM_List thePoints) ;
|
||||
GEOM_Object MakeSplineBezier (in GEOM_List thePoints) ;
|
||||
GEOM_Object MakeSplineInterpolation (in GEOM_List thePoints,
|
||||
in boolean theIsClosed) ;
|
||||
GEOM_Object MakeSketcher (in string theCommand,
|
||||
in GEOM_List theWorkingPlane) ;
|
||||
|
||||
GEOM_Object MakeSketcher (in string theCommand,
|
||||
in GEOM_List theWorkingPlane) ;
|
||||
|
||||
//-----------------------------------------------------------//
|
||||
// LocalOperations //
|
||||
//-----------------------------------------------------------//
|
||||
GEOM_Object MakeFilletAll (in GEOM_Object theShape,
|
||||
in double theR) ;
|
||||
in double theR) ;
|
||||
GEOM_Object MakeFilletEdges (in GEOM_Object theShape,
|
||||
in double theR,
|
||||
in GEOM_List theEdges) ;
|
||||
in double theR,
|
||||
in GEOM_List theEdges) ;
|
||||
GEOM_Object MakeFilletEdgesR1R2 (in GEOM_Object theShape,
|
||||
in double theR1,
|
||||
in double theR2,
|
||||
in GEOM_List theEdges) ;
|
||||
in double theR1,
|
||||
in double theR2,
|
||||
in GEOM_List theEdges) ;
|
||||
GEOM_Object MakeFilletFaces (in GEOM_Object theShape,
|
||||
in double theR,
|
||||
in GEOM_List theFaces) ;
|
||||
in double theR,
|
||||
in GEOM_List theFaces) ;
|
||||
GEOM_Object MakeFilletFacesR1R2 (in GEOM_Object theShape,
|
||||
in double theR1,
|
||||
in double theR2,
|
||||
in GEOM_List theFaces) ;
|
||||
in double theR1,
|
||||
in double theR2,
|
||||
in GEOM_List theFaces) ;
|
||||
GEOM_Object MakeFillet2D (in GEOM_Object theShape,
|
||||
in double theR,
|
||||
in GEOM_List theVertexes) ;
|
||||
in double theR,
|
||||
in GEOM_List theVertexes) ;
|
||||
GEOM_Object MakeChamferAll (in GEOM_Object theShape,
|
||||
in double theD) ;
|
||||
in double theD) ;
|
||||
GEOM_Object MakeChamferEdge (in GEOM_Object theShape,
|
||||
in double theD1, in double theD2,
|
||||
in long theFace1, in long theFace2) ;
|
||||
in double theD1, in double theD2,
|
||||
in long theFace1, in long theFace2) ;
|
||||
GEOM_Object MakeChamferEdgeAD (in GEOM_Object theShape,
|
||||
in double theD, in double theAngle,
|
||||
in long theFace1, in long theFace2) ;
|
||||
in double theD, in double theAngle,
|
||||
in long theFace1, in long theFace2) ;
|
||||
GEOM_Object MakeChamferFaces (in GEOM_Object theShape,
|
||||
in double theD1, in double theD2,
|
||||
in GEOM_List theFaces) ;
|
||||
in double theD1, in double theD2,
|
||||
in GEOM_List theFaces) ;
|
||||
GEOM_Object MakeChamferFacesAD (in GEOM_Object theShape,
|
||||
in double theD, in double theAngle,
|
||||
in GEOM_List theFaces) ;
|
||||
in double theD, in double theAngle,
|
||||
in GEOM_List theFaces) ;
|
||||
GEOM_Object MakeChamferEdges (in GEOM_Object theShape,
|
||||
in double theD1, in double theD2,
|
||||
in GEOM_List theEdges) ;
|
||||
in double theD1, in double theD2,
|
||||
in GEOM_List theEdges) ;
|
||||
GEOM_Object MakeChamferEdgesAD (in GEOM_Object theShape,
|
||||
in double theD, in double theAngle,
|
||||
in GEOM_List theEdges) ;
|
||||
in double theD, in double theAngle,
|
||||
in GEOM_List theEdges) ;
|
||||
GEOM_Object MakeArchimede (in GEOM_Object theShape,
|
||||
in double theWeight,
|
||||
in double theWaterDensity,
|
||||
in double theMeshDeflection) ;
|
||||
long GetSubShapeIndex (in GEOM_Object theShape,
|
||||
in GEOM_Object theSubShape) ;
|
||||
in double theWeight,
|
||||
in double theWaterDensity,
|
||||
in double theMeshDeflection) ;
|
||||
long GetSubShapeIndex (in GEOM_Object theShape,
|
||||
in GEOM_Object theSubShape) ;
|
||||
|
||||
//-----------------------------------------------------------//
|
||||
// GroupOperations //
|
||||
//-----------------------------------------------------------//
|
||||
GEOM_Object CreateGroup (in GEOM_Object theMainShape,
|
||||
in long theShapeType) ;
|
||||
void AddObject (in GEOM_Object theGroup,
|
||||
in long theSubShapeId) ;
|
||||
void RemoveObject (in GEOM_Object theGroup,
|
||||
in long theSubShapeId) ;
|
||||
GEOM_Object CreateGroup (in GEOM_Object theMainShape,
|
||||
in long theShapeType) ;
|
||||
void AddObject (in GEOM_Object theGroup,
|
||||
in long theSubShapeId) ;
|
||||
void RemoveObject (in GEOM_Object theGroup,
|
||||
in long theSubShapeId) ;
|
||||
long GetType (in GEOM_Object theGroup) ;
|
||||
GEOM_Object GetMainShape(in GEOM_Object theGroup) ;
|
||||
GEOM_List GetObjects(in GEOM_Object theGroup) ;
|
||||
@ -579,30 +580,30 @@ module GEOM
|
||||
//-----------------------------------------------------------//
|
||||
// AdvancedOperations //
|
||||
//-----------------------------------------------------------//
|
||||
GEOM_List MakePipeTShape (in double theR1, in double theW1, in double theL1,
|
||||
GEOM_List MakePipeTShape (in double theR1, in double theW1, in double theL1,
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
in boolean theHexMesh);
|
||||
|
||||
GEOM_List MakePipeTShapeWithPosition (in double theR1, in double theW1, in double theL1,
|
||||
|
||||
GEOM_List MakePipeTShapeWithPosition (in double theR1, in double theW1, in double theL1,
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
in boolean theHexMesh,
|
||||
in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3);
|
||||
|
||||
|
||||
GEOM_List MakePipeTShapeChamfer (in double theR1, in double theW1, in double theL1,
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
in double theH, in double theW, in boolean theHexMesh);
|
||||
|
||||
GEOM_List MakePipeTShapeChamferWithPosition (in double theR1, in double theW1, in double theL1,
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
|
||||
GEOM_List MakePipeTShapeChamferWithPosition (in double theR1, in double theW1, in double theL1,
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
in double theH, in double theW, in boolean theHexMesh,
|
||||
in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3);
|
||||
|
||||
GEOM_List MakePipeTShapeFillet (in double theR1, in double theW1, in double theL1,
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
|
||||
GEOM_List MakePipeTShapeFillet (in double theR1, in double theW1, in double theL1,
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
in double theRF, in boolean theHexMesh);
|
||||
|
||||
GEOM_List MakePipeTShapeFilletWithPosition (in double theR1, in double theW1, in double theL1,
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
|
||||
GEOM_List MakePipeTShapeFilletWithPosition (in double theR1, in double theW1, in double theL1,
|
||||
in double theR2, in double theW2, in double theL2,
|
||||
in double theRF, in boolean theHexMesh,
|
||||
in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3);
|
||||
|
||||
|
||||
@ -18,7 +18,6 @@
|
||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
//
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
#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() );
|
||||
static GEOM::GEOM_Gen_var 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 );
|
||||
}
|
||||
if ( !CORBA::is_nil( geomGen ) )
|
||||
|
||||
@ -172,8 +172,9 @@ GeometryGUI::GeometryGUI() :
|
||||
{
|
||||
if ( CORBA::is_nil( myComponentGeom ) )
|
||||
{
|
||||
Engines::Component_var comp = SalomeApp_Application::lcc()->FindOrLoad_Component( "FactoryServer", "GEOM" );
|
||||
myComponentGeom = GEOM::GEOM_Gen::_narrow( comp );
|
||||
Engines::EngineComponent_var comp =
|
||||
SalomeApp_Application::lcc()->FindOrLoad_Component( "FactoryServer", "GEOM" );
|
||||
myComponentGeom = GEOM::GEOM_Gen::_narrow( comp );
|
||||
}
|
||||
|
||||
myActiveDialogBox = 0;
|
||||
@ -588,22 +589,22 @@ void GeometryGUI::OnMousePress( SUIT_ViewWindow* w, QMouseEvent* e )
|
||||
// function : createGeomAction
|
||||
// purpose :
|
||||
//=======================================================================
|
||||
void GeometryGUI::createGeomAction( const int id, const QString& label, const QString& icolabel,
|
||||
const int accel, const bool toggle, const QString& shortcutAction )
|
||||
void GeometryGUI::createGeomAction( const int id, const QString& label, const QString& icolabel,
|
||||
const int accel, const bool toggle, const QString& shortcutAction )
|
||||
{
|
||||
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
|
||||
QPixmap icon = icolabel.isEmpty() ? resMgr->loadPixmap( "GEOM", tr( (QString( "ICO_" )+label).toLatin1().constData() ), false )
|
||||
: resMgr->loadPixmap( "GEOM", tr( icolabel.toLatin1().constData() ) );
|
||||
createAction( id,
|
||||
tr( QString( "TOP_%1" ).arg( label ).toLatin1().constData() ),
|
||||
icon,
|
||||
tr( QString( "MEN_%1" ).arg( label ).toLatin1().constData() ),
|
||||
tr( QString( "STB_%1" ).arg( label ).toLatin1().constData() ),
|
||||
accel,
|
||||
application()->desktop(),
|
||||
toggle,
|
||||
this, SLOT( OnGUIEvent() ),
|
||||
shortcutAction );
|
||||
tr( QString( "TOP_%1" ).arg( label ).toLatin1().constData() ),
|
||||
icon,
|
||||
tr( QString( "MEN_%1" ).arg( label ).toLatin1().constData() ),
|
||||
tr( QString( "STB_%1" ).arg( label ).toLatin1().constData() ),
|
||||
accel,
|
||||
application()->desktop(),
|
||||
toggle,
|
||||
this, SLOT( OnGUIEvent() ),
|
||||
shortcutAction );
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
@ -787,18 +788,18 @@ void GeometryGUI::initialize( CAM_Application* app )
|
||||
createGeomAction( GEOMOp::OpPointMarker, "POP_POINT_MARKER" );
|
||||
|
||||
createGeomAction( GEOMOp::OpPipeTShape, "PIPETSHAPE" );
|
||||
|
||||
|
||||
// Create actions for increase/decrease transparency shortcuts
|
||||
createGeomAction( GEOMOp::OpIncrTransparency, "", "", 0, false,
|
||||
"Geometry:Increase transparency");
|
||||
createGeomAction( GEOMOp::OpDecrTransparency, "", "", 0, false,
|
||||
"Geometry:Decrease transparency");
|
||||
createGeomAction( GEOMOp::OpIncrTransparency, "", "", 0, false,
|
||||
"Geometry:Increase transparency");
|
||||
createGeomAction( GEOMOp::OpDecrTransparency, "", "", 0, false,
|
||||
"Geometry:Decrease transparency");
|
||||
|
||||
// Create actions for increase/decrease number of isolines
|
||||
createGeomAction( GEOMOp::OpIncrNbIsos, "", "", 0, false,
|
||||
"Geometry:Increase number of isolines");
|
||||
createGeomAction( GEOMOp::OpDecrNbIsos, "", "", 0, false,
|
||||
"Geometry:Decrease number of isolines");
|
||||
createGeomAction( GEOMOp::OpIncrNbIsos, "", "", 0, false,
|
||||
"Geometry:Increase number of isolines");
|
||||
createGeomAction( GEOMOp::OpDecrNbIsos, "", "", 0, false,
|
||||
"Geometry:Decrease number of isolines");
|
||||
|
||||
// createGeomAction( GEOMOp::OpPipeTShapeGroups, "PIPETSHAPEGROUPS" );
|
||||
//@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@//
|
||||
@ -1543,7 +1544,7 @@ void GeometryGUI::createPreferences()
|
||||
const int nbQuantities = 8;
|
||||
int prec[nbQuantities], ii = 0;
|
||||
prec[ii++] = addPreference( tr( "GEOM_PREF_length_precision" ), precGroup,
|
||||
LightApp_Preferences::IntSpin, "Geometry", "length_precision" );
|
||||
LightApp_Preferences::IntSpin, "Geometry", "length_precision" );
|
||||
prec[ii++] = addPreference( tr( "GEOM_PREF_angle_precision" ), precGroup,
|
||||
LightApp_Preferences::IntSpin, "Geometry", "angle_precision" );
|
||||
prec[ii++] = addPreference( tr( "GEOM_PREF_len_tol_precision" ), precGroup,
|
||||
@ -1553,11 +1554,11 @@ void GeometryGUI::createPreferences()
|
||||
prec[ii++] = addPreference( tr( "GEOM_PREF_weight_precision" ), precGroup,
|
||||
LightApp_Preferences::IntSpin, "Geometry", "weight_precision" );
|
||||
prec[ii++] = addPreference( tr( "GEOM_PREF_density_precision" ), precGroup,
|
||||
LightApp_Preferences::IntSpin, "Geometry", "density_precision" );
|
||||
LightApp_Preferences::IntSpin, "Geometry", "density_precision" );
|
||||
prec[ii++] = addPreference( tr( "GEOM_PREF_parametric_precision" ), precGroup,
|
||||
LightApp_Preferences::IntSpin, "Geometry", "parametric_precision" );
|
||||
prec[ii ] = addPreference( tr( "GEOM_PREF_param_tol_precision" ), precGroup,
|
||||
LightApp_Preferences::IntSpin, "Geometry", "param_tol_precision" );
|
||||
LightApp_Preferences::IntSpin, "Geometry", "param_tol_precision" );
|
||||
|
||||
// Set property for precision value for spinboxes
|
||||
for ( ii = 0; ii < nbQuantities; ii++ ){
|
||||
@ -1691,7 +1692,7 @@ void GeometryGUI::storeVisualParameters (int savePoint)
|
||||
componentName.c_str(),
|
||||
savePoint);
|
||||
_PTR(IParameters) ip = ClientFactory::getIParameters(ap);
|
||||
|
||||
|
||||
QList<SUIT_ViewManager*> lst;
|
||||
QList<SUIT_ViewManager*>::Iterator it;
|
||||
|
||||
@ -1708,65 +1709,65 @@ void GeometryGUI::storeVisualParameters (int savePoint)
|
||||
const ObjMap anObjects = appStudy->getObjectMap(aMgrId);
|
||||
ObjMap::ConstIterator o_it = anObjects.begin();
|
||||
for( ;o_it != anObjects.end(); o_it++ ) {
|
||||
const PropMap aProps = o_it.value();
|
||||
const PropMap aProps = o_it.value();
|
||||
|
||||
//Check that object exists in the study
|
||||
_PTR(SObject) obj( studyDS->FindObjectID( o_it.key().toLatin1().data() ) );
|
||||
if ( !obj )
|
||||
continue;
|
||||
// entry is "encoded" = it does NOT contain component adress, since it is a
|
||||
// subject to change on next component loading
|
||||
//Check that object exists in the study
|
||||
_PTR(SObject) obj( studyDS->FindObjectID( o_it.key().toLatin1().data() ) );
|
||||
if ( !obj )
|
||||
continue;
|
||||
// entry is "encoded" = it does NOT contain component adress, since it is a
|
||||
// subject to change on next component loading
|
||||
|
||||
std::string entry = ip->encodeEntry(o_it.key().toLatin1().data(), componentName);
|
||||
|
||||
_PTR(GenericAttribute) anAttr;
|
||||
if( !obj->FindAttribute(anAttr, "AttributeIOR"))
|
||||
continue;
|
||||
|
||||
std::string param, occParam = vType.toLatin1().data();
|
||||
occParam += NAME_SEPARATOR;
|
||||
occParam += QString::number(aMgrId).toLatin1().data();
|
||||
occParam += NAME_SEPARATOR;
|
||||
|
||||
param = occParam + VISIBILITY_PROP;
|
||||
ip->setParameter(entry, param, aProps.value(VISIBILITY_PROP).toInt() == 1 ? "On" : "Off");
|
||||
|
||||
param = occParam + DISPLAY_MODE_PROP;
|
||||
|
||||
ip->setParameter(entry, param, QString::number(aProps.value(DISPLAY_MODE_PROP).toInt()).toLatin1().data());
|
||||
|
||||
QColor c = aProps.value(COLOR_PROP).value<QColor>();
|
||||
QString colorStr = QString::number(c.red()/255.);
|
||||
colorStr += DIGIT_SEPARATOR; colorStr += QString::number(c.green()/255.);
|
||||
colorStr += DIGIT_SEPARATOR; colorStr += QString::number(c.blue()/255.);
|
||||
param = occParam + COLOR_PROP;
|
||||
ip->setParameter(entry, param, colorStr.toLatin1().data());
|
||||
|
||||
if(vType == SVTK_Viewer::Type()) {
|
||||
param = occParam + OPACITY_PROP;
|
||||
ip->setParameter(entry, param, QString::number(1. - aProps.value(TRANSPARENCY_PROP).toDouble()).toLatin1().data());
|
||||
} else if (vType == SOCC_Viewer::Type()) {
|
||||
param = occParam + TRANSPARENCY_PROP;
|
||||
ip->setParameter(entry, param, QString::number(aProps.value(TRANSPARENCY_PROP).toDouble()).toLatin1().data());
|
||||
}
|
||||
|
||||
param = occParam + ISOS_PROP;
|
||||
ip->setParameter(entry, param, aProps.value(ISOS_PROP).toString().toLatin1().data());
|
||||
|
||||
param = occParam + VECTOR_MODE_PROP;
|
||||
ip->setParameter(entry, param, QString::number(aProps.value(VECTOR_MODE_PROP).toInt()).toLatin1().data());
|
||||
std::string entry = ip->encodeEntry(o_it.key().toLatin1().data(), componentName);
|
||||
|
||||
param = occParam + DEFLECTION_COEFF_PROP;
|
||||
ip->setParameter(entry, param, QString::number(aProps.value(DEFLECTION_COEFF_PROP).toDouble()).toLatin1().data());
|
||||
_PTR(GenericAttribute) anAttr;
|
||||
if( !obj->FindAttribute(anAttr, "AttributeIOR"))
|
||||
continue;
|
||||
|
||||
param = occParam + DEFLECTION_COEFF_PROP;
|
||||
ip->setParameter(entry, param, QString::number(aProps.value(DEFLECTION_COEFF_PROP).toDouble()).toLatin1().data());
|
||||
std::string param, occParam = vType.toLatin1().data();
|
||||
occParam += NAME_SEPARATOR;
|
||||
occParam += QString::number(aMgrId).toLatin1().data();
|
||||
occParam += NAME_SEPARATOR;
|
||||
|
||||
//Marker type of the vertex - ONLY for the "Vertex" and "Compound of the Vertex"
|
||||
if(aProps.contains(MARKER_TYPE_PROP)) {
|
||||
param = occParam + MARKER_TYPE_PROP;
|
||||
ip->setParameter(entry, param, aProps.value(MARKER_TYPE_PROP).toString().toLatin1().data());
|
||||
}
|
||||
param = occParam + VISIBILITY_PROP;
|
||||
ip->setParameter(entry, param, aProps.value(VISIBILITY_PROP).toInt() == 1 ? "On" : "Off");
|
||||
|
||||
param = occParam + DISPLAY_MODE_PROP;
|
||||
|
||||
ip->setParameter(entry, param, QString::number(aProps.value(DISPLAY_MODE_PROP).toInt()).toLatin1().data());
|
||||
|
||||
QColor c = aProps.value(COLOR_PROP).value<QColor>();
|
||||
QString colorStr = QString::number(c.red()/255.);
|
||||
colorStr += DIGIT_SEPARATOR; colorStr += QString::number(c.green()/255.);
|
||||
colorStr += DIGIT_SEPARATOR; colorStr += QString::number(c.blue()/255.);
|
||||
param = occParam + COLOR_PROP;
|
||||
ip->setParameter(entry, param, colorStr.toLatin1().data());
|
||||
|
||||
if(vType == SVTK_Viewer::Type()) {
|
||||
param = occParam + OPACITY_PROP;
|
||||
ip->setParameter(entry, param, QString::number(1. - aProps.value(TRANSPARENCY_PROP).toDouble()).toLatin1().data());
|
||||
} else if (vType == SOCC_Viewer::Type()) {
|
||||
param = occParam + TRANSPARENCY_PROP;
|
||||
ip->setParameter(entry, param, QString::number(aProps.value(TRANSPARENCY_PROP).toDouble()).toLatin1().data());
|
||||
}
|
||||
|
||||
param = occParam + ISOS_PROP;
|
||||
ip->setParameter(entry, param, aProps.value(ISOS_PROP).toString().toLatin1().data());
|
||||
|
||||
param = occParam + VECTOR_MODE_PROP;
|
||||
ip->setParameter(entry, param, QString::number(aProps.value(VECTOR_MODE_PROP).toInt()).toLatin1().data());
|
||||
|
||||
param = occParam + DEFLECTION_COEFF_PROP;
|
||||
ip->setParameter(entry, param, QString::number(aProps.value(DEFLECTION_COEFF_PROP).toDouble()).toLatin1().data());
|
||||
|
||||
param = occParam + DEFLECTION_COEFF_PROP;
|
||||
ip->setParameter(entry, param, QString::number(aProps.value(DEFLECTION_COEFF_PROP).toDouble()).toLatin1().data());
|
||||
|
||||
//Marker type of the vertex - ONLY for the "Vertex" and "Compound of the Vertex"
|
||||
if(aProps.contains(MARKER_TYPE_PROP)) {
|
||||
param = occParam + MARKER_TYPE_PROP;
|
||||
ip->setParameter(entry, param, aProps.value(MARKER_TYPE_PROP).toString().toLatin1().data());
|
||||
}
|
||||
|
||||
} // object iterator
|
||||
} // for (views)
|
||||
@ -1823,7 +1824,7 @@ void GeometryGUI::restoreVisualParameters (int savePoint)
|
||||
QString viewIndexStr;
|
||||
int viewIndex;
|
||||
QVector<PropMap> aListOfMap;
|
||||
|
||||
|
||||
for (; namesIt != paramNames.end(); ++namesIt, ++valuesIt)
|
||||
{
|
||||
// visual parameters are stored in strings as follows: ViewerType_ViewIndex_ParamName.
|
||||
@ -1840,41 +1841,41 @@ void GeometryGUI::restoreVisualParameters (int savePoint)
|
||||
viewIndex = viewIndexStr.toUInt(&ok);
|
||||
if (!ok) // bad conversion of view index to integer
|
||||
continue;
|
||||
|
||||
|
||||
if((viewIndex + 1) > aListOfMap.count()) {
|
||||
aListOfMap.resize(viewIndex + 1);
|
||||
aListOfMap.resize(viewIndex + 1);
|
||||
}
|
||||
|
||||
QString val((*valuesIt).c_str());
|
||||
if(paramNameStr == VISIBILITY_PROP){
|
||||
aListOfMap[viewIndex].insert(VISIBILITY_PROP, val == "On" ? 1 : 0);
|
||||
aListOfMap[viewIndex].insert(VISIBILITY_PROP, val == "On" ? 1 : 0);
|
||||
|
||||
} else if(paramNameStr == OPACITY_PROP) {
|
||||
aListOfMap[viewIndex].insert(TRANSPARENCY_PROP, 1. - val.toDouble());
|
||||
aListOfMap[viewIndex].insert(TRANSPARENCY_PROP, 1. - val.toDouble());
|
||||
|
||||
} else if(paramNameStr == TRANSPARENCY_PROP) {
|
||||
aListOfMap[viewIndex].insert(TRANSPARENCY_PROP, val.toDouble());
|
||||
} else if(paramNameStr == TRANSPARENCY_PROP) {
|
||||
aListOfMap[viewIndex].insert(TRANSPARENCY_PROP, val.toDouble());
|
||||
|
||||
} else if(paramNameStr == DISPLAY_MODE_PROP) {
|
||||
aListOfMap[viewIndex].insert( DISPLAY_MODE_PROP, val.toInt());
|
||||
|
||||
aListOfMap[viewIndex].insert( DISPLAY_MODE_PROP, val.toInt());
|
||||
|
||||
} else if(paramNameStr == ISOS_PROP) {
|
||||
aListOfMap[viewIndex].insert( ISOS_PROP, val);
|
||||
aListOfMap[viewIndex].insert( ISOS_PROP, val);
|
||||
|
||||
} else if(paramNameStr == COLOR_PROP) {
|
||||
QStringList rgb = val.split(DIGIT_SEPARATOR);
|
||||
if(rgb.count() == 3) {
|
||||
QColor c(int(rgb[0].toDouble()*255), int(rgb[1].toDouble()*255), int(rgb[2].toDouble()*255));
|
||||
aListOfMap[viewIndex].insert( COLOR_PROP, c);
|
||||
}
|
||||
QStringList rgb = val.split(DIGIT_SEPARATOR);
|
||||
if(rgb.count() == 3) {
|
||||
QColor c(int(rgb[0].toDouble()*255), int(rgb[1].toDouble()*255), int(rgb[2].toDouble()*255));
|
||||
aListOfMap[viewIndex].insert( COLOR_PROP, c);
|
||||
}
|
||||
} else if(paramNameStr == VECTOR_MODE_PROP) {
|
||||
aListOfMap[viewIndex].insert( VECTOR_MODE_PROP, val.toInt());
|
||||
aListOfMap[viewIndex].insert( VECTOR_MODE_PROP, val.toInt());
|
||||
|
||||
} else if(paramNameStr == DEFLECTION_COEFF_PROP) {
|
||||
aListOfMap[viewIndex].insert( DEFLECTION_COEFF_PROP, val.toDouble());
|
||||
aListOfMap[viewIndex].insert( DEFLECTION_COEFF_PROP, val.toDouble());
|
||||
} else if(paramNameStr == MARKER_TYPE_PROP) {
|
||||
aListOfMap[viewIndex].insert( MARKER_TYPE_PROP, val);
|
||||
}
|
||||
aListOfMap[viewIndex].insert( MARKER_TYPE_PROP, val);
|
||||
}
|
||||
|
||||
} // for names/parameters iterator
|
||||
|
||||
@ -1886,15 +1887,15 @@ void GeometryGUI::restoreVisualParameters (int savePoint)
|
||||
|
||||
QColor c = aListOfMap[index].value(COLOR_PROP).value<QColor>();
|
||||
//Get Visibility property of the current PropMap
|
||||
if(aListOfMap[index].value(VISIBILITY_PROP) == 1) {
|
||||
SUIT_ViewManager* vman = lst.at(index);
|
||||
SUIT_ViewModel* vmodel = vman->getViewModel();
|
||||
displayer()->Display(entry, true, dynamic_cast<SALOME_View*>(vmodel));
|
||||
if (aListOfMap[index].value(VISIBILITY_PROP) == 1) {
|
||||
SUIT_ViewManager* vman = lst.at(index);
|
||||
SUIT_ViewModel* vmodel = vman->getViewModel();
|
||||
displayer()->Display(entry, true, dynamic_cast<SALOME_View*>(vmodel));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} // for entries iterator
|
||||
|
||||
|
||||
// update all VTK and OCC views
|
||||
QList<SUIT_ViewManager*> lst;
|
||||
getApp()->viewManagers(lst);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user