mirror of
https://git.salome-platform.org/gitpub/modules/geom.git
synced 2025-02-03 14:10:33 +05:00
Merge 'master' branch into 'V9_dev' branch.
This commit is contained in:
rnv
commit
001d93f1ef
@ -19,7 +19,7 @@ for fi in range(len(faces)):
|
||||
fid = geompy.addToStudyInFather(cut, faces[fi], "Face %d" % (fi+1))
|
||||
isSuccess, closedWires, openWires = geompy.GetFreeBoundary(faces[fi])
|
||||
if isSuccess:
|
||||
print("Check free boudaries in face %d: OK" % (fi+1))
|
||||
print("Check free boundaries in face %d: OK" % (fi+1))
|
||||
print("-- Nb of closed boundaries = %d" % len(closedWires))
|
||||
for wi in range(len(closedWires)):
|
||||
wid = geompy.addToStudyInFather(faces[fi], closedWires[wi], "Closed wire %d" % (wi+1))
|
||||
@ -30,6 +30,6 @@ for fi in range(len(faces)):
|
||||
pass
|
||||
pass
|
||||
else:
|
||||
print("Check free boudaries in face %d: KO" % (fi+1))
|
||||
print("Check free boundaries in face %d: KO" % (fi+1))
|
||||
pass
|
||||
pass
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
\page annotation_page Shape annotation
|
||||
|
||||
<b> Annotation </b> functionality allows showing in the viewer special user-defined text label connected to corresponding part of a CAD model with a line.
|
||||
Annotation text is always parallel to the screen and horizontal. It is is not zoomed or rotated when a 3D scene is zoomed or rotated by the user.
|
||||
Annotation text is always parallel to the screen and horizontal. It is not zoomed or rotated when a 3D scene is zoomed or rotated by the user.
|
||||
The annotation text is defined using UTF-8 encoding and thus support any Unicode characters.
|
||||
|
||||
There are several algorithms for the annotation position calculation during the scene manipulations (panning, zooming, rotation):
|
||||
|
||||
@ -45,7 +45,7 @@ This operation allows quickly detecting self-interferences of the given shape us
|
||||
The algorithm works on the face level, i.e. it computes only face-to-face intersections. No additional intersection types are computed.
|
||||
|
||||
This can be useful to detect all intersections between subshapes of type "surface" in an assembly.
|
||||
The result quality will depend on the tesselation quality. However, small deflection values can significantly decrease the performance of the algorithm.
|
||||
The result quality will depend on the tessellation quality. However, small deflection values can significantly decrease the performance of the algorithm.
|
||||
Nevertheless, the performance of Fast Intersect algorithm is much higher than that of the topological intersection.
|
||||
|
||||
\image html measures13.png
|
||||
@ -53,7 +53,7 @@ Nevertheless, the performance of Fast Intersect algorithm is much higher than th
|
||||
In this dialog:
|
||||
|
||||
- \b Object - the checked object. \b Selection button allows picking it in the viewer or in the object browser.
|
||||
- <b>Deflection coefficient</b> - a linear deflection coefficient that defines the tesselation quality. If theDeflection <= 0, default deflection 0.001 is used.
|
||||
- <b>Deflection coefficient</b> - a linear deflection coefficient that defines the tessellation quality. If theDeflection <= 0, default deflection 0.001 is used.
|
||||
- <b>Detect gaps with tolerance</b> specifies the distance between shapes used for detecting gaps:
|
||||
- if theTolerance <= 0, the algorithm detects intersections;
|
||||
- if theTolerance > 0, the algorithm detects gapss.
|
||||
@ -67,7 +67,7 @@ If no interferences are selected, all of them are published in the study. Each i
|
||||
\n <b>TUI Command:</b> <em>geompy.CheckSelfIntersectionsFast(theShape, theDeflection, theTolerance),</em> \n
|
||||
where: \n
|
||||
\em theShape is the shape checked for validity. \n
|
||||
\em theDeflection that specifies the quality of tesselation.
|
||||
\em theDeflection that specifies the quality of tessellation.
|
||||
\em theTolerance Specifies the distance between shapes used for detecting gaps.
|
||||
|
||||
See also a \ref tui_check_self_intersections_fast_page "TUI example".
|
||||
|
||||
@ -20,7 +20,7 @@ coordinate system by the \b Radius.
|
||||
|
||||
\image html sphere2.png
|
||||
|
||||
\n <b>NB!</b> The is another way to create a\b Sphere, which is
|
||||
\n <b>NB!</b> The is another way to create a \b Sphere, which is
|
||||
currently accessible only via \b TUI commands.
|
||||
\n You can define the \b Sphere by the coordinates of the <b>Center
|
||||
Point</b> and its \b Radius (in this way you don't need to create it in advance).
|
||||
|
||||
@ -15,7 +15,7 @@ of coordinates defining its boundaries by the height and the width and its axis
|
||||
radio buttons (OXY, OYZ or OZX).This
|
||||
means that the \b Rectangle will lie in "OXY", "OYZ" or "OZX" plane correspondingly.
|
||||
\n <b>TUI Command:</b> <em>geompy.MakeFaceHW(Height, Width, Orientation)</em>
|
||||
\n <b>Arguments:</b> Name + 3 values (Dimensions at origin: heigth, width and
|
||||
\n <b>Arguments:</b> Name + 3 values (Dimensions at origin: height, width and
|
||||
orientation).
|
||||
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@ further analysis (see below).
|
||||
|
||||
\note The result quality depends on the quality of triangulation. Changing the value of the deflection coefficient
|
||||
parameter can strongly affect the result. However, small values of the deflection coefficient might lead to
|
||||
some performance loss of the algorithm, as number of triangles of the tesselation mesh depends on this parameter.
|
||||
some performance loss of the algorithm, as number of triangles of the tessellation mesh depends on this parameter.
|
||||
|
||||
Press <b>Apply and Close</b> or \b Apply button to store the selected sub-shapes in the study for further analysis.
|
||||
The selection will be published as a compound containing intersected sub-shapes from both source objects.
|
||||
|
||||
@ -386,7 +386,7 @@ module GEOM
|
||||
*
|
||||
* This function is useful for the compounds only; for simple shapes it
|
||||
* exactly the same value as GetShapeType().
|
||||
* Note, that compounds are procesed recursively.
|
||||
* Note, that compounds are processed recursively.
|
||||
*
|
||||
* \sa GetShapeType(), GetTopologyType(), GetMaxShapeType()
|
||||
*/
|
||||
@ -397,7 +397,7 @@ module GEOM
|
||||
*
|
||||
* This function is useful for the compounds only; for simple shapes it
|
||||
* exactly the same value as GetShapeType().
|
||||
* Note, that compounds are procesed recursively.
|
||||
* Note, that compounds are processed recursively.
|
||||
*
|
||||
* \sa GetShapeType(), GetTopologyType(), GetMinShapeType()
|
||||
*/
|
||||
@ -1893,7 +1893,7 @@ module GEOM
|
||||
* \param theBase Base shape to be extruded.
|
||||
* \param thePath Path shape to extrude the base shape along it.
|
||||
* \param theVec Vector defines a constant binormal direction to keep the
|
||||
* same angle beetween the Direction and the sections
|
||||
* same angle between the Direction and the sections
|
||||
* along the sweep surface.
|
||||
* \param IsGenerateGroups flag that tells if it is necessary to
|
||||
* return groups (true) or not (false).
|
||||
@ -4174,8 +4174,8 @@ module GEOM
|
||||
SALOMEDS::TMPFile GetTexture(in long theID, out long theWidth, out long theHeight);
|
||||
|
||||
/*!
|
||||
* \brief Get list of all avaiable texture IDs
|
||||
* \return list of all texture IDs avaiable for the current study
|
||||
* \brief Get list of all available texture IDs
|
||||
* \return list of all texture IDs available for the current study
|
||||
*/
|
||||
ListOfLong GetAllTextures();
|
||||
|
||||
@ -4534,7 +4534,7 @@ module GEOM
|
||||
/*!
|
||||
* \brief Detect self-intersections of the given shape with algorithm based on mesh intersections.
|
||||
* \param theShape Shape to check validity of.
|
||||
* \param theDeflection Linear deflection coefficient that specifies quality of tesselation.
|
||||
* \param theDeflection Linear deflection coefficient that specifies quality of tessellation.
|
||||
* \param theTolerance Specifies a distance between sub-shapes used for detecting gaps:
|
||||
* - if \a theTolerance <= 0, algorithm detects intersections
|
||||
* - if \a theTolerance > 0, algorithm detects gaps
|
||||
@ -4547,9 +4547,9 @@ module GEOM
|
||||
out ListOfLong theIntersections);
|
||||
|
||||
/*!
|
||||
* \brief Check boolean and partition operations agruments.
|
||||
* \param theShape the agrument of an operation to be checked.
|
||||
* \return TRUE if the agrument is valid for a boolean or partition
|
||||
* \brief Check boolean and partition operations arguments.
|
||||
* \param theShape the argument of an operation to be checked.
|
||||
* \return TRUE if the argument is valid for a boolean or partition
|
||||
* operation; FALSE otherwise.
|
||||
*/
|
||||
boolean CheckBOPArguments (in GEOM_Object theShape);
|
||||
@ -4561,7 +4561,7 @@ module GEOM
|
||||
* \param theTolerance Specifies a distance between shapes used for detecting gaps:
|
||||
* - if \a theTolerance <= 0, algorithm detects intersections
|
||||
* - if \a theTolerance > 0, algorithm detects gaps
|
||||
* \param theDeflection Linear deflection coefficient that specifies quality of tesselation:
|
||||
* \param theDeflection Linear deflection coefficient that specifies quality of tessellation:
|
||||
* - if \a theDeflection <= 0, default deflection 0.001 is used
|
||||
* \param theIntersections1 Output: contains list of sub-shapes IDs from 1st shape that localize intersection
|
||||
* \param theIntersections2 Output: contains list of sub-shapes IDs from 2nd shape that localize intersection
|
||||
@ -5022,7 +5022,7 @@ module GEOM
|
||||
|
||||
/*!
|
||||
* \brief Returns a GEOM_Object defined by its IOR
|
||||
* \param theIOR a string containg an IOR of the requested GEOM_Object
|
||||
* \param theIOR a string containing an IOR of the requested GEOM_Object
|
||||
*/
|
||||
GEOM_Object GetIORFromString (in string theIOR);
|
||||
|
||||
|
||||
@ -233,8 +233,8 @@ ShapeProcess.SameParameter.Tolerance3d : 1.e-7
|
||||
! FixShape.FixOrientationMode : Mode for fixing face orientation (default - -1, yes - 1 , no - 0).
|
||||
! FixShape.FixMissingSeamMode : Mode for fixing face missing seam (default - -1, yes - 1 , no - 0).
|
||||
! FixShape.FixSmallAreaWireMode : Mode for fixing small area wires (default - -1, yes - 1 , no - 0).
|
||||
! FixShape.ModifyTopologyMode : Mode allowing of modifing of topology (default - 0, yes - 1 , no - 0).
|
||||
! FixShape.ModifyGeometryMode : Mode allowing of modifing of geometry (default - 1, yes - 1 , no - 0).
|
||||
! FixShape.ModifyTopologyMode : Mode allowing for modifying of topology (default - 0, yes - 1 , no - 0).
|
||||
! FixShape.ModifyGeometryMode : Mode allowing for modifying of geometry (default - 1, yes - 1 , no - 0).
|
||||
! FixShape.ClosedWireMode : Mode defining whether the wire is to be closed. (default - 1, yes - 1 , no - 0).
|
||||
! FixShape.PreferencePCurveMode : Mode defining of preference of 2d representation (default - 1, yes - 1 , no - 0).
|
||||
! FixShape.FixReorderMode : Mode for fixing of order of the edges in the wire (default - -1, yes - 1 , no - 0).
|
||||
|
||||
@ -1832,7 +1832,7 @@ TopoDS_Shape AdvancedEngine_IOperations::MakeThicknessReduction (gp_Ax2 theAxes,
|
||||
StdFail_NotDone::Raise("Cannot build cones of thickness reduction");
|
||||
BRepAlgoAPI_Cut cut1 (ConeExt.Shape(), ConeInt.Shape());
|
||||
if (!cut1.IsDone())
|
||||
StdFail_NotDone::Raise("Coudn't build transition part of thickness reduction");
|
||||
StdFail_NotDone::Raise("Couldn't build transition part of thickness reduction");
|
||||
TopoDS_Shape aReduction = cut1.Shape();
|
||||
|
||||
// Build the thin part, if required
|
||||
@ -1846,7 +1846,7 @@ TopoDS_Shape AdvancedEngine_IOperations::MakeThicknessReduction (gp_Ax2 theAxes,
|
||||
StdFail_NotDone::Raise("Cannot build cylinders of thickness reduction");
|
||||
BRepAlgoAPI_Cut cut2 (CExt.Shape(), CInt.Shape());
|
||||
if (!cut2.IsDone())
|
||||
StdFail_NotDone::Raise("Coudn't build thin part of thickness reduction");
|
||||
StdFail_NotDone::Raise("Couldn't build thin part of thickness reduction");
|
||||
aThinPart = cut2.Shape();
|
||||
}
|
||||
|
||||
|
||||
@ -338,13 +338,13 @@ TopoDS_Shape AdvancedEngine_PipeTShapeDriver::MakePipeTShape (const double r1, c
|
||||
// Remove small radius main pipe
|
||||
BRepAlgoAPI_Cut cut1 (fuse1.Shape(), C1Int.Shape());
|
||||
if (!cut1.IsDone()) {
|
||||
StdFail_NotDone::Raise("Coudn't cut cylinders");
|
||||
StdFail_NotDone::Raise("Couldn't cut cylinders");
|
||||
}
|
||||
|
||||
// Remove small radius incident pipe => Te
|
||||
BRepAlgoAPI_Cut Te (cut1.Shape(), C2Int.Shape());
|
||||
if (!Te.IsDone()) {
|
||||
StdFail_NotDone::Raise("Coudn't cut cylinders");
|
||||
StdFail_NotDone::Raise("Couldn't cut cylinders");
|
||||
}
|
||||
|
||||
TopoDS_Shape aShape = Te.Shape();
|
||||
|
||||
@ -109,7 +109,7 @@ AdvancedGUI_SmoothingSurfaceDlg::~AdvancedGUI_SmoothingSurfaceDlg()
|
||||
void AdvancedGUI_SmoothingSurfaceDlg::Init()
|
||||
{
|
||||
// Get setting of step value from file configuration
|
||||
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
|
||||
//SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
|
||||
|
||||
initSpinBox(myDMaxSpin, 0., COORD_MAX, 0.00001, "parametric_precision" );
|
||||
|
||||
|
||||
@ -683,7 +683,7 @@ void BasicGUI_PointDlg::CheckBoxClicked()
|
||||
|
||||
|
||||
//=================================================================================
|
||||
// funcion : getParameter()
|
||||
// function : getParameter()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
double BasicGUI_PointDlg::getParameter() const
|
||||
@ -693,7 +693,7 @@ double BasicGUI_PointDlg::getParameter() const
|
||||
|
||||
|
||||
//=================================================================================
|
||||
// funcion : getUParameter()
|
||||
// function : getUParameter()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
double BasicGUI_PointDlg::getUParameter() const
|
||||
@ -703,7 +703,7 @@ double BasicGUI_PointDlg::getUParameter() const
|
||||
|
||||
|
||||
//=================================================================================
|
||||
// funcion : getVParameter()
|
||||
// function : getVParameter()
|
||||
// purpose :
|
||||
//=================================================================================
|
||||
double BasicGUI_PointDlg::getVParameter() const
|
||||
|
||||
@ -95,7 +95,7 @@ static void FixResult(const TopoDS_Shape& result,
|
||||
{
|
||||
for (TopExp_Explorer ex_f(result,TopAbs_FACE); ex_f.More(); ex_f.Next()) {
|
||||
TopoDS_Shape aShape = Context->Apply(ex_f.Current().Oriented(TopAbs_FORWARD));
|
||||
// face coud not be dropped or splitted on this step
|
||||
// face could not be dropped or split on this step
|
||||
TopoDS_Face aFace = TopoDS::Face(aShape);
|
||||
TopLoc_Location L;
|
||||
Handle(Geom_Surface) Surf = BRep_Tool::Surface(aFace,L);
|
||||
|
||||
@ -657,7 +657,7 @@ static Standard_Boolean MergeEdges(const TopTools_SequenceOfShape& SeqEdges,
|
||||
break;
|
||||
}
|
||||
if(NeedUnion) {
|
||||
MESSAGE ("can not make analitical union => make approximation");
|
||||
MESSAGE ("can not make analytical union => make approximation");
|
||||
TopoDS_Edge E = GlueEdgesWithPCurves(aChain, VF, VL);
|
||||
aChain.SetValue(1,E);
|
||||
}
|
||||
|
||||
@ -88,6 +88,8 @@
|
||||
#include <BRepAdaptor_HSurface.hxx>
|
||||
#include <LocalAnalysis_SurfaceContinuity.hxx>
|
||||
#include <GeomConvert_ApproxSurface.hxx>
|
||||
#include <Bnd_Box.hxx>
|
||||
#include <BRepBndLib.hxx>
|
||||
|
||||
#include <Geom_Curve.hxx>
|
||||
#include <Geom_Line.hxx>
|
||||
@ -239,8 +241,34 @@ static Standard_Boolean IsFacesOfSameSolids
|
||||
return isSame;
|
||||
}
|
||||
|
||||
#if OCC_VERSION_LARGE > 0x07020001
|
||||
// for Mantis issue 0023451 by JGV
|
||||
//=======================================================================
|
||||
//function : DefineMaxTolerance
|
||||
//purpose : calculates maximum possible tolerance on edges of shape
|
||||
//=======================================================================
|
||||
static Standard_Real DefineMaxTolerance(const TopoDS_Shape& theShape)
|
||||
{
|
||||
Standard_Real aTol = Precision::Confusion();
|
||||
|
||||
Standard_Real MinSize = RealLast();
|
||||
TopExp_Explorer Explo(theShape, TopAbs_EDGE);
|
||||
for (; Explo.More(); Explo.Next())
|
||||
{
|
||||
const TopoDS_Edge& anEdge = TopoDS::Edge(Explo.Current());
|
||||
Bnd_Box aBox;
|
||||
BRepBndLib::Add(anEdge, aBox);
|
||||
Standard_Real Xmin, Ymin, Zmin, Xmax, Ymax, Zmax;
|
||||
aBox.Get(Xmin, Ymin, Zmin, Xmax, Ymax, Zmax);
|
||||
Standard_Real MaxSize = Max(Xmax - Xmin, Max(Ymax - Ymin, Zmax - Zmin));
|
||||
if (MaxSize < MinSize)
|
||||
MinSize = MaxSize;
|
||||
}
|
||||
|
||||
if (!Precision::IsInfinite(MinSize))
|
||||
aTol = 0.1 * MinSize;
|
||||
|
||||
return aTol;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
//function : IsTangentFaces
|
||||
//purpose : decides: is edge on closed surface tangent or not
|
||||
@ -322,15 +350,13 @@ static Standard_Boolean HasSeamEdge(const TopoDS_Face& theFace)
|
||||
|
||||
return Standard_False;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
//=======================================================================
|
||||
//function : IsEdgeValidToMerge
|
||||
//purpose : Edge is valid if it is not seam or if it is a seam and the face
|
||||
// has another seam edge.
|
||||
//=======================================================================
|
||||
#if OCC_VERSION_LARGE > 0x07020001
|
||||
// for Mantis issue 0023451 by JGV
|
||||
static Standard_Boolean IsEdgeValidToMerge(const TopoDS_Edge& theEdge,
|
||||
const TopoDS_Face& theFace,
|
||||
const Handle(Geom_Surface)& theSurface,
|
||||
@ -396,37 +422,6 @@ static Standard_Boolean IsEdgeValidToMerge(const TopoDS_Edge& theEdge,
|
||||
|
||||
return isValid;
|
||||
}
|
||||
#else
|
||||
static Standard_Boolean IsEdgeValidToMerge(const TopoDS_Edge &theEdge,
|
||||
const TopoDS_Face &theFace)
|
||||
{
|
||||
Standard_Boolean isValid = Standard_True;
|
||||
|
||||
if (BRep_Tool::IsClosed(theEdge, theFace)) {
|
||||
// This is a seam edge. Check if there are another seam edges on the face.
|
||||
TopExp_Explorer anExp(theFace, TopAbs_EDGE);
|
||||
|
||||
for (; anExp.More(); anExp.Next()) {
|
||||
const TopoDS_Shape &aShEdge = anExp.Current();
|
||||
|
||||
// Skip same edge.
|
||||
if (theEdge.IsSame(aShEdge)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Check if this edge is a seam.
|
||||
TopoDS_Edge anEdge = TopoDS::Edge(aShEdge);
|
||||
|
||||
if (BRep_Tool::IsClosed(anEdge, theFace)) {
|
||||
isValid = Standard_False;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return isValid;
|
||||
}
|
||||
#endif
|
||||
|
||||
//=======================================================================
|
||||
//function : Perform
|
||||
@ -494,26 +489,16 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
|
||||
Handle(Geom_Surface) aBaseSurface = BRep_Tool::Surface(aFace,aBaseLocation);
|
||||
aBaseSurface = ClearRts(aBaseSurface);
|
||||
aBaseSurface = Handle(Geom_Surface)::DownCast(aBaseSurface->Copy());
|
||||
#if OCC_VERSION_LARGE > 0x07020001
|
||||
// for Mantis issue 0023451 by JGV
|
||||
Standard_Boolean ToMakeUPeriodic = Standard_False, ToMakeVPeriodic = Standard_False;
|
||||
#endif
|
||||
|
||||
// find adjacent faces to union
|
||||
Standard_Integer i;
|
||||
for (i = 1; i <= edges.Length(); i++) {
|
||||
TopoDS_Edge edge = TopoDS::Edge(edges(i));
|
||||
#if OCC_VERSION_LARGE > 0x07020001
|
||||
// for Mantis issue 0023451 by JGV
|
||||
Standard_Boolean IsEdgeOnSeam = Standard_False;
|
||||
#endif
|
||||
if (BRep_Tool::Degenerated(edge) ||
|
||||
#if OCC_VERSION_LARGE > 0x07020001
|
||||
// for Mantis issue 0023451 by JGV
|
||||
!IsEdgeValidToMerge(edge, aFace, aBaseSurface, IsEdgeOnSeam, ToMakeUPeriodic, ToMakeVPeriodic))
|
||||
#else
|
||||
!IsEdgeValidToMerge(edge, aFace))
|
||||
#endif
|
||||
!IsEdgeValidToMerge(edge, aFace, aBaseSurface,
|
||||
IsEdgeOnSeam, ToMakeUPeriodic, ToMakeVPeriodic))
|
||||
continue;
|
||||
|
||||
const TopTools_ListOfShape& aList = aMapEdgeFaces.FindFromKey(edge);
|
||||
@ -526,13 +511,8 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
|
||||
if (aProcessed.Contains(anCheckedFace))
|
||||
continue;
|
||||
|
||||
#if OCC_VERSION_LARGE > 0x07020001
|
||||
// for Mantis issue 0023451 by JGV
|
||||
if (!IsEdgeValidToMerge(edge, anCheckedFace, aBaseSurface,
|
||||
IsEdgeOnSeam, ToMakeUPeriodic, ToMakeVPeriodic)) {
|
||||
#else
|
||||
if (!IsEdgeValidToMerge(edge, anCheckedFace)) {
|
||||
#endif
|
||||
// Skip seam edge.
|
||||
continue;
|
||||
}
|
||||
@ -549,13 +529,10 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
|
||||
continue;
|
||||
}
|
||||
|
||||
#if OCC_VERSION_LARGE > 0x07020001
|
||||
// for Mantis issue 0023451 by JGV
|
||||
//Prevent creating a face with parametric range more than period
|
||||
if (IsEdgeOnSeam &&
|
||||
(HasSeamEdge(aFace) || HasSeamEdge(anCheckedFace)))
|
||||
continue;
|
||||
#endif
|
||||
|
||||
// replacing pcurves
|
||||
TopoDS_Face aMockUpFace;
|
||||
@ -580,8 +557,6 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
|
||||
NbModif++;
|
||||
TopoDS_Face aResult;
|
||||
BRep_Builder B;
|
||||
#if OCC_VERSION_LARGE > 0x07020001
|
||||
// for Mantis issue 0023451 by JGV
|
||||
if (ToMakeUPeriodic || ToMakeVPeriodic)
|
||||
{
|
||||
Handle(Geom_BSplineSurface) aBSplineSurface = Handle(Geom_BSplineSurface)::DownCast(aBaseSurface);
|
||||
@ -603,7 +578,6 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
|
||||
|
||||
aBaseSurface = aBSplineSurface;
|
||||
}
|
||||
#endif
|
||||
B.MakeFace(aResult,aBaseSurface,aBaseLocation,0);
|
||||
Standard_Integer nbWires = 0;
|
||||
|
||||
@ -722,15 +696,13 @@ TopoDS_Shape BlockFix_UnionFaces::Perform(const TopoDS_Shape& Shape)
|
||||
aContext->Replace(aContext->Apply(aFace),aResult);
|
||||
|
||||
ShapeFix_Face sff (aResult);
|
||||
//Intializing by tolerances
|
||||
//Initializing by tolerances
|
||||
sff.SetPrecision(myTolerance);
|
||||
sff.SetMinTolerance(tol);
|
||||
sff.SetMaxTolerance(Max(1.,myTolerance*1000.));
|
||||
Standard_Real MaxTol = DefineMaxTolerance(aResult);
|
||||
sff.SetMaxTolerance(MaxTol);
|
||||
//Setting modes
|
||||
sff.FixOrientationMode() = 0;
|
||||
#if OCC_VERSION_LARGE > 0x07020001
|
||||
sff.FixWireTool()->CheckMissingEdgesMode() = Standard_False;
|
||||
#endif
|
||||
//sff.FixWireMode() = 0;
|
||||
sff.SetContext(aContext);
|
||||
// Applying the fixes
|
||||
|
||||
@ -58,7 +58,7 @@ public:
|
||||
CurveCreator_ICurve* theCurve );
|
||||
|
||||
/**
|
||||
* Returns whethe the container has the value
|
||||
* Returns whether the container has the value
|
||||
* \param theList a container of values
|
||||
* \param theValue a value
|
||||
*/
|
||||
|
||||
@ -1591,7 +1591,7 @@ void CurveCreator_Widget::convert( const CurveCreator_ICurve::SectionToPointList
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whethe the container has the value
|
||||
* Returns whether the container has the value
|
||||
* \param theList a container of values
|
||||
* \param theValue a value
|
||||
*/
|
||||
|
||||
@ -297,8 +297,8 @@ bool EntityGUI::OnMousePress( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWi
|
||||
bool EntityGUI::OnMouseRelease( QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow )
|
||||
{
|
||||
((OCCViewer_ViewWindow*)theViewWindow)->setSketcherStyle(false);
|
||||
QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox();
|
||||
#ifdef WITH_OPENCV
|
||||
QDialog* aDlg = getGeometryGUI()->GetActiveDialogBox();
|
||||
if ( aDlg && ( QString( aDlg->metaObject()->className() ).compare( "EntityGUI_FeatureDetectorDlg" ) == 0 ) &&
|
||||
theViewWindow->getViewManager()->getType() == OCCViewer_Viewer::Type() &&
|
||||
pe->modifiers() != Qt::ControlModifier )
|
||||
|
||||
@ -485,7 +485,7 @@ void EntityGUI_FieldDlg::StepTable::setEditable (bool isEditable,
|
||||
|
||||
//=======================================================================
|
||||
// name : EntityGUI_FieldDlg::StepTable::isEditable
|
||||
// Purpose : Verify wheter cell is editable
|
||||
// Purpose : Verify whether cell is editable
|
||||
//=======================================================================
|
||||
bool EntityGUI_FieldDlg::StepTable::isEditable (int row, int col) const
|
||||
{
|
||||
|
||||
@ -627,7 +627,7 @@ void EntityGUI_SketcherDlg::RectClicked()
|
||||
{
|
||||
InitClick();
|
||||
|
||||
// Connect the selction manager (disconnected in InitClick())
|
||||
// Connect the selection manager (disconnected in InitClick())
|
||||
connect( myGeometryGUI->getApp()->selectionMgr(),
|
||||
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Field creation.
|
||||
//NOTE: This is an interface to a function for the Field creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -429,7 +429,7 @@ void GEOMAlgo_ShapeInfo::Dump()const
|
||||
break;
|
||||
//
|
||||
default:
|
||||
printf(" * not implememted yet\n");
|
||||
printf(" * not implemented yet\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -66,7 +66,7 @@ public :
|
||||
const bool shapesOnly = false );
|
||||
static QString GetShapeTypeString( const TopoDS_Shape& shape );
|
||||
|
||||
/* Convertions */
|
||||
/* Conversions */
|
||||
static Handle(GEOM_AISShape)
|
||||
ConvertIOinGEOMAISShape( const Handle(SALOME_InteractiveObject)& IO,
|
||||
bool onlyInActiveView = false );
|
||||
|
||||
@ -145,10 +145,10 @@ void GEOMBase_Helper::display( GEOM::GEOM_Object_ptr object, const bool updateVi
|
||||
{
|
||||
// Unset color of shape ( this color may be set during preview displaying )
|
||||
// Default color will be used
|
||||
// getDisplayer()->UnsetColor();
|
||||
// getDisplayer()->UnsetColor();
|
||||
getDisplayer()->UnsetWidth();
|
||||
|
||||
MESSAGE("GEOMBase_Helper::display myTexture = "<<getDisplayer()->GetTexture())
|
||||
MESSAGE("GEOMBase_Helper::display myTexture = "<<getDisplayer()->GetTexture());
|
||||
|
||||
// Enable activisation of selection
|
||||
getDisplayer()->SetToActivate( true );
|
||||
@ -179,9 +179,11 @@ void GEOMBase_Helper::erase( GEOM::GEOM_Object_ptr object, const bool updateView
|
||||
{
|
||||
if ( !object->_is_nil() ) {
|
||||
QString entry = getEntry( object );
|
||||
getDisplayer()->Erase( new SALOME_InteractiveObject(
|
||||
entry.toLatin1().constData(),
|
||||
"GEOM", strdup( GEOMBase::GetName( object ).toLatin1().constData() ) ), true, updateView );
|
||||
QString name = GEOMBase::GetName( object );
|
||||
getDisplayer()->Erase ( new SALOME_InteractiveObject(entry.toLatin1().constData(),
|
||||
"GEOM",
|
||||
name.toLatin1().constData() ),
|
||||
true, updateView );
|
||||
}
|
||||
}
|
||||
|
||||
@ -219,8 +221,12 @@ void GEOMBase_Helper::redisplay( GEOM::GEOM_Object_ptr object,
|
||||
getDisplayer()->SetToActivate( true );
|
||||
|
||||
QString entry = getEntry( object );
|
||||
getDisplayer()->Redisplay(new SALOME_InteractiveObject
|
||||
(entry.toLatin1().constData(), "GEOM", strdup(GEOMBase::GetName(object).toLatin1().constData())), false);
|
||||
QString name = GEOMBase::GetName( object );
|
||||
getDisplayer()->Redisplay
|
||||
(new SALOME_InteractiveObject (entry.toLatin1().constData(),
|
||||
"GEOM",
|
||||
name.toLatin1().constData()),
|
||||
false);
|
||||
}
|
||||
|
||||
if ( withChildren ) {
|
||||
@ -237,8 +243,12 @@ void GEOMBase_Helper::redisplay( GEOM::GEOM_Object_ptr object,
|
||||
if ( !CORBA::is_nil( aChild ) ) {
|
||||
if ( !aChild->_is_nil() ) {
|
||||
QString entry = getEntry( aChild );
|
||||
getDisplayer()->Redisplay( new SALOME_InteractiveObject(
|
||||
entry.toLatin1().constData(), "GEOM", strdup( GEOMBase::GetName( aChild ).toLatin1().constData() ) ), false );
|
||||
QString name = GEOMBase::GetName( aChild );
|
||||
getDisplayer()->Redisplay
|
||||
( new SALOME_InteractiveObject( entry.toLatin1().constData(),
|
||||
"GEOM",
|
||||
name.toLatin1().constData() ),
|
||||
false );
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -293,7 +303,7 @@ void GEOMBase_Helper::displayPreview( const bool display,
|
||||
else {
|
||||
for ( ObjectList::iterator it = objects.begin(); it != objects.end(); ++it )
|
||||
{
|
||||
GEOM::GEOM_Object_var obj=*it;
|
||||
GEOM::GEOM_Object_var obj = *it;
|
||||
displayPreview( obj, true, activate, false, lineWidth, displayMode, color );
|
||||
if ( toRemoveFromEngine )
|
||||
obj->UnRegister();
|
||||
@ -478,8 +488,11 @@ void GEOMBase_Helper::localSelection( const ObjectList& theObjs, const std::list
|
||||
continue;
|
||||
QString anEntry = getEntry( anObj );
|
||||
if ( anEntry != "" )
|
||||
aListOfIO.Append( new SALOME_InteractiveObject(
|
||||
anEntry.toLatin1().constData(), "GEOM", strdup( GEOMBase::GetName( anObj ).toLatin1().constData() ) ) );
|
||||
{
|
||||
QString aName = GEOMBase::GetName( anObj );
|
||||
aListOfIO.Append( new SALOME_InteractiveObject( anEntry.toLatin1().constData(),
|
||||
"GEOM", aName.toLatin1().constData() ));
|
||||
}
|
||||
}
|
||||
|
||||
getDisplayer()->LocalSelection( aListOfIO, modes );
|
||||
@ -952,7 +965,7 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction, b
|
||||
|
||||
//================================================================
|
||||
// Function : showError
|
||||
// Purpose : Shows a message box with infromation about an error taken from getOperation()->GetErrorCode()
|
||||
// Purpose : Shows a message box with information about an error taken from getOperation()->GetErrorCode()
|
||||
//================================================================
|
||||
void GEOMBase_Helper::showError()
|
||||
{
|
||||
|
||||
@ -133,7 +133,7 @@ protected:
|
||||
// should be published in a study.
|
||||
|
||||
void showError();
|
||||
// Shows a message box with infromation about an error taken from getOperation()->GetErrorCode()
|
||||
// Shows a message box with information about an error taken from getOperation()->GetErrorCode()
|
||||
void showError( const QString& msg );
|
||||
// Shows a error message followed by <msg>
|
||||
|
||||
|
||||
@ -135,14 +135,14 @@ public:
|
||||
/*!
|
||||
* \brief Inits property fields from the passed length object.
|
||||
* \param theIO [in] the interactive presentation.
|
||||
* \param theLCS [in] the local coordiante system of parent object.
|
||||
* \param theLCS [in] the local coordinate system of parent object.
|
||||
*/
|
||||
void Init( const Handle(AIS_LengthDimension)& theIO, const gp_Ax3& theLCS );
|
||||
|
||||
/*!
|
||||
* \brief Updates length object properties from the fields.
|
||||
* \param theIO [in/out] the interactive presentation.
|
||||
* \param theLCS [in] the local coordiante system of parent object.
|
||||
* \param theLCS [in] the local coordinate system of parent object.
|
||||
*/
|
||||
void Update( Handle(AIS_LengthDimension)& theIO, const gp_Ax3& theLCS );
|
||||
|
||||
@ -160,7 +160,7 @@ public:
|
||||
void FromValues(int& theIt, const std::vector<double>& theValues);
|
||||
|
||||
/*!
|
||||
* \brief Overload comparsion.
|
||||
* \brief Overload comparison.
|
||||
*/
|
||||
bool operator == (const Length &theOther) const;
|
||||
bool operator != (const Length &theOther) const { return !(operator == (theOther)); }
|
||||
@ -203,14 +203,14 @@ public:
|
||||
/*!
|
||||
* \brief Inits property fields from the passed length object.
|
||||
* \param theIO [in] the interactive presentation.
|
||||
* \param theLCS [in] the local coordiante system of parent object.
|
||||
* \param theLCS [in] the local coordinate system of parent object.
|
||||
*/
|
||||
void Init( const Handle(AIS_DiameterDimension)& theIO, const gp_Ax3& theLCS );
|
||||
|
||||
/*!
|
||||
* \brief Updates length object properties from the fields.
|
||||
* \param theIO [in/out] the interactive presentation.
|
||||
* \param theLCS [in] the local coordiante system of parent object.
|
||||
* \param theLCS [in] the local coordinate system of parent object.
|
||||
*/
|
||||
void Update( Handle(AIS_DiameterDimension)& theIO, const gp_Ax3& theLCS );
|
||||
|
||||
@ -228,7 +228,7 @@ public:
|
||||
void FromValues(int& theIt, const std::vector<double>& theValues);
|
||||
|
||||
/*!
|
||||
* \brief Overload comparsion.
|
||||
* \brief Overload comparison.
|
||||
*/
|
||||
bool operator == (const Diameter &theOther) const;
|
||||
bool operator != (const Diameter &theOther) const { return !(operator == (theOther)); }
|
||||
@ -273,14 +273,14 @@ public:
|
||||
/*!
|
||||
* \brief Inits property fields from the passed length object.
|
||||
* \param theIO [in] the interactive presentation.
|
||||
* \param theLCS [in] the local coordiante system of parent object.
|
||||
* \param theLCS [in] the local coordinate system of parent object.
|
||||
*/
|
||||
void Init( const Handle(AIS_AngleDimension)& theIO, const gp_Ax3& theLCS );
|
||||
|
||||
/*!
|
||||
* \brief Updates length object properties from the fields.
|
||||
* \param theIO [in/out] the interactive presentation.
|
||||
* \param theLCS [in] the local coordiante system of parent object.
|
||||
* \param theLCS [in] the local coordinate system of parent object.
|
||||
*/
|
||||
void Update( Handle(AIS_AngleDimension)& theIO, const gp_Ax3& theLCS );
|
||||
|
||||
@ -298,7 +298,7 @@ public:
|
||||
void FromValues(int& theIt, const std::vector<double>& theValues);
|
||||
|
||||
/*!
|
||||
* \brief Overload comparsion.
|
||||
* \brief Overload comparison.
|
||||
*/
|
||||
bool operator == (const Angle &theOther) const;
|
||||
bool operator != (const Angle &theOther) const { return !(operator == (theOther)); }
|
||||
@ -352,12 +352,12 @@ public:
|
||||
operator QString() const;
|
||||
|
||||
/*!
|
||||
* \brief Overload comparsion.
|
||||
* \brief Overload comparison.
|
||||
*/
|
||||
bool operator == (const GEOMGUI_DimensionProperty &theOther) const;
|
||||
|
||||
/*!
|
||||
* \brief Overload comparsion.
|
||||
* \brief Overload comparison.
|
||||
*/
|
||||
bool operator != (const GEOMGUI_DimensionProperty &theOther) const
|
||||
{
|
||||
|
||||
@ -1669,7 +1669,7 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs )
|
||||
//=================================================================
|
||||
/*!
|
||||
* GEOM_Displayer::BuildPrs
|
||||
* Build presentation accordint to the current viewer type
|
||||
* Build presentation according to the current viewer type
|
||||
*/
|
||||
//=================================================================
|
||||
SALOME_Prs* GEOM_Displayer::BuildPrs( GEOM::GEOM_Object_ptr theObj )
|
||||
@ -1698,7 +1698,7 @@ SALOME_Prs* GEOM_Displayer::BuildPrs( GEOM::GEOM_Object_ptr theObj )
|
||||
//=================================================================
|
||||
/*!
|
||||
* GEOM_Displayer::BuildPrs
|
||||
* Build presentation accordint to the current viewer type
|
||||
* Build presentation according to the current viewer type
|
||||
*/
|
||||
//=================================================================
|
||||
SALOME_Prs* GEOM_Displayer::BuildPrs( const TopoDS_Shape& theShape )
|
||||
|
||||
@ -129,7 +129,7 @@ public:
|
||||
/* Update visibility state */
|
||||
void UpdateVisibility( SALOME_View*, const SALOME_Prs*, bool );
|
||||
|
||||
/* build presentation accordint to the current viewer type*/
|
||||
/* build presentation according to the current viewer type*/
|
||||
SALOME_Prs* BuildPrs ( GEOM::GEOM_Object_ptr );
|
||||
SALOME_Prs* BuildPrs ( const TopoDS_Shape& );
|
||||
|
||||
|
||||
@ -116,7 +116,7 @@ Standard_Integer GEOMImpl_ArchimedeDriver::Execute(Handle(TFunction_Logbook)& lo
|
||||
double volume = VOL.CalculateVolume(Zmax) * aWaterDensity;
|
||||
|
||||
char msg[100] = "";
|
||||
sprintf(msg, "shape sinks to the bottom : Weigth max = %.1f", volume);
|
||||
sprintf(msg, "shape sinks to the bottom : Weight max = %.1f", volume);
|
||||
|
||||
StdFail_NotDone::Raise(msg);
|
||||
}
|
||||
|
||||
@ -915,7 +915,7 @@ void GEOMImpl_Block6Explorer::InitByTwoFaces (const TopoDS_Shape& theFace1,
|
||||
}
|
||||
|
||||
// 1.2. Ordered vertices and edges of the second face we temporarily store
|
||||
// in arrays, to find for them rigth location in <myVertices> on the Step 2.
|
||||
// in arrays, to find for them the right location in <myVertices> in Step 2.
|
||||
|
||||
// declare arrays
|
||||
TopTools_Array1OfShape aVertis2(1,4); // ordered vertices of the second face
|
||||
|
||||
@ -336,7 +336,7 @@ TopoDS_Shape GEOMImpl_GlueDriver::GlueFaces
|
||||
aGA.SetTolerance(theTolerance);
|
||||
aGA.SetKeepNonSolids(doKeepNonSolids);
|
||||
|
||||
// 2. Detect interferred shapes
|
||||
// 2. Detect interfered shapes
|
||||
aGA.Detect();
|
||||
|
||||
//Standard_Integer iWrnDetect = aGA.WarningStatus();
|
||||
@ -451,7 +451,7 @@ TopoDS_Shape GEOMImpl_GlueDriver::GlueWithWarnings (const TopoDS_Shape& theShape
|
||||
aGA.SetTolerance(theTolerance);
|
||||
aGA.SetKeepNonSolids(doKeepNonSolids);
|
||||
|
||||
// 2. Detect interferred shapes
|
||||
// 2. Detect interfered shapes
|
||||
aGA.Detect();
|
||||
|
||||
//modified by NIZNHY-PKV Tue Mar 13 14:07:12 2012f
|
||||
@ -609,7 +609,7 @@ TopoDS_Shape GEOMImpl_GlueDriver::GlueByList (const TopoDS_Shape& theShape,
|
||||
aGA.SetTolerance(theTolerance);
|
||||
aGA.SetKeepNonSolids(doKeepNonSolids);
|
||||
|
||||
// 2. Detect interferred shapes
|
||||
// 2. Detect interfered shapes
|
||||
aGA.Detect();
|
||||
|
||||
//modified by NIZNHY-PKV Tue Mar 13 14:07:12 2012f
|
||||
|
||||
@ -63,7 +63,7 @@
|
||||
|
||||
//=======================================================================
|
||||
//function : raiseNotDoneExeption
|
||||
//purpose : global function: forms error message and raises exeption
|
||||
//purpose : global function: forms error message and raises exception
|
||||
//=======================================================================
|
||||
void raiseNotDoneExeption( const int theErrorStatus )
|
||||
{
|
||||
|
||||
@ -1878,7 +1878,7 @@ Handle(TColStd_HSequenceOfTransient)
|
||||
try {
|
||||
OCC_CATCH_SIGNALS;
|
||||
if (!GetSolver()->ComputeFunction(aFunction)) {
|
||||
SetErrorCode("Pipe with defferent section driver failed");
|
||||
SetErrorCode("Pipe with different section driver failed");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Arc creation.
|
||||
//NOTE: This is an interface to a function for the Arc creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Archimede operation.
|
||||
//NOTE: This is an interface to a function for the Archimede operation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Common, Cut and Fuse creation.
|
||||
//NOTE: This is an interface to a function for the Common, Cut and Fuse creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
#include "TColStd_HSequenceOfTransient.hxx"
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Box creation.
|
||||
//NOTE: This is an interface to a function for the Box creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Circle creation.
|
||||
//NOTE: This is an interface to a function for the Circle creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Cone creation.
|
||||
//NOTE: This is an interface to a function for the Cone creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Copy operation.
|
||||
//NOTE: This is an interface to a function for the Copy operation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Cylinder creation.
|
||||
//NOTE: This is an interface to a function for the Cylinder creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Disk creation.
|
||||
//NOTE: This is an interface to a function for the Disk creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Ellipse creation.
|
||||
//NOTE: This is an interface to a function for the Ellipse creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Offset creation.
|
||||
//NOTE: This is an interface to a function for the Offset creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
#include <TColStd_HArray1OfInteger.hxx>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Face creation.
|
||||
//NOTE: This is an interface to a function for the Face creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Filling operation.
|
||||
//NOTE: This is an interface to a function for the Filling operation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
#include <TColStd_HSequenceOfTransient.hxx>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Import Export operation.
|
||||
//NOTE: This is an interface to a function for the Import Export operation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the vector creation.
|
||||
//NOTE: This is an interface to a function for the vector creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Offset creation.
|
||||
//NOTE: This is an interface to a function for the Offset creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
#include <TColStd_HArray1OfInteger.hxx>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Partition creation.
|
||||
//NOTE: This is an interface to a function for the Partition creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Pipe creation.
|
||||
//NOTE: This is an interface to a function for the Pipe creation.
|
||||
//
|
||||
#ifndef _GEOMImpl_IPIPE_HXX_
|
||||
#define _GEOMImpl_IPIPE_HXX_
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Pipe creation.
|
||||
//NOTE: This is an interface to a function for the Pipe creation.
|
||||
|
||||
#ifndef _GEOMImpl_IPIPEDIFFSECT_HXX_
|
||||
#define _GEOMImpl_IPIPEDIFFSECT_HXX_
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Pipe creation.
|
||||
//NOTE: This is an interface to a function for the Pipe creation.
|
||||
|
||||
#ifndef _GEOMImpl_IPIPESHELLSECT_HXX_
|
||||
#define _GEOMImpl_IPIPESHELLSECT_HXX_
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the vector creation.
|
||||
//NOTE: This is an interface to a function for the vector creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Setting In Position.
|
||||
//NOTE: This is an interface to a function for the Setting In Position.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Prism creation.
|
||||
//NOTE: This is an interface to a function for the Prism creation.
|
||||
|
||||
#include "GEOM_Function.hxx"
|
||||
// #include <GEOMImpl_Mode.hxx> TEST
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Revolution creation.
|
||||
//NOTE: This is an interface to a function for the Revolution creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Scale creation.
|
||||
//NOTE: This is an interface to a function for the Scale creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the extended shape creation.
|
||||
//NOTE: This is an interface to a function for the extended shape creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Sphere creation.
|
||||
//NOTE: This is an interface to a function for the Sphere creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Pipe creation.
|
||||
//NOTE: This is an interface to a function for the Pipe creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
#include <TColStd_HSequenceOfTransient.hxx>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Torus creation.
|
||||
//NOTE: This is an interface to a function for the Torus creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Transfer Data functionality.
|
||||
//NOTE: This is an interface to a function for the Transfer Data functionality.
|
||||
//
|
||||
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Transfer Data functionality.
|
||||
//NOTE: This is an interface to a function for the Transfer Data functionality.
|
||||
//
|
||||
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
//
|
||||
|
||||
//NOTE: This is an intreface to a function for the Translate creation.
|
||||
//NOTE: This is an interface to a function for the Translate creation.
|
||||
//
|
||||
#include "GEOM_Function.hxx"
|
||||
|
||||
|
||||
@ -569,7 +569,7 @@ static void FindNextPairOfFaces(const TopoDS_Shape& aCurFace,
|
||||
bool stat = FillForOtherEdges(F1other,E1,V1,FF);
|
||||
if (!stat) {
|
||||
if (aCI) delete aCI;
|
||||
Standard_ConstructionError::Raise("FindNextPairOfFaces: Can not mapping other egdes");
|
||||
Standard_ConstructionError::Raise("FindNextPairOfFaces: Can not map other edges");
|
||||
}
|
||||
|
||||
FindNextPairOfFaces(F1other, aMapEdgeFaces1, aMapEdgeFaces2, FF, aCI);
|
||||
@ -919,7 +919,7 @@ TopoDS_Shape GEOMImpl_PipeDriver::CreatePipeWithDifferentSections
|
||||
}
|
||||
}
|
||||
if (nbEdges<Edges.Length()) {
|
||||
// one of edges was splitted => we have to update WirePath
|
||||
// one of edges was split => we have to update WirePath
|
||||
BRep_Builder B;
|
||||
TopoDS_Wire W;
|
||||
B.MakeWire(W);
|
||||
@ -1824,7 +1824,7 @@ static TopoDS_Shape CreatePipeForShellSections(const TopoDS_Wire& aWirePath,
|
||||
bool stat = FillForOtherEdges(FS1,E1,V11,FF);
|
||||
if (!stat) {
|
||||
if (aCI) delete aCI;
|
||||
Standard_ConstructionError::Raise("FindForOtherEdges: Can not mapping other egdes");
|
||||
Standard_ConstructionError::Raise("FindForOtherEdges: Can not map other edges");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -91,7 +91,7 @@ Standard_Boolean GEOMImpl_PolylineDumper::Dump
|
||||
aPD << theObject << " = pl.result(";
|
||||
|
||||
if (myWorkingPlane.IsNull()) {
|
||||
// Add coodinates of working plane.
|
||||
// Add coordinates of working plane.
|
||||
Standard_Integer i;
|
||||
|
||||
aPD << "[";
|
||||
|
||||
@ -77,7 +77,7 @@ static QString getParentComponent( _PTR( SObject ) obj )
|
||||
|
||||
//=====================================================================================
|
||||
// function : inUse
|
||||
// purpose : check if the object(s) passed as the the second arguments are used
|
||||
// purpose : check if the object(s) passed as the second arguments are used
|
||||
// by the other objects in the study
|
||||
//=====================================================================================
|
||||
static bool inUse( const QString& component, const QMap<QString,QString>& objects )
|
||||
|
||||
@ -124,7 +124,7 @@
|
||||
// Below macro, when uncommented, switches on simplified (more performant) algorithm
|
||||
// of auto-color picking up
|
||||
#define SIMPLE_AUTOCOLOR
|
||||
// Below macro, when defined, switches on automatic layouting of OCC and Dependecy views
|
||||
// Below macro, when defined, switches on automatic layouting of OCC and Dependency views
|
||||
// on Show Dependencies operation
|
||||
#define LAYOUT_DEPVIEW
|
||||
|
||||
|
||||
@ -67,7 +67,7 @@
|
||||
*/
|
||||
|
||||
/*!
|
||||
\brief Contructor
|
||||
\brief Constructor
|
||||
*/
|
||||
GEOMToolsGUI_MaterialList::GEOMToolsGUI_MaterialList( QWidget* parent )
|
||||
: QListWidget( parent )
|
||||
|
||||
@ -238,7 +238,7 @@ void GEOMToolsGUI_TransparencyDlg::SliderHasMoved(int value)
|
||||
//=================================================================================
|
||||
// function : SetTransparency()
|
||||
// purpose : Called when value of slider change
|
||||
// : or the first time as initilisation
|
||||
// : or the first time as initialisation
|
||||
//=================================================================================
|
||||
void GEOMToolsGUI_TransparencyDlg::SetTransparency()
|
||||
{
|
||||
|
||||
@ -254,10 +254,10 @@ namespace GEOMUtils
|
||||
Standard_EXPORT bool CheckShape( TopoDS_Shape& shape, bool checkGeometry = false );
|
||||
|
||||
/*!
|
||||
* \brief Check boolean and partition operations agruments
|
||||
* \brief Check boolean and partition operations arguments
|
||||
*
|
||||
* \param theShape the agrument of an operation to be checked
|
||||
* \return \c true if the agrument is valid for a boolean or partition
|
||||
* \param theShape the argument of an operation to be checked
|
||||
* \return \c true if the argument is valid for a boolean or partition
|
||||
* operation or \c false otherwise
|
||||
*/
|
||||
Standard_EXPORT bool CheckBOPArguments(const TopoDS_Shape &theShape);
|
||||
|
||||
@ -915,7 +915,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapesO (GEOM::GEOM_Object_ptr theObject
|
||||
CORBA::String_var anIORo = _orb->object_to_string(theObject);
|
||||
SALOMEDS::SObject_var aSO = aStudy->FindObjectIOR(anIORo.in());
|
||||
//PTv, IMP 0020001, The salome object <aSO>
|
||||
// is not obligatory in case of invokation from script
|
||||
// is not obligatory in case of invocation from script
|
||||
// if (CORBA::is_nil(aSO))
|
||||
// return aParts._retn();
|
||||
|
||||
@ -944,7 +944,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapesO (GEOM::GEOM_Object_ptr theO
|
||||
CORBA::String_var anIORo = _orb->object_to_string(theObject);
|
||||
SALOMEDS::SObject_var aSO = getStudyServant()->FindObjectIOR(anIORo.in());
|
||||
//PTv, IMP 0020001, The salome object <aSO>
|
||||
// is not obligatory in case of invokation from script
|
||||
// is not obligatory in case of invocation from script
|
||||
// if (CORBA::is_nil(aSO))
|
||||
// return aParts._retn();
|
||||
|
||||
@ -1027,7 +1027,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreSubShapes(GEOM::GEOM_Object_ptr theObject,
|
||||
GEOM::ListOfGO_var aParts = new GEOM::ListOfGO;
|
||||
SALOMEDS::Study_var aStudy = getStudyServant();
|
||||
//PTv, IMP 0020001, The salome object <theSObject>
|
||||
// is not obligatory in case of invokation from script
|
||||
// is not obligatory in case of invocation from script
|
||||
if (CORBA::is_nil(aStudy) || CORBA::is_nil(theObject) /*|| CORBA::is_nil(theSObject)*/)
|
||||
return aParts._retn();
|
||||
|
||||
@ -1620,7 +1620,7 @@ GEOM::ListOfGO* GEOM_Gen_i::RestoreGivenSubShapes(GEOM::GEOM_Object_ptr theObj
|
||||
GEOM::ListOfGO_var aParts = new GEOM::ListOfGO;
|
||||
SALOMEDS::Study_var aStudy = getStudyServant();
|
||||
//PTv, IMP 0020001, The salome object <theSObject>
|
||||
// is not obligatory in case of invokation from script
|
||||
// is not obligatory in case of invocation from script
|
||||
if (CORBA::is_nil(aStudy) || CORBA::is_nil(theObject) /*|| CORBA::is_nil(theSObject)*/)
|
||||
return aParts._retn();
|
||||
|
||||
|
||||
@ -826,7 +826,7 @@ CORBA::Boolean GEOM_IMeasureOperations_i::CheckBOPArguments
|
||||
bool isGood = false;
|
||||
|
||||
if (!aShape.IsNull()) {
|
||||
// Check BOP agruments
|
||||
// Check BOP arguments
|
||||
isGood = GetOperations()->CheckBOPArguments(aShape);
|
||||
}
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
#
|
||||
|
||||
# GEOM_SWIG : binding of C++ implementaion with Python
|
||||
# GEOM_SWIG : binding of C++ implementation with Python
|
||||
# File : GEOM_TestHealing.py
|
||||
# Author : Julia DOROVSKIKH
|
||||
# Module : GEOM
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
|
||||
#
|
||||
|
||||
# GEOM GEOM_SWIG : binding of C++ implementaion with Python
|
||||
# GEOM GEOM_SWIG : binding of C++ implementation with Python
|
||||
# File : GEOM_blocks.py
|
||||
# Author : Julia DOROVSKIKH
|
||||
# Module : GEOM
|
||||
|
||||
@ -4367,7 +4367,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
|
||||
# @param theBase Base shape to be extruded.
|
||||
# @param thePath Path shape to extrude the base shape along it.
|
||||
# @param theVec Vector defines a constant binormal direction to keep the
|
||||
# same angle beetween the direction and the sections
|
||||
# same angle between the direction and the sections
|
||||
# along the sweep surface.
|
||||
# @param IsGenerateGroups flag that tells if it is necessary to
|
||||
# create groups. It is equal to False by default.
|
||||
@ -4396,7 +4396,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
|
||||
theBase Base shape to be extruded.
|
||||
thePath Path shape to extrude the base shape along it.
|
||||
theVec Vector defines a constant binormal direction to keep the
|
||||
same angle beetween the direction and the sections
|
||||
same angle between the direction and the sections
|
||||
along the sweep surface.
|
||||
IsGenerateGroups flag that tells if it is necessary to
|
||||
create groups. It is equal to False by default.
|
||||
@ -11540,7 +11540,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
|
||||
|
||||
## Detect self-intersections of the given shape with algorithm based on mesh intersections.
|
||||
# @param theShape Shape to check.
|
||||
# @param theDeflection Linear deflection coefficient that specifies quality of tesselation:
|
||||
# @param theDeflection Linear deflection coefficient that specifies quality of tessellation:
|
||||
# - if \a theDeflection <= 0, default deflection 0.001 is used
|
||||
# @param theTolerance Specifies a distance between sub-shapes used for detecting gaps:
|
||||
# - if \a theTolerance <= 0, algorithm detects intersections (default behavior)
|
||||
@ -11555,7 +11555,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
|
||||
|
||||
Parameters:
|
||||
theShape Shape to check.
|
||||
theDeflection Linear deflection coefficient that specifies quality of tesselation:
|
||||
theDeflection Linear deflection coefficient that specifies quality of tessellation:
|
||||
- if theDeflection <= 0, default deflection 0.001 is used
|
||||
theTolerance Specifies a distance between shapes used for detecting gaps:
|
||||
- if theTolerance <= 0, algorithm detects intersections (default behavior)
|
||||
@ -11569,20 +11569,20 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
|
||||
RaiseIfFailed("CheckSelfIntersectionsFast", self.MeasuOp)
|
||||
return IsValid
|
||||
|
||||
## Check boolean and partition operations agruments.
|
||||
# @param theShape the agrument of an operation to be checked
|
||||
# @return TRUE if the agrument is valid for a boolean or partition
|
||||
## Check boolean and partition operations arguments.
|
||||
# @param theShape the argument of an operation to be checked
|
||||
# @return TRUE if the argument is valid for a boolean or partition
|
||||
# operation; FALSE otherwise.
|
||||
@ManageTransactions("MeasuOp")
|
||||
def CheckBOPArguments(self, theShape):
|
||||
"""
|
||||
Check boolean and partition operations agruments.
|
||||
Check boolean and partition operations arguments.
|
||||
|
||||
Parameters:
|
||||
theShape the agrument of an operation to be checked
|
||||
theShape the argument of an operation to be checked
|
||||
|
||||
Returns:
|
||||
TRUE if the agrument is valid for a boolean or partition
|
||||
TRUE if the argument is valid for a boolean or partition
|
||||
operation; FALSE otherwise.
|
||||
"""
|
||||
return self.MeasuOp.CheckBOPArguments(theShape)
|
||||
@ -11593,7 +11593,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
|
||||
# @param theTolerance Specifies a distance between shapes used for detecting gaps:
|
||||
# - if \a theTolerance <= 0, algorithm detects intersections (default behavior)
|
||||
# - if \a theTolerance > 0, algorithm detects gaps
|
||||
# @param theDeflection Linear deflection coefficient that specifies quality of tesselation:
|
||||
# @param theDeflection Linear deflection coefficient that specifies quality of tessellation:
|
||||
# - if \a theDeflection <= 0, default deflection 0.001 is used
|
||||
# @return TRUE, if there are intersections (gaps) between source shapes
|
||||
# @return List of sub-shapes IDs from 1st shape that localize intersection.
|
||||
@ -11611,7 +11611,7 @@ class geomBuilder(GEOM._objref_GEOM_Gen):
|
||||
theTolerance Specifies a distance between shapes used for detecting gaps:
|
||||
- if theTolerance <= 0, algorithm detects intersections (default behavior)
|
||||
- if theTolerance > 0, algorithm detects gaps
|
||||
theDeflection Linear deflection coefficient that specifies quality of tesselation:
|
||||
theDeflection Linear deflection coefficient that specifies quality of tessellation:
|
||||
- if theDeflection <= 0, default deflection 0.001 is used
|
||||
|
||||
Returns:
|
||||
|
||||
@ -492,7 +492,7 @@ public:
|
||||
|
||||
/*!
|
||||
\brief Initialize GEOM module's engine
|
||||
\return \c true if initialization succeedes or \c false otherwise
|
||||
\return \c true if initialization succeeds or \c false otherwise
|
||||
*/
|
||||
bool GEOM_Swig::initGeomGen()
|
||||
{
|
||||
|
||||
@ -327,11 +327,11 @@ GEOM::GEOM_Object_ptr GroupGUI_BooleanDlg::getFather(GEOM::GEOM_Object_ptr theOb
|
||||
QList<GEOM::GeomObjPtr> GroupGUI_BooleanDlg::getSourceObjects()
|
||||
{
|
||||
QList<GEOM::GeomObjPtr> res;
|
||||
for (int i = 0; i < myListShapes.length(); i++) {
|
||||
for ( CORBA::ULong i = 0; i < myListShapes.length(); i++) {
|
||||
GEOM::GeomObjPtr aGeomObjPtr(myListShapes[i]);
|
||||
res << aGeomObjPtr;
|
||||
}
|
||||
for (int i = 0; i < myListTools.length(); i++) {
|
||||
for ( CORBA::ULong i = 0; i < myListTools.length(); i++) {
|
||||
GEOM::GeomObjPtr aGeomObjPtr(myListTools[i]);
|
||||
res << aGeomObjPtr;
|
||||
}
|
||||
|
||||
@ -101,10 +101,10 @@ Material_ResourceMgr* Material_ResourceMgr::resourceMgr()
|
||||
}
|
||||
|
||||
/*!
|
||||
\brief Get list of avaiable materials
|
||||
\brief Get list of available materials
|
||||
\param theType material type
|
||||
\param theSort if \c true (default), returns a list of materials sorted by name
|
||||
\return list of avaiable materials names
|
||||
\return list of available materials names
|
||||
*/
|
||||
QStringList Material_ResourceMgr::materials( MaterialType theType, bool theSort )
|
||||
{
|
||||
|
||||
@ -89,7 +89,7 @@ MeasureGUI_CheckSelfIntersectionsDlg::MeasureGUI_CheckSelfIntersectionsDlg (Geom
|
||||
mainFrame()->RadioButton3->close();
|
||||
|
||||
/***************************************************************/
|
||||
/* SIMPLE SELF-INTERSECTION constructor
|
||||
// SIMPLE SELF-INTERSECTION constructor
|
||||
/***************************************************************/
|
||||
mySimpleGrp = new QGroupBox(tr("GEOM_CHECK_INFOS"));
|
||||
QLabel *anObjLbl = new QLabel(tr("GEOM_OBJECT"));
|
||||
@ -139,7 +139,7 @@ MeasureGUI_CheckSelfIntersectionsDlg::MeasureGUI_CheckSelfIntersectionsDlg (Geom
|
||||
aGrpLayout1->addWidget(myShapeList1, 6, 2);
|
||||
|
||||
/***************************************************************/
|
||||
/* FAST SELF-INTERSECTION constructor
|
||||
// FAST SELF-INTERSECTION constructor
|
||||
/***************************************************************/
|
||||
|
||||
myFastGrp = new QGroupBox(tr("GEOM_CHECK_INFOS"), centralWidget());
|
||||
|
||||
@ -475,7 +475,7 @@ void MeasureGUI_CheckShapeDlg::onErrorsListSelectionChanged()
|
||||
|
||||
myGrp->ListBox2->clear();
|
||||
|
||||
if (aCurItem < aErrs.length()) {
|
||||
if (aCurItem < (int)aErrs.length()) {
|
||||
GEOM::GEOM_IMeasureOperations::ShapeError aErr = aErrs[aCurItem];
|
||||
GEOM::ListOfLong aObjLst = aErr.incriminated;
|
||||
QStringList aSubShapeList;
|
||||
|
||||
@ -1076,7 +1076,7 @@ void MeasureGUI_DimensionCreateTool::ChooseLengthFlyoutsFromBnd( SeqOfDirs& theD
|
||||
{
|
||||
const gp_Pln& aPlane = aPlaneIt.Value();
|
||||
|
||||
// transform bounding box to orthogonal coordiantes relative to
|
||||
// transform bounding box to orthogonal coordinates relative to
|
||||
// dimension points P1, P2 (x-axis) and plane direction (z-axis),
|
||||
// where y coordinates will correspond to flyout direction against
|
||||
// the dimension point line
|
||||
|
||||
@ -204,7 +204,7 @@ void MeasureGUI_DistanceDlg::enterEvent(QEvent*)
|
||||
//=================================================================================
|
||||
void MeasureGUI_DistanceDlg::SolutionSelected (int i)
|
||||
{
|
||||
if (i < 0 || myDbls->length() < (i+1)*6) {
|
||||
if (i < 0 || (int)myDbls->length() < (i+1)*6) {
|
||||
myGrp->LineEdit3->setText("");
|
||||
myGrp->LineEdit4->setText("");
|
||||
myGrp->LineEdit5->setText("");
|
||||
@ -341,7 +341,7 @@ SALOME_Prs* MeasureGUI_DistanceDlg::buildPrs()
|
||||
int currSol = myGrp->ComboBox1->currentIndex();
|
||||
|
||||
if (!myObj1 || !myObj2 ||
|
||||
currSol == -1 || (currSol+1)*6 > myDbls->length() ||
|
||||
currSol == -1 || (currSol+1)*6 > (int)myDbls->length() ||
|
||||
vw->getViewManager()->getType() != OCCViewer_Viewer::Type())
|
||||
return 0;
|
||||
|
||||
|
||||
@ -64,7 +64,7 @@
|
||||
// class : MeasureGUI_ShapeStatisticsDlg()
|
||||
//===========================================================================
|
||||
MeasureGUI_ShapeStatisticsDlg::MeasureGUI_ShapeStatisticsDlg( QWidget* parent, TopoDS_Shape aShape, TopAbs_ShapeEnum aSubShapeType )
|
||||
: GEOMBase_Helper( SUIT_Session::session()->activeApplication()->desktop() ),
|
||||
: GEOMBase_Helper( SUIT_Session::session()->activeApplication()->desktop() ),
|
||||
QDialog( parent ),
|
||||
myHistogram ( 0 )
|
||||
{
|
||||
@ -333,9 +333,9 @@ TopAbs_ShapeEnum MeasureGUI_ShapeStatisticsDlg::currentType()
|
||||
bool MeasureGUI_ShapeStatisticsDlg::isValid(QString& theMessage)
|
||||
{
|
||||
if ( myScalarRangeBox->isChecked() ) {
|
||||
RETURN_WITH_MSG( !myMin->text().isEmpty(), tr("GEOM_SHAPE_STATISTICS_MIN_ERROR") )
|
||||
RETURN_WITH_MSG( !myMax->text().isEmpty(), tr("GEOM_SHAPE_STATISTICS_MAX_ERROR") )
|
||||
RETURN_WITH_MSG( myMin->text().toDouble() <= myMax->text().toDouble(), tr("GEOM_SHAPE_STATISTICS_MIN_MAX_ERROR") )
|
||||
RETURN_WITH_MSG( !myMin->text().isEmpty(), tr("GEOM_SHAPE_STATISTICS_MIN_ERROR") );
|
||||
RETURN_WITH_MSG( !myMax->text().isEmpty(), tr("GEOM_SHAPE_STATISTICS_MAX_ERROR") );
|
||||
RETURN_WITH_MSG( myMin->text().toDouble() <= myMax->text().toDouble(), tr("GEOM_SHAPE_STATISTICS_MIN_MAX_ERROR") );
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -209,7 +209,7 @@ void GEOM_Annotation::SetAttachPoint( const gp_Pnt& thePoint )
|
||||
|
||||
// =======================================================================
|
||||
// function : SetHilightShape
|
||||
// purpose : Sets shape (annotated shape) that will be used for hilighting.
|
||||
// purpose : Sets shape (annotated shape) that will be used for highlighting.
|
||||
// =======================================================================
|
||||
void GEOM_Annotation::SetHilightShape( const TopoDS_Shape& theShape )
|
||||
{
|
||||
|
||||
@ -122,10 +122,10 @@ public:
|
||||
//! Returns attachment point of extension line.
|
||||
const gp_Pnt& GetAttachPoint() const { return myAttach; }
|
||||
|
||||
//! Sets shape (annotated shape) that will be used for hilighting.
|
||||
//! Sets shape (annotated shape) that will be used for highlighting.
|
||||
Standard_EXPORT void SetHilightShape( const TopoDS_Shape& theShape );
|
||||
|
||||
//! Returns the hilighting shape.
|
||||
//! Returns the highlighting shape.
|
||||
const TopoDS_Shape HilightShape() const { return myShape; }
|
||||
|
||||
public:
|
||||
@ -283,10 +283,10 @@ private:
|
||||
gp_Pnt myStartPosition; //!< Position before starting dragging operation.
|
||||
Standard_Boolean myIsScreenFixed; //!< Flag indicating whether "screen fixed" positioning mode is turned on or off.
|
||||
Standard_Boolean myIsAutoHide; //!< Flag indicating whether "auto-hiding" option is turned on.
|
||||
Standard_Boolean myIsDepthCulling; //!< Flag indiciating whether the "depth culling" is turned on.
|
||||
Standard_Boolean myIsDepthCulling; //!< Flag indicating whether the "depth culling" is turned on.
|
||||
HighlightMode myHilightMode; //!< Highlight mode for presentation.
|
||||
TCollection_ExtendedString myText; //!< Text string of the label presentation.
|
||||
TopoDS_Shape myShape; //!< Hilighting shape.
|
||||
TopoDS_Shape myShape; //!< Highlighting shape.
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@ -45,7 +45,7 @@ namespace
|
||||
GEOM::shape_type maxShapeType(const GEOM::ListOfGO& objs)
|
||||
{
|
||||
GEOM::shape_type r = GEOM::SHAPE;
|
||||
for ( int i = 0; i < objs.length(); i++ ) {
|
||||
for ( CORBA::ULong i = 0; i < objs.length(); i++ ) {
|
||||
GEOM::shape_type t = objs[i]->GetShapeType();
|
||||
if ( t == GEOM::COMPOUND || t == GEOM::COMPSOLID )
|
||||
t = objs[i]->GetMaxShapeType();
|
||||
@ -412,7 +412,7 @@ QList<GEOM::GeomObjPtr> OperationGUI_GetSharedShapesDlg::getSourceObjects()
|
||||
{
|
||||
QList<GEOM::GeomObjPtr> res;
|
||||
GEOM::ListOfGO aListPtr(myListShapes);
|
||||
for (int i = 0; i < aListPtr.length(); i++) {
|
||||
for (CORBA::ULong i = 0; i < aListPtr.length(); i++) {
|
||||
GEOM::GeomObjPtr aGeomObjPtr(aListPtr[i]);
|
||||
res << aGeomObjPtr;
|
||||
}
|
||||
|
||||
@ -842,7 +842,7 @@ GEOM::string_array* RepairGUI_ShapeProcessDlg::getParameters( const GEOM::string
|
||||
for ( i = 0, j = 0; i < theOperators.length(); i++ )
|
||||
j += myValMap[ QString( theOperators[i].in() ) ].size();
|
||||
|
||||
// set the new length of paremeters
|
||||
// set the new length of parameters
|
||||
aParams->length( j );
|
||||
|
||||
// fill the parameters
|
||||
|
||||
@ -74,7 +74,7 @@ private:
|
||||
|
||||
QWidget* getControl( const QString& );
|
||||
void setValue( QWidget*, const QString& ); // initialize the given control in the proper way
|
||||
// (analize its class and convert the value string)
|
||||
// (analyze its class and convert the value string)
|
||||
QString getValue( QWidget* ) const; // retrieve value of the control in the proper way
|
||||
QString getText( QWidget* ) const; // retrieve text of the control (for spin-boxes only)
|
||||
|
||||
|
||||
@ -594,8 +594,8 @@ void Sketcher_Profile::ShapeFunctor::addSegmentAbsolute( const TCollection_Ascii
|
||||
|
||||
/*!
|
||||
\brief Add segment by relativ coordinates
|
||||
\param dx dX value specifing segment end
|
||||
\param dy dY value specifing segment end
|
||||
\param dx dX value specifying segment end
|
||||
\param dy dY value specifying segment end
|
||||
\internal
|
||||
*/
|
||||
void Sketcher_Profile::ShapeFunctor::addSegmentRelative( const TCollection_AsciiString& dx,
|
||||
@ -801,8 +801,8 @@ void Sketcher_Profile::ShapeFunctor::addArcAbsolute( const TCollection_AsciiStri
|
||||
|
||||
/*!
|
||||
\brief Add arc along current direction vector by specified relative coordinates
|
||||
\param dx dX value specifing arc end
|
||||
\param dy dY value specifing arc end
|
||||
\param dx dX value specifying arc end
|
||||
\param dy dY value specifying arc end
|
||||
\internal
|
||||
*/
|
||||
void Sketcher_Profile::ShapeFunctor::addArcRelative( const TCollection_AsciiString& dx,
|
||||
@ -867,8 +867,8 @@ void Sketcher_Profile::ShapeFunctor::addArcRadiusAbsolute( const TCollection_Asc
|
||||
|
||||
/*!
|
||||
\brief Add arc with given radius by specified relative coordinates
|
||||
\param dx dX value specifing arc end
|
||||
\param dy dY value specifing arc end
|
||||
\param dx dX value specifying arc end
|
||||
\param dy dY value specifying arc end
|
||||
\param radius arc radius
|
||||
\param flag reverse direction flag
|
||||
\internal
|
||||
@ -958,8 +958,8 @@ void Sketcher_Profile::ShapeFunctor::addArcCenterAbsolute( const TCollection_Asc
|
||||
|
||||
/*!
|
||||
\brief Add arc with given center by specified relative coordinates
|
||||
\param dx dX value specifing arc end
|
||||
\param dy dY value specifing arc end
|
||||
\param dx dX value specifying arc end
|
||||
\param dy dY value specifying arc end
|
||||
\param xc X coordinate of arc center
|
||||
\param yc Y coordinate of arc center
|
||||
\param flag1 reverse direction flag
|
||||
@ -1351,8 +1351,8 @@ void Sketcher_Profile::DumpFunctor::addSegmentAbsolute( const TCollection_AsciiS
|
||||
|
||||
/*!
|
||||
\brief Add segment by relativ coordinates
|
||||
\param dx dX value specifing segment end
|
||||
\param dy dY value specifing segment end
|
||||
\param dx dX value specifying segment end
|
||||
\param dy dY value specifying segment end
|
||||
\internal
|
||||
*/
|
||||
void Sketcher_Profile::DumpFunctor::addSegmentRelative( const TCollection_AsciiString& dx,
|
||||
@ -1531,8 +1531,8 @@ void Sketcher_Profile::DumpFunctor::addArcAbsolute( const TCollection_AsciiStrin
|
||||
|
||||
/*!
|
||||
\brief Add arc along current direction vector by specified relative coordinates
|
||||
\param dx dX value specifing arc end
|
||||
\param dy dY value specifing arc end
|
||||
\param dx dX value specifying arc end
|
||||
\param dy dY value specifying arc end
|
||||
\internal
|
||||
*/
|
||||
void Sketcher_Profile::DumpFunctor::addArcRelative( const TCollection_AsciiString& dx,
|
||||
@ -1561,8 +1561,8 @@ void Sketcher_Profile::DumpFunctor::addArcRadiusAbsolute( const TCollection_Asci
|
||||
|
||||
/*!
|
||||
\brief Add arc with given radius by specified relative coordinates
|
||||
\param dx dX value specifing arc end
|
||||
\param dy dY value specifing arc end
|
||||
\param dx dX value specifying arc end
|
||||
\param dy dY value specifying arc end
|
||||
\param radius arc radius
|
||||
\param flag reverse direction flag
|
||||
\internal
|
||||
@ -1599,8 +1599,8 @@ void Sketcher_Profile::DumpFunctor::addArcCenterAbsolute( const TCollection_Asci
|
||||
|
||||
/*!
|
||||
\brief Add arc with given center by specified relative coordinates
|
||||
\param dx dX value specifing arc end
|
||||
\param dy dY value specifing arc end
|
||||
\param dx dX value specifying arc end
|
||||
\param dy dY value specifying arc end
|
||||
\param xc X coordinate of arc center
|
||||
\param yc Y coordinate of arc center
|
||||
\param flag1 reverse direction flag
|
||||
|
||||
@ -47,7 +47,7 @@ class ShHealOper_CloseContour : public ShHealOper_Tool
|
||||
Standard_EXPORT ShHealOper_CloseContour() : ShHealOper_Tool() {}
|
||||
|
||||
Standard_EXPORT ShHealOper_CloseContour (const TopoDS_Shape& theShape);
|
||||
//Initalizes by whole shape.
|
||||
//Initializes by whole shape.
|
||||
|
||||
Standard_EXPORT virtual void Init(const TopoDS_Shape& theShape);
|
||||
//Method for initialization by whole shape.
|
||||
|
||||
@ -261,7 +261,7 @@ Standard_Boolean ShHealOper_EdgeDivide::computeValues(const Handle(TColStd_HSequ
|
||||
|
||||
Standard_Real aFirst =0.,aLast=0.;
|
||||
|
||||
//computation of the split values if edge should be splitted by parameter.
|
||||
//computation of the split values if edge should be split by parameter.
|
||||
if(myDivideParamMode) {
|
||||
BRep_Tool::Range(myEdge,aFirst,aLast);
|
||||
Handle(Geom_Curve) aCurve = BRep_Tool::Curve(myEdge,aFirst,aLast);
|
||||
@ -275,7 +275,7 @@ Standard_Boolean ShHealOper_EdgeDivide::computeValues(const Handle(TColStd_HSequ
|
||||
}
|
||||
}
|
||||
else {
|
||||
//computation of the split values if edge should be splitted by length.
|
||||
//computation of the split values if edge should be split by length.
|
||||
ShapeAnalysis_Edge sae;
|
||||
Handle(Geom_Curve) aCurve;
|
||||
Standard_Real aCurLen =0.;
|
||||
|
||||
@ -56,7 +56,7 @@ class ShHealOper_EdgeDivide : public ShHealOper_Tool
|
||||
const Standard_Boolean theDivideParamMode = Standard_True);
|
||||
//Performs spitting of the specified edge in the accoradnce to
|
||||
//specified mode and value.
|
||||
//If theDivideParamMode is equal to true edge will be splitted by parameter.
|
||||
//If theDivideParamMode is equal to true edge will be split by parameter.
|
||||
//Else edge will be spliited by length (default true).
|
||||
//theValue is coefficient for splitting from 0 to 1.
|
||||
|
||||
|
||||
@ -47,7 +47,7 @@ class ShHealOper_ShapeProcess : public ShHealOper_Tool
|
||||
|
||||
/// Empty constructor
|
||||
Standard_EXPORT ShHealOper_ShapeProcess();
|
||||
//Constuctor initializes by defaults parameters
|
||||
//Constructor initializes by defaults parameters
|
||||
// (name of resource file - ShHealing, prefix - ShapeProcess,
|
||||
// SaveHistory = Standard_False, level = TopAbs_FACE)
|
||||
|
||||
@ -55,7 +55,7 @@ class ShHealOper_ShapeProcess : public ShHealOper_Tool
|
||||
Standard_EXPORT ShHealOper_ShapeProcess
|
||||
(const TCollection_AsciiString& theNameResource,
|
||||
const TCollection_AsciiString& thePrefix = "ShapeProcess");
|
||||
//Constuctor initializes by specified name of resource file and prefix
|
||||
//Constructor initializes by specified name of resource file and prefix
|
||||
|
||||
Standard_EXPORT void Perform(const TopoDS_Shape& theOldShape,
|
||||
TopoDS_Shape& theNewShape);
|
||||
|
||||
@ -148,7 +148,7 @@ void TransformationGUI_OffsetDlg::ClickOnOk()
|
||||
//=================================================================================
|
||||
bool TransformationGUI_OffsetDlg::ClickOnApply()
|
||||
{
|
||||
if ( !onAccept( GroupPoints->CheckButton1->isChecked() ) )
|
||||
if ( !onAccept( /*copy=*/true ))
|
||||
return false;
|
||||
|
||||
initName();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user