diff --git a/src/BRepFeat/BRepFeat_Form.cxx b/src/BRepFeat/BRepFeat_Form.cxx index b30dc8d0f7..e749670164 100644 --- a/src/BRepFeat/BRepFeat_Form.cxx +++ b/src/BRepFeat/BRepFeat_Form.cxx @@ -1015,7 +1015,11 @@ static void Descendants(const TopoDS_Shape&, Standard_Boolean BRepFeat_Form::IsDeleted(const TopoDS_Shape& F) { - return (myMap(F).IsEmpty()); + if (myMap.IsBound(F)) + { + return (myMap(F).IsEmpty()); + } + return Standard_False; } //======================================================================= @@ -1026,16 +1030,23 @@ Standard_Boolean BRepFeat_Form::IsDeleted(const TopoDS_Shape& F) const TopTools_ListOfShape& BRepFeat_Form::Modified (const TopoDS_Shape& F) { + myGenerated.Clear(); + if (!IsDone()) + return myGenerated; + + if (mySbase.IsEqual(F)) + { + myGenerated.Append(myShape); + return myGenerated; + } + if (myMap.IsBound(F)) { - static TopTools_ListOfShape list; - list.Clear(); // For the second passage DPF TopTools_ListIteratorOfListOfShape ite(myMap(F)); for(; ite.More(); ite.Next()) { const TopoDS_Shape& sh = ite.Value(); - if(!sh.IsSame(F)) - list.Append(sh); + if(!sh.IsSame(F) && sh.ShapeType() == F.ShapeType()) + myGenerated.Append(sh); } - return list; } return myGenerated; // empty list } @@ -1048,19 +1059,20 @@ const TopTools_ListOfShape& BRepFeat_Form::Modified const TopTools_ListOfShape& BRepFeat_Form::Generated (const TopoDS_Shape& S) { - if (myMap.IsBound(S) && - S.ShapeType() != TopAbs_FACE) { // check if filter on face or not - static TopTools_ListOfShape list; - list.Clear(); // For the second passage DPF + myGenerated.Clear(); + if (!IsDone()) + return myGenerated; + if (myMap.IsBound(S) && + S.ShapeType() != TopAbs_FACE) { // check if filter on face or not TopTools_ListIteratorOfListOfShape ite(myMap(S)); for(; ite.More(); ite.Next()) { const TopoDS_Shape& sh = ite.Value(); if(!sh.IsSame(S)) - list.Append(sh); + myGenerated.Append(sh); } - return list; + return myGenerated; } - else return myGenerated; + return myGenerated; } diff --git a/src/BRepTest/BRepTest_FeatureCommands.cxx b/src/BRepTest/BRepTest_FeatureCommands.cxx index 568bc68db9..1cf6dbcdc1 100644 --- a/src/BRepTest/BRepTest_FeatureCommands.cxx +++ b/src/BRepTest/BRepTest_FeatureCommands.cxx @@ -85,6 +85,10 @@ static BRepFeat_MakePipe thePipe; static BRepFeat_MakeLinearForm theLF; static BRepFeat_MakeRevolutionForm theRF; +//Input shapes for Prism, DPrism, Revol, Pipe +static TopoDS_Shape theSbase, thePbase; +static TopoDS_Face theSkface; + static Standard_Boolean dprdef = Standard_False; static Standard_Boolean prdef = Standard_False; static Standard_Boolean rvdef = Standard_False; @@ -94,8 +98,8 @@ static Standard_Boolean rfdef = Standard_False; static Standard_Real t3d = 1.e-4; static Standard_Real t2d = 1.e-5; -static Standard_Real ta = 1.e-2; -static Standard_Real fl = 1.e-3; +static Standard_Real ta = 1.e-2; +static Standard_Real fl = 1.e-3; static Standard_Real tapp_angle = 1.e-2; static GeomAbs_Shape blend_cont = GeomAbs_C1; static BRepFilletAPI_MakeFillet* Rakk = 0; @@ -103,7 +107,7 @@ static BRepFilletAPI_MakeFillet* Rakk = 0; static void Print(Draw_Interpretor& di, - const BRepFeat_Status St) + const BRepFeat_Status St) { di << " Error Status : "; switch (St) { @@ -122,17 +126,17 @@ static void Print(Draw_Interpretor& di, } static Standard_Integer Loc(Draw_Interpretor& theCommands, - Standard_Integer narg, const char** a) + Standard_Integer narg, const char** a) { - if (narg<6) return 1; + if (narg < 6) return 1; TopoDS_Shape S = DBRep::Get(a[2]); TopoDS_Shape T = DBRep::Get(a[3]); Standard_Boolean Fuse; - if (!strcasecmp("F",a[4])) { + if (!strcasecmp("F", a[4])) { Fuse = Standard_True; } - else if (!strcasecmp("C",a[4])) { + else if (!strcasecmp("C", a[4])) { Fuse = Standard_False; } else { @@ -140,10 +144,10 @@ static Standard_Integer Loc(Draw_Interpretor& theCommands, } TopTools_ListOfShape LF; - for (Standard_Integer i=0; i<= narg-6; i++) { - TopoDS_Shape aLocalShape(DBRep::Get(a[i+5],TopAbs_FACE)); + for (Standard_Integer i = 0; i <= narg - 6; i++) { + TopoDS_Shape aLocalShape(DBRep::Get(a[i + 5], TopAbs_FACE)); LF.Append(aLocalShape); -// LF.Append(TopoDS::Face(DBRep::Get(a[i+5],TopAbs_FACE))); + // LF.Append(TopoDS::Face(DBRep::Get(a[i+5],TopAbs_FACE))); } //BRepFeat_LocalOperation BLoc(S); @@ -151,7 +155,7 @@ static Standard_Integer Loc(Draw_Interpretor& theCommands, //BLoc.BuildPartsOfTool(); TopTools_ListOfShape parts; BRepFeat_Builder BLoc; - BLoc.Init(S,T); + BLoc.Init(S, T); BLoc.SetOperation(Fuse); //BRepFeat_LocalOperation BLoc; //BLoc.Init(S,T,Fuse); @@ -160,7 +164,7 @@ static Standard_Integer Loc(Draw_Interpretor& theCommands, #if 0 char newname[1024]; - strcpy(newname,a[1]); + strcpy(newname, a[1]); char* p = newname; while (*p != '\0') p++; *p = '_'; @@ -170,20 +174,20 @@ static Standard_Integer Loc(Draw_Interpretor& theCommands, i = 0; for (; its.More(); its.Next()) { i++; - Sprintf(p,"%d",i); - DBRep::Set(newname,its.Value()); + Sprintf(p, "%d", i); + DBRep::Set(newname, its.Value()); } if (i >= 2) { dout.Flush(); - Standard_Integer qq,ww,ee,button; + Standard_Integer qq, ww, ee, button; TopoDS_Shell S; do { - TopoDS_Shape aLocalShape(DBRep::Get(".",TopAbs_SHELL)); + TopoDS_Shape aLocalShape(DBRep::Get(".", TopAbs_SHELL)); S = TopoDS::Shell(aLocalShape); -// S = TopoDS::Shell(DBRep::Get(".",TopAbs_SHELL)); - Draw::LastPick(qq,ww,ee,button); + // S = TopoDS::Shell(DBRep::Get(".",TopAbs_SHELL)); + Draw::LastPick(qq, ww, ee, button); if (!S.IsNull()) { - + switch (button) { case 1: //BLoc.RemovePart(S); @@ -192,7 +196,7 @@ static Standard_Integer Loc(Draw_Interpretor& theCommands, BLoc.KeepPart(S); break; default: - {} + {} } } else { @@ -204,131 +208,131 @@ static Standard_Integer Loc(Draw_Interpretor& theCommands, #endif BLoc.PerformResult(); if (!BLoc.HasErrors()) { -// dout.Clear(); - DBRep::Set(a[1],BLoc.Shape()); + // dout.Clear(); + DBRep::Set(a[1], BLoc.Shape()); dout.Flush(); return 0; } - theCommands << "Local operation not done" ; + theCommands << "Local operation not done"; return 1; } static Standard_Integer HOLE1(Draw_Interpretor& theCommands, - Standard_Integer narg, const char** a) + Standard_Integer narg, const char** a) { - if (narg<10 || narg == 11) return 1; + if (narg < 10 || narg == 11) return 1; TopoDS_Shape S = DBRep::Get(a[2]); - gp_Pnt Or(Draw::Atof(a[3]),Draw::Atof(a[4]),Draw::Atof(a[5])); - gp_Dir Di(Draw::Atof(a[6]),Draw::Atof(a[7]),Draw::Atof(a[8])); + gp_Pnt Or(Draw::Atof(a[3]), Draw::Atof(a[4]), Draw::Atof(a[5])); + gp_Dir Di(Draw::Atof(a[6]), Draw::Atof(a[7]), Draw::Atof(a[8])); Standard_Real Radius = Draw::Atof(a[9]); - theHole.Init(S,gp_Ax1(Or,Di)); + theHole.Init(S, gp_Ax1(Or, Di)); if (narg <= 10) { theHole.Perform(Radius); } else { Standard_Real pfrom = Draw::Atof(a[10]); - Standard_Real pto = Draw::Atof(a[11]); - theHole.Perform(Radius,pfrom,pto,WithControl); + Standard_Real pto = Draw::Atof(a[11]); + theHole.Perform(Radius, pfrom, pto, WithControl); } theHole.Build(); if (!theHole.HasErrors()) { -// dout.Clear(); - DBRep::Set(a[1],theHole.Shape()); + // dout.Clear(); + DBRep::Set(a[1], theHole.Shape()); dout.Flush(); return 0; } theCommands << "Echec de MakeCylindricalHole"; - Print(theCommands,theHole.Status()); + Print(theCommands, theHole.Status()); return 1; } static Standard_Integer HOLE2(Draw_Interpretor& theCommands, - Standard_Integer narg, const char** a) + Standard_Integer narg, const char** a) { - if (narg<10) return 1; + if (narg < 10) return 1; TopoDS_Shape S = DBRep::Get(a[2]); - gp_Pnt Or(Draw::Atof(a[3]),Draw::Atof(a[4]),Draw::Atof(a[5])); - gp_Dir Di(Draw::Atof(a[6]),Draw::Atof(a[7]),Draw::Atof(a[8])); + gp_Pnt Or(Draw::Atof(a[3]), Draw::Atof(a[4]), Draw::Atof(a[5])); + gp_Dir Di(Draw::Atof(a[6]), Draw::Atof(a[7]), Draw::Atof(a[8])); Standard_Real Radius = Draw::Atof(a[9]); - theHole.Init(S,gp_Ax1(Or,Di)); - theHole.PerformThruNext(Radius,WithControl); + theHole.Init(S, gp_Ax1(Or, Di)); + theHole.PerformThruNext(Radius, WithControl); theHole.Build(); if (!theHole.HasErrors()) { -// dout.Clear(); - DBRep::Set(a[1],theHole.Shape()); + // dout.Clear(); + DBRep::Set(a[1], theHole.Shape()); dout.Flush(); return 0; } theCommands << "Echec de MakeCylindricalHole"; - Print(theCommands,theHole.Status()); + Print(theCommands, theHole.Status()); return 1; } static Standard_Integer HOLE3(Draw_Interpretor& theCommands, - Standard_Integer narg, const char** a) + Standard_Integer narg, const char** a) { - if (narg<10) return 1; + if (narg < 10) return 1; TopoDS_Shape S = DBRep::Get(a[2]); - gp_Pnt Or(Draw::Atof(a[3]),Draw::Atof(a[4]),Draw::Atof(a[5])); - gp_Dir Di(Draw::Atof(a[6]),Draw::Atof(a[7]),Draw::Atof(a[8])); + gp_Pnt Or(Draw::Atof(a[3]), Draw::Atof(a[4]), Draw::Atof(a[5])); + gp_Dir Di(Draw::Atof(a[6]), Draw::Atof(a[7]), Draw::Atof(a[8])); Standard_Real Radius = Draw::Atof(a[9]); - theHole.Init(S,gp_Ax1(Or,Di)); - theHole.PerformUntilEnd(Radius,WithControl); + theHole.Init(S, gp_Ax1(Or, Di)); + theHole.PerformUntilEnd(Radius, WithControl); theHole.Build(); if (!theHole.HasErrors()) { -// dout.Clear(); - DBRep::Set(a[1],theHole.Shape()); + // dout.Clear(); + DBRep::Set(a[1], theHole.Shape()); dout.Flush(); return 0; } theCommands << "Echec de MakeCylindricalHole"; - Print(theCommands,theHole.Status()); + Print(theCommands, theHole.Status()); return 1; } static Standard_Integer HOLE4(Draw_Interpretor& theCommands, - Standard_Integer narg, const char** a) + Standard_Integer narg, const char** a) { - if (narg<11) return 1; + if (narg < 11) return 1; TopoDS_Shape S = DBRep::Get(a[2]); - gp_Pnt Or(Draw::Atof(a[3]),Draw::Atof(a[4]),Draw::Atof(a[5])); - gp_Dir Di(Draw::Atof(a[6]),Draw::Atof(a[7]),Draw::Atof(a[8])); + gp_Pnt Or(Draw::Atof(a[3]), Draw::Atof(a[4]), Draw::Atof(a[5])); + gp_Dir Di(Draw::Atof(a[6]), Draw::Atof(a[7]), Draw::Atof(a[8])); Standard_Real Radius = Draw::Atof(a[9]); Standard_Real Length = Draw::Atof(a[10]); - theHole.Init(S,gp_Ax1(Or,Di)); - theHole.PerformBlind(Radius,Length,WithControl); + theHole.Init(S, gp_Ax1(Or, Di)); + theHole.PerformBlind(Radius, Length, WithControl); theHole.Build(); if (!theHole.HasErrors()) { -// dout.Clear(); - DBRep::Set(a[1],theHole.Shape()); + // dout.Clear(); + DBRep::Set(a[1], theHole.Shape()); dout.Flush(); return 0; } theCommands << "Echec de MakeCylindricalHole"; - Print(theCommands,theHole.Status()); + Print(theCommands, theHole.Status()); return 1; } static Standard_Integer CONTROL(Draw_Interpretor& theCommands, - Standard_Integer narg, const char** a) + Standard_Integer narg, const char** a) { if (narg >= 2) { WithControl = strcmp("0", a[1]) != 0; @@ -347,40 +351,40 @@ static Standard_Integer CONTROL(Draw_Interpretor& theCommands, //purpose : Print state of offset operation by error code. //======================================================================= static void reportOffsetState(Draw_Interpretor& theCommands, - const BRepOffset_Error theErrorCode) + const BRepOffset_Error theErrorCode) { - switch(theErrorCode) + switch (theErrorCode) { case BRepOffset_NoError: - { - theCommands << "OK. Offset performed succesfully."; - break; - } + { + theCommands << "OK. Offset performed succesfully."; + break; + } case BRepOffset_BadNormalsOnGeometry: - { - theCommands << "ERROR. Degenerated normal on input data."; - break; - } + { + theCommands << "ERROR. Degenerated normal on input data."; + break; + } case BRepOffset_C0Geometry: - { - theCommands << "ERROR. C0 continuity of input data."; - break; - } + { + theCommands << "ERROR. C0 continuity of input data."; + break; + } case BRepOffset_NullOffset: - { - theCommands << "ERROR. Null offset of all faces."; - break; - } + { + theCommands << "ERROR. Null offset of all faces."; + break; + } case BRepOffset_NotConnectedShell: - { - theCommands << "ERROR. Incorrect set of faces to remove, the remaining shell is not connected."; - break; - } + { + theCommands << "ERROR. Incorrect set of faces to remove, the remaining shell is not connected."; + break; + } default: - { - theCommands << "ERROR. offsetperform operation not done."; - break; - } + { + theCommands << "ERROR. offsetperform operation not done."; + break; + } } } @@ -390,13 +394,13 @@ static void reportOffsetState(Draw_Interpretor& theCommands, //======================================================================= static Standard_Integer PRW(Draw_Interpretor& theCommands, - Standard_Integer narg, const char** a) + Standard_Integer narg, const char** a) { - if (narg<9) return 1; + if (narg < 9) return 1; TopoDS_Shape S = DBRep::Get(a[3]); BRepFeat_MakePrism thePFace; gp_Vec V; - TopoDS_Shape FFrom,FUntil; + TopoDS_Shape FFrom, FUntil; Standard_Integer borne; Standard_Boolean fuse; if (a[1][0] == 'f' || a[1][0] == 'F') { @@ -415,21 +419,21 @@ static Standard_Integer PRW(Draw_Interpretor& theCommands, } if (a[5][0] == '.' || IsAlphabetic(a[5][0])) { if (narg < 11) { - return 1; + return 1; } - V.SetCoord(Draw::Atof(a[6]),Draw::Atof(a[7]),Draw::Atof(a[8])); - FFrom = DBRep::Get(a[4],TopAbs_SHAPE); - FUntil = DBRep::Get(a[5],TopAbs_SHAPE); + V.SetCoord(Draw::Atof(a[6]), Draw::Atof(a[7]), Draw::Atof(a[8])); + FFrom = DBRep::Get(a[4], TopAbs_SHAPE); + FUntil = DBRep::Get(a[5], TopAbs_SHAPE); borne = 9; } else { - V.SetCoord(Draw::Atof(a[5]),Draw::Atof(a[6]),Draw::Atof(a[7])); - FUntil = DBRep::Get(a[4],TopAbs_SHAPE); + V.SetCoord(Draw::Atof(a[5]), Draw::Atof(a[6]), Draw::Atof(a[7])); + FUntil = DBRep::Get(a[4], TopAbs_SHAPE); borne = 8; } } else { - V.SetCoord(Draw::Atof(a[4]),Draw::Atof(a[5]),Draw::Atof(a[6])); + V.SetCoord(Draw::Atof(a[4]), Draw::Atof(a[5]), Draw::Atof(a[6])); borne = 7; } Standard_Real Length = V.Magnitude(); @@ -437,34 +441,34 @@ static Standard_Integer PRW(Draw_Interpretor& theCommands, return 1; } - TopoDS_Shape aLocalShape(DBRep::Get(a[borne],TopAbs_FACE)); - TopoDS_Face F = TopoDS::Face(aLocalShape); -// TopoDS_Face F = TopoDS::Face(DBRep::Get(a[borne],TopAbs_FACE)); + TopoDS_Shape aLocalShape(DBRep::Get(a[borne], TopAbs_FACE)); + TopoDS_Face F = TopoDS::Face(aLocalShape); + // TopoDS_Face F = TopoDS::Face(DBRep::Get(a[borne],TopAbs_FACE)); BRepFeat_SplitShape Spls(F); - for (Standard_Integer i = borne+1; iDynamicType() == STANDARD_TYPE(Geom_RectangularTrimmedSurface)) { - Su = Handle(Geom_RectangularTrimmedSurface):: - DownCast(Su)->BasisSurface(); + Su = Handle(Geom_RectangularTrimmedSurface):: + DownCast(Su)->BasisSurface(); } if (Su->DynamicType() == STANDARD_TYPE(Geom_Plane)) { - gp_Pln pl = Handle(Geom_Plane)::DownCast(Su)->Pln(); - if (pl.Contains(gp_Lin(pl.Location(),V), - Precision::Confusion(), - Precision::Angular())) { - FEIF.Set(ToPrism,fac); - for (FEIF.Init();FEIF.More();FEIF.Next()) { - thePFace.Add(FEIF.Edge(),fac); - } - } + gp_Pln pl = Handle(Geom_Plane)::DownCast(Su)->Pln(); + if (pl.Contains(gp_Lin(pl.Location(), V), + Precision::Confusion(), + Precision::Angular())) { + FEIF.Set(ToPrism, fac); + for (FEIF.Init(); FEIF.More(); FEIF.Next()) { + thePFace.Add(FEIF.Edge(), fac); + } + } } else if (Su->DynamicType() == STANDARD_TYPE(Geom_CylindricalSurface)) { - gp_Cylinder cy = - Handle(Geom_CylindricalSurface)::DownCast(Su)->Cylinder(); - if (V.IsParallel(cy.Axis().Direction(),Precision::Angular())) { - FEIF.Set(ToPrism,fac); - for (FEIF.Init();FEIF.More();FEIF.Next()) { - thePFace.Add(FEIF.Edge(),fac); - } - } + gp_Cylinder cy = + Handle(Geom_CylindricalSurface)::DownCast(Su)->Cylinder(); + if (V.IsParallel(cy.Axis().Direction(), Precision::Angular())) { + FEIF.Set(ToPrism, fac); + for (FEIF.Init(); FEIF.More(); FEIF.Next()) { + thePFace.Add(FEIF.Edge(), fac); + } + } } } } @@ -532,14 +536,14 @@ static Standard_Integer PRW(Draw_Interpretor& theCommands, } else if (borne == 9) { if (!(FFrom.IsNull() || FUntil.IsNull())) { - thePFace.Perform(FFrom,FUntil); + thePFace.Perform(FFrom, FUntil); } else if (FFrom.IsNull()) { if (!FUntil.IsNull()) { - thePFace.PerformFromEnd(FUntil); + thePFace.PerformFromEnd(FUntil); } else { - thePFace.PerformThruAll(); + thePFace.PerformThruAll(); } } else { @@ -553,7 +557,7 @@ static Standard_Integer PRW(Draw_Interpretor& theCommands, return 1; } - DBRep::Set(a[2],thePFace); + DBRep::Set(a[2], thePFace); dout.Flush(); return 0; } @@ -565,14 +569,14 @@ static Standard_Integer PRW(Draw_Interpretor& theCommands, //======================================================================= static Standard_Integer PRF(Draw_Interpretor& theCommands, - Standard_Integer narg, const char** a) + Standard_Integer narg, const char** a) { - if (narg<8) return 1; + if (narg < 8) return 1; TopoDS_Shape S = DBRep::Get(a[3]); BRepFeat_MakePrism thePFace; Standard_Integer borne; gp_Vec V; - TopoDS_Shape FFrom,FUntil; + TopoDS_Shape FFrom, FUntil; Standard_Boolean fuse; if (a[1][0] == 'f' || a[1][0] == 'F') { fuse = Standard_True; @@ -591,22 +595,22 @@ static Standard_Integer PRF(Draw_Interpretor& theCommands, } if (a[5][0] == '.' || IsAlphabetic(a[5][0])) { if (narg < 10) { - return 1; + return 1; } borne = 9; - V.SetCoord(Draw::Atof(a[6]),Draw::Atof(a[7]),Draw::Atof(a[8])); - FFrom = DBRep::Get(a[4],TopAbs_SHAPE); - FUntil = DBRep::Get(a[5],TopAbs_SHAPE); + V.SetCoord(Draw::Atof(a[6]), Draw::Atof(a[7]), Draw::Atof(a[8])); + FFrom = DBRep::Get(a[4], TopAbs_SHAPE); + FUntil = DBRep::Get(a[5], TopAbs_SHAPE); } else { borne = 8; - V.SetCoord(Draw::Atof(a[5]),Draw::Atof(a[6]),Draw::Atof(a[7])); - FUntil = DBRep::Get(a[4],TopAbs_SHAPE); + V.SetCoord(Draw::Atof(a[5]), Draw::Atof(a[6]), Draw::Atof(a[7])); + FUntil = DBRep::Get(a[4], TopAbs_SHAPE); } } else { borne = 7; - V.SetCoord(Draw::Atof(a[4]),Draw::Atof(a[5]),Draw::Atof(a[6])); + V.SetCoord(Draw::Atof(a[4]), Draw::Atof(a[5]), Draw::Atof(a[6])); } Standard_Real Length = V.Magnitude(); if (Length < Precision::Confusion()) { @@ -614,41 +618,41 @@ static Standard_Integer PRF(Draw_Interpretor& theCommands, } TopoDS_Shape ToPrism; - if (narg == borne+1) { - TopoDS_Shape aLocalShape(DBRep::Get(a[borne],TopAbs_FACE)); - TopoDS_Face F = TopoDS::Face(aLocalShape); -// TopoDS_Face F = TopoDS::Face(DBRep::Get(a[borne],TopAbs_FACE)); - thePFace.Init(S,F,F,V,fuse,Standard_True); + if (narg == borne + 1) { + TopoDS_Shape aLocalShape(DBRep::Get(a[borne], TopAbs_FACE)); + TopoDS_Face F = TopoDS::Face(aLocalShape); + // TopoDS_Face F = TopoDS::Face(DBRep::Get(a[borne],TopAbs_FACE)); + thePFace.Init(S, F, F, V, fuse, Standard_True); ToPrism = F; } else { TopoDS_Shell She; BRep_Builder B; B.MakeShell(She); - for (Standard_Integer i=borne; iDynamicType() == STANDARD_TYPE(Geom_RectangularTrimmedSurface)) { - Su = Handle(Geom_RectangularTrimmedSurface):: - DownCast(Su)->BasisSurface(); + Su = Handle(Geom_RectangularTrimmedSurface):: + DownCast(Su)->BasisSurface(); } if (Su->DynamicType() == STANDARD_TYPE(Geom_Plane)) { - gp_Pln pl = Handle(Geom_Plane)::DownCast(Su)->Pln(); - if (pl.Contains(gp_Lin(pl.Location(),V), - Precision::Confusion(), - Precision::Angular())) { - FEIF.Set(ToPrism,fac); - for (FEIF.Init();FEIF.More();FEIF.Next()) { - thePFace.Add(FEIF.Edge(),fac); - } - } + gp_Pln pl = Handle(Geom_Plane)::DownCast(Su)->Pln(); + if (pl.Contains(gp_Lin(pl.Location(), V), + Precision::Confusion(), + Precision::Angular())) { + FEIF.Set(ToPrism, fac); + for (FEIF.Init(); FEIF.More(); FEIF.Next()) { + thePFace.Add(FEIF.Edge(), fac); + } + } } else if (Su->DynamicType() == STANDARD_TYPE(Geom_CylindricalSurface)) { - gp_Cylinder cy = - Handle(Geom_CylindricalSurface)::DownCast(Su)->Cylinder(); - if (V.IsParallel(cy.Axis().Direction(),Precision::Angular())) { - FEIF.Set(ToPrism,fac); - for (FEIF.Init();FEIF.More();FEIF.Next()) { - thePFace.Add(FEIF.Edge(),fac); - } - } + gp_Cylinder cy = + Handle(Geom_CylindricalSurface)::DownCast(Su)->Cylinder(); + if (V.IsParallel(cy.Axis().Direction(), Precision::Angular())) { + FEIF.Set(ToPrism, fac); + for (FEIF.Init(); FEIF.More(); FEIF.Next()) { + thePFace.Add(FEIF.Edge(), fac); + } + } } } } @@ -697,14 +701,14 @@ static Standard_Integer PRF(Draw_Interpretor& theCommands, } else if (borne == 9) { if (!(FFrom.IsNull() || FUntil.IsNull())) { - thePFace.Perform(FFrom,FUntil); + thePFace.Perform(FFrom, FUntil); } else if (FFrom.IsNull()) { if (!FUntil.IsNull()) { - thePFace.PerformFromEnd(FUntil); + thePFace.PerformFromEnd(FUntil); } else { - thePFace.PerformThruAll(); + thePFace.PerformThruAll(); } } else { //FUntil.IsNull() @@ -718,7 +722,7 @@ static Standard_Integer PRF(Draw_Interpretor& theCommands, return 1; } - DBRep::Set(a[2],thePFace); + DBRep::Set(a[2], thePFace); dout.Flush(); return 0; } @@ -730,8 +734,8 @@ static Standard_Integer PRF(Draw_Interpretor& theCommands, //purpose : //======================================================================= -static Standard_Integer SPLS(Draw_Interpretor& , - Standard_Integer narg, const char** a) +static Standard_Integer SPLS(Draw_Interpretor&, + Standard_Integer narg, const char** a) { Standard_Integer newnarg; @@ -746,34 +750,34 @@ static Standard_Integer SPLS(Draw_Interpretor& , TopoDS_Shape S = DBRep::Get(a[2]); if (S.IsNull()) { - std::cout << "Invalid input shape " << a[2]< 4) { - if (!strcmp(a[4],"i")) + if (!strcmp(a[4], "i")) JT = GeomAbs_Intersection; - if (!strcmp(a[4],"t")) + if (!strcmp(a[4], "t")) JT = GeomAbs_Tangent; } @@ -926,14 +930,14 @@ Standard_Integer thickshell(Draw_Interpretor& theCommands, Tol = Draw::Atof(a[5]); BRepOffset_MakeOffset B; - B.Initialize(S,Of,Tol,BRepOffset_Skin,Inter,0,JT,Standard_True); + B.Initialize(S, Of, Tol, BRepOffset_Skin, Inter, 0, JT, Standard_True); B.MakeOffsetShape(); const BRepOffset_Error aRetCode = B.Error(); reportOffsetState(theCommands, aRetCode); - DBRep::Set(a[1],B.Shape()); + DBRep::Set(a[1], B.Shape()); return 0; } @@ -943,42 +947,42 @@ Standard_Integer thickshell(Draw_Interpretor& theCommands, //======================================================================= Standard_Integer offsetshape(Draw_Interpretor& theCommands, - Standard_Integer n, const char** a) + Standard_Integer n, const char** a) { - if ( n < 4) return 1; - TopoDS_Shape S = DBRep::Get(a[2]); + if (n < 4) return 1; + TopoDS_Shape S = DBRep::Get(a[2]); if (S.IsNull()) return 1; - Standard_Real Of = Draw::Atof(a[3]); - Standard_Boolean Inter = (!strcmp(a[0],"offsetcompshape")); - GeomAbs_JoinType JT= GeomAbs_Arc; - if (!strcmp(a[0],"offsetinter")) + Standard_Real Of = Draw::Atof(a[3]); + Standard_Boolean Inter = (!strcmp(a[0], "offsetcompshape")); + GeomAbs_JoinType JT = GeomAbs_Arc; + if (!strcmp(a[0], "offsetinter")) { - JT = GeomAbs_Intersection; + JT = GeomAbs_Intersection; Inter = Standard_True; } - + BRepOffset_MakeOffset B; - Standard_Integer IB = 4; + Standard_Integer IB = 4; Standard_Real Tol = Precision::Confusion(); if (n > 4) { - TopoDS_Shape SF = DBRep::Get(a[4],TopAbs_FACE); + TopoDS_Shape SF = DBRep::Get(a[4], TopAbs_FACE); if (SF.IsNull()) { - IB = 5; + IB = 5; Tol = Draw::Atof(a[4]); } } - B.Initialize(S,Of,Tol,BRepOffset_Skin,Inter,0,JT); + B.Initialize(S, Of, Tol, BRepOffset_Skin, Inter, 0, JT); //------------------------------------------ // recuperation et chargement des bouchons. //---------------------------------------- Standard_Boolean YaBouchon = Standard_False; - for (Standard_Integer i = IB ; i < n; i++) + for (Standard_Integer i = IB; i < n; i++) { - TopoDS_Shape SF = DBRep::Get(a[i],TopAbs_FACE); + TopoDS_Shape SF = DBRep::Get(a[i], TopAbs_FACE); if (!SF.IsNull()) { YaBouchon = Standard_True; @@ -987,12 +991,12 @@ Standard_Integer offsetshape(Draw_Interpretor& theCommands, } if (!YaBouchon) B.MakeOffsetShape(); - else B.MakeThickSolid (); + else B.MakeThickSolid(); const BRepOffset_Error aRetCode = B.Error(); reportOffsetState(theCommands, aRetCode); - DBRep::Set(a[1],B.Shape()); + DBRep::Set(a[1], B.Shape()); return 0; } @@ -1001,30 +1005,31 @@ static BRepOffset_MakeOffset TheOffset; static Standard_Real TheRadius; static Standard_Boolean theYaBouchon; static Standard_Real TheTolerance = Precision::Confusion(); -static Standard_Boolean TheInter = Standard_False; -static GeomAbs_JoinType TheJoin = GeomAbs_Arc; +static Standard_Boolean TheInter = Standard_False; +static GeomAbs_JoinType TheJoin = GeomAbs_Arc; static Standard_Boolean RemoveIntEdges = Standard_False; Standard_Integer offsetparameter(Draw_Interpretor& di, - Standard_Integer n, const char** a) + Standard_Integer n, const char** a) { - if ( n == 1 ) { + if (n == 1) { di << " offsetparameter Tol Inter(c/p) JoinType(a/i/t) [RemoveInternalEdges(r/k)]\n"; di << " Current Values\n"; di << " --> Tolerance : " << TheTolerance << "\n"; di << " --> TheInter : "; - if ( TheInter) { - di << "Complet" ; - } else { + if (TheInter) { + di << "Complet"; + } + else { di << "Partial"; } di << "\n --> TheJoin : "; - + switch (TheJoin) { case GeomAbs_Arc: di << "Arc"; break; case GeomAbs_Intersection: di << "Intersection"; break; default: - break ; + break; } // di << "\n --> Internal Edges : "; @@ -1039,14 +1044,14 @@ Standard_Integer offsetparameter(Draw_Interpretor& di, return 0; } - if ( n < 4 ) return 1; + if (n < 4) return 1; // TheTolerance = Draw::Atof(a[1]); - TheInter = strcmp(a[2],"p") != 0; + TheInter = strcmp(a[2], "p") != 0; // - if ( !strcmp(a[3],"a")) TheJoin = GeomAbs_Arc; - else if ( !strcmp(a[3],"i")) TheJoin = GeomAbs_Intersection; - else if ( !strcmp(a[3],"t")) TheJoin = GeomAbs_Tangent; + if (!strcmp(a[3], "a")) TheJoin = GeomAbs_Arc; + else if (!strcmp(a[3], "i")) TheJoin = GeomAbs_Intersection; + else if (!strcmp(a[3], "t")) TheJoin = GeomAbs_Tangent; // RemoveIntEdges = (n >= 5) ? !strcmp(a[4], "r") : Standard_False; // @@ -1058,24 +1063,24 @@ Standard_Integer offsetparameter(Draw_Interpretor& di, //purpose : //======================================================================= -Standard_Integer offsetload(Draw_Interpretor& , +Standard_Integer offsetload(Draw_Interpretor&, Standard_Integer n, const char** a) { - if ( n < 2) return 1; - TopoDS_Shape S = DBRep::Get(a[1]); + if (n < 2) return 1; + TopoDS_Shape S = DBRep::Get(a[1]); if (S.IsNull()) return 1; - Standard_Real Of = Draw::Atof(a[2]); + Standard_Real Of = Draw::Atof(a[2]); TheRadius = Of; -// Standard_Boolean Inter = Standard_True; - - TheOffset.Initialize(S,Of,TheTolerance,BRepOffset_Skin,TheInter,0,TheJoin, - Standard_False, RemoveIntEdges); + // Standard_Boolean Inter = Standard_True; + + TheOffset.Initialize(S, Of, TheTolerance, BRepOffset_Skin, TheInter, 0, TheJoin, + Standard_False, RemoveIntEdges); //------------------------------------------ // recuperation et chargement des bouchons. //---------------------------------------- - for (Standard_Integer i = 3 ; i < n; i++) { - TopoDS_Shape SF = DBRep::Get(a[i],TopAbs_FACE); + for (Standard_Integer i = 3; i < n; i++) { + TopoDS_Shape SF = DBRep::Get(a[i], TopAbs_FACE); if (!SF.IsNull()) { TheOffset.AddFace(TopoDS::Face(SF)); } @@ -1094,16 +1099,16 @@ Standard_Integer offsetload(Draw_Interpretor& , Standard_Integer offsetonface(Draw_Interpretor&, Standard_Integer n, const char** a) { - if ( n < 3) return 1; + if (n < 3) return 1; - for (Standard_Integer i = 1 ; i < n; i+=2) { - TopoDS_Shape SF = DBRep::Get(a[i],TopAbs_FACE); + for (Standard_Integer i = 1; i < n; i += 2) { + TopoDS_Shape SF = DBRep::Get(a[i], TopAbs_FACE); if (!SF.IsNull()) { - Standard_Real Of = Draw::Atof(a[i+1]); - TheOffset.SetOffsetOnFace(TopoDS::Face(SF),Of); + Standard_Real Of = Draw::Atof(a[i + 1]); + TheOffset.SetOffsetOnFace(TopoDS::Face(SF), Of); } } - + return 0; } @@ -1113,35 +1118,35 @@ Standard_Integer offsetonface(Draw_Interpretor&, Standard_Integer n, const char* //======================================================================= Standard_Integer offsetperform(Draw_Interpretor& theCommands, - Standard_Integer theNArg, const char** a) - { - if ( theNArg < 2) return 1; + Standard_Integer theNArg, const char** a) +{ + if (theNArg < 2) return 1; if (theYaBouchon) - TheOffset.MakeThickSolid (); + TheOffset.MakeThickSolid(); else TheOffset.MakeOffsetShape(); - if(TheOffset.IsDone()) - { - DBRep::Set(a[1],TheOffset.Shape()); - } + if (TheOffset.IsDone()) + { + DBRep::Set(a[1], TheOffset.Shape()); + } else - { - const BRepOffset_Error aRetCode = TheOffset.Error(); - reportOffsetState(theCommands, aRetCode); - } + { + const BRepOffset_Error aRetCode = TheOffset.Error(); + reportOffsetState(theCommands, aRetCode); + } // Store the history of Boolean operation into the session if (BRepTest_Objects::IsHistoryNeeded()) { TopTools_ListOfShape aLA; - aLA.Append (TheOffset.InitShape()); + aLA.Append(TheOffset.InitShape()); BRepTest_Objects::SetHistory(aLA, TheOffset); } return 0; - } +} //======================================================================= @@ -1150,16 +1155,16 @@ Standard_Integer offsetperform(Draw_Interpretor& theCommands, //======================================================================= static Standard_Integer ROW(Draw_Interpretor& theCommands, - Standard_Integer narg, const char** a) + Standard_Integer narg, const char** a) { - if (narg<13) return 1; + if (narg < 13) return 1; TopoDS_Shape S = DBRep::Get(a[3]); BRepFeat_MakeRevol theRFace; gp_Dir D; gp_Pnt Or; - Standard_Real Angle=0; - TopoDS_Shape FFrom,FUntil; - Standard_Integer i,borne; + Standard_Real Angle = 0; + TopoDS_Shape FFrom, FUntil; + Standard_Integer i, borne; Standard_Boolean fuse; if (a[1][0] == 'f' || a[1][0] == 'F') { @@ -1172,61 +1177,61 @@ static Standard_Integer ROW(Draw_Interpretor& theCommands, return 1; } - FFrom = DBRep::Get(a[4],TopAbs_SHAPE); + FFrom = DBRep::Get(a[4], TopAbs_SHAPE); if (FFrom.IsNull()) { Angle = Draw::Atof(a[4]); - Angle *=M_PI/180.; + Angle *= M_PI / 180.; i = 5; } else { - FUntil = DBRep::Get(a[5],TopAbs_SHAPE); + FUntil = DBRep::Get(a[5], TopAbs_SHAPE); if (FUntil.IsNull()) { i = 5; FUntil = FFrom; FFrom.Nullify(); - + } else { if (narg < 14) { - return 1; + return 1; } i = 6; } } - borne = i+6; + borne = i + 6; - Or.SetCoord(Draw::Atof(a[i]),Draw::Atof(a[i+1]),Draw::Atof(a[i+2])); - D.SetCoord(Draw::Atof(a[i+3]),Draw::Atof(a[i+4]),Draw::Atof(a[i+5])); - gp_Ax1 theAxis(Or,D); + Or.SetCoord(Draw::Atof(a[i]), Draw::Atof(a[i + 1]), Draw::Atof(a[i + 2])); + D.SetCoord(Draw::Atof(a[i + 3]), Draw::Atof(a[i + 4]), Draw::Atof(a[i + 5])); + gp_Ax1 theAxis(Or, D); - TopoDS_Shape aLocalShape(DBRep::Get(a[borne],TopAbs_FACE)); - TopoDS_Face F = TopoDS::Face(aLocalShape); -// TopoDS_Face F = TopoDS::Face(DBRep::Get(a[borne],TopAbs_FACE)); + TopoDS_Shape aLocalShape(DBRep::Get(a[borne], TopAbs_FACE)); + TopoDS_Face F = TopoDS::Face(aLocalShape); + // TopoDS_Face F = TopoDS::Face(DBRep::Get(a[borne],TopAbs_FACE)); BRepFeat_SplitShape Spls(F); - for (i = borne+1; iDynamicType() == STANDARD_TYPE(Geom_RectangularTrimmedSurface)) { - Su = Handle(Geom_RectangularTrimmedSurface):: - DownCast(Su)->BasisSurface(); + Su = Handle(Geom_RectangularTrimmedSurface):: + DownCast(Su)->BasisSurface(); } if (Su->DynamicType() == STANDARD_TYPE(Geom_Plane)) { - gp_Pln pl = Handle(Geom_Plane)::DownCast(Su)->Pln(); - if (pl.Axis().IsParallel(theAxis,Precision::Angular())) { - FEIF.Set(ToRotate,fac); - for (FEIF.Init();FEIF.More();FEIF.Next()) { - theRFace.Add(FEIF.Edge(),fac); - } - } + gp_Pln pl = Handle(Geom_Plane)::DownCast(Su)->Pln(); + if (pl.Axis().IsParallel(theAxis, Precision::Angular())) { + FEIF.Set(ToRotate, fac); + for (FEIF.Init(); FEIF.More(); FEIF.Next()) { + theRFace.Add(FEIF.Edge(), fac); + } + } } else if (Su->DynamicType() == STANDARD_TYPE(Geom_CylindricalSurface)) { - gp_Cylinder cy = - Handle(Geom_CylindricalSurface)::DownCast(Su)->Cylinder(); - if (cy.Axis().IsCoaxial(theAxis, - Precision::Angular(),Precision::Confusion())) { - FEIF.Set(ToRotate,fac); - for (FEIF.Init();FEIF.More();FEIF.Next()) { - theRFace.Add(FEIF.Edge(),fac); - } - } + gp_Cylinder cy = + Handle(Geom_CylindricalSurface)::DownCast(Su)->Cylinder(); + if (cy.Axis().IsCoaxial(theAxis, + Precision::Angular(), Precision::Confusion())) { + FEIF.Set(ToRotate, fac); + for (FEIF.Init(); FEIF.More(); FEIF.Next()) { + theRFace.Add(FEIF.Edge(), fac); + } + } } } } @@ -1292,7 +1297,7 @@ static Standard_Integer ROW(Draw_Interpretor& theCommands, } } else { // borne == 12 - theRFace.Perform(FFrom,FUntil); + theRFace.Perform(FFrom, FUntil); } if (!theRFace.IsDone()) { @@ -1300,7 +1305,7 @@ static Standard_Integer ROW(Draw_Interpretor& theCommands, return 1; } - DBRep::Set(a[2],theRFace); + DBRep::Set(a[2], theRFace); dout.Flush(); return 0; } @@ -1312,16 +1317,16 @@ static Standard_Integer ROW(Draw_Interpretor& theCommands, //======================================================================= static Standard_Integer ROF(Draw_Interpretor& theCommands, - Standard_Integer narg, const char** a) + Standard_Integer narg, const char** a) { - if (narg<12) return 1; + if (narg < 12) return 1; TopoDS_Shape S = DBRep::Get(a[3]); BRepFeat_MakeRevol theRFace; gp_Dir D; gp_Pnt Or; - Standard_Real Angle=0; - TopoDS_Shape FFrom,FUntil; - Standard_Integer i,borne; + Standard_Real Angle = 0; + TopoDS_Shape FFrom, FUntil; + Standard_Integer i, borne; Standard_Boolean fuse; if (a[1][0] == 'f' || a[1][0] == 'F') { @@ -1334,67 +1339,67 @@ static Standard_Integer ROF(Draw_Interpretor& theCommands, return 1; } - FFrom = DBRep::Get(a[4],TopAbs_SHAPE); + FFrom = DBRep::Get(a[4], TopAbs_SHAPE); if (FFrom.IsNull()) { Angle = Draw::Atof(a[4]); - Angle *=M_PI/180.; + Angle *= M_PI / 180.; i = 5; } else { - FUntil = DBRep::Get(a[5],TopAbs_SHAPE); + FUntil = DBRep::Get(a[5], TopAbs_SHAPE); if (FUntil.IsNull()) { i = 5; FUntil = FFrom; FFrom.Nullify(); - + } else { if (narg < 13) { - return 1; + return 1; } i = 6; } } - borne = i+6; - Or.SetCoord(Draw::Atof(a[i]),Draw::Atof(a[i+1]),Draw::Atof(a[i+2])); - D.SetCoord(Draw::Atof(a[i+3]),Draw::Atof(a[i+4]),Draw::Atof(a[i+5])); - gp_Ax1 theAxis(Or,D); + borne = i + 6; + Or.SetCoord(Draw::Atof(a[i]), Draw::Atof(a[i + 1]), Draw::Atof(a[i + 2])); + D.SetCoord(Draw::Atof(a[i + 3]), Draw::Atof(a[i + 4]), Draw::Atof(a[i + 5])); + gp_Ax1 theAxis(Or, D); TopoDS_Shape ToRotate; - if (narg == borne+1) { - TopoDS_Shape aLocalShape(DBRep::Get(a[borne],TopAbs_FACE)); - TopoDS_Face F = TopoDS::Face(aLocalShape); -// TopoDS_Face F = TopoDS::Face(DBRep::Get(a[borne],TopAbs_FACE)); - theRFace.Init(S,F,F,theAxis,fuse,Standard_True); + if (narg == borne + 1) { + TopoDS_Shape aLocalShape(DBRep::Get(a[borne], TopAbs_FACE)); + TopoDS_Face F = TopoDS::Face(aLocalShape); + // TopoDS_Face F = TopoDS::Face(DBRep::Get(a[borne],TopAbs_FACE)); + theRFace.Init(S, F, F, theAxis, fuse, Standard_True); ToRotate = F; } else { TopoDS_Shell She; BRep_Builder B; B.MakeShell(She); - - for (i=borne; iDynamicType() == STANDARD_TYPE(Geom_RectangularTrimmedSurface)) { - Su = Handle(Geom_RectangularTrimmedSurface):: - DownCast(Su)->BasisSurface(); + Su = Handle(Geom_RectangularTrimmedSurface):: + DownCast(Su)->BasisSurface(); } if (Su->DynamicType() == STANDARD_TYPE(Geom_Plane)) { - gp_Pln pl = Handle(Geom_Plane)::DownCast(Su)->Pln(); - if (pl.Axis().IsParallel(theAxis,Precision::Angular())) { - FEIF.Set(ToRotate,fac); - for (FEIF.Init();FEIF.More();FEIF.Next()) { - theRFace.Add(FEIF.Edge(),fac); - } - } + gp_Pln pl = Handle(Geom_Plane)::DownCast(Su)->Pln(); + if (pl.Axis().IsParallel(theAxis, Precision::Angular())) { + FEIF.Set(ToRotate, fac); + for (FEIF.Init(); FEIF.More(); FEIF.Next()) { + theRFace.Add(FEIF.Edge(), fac); + } + } } else if (Su->DynamicType() == STANDARD_TYPE(Geom_CylindricalSurface)) { - gp_Cylinder cy = - Handle(Geom_CylindricalSurface)::DownCast(Su)->Cylinder(); - if (cy.Axis().IsCoaxial(theAxis, - Precision::Angular(),Precision::Confusion())) { - FEIF.Set(ToRotate,fac); - for (FEIF.Init();FEIF.More();FEIF.Next()) { - theRFace.Add(FEIF.Edge(),fac); - } - } + gp_Cylinder cy = + Handle(Geom_CylindricalSurface)::DownCast(Su)->Cylinder(); + if (cy.Axis().IsCoaxial(theAxis, + Precision::Angular(), Precision::Confusion())) { + FEIF.Set(ToRotate, fac); + for (FEIF.Init(); FEIF.More(); FEIF.Next()) { + theRFace.Add(FEIF.Edge(), fac); + } + } } } } @@ -1443,7 +1448,7 @@ static Standard_Integer ROF(Draw_Interpretor& theCommands, } } else { // borne == 12 - theRFace.Perform(FFrom,FUntil); + theRFace.Perform(FFrom, FUntil); } if (!theRFace.IsDone()) { @@ -1451,7 +1456,7 @@ static Standard_Integer ROF(Draw_Interpretor& theCommands, return 1; } - DBRep::Set(a[2],theRFace); + DBRep::Set(a[2], theRFace); dout.Flush(); return 0; } @@ -1462,23 +1467,23 @@ static Standard_Integer ROF(Draw_Interpretor& theCommands, //purpose : Commande glue //======================================================================= -static Standard_Integer GLU(Draw_Interpretor& , - Standard_Integer narg, const char** a) +static Standard_Integer GLU(Draw_Interpretor&, + Standard_Integer narg, const char** a) { - if (narg<6 || narg%2 != 0) return 1; + if (narg < 6 || narg % 2 != 0) return 1; TopoDS_Shape Sne = DBRep::Get(a[2]); TopoDS_Shape Sba = DBRep::Get(a[3]); - + Standard_Boolean pick; - - BRepFeat_Gluer theGl(Sne,Sba); - TopoDS_Shape Fne,Fba; - + + BRepFeat_Gluer theGl(Sne, Sba); + TopoDS_Shape Fne, Fba; + LocOpe_FindEdges fined; Standard_Integer i = 4; Standard_Boolean first = Standard_True; - while (iSetParams(ta,t3d,t2d,t3d,t2d,fl); + Rakk = new BRepFilletAPI_MakeFillet(V, FSh); + Rakk->SetParams(ta, t3d, t2d, t3d, t2d, fl); Rakk->SetContinuity(blend_cont, tapp_angle); Standard_Real Rad; TopoDS_Shape S; @@ -2191,57 +2245,57 @@ static Standard_Integer BOSS(Draw_Interpretor& theCommands, Standard_Integer nbedge = 0; if (Kas == 2) { - for (Standard_Integer ii = 1; ii < (narg-1)/2; ii++){ - Rad = Draw::Atof(a[2*ii + 1]); - if (Rad == 0.) continue; - S = DBRep::Get(a[(2*ii+2)],TopAbs_SHAPE); - TopExp_Explorer exp; - for (exp.Init(S,TopAbs_EDGE); exp.More(); exp.Next()) { - E = TopoDS::Edge(exp.Current()); - if(!E.IsNull()){ - Rakk->Add(Rad,E); - nbedge++; - } - } + for (Standard_Integer ii = 1; ii < (narg - 1) / 2; ii++) { + Rad = Draw::Atof(a[2 * ii + 1]); + if (Rad == 0.) continue; + S = DBRep::Get(a[(2 * ii + 2)], TopAbs_SHAPE); + TopExp_Explorer exp; + for (exp.Init(S, TopAbs_EDGE); exp.More(); exp.Next()) { + E = TopoDS::Edge(exp.Current()); + if (!E.IsNull()) { + Rakk->Add(Rad, E); + nbedge++; + } + } } } else if (Kas == 3) { Rad = Draw::Atof(a[3]); if (Rad != 0.) { - S = theShapeTop; - TopExp_Explorer exp; - for (exp.Init(S,TopAbs_EDGE); exp.More(); exp.Next()) { - E = TopoDS::Edge(exp.Current()); - if(!E.IsNull()){ - Rakk->Add(Rad,E); - nbedge++; - } - } + S = theShapeTop; + TopExp_Explorer exp; + for (exp.Init(S, TopAbs_EDGE); exp.More(); exp.Next()) { + E = TopoDS::Edge(exp.Current()); + if (!E.IsNull()) { + Rakk->Add(Rad, E); + nbedge++; + } + } } Rad = Draw::Atof(a[4]); if (Rad != 0.) { - S = theShapeBottom; - TopExp_Explorer exp; - for (exp.Init(S,TopAbs_EDGE); exp.More(); exp.Next()) { - E = TopoDS::Edge(exp.Current()); - if(!E.IsNull()){ - Rakk->Add(Rad,E); - nbedge++; - } - } + S = theShapeBottom; + TopExp_Explorer exp; + for (exp.Init(S, TopAbs_EDGE); exp.More(); exp.Next()) { + E = TopoDS::Edge(exp.Current()); + if (!E.IsNull()) { + Rakk->Add(Rad, E); + nbedge++; + } + } } } - - if(!nbedge) return 1; + + if (!nbedge) return 1; Rakk->Build(); - if(!Rakk->IsDone()) return 1; + if (!Rakk->IsDone()) return 1; TopoDS_Shape res = Rakk->Shape(); if (Kas == 2) { - DBRep::Set(a[1],res); - } + DBRep::Set(a[1], res); + } else if (Kas == 3) { - DBRep::Set(a[2],res); + DBRep::Set(a[2], res); } dout.Flush(); @@ -2264,8 +2318,8 @@ static Standard_Integer BOSS(Draw_Interpretor& theCommands, //purpose : Computes simple offset. //============================================================================= static Standard_Integer ComputeSimpleOffset(Draw_Interpretor& theCommands, - Standard_Integer narg, - const char** a) + Standard_Integer narg, + const char** a) { if (narg < 4) { @@ -2287,12 +2341,12 @@ static Standard_Integer ComputeSimpleOffset(Draw_Interpretor& theCommands, return 0; } - Standard_Boolean makeSolid = (narg > 4 && !strcasecmp(a[4],"solid")); + Standard_Boolean makeSolid = (narg > 4 && !strcasecmp(a[4], "solid")); int iTolArg = (makeSolid ? 5 : 4); Standard_Real aTol = (narg > iTolArg ? Draw::Atof(a[iTolArg]) : Precision::Confusion()); BRepOffset_MakeSimpleOffset aMaker(aShape, anOffsetValue); - aMaker.SetTolerance (aTol); + aMaker.SetTolerance(aTol); aMaker.SetBuildSolidFlag(makeSolid); aMaker.Perform(); @@ -2312,7 +2366,7 @@ static Standard_Integer ComputeSimpleOffset(Draw_Interpretor& theCommands, //purpose : //======================================================================= -void BRepTest::FeatureCommands (Draw_Interpretor& theCommands) +void BRepTest::FeatureCommands(Draw_Interpretor& theCommands) { static Standard_Boolean done = Standard_False; if (done) return; @@ -2322,48 +2376,48 @@ void BRepTest::FeatureCommands (Draw_Interpretor& theCommands) const char* g = "TOPOLOGY Feature commands"; - theCommands.Add("localope", - " Performs a local top. operation : localope result shape tool F/C (fuse/cut) face [face...]", - __FILE__,Loc,g); + theCommands.Add("localope", + " Performs a local top. operation : localope result shape tool F/C (fuse/cut) face [face...]", + __FILE__, Loc, g); theCommands.Add("hole", - " Performs a hole : hole result shape Or.X Or.Y Or.Z Dir.X Dir.Y Dir.Z Radius [Pfrom Pto]", - __FILE__,HOLE1,g); + " Performs a hole : hole result shape Or.X Or.Y Or.Z Dir.X Dir.Y Dir.Z Radius [Pfrom Pto]", + __FILE__, HOLE1, g); theCommands.Add("firsthole", - " Performs the first hole : firsthole result shape Or.X Or.Y Or.Z Dir.X Dir.Y Dir.Z Radius", - __FILE__,HOLE2,g); + " Performs the first hole : firsthole result shape Or.X Or.Y Or.Z Dir.X Dir.Y Dir.Z Radius", + __FILE__, HOLE2, g); theCommands.Add("holend", - " Performs the hole til end : holend result shape Or.X Or.Y Or.Z Dir.X Dir.Y Dir.Z Radius", - __FILE__,HOLE3,g); + " Performs the hole til end : holend result shape Or.X Or.Y Or.Z Dir.X Dir.Y Dir.Z Radius", + __FILE__, HOLE3, g); - theCommands.Add("blindhole", - " Performs the blind hole : blindhole result shape Or.X Or.Y Or.Z Dir.X Dir.Y Dir.Z Radius Length", - __FILE__,HOLE4,g); + theCommands.Add("blindhole", + " Performs the blind hole : blindhole result shape Or.X Or.Y Or.Z Dir.X Dir.Y Dir.Z Radius Length", + __FILE__, HOLE4, g); theCommands.Add("holecontrol", - "Sets/Unsets or display controls on holes : holecontrol [0/1]", - __FILE__,CONTROL,g); + "Sets/Unsets or display controls on holes : holecontrol [0/1]", + __FILE__, CONTROL, g); theCommands.Add("wprism", - "Prisms wires on a face : wprism f[use]/c[ut] result shape [[FaceFrom] FaceUntil] VecX VecY VecZ SkecthFace wire1 [wire2 ....]", - __FILE__,PRW,g); + "Prisms wires on a face : wprism f[use]/c[ut] result shape [[FaceFrom] FaceUntil] VecX VecY VecZ SkecthFace wire1 [wire2 ....]", + __FILE__, PRW, g); - theCommands.Add("fprism", - "Prisms a set of faces of a shape : fprism f[use]/c[ut] result shape [[FaceFrom] FaceUntil] VecX VecY VecZ face1 [face2...]", - __FILE__,PRF,g); + theCommands.Add("fprism", + "Prisms a set of faces of a shape : fprism f[use]/c[ut] result shape [[FaceFrom] FaceUntil] VecX VecY VecZ face1 [face2...]", + __FILE__, PRF, g); theCommands.Add("wrotate", - "Rotates wires on a face : wrotate f[use]/c[ut] result shape Angle/[FFrom] FUntil OX OY OZ DX DY DZ SkecthFace wire1 [wire2 ....]", - __FILE__,ROW,g); + "Rotates wires on a face : wrotate f[use]/c[ut] result shape Angle/[FFrom] FUntil OX OY OZ DX DY DZ SkecthFace wire1 [wire2 ....]", + __FILE__, ROW, g); - theCommands.Add("frotate", - "Rotates a set of faces of a shape : frotate f[use]/c[ut] result shape Angle/[FaceFrom] FaceUntil OX OY OZ DX DY DZ face1 [face2...]", - __FILE__,ROF,g); + theCommands.Add("frotate", + "Rotates a set of faces of a shape : frotate f[use]/c[ut] result shape Angle/[FaceFrom] FaceUntil OX OY OZ DX DY DZ face1 [face2...]", + __FILE__, ROF, g); theCommands.Add("splitshape", @@ -2372,87 +2426,87 @@ void BRepTest::FeatureCommands (Draw_Interpretor& theCommands) theCommands.Add("thickshell", - "thickshell r shape offset [jointype [tol] ]", - __FILE__,thickshell,g); - + "thickshell r shape offset [jointype [tol] ]", + __FILE__, thickshell, g); + theCommands.Add("offsetshape", - "offsetshape r shape offset [tol] [face ...]", - __FILE__,offsetshape,g); - + "offsetshape r shape offset [tol] [face ...]", + __FILE__, offsetshape, g); + theCommands.Add("offsetcompshape", - "offsetcompshape r shape offset [face ...]", - __FILE__,offsetshape,g); + "offsetcompshape r shape offset [face ...]", + __FILE__, offsetshape, g); theCommands.Add("offsetparameter", - "offsetparameter Tol Inter(c/p) JoinType(a/i/t) [RemoveInternalEdges(r/k)]", - __FILE__,offsetparameter); + "offsetparameter Tol Inter(c/p) JoinType(a/i/t) [RemoveInternalEdges(r/k)]", + __FILE__, offsetparameter); theCommands.Add("offsetload", - "offsetload shape offset bouchon1 bouchon2 ...", - __FILE__,offsetload,g); + "offsetload shape offset bouchon1 bouchon2 ...", + __FILE__, offsetload, g); theCommands.Add("offsetonface", - "offsetonface face1 offset1 face2 offset2 ...", - __FILE__,offsetonface,g); + "offsetonface face1 offset1 face2 offset2 ...", + __FILE__, offsetonface, g); theCommands.Add("offsetperform", - "offsetperform result", - __FILE__,offsetperform,g); + "offsetperform result", + __FILE__, offsetperform, g); - theCommands.Add("glue", - "glue result shapenew shapebase facenew facebase [facenew facebase...] [edgenew edgebase [edgenew edgebase...]]", - __FILE__,GLU,g); + theCommands.Add("glue", + "glue result shapenew shapebase facenew facebase [facenew facebase...] [edgenew edgebase [edgenew edgebase...]]", + __FILE__, GLU, g); - theCommands.Add("featprism", - "Defines the arguments for a prism : featprism shape element skface Dirx Diry Dirz Fuse(0/1/2) Modify(0/1)", - __FILE__,DEFIN); + theCommands.Add("featprism", + "Defines the arguments for a prism : featprism shape element skface Dirx Diry Dirz Fuse(0/1/2) Modify(0/1)", + __FILE__, DEFIN); - theCommands.Add("featrevol", - "Defines the arguments for a revol : featrevol shape element skface Ox Oy Oz Dx Dy Dz Fuse(0/1/2) Modify(0/1)", - __FILE__,DEFIN); + theCommands.Add("featrevol", + "Defines the arguments for a revol : featrevol shape element skface Ox Oy Oz Dx Dy Dz Fuse(0/1/2) Modify(0/1)", + __FILE__, DEFIN); - theCommands.Add("featpipe", - "Defines the arguments for a pipe : featpipe shape element skface spine Fuse(0/1/2) Modify(0/1)", - __FILE__,DEFIN); + theCommands.Add("featpipe", + "Defines the arguments for a pipe : featpipe shape element skface spine Fuse(0/1/2) Modify(0/1)", + __FILE__, DEFIN); - theCommands.Add("featdprism", - "Defines the arguments for a drafted prism : featdprism shape face skface angle Fuse(0/1/2) Modify(0/1)", - __FILE__,DEFIN); + theCommands.Add("featdprism", + "Defines the arguments for a drafted prism : featdprism shape face skface angle Fuse(0/1/2) Modify(0/1)", + __FILE__, DEFIN); - theCommands.Add("featlf", - "Defines the arguments for a linear rib or slot : featlf shape wire plane DirX DirY DirZ DirX DirY DirZ Fuse(0/1/2) Modify(0/1)", - __FILE__,DEFIN); + theCommands.Add("featlf", + "Defines the arguments for a linear rib or slot : featlf shape wire plane DirX DirY DirZ DirX DirY DirZ Fuse(0/1/2) Modify(0/1)", + __FILE__, DEFIN); - theCommands.Add("featrf", - "Defines the arguments for a rib or slot of revolution : featrf shape wire plane X Y Z DirX DirY DirZ Size Size Fuse(0/1/2) Modify(0/1)", - __FILE__,DEFIN); + theCommands.Add("featrf", + "Defines the arguments for a rib or slot of revolution : featrf shape wire plane X Y Z DirX DirY DirZ Size Size Fuse(0/1/2) Modify(0/1)", + __FILE__, DEFIN); - theCommands.Add("addslide", - " Adds sliding elements : addslide prism/revol/pipe edge face [edge face...]", - __FILE__,ADD); + theCommands.Add("addslide", + " Adds sliding elements : addslide prism/revol/pipe edge face [edge face...]", + __FILE__, ADD); - theCommands.Add("featperform", - " Performs the prism revol dprism linform or pipe :featperform prism/revol/pipe/dprism/lf result [[Ffrom] Funtil]", - __FILE__,PERF); + theCommands.Add("featperform", + " Performs the prism revol dprism linform or pipe :featperform prism/revol/pipe/dprism/lf result [[Ffrom] Funtil]", + __FILE__, PERF); - theCommands.Add("featperformval", - " Performs the prism revol dprism or linform with a value :featperformval prism/revol/dprism/lf result value", - __FILE__,PERF); + theCommands.Add("featperformval", + " Performs the prism revol dprism or linform with a value :featperformval prism/revol/dprism/lf result value", + __FILE__, PERF); - theCommands.Add("endedges", - " Return top and bottom edges of dprism :endedges dprism shapetop shapebottom First/LastShape (1/2)", - __FILE__,BOSS); + theCommands.Add("endedges", + " Return top and bottom edges of dprism :endedges dprism shapetop shapebottom First/LastShape (1/2)", + __FILE__, BOSS); - theCommands.Add("fillet", - " Perform fillet on compounds of edges :fillet result object rad1 comp1 rad2 comp2 ...", - __FILE__,BOSS); + theCommands.Add("fillet", + " Perform fillet on compounds of edges :fillet result object rad1 comp1 rad2 comp2 ...", + __FILE__, BOSS); - theCommands.Add("bossage", - " Perform fillet on top and bottom edges of dprism :bossage dprism result radtop radbottom First/LastShape (1/2)", - __FILE__,BOSS); + theCommands.Add("bossage", + " Perform fillet on top and bottom edges of dprism :bossage dprism result radtop radbottom First/LastShape (1/2)", + __FILE__, BOSS); - theCommands.Add("offsetshapesimple", - "offsetshapesimple result shape offsetvalue [solid] [tolerance=1e-7]", - __FILE__, ComputeSimpleOffset); + theCommands.Add("offsetshapesimple", + "offsetshapesimple result shape offsetvalue [solid] [tolerance=1e-7]", + __FILE__, ComputeSimpleOffset); } diff --git a/tests/bugs/modalg_7/bug31469 b/tests/bugs/modalg_7/bug31469 new file mode 100644 index 0000000000..26713e964c --- /dev/null +++ b/tests/bugs/modalg_7/bug31469 @@ -0,0 +1,43 @@ +puts "========" +puts "0031469: Modeling Algorithms - 0031469: BRepFeat_MakePrism has problem with method IsDeleted(...)" +puts "========" +puts "" + +box S 400 250 300 + +explode S face +mksurface pl2 S_2 +trim pl2 pl2 100 200 -200 -100 +mkface pbase pl2 +featprism S pbase S_2 -1 0 0 0 1 +featperformval prism pp 200 +checkshape pp +checknbshapes pp -vertex 12 -edge 20 -face 11 -solid 1 +savehistory ph +if { ![regexp "Not deleted" [isdeleted ph S]] } { + puts "Error: S has wrong delete status" +} + +if { ![regexp "Not deleted" [isdeleted ph S_2]] } { + puts "Error: S_2 has wrong delete status" +} + +if {![regexp "The shape has not been modified." [modified m1 ph S]] } { + checknbshapes m1 -vertex 12 -edge 20 -face 11 -solid 1 +} else { + puts "Error: S has wrong modified list" +} + +if {![regexp "The shape has not been modified." [modified m2 ph S_2]] } { + checknbshapes m2 -vertex 8 -edge 8 -wire 2 -face 1 +} else { + puts "Error: S_2 has wrong modified list" +} + +explode pbase e +if {![regexp "No shapes were generated from the shape." [generated g1 ph pbase_1]] } { + checknbshapes g1 -vertex 2 -edge 3 -wire 1 -face 1 + checkprops g1 -s 20000 +} else { + puts "Error: pbase_1 has wrong generated list" +}