diff --git a/dox/user_guides/iges/iges.md b/dox/user_guides/iges/iges.md index 07ea44339e..914cdacbe4 100644 --- a/dox/user_guides/iges/iges.md +++ b/dox/user_guides/iges/iges.md @@ -329,7 +329,7 @@ faces = Reader.GiveList(“xst-type(!=SurfaceOfRevolution)”); * *iges-visible-transf-roots* -- selects all visible and translatable roots. * *iges-blanked-roots* -- selects all blank roots, whether translatable or not. * *iges-blanked-transf-roots* -- selects all blank and translatable roots. - * *iges-status-independant* -- selects entities whose IGES Subordinate Status = 0. + * *iges-status-independent* -- selects entities whose IGES Subordinate Status = 0. * *iges-bypass-group* -- selects all root entities. If a root entity is a group (402/7 or 402/9), the entities in the group are selected. * *iges-bypass-subfigure* -- selects all root entities. If a root entity is a subfigure definition (308), the entities in the subfigure definition are selected. * *iges-bypass-group-subfigure* -- selects all root entities. If a root entity is a group (402/7 or 402/9) or a subfigure definition (308), the entities in the group and in the subfigure definition are selected. diff --git a/dox/user_guides/visualization/visualization.md b/dox/user_guides/visualization/visualization.md index 0b88dc1f87..066340a8b8 100644 --- a/dox/user_guides/visualization/visualization.md +++ b/dox/user_guides/visualization/visualization.md @@ -574,7 +574,7 @@ It is possible to make this declaration in one of two ways: * Initially by using one of the values of the enumeration *PrsMgr_TypeOfPresentation3d*: * *PrsMgr_TOP_AllView*, - * *PrsMgr_TOP_ProjectorDependant* + * *PrsMgr_TOP_ProjectorDependent* * Later by using the function *PrsMgr_PresentableObject::SetTypeOfPresentation* diff --git a/samples/ios/UIKitSample/UIKitSample/OcctViewer.h b/samples/ios/UIKitSample/UIKitSample/OcctViewer.h index de7baa3ec0..57962aa15b 100644 --- a/samples/ios/UIKitSample/UIKitSample/OcctViewer.h +++ b/samples/ios/UIKitSample/UIKitSample/OcctViewer.h @@ -58,7 +58,7 @@ public: const Handle(V3d_View)& ActiveView() const { return myView; } //! Interactive context. - const Handle(AIS_InteractiveContext)& AisContex() const { return myContext; } + const Handle(AIS_InteractiveContext)& AisContext() const { return myContext; } //! Invalidate active viewer. void Invalidate() diff --git a/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp b/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp index 4c1a12426d..73a0d97c9b 100755 --- a/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp +++ b/samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp @@ -9,7 +9,7 @@ IMPLEMENT_STANDARD_RTTIEXT(ISession2D_Shape,AIS_InteractiveObject) ISession2D_Shape::ISession2D_Shape () - :AIS_InteractiveObject(PrsMgr_TOP_ProjectorDependant) + :AIS_InteractiveObject(PrsMgr_TOP_ProjectorDependent) {} void ISession2D_Shape::Add(const TopoDS_Shape& aShape) diff --git a/samples/mfc/standard/Common/User_Cylinder.cxx b/samples/mfc/standard/Common/User_Cylinder.cxx index f7ecf73dda..815b73858f 100755 --- a/samples/mfc/standard/Common/User_Cylinder.cxx +++ b/samples/mfc/standard/Common/User_Cylinder.cxx @@ -28,7 +28,7 @@ IMPLEMENT_STANDARD_RTTIEXT(User_Cylinder,AIS_InteractiveObject) // User_Cylinder::User_Cylinder(const Standard_Real R, const Standard_Real H) : -AIS_InteractiveObject(PrsMgr_TOP_ProjectorDependant) +AIS_InteractiveObject(PrsMgr_TOP_ProjectorDependent) { BRepPrimAPI_MakeCylinder S(R,H); myShape = S.Shape(); @@ -38,7 +38,7 @@ AIS_InteractiveObject(PrsMgr_TOP_ProjectorDependant) } User_Cylinder::User_Cylinder(const gp_Ax2 CylAx2, const Standard_Real R, const Standard_Real H) : -AIS_InteractiveObject(PrsMgr_TOP_ProjectorDependant) +AIS_InteractiveObject(PrsMgr_TOP_ProjectorDependent) { BRepPrimAPI_MakeCylinder S(CylAx2,R,H); diff --git a/src/AIS/AIS_Shape.cxx b/src/AIS/AIS_Shape.cxx index 385fbdd4c8..076a888710 100644 --- a/src/AIS/AIS_Shape.cxx +++ b/src/AIS/AIS_Shape.cxx @@ -102,7 +102,7 @@ void AIS_Shape::replaceWithNewOwnAspects() // Purpose : //================================================== AIS_Shape::AIS_Shape(const TopoDS_Shape& theShape) -: AIS_InteractiveObject (PrsMgr_TOP_ProjectorDependant), +: AIS_InteractiveObject (PrsMgr_TOP_ProjectorDependent), myshape (theShape), myUVOrigin(0.0, 0.0), myUVRepeat(1.0, 1.0), diff --git a/src/DNaming/DNaming.cxx b/src/DNaming/DNaming.cxx index b0705f238f..63b66a71c4 100644 --- a/src/DNaming/DNaming.cxx +++ b/src/DNaming/DNaming.cxx @@ -441,8 +441,8 @@ static void LoadFirstLevel(const TopoDS_Shape& S, if (S.ShapeType() == TopAbs_COMPOUND || S.ShapeType() == TopAbs_COMPSOLID) { TopoDS_Iterator itr(S); for (; itr.More(); itr.Next()) { - TNaming_Builder bIndependantShapes(Tagger->NewChild()); - bIndependantShapes.Generated(itr.Value()); + TNaming_Builder bIndependentShapes(Tagger->NewChild()); + bIndependentShapes.Generated(itr.Value()); if (itr.Value().ShapeType() == TopAbs_COMPOUND || itr.Value().ShapeType() == TopAbs_COMPSOLID) { LoadFirstLevel(itr.Value(), Tagger); } else LoadNextLevels(itr.Value(), Tagger); diff --git a/src/DNaming/DNaming.hxx b/src/DNaming/DNaming.hxx index 001b13af86..73edfec3fc 100644 --- a/src/DNaming/DNaming.hxx +++ b/src/DNaming/DNaming.hxx @@ -93,11 +93,11 @@ public: Standard_EXPORT static Standard_Boolean ComputeSweepDir (const TopoDS_Shape& theShape, gp_Ax1& theAxis); - Standard_EXPORT static void LoadAndOrientModifiedShapes (BRepBuilderAPI_MakeShape& MakeShape, const TopoDS_Shape& ShapeIn, const TopAbs_ShapeEnum GeneratedFrom, TNaming_Builder& Buider, const TopTools_DataMapOfShapeShape& SubShapesOfResult); + Standard_EXPORT static void LoadAndOrientModifiedShapes (BRepBuilderAPI_MakeShape& MakeShape, const TopoDS_Shape& ShapeIn, const TopAbs_ShapeEnum GeneratedFrom, TNaming_Builder& Builder, const TopTools_DataMapOfShapeShape& SubShapesOfResult); - Standard_EXPORT static void LoadAndOrientGeneratedShapes (BRepBuilderAPI_MakeShape& MakeShape, const TopoDS_Shape& ShapeIn, const TopAbs_ShapeEnum GeneratedFrom, TNaming_Builder& Buider, const TopTools_DataMapOfShapeShape& SubShapesOfResult); + Standard_EXPORT static void LoadAndOrientGeneratedShapes (BRepBuilderAPI_MakeShape& MakeShape, const TopoDS_Shape& ShapeIn, const TopAbs_ShapeEnum GeneratedFrom, TNaming_Builder& Builder, const TopTools_DataMapOfShapeShape& SubShapesOfResult); - Standard_EXPORT static void LoadDeletedShapes (BRepBuilderAPI_MakeShape& MakeShape, const TopoDS_Shape& ShapeIn, const TopAbs_ShapeEnum KindOfDeletedShape, TNaming_Builder& Buider); + Standard_EXPORT static void LoadDeletedShapes (BRepBuilderAPI_MakeShape& MakeShape, const TopoDS_Shape& ShapeIn, const TopAbs_ShapeEnum KindOfDeletedShape, TNaming_Builder& Builder); Standard_EXPORT static void LoadResult (const TDF_Label& theLabel, BRepAlgoAPI_BooleanOperation& MS); diff --git a/src/PrsMgr/PrsMgr_PresentableObject.cxx b/src/PrsMgr/PrsMgr_PresentableObject.cxx index e79d10af2f..835dadb20c 100644 --- a/src/PrsMgr/PrsMgr_PresentableObject.cxx +++ b/src/PrsMgr/PrsMgr_PresentableObject.cxx @@ -237,7 +237,7 @@ void PrsMgr_PresentableObject::SetTypeOfPresentation (const PrsMgr_TypeOfPresent for (PrsMgr_Presentations::Iterator aPrsIter (myPresentations); aPrsIter.More(); aPrsIter.Next()) { const Handle(PrsMgr_Presentation)& aPrs = aPrsIter.Value(); - aPrs->SetVisual (myTypeOfPresentation3d == PrsMgr_TOP_ProjectorDependant + aPrs->SetVisual (myTypeOfPresentation3d == PrsMgr_TOP_ProjectorDependent ? Graphic3d_TOS_COMPUTED : Graphic3d_TOS_ALL); } diff --git a/src/PrsMgr/PrsMgr_Presentation.cxx b/src/PrsMgr/PrsMgr_Presentation.cxx index 6ca7cd5dcb..481f0f0f79 100644 --- a/src/PrsMgr/PrsMgr_Presentation.cxx +++ b/src/PrsMgr/PrsMgr_Presentation.cxx @@ -55,7 +55,7 @@ PrsMgr_Presentation::PrsMgr_Presentation (const Handle(PrsMgr_PresentationManage myMode (theMode), myMustBeUpdated (Standard_False) { - if (thePrsObject->TypeOfPresentation3d() == PrsMgr_TOP_ProjectorDependant) + if (thePrsObject->TypeOfPresentation3d() == PrsMgr_TOP_ProjectorDependent) { SetVisual (Graphic3d_TOS_COMPUTED); } diff --git a/src/PrsMgr/PrsMgr_TypeOfPresentation3d.hxx b/src/PrsMgr/PrsMgr_TypeOfPresentation3d.hxx index c9e94f2db1..d1643c440b 100644 --- a/src/PrsMgr/PrsMgr_TypeOfPresentation3d.hxx +++ b/src/PrsMgr/PrsMgr_TypeOfPresentation3d.hxx @@ -17,16 +17,18 @@ #ifndef _PrsMgr_TypeOfPresentation3d_HeaderFile #define _PrsMgr_TypeOfPresentation3d_HeaderFile -//! To declare the type of presentation as follows -//! - AllView for display involving no recalculation for -//! new projectors (points of view)in hidden line removal mode -//! - ProjectorDependant for display in hidden line -//! removal mode, where every new point of view -//! entails recalculation of the display. +#include + +//! The type of presentation. enum PrsMgr_TypeOfPresentation3d { -PrsMgr_TOP_AllView, -PrsMgr_TOP_ProjectorDependant + //! Presentation display involves no recalculation for new projectors (points of view) in hidden line removal mode. + PrsMgr_TOP_AllView, + //! Every new point of view entails recalculation of the display in hidden line removal mode. + PrsMgr_TOP_ProjectorDependent }; +Standard_DEPRECATED("PrsMgr_TOP_ProjectorDependent should be used instead") +const PrsMgr_TypeOfPresentation3d PrsMgr_TOP_ProjectorDependant = PrsMgr_TOP_ProjectorDependent; + #endif // _PrsMgr_TypeOfPresentation3d_HeaderFile diff --git a/src/SWDRAW/SWDRAW_ShapeAnalysis.cxx b/src/SWDRAW/SWDRAW_ShapeAnalysis.cxx index a0db2bfc86..eb267bbad3 100644 --- a/src/SWDRAW/SWDRAW_ShapeAnalysis.cxx +++ b/src/SWDRAW/SWDRAW_ShapeAnalysis.cxx @@ -469,7 +469,7 @@ static Standard_Integer XSHAPE_statshape(Draw_Interpretor& di, Standard_Integer if(argc > 3) { analyzer.ModifyBigSplineMode()=(strstr("bigspl",arg3)!=NULL); analyzer.ModifyIndirectMode()=(strstr("indsur",arg3)!=NULL); - analyzer.ModifyOffestSurfaceMode()=(strstr("ofsur",arg3)!=NULL); + analyzer.ModifyOffsetSurfaceMode()=(strstr("ofsur",arg3)!=NULL); analyzer.ModifyTrimmed3dMode()=(strstr("trc3d",arg3)!=NULL); analyzer.ModifyOffsetCurveMode()=(strstr("ofcur",arg3)!=NULL); analyzer.ModifyTrimmed2dMode()=(strstr("trc2d",arg3)!=NULL); @@ -549,7 +549,7 @@ static Standard_Integer XSHAPE_statshape(Draw_Interpretor& di, Standard_Integer DBRep::Set (nompart,sec->Value(i)); } } - if(analyzer.ModifyOffestSurfaceMode()) { + if(analyzer.ModifyOffsetSurfaceMode()) { sec = analyzer.OffsetSurfaceSec(); for(Standard_Integer i = 1; i <= sec->Length(); i++) { Sprintf(nompart,"%s_ofsur_%d",arg2,i); diff --git a/src/ShapeAnalysis/FILES b/src/ShapeAnalysis/FILES index 1c2659f379..50a8c769d3 100755 --- a/src/ShapeAnalysis/FILES +++ b/src/ShapeAnalysis/FILES @@ -26,7 +26,6 @@ ShapeAnalysis_HSequenceOfFreeBounds.hxx ShapeAnalysis_SequenceOfFreeBounds.hxx ShapeAnalysis_ShapeContents.cxx ShapeAnalysis_ShapeContents.hxx -ShapeAnalysis_ShapeContents.lxx ShapeAnalysis_ShapeTolerance.cxx ShapeAnalysis_ShapeTolerance.hxx ShapeAnalysis_Shell.cxx diff --git a/src/ShapeAnalysis/ShapeAnalysis_ShapeContents.cxx b/src/ShapeAnalysis/ShapeAnalysis_ShapeContents.cxx index 9f4199bcd4..7ddca39d35 100644 --- a/src/ShapeAnalysis/ShapeAnalysis_ShapeContents.cxx +++ b/src/ShapeAnalysis/ShapeAnalysis_ShapeContents.cxx @@ -104,7 +104,7 @@ void ShapeAnalysis_ShapeContents::ClearFlags() { myBigSplineMode = Standard_False; myIndirectMode = Standard_False; - myOffestSurfaceMode = Standard_False; + myOffsetSurfaceMode = Standard_False; myTrimmed3dMode = Standard_False; myOffsetCurveMode = Standard_False; myTrimmed2dMode = Standard_False; @@ -189,7 +189,7 @@ void ShapeAnalysis_ShapeContents::Perform(const TopoDS_Shape& Shape) } if (surf->IsKind(STANDARD_TYPE(Geom_OffsetSurface))) { myNbOffsetSurf++; - if (myOffestSurfaceMode) myOffsetSurfaceSec->Append(face); + if (myOffsetSurfaceMode) myOffsetSurfaceSec->Append(face); } else if (surf->IsKind(STANDARD_TYPE(Geom_BezierSurface))) { myNbBezierSurf++; diff --git a/src/ShapeAnalysis/ShapeAnalysis_ShapeContents.hxx b/src/ShapeAnalysis/ShapeAnalysis_ShapeContents.hxx index f4d63fb9b9..25778f4df1 100644 --- a/src/ShapeAnalysis/ShapeAnalysis_ShapeContents.hxx +++ b/src/ShapeAnalysis/ShapeAnalysis_ShapeContents.hxx @@ -47,122 +47,114 @@ public: //! Counts quantities of sun-shapes in shape and //! stores sub-shapes according to flags Standard_EXPORT void Perform (const TopoDS_Shape& shape); - + //! Returns (modifiable) the flag which defines whether to store faces //! with edges if its 3D curves has more than 8192 poles. - Standard_Boolean& ModifyBigSplineMode(); - + Standard_Boolean& ModifyBigSplineMode() { return myBigSplineMode; } + + //! Returns (modifiable) the flag which defines whether to store faces on indirect surfaces. + Standard_Boolean& ModifyIndirectMode() { return myIndirectMode; } + + //! Returns (modifiable) the flag which defines whether to store faces on offset surfaces. + Standard_Boolean& ModifyOffsetSurfaceMode() { return myOffsetSurfaceMode; } + //! Returns (modifiable) the flag which defines whether to store faces - //! on indirect surfaces - Standard_Boolean& ModifyIndirectMode(); - + //! with edges if its 3D curves are trimmed curves + Standard_Boolean& ModifyTrimmed3dMode() { return myTrimmed3dMode; } + //! Returns (modifiable) the flag which defines whether to store faces - //! on offset surfaces. - Standard_Boolean& ModifyOffestSurfaceMode(); - - //! Returns (modifiable) the flag which defines whether to store faces - //! with edges if ist 3D curves are trimmed curves - Standard_Boolean& ModifyTrimmed3dMode(); - - //! Returns (modifiable) the flag which defines whether to store faces - //! with edges if its 3D curves and pcurves are offest curves - Standard_Boolean& ModifyOffsetCurveMode(); - + //! with edges if its 3D curves and pcurves are offset curves + Standard_Boolean& ModifyOffsetCurveMode() { return myOffsetCurveMode; } + //! Returns (modifiable) the flag which defines whether to store faces //! with edges if its pcurves are trimmed curves - Standard_Boolean& ModifyTrimmed2dMode(); - - Standard_Integer NbSolids() const; - - Standard_Integer NbShells() const; - - Standard_Integer NbFaces() const; - - Standard_Integer NbWires() const; - - Standard_Integer NbEdges() const; - - Standard_Integer NbVertices() const; - - Standard_Integer NbSolidsWithVoids() const; - - Standard_Integer NbBigSplines() const; - - Standard_Integer NbC0Surfaces() const; - - Standard_Integer NbC0Curves() const; - - Standard_Integer NbOffsetSurf() const; - - Standard_Integer NbIndirectSurf() const; - - Standard_Integer NbOffsetCurves() const; - - Standard_Integer NbTrimmedCurve2d() const; - - Standard_Integer NbTrimmedCurve3d() const; - - Standard_Integer NbBSplibeSurf() const; - - Standard_Integer NbBezierSurf() const; - - Standard_Integer NbTrimSurf() const; - - Standard_Integer NbWireWitnSeam() const; - - Standard_Integer NbWireWithSevSeams() const; - - Standard_Integer NbFaceWithSevWires() const; - - Standard_Integer NbNoPCurve() const; - - Standard_Integer NbFreeFaces() const; - - Standard_Integer NbFreeWires() const; - - Standard_Integer NbFreeEdges() const; - - Standard_Integer NbSharedSolids() const; - - Standard_Integer NbSharedShells() const; - - Standard_Integer NbSharedFaces() const; - - Standard_Integer NbSharedWires() const; - - Standard_Integer NbSharedFreeWires() const; - - Standard_Integer NbSharedFreeEdges() const; - - Standard_Integer NbSharedEdges() const; - - Standard_Integer NbSharedVertices() const; - - Handle(TopTools_HSequenceOfShape) BigSplineSec() const; - - Handle(TopTools_HSequenceOfShape) IndirectSec() const; - - Handle(TopTools_HSequenceOfShape) OffsetSurfaceSec() const; - - Handle(TopTools_HSequenceOfShape) Trimmed3dSec() const; - - Handle(TopTools_HSequenceOfShape) OffsetCurveSec() const; - - Handle(TopTools_HSequenceOfShape) Trimmed2dSec() const; + Standard_Boolean& ModifyTrimmed2dMode() { return myTrimmed2dMode; } + Standard_Integer NbSolids() const { return myNbSolids; } + Standard_Integer NbShells() const { return myNbShells; } + Standard_Integer NbFaces() const { return myNbFaces; } -protected: + Standard_Integer NbWires() const { return myNbWires; } + Standard_Integer NbEdges() const { return myNbEdges; } + Standard_Integer NbVertices() const { return myNbVertices; } + Standard_Integer NbSolidsWithVoids() const { return myNbSolidsWithVoids; } + Standard_Integer NbBigSplines() const { return myNbBigSplines; } + + Standard_Integer NbC0Surfaces() const { return myNbC0Surfaces; } + + Standard_Integer NbC0Curves() const { return myNbC0Curves; } + + Standard_Integer NbOffsetSurf() const { return myNbOffsetSurf; } + + Standard_Integer NbIndirectSurf() const { return myNbIndirectSurf; } + + Standard_Integer NbOffsetCurves() const { return myNbOffsetCurves; } + + Standard_Integer NbTrimmedCurve2d() const { return myNbTrimmedCurve2d; } + + Standard_Integer NbTrimmedCurve3d() const { return myNbTrimmedCurve3d; } + + Standard_Integer NbBSplibeSurf() const { return myNbBSplibeSurf; } + + Standard_Integer NbBezierSurf() const { return myNbBezierSurf; } + + Standard_Integer NbTrimSurf() const { return myNbTrimSurf; } + + Standard_Integer NbWireWitnSeam() const { return myNbWireWitnSeam; } + + Standard_Integer NbWireWithSevSeams() const { return myNbWireWithSevSeams; } + + Standard_Integer NbFaceWithSevWires() const { return myNbFaceWithSevWires; } + + Standard_Integer NbNoPCurve() const { return myNbNoPCurve; } + + Standard_Integer NbFreeFaces() const { return myNbFreeFaces; } + + Standard_Integer NbFreeWires() const { return myNbFreeWires; } + + Standard_Integer NbFreeEdges() const { return myNbFreeEdges; } + + Standard_Integer NbSharedSolids() const { return myNbSharedSolids; } + + Standard_Integer NbSharedShells() const { return myNbSharedShells; } + + Standard_Integer NbSharedFaces() const { return myNbSharedFaces; } + + Standard_Integer NbSharedWires() const { return myNbSharedWires; } + + Standard_Integer NbSharedFreeWires() const { return myNbSharedFreeWires; } + + Standard_Integer NbSharedFreeEdges() const { return myNbSharedFreeEdges; } + + Standard_Integer NbSharedEdges() const { return myNbSharedEdges; } + + Standard_Integer NbSharedVertices() const { return myNbSharedVertices; } + + const Handle(TopTools_HSequenceOfShape)& BigSplineSec() const { return myBigSplineSec; } + + const Handle(TopTools_HSequenceOfShape)& IndirectSec() const { return myIndirectSec; } + + const Handle(TopTools_HSequenceOfShape)& OffsetSurfaceSec() const { return myOffsetSurfaceSec; } + + const Handle(TopTools_HSequenceOfShape)& Trimmed3dSec() const { return myTrimmed3dSec; } + + const Handle(TopTools_HSequenceOfShape)& OffsetCurveSec() const { return myOffsetCurveSec; } + + const Handle(TopTools_HSequenceOfShape)& Trimmed2dSec() const { return myTrimmed2dSec; } + +public: + + Standard_DEPRECATED("ModifyOffsetSurfaceMode() should be used instead") + Standard_Boolean& ModifyOffestSurfaceMode() { return myOffsetSurfaceMode; } private: - - Standard_Integer myNbSolids; Standard_Integer myNbShells; Standard_Integer myNbFaces; @@ -198,7 +190,7 @@ private: Standard_Integer myNbSharedVertices; Standard_Boolean myBigSplineMode; Standard_Boolean myIndirectMode; - Standard_Boolean myOffestSurfaceMode; + Standard_Boolean myOffsetSurfaceMode; Standard_Boolean myTrimmed3dMode; Standard_Boolean myOffsetCurveMode; Standard_Boolean myTrimmed2dMode; @@ -209,14 +201,6 @@ private: Handle(TopTools_HSequenceOfShape) myOffsetCurveSec; Handle(TopTools_HSequenceOfShape) myTrimmed2dSec; - }; - -#include - - - - - #endif // _ShapeAnalysis_ShapeContents_HeaderFile diff --git a/src/ShapeAnalysis/ShapeAnalysis_ShapeContents.lxx b/src/ShapeAnalysis/ShapeAnalysis_ShapeContents.lxx deleted file mode 100644 index 5a91a6ea77..0000000000 --- a/src/ShapeAnalysis/ShapeAnalysis_ShapeContents.lxx +++ /dev/null @@ -1,461 +0,0 @@ -// Created on: 1999-03-01 -// Created by: Pavel DURANDIN -// Copyright (c) 1999-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -//======================================================================= -//function : NbSolids -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbSolids() const -{ - return myNbSolids; -} - -//======================================================================= -//function : NbShells -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbShells() const -{ - return myNbShells; -} - -//======================================================================= -//function : NbFaces -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbFaces() const -{ - return myNbFaces; -} - -//======================================================================= -//function : NbWires -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbWires() const -{ - return myNbWires; -} - -//======================================================================= -//function : NbEdges -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbEdges() const -{ - return myNbEdges; -} - -//======================================================================= -//function : NbVertices -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbVertices() const -{ - return myNbVertices; -} - -//======================================================================= -//function : NbSolidsWithVoids -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbSolidsWithVoids() const -{ - return myNbSolidsWithVoids; -} - -//======================================================================= -//function : NbBigSplines -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbBigSplines() const -{ - return myNbBigSplines; -} - -//======================================================================= -//function : NbC0Surfaces -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbC0Surfaces() const -{ - return myNbC0Surfaces; -} - -//======================================================================= -//function : -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbC0Curves() const -{ - return myNbC0Curves; -} - -//======================================================================= -//function : NbOffsetSurf -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbOffsetSurf() const -{ - return myNbOffsetSurf; -} - -//======================================================================= -//function : NbIndirectSurf -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbIndirectSurf() const -{ - return myNbIndirectSurf; -} - -//======================================================================= -//function : NbOffsetCurves -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbOffsetCurves() const -{ - return myNbOffsetCurves; -} - -//======================================================================= -//function : NbTrimmedCurve2d -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbTrimmedCurve2d() const -{ - return myNbTrimmedCurve2d; -} - -//======================================================================= -//function : -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbTrimmedCurve3d() const -{ - return myNbTrimmedCurve3d; -} - -//======================================================================= -//function : NbBSplibeSurf -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbBSplibeSurf() const -{ - return myNbBSplibeSurf; -} - -//======================================================================= -//function : NbBezierSurf -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbBezierSurf() const -{ - return myNbBezierSurf; -} - -//======================================================================= -//function : NbTrimSurf -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbTrimSurf() const -{ - return myNbTrimSurf; -} - -//======================================================================= -//function : NbWireWitnSeam -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbWireWitnSeam() const -{ - return myNbWireWitnSeam; -} - -//======================================================================= -//function :NbWireWithSevSeams -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbWireWithSevSeams() const -{ - return myNbWireWithSevSeams; -} - -//======================================================================= -//function : NbFaceWithSevWires -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbFaceWithSevWires() const -{ - return myNbFaceWithSevWires; -} - -//======================================================================= -//function : NbNoPCurve -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbNoPCurve() const -{ - return myNbNoPCurve; -} - -//======================================================================= -//function : NbFreeFaces -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbFreeFaces() const -{ - return myNbFreeFaces; -} - -//======================================================================= -//function : NbFreeWires -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbFreeWires() const -{ - return myNbFreeWires; -} - -//======================================================================= -//function : NbFreeEdges -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbFreeEdges() const -{ - return myNbFreeEdges; -} - -//======================================================================= -//function : NbSharedSolids -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbSharedSolids() const -{ - return myNbSharedSolids; -} - -//======================================================================= -//function : NbSharedShells -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbSharedShells() const -{ - return myNbSharedShells; -} - -//======================================================================= -//function : NbSharedFaces -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbSharedFaces() const -{ - return myNbSharedFaces; -} - -//======================================================================= -//function : NbSharedWires -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbSharedWires() const -{ - return myNbSharedWires; -} - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbSharedFreeWires() const -{ - return myNbSharedFreeWires; -} - -//======================================================================= -//function : NbSharedFreeEdges -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbSharedFreeEdges() const -{ - return myNbSharedFreeEdges; -} - -//======================================================================= -//function : NbSharedEdges -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbSharedEdges() const -{ - return myNbSharedEdges; -} - -//======================================================================= -//function : NbSharedVertices -//purpose : -//======================================================================= - -inline Standard_Integer ShapeAnalysis_ShapeContents::NbSharedVertices() const -{ - return myNbSharedVertices; -} - -//======================================================================= -//function : BigSplineSec -//purpose : -//======================================================================= - -inline Handle(TopTools_HSequenceOfShape) ShapeAnalysis_ShapeContents::BigSplineSec() const -{ - return myBigSplineSec; -} - -//======================================================================= -//function : IndirectSec -//purpose : -//======================================================================= - -inline Handle(TopTools_HSequenceOfShape) ShapeAnalysis_ShapeContents::IndirectSec() const -{ - return myIndirectSec; -} - -//======================================================================= -//function : OffsetSurfaceSec -//purpose : -//======================================================================= - -inline Handle(TopTools_HSequenceOfShape) ShapeAnalysis_ShapeContents::OffsetSurfaceSec() const -{ - return myOffsetSurfaceSec; -} - -//======================================================================= -//function : Trimmed3dSec -//purpose : -//======================================================================= - -inline Handle(TopTools_HSequenceOfShape) ShapeAnalysis_ShapeContents::Trimmed3dSec() const -{ - return myTrimmed3dSec; -} - -//======================================================================= -//function : OffsetCurveSec -//purpose : -//======================================================================= - -inline Handle(TopTools_HSequenceOfShape) ShapeAnalysis_ShapeContents::OffsetCurveSec() const -{ - return myOffsetCurveSec; -} - -//======================================================================= -//function : Trimmed2dSec -//purpose : -//======================================================================= - -inline Handle(TopTools_HSequenceOfShape) ShapeAnalysis_ShapeContents::Trimmed2dSec() const -{ - return myTrimmed2dSec; -} - - -//======================================================================= -//function : ModifyBigSplineMode -//purpose : -//======================================================================= - -inline Standard_Boolean& ShapeAnalysis_ShapeContents::ModifyBigSplineMode() -{ - return myBigSplineMode; -} - -//======================================================================= -//function : ModifyIndirectMode -//purpose : -//======================================================================= - -inline Standard_Boolean& ShapeAnalysis_ShapeContents::ModifyIndirectMode() -{ - return myIndirectMode; -} - -//======================================================================= -//function : ModifyOffestSurfaceMode -//purpose : -//======================================================================= - -inline Standard_Boolean& ShapeAnalysis_ShapeContents::ModifyOffestSurfaceMode() -{ - return myOffestSurfaceMode; -} - -//======================================================================= -//function : ModifyTrimmed3dMode -//purpose : -//======================================================================= - -inline Standard_Boolean& ShapeAnalysis_ShapeContents::ModifyTrimmed3dMode() -{ - return myTrimmed3dMode; -} - -//======================================================================= -//function : ModifyOffsetCurveMode -//purpose : -//======================================================================= - -inline Standard_Boolean& ShapeAnalysis_ShapeContents::ModifyOffsetCurveMode() -{ - return myOffsetCurveMode; -} - -//======================================================================= -//function : ModifyTrimmed2dMode -//purpose : -//======================================================================= - -inline Standard_Boolean& ShapeAnalysis_ShapeContents::ModifyTrimmed2dMode() -{ - return myTrimmed2dMode; -} diff --git a/src/TopoDS/TopoDS_Builder.cxx b/src/TopoDS/TopoDS_Builder.cxx index 66a722132e..b27b941ed0 100644 --- a/src/TopoDS/TopoDS_Builder.cxx +++ b/src/TopoDS/TopoDS_Builder.cxx @@ -115,7 +115,7 @@ void TopoDS_Builder::Add (TopoDS_Shape& aShape, } } else { - throw TopoDS_FrozenShape("TopoDS_Buider::Add"); + throw TopoDS_FrozenShape("TopoDS_Builder::Add"); } } diff --git a/src/XCAFPrs/XCAFPrs_DocumentExplorer.cxx b/src/XCAFPrs/XCAFPrs_DocumentExplorer.cxx index 869a8a0538..8c3596b13f 100644 --- a/src/XCAFPrs/XCAFPrs_DocumentExplorer.cxx +++ b/src/XCAFPrs/XCAFPrs_DocumentExplorer.cxx @@ -298,10 +298,10 @@ void XCAFPrs_DocumentExplorer::initRoot() // function : initCurrent // purpose : // ======================================================================= -void XCAFPrs_DocumentExplorer::initCurrent (Standard_Boolean theIsAssmebly) +void XCAFPrs_DocumentExplorer::initCurrent (Standard_Boolean theIsAssembly) { myCurrent = XCAFPrs_DocumentNode(); - if (theIsAssmebly) + if (theIsAssembly) { if (myTop < 0) { diff --git a/src/XCAFPrs/XCAFPrs_DocumentExplorer.hxx b/src/XCAFPrs/XCAFPrs_DocumentExplorer.hxx index e2a1d3e8f7..fca18f4dd1 100644 --- a/src/XCAFPrs/XCAFPrs_DocumentExplorer.hxx +++ b/src/XCAFPrs/XCAFPrs_DocumentExplorer.hxx @@ -161,7 +161,7 @@ protected: Standard_EXPORT void initRoot(); //! Initialize properties for a current label. - Standard_EXPORT void initCurrent (Standard_Boolean theIsAssmebly); + Standard_EXPORT void initCurrent (Standard_Boolean theIsAssembly); protected: diff --git a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDatum.cxx b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDatum.cxx index a418c9f136..9eb4009d56 100644 --- a/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDatum.cxx +++ b/tools/DFBrowserPaneXDE/DFBrowserPaneXDE_XCAFDocDatum.cxx @@ -41,11 +41,11 @@ void DFBrowserPaneXDE_XCAFDocDatum::GetValues (const Handle(TDF_Attribute)& theA Handle(TCollection_HAsciiString) aName = anAttr->GetName(); Handle(TCollection_HAsciiString) aDescription = anAttr->GetDescription(); - Handle(TCollection_HAsciiString) anIndentification = anAttr->GetIdentification(); + Handle(TCollection_HAsciiString) anIdentification = anAttr->GetIdentification(); theValues << "Name" << (!aName.IsNull() ? aName->ToCString() : QString ("")) << "Description" << (!aDescription.IsNull() ? aDescription->ToCString() : QString ("")) - << "Identification" << (!anIndentification.IsNull() ? anIndentification->ToCString() : QString ("")); + << "Identification" << (!anIdentification.IsNull() ? anIdentification->ToCString() : QString ("")); Handle(XCAFDimTolObjects_DatumObject) anObject = anAttr->GetObject(); Handle(TCollection_HAsciiString) anObjectName;