diff --git a/adm/UDLIST b/adm/UDLIST index 6470a2ad50..7d23aeed13 100644 --- a/adm/UDLIST +++ b/adm/UDLIST @@ -398,9 +398,6 @@ n HLRTest n MeshTest n SWDRAW n TObjDRAW -n TestTopOpe -n TestTopOpeDraw -n TestTopOpeTools n ViewerTest n XDEDRAW n XSDRAW diff --git a/adm/upgrade.dat b/adm/upgrade.dat index d917e09d61..36deb7169a 100644 --- a/adm/upgrade.dat +++ b/adm/upgrade.dat @@ -801,13 +801,6 @@ TDF_LabelSequence TDocStd_LabelIDMapDataMap TDocStd_SequenceOfApplicationDelta TDocStd_SequenceOfDocument -TestTopOpeDraw_Array1OfDrawableMesure -TestTopOpeDraw_Array1OfDrawableP3D -TestTopOpeDraw_HArray1OfDrawableMesure -TestTopOpeDraw_HArray1OfDrawableP3D -TestTopOpeDraw_ListOfPnt2d -TestTopOpeTools_Array1OfMesure -TestTopOpeTools_HArray1OfMesure TFunction_Array1OfDataMapOfGUIDDriver TFunction_DataMapOfGUIDDriver TFunction_DataMapOfLabelListOfLabel diff --git a/dox/dev_guides/upgrade/upgrade.md b/dox/dev_guides/upgrade/upgrade.md index 7be91788cc..4603e32efc 100644 --- a/dox/dev_guides/upgrade/upgrade.md +++ b/dox/dev_guides/upgrade/upgrade.md @@ -1126,6 +1126,9 @@ The following obsolete features have been removed: These property was not implemented. * The class *LocOpe_HBuilder* has been removed as obsolete. * The class *QANewBRepNaming_BooleanOperationFeat* has been removed. The class *QANewBRepNaming_BooleanOperation* should be used instead. +* The package *TestTopOpe* has been removed; +* The package *TestTopOpeDraw* has been removed; +* The package *TestTopOpeTools* has been removed. @subsection upgrade_occt720_correction_of_Offset_API Corrections in BRepOffset API diff --git a/dox/user_guides/draw_test_harness/draw_test_harness.md b/dox/user_guides/draw_test_harness/draw_test_harness.md index d4f54d1994..a2da869de8 100644 --- a/dox/user_guides/draw_test_harness/draw_test_harness.md +++ b/dox/user_guides/draw_test_harness/draw_test_harness.md @@ -5439,7 +5439,7 @@ parameters p 5 5 5 u v # the values of u and v are : 0 5 ~~~~~ -@subsubsection occt_draw_6_6_6 proj, dproj +@subsubsection occt_draw_6_6_6 proj, 2dproj Syntax: ~~~~~ @@ -5571,13 +5571,50 @@ surfapp s 3 4 \ 0 30 0 10 30 0 20 30 0 ~~~~~ -@subsection occt_draw_6_9 Constraints +@subsection occt_draw_6_9 Projections + +Draw provides commands to project points/curves on curves/surfaces. + +* **proj** projects point on the curve/surface (see @ref occt_draw_6_6_6 "proj command description"); +* **project** projects 3D curve on the surface (see @ref occt_draw_6_2_11 "project command description"); +* **projponf** projects point on the face. + +@subsubsection occt_draw_6_9_1 projponf + +Syntax: +~~~~~ +projponf face pnt [extrema flag: -min/-max/-minmax] [extrema algo: -g(grad)/-t(tree)] +~~~~~ + +**projponf** projects point *pnt* on the face *face*. +You can change the Extrema options: +* To change the Extrema search algorithm use the following options:
+ -g - for Grad algorithm;
+ -t - for Tree algorithm; +* To change the Extrema search solutions use the following options:
+ -min - to look for Min solutions;
+ -max - to look for Max solutions;
+ -minmax - to look for MinMax solutions. + +**Example** +~~~~~ +plane p 0 0 0 0 0 1 +mkface f p +point pnt 5 5 10 + +projponf f pnt +# proj dist = 10 +# uvproj = 5 5 +# pproj = 5 5 0 +~~~~~ + +@subsection occt_draw_6_10 Constraints * **cirtang** constructs 2d circles tangent to curves; * **lintan** constructs 2d lines tangent to curves. -@subsubsection occt_draw_6_9_1 cirtang +@subsubsection occt_draw_6_10_1 cirtang Syntax: ~~~~~ @@ -5595,7 +5632,7 @@ cirtang c p 1 4 == c_1 c_2 ~~~~~ -@subsubsection occt_draw_6_9_2 lintan +@subsubsection occt_draw_6_10_2 lintan Syntax: ~~~~~ @@ -5618,7 +5655,7 @@ line l 2 0 1 1 lintan l1 c1 l 15 ~~~~~ -@subsection occt_draw_6_10 Display +@subsection occt_draw_6_11 Display Draw provides commands to control the display of geometric objects. Some display parameters are used for all objects, others are valid for surfaces only, some for bezier and bspline only, and others for bspline only. @@ -5631,7 +5668,7 @@ On bezier and bspline curve and surface you can toggle the display of the contro On bspline curves and surfaces you can toggle the display of the knots with the **shknots** and **clknots** commands. -@subsubsection occt_draw_6_10_1 dmod, discr, defle +@subsubsection occt_draw_6_11_1 dmod, discr, defle Syntax: ~~~~~ @@ -5658,7 +5695,7 @@ discr 100 dmode c u ~~~~~ -@subsubsection occt_draw_6_10_2 nbiso +@subsubsection occt_draw_6_11_2 nbiso Syntax: ~~~~~ @@ -5675,7 +5712,7 @@ sphere s 20 nbiso s 35 15 ~~~~~ -@subsubsection occt_draw_6_10_3 clpoles, shpoles +@subsubsection occt_draw_6_11_3 clpoles, shpoles Syntax: ~~~~~ @@ -5694,7 +5731,7 @@ beziercurve c 3 0 0 0 10 0 0 10 10 0 clpoles c ~~~~~ -@subsubsection occt_draw_6_10_4 clknots, shknots +@subsubsection occt_draw_6_11_4 clknots, shknots Syntax: ~~~~~ @@ -5931,6 +5968,49 @@ this shape seems to be valid **Note** that this test is performed using the tolerance set in the algorithm. +@subsubsection occt_draw_7_1_6 compare + +Syntax: +~~~~~ +compare shape1 shape2 +~~~~~ + +**compare** compares the two shapes *shape1* and *shape2* using the methods *TopoDS_Shape::IsSame()* and *TopoDS_Shape::IsEqual()*. + +**Example** +~~~~~ +box b1 1 1 1 +copy b1 b2 +compare b1 b2 +# same shapes +# equal shapes + +orientation b2 R +compare b1 b2 +# same shapes + +box b2 1 1 1 +compare b1 b2 +# shapes are not same +~~~~~ + +@subsubsection occt_draw_7_1_7 issubshape + +Syntax: +~~~~~ +issubshape subshape shape +~~~~~ + +**issubshape** checks if the shape *subshape* is sub-shape of the shape *shape* and gets its index in the shape. + +**Example** +~~~~~ +box b 1 1 1 +explode b f +issubshape b_2 b +# b_2 is sub-shape of b. Index in the shape: 2. +~~~~~ + @subsection occt_draw_7_2 Curve and surface topology diff --git a/src/BOPTest/BOPTest.cxx b/src/BOPTest/BOPTest.cxx index 2055ddb5c3..661e8cfcc7 100644 --- a/src/BOPTest/BOPTest.cxx +++ b/src/BOPTest/BOPTest.cxx @@ -18,10 +18,12 @@ #include #include #include +#include #include #include #include #include +#include //======================================================================= //function : AllCommands @@ -64,4 +66,7 @@ void BOPTest::AllCommands(Draw_Interpretor& theCommands) MeshTest::Commands(theCommands); HLRTest::Commands(theCommands); BOPTest::AllCommands(theCommands); + SWDRAW::Init (theCommands); } +// Declare entry point PLUGINFACTORY +DPLUGIN(BOPTest) diff --git a/src/BRepAlgo/BRepAlgo_DSAccess.cxx b/src/BRepAlgo/BRepAlgo_DSAccess.cxx index 1440ccbf9e..f659555a93 100644 --- a/src/BRepAlgo/BRepAlgo_DSAccess.cxx +++ b/src/BRepAlgo/BRepAlgo_DSAccess.cxx @@ -52,9 +52,6 @@ #include #include -#ifdef DRAW -//#include -#endif //======================================================================= //function : Create @@ -145,10 +142,6 @@ void BRepAlgo_DSAccess::Load(TopoDS_Shape& S1, myS1 = S1; myS2 = S2; -#ifdef DRAW -// TestTopOpe::CurrentDS(myHDS); -// TestTopOpe::Shapes(myS1,myS2); -#endif } //======================================================================= diff --git a/src/BRepTest/BRepTest_BasicCommands.cxx b/src/BRepTest/BRepTest_BasicCommands.cxx index b195b67d38..0d0a9ff496 100644 --- a/src/BRepTest/BRepTest_BasicCommands.cxx +++ b/src/BRepTest/BRepTest_BasicCommands.cxx @@ -977,6 +977,83 @@ static Standard_Integer scalexyz(Draw_Interpretor& /*di*/, Standard_Integer n, c return 0; } +//======================================================================= +//function : compareshapes +//purpose : +//======================================================================= +static Standard_Integer compareshapes(Draw_Interpretor& di, + Standard_Integer n, + const char** a) +{ + if (n != 3) { + di << "Compare shapes. Usage: compare shape1 shape2\n"; + return 1; + } + // get shapes + TopoDS_Shape aS1 = DBRep::Get(a[1]); + TopoDS_Shape aS2 = DBRep::Get(a[2]); + // check shapes + if (aS1.IsNull() || aS2.IsNull()) { + di << "null shapes\n"; + return 0; + } + // compare shapes + if (aS1.IsSame(aS2)) { + di << "same shapes\n"; + if (aS1.IsEqual(aS2)) { + di << "equal shapes\n"; + } + } + else { + di << "shapes are not same\n"; + } + return 0; +} + +//======================================================================= +//function : issubshape +//purpose : +//======================================================================= +static Standard_Integer issubshape(Draw_Interpretor& di, + Standard_Integer n, + const char** a) +{ + if (n != 3) { + di << "Check if the shape is sub-shape of other shape and get its index in the shape.\n"; + di << "Usage: issubshape subshape shape\n"; + return 1; + } + // get shapes + TopoDS_Shape aSubShape = DBRep::Get(a[1]); + TopoDS_Shape aShape = DBRep::Get(a[2]); + // check shapes + if (aSubShape.IsNull() || aShape.IsNull()) { + di << "null shapes\n"; + return 0; + } + // find index of the sub-shape in the shape + TopTools_MapOfShape aMShapes; + // try to find the SubShape in Shape + TopExp_Explorer anExp(aShape, aSubShape.ShapeType()); + for (; anExp.More(); anExp.Next()) { + const TopoDS_Shape& aSS = anExp.Current(); + if (aMShapes.Add(aSS)) { + if (aSS.IsSame(aSubShape)) { + break; + } + } + } + // + if (anExp.More()) { + di << a[1] << " is sub-shape of " << a[2] << ". Index in the shape: " << aMShapes.Extent() << ".\n"; + } + else { + di << a[1] << " is NOT sub-shape of " << a[2] << ".\n"; + } + // + return 0; +} + void BRepTest::BasicCommands(Draw_Interpretor& theCommands) { static Standard_Boolean done = Standard_False; @@ -1149,4 +1226,15 @@ void BRepTest::BasicCommands(Draw_Interpretor& theCommands) "scalexyz res shape factor_x factor_y factor_z", __FILE__, scalexyz, g); + + theCommands.Add("compare", + "Compare shapes. Usage: compare shape1 shape2", + __FILE__, + compareshapes, g); + + theCommands.Add("issubshape", + "issubshape subshape shape\n" + "\t\tCheck if the shape is sub-shape of other shape and get its index in the shape.", + __FILE__, + issubshape, g); } diff --git a/src/BRepTest/BRepTest_SurfaceCommands.cxx b/src/BRepTest/BRepTest_SurfaceCommands.cxx index dfe883e83d..2cfd440451 100644 --- a/src/BRepTest/BRepTest_SurfaceCommands.cxx +++ b/src/BRepTest/BRepTest_SurfaceCommands.cxx @@ -45,6 +45,8 @@ #include #include +#include + #ifdef _WIN32 //#define strcasecmp strcmp Already defined #include @@ -575,6 +577,104 @@ static Standard_Integer getedgeregul return 0; // Done } +//======================================================================= +//function : projponf +//purpose : +//======================================================================= +static Standard_Integer projponf(Draw_Interpretor& di, Standard_Integer n, const char** a) +{ + if (n < 3 || n > 5) { + di << "Project point on the face.\n"; + di << "Usage: projponf face pnt [extrema flag: -min/-max/-minmax] [extrema algo: -g(grad)/-t(tree)]\n"; + return 1; + } + // get face + TopoDS_Shape aS = DBRep::Get(a[1]); + if (aS.IsNull()) { + di << "the face is a null shape\n"; + return 0; + } + // + if (aS.ShapeType() != TopAbs_FACE) { + di << "not a face\n"; + return 0; + } + // + const TopoDS_Face& aFace = *(TopoDS_Face*)&aS; + // + // get point + gp_Pnt aP; + DrawTrSurf::GetPoint(a[2], aP); + // + // get projection options + // default values; + Extrema_ExtAlgo anExtAlgo = Extrema_ExtAlgo_Grad; + Extrema_ExtFlag anExtFlag = Extrema_ExtFlag_MINMAX; + // + for (Standard_Integer i = 3; i < n; ++i) { + if (!strcasecmp(a[i], "-min")) { + anExtFlag = Extrema_ExtFlag_MIN; + } + else if (!strcasecmp(a[i], "-max")) { + anExtFlag = Extrema_ExtFlag_MAX; + } + else if (!strcasecmp(a[i], "-minmax")) { + anExtFlag = Extrema_ExtFlag_MINMAX; + } + else if (!strcasecmp(a[i], "-t")) { + anExtAlgo = Extrema_ExtAlgo_Tree; + } + else if (!strcasecmp(a[i], "-g")) { + anExtAlgo = Extrema_ExtAlgo_Grad; + } + } + // + // get surface + TopLoc_Location aLoc; + const Handle(Geom_Surface)& aSurf = BRep_Tool::Surface(aFace, aLoc); + // move point to surface location + aP.Transform(aLoc.Transformation().Inverted()); + // + // get bounds of the surface + Standard_Real aUMin, aUMax, aVMin, aVMax; + aSurf->Bounds(aUMin, aUMax, aVMin, aVMax); + // + // initialize projector + GeomAPI_ProjectPointOnSurf aProjPS; + aProjPS.Init(aSurf, aUMin, aUMax, aVMin, aVMax); + // set the options + aProjPS.SetExtremaAlgo(anExtAlgo); + aProjPS.SetExtremaFlag(anExtFlag); + // perform projection + aProjPS.Perform(aP); + // + if (aProjPS.NbPoints()) { + // lower distance + Standard_Real aDist = aProjPS.LowerDistance(); + // lower distance parameters + Standard_Real U, V; + aProjPS.LowerDistanceParameters(U, V); + // nearest point + gp_Pnt aPProj = aProjPS.NearestPoint(); + // translate projection point to face location + aPProj.Transform(aLoc.Transformation()); + // + // print the projection values + di << "proj dist = " << aDist << "\n"; + di << "uvproj = " << U << " " << V << "\n"; + di << "pproj = " << aPProj.X() << " " << aPProj.Y() << " " << aPProj.Z() << "\n"; + } + else { + if (!aProjPS.IsDone()) { + di << "projection failed\n"; + } + else { + di << "no projection found\n"; + } + } + return 0; +} + //======================================================================= //function : SurfaceCommands //purpose : @@ -630,5 +730,10 @@ void BRepTest::SurfaceCommands(Draw_Interpretor& theCommands) theCommands.Add ("fastsewing", "fastsewing result [-tol ] ", __FILE__, fastsewing, g); theCommands.Add ("getedgeregularity", "getedgeregularity edge face1 [face2]", __FILE__,getedgeregul,g); + + theCommands.Add ("projponf", + "projponf face pnt [extrema flag: -min/-max/-minmax] [extrema algo: -g(grad)/-t(tree)]\n" + "\t\tProject point on the face.", + __FILE__, projponf, g); } diff --git a/src/ChFi3d/ChFi3d_Builder.cxx b/src/ChFi3d/ChFi3d_Builder.cxx index cd1d2658b0..9514f7cc10 100644 --- a/src/ChFi3d/ChFi3d_Builder.cxx +++ b/src/ChFi3d/ChFi3d_Builder.cxx @@ -80,10 +80,6 @@ #include #include -#ifdef DRAW -#include -#include -#endif #ifdef OCCT_DEBUG #include @@ -237,11 +233,6 @@ void ChFi3d_Builder::Compute() TopOpeBRepDS_DataStructure& DStr = myDS->ChangeDS(); done = Standard_True; hasresult=Standard_False; -#ifdef DRAW - TestTopOpe::CurrentDS(myDS); - TopoDS_Shape bids; - TestTopOpe::Shapes(myShape,bids); -#endif // filling of myVDatatMap ChFiDS_ListIteratorOfListOfStripe itel; diff --git a/src/GeomAPI/GeomAPI_ProjectPointOnSurf.hxx b/src/GeomAPI/GeomAPI_ProjectPointOnSurf.hxx index 43dfc11020..2619f446b8 100644 --- a/src/GeomAPI/GeomAPI_ProjectPointOnSurf.hxx +++ b/src/GeomAPI/GeomAPI_ProjectPointOnSurf.hxx @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -84,7 +85,21 @@ public: Standard_EXPORT void Init (const Handle(Geom_Surface)& Surface, const Quantity_Parameter Umin, const Quantity_Parameter Usup, const Quantity_Parameter Vmin, const Quantity_Parameter Vsup, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); Standard_EXPORT void Init (const Handle(Geom_Surface)& Surface, const Quantity_Parameter Umin, const Quantity_Parameter Usup, const Quantity_Parameter Vmin, const Quantity_Parameter Vsup, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); - + + //! Sets the Extrema search algorithm - Grad or Tree.
+ //! By default the Extrema is initialized with Grad algorithm. + void SetExtremaAlgo(const Extrema_ExtAlgo theAlgo) + { + myExtPS.SetAlgo(theAlgo); + } + + //! Sets the Extrema search flag - MIN or MAX or MINMAX.
+ //! By default the Extrema is set to search the MinMax solutions. + void SetExtremaFlag(const Extrema_ExtFlag theExtFlag) + { + myExtPS.SetFlag(theExtFlag); + } + //! Performs the projection of a point on the current surface. Standard_EXPORT void Perform (const gp_Pnt& P); diff --git a/src/IntTools/IntTools_Context.cxx b/src/IntTools/IntTools_Context.cxx index 0ba725b007..903a0e38f9 100644 --- a/src/IntTools/IntTools_Context.cxx +++ b/src/IntTools/IntTools_Context.cxx @@ -282,9 +282,8 @@ GeomAPI_ProjectPointOnSurf& IntTools_Context::ProjPS(const TopoDS_Face& aF) // pProjPS=(GeomAPI_ProjectPointOnSurf*)myAllocator->Allocate(sizeof(GeomAPI_ProjectPointOnSurf)); new (pProjPS) GeomAPI_ProjectPointOnSurf(); - pProjPS->Init(aS ,Umin, Usup, Vmin, Vsup, myPOnSTolerance/*, Extrema_ExtAlgo_Tree*/); - Extrema_ExtPS& anExtAlgo = const_cast(pProjPS->Extrema()); - anExtAlgo.SetFlag(Extrema_ExtFlag_MIN); + pProjPS->Init(aS ,Umin, Usup, Vmin, Vsup, myPOnSTolerance); + pProjPS->SetExtremaFlag(Extrema_ExtFlag_MIN); // anAdr=(Standard_Address)pProjPS; myProjPSMap.Bind(aF, anAdr); diff --git a/src/TKTopTest/PACKAGES b/src/TKTopTest/PACKAGES index e69da69576..90d24dd3c7 100755 --- a/src/TKTopTest/PACKAGES +++ b/src/TKTopTest/PACKAGES @@ -1,6 +1,3 @@ -TestTopOpeDraw -TestTopOpeTools -TestTopOpe BRepTest GeometryTest HLRTest diff --git a/src/TestTopOpe/FILES b/src/TestTopOpe/FILES deleted file mode 100755 index 9b1fe72f57..0000000000 --- a/src/TestTopOpe/FILES +++ /dev/null @@ -1,18 +0,0 @@ -FILES -TestTopOpe.cxx -TestTopOpe.hxx -TestTopOpe_BOOP.cxx -TestTopOpe_BOOP.hxx -TestTopOpe_BOOPCommands.cxx -TestTopOpe_CORCommands.cxx -TestTopOpe_DSF.cxx -TestTopOpe_EditBOOP.cxx -TestTopOpe_HDSCommands.cxx -TestTopOpe_HDSDisplayer.cxx -TestTopOpe_HDSDisplayer.hxx -TestTopOpe_KroBOOP.cxx -TestTopOpe_MesureCommands.cxx -TestTopOpe_MiscBOOP.cxx -TestTopOpe_OtherCommands.cxx -TestTopOpe_VarsTopo.cxx -TestTopOpe_VarsTopo.hxx diff --git a/src/TestTopOpe/TestTopOpe.cxx b/src/TestTopOpe/TestTopOpe.cxx deleted file mode 100644 index b32f08e164..0000000000 --- a/src/TestTopOpe/TestTopOpe.cxx +++ /dev/null @@ -1,111 +0,0 @@ -// Created on: 1994-10-24 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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. - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef _MSC_VER -#pragma warning(4:4190) -#endif - -//======================================================================= -//function : AllCommands -//purpose : -//======================================================================= - -void TestTopOpe::AllCommands(Draw_Interpretor& theCommands) -{ - static Standard_Boolean done = Standard_False; - if (done) return; - - done = Standard_True; - - TestTopOpe::BOOPCommands(theCommands); - TestTopOpe::HDSCommands(theCommands); - TestTopOpe::MesureCommands(theCommands); - TestTopOpe::CORCommands(theCommands); - //TestTopOpe::DSACommands(theCommands); - TestTopOpe::OtherCommands(theCommands); - TestTopOpeTools::AllCommands(theCommands); - TestTopOpeDraw::AllCommands(theCommands); -} - -extern TestTopOpe_HDSDisplayer* PHDSD; -extern TestTopOpe_BOOP* PBOOP; - -//======================================================================= -//function : Shapes -//purpose : -//======================================================================= -void TestTopOpe::Shapes(const TopoDS_Shape& S1,const TopoDS_Shape& S2) -{ - if (PHDSD != NULL) { PHDSD->SetShape1(S1);PHDSD->SetShape2(S2); } - if (PBOOP != NULL) { PBOOP->SetShape1(S1);PBOOP->SetShape2(S2); } -} - -//======================================================================= -//function : CurrentHDS -//purpose : -//======================================================================= -void TestTopOpe::CurrentDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS) -{ - if (PHDSD != NULL) { PHDSD->SetCurrentHDS(HDS); } - if (PBOOP != NULL) { PBOOP->SetCurrentHDS(HDS); } -} - -//======================================================================= -//function : CurrentHB -//purpose : -//======================================================================= -void TestTopOpe::CurrentHB(const Handle(TopOpeBRepBuild_HBuilder)& HB) -{ - if (PBOOP != NULL) { PBOOP->SetCurrentHB(HB); } -} - -//============================================================================== -// TestTopOpe::Factory -//============================================================================== -void TestTopOpe::Factory(Draw_Interpretor& theDI) -{ - static Standard_Boolean FactoryDone = Standard_False; - if (FactoryDone) return; - - FactoryDone = Standard_True; - - TestTopOpe::AllCommands(theDI); - - BOPTest::Factory(theDI); - - SWDRAW::Init (theDI); - -#ifdef OCCT_DEBUG - cout << "Draw Plugin : All topological operations kernel commands are loaded" << endl; -#endif -} -// Declare entry point PLUGINFACTORY -DPLUGIN(TestTopOpe) diff --git a/src/TestTopOpe/TestTopOpe.hxx b/src/TestTopOpe/TestTopOpe.hxx deleted file mode 100644 index dfd74a620a..0000000000 --- a/src/TestTopOpe/TestTopOpe.hxx +++ /dev/null @@ -1,91 +0,0 @@ -// Created on: 1996-10-21 -// Created by: Jean Yves LEBEY -// Copyright (c) 1996-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. - -#ifndef _TestTopOpe_HeaderFile -#define _TestTopOpe_HeaderFile - -#include -#include -#include - -#include -class TopOpeBRepBuild_HBuilder; -class TopOpeBRepDS_HDataStructure; -class TopoDS_Shape; - - - -class TestTopOpe -{ -public: - - DEFINE_STANDARD_ALLOC - - - //! Defines all Top. Ope. test commands - Standard_EXPORT static void AllCommands (Draw_Interpretor& I); - - Standard_EXPORT static void TOPOCommands (Draw_Interpretor& I); - - Standard_EXPORT static void BOOPCommands (Draw_Interpretor& I); - - //! commands on a HDS involved in topological operations - Standard_EXPORT static void HDSCommands (Draw_Interpretor& I); - - //! Defines the HBuilder on which BOOPCommands will operate. - Standard_EXPORT static void CurrentHB (const Handle(TopOpeBRepBuild_HBuilder)& HDS); - - //! Defines the HDS on which HDSCommands/BOOPCommands will operate. - Standard_EXPORT static void CurrentDS (const Handle(TopOpeBRepDS_HDataStructure)& HDS); - - //! Defines current shapes of current topological operation - Standard_EXPORT static void Shapes (const TopoDS_Shape& S1, const TopoDS_Shape& S2); - - Standard_EXPORT static void MesureCommands (Draw_Interpretor& I); - - Standard_EXPORT static void CORCommands (Draw_Interpretor& I); - - Standard_EXPORT static void DSACommands (Draw_Interpretor& I); - - Standard_EXPORT static void OtherCommands (Draw_Interpretor& I); - - //! Loads all Draw commands of TKDrawDEB. Used for plugin. - Standard_EXPORT static void Factory (Draw_Interpretor& theDI); - - - - -protected: - - - - - -private: - - - - - -}; - - - - - - - -#endif // _TestTopOpe_HeaderFile diff --git a/src/TestTopOpe/TestTopOpe_BOOP.cxx b/src/TestTopOpe/TestTopOpe_BOOP.cxx deleted file mode 100644 index 0d9d43878c..0000000000 --- a/src/TestTopOpe/TestTopOpe_BOOP.cxx +++ /dev/null @@ -1,493 +0,0 @@ -// Created on: 1996-02-05 -// Created by: Jea Yves LEBEY -// Copyright (c) 1996-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. - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef _WIN32 -Standard_IMPORT Draw_Viewer dout; -#endif - -extern Standard_Integer TOPOPE_SeeShape(char *name); - -#ifdef OCCT_DEBUG -#include -extern Standard_Boolean TopOpeBRepTool_GettraceKRO(); -extern void PrintKRO_PREPA(); -#endif - -Standard_Integer TestTopOpe_BOOP::Prepare(const char* ns1,const char* ns2) -{ - Standard_Integer anErrorCode = 0; - anErrorCode = LoadShapes(ns1,ns2); // mylastPREP is 0 - if (anErrorCode) - return anErrorCode; - - anErrorCode = LoadnewDS(); // mylastPREP is 100 - if (anErrorCode) - return anErrorCode; - - anErrorCode = DSF_Insert(); // mylastPREP is (100,200) - if (anErrorCode) - return anErrorCode; - - anErrorCode = LoadnewHB(); // mylastPREP is 200 - if (anErrorCode) - return anErrorCode; - - anErrorCode = Builder_Perform(); // mylastPREP is (200,300) - return anErrorCode; -} - -Standard_Integer TestTopOpe_BOOP::LoadShapes(const char* ns1, const char* ns2) -{ - if (ns1==NULL) return 1;TopoDS_Shape S1=DBRep::Get(ns1);if (S1.IsNull()) return 1; - if (ns2==NULL) return 1;TopoDS_Shape S2=DBRep::Get(ns2);if (S2.IsNull()) return 1; - SetShape1(S1); mynameS1 = ns1; - SetShape2(S2); mynameS2 = ns2; - mylastPREP = 0; - return 0; -} - -Standard_Integer TestTopOpe_BOOP::LoadnewDS() -{ - myHDS = new TopOpeBRepDS_HDataStructure(); - TestTopOpe::Shapes(myS1,myS2); - TestTopOpe::CurrentDS(myHDS); - if (myPDSF != NULL) { free((TopOpeBRep_DSFiller*)myPDSF); myPDSF = NULL; } - myPDSF = new TopOpeBRep_DSFiller(); - mylastPREP = 100; - return 0; -} - -Standard_Integer TestTopOpe_BOOP::DSF_Insert() -{ - TopOpeBRep_DSFiller DSF; - DSF_Insert(DSF); - mylastPREP = 190; - return 0; -} - -Standard_Integer TestTopOpe_BOOP::LoadnewHB() -{ - TopOpeBRepTool_GeomTool GT; - Standard_Boolean c2d = myVarsTopo.GetC2D(); - GT.Define(myVarsTopo.GetOCT(),Standard_True,c2d, c2d); - Standard_Real t3,t2; myVarsTopo.GetTolx(t3,t2); - GT.SetTolerances(t3,t2); - TopOpeBRepDS_BuildTool BT(GT); - myHB = new TopOpeBRepBuild_HBuilder(BT); - mylastPREP = 200; - return 0; -} - -Standard_Integer TestTopOpe_BOOP::Builder_Perform() -{ - myHB->Perform(myHDS,myS1,myS2); -#ifdef OCCT_DEBUG - if ( TopOpeBRepTool_GettraceKRO() ) PrintKRO_PREPA(); -#endif - myESP = myHDS->EdgesSameParameter(); - myPREPdone = Standard_True; - myBOOdone = Standard_False; - mylastPREP = 290; - return 0; -} - -Standard_Integer TestTopOpe_BOOP::FaceFilter() -{ - TopOpeBRepDS_Filter F(myHDS); - F.ProcessFaceInterferences(myHB->ChangeBuilder().MSplit(TopAbs_ON)); - return 0; -} - -Standard_Integer TestTopOpe_BOOP::FaceReducer() -{ - TopOpeBRepDS_Reducer R(myHDS); - R.ProcessFaceInterferences(myHB->ChangeBuilder().MSplit(TopAbs_ON)); - return 0; -} - -Standard_Boolean TestTopOpe_BOOP::CheckBooope(const char* key) -{ - Standard_Boolean res = Standard_True; - Operation_t o = Operation(key); - if (o == BOOP_UND) return Standard_False; - - if ( !myPREPdone) { - cout<<"pas de preparation"<NbShapes(); - Standard_Integer i1 = 0, i2 = 0; - if (is != 0) { - if (is > ns || ns < 1) { - cout<<"index "<Shape(ids).ShapeType(),ix)<<" of "<Shape(ids).ShapeType(),ix)<<" of "<Shape(ids); - Standard_Integer i = FindShape(S,Sref); - return i; -} - -Standard_Integer TestTopOpe_BOOP::FindShape(const TopoDS_Shape& S,const TopoDS_Shape& Sref) -{ - if (Sref.IsNull()) return 0; TopExp_Explorer x; Standard_Integer i; - for (i=1,x.Init(Sref,S.ShapeType());x.More();x.Next(),i++) - if (x.Current().IsSame(S)) return i; - return 0; -} - -void TestTopOpe_BOOP::Booope(const char* key,const char *namres) -{ - Standard_Boolean res = CheckBooope(key); - if (!res) return; - if (myHB.IsNull()) return; - - Operation_t o = Operation(key); - - if (o == BOOP_SECC || o == BOOP_SECE || o == BOOP_SEC) { - Standard_Integer k; - if (o == BOOP_SECC) k = 1; // section sur courbes - else if (o == BOOP_SECE) k = 2; // section sur aretes - else if (o == BOOP_SEC) k = 3; // toutes sections - else return; - TopTools_ListOfShape LE; myHB->InitSection(k); - for (;myHB->MoreSection();myHB->NextSection()) - LE.Append(myHB->CurrentSection()); - MakeResult(LE); StoreResult(key,namres); - } - - else if (o == BOOP_C12 || o == BOOP_C21 || o == BOOP_COM || o == BOOP_FUS) { - - TopAbs_State t1=TopAbs_UNKNOWN,t2=TopAbs_UNKNOWN; - if (o == BOOP_C12) { t1 = TopAbs_OUT; t2 = TopAbs_IN; } - else if (o == BOOP_C21) { t1 = TopAbs_IN; t2 = TopAbs_OUT; } - else if (o == BOOP_COM) { t1 = TopAbs_IN; t2 = TopAbs_IN; } - else if (o == BOOP_FUS) { t1 = TopAbs_OUT; t2 = TopAbs_OUT; } - - if((myS2type > TopAbs_WIRE) && (o == BOOP_COM)) { - BRepAlgo_BooleanOperations babo; - babo.Shapes2d(myS1,myS2); - TestTopOpe::CurrentDS(babo.DataStructure()); - babo.Common(); - myHB = babo.Builder(); - const TopTools_ListOfShape& LE = myHB->Splits(myS2, TopAbs_IN); - MakeResult(LE); StoreResult(key,namres); - return; - } - - myHB->Clear(); - myHB->MergeShapes(myS1,t1,myS2,t2); - cout<<"MergeShapes done"<Merged(myS1,t1); - MakeResult(L1); - StoreResult(key,namres); - } - - myBOOdone = Standard_True; -} - -void TestTopOpe_BOOP::ClearResult() -{ - BRep_Builder BB; - BB.MakeCompound(myCresult); - myNresult = 0; -} - -void TestTopOpe_BOOP::AddResult(const TopTools_ListOfShape& L) -{ - BRep_Builder BB; - TopTools_ListIteratorOfListOfShape it(L); - for (; it.More(); it.Next(), myNresult++) BB.Add(myCresult,it.Value()); -} - -void TestTopOpe_BOOP::MakeResult(const TopTools_ListOfShape& L) -{ - ClearResult(); - AddResult(L); -} - -void TestTopOpe_BOOP::StoreResult -(const char* key,const char* namres, char* extent) const -{ - const char* nam = (namres == NULL) ? myresnamdef : namres; - if (nam == NULL) return; - char na[100]; strcpy(na,nam);if (extent!=NULL) strcat(na,extent); - - if (Operation(key) != BOOP_SEC && myVarsTopo.GetClear()) dout.Clear(); - DBRep::Set(na,myCresult); - if (key != NULL) { - cout<<"("<DataStructure().IsNull() ) return; - ClearResult(); - Standard_Integer ns = myHB->DataStructure()->DS().NbShapes(); - for (Standard_Integer is = 1; is <= ns; is++) { - const TopoDS_Shape& S = myHB->DataStructure()->Shape(is); - Standard_Boolean issplit = myHB->IsSplit(S,sta); - if (issplit) { - GetSplit(typ,sta,is); - } - } -} - -void TestTopOpe_BOOP::GetSplit(const TopAbs_ShapeEnum typ, - const TopAbs_State sta, - const Standard_Integer isha) -{ - if (isha == 0) return; - if ( myHB.IsNull() ) return; - if ( myHB->DataStructure().IsNull() ) return; - const TopoDS_Shape& S = myHB->DataStructure()->Shape(isha); - if (S.IsNull()) { cout<<"shape "<IsSplit(S,sta); - if (issplit) { - const TopTools_ListOfShape& LS = myHB->Splits(S,sta); - ClearResult(); - AddResult(LS); - TCollection_AsciiString namres; - - if (typ==TopAbs_EDGE) namres = "e"; - else if (typ==TopAbs_FACE) namres = "f"; - else if (typ==TopAbs_SOLID) namres = "s"; - namres += TCollection_AsciiString(isha); -// namres += "sp"; - if (sta==TopAbs_IN) namres += "in"; - else if (sta==TopAbs_OUT) namres += "ou"; - else if (sta==TopAbs_ON) namres += "on"; - - cout< "<DataStructure().IsNull() ) return; - const TopoDS_Shape& S = myHB->DataStructure()->Shape(isha); - if (S.IsNull()) { cout<<"shape "<IsSplit(S,sta); - if (issplit) { - GetSplit(typ,sta,isha); - } -} - -void TestTopOpe_BOOP::GetSplit(const Standard_Integer isha) -{ - if (isha == 0) return; - if ( myHB.IsNull() ) return; - if ( myHB->DataStructure().IsNull() ) return; - const TopoDS_Shape& S = myHB->DataStructure()->Shape(isha); - if (S.IsNull()) { cout<<"shape "<DataStructure().IsNull() ) return; - GetSplit(TopAbs_SOLID,sta); - GetSplit(TopAbs_FACE,sta); - GetSplit(TopAbs_EDGE,sta); -} - -void TestTopOpe_BOOP::GetMerged(const TopAbs_ShapeEnum typ,const TopAbs_State sta) -{ - if ( myHB.IsNull() ) return; - if ( myHB->DataStructure().IsNull() ) return; - ClearResult(); - Standard_Integer ns = myHB->DataStructure()->DS().NbShapes(); - for (Standard_Integer is = 1; is <= ns; is++) { - const TopoDS_Shape& S = myHB->DataStructure()->Shape(is); - Standard_Boolean isMerged = myHB->IsMerged(S,sta); - if (isMerged) { - GetMerged(typ,sta,is); - } - } -} - -void TestTopOpe_BOOP::GetMerged(const TopAbs_ShapeEnum typ,const TopAbs_State sta,const Standard_Integer isha) -{ - if (isha == 0) return; - if ( myHB.IsNull() ) return; - if ( myHB->DataStructure().IsNull() ) return; - const TopoDS_Shape& S = myHB->DataStructure()->Shape(isha); - if (S.IsNull()) { cout<<"shape "<IsMerged(S,sta); - if (isMerged) { - const TopTools_ListOfShape& LS = myHB->Merged(S,sta); - ClearResult(); - AddResult(LS); - TCollection_AsciiString namres; - - if (typ==TopAbs_EDGE) namres = "e"; - else if (typ==TopAbs_FACE) namres = "f"; - else if (typ==TopAbs_SOLID) namres = "s"; - namres += TCollection_AsciiString(isha); - namres += "me"; - if (sta==TopAbs_IN) namres += "IN"; - else if (sta==TopAbs_OUT) namres += "OUT"; - else if (sta==TopAbs_ON) namres += "ON"; - - cout< "<DataStructure().IsNull() ) return; - const TopoDS_Shape& S = myHB->DataStructure()->Shape(isha); - if (S.IsNull()) { cout<<"shape "<IsMerged(S,sta); - if (isMerged) { - GetMerged(typ,sta,isha); - } -} - -void TestTopOpe_BOOP::GetMerged(const Standard_Integer isha) -{ - if (isha == 0) return; - if ( myHB.IsNull() ) return; - if ( myHB->DataStructure().IsNull() ) return; - const TopoDS_Shape& S = myHB->DataStructure()->Shape(isha); - if (S.IsNull()) { cout<<"shape "<DataStructure().IsNull() ) return; - GetMerged(TopAbs_SOLID,sta); - GetMerged(TopAbs_FACE,sta); - GetMerged(TopAbs_EDGE,sta); -} - -// NYI void ChkIntg(); -// NYI void ChkIntgInterf(); -// NYI void ChkIntgSamDomain(); -// NYI void ChkVertex(); diff --git a/src/TestTopOpe/TestTopOpe_BOOP.hxx b/src/TestTopOpe/TestTopOpe_BOOP.hxx deleted file mode 100644 index 285cf6da45..0000000000 --- a/src/TestTopOpe/TestTopOpe_BOOP.hxx +++ /dev/null @@ -1,137 +0,0 @@ -// Created on: 1996-02-05 -// Created by: Jean Yves LEBEY -// Copyright (c) 1996-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. - -#ifndef _TestTopOpe_BOOP_HeaderFile -#define _TestTopOpe_BOOP_HeaderFile - -#include -#include -#include -#include -#include -#include - -#define TESTTOPOPE_NKEYS 8 -enum Operation_t {BOOP_UND = -1,BOOP_TOPX = 0,BOOP_SECC = 1,BOOP_SECE = 2,BOOP_SEC = 3, - BOOP_COM = 4,BOOP_C12 = 5,BOOP_C21 = 6,BOOP_FUS = 7} ; - -#define TESTTOPOPE_NTKEYS 20 - -class TestTopOpe_BOOP { - -public: - - TestTopOpe_BOOP(const char*[],const char* resnamdef); - Operation_t Operation(const char* key) const; - Standard_Boolean IsBooope(const char* key) const; - - void Tinit(); - const TCollection_AsciiString& Tkeys(const Standard_Integer ik) const; - const TCollection_AsciiString& Thelp(const Standard_Integer ik) const; - Standard_Integer Tstep(const TCollection_AsciiString& s) const; - Standard_Integer Tnb() const; - Standard_Boolean Tadd(const TCollection_AsciiString& k,const Standard_Integer ic,const TCollection_AsciiString& h); - - VarsTopo& ChangeVarsTopo(); - void SetCurrentHB(const Handle(TopOpeBRepBuild_HBuilder)& HB); - void SetCurrentHDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS); - void SetShape1(const TopoDS_Shape& S); - void SetShape2(const TopoDS_Shape& S); - Handle(TopOpeBRepBuild_HBuilder)& ChangeCurrentHB(); - Handle(TopOpeBRepDS_HDataStructure)& ChangeCurrentDS(); - TopoDS_Shape& ChangeShape1(); - TopoDS_Shape& ChangeShape2(); - const TCollection_AsciiString& nameS1() const; - const TCollection_AsciiString& nameS2() const; - // - Standard_Integer Prepare(const char* ns1,const char* ns2); - Standard_Integer LoadShapes(const char* ns1,const char* ns2); - Standard_Integer LoadnewDS(); - Standard_Integer DSF_SetInterTolerances(TopOpeBRep_DSFiller& DSF); // - Standard_Integer DSF_Insert(); // - Standard_Integer DSF_Insert(TopOpeBRep_DSFiller& DSF); - Standard_Integer DSF_Insert_InsertIntersection(TopOpeBRep_DSFiller& DSF); - Standard_Integer DSF_Insert_Complete_GapFiller(TopOpeBRep_DSFiller& DSF); - Standard_Integer DSF_Insert_Complete_CompleteDS(TopOpeBRep_DSFiller& DSF); - Standard_Integer DSF_Insert_Complete_Filter(TopOpeBRep_DSFiller& DSF); - Standard_Integer DSF_Insert_Complete_Reducer(TopOpeBRep_DSFiller& DSF); - Standard_Integer DSF_Insert_Complete_RemoveUnsharedGeometry(TopOpeBRep_DSFiller& DSF); - Standard_Integer DSF_Insert_Complete_Checker(TopOpeBRep_DSFiller& DSF); - Standard_Integer LoadnewHB(); - Standard_Integer Builder_Perform(); - Standard_Integer FaceFilter(); - Standard_Integer FaceReducer(); - // - void SetTol(const TopOpeBRepDS_Kind K,const Standard_Integer index,const Standard_Real tol); - void SetTol(const Standard_Integer index,const Standard_Real tol); - void SetPnt(const Standard_Integer index,const Standard_Real x,const Standard_Real y,const Standard_Real z); - - void Booope(const char* key, const char* namres); - void GetSplit(const TopAbs_ShapeEnum Typ,const TopAbs_State sta); - void GetSplit(const TopAbs_ShapeEnum Typ,const TopAbs_State sta,const Standard_Integer is); - void GetSplit(const TopAbs_State sta,const Standard_Integer is); - void GetSplit(const TopAbs_State sta); - void GetSplit(const Standard_Integer is); - - void GetMerged(const TopAbs_ShapeEnum Typ,const TopAbs_State sta); - void GetMerged(const TopAbs_ShapeEnum Typ,const TopAbs_State sta,const Standard_Integer is); - void GetMerged(const TopAbs_State sta,const Standard_Integer is); - void GetMerged(const TopAbs_State sta); - void GetMerged(const Standard_Integer is); - - void ClearResult(); - void AddResult(const TopTools_ListOfShape& L); - void MakeResult(const TopTools_ListOfShape& L); - void StoreResult(const char* key, const char* namres, char* extent=NULL) const; - const Handle(TopOpeBRepBuild_HBuilder)& HBuilder() const; - void SetMode(const Standard_Integer mode); - Standard_Integer GetMode() const; - Standard_Boolean CheckBooope(const char* key); - Standard_Integer FindShape(const TCollection_AsciiString& str); - Standard_Integer FindShape(const Standard_Integer ids,const TopoDS_Shape& Sref); - Standard_Integer FindShape(const TopoDS_Shape& S,const TopoDS_Shape& Sref); - - Standard_Integer mylastPREP; - Standard_Integer mytodoPREP; - Standard_Integer mymet[100]; - Standard_Integer mynmet; - TopOpeBRep_DSFiller* myPDSF; - -private: - - const char* mykeys[TESTTOPOPE_NKEYS]; - const char* myresnamdef; - VarsTopo myVarsTopo; - Handle(TopOpeBRepDS_HDataStructure) myHDS; - Handle(TopOpeBRepBuild_HBuilder) myHB; - TCollection_AsciiString mynameS1,mynameS2; - TopoDS_Shape myS1,myS2; - TopAbs_ShapeEnum myS1type,myS2type; - Standard_Boolean myESP; - Standard_Boolean myPREPdone; - TopoDS_Compound myCresult; - Standard_Integer myNresult; - Standard_Boolean myBOOdone; - - Standard_Integer mycomn; - TCollection_AsciiString mycomk[TESTTOPOPE_NTKEYS]; - TCollection_AsciiString mycomh[TESTTOPOPE_NTKEYS]; - Standard_Integer mycomi[TESTTOPOPE_NTKEYS]; -}; - -#define ISINTEGER(Mstr) ((strspn((Mstr),"0123456789")==strlen((Mstr)))) - -#endif diff --git a/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx b/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx deleted file mode 100644 index 36a8db520f..0000000000 --- a/src/TestTopOpe/TestTopOpe_BOOPCommands.cxx +++ /dev/null @@ -1,631 +0,0 @@ -// Created on: 1996-10-21 -// Created by: Jean Yves LEBEY -// Copyright (c) 1996-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. - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -extern void suppressarg(Standard_Integer& na,const char** a,const Standard_Integer d); -#ifdef OCCT_DEBUG -extern void TopOpeBRepTool_SettraceEND(const Standard_Boolean); -extern Standard_Boolean TopOpeBRepTool_GettraceEND(); -#endif - -static const char* kboo[TESTTOPOPE_NKEYS] = {"topo","secc","sece","sec","com","c12","c21","fus"}; -static TestTopOpe_BOOP LOCALBOOP(kboo, "r"); -TestTopOpe_BOOP* PBOOP=&LOCALBOOP; - -void CATIND -(TCollection_AsciiString& s,const Standard_Integer I,const TCollection_AsciiString& a,const TCollection_AsciiString& b) {s=s+a+TCollection_AsciiString(I)+b;} -void CATSHA -(TCollection_AsciiString& s,const TopoDS_Shape& S,const TopOpeBRepDS_DataStructure& BDS,const TCollection_AsciiString& a,const TCollection_AsciiString& b) -{if (S.IsNull()) return;::CATIND(s,BDS.Shape(S),a,b);} -void CATLOSHA -(TCollection_AsciiString& s,const TopTools_ListOfShape& L,const TopOpeBRepDS_DataStructure& BDS,const TCollection_AsciiString& a,const TCollection_AsciiString& aa,const TCollection_AsciiString& bb,const TCollection_AsciiString& b) -{ - if (!L.Extent()) return; - s=s+a;for(TopTools_ListIteratorOfListOfShape i(L);i.More();i.Next())::CATSHA(s,i.Value(),BDS,aa,bb);s=s+b; -} - -Standard_Integer TOPOCHKCOMMANDS(TestTopOpe_BOOP& P,Standard_Integer na,const char**a); -Standard_Integer TOPOSETCOMMANDS(TestTopOpe_BOOP& P,Standard_Integer na,const char**a, Draw_Interpretor& di); -Standard_Integer TOPOCOMMANDS(TestTopOpe_BOOP& PT,Standard_Integer na,const char**a, Draw_Interpretor& di); - -// ---------------------------------------------------------------------- -Standard_Integer TOPOC(Draw_Interpretor& interpretor,Standard_Integer na,const char** a) -{ - if (PBOOP == NULL) return 0; - Standard_Integer err=0, i; - - if (!strncmp(a[0],kboo[BOOP_TOPX],4)) { - err = TOPOCOMMANDS((*PBOOP),na,a,interpretor); - return err; - } - else if (PBOOP->IsBooope(a[0])) { - PBOOP->Booope(a[0],(na >= 2) ? a[1] : NULL); - return 0; - } - else if (!strcmp(a[0],"toposet")) { - err = TOPOSETCOMMANDS((*PBOOP),na,a,interpretor); - return err; - } - else if (!strcmp(a[0],"tsp") ) { - TopAbs_State sta = TopAbs_UNKNOWN; - if (na >= 2) { - if (!strcmp(a[1],"IN")) sta = TopAbs_IN; - else if (!strcmp(a[1],"OUT")) sta = TopAbs_OUT; - else if (!strcmp(a[1],"ON")) sta = TopAbs_ON; - - if (sta != TopAbs_UNKNOWN) { - if (na==2) { PBOOP->GetSplit(sta); } // tsp IN/ON/OUT - else if ( na > 2 ) { - TopAbs_ShapeEnum typ = TopAbs_SHAPE; - if (!strcmp(a[2],"e")) typ = TopAbs_EDGE; - else if (!strcmp(a[2],"f")) typ = TopAbs_FACE; - else if (!strcmp(a[2],"s")) typ = TopAbs_SOLID; - if (typ != TopAbs_SHAPE) { - if (na == 3) { - // tsp IN/ON/OUT e/f/s - PBOOP->GetSplit(typ,sta); - } - else if (na > 3) { - // tsp IN/ON/OUT e/f/s i1 i2 ... - for(i=3;iGetSplit(typ,sta,Draw::Atoi(a[i])); - } - } - else { - // tsp IN/ON/OUT i1 i2 ... - for(i=2;iGetSplit(sta,Draw::Atoi(a[i])); - } - } - } - else { // tsp i1 i2 ... - for (i = 1; i < na; i++) { - if ( ISINTEGER(a[i]) ) PBOOP->GetSplit(Draw::Atoi(a[i])); - } - } - } - else { - PBOOP->GetSplit(TopAbs_IN); - PBOOP->GetSplit(TopAbs_ON); - PBOOP->GetSplit(TopAbs_OUT); - } // tsp - } // arg0 = tsp - - else if (!strcmp(a[0],"tme") ) { - TopAbs_State sta = TopAbs_UNKNOWN; - if (na >= 2) { - if (!strcmp(a[1],"IN")) sta = TopAbs_IN; - else if (!strcmp(a[1],"OUT")) sta = TopAbs_OUT; - else if (!strcmp(a[1],"ON")) sta = TopAbs_ON; - - if (sta != TopAbs_UNKNOWN) { - if (na==2) { PBOOP->GetMerged(sta); } // tme IN/ON/OUT - else if ( na > 2 ) { - TopAbs_ShapeEnum typ = TopAbs_SHAPE; - if (!strcmp(a[2],"e")) typ = TopAbs_EDGE; - else if (!strcmp(a[2],"f")) typ = TopAbs_FACE; - else if (!strcmp(a[2],"s")) typ = TopAbs_SOLID; - if (typ != TopAbs_SHAPE) { - if (na == 3) { - // tme IN/ON/OUT e/f/s - PBOOP->GetMerged(typ,sta); - } - else if (na > 3) { - // tme IN/ON/OUT e/f/s i1 i2 ... - for(i=3;iGetMerged(typ,sta,Draw::Atoi(a[i])); - } - } - else { - // tme IN/ON/OUT i1 i2 ... - for(i=2;iGetMerged(sta,Draw::Atoi(a[i])); - } - } - } - else { // tme i1 i2 ... - for (i = 1; i < na; i++) { - if ( ISINTEGER(a[i]) ) PBOOP->GetMerged(Draw::Atoi(a[i])); - } - } - } - else { - PBOOP->GetMerged(TopAbs_IN); - PBOOP->GetMerged(TopAbs_ON); - PBOOP->GetMerged(TopAbs_OUT); - } // tme - } // arg0 = tme - - else if (!strcmp(a[0],"csecanc") ) { - Standard_Integer ia; - - Standard_Boolean outdraw = Standard_False,outclear = Standard_False,outAB = Standard_False; - for (ia=1; iaHBuilder(); - Handle(TopOpeBRepDS_HDataStructure) HDS = HB->DataStructure(); - const TopOpeBRepDS_DataStructure& BDS = HDS->DS(); - const TopTools_ListOfShape& loe = HB->Section(); - - Standard_Boolean onedef = Standard_False; - Standard_Integer n = loe.Extent(); - Handle(TColStd_HArray1OfBoolean) tabloe = new TColStd_HArray1OfBoolean(1,n,Standard_False); - for (ia=1; ia=1 && ie<=n) { onedef = Standard_True; tabloe->SetValue(ie,Standard_True); } - } - if (!onedef) tabloe->Init(Standard_True); - - TopTools_ListIteratorOfListOfShape itloe(loe); - for (Standard_Integer ie=1;itloe.More();itloe.Next(),ie++) { - if (!tabloe->Value(ie)) continue; - const TopoDS_Shape& es = itloe.Value(); - TopoDS_Shape F1,F2; Standard_Integer IC; TopTools_ListOfShape LF1,LF2,LE1,LE2; - Standard_Boolean eca = HB->EdgeCurveAncestors(es,F1,F2,IC); - Standard_Boolean esa = HB->EdgeSectionAncestors(es,LF1,LF2,LE1,LE2); - TCollection_AsciiString namie("se"); namie = namie + TCollection_AsciiString(ie); - DBRep::Set(namie.ToCString(),es); - if (eca) { - TCollection_AsciiString s; - - if (outdraw) { - if (outclear) s = s + "clear; "; - ::CATSHA(s,F1,BDS,"tsee f ","; "); - ::CATSHA(s,F2,BDS,"tsee f ","; "); - ::CATIND(s,IC,"tsee c ","; "); - s = s + "cdins " + namie; - interpretor<= 2 ) TopOpeBRepTool_BOOOPE_CHECK_DEB = (Draw::Atoi(a[1])) ? 1 : 0; - return 0; - } - return 0; -} -#else -Standard_Integer BOOPCHK(Draw_Interpretor& ,Standard_Integer,const char**) {return 0;} -#endif - -// ---------------------------------------------------- -Standard_Integer TOPOSETCOMMANDS(TestTopOpe_BOOP& PT,Standard_Integer na,const char** a, Draw_Interpretor& di) -{ - switch(na) { - case 1: - di<<"toposet \n"; - di<<"toposet \n"; - di<<"kind = p | c | s | v | e | f | w \n"; - return 1; - case 4: - if(!strcasecmp(a[1],"p")) - PT.SetTol(TopOpeBRepDS_POINT,Draw::Atoi(a[2]),Draw::Atof(a[3])); - else if(!strcasecmp(a[1],"c"))// c ou C - PT.SetTol(TopOpeBRepDS_CURVE,Draw::Atoi(a[2]),Draw::Atof(a[3])); - else if(!strcasecmp(a[1],"s")) - PT.SetTol(TopOpeBRepDS_SURFACE,Draw::Atoi(a[2]),Draw::Atof(a[3])); - else if(!strcasecmp(a[1],"sh") || - !strcasecmp(a[1],"v") || - !strcasecmp(a[1],"e") || - !strcasecmp(a[1],"f") || - !strcasecmp(a[1],"w")) - PT.SetTol(Draw::Atoi(a[2]),Draw::Atof(a[3])); - break; - case 6: - if(!strcasecmp(a[1],"p")) - PT.SetPnt(Draw::Atoi(a[2]),Draw::Atof(a[3]),Draw::Atof(a[4]),Draw::Atof(a[5])); - else - return 1; - break; - default: - break; - } // switch na - return 0; -} - -// ----------------------------------------------------- -void TOPOHELP(TestTopOpe_BOOP& PT, Draw_Interpretor& di) -{ - di<<"\n"; - di<<"Help on topo command :\n"; - di<<"----------------------\n"; - for (Standard_Integer ic=0;ic among input shapes (exploration index)\n"; - di<<"-v [0]/1 : do not trace / trace methods name\n"; - di<<"-d : dump all control variables\n"; - di<<"-i : initialize control variables to default values\n"; - di<<"-h : help\n"; - di<<"----------------------\n"; -} - -// ------------------------------------------------------- -Standard_Integer VARSTOPOARGS(TestTopOpe_BOOP& PT,Standard_Integer& na,const char** a, Draw_Interpretor& di) -{ - VarsTopo& VT = PT.ChangeVarsTopo(); - - Standard_Boolean dump = Standard_False; - Standard_Boolean help = Standard_False; - Standard_Integer ia = 1; - while (ia < na) { - const char *thea = a[ia]; - if (!strcmp(thea,"-f")) { - suppressarg(na,a,ia); - if (ia < na) { - PT.FindShape(a[ia]); - suppressarg(na,a,ia); - } - else { - PT.FindShape(0); - } - } - else if (!strcasecmp(thea,"-2d")) { - VT.SetC2D(Standard_True); - suppressarg(na,a,ia); - } - else if (!strcasecmp(thea,"-no2d")){ - VT.SetC2D(Standard_False); - suppressarg(na,a,ia); - } - else if (!strcasecmp(thea,"-a")) { - VT.SetOCT(TopOpeBRepTool_APPROX); - suppressarg(na,a,ia); - } - else if (!strcasecmp(thea,"-p")) { - VT.SetOCT(TopOpeBRepTool_BSPLINE1); - suppressarg(na,a,ia); - } - else if (!strcmp(thea,"-tx")) { - suppressarg(na,a,ia); - if (ia + 1 < na) { - VT.SetTolx(Draw::Atof(a[ia]),Draw::Atof(a[ia + 1])); - suppressarg(na,a,ia); - suppressarg(na,a,ia); - } - else if (ia < na) { - if (!strcmp(a[ia],"default")) { - VT.SetTolxDef(); - suppressarg(na,a,ia); - } - else { - VT.SetTolx(Draw::Atof(a[ia]),Draw::Atof(a[ia])); - suppressarg(na,a,ia); - } - } - } - else if (!strcmp(thea,"-ti")) { - suppressarg(na,a,ia); - if (ia + 1 < na) { - VT.SetToli(Draw::Atof(a[ia]),Draw::Atof(a[ia + 1])); - suppressarg(na,a,ia); - suppressarg(na,a,ia); - } - else if (ia < na) { - if (!strcmp(a[ia],"shape")) { - VT.SetToliDef(); - suppressarg(na,a,ia); - } - else { - VT.SetToli(Draw::Atof(a[ia]),Draw::Atof(a[ia])); - suppressarg(na,a,ia); - } - } - } - else if (!strcmp(thea,"-c")) { - suppressarg(na,a,ia); - if (ia < na) { - VT.SetClear (Draw::Atoi(a[ia]) != 0); - suppressarg(na,a,ia); - } - else VT.SetClear(Standard_True); - } - else if (!strcasecmp(thea,"-d")) { - dump = Standard_True; - suppressarg(na,a,ia); - } - else if (!strcasecmp(thea,"-i")) { - VT.Init(); - suppressarg(na,a,ia); - } - else if (!strcmp(thea,"-m")) { - suppressarg(na,a,ia); - if (ia < na) { - VT.SetMode(Draw::Atoi(a[ia])); - suppressarg(na,a,ia); - } - else VT.SetMode(0); - } - else if (!strcmp(thea,"-v")) { - suppressarg(na,a,ia); - if (ia < na) { - VT.SetVerbose(Draw::Atoi(a[ia])); - suppressarg(na,a,ia); - } - else VT.SetVerbose(0); - } - else if (!strcasecmp(thea,"-h")) { - help = Standard_True; - suppressarg(na,a,ia); - } - else { - ia++; - } - } // while (ia < na) - if (dump) VT.Dump(cout); - if (help) TOPOHELP(PT, di); - return 0; - -} // VARSTOPOARGS - -// ---------------------------------------------------- -Standard_Integer SETTOPOCOMMANDS(TestTopOpe_BOOP& PT) -{ - PT.Tinit(); - PT.Tadd("-def",0 ,"[a b] : load shapes"); - PT.Tadd("-iss",100,"[a b] : intersection"); - PT.Tadd("-gap",110,"[a b] : gap filler"); - PT.Tadd("-cds",115,"[a b] : complete DS"); - PT.Tadd("-fil",120,"[a b] : filter"); - PT.Tadd("-red",130,"[a b] : reducer"); - PT.Tadd("-rug",140,"[a b] : remove unshared geometry"); - PT.Tadd("-chk",150,"[a b] : check DS"); - PT.Tadd("-bui",200,"[a b] : section building"); - PT.Tadd("-all",290,"[a b] : all"); - return 0; -} - -// ---------------------------------------------------- -Standard_Integer SETTOPOPREP(TestTopOpe_BOOP& PT,Standard_Integer& na,const char** a) -{ - if (na < 2) return 0; - const char* thea = a[0]; - PT.mytodoPREP = 999; - if (!strcasecmp(thea,"topo") && na == 3) { - PT.mylastPREP = -1; - return 0; - } - if (na == 4) { - PT.mylastPREP = -1; - } - - Standard_Integer ia = 1; - while (ia < na) { - thea = a[ia]; - Standard_Integer ik = PT.Tstep(thea); - if (ik != -1) { - PT.mytodoPREP = ik; - suppressarg(na,a,ia); - } - else { - ia++; - } - } - return 0; -} - -// ---------------------------------------------------- -Standard_Integer TOPOCOMMANDS(TestTopOpe_BOOP& PT,Standard_Integer na,const char** a, Draw_Interpretor& di) -{ - Standard_Integer err = 0; - if (strncmp(a[0],"topo",4)) return 1; - if (na == 2 && !strcasecmp(a[1],"-h")) { TOPOHELP(PT, di); return 0; } - err = VARSTOPOARGS(PT,na,a, di); if (err) return err; - if (na == 1) return 0; - err = SETTOPOPREP(PT,na,a); if (err) return err; - -#ifdef OCCT_DEBUG - Standard_Boolean tend = TopOpeBRepTool_GettraceEND(); - TopOpeBRepTool_SettraceEND(PT.ChangeVarsTopo().GetVerbose() != 0); -#endif - - err = 0; - TopOpeBRep_DSFiller* PDSF = PT.myPDSF; - while (PT.mylastPREP <= PT.mytodoPREP) { - switch (PT.mylastPREP) { - case -1 : if (na >= 3) err = PT.LoadShapes(a[1],a[2]);break; - case 0 : err = PT.LoadnewDS(); PDSF = PT.myPDSF; break; - case 100 : err = PT.DSF_Insert_InsertIntersection(*PDSF); break; - case 110 : err = PT.DSF_Insert_Complete_GapFiller(*PDSF);break; - case 115 : err = PT.DSF_Insert_Complete_CompleteDS(*PDSF); break; - case 120 : err = PT.DSF_Insert_Complete_Filter(*PDSF); break; - case 130 : err = PT.DSF_Insert_Complete_Reducer(*PDSF); break; - case 140 : err = PT.DSF_Insert_Complete_RemoveUnsharedGeometry(*PDSF); break; - case 150 : err = PT.DSF_Insert_Complete_Checker(*PDSF); break; - case 160 : err = PT.LoadnewHB(); break; - case 200 : err = PT.Builder_Perform(); break; - case 290 : PT.mylastPREP = 1000; break; - default : PT.mylastPREP = 1000; break; - } - if (err) return err; - } - -#ifdef OCCT_DEBUG - TopOpeBRepTool_SettraceEND(tend); -#endif - return 0; -} - -//======================================================================= -//function : BOOPCommands -//purpose : -//======================================================================= -void TestTopOpe::BOOPCommands(Draw_Interpretor& theCommands) -{ - SETTOPOCOMMANDS(*PBOOP); - theCommands.Add(kboo[BOOP_TOPX],"-h for help",__FILE__,TOPOC); - theCommands.Add(kboo[BOOP_SECC],"secc [r]",__FILE__,TOPOC); - theCommands.Add(kboo[BOOP_SECE],"sece [r]",__FILE__,TOPOC); - theCommands.Add(kboo[BOOP_SEC],"sec [r]",__FILE__,TOPOC); - theCommands.Add(kboo[BOOP_C12],"c12 [r]",__FILE__,TOPOC); - theCommands.Add(kboo[BOOP_C21],"c21 [r]",__FILE__,TOPOC); - theCommands.Add(kboo[BOOP_COM],"com [r]",__FILE__,TOPOC); - theCommands.Add(kboo[BOOP_FUS],"fus [r]",__FILE__,TOPOC); - theCommands.Add("toposet","",__FILE__,TOPOC); - theCommands.Add("tsp","tsp [state] iS1 : get split parts",__FILE__,TOPOC); - theCommands.Add("tme","tme [state] iS1 : get merged parts",__FILE__,TOPOC); - theCommands.Add("csecanc","section edge ancestors. use : puts [csecanc]",__FILE__,TOPOC); - theCommands.Add("parvi","parvi : get parameter of internal vertices",__FILE__,TOPOC); - theCommands.Add("parvi2d","parvi : get parameter of internal vertices",__FILE__,TOPOC); - theCommands.Add("tchk","tchk 1/0 : check SameParameter edges or not in BRepBuilderAPI",__FILE__,BOOPCHK); -} - -#if 0 - if (!strcasecmp(thea,"-def")) { PT.mytodoPREP = 0; suppressarg(na,a,ia); } - else if (!strcasecmp(thea,"-iss")) { PT.mytodoPREP = 100; suppressarg(na,a,ia); } - else if (!strcasecmp(thea,"-gap")) { PT.mytodoPREP = 110; suppressarg(na,a,ia); } - else if (!strcasecmp(thea,"-cds")) { PT.mytodoPREP = 115; suppressarg(na,a,ia); } - else if (!strcasecmp(thea,"-fil")) { PT.mytodoPREP = 120; suppressarg(na,a,ia); } - else if (!strcasecmp(thea,"-red")) { PT.mytodoPREP = 130; suppressarg(na,a,ia); } - else if (!strcasecmp(thea,"-rug")) { PT.mytodoPREP = 140; suppressarg(na,a,ia); } - else if (!strcasecmp(thea,"-chk")) { PT.mytodoPREP = 150; suppressarg(na,a,ia); } - else if (!strcasecmp(thea,"-bui")) { PT.mytodoPREP = 200; suppressarg(na,a,ia); } - else if (!strcasecmp(thea,"-all")) { PT.mytodoPREP = 290; suppressarg(na,a,ia); } -#endif diff --git a/src/TestTopOpe/TestTopOpe_CORCommands.cxx b/src/TestTopOpe/TestTopOpe_CORCommands.cxx deleted file mode 100644 index 1879250e1d..0000000000 --- a/src/TestTopOpe/TestTopOpe_CORCommands.cxx +++ /dev/null @@ -1,873 +0,0 @@ -// Created on: 1997-07-24 -// Created by: Xuan PHAM PHU -// Copyright (c) 1997-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. - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -#ifdef DRAW -#include -#endif - -Standard_IMPORT Draw_Color DrawTrSurf_CurveColor(const Draw_Color col); -Standard_IMPORT void DBRep_WriteColorOrientation (); -Standard_IMPORT Draw_Color DBRep_ColorOrientation (const TopAbs_Orientation Or); - -Standard_IMPORT Draw_Color DrawTrSurf_CurveColor(const Draw_Color col); -Standard_IMPORT void DBRep_WriteColorOrientation (); -Standard_IMPORT Draw_Color DBRep_ColorOrientation (const TopAbs_Orientation Or); -Standard_EXPORT void FUN_tool_mkBnd2d(const TopoDS_Shape& W, const TopoDS_Shape& F,Bnd_Box2d& B2d); -Standard_EXPORT void FUN_tool_UpdateBnd2d(Bnd_Box2d& B2d, const Bnd_Box2d& newB2d); -Standard_IMPORT Standard_Integer FUN_tool_classiBnd2d(const Bnd_Array1OfBox2d& B,const Standard_Boolean chklarge = Standard_True); -Standard_IMPORT Standard_Boolean FUN_tool_chkp2dFORinE(const gp_Pnt2d& p2d,const TopoDS_Edge& E, - const TopoDS_Face& F, Standard_Real& tol2d); -Standard_IMPORT TopoDS_Vertex FUN_tool_getv(const Standard_Integer Index,const TopoDS_Edge& E); - - -#define SAME (-1) -#define DIFF (-2) -#define UNKNOWN ( 0) -#define oneINtwo ( 1) -#define twoINone ( 2) - -static void FUN_test_draw(TCollection_AsciiString aa, - const TopoDS_Edge& E, const TopoDS_Face& F, - const Standard_Integer ie, - Draw_Interpretor& di) -{ - if (E.IsNull()) {di<<"************* null edge\n"; return;} - Standard_Real f,l; const Handle(Geom2d_Curve)& PC = BRep_Tool::CurveOnSurface(E,F,f,l); - if (PC.IsNull()) {di<<"************* no curv on surf\n"; return;} - TCollection_AsciiString bb(aa); bb += TCollection_AsciiString(ie); - char* aaa = (char *)bb.ToCString(); - - Standard_Boolean coldef = Standard_False; - TopExp_Explorer ex(F,TopAbs_EDGE); - Draw_Color col; - DrawTrSurf_CurveColor(Draw_Color(Draw_rouge)); - for (; ex.More(); ex.Next()) - if (E.IsEqual(ex.Current())) - {col = DBRep_ColorOrientation(ex.Current().Orientation()); - coldef = Standard_True; - break;} - if (!coldef) col = DBRep_ColorOrientation(E.Orientation()); - - DrawTrSurf_CurveColor(col); - DrawTrSurf::Set(aaa,new Geom2d_TrimmedCurve(PC,f,l)); -} - -void FUN_draw(const TCollection_AsciiString aa,const TopoDS_Shape& s) -{char* aaa = (char *)aa.ToCString(); DBRep::Set(aaa,s);} - -void FUN_cout(const gp_Pnt2d& p2d, Draw_Interpretor& di) -{di <<" = ("< - TopTools_ListOfShape lfyE; Standard_Boolean topurge = CORRISO.PurgeFyClosingE(cEds,lfyE); - if (!topurge) {lWs.Append(W); continue;} - - TopoDS_Wire Wi; BB.MakeWire(Wi); // Add une TShape - Wi.Free(Standard_True); - ite.Initialize(CORRISO.Eds()); - for (; ite.More(); ite.Next()) { - const TopoDS_Edge& ed = TopoDS::Edge(ite.Value()); - Standard_Boolean equ = Standard_False; - for (TopTools_ListIteratorOfListOfShape itlfyE(lfyE);itlfyE.More();itlfyE.Next()) { - const TopoDS_Shape& fyE = itlfyE.Value(); - if (ed.IsEqual(fyE)) { - equ = Standard_True; - break; - } - } - if (equ) { - continue; - } - BB.Add(Wi,ed); - } - lWs.Append(Wi); - } // exw - - if (!hasnew) return 1; - - // Building up the new face : - aLocalShape = fa.EmptyCopied(); - TopoDS_Face newF = TopoDS::Face(aLocalShape); -// TopoDS_Face newF = TopoDS::Face(fa.EmptyCopied()); - TopTools_ListIteratorOfListOfShape itw(lWs); - for (; itw.More(); itw.Next()) BB.Add(newF, TopoDS::Wire(itw.Value())); - - di <<"New face built is newF\n"; - TCollection_AsciiString aa("newF"); - FUN_draw(aa, newF); - return 0; -} - - -Standard_Integer correctONISO(Draw_Interpretor& di, Standard_Integer n, const char** a) -{ - if (n < 3) return 1; - TopoDS_Shape aLocalShape = DBRep::Get(a[1]); - TopoDS_Face F = TopoDS::Face(aLocalShape); - aLocalShape = DBRep::Get(a[2]); - TopoDS_Face Fsp = TopoDS::Face(aLocalShape); -// TopoDS_Face F = TopoDS::Face(DBRep::Get(a[1])); -// TopoDS_Face Fsp = TopoDS::Face(DBRep::Get(a[2])); - - FC2D_Prepare(F,F); - - if (F.IsNull() || Fsp.IsNull()) {di<<"NULL shape(s)\n";return 1;} - - TopOpeBRepTool::CorrectONUVISO(F,Fsp); - TCollection_AsciiString aa("newFsp"); - FUN_draw(aa,Fsp); - di<<"-> newFsp\n"; - - return 0; -} - -// ====================================================================== -// useful commands : -// ====================================================================== - -static Standard_Integer isclosingE(Draw_Interpretor& di, Standard_Integer n, const char** a) -{ - if (n < 3) return 1; - TopoDS_Shape aLocalShape = DBRep::Get(a[1]) ; - TopoDS_Edge ed = TopoDS::Edge(aLocalShape); - aLocalShape = DBRep::Get(a[2]); - TopoDS_Face fa = TopoDS::Face(aLocalShape); -// TopoDS_Edge ed = TopoDS::Edge(DBRep::Get(a[1])); -// TopoDS_Face fa = TopoDS::Face(DBRep::Get(a[2])); - Standard_Boolean isclosing = BRep_Tool::IsClosed(ed,fa); - TopAbs_Orientation oriE = ed.Orientation(); - if (isclosing) {di <<"edge is "; - //TopAbs::Print(oriE,cout); - Standard_SStream aSStream; - TopAbs::Print(oriE,aSStream); - di << aSStream; - di<<" closing edge\n";} - else di <<"edge is NOT closing edge\n"; - return 0; -} - -static Standard_Integer compareshsh(Draw_Interpretor& di, Standard_Integer n, const char** a) -{ - if (n < 3) return 1; - TopoDS_Shape sh1 = DBRep::Get(a[1]); - TopoDS_Shape sh2 = DBRep::Get(a[2]); - Standard_Boolean issame = sh1.IsSame(sh2); - if (issame) di<<" same shapes\n"; - else di <<" shapes are not same\n"; - Standard_Boolean isequal = sh1.IsEqual(sh2); if (isequal) di<<" equal shapes\n"; - return 0; -} -static Standard_Integer pcurveedgeonface(Draw_Interpretor& di, Standard_Integer n, const char** a) -{ - if (n < 3) return 1; - TopoDS_Shape ed = DBRep::Get(a[1]); - TopoDS_Shape fa = DBRep::Get(a[2]); - TCollection_AsciiString aa("edonfa_"); - FUN_test_draw(aa,TopoDS::Edge(ed),TopoDS::Face(fa),0,di); - return 0; -} - -static Standard_Integer pcurvesonface(Draw_Interpretor& di, Standard_Integer n, const char** a) -{ - if (n < 3) return 1; - TopoDS_Shape sh = DBRep::Get(a[2]); - TopoDS_Shape fa = DBRep::Get(a[3]); - TopExp_Explorer exe(sh, TopAbs_EDGE); - Standard_Integer i = 0; - for (; exe.More(); exe.Next()){ - i++; - TCollection_AsciiString aa(a[1]); - FUN_test_draw(aa,TopoDS::Edge(exe.Current()),TopoDS::Face(fa),i,di); - } - return 0; -} - -static Standard_Integer orivine(Draw_Interpretor& di, Standard_Integer n, const char** a) -{ - if (n < 3) return 1; - TopoDS_Shape aLocalShape = DBRep::Get(a[1]); - TopoDS_Vertex v = TopoDS::Vertex(aLocalShape); - aLocalShape = DBRep::Get(a[2]); - TopoDS_Edge ed = TopoDS::Edge(aLocalShape); -// TopoDS_Vertex v = TopoDS::Vertex(DBRep::Get(a[1])); -// TopoDS_Edge ed = TopoDS::Edge(DBRep::Get(a[2])); - - Standard_Integer ori = TopOpeBRepTool_TOOL::OriinSor(v,ed); - if (ori==0) di<<"v not in ed\n"; - else if (ori==1) di<<"v FORWARD in ed\n"; - else if (ori==2) di<<"v REVERSED in ed\n"; - else if (ori==3) di<<"v INTERNAL in ed\n"; - else if (ori==4) di<<"v EXTERNAL in ed\n"; - else if (ori==5) di<<"v CLOSING in ed\n"; - return 0; -} - -static Standard_Integer vine(Draw_Interpretor& di, Standard_Integer n, const char** a) -{ - if (n < 4) return 1; - TopoDS_Shape aLocalShape = DBRep::Get(a[1]); - TopoDS_Vertex v = TopoDS::Vertex(aLocalShape); - aLocalShape = DBRep::Get(a[2]); - TopoDS_Edge ed = TopoDS::Edge(aLocalShape); - aLocalShape = DBRep::Get(a[3]); - TopoDS_Face fa = TopoDS::Face(aLocalShape); -// TopoDS_Vertex v = TopoDS::Vertex(DBRep::Get(a[1])); -// TopoDS_Edge ed = TopoDS::Edge(DBRep::Get(a[2])); -// TopoDS_Face fa = TopoDS::Face(DBRep::Get(a[3])); - - Standard_Real pf,pl; - const Handle(Geom2d_Curve) PC = BRep_Tool::CurveOnSurface(ed,fa,pf,pl); - gp_Pnt2d p2df, p2dl; PC->D0(pf,p2df); PC->D0(pl,p2dl); - di << "p2df";FUN_cout(p2df,di); di << "p2dl";FUN_cout(p2dl,di);di<<"\n"; - - Standard_Integer ori = TopOpeBRepTool_TOOL::OriinSor(v,ed); - if (ori==0) {di<<"v not in ed\n"; return 0;} - else if (ori==1) di<<"v FORWARD in ed\n"; - else if (ori==2) di<<"v REVERSED in ed\n"; - else if (ori==3) di<<"v INTERNAL in ed\n"; - else if (ori==4) di<<"v EXTERNAL in ed\n"; - else if (ori==5) di<<"v CLOSING in ed\n"; - - if ((ori == 1) || (ori == 2)) { - Standard_Real par = TopOpeBRepTool_TOOL::ParE(ori,ed);//FUN_tool_parOnE(ind,ed,fa); - gp_Pnt2d p2d; PC->D0(par,p2d); - di <<"p2d : with TopOpeBRepTool_TOOL::ParE";FUN_cout(p2d,di);di<<"\n"; - } - - Standard_Real par = BRep_Tool::Parameter(v,ed,fa); - gp_Pnt2d pp2d; PC->D0(par,pp2d); - di <<"p2d computed with BRep_Tool::Parameter";FUN_cout(pp2d,di);di<<"\n"; - - return 0; -} - -static Standard_Integer issubshape(Draw_Interpretor& di, Standard_Integer n, const char** a) -{ - if (n < 3) return 1; - TopoDS_Shape subshape = DBRep::Get(a[1]); - TopoDS_Shape shape = DBRep::Get(a[2]); - TopExp_Explorer ex(shape, subshape.ShapeType()); - Standard_Boolean issubs = Standard_False; - for (; ex.More(); ex.Next()) - if (ex.Current().IsSame(subshape)) {issubs = Standard_True; break;} - - if (issubs) di<<" is subshape\n"; - else di<<" is NOT subshape\n"; - return 0; -} - -void FUN_mkBnd2dBREP(const TopoDS_Shape& W, const TopoDS_Shape& F,Bnd_Box2d& B2d,const Standard_Integer& i) -{ - // greater with 's UV representation on - Standard_Real tol = 1.e-8; - TopExp_Explorer ex; - for (ex.Init(W, TopAbs_EDGE); ex.More(); ex.Next()) { -// for (TopExp_Explorer ex(W, TopAbs_EDGE); ex.More(); ex.Next()) { - if (i == 0) { - FUN_tool_mkBnd2d(W,F,B2d); - } - if (i == 1) { - BRepAdaptor_Curve2d BC2d(TopoDS::Edge(ex.Current()), TopoDS::Face(F)); - BndLib_Add2dCurve::Add(BC2d, tol, B2d); - } - if (i == 2) { - Standard_Real f,l; - Handle(Geom2d_Curve) PC = BRep_Tool::CurveOnSurface(TopoDS::Edge(ex.Current()),TopoDS::Face(F),f,l); - Geom2dAdaptor_Curve GC2d(PC); - BndLib_Add2dCurve::Add(GC2d, tol, B2d); - } - if (i == 3) { - TopLoc_Location L; Standard_Real f,l; - const Handle(Geom_Surface)& S = BRep_Tool::Surface(TopoDS::Face(F),L); - const Handle(Geom2d_Curve)& PC = BRep_Tool::CurveOnSurface(TopoDS::Edge(ex.Current()),S,L,f,l); - Geom2dAdaptor_Curve GC2d(PC); - BndLib_Add2dCurve::Add(GC2d, tol, B2d); - } - - } //ex(W,EDGE) -} - -static Standard_Integer drawbnd2d(Draw_Interpretor& , Standard_Integer n, const char** a) -{ - if (n < 5) return 1; - Standard_Integer i = Draw::Atoi(a[4]); - TopoDS_Shape W = DBRep::Get(a[2]); - TopoDS_Shape F = DBRep::Get(a[3]); - if (W.IsNull() || F.IsNull()) return 1; - Bnd_Box2d B2d; - Standard_Real umin,vmin,umax,vmax; - FUN_mkBnd2dBREP(W,F,B2d,i); - B2d.Get(umin,vmin,umax,vmax); - - Handle(Geom2d_Line) cx = new Geom2d_Line(gp_Pnt2d(umin,vmin),gp_Dir2d(1.,0.)); - Handle(Geom2d_Line) cy = new Geom2d_Line(gp_Pnt2d(umin,vmin),gp_Dir2d(0.,1.)); - gp_Trsf2d tx; gp_Vec2d vx(umax-umin,0.); tx.SetTranslation(vx); - gp_Trsf2d ty; gp_Vec2d vy(0.,vmax-vmin); ty.SetTranslation(vy); - - Handle(Geom2d_Curve) tcx = new Geom2d_TrimmedCurve(cx,0.,umax-umin); - Handle(Geom2d_Curve) tcy = new Geom2d_TrimmedCurve(cy,0.,vmax-vmin); - Handle(Geom2d_Curve) tccx = Handle(Geom2d_Curve)::DownCast (tcx->Copy()); - tccx->Transform(ty); - Handle(Geom2d_Curve) tccy = Handle(Geom2d_Curve)::DownCast (tcy->Copy()); - tccy->Transform(tx); - - Draw_Color col(Draw_blanc); - DrawTrSurf_CurveColor(col); - - TCollection_AsciiString aa3 = TCollection_AsciiString(a[1]); aa3 += TCollection_AsciiString(3); - TCollection_AsciiString aa4 = TCollection_AsciiString(a[1]); aa4 += TCollection_AsciiString(4); - - TCollection_AsciiString aa; - aa=TCollection_AsciiString(a[1]); aa+=TCollection_AsciiString(1); char* aaa = (char *)aa.ToCString(); DrawTrSurf::Set(aaa,tcx); - aa=TCollection_AsciiString(a[1]); aa+=TCollection_AsciiString(2); aaa=(char *)aa.ToCString(); DrawTrSurf::Set(aaa,tcy); - aa=TCollection_AsciiString(a[1]); aa+=TCollection_AsciiString(3); aaa=(char *)aa.ToCString(); DrawTrSurf::Set(aaa,tccx); - aa=TCollection_AsciiString(a[1]); aa+=TCollection_AsciiString(4); aaa=(char *)aa.ToCString(); DrawTrSurf::Set(aaa,tccy); - return 0; -} - -static Standard_Integer classifBnd2d(Draw_Interpretor& di, Standard_Integer n, const char** a) -{ - if (n < 5) return 1; - TopoDS_Shape W1 = DBRep::Get(a[1]); - TopoDS_Shape W2 = DBRep::Get(a[2]); - TopoDS_Shape F = DBRep::Get(a[3]); - - TopoDS_Wire w1 = TopoDS::Wire(W1); - TopoDS_Wire w2 = TopoDS::Wire(W2); - TopoDS_Face Fref = TopoDS::Face(F); - - TopOpeBRepTool_CLASSI classi; classi.Init2d(Fref); - Standard_Real tolF = BRep_Tool::Tolerance(Fref); - Standard_Real toluv = TopOpeBRepTool_TOOL::TolUV(Fref,tolF); - - if (w1.IsNull() || w2.IsNull() || Fref.IsNull()) return 1; - -#ifdef OCCT_DEBUG - Standard_Integer sta = -#endif - classi.ClassiBnd2d(w1,w2,toluv,Standard_True); - di <<"wires classification : checklarge=true "; -#ifdef OCCT_DEBUG - FUN_tool_coutsta(sta,1,2); -#endif - -#ifdef OCCT_DEBUG - sta = -#endif - classi.ClassiBnd2d(w1,w2,toluv,Standard_False); - di <<"wires classification : checklarge=false "; -#ifdef OCCT_DEBUG - FUN_tool_coutsta(sta,1,2); -#endif - - return 0; -} - -static Standard_Integer pntonc(Draw_Interpretor& di, Standard_Integer n, const char** a) -{ - if (n < 3) return 1; - Standard_Real x = Draw::Atof(a[1]); - Handle(Geom_Curve) C = DrawTrSurf::GetCurve(a[2]); - if (C.IsNull()) {di<<"null curve\n"; return 1;} - gp_Pnt p = C->Value(x); - di<<"point on curve of parameter "<Value(x); - di<<"point on curve of parameter "<Value(p2d.X(),p2d.Y()); - di<<"point on curve of parameter "< 3) { - const char* key1 = a[3]; - const char* key2 = (n > 4) ? a[4] : NULL; - if (key1) { - if (!strcasecmp(key1,"-min")) { - anExtFlag = Extrema_ExtFlag_MIN; - } else if (!strcasecmp(key1,"-max")) { - anExtFlag = Extrema_ExtFlag_MAX; - } else { - anExtAlgo = (!strcasecmp(key1,"-t")) ? Extrema_ExtAlgo_Tree : anExtAlgo; - } - } - if (key2) { - anExtAlgo = (!strcasecmp(key2,"-t")) ? Extrema_ExtAlgo_Tree : anExtAlgo; - } - } - ok = FUN_tool_projPonF(p, f, uv, dist, anExtFlag, anExtAlgo); - // - if (!ok) { - di<<"projection failed\n"; - return 1; - } - // - ok = FUN_tool_value(uv,f,pproj); - if (!ok) { - di<<"projection failed\n"; - return 1; - } - // - di<<"proj dist = "< KO\n"; return 1;} - - sta = soclassi.State(); - di<<"point is "; - //TopAbs::Print(sta,cout); - Standard_SStream aSStream; - TopAbs::Print(sta,aSStream); - di << aSStream; - di<<" shape s\n"; - return 0; -} - -static Standard_Integer class3dclassifier(Draw_Interpretor& di, Standard_Integer n, const char** a) -{ - if (n < 4) return 1; - TopoDS_Shape s = DBRep::Get(a[1]); - if (s.IsNull()) {di<<"null shape\n";return 1;} - gp_Pnt p; DrawTrSurf::GetPoint(a[2], p); - Standard_Real tol = Draw::Atof(a[3]); - - BRepClass3d_SolidClassifier soclassi(s); - TopAbs_State sta = TopAbs_UNKNOWN; - soclassi.Perform(p,tol); - - sta = soclassi.State(); - di<<"point is "; - //TopAbs::Print(sta,cout); - Standard_SStream aSStream; - TopAbs::Print(sta,aSStream); - di << aSStream; - di<<" shape s\n"; - return 0; -} -static Standard_Integer shapeclassifier(Draw_Interpretor& di, Standard_Integer n, const char** a) -{ - if (n < 3) return 1; - TopoDS_Shape sh = DBRep::Get(a[1]); - if (sh.IsNull()) {di<<"null shape\n";return 1;} - TopoDS_Shape shref = DBRep::Get(a[2]); - if (shref.IsNull()) {di<<"null reference shape\n";return 1;} - Standard_Boolean hastoavoid = (n > 3); - TopTools_ListOfShape toavoid; - if (hastoavoid) { - for (Standard_Integer i=3; i<=n; i++) { - TopoDS_Shape shtoavoid = DBRep::Get(a[i]); - if (shtoavoid.IsNull()) {di<<"null toavoid shape\n";return 1;} - toavoid.Append(shtoavoid); - } - } - - TopOpeBRepTool_ShapeClassifier shclassi; - TopAbs_State sta = TopAbs_UNKNOWN; - if (hastoavoid) sta = shclassi.StateShapeShape(sh,shref); - else if (toavoid.Extent() == 1) sta = shclassi.StateShapeShape(sh,toavoid.First(),shref); - else sta = shclassi.StateShapeShape(sh,toavoid,shref); - - di<<"shape is "; - //TopAbs::Print(sta,cout); - Standard_SStream aSStream; - TopAbs::Print(sta,aSStream); - di << aSStream; - di<<" shape ref\n"; - return 0; -} - -static Standard_Integer curvature(Draw_Interpretor& di, Standard_Integer n, const char** a) -{ - if (n < 5) return 1; - TopoDS_Shape aLocalShape = DBRep::Get(a[1]); - TopoDS_Face f = TopoDS::Face(aLocalShape); -// TopoDS_Face f = TopoDS::Face(DBRep::Get(a[1])); - if (f.IsNull()) {di<<"null shape\n";return 1;} - Standard_Real x = Draw::Atof(a[2]); - Standard_Real y = Draw::Atof(a[3]); - Standard_Real z = Draw::Atof(a[4]); - Handle(Geom_Line) line = new Geom_Line(gp_Ax1(gp_Pnt(0.,0.,0.), gp_Dir(x,y,z))); - BRepAdaptor_Surface BS(f); - Handle(Geom_Surface) su = BRep_Tool::Surface(f); - GeomAPI_IntCS intcs(line,su); - Standard_Boolean done = intcs.IsDone(); - if (!done) {di<<"intersection point on surface not found\n"; return 1;} - Standard_Integer npnts = intcs.NbPoints(); - if (npnts < 1) {di<<"intersection point on surface not found\n"; return 1;} - - Standard_Real tol = Precision::Confusion(); - BRepLProp_SLProps props(BS,2,tol); - gp_Dir Norm,D1,D2; - for (Standard_Integer i = 1; i <= npnts; i++) { - gp_Pnt p = intcs.Point(i); - Standard_Real u,v,w; intcs.Parameters(i,u,v,w); - di<<"point("<", __FILE__, shapeclassifier, g); - theCommands.Add("clclass", "clclass sh shref ", __FILE__, class3dclassifier, g); - - // useful commands : - theCommands.Add("cled", "cled ed f", __FILE__, isclosingE, g); - theCommands.Add("compare", "compare s1 s2", __FILE__, compareshsh, g); - theCommands.Add("edonfa", "edonfa ed f", __FILE__, pcurveedgeonface, g); - theCommands.Add("pconfa", "pconfa name s f", __FILE__, pcurvesonface, g); - theCommands.Add("orivine", "orivine v ed", __FILE__, orivine, g); - theCommands.Add("vine", "vine v ed fa", __FILE__, vine, g); - theCommands.Add("issubsh", "issubsh subsh sh", __FILE__, issubshape, g); - theCommands.Add("bnd2d", "bnd2d name W F i", __FILE__, drawbnd2d, g); - theCommands.Add("classibnd2d","classibnd2d W1 W2 F i", __FILE__, classifBnd2d, g); - theCommands.Add("pntonc", "pntonc par C3d", __FILE__, pntonc, g); - theCommands.Add("pntonc2d", "pntonc2d par C2d S", __FILE__, pntonc2d, g); - theCommands.Add("projponf", - "projponf f pnt [extrema flag: -min/-max/-minmax] [extrema algo: -g(grad)/-t(tree)]", - __FILE__, projponf, g); - theCommands.Add("curvature", "curvature f x y z", __FILE__, curvature , g); -} diff --git a/src/TestTopOpe/TestTopOpe_DSF.cxx b/src/TestTopOpe/TestTopOpe_DSF.cxx deleted file mode 100644 index 077c31622b..0000000000 --- a/src/TestTopOpe/TestTopOpe_DSF.cxx +++ /dev/null @@ -1,105 +0,0 @@ -// Created on: 1996-02-05 -// Created by: Jea Yves LEBEY -// Copyright (c) 1996-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. - -#include - -#include -#include -#include -#include - -Standard_Integer TestTopOpe_BOOP::DSF_SetInterTolerances(TopOpeBRep_DSFiller& DSF) -{ - if (myVarsTopo.GetForceToli()) { - TopOpeBRep_ShapeIntersector& tobsi = DSF.ChangeShapeIntersector(); - Standard_Real tola,tolt; myVarsTopo.GetToli(tola,tolt); - TopOpeBRep_FacesIntersector& tobfi = tobsi.ChangeFacesIntersector(); - tobfi.ForceTolerances(tola,tolt); - TopOpeBRep_EdgesIntersector& tobei = tobsi.ChangeEdgesIntersector(); - tobei.ForceTolerances(tola,tolt); - } - return 0; -} - -Standard_Integer TestTopOpe_BOOP::DSF_Insert(TopOpeBRep_DSFiller& DSF) -{ -// Standard_Integer err = 0; - DSF_Insert_InsertIntersection(DSF); - DSF_Insert_Complete_CompleteDS(DSF); - DSF_Insert_Complete_Filter(DSF); - DSF_Insert_Complete_Reducer(DSF); - DSF_Insert_Complete_RemoveUnsharedGeometry(DSF); - DSF_Insert_Complete_Checker(DSF); - mylastPREP = 190; - return 0; -} - -Standard_Integer TestTopOpe_BOOP::DSF_Insert_InsertIntersection(TopOpeBRep_DSFiller& DSF) -{ -// Standard_Integer err = 0; - DSF_SetInterTolerances(DSF); - DSF.InsertIntersection(myS1,myS2,myHDS); - mylastPREP = 110; - return 0; -} - -Standard_Integer TestTopOpe_BOOP::DSF_Insert_Complete_GapFiller(TopOpeBRep_DSFiller& DSF) -{ -// Standard_Integer err = 0; - DSF.GapFiller(myHDS); - mylastPREP = 115; - return 0; -} - -Standard_Integer TestTopOpe_BOOP::DSF_Insert_Complete_CompleteDS(TopOpeBRep_DSFiller& DSF) -{ -// Standard_Integer err = 0; - DSF.CompleteDS(myHDS); - mylastPREP = 120; - return 0; -} - -Standard_Integer TestTopOpe_BOOP::DSF_Insert_Complete_Filter(TopOpeBRep_DSFiller& DSF) -{ -// Standard_Integer err = 0; - DSF.Filter(myHDS); - mylastPREP = 130; - return 0; -} - -Standard_Integer TestTopOpe_BOOP::DSF_Insert_Complete_Reducer(TopOpeBRep_DSFiller& DSF) -{ -// Standard_Integer err = 0; - DSF.Reducer(myHDS); - mylastPREP = 140; - return 0; -} - -Standard_Integer TestTopOpe_BOOP::DSF_Insert_Complete_RemoveUnsharedGeometry(TopOpeBRep_DSFiller& DSF) -{ -// Standard_Integer err = 0; - DSF.RemoveUnsharedGeometry(myHDS); - mylastPREP = 150; - return 0; -} - -Standard_Integer TestTopOpe_BOOP::DSF_Insert_Complete_Checker(TopOpeBRep_DSFiller& DSF) -{ -// Standard_Integer err = 0; - DSF.Checker(myHDS); - mylastPREP = 160; - return 0; -} diff --git a/src/TestTopOpe/TestTopOpe_EditBOOP.cxx b/src/TestTopOpe/TestTopOpe_EditBOOP.cxx deleted file mode 100644 index ad83485ce1..0000000000 --- a/src/TestTopOpe/TestTopOpe_EditBOOP.cxx +++ /dev/null @@ -1,86 +0,0 @@ -// Created on: 1996-02-05 -// Created by: Jea Yves LEBEY -// Copyright (c) 1996-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. - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -void TestTopOpe_BOOP::SetTol(const TopOpeBRepDS_Kind K,const Standard_Integer index,const Standard_Real tol) -{ - TopOpeBRepDS_DataStructure& BDS = myHDS->ChangeDS(); - switch(K) { - case TopOpeBRepDS_SURFACE: { - TopOpeBRepDS_Surface& Surf = BDS.ChangeSurface(index); - Surf.Tolerance(tol); - break; - } - case TopOpeBRepDS_CURVE: { - TopOpeBRepDS_Curve& Curv = BDS.ChangeCurve(index); - Curv.Tolerance(tol); - break; - } - case TopOpeBRepDS_POINT: { - TopOpeBRepDS_Point& Poin = BDS.ChangePoint(index); - Poin.Tolerance(tol); - break; - } - default: - break; - } - TopOpeBRepDS::Print(K, index, cout); - cout<Shape(index))); - TopAbs_ShapeEnum se = S.ShapeType(); - BRep_Builder BRB; - if(se == TopAbs_FACE) { - TopoDS_Face& F = TopoDS::Face(S); - BRB.UpdateFace(F, tol); - } - else if(se == TopAbs_EDGE) { - TopoDS_Edge& E = TopoDS::Edge(S); - BRB.UpdateEdge(E, tol); - } - else if(se == TopAbs_VERTEX) { - TopoDS_Vertex& V = TopoDS::Vertex(S); - BRB.UpdateVertex(V, tol); - } - else { - cout<<"Impossible to change the tolerance of "; - TopOpeBRepDS::Print(TopOpeBRepDS::ShapeToKind(se),cout); - cout<ChangeDS().ChangePoint(i); - gp_Pnt& Pnt = Poin.ChangePoint(); - Pnt.SetCoord(x,y,z); -} diff --git a/src/TestTopOpe/TestTopOpe_HDSCommands.cxx b/src/TestTopOpe/TestTopOpe_HDSCommands.cxx deleted file mode 100644 index fc166fb6a4..0000000000 --- a/src/TestTopOpe/TestTopOpe_HDSCommands.cxx +++ /dev/null @@ -1,1259 +0,0 @@ -// Created on: 1994-10-24 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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. - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -class TSEEpar { -public: - TSEEpar(const TCollection_AsciiString& s) { set(s); } - void set(const TCollection_AsciiString& s) { - miskind = misshap = misgeom = missect = misdege = misafev = misedcu = Standard_False; - mTK = TopOpeBRepDS_UNKNOWN; mTS = TopAbs_SHAPE; - char* sK = (char *)s.ToCString(); - miskind = TestTopOpeDraw_TTOT::StringToKind(s,mTK); - if ( miskind ) { - misshap = TopOpeBRepDS::IsTopology(mTK); - if (misshap) mTS = TopOpeBRepDS::KindToShape(mTK); - else misgeom = TopOpeBRepDS::IsGeometry(mTK); - } - else if ( ! strcasecmp(sK,"s") ) { - misshap = Standard_True; mTS = TopAbs_SHAPE; - } - else if ( ! strcasecmp(sK,"se") ) { - missect = Standard_True; mTK = TopOpeBRepDS_EDGE; - } - else if ( ! strcasecmp(sK,"de") ) { - misdege = Standard_True; mTK = TopOpeBRepDS_EDGE; - } - else if ( ! strcasecmp(sK,"fev") ) { - misafev = Standard_True; - } - else if ( ! strcasecmp(sK,"ec") ) { - misedcu = Standard_True; - } - } - Standard_Boolean iskind() { return miskind;} - Standard_Boolean isshap() { return misshap;} - Standard_Boolean isgeom() { return misgeom;} - Standard_Boolean issect() { return missect;} - Standard_Boolean isdege() { return misdege;} - Standard_Boolean isafev() { return misafev;} - Standard_Boolean isedcu() { return misedcu;} - TopOpeBRepDS_Kind TK() {return mTK;} - TopAbs_ShapeEnum TS() {return mTS;} -private: - Standard_Boolean miskind,misshap,misgeom,missect,misdege,misafev,misedcu; - TopOpeBRepDS_Kind mTK; TopAbs_ShapeEnum mTS; -}; - -class TDSpar : public TSEEpar { -public: - TDSpar(const TCollection_AsciiString& s) : TSEEpar(s) {} -}; - -#define ISINTEGER(MMstr) ((strspn((MMstr),"0123456789") == strlen((MMstr)))) - -TestTopOpe_HDSDisplayer* PHDSD = NULL; -static TestTopOpeDraw_Displayer* POCD = NULL; - -static Standard_Boolean SFindKeep = Standard_False; -static Standard_Boolean GFindKeep = Standard_False; -static Standard_Boolean PrintDistancePP = Standard_False; -static Standard_Integer SelectRankShape = 0; -static Standard_Boolean DisOri = Standard_False; -static Standard_Boolean TolFlag = Standard_False; -static Standard_Real OldParFlag = -1.0; -static Standard_Real ParFlag = -1.0; - -class tsee_entity { -public: - Standard_Boolean myEOK; - TestTopOpe_HDSDisplayer* myEPHDSD; - Handle(TopOpeBRepDS_HDataStructure) myEHDS; TopOpeBRepDS_DataStructure *myEPDS; - TopOpeBRepDS_Kind myETK;TopAbs_ShapeEnum myETS;Standard_Integer myEindex; - Standard_Boolean myEiskind,myEisshape,myEisgeome,myEissect; - TCollection_AsciiString myEnamedbrep,myEnamedisp; Draw_ColorKind myEnamecolor; - -//JR/Hp : - tsee_entity() { -// tsee_entity::tsee_entity() { - myEOK = Standard_False; - if (PHDSD == NULL) return; myEPHDSD = PHDSD; - myEHDS = myEPHDSD->CurrentHDS(); myEPDS = (TopOpeBRepDS_DataStructure*)&myEHDS->ChangeDS(); - myETK = TopOpeBRepDS_UNKNOWN;myETS = TopAbs_SHAPE; myEindex = 0; - myEiskind = myEisshape = myEisgeome = myEissect = Standard_False; - myEnamedbrep = ""; myEnamedisp = ""; myEnamecolor = Draw_blanc; - myEOK = Standard_True; - } - - Standard_Boolean IsP() const { return (myETK == TopOpeBRepDS_POINT); } - Standard_Boolean IsV() const { return (myETK == TopOpeBRepDS_VERTEX); } - Standard_Boolean Is0() const { return IsP() || IsV(); } - Standard_Integer Set(Standard_Integer na,const char** a,Standard_Integer iargK,Standard_Integer iargI); - - virtual ~tsee_entity() {} - void virtual See() = 0; -}; - -Standard_Integer tsee_entity::Set(Standard_Integer na,const char** a,Standard_Integer iargK,Standard_Integer iargI) { - myEOK = Standard_False; - if (iargK>=na) return 1; if (iargI>=na) return 1; - TCollection_AsciiString ascK = a[iargK]; myEindex = Draw::Atoi(a[iargI]); - myEiskind = TestTopOpeDraw_TTOT::StringToKind(ascK,myETK); - if (!myEiskind) return 1; if (myETK == TopOpeBRepDS_UNKNOWN) return 1; - - myEisshape = TopOpeBRepDS::IsTopology(myETK); - if (myEisshape) { - if ((myEindex < 1) || (myEindex > myEPDS->NbShapes())) return 0; - myETS = TopOpeBRepDS::KindToShape(myETK); - const TopoDS_Shape& S = myEPDS->Shape(myEindex); - if (myETS != S.ShapeType()) return 0; - myEPHDSD->ShapeName(myEindex,S,myEnamedbrep); - myEPHDSD->ShapeDisplayName(myEindex,S,myEnamedisp); - } - - myEisgeome = TopOpeBRepDS::IsGeometry(myETK); - if (myEisgeome) { - if (IsP()) { - TopOpeBRepDS_PointExplorer pex(myEHDS->DS()); - if (!pex.IsPoint(myEindex)) return 1; - } - TestTopOpeDraw_TTOT::GeometryName(myEindex,myETK,myEnamedbrep); - myEPHDSD->GeometryDisplayName(myEindex,myETK,myEnamedisp); - } - - myEnamecolor = TestTopOpeDraw_TTOT::GeometryColor(myETK); - myEOK = Standard_True; - return 0; -} - -class tsee_entity0 : public tsee_entity { -public: - gp_Pnt Pnt() const; - void See(); -}; - -gp_Pnt tsee_entity0::Pnt() const -{ - if (!Is0()) throw Standard_Failure("not 0d"); - gp_Pnt P; - if (IsP()) P = myEPDS->Point(myEindex).Point(); - else if (IsV()) P = BRep_Tool::Pnt(TopoDS::Vertex(myEPDS->Shape(myEindex))); - return P; -} - -static void SetPoint -(const TCollection_AsciiString& namedbrep,const TCollection_AsciiString& namedisp,const Draw_Color& namecolor,const TopOpeBRepDS_Point& P) -{ - Handle(TestTopOpeDraw_DrawableP3D) D; - if(TolFlag) { - D = new TestTopOpeDraw_DrawableP3D(P.Point(),Draw_CircleZoom,namecolor, - namedisp.ToCString(),namecolor, - P.Tolerance()); - } else { - D = new TestTopOpeDraw_DrawableP3D(P.Point(),Draw_Square,namecolor, - namedisp.ToCString(),namecolor); - } - char *pname = (char *)namedbrep.ToCString(); - Draw::Set(pname,D); - -} -void tsee_entity0::See() -{ - if (IsP()) ::SetPoint(myEnamedbrep,myEnamedisp,myEnamecolor,myEPDS->Point(myEindex)); - if (IsV()) POCD->DisplayShape(myEnamedbrep,myEnamedisp,myEPDS->Shape(myEindex)); -} - -//----------------------------------------------- -static void SetCurve -//----------------------------------------------- -(const TCollection_AsciiString& namedbrep, - const TCollection_AsciiString& namedisp, - const Draw_Color& namecolor, - const TopOpeBRepDS_Curve& DSC, - const Standard_Integer iC) -{ - if ( !PHDSD ) return; - const Handle(Geom_Curve) GC = DSC.Curve(); - if ( GC.IsNull() ) { cout<<"Curve() nulle"<FirstParameter(); - Standard_Real l = GC->LastParameter(); - - GeomAdaptor_Curve GAC(GC); - GeomAbs_CurveType GACt = GAC.GetType(); - if ( GACt == GeomAbs_Line ) { - Standard_Real fline = RealLast(),lline = RealFirst(); - Standard_Integer imother = DSC.Mother(),igood; - if(imother) igood = imother; - else igood = iC; - TopOpeBRepDS_PointIterator it = PHDSD->CurrentHDS()->CurvePoints(igood); - for(; it.More(); it.Next()) { - Standard_Real p = it.Parameter(); - fline = Min(fline,p); lline = Max(fline,p); - } - f = fline; - l = lline; - } - - Handle(Geom_TrimmedCurve) GTC = new Geom_TrimmedCurve(GC,f,l); - Handle(TestTopOpeDraw_DrawableC3D) D; - D = new TestTopOpeDraw_DrawableC3D(GTC,namecolor,namedisp.ToCString(),namecolor); - char *pname = (char *)namedbrep.ToCString(); - Draw::Set(pname,D); -} - -static TopoDS_Shape bidbid; -static const TopoDS_Shape& GetShape(const Standard_Integer IS,const TopAbs_ShapeEnum TS) -{ - Standard_Boolean TypeControl = Standard_True; - if ( !PHDSD ) return bidbid; - - static TopoDS_Shape ShapeNull; - const TopOpeBRepDS_DataStructure& BDS = PHDSD->CurrentBDS(); - - // check on shape index and on shape kind if kind differs from TopAbs_SHAPE - Standard_Integer ns = BDS.NbShapes(); - if ( IS < 1 || IS > ns) { - TopAbs::Print(TS,cout);cout<<" "<ShapeKind(IS,TS) ) { - if ( TypeControl ) { - cout<<"Shape "<CurrentBDS(); - const TopoDS_Shape& S = BDS.Shape(IS); - return S; -} - -//----------------------------------------------------------------------- -// SeeSectionEdge -//----------------------------------------------------------------------- -static Standard_Integer SeeSectionEdge(const Standard_Integer ISE) -{ - if ( !PHDSD || !POCD ) return 0; - - Standard_Integer nse = PHDSD->CurrentBDS().NbSectionEdges(); - if ( ISE < 1 || ISE > nse ) return 0; - const TopoDS_Shape& SE = PHDSD->CurrentBDS().SectionEdge(ISE); - if (SE.IsNull()) return 0; - - TCollection_AsciiString namedbrep; PHDSD->SectionEdgeName(ISE,SE,namedbrep); - TCollection_AsciiString namedisp; PHDSD->SectionEdgeDisplayName(ISE,SE,namedisp); - POCD->DisplayGeometry(Standard_True); - POCD->DisplayShape(namedbrep,namedisp,SE); - return 0; -} - -//----------------------------------------------------------------------- -// SeeShapeIS -//----------------------------------------------------------------------- -Standard_Integer SeeShapeIS(const Standard_Integer I,const TopoDS_Shape& S) -{ - if ( !PHDSD || !POCD) return 0; - - if (S.IsNull()) return 0; - TCollection_AsciiString namedbrep; PHDSD->ShapeName(I,S,namedbrep); - TCollection_AsciiString namedisp = namedbrep; - // NameDisplay = *name/name* if S subshape of shape1/shape2 - TCollection_AsciiString ast = "*"; - const TopOpeBRepDS_DataStructure& BDS = PHDSD->CurrentBDS(); - // if the Shape was removed from the DS, "*" is replaced by "~" - if(!BDS.HasShape(S)) - ast = "~"; - Standard_Boolean of1 = PHDSD->SubShape(S,1);if(of1) namedisp = ast+namedisp; - Standard_Boolean of2 = PHDSD->SubShape(S,2);if(of2) namedisp = namedisp+ast; - if (SelectRankShape == 1 && !of1) return 0; - if (SelectRankShape == 2 && !of2) return 0; - - if (S.ShapeType()==TopAbs_EDGE) POCD->DisplayGeometry(Standard_True); - else POCD->DisplayGeometry(DisOri); - if((S.ShapeType()==TopAbs_VERTEX) && TolFlag) { - const TopoDS_Vertex& V = TopoDS::Vertex(S); - Standard_Real Tol = BRep_Tool::Tolerance(V); - POCD->SetTol(Tol); - } - POCD->DisplayShape(namedbrep,namedisp,S); - - return 0; -} - - -//----------------------------------------------------------------------- -// SeeShape -//----------------------------------------------------------------------- -static Standard_Integer SeeShape(TCollection_AsciiString namedbrep) -{ - if ( !PHDSD || !POCD ) return 0; - - const char* pname = (const char *)namedbrep.ToCString(); - TopoDS_Shape S = DBRep::Get(pname); - if ( S.IsNull() ) return 0; - TCollection_AsciiString namedisp; - PHDSD->ShapeDisplayName(namedbrep,S,namedisp); - POCD->DisplayShape(namedbrep,namedisp,S); - return 0; -} - -//----------------------------------------------------------------------- -// SeePoint -//----------------------------------------------------------------------- -static Standard_Integer SeePoint(const Standard_Integer I) -{ - if ( !PHDSD ) return 0; - - const TopOpeBRepDS_DataStructure& BDS = PHDSD->CurrentBDS(); - if (I < 1 || I > BDS.NbPoints()) return 0; - - TopOpeBRepDS_PointExplorer pex(BDS); - Standard_Boolean isp = pex.IsPoint(I); - if (!isp) return 0; - - const TopOpeBRepDS_Point& P = BDS.Point(I); - TopOpeBRepDS_Kind K = TopOpeBRepDS_POINT; - TCollection_AsciiString namedbrep; TestTopOpeDraw_TTOT::GeometryName(I,K,namedbrep); - TCollection_AsciiString namedisp; PHDSD->GeometryDisplayName(I,K,namedisp); - Draw_ColorKind namecolor = TestTopOpeDraw_TTOT::GeometryColor(K); - SetPoint(namedbrep,namedisp,namecolor,P); - return 0; -} - -//----------------------------------------------------------------------- -// SeeCurve -//----------------------------------------------------------------------- -static Standard_Integer SeeCurve(const Standard_Integer I) -{ - if ( !PHDSD ) return 0; - - const TopOpeBRepDS_DataStructure& BDS = PHDSD->CurrentBDS(); - if (I < 1 || I > BDS.NbCurves()) return 0; - - TopOpeBRepDS_CurveExplorer cex(BDS,GFindKeep); - Standard_Boolean isc = cex.IsCurve(I); - if (!isc) return 0; - - const TopOpeBRepDS_Curve& C = BDS.Curve(I); - TopOpeBRepDS_Kind K = TopOpeBRepDS_CURVE; - TCollection_AsciiString namedbrep; TestTopOpeDraw_TTOT::GeometryName(I,K,namedbrep); - TCollection_AsciiString namedisp; PHDSD->GeometryDisplayName(I,K,namedisp); - Draw_ColorKind namecolor = TestTopOpeDraw_TTOT::GeometryColor(K); - SetCurve(namedbrep,namedisp,namecolor,C,I); - return 0; -} - - -//----------------------------------------------------------------------- -// SeeSurface NYI -//----------------------------------------------------------------------- -Standard_Integer SeeSurface(const Standard_Integer I) // NYI -{ - if ( !PHDSD ) return 0; - - const TopOpeBRepDS_DataStructure& BDS = PHDSD->CurrentBDS(); - if (I < 1 || I > BDS.NbSurfaces()) return 0; - return 0; -} - -//----------------------------------------------------------------------- -// SeeEdgeCurve -//----------------------------------------------------------------------- -static Standard_Integer SeeEdgeCurve(const Standard_Integer IE,const TopoDS_Shape& SE) -{ - if ( !POCD ) return 0; - - if (SE.IsNull()) return 0; - const TopoDS_Edge& E = TopoDS::Edge(SE); - TopLoc_Location L;Standard_Real f,l;Handle(Geom_Curve) GC=BRep_Tool::Curve(E,L,f,l); - TCollection_AsciiString namedbrep="E";TestTopOpeDraw_TTOT::CatCurveName(IE,namedbrep); - TCollection_AsciiString namedisp="E";TestTopOpeDraw_TTOT::CatCurveDisplayName(IE,GC,namedisp); - POCD->DisplayGeometry(Standard_True); - POCD->DisplayShape(namedbrep,namedisp,SE); - return 0; -} - -//----------------------------------------------------------------------- -// SeeGeometry -//----------------------------------------------------------------------- -static Standard_Integer SeeGeometry(const Standard_Integer IG,const TopOpeBRepDS_Kind TK) -{ - if (TK == TopOpeBRepDS_POINT) return SeePoint(IG); - else if (TK == TopOpeBRepDS_CURVE) return SeeCurve(IG); - else if (TK == TopOpeBRepDS_SURFACE) return SeeSurface(IG); - return 0; -} - -//----------------------------------------------------------------------- -// SeeGeometry -//----------------------------------------------------------------------- -static Standard_Integer SeeGeometry(const TopOpeBRepDS_Kind TK) -{ - if ( !PHDSD ) return 0; - - const TopOpeBRepDS_DataStructure& BDS = PHDSD->CurrentBDS(); - - if (TK == TopOpeBRepDS_POINT) { - TopOpeBRepDS_PointExplorer pex(BDS,GFindKeep); - for (; pex.More(); pex.Next()) { - Standard_Integer ig = pex.Index(); - SeeGeometry(ig,TK); - } - } - else if (TK == TopOpeBRepDS_CURVE) { - TopOpeBRepDS_CurveExplorer cex(BDS,GFindKeep); - for (; cex.More(); cex.Next()) { - Standard_Integer ig = cex.Index(); - SeeGeometry(ig,TK); - } - } - else if (TK == TopOpeBRepDS_SURFACE) { //NYI - } - return 0; -} - -//----------------------------------------------------------------------- -// TOPOPE_SeeShape -//----------------------------------------------------------------------- -Standard_Integer TOPOPE_SeeShape(char* name) -{ - TCollection_AsciiString asc = name; - Standard_Integer res = SeeShape(asc); - return res; -} - -//----------------------------------------------------------------------- -// suppressarg : remove a[d],modify na-- -//----------------------------------------------------------------------- -void suppressarg(Standard_Integer& na,const char** a,const Standard_Integer d) -{ - for(Standard_Integer i=d;i to ,modify na = na - (l - f) -//----------------------------------------------------------------------- -Standard_EXPORT void suppressargs(Standard_Integer& na,const char** a,const Standard_Integer f,const Standard_Integer l) -{ - if(l == f) - suppressarg(na,a,l); - if(l <= f) return; - for(Standard_Integer i=0;i s_4 is subshape of the 1st argument - suppressarg(na,a,ia); - SelectRankShape = 1; - } - else if (!strcasecmp(a[ia],"-2")) { - // tsee -2 s 4 : display s_4 <=> s_4 is subshape of the 2nd argument - suppressarg(na,a,ia); - SelectRankShape = 2; - } - else if (!strcasecmp(a[ia],"-p") && (ia < na-1)) { - suppressargs(na,a,ia,ia+1); - Standard_Real t = Draw::Atof(a[ia+1]); - if (t >= 0. && t <= 1.) { - OldParFlag = ParFlag; ParFlag = t; - } - } - } -} - -void OthersCommands_help(const char* CommandName,const char* syntaxe = ""); -//----------------------------------------------------------------------- -// tsee_help -//----------------------------------------------------------------------- -static void tsee_help(const char* CommandName, Draw_Interpretor& di) -{ - di<<"\n"; - di<<"tsee : Draw entities of data structure (DS) loaded by TestTopOpe::CurrentDS().\n"; - di<<"DS entities are shapes and geometries accessed by a and an .\n"; - di<<"basic usage :\n"; - di<<" tsee \n"; - di<<" = so sh f w e v s for solid/shell/face/wire/edge/vertex/shape\n"; - di<<" su cu p for surface/curve/point (N.B : su is NYI)\n"; - di<<" = integer\n"; - di<<"example : 'tsee e 3' will draw the edge of index 3\n"; - di<<" 'tsee e 3 6' will draw the edges of index 3 and 6\n"; - di<<" 'tsee e' will draw all the edges.\n"; - di<<"\n"; - di<<"Index values of DS entities may be given by the 'tds' command which prints\n"; - di<<"the content of the DS for each shape and geometry type.\n"; - di<<"Entities are drawn with a specific color according to their type.\n"; - di<<"\n"; - di<<"Naming : \n"; - di<<"'tsee ' creates the drawable object named _.\n"; - di<<"This name is displayed near the entity in one if the forms : \n"; - di<<" *_ meaning entity belongs to the first shape of current operation.\n"; - di<<" _* meaning entity belongs to the second shape of current operation.\n"; - di<<"\n"; - di<<"Same Domain shapes : \n"; - di<<"'tsee sd' to display all shapes of having same domain data.\n"; - di<<"example : 'tsee e sd' to display all edges sharing a 1d geometric domain\n"; - di<<" with other edges.\n"; - di<<"\n"; - di<<"Optional flags :\n"; - OthersCommands_help(CommandName); - di<<"Other types :\n"; - di<<"'tsee fev' : displays all faces,then edges,then vertices.\n"; - di<<"'tsee es ' displays edge described as section edge .\n"; - di<<" The name of a section edge likes t_i,where :\n"; - di<<" - i is the edge index in the set of section edge,\n"; - di<<" - j is edge index in the DS (as any edge).\n"; - di<<"\n"; -} - -static void tseei_help(Draw_Interpretor& di) -{ - di<<"\n"; - di<<"tseei : Draws entities of data structure (DS) loaded by TestTopOpe::CurrentDS().\n"; - di<<"Draws the objects appearing in interferences DS objects.\n"; - di<<"See command 'tsee' for discussion about DS objects.\n"; - di<<"\n"; -} - -static void tki_help(Draw_Interpretor& di) -{ - di<<"\n"; - di<<"tki,tkig,tkis : Groups interferences of DS objects\n"; - di<<" by geometry (g),or support (s),and index.\n"; - di<<"See command 'tsee' for discussion about DS objects.\n"; - di<<"(Test of class TopOpeBRepDS_TKI)\n"; - di<<"\n"; -} - -static void tds_help(Draw_Interpretor& di) -{ - di<<"\n"; - di<<"tds : dump current DS (loaded by CurrentDS())\n"; - di<<"basic usage : tds <-arg> type \n"; - di<<"\n"; - di<<"Description of curve geometry (type = c) : <-arg> = -t -k -s -l\n"; - di<<"\t-k : print only the curve with keep = Standard_True\n"; - di<<"\t-l : (long) print all poles and knots for BSplines curves\n"; - di<<"\t-s : (short) print only 4 poles and 4 knots for BSplines curves\n"; - di<<"on shapes (type = s|so|sh|f|w|e|v) : <-arg> = -ssi\n"; - di<<"\t-ssi : print only ShapeShapeInterferences\n"; - di<<"\n"; - di<<"See command 'tsee' for discussion about type and .\n"; - di<<"\n"; -} - -typedef Standard_Integer (*tf_SeeShape)(const Standard_Integer I,const TopoDS_Shape& S); -extern void OthersCommands_flags(Standard_Integer& na,const char** a,TestTopOpeDraw_Displayer& TD); -void COUTNOHDS(Draw_Interpretor& di) {di<<"no current HDS\n";} -Standard_Integer tsee_SeeShapefunc(Draw_Interpretor& di,Standard_Integer na_in,const char** a,tf_SeeShape SeeShapefunc) -{ - if (na_in == 1 || (na_in == 2 && !strcasecmp(a[1],"-h"))) { - tsee_help(a[0], di); - return 0; - } - - Standard_Integer na = na_in; - if ((PHDSD == NULL) || (POCD == NULL)) return 0; - - const Handle(TopOpeBRepDS_HDataStructure)& HDS = PHDSD->CurrentHDS(); - if (HDS.IsNull()) { COUTNOHDS(di); return 0; } - if (na < 2) return 1; - const TopOpeBRepDS_DataStructure& BDS = PHDSD->CurrentBDS(); - - POCD->InitDisplayer(); - TolFlag = Standard_False; - tsee_flags(na,a); - OthersCommands_flags(na,a,*POCD); - TolFlag = POCD->TolIs(); - DisOri = POCD->DisplayGeometry(); - - Standard_Integer i1arg = 1; - TSEEpar Tpar(a[i1arg]); - -// Standard_Integer ia,is,ig; - Standard_Integer ia,is; - - if ( PrintDistancePP ) { - tsee_entity0 E1,E2; - if (na == 4) { // tsee p 3 4 - if (E1.Set(na,a,i1arg+0,i1arg+1)) return 1; - if (E2.Set(na,a,i1arg+0,i1arg+2)) return 1; - } - else if (na == 5) { // tsee p 3 v 4 - if (E1.Set(na,a,i1arg+0,i1arg+1)) return 1; - if (E2.Set(na,a,i1arg+2,i1arg+3)) return 1; - } - if (!E1.myEOK || !E2.myEOK) return 1; - - E1.See();E2.See(); - di<<"Distance "< 2 : display DS shapes of type TS of index Draw::Atoi(a[2]..a[narg-1]) - if (na == 2 ) { - TopOpeBRepDS_Explorer x(HDS,Tpar.TS(),Standard_False); - for(;x.More();x.Next()) (*SeeShapefunc)(x.Index(),x.Current()); - } - else { - if ( !strcmp(a[i1arg+1],"sd") ) { // shapes HasSameDomain of type TS - TopOpeBRepDS_Explorer x(HDS,Tpar.TS(),Standard_False); - for (;x.More();x.Next()) { - Standard_Boolean isSsd = HDS->HasSameDomain(x.Current()); - if (isSsd ) (*SeeShapefunc)(x.Index(),x.Current()); - } - } - else if (Tpar.isshap() && (Tpar.TS() == TopAbs_EDGE) && (na>=2) && POCD->ParIs()) { - // see edges [4..na[ with of the name in t in [0..1] / range - if (na == 2) { - TopOpeBRepDS_Explorer x(HDS,TopAbs_EDGE,Standard_False); - for (;x.More();x.Next()) (*SeeShapefunc)(x.Index(),x.Current()); - } - else { - for (ia = i1arg+1; ia < na; ia++) { - is = Draw::Atoi(a[ia]); - (*SeeShapefunc)(is,GetShape(is,Tpar.TS())); - } - } - ParFlag = OldParFlag; - } - else { - for (ia = i1arg+1; ia < na; ia++) { - is = Draw::Atoi(a[ia]); - (*SeeShapefunc)(is,GetShape(is,Tpar.TS())); - } - } - } - } // isshap - - else if ( Tpar.isgeom() ) { - // na == 2 : display all DS geometries of type TK - // na > 2 : display DS geometries of type TK index Draw::Atoi(a[2])..a[narg-1]) - if (na == 2 ) SeeGeometry(Tpar.TK()); - else for (ia = i1arg+1; ia < na; ia++) SeeGeometry(Standard_Integer(Draw::Atoi(a[ia])),Tpar.TK()); - } - - else if ( Tpar.isafev() ) { - // faces then edges then vertices - TopOpeBRepDS_Explorer x; - for (x.Init(HDS,TopAbs_FACE,Standard_False);x.More();x.Next()) (*SeeShapefunc)(x.Index(),GetShape(x.Index())); - for (x.Init(HDS,TopAbs_EDGE,Standard_False);x.More();x.Next()) (*SeeShapefunc)(x.Index(),GetShape(x.Index())); - for (x.Init(HDS,TopAbs_VERTEX,Standard_False);x.More();x.Next()) (*SeeShapefunc)(x.Index(),GetShape(x.Index())); - } - - else if ( Tpar.isedcu() ) { - // na == 2 : display curves of all DS edges - // na > 2 : display curve of DS edges index Draw::Atoi(a[2])..a[narg-1]) - if ( na == 2 ) { - TopOpeBRepDS_Explorer x(HDS,TopAbs_EDGE,Standard_False); - for (;x.More();x.Next()) SeeEdgeCurve(x.Index(),x.Edge()); - } - else { - for (ia = i1arg+1; ia < na; ia++) { - is = Draw::Atoi(a[ia]); - SeeEdgeCurve(is,GetShape(is,TopAbs_EDGE)); - } - } - } - - else if ( Tpar.issect() ) { // na=2 all section edges,na>2 section edges (a[2]..a[na-1]) - Standard_Integer ise,nse = BDS.NbSectionEdges(); - if (na == 2) for (ise = 1; ise<=nse; ise++) SeeSectionEdge(ise); - else for (ia = i1arg+1; iaCurrentHDS(); - if (S.IsNull()) return 0; - SeeShapeIS(I,S); - - TopOpeBRepDS_Kind SK = TopOpeBRepDS::ShapeToKind(S.ShapeType()); - const TopOpeBRepDS_DataStructure& BDS = HDS->DS(); - const TopOpeBRepDS_ListOfInterference& LOI = BDS.ShapeInterferences(S); - TopOpeBRepDS_ListIteratorOfListOfInterference ITLOI(LOI); - TColStd_ListOfInteger LOKK,LOII; - - for (;ITLOI.More();ITLOI.Next()) { - const Handle(TopOpeBRepDS_Interference)& HI = ITLOI.Value(); - const TopOpeBRepDS_Transition& T = HI->Transition(); - - TopAbs_ShapeEnum sb = T.ShapeBefore();TopOpeBRepDS_Kind sbk = TopOpeBRepDS::ShapeToKind(sb); - Standard_Integer sbi = T.IndexBefore(); - TopAbs_ShapeEnum sa = T.ShapeAfter();TopOpeBRepDS_Kind sak = TopOpeBRepDS::ShapeToKind(sa); - Standard_Integer sai = T.IndexAfter(); - TopOpeBRepDS_Kind gk,sk; Standard_Integer gi,si; HI->GKGSKS(gk,gi,sk,si); - - AddShapeKI(LOKK,LOII,sbk,sbi); - AddShapeKI(LOKK,LOII,sak,sai); - AddShapeKI(LOKK,LOII,gk,gi); - AddShapeKI(LOKK,LOII,sk,si); - } - - TColStd_ListIteratorOfListOfInteger ITLOKK,ITLOII; - - ITLOKK.Initialize(LOKK); ITLOII.Initialize(LOII); - Standard_Boolean ya = ITLOKK.More(); - TopOpeBRepDS::Print(SK,I,cout,""," : "); - for(; ITLOKK.More(),ITLOII.More(); ITLOKK.Next(),ITLOII.Next()) { -//JR/Hp - Standard_Integer ikk = ITLOKK.Value() ; - TopOpeBRepDS_Kind kk = (TopOpeBRepDS_Kind) ikk ; - Standard_Integer ii = ITLOII.Value(); -// TopOpeBRepDS_Kind kk = (TopOpeBRepDS_Kind)ITLOKK.Value(); Standard_Integer ii = ITLOII.Value(); - TopOpeBRepDS::Print(kk,ii,cout,""," "); - } - if (ya) di<<"\n"; else di<<"no shape interference\n"; - - ITLOKK.Initialize(LOKK); ITLOII.Initialize(LOII); - for(; ITLOKK.More(),ITLOII.More(); ITLOKK.Next(),ITLOII.Next()) { -//JR/Hp - Standard_Integer ikk =ITLOKK.Value() ; - TopOpeBRepDS_Kind kk = (TopOpeBRepDS_Kind) ikk ; - Standard_Integer ii = ITLOII.Value(); -// TopOpeBRepDS_Kind kk = (TopOpeBRepDS_Kind)ITLOKK.Value(); Standard_Integer ii = ITLOII.Value(); - SeeAnyKI(kk,ii); - } - //POP pour WNT - return 0; - -} // SeeShapeISI - -//----------------------------------------------------------------------- -// SeeShapeTKIG -//----------------------------------------------------------------------- -Standard_Integer SeeShapeTKIG(const Standard_Integer I,const TopoDS_Shape& S) -{ - if ( !PHDSD ) return 0; - const Handle(TopOpeBRepDS_HDataStructure)& HDS = PHDSD->CurrentHDS(); - if (S.IsNull()) return 0; - SeeShapeIS(I,S); - - TopOpeBRepDS_Kind SK = TopOpeBRepDS::ShapeToKind(S.ShapeType()); - const TopOpeBRepDS_ListOfInterference& LOI = HDS->DS().ShapeInterferences(S); - TopOpeBRepDS_TKI tki; - TCollection_AsciiString s1,s2; - - tki.Clear(); - tki.FillOnGeometry(LOI); - s1=TopOpeBRepDS::SPrint(SK,I,""," by G : \n"); - tki.Init();if (tki.More()) s2="\n";else s2=""; - tki.DumpTKIIterator(s1,s2); - - return 0; -} // SeeShapeTKIG - -//----------------------------------------------------------------------- -// SeeShapeTKIS -//----------------------------------------------------------------------- -Standard_Integer SeeShapeTKIS(const Standard_Integer I,const TopoDS_Shape& S) -{ - if ( !PHDSD ) return 0; - const Handle(TopOpeBRepDS_HDataStructure)& HDS = PHDSD->CurrentHDS(); - if (S.IsNull()) return 0; - SeeShapeIS(I,S); - - TopOpeBRepDS_Kind SK = TopOpeBRepDS::ShapeToKind(S.ShapeType()); - const TopOpeBRepDS_ListOfInterference& LOI = HDS->DS().ShapeInterferences(S); - TopOpeBRepDS_TKI tki; - TCollection_AsciiString s1,s2; - - tki.Clear(); - tki.FillOnSupport(LOI); - s1=TopOpeBRepDS::SPrint(SK,I,""," by S : \n"); - tki.Init();if (tki.More()) s2="\n";else s2=""; - tki.DumpTKIIterator(s1,s2); - - return 0; -} // SeeShapeTKIS - -//----------------------------------------------------------------------- -// SeeShapeTKI -//----------------------------------------------------------------------- -Standard_Integer SeeShapeTKI(const Standard_Integer I,const TopoDS_Shape& S,Draw_Interpretor& di) -{ - di<<"\n"; - SeeShapeTKIG(I,S); - SeeShapeTKIS(I,S); - return 0; -} // SeeShapeTKI - -//----------------------------------------------------------------------- -// tseei -//----------------------------------------------------------------------- -Standard_Integer tseei(Draw_Interpretor& di,Standard_Integer na_in,const char** a) -{ - if (na_in == 1) { tseei_help(di); return 0; } - tf_SeeShape ssf = (tf_SeeShape)SeeShapeISI; - Standard_Integer r = tsee_SeeShapefunc(di,na_in,a,ssf); - return r; -} // tseei - -//----------------------------------------------------------------------- -// tki -//----------------------------------------------------------------------- -Standard_Integer tki(Draw_Interpretor& di,Standard_Integer na_in,const char** a) -{ - if (na_in == 1) { tki_help(di); return 0; } - - tf_SeeShape ssf = NULL; - if ( !strcasecmp(a[0],"tki") ) ssf = (tf_SeeShape)SeeShapeTKI; - else if ( !strcasecmp(a[0],"tkig") ) ssf = (tf_SeeShape)SeeShapeTKIG; - else if ( !strcasecmp(a[0],"tkis") ) ssf = (tf_SeeShape)SeeShapeTKIS; - if (ssf == NULL) return 0; - - Standard_Integer r = tsee_SeeShapefunc(di,na_in,a,ssf); - return r; -} // tki - -//----------------------------------------------------------------------- -// 0 = tds -// 1 = kind of DS object to dump = [s] [so sh f w e v] [se] [su c p] -// 2,3 ... = [i1,i2 ...] = indices of DS object to see -//----------------------------------------------------------------------- -Standard_Integer tds(Draw_Interpretor& di,Standard_Integer na,const char** a) -{ - Standard_Integer ia ; - for ( ia = 0; ia < na; ia++) { - if (!strcasecmp(a[ia],"-ssi")) { - suppressarg(na,a,ia); - continue; - } - else if (!strncmp(a[ia],"-",1)) { - TCollection_AsciiString as = a[ia]; - as.Remove(1,1); - for(Standard_Integer i = 1;i <= as.Length(); i++) { - if (as.Value(i) == 'h') { tds_help(di); return 0; } - } - suppressarg(na,a,ia); - } - } - - if (PHDSD == NULL) return 0; - const Handle(TopOpeBRepDS_HDataStructure)& HDS = PHDSD->CurrentHDS(); - if (HDS.IsNull()) {COUTNOHDS(di);return 0;} - PHDSD->CurrentBDS(); - - return 0; -} - -Standard_Integer TPPE(Draw_Interpretor& di,Standard_Integer na,const char** a) -{ - if (PHDSD == NULL) return 0; - const Handle(TopOpeBRepDS_HDataStructure)& HDS = PHDSD->CurrentHDS(); - if ( HDS.IsNull() ) { COUTNOHDS(di); return 0; } - - if (na != 5) return 1; - Standard_Boolean ok = Standard_True; - - gp_Pnt pds; - TopoDS_Edge ed; - - Standard_Integer ip = Draw::Atoi(a[2]); - Standard_Integer ie = Draw::Atoi(a[4]); - ok = ok && (ip >= 1); ok = ok && (ie >= 1); - if (!ok) { - di <<" bad data\n"; - return 1; - } - - ok = Standard_False; - if (!strcmp("p",a[1])){ - ok = Standard_True; - ok = ok && (ip <= HDS->NbPoints()); - if (ok) pds = HDS->Point(ip).Point(); - if (!ok) di<<" geometry "<NbShapes()); - if (ok) { - TopoDS_Shape sh = HDS->Shape(ip,SFindKeep); - ok = ok && (sh.ShapeType() == TopAbs_VERTEX); - if (ok) pds =BRep_Tool::Pnt(TopoDS::Vertex(sh)); - } - if (!ok) di<<" shape "<NbShapes()); - if (ok) { - TopoDS_Shape sh = HDS->Shape(ie,SFindKeep); - ok = ok && (sh.ShapeType() == TopAbs_EDGE); - if (ok) ed = TopoDS::Edge(sh); - } - if (!ok) di<<" shape "<= 1; - - if (ok) { - dmin = ponc.LowerDistance(); - Standard_Real par = ponc.LowerDistanceParameter(); - BRepAdaptor_Curve bc(ed); - pproj = bc.Value(par); - } - } - - if (ok) { - TCollection_AsciiString pp("p"); - pp.AssignCat(ip); pp.AssignCat("e"); pp.AssignCat(ie); - char* ppp = (char *)pp.ToCString(); - DrawTrSurf::Set(ppp,pproj); - di<<"dist point "<CurrentHDS()->ChkIntg(); - di<<"Check interference integrity completed\n"; -} - -void FUN_ChkIntgSamDomain(Draw_Interpretor& di) //***Check Integrity SameDomain -{ - if ( PHDSD == NULL ) return; - TopOpeBRepDS_Check C(PHDSD->CurrentHDS()); - if(C.ChkIntgSamDom()) - di<<"Check SameDomain integrity completed\n"; -} - -void FUN_ChkIntg(Draw_Interpretor& di) //***Check Integrity -{ - if ( PHDSD == NULL ) return; - FUN_ChkIntgInterf(di); - FUN_ChkIntgSamDomain(di); -} - -void FUN_ChkVertex(Draw_Interpretor& di) //***Check Vertex SameDomain -{ - if ( PHDSD == NULL ) return; - TopOpeBRepDS_Check C(PHDSD->CurrentHDS()); - if(C.OneVertexOnPnt()) - di<<"Check Structure Vertex SameDomain Complete\n"; -} - -//--------------------------------------------------------- -Standard_Integer topochk(Draw_Interpretor& di,Standard_Integer na,const char** a) -{ - if (strcmp(a[0],"topochk")) return 1; - - if(na < 2) { - ::FUN_ChkIntg(di); - ::FUN_ChkVertex(di); - } - else if(na > 2) return 1; - else if(!strcmp (a[1],"-i")) ::FUN_ChkIntg(di); - else if(!strncmp(a[1],"-i",2)) { - if (!strcmp(a[1],"-ii")) ::FUN_ChkIntgInterf(di); - else if(!strcmp(a[1],"-isd")) ::FUN_ChkIntgSamDomain(di); - } - else if(!strcmp (a[1],"-s")) ::FUN_ChkVertex(di); - else { - di<<"option : -i = check DS full integrity\n"; - di<<"option : -ii = check only interferences\n"; - di<<"option : -isd = check only SameDomain data\n\n"; - di<<"option : -s = check only SameDomain data on vertex\n"; - return 1; - } - return 0; -} - -//----------------------------------------------------------------------- -// SeeShapeTCX -//----------------------------------------------------------------------- -Standard_Integer SeeShapeTCX(const Standard_Integer I,const TopoDS_Shape& S) -{ - if ( !PHDSD ) return 0; - const Handle(TopOpeBRepDS_HDataStructure)& HDS = PHDSD->CurrentHDS(); - if (S.IsNull()) return 0; - FDSCNX_Dump(HDS,I); - return 0; -} // SeeShapeTCX - -static void tcx_help(Draw_Interpretor& di) -{ - di<<"tcx : function not documented\n"; -} - -//----------------------------------------------------------------------- -// tcx -//----------------------------------------------------------------------- -Standard_Integer tcx(Draw_Interpretor& di,Standard_Integer na_in,const char** a) -{ - if (na_in == 1) { tcx_help(di); return 0; } - Standard_Integer r = tsee_SeeShapefunc(di,na_in,a,SeeShapeTCX); - return r; -} // tcx - -#if 0 -//--------------------------------------------------------- -Standard_Integer tcx(Draw_Interpretor& di,Standard_Integer na,const char** a) -{ - if (PHDSD == NULL) return 0; - const Handle(TopOpeBRepDS_HDataStructure)& HDS = PHDSD->CurrentHDS(); - if ( HDS.IsNull() ) { COUTNOHDS(di); return 0; } - if (na == 1) FDSCNX_Dump(HDS); - else if (na == 2) { - if (ISINTEGER(a[1])) FDSCNX_Dump(HDS,Draw::Atoi(a[1])); - else - } - return 0; -} -#endif - -//----------------------------------------------------------------------- -Standard_Integer tdsri(Draw_Interpretor& di,Standard_Integer na_in,const char** a) -{ - if (na_in == 1 || (na_in == 2 && !strcasecmp(a[1],"-h"))) { - tsee_help(a[0],di); - return 0; - } - Standard_Integer na = na_in; - if ((PHDSD == NULL) || (POCD == NULL)) return 0; - const Handle(TopOpeBRepDS_HDataStructure)& HDS = PHDSD->CurrentHDS(); - if (HDS.IsNull()) { COUTNOHDS(di); return 0; } - if (na < 5) return 1; - TopOpeBRepDS_DataStructure& BDS = HDS->ChangeDS(); - - Standard_Integer i1arg = 1; - TDSpar Tpar(a[i1arg]); - - if ( strcasecmp(a[i1arg + 2],"i") ) return 0; - Standard_Integer ii = Draw::Atoi(a[i1arg + 3]); -// Standard_Integer ia,is,ig; - Standard_Integer is; - if ( Tpar.isshap() ) { - is = Draw::Atoi(a[i1arg + 1]); - const TopoDS_Shape& s = GetShape(is,Tpar.TS()); if (s.IsNull()) return 0; - TopOpeBRepDS_ListOfInterference& li = BDS.ChangeShapeInterferences(is); - Standard_Integer i=0; TopOpeBRepDS_ListIteratorOfListOfInterference it(li); - while (it.More()) { - if(++i == ii) { - li.Remove(it); - } - else it.Next(); - } - } - return 0; -} // tdsri - -//======================================================================= -//function : DSCommands -//purpose : -//======================================================================= -void TestTopOpe::HDSCommands(Draw_Interpretor& theCommands) -{ - static Standard_Boolean done = Standard_False; - if (done) return; - done = Standard_True; - PHDSD = (TestTopOpe_HDSDisplayer*) new (TestTopOpe_HDSDisplayer); - POCD = (TestTopOpeDraw_Displayer*) new (TestTopOpeDraw_Displayer); - - const char* g = "Topological operation data structure commands"; - theCommands.Add("tseei","no args to get help",__FILE__,tseei,g); - theCommands.Add("tsee","no args to get help ",__FILE__,tsee,g); - theCommands.Add("tki","no args to get help ",__FILE__,tki,g); - theCommands.Add("tkig","no args to get help ",__FILE__,tki,g); - theCommands.Add("tkis","no args to get help ",__FILE__,tki,g); - theCommands.Add("tds","-h to get help ",__FILE__,tds,g); - theCommands.Add("tppe","tppe p/v e ",__FILE__,TPPE); - theCommands.Add("topochk","check current DS (loaded by CurrentDS()",__FILE__,topochk,g); - theCommands.Add("tcx","dump connexity information",__FILE__,tcx,g); - theCommands.Add("tdsri","remove interference : tdsri type itype iinterf",__FILE__,tdsri,g); -} diff --git a/src/TestTopOpe/TestTopOpe_HDSDisplayer.cxx b/src/TestTopOpe/TestTopOpe_HDSDisplayer.cxx deleted file mode 100644 index 904e82a3bd..0000000000 --- a/src/TestTopOpe/TestTopOpe_HDSDisplayer.cxx +++ /dev/null @@ -1,270 +0,0 @@ -// Created on: 1996-09-19 -// Created by: Jean Yves LEBEY -// Copyright (c) 1996-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. - -#include - -#include -#include -#include -#include -#include - -//======================================================================= -//function : TestTopOpe_HDSDisplayer -//purpose : -//======================================================================= - -TestTopOpe_HDSDisplayer::TestTopOpe_HDSDisplayer() : -myPMap1(NULL),myPMap2(NULL) -{} - -//======================================================================= -//function : TestTopOpe_HDSDisplayer -//purpose : -//======================================================================= - -TestTopOpe_HDSDisplayer::TestTopOpe_HDSDisplayer(const Handle(TopOpeBRepDS_HDataStructure)& HDS) : -myPMap1(NULL),myPMap2(NULL) -{ - SetCurrentHDS(HDS); -} - -//======================================================================= -//function : Init -//purpose : -//======================================================================= - -void TestTopOpe_HDSDisplayer::Init() -{ - if ( myHDS.IsNull() ) return; - myHDS->ChangeDS().Init(); -} - -//======================================================================= -//function : SetCurrentHDS -//purpose : -//======================================================================= - -void TestTopOpe_HDSDisplayer::SetCurrentHDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS) -{ - if ( !myHDS.IsNull() ) Init(); - myHDS = HDS; -} - -//======================================================================= -//function : CurrentHDS -//purpose : -//======================================================================= - -const Handle(TopOpeBRepDS_HDataStructure)& TestTopOpe_HDSDisplayer::CurrentHDS() const -{ - return myHDS; -} - -//======================================================================= -//function : DS -//purpose : -//======================================================================= - -const TopOpeBRepDS_DataStructure& TestTopOpe_HDSDisplayer::CurrentBDS() const -{ - if ( !myHDS.IsNull() ) return myHDS->DS(); - else { - static TopOpeBRepDS_DataStructure* dummypbid = NULL; - if (!dummypbid) dummypbid = - (TopOpeBRepDS_DataStructure*) new (TopOpeBRepDS_DataStructure); - return (*dummypbid); - } -} - -//======================================================================= -//function : SetShape1 -//purpose : -//======================================================================= - -void TestTopOpe_HDSDisplayer::SetShape1(const TopoDS_Shape& S1) -{ - myS1 = S1; - if (myPMap1) myPMap1->Clear(); -} - -//======================================================================= -//function : Shape2 -//purpose : -//======================================================================= - -void TestTopOpe_HDSDisplayer::SetShape2(const TopoDS_Shape& S2) -{ - myS2 = S2; - if (myPMap2) myPMap2->Clear(); -} - -#define FindKeep Standard_False - -//======================================================================= -//function : SubShape -//purpose : -//======================================================================= - -Standard_Boolean TestTopOpe_HDSDisplayer::SubShape(const TopoDS_Shape& S,const Standard_Integer I12) -{ - Standard_Integer h = myHDS->DS().HasShape(S,FindKeep); - if ( !h ) return Standard_False; - - // returns True if is a subshape of loaded shape = 1,2 - Standard_Integer rankS = myHDS->DS().AncestorRank(S); - if ( rankS == 1 || rankS == 2 ) { - Standard_Boolean r = rankS == I12; - return r; - } - -#ifdef OCCT_DEBUG - Standard_Integer iS = myHDS->Shape(S,FindKeep); - cout<Contains(S); break; - case 2 : r = myPMap2->Contains(S); break; - } - return r; -} - -//======================================================================= -//function : ShapeName -//purpose : -//======================================================================= - -void TestTopOpe_HDSDisplayer::ShapeName(const Standard_Integer I,const TopoDS_Shape& S,TCollection_AsciiString& N) const -{ - TestTopOpeDraw_TTOT::ShapeEnumToString(S.ShapeType(),N); - N = N + "_" + TCollection_AsciiString(I); -} - -// if (S.ShapeType()==TopAbs_VERTEX) N = N + " "; -// switch (S.Orientation()) { -// case TopAbs_FORWARD : N = N + "F"; break; -// case TopAbs_REVERSED : N = N + "R"; break; -// case TopAbs_INTERNAL : N = N + "I"; break; -// case TopAbs_EXTERNAL : N = N + "E"; break; -// } - -//======================================================================= -//function : AncestorMark -//purpose : -//======================================================================= - -TCollection_AsciiString TestTopOpe_HDSDisplayer::AncestorMark(const TopoDS_Shape& S,const TCollection_AsciiString& Nin) -{ - Standard_Boolean of1 = SubShape(S,1),of2 = SubShape(S,2); - // N = "*Nin" / "Nin*" if S is subshape of first / second shape - TCollection_AsciiString N = ""; if (of1) N="*"; N=N+Nin; if (of2) N=N+"*"; - return N; -} - -//======================================================================= -//function : ShapeDisplayName -//purpose : -//======================================================================= - -void TestTopOpe_HDSDisplayer::ShapeDisplayName(const Standard_Integer I,const TopoDS_Shape& S,TCollection_AsciiString& N) -{ - TCollection_AsciiString name; - ShapeName(I,S,name); - N = AncestorMark(S,name); -} - -//======================================================================= -//function : ShapeDisplayName -//purpose : -//======================================================================= - -void TestTopOpe_HDSDisplayer::ShapeDisplayName(const TCollection_AsciiString& NameNBRep,const TopoDS_Shape& S,TCollection_AsciiString& N) -{ - // get subshape information on S - Standard_Boolean of1 = SubShape(S,1); - Standard_Boolean of2 = SubShape(S,2); - - // namedisp = "*name" if shape S is a subshape of first shape - // namedisp = "name*" if shape S is a subshape of second shape - N = ""; - if (S.ShapeType()==TopAbs_VERTEX) N = N + " "; - if (of1) N = N + "*"; - N = N + NameNBRep; - if (of2) N = N + "*"; -} - -//======================================================================= -//function : SectionEdgeName -//purpose : -//======================================================================= - -void TestTopOpe_HDSDisplayer::SectionEdgeName(const Standard_Integer ISE,const TopoDS_Shape& S,TCollection_AsciiString& N) const -{ - TestTopOpeDraw_TTOT::ShapeEnumToString(S.ShapeType(),N); - N = N + "s" + "_" + TCollection_AsciiString(ISE); -} - -//======================================================================= -//function : SectionEdgeDisplayName -//purpose : -//======================================================================= - -void TestTopOpe_HDSDisplayer::SectionEdgeDisplayName(const Standard_Integer ISE,const TopoDS_Shape& S,TCollection_AsciiString& N) -{ - TCollection_AsciiString name; - SectionEdgeName(ISE,S,name); - - Standard_Integer ids = CurrentBDS().Shape(S,FindKeep); - name = name + "<" + TCollection_AsciiString(ids) + ">"; - - N = AncestorMark(S,name); -} - -//======================================================================= -//function : GeometryDisplayName -//purpose : -//======================================================================= - -void TestTopOpe_HDSDisplayer::GeometryDisplayName(const Standard_Integer I,const TopOpeBRepDS_Kind K,TCollection_AsciiString& N) -{ - if (K == TopOpeBRepDS_CURVE) { - const Handle(Geom_Curve) GC = CurrentBDS().Curve(I).Curve(); - TestTopOpeDraw_TTOT::CurveDisplayName(I,GC,N); - } - else { - TCollection_AsciiString n; - TestTopOpeDraw_TTOT::GeometryName(I,K,n); - N = " "; N = N + n; - } -} - -//======================================================================= -//function : ShapeKind -//purpose : -//======================================================================= - -Standard_Boolean TestTopOpe_HDSDisplayer::ShapeKind(const Standard_Integer IS,const TopAbs_ShapeEnum TS) const -{ - const TopoDS_Shape& S = CurrentBDS().Shape(IS,FindKeep); - Standard_Boolean b = TestTopOpeDraw_TTOT::ShapeKind(S,TS); - return b; -} diff --git a/src/TestTopOpe/TestTopOpe_HDSDisplayer.hxx b/src/TestTopOpe/TestTopOpe_HDSDisplayer.hxx deleted file mode 100644 index 07c236ba05..0000000000 --- a/src/TestTopOpe/TestTopOpe_HDSDisplayer.hxx +++ /dev/null @@ -1,52 +0,0 @@ -// Created on: 1996-09-23 -// Created by: Jean Yves LEBEY -// Copyright (c) 1996-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. - -#ifndef _TestTopOpe_HDSDisplayer_HeaderFile -#define _TestTopOpe_HDSDisplayer_HeaderFile - -#include - -class TestTopOpe_HDSDisplayer { - -public: - TestTopOpe_HDSDisplayer(); - TestTopOpe_HDSDisplayer(const Handle(TopOpeBRepDS_HDataStructure)& HDS); - void Init(); - void SetCurrentHDS(const Handle(TopOpeBRepDS_HDataStructure)& HDS); - const Handle(TopOpeBRepDS_HDataStructure)& CurrentHDS() const ; - const TopOpeBRepDS_DataStructure& CurrentBDS() const ; - void SetShape1(const TopoDS_Shape& S1); - void SetShape2(const TopoDS_Shape& S2); - Standard_Boolean SubShape(const TopoDS_Shape& S,const Standard_Integer I); - - void ShapeName(const Standard_Integer,const TopoDS_Shape&,TCollection_AsciiString&) const ; - void ShapeDisplayName(const Standard_Integer,const TopoDS_Shape&,TCollection_AsciiString&) ; - TCollection_AsciiString AncestorMark(const TopoDS_Shape&,const TCollection_AsciiString&) ; - void ShapeDisplayName(const TCollection_AsciiString&,const TopoDS_Shape&,TCollection_AsciiString&) ; - - void SectionEdgeName(const Standard_Integer,const TopoDS_Shape&,TCollection_AsciiString&) const ; - void SectionEdgeDisplayName(const Standard_Integer,const TopoDS_Shape&,TCollection_AsciiString&) ; - - void GeometryDisplayName(const Standard_Integer,const TopOpeBRepDS_Kind,TCollection_AsciiString&) ; - Standard_Boolean ShapeKind(const Standard_Integer IS,const TopAbs_ShapeEnum TS) const ; - -private: - Handle(TopOpeBRepDS_HDataStructure) myHDS; - TopoDS_Shape myS1,myS2; - TopTools_IndexedMapOfShape *myPMap1, *myPMap2; -}; - -#endif diff --git a/src/TestTopOpe/TestTopOpe_KroBOOP.cxx b/src/TestTopOpe/TestTopOpe_KroBOOP.cxx deleted file mode 100644 index 69859a6df9..0000000000 --- a/src/TestTopOpe/TestTopOpe_KroBOOP.cxx +++ /dev/null @@ -1,30 +0,0 @@ -// Created on: 1998-10-14 -// Created by: Jean Yves LEBEY -// Copyright (c) 1998-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. - -#ifdef OCCT_DEBUG -#include -Standard_IMPORT TOPKRO KRO_DSFILLER_TOTAL; -Standard_IMPORT TOPKRO KRO_DSFILLER_INTFF; -Standard_IMPORT TOPKRO KRO_DSFILLER_INTEE; -Standard_IMPORT TOPKRO KRO_DSFILLER_INTFE; -void PrintKRO_PREPA() { - KRO_DSFILLER_TOTAL.Print(cout); cout< -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef _WIN32 -Standard_IMPORT Draw_Viewer dout; -#endif - - -//static Standard_Boolean Bool; -static Standard_Integer NbMES = 0; -static TColStd_Array1OfAsciiString *PDel = NULL; -static TColStd_Array1OfAsciiString *PNAME = NULL; -static TestTopOpeTools_Array1OfMesure *PAMES = NULL; - -//----------------------------------------------- -static Standard_Integer SetName(const Standard_Character *C, Draw_Interpretor& di) -//----------------------------------------------- -// here the number of measurement is managed -{ - if(PNAME == NULL) { - PNAME = new TColStd_Array1OfAsciiString(1, 100); - } - if(PDel == NULL) { - PDel = new TColStd_Array1OfAsciiString(1, 100); - } - if(NbMES >= 100) {di << "ATTENTION : last measurement accepted";} - for(Standard_Integer i = 1; i <= NbMES; i++) { - Standard_Character *Ch = (Standard_Character *)(*PNAME).Value(i).ToCString(); - if( *Ch == *C) return i; - } - (*PNAME).SetValue(++NbMES, *C); - (*PDel).SetValue(NbMES, "0"); - return NbMES; -} - -static void Mes_help(Draw_Interpretor& di) -{ - di<<"\n"; - di<<"mesure M : create/reset measurement M \n"; - di<<"mesure reset : reinitialize all measurements\n"; - di<<"mesure M n t : add data [n t] to M\n"; - di<<"mesure range M : sort indexes 'min max' of M\n"; - di<<"mesure minmax M : take 'xmin ymin xmax ymax' from M\n"; - di<<"mesure xy M : take 'x y' = M(i)\n"; - di<<"seem M : visualize M\n"; - di<<"seemx M fx : visualize M with factor in x\n"; - di<<"seemx M fy : visualize M with factor in y\n"; - di<<"seemxy M fx fy : visualize M with factor in x,y\n"; - di<<"\n"; -} - -// ---------------------------------------------------------------------- -Standard_Integer Mes(Draw_Interpretor& di,Standard_Integer na, const char** a) -// ---------------------------------------------------------------------- -{ - if (!strcmp(a[0],"mesure")) { - if (na == 1) { - Mes_help(di); - return 0; - } - else if (na == 2) { - if (!strcmp(a[1],"reset")) { PAMES = NULL; return 0;} - else { - Standard_Integer CurrentMES2 = SetName(a[1],di); - TestTopOpeTools_Mesure *MES2; - MES2 = new TestTopOpeTools_Mesure(a[1]); - if(PAMES == NULL) { PAMES = new TestTopOpeTools_Array1OfMesure(1, 100); } - (*PAMES).SetValue(CurrentMES2, *MES2); - } - } - else if (na == 3) { - if (!strcmp(a[1],"range")) { - const TestTopOpeTools_Mesure& M = (*PAMES).Value(SetName(a[2],di)); - di<<"1 "<Pnts())); - MES->SetName(a[i]); - (*PAMES).SetValue(CurrentMESS2, *MES); - } else { - MESS2 = (*PAMES).Value(CurrentMESS2); - if(!D.IsNull()) { - DMES2 = Handle(TestTopOpeDraw_DrawableMesure)::DownCast(D); - } else { // --> M is already in PAMES, and DMES has no name - DMES2 = new TestTopOpeDraw_DrawableMesure(MESS2, Draw_blanc,Draw_rose); - } - } - Draw::Set(a[i],DMES2); - (*PDel).SetValue(CurrentMESS2, "1"); - } - dout.RepaintAll(); - } - else if (!strcmp(a[0],"seemx") || !strcmp(a[0],"seemy")) { - if (na < 3) return 0; - Standard_Real dx=1.,dy=1.; - Standard_Boolean isX = Standard_False, isY = Standard_False; - if (!strcmp(a[0],"seemx")) { dx = Draw::Atof(a[na-1]); isX = Standard_True; } - else if (!strcmp(a[0],"seemy")) { dy = Draw::Atof(a[na-1]); isY = Standard_True; } - TestTopOpeTools_Mesure MES5; - Handle(Draw_Drawable3D) D; - Handle(TestTopOpeDraw_DrawableMesure) DMES5; - Standard_Integer test, i; - if(PAMES == NULL) { PAMES = new TestTopOpeTools_Array1OfMesure(1, 100); } - for(i = 1; i < na-1; i++) { - test = NbMES; - Standard_Integer CurrentMES5 = SetName(a[i],di); - D = Draw::Get(a[i],Standard_False); - if(test < CurrentMES5) {// if new measurement, it is after restore - if(D.IsNull()) { return 0; } - DMES5 = Handle(TestTopOpeDraw_DrawableMesure)::DownCast(D); - TestTopOpeTools_Mesure *MES; - MES = (new TestTopOpeTools_Mesure(DMES5->Pnts())); - MES->SetName(a[i]); - (*PAMES).SetValue(CurrentMES5, *MES); - } else { - MES5 = (*PAMES).Value(CurrentMES5); - if(!D.IsNull()) { - DMES5 = Handle(TestTopOpeDraw_DrawableMesure)::DownCast(D); - } else { - DMES5 = new TestTopOpeDraw_DrawableMesure(MES5, Draw_blanc,Draw_rose); - } - } - Draw::Set(a[i],DMES5); - (*PDel).SetValue(CurrentMES5, "1"); - if(isX) DMES5->SetScaleX(dx); - if(isY) DMES5->SetScaleY(dy); - } - } - else if (!strcmp(a[0],"seemxy")) { - if (na < 4) return 0; - TestTopOpeTools_Mesure& M = (*PAMES).ChangeValue(SetName(a[1],di)); - Standard_Real dx=Draw::Atof(a[2]),dy=Draw::Atof(a[3]); - Handle(Draw_Drawable3D) D = Draw::Get(a[1],Standard_False); - Handle(TestTopOpeDraw_DrawableMesure) DM; - DM = Handle(TestTopOpeDraw_DrawableMesure)::DownCast(D); - if (DM.IsNull()) { - DM = new TestTopOpeDraw_DrawableMesure(M,Draw_blanc,Draw_rose); - Draw::Set(a[1],DM); - } - DM->SetScaleX(dx); - DM->SetScaleY(dy); - dout< -#include -#include -#include -#include -#include - - -TestTopOpe_BOOP::TestTopOpe_BOOP(const char* keys[], - const char* resnamdef) : - mynmet(0), - myESP(Standard_False) -{ - Standard_Integer i; - for (i=0;i -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef _WIN32 -Standard_IMPORT Draw_Viewer dout; -#endif - -//======================================================================= -// bounds S xmin ymin zmin zmax ymax zmax -//======================================================================= -Standard_Integer BOUNDS(Draw_Interpretor& di, Standard_Integer narg, const char** a) -{ - if (narg != 8) return 1; - TopoDS_Shape S = DBRep::Get(a[1]); - Standard_Real xmin,ymin,zmin,xmax,ymax,zmax; - Bnd_Box b; BRepBndLib::Add(S,b); - b.Enlarge(Precision::Confusion()); - b.Get(xmin,ymin,zmin,xmax,ymax,zmax); - Draw::Set(a[2],xmin); - Draw::Set(a[3],ymin); - Draw::Set(a[4],zmin); - Draw::Set(a[5],xmax); - Draw::Set(a[6],ymax); - Draw::Set(a[7],zmax); - di<<"xmin:"< axis) -//======================================================================= -Standard_Integer DOTVIEW(Draw_Interpretor&, Standard_Integer narg, const char** a) -{ - if (narg < 8) return 1; - - Standard_Real dx,dy,dz; - Draw::Get(a[1],dx); Draw::Get(a[2],dy); Draw::Get(a[3],dz); - gp_Dir d1(dx,dy,dz); - Standard_Real idr; Draw::Get(a[4],idr); - gp_Pnt p; gp_Dir d2; PersEyeDir((Standard_Integer)idr,p,d2); - - gp_Dir d3(d1.Crossed(d2)); - Draw::Set(a[5],d3.X()); - Draw::Set(a[6],d3.Y()); - Draw::Set(a[7],d3.Z()); - - return 0; -} - -Standard_Integer VECTEUR(Draw_Interpretor& di, Standard_Integer , const char** ) { - di << "Pick positions with button \n"; - Standard_Integer id,X,Y,b; - gp_Trsf T; - gp_Pnt P1,P2,PP1,PP2; - - //----------------------------------------------------------- - dout.Select(id,X,Y,b); dout.GetTrsf(id,T); - T.Invert(); - Standard_Real z = dout.Zoom(id); - P1.SetCoord((Standard_Real)X /z,(Standard_Real)Y /z,0.0); - P1.Transform(T); - - dout.Select(id,X,Y,b); dout.GetTrsf(id,T); - T.Invert(); z = dout.Zoom(id); - - P2.SetCoord((Standard_Real)X /z,(Standard_Real)Y /z,0.0); - P2.Transform(T); - Standard_Real xa,ya,za; - if(Abs(P1.X())>Abs(P2.X())) xa = P1.X(); else xa = P2.X(); - if(Abs(P1.Y())>Abs(P2.Y())) ya = P1.Y(); else ya = P2.Y(); - if(Abs(P1.Z())>Abs(P2.Z())) za = P1.Z(); else za = P2.Z(); - P1.SetCoord(xa,ya,za); - Handle(Draw_Marker3D) D0 = new Draw_Marker3D - (gp_Pnt(P1.X(),P1.Y(),P1.Z()),Draw_Square,Draw_blanc,1); - dout << D0; - dout.Flush(); - //----------------------------------------------------------- - dout.Select(id,X,Y,b); - dout.GetTrsf(id,T); - T.Invert(); - z = dout.Zoom(id); - PP1.SetCoord((Standard_Real)X /z,(Standard_Real)Y /z,0.0); - PP1.Transform(T); - dout.Select(id,X,Y,b); - dout.GetTrsf(id,T); - T.Invert(); - z = dout.Zoom(id); - PP2.SetCoord((Standard_Real)X /z,(Standard_Real)Y /z,0.0); - PP2.Transform(T); - if(Abs(PP1.X())>Abs(PP2.X())) xa = PP1.X(); else xa = PP2.X(); - if(Abs(PP1.Y())>Abs(PP2.Y())) ya = PP1.Y(); else ya = PP2.Y(); - if(Abs(PP1.Z())>Abs(PP2.Z())) za = PP1.Z(); else za = PP2.Z(); - PP1.SetCoord(xa,ya,za); - Handle(Draw_Segment3D) d = new Draw_Segment3D(P1, PP1, Draw_blanc); - dout << d; - dout.Flush(); - di<<"\n"; - di<<"cdinp P1 "< 2) ? narg : 2; - - // take all the FACE args, place them in the shell - TopoDS_Shell she; BB.MakeShell(she); she.Closed(Standard_False); - Standard_Boolean yaface = Standard_False; - for (i = i1; i < i2; i++) { - const TopoDS_Shape& S = DBRep::Get(a[i]); - if (S.IsNull()) continue; - if (S.ShapeType() == TopAbs_FACE) { - BB.Add(she,S); - she.Closed (BRep_Tool::IsClosed (she)); - yaface = Standard_True; - } - } - - // take all the SHELL args, place them in the solid - TopoDS_Solid sol; BB.MakeSolid(sol); - for (i = i1; i < i2; i++) { - const TopoDS_Shape& S = DBRep::Get(a[i]); - if (S.IsNull()) continue; - if (S.ShapeType() == TopAbs_SHELL) { - BB.Add(sol,S); - } - } - - if (!strcmp("mksol",a[0])) { - if (yaface) BB.Add(sol,she); - res = sol; - } - else if (!strcmp("mkshe",a[0])) { - res = she; - } - else { - return 1; - } - - DBRep::Set(a[1],res); - return 0; -} - -//======================================================================= -// Grille xmin ymin zmin zmax ymax zmax nbx nby nbz -//======================================================================= -Standard_Integer GRILLE(Draw_Interpretor& di, Standard_Integer narg, const char** a) -{ - if (narg != 10) return 1; - Standard_Real xmin,ymin,zmin,xmax,ymax,zmax,dx,dy; - Standard_Integer nbx,nby,nbz; - xmin = Draw::Atof(a[1]); - ymin = Draw::Atof(a[2]); - zmin = Draw::Atof(a[3]); - xmax = Draw::Atof(a[4]); - ymax = Draw::Atof(a[5]); - zmax = Draw::Atof(a[6]); - nbx = Draw::Atoi(a[7]); - nby = Draw::Atoi(a[8]); - nbz = Draw::Atoi(a[9]); - if(xmax -Standard_IMPORT Standard_Boolean Draw_Chrono; -Standard_Integer CHROBOOP(Draw_Interpretor& di, Standard_Integer n, const char** a) -{ - Standard_Real ns = 0.; - Standard_Integer nm = 0; - Standard_Integer nh = 0; - Standard_Real ct = 0.; - - if ((n == 1) || (*a[1] == '0') || (*a[1] == '1')) { - if (n == 1) - Draw_Chrono = !Draw_Chrono; - else - Draw_Chrono = (*a[1] == '1'); - - if (Draw_Chrono) di << "Chronometers activated.\n"; - else di << "Chronometers desactivated.\n"; - } - else { - Handle(Draw_Drawable3D) D = Draw::Get(a[1]); - Handle(Draw_Chronometer) C; - if (!D.IsNull()) { - C = Handle(Draw_Chronometer)::DownCast(D); - } - if (C.IsNull()) { - C = new Draw_Chronometer(); - Draw::Set(a[1],C,Standard_False); - } - if (n <= 2) { - C->Timer().Reset(); - } - else if (n <= 3) { - if (!strcasecmp(a[2],"reset")) - C->Timer().Reset(); - else if (!strcasecmp(a[2],"start")) - C->Timer().Start(); - else if (!strcasecmp(a[2],"stop")) - C->Timer().Stop(); - else if (!strcasecmp(a[2],"show")) - C->Timer().Show(); - else { - C->Timer().Show(ns,nm,nh,ct); - if (!strcasecmp(a[2],"-s")) { - di< -#include - -VarsTopo::VarsTopo() : mytolarc(0.), mytoltan(0.) -{ - Init(); -} - -void VarsTopo::Init() -{ - myOCT = TopOpeBRepTool_APPROX; - myC2D = Standard_True; - mytol3xdef = mytol2xdef = mytol3x = mytol2x = 1.e-7; - myforcetoli = Standard_False; - myclear = Standard_True; - myexecmode = 0; - myverbmode = 0; -} - -void VarsTopo::SetTolxDef() -{ - mytol3x = mytol3xdef; - mytol2x = mytol2xdef; -} - -void VarsTopo::SetTolx(const Standard_Real tol3x, const Standard_Real tol2x) -{ - mytol3x = tol3x; - mytol2x = tol2x; -} - -void VarsTopo::GetTolx(Standard_Real& tol3x, Standard_Real& tol2x) const -{ - tol3x = mytol3x; - tol2x = mytol2x; -} - -void VarsTopo::SetToliDef() -{ - myforcetoli = Standard_False; -} - -void VarsTopo::SetToli(const Standard_Real tolarc,const Standard_Real toltan) -{ - mytolarc = tolarc; - mytoltan = toltan; - myforcetoli = Standard_True; -} - -void VarsTopo::GetToli(Standard_Real& tolarc, Standard_Real& toltan) const -{ - tolarc = mytolarc; - toltan = mytoltan; -} - -Standard_Boolean VarsTopo::GetForceToli() const -{ - return myforcetoli; -} - -void VarsTopo::SetClear(const Standard_Boolean b) -{ - myclear = b; -} - -Standard_Boolean VarsTopo::GetClear() const -{ - return myclear; -} - -void VarsTopo::SetOCT(char* noct) -{ - if (noct == NULL) return; - else if (!strcmp(noct,"-a")) SetOCT(TopOpeBRepTool_APPROX); - else if (!strcmp(noct,"-p")) SetOCT(TopOpeBRepTool_BSPLINE1); - else if (!strcmp(noct,"-i")) SetOCT(TopOpeBRepTool_INTERPOL); -} - -void VarsTopo::SetOCT(const TopOpeBRepTool_OutCurveType oct) -{ - myOCT = oct; -} - -TopOpeBRepTool_OutCurveType VarsTopo::GetOCT() const -{ - return myOCT; -} - -void VarsTopo::SetC2D(char* nc2d) -{ - if (nc2d == NULL) return; - else if (!strcasecmp(nc2d,"-no2d")) SetC2D(Standard_True); - else if (!strcasecmp(nc2d,"-2d")) SetC2D(Standard_False); -} - -void VarsTopo::SetC2D(const Standard_Boolean c2d) -{ - myC2D = c2d; -} - -Standard_Boolean VarsTopo::GetC2D() const -{ - return myC2D; -} - -void VarsTopo::DumpOCT(Standard_OStream& OS) const -{ - if (myOCT == TopOpeBRepTool_APPROX) - OS<<"section curves approximated\n"; - if (myOCT == TopOpeBRepTool_BSPLINE1) - OS<<"section curves discretizated\n"; -} - -void VarsTopo::DumpC2D(Standard_OStream& OS) const -{ - if (!myC2D) { - OS<<"section without pcurve"; OS<<"\n"; - } - else { - OS<<"section with pcurve"; OS<<"\n"; - } -} - -void VarsTopo::DumpTolx(Standard_OStream& OS) const -{ - OS<<"approximation tolerances : "; - OS<<"(3d "< -#include - -class VarsTopo { - -public: - - VarsTopo(); - void Init(); - void SetTolxDef(); - void SetTolx(const Standard_Real tol3x, const Standard_Real tol2x); - void GetTolx(Standard_Real& tol3x, Standard_Real& tol2x) const; - void SetToliDef(); - void SetToli(const Standard_Real tolarc, const Standard_Real toltan); - void GetToli(Standard_Real& tolarc, Standard_Real& toltan) const; Standard_Boolean GetForceToli() const; - void SetClear(const Standard_Boolean b); Standard_Boolean GetClear() const; - void SetOCT(char* namoct); - void SetOCT(const TopOpeBRepTool_OutCurveType oct); - TopOpeBRepTool_OutCurveType GetOCT() const; - void SetC2D(char* namoct); - void SetC2D(const Standard_Boolean c2d); - Standard_Boolean GetC2D() const; - void DumpOCT(Standard_OStream&) const; - void DumpC2D(Standard_OStream&) const; - void DumpTolx(Standard_OStream&) const; - void DumpToli(Standard_OStream&) const; - void DumpMode(Standard_OStream&) const; - void DumpVerbose(Standard_OStream&) const; - void DumpClear(Standard_OStream&) const; - void Dump(Standard_OStream&) const; - void SetMode(const Standard_Integer mode); - Standard_Integer GetMode() const; - void SetVerbose(const Standard_Integer mode); - Standard_Integer GetVerbose() const; - -private: - - TopOpeBRepTool_OutCurveType myOCT; - Standard_Boolean myC2D; - Standard_Real mytol3xdef,mytol2xdef; - Standard_Real mytol3x,mytol2x; - Standard_Boolean myforcetoli; - Standard_Real mytolarc, mytoltan; - Standard_Boolean myclear; - Standard_Integer myexecmode; - Standard_Integer myverbmode; - -}; - -#endif diff --git a/src/TestTopOpeDraw/FILES b/src/TestTopOpeDraw/FILES deleted file mode 100755 index 23cd840dda..0000000000 --- a/src/TestTopOpeDraw/FILES +++ /dev/null @@ -1,29 +0,0 @@ -FILES -TestTopOpeDraw.cxx -TestTopOpeDraw.hxx -TestTopOpeDraw_Array1OfDrawableMesure.hxx -TestTopOpeDraw_Array1OfDrawableP3D.hxx -TestTopOpeDraw_Displayer.cxx -TestTopOpeDraw_Displayer.hxx -TestTopOpeDraw_DrawableC2D.cxx -TestTopOpeDraw_DrawableC2D.hxx -TestTopOpeDraw_DrawableC3D.cxx -TestTopOpeDraw_DrawableC3D.hxx -TestTopOpeDraw_DrawableMesure.cxx -TestTopOpeDraw_DrawableMesure.hxx -TestTopOpeDraw_DrawableP2D.cxx -TestTopOpeDraw_DrawableP2D.hxx -TestTopOpeDraw_DrawableP3D.cxx -TestTopOpeDraw_DrawableP3D.hxx -TestTopOpeDraw_DrawableSHA.cxx -TestTopOpeDraw_DrawableSHA.hxx -TestTopOpeDraw_DrawableSUR.cxx -TestTopOpeDraw_DrawableSUR.hxx -TestTopOpeDraw_HArray1OfDrawableMesure.hxx -TestTopOpeDraw_HArray1OfDrawableP3D.hxx -TestTopOpeDraw_ListIteratorOfListOfPnt2d.hxx -TestTopOpeDraw_ListOfPnt2d.hxx -TestTopOpeDraw_OtherCommands.cxx -TestTopOpeDraw_SaveRestore.cxx -TestTopOpeDraw_TTOT.cxx -TestTopOpeDraw_TTOT.hxx diff --git a/src/TestTopOpeDraw/TestTopOpeDraw.cxx b/src/TestTopOpeDraw/TestTopOpeDraw.cxx deleted file mode 100644 index 27ff49864b..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw.cxx +++ /dev/null @@ -1,28 +0,0 @@ -// Created on: 1997-01-20 -// Created by: Jean Yves LEBEY -// Copyright (c) 1997-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. - - -#include -#include - -//======================================================================= -//function : AllCommands -//purpose : -//======================================================================= -void TestTopOpeDraw::AllCommands(Draw_Interpretor& theCommands) -{ - TestTopOpeDraw::OtherCommands(theCommands); -} diff --git a/src/TestTopOpeDraw/TestTopOpeDraw.hxx b/src/TestTopOpeDraw/TestTopOpeDraw.hxx deleted file mode 100644 index 5fbd1f680f..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw.hxx +++ /dev/null @@ -1,76 +0,0 @@ -// Created on: 1997-01-20 -// Created by: Jean Yves LEBEY -// Copyright (c) 1997-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. - -#ifndef _TestTopOpeDraw_HeaderFile -#define _TestTopOpeDraw_HeaderFile - -#include -#include -#include - -#include -class TestTopOpeDraw_DrawableSHA; -class TestTopOpeDraw_DrawableSUR; -class TestTopOpeDraw_DrawableC3D; -class TestTopOpeDraw_DrawableC2D; -class TestTopOpeDraw_DrawableP3D; -class TestTopOpeDraw_DrawableP2D; -class TestTopOpeDraw_DrawableMesure; - - - -class TestTopOpeDraw -{ -public: - - DEFINE_STANDARD_ALLOC - - - Standard_EXPORT static void AllCommands (Draw_Interpretor& I); - - Standard_EXPORT static void OtherCommands (Draw_Interpretor& I); - - - - -protected: - - - - - -private: - - - - -friend class TestTopOpeDraw_DrawableSHA; -friend class TestTopOpeDraw_DrawableSUR; -friend class TestTopOpeDraw_DrawableC3D; -friend class TestTopOpeDraw_DrawableC2D; -friend class TestTopOpeDraw_DrawableP3D; -friend class TestTopOpeDraw_DrawableP2D; -friend class TestTopOpeDraw_DrawableMesure; - -}; - - - - - - - -#endif // _TestTopOpeDraw_HeaderFile diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_Array1OfDrawableMesure.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_Array1OfDrawableMesure.hxx deleted file mode 100644 index 4c728d4619..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_Array1OfDrawableMesure.hxx +++ /dev/null @@ -1,26 +0,0 @@ -// Created on: 1997-01-20 -// Created by: Jean Yves LEBEY -// Copyright (c) 1997-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. - -#ifndef TestTopOpeDraw_Array1OfDrawableMesure_HeaderFile -#define TestTopOpeDraw_Array1OfDrawableMesure_HeaderFile - -#include -#include - -typedef NCollection_Array1 TestTopOpeDraw_Array1OfDrawableMesure; - - -#endif diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_Array1OfDrawableP3D.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_Array1OfDrawableP3D.hxx deleted file mode 100644 index a8aecf89d4..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_Array1OfDrawableP3D.hxx +++ /dev/null @@ -1,26 +0,0 @@ -// Created on: 1997-01-20 -// Created by: Jean Yves LEBEY -// Copyright (c) 1997-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. - -#ifndef TestTopOpeDraw_Array1OfDrawableP3D_HeaderFile -#define TestTopOpeDraw_Array1OfDrawableP3D_HeaderFile - -#include -#include - -typedef NCollection_Array1 TestTopOpeDraw_Array1OfDrawableP3D; - - -#endif diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx deleted file mode 100644 index 43a8ec16e8..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_Displayer.cxx +++ /dev/null @@ -1,488 +0,0 @@ -// Created on: 1996-09-09 -// Created by: Jean Yves LEBEY -// Copyright (c) 1996-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. - -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#ifdef _WIN32 -Standard_IMPORT Draw_Viewer dout; -#endif - -//======================================================================= -//function : TestTopOpeDraw_Displayer -//purpose : -//======================================================================= - -TestTopOpeDraw_Displayer::TestTopOpeDraw_Displayer() -{ - InitDisplayer(); -} - -//======================================================================= -//function : TestTopOpeDraw_Displayer -//purpose : -//======================================================================= - -TestTopOpeDraw_Displayer::TestTopOpeDraw_Displayer(const TCollection_AsciiString& namedbrep,const TopoDS_Shape& S) -{ - InitDisplayer(); - DisplayShape(namedbrep,S); -} - -//======================================================================= -//function : TestTopOpeDraw_Displayer -//purpose : -//======================================================================= - -TestTopOpeDraw_Displayer::TestTopOpeDraw_Displayer -(const TCollection_AsciiString& namedbrep,const TCollection_AsciiString& namedisp,const TopoDS_Shape& S) -{ - InitDisplayer(); - DisplayShape(namedbrep,namedisp,S); -} - -//======================================================================= -//function : DisplayShape -//purpose : -//======================================================================= - -void TestTopOpeDraw_Displayer::DisplayShape(const TCollection_AsciiString& namedbrep, const TopoDS_Shape& S) -{ - if (S.IsNull()) return; - SetShape(namedbrep,S); - DisplayShapePrivate(); -} - -//======================================================================= -//function : DisplayShape -//purpose : -//======================================================================= - -void TestTopOpeDraw_Displayer::DisplayShape -(const TCollection_AsciiString& namedbrep,const TCollection_AsciiString& namedisp,const TopoDS_Shape& S) -{ - if (S.IsNull()) return; - SetShape(namedbrep,S); - myNameDisplay = namedisp; - DisplayShapePrivate(); -} - -//======================================================================= -//function : DisplayShapePrivate -//purpose : -//======================================================================= - -void TestTopOpeDraw_Displayer::DisplayShapePrivate() -{ - if (myShape.IsNull()) return; - TopAbs_ShapeEnum t = myShape.ShapeType(); - - myNameDisplay.Prepend(" "); - if ( ! myNameColorIs ) myNameColor = TestTopOpeDraw_TTOT::ShapeColor(myShape); - - if (myDisplayNameWithOrientation) TestTopOpeDraw_TTOT::CatOrientation(myShape,myNameDisplay); - if (myDisplayNameWithGeometry) TestTopOpeDraw_TTOT::CatGeometry(myShape,myNameDisplay); - Draw_Color ConnCol = Draw_jaune; - if (t == TopAbs_VERTEX) ConnCol = myNameColor; - Draw_Color EdgeCol = Draw_rouge; - if (myColIs) { - ConnCol = EdgeCol = myCol; - } - Handle(TestTopOpeDraw_DrawableSHA) D; - Standard_Integer nbisos = mySnbisos; - Standard_Boolean nbisosdef = mySnbisosdef; - Standard_Integer discret = mySdiscret; - Standard_Boolean discretdef = mySdiscretdef; - Standard_CString csn = myNameDBRep.ToCString(); - Handle(DBRep_DrawableShape) DBS = Handle(DBRep_DrawableShape)::DownCast(Draw::Get(csn)); - if (!DBS.IsNull() && !nbisosdef) { - nbisos = DBS->NbIsos(); - } - if (!DBS.IsNull() && !discretdef) { - discret = DBS->Discret(); - } - D = new TestTopOpeDraw_DrawableSHA - (myShape, - Draw_vert,ConnCol,EdgeCol,Draw_bleu,//free,shared,other,isos - mySsize,nbisos,discret, - myNameDisplay.ToCString(),myNameColor, - myDisplayGeometry); - - if (myTol != 0.0 ) D->SetTol(myTol); - if (myPar != -1.0 ) D->SetPar(myPar); - - char* pname = (char *)myNameDBRep.ToCString(); - Draw::Set(pname,D); -} - -//======================================================================= -//function : InitDisplayer -//purpose : -//======================================================================= - -void TestTopOpeDraw_Displayer::InitDisplayer() -{ - myDisplayGeometry = Standard_False; - myDisplayNameWithGeometry = Standard_False; - myDisplayNameWithOrientation = Standard_False; - - myShape.Nullify(); - NameDBRep().Copy(""); - NameDisplay().Copy(""); - - mySsize = 100.; - mySnbisos = DBRep::NbIsos(); - mySnbisosdef = Standard_False; - mySdiscret = DBRep::Discretisation(); - mySdiscretdef = Standard_False; - myTol = 0.0; - myTolIs = Standard_False; - myPar = -1.0; - myParIs = Standard_False; - myCol = Draw_blanc; - myColIs = Standard_False; - myNameColor = Draw_blanc; - myNameColorIs = Standard_False; -} - -//======================================================================= -//function : SetShape -//purpose : -//======================================================================= - -void TestTopOpeDraw_Displayer::SetShape(const TCollection_AsciiString& namedbrep,const TopoDS_Shape& S) -{ - myShape = S; - myNameDBRep = namedbrep; - myNameDisplay = namedbrep; - if (myDisplayNameWithOrientation) TestTopOpeDraw_TTOT::CatOrientation(myShape,myNameDisplay); - if (myDisplayNameWithGeometry) TestTopOpeDraw_TTOT::CatGeometry(myShape,myNameDisplay); -} - -//======================================================================= -//function : TestTopOpeDraw_P3DDisplayer -//purpose : -//======================================================================= - -TestTopOpeDraw_P3DDisplayer::TestTopOpeDraw_P3DDisplayer() -{} - -//======================================================================= -//function : TestTopOpeDraw_P3DDisplayer -//purpose : -//======================================================================= - -TestTopOpeDraw_P3DDisplayer::TestTopOpeDraw_P3DDisplayer(const TCollection_AsciiString& namedbrep, const gp_Pnt& P) -{ - DisplayP3D(namedbrep,P); -} - -//======================================================================= -//function : TestTopOpeDraw_P3DDisplayer -//purpose : -//======================================================================= - -TestTopOpeDraw_P3DDisplayer::TestTopOpeDraw_P3DDisplayer -(const TCollection_AsciiString& namedbrep,const Standard_Real x, const Standard_Real y, const Standard_Real z) -{ - DisplayP3D(namedbrep,x,y,z); -} - -//======================================================================= -//function : DisplayP3D -//purpose : -//======================================================================= - -void TestTopOpeDraw_P3DDisplayer::DisplayP3D -(const TCollection_AsciiString& namedbrep,const Standard_Real x, const Standard_Real y, const Standard_Real z) -{ - gp_Pnt P(x,y,z); - DisplayP3D(namedbrep,P); -} - -//======================================================================= -//function : DisplayP3D -//purpose : -//======================================================================= - -void TestTopOpeDraw_P3DDisplayer::DisplayP3D -(const TCollection_AsciiString& namedbrep,const gp_Pnt& P) -{ - TCollection_AsciiString namedisp(" "); namedisp += namedbrep; - Handle(TestTopOpeDraw_DrawableP3D) D = - new TestTopOpeDraw_DrawableP3D(P,Draw_Square, - Draw_Color(Draw_rouge), - namedisp.ToCString(), - Draw_Color(Draw_cyan),1); - char* pname = (char *)namedbrep.ToCString(); - Draw::Set(pname,D); - dout< -#include -#include -#include -#include -#include -#include -#include -#include -#include - -class TestTopOpeDraw_Displayer { - - public: - - Standard_EXPORT TestTopOpeDraw_Displayer(); - Standard_EXPORT TestTopOpeDraw_Displayer(const TCollection_AsciiString&,const TopoDS_Shape&); - Standard_EXPORT TestTopOpeDraw_Displayer(const TCollection_AsciiString&,const TCollection_AsciiString&,const TopoDS_Shape&); - Standard_EXPORT void DisplayShape(const TCollection_AsciiString&,const TopoDS_Shape&); - Standard_EXPORT void DisplayShape(const TCollection_AsciiString&,const TCollection_AsciiString&,const TopoDS_Shape&); - Standard_EXPORT void InitDisplayer(); - void SetShape(const TCollection_AsciiString&,const TopoDS_Shape&); - - TCollection_AsciiString& NameDBRep() { return myNameDBRep; } - TCollection_AsciiString& NameDisplay() { return myNameDisplay; } - void DisplayGeometry(const Standard_Boolean b) { myDisplayGeometry = b; } - Standard_Boolean DisplayGeometry(void) { return myDisplayGeometry; } - void DisplayNameWithGeometry(const Standard_Boolean b) { myDisplayNameWithGeometry = b; } - void DisplayNameWithOrientation(const Standard_Boolean b) { myDisplayNameWithOrientation = b; } - void NbIsos(const Standard_Integer n) { mySnbisos = n; } - void NbIsosDef(const Standard_Boolean b) { mySnbisosdef = b; } - void Discret(const Standard_Integer n) { mySdiscret = n; } - void DiscretDef(const Standard_Boolean b) { mySdiscretdef = b; } - void SetTol(const Standard_Real Tol) { myTol = Tol;} - void GetTol(Standard_Real& Tol) { Tol = myTol;} - Standard_Boolean TolIs(void) {return myTolIs;} - void TolIs(Standard_Boolean TolIs) { myTolIs = TolIs;} - void SetPar(const Standard_Real Par) { myPar = Par; myParIs = Standard_True;} - void GetPar(Standard_Real& Par) { Par = myPar;} - Standard_Boolean ParIs(void) {return myParIs;} - void SetColor(const Draw_Color Col) { myCol = Col; myColIs = Standard_True;} - void SetNameColor(const Draw_Color Col) { myNameColor = Col; myNameColorIs = Standard_True;} - void AllColors(const Draw_Color Col) { SetColor(Col); SetNameColor(Col); } - - protected: - TCollection_AsciiString myNameDBRep; - TCollection_AsciiString myNameDisplay; - Standard_Boolean myDisplayGeometry; - Standard_Boolean myDisplayNameWithGeometry; - Standard_Boolean myDisplayNameWithOrientation; - Draw_Color myNameColor; Standard_Boolean myNameColorIs; - Draw_Color myCol; Standard_Boolean myColIs; - - private: - // Shape - void DisplayShapePrivate(); - TopoDS_Shape myShape; - Standard_Real mySsize; - Standard_Integer mySnbisos; - Standard_Boolean mySnbisosdef; - Standard_Integer mySdiscret; - Standard_Boolean mySdiscretdef; - Standard_Real myTol; Standard_Boolean myTolIs; - Standard_Real myPar; Standard_Boolean myParIs; -}; - -class TestTopOpeDraw_C3DDisplayer : public TestTopOpeDraw_Displayer { -public: - TestTopOpeDraw_C3DDisplayer(); - TestTopOpeDraw_C3DDisplayer(const Handle(Geom_Curve)& C); - void InitC3DDisplayer(); - void DisplayC3D(const Handle(Geom_Curve)& C); -private: - Standard_Integer myCDdiscret; - Standard_Real myCDdeflect; - Standard_Integer myCDdrawmod; - Standard_Boolean myCDdisplayorigin; -}; - -class TestTopOpeDraw_C2DDisplayer : public TestTopOpeDraw_Displayer { -public: - TestTopOpeDraw_C2DDisplayer(); - TestTopOpeDraw_C2DDisplayer(const Handle(Geom2d_Curve)& C); - void InitC2DDisplayer(); - void DisplayC2D(const Handle(Geom2d_Curve)& C); - void DisplayC2D(const TCollection_AsciiString&,const TCollection_AsciiString&,const Handle(Geom2d_Curve)& C); -private: - Standard_Integer myC2Ddiscret; - Standard_Boolean myC2Ddisplayorigin; - Standard_Boolean myC2Ddisplaycurvradius; - Standard_Real myC2Dradiusmax; - Standard_Real myC2Dradiusratio; -}; - -class TestTopOpeDraw_SurfaceDisplayer : public TestTopOpeDraw_Displayer { -public: - TestTopOpeDraw_SurfaceDisplayer(); - TestTopOpeDraw_SurfaceDisplayer(const Handle(Geom_Surface)& S); - void InitSurfaceDisplayer(); - void DisplaySurface(const Handle(Geom_Surface)& S); -private: - Draw_Color mySDBoundColor,mySDIsoColor,mySDNormalColor; - Standard_Integer mySDnu,mySDnv; - Standard_Integer mySDdiscret; - Standard_Real mySDdeflect; - Standard_Integer mySDdrawmod; - Standard_Boolean mySDdisplayorigin; -}; - -class TestTopOpeDraw_P3DDisplayer : public TestTopOpeDraw_Displayer { -public: - TestTopOpeDraw_P3DDisplayer(); - TestTopOpeDraw_P3DDisplayer(const TCollection_AsciiString&,const gp_Pnt& P); - TestTopOpeDraw_P3DDisplayer(const TCollection_AsciiString&,const Standard_Real x, const Standard_Real y, const Standard_Real z); - void DisplayP3D(const TCollection_AsciiString&,const Standard_Real x, const Standard_Real y, const Standard_Real z); - void DisplayP3D(const TCollection_AsciiString&,const gp_Pnt& P); -}; - -class TestTopOpeDraw_P2DDisplayer : public TestTopOpeDraw_Displayer { -public: - TestTopOpeDraw_P2DDisplayer(); - TestTopOpeDraw_P2DDisplayer(const TCollection_AsciiString&,const gp_Pnt2d& P); - TestTopOpeDraw_P2DDisplayer(const TCollection_AsciiString&,const Standard_Real x, const Standard_Real y); - void DisplayP2D(const TCollection_AsciiString&,const Standard_Real x, const Standard_Real y); - void DisplayP2D(const TCollection_AsciiString&,const gp_Pnt2d& P); -}; - -#endif diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.cxx deleted file mode 100644 index 96527a168d..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.cxx +++ /dev/null @@ -1,156 +0,0 @@ -// Created on: 1995-12-01 -// Created by: Jean Yves LEBEY -// Copyright (c) 1995-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. - - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -IMPLEMENT_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableC2D,DrawTrSurf_Curve2d) - -//======================================================================= -//function : TestTopOpeDraw_DrawableC2D -//purpose : -//======================================================================= -TestTopOpeDraw_DrawableC2D::TestTopOpeDraw_DrawableC2D -(const Handle(Geom2d_Curve)& C, const Draw_Color& CColor, - const Standard_CString Text, const Draw_Color& TextColor, - const Standard_Integer Discret, const Standard_Boolean DispOrigin, const Standard_Boolean DispCurvRadius, - const Standard_Real RadiusMax, const Standard_Real RadiusRatio) : - DrawTrSurf_Curve2d(C,CColor,Discret,DispOrigin,DispCurvRadius,RadiusMax,RadiusRatio), - myText(Text), - myTextColor(TextColor) -{ - myText2D = new Draw_Text2D(Pnt2d(),Text,TextColor); -} - -//======================================================================= -//function : TestTopOpeDraw_DrawableC2D -//purpose : -//======================================================================= - -TestTopOpeDraw_DrawableC2D::TestTopOpeDraw_DrawableC2D -(const Handle(Geom2d_Curve)& C, const Draw_Color& CColor) : - DrawTrSurf_Curve2d(C,CColor,16,Standard_True,Standard_False,0.01,1), //Discret,Deflect,DrawMode - myText(""), - myTextColor(CColor) -{ - myText2D = new Draw_Text2D(Pnt2d(),"",CColor); -} - -//======================================================================= -//function : TestTopOpeDraw_DrawableC2D -//purpose : -//======================================================================= - -TestTopOpeDraw_DrawableC2D::TestTopOpeDraw_DrawableC2D -(const Handle(Geom2d_Curve)& C, const Draw_Color& CColor, - const Standard_CString Text, const Draw_Color& TextColor) : - DrawTrSurf_Curve2d(C,CColor,16,Standard_True,Standard_False,0.01,1), //Discret,Deflect,DrawMode - myText(Text), - myTextColor(TextColor) -{ - myText2D = new Draw_Text2D(Pnt2d(),Text,TextColor); -} - -//======================================================================= -//function : Pnt2d -//purpose : -//======================================================================= - -gp_Pnt2d TestTopOpeDraw_DrawableC2D::Pnt2d() const -{ - const Handle(Geom2d_Curve)& GC = GetCurve(); - Standard_Real f = GC->FirstParameter(); - Standard_Real l = GC->LastParameter(); - Standard_Real t = 1/2.; - Standard_Real p = t*f + (1-t)*l; - gp_Pnt2d P = GC->Value(p); - return P; -} - -//======================================================================= -//function : ChangePnt2d -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableC2D::ChangePnt2d(const gp_Pnt2d&) -{ - myText2D = new Draw_Text2D(Pnt2d(),myText,myTextColor); -} - -//======================================================================= -//function : ChangeCurve -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableC2D::ChangeCurve(const Handle(Geom2d_Curve)& GC) -{ - curv = GC; -} - -//======================================================================= -//function : ChangeText -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableC2D::ChangeText(const Standard_CString T) -{ - myText = T; - myText2D = new Draw_Text2D(Pnt2d(),T,myTextColor); -} - -//======================================================================= -//function : Whatis -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableC2D::Whatis(Draw_Interpretor& s)const -{ - if (!curv.IsNull()) - s << "DrawableC2D"; -} - -//======================================================================= -//function : DrawOn -//purpose : -//======================================================================= -void TestTopOpeDraw_DrawableC2D::DrawOn(Draw_Display& dis) const -{ - DrawTrSurf_Curve2d::DrawOn(dis); - myText2D->DrawOn(dis); -} - -//======================================================================= -//function : Name -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableC2D::Name(const Standard_CString N) -{ - char* temp = new char[2]; - temp[0] = ' ' ; - temp[1] = 0; - strcat(temp, N); - Draw_Drawable3D::Name(temp); - ChangeText(temp); -} diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.hxx deleted file mode 100644 index 2ac77e18bf..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC2D.hxx +++ /dev/null @@ -1,94 +0,0 @@ -// Created on: 1995-12-01 -// Created by: Jean Yves LEBEY -// Copyright (c) 1995-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. - -#ifndef _TestTopOpeDraw_DrawableC2D_HeaderFile -#define _TestTopOpeDraw_DrawableC2D_HeaderFile - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -class Draw_Text2D; -class Geom2d_Curve; -class Draw_Color; -class gp_Pnt2d; -class Draw_Display; - - -class TestTopOpeDraw_DrawableC2D; -DEFINE_STANDARD_HANDLE(TestTopOpeDraw_DrawableC2D, DrawTrSurf_Curve2d) - - -class TestTopOpeDraw_DrawableC2D : public DrawTrSurf_Curve2d -{ - -public: - - - Standard_EXPORT TestTopOpeDraw_DrawableC2D(const Handle(Geom2d_Curve)& C, const Draw_Color& CColor); - - Standard_EXPORT TestTopOpeDraw_DrawableC2D(const Handle(Geom2d_Curve)& C, const Draw_Color& CColor, const Standard_CString Text, const Draw_Color& TextColor); - - Standard_EXPORT TestTopOpeDraw_DrawableC2D(const Handle(Geom2d_Curve)& C, const Draw_Color& CColor, const Standard_CString Text, const Draw_Color& TextColor, const Standard_Integer Discret, const Standard_Boolean DispOrigin = Standard_True, const Standard_Boolean DispCurvRadius = Standard_False, const Standard_Real RadiusMax = 1.0e3, const Standard_Real RatioOfRadius = 0.1); - - Standard_EXPORT virtual gp_Pnt2d Pnt2d() const; - - Standard_EXPORT void ChangePnt2d (const gp_Pnt2d& P); - - Standard_EXPORT void ChangeCurve (const Handle(Geom2d_Curve)& C); - - Standard_EXPORT void ChangeText (const Standard_CString T); - - Standard_EXPORT virtual void Name (const Standard_CString N) Standard_OVERRIDE; - - //! For variable whatis command. - Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE; - - Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; - - - - - DEFINE_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableC2D,DrawTrSurf_Curve2d) - -protected: - - - Handle(Draw_Text2D) myText2D; - Standard_CString myText; - - -private: - - - Draw_Color myTextColor; - - -}; - - - - - - - -#endif // _TestTopOpeDraw_DrawableC2D_HeaderFile diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.cxx deleted file mode 100644 index 3ac11e4035..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.cxx +++ /dev/null @@ -1,147 +0,0 @@ -// Created on: 1995-12-01 -// Created by: Jean Yves LEBEY -// Copyright (c) 1995-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. - - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -IMPLEMENT_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableC3D,DrawTrSurf_Curve) - -//======================================================================= -//function : TestTopOpeDraw_DrawableC3D -//purpose : -//======================================================================= -TestTopOpeDraw_DrawableC3D::TestTopOpeDraw_DrawableC3D -(const Handle(Geom_Curve)& C, const Draw_Color& CColor, - const Standard_CString Text, const Draw_Color& TextColor, - const Standard_Integer Discret, const Standard_Real Deflect,const Standard_Integer DrawMode, const Standard_Boolean DispOrigin) : - DrawTrSurf_Curve(C,CColor,Discret,Deflect,DrawMode,DispOrigin), - myText(Text),myTextColor(TextColor) -{ - myText3D = new Draw_Text3D(Pnt(),Text,TextColor); -} - -//======================================================================= -//function : TestTopOpeDraw_DrawableC3D -//purpose : -//======================================================================= -TestTopOpeDraw_DrawableC3D::TestTopOpeDraw_DrawableC3D -(const Handle(Geom_Curve)& C, const Draw_Color& CColor) : - DrawTrSurf_Curve(C,CColor,16,0.01,1), //Discret,Deflect,DrawMode - myText(""), - myTextColor(CColor) -{ - DrawTrSurf_Curve::DisplayOrigin(Standard_True); - myText3D = new Draw_Text3D(Pnt(),"",CColor); -} - -//======================================================================= -//function : TestTopOpeDraw_DrawableC3D -//purpose : -//======================================================================= -TestTopOpeDraw_DrawableC3D::TestTopOpeDraw_DrawableC3D -(const Handle(Geom_Curve)& C, const Draw_Color& CColor, - const Standard_CString Text, const Draw_Color& TextColor) : - DrawTrSurf_Curve(C,CColor,16,0.01,1), //Discret,Deflect,DrawMode - myText(Text), - myTextColor(TextColor) -{ - DrawTrSurf_Curve::DisplayOrigin(Standard_True); - myText3D = new Draw_Text3D(Pnt(),Text,TextColor); -} - -//======================================================================= -//function : Pnt -//purpose : -//======================================================================= -gp_Pnt TestTopOpeDraw_DrawableC3D::Pnt() const -{ - const Handle(Geom_Curve)& GC = GetCurve(); - Standard_Real f = GC->FirstParameter(); - Standard_Real l = GC->LastParameter(); - Standard_Real t = 1/2.; - Standard_Real p = t*f + (1-t)*l; - gp_Pnt P = GC->Value(p); - return P; -} - -//======================================================================= -//function : ChangePnt -//purpose : -//======================================================================= -void TestTopOpeDraw_DrawableC3D::ChangePnt(const gp_Pnt&) -{ - myText3D = new Draw_Text3D(Pnt(),myText,myTextColor); -} - -//======================================================================= -//function : ChangeCurve -//purpose : -//======================================================================= -void TestTopOpeDraw_DrawableC3D::ChangeCurve(const Handle(Geom_Curve)& GC) -{ - curv = GC; -} - -//======================================================================= -//function : ChangeText -//purpose : -//======================================================================= -void TestTopOpeDraw_DrawableC3D::ChangeText(const Standard_CString T) -{ - myText = T; - myText3D = new Draw_Text3D(Pnt(),T,myTextColor); -} - -//======================================================================= -//function : Whatis -//purpose : -//======================================================================= -void TestTopOpeDraw_DrawableC3D::Whatis(Draw_Interpretor& s)const -{ - if (!curv.IsNull()) s << "DrawableC3D"; -} - -//======================================================================= -//function : DrawOn -//purpose : -//======================================================================= -void TestTopOpeDraw_DrawableC3D::DrawOn(Draw_Display& dis) const -{ - DrawTrSurf_Curve::DrawOn(dis); - myText3D->DrawOn(dis); -} - -//======================================================================= -//function : Name -//purpose : -//======================================================================= -void TestTopOpeDraw_DrawableC3D::Name(const Standard_CString N) -{ - char* temp = new char[2]; - temp[0] = ' ' ; - temp[1] = 0; - strcat(temp, N); - Draw_Drawable3D::Name(temp); - ChangeText(temp); -} diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.hxx deleted file mode 100644 index d6f80a35e8..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableC3D.hxx +++ /dev/null @@ -1,94 +0,0 @@ -// Created on: 1995-12-01 -// Created by: Jean Yves LEBEY -// Copyright (c) 1995-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. - -#ifndef _TestTopOpeDraw_DrawableC3D_HeaderFile -#define _TestTopOpeDraw_DrawableC3D_HeaderFile - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -class Draw_Text3D; -class Geom_Curve; -class Draw_Color; -class gp_Pnt; -class Draw_Display; - - -class TestTopOpeDraw_DrawableC3D; -DEFINE_STANDARD_HANDLE(TestTopOpeDraw_DrawableC3D, DrawTrSurf_Curve) - - -class TestTopOpeDraw_DrawableC3D : public DrawTrSurf_Curve -{ - -public: - - - Standard_EXPORT TestTopOpeDraw_DrawableC3D(const Handle(Geom_Curve)& C, const Draw_Color& CColor); - - Standard_EXPORT TestTopOpeDraw_DrawableC3D(const Handle(Geom_Curve)& C, const Draw_Color& CColor, const Standard_CString Text, const Draw_Color& TextColor); - - Standard_EXPORT TestTopOpeDraw_DrawableC3D(const Handle(Geom_Curve)& C, const Draw_Color& CColor, const Standard_CString Text, const Draw_Color& TextColor, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode, const Standard_Boolean DispOrigin = Standard_True); - - Standard_EXPORT virtual gp_Pnt Pnt() const; - - Standard_EXPORT void ChangePnt (const gp_Pnt& P); - - Standard_EXPORT void ChangeCurve (const Handle(Geom_Curve)& C); - - Standard_EXPORT void ChangeText (const Standard_CString T); - - Standard_EXPORT virtual void Name (const Standard_CString N) Standard_OVERRIDE; - - //! For variable whatis command. - Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE; - - Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; - - - - - DEFINE_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableC3D,DrawTrSurf_Curve) - -protected: - - - Handle(Draw_Text3D) myText3D; - Standard_CString myText; - - -private: - - - Draw_Color myTextColor; - - -}; - - - - - - - -#endif // _TestTopOpeDraw_DrawableC3D_HeaderFile diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cxx deleted file mode 100644 index 94b27165d6..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.cxx +++ /dev/null @@ -1,362 +0,0 @@ -// Created on: 1997-03-13 -// Created by: Prestataire Mary FABIEN -// Copyright (c) 1997-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. - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -IMPLEMENT_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableMesure,TestTopOpeDraw_DrawableC3D) - -static gp_Pnt PScale(const gp_Pnt& P, - const Standard_Real ScaleX, - const Standard_Real ScaleY) -{ - gp_Pnt Pnt; - Pnt.SetX(P.X() * ScaleX); - Pnt.SetY(P.Y() * ScaleY); - Pnt.SetZ(0.); - return Pnt; -} - -static TColgp_Array1OfPnt& Scale(const TColgp_Array1OfPnt& AP, - const Standard_Real ScaleX, - const Standard_Real ScaleY) -{ - Standard_Integer i,up = AP.Upper(); - TColgp_Array1OfPnt *aAP = new TColgp_Array1OfPnt(1, up); - for (i = 1; i <= up;i++) { - aAP->SetValue(i, PScale(AP.Value(i), ScaleX, ScaleY)); - } - return *aAP; -} - -Handle(TColgp_HArray1OfPnt) makepnt(const TestTopOpeTools_Mesure& M, - Handle(TColgp_HArray1OfPnt) T) - -{ - Standard_Integer up = T->Upper(); - TColgp_Array1OfPnt& AOP = T->ChangeArray1(); - const TColgp_Array1OfPnt& MAOP = M.Pnts(); - for(Standard_Integer i= 1; i <= up; i++) { - AOP.SetValue(i,MAOP.Value(i)); - } - return T; -} - -Handle(TColgp_HArray1OfPnt) makepnt(const TestTopOpeTools_Mesure& M) - -{ - Standard_Integer up = M.NPnts(); - Handle(TColgp_HArray1OfPnt) T = new TColgp_HArray1OfPnt(1,up); - TColgp_Array1OfPnt& AOP = T->ChangeArray1(); - const TColgp_Array1OfPnt& MAOP = M.Pnts(); - for(Standard_Integer i= 1; i <= up; i++) { - AOP.SetValue(i,MAOP.Value(i)); - } - return T; -} - -Handle(Geom_Curve) makecurvescale (const Handle(TColgp_HArray1OfPnt)& HP, - const Standard_Real ScaleX, - const Standard_Real ScaleY) -{ - Handle(Geom_Curve) C; - C = TopOpeBRepTool_CurveTool::MakeBSpline1fromPnt(Scale(HP->Array1(),ScaleX,ScaleY)); - return C; -} - -Handle(Geom_Curve) makecurve(const Handle(TColgp_HArray1OfPnt)& HP) -{ - Handle(Geom_Curve) C; - C = TopOpeBRepTool_CurveTool::MakeBSpline1fromPnt(HP->Array1()); - return C; -} - - -static Standard_CString makename(const TCollection_AsciiString C) -{ - char * temp = new char[C.Length()+2]; - temp[0] = ' ' ; - temp[C.Length()+1] = 0; - strncpy(&temp[1], C.ToCString(), C.Length()); - return temp; -} - -static Standard_CString makename1(const gp_Pnt& P) -{ - TCollection_AsciiString C((Standard_Integer)P.Coord(1)); - - char * temp = new char[C.Length()+2]; - temp[0]=' '; - temp[C.Length()+1]=0; - strncpy(&temp[1], C.ToCString(), C.Length()); - return temp; -} - -static Standard_CString makename2(const gp_Pnt& P) -{ - TCollection_AsciiString C; - - C = "";C = C + P.Coord(2); - TCollection_AsciiString S1 = C.Token(".",1); - S1.RightJustify(15, ' '); - TCollection_AsciiString S2 = C.Token(".",2); - S2.Trunc(2); - C = " ";C = C + S1 + "." + S2; - - char * temp = new char[C.Length()+1]; - temp[C.Length()]=0; - strncpy(&temp[0], C.ToCString(), C.Length()); - return temp; -} - -static Handle(Geom_Curve) DrawAxe1(const TColgp_Array1OfPnt& T, - const Standard_Real ScaleX) -{ - Standard_Integer up = T.Upper(); - TColgp_Array1OfPnt *AOP = new TColgp_Array1OfPnt(1, up); - for(Standard_Integer i= 1; i <= up; i++) { - gp_Pnt pnt(T.Value(i).Coord(1) * ScaleX, 0, 0); - (*AOP).SetValue(i, pnt); - } - Handle(Geom_Curve) C; - C = TopOpeBRepTool_CurveTool::MakeBSpline1fromPnt(*AOP); - return C; -} - -static Handle(Geom_Curve) DrawAxe2(const TColgp_Array1OfPnt& T, - const Standard_Real ScaleY) -{ - Standard_Integer up = T.Upper(); - TColgp_Array1OfPnt *AOP = new TColgp_Array1OfPnt(1, up); - for(Standard_Integer i= 1; i <= up; i++) { - gp_Pnt pnt(0, T.Value(i).Coord(2) * ScaleY, 0); - (*AOP).SetValue(i, pnt); - } - Handle(Geom_Curve) C; - C = TopOpeBRepTool_CurveTool::MakeBSpline1fromPnt(*AOP); - return C; -} - -//======================================================================= -//function : TestTopOpeDraw_DrawableMesure -//purpose : -//======================================================================= - -TestTopOpeDraw_DrawableMesure::TestTopOpeDraw_DrawableMesure -(const TestTopOpeTools_Mesure& M, - const Draw_Color& CurveColor, - const Draw_Color& TextColor, - const Standard_Real ScaleX, - const Standard_Real ScaleY) : - TestTopOpeDraw_DrawableC3D(::makecurvescale(makepnt(M),ScaleX,ScaleY), - CurveColor, ::makename(M.Name()) - , TextColor) - ,myP(makepnt(M)) - ,myAXE1(new TestTopOpeDraw_DrawableC3D(DrawAxe1(myP->Array1(), ScaleX), - Draw_saumon)) - ,myAXE2(new TestTopOpeDraw_DrawableC3D(DrawAxe2(myP->Array1(), ScaleY), - Draw_saumon)) - ,myScaleX(ScaleX) - ,myScaleY(ScaleY) -{ - Standard_Integer up = myP->Upper(), i; - myHDP = new TestTopOpeDraw_HArray1OfDrawableP3D(1,up); - myHADP1 = new TestTopOpeDraw_HArray1OfDrawableP3D(1,up); - myHADP2 = new TestTopOpeDraw_HArray1OfDrawableP3D(1,up); - for(i = 1; i <= up; i++) { - Handle(TestTopOpeDraw_DrawableP3D) DP - = new TestTopOpeDraw_DrawableP3D(PScale(myP->Value(i), ScaleX, ScaleY), - Draw_rouge); - myHDP->SetValue(i,DP); - gp_Pnt PA1(myP->Value(i).Coord(1), 0, 0); - gp_Pnt PA1Sc(myP->Value(i).Coord(1) * ScaleX, 0, 0); - Handle(TestTopOpeDraw_DrawableP3D) DPA1 - = new TestTopOpeDraw_DrawableP3D(PA1Sc,Draw_rose, - makename1(PA1),Draw_rose,-7,15); - myHADP1->SetValue(i,DPA1); - gp_Pnt PA2(0,myP->Value(i).Coord(2), 0); - gp_Pnt PA2Sc(0,myP->Value(i).Coord(2) * myScaleY, 0); - Handle(TestTopOpeDraw_DrawableP3D) DPA2 - = new TestTopOpeDraw_DrawableP3D(PA2Sc,Draw_rose, - makename2(PA2),Draw_rose,-120,5); - myHADP2->SetValue(i,DPA2); - } -} - -//======================================================================= -//function : SetScaleX -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableMesure::SetScaleX(const Standard_Real ScaleX) -{ - SetScale(ScaleX, myScaleY); -} - -//======================================================================= -//function : SetScaleY -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableMesure::SetScaleY(const Standard_Real ScaleY) -{ - SetScale(myScaleX, ScaleY); -} - -//======================================================================= -//function : SetScale -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableMesure::SetScale(const Standard_Real ScaleX, - const Standard_Real ScaleY) -{ - myScaleX = ScaleX; - myScaleY = ScaleY; - Handle(Geom_Curve) GC = ::makecurvescale(myP, myScaleX, myScaleY); - ChangeCurve(GC); - ChangePnt(Pnt()); - GC = DrawAxe1(myP->Array1(), myScaleX); - myAXE1->ChangeCurve(GC); - myAXE1->ChangePnt(Pnt()); - GC = DrawAxe2(myP->Array1(), myScaleY); - myAXE2->ChangeCurve(GC); - myAXE2->ChangePnt(Pnt()); - Standard_Integer up = myP->Upper(), i; - for(i = 1; i <= up; i++) { - Handle(TestTopOpeDraw_DrawableP3D) DP = myHDP->Value(i); - gp_Pnt P = PScale(myP->Value(i), myScaleX, myScaleY); - DP->ChangePnt(P); - myHDP->SetValue(i,DP); - - Handle(TestTopOpeDraw_DrawableP3D) DPA1 = myHADP1->Value(i); - gp_Pnt PA1(myP->Value(i).Coord(1) * myScaleX, 0, 0); - DPA1->ChangePnt(PA1); - myHADP1->SetValue(i,DPA1); - - Handle(TestTopOpeDraw_DrawableP3D) DPA2 = myHADP2->Value(i); - gp_Pnt PA2(0, myP->Value(i).Coord(2) * myScaleY, 0); - DPA2->ChangePnt(PA2); - myHADP2->SetValue(i,DPA2); - } -} - -//======================================================================= -//function : Pnt -//purpose : -//======================================================================= - -gp_Pnt TestTopOpeDraw_DrawableMesure::Pnt() const -{ - const Handle(Geom_Curve)& GC = DrawTrSurf_Curve::GetCurve(); - Standard_Real f = GC->FirstParameter(); - Standard_Real l = GC->LastParameter(); - Standard_Real t = 0.; - Standard_Real p = t*f + (1-t)*l; - gp_Pnt P = GC->Value(p); - return P; -} - -//======================================================================= -//function : Pnts -//purpose : -//======================================================================= - -const Handle(TColgp_HArray1OfPnt)& TestTopOpeDraw_DrawableMesure::Pnts() const -{ - return myP; -} - -//======================================================================= -//function : SetName -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableMesure::SetName(const TCollection_AsciiString& Name) -{ - Standard_CString Str = makename(Name); - ChangeText(Str); -} - -//======================================================================= -//function : Clear -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableMesure::Clear() -{ - myScaleX = 1; - myScaleY = 1; - -} - -//======================================================================= -//function : Whatis -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableMesure::Whatis(Draw_Interpretor& s)const -{ - if (!myP.IsNull()) - s << "DrawableMesure"; -} - -//======================================================================= -//function : DrawOn -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableMesure::DrawOn(Draw_Display& dis) const -{ - Standard_Integer i,n; - - // les axes - n = myHADP1->Upper(); - myAXE1->DrawOn(dis); - for(i = 1; i <= n; i++) { - myHADP1->Value(i)->DrawOn(dis); - } - - myAXE2->DrawOn(dis); - n = myHADP2->Upper(); - for(i = 1; i <= n; i++) { - myHADP2->Value(i)->DrawOn(dis); - } - - // la courbe et ses points - TestTopOpeDraw_DrawableC3D::DrawOn(dis); - n = myHDP->Upper(); - for(i = 1; i <= n; i++) { - myHDP->Value(i)->DrawOn(dis); - myHADP1->Value(i)->DrawOn(dis); - myHADP2->Value(i)->DrawOn(dis); - } -} diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.hxx deleted file mode 100644 index ac01165fab..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableMesure.hxx +++ /dev/null @@ -1,100 +0,0 @@ -// Created on: 1997-03-19 -// Created by: Prestataire Mary FABIEN -// Copyright (c) 1997-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. - -#ifndef _TestTopOpeDraw_DrawableMesure_HeaderFile -#define _TestTopOpeDraw_DrawableMesure_HeaderFile - -#include -#include - -#include -#include -#include -#include -#include -#include -class TestTopOpeDraw_DrawableC3D; -class TestTopOpeTools_Mesure; -class Draw_Color; -class TCollection_AsciiString; -class gp_Pnt; -class Draw_Display; - - -class TestTopOpeDraw_DrawableMesure; -DEFINE_STANDARD_HANDLE(TestTopOpeDraw_DrawableMesure, TestTopOpeDraw_DrawableC3D) - - -class TestTopOpeDraw_DrawableMesure : public TestTopOpeDraw_DrawableC3D -{ - -public: - - - Standard_EXPORT TestTopOpeDraw_DrawableMesure(const TestTopOpeTools_Mesure& M, const Draw_Color& CurveColor, const Draw_Color& TextColor, const Standard_Real ScaleX = 1.0, const Standard_Real ScaleY = 1.0); - - Standard_EXPORT void SetScale (const Standard_Real ScaleX, const Standard_Real ScaleY); - - Standard_EXPORT void SetScaleX (const Standard_Real ScaleX); - - Standard_EXPORT void SetScaleY (const Standard_Real ScaleY); - - Standard_EXPORT void SetName (const TCollection_AsciiString& Name); - - Standard_EXPORT virtual gp_Pnt Pnt() const Standard_OVERRIDE; - - Standard_EXPORT const Handle(TColgp_HArray1OfPnt)& Pnts() const; - - Standard_EXPORT void Clear(); - - //! For variable whatis command. - Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE; - - Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; - - - - - DEFINE_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableMesure,TestTopOpeDraw_DrawableC3D) - -protected: - - - - -private: - - - Handle(TColgp_HArray1OfPnt) myP; - Draw_Color myCurveColor; - Handle(TestTopOpeDraw_DrawableC3D) myAXE1; - Handle(TestTopOpeDraw_DrawableC3D) myAXE2; - Handle(TestTopOpeDraw_HArray1OfDrawableP3D) myHDP; - Handle(TestTopOpeDraw_HArray1OfDrawableP3D) myHADP1; - Handle(TestTopOpeDraw_HArray1OfDrawableP3D) myHADP2; - Standard_Real myScaleX; - Standard_Real myScaleY; - - -}; - - - - - - - -#endif // _TestTopOpeDraw_DrawableMesure_HeaderFile diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.cxx deleted file mode 100644 index 228f70daab..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.cxx +++ /dev/null @@ -1,128 +0,0 @@ -// Created on: 1994-11-17 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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. - - -#include -#include -#include -#include -#include -#include - -IMPLEMENT_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableP2D,Draw_Marker2D) - -//======================================================================= -//function : TestTopOpeDraw_DrawableP2D -//purpose : -//======================================================================= -TestTopOpeDraw_DrawableP2D::TestTopOpeDraw_DrawableP2D -(const gp_Pnt2d& P, - const Draw_Color& PColor, - const Standard_Real MoveX, - const Standard_Real MoveY) : - Draw_Marker2D(P,Draw_Square,PColor,2), // Size - myPnt2d(P), - myText(" "), - myTextColor(PColor), - myMoveX(MoveX), - myMoveY(MoveY) -{ - myText2D = new Draw_Text2D(myPnt2d,myText,myTextColor,(Standard_Integer)myMoveX,(Standard_Integer)myMoveY); -} - -//======================================================================= -//function : TestTopOpeDraw_DrawableP2D -//purpose : -//======================================================================= - -TestTopOpeDraw_DrawableP2D::TestTopOpeDraw_DrawableP2D -(const gp_Pnt2d& P,const Draw_Color& PColor, - const Standard_CString Text,const Draw_Color& TextColor, - const Standard_Real MoveX, - const Standard_Real MoveY) : - Draw_Marker2D(P,Draw_Square,PColor,2), // Size - myPnt2d(P), - myText(Text), - myTextColor(TextColor), - myMoveX(MoveX), - myMoveY(MoveY) -{ - myText2D = new Draw_Text2D(myPnt2d,myText,myTextColor,(Standard_Integer)myMoveX,(Standard_Integer)myMoveY); -} - -//======================================================================= -//function : TestTopOpeDraw_DrawableP2D -//purpose : -//======================================================================= - -TestTopOpeDraw_DrawableP2D::TestTopOpeDraw_DrawableP2D -(const gp_Pnt2d& P,const Draw_MarkerShape T,const Draw_Color& PColor, - const Standard_CString Text,const Draw_Color& TextColor, - const Standard_Integer Size, - const Standard_Real MoveX, - const Standard_Real MoveY) : - Draw_Marker2D(P,T,PColor,Size), - myPnt2d(P), - myText(Text), - myTextColor(TextColor), - myMoveX(MoveX), - myMoveY(MoveY) -{ - myText2D = new Draw_Text2D(myPnt2d,myText,myTextColor,(Standard_Integer)myMoveX,(Standard_Integer)myMoveY); -} - -//======================================================================= -//function : TestTopOpeDraw_DrawableP2D -//purpose : -//======================================================================= - -TestTopOpeDraw_DrawableP2D::TestTopOpeDraw_DrawableP2D -(const gp_Pnt2d& P,const Draw_MarkerShape T, - const Draw_Color& PColor,const Standard_CString Text, - const Draw_Color& TextColor,const Standard_Real Tol, - const Standard_Real MoveX,const Standard_Real MoveY) : - Draw_Marker2D(P,T,PColor,Tol), - myPnt2d(P), - myText(Text), - myTextColor(TextColor), - myMoveX(MoveX), - myMoveY(MoveY) -{ - myText2D = new Draw_Text2D(myPnt2d,myText,myTextColor,(Standard_Integer)myMoveX,(Standard_Integer)myMoveY); -} - -//======================================================================= -//function : ChangePnt2d -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableP2D::ChangePnt2d(const gp_Pnt2d& P) -{ - myPnt2d = P; - myText2D = new Draw_Text2D(myPnt2d,myText,myTextColor,(Standard_Integer)myMoveX,(Standard_Integer)myMoveY); - ChangePos() = P; -} - -//======================================================================= -//function : DrawOn -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableP2D::DrawOn(Draw_Display& dis) const -{ - Draw_Marker2D::DrawOn(dis); - myText2D->DrawOn(dis); -} diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.hxx deleted file mode 100644 index 02f31a9499..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP2D.hxx +++ /dev/null @@ -1,87 +0,0 @@ -// Created on: 1994-10-24 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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. - -#ifndef _TestTopOpeDraw_DrawableP2D_HeaderFile -#define _TestTopOpeDraw_DrawableP2D_HeaderFile - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -class Draw_Text2D; -class gp_Pnt2d; -class Draw_Color; -class Draw_Display; - - -class TestTopOpeDraw_DrawableP2D; -DEFINE_STANDARD_HANDLE(TestTopOpeDraw_DrawableP2D, Draw_Marker2D) - - -class TestTopOpeDraw_DrawableP2D : public Draw_Marker2D -{ - -public: - - - Standard_EXPORT TestTopOpeDraw_DrawableP2D(const gp_Pnt2d& P, const Draw_Color& PColor, const Standard_Real moveX = 0.0, const Standard_Real moveY = 0.0); - - Standard_EXPORT TestTopOpeDraw_DrawableP2D(const gp_Pnt2d& P, const Draw_Color& PColor, const Standard_CString Text, const Draw_Color& TextColor, const Standard_Real moveX = 0.0, const Standard_Real moveY = 0.0); - - Standard_EXPORT TestTopOpeDraw_DrawableP2D(const gp_Pnt2d& P, const Draw_MarkerShape T, const Draw_Color& PColor, const Standard_CString Text, const Draw_Color& TextColor, const Standard_Integer Size = 2, const Standard_Real moveX = 0.0, const Standard_Real moveY = 0.0); - - Standard_EXPORT TestTopOpeDraw_DrawableP2D(const gp_Pnt2d& P, const Draw_MarkerShape T, const Draw_Color& PColor, const Standard_CString Text, const Draw_Color& TextColor, const Standard_Real Tol, const Standard_Real moveX = 0.0, const Standard_Real moveY = 0.0); - - Standard_EXPORT void ChangePnt2d (const gp_Pnt2d& P); - - Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; - - - - - DEFINE_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableP2D,Draw_Marker2D) - -protected: - - - - -private: - - - gp_Pnt2d myPnt2d; - Standard_CString myText; - Draw_Color myTextColor; - Standard_Real myMoveX; - Standard_Real myMoveY; - Handle(Draw_Text2D) myText2D; - - -}; - - - - - - - -#endif // _TestTopOpeDraw_DrawableP2D_HeaderFile diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.cxx deleted file mode 100644 index 38c60c9146..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.cxx +++ /dev/null @@ -1,129 +0,0 @@ -// Created on: 1994-11-17 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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. - - -#include -#include -#include -#include -#include -#include - -IMPLEMENT_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableP3D,Draw_Marker3D) - -//======================================================================= -//function : TestTopOpeDraw_DrawableP3D -//purpose : -//======================================================================= -TestTopOpeDraw_DrawableP3D::TestTopOpeDraw_DrawableP3D -(const gp_Pnt& P, - const Draw_Color& PColor, - const Standard_Real MoveX, - const Standard_Real MoveY) : - Draw_Marker3D(P,Draw_Square,PColor,2), // Size - myPnt(P), - myText(" "), - myTextColor(PColor), - myMoveX(MoveX), - myMoveY(MoveY) -{ - myText3D = new Draw_Text3D(myPnt,myText,myTextColor, myMoveX, myMoveY); -} - -//======================================================================= -//function : TestTopOpeDraw_DrawableP3D -//purpose : -//======================================================================= - -TestTopOpeDraw_DrawableP3D::TestTopOpeDraw_DrawableP3D -(const gp_Pnt& P, const Draw_Color& PColor, - const Standard_CString Text, const Draw_Color& TextColor, - const Standard_Real MoveX, - const Standard_Real MoveY) : - Draw_Marker3D(P,Draw_Square,PColor,2), // Size - myPnt(P), - myText(Text), - myTextColor(TextColor), - myMoveX(MoveX), - myMoveY(MoveY) -{ - myText3D = new Draw_Text3D(myPnt,myText,myTextColor, myMoveX, myMoveY); -} - -//======================================================================= -//function : TestTopOpeDraw_DrawableP3D -//purpose : -//======================================================================= - -TestTopOpeDraw_DrawableP3D::TestTopOpeDraw_DrawableP3D -(const gp_Pnt& P, const Draw_MarkerShape T, const Draw_Color& PColor, - const Standard_CString Text, const Draw_Color& TextColor, - const Standard_Integer Size, - const Standard_Real MoveX, - const Standard_Real MoveY) : - Draw_Marker3D(P,T,PColor,Size), - myPnt(P), - myText(Text), - myTextColor(TextColor), - myMoveX(MoveX), - myMoveY(MoveY) -{ - myText3D = new Draw_Text3D(myPnt,myText,myTextColor, myMoveX, myMoveY); -} - -//======================================================================= -//function : TestTopOpeDraw_DrawableP3D -//purpose : -//======================================================================= - -TestTopOpeDraw_DrawableP3D::TestTopOpeDraw_DrawableP3D -(const gp_Pnt& P, const Draw_MarkerShape T, - const Draw_Color& PColor, const Standard_CString Text, - const Draw_Color& TextColor, const Standard_Real Tol, - const Standard_Real MoveX, const Standard_Real MoveY) : - Draw_Marker3D(P, T, PColor, Tol), - myPnt(P), - myText(Text), - myTextColor(TextColor), - myMoveX(MoveX), - myMoveY(MoveY) -{ - myText3D = new Draw_Text3D(myPnt,myText,myTextColor, myMoveX, myMoveY); -} - -//======================================================================= -//function : ChangePnt -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableP3D::ChangePnt(const gp_Pnt& P) -{ - myPnt = P; - myText3D = new Draw_Text3D(myPnt, myText, myTextColor, myMoveX, myMoveY); - ChangePos() = P; - -} - -//======================================================================= -//function : DrawOn -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableP3D::DrawOn(Draw_Display& dis) const -{ - Draw_Marker3D::DrawOn(dis); - myText3D->DrawOn(dis); -} diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.hxx deleted file mode 100644 index 0e44dea603..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableP3D.hxx +++ /dev/null @@ -1,87 +0,0 @@ -// Created on: 1994-10-24 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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. - -#ifndef _TestTopOpeDraw_DrawableP3D_HeaderFile -#define _TestTopOpeDraw_DrawableP3D_HeaderFile - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -class Draw_Text3D; -class gp_Pnt; -class Draw_Color; -class Draw_Display; - - -class TestTopOpeDraw_DrawableP3D; -DEFINE_STANDARD_HANDLE(TestTopOpeDraw_DrawableP3D, Draw_Marker3D) - - -class TestTopOpeDraw_DrawableP3D : public Draw_Marker3D -{ - -public: - - - Standard_EXPORT TestTopOpeDraw_DrawableP3D(const gp_Pnt& P, const Draw_Color& PColor, const Standard_Real moveX = 0.0, const Standard_Real moveY = 0.0); - - Standard_EXPORT TestTopOpeDraw_DrawableP3D(const gp_Pnt& P, const Draw_Color& PColor, const Standard_CString Text, const Draw_Color& TextColor, const Standard_Real moveX = 0.0, const Standard_Real moveY = 0.0); - - Standard_EXPORT TestTopOpeDraw_DrawableP3D(const gp_Pnt& P, const Draw_MarkerShape T, const Draw_Color& PColor, const Standard_CString Text, const Draw_Color& TextColor, const Standard_Integer Size = 2, const Standard_Real moveX = 0.0, const Standard_Real moveY = 0.0); - - Standard_EXPORT TestTopOpeDraw_DrawableP3D(const gp_Pnt& P, const Draw_MarkerShape T, const Draw_Color& PColor, const Standard_CString Text, const Draw_Color& TextColor, const Standard_Real Tol, const Standard_Real moveX = 0.0, const Standard_Real moveY = 0.0); - - Standard_EXPORT void ChangePnt (const gp_Pnt& P); - - Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; - - - - - DEFINE_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableP3D,Draw_Marker3D) - -protected: - - - - -private: - - - gp_Pnt myPnt; - Standard_CString myText; - Draw_Color myTextColor; - Standard_Real myMoveX; - Standard_Real myMoveY; - Handle(Draw_Text3D) myText3D; - - -}; - - - - - - - -#endif // _TestTopOpeDraw_DrawableP3D_HeaderFile diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.cxx deleted file mode 100644 index a662485b30..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.cxx +++ /dev/null @@ -1,244 +0,0 @@ -// Created on: 1994-10-24 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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. - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -IMPLEMENT_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableSHA,DBRep_DrawableShape) - -Draw_Color DBRep_ColorOrientation (const TopAbs_Orientation); - -//======================================================================= -//function : TestTopOpeDraw_DrawableSHA -//purpose : -//======================================================================= - -TestTopOpeDraw_DrawableSHA::TestTopOpeDraw_DrawableSHA -(const TopoDS_Shape& aShape, - const Draw_Color& FreeCol, - const Draw_Color& ConnCol, - const Draw_Color& EdgeCol, - const Draw_Color& IsosCol, - const Standard_Real size, - const Standard_Integer nbisos, - const Standard_Integer discret, - const Standard_CString Text, - const Draw_Color& TextColor, - const Standard_Boolean DisplayGeometry) : - DBRep_DrawableShape(aShape,FreeCol,ConnCol,EdgeCol,IsosCol,size,nbisos,discret), - myTol(0.0), myPar(-1.0) -{ - myDisplayGeometry = DisplayGeometry; - myText = new Draw_Text3D(Pnt(),Text,TextColor); - myTextColor = TextColor; -} - - -//======================================================================= -//function : Pnt -//purpose : -//======================================================================= - -gp_Pnt TestTopOpeDraw_DrawableSHA::Pnt() const -{ - gp_Pnt P(0,0,0); - Standard_Real u1,u2,v1,v2; - TopExp_Explorer ex; - - TopoDS_Shape S = Shape(); - TopAbs_ShapeEnum T = S.ShapeType(); - Standard_Real facpar = 0.; - - while ( T == TopAbs_COMPOUND ) { - TopoDS_Iterator ti(S); - if ( ti.More() ) { - S = ti.Value(); T = S.ShapeType(); - } - else { - break; - } - } - // si S final = compound --> P = 0 0 0 - - switch (T) { - - case TopAbs_VERTEX : - P = BRep_Tool::Pnt(TopoDS::Vertex(S)); - break; - - case TopAbs_WIRE : - T = TopAbs_EDGE; - ex.Init(S,T); S = ex.Current(); - facpar = 0.33; - // no break, in order to execute EDGE case - - case TopAbs_EDGE : - { - BRepAdaptor_Curve CU(TopoDS::Edge(S)); - u1 = CU.FirstParameter(); u2 = CU.LastParameter(); - if (facpar == 0.) facpar = 0.20; - if (myPar != -1.0) facpar = myPar; - Standard_Real p = u1 + (u2-u1)*facpar; - P = CU.Value(p); - } - break; - - case TopAbs_SHELL : case TopAbs_SOLID : case TopAbs_COMPSOLID : - T = TopAbs_FACE; - ex.Init(S,T); S = ex.Current(); - facpar = 0.33; - // no break, in order to execute FACE case - - case TopAbs_FACE : - { - BRepAdaptor_Surface SU(TopoDS::Face(S)); - BRepTools::UVBounds(TopoDS::Face(S),u1,u2,v1,v2); - if (facpar == 0.) facpar = 0.20; - Standard_Real u = u1 + (u2-u1)*facpar; - Standard_Real v = v1 + (v2-v1)*facpar; - P = SU.Value(u,v); - } - break; - default: - break; - } - - return P; -} - -//======================================================================= -//function : SetDisplayGeometry -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableSHA::SetDisplayGeometry(const Standard_Boolean b) -{ - myDisplayGeometry = b; -} - -//======================================================================= -//function : SetTol -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableSHA::SetTol(const Standard_Real t) -{ - myTol = t; - if(myTol != 0.0) - myDM3d = new Draw_Marker3D(Pnt(), Draw_CircleZoom , Draw_rouge, myTol); -} - - -//======================================================================= -//function : SetPar -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableSHA::SetPar(const Standard_Real t) -{ - myPar = t; - myText->SetPnt(Pnt()); -} - - -//======================================================================= -//function : DrawOn -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableSHA::DrawOn(Draw_Display& dis) const -{ - if(myDM3d.IsNull()) - DBRep_DrawableShape::DrawOn(dis); - else - myDM3d->DrawOn(dis); - myText->DrawOn(dis); - if (myDisplayGeometry) DisplayGeometry(dis); -} - -//======================================================================= -//function : DisplayGeometry -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableSHA::DisplayGeometry(Draw_Display& dis) const -{ - const TopoDS_Shape& aShape = Shape(); - const TopAbs_ShapeEnum t = aShape.ShapeType(); - - if ( t == TopAbs_FACE ) { - const TopoDS_Face& F = TopoDS::Face(aShape); - TopLoc_Location loc; - Handle(Geom_Surface) GS = BRep_Tool::Surface(F,loc); - if ( GS.IsNull() ) return; - Standard_Real u1,u2,v1,v2; BRepTools::UVBounds(F,u1,u2,v1,v2); - GS = Handle(Geom_Surface)::DownCast(GS->Transformed(loc.Transformation())); - Handle(Geom_RectangularTrimmedSurface) GRTS; - GRTS = new Geom_RectangularTrimmedSurface(GS,u1,u2,v1,v2); - Handle(TestTopOpeDraw_DrawableSUR) D; - D = new TestTopOpeDraw_DrawableSUR(GRTS,Draw_bleu); - Draw_Color norcol = DBRep_ColorOrientation(aShape.Orientation()); - D->NormalColor(norcol); - D->DrawNormale(dis); - } - - else if ( t == TopAbs_EDGE ) { - const TopoDS_Edge& E = TopoDS::Edge(aShape); - TopLoc_Location loc; Standard_Real f,l; - Handle(Geom_Curve) GC = BRep_Tool::Curve(E,loc,f,l); - if ( GC.IsNull() ) return; - GC = Handle(Geom_Curve)::DownCast(GC->Transformed(loc.Transformation())); - Handle(Geom_TrimmedCurve) GTC = new Geom_TrimmedCurve(GC,f,l); - Handle(TestTopOpeDraw_DrawableC3D) D; - D = new TestTopOpeDraw_DrawableC3D(GTC,myTextColor); - D->DrawOn(dis); - } - - else if ( t == TopAbs_VERTEX ) { - const TopoDS_Vertex& V = TopoDS::Vertex(aShape); - gp_Pnt P = BRep_Tool::Pnt(V); - Handle(TestTopOpeDraw_DrawableP3D) D; - D = new TestTopOpeDraw_DrawableP3D(P,myTextColor); - D->DrawOn(dis); - } - -} diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.hxx deleted file mode 100644 index 6a7a7414dd..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSHA.hxx +++ /dev/null @@ -1,90 +0,0 @@ -// Created on: 1994-10-24 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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. - -#ifndef _TestTopOpeDraw_DrawableSHA_HeaderFile -#define _TestTopOpeDraw_DrawableSHA_HeaderFile - -#include -#include - -#include -#include -#include -#include -#include -#include -class Draw_Text3D; -class Draw_Marker3D; -class TopoDS_Shape; -class Draw_Color; -class gp_Pnt; -class Draw_Display; - - -class TestTopOpeDraw_DrawableSHA; -DEFINE_STANDARD_HANDLE(TestTopOpeDraw_DrawableSHA, DBRep_DrawableShape) - - -class TestTopOpeDraw_DrawableSHA : public DBRep_DrawableShape -{ - -public: - - - Standard_EXPORT TestTopOpeDraw_DrawableSHA(const TopoDS_Shape& S, const Draw_Color& FreeCol, const Draw_Color& ConnCol, const Draw_Color& EdgeCol, const Draw_Color& IsosCol, const Standard_Real size, const Standard_Integer nbisos, const Standard_Integer discret, const Standard_CString Text, const Draw_Color& TextColor, const Standard_Boolean DisplayGeometry = Standard_False); - - Standard_EXPORT void SetDisplayGeometry (const Standard_Boolean b); - - Standard_EXPORT void SetTol (const Standard_Real t); - - Standard_EXPORT void SetPar (const Standard_Real p); - - Standard_EXPORT void DisplayGeometry (Draw_Display& dis) const; - - Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; - - - - - DEFINE_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableSHA,DBRep_DrawableShape) - -protected: - - - - -private: - - - Standard_EXPORT gp_Pnt Pnt() const; - - Handle(Draw_Text3D) myText; - Draw_Color myTextColor; - Standard_Boolean myDisplayGeometry; - Handle(Draw_Marker3D) myDM3d; - Standard_Real myTol; - Standard_Real myPar; - - -}; - - - - - - - -#endif // _TestTopOpeDraw_DrawableSHA_HeaderFile diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.cxx deleted file mode 100644 index 2c0358c268..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.cxx +++ /dev/null @@ -1,182 +0,0 @@ -// Created on: 1996-09-11 -// Created by: Jean Yves LEBEY -// Copyright (c) 1996-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. - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -IMPLEMENT_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableSUR,DrawTrSurf_Surface) - -//======================================================================= -//function : TestTopOpeDraw_DrawableSUR -//purpose : -//======================================================================= -TestTopOpeDraw_DrawableSUR::TestTopOpeDraw_DrawableSUR -(const Handle(Geom_Surface)& S, const Draw_Color& IsoColor) : - DrawTrSurf_Surface(S,0, 0, Draw_cyan, IsoColor,16, 0.01, 1), - // nu,nv,boundscolor Disc,Defl, DMode) - myNormalColor(Draw_blanc) - -{ - myText = new Draw_Text3D(Pnt(),"",IsoColor); -} - -//======================================================================= -//function : TestTopOpeDraw_DrawableSUR -//purpose : -//======================================================================= - -TestTopOpeDraw_DrawableSUR::TestTopOpeDraw_DrawableSUR -(const Handle(Geom_Surface)& S, const Draw_Color& IsoColor, - const Standard_CString Text,const Draw_Color& TextColor) : - DrawTrSurf_Surface(S,0, 0, Draw_cyan, IsoColor,16, 0.01, 1), - // nu,nv,boundscolor Disc,Defl, DMode) - myNormalColor(Draw_blanc) - -{ - myText = new Draw_Text3D(Pnt(),Text,TextColor); -} - -//======================================================================= -//function : TestTopOpeDraw_DrawableSUR -//purpose : -//======================================================================= - -TestTopOpeDraw_DrawableSUR::TestTopOpeDraw_DrawableSUR -(const Handle(Geom_Surface)& S, - const Draw_Color& IsoColor, - const Draw_Color& BoundColor, - const Draw_Color& NormalColor, - const Standard_CString Text,const Draw_Color& TextColor, - const Standard_Integer Nu, const Standard_Integer Nv, - const Standard_Integer Disc, const Standard_Real Defl, const Standard_Integer DMode, - const Standard_Boolean /*DispOrigin*/) : - DrawTrSurf_Surface(S,Nu,Nv,IsoColor,BoundColor,Disc,Defl,DMode) -{ - myText = new Draw_Text3D(Pnt(),Text,TextColor); - myNormalColor = NormalColor; -} - -//======================================================================= -//function : Pnt2d -//purpose : -//======================================================================= - -gp_Pnt2d TestTopOpeDraw_DrawableSUR::Pnt2d() const -{ - const Handle(Geom_Surface)& GS = GetSurface(); - Standard_Real u1,u2,v1,v2; GS->Bounds(u1,u2,v1,v2); - Standard_Real facpar = 0.20; - Standard_Real u = u1 + (u2-u1)*facpar; - Standard_Real v = v1 + (v2-v1)*facpar; - gp_Pnt2d P(u,v); - return P; -} - -//======================================================================= -//function : Pnt -//purpose : -//======================================================================= - -gp_Pnt TestTopOpeDraw_DrawableSUR::Pnt() const -{ - const Handle(Geom_Surface)& GS = GetSurface(); - gp_Pnt2d P2d = Pnt2d(); - gp_Pnt P = GS->Value(P2d.X(),P2d.Y()); - return P; -} - -//======================================================================= -//function : DrawOn -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableSUR::DrawOn(Draw_Display& dis) const -{ - DrawTrSurf_Surface::DrawOn(dis); - myText->DrawOn(dis); - DrawNormale(dis); -} - -//======================================================================= -//function : NormalColor -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableSUR::NormalColor(const Draw_Color& NormalColor) -{ - myNormalColor = NormalColor; -} - -//======================================================================= -//function : DrawNormale -//purpose : -//======================================================================= - -void TestTopOpeDraw_DrawableSUR::DrawNormale(Draw_Display& dis) const -{ - dis.SetColor(myNormalColor); - - // la normale - gp_Pnt2d P2d = Pnt2d(); Standard_Real u,v; P2d.Coord(u,v); - gp_Pnt P1,P2; gp_Vec V,V1,V2; - const Handle(Geom_Surface)& GS = GetSurface(); - GS->D1(u,v,P1,V1,V2); - Standard_Real mag; V = V1.Crossed(V2); mag = V.Magnitude(); - Standard_Real lvec = 1.; - Handle(Geom_RectangularTrimmedSurface) GRTS; - GRTS = Handle(Geom_RectangularTrimmedSurface)::DownCast(GS); - if (!GRTS.IsNull()) { - Standard_Real u1,u2,v1,v2; GRTS->Bounds(u1,u2,v1,v2); - gp_Pnt Pmin,Pmax; GRTS->D0(u1,v1,Pmin); GRTS->D0(u2,v2,Pmax); - lvec = Pmin.Distance(Pmax); - } - if (mag > 1.e-10) V.Multiply(lvec/mag); - else { V.SetCoord(lvec/2.,0,0); cout<<"Null normal"< gp::Resolution()) { - Standard_Real L = 20 / dis.Zoom(); - Standard_Real H = 10 / dis.Zoom(); - gp_Dir2d d2d(v2d); - gp_Pnt2d pp; - pp.SetCoord(p2.X() - L*d2d.X() - H*d2d.Y(), p2.Y() - L*d2d.Y() + H*d2d.X()); - dis.MoveTo(pp); - dis.DrawTo(p2); - pp.SetCoord(p2.X() - L*d2d.X() + H*d2d.Y(), p2.Y() - L*d2d.Y() - H*d2d.X()); - dis.DrawTo(pp); - } - -} diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.hxx deleted file mode 100644 index 9dbc3673c0..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_DrawableSUR.hxx +++ /dev/null @@ -1,88 +0,0 @@ -// Created on: 1996-09-10 -// Created by: Jean Yves LEBEY -// Copyright (c) 1996-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. - -#ifndef _TestTopOpeDraw_DrawableSUR_HeaderFile -#define _TestTopOpeDraw_DrawableSUR_HeaderFile - -#include -#include - -#include -#include -#include -#include -#include -#include -class Draw_Text3D; -class Geom_Surface; -class Draw_Color; -class gp_Pnt; -class gp_Pnt2d; -class Draw_Display; - - -class TestTopOpeDraw_DrawableSUR; -DEFINE_STANDARD_HANDLE(TestTopOpeDraw_DrawableSUR, DrawTrSurf_Surface) - - -class TestTopOpeDraw_DrawableSUR : public DrawTrSurf_Surface -{ - -public: - - - Standard_EXPORT TestTopOpeDraw_DrawableSUR(const Handle(Geom_Surface)& S, const Draw_Color& IsoColor); - - Standard_EXPORT TestTopOpeDraw_DrawableSUR(const Handle(Geom_Surface)& S, const Draw_Color& IsoColor, const Standard_CString Text, const Draw_Color& TextColor); - - Standard_EXPORT TestTopOpeDraw_DrawableSUR(const Handle(Geom_Surface)& S, const Draw_Color& IsoColor, const Draw_Color& BoundColor, const Draw_Color& NormalColor, const Standard_CString Text, const Draw_Color& TextColor, const Standard_Integer Nu, const Standard_Integer Nv, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode, const Standard_Boolean DispOrigin = Standard_True); - - Standard_EXPORT gp_Pnt Pnt() const; - - Standard_EXPORT gp_Pnt2d Pnt2d() const; - - Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; - - Standard_EXPORT void NormalColor (const Draw_Color& NormalColor); - - Standard_EXPORT void DrawNormale (Draw_Display& dis) const; - - - - - DEFINE_STANDARD_RTTIEXT(TestTopOpeDraw_DrawableSUR,DrawTrSurf_Surface) - -protected: - - - - -private: - - - Handle(Draw_Text3D) myText; - Draw_Color myNormalColor; - - -}; - - - - - - - -#endif // _TestTopOpeDraw_DrawableSUR_HeaderFile diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_HArray1OfDrawableMesure.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_HArray1OfDrawableMesure.hxx deleted file mode 100644 index 412aef5457..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_HArray1OfDrawableMesure.hxx +++ /dev/null @@ -1,27 +0,0 @@ -// Created on: 1997-01-20 -// Created by: Jean Yves LEBEY -// Copyright (c) 1997-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. - -#ifndef TestTopOpeDraw_HArray1OfDrawableMesure_HeaderFile -#define TestTopOpeDraw_HArray1OfDrawableMesure_HeaderFile - -#include -#include -#include - -DEFINE_HARRAY1(TestTopOpeDraw_HArray1OfDrawableMesure, TestTopOpeDraw_Array1OfDrawableMesure) - - -#endif diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_HArray1OfDrawableP3D.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_HArray1OfDrawableP3D.hxx deleted file mode 100644 index 8370cf41af..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_HArray1OfDrawableP3D.hxx +++ /dev/null @@ -1,27 +0,0 @@ -// Created on: 1997-01-20 -// Created by: Jean Yves LEBEY -// Copyright (c) 1997-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. - -#ifndef TestTopOpeDraw_HArray1OfDrawableP3D_HeaderFile -#define TestTopOpeDraw_HArray1OfDrawableP3D_HeaderFile - -#include -#include -#include - -DEFINE_HARRAY1(TestTopOpeDraw_HArray1OfDrawableP3D, TestTopOpeDraw_Array1OfDrawableP3D) - - -#endif diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_ListIteratorOfListOfPnt2d.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_ListIteratorOfListOfPnt2d.hxx deleted file mode 100644 index baa7fbbcc9..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_ListIteratorOfListOfPnt2d.hxx +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 2015 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. - - -#ifndef TestTopOpeDraw_ListIteratorOfListOfPnt2d_HeaderFile -#define TestTopOpeDraw_ListIteratorOfListOfPnt2d_HeaderFile - -#include - -#endif diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_ListOfPnt2d.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_ListOfPnt2d.hxx deleted file mode 100644 index 8e79687d4f..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_ListOfPnt2d.hxx +++ /dev/null @@ -1,27 +0,0 @@ -// Created on: 1997-01-20 -// Created by: Jean Yves LEBEY -// Copyright (c) 1997-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. - -#ifndef TestTopOpeDraw_ListOfPnt2d_HeaderFile -#define TestTopOpeDraw_ListOfPnt2d_HeaderFile - -#include -#include - -typedef NCollection_List TestTopOpeDraw_ListOfPnt2d; -typedef NCollection_List::Iterator TestTopOpeDraw_ListIteratorOfListOfPnt2d; - - -#endif diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx deleted file mode 100644 index 8ec55a45f9..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_OtherCommands.cxx +++ /dev/null @@ -1,612 +0,0 @@ -// Created on: 1996-02-02 -// Created by: Jean Yves LEBEY -// Copyright (c) 1996-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. - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -//----------------------------------------------------------------------- -// 0 = testtopopedraw_cdinp -// 1,2,3,4 = display point p of coords x y z -//----------------------------------------------------------------------- -Standard_Integer testtopopedraw_cdinp(Draw_Interpretor&,Standard_Integer na,const char** a) -{ - if ( na < 5 ) return 0; - TestTopOpeDraw_P3DDisplayer PD(a[1],Draw::Atof(a[2]),Draw::Atof(a[3]),Draw::Atof(a[4])); - return 0; -} - -//----------------------------------------------------------------------- -// DRAWsuppressarg : remove a[d], modify na-- -//----------------------------------------------------------------------- -Standard_EXPORT void DRAWsuppressarg(Standard_Integer& na,const char** a,const Standard_Integer d) -{ - for(Standard_Integer i=d;i to , modify na = na - (l - f) -//----------------------------------------------------------------------- -Standard_EXPORT void DRAWsuppressargs(Standard_Integer& na,const char** a,const Standard_Integer f,const Standard_Integer l) -{ - if(l == f) - DRAWsuppressarg(na,a,l); - if(l <= f) return; - for(Standard_Integer i=0;i to display the name of an edge round a point of "< : on edge , diplay name at t in [0..1]"< : visualize face with isos"< : display name with color col (Draw_blanc, Draw_rouge, ...)"< -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -class cvx2d { - -public: - cvx2d(Draw_Interpretor& di) { - clearall(); - mypdi = &di; - } - - const TopoDS_Face& face() const { return myface; } - const TCollection_AsciiString& facename() const { return myfacename; } - - void erasevisible() { - TColStd_ListIteratorOfListOfAsciiString i(myvis); - Standard_Boolean ya = i.More(); - TCollection_AsciiString str = "erase"; - for (; i.More(); i.Next()) { - const TCollection_AsciiString& s = i.Value(); - str = str + " " + s; - } - if (ya) { - TCollection_AsciiString str1 = "erase -mute;"; mypdi->Eval(str1.ToCString()); - str = str + ";"; mypdi->Eval(str.ToCString()); - } - clearvisible(); - } - - void addvisible(const TCollection_AsciiString& N) { myvis.Append(N); } - void clearvisible() { myvis.Clear(); } - - const TopoDS_Edge& edge(const Standard_Integer ie) const { - if ( ie >= 1 && ie <= mymapis.Extent()) { - const TopoDS_Edge& E = TopoDS::Edge(mymapis.Find(ie)); - return E; - } - return myemptyedge; - } - - Standard_Integer nedge() const { return mymapis.Extent(); } - - void clearall() { - clearvisible(); - mymapve.Clear(); - mymapsi.Clear(); mymapis.Clear(); mynemap = 0; myiemap = 1; myedgedisplayed = 0; - myface.Nullify(); - myfacename = ""; - } - - void addedge(const TopoDS_Shape& E) { - mynemap++; - mymapsi.Bind(E,mynemap); - mymapis.Bind(mynemap,E); - } - - void initface(const TopoDS_Face& F,const TCollection_AsciiString& N) { - clearall(); - myface = F; myfacename = N; - TopExp::MapShapesAndAncestors(myface,TopAbs_VERTEX,TopAbs_EDGE,mymapve); - TopExp_Explorer e; - for (e.Init(F,TopAbs_EDGE);e.More();e.Next()) addedge(e.Current()); -// for (TopExp_Explorer e(F,TopAbs_EDGE);e.More();e.Next()) addedge(e.Current()); - initedgeiter(); - setedgedisplayed(0); - } - - void displayface() const { - char s[1000]; - mypdi->Eval("info proc vx2d_displayface"); - if (mypdi->Result()) { - Sprintf(s,"vx2d_displayface %s",myfacename.ToCString()); - mypdi->Eval(s); - } - else cout<<"procedure vx2d_displayface non trouvee"<1) && (i%4 == 0) && (i=1 &&i<=mynemap) myiemap = i; } - Standard_Integer edgedisplayed() const { return myedgedisplayed; } - void setedgedisplayed(const Standard_Integer i) { if (i>=1 &&i<=mynemap) myedgedisplayed = i; } - - TopoDS_Face myface; TCollection_AsciiString myfacename; - TColStd_ListOfAsciiString myvis; - TopTools_IndexedDataMapOfShapeListOfShape mymapve; - - TopTools_DataMapOfOrientedShapeInteger mymapsi; - TopTools_DataMapOfIntegerShape mymapis; - Standard_Integer mynemap; - Standard_Integer myiemap; - Standard_Integer myedgedisplayed; - - Draw_Interpretor* mypdi; - TopoDS_Edge myemptyedge; - TopTools_ListOfShape myemptylos; -}; // cvx2d - -void cvx2d::nextedgeiter(const Standard_Integer incr) -{ - if (!moreedgeiter()) return; - myiemap += incr; - if (myiemap>mynemap) myiemap = 1; - else if (myiemap<1) myiemap = mynemap; -} - -Standard_Integer cvx2d::displayface(const TopoDS_Shape& S, const TCollection_AsciiString& sta) { - TopoDS_Shape aLocalShape = S.Oriented(TopAbs_FORWARD) ; - TopoDS_Face F = TopoDS::Face(aLocalShape); -// TopoDS_Face F = TopoDS::Face(S.Oriented(TopAbs_FORWARD)); - Standard_Boolean init = Standard_True; - if (init) initface(F,sta); - displayface(); - printedges(); - return 0; -} // displayface - -Standard_Integer cvx2d::displayedge(const TopoDS_Shape& S) { - if (S.IsNull()) return 0; - const TopoDS_Edge& E = TopoDS::Edge(S); - const TopoDS_Face& F = face(); - if (F.IsNull()) return 0; - - Draw_Color savecol = DrawTrSurf_CurveColor(Draw_Color(Draw_rouge)); - - Standard_Real u,v,V,U;BRepTools::UVBounds(F,E,u,U,v,V); - Standard_Boolean deg = BRep_Tool::Degenerated(E); - gp_Pnt2d pe1(u,v);gp_Pnt2d pe2(U,V); - gp_Pnt2d p1,p2;BRep_Tool::UVPoints(E,F,p1,p2); - TopoDS_Vertex v1,v2; TopExp::Vertices(E,v1,v2); - gp_Pnt P1 = BRep_Tool::Pnt(v1); - gp_Pnt P2 = BRep_Tool::Pnt(v2); - Standard_Real v1v2 = P1.Distance(P2); - Standard_Real tole = BRep_Tool::Tolerance(E); - Standard_Real tol1 = BRep_Tool::Tolerance(v1); - Standard_Real tol2 = BRep_Tool::Tolerance(v2); - const TopTools_ListOfShape& l1 = incidentedges(v1); - const TopTools_ListOfShape& l2 = incidentedges(v2); - Handle(Geom2d_Curve) c2d = curve2d(E); - -// char sdi[1000]; - char stol[1000]; - TCollection_AsciiString ste,stc,sv1,sv1a,sv2,sv2a,ste1,ste2; - - ename(E,ste); - stc = "c"; stc = stc + ste; - vname(v1,E,sv1); sv1a = "V"; sv1a = sv1a + sv1; - vname(v2,E,sv2); sv2a = "V"; sv2a = sv2a + sv2; - lenames(l1,ste1); - lenames(l2,ste2); - - cout<edgedisplayed()) pv2d->nextedgeiter(dostep); - if (pv2d->moreedgeiter()) pv2d->displayedge(pv2d->edge(pv2d->curredgeiter())); - return 0; - } - else if (doiedge) { - pv2d->setcurredgeiter(doiedge); - if (pv2d->moreedgeiter()) pv2d->displayedge(pv2d->edge(pv2d->curredgeiter())); - return 0; - } - - TopoDS_Shape S = DBRep::Get(a[1]); if (S.IsNull()) return 0; - TCollection_AsciiString sta1(a[1]); TopAbs_ShapeEnum t = S.ShapeType(); - TopAbs_ShapeEnum tt = ( t == TopAbs_FACE) ? TopAbs_EDGE : TopAbs_FACE; - - Standard_Integer iearg = (na >= 3) ? Draw::Atoi(a[2]) : 0; - TCollection_AsciiString stss; Standard_Integer i = 1; - TopExp_Explorer ex; - for (ex.Init(S,tt);ex.More();ex.Next(),i++) { -// for (TopExp_Explorer ex(S,tt);ex.More();ex.Next(),i++) { - Standard_Boolean cond = Standard_False; - cond = cond || (!iearg); - cond = cond || (iearg && (iearg == i)); - if (cond) { - pv2d->subshapename(sta1,tt,i,stss); - DBRep::Set(stss.ToCString(),ex.Current()); - di<<"vx2d "<displayface(S,sta1); - else if (t == TopAbs_EDGE) r = pv2d->displayedge(S); - return r; -} // vx2d - -//======================================================================= -//function : OtherCommands -//purpose : -//======================================================================= - -void TestTopOpeDraw::OtherCommands(Draw_Interpretor& theCommands) -{ - const char* g = "Topological Operation other commands"; - theCommands.Add("cdinp","cdinp p x y z",__FILE__,testtopopedraw_cdinp,g); - theCommands.Add("cdins","cdins s1 ... ",__FILE__,testtopopedraw_cdins,g); - theCommands.Add("vx2d","vx2d f",__FILE__,vx2d,g); - BoopReadInitFile(theCommands,getenv("BOOPGLOB")); - theCommands.Add("ttab","",__FILE__,ttab,g); -} diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_SaveRestore.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_SaveRestore.cxx deleted file mode 100644 index f62043d42f..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_SaveRestore.cxx +++ /dev/null @@ -1,250 +0,0 @@ -// Created on: 1996-04-10 -// Created by: Jean-Yves LEBEY -// Copyright (c) 1996-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. - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// pour sauver un DrawableSHA - -//======================================================================= -//function : stestTopOpe -//purpose : -//======================================================================= - -static Standard_Boolean stestTopOpe(const Handle(Draw_Drawable3D)& D) -{ - Standard_Boolean res = D->IsInstance(STANDARD_TYPE(TestTopOpeDraw_DrawableSHA)); - return res; -} - - -//======================================================================= -//function : ssaveTopOpe -//purpose : -//======================================================================= - -static void ssaveTopOpe (const Handle(Draw_Drawable3D)& D, ostream& OS) -{ - Handle(TestTopOpeDraw_DrawableSHA) N; - N = Handle(TestTopOpeDraw_DrawableSHA)::DownCast(D); - if ( !N.IsNull()) { - BRep_Builder B; - BRepTools_ShapeSet S(B); - S.Add(N->Shape()); - S.Write(OS); - S.Write(N->Shape(),OS); - } - else cout <<"TestTopOpeDraw::ssaveTopOpe : error" << endl; -} - -static Standard_Real size = 100.; -static Standard_Integer nbIsos = 2; -static Standard_Integer discret = 30; -//======================================================================= -//function : srestoreTopOpe -//purpose : -//======================================================================= - -static Handle(Draw_Drawable3D) srestoreTopOpe (istream& IS) -{ - BRep_Builder B; - BRepTools_ShapeSet S(B); - S.Read(IS); - TopoDS_Shape theShape; - S.Read(theShape,IS); - Handle(DBRep_DrawableShape) N; - N = new DBRep_DrawableShape(theShape, - Draw_vert, - Draw_jaune, - Draw_rouge, - Draw_bleu, - size, - nbIsos, - discret); - return N; -} - - -//======================================================================= -//function : ssrTopOpe -//purpose : -//======================================================================= - -static Draw_SaveAndRestore ssrTopOpe -("TestTopOpeDraw_DrawableSHA", - stestTopOpe,ssaveTopOpe,srestoreTopOpe); - -// pour sauver une DrawableC3D - -//======================================================================= -//function : ctestTopOpe -//purpose : -//======================================================================= - -static Standard_Boolean ctestTopOpe(const Handle(Draw_Drawable3D)& D) -{ - Standard_Boolean res = D->IsInstance(STANDARD_TYPE(TestTopOpeDraw_DrawableC3D)); - return res; -} - - -//======================================================================= -//function : csaveTopOpe -//purpose : -//======================================================================= - -static void csaveTopOpe (const Handle(Draw_Drawable3D)& D, ostream& OS) -{ - - - Handle(DrawTrSurf_Curve) N; - N = Handle(DrawTrSurf_Curve)::DownCast(D); - if ( !N.IsNull()) { - Handle(Geom_Curve) GC; - GC = N->GetCurve(); - BRep_Builder BB; - TopoDS_Edge E; - BB.MakeEdge(E, GC, 1.0e-7); - BRep_Builder B; - BRepTools_ShapeSet S(B); - S.Add(E); - S.Write(OS); - S.Write(E,OS); - } - else cout <<"TestTopOpeDraw::csaveTopOpe : error" << endl; -} - -//======================================================================= -//function : crestoreTopOpe -//purpose : -//======================================================================= - -static Handle(Draw_Drawable3D) crestoreTopOpe (istream& IS) -{ - BRep_Builder B; - BRepTools_ShapeSet S(B); - S.Read(IS); - TopoDS_Shape theShape; - S.Read(theShape,IS); - TopoDS_Edge& E = TopoDS::Edge(theShape); - Standard_Real f, l; - Handle(Geom_Curve) C3d = BRep_Tool::Curve(E, f, l); - Handle(TestTopOpeDraw_DrawableC3D) N; - N = new TestTopOpeDraw_DrawableC3D(C3d,Draw_blanc); - return N; -} - - -//======================================================================= -//function : csrTopOpe -//purpose : -//======================================================================= - -static Draw_SaveAndRestore csrTopOpe -("TestTopOpeDraw_DrawableC3D", - ctestTopOpe,csaveTopOpe,crestoreTopOpe); - - -// pour sauver une DrawableMesure - -//======================================================================= -//function : mtestTopOpe -//purpose : -//======================================================================= - -static Standard_Boolean mtestTopOpe(const Handle(Draw_Drawable3D)& D) -{ - Standard_Boolean res = D->IsInstance(STANDARD_TYPE(TestTopOpeDraw_DrawableMesure)); - return res; -} - - -//======================================================================= -//function : msaveTopOpe -//purpose : -//======================================================================= - -static void msaveTopOpe (const Handle(Draw_Drawable3D)& D, ostream& OS) -{ - Handle(DrawTrSurf_Curve) N; - N = Handle(DrawTrSurf_Curve)::DownCast(D); - if ( !N.IsNull()) { - Handle(Geom_BSplineCurve) BS; - BS = Handle(Geom_BSplineCurve)::DownCast(N->GetCurve()); - BRep_Builder BB; - TopoDS_Edge E; - BB.MakeEdge(E, BS, 1.0e-7); - BRep_Builder B; - BRepTools_ShapeSet S(B); - S.Add(E); - S.Write(OS); - S.Write(E,OS); - } - else cout <<"TestTopOpeDraw::msaveTopOpe : error" << endl; -} - -//======================================================================= -//function : mrestoreTopOpe -//purpose : -//======================================================================= - -static Handle(Draw_Drawable3D) mrestoreTopOpe (istream& IS) -{ - BRep_Builder B; - BRepTools_ShapeSet S(B); - S.Read(IS); - TopoDS_Shape theShape; - S.Read(theShape,IS); - TopoDS_Edge& E = TopoDS::Edge(theShape); - Standard_Integer NbPoles; - Standard_Real f, l; - Handle(Geom_Curve) C3d = BRep_Tool::Curve(E, f, l); - Handle(Geom_BSplineCurve) BS; - BS = Handle(Geom_BSplineCurve)::DownCast(C3d); - NbPoles = BS->NbPoles(); - TColgp_HArray1OfPnt* Pnt = new TColgp_HArray1OfPnt(1, NbPoles); - BS->Poles(Pnt->ChangeArray1()); - TestTopOpeTools_Mesure Mes(Pnt); - Handle(TestTopOpeDraw_DrawableMesure) N; - N = new TestTopOpeDraw_DrawableMesure(Mes, Draw_blanc, Draw_rose); - return N; -} - - -//======================================================================= -//function : msrTopOpe -//purpose : -//======================================================================= - -static Draw_SaveAndRestore msrTopOpe -("TestTopOpeDraw_DrawableMesure", - mtestTopOpe,msaveTopOpe,mrestoreTopOpe); diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_TTOT.cxx b/src/TestTopOpeDraw/TestTopOpeDraw_TTOT.cxx deleted file mode 100644 index 89d206d6da..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_TTOT.cxx +++ /dev/null @@ -1,355 +0,0 @@ -// Created on: 1996-09-20 -// Created by: Jean Yves LEBEY -// Copyright (c) 1996-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. - -#include -#include -#include -#include - -//======================================================================= -//function : ShapeEnumToString -//purpose : -//======================================================================= -void TestTopOpeDraw_TTOT::ShapeEnumToString -(const TopAbs_ShapeEnum T, TCollection_AsciiString& N) -{ - if (T == TopAbs_SHAPE) N = "s"; - else if (T == TopAbs_COMPOUND) N = "co"; - else if (T == TopAbs_COMPSOLID) N = "cs"; - else if (T == TopAbs_SOLID) N = "so"; - else if (T == TopAbs_SHELL) N = "sh"; - else if (T == TopAbs_FACE) N = "f"; - else if (T == TopAbs_WIRE) N = "w"; - else if (T == TopAbs_EDGE) N = "e"; - else if (T == TopAbs_VERTEX) N = "v"; -} - -//======================================================================= -//function : OrientationToString -//purpose : -//======================================================================= - -void TestTopOpeDraw_TTOT::OrientationToString -(const TopAbs_Orientation o, TCollection_AsciiString& N) -{ - switch (o) { - case TopAbs_FORWARD : N = "FORWARD" ; break; - case TopAbs_REVERSED : N = "REVERSED"; break; - case TopAbs_INTERNAL : N = "INTERNAL"; break; - case TopAbs_EXTERNAL : N = "EXTERNAL"; break; - } -} - -//======================================================================= -//function : StringToKind -//purpose : -//======================================================================= - -Standard_Boolean TestTopOpeDraw_TTOT::StringToKind -(const TCollection_AsciiString& N, TopOpeBRepDS_Kind& T) -{ - char *s = (char*)N.ToCString(); - Standard_Integer ok = 0; - if (!strcasecmp(s,"su")) { T = TopOpeBRepDS_SURFACE; ok = 1; } - else if (!strcasecmp(s,"c")) { T = TopOpeBRepDS_CURVE; ok = 1; } - else if (!strcasecmp(s,"p")) { T = TopOpeBRepDS_POINT; ok = 1; } - if (!strcasecmp(s,"co")) { T = TopOpeBRepDS_COMPOUND; ok = 1; } - if (!strcasecmp(s,"cs")) { T = TopOpeBRepDS_COMPSOLID; ok = 1; } - else if (!strcasecmp(s,"so")) { T = TopOpeBRepDS_SOLID; ok = 1; } - else if (!strcasecmp(s,"sh")) { T = TopOpeBRepDS_SHELL; ok = 1; } - else if (!strcasecmp(s,"f")) { T = TopOpeBRepDS_FACE; ok = 1; } - else if (!strcasecmp(s,"w")) { T = TopOpeBRepDS_WIRE; ok = 1; } - else if (!strcasecmp(s,"e")) { T = TopOpeBRepDS_EDGE; ok = 1; } - else if (!strcasecmp(s,"v")) { T = TopOpeBRepDS_VERTEX; ok = 1; } - return ok != 0; -} - -//======================================================================= -//function : KindToString -//purpose : -//======================================================================= - -void TestTopOpeDraw_TTOT::KindToString -(const TopOpeBRepDS_Kind T, TCollection_AsciiString& N) -{ - if (T == TopOpeBRepDS_SURFACE) N = "su"; - else if (T == TopOpeBRepDS_CURVE) N = "c"; - else if (T == TopOpeBRepDS_POINT) N = "p"; - else if (T == TopOpeBRepDS_COMPOUND) N = "co"; - else if (T == TopOpeBRepDS_COMPSOLID) N = "cs"; - else if (T == TopOpeBRepDS_SOLID) N = "so"; - else if (T == TopOpeBRepDS_SHELL) N = "sh"; - else if (T == TopOpeBRepDS_FACE) N = "f"; - else if (T == TopOpeBRepDS_WIRE) N = "w"; - else if (T == TopOpeBRepDS_EDGE) N = "e"; - else if (T == TopOpeBRepDS_VERTEX) N = "v"; -} - - -//======================================================================= -//function : StringToShapeEnum -//purpose : -//======================================================================= - -Standard_Boolean TestTopOpeDraw_TTOT::StringToShapeEnum -(const TCollection_AsciiString& N, TopAbs_ShapeEnum& T) -{ - char *s = (char*)N.ToCString(); - Standard_Integer ok = 0; - if (!strcasecmp(s,"s")) { T = TopAbs_SHAPE; ok = 1; } - else if (!strcasecmp(s,"co")) { T = TopAbs_COMPOUND; ok = 1; } - else if (!strcasecmp(s,"cs")) { T = TopAbs_COMPSOLID; ok = 1; } - else if (!strcasecmp(s,"so")) { T = TopAbs_SOLID; ok = 1; } - else if (!strcasecmp(s,"sh")) { T = TopAbs_SHELL; ok = 1; } - else if (!strcasecmp(s,"f")) { T = TopAbs_FACE; ok = 1; } - else if (!strcasecmp(s,"w")) { T = TopAbs_WIRE; ok = 1; } - else if (!strcasecmp(s,"e")) { T = TopAbs_EDGE; ok = 1; } - else if (!strcasecmp(s,"v")) { T = TopAbs_VERTEX; ok = 1; } - return ok != 0; -} - - -//======================================================================= -//function : ShapeColor -//purpose : -//======================================================================= - -Draw_ColorKind TestTopOpeDraw_TTOT::ShapeColor -(const TopoDS_Shape& S) -{ - Draw_ColorKind col = Draw_orange; - switch ( S.ShapeType() ) { - case TopAbs_COMPOUND : col = Draw_saumon; break; - case TopAbs_COMPSOLID : col = Draw_blanc; break; - case TopAbs_SOLID : col = Draw_violet; break; - case TopAbs_SHELL : col = Draw_corail; break; - case TopAbs_FACE : col = Draw_vert; break; // col = Draw_jaune; break; - case TopAbs_WIRE : col = Draw_cyan; break; - case TopAbs_EDGE : col = Draw_magenta; break; - case TopAbs_VERTEX : col = Draw_orange; break; - default : col = Draw_marron; - } - return col; -} - -Draw_ColorKind TestTopOpeDraw_TTOT::KindColor -(const TopOpeBRepDS_Kind K) -{ - Draw_ColorKind col = Draw_orange; - if (K == TopOpeBRepDS_SURFACE) col = Draw_jaune; - else if (K == TopOpeBRepDS_CURVE) col = Draw_vert; - else if (K == TopOpeBRepDS_POINT) col = Draw_blanc; - else if (K == TopOpeBRepDS_FACE) col = Draw_cyan; - return col; -} - -//======================================================================= -//function : GeometryColor -//purpose : -//======================================================================= - -Draw_ColorKind TestTopOpeDraw_TTOT::GeometryColor -(const TopOpeBRepDS_Kind K) -{ - Draw_ColorKind col = Draw_orange; - col = KindColor(K); - return col; -} - -//======================================================================= -//function : CurveToString -//purpose : -//======================================================================= - -void TestTopOpeDraw_TTOT::CurveToString -(const GeomAbs_CurveType t, TCollection_AsciiString& N) -{ - switch(t) { - case GeomAbs_Line : N = "LINE"; break; - case GeomAbs_Circle : N = "CIRCLE"; break; - case GeomAbs_Ellipse : N = "ELLIPSE"; break; - case GeomAbs_Hyperbola : N = "HYPERBOLA"; break; - case GeomAbs_Parabola : N = "PARABOLA"; break; - case GeomAbs_BezierCurve : N = "BEZIER"; break; - case GeomAbs_BSplineCurve : N = "BSPLINE"; break; - case GeomAbs_OffsetCurve : N = "OFFSET"; break; - case GeomAbs_OtherCurve : N = "OTHER"; break; - default : N = "UNKNOWN"; break; - } -} - -//======================================================================= -//function : SurfaceToString -//purpose : -//======================================================================= - -void TestTopOpeDraw_TTOT::SurfaceToString -(const GeomAbs_SurfaceType t, TCollection_AsciiString& N) -{ - switch(t) { - case GeomAbs_Plane : N = "PLANE"; break; - case GeomAbs_Cylinder : N = "CYLINDER"; break; - case GeomAbs_Cone : N = "CONE"; break; - case GeomAbs_Sphere : N = "SPHERE"; break; - case GeomAbs_Torus : N = "TORUS"; break; - case GeomAbs_BezierSurface : N = "BEZIER"; break; - case GeomAbs_BSplineSurface : N = "BSPLINE"; break; - case GeomAbs_SurfaceOfRevolution : N = "REVOLUTION"; break; - case GeomAbs_SurfaceOfExtrusion : N = "EXTRUSION"; break; - case GeomAbs_OffsetSurface : N = "OFFSET"; break; - case GeomAbs_OtherSurface : N = "OTHER"; break; - default : N = "UNKNOWN"; break; - } -} - -//======================================================================= -//function : GeometryName -//purpose : -//======================================================================= - -void TestTopOpeDraw_TTOT::GeometryName -(const Standard_Integer I, const TopOpeBRepDS_Kind K, TCollection_AsciiString& N) -{ - TCollection_AsciiString name; KindToString(K,name); - name = name + "_" + TCollection_AsciiString(I); - N = name; -} - -//======================================================================= -//function : CatCurveName -//purpose : -//======================================================================= - -void TestTopOpeDraw_TTOT::CatCurveName -(const Standard_Integer I, TCollection_AsciiString& N) -{ - TCollection_AsciiString n; GeometryName(I,TopOpeBRepDS_CURVE,n); - N = N + n; -} - -//======================================================================= -//function : CatOrientation -//purpose : -//======================================================================= - -void TestTopOpeDraw_TTOT::CatOrientation -(const TopAbs_Orientation o,TCollection_AsciiString& N) -{ - TCollection_AsciiString s; OrientationToString(o,s); - s.Trunc(1); - N = N + "["; N = N + s; N = N + "]"; -} - -//======================================================================= -//function : CatOrientation -//purpose : -//======================================================================= - -void TestTopOpeDraw_TTOT::CatOrientation -(const TopoDS_Shape& S,TCollection_AsciiString& N) -{ - CatOrientation(S.Orientation(),N); -} - -//======================================================================= -//function : CatCurve -//purpose : -//======================================================================= - -void TestTopOpeDraw_TTOT::CatCurve -(const Handle(Geom_Curve) GC, TCollection_AsciiString& N) -{ - if ( GC.IsNull() ) return; - GeomAdaptor_Curve GAC(GC); GeomAbs_CurveType t = GAC.GetType(); - TCollection_AsciiString s; CurveToString(t,s); - s.Trunc(2); - N = N + "("; N = N + s; N = N + ")"; -} - -//======================================================================= -//function : CatSurface -//purpose : -//======================================================================= - -void TestTopOpeDraw_TTOT::CatSurface -(const Handle(Geom_Surface) GS, TCollection_AsciiString& N) -{ - if ( GS.IsNull() ) return; - GeomAdaptor_Surface GAS(GS); GeomAbs_SurfaceType t = GAS.GetType(); - TCollection_AsciiString s; SurfaceToString(t,s); - s.Trunc(2); - N = N + "("; N = N + s; N = N + ")"; -} - -//======================================================================= -//function : CatGeometry -//purpose : -//======================================================================= - -void TestTopOpeDraw_TTOT::CatGeometry -(const TopoDS_Shape& S, TCollection_AsciiString& N) -{ - if ( S.IsNull() ) return; - const TopAbs_ShapeEnum t = S.ShapeType(); - if (t == TopAbs_FACE) { - const TopoDS_Face& F = TopoDS::Face(S); - TopLoc_Location loc; - Handle(Geom_Surface) GS = BRep_Tool::Surface(F,loc); - CatSurface(GS,N); - } - else if (t == TopAbs_EDGE) { - const TopoDS_Edge& E = TopoDS::Edge(S); - TopLoc_Location loc; Standard_Real f,l; - Handle(Geom_Curve) GC = BRep_Tool::Curve(E,loc,f,l); - CatCurve(GC,N); - } -} - -//======================================================================= -//function : CatCurveDisplayName -//purpose : -//======================================================================= - -void TestTopOpeDraw_TTOT::CatCurveDisplayName -(const Standard_Integer I, const Handle(Geom_Curve) GC, TCollection_AsciiString& N) -{ - if ( GC.IsNull() ) return; - CatCurveName(I,N); - CatCurve(GC,N); -} - -//======================================================================= -//function : CurveDisplayName -//purpose : -//======================================================================= - -void TestTopOpeDraw_TTOT::CurveDisplayName -(const Standard_Integer I, const Handle(Geom_Curve) GC, TCollection_AsciiString& N) -{ - N = " "; - CatCurveDisplayName(I,GC,N); -} - -//======================================================================= -//function : ShapeKind -//purpose : -//======================================================================= - -Standard_Boolean TestTopOpeDraw_TTOT::ShapeKind(const TopoDS_Shape& S,const TopAbs_ShapeEnum TS) -{ - if ( TS == TopAbs_SHAPE ) return Standard_True; - else return ( S.ShapeType() == TS ); -} diff --git a/src/TestTopOpeDraw/TestTopOpeDraw_TTOT.hxx b/src/TestTopOpeDraw/TestTopOpeDraw_TTOT.hxx deleted file mode 100644 index 7bcde69fa7..0000000000 --- a/src/TestTopOpeDraw/TestTopOpeDraw_TTOT.hxx +++ /dev/null @@ -1,98 +0,0 @@ -// Created on: 1996-09-20 -// Created by: Jean Yves LEBEY -// Copyright (c) 1996-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. - -#ifndef _TestTopOpeDraw_TTOT_HeaderFile -#define _TestTopOpeDraw_TTOT_HeaderFile - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -class TestTopOpeDraw_TTOT { - -public: - - static Standard_EXPORT void ShapeEnumToString - (const TopAbs_ShapeEnum T, TCollection_AsciiString& N); - - static void OrientationToString - (const TopAbs_Orientation o, TCollection_AsciiString& N); - - static Standard_EXPORT Standard_Boolean StringToKind - (const TCollection_AsciiString& N, TopOpeBRepDS_Kind& T); - - static void KindToString - (const TopOpeBRepDS_Kind T, TCollection_AsciiString& N); - - static Standard_Boolean StringToShapeEnum - (const TCollection_AsciiString& N, TopAbs_ShapeEnum& T); - - static Draw_ColorKind ShapeColor - (const TopoDS_Shape& S); - - static Draw_ColorKind KindColor - (const TopOpeBRepDS_Kind K); - - static Standard_EXPORT Draw_ColorKind GeometryColor - (const TopOpeBRepDS_Kind K); - - static void CurveToString - (const GeomAbs_CurveType t, TCollection_AsciiString& N); - - static void SurfaceToString - (const GeomAbs_SurfaceType t, TCollection_AsciiString& N); - - static Standard_EXPORT void GeometryName - (const Standard_Integer I, const TopOpeBRepDS_Kind K, TCollection_AsciiString& N); - - static Standard_EXPORT void CatCurveName - (const Standard_Integer I, TCollection_AsciiString& N); - - static void CatOrientation - (const TopAbs_Orientation o,TCollection_AsciiString& N); - - static void CatOrientation - (const TopoDS_Shape& S,TCollection_AsciiString& N); - - static void CatCurve - (const Handle(Geom_Curve) GC, TCollection_AsciiString& N); - - static void CatSurface - (const Handle(Geom_Surface) GS, TCollection_AsciiString& N); - - static void CatGeometry - (const TopoDS_Shape& S, TCollection_AsciiString& N); - - static Standard_EXPORT void CatCurveDisplayName - (const Standard_Integer I, const Handle(Geom_Curve) GC, TCollection_AsciiString& N); - - static Standard_EXPORT void CurveDisplayName - (const Standard_Integer I, const Handle(Geom_Curve) GC, TCollection_AsciiString& N); - - static Standard_Boolean Standard_EXPORT ShapeKind - (const TopoDS_Shape& S,const TopAbs_ShapeEnum TS); - -}; - - -#endif diff --git a/src/TestTopOpeTools/FILES b/src/TestTopOpeTools/FILES deleted file mode 100755 index 5c6ae9ba3c..0000000000 --- a/src/TestTopOpeTools/FILES +++ /dev/null @@ -1,12 +0,0 @@ -FILES -TestTopOpeTools.cxx -TestTopOpeTools.hxx -TestTopOpeTools_Array1OfMesure.hxx -TestTopOpeTools_HArray1OfMesure.hxx -TestTopOpeTools_Mesure.cxx -TestTopOpeTools_Mesure.hxx -TestTopOpeTools_OtherCommands.cxx -TestTopOpeTools_PMesure.hxx -TestTopOpeTools_Trace.cxx -TestTopOpeTools_Trace.hxx -TestTopOpeTools_TraceCommands.cxx diff --git a/src/TestTopOpeTools/TestTopOpeTools.cxx b/src/TestTopOpeTools/TestTopOpeTools.cxx deleted file mode 100644 index ae74f41824..0000000000 --- a/src/TestTopOpeTools/TestTopOpeTools.cxx +++ /dev/null @@ -1,28 +0,0 @@ -// Created on: 1994-10-24 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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. - - -#include - -//======================================================================= -//function : AllCommands -//purpose : -//======================================================================= -void TestTopOpeTools::AllCommands(Draw_Interpretor& theCommands) -{ - TestTopOpeTools::TraceCommands(theCommands); - TestTopOpeTools::OtherCommands(theCommands); -} diff --git a/src/TestTopOpeTools/TestTopOpeTools.hxx b/src/TestTopOpeTools/TestTopOpeTools.hxx deleted file mode 100644 index ccf53248c1..0000000000 --- a/src/TestTopOpeTools/TestTopOpeTools.hxx +++ /dev/null @@ -1,118 +0,0 @@ -// Created on: 1994-04-26 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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. - -#ifndef _TestTopOpeTools_HeaderFile -#define _TestTopOpeTools_HeaderFile - -#include -#include -#include - -#include -class TestTopOpeTools_Mesure; - - - -//! Provide Trace control on packages involved in -//! topological operations kernel, from Draw command interpretor. -//! -//! They may be used by users of topological operation kernel, such as : -//! -//! * topological operation performer, -//! * hidden line removal performer, -//! * fillet, chamfer performer -//! -//! Trace control consists in management of -//! control functions, activating/desactivating execution of -//! instructions considered as purely PASSIVE code, -//! performing dumps, prints, and drawing of internal objects -//! dealed by some topological operation packages. -//! -//! All of the Trace controls in top.ope. kernel -//! are enclosed by the C conditional compilation statements : -//! #ifdef OCCT_DEBUG ... #endif -//! -//! The "Traced" packages of topological operation kernel are : -//! - TopBuild -//! - TopOpeBRepTool -//! - TopOpeBRepDS -//! -//! How to use the Trace : -//! ---------------------- -//! -//! In a Test.cxx program using the Draw command interpretor, dealing -//! a set of commands theCommands (Draw_CommandManager theCommands) : -//! -//! TestTopOpeTools::TraceCommands(); -//! -//! Compile your Test.cxx, run and then, under the command manager prompt : -//! -//! Trace : prints the list of the Trace flags available on top.ope. kernel -//! Trace : activates Trace code of -//! Trace <1 | 0> : activates/desactivates Trace code of -//! Trace <1 | 0> : activates/desactivates all Trace code of top.ope. kernel -//! -//! How to add Traces : -//! ------------------- -//! -//! It it possible to add your own "Traced" portions of code in your code. -//! In your test program, simply add : -//! -//! #include -//! -//! and see the file TestTopOpeTools_Trace.hxx for explanations. -class TestTopOpeTools -{ -public: - - DEFINE_STANDARD_ALLOC - - - //! Defines all topological operation test commands - Standard_EXPORT static void AllCommands (Draw_Interpretor& I); - - //! Defines the dump commands on - //! topological operation packages. - Standard_EXPORT static void TraceCommands (Draw_Interpretor& I); - - //! Defines auxiliary commands - Standard_EXPORT static void OtherCommands (Draw_Interpretor& I); - - - - -protected: - - - - - -private: - - - - -friend class TestTopOpeTools_Mesure; - -}; - - - - - - - -#endif // _TestTopOpeTools_HeaderFile diff --git a/src/TestTopOpeTools/TestTopOpeTools_Array1OfMesure.hxx b/src/TestTopOpeTools/TestTopOpeTools_Array1OfMesure.hxx deleted file mode 100644 index 6b17e5624f..0000000000 --- a/src/TestTopOpeTools/TestTopOpeTools_Array1OfMesure.hxx +++ /dev/null @@ -1,26 +0,0 @@ -// Created on: 1994-04-26 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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. - -#ifndef TestTopOpeTools_Array1OfMesure_HeaderFile -#define TestTopOpeTools_Array1OfMesure_HeaderFile - -#include -#include - -typedef NCollection_Array1 TestTopOpeTools_Array1OfMesure; - - -#endif diff --git a/src/TestTopOpeTools/TestTopOpeTools_HArray1OfMesure.hxx b/src/TestTopOpeTools/TestTopOpeTools_HArray1OfMesure.hxx deleted file mode 100644 index e67eeea2c9..0000000000 --- a/src/TestTopOpeTools/TestTopOpeTools_HArray1OfMesure.hxx +++ /dev/null @@ -1,27 +0,0 @@ -// Created on: 1994-04-26 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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. - -#ifndef TestTopOpeTools_HArray1OfMesure_HeaderFile -#define TestTopOpeTools_HArray1OfMesure_HeaderFile - -#include -#include -#include - -DEFINE_HARRAY1(TestTopOpeTools_HArray1OfMesure, TestTopOpeTools_Array1OfMesure) - - -#endif diff --git a/src/TestTopOpeTools/TestTopOpeTools_Mesure.cxx b/src/TestTopOpeTools/TestTopOpeTools_Mesure.cxx deleted file mode 100644 index f9f3d15ee5..0000000000 --- a/src/TestTopOpeTools/TestTopOpeTools_Mesure.cxx +++ /dev/null @@ -1,137 +0,0 @@ -// Created on: 1997-03-17 -// Created by: Prestataire Mary FABIEN -// Copyright (c) 1997-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. - - -#include -#include -#include -#include -#include -#include -#include -#include - -//======================================================================= -//function : TestTopOpeTools_Mesure -//purpose : -//======================================================================= -TestTopOpeTools_Mesure::TestTopOpeTools_Mesure() -:myPnts(new TColgp_HArray1OfPnt(1,100)),myNPnts(0){} - -//======================================================================= -//function : TestTopOpeTools_Mesure -//purpose : -//======================================================================= - -TestTopOpeTools_Mesure::TestTopOpeTools_Mesure -(const TCollection_AsciiString& Name) -: myName(Name),myPnts(new TColgp_HArray1OfPnt(1,100)),myNPnts(0) -{ - myNPnts = 1; - myPnts->SetValue(myNPnts,gp_Pnt(0.,0.,0.)); -} - -//======================================================================= -//function : TestTopOpeTools_Mesure -//purpose : -//======================================================================= - -TestTopOpeTools_Mesure::TestTopOpeTools_Mesure -(const Handle(TColgp_HArray1OfPnt)& P) -: myName(""),myPnts(new TColgp_HArray1OfPnt(1,100)),myNPnts(0) -{ - myPnts = P; - myNPnts = myPnts->Length(); -} - -//======================================================================= -//function : Add -//purpose : -//======================================================================= - -void TestTopOpeTools_Mesure::Add(const Standard_Integer n, - const Standard_Real t) -{ - if (myPnts.IsNull()) return; - if (myNPnts+1 > myPnts->Upper()) { - Handle(TColgp_HArray1OfPnt) Ploc = new TColgp_HArray1OfPnt(1,10*myNPnts); - for(Standard_Integer i = 1;i <= myNPnts;i++) - Ploc->SetValue(i,myPnts->Value(i)); - myPnts->ChangeArray1() = Ploc->Array1(); - } - myNPnts++; - myPnts->SetValue(myNPnts,gp_Pnt((Standard_Real)n,t,0.)); -} - -//======================================================================= -//function : Name -//purpose : -//======================================================================= - -const TCollection_AsciiString& TestTopOpeTools_Mesure::Name() const -{ - return myName; -} - -//======================================================================= -//function : Name -//purpose : -//======================================================================= - -void TestTopOpeTools_Mesure::SetName(const TCollection_AsciiString& Name) -{ - myName = Name; -} - -//======================================================================= -//function : Pnts -//purpose : -//======================================================================= - -const TColgp_Array1OfPnt& TestTopOpeTools_Mesure::Pnts() const -{ - return myPnts->Array1(); -} - -//======================================================================= -//function : Pnt -//purpose : -//======================================================================= - -const gp_Pnt& TestTopOpeTools_Mesure::Pnt(const Standard_Integer I) const -{ - return myPnts->Value(I); -} - -//======================================================================= -//function : NPnts -//purpose : -//======================================================================= - -Standard_Integer TestTopOpeTools_Mesure::NPnts() const -{ - return myNPnts; -} - -//======================================================================= -//function : Clear -//purpose : -//======================================================================= - -void TestTopOpeTools_Mesure::Clear() -{ - myNPnts = 0; -} diff --git a/src/TestTopOpeTools/TestTopOpeTools_Mesure.hxx b/src/TestTopOpeTools/TestTopOpeTools_Mesure.hxx deleted file mode 100644 index a9dd8bb3f0..0000000000 --- a/src/TestTopOpeTools/TestTopOpeTools_Mesure.hxx +++ /dev/null @@ -1,87 +0,0 @@ -// Created on: 1997-03-19 -// Created by: Prestataire Mary FABIEN -// Copyright (c) 1997-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. - -#ifndef _TestTopOpeTools_Mesure_HeaderFile -#define _TestTopOpeTools_Mesure_HeaderFile - -#include -#include -#include - -#include -#include -#include -#include -#include -class TCollection_AsciiString; -class gp_Pnt; - - - -class TestTopOpeTools_Mesure -{ -public: - - DEFINE_STANDARD_ALLOC - - - Standard_EXPORT TestTopOpeTools_Mesure(); - - Standard_EXPORT TestTopOpeTools_Mesure(const TCollection_AsciiString& name); - - Standard_EXPORT TestTopOpeTools_Mesure(const Handle(TColgp_HArray1OfPnt)& Pnts); - - Standard_EXPORT void Add (const Standard_Integer n, const Standard_Real t); - - Standard_EXPORT void SetName (const TCollection_AsciiString& Name); - - Standard_EXPORT const TCollection_AsciiString& Name() const; - - Standard_EXPORT const TColgp_Array1OfPnt& Pnts() const; - - Standard_EXPORT const gp_Pnt& Pnt (const Standard_Integer I) const; - - Standard_EXPORT Standard_Integer NPnts() const; - - Standard_EXPORT void Clear(); - - - - -protected: - - - - - -private: - - - - TCollection_AsciiString myName; - Handle(TColgp_HArray1OfPnt) myPnts; - Standard_Integer myNPnts; - - -}; - - - - - - - -#endif // _TestTopOpeTools_Mesure_HeaderFile diff --git a/src/TestTopOpeTools/TestTopOpeTools_OtherCommands.cxx b/src/TestTopOpeTools/TestTopOpeTools_OtherCommands.cxx deleted file mode 100644 index 7e4f68b704..0000000000 --- a/src/TestTopOpeTools/TestTopOpeTools_OtherCommands.cxx +++ /dev/null @@ -1,26 +0,0 @@ -// Created on: 1996-02-02 -// Created by: Jean Yves LEBEY -// Copyright (c) 1996-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. - -#include - -//======================================================================= -//function : OtherCommands -//purpose : -//======================================================================= - -void TestTopOpeTools::OtherCommands(Draw_Interpretor&) -{ -} diff --git a/src/TestTopOpeTools/TestTopOpeTools_PMesure.hxx b/src/TestTopOpeTools/TestTopOpeTools_PMesure.hxx deleted file mode 100644 index 86992ad065..0000000000 --- a/src/TestTopOpeTools/TestTopOpeTools_PMesure.hxx +++ /dev/null @@ -1,23 +0,0 @@ -// Created on: 1994-04-26 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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. - -#ifndef _TestTopOpeTools_PMesure_HeaderFile -#define _TestTopOpeTools_PMesure_HeaderFile - -class TestTopOpeTools_Mesure; -typedef TestTopOpeTools_Mesure* TestTopOpeTools_PMesure; - -#endif // _TestTopOpeTools_PMesure_HeaderFile diff --git a/src/TestTopOpeTools/TestTopOpeTools_Trace.cxx b/src/TestTopOpeTools/TestTopOpeTools_Trace.cxx deleted file mode 100644 index c76601be05..0000000000 --- a/src/TestTopOpeTools/TestTopOpeTools_Trace.cxx +++ /dev/null @@ -1,183 +0,0 @@ -// Created on: 1994-08-01 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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. - -#include - -TestTopOpeTools_Trace::TestTopOpeTools_Trace -(const Standard_Integer nbmaxentry, - const TCollection_AsciiString& genre) : - mygenre(genre), - myfirstentry(1),mynbmaxentry(nbmaxentry),mynbentries(0), - myflag(myfirstentry,mynbmaxentry), - myftyp(myfirstentry,mynbmaxentry), - myverbose(Standard_False), - myfverbose(myfirstentry,mynbmaxentry) -{} - -TestTopOpeTools_Trace::TestTopOpeTools_Trace -(const Standard_Integer nbmaxentry) : -mygenre("flag"), -myfirstentry(1),mynbmaxentry(nbmaxentry),mynbentries(0), -myflag(myfirstentry,mynbmaxentry), -myftyp(myfirstentry,mynbmaxentry), -myverbose(Standard_False), -myfverbose(myfirstentry,mynbmaxentry) -{} - -Standard_Integer TestTopOpeTools_Trace::Add -(const t_flag flag,tf_value func) -{ return Add(flag,(tf_value)func,te_value); } - -Standard_Integer TestTopOpeTools_Trace::SetVerbose -(const Standard_Boolean b) -{ myverbose = b; return 0;} - -Standard_Integer TestTopOpeTools_Trace::SetVerbose -(const t_flag flag,const Standard_Boolean b) -{ - Standard_Integer index = 0; - if ( !Exist(flag,index) ) return 1; - if (b) cout<<"set "<= mynbmaxentry) ) return 1; - mynbentries++; - myflag.SetValue(mynbentries,flag); - myfunc.SetValue(mynbentries,func); - myftyp.SetValue(mynbentries,(Standard_Integer)ftyp); - myfverbose.SetValue(mynbentries,Standard_False); - return 0; -} diff --git a/src/TestTopOpeTools/TestTopOpeTools_Trace.hxx b/src/TestTopOpeTools/TestTopOpeTools_Trace.hxx deleted file mode 100644 index f58bcf2e4a..0000000000 --- a/src/TestTopOpeTools/TestTopOpeTools_Trace.hxx +++ /dev/null @@ -1,135 +0,0 @@ -// Created on: 1994-08-01 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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. - -#ifndef _TestTopOpeTools_Trace_HeaderFile -#define _TestTopOpeTools_Trace_HeaderFile - -#include -#include -#include -#include -#include - -typedef Standard_Boolean t_value; -typedef TCollection_AsciiString t_flag; - -typedef void (*tf_value)(const t_value); -typedef void (*tf_intarg)(const t_value, Standard_Integer, const char**); -typedef Standard_Integer (*tf_int_intarg)(const t_value, Standard_Integer, const char**); - -typedef enum te_ftyp { te_value, te_intarg, te_int_intarg } te_ftyp; - -//--------------------------------------------------------------------------- -// -// Une fonction de trace FT est une fonction qui value un ensemble -// de variables de controle dont la valeur conditionne l execution -// d un ensemble d instructions. -// -// La classe TestTopOpeTools_Trace permet de coupler un nom, ou flag, -// a une fonction de trace, et de stocker une ensemble de tels couples. -// Un flag est une chaine de caracteres qui identifie la fonction. -// -// 1/ trace simple -// Une fonction de trace simple consiste a valuer une valeur booleenne. -// le type t_value est defini comme Standard_Boolean -// le type tf_value decrit une fonction de trace a un argument de type t_value. -// -// Creation de l objet de trace T : -// TestTopOpeTools_Trace T; -// -// Ajouter une fonction de trace FT1 de nom "toto" a l objet de trace T : -// Ajout de la fonction de trace FT2 de nom "titi" a l objet de trace T : -// -// Standard_IMPORT void FT1(const Standard_Boolean); -// Standard_IMPORT void FT2(const Standard_Boolean); -// T.Add("toto",(tf_value)FT1); -// T.Add("titi",(tf_value)FT2); -// -// Valuation a Standard_True de la variable de controle gouvernee par FT1 : -// -// T.Set("toto",Standard_True); -// -// 2/ trace generale -// Une fonction de trace generale prend 3 arguments : -// - Standard_Boolean b -// - Standard_Integer n -// - char **a -// -// le type tf_intarg represente une telle fonction de trace -// -// Ajouter une fonction de trace FT3 de nom "aaaaaa" a l objet de trace T : -// -// Standard_IMPORT void FT3(const Standard_Boolean,const Standard_Integer,const char**); -// T.Add((tf_intarg)FT3); -// -// Chargement de la fonction de trace FT3 par b,n,a : -// T.Set("aaaaaa",b,n,a); -// -// -// TestTopOpeTools.hxx definit l objet theTrace (classe TestTopOpeTools_Trace) -// -//---------------------------------------------------------------------------- - -class TestTopOpeTools_Trace { - -public: - - TestTopOpeTools_Trace(const Standard_Integer nbmaxentry, - const TCollection_AsciiString& genre); - TestTopOpeTools_Trace(const Standard_Integer nbmaxentry); - - Standard_Integer Add(const t_flag flag, tf_value func); - Standard_Integer SetVerbose(const Standard_Boolean b); - Standard_Integer SetVerbose(const t_flag flag, const Standard_Boolean b); - Standard_Integer Set(const Standard_Integer mute, - const t_flag flag, const t_value value); - - Standard_Integer Add(const t_flag flag, tf_intarg func); - Standard_Integer Add(const t_flag flag, tf_int_intarg func); - Standard_Integer Set(const Standard_Integer mute, - const t_flag flag, const t_value value, - Standard_Integer narg, const char** args); - - void Dump(); - void Reset(const t_value); - Standard_Boolean IsEmpty() { return (mynbentries == 0); } - const TCollection_AsciiString& Genre() { return mygenre; } - - Standard_Boolean Exist(const t_flag flag, Standard_Integer& index); - Standard_Boolean Exist(const tf_value func, Standard_Integer& index); - -private: - - // ==== Methods - - const t_flag Getflag(const Standard_Integer index); - tf_value Getfunc(const Standard_Integer index); - te_ftyp Getftyp(const Standard_Integer index); - Standard_Integer Add(const t_flag flag,const tf_value func,const te_ftyp ftyp); - - // ==== Fields - - TCollection_AsciiString mygenre; - Standard_Integer myfirstentry,mynbmaxentry,mynbentries; - TColStd_Array1OfAsciiString myflag; - NCollection_Vector myfunc; - TColStd_Array1OfInteger myftyp; - Standard_Boolean myverbose; - TColStd_Array1OfBoolean myfverbose; - -}; - -#endif diff --git a/src/TestTopOpeTools/TestTopOpeTools_TraceCommands.cxx b/src/TestTopOpeTools/TestTopOpeTools_TraceCommands.cxx deleted file mode 100644 index 151a193111..0000000000 --- a/src/TestTopOpeTools/TestTopOpeTools_TraceCommands.cxx +++ /dev/null @@ -1,293 +0,0 @@ -// Created on: 1994-10-24 -// Created by: Jean Yves LEBEY -// Copyright (c) 1994-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. - -#include -#include -#include -#include -#include - -#ifdef OCCT_DEBUG -TestTopOpeTools_Trace theTrace(100,"trace"); -TestTopOpeTools_Trace theContext(100,"context"); - -Standard_IMPORT void TopClass_SettraceFC(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepTool_SettraceEND(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepTool_SettraceKRO(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepTool_SetcontextNOSEW(const Standard_Boolean); -Standard_IMPORT void TopOpeBRep_SettraceFITOL(const Standard_Boolean); -Standard_IMPORT void TopOpeBRep_SettraceBIPS(const Standard_Boolean); -Standard_IMPORT void TopOpeBRep_SettraceSI(const Standard_Boolean); -Standard_IMPORT void TopOpeBRep_SettraceSIFF(const Standard_Boolean, Standard_Integer, char**); -Standard_IMPORT void TopOpeBRep_SettraceSAVFF(const Standard_Boolean); -Standard_IMPORT Standard_Integer TopOpeBRep_SettraceNVP(const Standard_Boolean, Standard_Integer, char**); -Standard_IMPORT Standard_Integer TopOpeBRep_SettraceEEFF(const Standard_Boolean, Standard_Integer, char**); -Standard_IMPORT Standard_Integer TopOpeBRep_SettraceSHA(const Standard_Boolean, Standard_Integer, char**); -Standard_IMPORT void TopOpeBRep_SetcontextREST1(const Standard_Boolean); -Standard_IMPORT void TopOpeBRep_SetcontextREST2(const Standard_Boolean); -Standard_IMPORT void TopOpeBRep_SetcontextINL(const Standard_Boolean); -Standard_IMPORT void TopOpeBRep_SetcontextNEWKP(const Standard_Boolean); -Standard_IMPORT void TopOpeBRep_SetcontextTOL0(const Standard_Boolean); -Standard_IMPORT void TopOpeBRep_SetcontextNONOG(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SettraceCHK(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SettraceCHKOK(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SettraceCHKNOK(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SettraceCU(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SettraceCUV(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SettraceSPF(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SettraceSPS(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SettraceSHEX(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SettraceSS(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SettraceAREA(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SettraceKPB(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SettracePURGE(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SettraceSAVFREGU(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SettraceSAVSREGU(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SetcontextNOSG(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SettraceFE(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SetcontextSSCONNEX(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SetcontextSF2(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SetcontextSPEON(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SetcontextNOPURGE(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SetcontextNOREGUFA(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SetcontextNOREGUSO(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SetcontextREGUXPU(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SetcontextNOCORRISO(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SetcontextNOFUFA(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SetcontextNOFE(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SetcontextEINTERNAL(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepBuild_SetcontextEEXTERNAL(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepTool_SettraceNYI(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepTool_SettraceVC(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepTool_SettracePCURV(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepTool_SettraceBOXPERSO(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepTool_SettraceBOX(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepTool_SettraceCLOV(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepTool_SettraceCHKBSPL(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepTool_SettraceREGUFA(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepTool_SettraceREGUSO(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepTool_SettraceC2D(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepTool_SettraceCORRISO(const Standard_Boolean); -Standard_IMPORT void TopOpeBRep_SettraceCONIC(const Standard_Boolean); -Standard_IMPORT void TopOpeBRep_SettracePROEDG(const Standard_Boolean); -Standard_IMPORT void TopOpeBRep_SetcontextNOPROEDG(const Standard_Boolean); -Standard_IMPORT void TopOpeBRep_SetcontextFFOR(const Standard_Boolean); -Standard_IMPORT void TopOpeBRep_SetcontextNOPUNK(const Standard_Boolean); -Standard_IMPORT void TopOpeBRep_SetcontextNOFEI(const Standard_Boolean); -Standard_IMPORT void TopOpeBRepTool_SettraceCL2DDR(const Standard_Boolean, Standard_Integer, char**); -Standard_IMPORT void TopOpeBRepTool_SettraceCL2DPR(const Standard_Boolean, Standard_Integer, char**); -Standard_IMPORT void TopOpeBRepTool_SettraceCL3DDR(const Standard_Boolean, Standard_Integer, char**); -Standard_IMPORT void TopOpeBRepTool_SettraceCL3DPR(const Standard_Boolean, Standard_Integer, char**); -#endif - -#ifdef OCCT_DEBUG -//---------------------------------------------------------------------------- -static Standard_Integer InitTraceTopOpeKernel (TestTopOpeTools_Trace& T) -//---------------------------------------------------------------------------- -{ - if (T.Add("tfc",(tf_value)TopClass_SettraceFC)) return 1; - if (T.Add("tend",(tf_value)TopOpeBRepTool_SettraceEND)) return 1; - if (T.Add("tkro",(tf_value)TopOpeBRepTool_SettraceKRO)) return 1; - if (T.Add("tfitol",(tf_value)TopOpeBRep_SettraceFITOL)) return 1; - if (T.Add("tbips",(tf_value)TopOpeBRep_SettraceBIPS)) return 1; - if (T.Add("tsi",(tf_value)TopOpeBRep_SettraceSI)) return 1; - if (T.Add("tsiff",(tf_intarg)TopOpeBRep_SettraceSIFF)) return 1; // tsiff 0|[1 s1 s2 name] - if (T.Add("tsavff",(tf_value)TopOpeBRep_SettraceSAVFF)) return 1; - if (T.Add("tnvp",(tf_int_intarg)TopOpeBRep_SettraceNVP)) return 1; // tnvp 0|1 if1 if2 ili ivp isi - if (T.Add("teeff",(tf_int_intarg)TopOpeBRep_SettraceEEFF)) return 1; // teeff 0|1 ie1 ie2 if1 if2 - if (T.Add("tsha",(tf_int_intarg)TopOpeBRep_SettraceSHA)) return 1; // tsha 0|1 isha - if (T.Add("tchk",(tf_value)TopOpeBRepBuild_SettraceCHK)) return 1; - if (T.Add("tok",(tf_value)TopOpeBRepBuild_SettraceCHKOK)) return 1; - if (T.Add("tnok",(tf_value)TopOpeBRepBuild_SettraceCHKNOK)) return 1; - if (T.Add("tcu",(tf_value)TopOpeBRepBuild_SettraceCU)) return 1; - if (T.Add("tcuv",(tf_value)TopOpeBRepBuild_SettraceCUV)) return 1; - if (T.Add("tspf",(tf_value)TopOpeBRepBuild_SettraceSPF)) return 1; // splitface - if (T.Add("tsps",(tf_value)TopOpeBRepBuild_SettraceSPS)) return 1; // splitsolid - if (T.Add("tshex",(tf_value)TopOpeBRepBuild_SettraceSHEX)) return 1; - if (T.Add("tss",(tf_value)TopOpeBRepBuild_SettraceSS)) return 1; - if (T.Add("tarea",(tf_value)TopOpeBRepBuild_SettraceAREA)) return 1; - if (T.Add("tkpb",(tf_value)TopOpeBRepBuild_SettraceKPB)) return 1; - if (T.Add("tpurge",(tf_value)TopOpeBRepBuild_SettracePURGE)) return 1; - if (T.Add("tsavfregu",(tf_value)TopOpeBRepBuild_SettraceSAVFREGU)) return 1; - if (T.Add("tsavsregu",(tf_value)TopOpeBRepBuild_SettraceSAVSREGU)) return 1; - if (T.Add("tfe",(tf_value)TopOpeBRepBuild_SettraceFE)) return 1; - if (T.Add("tnyi",(tf_value)TopOpeBRepTool_SettraceNYI)) return 1; - if (T.Add("tvc",(tf_value)TopOpeBRepTool_SettraceVC)) return 1; - if (T.Add("tpcurv",(tf_value)TopOpeBRepTool_SettracePCURV)) return 1; - if (T.Add("tbp",(tf_value)TopOpeBRepTool_SettraceBOXPERSO)) return 1; - if (T.Add("tbox",(tf_value)TopOpeBRepTool_SettraceBOX)) return 1; - if (T.Add("tclov",(tf_value)TopOpeBRepTool_SettraceCLOV)) return 1; - if (T.Add("tchkbspl",(tf_value)TopOpeBRepTool_SettraceCHKBSPL)) return 1; - if (T.Add("tregufa",(tf_value)TopOpeBRepTool_SettraceREGUFA)) return 1; - if (T.Add("treguso",(tf_value)TopOpeBRepTool_SettraceREGUSO)) return 1; - if (T.Add("tc2d",(tf_value)TopOpeBRepTool_SettraceC2D)) return 1; - if (T.Add("tcorriso",(tf_value)TopOpeBRepTool_SettraceCORRISO)) return 1; - if (T.Add("tcl2ddr",(tf_intarg)TopOpeBRepTool_SettraceCL2DDR)) return 1; - if (T.Add("tcl2dpr",(tf_intarg)TopOpeBRepTool_SettraceCL2DPR)) return 1; - if (T.Add("tcl3ddr",(tf_intarg)TopOpeBRepTool_SettraceCL3DDR)) return 1; - if (T.Add("tcl3dpr",(tf_intarg)TopOpeBRepTool_SettraceCL3DPR)) return 1; - if (T.Add("tproedg",(tf_value)TopOpeBRep_SettracePROEDG)) return 1; - if (T.Add("tconic",(tf_value)TopOpeBRep_SettraceCONIC)) return 1; - return 0; -} -#endif -#ifdef OCCT_DEBUG -//---------------------------------------------------------------------------- -Standard_Integer InitContextTopOpeKernel (TestTopOpeTools_Trace& T) -//---------------------------------------------------------------------------- -{ - if (T.Add("nosew",(tf_value)TopOpeBRepTool_SetcontextNOSEW)) return 1; - if (T.Add("nosg",(tf_value)TopOpeBRepBuild_SetcontextNOSG)) return 1; - if (T.Add("ssconnex",(tf_value)TopOpeBRepBuild_SetcontextSSCONNEX)) return 1; - if (T.Add("sf2",(tf_value)TopOpeBRepBuild_SetcontextSF2)) return 1; - if (T.Add("speon",(tf_value)TopOpeBRepBuild_SetcontextSPEON)) return 1; - if (T.Add("nopurge",(tf_value)TopOpeBRepBuild_SetcontextNOPURGE)) return 1; - if (T.Add("noregufa",(tf_value)TopOpeBRepBuild_SetcontextNOREGUFA)) return 1; - if (T.Add("noreguso",(tf_value)TopOpeBRepBuild_SetcontextNOREGUSO)) return 1; - if (T.Add("reguxpu",(tf_value)TopOpeBRepBuild_SetcontextREGUXPU)) return 1; - if (T.Add("nocorriso",(tf_value)TopOpeBRepBuild_SetcontextNOCORRISO)) return 1; - if (T.Add("nofe",(tf_value)TopOpeBRepBuild_SetcontextNOFE)) return 1; - if (T.Add("nofufa",(tf_value)TopOpeBRepBuild_SetcontextNOFUFA)) return 1; - if (T.Add("einternal",(tf_value)TopOpeBRepBuild_SetcontextEINTERNAL)) return 1; - if (T.Add("eexternal",(tf_value)TopOpeBRepBuild_SetcontextEEXTERNAL)) return 1; - if (T.Add("noproedg",(tf_value)TopOpeBRep_SetcontextNOPROEDG)) return 1; - if (T.Add("rest1",(tf_value)TopOpeBRep_SetcontextREST1)) return 1; - if (T.Add("rest2",(tf_value)TopOpeBRep_SetcontextREST2)) return 1; - if (T.Add("inl",(tf_value)TopOpeBRep_SetcontextINL)) return 1; - if (T.Add("newkp",(tf_value)TopOpeBRep_SetcontextNEWKP)) return 1; - if (T.Add("tol0",(tf_value)TopOpeBRep_SetcontextTOL0)) return 1; - if (T.Add("nonog",(tf_value)TopOpeBRep_SetcontextNONOG)) return 1; - if (T.Add("ffor",(tf_value)TopOpeBRep_SetcontextFFOR)) return 1; - if (T.Add("nopunk",(tf_value)TopOpeBRep_SetcontextNOPUNK)) return 1; - if (T.Add("nofei",(tf_value)TopOpeBRep_SetcontextNOFEI)) return 1; - - return 0; -} -#else -Standard_Integer InitContextTopOpeKernel (TestTopOpeTools_Trace&) { return 0;} -#endif - -Standard_EXPORT Standard_Integer TestTopOpeTools_SetFlags -(TestTopOpeTools_Trace& theFlags, Standard_Integer mute, Standard_Integer n , const char** a) -{ - if (n == 1) { - theFlags.Dump(); - return 0; - } - if (n < 2) { - return 1; - } - const char* flag = a[1]; - t_value value; // new value of flag - if (n == 2) value = Standard_True; - else value = (Draw::Atoi(a[2]) ? Standard_True : Standard_False); - - if (mute == 0) { - if ( n == 2 ) { - if (!strcasecmp(a[1],"0")) { - theFlags.Reset(Standard_False); - cout<3)?(n-3):0,(n>3)?&a[3]:NULL); - if (res) res=theFlags.Set(mute,flag,value); - return res; -} - -//========================================================================= -// a1 = flag (for example tbs) = value, if omitted flag becomes True -//========================================================================= - - -#ifdef OCCT_DEBUG -Standard_Integer TestTopOpeTools_SetTrace(Draw_Interpretor&, Standard_Integer n ,const char** a) -#else -Standard_Integer TestTopOpeTools_SetTrace(Draw_Interpretor&, Standard_Integer,const char**) -#endif -{ - Standard_Integer ok = Standard_True; -#ifdef OCCT_DEBUG - InitTraceTopOpeKernel(theTrace); - Standard_Integer mute = 0; if (!strcasecmp(a[0],"trcmute")) mute = 1; - ok = TestTopOpeTools_SetFlags(theTrace,mute,n,a); -#endif - return ok; -} - -//========================================================================= -// a1 = flag (for example tbs) = value, if omitted flag becomes True -//========================================================================= - -#ifdef OCCT_DEBUG -Standard_Integer TestTopOpeTools_SetContext(Draw_Interpretor&, Standard_Integer n ,const char** a) -{ - Standard_Integer ok = Standard_True; - InitContextTopOpeKernel(theContext); - Standard_Integer mute = 0; if (!strcasecmp(a[0],"ctxmute")) mute = 1; - ok = TestTopOpeTools_SetFlags(theContext,mute,n,a); - return ok; -} -#else -Standard_Integer TestTopOpeTools_SetContext(Draw_Interpretor&, Standard_Integer,const char**) -{ return Standard_True;} -#endif - -Standard_Integer dstrace(Draw_Interpretor& di, Standard_Integer n , const char** a) { - const char ** pa = NULL; TCollection_AsciiString a1; - if (!strcasecmp(a[0],"tsx")) a1 = "tspsx"; - else if (!strcasecmp(a[0],"tcx")) a1 = "tcx"; - else return 0; - TCollection_AsciiString a0("trc"); - Standard_Integer npa = n+1;pa = (const char**) malloc((size_t)((npa)*sizeof(char*))); - pa[0] = (char *)a0.ToCString(); - pa[1] = (char *)a1.ToCString(); - for (Standard_Integer i=1;i ",__FILE__,TestTopOpeTools_SetTrace,g); - theCommands.Add("trcmute","Trace ",__FILE__,TestTopOpeTools_SetTrace,g); - theCommands.Add("ctx","Context ",__FILE__,TestTopOpeTools_SetContext,g); - theCommands.Add("ctxmute","Context ",__FILE__,TestTopOpeTools_SetContext,g); -} diff --git a/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx b/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx index ea29b2913e..1aee078d4c 100644 --- a/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx +++ b/src/TopOpeBRep/TopOpeBRep_EdgesIntersector.cxx @@ -15,11 +15,23 @@ // commercial license or contractual agreement. #ifdef DRAW -#include -#include +static void CurveToString(const GeomAbs_CurveType t, TCollection_AsciiString& N) +{ + switch(t) { + case GeomAbs_Line : N = "LINE"; break; + case GeomAbs_Circle : N = "CIRCLE"; break; + case GeomAbs_Ellipse : N = "ELLIPSE"; break; + case GeomAbs_Hyperbola : N = "HYPERBOLA"; break; + case GeomAbs_Parabola : N = "PARABOLA"; break; + case GeomAbs_BezierCurve : N = "BEZIER"; break; + case GeomAbs_BSplineCurve : N = "BSPLINE"; break; + case GeomAbs_OffsetCurve : N = "OFFSET"; break; + case GeomAbs_OtherCurve : N = "OTHER"; break; + default : N = "UNKNOWN"; break; + } +} #endif - #include #include #include @@ -454,8 +466,8 @@ Standard_Boolean EdgesIntersector_checkT1D(const TopoDS_Edge& E1,const TopoDS_Ed #ifdef DRAW GeomAbs_CurveType t1 = myCurve1.GetType(); GeomAbs_CurveType t2 = myCurve2.GetType(); - TCollection_AsciiString s1;TestTopOpeDraw_TTOT::CurveToString(t1,s1);cout<<" "< -#include static TCollection_AsciiString PRODINS("dins "); #endif diff --git a/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cxx b/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cxx index b69bb4a766..24de5e50fa 100644 --- a/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cxx +++ b/src/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cxx @@ -16,8 +16,18 @@ #ifdef DRAW #include -#include static TCollection_AsciiString PRODINS("dins "); + +static void OrientationToString(const TopAbs_Orientation o, TCollection_AsciiString& N) +{ + switch (o) { + case TopAbs_FORWARD : N = "FORWARD" ; break; + case TopAbs_REVERSED : N = "REVERSED"; break; + case TopAbs_INTERNAL : N = "INTERNAL"; break; + case TopAbs_EXTERNAL : N = "EXTERNAL"; break; + } +} + #endif @@ -576,10 +586,10 @@ TCollection_AsciiString TopOpeBRepBuild_WireEdgeSet::SNameVEE(const TopoDS_Shape TopAbs_Orientation oVE1,oVE2; Standard_Boolean conn = VertexConnectsEdges(V,E1,E2,oVE1,oVE2); str=SName(VV)+" "; str=str+SNameori(E1)+" V/E1 : "; - TCollection_AsciiString so1;TestTopOpeDraw_TTOT::OrientationToString(oVE1,so1);so1.UpperCase(); + TCollection_AsciiString so1;OrientationToString(oVE1,so1);so1.UpperCase(); str=str+so1.SubString(1,1)+" "; str=str+SNameori(E2)+" V/E2 : "; - TCollection_AsciiString so2;TestTopOpeDraw_TTOT::OrientationToString(oVE2,so2);so2.UpperCase(); + TCollection_AsciiString so2;OrientationToString(oVE2,so2);so2.UpperCase(); str=str+so2.SubString(1,1)+" "; return str; } diff --git a/tests/bugs/modalg_6/bug26565_8 b/tests/bugs/modalg_6/bug26565_8 index efe49fd9e8..31b63114cf 100755 --- a/tests/bugs/modalg_6/bug26565_8 +++ b/tests/bugs/modalg_6/bug26565_8 @@ -8,7 +8,10 @@ puts "" box b 10 10 10 explode b f -mkshe profile b_1 b_3 + +shape profile Sh +add b_1 profile +add b_3 profile polyline spine 0 0 0 10 10 0 @@ -17,7 +20,11 @@ pipe sh spine profile whatis sh plane pl 10 10 0 -1 -1 0 1 0 0 mkface f pl -mksol sl f + +shape sl So +shape sl_sh Sh +add f sl_sh +add sl_sh sl bcut res sh sl diff --git a/tests/bugs/moddata_1/bug22489_2 b/tests/bugs/moddata_1/bug22489_2 index bd36e8cb2a..c805a6e53a 100755 --- a/tests/bugs/moddata_1/bug22489_2 +++ b/tests/bugs/moddata_1/bug22489_2 @@ -10,7 +10,8 @@ set BugNumber OCC22489 restore [locate_data_file bug22489_sew1.brep] s -mksol b s +shape b So +add s b point p 1000 1000 1000 diff --git a/tests/bugs/moddata_3/bug24138 b/tests/bugs/moddata_3/bug24138 index 396d939067..18c0506e45 100755 --- a/tests/bugs/moddata_3/bug24138 +++ b/tests/bugs/moddata_3/bug24138 @@ -16,7 +16,9 @@ copy s_1 f point p 0.753071156928785 4.98580193823337 0 set proj_fp [projponf f p -t] -regexp {proj dist = ([-0-9.+eE]+) uvproj = \(([-0-9.+eE]+) ([-0-9.+eE]+)\); pproj = \(([-0-9.+eE]+) ([-0-9.+eE]+) ([-0-9.+eE]+)\)} ${proj_fp} full dist uproj vproj proj1 proj2 +regexp {proj dist = ([-0-9.+eE]+)} ${proj_fp} full dist +regexp {uvproj = ([-0-9.+eE]+) ([-0-9.+eE]+)} ${proj_fp} full uproj vproj +regexp {pproj = ([-0-9.+eE]+) ([-0-9.+eE]+) ([-0-9.+eE]+)} ${proj_fp} full proj1 proj2 puts "dist=${dist}" puts "uproj=${uproj}" diff --git a/tests/bugs/moddata_3/bug25223 b/tests/bugs/moddata_3/bug25223 index 49f92cc937..3deb7a2552 100644 --- a/tests/bugs/moddata_3/bug25223 +++ b/tests/bugs/moddata_3/bug25223 @@ -34,7 +34,9 @@ mkface f s set proj_fp [projponf f p1] #proj dist = 9.8455689542838467e-014 -regexp {proj dist = ([-0-9.+eE]+) uvproj = \(([-0-9.+eE]+) ([-0-9.+eE]+)\); pproj = \(([-0-9.+eE]+) ([-0-9.+eE]+) ([-0-9.+eE]+)\)} ${proj_fp} full dist uproj vproj proj1 proj2 +regexp {proj dist = ([-0-9.+eE]+)} ${proj_fp} full dist +regexp {uvproj = ([-0-9.+eE]+) ([-0-9.+eE]+)} ${proj_fp} full uproj vproj +regexp {pproj = ([-0-9.+eE]+) ([-0-9.+eE]+) ([-0-9.+eE]+)} ${proj_fp} full proj1 proj2 puts "dist=${dist}" puts "uproj=${uproj}"