OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0031990: Coding, Draw Harness - Replace C-like pointers to function in Draw_SaveAndRestore class to virtual function

Browse Source 
Save/Restore interface has been moved to Draw_Drawable3D base class.
Create a singleton Draw_Params class for DRAW parameters
This commit is contained in:
asuraven 2020-11-03 17:22:14 +03:00 committed by bugmaster
parent 930b466c9b
commit a13df0fee0
60 changed files with 2665 additions and 4185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

558
src/DBRep/DBRep.cxx
View File

@ -14,7 +14,8 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <BinTools_ShapeSet.hxx> #include <DBRep.hxx>
#include <BRep_TEdge.hxx> #include <BRep_TEdge.hxx>
#include <BRepAdaptor_Surface.hxx> #include <BRepAdaptor_Surface.hxx>
#include <BRepGProp.hxx> #include <BRepGProp.hxx>
@ -22,7 +23,6 @@
#include <BRepTools_ShapeSet.hxx> #include <BRepTools_ShapeSet.hxx>
#include <BRepTools_WireExplorer.hxx> #include <BRepTools_WireExplorer.hxx>
#include <BinTools.hxx> #include <BinTools.hxx>
#include <DBRep.hxx>
#include <DBRep_DrawableShape.hxx> #include <DBRep_DrawableShape.hxx>
#include <Draw.hxx> #include <Draw.hxx>
#include <Draw_Appli.hxx> #include <Draw_Appli.hxx>
@ -34,9 +34,7 @@
#include <GProp_GProps.hxx> #include <GProp_GProps.hxx>
#include <NCollection_Vector.hxx> #include <NCollection_Vector.hxx>
#include <OSD_OpenFile.hxx> #include <OSD_OpenFile.hxx>
#include <Poly_Triangulation.hxx>
#include <Precision.hxx> #include <Precision.hxx>
#include <Standard.hxx>
#include <TColStd_Array1OfInteger.hxx> #include <TColStd_Array1OfInteger.hxx>
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
#include <TopAbs.hxx> #include <TopAbs.hxx>
@ -45,7 +43,6 @@
#include <TopoDS.hxx> #include <TopoDS.hxx>
#include <TopoDS_Compound.hxx> #include <TopoDS_Compound.hxx>
#include <TopoDS_Iterator.hxx> #include <TopoDS_Iterator.hxx>
#include <TopoDS_Shape.hxx>
#include <TopTools_Array1OfShape.hxx> #include <TopTools_Array1OfShape.hxx>
#include <TopTools_ListOfShape.hxx> #include <TopTools_ListOfShape.hxx>
#include <TopTools_MapOfShape.hxx> #include <TopTools_MapOfShape.hxx>
@ -97,62 +94,64 @@ Standard_EXPORT Draw_Color DBRep_ColorOrientation (const TopAbs_Orientation Or)
return col; return col;
} }
//========================================== //=======================================================================
// static variables //function : Parameters
//========================================== //purpose :
//=======================================================================
static Standard_Integer nbIsos = 2; DBRep_Params& DBRep::Parameters()
static Standard_Real size = 100.; {
static Standard_Integer discret = 30; static DBRep_Params aParams;
static Standard_Boolean disptriangles = Standard_False; return aParams;
static Standard_Boolean disppolygons = Standard_False; }
static Standard_Real anglHLR = 35 * M_PI / 180;
static Standard_Real HAngMin = 1 * M_PI / 180;
static Standard_Real HAngMax = 35 * M_PI / 180;
static Standard_Boolean withHLR = Standard_False;
static Standard_Boolean withRg1 = Standard_True;
static Standard_Boolean withRgN = Standard_False;
static Standard_Boolean withHid = Standard_False;
//======================================================================= //=======================================================================
// isos // isos
//======================================================================= //=======================================================================
static Standard_Integer isos (Draw_Interpretor& di, static Standard_Integer isos(Draw_Interpretor& di, Standard_Integer NbArg, const char **Arg)
Standard_Integer NbArg, const char **Arg)
{ {
DBRep_Params& aParams = DBRep::Parameters();
NbArg-- ; NbArg-- ;
if (NbArg <= 0)
if (NbArg <= 0) { {
di << "Current number of isos : " << nbIsos << "\n" ; di << "Current number of isos : " << aParams.NbIsos << "\n" ;
return 0 ; return 0 ;
} }
Standard_Integer NbIsos = 0 ; Standard_Integer aNbIsos = 0;
Standard_Boolean Change = Standard_False ; Standard_Boolean Change = Standard_False ;
if (!Characters (NbArg) && Float (NbArg)) return 1 ; if (!Characters (NbArg) && Float (NbArg)) return 1 ;
if (!Characters (NbArg)) { if (!Characters (NbArg))
NbIsos = Draw::Atoi (Arg[NbArg]) ; {
aNbIsos = Draw::Atoi (Arg[NbArg]);
NbArg-- ; NbArg-- ;
Change = Standard_True ; Change = Standard_True ;
} }
if (NbArg <= 0) { if (NbArg <= 0)
nbIsos = NbIsos ; {
di << "New current number of isos : " << nbIsos << "\n" ; aParams.NbIsos = aNbIsos;
} else { di << "New current number of isos : " << aParams.NbIsos << "\n";
for (Standard_Integer IArg = 1 ; IArg <= NbArg ; IArg++) { }
else
{
for (Standard_Integer IArg = 1 ; IArg <= NbArg ; IArg++)
{
Handle (Draw_Drawable3D) Shape1 = Draw::Get (Arg[IArg]) ; Handle (Draw_Drawable3D) Shape1 = Draw::Get (Arg[IArg]) ;
if (!Shape1.IsNull()) { if (!Shape1.IsNull())
Handle (DBRep_DrawableShape) Shape2 = {
Handle (DBRep_DrawableShape)::DownCast (Shape1) ; Handle (DBRep_DrawableShape) Shape2 = Handle (DBRep_DrawableShape)::DownCast (Shape1);
if (!Shape2.IsNull()) { if (!Shape2.IsNull())
if (Change) { {
Shape2->ChangeNbIsos (NbIsos) ; if (Change)
} else { {
di << "Number of isos for " << Arg[IArg] << " : " << Shape2->NbIsos() << "\n"; Shape2->ChangeNbIsos (aNbIsos);
} }
} else
{
di << "Number of isos for " << Arg[IArg] << " : " << Shape2->NbIsos() << "\n";
}
}
} }
} }
if (Change) dout.RepaintAll() ; if (Change) dout.RepaintAll() ;
@ -165,23 +164,23 @@ static Standard_Integer isos (Draw_Interpretor& di,
// hlr // hlr
//======================================================================= //=======================================================================
static Standard_Integer hlr (Draw_Interpretor& di, static Standard_Integer hlr (Draw_Interpretor& di, Standard_Integer n, const char **a)
Standard_Integer n, const char **a)
{ {
if (n <= 1) { DBRep_Params& aParams = DBRep::Parameters();
if (withHLR) { if (n <= 1)
{
if (aParams.WithHLR)
{
di << " HLR"; di << " HLR";
if (withRgN) di << " RgNLines"; di << (aParams.WithRgN
else { ? " RgNLines"
if (withRg1) di << " Rg1Lines"; : (aParams.WithRg1 ? " Rg1Lines" : " no RegLines"));
else di << " no RegLines"; di << (aParams.WithHid ? " HiddenLines" : " no HiddenLines");
}
if (withHid) di << " HiddenLines";
else di << " no HiddenLines";
di << "\n"; di << "\n";
if (withHLR) { if (aParams.WithHLR)
di << "Angle of discretization : "; {
di << anglHLR * 180 / M_PI << " degrees\n"; di << "Angle of discretization : ";
di << aParams.HLRAngle * 180 / M_PI << " degrees\n";
} }
} }
else di << " wireframe"; else di << " wireframe";
@ -189,102 +188,141 @@ static Standard_Integer hlr (Draw_Interpretor& di,
return 0 ; return 0 ;
} }
if (n == 2) { if (n == 2)
if (!strcasecmp(a[1],"nohlr")) withHLR = Standard_False; {
else if (!strcasecmp(a[1],"hlr" )) withHLR = Standard_True; if (!strcasecmp(a[1], "nohlr"))
else if (!strcasecmp(a[1],"nohid")) withHid = Standard_False; {
else if (!strcasecmp(a[1],"hid" )) { aParams.WithHLR = Standard_False;
withHLR = Standard_True;
withHid = Standard_True;
} }
else if (!strcasecmp(a[1],"norg1")) { else if (!strcasecmp (a[1], "hlr"))
withRg1 = Standard_False; {
withRgN = Standard_False; aParams.WithHLR = Standard_True;
} }
else if (!strcasecmp(a[1],"rg1" )) { else if (!strcasecmp (a[1], "nohid"))
withHLR = Standard_True; {
withRg1 = Standard_True; aParams.WithHid = Standard_False;
withRgN = Standard_False;
} }
else if (!strcasecmp(a[1],"norgn")) { else if (!strcasecmp(a[1], "hid"))
withRgN = Standard_False; {
aParams.WithHLR = Standard_True;
aParams.WithHid = Standard_True;
} }
else if (!strcasecmp(a[1],"rgn" )) { else if (!strcasecmp(a[1], "norg1"))
withHLR = Standard_True; {
withRg1 = Standard_True; aParams.WithRg1 = Standard_False;
withRgN = Standard_True; aParams.WithRgN = Standard_False;
} }
else if (!strcasecmp(a[1],"ang" )) { else if (!strcasecmp (a[1], "rg1"))
{
aParams.WithHLR = Standard_True;
aParams.WithRg1 = Standard_True;
aParams.WithRgN = Standard_False;
}
else if (!strcasecmp (a[1], "norgn"))
{
aParams.WithRgN = Standard_False;
}
else if (!strcasecmp (a[1], "rgn"))
{
aParams.WithHLR = Standard_True;
aParams.WithRg1 = Standard_True;
aParams.WithRgN = Standard_True;
}
else if (!strcasecmp (a[1], "ang"))
{
di << "Angle de discretisation : "; di << "Angle de discretisation : ";
di << anglHLR * 180 / M_PI << " degres\n"; di << aParams.HLRAngle * 180 / M_PI << " degres\n";
} }
else return 1; else return 1;
} }
Standard_Integer nFirst = 2; Standard_Integer nFirst = 2;
if (n >= 3 && !strcasecmp(a[1],"ang" )) { if (n >= 3 && !strcasecmp (a[1], "ang"))
{
nFirst = 3; nFirst = 3;
if (n == 3) { if(n == 3)
{
Standard_Real ang = Draw::Atof(a[2]); Standard_Real ang = Draw::Atof(a[2]);
anglHLR = ang * M_PI / 180; aParams.HLRAngle = ang * M_PI / 180;
if (anglHLR < HAngMin) anglHLR = HAngMin; if(aParams.HLRAngle < aParams.HAngMin)
if (anglHLR > HAngMax) anglHLR = HAngMax; {
} aParams.HLRAngle = aParams.HAngMin;
di << "Angle of discretization : "; }
di << anglHLR * 180 / M_PI << " degrees\n"; if (aParams.HLRAngle > aParams.HAngMax)
} {
aParams.HLRAngle = aParams.HAngMax;
if (n >= nFirst + 1) {
for (Standard_Integer i = nFirst ; i < n; i++) {
Handle (Draw_Drawable3D) D = Draw::Get (a[i]) ;
if (!D.IsNull()) {
Handle (DBRep_DrawableShape) S =
Handle (DBRep_DrawableShape)::DownCast (D) ;
if (!S.IsNull()) {
Standard_Boolean localHLR, localRg1, localRgN, localHid;
Standard_Real localAng;
S->GetDisplayHLR(localHLR, localRg1, localRgN, localHid,
localAng);
if (!strcasecmp(a[1],"nohlr")) localHLR = Standard_False;
else if (!strcasecmp(a[1],"hlr" )) localHLR = Standard_True;
else if (!strcasecmp(a[1],"nohid")) localHid = Standard_False;
else if (!strcasecmp(a[1],"hid" )) {
localHLR = Standard_True;
localHid = Standard_True;
}
else if (!strcasecmp(a[1],"norg1")) {
localRg1 = Standard_False;
localRgN = Standard_False;
}
else if (!strcasecmp(a[1],"rg1" )) {
localHLR = Standard_True;
localRg1 = Standard_True;
localRgN = Standard_False;
}
else if (!strcasecmp(a[1],"norgn")) {
localRgN = Standard_False;
}
else if (!strcasecmp(a[1],"rgn" )) {
localHLR = Standard_True;
localRg1 = Standard_True;
localRgN = Standard_True;
}
else if (!strcasecmp(a[1],"ang" )) {
Standard_Real ang = Draw::Atof(a[2]);
localAng = ang * M_PI / 180;
}
else return 1;
S->DisplayHLR(localHLR, localRg1, localRgN, localHid,
localAng);
}
} }
} }
di << "Angle of discretization : ";
di << aParams.HLRAngle * 180 / M_PI << " degrees\n";
} }
dout.RepaintAll() ;
return 0 ; for (Standard_Integer i = nFirst; i < n; i++)
{
Handle(Draw_Drawable3D) D = Draw::Get (a[i]);
Handle(DBRep_DrawableShape) S = Handle(DBRep_DrawableShape)::DownCast (D);
if (S.IsNull())
{
continue;
}
bool localHLR = false, localRg1 = false, localRgN = false, localHid = false;
Standard_Real localAng = 0.0;
S->GetDisplayHLR(localHLR, localRg1, localRgN, localHid, localAng);
if (!strcasecmp (a[1], "nohlr"))
{
localHLR = Standard_False;
}
else if (!strcasecmp (a[1], "hlr"))
{
localHLR = Standard_True;
}
else if (!strcasecmp (a[1], "nohid"))
{
localHid = Standard_False;
}
else if (!strcasecmp (a[1], "hid"))
{
localHLR = Standard_True;
localHid = Standard_True;
}
else if (!strcasecmp (a[1], "norg1"))
{
localRg1 = Standard_False;
localRgN = Standard_False;
}
else if (!strcasecmp (a[1], "rg1"))
{
localHLR = Standard_True;
localRg1 = Standard_True;
localRgN = Standard_False;
}
else if (!strcasecmp (a[1], "norgn"))
{
localRgN = Standard_False;
}
else if (!strcasecmp (a[1], "rgn"))
{
localHLR = Standard_True;
localRg1 = Standard_True;
localRgN = Standard_True;
}
else if (!strcasecmp (a[1], "ang"))
{
Standard_Real ang = Draw::Atof (a[2]);
localAng = ang * M_PI / 180;
}
else
{
di << "Syntax error";
return 1;
}
S->DisplayHLR (localHLR, localRg1, localRgN, localHid, localAng);
}
dout.RepaintAll();
return 0;
} }
@ -292,24 +330,21 @@ static Standard_Integer hlr (Draw_Interpretor& di,
// dispor, dispcon // dispor, dispcon
//======================================================================= //=======================================================================
static Standard_Integer dispor (Draw_Interpretor& , static Standard_Integer dispor (Draw_Interpretor&, Standard_Integer n, const char** a)
Standard_Integer n, const char** a)
{ {
Standard_Boolean d = !strcasecmp(a[0],"vori"); Standard_Boolean d = !strcasecmp(a[0],"vori");
if (d) if (d)
{
DBRep_WriteColorOrientation(); DBRep_WriteColorOrientation();
}
Standard_Integer i; for (Standard_Integer i = 1; i < n; i++)
for (i = 1; i < n; i++) { {
Handle(Draw_Drawable3D) d1 = Draw::Get(a[i]); Handle(Draw_Drawable3D) d1 = Draw::Get (a[i]);
if (!d1.IsNull()) { if (Handle(DBRep_DrawableShape) d2 = Handle(DBRep_DrawableShape)::DownCast(d1))
Handle(DBRep_DrawableShape) d2 = {
Handle(DBRep_DrawableShape)::DownCast(d1); d2->DisplayOrientation (d);
if (!d2.IsNull()) {
d2->DisplayOrientation(d);
Draw::Repaint(); Draw::Repaint();
}
} }
} }
return 0; return 0;
@ -319,13 +354,16 @@ static Standard_Integer dispor (Draw_Interpretor& ,
// discretisation // discretisation
//======================================================================= //=======================================================================
static Standard_Integer discretisation(Draw_Interpretor& di, static Standard_Integer discretisation(Draw_Interpretor& di, Standard_Integer n, const char** a)
Standard_Integer n, const char** a)
{ {
DBRep_Params& aParams = DBRep::Parameters();
if (n <= 1) if (n <= 1)
di << "Current number of points : "<<discret<<"\n"; {
else { di << "Current number of points : "<< aParams.Discretization <<"\n";
discret = Draw::Atoi(a[1]); }
else
{
aParams.Discretization = Draw::Atoi(a[1]);
} }
return 0; return 0;
} }
@ -335,28 +373,25 @@ static Standard_Integer discretisation(Draw_Interpretor& di,
// triangles // triangles
//======================================================================= //=======================================================================
static Standard_Integer triangles(Draw_Interpretor& , static Standard_Integer triangles(Draw_Interpretor&, Standard_Integer n, const char** a)
Standard_Integer n, const char** a)
{ {
if (n < 1) return 1; DBRep_Params& aParams = DBRep::Parameters();
if (n < 1)
if (n == 1) { {
disptriangles = !disptriangles; return 1;
#ifdef OCCT_DEBUG
if (disptriangles) std::cout <<"Triangulations are always displayed"<<std::endl;
else std::cout <<"Triangulations are displayed only if there is no geometric representation"<<std::endl;
#endif
} }
else { if(n == 1)
Standard_Integer i; {
for (i = 1; i <= n-1; i++) { aParams.DispTriangles = !aParams.DispTriangles;
}
else
{
for (Standard_Integer i = 1; i <= n-1; i++)
{
Handle(Draw_Drawable3D) d1 = Draw::Get(a[i]); Handle(Draw_Drawable3D) d1 = Draw::Get(a[i]);
if (!d1.IsNull()) { if (Handle(DBRep_DrawableShape) d2 = Handle(DBRep_DrawableShape)::DownCast(d1))
Handle(DBRep_DrawableShape) d2 = {
Handle(DBRep_DrawableShape)::DownCast(d1); d2->DisplayTriangulation(!(d2->DisplayTriangulation()));
if (!d2.IsNull()) {
d2->DisplayTriangulation(!(d2->DisplayTriangulation()));
}
} }
} }
} }
@ -426,32 +461,28 @@ static Standard_Integer tclean(Draw_Interpretor& di,
// polygons // polygons
//======================================================================= //=======================================================================
static Standard_Integer polygons(Draw_Interpretor& , static Standard_Integer polygons(Draw_Interpretor&, Standard_Integer n, const char** a)
Standard_Integer n, const char** a)
{ {
if (n < 1) return 1; DBRep_Params& aParams = DBRep::Parameters();
if (n < 1)
if (n == 1) { {
disppolygons = !disppolygons; return 1;
#ifdef OCCT_DEBUG
if (disppolygons) std::cout <<"Polygons are always displayed"<<std::endl;
else std::cout <<"Polygons are displayed only if there is no geometric representation"<<std::endl;
#endif
} }
else { if (n == 1)
Standard_Integer i; {
for (i = 1; i <= n-1; i++) { aParams.DisplayPolygons = !aParams.DisplayPolygons;
}
else
{
for (Standard_Integer i = 1; i <= n-1; i++)
{
Handle(Draw_Drawable3D) d1 = Draw::Get(a[i]); Handle(Draw_Drawable3D) d1 = Draw::Get(a[i]);
if (!d1.IsNull()) { if (Handle(DBRep_DrawableShape) d2 = Handle(DBRep_DrawableShape)::DownCast(d1))
Handle(DBRep_DrawableShape) d2 = {
Handle(DBRep_DrawableShape)::DownCast(d1); d2->DisplayPolygons(!(d2->DisplayPolygons()));
if (!d2.IsNull()) {
d2->DisplayPolygons(!(d2->DisplayPolygons()));
}
} }
} }
} }
Draw::Repaint(); Draw::Repaint();
return 0; return 0;
} }
@ -1306,21 +1337,16 @@ static Standard_Integer normals (Draw_Interpretor& theDI,
//function : Set //function : Set
//purpose : //purpose :
//======================================================================= //=======================================================================
void DBRep::Set(const Standard_CString Name, const TopoDS_Shape& S) void DBRep::Set (const Standard_CString theName, const TopoDS_Shape& theShape)
{ {
Handle(DBRep_DrawableShape) D = DBRep_Params& aParams = DBRep::Parameters();
new DBRep_DrawableShape(S, Handle(DBRep_DrawableShape) aDrawShape =
Draw_vert, new DBRep_DrawableShape (theShape, Draw_vert, Draw_jaune, Draw_rouge, Draw_bleu,
Draw_jaune, aParams.Size, aParams.NbIsos, aParams.Discretization);
Draw_rouge, aDrawShape->DisplayTriangulation (aParams.DispTriangles);
Draw_bleu, aDrawShape->DisplayPolygons (aParams.DisplayPolygons);
size, aDrawShape->DisplayHLR (aParams.WithHLR, aParams.WithRg1, aParams.WithRgN, aParams.WithHid, aParams.HLRAngle);
nbIsos, Draw::Set (theName, aDrawShape);
discret);
D->DisplayTriangulation(disptriangles);
D->DisplayPolygons(disppolygons);
D->DisplayHLR(withHLR,withRg1,withRgN,withHid,anglHLR);
Draw::Set(Name,D);
} }
//======================================================================= //=======================================================================
//function : getShape //function : getShape
@ -1645,6 +1671,9 @@ void DBRep::BasicCommands(Draw_Interpretor& theCommands)
done = Standard_True; done = Standard_True;
Draw::Commands(theCommands); Draw::Commands(theCommands);
// Register save/restore tools
DBRep_DrawableShape::RegisterFactory();
const char* g = "Basic shape commands"; const char* g = "Basic shape commands";
theCommands.Add("isos","isos [name1 ...] [nbisos]",__FILE__,isos,g); theCommands.Add("isos","isos [name1 ...] [nbisos]",__FILE__,isos,g);
@ -1724,120 +1753,3 @@ void DBRep::BasicCommands(Draw_Interpretor& theCommands)
"removes all internal sub-shapes\n", "removes all internal sub-shapes\n",
__FILE__, removeInternals, g); __FILE__, removeInternals, g);
} }
//=======================================================================
//function : HLRMode
//purpose :
//=======================================================================
Standard_Boolean DBRep::HLRMode()
{ return withHLR; }
//=======================================================================
//function : Rg1Mode
//purpose :
//=======================================================================
Standard_Boolean DBRep::Rg1Mode()
{ return withRg1; }
//=======================================================================
//function : RgNMode
//purpose :
//=======================================================================
Standard_Boolean DBRep::RgNMode()
{ return withRgN; }
//=======================================================================
//function : HidMode
//purpose :
//=======================================================================
Standard_Boolean DBRep::HidMode()
{ return withHid; }
//=======================================================================
//function : HLRAngle
//purpose :
//=======================================================================
Standard_Real DBRep::HLRAngle()
{ return anglHLR; }
//=======================================================================
//function :
//purpose : save and restore shapes
//=======================================================================
static Standard_Boolean stest(const Handle(Draw_Drawable3D)& d)
{
return d->IsInstance(STANDARD_TYPE(DBRep_DrawableShape));
}
static void ssave(const Handle(Draw_Drawable3D)&d, std::ostream& OS)
{
Handle(DBRep_DrawableShape)
N = Handle(DBRep_DrawableShape)::DownCast(d);
BRep_Builder B;
BRepTools_ShapeSet S(B);
S.Add (N->Shape());
Handle(Draw_ProgressIndicator) aProgress = Draw::GetProgressBar();
S.Write(OS, Message_ProgressIndicator::Start(aProgress));
if (! aProgress.IsNull() && aProgress->UserBreak())
return;
S.Write(N->Shape(),OS);
}
static Handle(Draw_Drawable3D) srestore (std::istream& IS)
{
BRep_Builder B;
BRepTools_ShapeSet S(B);
Handle(Draw_ProgressIndicator) aProgress = Draw::GetProgressBar();
S.Read(IS, Message_ProgressIndicator::Start(aProgress));
Handle(DBRep_DrawableShape) N;
if (! aProgress.IsNull() && aProgress->UserBreak())
return N;
TopoDS_Shape theShape;
S.Read(theShape,IS );
N = new DBRep_DrawableShape(theShape,
Draw_vert,
Draw_jaune,
Draw_rouge,
Draw_bleu,
size,
nbIsos,
discret);
N->DisplayTriangulation(disptriangles);
N->DisplayPolygons(disppolygons);
N->DisplayHLR(withHLR,withRg1,withRgN,withHid,anglHLR);
return N;
}
static Draw_SaveAndRestore ssr("DBRep_DrawableShape",
stest,ssave,srestore);
void dumps (const TopoDS_Shape& S)
{
BRepTools::Dump(S,std::cout);
}
//=======================================================================
//function : NbIsos
//purpose :
//=======================================================================
Standard_Integer DBRep::NbIsos()
{ return nbIsos; }
//=======================================================================
//function : Discretisation
//purpose :
//=======================================================================
Standard_Integer DBRep::Discretisation()
{ return discret; }

37
src/DBRep/DBRep.hxx
View File

@ -17,9 +17,9 @@
#ifndef _DBRep_HeaderFile #ifndef _DBRep_HeaderFile
#define _DBRep_HeaderFile #define _DBRep_HeaderFile
#include <DBRep_Params.hxx>
#include <Draw_Interpretor.hxx> #include <Draw_Interpretor.hxx>
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <TopoDS_Shape.hxx> #include <TopoDS_Shape.hxx>
//! Used to display BRep objects using the DrawTrSurf //! Used to display BRep objects using the DrawTrSurf
@ -83,29 +83,30 @@ public:
//! Defines the basic commands. //! Defines the basic commands.
Standard_EXPORT static void BasicCommands (Draw_Interpretor& theCommands); Standard_EXPORT static void BasicCommands (Draw_Interpretor& theCommands);
//! Return global parameters.
Standard_EXPORT static DBRep_Params& Parameters();
//! True if HLR, False if wireframe. //! True if HLR, False if wireframe.
Standard_EXPORT static Standard_Boolean HLRMode(); static Standard_Boolean HLRMode() { return Parameters().WithHLR; }
//! True if display Rg1Lines. //! True if display Rg1Lines.
Standard_EXPORT static Standard_Boolean Rg1Mode(); static Standard_Boolean Rg1Mode() { return Parameters().WithRg1; }
//! True if display RgNLines. //! True if display RgNLines.
Standard_EXPORT static Standard_Boolean RgNMode(); static Standard_Boolean RgNMode() { return Parameters().WithRgN; }
//! True if display HiddenLines. //! True if display HiddenLines.
Standard_EXPORT static Standard_Boolean HidMode(); static Standard_Boolean HidMode() { return Parameters().WithHid; }
//! discretisation angle for edges. //! discretisation angle for edges.
Standard_EXPORT static Standard_Real HLRAngle(); static Standard_Real HLRAngle() { return Parameters().HLRAngle; }
//! number of iso in U and V //! number of iso in U and V
Standard_EXPORT static Standard_Integer NbIsos(); static Standard_Integer NbIsos() { return Parameters().NbIsos; }
//! discretisation number of points for curves //! Discretization number of points for curves
//! set progress indicator static Standard_Integer Discretisation() { return Parameters().Discretization; }
//! get progress indicator
Standard_EXPORT static Standard_Integer Discretisation();
protected: protected:

61
src/DBRep/DBRep_DrawableShape.cxx
View File

@ -14,6 +14,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <DBRep_DrawableShape.hxx>
#include <Adaptor3d_Curve.hxx> #include <Adaptor3d_Curve.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
@ -21,7 +22,8 @@
#include <BRepAdaptor_Surface.hxx> #include <BRepAdaptor_Surface.hxx>
#include <BRepMesh_IncrementalMesh.hxx> #include <BRepMesh_IncrementalMesh.hxx>
#include <BRepTools.hxx> #include <BRepTools.hxx>
#include <DBRep_DrawableShape.hxx> #include <BRepTools_ShapeSet.hxx>
#include <DBRep.hxx>
#include <DBRep_Edge.hxx> #include <DBRep_Edge.hxx>
#include <DBRep_Face.hxx> #include <DBRep_Face.hxx>
#include <DBRep_HideData.hxx> #include <DBRep_HideData.hxx>
@ -32,13 +34,13 @@
#include <Draw_Appli.hxx> #include <Draw_Appli.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Draw_Display.hxx> #include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx> #include <Draw_ProgressIndicator.hxx>
#include <Geom_BSplineCurve.hxx> #include <Geom_BSplineCurve.hxx>
#include <Geom_BSplineSurface.hxx> #include <Geom_BSplineSurface.hxx>
#include <GeomAdaptor_Surface.hxx> #include <GeomAdaptor_Surface.hxx>
#include <GeomAdaptor_Surface.hxx>
#include <gp_Lin2d.hxx> #include <gp_Lin2d.hxx>
#include <gp_Trsf.hxx> #include <gp_Trsf.hxx>
#include <Message_ProgressIndicator.hxx>
#include <HLRBRep.hxx> #include <HLRBRep.hxx>
#include <Poly_Connect.hxx> #include <Poly_Connect.hxx>
#include <Poly_Polygon3D.hxx> #include <Poly_Polygon3D.hxx>
@ -1006,21 +1008,62 @@ void DBRep_DrawableShape::GetDisplayHLR(Standard_Boolean& withHLR,
//======================================================================= //=======================================================================
//function : Dump //function : Dump
//purpose : //purpose :
//======================================================================= //=======================================================================
void DBRep_DrawableShape::Dump (Standard_OStream& S) const
void DBRep_DrawableShape::Dump(Standard_OStream& S)const
{ {
BRepTools::Dump(myShape,S); BRepTools::Dump(myShape,S);
} }
//=======================================================================
//function : Save
//purpose :
//=======================================================================
void DBRep_DrawableShape::Save (Standard_OStream& theStream) const
{
BRep_Builder aBuilder;
BRepTools_ShapeSet aShapeSet (aBuilder);
aShapeSet.Add (myShape);
Handle(Draw_ProgressIndicator) aProgress = Draw::GetProgressBar();
aShapeSet.Write (theStream, Message_ProgressIndicator::Start (aProgress));
if (aProgress.IsNull() || !aProgress->UserBreak())
{
aShapeSet.Write (myShape, theStream);
}
}
//=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) DBRep_DrawableShape::Restore (Standard_IStream& theStream)
{
const DBRep_Params& aParams = DBRep::Parameters();
BRep_Builder aBuilder;
BRepTools_ShapeSet aShapeSet (aBuilder);
Handle(Draw_ProgressIndicator) aProgress = Draw::GetProgressBar();
aShapeSet.Read (theStream, Message_ProgressIndicator::Start(aProgress));
if (!aProgress.IsNull() && aProgress->UserBreak())
{
return Handle(Draw_Drawable3D)();
}
TopoDS_Shape aTopoShape;
aShapeSet.Read (aTopoShape, theStream);
Handle(DBRep_DrawableShape) aDrawShape = new DBRep_DrawableShape (aTopoShape,
Draw_vert, Draw_jaune, Draw_rouge, Draw_bleu,
aParams.Size, aParams.NbIsos, aParams.Discretization);
aDrawShape->DisplayTriangulation (aParams.DispTriangles);
aDrawShape->DisplayPolygons (aParams.DisplayPolygons);
aDrawShape->DisplayHLR (aParams.WithHLR, aParams.WithRg1, aParams.WithRgN, aParams.WithHid, aParams.HLRAngle);
return aDrawShape;
}
//======================================================================= //=======================================================================
//function : Whatis //function : Whatis
//purpose : //purpose :
//======================================================================= //=======================================================================
void DBRep_DrawableShape::Whatis (Draw_Interpretor& s) const
void DBRep_DrawableShape::Whatis(Draw_Interpretor& s)const
{ {
if (myShape.IsNull()) if (myShape.IsNull())
{ {

8
src/DBRep/DBRep_DrawableShape.hxx
View File

@ -37,8 +37,9 @@ class gp_Trsf;
class DBRep_DrawableShape : public Draw_Drawable3D class DBRep_DrawableShape : public Draw_Drawable3D
{ {
DEFINE_STANDARD_RTTIEXT(DBRep_DrawableShape, Draw_Drawable3D) DEFINE_STANDARD_RTTIEXT(DBRep_DrawableShape, Draw_Drawable3D)
Draw_Drawable3D_FACTORY
public: public:
Standard_EXPORT DBRep_DrawableShape(const TopoDS_Shape& C, 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); Standard_EXPORT DBRep_DrawableShape(const TopoDS_Shape& C, 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);
//! Changes the number of isoparametric curves in a shape. //! Changes the number of isoparametric curves in a shape.
@ -86,7 +87,10 @@ public:
//! For variable dump. //! For variable dump.
Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE; Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE;
//! Save drawable into stream.
Standard_EXPORT virtual void Save (Standard_OStream& theStream) const Standard_OVERRIDE;
//! For variable whatis command. //! For variable whatis command.
Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE; Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;

52
src/DBRep/DBRep_Params.hxx Normal file
View File

@ -0,0 +1,52 @@
// Copyright (c) 2021 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 Draw_Params_HeaderFile
#define Draw_Params_HeaderFile
#include <Standard_Real.hxx>
//! DBRep parameters.
struct DBRep_Params
{
public:
Standard_Integer NbIsos; //!< number of iso in U and V
Standard_Real Size;
Standard_Integer Discretization; //!< Discretization number of points for curves
Standard_Boolean DispTriangles;
Standard_Boolean DisplayPolygons;
Standard_Real HLRAngle; //!< Discretization angle for edges
Standard_Real HAngMin;
Standard_Real HAngMax;
Standard_Boolean WithHLR; //!< True if HLR, False if wireframe
Standard_Boolean WithRg1; //!< True if display Rg1Lines
Standard_Boolean WithRgN; //!< True if display RgNLines
Standard_Boolean WithHid; //!< True if display HiddenLines
DBRep_Params()
: NbIsos (2),
Size (100.0),
Discretization (30),
DispTriangles(false),
DisplayPolygons (false),
HLRAngle(35.0 * M_PI / 180.0),
HAngMin ( 1.0 * M_PI / 180.0),
HAngMax (35.0 * M_PI / 180.0),
WithHLR (false),
WithRg1 (true),
WithRgN (false),
WithHid (false)
{}
};
#endif

1
src/DBRep/FILES
View File

@ -19,3 +19,4 @@ DBRep_ListIteratorOfListOfHideData.hxx
DBRep_ListOfEdge.hxx DBRep_ListOfEdge.hxx
DBRep_ListOfFace.hxx DBRep_ListOfFace.hxx
DBRep_ListOfHideData.hxx DBRep_ListOfHideData.hxx
DBRep_Params.hxx

27
src/Draw/Draw_Appli.hxx
View File

@ -37,35 +37,8 @@ extern Draw_Viewer dout;
extern Standard_Boolean Draw_Batch; extern Standard_Boolean Draw_Batch;
#endif #endif
class Draw_SaveAndRestore {
public :
Standard_EXPORT Draw_SaveAndRestore
(const char* name,
Standard_Boolean (*test)(const Handle(Draw_Drawable3D)&),
void (*save)(const Handle(Draw_Drawable3D)&, std::ostream&),
Handle(Draw_Drawable3D) (*restore) (std::istream&),
Standard_Boolean display = Standard_True);
const char* Name() const {return myName;}
Standard_Boolean Test(const Handle(Draw_Drawable3D)&d);
void Save(const Handle(Draw_Drawable3D)& d, std::ostream& os) const;
Handle(Draw_Drawable3D) Restore(std::istream&) const;
Standard_Boolean Disp() const {return myDisplay;}
Draw_SaveAndRestore* Next() {return myNext;}
private :
const char* myName;
Standard_Boolean (*myTest)(const Handle(Draw_Drawable3D)&);
void (*mySave)(const Handle(Draw_Drawable3D)&, std::ostream&);
Handle(Draw_Drawable3D) (*myRestore) (std::istream&);
Standard_Boolean myDisplay;
Draw_SaveAndRestore* myNext;
};
#endif #endif

122
src/Draw/Draw_Drawable3D.cxx
View File

@ -14,33 +14,65 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx> #include <Draw_Drawable3D.hxx>
#include <Standard_Type.hxx>
IMPLEMENT_STANDARD_RTTIEXT(Draw_Drawable3D,Standard_Transient) #include <NCollection_DataMap.hxx>
#include <Draw_Display.hxx>
#include <Standard_NotImplemented.hxx>
IMPLEMENT_STANDARD_RTTIEXT(Draw_Drawable3D, Standard_Transient)
//! Return the map of factory functions.
static NCollection_DataMap<Standard_CString, Draw_Drawable3D::FactoryFunction_t>& getFactoryMap()
{
static NCollection_DataMap<Standard_CString, Draw_Drawable3D::FactoryFunction_t> myToolMap;
return myToolMap;
}
//=======================================================================
//function : RegisterFactory
//purpose :
//=======================================================================
void Draw_Drawable3D::RegisterFactory (const Standard_CString theType,
const FactoryFunction_t& theFactory)
{
getFactoryMap().Bind (theType, theFactory);
}
//=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) Draw_Drawable3D::Restore (const Standard_CString theType,
Standard_IStream& theStream)
{
FactoryFunction_t aFactory = NULL;
if (getFactoryMap().Find (theType, aFactory))
{
return aFactory (theStream);
}
return Handle(Draw_Drawable3D)();
}
//======================================================================= //=======================================================================
//function : Draw_Drawable3D //function : Draw_Drawable3D
//purpose : //purpose :
//======================================================================= //=======================================================================
Draw_Drawable3D::Draw_Drawable3D() : Draw_Drawable3D::Draw_Drawable3D()
myXmin(0.0), : myXmin(0.0),
myXmax(0.0), myXmax(0.0),
myYmin(0.0), myYmin(0.0),
myYmax(0.0), myYmax(0.0),
myName(NULL),
isVisible(Standard_False), isVisible(Standard_False),
isProtected(Standard_False), isProtected(Standard_False)
myName(NULL)
{ {
} }
//======================================================================= //=======================================================================
//function : PickReject //function : PickReject
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean Draw_Drawable3D::PickReject(const Standard_Real X, Standard_Boolean Draw_Drawable3D::PickReject(const Standard_Real X,
const Standard_Real Y, const Standard_Real Y,
const Standard_Real Prec) const const Standard_Real Prec) const
@ -48,82 +80,40 @@ Standard_Boolean Draw_Drawable3D::PickReject(const Standard_Real X,
return ((X+Prec < myXmin) || (X-Prec > myXmax) || return ((X+Prec < myXmin) || (X-Prec > myXmax) ||
(Y+Prec < myYmin) || (Y-Prec > myYmax)); (Y+Prec < myYmin) || (Y-Prec > myYmax));
} }
//======================================================================= //=======================================================================
//function : Copy //function : Copy
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(Draw_Drawable3D) Draw_Drawable3D::Copy() const
Handle(Draw_Drawable3D) Draw_Drawable3D::Copy() const
{ {
return this; return this;
} }
//======================================================================= //=======================================================================
//function : Dump //function : Dump
//purpose : //purpose :
//======================================================================= //=======================================================================
void Draw_Drawable3D::Dump (Standard_OStream& S) const
void Draw_Drawable3D::Dump(Standard_OStream& S) const
{ {
S << myXmin << " " << myXmax << "\n"; S << myXmin << " " << myXmax << "\n";
S << myYmin << " " << myYmax << "\n"; S << myYmin << " " << myYmax << "\n";
} }
//=======================================================================
//function : Save
//purpose :
//=======================================================================
void Draw_Drawable3D::Save (Standard_OStream& ) const
{
throw Standard_NotImplemented ("Draw_Drawable3D::Save() should be redefined in sub-class");
}
//======================================================================= //=======================================================================
//function : Whatis //function : Whatis
//purpose : //purpose :
//======================================================================= //=======================================================================
void Draw_Drawable3D::Whatis(Draw_Interpretor& S) const void Draw_Drawable3D::Whatis(Draw_Interpretor& S) const
{ {
S << "drawable 3d"; S << "drawable 3d";
} }
//=======================================================================
//function : Is3D
//purpose :
//=======================================================================
Standard_Boolean Draw_Drawable3D::Is3D() const
{
return Standard_True;
}
//=======================================================================
//function : SetBounds
//purpose :
//=======================================================================
void Draw_Drawable3D::SetBounds(const Standard_Real xmin,
const Standard_Real xmax,
const Standard_Real ymin,
const Standard_Real ymax)
{
myXmin = xmin;
myXmax = xmax;
myYmin = ymin;
myYmax = ymax;
}
//=======================================================================
//function : Bounds
//purpose :
//=======================================================================
void Draw_Drawable3D::Bounds(Standard_Real& xmin,
Standard_Real& xmax,
Standard_Real& ymin,
Standard_Real& ymax) const
{
xmin = myXmin;
xmax = myXmax;
ymin = myYmin;
ymax = myYmax;
}

106
src/Draw/Draw_Drawable3D.hxx
View File

@ -17,28 +17,46 @@
#ifndef _Draw_Drawable3D_HeaderFile #ifndef _Draw_Drawable3D_HeaderFile
#define _Draw_Drawable3D_HeaderFile #define _Draw_Drawable3D_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Standard_Real.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_CString.hxx> #include <Standard_CString.hxx>
#include <Standard_Type.hxx>
#include <Standard_Transient.hxx> #include <Standard_Transient.hxx>
#include <Standard_IStream.hxx>
#include <Standard_OStream.hxx> #include <Standard_OStream.hxx>
#include <Draw_Interpretor.hxx> #include <Draw_Interpretor.hxx>
class Draw_Display; class Draw_Display;
class Draw_Drawable3D;
DEFINE_STANDARD_HANDLE(Draw_Drawable3D, Standard_Transient) DEFINE_STANDARD_HANDLE(Draw_Drawable3D, Standard_Transient)
class Draw_Drawable3D : public Standard_Transient class Draw_Drawable3D : public Standard_Transient
{ {
DEFINE_STANDARD_RTTIEXT(Draw_Drawable3D, Standard_Transient)
public:
//! Function type for restoring drawable from stream.
typedef Handle(Draw_Drawable3D)(*FactoryFunction_t)(Standard_IStream& theStream);
//! Register factory for restoring drawable from stream (opposite to Draw_Drawable3D::Save()).
//! @param theType [in] class name
//! @param theFactory [in] factory function
Standard_EXPORT static void RegisterFactory (const Standard_CString theType,
const FactoryFunction_t& theFactory);
//! Restore drawable from stream (opposite to Draw_Drawable3D::Save()).
//! @param theType [in] class name
//! @param theStream [in] input stream
//! @return restored drawable or NULL if factory is undefined for specified class
Standard_EXPORT static Handle(Draw_Drawable3D) Restore (const Standard_CString theType,
Standard_IStream& theStream);
//! @def Draw_Drawable3D_FACTORY
//! Auxiliary macros defining Draw_Drawable3D restoration API to sub-class.
#define Draw_Drawable3D_FACTORY \
static void RegisterFactory() { Draw_Drawable3D::RegisterFactory (get_type_name(), &Restore); } \
Standard_EXPORT static Handle(Draw_Drawable3D) Restore (Standard_IStream& theStream);
public: public:
Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const = 0; Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const = 0;
//! Returns True if the pick is outside the box //! Returns True if the pick is outside the box
@ -49,61 +67,63 @@ public:
//! For variable dump. //! For variable dump.
Standard_EXPORT virtual void Dump (Standard_OStream& S) const; Standard_EXPORT virtual void Dump (Standard_OStream& S) const;
//! For variable whatis command. Set as a result the //! Save drawable into stream; default implementation raises Standard_NotImplemented exception.
//! type of the variable. Standard_EXPORT virtual void Save (Standard_OStream& theStream) const;
//! For variable whatis command. Set as a result the type of the variable.
Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const; Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const;
//! Is a 3D object. (Default True). //! Is a 3D object. (Default True).
Standard_EXPORT virtual Standard_Boolean Is3D() const; virtual bool Is3D() const { return true; }
Standard_EXPORT void SetBounds (const Standard_Real xmin, const Standard_Real xmax, const Standard_Real ymin, const Standard_Real ymax);
Standard_EXPORT void Bounds (Standard_Real& xmin, Standard_Real& xmax, Standard_Real& ymin, Standard_Real& ymax) const;
Standard_Boolean Visible() const;
void Visible (const Standard_Boolean V);
Standard_Boolean Protected() const;
void Protected (const Standard_Boolean P);
Standard_CString Name() const;
virtual void Name (const Standard_CString N);
//! Return TRUE if object can be displayed.
virtual bool IsDisplayable() const { return true; }
void SetBounds (const Standard_Real theXMin, const Standard_Real theXMax,
const Standard_Real theYMin, const Standard_Real theYMax)
{
myXmin = theXMin;
myXmax = theXMax;
myYmin = theYMin;
myYmax = theYMax;
}
void Bounds (Standard_Real& theXMin, Standard_Real& theXMax,
Standard_Real& theYMin, Standard_Real& theYMax) const
{
theXMin = myXmin;
theXMax = myXmax;
theYMin = myYmin;
theYMax = myYmax;
}
DEFINE_STANDARD_RTTIEXT(Draw_Drawable3D,Standard_Transient) Standard_Boolean Visible() const { return isVisible; }
void Visible (const Standard_Boolean V) { isVisible = V; }
Standard_Boolean Protected() const { return isProtected; }
void Protected (const Standard_Boolean P) { isProtected = P; }
Standard_CString Name() const { return myName; }
virtual void Name (const Standard_CString N) { myName = N; }
protected: protected:
Standard_EXPORT Draw_Drawable3D(); Standard_EXPORT Draw_Drawable3D();
private: private:
Standard_Real myXmin; Standard_Real myXmin;
Standard_Real myXmax; Standard_Real myXmax;
Standard_Real myYmin; Standard_Real myYmin;
Standard_Real myYmax; Standard_Real myYmax;
Standard_CString myName;
Standard_Boolean isVisible; Standard_Boolean isVisible;
Standard_Boolean isProtected; Standard_Boolean isProtected;
Standard_CString myName;
}; };
#include <Draw_Drawable3D.lxx>
#endif // _Draw_Drawable3D_HeaderFile #endif // _Draw_Drawable3D_HeaderFile

46
src/Draw/Draw_Drawable3D.lxx
View File

@ -1,46 +0,0 @@
// Created on: 1995-02-28
// Created by: Remi LEQUETTE
// 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.
inline Standard_Boolean Draw_Drawable3D::Visible() const
{
return isVisible;
}
inline void Draw_Drawable3D::Visible(const Standard_Boolean V)
{
isVisible = V;
}
inline Standard_Boolean Draw_Drawable3D::Protected() const
{
return isProtected;
}
inline void Draw_Drawable3D::Protected(const Standard_Boolean V)
{
isProtected = V;
}
inline Standard_CString Draw_Drawable3D::Name() const
{
return myName;
}
inline void Draw_Drawable3D::Name(const Standard_CString N)
{
myName = N;
}

84
src/Draw/Draw_Number.cxx
View File

@ -14,85 +14,81 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <Draw_Number.hxx>
#include <Draw_Display.hxx> #include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx>
#include <Draw_Number.hxx>
#include <Standard_Type.hxx>
IMPLEMENT_STANDARD_RTTIEXT(Draw_Number,Draw_Drawable3D) IMPLEMENT_STANDARD_RTTIEXT(Draw_Number,Draw_Drawable3D)
//======================================================================= //=======================================================================
//function : Draw_Number //function : Draw_Number
//purpose : //purpose :
//======================================================================= //=======================================================================
Draw_Number::Draw_Number(const Standard_Real V) : Draw_Number::Draw_Number (const Standard_Real theV)
myValue(V) : myValue (theV)
{ {
//
} }
//=======================================================================
//function : Value
//purpose :
//=======================================================================
Standard_Real Draw_Number::Value()const
{
return myValue;
}
//=======================================================================
//function : Value
//purpose :
//=======================================================================
void Draw_Number::Value(const Standard_Real V)
{
myValue = V;
}
//======================================================================= //=======================================================================
//function : DrawOn //function : DrawOn
//purpose : //purpose :
//======================================================================= //=======================================================================
void Draw_Number::DrawOn (Draw_Display& ) const
void Draw_Number::DrawOn(Draw_Display&)const
{ {
//
} }
//======================================================================= //=======================================================================
//function : Copy //function : Copy
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(Draw_Drawable3D) Draw_Number::Copy() const
Handle(Draw_Drawable3D) Draw_Number::Copy()const
{ {
Handle(Draw_Number) D = new Draw_Number(myValue); Handle(Draw_Number) D = new Draw_Number (myValue);
return D; return D;
} }
//======================================================================= //=======================================================================
//function : Dump //function : Dump
//purpose : //purpose :
//======================================================================= //=======================================================================
void Draw_Number::Dump (Standard_OStream& S) const
void Draw_Number::Dump(Standard_OStream& S)const
{ {
S << myValue; S << myValue;
} }
//=======================================================================
//function : Save
//purpose :
//=======================================================================
void Draw_Number::Save (Standard_OStream& theStream) const
{
std::ios::fmtflags aFlags = theStream.flags();
theStream.setf (std::ios::scientific);
theStream.precision (15);
theStream.width (30);
theStream << myValue << "\n";
theStream.setf (aFlags);
}
//=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) Draw_Number::Restore (Standard_IStream& theStream)
{
Standard_Real aVal = RealLast();
theStream >> aVal;
Handle(Draw_Number) aNumb = new Draw_Number (aVal);
return aNumb;
}
//======================================================================= //=======================================================================
//function : Whatis //function : Whatis
//purpose : //purpose :
//======================================================================= //=======================================================================
void Draw_Number::Whatis (Draw_Interpretor& S) const
void Draw_Number::Whatis(Draw_Interpretor& S)const
{ {
S << "numeric"; S << "numeric";
} }

59
src/Draw/Draw_Number.hxx
View File

@ -17,68 +17,45 @@
#ifndef _Draw_Number_HeaderFile #ifndef _Draw_Number_HeaderFile
#define _Draw_Number_HeaderFile #define _Draw_Number_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Standard_Real.hxx>
#include <Draw_Drawable3D.hxx> #include <Draw_Drawable3D.hxx>
#include <Standard_OStream.hxx>
#include <Draw_Interpretor.hxx>
class Draw_Display;
class Draw_Drawable3D;
class Draw_Number;
DEFINE_STANDARD_HANDLE(Draw_Number, Draw_Drawable3D) DEFINE_STANDARD_HANDLE(Draw_Number, Draw_Drawable3D)
//! To store numbers in variables. //! To store numbers in variables.
class Draw_Number : public Draw_Drawable3D class Draw_Number : public Draw_Drawable3D
{ {
DEFINE_STANDARD_RTTIEXT(Draw_Number, Draw_Drawable3D)
Draw_Drawable3D_FACTORY
public: public:
Standard_EXPORT Draw_Number (const Standard_Real theV);
Standard_Real Value() const { return myValue; }
void Value (const Standard_Real theV) { myValue = theV; }
Standard_EXPORT Draw_Number(const Standard_Real V); //! Does nothing,
Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
Standard_EXPORT Standard_Real Value() const;
//! Returns TRUE if object can be displayed.
Standard_EXPORT void Value (const Standard_Real V); virtual bool IsDisplayable() const Standard_OVERRIDE { return false; }
//! Does nothhing,
Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
//! For variable copy. //! For variable copy.
Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
//! For variable dump. //! For variable dump.
Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE; Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE;
//! For variable whatis command. Set as a result the //! Save drawable into stream.
//! type of the variable. Standard_EXPORT virtual void Save (Standard_OStream& theStream) const Standard_OVERRIDE;
//! For variable whatis command. Set as a result the type of the variable.
Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE; Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(Draw_Number,Draw_Drawable3D)
protected:
private: private:
Standard_Real myValue; Standard_Real myValue;
}; };
#endif // _Draw_Number_HeaderFile #endif // _Draw_Number_HeaderFile

233
src/Draw/Draw_VariableCommands.cxx
View File

@ -14,7 +14,6 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <Draw.hxx> #include <Draw.hxx>
#include <Draw_Appli.hxx> #include <Draw_Appli.hxx>
#include <Draw_Axis2D.hxx> #include <Draw_Axis2D.hxx>
@ -23,13 +22,13 @@
#include <Draw_Drawable3D.hxx> #include <Draw_Drawable3D.hxx>
#include <Draw_Grid.hxx> #include <Draw_Grid.hxx>
#include <Draw_Number.hxx> #include <Draw_Number.hxx>
#include <Message.hxx>
#include <Draw_ProgressIndicator.hxx> #include <Draw_ProgressIndicator.hxx>
#include <Draw_SequenceOfDrawable3D.hxx> #include <Draw_SequenceOfDrawable3D.hxx>
#include <Message.hxx> #include <Message.hxx>
#include <NCollection_Map.hxx> #include <NCollection_Map.hxx>
#include <Standard_SStream.hxx> #include <Standard_SStream.hxx>
#include <Standard_Stream.hxx> #include <Standard_Stream.hxx>
#include <Standard_NotImplemented.hxx>
#include <TCollection_AsciiString.hxx> #include <TCollection_AsciiString.hxx>
#include <ios> #include <ios>
@ -67,195 +66,119 @@ static Standard_Integer p_Y;
static Standard_Integer p_b; static Standard_Integer p_b;
static const char* p_Name = ""; static const char* p_Name = "";
static Draw_SaveAndRestore* Draw_First = NULL;
//=======================================================================
//function : Draw_SaveAndRestore
//purpose :
//=======================================================================
Draw_SaveAndRestore::Draw_SaveAndRestore
(const char* name,
Standard_Boolean (*test)(const Handle(Draw_Drawable3D)&),
void (*save)(const Handle(Draw_Drawable3D)&, std::ostream&),
Handle(Draw_Drawable3D) (*restore) (std::istream&),
Standard_Boolean display) :
myName(name),
myTest(test),
mySave(save),
myRestore(restore),
myDisplay(display),
myNext(Draw_First)
{
Draw_First = this;
}
Standard_Boolean Draw_SaveAndRestore::Test(const Handle(Draw_Drawable3D)&d)
{return (*myTest) (d);}
void Draw_SaveAndRestore::Save(const Handle(Draw_Drawable3D)& d,
std::ostream& os) const
{ (*mySave) (d,os);}
Handle(Draw_Drawable3D) Draw_SaveAndRestore::Restore(std::istream& is) const
{return (*myRestore) (is);}
//=======================================================================
// numeric save and restore
//=======================================================================
static Standard_Boolean numtest(const Handle(Draw_Drawable3D)& d)
{
return d->IsInstance(STANDARD_TYPE(Draw_Number));
}
static void numsave (const Handle(Draw_Drawable3D)& theDrawable,
std::ostream& theStream)
{
Handle(Draw_Number) aNum = Handle(Draw_Number)::DownCast (theDrawable);
std::ios::fmtflags aFlags = theStream.flags();
theStream.setf (std::ios::scientific);
theStream.precision (15);
theStream.width (30);
theStream << aNum->Value() << "\n";
theStream.setf (aFlags);
}
static Handle(Draw_Drawable3D) numrestore (std::istream& is)
{
Standard_Real val;
is >> val;
Handle(Draw_Number) N = new Draw_Number(val);
return N;
}
static Draw_SaveAndRestore numsr("Draw_Number",
numtest,numsave,numrestore,
Standard_False);
//======================================================================= //=======================================================================
// save // save
//======================================================================= //=======================================================================
static Standard_Integer save (Draw_Interpretor& theDI,
static Standard_Integer save(Draw_Interpretor& di, Standard_Integer n, const char** a) Standard_Integer theNbArgs,
const char** theArgVec)
{ {
if (n < 3) if (theNbArgs != 3)
{ {
di << "Syntax error: wrong number of arguments!\n"; theDI << "Syntax error: wrong number of arguments!\n";
di.PrintHelp(a[0]); theDI.PrintHelp (theArgVec[0]);
return 1; return 1;
} }
const char* name = a[2]; Handle(Draw_Drawable3D) aDrawable = Draw::Get (theArgVec[1]);
std::ofstream os; if (aDrawable.IsNull())
os.precision(15);
OSD_OpenStream(os, name, std::ios::out);
if (!os.is_open() || !os.good())
{ {
di << "Cannot open file for writing "<<name; theDI << "Syntax error: '" << theArgVec[1] << "' is not a drawable";
return 1; return 1;
} }
Handle(Draw_Drawable3D) D = Draw::Get(a[1]); const char* aName = theArgVec[2];
if (!D.IsNull()) { std::ofstream aStream;
// find a tool aStream.precision (15);
Draw_SaveAndRestore* tool = Draw_First; OSD_OpenStream (aStream, aName, std::ios::out);
Handle(Draw_ProgressIndicator) progress = new Draw_ProgressIndicator ( di, 1 ); if (!aStream.is_open() || !aStream.good())
{
while (tool) { theDI << "Error: cannot open file for writing " << aName;
if (tool->Test(D)) break; return 1;
tool = tool->Next();
}
if (tool) {
os << tool->Name() << "\n";
Draw::SetProgressBar(progress);
tool->Save(D,os);
os << "\n";
}
else {
di << "No method for saving " << a[1];
return 1;
}
Draw::SetProgressBar( 0 );
} }
os << "0\n\n";
Standard_Boolean res = Standard_False; try
{
Handle(Draw_ProgressIndicator) aProgress = new Draw_ProgressIndicator (theDI, 1);
Standard_CString aToolTypeName = aDrawable->DynamicType()->Name();
aStream << aToolTypeName << "\n";
Draw::SetProgressBar (aProgress);
aDrawable->Save (aStream);
}
catch (const Standard_NotImplemented& )
{
theDI << "Error: no method for saving " << theArgVec[1];
return 1;
}
aStream << "\n";
aStream << "0\n\n";
Draw::SetProgressBar (Handle(Draw_ProgressIndicator)());
errno = 0; errno = 0;
const Standard_Boolean aRes = aStream.good() && !errno;
res = os.good() && !errno; if (!aRes)
if( !res )
{ {
di<<"File has not been written"; theDI << "Error: file has not been written";
return 1; return 1;
} }
di << a[1]; theDI << theArgVec[1];
return 0; return 0;
} }
//======================================================================= //=======================================================================
// read // read
//======================================================================= //=======================================================================
static Standard_Integer restore (Draw_Interpretor& theDI,
static Standard_Integer restore(Draw_Interpretor& di, Standard_Integer n, const char** a) Standard_Integer theNbArgs,
const char** theArgVec)
{ {
if (theNbArgs != 3)
if (n <= 2) return 1; {
const char* fname = a[1];
const char* name = a[2];
std::filebuf fic;
std::istream in(&fic);
OSD_OpenStream (fic, fname, std::ios::in);
if (!fic.is_open()) {
di << "Cannot open file for reading : "<<fname;
return 1; return 1;
} }
const char* aFileName = theArgVec[1];
const char* aVarName = theArgVec[2];
char typ[255]; std::filebuf aFileBuf;
in >> typ; std::istream aStream (&aFileBuf);
if (!in.fail()) { OSD_OpenStream (aFileBuf, aFileName, std::ios::in);
// search a tool if (!aFileBuf.is_open())
Handle(Draw_ProgressIndicator) progress = new Draw_ProgressIndicator ( di, 1 ); {
Draw::SetProgressBar(progress); theDI << "Error: cannot open file for reading: '" << aFileName << "'";
return 1;
}
Draw_SaveAndRestore* tool = Draw_First; char aType[255] = {};
Draw_SaveAndRestore* aDBRepTool = NULL; aStream >> aType;
while (tool) { if (aStream.fail())
const char* toolName = tool->Name(); {
if (!strcmp(typ,toolName)) break; theDI << "Error: cannot read file: '" << aFileName << "'";
if (!strcmp("DBRep_DrawableShape",toolName)) return 1;
aDBRepTool = tool; }
tool = tool->Next();
}
if (!tool) {
Handle(Draw_ProgressIndicator) aProgress = new Draw_ProgressIndicator (theDI, 1);
Draw::SetProgressBar (aProgress);
Handle(Draw_Drawable3D) aDrawable = Draw_Drawable3D::Restore (aType, aStream);
if (aDrawable.IsNull())
{ {
//assume that this file stores a DBRep_DrawableShape variable // assume that this file stores a DBRep_DrawableShape variable
tool = aDBRepTool; aStream.seekg (0, std::ios::beg);
in.seekg(0, std::ios::beg); aDrawable = Draw_Drawable3D::Restore ("DBRep_DrawableShape", aStream);
} }
if (aDrawable.IsNull())
if (tool)
{ {
Handle(Draw_Drawable3D) D = tool->Restore(in); theDI << "Error: cannot restore a " << aType;
Draw::Set(name,D,tool->Disp() && autodisp);
}
else {
di << "Cannot restore a " << typ;
return 1; return 1;
} }
Draw::SetProgressBar( 0 );
Draw::Set (aVarName, aDrawable, aDrawable->IsDisplayable() && autodisp);
Draw::SetProgressBar (Handle(Draw_ProgressIndicator)());
} }
di << name; theDI << aVarName;
return 0; return 0;
} }
@ -1239,8 +1162,10 @@ void Draw::VariableCommands(Draw_Interpretor& theCommandsArg)
Draw_BeforeCommand = &before; Draw_BeforeCommand = &before;
Draw_AfterCommand = &after; Draw_AfterCommand = &after;
// set up some variables // Register save/restore tools
Draw_Number::RegisterFactory();
// set up some variables
const char* n; const char* n;
Handle(Draw_Axis3D) theAxes3d = new Draw_Axis3D(gp_Pnt(0,0,0),Draw_bleu,20); Handle(Draw_Axis3D) theAxes3d = new Draw_Axis3D(gp_Pnt(0,0,0),Draw_bleu,20);
n = "axes"; n = "axes";

1
src/Draw/FILES
View File

@ -27,7 +27,6 @@ Draw_Drawable2D.cxx
Draw_Drawable2D.hxx Draw_Drawable2D.hxx
Draw_Drawable3D.cxx Draw_Drawable3D.cxx
Draw_Drawable3D.hxx Draw_Drawable3D.hxx
Draw_Drawable3D.lxx
Draw_Failure.hxx Draw_Failure.hxx
Draw_GraphicCommands.cxx Draw_GraphicCommands.cxx
Draw_Grid.cxx Draw_Grid.cxx

1119
src/DrawTrSurf/DrawTrSurf.cxx
View File

File diff suppressed because it is too large Load Diff

82
src/DrawTrSurf/DrawTrSurf.hxx
View File

@ -17,46 +17,23 @@
#ifndef _DrawTrSurf_HeaderFile #ifndef _DrawTrSurf_HeaderFile
#define _DrawTrSurf_HeaderFile #define _DrawTrSurf_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Draw_Interpretor.hxx> #include <Draw_Interpretor.hxx>
#include <Geom_Geometry.hxx> #include <Geom_Geometry.hxx>
#include <Geom_Surface.hxx> #include <Geom_Surface.hxx>
#include <Geom2d_Curve.hxx> #include <Geom2d_Curve.hxx>
class gp_Pnt;
class gp_Pnt2d;
class Poly_Triangulation;
class Poly_Polygon3D;
class Poly_Polygon2D;
class Geom_Curve;
class Geom_BezierCurve; class Geom_BezierCurve;
class Geom_BezierSurface;
class Geom_BSplineCurve; class Geom_BSplineCurve;
class Geom_BSplineSurface;
class Geom2d_BezierCurve; class Geom2d_BezierCurve;
class Geom2d_BSplineCurve; class Geom2d_BSplineCurve;
class Geom_BezierSurface; class Poly_Polygon2D;
class Geom_BSplineSurface; class Poly_Polygon3D;
class DrawTrSurf_Drawable; class Poly_Triangulation;
class DrawTrSurf_Point; struct DrawTrSurf_Params;
class DrawTrSurf_Curve;
class DrawTrSurf_BSplineCurve;
class DrawTrSurf_BezierCurve;
class DrawTrSurf_Curve2d;
class DrawTrSurf_BSplineCurve2d;
class DrawTrSurf_BezierCurve2d;
class DrawTrSurf_Triangulation2D;
class DrawTrSurf_Surface;
class DrawTrSurf_BSplineSurface;
class DrawTrSurf_BezierSurface;
class DrawTrSurf_Triangulation;
class DrawTrSurf_Polygon3D;
class DrawTrSurf_Polygon2D;
//! This package supports the display of parametric curves and surfaces.
//! This package supports the display of parametric
//! curves and surfaces.
//! //!
//! The Drawable deferred classes is inherited from //! The Drawable deferred classes is inherited from
//! the Drawable3D class from the package Draw, it //! the Drawable3D class from the package Draw, it
@ -67,15 +44,13 @@ class DrawTrSurf_Polygon2D;
//! and can be used to draw a single curve from //! and can be used to draw a single curve from
//! packages Geom or Geom2d or a surface from Geom. //! packages Geom or Geom2d or a surface from Geom.
//! //!
//! The Triangulation and Polygon from the package //! The Triangulation and Polygon from the package Poly are also supported.
//! Poly are also supported.
class DrawTrSurf class DrawTrSurf
{ {
public: public:
DEFINE_STANDARD_ALLOC DEFINE_STANDARD_ALLOC
//! Sets <G> in the variable <Name>. Overwrite the //! Sets <G> in the variable <Name>. Overwrite the
//! variable if already set. //! variable if already set.
Standard_EXPORT static void Set (const Standard_CString Name, const gp_Pnt& G); Standard_EXPORT static void Set (const Standard_CString Name, const gp_Pnt& G);
@ -169,46 +144,13 @@ template <class T> static void Set (const Standard_CString Name, const Handle(T)
//! Get the variable <S>. Returns a null handle if //! Get the variable <S>. Returns a null handle if
//! none, and print a warning message. //! none, and print a warning message.
Standard_EXPORT static Handle(Poly_Polygon2D) GetPolygon2D (Standard_CString& Name); Standard_EXPORT static Handle(Poly_Polygon2D) GetPolygon2D (Standard_CString& Name);
//! Return package global parameters.
Standard_EXPORT static DrawTrSurf_Params& Parameters();
//! defines display commands. //! defines display commands.
Standard_EXPORT static void BasicCommands (Draw_Interpretor& I); Standard_EXPORT static void BasicCommands (Draw_Interpretor& I);
protected:
private:
friend class DrawTrSurf_Drawable;
friend class DrawTrSurf_Point;
friend class DrawTrSurf_Curve;
friend class DrawTrSurf_BSplineCurve;
friend class DrawTrSurf_BezierCurve;
friend class DrawTrSurf_Curve2d;
friend class DrawTrSurf_BSplineCurve2d;
friend class DrawTrSurf_BezierCurve2d;
friend class DrawTrSurf_Triangulation2D;
friend class DrawTrSurf_Surface;
friend class DrawTrSurf_BSplineSurface;
friend class DrawTrSurf_BezierSurface;
friend class DrawTrSurf_Triangulation;
friend class DrawTrSurf_Polygon3D;
friend class DrawTrSurf_Polygon2D;
}; };
#endif // _DrawTrSurf_HeaderFile #endif // _DrawTrSurf_HeaderFile

532
src/DrawTrSurf/DrawTrSurf_BSplineCurve.cxx
View File

@ -12,319 +12,323 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <DrawTrSurf_BSplineCurve.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Draw_Display.hxx> #include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx>
#include <Draw_MarkerShape.hxx> #include <Draw_MarkerShape.hxx>
#include <DrawTrSurf_BSplineCurve.hxx> #include <DrawTrSurf.hxx>
#include <DrawTrSurf_Params.hxx>
#include <Geom_BSplineCurve.hxx> #include <Geom_BSplineCurve.hxx>
#include <gp_Pnt2d.hxx> #include <gp_Pnt2d.hxx>
#include <Standard_Type.hxx> #include <GeomTools_CurveSet.hxx>
#include <TColgp_Array1OfPnt.hxx> #include <TColgp_Array1OfPnt.hxx>
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BSplineCurve,DrawTrSurf_Curve) IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BSplineCurve, DrawTrSurf_Curve)
DrawTrSurf_BSplineCurve::DrawTrSurf_BSplineCurve ( DrawTrSurf_BSplineCurve::DrawTrSurf_BSplineCurve (const Handle(Geom_BSplineCurve)& C)
const Handle(Geom_BSplineCurve)& C) : : DrawTrSurf_Curve (C, Draw_vert, 16, 0.05, 1)
DrawTrSurf_Curve (C, Draw_vert, 16, 0.05, 1) { {
drawKnots = Standard_True; drawKnots = Standard_True;
knotsForm = Draw_Losange; knotsForm = Draw_Losange;
knotsLook = Draw_violet; knotsLook = Draw_violet;
knotsDim = 5; knotsDim = 5;
drawPoles = Standard_True; drawPoles = Standard_True;
polesLook = Draw_rouge; polesLook = Draw_rouge;
} }
DrawTrSurf_BSplineCurve::DrawTrSurf_BSplineCurve (const Handle(Geom_BSplineCurve)& C, const Draw_Color& CurvColor,
const Draw_Color& PolesColor, const Draw_Color& KnotsColor,
const Draw_MarkerShape KnotsShape, const Standard_Integer KnotsSize,
const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots,
const Standard_Integer Discret, const Standard_Real Deflection,
const Standard_Integer DrawMode)
: DrawTrSurf_Curve (C, CurvColor, Discret, Deflection, DrawMode)
{
drawKnots = ShowKnots;
knotsForm = KnotsShape;
knotsLook = KnotsColor;
knotsDim = KnotsSize;
drawPoles = ShowPoles;
polesLook = PolesColor;
}
void DrawTrSurf_BSplineCurve::DrawOn (Draw_Display& dis) const
{
DrawTrSurf_BSplineCurve::DrawTrSurf_BSplineCurve ( Handle(Geom_BSplineCurve) C = Handle(Geom_BSplineCurve)::DownCast(curv);
const Handle(Geom_BSplineCurve)& C, const Draw_Color& CurvColor, if (drawPoles)
const Draw_Color& PolesColor, const Draw_Color& KnotsColor, {
const Draw_MarkerShape KnotsShape, const Standard_Integer KnotsSize, Standard_Integer NbPoles = C->NbPoles();
const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots, dis.SetColor(polesLook);
const Standard_Integer Discret, const Standard_Real Deflection, TColgp_Array1OfPnt CPoles (1, NbPoles);
const Standard_Integer DrawMode) C->Poles (CPoles);
: DrawTrSurf_Curve (C , CurvColor, Discret, Deflection, DrawMode) { dis.MoveTo(CPoles(1));
for (Standard_Integer i = 2; i <= NbPoles; i++)
drawKnots = ShowKnots; {
knotsForm = KnotsShape; dis.DrawTo(CPoles(i));
knotsLook = KnotsColor;
knotsDim = KnotsSize;
drawPoles = ShowPoles;
polesLook = PolesColor;
}
void DrawTrSurf_BSplineCurve::DrawOn (Draw_Display& dis) const {
Handle(Geom_BSplineCurve) C = Handle(Geom_BSplineCurve)::DownCast(curv);
if (drawPoles) {
Standard_Integer NbPoles = C->NbPoles();
dis.SetColor(polesLook);
TColgp_Array1OfPnt CPoles (1, NbPoles);
C->Poles (CPoles);
dis.MoveTo(CPoles(1));
for (Standard_Integer i = 2; i <= NbPoles; i++) {
dis.DrawTo(CPoles(i));
}
if (C->IsPeriodic())
dis.DrawTo(CPoles(1));
} }
if (C->IsPeriodic())
DrawTrSurf_Curve::DrawOn(dis); {
dis.DrawTo(CPoles(1));
if (drawKnots) { }
Standard_Integer NbKnots = C->NbKnots(); }
TColStd_Array1OfReal CKnots (1, NbKnots);
C->Knots (CKnots); DrawTrSurf_Curve::DrawOn (dis);
dis.SetColor(knotsLook); if (drawKnots)
Standard_Integer first = C->FirstUKnotIndex(); {
Standard_Integer last = C->LastUKnotIndex(); Standard_Integer NbKnots = C->NbKnots();
for (Standard_Integer i = first; i <= last; i++) { TColStd_Array1OfReal CKnots (1, NbKnots);
dis.DrawMarker (C->Value (CKnots (i)), knotsForm, knotsDim); C->Knots (CKnots);
} dis.SetColor(knotsLook);
Standard_Integer first = C->FirstUKnotIndex();
Standard_Integer last = C->LastUKnotIndex();
for (Standard_Integer i = first; i <= last; i++)
{
dis.DrawMarker (C->Value (CKnots (i)), knotsForm, knotsDim);
}
}
}
void DrawTrSurf_BSplineCurve::DrawOn (Draw_Display& dis,
const Standard_Boolean ShowPoles,
const Standard_Boolean ShowKnots) const
{
Handle(Geom_BSplineCurve) C = Handle(Geom_BSplineCurve)::DownCast(curv);
if (drawPoles && ShowPoles)
{
Standard_Integer NbPoles = C->NbPoles();
dis.SetColor(polesLook);
TColgp_Array1OfPnt CPoles (1, NbPoles);
C->Poles (CPoles);
dis.MoveTo(CPoles(1));
for (Standard_Integer i = 2; i <= NbPoles; i++)
{
dis.DrawTo(CPoles(i));
} }
} }
DrawTrSurf_Curve::DrawOn(dis);
void DrawTrSurf_BSplineCurve::DrawOn ( if (drawKnots && ShowKnots)
{
Draw_Display& dis, Standard_Integer NbKnots = C->NbKnots();
const Standard_Boolean ShowPoles, TColStd_Array1OfReal CKnots (1, NbKnots);
const Standard_Boolean ShowKnots C->Knots (CKnots);
) const { dis.SetColor(knotsLook);
for (Standard_Integer i = 1; i <= NbKnots; i++)
{
dis.DrawMarker (C->Value (CKnots (i)), knotsForm, knotsDim);
}
}
}
void DrawTrSurf_BSplineCurve::DrawOn (Draw_Display& dis,
const Standard_Real U1,
const Standard_Real U2,
const Standard_Integer Pindex,
const Standard_Boolean ShowPoles,
const Standard_Boolean ShowKnots) const
{
Handle(Geom_BSplineCurve) C = Handle(Geom_BSplineCurve)::DownCast(curv);
Standard_Real Eps1 = Abs(Epsilon (U1));
Standard_Real Eps2 = Abs(Epsilon (U2));
Standard_Integer I1, J1, I2, J2;
C->LocateU (U1, Eps1, I1, J1);
C->LocateU (U2, Eps2, I2, J2);
Standard_Integer ka = C->FirstUKnotIndex ();
Standard_Integer kb = C->LastUKnotIndex ();
Handle(Geom_BSplineCurve) C = Handle(Geom_BSplineCurve)::DownCast(curv); if (drawPoles && ShowPoles)
if (drawPoles && ShowPoles) { {
Standard_Integer NbPoles = C->NbPoles(); Standard_Integer NbPoles = C->NbPoles();
dis.SetColor(polesLook); dis.SetColor(polesLook);
TColgp_Array1OfPnt CPoles (1, NbPoles); TColgp_Array1OfPnt CPoles (1, NbPoles);
C->Poles (CPoles); C->Poles (CPoles);
if (Pindex == 0)
{
dis.MoveTo(CPoles(1)); dis.MoveTo(CPoles(1));
for (Standard_Integer i = 2; i <= NbPoles; i++) { for (Standard_Integer i = 2; i <= NbPoles; i++)
{
dis.DrawTo(CPoles(i)); dis.DrawTo(CPoles(i));
} }
} }
else if (Pindex == 1)
DrawTrSurf_Curve::DrawOn(dis); {
dis.MoveTo(CPoles(1));
if (drawKnots && ShowKnots) { dis.DrawTo(CPoles(2));
Standard_Integer NbKnots = C->NbKnots(); }
TColStd_Array1OfReal CKnots (1, NbKnots); else if (Pindex == NbPoles)
C->Knots (CKnots); {
dis.SetColor(knotsLook); dis.MoveTo(CPoles(NbPoles-1));
for (Standard_Integer i = 1; i <= NbKnots; i++) { dis.DrawTo(CPoles(NbPoles));
dis.DrawMarker (C->Value (CKnots (i)), knotsForm, knotsDim); }
} else
{
dis.MoveTo(CPoles(Pindex-1));
dis.DrawTo(CPoles(Pindex));
dis.DrawTo(CPoles(Pindex+1));
} }
} }
dis.SetColor(look);
Standard_Integer Degree = C->Degree();
if (Degree == 1)
{
dis.MoveTo(C->Value(U1));
dis.DrawTo(C->Value(U2));
}
else
{
Standard_Integer NbPoints;
Standard_Integer Discret = GetDiscretisation();
Standard_Real Ustart = C->Knot (ka);
Standard_Real Uend = C->Knot (kb);
Standard_Real Du, U, Ua, Ub, Uk1, Uk2;
if (I1 > ka) { ka = I1; Uk1 = U1; }
else
void DrawTrSurf_BSplineCurve::DrawOn ( {
U = U1;
Draw_Display& dis, NbPoints = (Standard_Integer) Abs (Discret * (U1 - Ustart) / (Ustart - Uend));
const Standard_Real U1, NbPoints = Max (NbPoints, 30);
const Standard_Real U2, Du = (Ustart - U1) / NbPoints;
const Standard_Integer Pindex, dis.MoveTo(C->Value (U));
const Standard_Boolean ShowPoles, for (Standard_Integer i = 1; i <= NbPoints - 2; i++) {
const Standard_Boolean ShowKnots U+= Du;
) const { dis.DrawTo(C->Value (U));
Handle(Geom_BSplineCurve) C = Handle(Geom_BSplineCurve)::DownCast(curv);
Standard_Real Eps1 = Abs(Epsilon (U1));
Standard_Real Eps2 = Abs(Epsilon (U2));
Standard_Integer I1, J1, I2, J2;
C->LocateU (U1, Eps1, I1, J1);
C->LocateU (U2, Eps2, I2, J2);
Standard_Integer ka = C->FirstUKnotIndex ();
Standard_Integer kb = C->LastUKnotIndex ();
if (drawPoles && ShowPoles) {
Standard_Integer NbPoles = C->NbPoles();
dis.SetColor(polesLook);
TColgp_Array1OfPnt CPoles (1, NbPoles);
C->Poles (CPoles);
if (Pindex == 0) {
dis.MoveTo(CPoles(1));
for (Standard_Integer i = 2; i <= NbPoles; i++) {
dis.DrawTo(CPoles(i));
}
} }
else if (Pindex == 1) { dis.DrawTo(C->Value (Ustart));
dis.MoveTo(CPoles(1)); Uk1 = Ustart;
dis.DrawTo(CPoles(2)); }
}
else if (Pindex == NbPoles) { if (J2 < kb) { kb = J2; Uk2 = U2; }
dis.MoveTo(CPoles(NbPoles-1)); else
dis.DrawTo(CPoles(NbPoles)); {
} Uk2 = Uend;
else { U = Uend;
dis.MoveTo(CPoles(Pindex-1)); NbPoints = (Standard_Integer) Abs (Discret * (U2 - Uend) / (Ustart - Uend));
dis.DrawTo(CPoles(Pindex)); NbPoints = Max (NbPoints, 30);
dis.DrawTo(CPoles(Pindex+1)); Du = (U2 - Uend) / NbPoints;
dis.MoveTo(C->Value (U));
for (Standard_Integer i = 1; i <= NbPoints - 2; i++)
{
U+= Du;
dis.DrawTo(C->Value (U));
} }
dis.DrawTo(C->Value (U2));
} }
for (Standard_Integer k = ka; k < kb; k++)
dis.SetColor(look); {
Standard_Integer Degree = C->Degree(); if (k == ka)
{
if (Degree == 1) { Ua = Uk1;
dis.MoveTo(C->Value(U1)); Ub = C->Knot (k+1);
dis.DrawTo(C->Value(U2)); }
else if (k == kb-1)
{
Ua = C->Knot (k);
Ub = Uk2;
}
else
{
Ua = C->Knot (k);
Ub = C->Knot (k+1);
}
U = Ua;
NbPoints = (Standard_Integer) Abs (Discret * (Ua - Ub) / (Ustart - Uend));
NbPoints = Max (NbPoints, 30);
Du = (Ub - Ua) / NbPoints;
dis.MoveTo(C->Value (U));
for (Standard_Integer i = 1; i <= NbPoints - 2; i++)
{
U+= Du;
dis.DrawTo(C->Value (U));
}
dis.DrawTo(C->Value (Ub));
} }
else { }
Standard_Integer NbPoints;
Standard_Integer Discret = GetDiscretisation();
Standard_Real Ustart = C->Knot (ka);
Standard_Real Uend = C->Knot (kb);
Standard_Real Du, U, Ua, Ub, Uk1, Uk2;
if (I1 > ka) { ka = I1; Uk1 = U1; } if (drawKnots && ShowKnots)
else { {
U = U1; Standard_Integer NbKnots = C->NbKnots();
NbPoints = (Standard_Integer) Abs (Discret * (U1 - Ustart) / (Ustart - Uend)); TColStd_Array1OfReal CKnots (1, NbKnots);
NbPoints = Max (NbPoints, 30); C->Knots (CKnots);
Du = (Ustart - U1) / NbPoints; dis.SetColor(knotsLook);
dis.MoveTo(C->Value (U)); for (Standard_Integer i = J1; i <= I2; i++)
for (Standard_Integer i = 1; i <= NbPoints - 2; i++) { {
U+= Du; dis.DrawMarker (C->Value (CKnots (i)), knotsForm, knotsDim);
dis.DrawTo(C->Value (U));
}
dis.DrawTo(C->Value (Ustart));
Uk1 = Ustart;
}
if (J2 < kb) { kb = J2; Uk2 = U2; }
else {
Uk2 = Uend;
U = Uend;
NbPoints = (Standard_Integer) Abs (Discret * (U2 - Uend) / (Ustart - Uend));
NbPoints = Max (NbPoints, 30);
Du = (U2 - Uend) / NbPoints;
dis.MoveTo(C->Value (U));
for (Standard_Integer i = 1; i <= NbPoints - 2; i++) {
U+= Du;
dis.DrawTo(C->Value (U));
}
dis.DrawTo(C->Value (U2));
}
for (Standard_Integer k = ka; k < kb; k++) {
if (k == ka) {
Ua = Uk1;
Ub = C->Knot (k+1);
}
else if (k == kb-1) {
Ua = C->Knot (k);
Ub = Uk2;
}
else {
Ua = C->Knot (k);
Ub = C->Knot (k+1);
}
U = Ua;
NbPoints = (Standard_Integer) Abs (Discret * (Ua - Ub) / (Ustart - Uend));
NbPoints = Max (NbPoints, 30);
Du = (Ub - Ua) / NbPoints;
dis.MoveTo(C->Value (U));
for (Standard_Integer i = 1; i <= NbPoints - 2; i++) {
U+= Du;
dis.DrawTo(C->Value (U));
}
dis.DrawTo(C->Value (Ub));
}
} }
}
}
void DrawTrSurf_BSplineCurve::FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real XPrec,
if (drawKnots && ShowKnots) { Standard_Integer& Index) const
Standard_Integer NbKnots = C->NbKnots(); {
TColStd_Array1OfReal CKnots (1, NbKnots); Handle(Geom_BSplineCurve) bc = Handle(Geom_BSplineCurve)::DownCast(curv);
C->Knots (CKnots); Standard_Real Prec = XPrec / D.Zoom();
dis.SetColor(knotsLook); gp_Pnt2d p1(X/D.Zoom(),Y/D.Zoom());
for (Standard_Integer i = J1; i <= I2; i++) { Index++;
dis.DrawMarker (C->Value (CKnots (i)), knotsForm, knotsDim); Standard_Integer NbPoles = bc->NbPoles();
} while (Index <= NbPoles)
{
if (D.Project(bc->Pole(Index)).Distance(p1) <= Prec)
{
return;
} }
Index++;
}
Index = 0;
}
} void DrawTrSurf_BSplineCurve::FindKnot (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec,
Standard_Integer& Index) const
{
Handle(Geom_BSplineCurve) bc = Handle(Geom_BSplineCurve)::DownCast(curv);
void DrawTrSurf_BSplineCurve::ShowPoles () { drawPoles = Standard_True; } gp_Pnt2d p1(X,Y);
Index++;
Standard_Integer NbKnots = bc->NbKnots();
void DrawTrSurf_BSplineCurve::ShowKnots () { drawKnots = Standard_True; } while (Index <= NbKnots)
{
if (D.Project(bc->Value(bc->Knot(Index))).Distance(p1) <= Prec)
void DrawTrSurf_BSplineCurve::ClearPoles () { drawPoles = Standard_False; } {
return;
}
void DrawTrSurf_BSplineCurve::ClearKnots () { drawKnots = Standard_False; } Index++;
}
Index = 0;
void DrawTrSurf_BSplineCurve::FindPole ( }
const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real XPrec,
Standard_Integer& Index) const {
Handle(Geom_BSplineCurve) bc = Handle(Geom_BSplineCurve)::DownCast(curv);
Standard_Real Prec = XPrec / D.Zoom();
gp_Pnt2d p1(X/D.Zoom(),Y/D.Zoom());
Index++;
Standard_Integer NbPoles = bc->NbPoles();
while (Index <= NbPoles) {
if (D.Project(bc->Pole(Index)).Distance(p1) <= Prec)
return;
Index++;
}
Index = 0;
}
void DrawTrSurf_BSplineCurve::FindKnot (
const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec,
Standard_Integer& Index) const {
Handle(Geom_BSplineCurve) bc = Handle(Geom_BSplineCurve)::DownCast(curv);
gp_Pnt2d p1(X,Y);
Index++;
Standard_Integer NbKnots = bc->NbKnots();
while (Index <= NbKnots) {
if (D.Project(bc->Value(bc->Knot(Index))).Distance(p1) <= Prec)
return;
Index++;
}
Index = 0;
}
//======================================================================= //=======================================================================
//function : Copy //function : Copy
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_BSplineCurve::Copy() const
Handle(Draw_Drawable3D) DrawTrSurf_BSplineCurve::Copy()const
{ {
Handle(DrawTrSurf_BSplineCurve) DC = new DrawTrSurf_BSplineCurve Handle(DrawTrSurf_BSplineCurve) DC = new DrawTrSurf_BSplineCurve
(Handle(Geom_BSplineCurve)::DownCast(curv->Copy()), (Handle(Geom_BSplineCurve)::DownCast(curv->Copy()),
look,polesLook,knotsLook,knotsForm,knotsDim, look,polesLook,knotsLook,knotsForm,knotsDim,
drawPoles,drawKnots, drawPoles,drawKnots,
GetDiscretisation(),GetDeflection(),GetDrawMode()); GetDiscretisation(),GetDeflection(),GetDrawMode());
return DC; return DC;
} }
//=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_BSplineCurve::Restore (std::istream& theStream)
{
const DrawTrSurf_Params& aParams = DrawTrSurf::Parameters();
Handle(Geom_BSplineCurve) aGeomCurve = Handle(Geom_BSplineCurve)::DownCast (GeomTools_CurveSet::ReadCurve (theStream));
Handle(DrawTrSurf_BSplineCurve) aDrawCurve = new DrawTrSurf_BSplineCurve (aGeomCurve,
aParams.CurvColor, aParams.PolesColor, aParams.KnotsColor,
aParams.KnotsMarker, aParams.KnotsSize,
aParams.IsShowPoles, aParams.IsShowKnots,
aParams.Discret, aParams.Deflection, aParams.DrawMode);
return aDrawCurve;
}

108
src/DrawTrSurf/DrawTrSurf_BSplineCurve.hxx
View File

@ -17,55 +17,46 @@
#ifndef _DrawTrSurf_BSplineCurve_HeaderFile #ifndef _DrawTrSurf_BSplineCurve_HeaderFile
#define _DrawTrSurf_BSplineCurve_HeaderFile #define _DrawTrSurf_BSplineCurve_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Standard_Boolean.hxx>
#include <Draw_MarkerShape.hxx> #include <Draw_MarkerShape.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Standard_Integer.hxx>
#include <DrawTrSurf_Curve.hxx> #include <DrawTrSurf_Curve.hxx>
#include <Standard_Real.hxx>
class Geom_BSplineCurve; class Geom_BSplineCurve;
class Draw_Color; class Draw_Color;
class Draw_Display;
class Draw_Drawable3D;
class DrawTrSurf_BSplineCurve;
DEFINE_STANDARD_HANDLE(DrawTrSurf_BSplineCurve, DrawTrSurf_Curve) DEFINE_STANDARD_HANDLE(DrawTrSurf_BSplineCurve, DrawTrSurf_Curve)
class DrawTrSurf_BSplineCurve : public DrawTrSurf_Curve class DrawTrSurf_BSplineCurve : public DrawTrSurf_Curve
{ {
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BSplineCurve, DrawTrSurf_Curve)
Draw_Drawable3D_FACTORY
public: public:
//! creates a drawable BSpline curve from a BSpline curve of package Geom.
Standard_EXPORT DrawTrSurf_BSplineCurve (const Handle(Geom_BSplineCurve)& C);
//! creates a drawable BSpline curve from a BSpline curve of //! creates a drawable BSpline curve from a BSpline curve of package Geom.
//! package Geom. Standard_EXPORT DrawTrSurf_BSplineCurve (const Handle(Geom_BSplineCurve)& C,
Standard_EXPORT DrawTrSurf_BSplineCurve(const Handle(Geom_BSplineCurve)& C); const Draw_Color& CurvColor, const Draw_Color& PolesColor, const Draw_Color& KnotsColor, const Draw_MarkerShape KnotsShape,
const Standard_Integer KnotsSize, const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots,
const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode);
//! creates a drawable BSpline curve from a BSpline curve of Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
//! package Geom.
Standard_EXPORT DrawTrSurf_BSplineCurve(const Handle(Geom_BSplineCurve)& C, const Draw_Color& CurvColor, const Draw_Color& PolesColor, const Draw_Color& KnotsColor, const Draw_MarkerShape KnotsShape, const Standard_Integer KnotsSize, const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode); Standard_EXPORT void DrawOn (Draw_Display& dis,
const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots) const;
Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
Standard_EXPORT void DrawOn (Draw_Display& dis,
Standard_EXPORT void DrawOn (Draw_Display& dis, const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots) const; const Standard_Real U1, const Standard_Real U2, const Standard_Integer Pindex,
const Standard_Boolean ShowPoles = Standard_True, const Standard_Boolean ShowKnots = Standard_True) const;
Standard_EXPORT void DrawOn (Draw_Display& dis, const Standard_Real U1, const Standard_Real U2, const Standard_Integer Pindex, const Standard_Boolean ShowPoles = Standard_True, const Standard_Boolean ShowKnots = Standard_True) const;
void ShowPoles() { drawPoles = Standard_True; }
Standard_EXPORT void ShowPoles();
void ShowKnots() { drawKnots = Standard_True; }
Standard_EXPORT void ShowKnots();
void ClearPoles() { drawPoles = Standard_False; }
Standard_EXPORT void ClearPoles();
void ClearKnots() { drawKnots = Standard_False; }
Standard_EXPORT void ClearKnots();
//! Returns in <Index> the index of the first pole of the //! Returns in <Index> the index of the first pole of the
//! curve projected by the Display <D> at a distance lower //! curve projected by the Display <D> at a distance lower
@ -73,37 +64,26 @@ public:
//! set to 0, else index is always greater than the input //! set to 0, else index is always greater than the input
//! value of index. //! value of index.
Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const; Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const;
Standard_EXPORT void FindKnot (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const; Standard_EXPORT void FindKnot (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const;
void SetPolesColor (const Draw_Color& aColor); void SetPolesColor (const Draw_Color& theColor) { polesLook = theColor; }
void SetKnotsColor (const Draw_Color& aColor); void SetKnotsColor (const Draw_Color& theColor) { knotsLook = theColor; }
void SetKnotsShape (const Draw_MarkerShape Shape); void SetKnotsShape (const Draw_MarkerShape theShape) { knotsForm = theShape; }
Draw_MarkerShape KnotsShape() const; Draw_MarkerShape KnotsShape() const { return knotsForm; }
Draw_Color KnotsColor() const; Draw_Color KnotsColor() const { return knotsLook; }
Draw_Color PolesColor() const; Draw_Color PolesColor() const { return polesLook; }
//! For variable copy. //! For variable copy.
Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BSplineCurve,DrawTrSurf_Curve)
protected:
private: private:
Standard_Boolean drawPoles; Standard_Boolean drawPoles;
Standard_Boolean drawKnots; Standard_Boolean drawKnots;
Draw_MarkerShape knotsForm; Draw_MarkerShape knotsForm;
@ -111,14 +91,6 @@ private:
Standard_Integer knotsDim; Standard_Integer knotsDim;
Draw_Color polesLook; Draw_Color polesLook;
}; };
#include <DrawTrSurf_BSplineCurve.lxx>
#endif // _DrawTrSurf_BSplineCurve_HeaderFile #endif // _DrawTrSurf_BSplineCurve_HeaderFile

51
src/DrawTrSurf/DrawTrSurf_BSplineCurve.lxx
View File

@ -1,51 +0,0 @@
// 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.
inline void DrawTrSurf_BSplineCurve::SetPolesColor (
const Draw_Color& aColor) {
polesLook = aColor;
}
inline void DrawTrSurf_BSplineCurve::SetKnotsColor (
const Draw_Color& aColor) {
knotsLook = aColor;
}
inline void DrawTrSurf_BSplineCurve::SetKnotsShape (
const Draw_MarkerShape Shape) {
knotsForm = Shape;
}
inline Draw_MarkerShape DrawTrSurf_BSplineCurve::KnotsShape () const {
return knotsForm;
}
inline Draw_Color DrawTrSurf_BSplineCurve::KnotsColor () const {
return knotsLook;
}
inline Draw_Color DrawTrSurf_BSplineCurve::PolesColor () const {
return polesLook;
}

184
src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.cxx
View File

@ -12,54 +12,48 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <DrawTrSurf_BSplineCurve2d.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Draw_Display.hxx> #include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx>
#include <Draw_MarkerShape.hxx> #include <Draw_MarkerShape.hxx>
#include <DrawTrSurf_BSplineCurve2d.hxx> #include <DrawTrSurf.hxx>
#include <DrawTrSurf_Params.hxx>
#include <Geom2d_BSplineCurve.hxx> #include <Geom2d_BSplineCurve.hxx>
#include <GeomTools_Curve2dSet.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <Standard_Type.hxx>
#include <TColgp_Array1OfPnt2d.hxx> #include <TColgp_Array1OfPnt2d.hxx>
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BSplineCurve2d,DrawTrSurf_Curve2d) IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BSplineCurve2d, DrawTrSurf_Curve2d)
DrawTrSurf_BSplineCurve2d::DrawTrSurf_BSplineCurve2d ( DrawTrSurf_BSplineCurve2d::DrawTrSurf_BSplineCurve2d (const Handle(Geom2d_BSplineCurve)& C)
const Handle(Geom2d_BSplineCurve)& C) : DrawTrSurf_Curve2d (C, Draw_vert, 100)
: DrawTrSurf_Curve2d (C, Draw_vert, 100) {
drawKnots = Standard_True;
knotsForm = Draw_Losange;
knotsLook = Draw_violet;
knotsDim = 5;
drawPoles = Standard_True;
polesLook = Draw_rouge;
}
DrawTrSurf_BSplineCurve2d::DrawTrSurf_BSplineCurve2d (
const Handle(Geom2d_BSplineCurve)& C, const Draw_Color& CurvColor,
const Draw_Color& PolesColor, const Draw_Color& KnotsColor,
const Draw_MarkerShape KnotsShape, const Standard_Integer KnotsSize,
const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots, const Standard_Integer Discret)
: DrawTrSurf_Curve2d (C, CurvColor, Discret) {
drawKnots = ShowKnots;
knotsForm = KnotsShape;
knotsLook = KnotsColor;
knotsDim = KnotsSize;
drawPoles = ShowPoles;
polesLook = PolesColor;
}
void DrawTrSurf_BSplineCurve2d::DrawOn (Draw_Display& dis) const
{ {
drawKnots = Standard_True;
knotsForm = Draw_Losange;
knotsLook = Draw_violet;
knotsDim = 5;
drawPoles = Standard_True;
polesLook = Draw_rouge;
}
DrawTrSurf_BSplineCurve2d::DrawTrSurf_BSplineCurve2d (const Handle(Geom2d_BSplineCurve)& C, const Draw_Color& CurvColor,
const Draw_Color& PolesColor, const Draw_Color& KnotsColor,
const Draw_MarkerShape KnotsShape, const Standard_Integer KnotsSize,
const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots, const Standard_Integer Discret)
: DrawTrSurf_Curve2d (C, CurvColor, Discret)
{
drawKnots = ShowKnots;
knotsForm = KnotsShape;
knotsLook = KnotsColor;
knotsDim = KnotsSize;
drawPoles = ShowPoles;
polesLook = PolesColor;
}
void DrawTrSurf_BSplineCurve2d::DrawOn (Draw_Display& dis) const
{
Handle(Geom2d_BSplineCurve) C = Handle(Geom2d_BSplineCurve)::DownCast(curv); Handle(Geom2d_BSplineCurve) C = Handle(Geom2d_BSplineCurve)::DownCast(curv);
if (drawPoles) { if (drawPoles) {
@ -89,74 +83,78 @@ void DrawTrSurf_BSplineCurve2d::DrawOn (Draw_Display& dis) const
} }
} }
void DrawTrSurf_BSplineCurve2d::FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real XPrec,
Standard_Integer& Index) const
{
Handle(Geom2d_BSplineCurve) bc = Handle(Geom2d_BSplineCurve)::DownCast(curv);
Standard_Real Prec = XPrec / D.Zoom();
gp_Pnt2d p1(X/D.Zoom(),Y/D.Zoom());
Index++;
Standard_Integer NbPoles = bc->NbPoles();
gp_Pnt P;
gp_Pnt2d P2d;
while (Index <= NbPoles)
{
P2d = bc->Pole(Index);
P.SetCoord (P2d.X(), P2d.Y(), 0.0);
if (D.Project(P).Distance(p1) <= Prec)
{
return;
}
Index++;
}
Index = 0;
}
void DrawTrSurf_BSplineCurve2d::ShowPoles () { drawPoles = Standard_True; } void DrawTrSurf_BSplineCurve2d::FindKnot (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec,
Standard_Integer& Index) const
{
void DrawTrSurf_BSplineCurve2d::ShowKnots () { drawKnots = Standard_True; } Handle(Geom2d_BSplineCurve) bc = Handle(Geom2d_BSplineCurve)::DownCast(curv);
gp_Pnt2d P2d;
gp_Pnt P;
void DrawTrSurf_BSplineCurve2d::ClearPoles () { drawPoles = Standard_False; } gp_Pnt2d p1(X,Y);
Index++;
Standard_Integer NbKnots = bc->NbKnots();
void DrawTrSurf_BSplineCurve2d::ClearKnots () { drawKnots = Standard_False; } while (Index <= NbKnots)
{
P2d = bc->Value(bc->Knot(Index));
void DrawTrSurf_BSplineCurve2d::FindPole ( P.SetCoord (P2d.X(), P2d.Y(), 0.0);
const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real XPrec, if (D.Project(P).Distance(p1) <= Prec)
Standard_Integer& Index) const { {
return;
Handle(Geom2d_BSplineCurve) bc = Handle(Geom2d_BSplineCurve)::DownCast(curv); }
Standard_Real Prec = XPrec / D.Zoom(); Index++;
gp_Pnt2d p1(X/D.Zoom(),Y/D.Zoom()); }
Index++; Index = 0;
Standard_Integer NbPoles = bc->NbPoles(); }
gp_Pnt P;
gp_Pnt2d P2d;
while (Index <= NbPoles) {
P2d = bc->Pole(Index);
P.SetCoord (P2d.X(), P2d.Y(), 0.0);
if (D.Project(P).Distance(p1) <= Prec)
return;
Index++;
}
Index = 0;
}
void DrawTrSurf_BSplineCurve2d::FindKnot (
const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec,
Standard_Integer& Index) const {
Handle(Geom2d_BSplineCurve) bc = Handle(Geom2d_BSplineCurve)::DownCast(curv);
gp_Pnt2d P2d;
gp_Pnt P;
gp_Pnt2d p1(X,Y);
Index++;
Standard_Integer NbKnots = bc->NbKnots();
while (Index <= NbKnots) {
P2d = bc->Value(bc->Knot(Index));
P.SetCoord (P2d.X(), P2d.Y(), 0.0);
if (D.Project(P).Distance(p1) <= Prec)
return;
Index++;
}
Index = 0;
}
//======================================================================= //=======================================================================
//function : Copy //function : Copy
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_BSplineCurve2d::Copy() const
Handle(Draw_Drawable3D) DrawTrSurf_BSplineCurve2d::Copy()const
{ {
Handle(DrawTrSurf_BSplineCurve2d) DC = new DrawTrSurf_BSplineCurve2d Handle(DrawTrSurf_BSplineCurve2d) DC = new DrawTrSurf_BSplineCurve2d
(Handle(Geom2d_BSplineCurve)::DownCast(curv->Copy()), (Handle(Geom2d_BSplineCurve)::DownCast(curv->Copy()),
look,polesLook,knotsLook,knotsForm,knotsDim, look,polesLook,knotsLook,knotsForm,knotsDim,
drawPoles,drawKnots, drawPoles,drawKnots,
GetDiscretisation()); GetDiscretisation());
return DC; return DC;
} }
//=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_BSplineCurve2d::Restore (Standard_IStream& theStream)
{
const DrawTrSurf_Params& aParams = DrawTrSurf::Parameters();
Handle(Geom2d_BSplineCurve) aGeomCurve = Handle(Geom2d_BSplineCurve)::DownCast (GeomTools_Curve2dSet::ReadCurve2d (theStream));
Handle(DrawTrSurf_BSplineCurve2d) aDrawCurve = new DrawTrSurf_BSplineCurve2d (aGeomCurve,
aParams.CurvColor, aParams.PolesColor, aParams.KnotsColor,
aParams.KnotsMarker, aParams.KnotsSize,
aParams.IsShowPoles, aParams.IsShowKnots,
aParams.Discret);
return aDrawCurve;
}

96
src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.hxx
View File

@ -17,85 +17,65 @@
#ifndef _DrawTrSurf_BSplineCurve2d_HeaderFile #ifndef _DrawTrSurf_BSplineCurve2d_HeaderFile
#define _DrawTrSurf_BSplineCurve2d_HeaderFile #define _DrawTrSurf_BSplineCurve2d_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Standard_Boolean.hxx>
#include <Draw_MarkerShape.hxx> #include <Draw_MarkerShape.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Standard_Integer.hxx>
#include <DrawTrSurf_Curve2d.hxx> #include <DrawTrSurf_Curve2d.hxx>
#include <Standard_Real.hxx>
class Geom2d_BSplineCurve; class Geom2d_BSplineCurve;
class Draw_Color; class Draw_Color;
class Draw_Display;
class Draw_Drawable3D;
class DrawTrSurf_BSplineCurve2d;
DEFINE_STANDARD_HANDLE(DrawTrSurf_BSplineCurve2d, DrawTrSurf_Curve2d) DEFINE_STANDARD_HANDLE(DrawTrSurf_BSplineCurve2d, DrawTrSurf_Curve2d)
class DrawTrSurf_BSplineCurve2d : public DrawTrSurf_Curve2d class DrawTrSurf_BSplineCurve2d : public DrawTrSurf_Curve2d
{ {
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BSplineCurve2d, DrawTrSurf_Curve2d)
Draw_Drawable3D_FACTORY
public: public:
//! creates a drawable BSpline curve from a BSpline curve of package Geom2d.
Standard_EXPORT DrawTrSurf_BSplineCurve2d (const Handle(Geom2d_BSplineCurve)& C);
Standard_EXPORT DrawTrSurf_BSplineCurve2d (const Handle(Geom2d_BSplineCurve)& C,
const Draw_Color& CurvColor, const Draw_Color& PolesColor,
const Draw_Color& KnotsColor, const Draw_MarkerShape KnotsShape, const Standard_Integer KnotsSize,
const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots, const Standard_Integer Discret);
Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
void ShowPoles() { drawPoles = Standard_True; }
void ShowKnots() { drawKnots = Standard_True; }
void ClearPoles() { drawPoles = Standard_False; }
void ClearKnots() { drawKnots = Standard_False; }
//! creates a drawable BSpline curve from a BSpline curve of
//! package Geom2d.
Standard_EXPORT DrawTrSurf_BSplineCurve2d(const Handle(Geom2d_BSplineCurve)& C);
Standard_EXPORT DrawTrSurf_BSplineCurve2d(const Handle(Geom2d_BSplineCurve)& C, const Draw_Color& CurvColor, const Draw_Color& PolesColor, const Draw_Color& KnotsColor, const Draw_MarkerShape KnotsShape, const Standard_Integer KnotsSize, const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots, const Standard_Integer Discret);
Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
Standard_EXPORT void ShowPoles();
Standard_EXPORT void ShowKnots();
Standard_EXPORT void ClearPoles();
Standard_EXPORT void ClearKnots();
//! Returns in <Index> the index of the first pole of the //! Returns in <Index> the index of the first pole of the
//! curve projected by the Display <D> at a distance lower //! curve projected by the Display <D> at a distance lower
//! than <Prec> from <X,Y>. If no pole is found index is //! than <Prec> from <X,Y>. If no pole is found index is
//! set to 0, else index is always greater than the input //! set to 0, else index is always greater than the input
//! value of index. //! value of index.
Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const; Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const;
Standard_EXPORT void FindKnot (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const; Standard_EXPORT void FindKnot (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const;
void SetPolesColor (const Draw_Color& aColor); void SetPolesColor (const Draw_Color& theColor) { polesLook = theColor; }
void SetKnotsColor (const Draw_Color& aColor); void SetKnotsColor (const Draw_Color& theColor) { knotsLook = theColor; }
void SetKnotsShape (const Draw_MarkerShape Shape); void SetKnotsShape (const Draw_MarkerShape theShape) { knotsForm = theShape; }
Draw_MarkerShape KnotsShape() const; Draw_MarkerShape KnotsShape() const { return knotsForm; }
Draw_Color KnotsColor() const; Draw_Color KnotsColor() const { return knotsLook; }
Draw_Color PolesColor() const; Draw_Color PolesColor() const { return polesLook; }
//! For variable copy. //! For variable copy.
Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BSplineCurve2d,DrawTrSurf_Curve2d)
protected:
private: private:
Standard_Boolean drawPoles; Standard_Boolean drawPoles;
Standard_Boolean drawKnots; Standard_Boolean drawKnots;
Draw_MarkerShape knotsForm; Draw_MarkerShape knotsForm;
@ -103,14 +83,6 @@ private:
Standard_Integer knotsDim; Standard_Integer knotsDim;
Draw_Color polesLook; Draw_Color polesLook;
}; };
#include <DrawTrSurf_BSplineCurve2d.lxx>
#endif // _DrawTrSurf_BSplineCurve2d_HeaderFile #endif // _DrawTrSurf_BSplineCurve2d_HeaderFile

52
src/DrawTrSurf/DrawTrSurf_BSplineCurve2d.lxx
View File

@ -1,52 +0,0 @@
// 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.
inline void DrawTrSurf_BSplineCurve2d::SetPolesColor (
const Draw_Color& aColor) {
polesLook = aColor;
}
inline void DrawTrSurf_BSplineCurve2d::SetKnotsColor (
const Draw_Color& aColor) {
knotsLook = aColor;
}
inline void DrawTrSurf_BSplineCurve2d::SetKnotsShape (
const Draw_MarkerShape Shape) {
knotsForm = Shape;
}
inline Draw_MarkerShape DrawTrSurf_BSplineCurve2d::KnotsShape () const {
return knotsForm;
}
inline Draw_Color DrawTrSurf_BSplineCurve2d::KnotsColor () const {
return knotsLook;
}
inline Draw_Color DrawTrSurf_BSplineCurve2d::PolesColor () const {
return polesLook;
}

382
src/DrawTrSurf/DrawTrSurf_BSplineSurface.cxx
View File

@ -12,117 +12,115 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <DrawTrSurf_BSplineSurface.hxx>
#include <Adaptor3d_IsoCurve.hxx> #include <Adaptor3d_IsoCurve.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Draw_Display.hxx> #include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx>
#include <Draw_MarkerShape.hxx> #include <Draw_MarkerShape.hxx>
#include <DrawTrSurf.hxx>
#include <DrawTrSurf_BSplineCurve.hxx> #include <DrawTrSurf_BSplineCurve.hxx>
#include <DrawTrSurf_BSplineSurface.hxx> #include <DrawTrSurf_Params.hxx>
#include <Geom_BSplineSurface.hxx> #include <Geom_BSplineSurface.hxx>
#include <GeomAdaptor_Surface.hxx> #include <GeomAdaptor_Surface.hxx>
#include <GeomAdaptor_Surface.hxx> #include <GeomTools_SurfaceSet.hxx>
#include <gp_Pnt2d.hxx> #include <gp_Pnt2d.hxx>
#include <Standard_Type.hxx>
#include <TColgp_Array2OfPnt.hxx> #include <TColgp_Array2OfPnt.hxx>
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BSplineSurface,DrawTrSurf_Surface) IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BSplineSurface, DrawTrSurf_Surface)
DrawTrSurf_BSplineSurface::DrawTrSurf_BSplineSurface ( DrawTrSurf_BSplineSurface::DrawTrSurf_BSplineSurface (const Handle(Geom_BSplineSurface)& S)
const Handle(Geom_BSplineSurface)& S) : DrawTrSurf_Surface (S, S->NbUKnots()-2, S->NbVKnots()-2,
: DrawTrSurf_Surface (S, S->NbUKnots()-2, S->NbVKnots()-2, Draw_jaune, Draw_bleu, 30, 0.05, 0)
Draw_jaune, Draw_bleu, 30, 0.05, 0){ {
drawPoles = Standard_True;
drawKnots = Standard_True;
knotsIsos = Standard_True;
knotsForm = Draw_Losange;
knotsLook = Draw_violet;
knotsDim = 5;
polesLook = Draw_rouge;
}
drawPoles = Standard_True; DrawTrSurf_BSplineSurface::DrawTrSurf_BSplineSurface (const Handle(Geom_BSplineSurface)& S, const Draw_Color& BoundsColor,
drawKnots = Standard_True; const Draw_Color& IsosColor, const Draw_Color& PolesColor,
knotsIsos = Standard_True; const Draw_Color& KnotsColor, const Draw_MarkerShape KnotsShape,
knotsForm = Draw_Losange; const Standard_Integer KnotsSize, const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots,
knotsLook = Draw_violet; const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode)
knotsDim = 5; : DrawTrSurf_Surface (S, S->NbUKnots()-2, S->NbVKnots()-2, BoundsColor,
polesLook = Draw_rouge; IsosColor, Discret, Deflection, DrawMode)
} {
knotsIsos = Standard_True;
drawPoles = ShowPoles;
drawKnots = ShowKnots;
knotsForm = KnotsShape;
knotsLook = KnotsColor;
knotsDim = KnotsSize;
polesLook = PolesColor;
}
DrawTrSurf_BSplineSurface::DrawTrSurf_BSplineSurface (const Handle(Geom_BSplineSurface)& S, const Standard_Integer NbUIsos,
const Standard_Integer NbVIsos, const Draw_Color& BoundsColor,
const Draw_Color& IsosColor, const Draw_Color& PolesColor,
const Draw_Color& KnotsColor, const Draw_MarkerShape KnotsShape,
const Standard_Integer KnotsSize, const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots,
const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode)
: DrawTrSurf_Surface (S, Abs(NbUIsos), Abs(NbVIsos), BoundsColor,
IsosColor, Discret, Deflection, DrawMode)
{
knotsIsos = Standard_False;
drawPoles = ShowPoles;
drawKnots = ShowKnots;
knotsForm = KnotsShape;
knotsLook = KnotsColor;
knotsDim = KnotsSize;
polesLook = PolesColor;
}
void DrawTrSurf_BSplineSurface::DrawOn (Draw_Display& dis) const
{
DrawTrSurf_BSplineSurface::DrawTrSurf_BSplineSurface (
const Handle(Geom_BSplineSurface)& S, const Draw_Color& BoundsColor,
const Draw_Color& IsosColor, const Draw_Color& PolesColor,
const Draw_Color& KnotsColor, const Draw_MarkerShape KnotsShape,
const Standard_Integer KnotsSize, const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots,
const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode)
: DrawTrSurf_Surface (S, S->NbUKnots()-2, S->NbVKnots()-2, BoundsColor,
IsosColor, Discret, Deflection, DrawMode){
knotsIsos = Standard_True;
drawPoles = ShowPoles;
drawKnots = ShowKnots;
knotsForm = KnotsShape;
knotsLook = KnotsColor;
knotsDim = KnotsSize;
polesLook = PolesColor;
}
DrawTrSurf_BSplineSurface::DrawTrSurf_BSplineSurface (
const Handle(Geom_BSplineSurface)& S, const Standard_Integer NbUIsos,
const Standard_Integer NbVIsos, const Draw_Color& BoundsColor,
const Draw_Color& IsosColor, const Draw_Color& PolesColor,
const Draw_Color& KnotsColor, const Draw_MarkerShape KnotsShape,
const Standard_Integer KnotsSize, const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots,
const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode)
: DrawTrSurf_Surface (S, Abs(NbUIsos), Abs(NbVIsos), BoundsColor,
IsosColor, Discret, Deflection, DrawMode){
knotsIsos = Standard_False;
drawPoles = ShowPoles;
drawKnots = ShowKnots;
knotsForm = KnotsShape;
knotsLook = KnotsColor;
knotsDim = KnotsSize;
polesLook = PolesColor;
}
void DrawTrSurf_BSplineSurface::DrawOn (Draw_Display& dis) const {
Handle(Geom_BSplineSurface) S = Handle(Geom_BSplineSurface)::DownCast(surf); Handle(Geom_BSplineSurface) S = Handle(Geom_BSplineSurface)::DownCast(surf);
Standard_Integer i, j; Standard_Integer i, j;
Standard_Real Ua,Ub,Va,Vb; Standard_Real Ua,Ub,Va,Vb;
S->Bounds(Ua,Ub,Va,Vb); S->Bounds(Ua,Ub,Va,Vb);
if (drawPoles) { if (drawPoles)
{
Standard_Integer NbUPoles = S->NbUPoles(); Standard_Integer NbUPoles = S->NbUPoles();
Standard_Integer NbVPoles = S->NbVPoles(); Standard_Integer NbVPoles = S->NbVPoles();
dis.SetColor(polesLook); dis.SetColor(polesLook);
TColgp_Array2OfPnt SPoles (1, NbUPoles, 1, NbVPoles); TColgp_Array2OfPnt SPoles (1, NbUPoles, 1, NbVPoles);
S->Poles (SPoles); S->Poles (SPoles);
for (j = 1; j <= NbVPoles; j++) { for (j = 1; j <= NbVPoles; j++)
{
dis.MoveTo(SPoles(1, j)); dis.MoveTo(SPoles(1, j));
for (i = 2; i <= NbUPoles; i++) { for (i = 2; i <= NbUPoles; i++)
dis.DrawTo(SPoles(i, j)); {
dis.DrawTo(SPoles(i, j));
} }
if (S->IsUPeriodic()) if (S->IsUPeriodic())
dis.DrawTo(SPoles(1,j)); {
dis.DrawTo(SPoles(1,j));
}
} }
for (i = 1; i <= NbUPoles; i++) { for (i = 1; i <= NbUPoles; i++)
{
dis.MoveTo(SPoles(i, 1)); dis.MoveTo(SPoles(i, 1));
for (j = 2; j <= NbVPoles; j++) { for (j = 2; j <= NbVPoles; j++)
dis.DrawTo(SPoles(i, j)); {
dis.DrawTo(SPoles(i, j));
} }
if (S->IsVPeriodic()) if (S->IsVPeriodic())
dis.DrawTo(SPoles(i,1)); {
dis.DrawTo(SPoles(i,1));
}
} }
} }
if (knotsIsos)
if (knotsIsos) { {
Standard_Integer first, last; Standard_Integer first, last;
Handle(GeomAdaptor_Surface) HS = new GeomAdaptor_Surface(); Handle(GeomAdaptor_Surface) HS = new GeomAdaptor_Surface();
HS->Load(surf); HS->Load(surf);
@ -132,19 +130,22 @@ void DrawTrSurf_BSplineSurface::DrawOn (Draw_Display& dis) const {
dis.SetColor(isosLook); dis.SetColor(isosLook);
first = S->FirstUKnotIndex() + 1; first = S->FirstUKnotIndex() + 1;
last = S->LastUKnotIndex() - 1; last = S->LastUKnotIndex() - 1;
for (i = first; i <= last; i++) { for (i = first; i <= last; i++)
{
DrawIsoCurveOn(C,GeomAbs_IsoU,S->UKnot(i),Va,Vb,dis); DrawIsoCurveOn(C,GeomAbs_IsoU,S->UKnot(i),Va,Vb,dis);
} }
first = S->FirstVKnotIndex() + 1; first = S->FirstVKnotIndex() + 1;
last = S->LastVKnotIndex() - 1; last = S->LastVKnotIndex() - 1;
for (j = first; j <= last; j++) { for (j = first; j <= last; j++)
{
DrawIsoCurveOn(C,GeomAbs_IsoV,S->VKnot(j),Ua,Ub,dis); DrawIsoCurveOn(C,GeomAbs_IsoV,S->VKnot(j),Ua,Ub,dis);
} }
} }
DrawTrSurf_Surface::DrawOn(dis,!knotsIsos); DrawTrSurf_Surface::DrawOn(dis,!knotsIsos);
if (drawKnots) { if (drawKnots)
{
Standard_Integer first, last; Standard_Integer first, last;
Standard_Integer NbUKnots = S->NbUKnots(); Standard_Integer NbUKnots = S->NbUKnots();
TColStd_Array1OfReal SUKnots (1, NbUKnots); TColStd_Array1OfReal SUKnots (1, NbUKnots);
@ -152,7 +153,8 @@ void DrawTrSurf_BSplineSurface::DrawOn (Draw_Display& dis) const {
dis.SetColor(knotsLook); dis.SetColor(knotsLook);
first = S->FirstUKnotIndex(); first = S->FirstUKnotIndex();
last = S->LastUKnotIndex(); last = S->LastUKnotIndex();
for (i = first; i <= last; i++) { for (i = first; i <= last; i++)
{
dis.DrawMarker (S->Value (SUKnots(i), Va), knotsForm, knotsDim); dis.DrawMarker (S->Value (SUKnots(i), Va), knotsForm, knotsDim);
} }
Standard_Integer NbVKnots = S->NbVKnots(); Standard_Integer NbVKnots = S->NbVKnots();
@ -161,145 +163,155 @@ void DrawTrSurf_BSplineSurface::DrawOn (Draw_Display& dis) const {
dis.SetColor(knotsLook); dis.SetColor(knotsLook);
first = S->FirstVKnotIndex(); first = S->FirstVKnotIndex();
last = S->LastVKnotIndex(); last = S->LastVKnotIndex();
for (j = first; j <= last; j++) { for (j = first; j <= last; j++)
{
dis.DrawMarker (S->Value (Ua, SVKnots(j)), knotsForm, knotsDim); dis.DrawMarker (S->Value (Ua, SVKnots(j)), knotsForm, knotsDim);
} }
} }
} }
void DrawTrSurf_BSplineSurface::ShowKnotsIsos()
{
knotsIsos = Standard_True;
Handle(Geom_BSplineSurface) S = Handle(Geom_BSplineSurface)::DownCast(surf);
nbUIsos = S->NbUKnots()-2;
nbVIsos = S->NbVKnots()-2;
}
void DrawTrSurf_BSplineSurface::ClearIsos()
{
knotsIsos = Standard_False;
nbUIsos = 0;
nbVIsos = 0;
}
void DrawTrSurf_BSplineSurface::ShowIsos (const Standard_Integer Nu, const Standard_Integer Nv)
{
knotsIsos = Standard_False;
nbUIsos = Abs(Nu);
nbVIsos = Abs(Nv);
}
void DrawTrSurf_BSplineSurface::FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real XPrec,
Standard_Integer& UIndex, Standard_Integer& VIndex) const
{
void DrawTrSurf_BSplineSurface::ShowPoles () { drawPoles = Standard_True; } Handle(Geom_BSplineSurface) bs = Handle(Geom_BSplineSurface)::DownCast(surf);
gp_Pnt2d p1(X/D.Zoom(),Y/D.Zoom());
Standard_Real Prec = XPrec / D.Zoom();
void DrawTrSurf_BSplineSurface::ShowKnots () { drawKnots = Standard_True; } UIndex++;
VIndex++;
Standard_Integer NbUPoles = bs->NbUPoles();
void DrawTrSurf_BSplineSurface::ClearPoles () { drawPoles = Standard_False; } Standard_Integer NbVPoles = bs->NbVPoles();
while (VIndex <= NbVPoles)
{
void DrawTrSurf_BSplineSurface::ShowKnotsIsos () { while (UIndex <= NbUPoles)
knotsIsos = Standard_True; {
Handle(Geom_BSplineSurface) S = Handle(Geom_BSplineSurface)::DownCast(surf); if (D.Project(bs->Pole(UIndex, VIndex)).Distance(p1) <= Prec)
nbUIsos = S->NbUKnots()-2; {
nbVIsos = S->NbVKnots()-2; return;
}
UIndex++;
}
UIndex = 1;
VIndex++;
} }
UIndex = VIndex = 0;
}
void DrawTrSurf_BSplineSurface::FindUKnot (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec,
Standard_Integer& UIndex) const
void DrawTrSurf_BSplineSurface::ClearIsos () { {
Handle(Geom_BSplineSurface) bs = Handle(Geom_BSplineSurface)::DownCast(surf);
knotsIsos = Standard_False; gp_Pnt2d p1(X,Y);
nbUIsos = 0; UIndex++;
nbVIsos = 0; Standard_Integer NbUKnots = bs->NbUKnots();
Standard_Real U1, U2, V1, V2;
surf->Bounds (U1, U2, V1, V2);
while (UIndex <= NbUKnots)
{
if (D.Project(bs->Value(bs->UKnot(UIndex), V1)).Distance(p1) <= Prec)
{
return;
}
UIndex++;
} }
UIndex = 0;
}
void DrawTrSurf_BSplineSurface::FindVKnot (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec,
void DrawTrSurf_BSplineSurface::ShowIsos ( Standard_Integer& VIndex) const
const Standard_Integer Nu, const Standard_Integer Nv) { {
Handle(Geom_BSplineSurface) bs = Handle(Geom_BSplineSurface)::DownCast(surf);
knotsIsos = Standard_False; gp_Pnt2d p1(X,Y);
nbUIsos = Abs(Nu); VIndex++;
nbVIsos = Abs(Nv); Standard_Integer NbVKnots = bs->NbVKnots();
Standard_Real U1, U2, V1, V2;
surf->Bounds (U1, U2, V1, V2);
while (VIndex <= NbVKnots)
{
if (D.Project(bs->Value(U1, bs->VKnot(VIndex))).Distance(p1) <= Prec)
{
return;
}
VIndex++;
} }
VIndex = 0;
}
void DrawTrSurf_BSplineSurface::ClearKnots () { drawKnots = Standard_False; }
void DrawTrSurf_BSplineSurface::FindPole (
const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real XPrec,
Standard_Integer& UIndex, Standard_Integer& VIndex) const {
Handle(Geom_BSplineSurface) bs = Handle(Geom_BSplineSurface)::DownCast(surf);
gp_Pnt2d p1(X/D.Zoom(),Y/D.Zoom());
Standard_Real Prec = XPrec / D.Zoom();
UIndex++;
VIndex++;
Standard_Integer NbUPoles = bs->NbUPoles();
Standard_Integer NbVPoles = bs->NbVPoles();
while (VIndex <= NbVPoles) {
while (UIndex <= NbUPoles) {
if (D.Project(bs->Pole(UIndex, VIndex)).Distance(p1) <= Prec)
return;
UIndex++;
}
UIndex = 1;
VIndex++;
}
UIndex = VIndex = 0;
}
void DrawTrSurf_BSplineSurface::FindUKnot (
const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec,
Standard_Integer& UIndex) const {
Handle(Geom_BSplineSurface) bs = Handle(Geom_BSplineSurface)::DownCast(surf);
gp_Pnt2d p1(X,Y);
UIndex++;
Standard_Integer NbUKnots = bs->NbUKnots();
Standard_Real U1, U2, V1, V2;
surf->Bounds (U1, U2, V1, V2);
while (UIndex <= NbUKnots) {
if (D.Project(bs->Value(bs->UKnot(UIndex), V1)).Distance(p1) <= Prec)
return;
UIndex++;
}
UIndex = 0;
}
void DrawTrSurf_BSplineSurface::FindVKnot (
const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec,
Standard_Integer& VIndex) const {
Handle(Geom_BSplineSurface) bs = Handle(Geom_BSplineSurface)::DownCast(surf);
gp_Pnt2d p1(X,Y);
VIndex++;
Standard_Integer NbVKnots = bs->NbVKnots();
Standard_Real U1, U2, V1, V2;
surf->Bounds (U1, U2, V1, V2);
while (VIndex <= NbVKnots) {
if (D.Project(bs->Value(U1, bs->VKnot(VIndex))).Distance(p1) <= Prec)
return;
VIndex++;
}
VIndex = 0;
}
//======================================================================= //=======================================================================
//function : Copy //function : Copy
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_BSplineSurface::Copy() const
Handle(Draw_Drawable3D) DrawTrSurf_BSplineSurface::Copy()const
{ {
Handle(DrawTrSurf_BSplineSurface) DS; Handle(DrawTrSurf_BSplineSurface) DS;
if (!knotsIsos) if (!knotsIsos)
{
DS = new DrawTrSurf_BSplineSurface DS = new DrawTrSurf_BSplineSurface
(Handle(Geom_BSplineSurface)::DownCast(surf->Copy()), (Handle(Geom_BSplineSurface)::DownCast(surf->Copy()),
nbUIsos,nbVIsos, nbUIsos,nbVIsos,
boundsLook,isosLook,polesLook,knotsLook, boundsLook,isosLook,polesLook,knotsLook,
knotsForm,knotsDim,drawPoles,drawKnots, knotsForm,knotsDim,drawPoles,drawKnots,
GetDiscretisation(),GetDeflection(),GetDrawMode()); GetDiscretisation(),GetDeflection(),GetDrawMode());
}
else else
{
DS = new DrawTrSurf_BSplineSurface DS = new DrawTrSurf_BSplineSurface
(Handle(Geom_BSplineSurface)::DownCast(surf->Copy()), (Handle(Geom_BSplineSurface)::DownCast(surf->Copy()),
boundsLook,isosLook,polesLook,knotsLook, boundsLook,isosLook,polesLook,knotsLook,
knotsForm,knotsDim,drawPoles,drawKnots, knotsForm,knotsDim,drawPoles,drawKnots,
GetDiscretisation(),GetDeflection(),GetDrawMode()); GetDiscretisation(),GetDeflection(),GetDrawMode());
}
return DS; return DS;
} }
//=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_BSplineSurface::Restore (Standard_IStream& theStream)
{
const DrawTrSurf_Params& aParams = DrawTrSurf::Parameters();
Handle(Geom_BSplineSurface) aGeomSurface = Handle(Geom_BSplineSurface)::DownCast (GeomTools_SurfaceSet::ReadSurface (theStream));
Handle(DrawTrSurf_BSplineSurface) aDrawSurface;
if (!aParams.NeedKnotsIsos)
{
aDrawSurface = new DrawTrSurf_BSplineSurface (aGeomSurface,
aParams.NbUIsos, aParams.NbVIsos,
aParams.BoundsColor, aParams.IsosColor,
aParams.PolesColor, aParams.KnotsColor,
aParams.KnotsMarker, aParams.KnotsSize,
aParams.IsShowPoles, aParams.IsShowKnots,
aParams.Discret, aParams.Deflection, aParams.DrawMode);
}
else
{
aDrawSurface = new DrawTrSurf_BSplineSurface (aGeomSurface,
aParams.BoundsColor, aParams.IsosColor,
aParams.PolesColor, aParams.KnotsColor,
aParams.KnotsMarker, aParams.KnotsSize,
aParams.IsShowPoles, aParams.IsShowKnots,
aParams.Discret, aParams.Deflection, aParams.DrawMode);
}
return aDrawSurface;
}

114
src/DrawTrSurf/DrawTrSurf_BSplineSurface.hxx
View File

@ -17,25 +17,15 @@
#ifndef _DrawTrSurf_BSplineSurface_HeaderFile #ifndef _DrawTrSurf_BSplineSurface_HeaderFile
#define _DrawTrSurf_BSplineSurface_HeaderFile #define _DrawTrSurf_BSplineSurface_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Standard_Boolean.hxx>
#include <Draw_MarkerShape.hxx> #include <Draw_MarkerShape.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Standard_Integer.hxx>
#include <DrawTrSurf_Surface.hxx> #include <DrawTrSurf_Surface.hxx>
#include <Standard_Real.hxx>
class Geom_BSplineSurface; class Geom_BSplineSurface;
class Draw_Color; class Draw_Color;
class Draw_Display;
class Draw_Drawable3D;
class DrawTrSurf_BSplineSurface;
DEFINE_STANDARD_HANDLE(DrawTrSurf_BSplineSurface, DrawTrSurf_Surface) DEFINE_STANDARD_HANDLE(DrawTrSurf_BSplineSurface, DrawTrSurf_Surface)
//! This class defines a drawable BSplineSurface. //! This class defines a drawable BSplineSurface.
//! With this class you can draw the control points and the knots //! With this class you can draw the control points and the knots
//! of the surface. //! of the surface.
@ -43,80 +33,74 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_BSplineSurface, DrawTrSurf_Surface)
//! if you just want to sea boundaries and isoparametric curves. //! if you just want to sea boundaries and isoparametric curves.
class DrawTrSurf_BSplineSurface : public DrawTrSurf_Surface class DrawTrSurf_BSplineSurface : public DrawTrSurf_Surface
{ {
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BSplineSurface, DrawTrSurf_Surface)
Draw_Drawable3D_FACTORY
public: public:
//! default drawing mode. //! default drawing mode.
//! The isoparametric curves corresponding to the knots values are //! The isoparametric curves corresponding to the knots values are drawn.
//! drawn.
//! The control points and the knots points are drawn. //! The control points and the knots points are drawn.
//! The boundaries are yellow, the isoparametric curves are blues. //! The boundaries are yellow, the isoparametric curves are blues.
//! For the discretisation 50 points are computed in each parametric //! For the discretisation 50 points are computed in each parametric direction.
//! direction. Standard_EXPORT DrawTrSurf_BSplineSurface (const Handle(Geom_BSplineSurface)& S);
Standard_EXPORT DrawTrSurf_BSplineSurface(const Handle(Geom_BSplineSurface)& S);
//! The isoparametric curves corresponding to the knots values are drawn.
Standard_EXPORT DrawTrSurf_BSplineSurface (const Handle(Geom_BSplineSurface)& S,
const Draw_Color& BoundsColor, const Draw_Color& IsosColor, const Draw_Color& PolesColor,
const Draw_Color& KnotsColor, const Draw_MarkerShape KnotsShape, const Standard_Integer KnotsSize,
const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots,
const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode);
//! The isoparametric curves corresponding to the knots values are
//! drawn.
Standard_EXPORT DrawTrSurf_BSplineSurface(const Handle(Geom_BSplineSurface)& S, const Draw_Color& BoundsColor, const Draw_Color& IsosColor, const Draw_Color& PolesColor, const Draw_Color& KnotsColor, const Draw_MarkerShape KnotsShape, const Standard_Integer KnotsSize, const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode);
//! Parametric equidistant iso curves are drawn. //! Parametric equidistant iso curves are drawn.
Standard_EXPORT DrawTrSurf_BSplineSurface(const Handle(Geom_BSplineSurface)& S, const Standard_Integer NbUIsos, const Standard_Integer NbVIsos, const Draw_Color& BoundsColor, const Draw_Color& IsosColor, const Draw_Color& PolesColor, const Draw_Color& KnotsColor, const Draw_MarkerShape KnotsShape, const Standard_Integer KnotsSize, const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode); Standard_EXPORT DrawTrSurf_BSplineSurface (const Handle(Geom_BSplineSurface)& S,
const Standard_Integer NbUIsos, const Standard_Integer NbVIsos,
Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; const Draw_Color& BoundsColor, const Draw_Color& IsosColor, const Draw_Color& PolesColor,
const Draw_Color& KnotsColor, const Draw_MarkerShape KnotsShape, const Standard_Integer KnotsSize,
Standard_EXPORT void ShowPoles(); const Standard_Boolean ShowPoles, const Standard_Boolean ShowKnots,
const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode);
Standard_EXPORT void ShowKnots();
Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
void ShowPoles() { drawPoles = Standard_True; }
void ShowKnots() { drawKnots = Standard_True; }
//! change the number of isoparametric curves to be drawn. //! change the number of isoparametric curves to be drawn.
Standard_EXPORT virtual void ShowIsos (const Standard_Integer Nu, const Standard_Integer Nv) Standard_OVERRIDE; Standard_EXPORT virtual void ShowIsos (const Standard_Integer Nu, const Standard_Integer Nv) Standard_OVERRIDE;
//! change the number of isoparametric curves to be drawn. //! change the number of isoparametric curves to be drawn.
Standard_EXPORT void ShowKnotsIsos(); Standard_EXPORT void ShowKnotsIsos();
//! rub out all the isoparametric curves. //! rub out all the isoparametric curves.
Standard_EXPORT virtual void ClearIsos() Standard_OVERRIDE; Standard_EXPORT virtual void ClearIsos() Standard_OVERRIDE;
Standard_EXPORT void ClearPoles(); void ClearPoles() { drawPoles = Standard_False; }
Standard_EXPORT void ClearKnots(); void ClearKnots() { drawKnots = Standard_False; }
Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& UIndex, Standard_Integer& VIndex) const; Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& UIndex, Standard_Integer& VIndex) const;
Standard_EXPORT void FindUKnot (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& UIndex) const; Standard_EXPORT void FindUKnot (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& UIndex) const;
Standard_EXPORT void FindVKnot (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& VIndex) const; Standard_EXPORT void FindVKnot (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& VIndex) const;
void SetPolesColor (const Draw_Color& aColor); void SetPolesColor (const Draw_Color& theColor) { polesLook = theColor; }
void SetKnotsColor (const Draw_Color& aColor); void SetKnotsColor (const Draw_Color& theColor) { knotsLook = theColor; }
void SetKnotsShape (const Draw_MarkerShape Shape); void SetKnotsShape (const Draw_MarkerShape theShape) { knotsForm = theShape; }
Draw_MarkerShape KnotsShape() const; Draw_MarkerShape KnotsShape() const { return knotsForm; }
Draw_Color KnotsColor() const; Draw_Color KnotsColor() const { return knotsLook; }
Draw_Color PolesColor() const; Draw_Color PolesColor() const { return polesLook; }
//! For variable copy. //! For variable copy.
Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BSplineSurface,DrawTrSurf_Surface)
protected:
private: private:
Standard_Boolean drawPoles; Standard_Boolean drawPoles;
Standard_Boolean drawKnots; Standard_Boolean drawKnots;
Standard_Boolean knotsIsos; Standard_Boolean knotsIsos;
@ -125,14 +109,6 @@ private:
Standard_Integer knotsDim; Standard_Integer knotsDim;
Draw_Color polesLook; Draw_Color polesLook;
}; };
#include <DrawTrSurf_BSplineSurface.lxx>
#endif // _DrawTrSurf_BSplineSurface_HeaderFile #endif // _DrawTrSurf_BSplineSurface_HeaderFile

51
src/DrawTrSurf/DrawTrSurf_BSplineSurface.lxx
View File

@ -1,51 +0,0 @@
// 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.
inline void DrawTrSurf_BSplineSurface::SetKnotsColor (
const Draw_Color& aColor) {
knotsLook = aColor;
}
inline void DrawTrSurf_BSplineSurface::SetKnotsShape (
const Draw_MarkerShape Shape) {
knotsForm = Shape;
}
inline void DrawTrSurf_BSplineSurface::SetPolesColor (
const Draw_Color& aColor) {
polesLook = aColor;
}
inline Draw_MarkerShape DrawTrSurf_BSplineSurface::KnotsShape () const {
return knotsForm;
}
inline Draw_Color DrawTrSurf_BSplineSurface::KnotsColor () const {
return knotsLook;
}
inline Draw_Color DrawTrSurf_BSplineSurface::PolesColor () const {
return polesLook;
}

146
src/DrawTrSurf/DrawTrSurf_BezierCurve.cxx
View File

@ -12,103 +12,99 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <DrawTrSurf_BezierCurve.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Draw_Display.hxx> #include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx> #include <DrawTrSurf.hxx>
#include <DrawTrSurf_BezierCurve.hxx> #include <DrawTrSurf_Params.hxx>
#include <Geom_BezierCurve.hxx> #include <Geom_BezierCurve.hxx>
#include <GeomTools_CurveSet.hxx>
#include <gp_Pnt2d.hxx> #include <gp_Pnt2d.hxx>
#include <Standard_Type.hxx>
#include <TColgp_Array1OfPnt.hxx> #include <TColgp_Array1OfPnt.hxx>
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BezierCurve,DrawTrSurf_Curve) IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BezierCurve, DrawTrSurf_Curve)
DrawTrSurf_BezierCurve::DrawTrSurf_BezierCurve (const Handle(Geom_BezierCurve)& C)
: DrawTrSurf_Curve (C, Draw_vert, 16, 0.05, 1)
{
drawPoles = Standard_True;
polesLook = Draw_rouge;
}
DrawTrSurf_BezierCurve::DrawTrSurf_BezierCurve ( DrawTrSurf_BezierCurve::DrawTrSurf_BezierCurve (
const Handle(Geom_BezierCurve)& C) const Handle(Geom_BezierCurve)& C, const Draw_Color& CurvColor,
: DrawTrSurf_Curve (C, Draw_vert, 16, 0.05, 1) { const Draw_Color& PolesColor, const Standard_Boolean ShowPoles,
const Standard_Integer Discret,const Standard_Real Deflection,
const Standard_Integer DrawMode )
: DrawTrSurf_Curve (C, CurvColor, Discret, Deflection, DrawMode)
{
drawPoles = ShowPoles;
polesLook = PolesColor;
}
drawPoles = Standard_True; void DrawTrSurf_BezierCurve::DrawOn (Draw_Display& dis) const
polesLook = Draw_rouge; {
} Handle(Geom_BezierCurve) C = Handle(Geom_BezierCurve)::DownCast(curv);
if (drawPoles)
{
Standard_Integer NbPoles = C->NbPoles();
DrawTrSurf_BezierCurve::DrawTrSurf_BezierCurve ( dis.SetColor(polesLook);
const Handle(Geom_BezierCurve)& C, const Draw_Color& CurvColor, TColgp_Array1OfPnt CPoles (1, NbPoles);
const Draw_Color& PolesColor, const Standard_Boolean ShowPoles, C->Poles (CPoles);
const Standard_Integer Discret,const Standard_Real Deflection, dis.MoveTo(CPoles(1));
const Standard_Integer DrawMode ) : for (Standard_Integer i = 2; i <= NbPoles; i++)
DrawTrSurf_Curve (C, CurvColor, Discret, Deflection, DrawMode) { {
dis.DrawTo(CPoles(i));
drawPoles = ShowPoles;
polesLook = PolesColor;
}
void DrawTrSurf_BezierCurve::DrawOn (Draw_Display& dis) const {
Handle(Geom_BezierCurve) C = Handle(Geom_BezierCurve)::DownCast(curv);
if (drawPoles) {
Standard_Integer NbPoles = C->NbPoles();
dis.SetColor(polesLook);
TColgp_Array1OfPnt CPoles (1, NbPoles);
C->Poles (CPoles);
dis.MoveTo(CPoles(1));
for (Standard_Integer i = 2; i <= NbPoles; i++) {
dis.DrawTo(CPoles(i));
}
} }
DrawTrSurf_Curve::DrawOn(dis);
} }
DrawTrSurf_Curve::DrawOn(dis);
}
void DrawTrSurf_BezierCurve::FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D,
void DrawTrSurf_BezierCurve::ShowPoles () { drawPoles = Standard_True; } const Standard_Real XPrec, Standard_Integer& Index) const
{
Handle(Geom_BezierCurve) bz = Handle(Geom_BezierCurve)::DownCast(curv);
void DrawTrSurf_BezierCurve::ClearPoles () { drawPoles = Standard_False; } gp_Pnt2d p1(X/D.Zoom(),Y/D.Zoom());
Standard_Real Prec = XPrec / D.Zoom();
Index++;
void DrawTrSurf_BezierCurve::FindPole ( Standard_Integer NbPoles = bz->NbPoles();
const Standard_Real X, const Standard_Real Y, const Draw_Display& D, while (Index <= NbPoles)
const Standard_Real XPrec, Standard_Integer& Index) const { {
if (D.Project(bz->Pole(Index)).Distance(p1) <= Prec)
Handle(Geom_BezierCurve) bz = Handle(Geom_BezierCurve)::DownCast(curv); {
gp_Pnt2d p1(X/D.Zoom(),Y/D.Zoom()); return;
Standard_Real Prec = XPrec / D.Zoom(); }
Index++; Index++;
Standard_Integer NbPoles = bz->NbPoles(); }
while (Index <= NbPoles) { Index = 0;
if (D.Project(bz->Pole(Index)).Distance(p1) <= Prec) }
return;
Index++;
}
Index = 0;
}
//======================================================================= //=======================================================================
//function : Copy //function : Copy
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_BezierCurve::Copy() const
Handle(Draw_Drawable3D) DrawTrSurf_BezierCurve::Copy()const
{ {
Handle(DrawTrSurf_BezierCurve) DC = new DrawTrSurf_BezierCurve Handle(DrawTrSurf_BezierCurve) DC = new DrawTrSurf_BezierCurve (Handle(Geom_BezierCurve)::DownCast(curv->Copy()),
(Handle(Geom_BezierCurve)::DownCast(curv->Copy()), look, polesLook,
look,polesLook,
drawPoles, drawPoles,
GetDiscretisation(),GetDeflection(),GetDrawMode()); GetDiscretisation(),GetDeflection(),GetDrawMode());
return DC; return DC;
} }
//=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_BezierCurve::Restore (Standard_IStream& theStream)
{
const DrawTrSurf_Params& aParams = DrawTrSurf::Parameters();
Handle(Geom_BezierCurve) aGeomCurve = Handle(Geom_BezierCurve)::DownCast (GeomTools_CurveSet::ReadCurve (theStream));
Handle(DrawTrSurf_BezierCurve) aDrawCurve = new DrawTrSurf_BezierCurve (aGeomCurve,
aParams.CurvColor, aParams.PolesColor, aParams.IsShowPoles,
aParams.Discret, aParams.Deflection, aParams.DrawMode);
return aDrawCurve;
}

68
src/DrawTrSurf/DrawTrSurf_BezierCurve.hxx
View File

@ -17,43 +17,32 @@
#ifndef _DrawTrSurf_BezierCurve_HeaderFile #ifndef _DrawTrSurf_BezierCurve_HeaderFile
#define _DrawTrSurf_BezierCurve_HeaderFile #define _DrawTrSurf_BezierCurve_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Standard_Boolean.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <DrawTrSurf_Curve.hxx> #include <DrawTrSurf_Curve.hxx>
#include <Standard_Integer.hxx>
#include <Standard_Real.hxx>
class Geom_BezierCurve; class Geom_BezierCurve;
class Draw_Color; class Draw_Color;
class Draw_Display;
class Draw_Drawable3D;
class DrawTrSurf_BezierCurve;
DEFINE_STANDARD_HANDLE(DrawTrSurf_BezierCurve, DrawTrSurf_Curve) DEFINE_STANDARD_HANDLE(DrawTrSurf_BezierCurve, DrawTrSurf_Curve)
class DrawTrSurf_BezierCurve : public DrawTrSurf_Curve class DrawTrSurf_BezierCurve : public DrawTrSurf_Curve
{ {
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BezierCurve, DrawTrSurf_Curve)
Draw_Drawable3D_FACTORY
public: public:
//! creates a drawable Bezier curve from a Bezier curve of package Geom.
Standard_EXPORT DrawTrSurf_BezierCurve (const Handle(Geom_BezierCurve)& C);
//! creates a drawable Bezier curve from a Bezier curve of Standard_EXPORT DrawTrSurf_BezierCurve (const Handle(Geom_BezierCurve)& C,
//! package Geom. const Draw_Color& CurvColor, const Draw_Color& PolesColor, const Standard_Boolean ShowPoles,
Standard_EXPORT DrawTrSurf_BezierCurve(const Handle(Geom_BezierCurve)& C); const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode);
Standard_EXPORT DrawTrSurf_BezierCurve(const Handle(Geom_BezierCurve)& C, const Draw_Color& CurvColor, const Draw_Color& PolesColor, const Standard_Boolean ShowPoles, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode); Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; void ShowPoles() { drawPoles = Standard_True; }
Standard_EXPORT void ShowPoles(); void ClearPoles() { drawPoles = Standard_False; }
Standard_EXPORT void ClearPoles();
//! Returns in <Index> the index of the first pole of the //! Returns in <Index> the index of the first pole of the
//! curve projected by the Display <D> at a distance lower //! curve projected by the Display <D> at a distance lower
@ -61,38 +50,19 @@ public:
//! set to 0, else index is always greater than the input //! set to 0, else index is always greater than the input
//! value of index. //! value of index.
Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const; Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const;
void SetPolesColor (const Draw_Color& aColor); void SetPolesColor (const Draw_Color& theColor) { polesLook = theColor; }
Draw_Color PolesColor() const; Draw_Color PolesColor() const { return polesLook; }
//! For variable copy. //! For variable copy.
Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BezierCurve,DrawTrSurf_Curve)
protected:
private: private:
Standard_Boolean drawPoles; Standard_Boolean drawPoles;
Draw_Color polesLook; Draw_Color polesLook;
}; };
#include <DrawTrSurf_BezierCurve.lxx>
#endif // _DrawTrSurf_BezierCurve_HeaderFile #endif // _DrawTrSurf_BezierCurve_HeaderFile

32
src/DrawTrSurf/DrawTrSurf_BezierCurve.lxx
View File

@ -1,32 +0,0 @@
// 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.
inline void DrawTrSurf_BezierCurve::SetPolesColor (
const Draw_Color& aColor) {
polesLook = aColor;
}
inline Draw_Color DrawTrSurf_BezierCurve::PolesColor () const {
return polesLook;
}

98
src/DrawTrSurf/DrawTrSurf_BezierCurve2d.cxx
View File

@ -12,44 +12,41 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <DrawTrSurf_BezierCurve2d.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Draw_Display.hxx> #include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx> #include <DrawTrSurf.hxx>
#include <DrawTrSurf_BezierCurve2d.hxx> #include <DrawTrSurf_Params.hxx>
#include <Geom2d_BezierCurve.hxx> #include <Geom2d_BezierCurve.hxx>
#include <GeomTools_Curve2dSet.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <Standard_Type.hxx>
#include <TColgp_Array1OfPnt2d.hxx> #include <TColgp_Array1OfPnt2d.hxx>
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BezierCurve2d,DrawTrSurf_Curve2d) IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BezierCurve2d, DrawTrSurf_Curve2d)
DrawTrSurf_BezierCurve2d::DrawTrSurf_BezierCurve2d ( DrawTrSurf_BezierCurve2d::DrawTrSurf_BezierCurve2d (const Handle(Geom2d_BezierCurve)& C)
const Handle(Geom2d_BezierCurve)& C) : : DrawTrSurf_Curve2d (C, Draw_vert, 50)
DrawTrSurf_Curve2d (C, Draw_vert, 50) { {
drawPoles = Standard_True;
drawPoles = Standard_True; polesLook = Draw_rouge;
polesLook = Draw_rouge; }
}
DrawTrSurf_BezierCurve2d::DrawTrSurf_BezierCurve2d (const Handle(Geom2d_BezierCurve)& C, const Draw_Color& CurvColor,
const Draw_Color& PolesColor, const Standard_Boolean ShowPoles,
DrawTrSurf_BezierCurve2d::DrawTrSurf_BezierCurve2d ( const Standard_Integer Discret)
const Handle(Geom2d_BezierCurve)& C, const Draw_Color& CurvColor, : DrawTrSurf_Curve2d (C, CurvColor, Discret)
const Draw_Color& PolesColor, const Standard_Boolean ShowPoles, {
const Standard_Integer Discret) : DrawTrSurf_Curve2d (C, CurvColor, Discret) { drawPoles = ShowPoles;
polesLook = PolesColor;
drawPoles = ShowPoles; }
polesLook = PolesColor;
} void DrawTrSurf_BezierCurve2d::DrawOn (Draw_Display& dis) const
void DrawTrSurf_BezierCurve2d::DrawOn (Draw_Display& dis) const
{ {
Handle(Geom2d_BezierCurve) C = Handle(Geom2d_BezierCurve)::DownCast(curv); Handle(Geom2d_BezierCurve) C = Handle(Geom2d_BezierCurve)::DownCast(curv);
if (drawPoles)
if (drawPoles) { {
dis.SetColor(polesLook); dis.SetColor(polesLook);
TColgp_Array1OfPnt2d CPoles (1, C->NbPoles()); TColgp_Array1OfPnt2d CPoles (1, C->NbPoles());
C->Poles (CPoles); C->Poles (CPoles);
@ -60,31 +57,13 @@ void DrawTrSurf_BezierCurve2d::DrawOn (Draw_Display& dis) const
} }
DrawTrSurf_Curve2d::DrawOn(dis); DrawTrSurf_Curve2d::DrawOn(dis);
} }
void DrawTrSurf_BezierCurve2d::FindPole (const Standard_Real X, const Standard_Real Y,
const Draw_Display& D,
void DrawTrSurf_BezierCurve2d::ShowPoles () const Standard_Real XPrec,
Standard_Integer& Index) const
{ {
drawPoles = Standard_True;
}
void DrawTrSurf_BezierCurve2d::ClearPoles ()
{
drawPoles = Standard_False;
}
void DrawTrSurf_BezierCurve2d::FindPole (
const Standard_Real X,
const Standard_Real Y,
const Draw_Display& D,
const Standard_Real XPrec,
Standard_Integer& Index) const
{
Handle(Geom2d_BezierCurve) bz = Handle(Geom2d_BezierCurve)::DownCast(curv); Handle(Geom2d_BezierCurve) bz = Handle(Geom2d_BezierCurve)::DownCast(curv);
gp_Pnt2d p1(X/D.Zoom(),Y/D.Zoom()); gp_Pnt2d p1(X/D.Zoom(),Y/D.Zoom());
Standard_Real Prec = XPrec / D.Zoom(); Standard_Real Prec = XPrec / D.Zoom();
@ -104,16 +83,29 @@ void DrawTrSurf_BezierCurve2d::FindPole (
//======================================================================= //=======================================================================
//function : Copy //function : Copy
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_BezierCurve2d::Copy() const
Handle(Draw_Drawable3D) DrawTrSurf_BezierCurve2d::Copy()const
{ {
Handle(DrawTrSurf_BezierCurve2d) DC = new DrawTrSurf_BezierCurve2d Handle(DrawTrSurf_BezierCurve2d) DC = new DrawTrSurf_BezierCurve2d
(Handle(Geom2d_BezierCurve)::DownCast(curv->Copy()), (Handle(Geom2d_BezierCurve)::DownCast(curv->Copy()),
look,polesLook, look,polesLook,
drawPoles, drawPoles,
GetDiscretisation()); GetDiscretisation());
return DC; return DC;
} }
//=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_BezierCurve2d::Restore (Standard_IStream& theStream)
{
const DrawTrSurf_Params& aParams = DrawTrSurf::Parameters();
Handle(Geom2d_BezierCurve) aGeomCurve = Handle(Geom2d_BezierCurve)::DownCast(GeomTools_Curve2dSet::ReadCurve2d (theStream));
Handle(DrawTrSurf_BezierCurve2d) aDrawCurve = new DrawTrSurf_BezierCurve2d (aGeomCurve,
aParams.CurvColor, aParams.PolesColor,
aParams.IsShowPoles, aParams.Discret);
return aDrawCurve;
}

67
src/DrawTrSurf/DrawTrSurf_BezierCurve2d.hxx
View File

@ -17,43 +17,31 @@
#ifndef _DrawTrSurf_BezierCurve2d_HeaderFile #ifndef _DrawTrSurf_BezierCurve2d_HeaderFile
#define _DrawTrSurf_BezierCurve2d_HeaderFile #define _DrawTrSurf_BezierCurve2d_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Standard_Boolean.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <DrawTrSurf_Curve2d.hxx> #include <DrawTrSurf_Curve2d.hxx>
#include <Standard_Integer.hxx>
#include <Standard_Real.hxx>
class Geom2d_BezierCurve; class Geom2d_BezierCurve;
class Draw_Color; class Draw_Color;
class Draw_Display;
class Draw_Drawable3D;
class DrawTrSurf_BezierCurve2d;
DEFINE_STANDARD_HANDLE(DrawTrSurf_BezierCurve2d, DrawTrSurf_Curve2d) DEFINE_STANDARD_HANDLE(DrawTrSurf_BezierCurve2d, DrawTrSurf_Curve2d)
class DrawTrSurf_BezierCurve2d : public DrawTrSurf_Curve2d class DrawTrSurf_BezierCurve2d : public DrawTrSurf_Curve2d
{ {
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BezierCurve2d, DrawTrSurf_Curve2d)
Draw_Drawable3D_FACTORY
public: public:
//! creates a drawable Bezier curve from a Bezier curve of package Geom2d.
Standard_EXPORT DrawTrSurf_BezierCurve2d (const Handle(Geom2d_BezierCurve)& C);
//! creates a drawable Bezier curve from a Bezier curve of Standard_EXPORT DrawTrSurf_BezierCurve2d (const Handle(Geom2d_BezierCurve)& C,
//! package Geom2d. const Draw_Color& CurvColor, const Draw_Color& PolesColor, const Standard_Boolean ShowPoles, const Standard_Integer Discret);
Standard_EXPORT DrawTrSurf_BezierCurve2d(const Handle(Geom2d_BezierCurve)& C);
Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
Standard_EXPORT DrawTrSurf_BezierCurve2d(const Handle(Geom2d_BezierCurve)& C, const Draw_Color& CurvColor, const Draw_Color& PolesColor, const Standard_Boolean ShowPoles, const Standard_Integer Discret);
void ShowPoles() { drawPoles = Standard_True; }
Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
void ClearPoles() { drawPoles = Standard_False; }
Standard_EXPORT void ShowPoles();
Standard_EXPORT void ClearPoles();
//! Returns in <Index> the index of the first pole of the //! Returns in <Index> the index of the first pole of the
//! curve projected by the Display <D> at a distance lower //! curve projected by the Display <D> at a distance lower
@ -61,38 +49,19 @@ public:
//! set to 0, else index is always greater than the input //! set to 0, else index is always greater than the input
//! value of index. //! value of index.
Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const; Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& Index) const;
void SetPolesColor (const Draw_Color& aColor); void SetPolesColor (const Draw_Color& theColor) { polesLook = theColor; }
Draw_Color PolesColor() const; Draw_Color PolesColor() const { return polesLook; }
//! For variable copy. //! For variable copy.
Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BezierCurve2d,DrawTrSurf_Curve2d)
protected:
private: private:
Standard_Boolean drawPoles; Standard_Boolean drawPoles;
Draw_Color polesLook; Draw_Color polesLook;
}; };
#include <DrawTrSurf_BezierCurve2d.lxx>
#endif // _DrawTrSurf_BezierCurve2d_HeaderFile #endif // _DrawTrSurf_BezierCurve2d_HeaderFile

32
src/DrawTrSurf/DrawTrSurf_BezierCurve2d.lxx
View File

@ -1,32 +0,0 @@
// 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.
inline void DrawTrSurf_BezierCurve2d::SetPolesColor (
const Draw_Color& aColor) {
polesLook = aColor;
}
inline Draw_Color DrawTrSurf_BezierCurve2d::PolesColor () const {
return polesLook;
}

184
src/DrawTrSurf/DrawTrSurf_BezierSurface.cxx
View File

@ -12,112 +12,103 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <DrawTrSurf_BezierSurface.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Draw_Display.hxx> #include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx> #include <DrawTrSurf.hxx>
#include <DrawTrSurf_BezierCurve.hxx> #include <DrawTrSurf_BezierCurve.hxx>
#include <DrawTrSurf_BezierSurface.hxx> #include <DrawTrSurf_Params.hxx>
#include <Geom_BezierSurface.hxx> #include <Geom_BezierSurface.hxx>
#include <GeomTools_SurfaceSet.hxx>
#include <gp_Pnt2d.hxx> #include <gp_Pnt2d.hxx>
#include <Standard_Type.hxx>
#include <TColgp_Array2OfPnt.hxx> #include <TColgp_Array2OfPnt.hxx>
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BezierSurface,DrawTrSurf_Surface) IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_BezierSurface, DrawTrSurf_Surface)
DrawTrSurf_BezierSurface::DrawTrSurf_BezierSurface ( DrawTrSurf_BezierSurface::DrawTrSurf_BezierSurface (const Handle(Geom_BezierSurface)& S)
const Handle(Geom_BezierSurface)& S) : DrawTrSurf_Surface (S, 1, 1, Draw_jaune, Draw_bleu, 30, 0.05, 0)
: DrawTrSurf_Surface (S, 1, 1, Draw_jaune, Draw_bleu, 30, 0.05, 0) { {
drawPoles = Standard_True;
polesLook = Draw_rouge;
}
drawPoles = Standard_True; DrawTrSurf_BezierSurface::DrawTrSurf_BezierSurface (const Handle(Geom_BezierSurface)& S,
polesLook = Draw_rouge; const Standard_Integer NbUIsos, const Standard_Integer NbVIsos,
} const Draw_Color& BoundsColor, const Draw_Color& IsosColor,
const Draw_Color& PolesColor, const Standard_Boolean ShowPoles,
const Standard_Integer Discret,const Standard_Real Deflection,
const Standard_Integer DrawMode)
: DrawTrSurf_Surface (S, NbUIsos, NbVIsos, BoundsColor, IsosColor,
Discret, Deflection, DrawMode)
{
drawPoles = ShowPoles;
polesLook = PolesColor;
}
void DrawTrSurf_BezierSurface::DrawOn (Draw_Display& dis) const
{
DrawTrSurf_BezierSurface::DrawTrSurf_BezierSurface ( Standard_Integer i,j;
const Handle(Geom_BezierSurface)& S, Handle(Geom_BezierSurface) S = Handle(Geom_BezierSurface)::DownCast(surf);
const Standard_Integer NbUIsos, const Standard_Integer NbVIsos, if (drawPoles)
const Draw_Color& BoundsColor, const Draw_Color& IsosColor, {
const Draw_Color& PolesColor, const Standard_Boolean ShowPoles, Standard_Integer NbUPoles = S->NbUPoles();
const Standard_Integer Discret,const Standard_Real Deflection, Standard_Integer NbVPoles = S->NbVPoles();
const Standard_Integer DrawMode) dis.SetColor(polesLook);
: DrawTrSurf_Surface (S, NbUIsos, NbVIsos, BoundsColor, IsosColor, TColgp_Array2OfPnt SPoles (1, NbUPoles, 1, NbVPoles);
Discret, Deflection, DrawMode){ S->Poles (SPoles);
for (j = 1; j <= NbVPoles; j++)
drawPoles = ShowPoles; {
polesLook = PolesColor; dis.MoveTo(SPoles(1, j));
} for (i = 2; i <= NbUPoles; i++)
{
dis.DrawTo(SPoles(i, j));
}
void DrawTrSurf_BezierSurface::DrawOn (Draw_Display& dis) const { }
for (i = 1; i <= NbUPoles; i++)
Standard_Integer i,j; {
Handle(Geom_BezierSurface) S = Handle(Geom_BezierSurface)::DownCast(surf); dis.MoveTo(SPoles(i, 1));
for (j = 2; j <= NbVPoles; j++)
if (drawPoles) { {
Standard_Integer NbUPoles = S->NbUPoles(); dis.DrawTo(SPoles(i, j));
Standard_Integer NbVPoles = S->NbVPoles();
dis.SetColor(polesLook);
TColgp_Array2OfPnt SPoles (1, NbUPoles, 1, NbVPoles);
S->Poles (SPoles);
for (j = 1; j <= NbVPoles; j++) {
dis.MoveTo(SPoles(1, j));
for (i = 2; i <= NbUPoles; i++) {
dis.DrawTo(SPoles(i, j));
}
}
for (i = 1; i <= NbUPoles; i++) {
dis.MoveTo(SPoles(i, 1));
for (j = 2; j <= NbVPoles; j++) {
dis.DrawTo(SPoles(i, j));
}
} }
} }
DrawTrSurf_Surface::DrawOn(dis);
} }
DrawTrSurf_Surface::DrawOn (dis);
}
void DrawTrSurf_BezierSurface::FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D,
void DrawTrSurf_BezierSurface::ShowPoles () { drawPoles = Standard_True; } const Standard_Real XPrec, Standard_Integer& UIndex, Standard_Integer& VIndex) const
{
Handle(Geom_BezierSurface) bs = Handle(Geom_BezierSurface)::DownCast(surf);
void DrawTrSurf_BezierSurface::ClearPoles () { drawPoles = Standard_False; } gp_Pnt2d p1(X/D.Zoom(),Y/D.Zoom());
Standard_Real Prec = XPrec / D.Zoom();
UIndex++;
void DrawTrSurf_BezierSurface::FindPole ( VIndex++;
const Standard_Real X, const Standard_Real Y, const Draw_Display& D, Standard_Integer NbUPoles = bs->NbUPoles();
const Standard_Real XPrec, Standard_Integer& UIndex, Standard_Integer& VIndex) const { Standard_Integer NbVPoles = bs->NbVPoles();
while (VIndex <= NbVPoles)
Handle(Geom_BezierSurface) bs = Handle(Geom_BezierSurface)::DownCast(surf); {
gp_Pnt2d p1(X/D.Zoom(),Y/D.Zoom()); while (UIndex <= NbUPoles)
Standard_Real Prec = XPrec / D.Zoom(); {
UIndex++; if (D.Project(bs->Pole(UIndex, VIndex)).Distance(p1) <= Prec)
VIndex++; {
Standard_Integer NbUPoles = bs->NbUPoles(); return;
Standard_Integer NbVPoles = bs->NbVPoles(); }
while (VIndex <= NbVPoles) { UIndex++;
while (UIndex <= NbUPoles) { }
if (D.Project(bs->Pole(UIndex, VIndex)).Distance(p1) <= Prec) UIndex = 1;
return; VIndex++;
UIndex++; }
} UIndex = VIndex = 0;
UIndex = 1; }
VIndex++;
}
UIndex = VIndex = 0;
}
//======================================================================= //=======================================================================
//function : Copy //function : Copy
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_BezierSurface::Copy() const
Handle(Draw_Drawable3D) DrawTrSurf_BezierSurface::Copy()const
{ {
Handle(DrawTrSurf_BezierSurface) DS = new DrawTrSurf_BezierSurface Handle(DrawTrSurf_BezierSurface) DS = new DrawTrSurf_BezierSurface
(Handle(Geom_BezierSurface)::DownCast(surf->Copy()), (Handle(Geom_BezierSurface)::DownCast(surf->Copy()),
@ -128,9 +119,18 @@ Handle(Draw_Drawable3D) DrawTrSurf_BezierSurface::Copy()const
return DS; return DS;
} }
//=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_BezierSurface::Restore (Standard_IStream& theStream)
{
const DrawTrSurf_Params& aParams = DrawTrSurf::Parameters();
Handle(Geom_BezierSurface) aGeomSurface = Handle(Geom_BezierSurface)::DownCast (GeomTools_SurfaceSet::ReadSurface (theStream));
Handle(DrawTrSurf_BezierSurface) aDrawSurface = new DrawTrSurf_BezierSurface (aGeomSurface,
aParams.NbUIsos, aParams.NbVIsos,
aParams.BoundsColor, aParams.IsosColor, aParams.PolesColor,
aParams.IsShowPoles, aParams.Discret,
aParams.Deflection, aParams.DrawMode);
return aDrawSurface;
}

70
src/DrawTrSurf/DrawTrSurf_BezierSurface.hxx
View File

@ -17,76 +17,48 @@
#ifndef _DrawTrSurf_BezierSurface_HeaderFile #ifndef _DrawTrSurf_BezierSurface_HeaderFile
#define _DrawTrSurf_BezierSurface_HeaderFile #define _DrawTrSurf_BezierSurface_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Standard_Boolean.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <DrawTrSurf_Surface.hxx> #include <DrawTrSurf_Surface.hxx>
#include <Standard_Integer.hxx>
#include <Standard_Real.hxx>
class Geom_BezierSurface; class Geom_BezierSurface;
class Draw_Color; class Draw_Color;
class Draw_Display;
class Draw_Drawable3D;
class DrawTrSurf_BezierSurface;
DEFINE_STANDARD_HANDLE(DrawTrSurf_BezierSurface, DrawTrSurf_Surface) DEFINE_STANDARD_HANDLE(DrawTrSurf_BezierSurface, DrawTrSurf_Surface)
class DrawTrSurf_BezierSurface : public DrawTrSurf_Surface class DrawTrSurf_BezierSurface : public DrawTrSurf_Surface
{ {
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BezierSurface, DrawTrSurf_Surface)
Draw_Drawable3D_FACTORY
public: public:
//! creates a drawable Bezier curve from a Bezier curve of package Geom.
Standard_EXPORT DrawTrSurf_BezierSurface (const Handle(Geom_BezierSurface)& S);
Standard_EXPORT DrawTrSurf_BezierSurface (const Handle(Geom_BezierSurface)& S,
const Standard_Integer NbUIsos, const Standard_Integer NbVIsos, const Draw_Color& BoundsColor,
const Draw_Color& IsosColor, const Draw_Color& PolesColor, const Standard_Boolean ShowPoles,
const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode);
Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
void ShowPoles() { drawPoles = Standard_True; }
void ClearPoles() { drawPoles = Standard_False; }
//! creates a drawable Bezier curve from a Bezier curve of
//! package Geom.
Standard_EXPORT DrawTrSurf_BezierSurface(const Handle(Geom_BezierSurface)& S);
Standard_EXPORT DrawTrSurf_BezierSurface(const Handle(Geom_BezierSurface)& S, const Standard_Integer NbUIsos, const Standard_Integer NbVIsos, const Draw_Color& BoundsColor, const Draw_Color& IsosColor, const Draw_Color& PolesColor, const Standard_Boolean ShowPoles, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode);
Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
Standard_EXPORT void ShowPoles();
Standard_EXPORT void ClearPoles();
Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& UIndex, Standard_Integer& VIndex) const; Standard_EXPORT void FindPole (const Standard_Real X, const Standard_Real Y, const Draw_Display& D, const Standard_Real Prec, Standard_Integer& UIndex, Standard_Integer& VIndex) const;
void SetPolesColor (const Draw_Color& aColor); void SetPolesColor (const Draw_Color& theColor) { polesLook = theColor; }
Draw_Color PolesColor() const; Draw_Color PolesColor() const { return polesLook; }
//! For variable copy. //! For variable copy.
Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_BezierSurface,DrawTrSurf_Surface)
protected:
private: private:
Standard_Boolean drawPoles; Standard_Boolean drawPoles;
Draw_Color polesLook; Draw_Color polesLook;
}; };
#include <DrawTrSurf_BezierSurface.lxx>
#endif // _DrawTrSurf_BezierSurface_HeaderFile #endif // _DrawTrSurf_BezierSurface_HeaderFile

25
src/DrawTrSurf/DrawTrSurf_BezierSurface.lxx
View File

@ -1,25 +0,0 @@
// 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.
inline Draw_Color DrawTrSurf_BezierSurface::PolesColor () const {
return polesLook;
}
inline void DrawTrSurf_BezierSurface::SetPolesColor (
const Draw_Color& aColor) {
polesLook = aColor;
}

110
src/DrawTrSurf/DrawTrSurf_Curve.cxx
View File

@ -12,11 +12,10 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <DrawTrSurf_Curve.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Draw_Display.hxx> #include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx>
#include <DrawTrSurf_Curve.hxx>
#include <Geom_Curve.hxx> #include <Geom_Curve.hxx>
#include <GeomAdaptor_Curve.hxx> #include <GeomAdaptor_Curve.hxx>
#include <GeomLProp_CLProps.hxx> #include <GeomLProp_CLProps.hxx>
@ -26,65 +25,61 @@
#include <gp_Pnt2d.hxx> #include <gp_Pnt2d.hxx>
#include <gp_Vec.hxx> #include <gp_Vec.hxx>
#include <gp_Vec2d.hxx> #include <gp_Vec2d.hxx>
#include <DrawTrSurf.hxx>
#include <DrawTrSurf_Params.hxx>
#include <Precision.hxx> #include <Precision.hxx>
#include <Standard_Type.hxx>
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Curve,DrawTrSurf_Drawable) IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Curve, DrawTrSurf_Drawable)
Standard_Real DrawTrSurf_CurveLimit = 400; Standard_Real DrawTrSurf_CurveLimit = 400;
extern Standard_Boolean Draw_Bounds; extern Standard_Boolean Draw_Bounds;
//======================================================================= //=======================================================================
//function : DrawTrSurf_Curve //function : DrawTrSurf_Curve
//purpose : //purpose :
//======================================================================= //=======================================================================
DrawTrSurf_Curve::DrawTrSurf_Curve (const Handle(Geom_Curve)& C, DrawTrSurf_Curve::DrawTrSurf_Curve (const Handle(Geom_Curve)& C,
const Standard_Boolean DispOrigin) : const Standard_Boolean DispOrigin)
DrawTrSurf_Drawable (16, 0.01, 1), : DrawTrSurf_Drawable (16, 0.01, 1),
curv(C), curv (C),
look(Draw_vert), look (Draw_vert),
disporigin(DispOrigin), disporigin (DispOrigin),
dispcurvradius(Standard_False), dispcurvradius (Standard_False),
radiusmax(1.0e3), radiusmax (1.0e3),
radiusratio(0.1) radiusratio (0.1)
{ {
//
} }
//======================================================================= //=======================================================================
//function : DrawTrSurf_Curve //function : DrawTrSurf_Curve
//purpose : //purpose :
//======================================================================= //=======================================================================
DrawTrSurf_Curve::DrawTrSurf_Curve (const Handle(Geom_Curve)& C,
DrawTrSurf_Curve::DrawTrSurf_Curve (const Handle(Geom_Curve)& C, const Draw_Color& aColor,
const Draw_Color& aColor, const Standard_Integer Discret,
const Standard_Integer Discret, const Standard_Real Deflection,
const Standard_Real Deflection, const Standard_Integer DrawMode,
const Standard_Integer DrawMode, const Standard_Boolean DispOrigin,
const Standard_Boolean DispOrigin, const Standard_Boolean DispCurvRadius,
const Standard_Boolean DispCurvRadius, const Standard_Real RadiusMax,
const Standard_Real RadiusMax, const Standard_Real RadiusRatio)
const Standard_Real RadiusRatio) : : DrawTrSurf_Drawable (Discret,Deflection, DrawMode),
DrawTrSurf_Drawable (Discret,Deflection, DrawMode), curv(C),
curv(C), look(aColor),
look(aColor), disporigin(DispOrigin),
disporigin(DispOrigin), dispcurvradius(DispCurvRadius),
dispcurvradius(DispCurvRadius), radiusmax(RadiusMax),
radiusmax(RadiusMax), radiusratio(RadiusRatio)
radiusratio(RadiusRatio)
{ {
//
} }
//======================================================================= //=======================================================================
//function : DrawOn //function : DrawOn
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Curve::DrawOn (Draw_Display& dis) const void DrawTrSurf_Curve::DrawOn (Draw_Display& dis) const
{ {
Standard_Real First = curv->FirstParameter(); Standard_Real First = curv->FirstParameter();
@ -184,13 +179,11 @@ void DrawTrSurf_Curve::DrawOn (Draw_Display& dis) const
} }
} }
//======================================================================= //=======================================================================
//function : Copy //function : Copy
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_Curve::Copy() const
Handle(Draw_Drawable3D) DrawTrSurf_Curve::Copy()const
{ {
Handle(DrawTrSurf_Curve) DC = new DrawTrSurf_Curve Handle(DrawTrSurf_Curve) DC = new DrawTrSurf_Curve
(Handle(Geom_Curve)::DownCast(curv->Copy()), (Handle(Geom_Curve)::DownCast(curv->Copy()),
@ -200,24 +193,41 @@ Handle(Draw_Drawable3D) DrawTrSurf_Curve::Copy()const
return DC; return DC;
} }
//======================================================================= //=======================================================================
//function : Dump //function : Dump
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Curve::Dump (Standard_OStream& S) const
void DrawTrSurf_Curve::Dump(Standard_OStream& S)const
{ {
GeomTools_CurveSet::PrintCurve(curv,S); GeomTools_CurveSet::PrintCurve (curv, S);
} }
//=======================================================================
//function : Save
//purpose :
//=======================================================================
void DrawTrSurf_Curve::Save (Standard_OStream& theOs) const
{
GeomTools_CurveSet::PrintCurve (GetCurve(), theOs, true);
}
//=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_Curve::Restore (Standard_IStream& theStream)
{
const DrawTrSurf_Params& aParams = DrawTrSurf::Parameters();
Handle(Geom_Curve) aGeomCurve = GeomTools_CurveSet::ReadCurve (theStream);
Handle(DrawTrSurf_Curve) aDrawCurve = new DrawTrSurf_Curve (aGeomCurve, aParams.CurvColor, aParams.Discret, aParams.Deflection, aParams.DrawMode);
return aDrawCurve;
}
//======================================================================= //=======================================================================
//function : Whatis //function : Whatis
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Curve::Whatis (Draw_Interpretor& S) const
void DrawTrSurf_Curve::Whatis(Draw_Interpretor& S)const
{ {
S << " a 3d curve"; S << " a 3d curve";
} }

106
src/DrawTrSurf/DrawTrSurf_Curve.hxx
View File

@ -17,81 +17,70 @@
#ifndef _DrawTrSurf_Curve_HeaderFile #ifndef _DrawTrSurf_Curve_HeaderFile
#define _DrawTrSurf_Curve_HeaderFile #define _DrawTrSurf_Curve_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Real.hxx>
#include <DrawTrSurf_Drawable.hxx> #include <DrawTrSurf_Drawable.hxx>
#include <Standard_Integer.hxx>
#include <Standard_OStream.hxx>
#include <Draw_Interpretor.hxx> #include <Draw_Interpretor.hxx>
class Geom_Curve; class Geom_Curve;
class Draw_Color; class Draw_Color;
class Draw_Display; class Draw_Display;
class Draw_Drawable3D;
class DrawTrSurf_Curve;
DEFINE_STANDARD_HANDLE(DrawTrSurf_Curve, DrawTrSurf_Drawable) DEFINE_STANDARD_HANDLE(DrawTrSurf_Curve, DrawTrSurf_Drawable)
//! This class defines a drawable curve in 3d space. //! This class defines a drawable curve in 3d space.
class DrawTrSurf_Curve : public DrawTrSurf_Drawable class DrawTrSurf_Curve : public DrawTrSurf_Drawable
{ {
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Curve, DrawTrSurf_Drawable)
Draw_Drawable3D_FACTORY
public: public:
//! creates a drawable curve from a curve of package Geom. //! creates a drawable curve from a curve of package Geom.
Standard_EXPORT DrawTrSurf_Curve(const Handle(Geom_Curve)& C, const Standard_Boolean DispOrigin = Standard_True); Standard_EXPORT DrawTrSurf_Curve (const Handle(Geom_Curve)& C, const Standard_Boolean DispOrigin = Standard_True);
Standard_EXPORT DrawTrSurf_Curve(const Handle(Geom_Curve)& C, const Draw_Color& aColor, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode, 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 DrawTrSurf_Curve (const Handle(Geom_Curve)& C,
const Draw_Color& aColor, const Standard_Integer Discret, const Standard_Real Deflection,
Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; const Standard_Integer DrawMode,
const Standard_Boolean DispOrigin = Standard_True, const Standard_Boolean DispCurvRadius = Standard_False,
Handle(Geom_Curve) GetCurve() const; const Standard_Real RadiusMax = 1.0e3, const Standard_Real RatioOfRadius = 0.1);
void SetColor (const Draw_Color& aColor); Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
Standard_Boolean DisplayOrigin() const; Handle(Geom_Curve) GetCurve() const { return curv; }
void DisplayOrigin (const Standard_Boolean V); void SetColor (const Draw_Color& theColor) { look = theColor; }
void ShowCurvature(); Standard_Boolean DisplayOrigin() const { return disporigin; }
void ClearCurvature(); void DisplayOrigin (const Standard_Boolean V) { disporigin = V; }
void SetRadiusMax (const Standard_Real Radius); void ShowCurvature() { dispcurvradius = Standard_True; }
void SetRadiusRatio (const Standard_Real Ratio); void ClearCurvature() { dispcurvradius = Standard_False; }
Draw_Color Color() const; void SetRadiusMax (const Standard_Real theRadius) { radiusmax = theRadius; }
Standard_Real RadiusMax() const; void SetRadiusRatio (const Standard_Real theRatio) { radiusratio = theRatio; }
Standard_Real RadiusRatio() const; Draw_Color Color() const { return look; }
Standard_Real RadiusMax() const { return radiusmax; }
Standard_Real RadiusRatio() const { return radiusratio; }
//! For variable copy. //! For variable copy.
Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
//! For variable dump. //! For variable dump.
Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE; Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE;
//! For variable whatis command. Set as a result the //! Save drawable into stream.
//! type of the variable. Standard_EXPORT virtual void Save (Standard_OStream& theStream) const Standard_OVERRIDE;
//! For variable whatis command. Set as a result the type of the variable.
Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE; Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Curve,DrawTrSurf_Drawable)
protected: protected:
Handle(Geom_Curve) curv; Handle(Geom_Curve) curv;
Draw_Color look; Draw_Color look;
Standard_Boolean disporigin; Standard_Boolean disporigin;
@ -99,19 +88,6 @@ protected:
Standard_Real radiusmax; Standard_Real radiusmax;
Standard_Real radiusratio; Standard_Real radiusratio;
private:
}; };
#include <DrawTrSurf_Curve.lxx>
#endif // _DrawTrSurf_Curve_HeaderFile #endif // _DrawTrSurf_Curve_HeaderFile

46
src/DrawTrSurf/DrawTrSurf_Curve.lxx
View File

@ -1,46 +0,0 @@
// 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.
inline Handle(Geom_Curve) DrawTrSurf_Curve::GetCurve () const
{ return curv; }
inline Draw_Color DrawTrSurf_Curve::Color () const
{ return look; }
inline Standard_Boolean DrawTrSurf_Curve::DisplayOrigin () const
{ return disporigin; }
inline void DrawTrSurf_Curve::DisplayOrigin (const Standard_Boolean V)
{ disporigin = V; }
inline void DrawTrSurf_Curve::SetColor (const Draw_Color& aColor)
{ look = aColor; }
inline void DrawTrSurf_Curve::ShowCurvature()
{ dispcurvradius = Standard_True;}
inline void DrawTrSurf_Curve::ClearCurvature()
{ dispcurvradius = Standard_False;}
inline Standard_Real DrawTrSurf_Curve::RadiusMax () const
{ return radiusmax; }
inline Standard_Real DrawTrSurf_Curve::RadiusRatio () const
{ return radiusratio; }
inline void DrawTrSurf_Curve::SetRadiusMax (const Standard_Real Radius)
{ radiusmax = Radius; }
inline void DrawTrSurf_Curve::SetRadiusRatio (const Standard_Real Ratio)
{ radiusratio = Ratio; }

67
src/DrawTrSurf/DrawTrSurf_Curve2d.cxx
View File

@ -12,11 +12,13 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <DrawTrSurf_Curve2d.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Draw_Display.hxx> #include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx> #include <Draw_Drawable3D.hxx>
#include <DrawTrSurf_Curve2d.hxx> #include <DrawTrSurf.hxx>
#include <DrawTrSurf_Params.hxx>
#include <Geom2d_Curve.hxx> #include <Geom2d_Curve.hxx>
#include <Geom2d_Hyperbola.hxx> #include <Geom2d_Hyperbola.hxx>
#include <Geom2d_Line.hxx> #include <Geom2d_Line.hxx>
@ -28,22 +30,20 @@
#include <GeomTools_Curve2dSet.hxx> #include <GeomTools_Curve2dSet.hxx>
#include <gp.hxx> #include <gp.hxx>
#include <Precision.hxx> #include <Precision.hxx>
#include <Standard_Type.hxx>
#include <TColStd_Array1OfReal.hxx> #include <TColStd_Array1OfReal.hxx>
IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Curve2d,DrawTrSurf_Drawable) IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Curve2d, DrawTrSurf_Drawable)
static Standard_Real DrawTrSurf_CurveLimit = 400; static Standard_Real DrawTrSurf_CurveLimit = 400;
extern Standard_Boolean Draw_Bounds; extern Standard_Boolean Draw_Bounds;
//======================================================================= //=======================================================================
//function : DrawTrSurf_Curve2d //function : DrawTrSurf_Curve2d
//purpose : //purpose :
//======================================================================= //=======================================================================
DrawTrSurf_Curve2d::DrawTrSurf_Curve2d (const Handle(Geom2d_Curve)& C, DrawTrSurf_Curve2d::DrawTrSurf_Curve2d (const Handle(Geom2d_Curve)& C,
const Standard_Boolean DispOrigin) : const Standard_Boolean DispOrigin)
DrawTrSurf_Drawable (50) : DrawTrSurf_Drawable (50)
{ {
curv = C; curv = C;
look = Draw_vert; look = Draw_vert;
@ -53,12 +53,10 @@ DrawTrSurf_Curve2d::DrawTrSurf_Curve2d (const Handle(Geom2d_Curve)& C,
radiusratio = 0.1; radiusratio = 0.1;
} }
//======================================================================= //=======================================================================
//function : DrawTrSurf_Curve2d //function : DrawTrSurf_Curve2d
//purpose : //purpose :
//======================================================================= //=======================================================================
DrawTrSurf_Curve2d::DrawTrSurf_Curve2d (const Handle(Geom2d_Curve)& C, DrawTrSurf_Curve2d::DrawTrSurf_Curve2d (const Handle(Geom2d_Curve)& C,
const Draw_Color& aColor, const Draw_Color& aColor,
const Standard_Integer Discret, const Standard_Integer Discret,
@ -76,13 +74,11 @@ DrawTrSurf_Curve2d::DrawTrSurf_Curve2d (const Handle(Geom2d_Curve)& C,
radiusratio = RadiusRatio; radiusratio = RadiusRatio;
} }
//======================================================================= //=======================================================================
//function : DrawOn //function : DrawOn
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Curve2d::DrawOn (Draw_Display& dis) const
void DrawTrSurf_Curve2d::DrawOn (Draw_Display& dis) const
{ {
Standard_Real First = curv->FirstParameter(); Standard_Real First = curv->FirstParameter();
@ -179,13 +175,11 @@ void DrawTrSurf_Curve2d::DrawOn (Draw_Display& dis) const
} }
} }
//======================================================================= //=======================================================================
//function : Copy //function : Copy
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_Curve2d::Copy()const Handle(Draw_Drawable3D) DrawTrSurf_Curve2d::Copy() const
{ {
Handle(DrawTrSurf_Curve2d) DC = new DrawTrSurf_Curve2d Handle(DrawTrSurf_Curve2d) DC = new DrawTrSurf_Curve2d
(Handle(Geom2d_Curve)::DownCast(curv->Copy()), (Handle(Geom2d_Curve)::DownCast(curv->Copy()),
@ -195,34 +189,49 @@ Handle(Draw_Drawable3D) DrawTrSurf_Curve2d::Copy()const
return DC; return DC;
} }
//======================================================================= //=======================================================================
//function : Dump //function : Dump
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Curve2d::Dump (Standard_OStream& S) const
void DrawTrSurf_Curve2d::Dump(Standard_OStream& S) const
{ {
GeomTools_Curve2dSet::PrintCurve2d(curv,S); GeomTools_Curve2dSet::PrintCurve2d (curv, S);
} }
//=======================================================================
//function : Save
//purpose :
//=======================================================================
void DrawTrSurf_Curve2d::Save (Standard_OStream& theStream) const
{
GeomTools_Curve2dSet::PrintCurve2d (GetCurve(), theStream, true);
}
//=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_Curve2d::Restore (Standard_IStream& theStream)
{
const DrawTrSurf_Params& aParams = DrawTrSurf::Parameters();
Handle(Geom2d_Curve) aGeomCurve = GeomTools_Curve2dSet::ReadCurve2d (theStream);
Handle(DrawTrSurf_Curve2d) aDrawCurve = new DrawTrSurf_Curve2d (aGeomCurve, aParams.CurvColor, aParams.Discret);
return aDrawCurve;
}
//======================================================================= //=======================================================================
//function : Whatis //function : Whatis
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Curve2d::Whatis (Draw_Interpretor& S) const
void DrawTrSurf_Curve2d::Whatis(Draw_Interpretor& S)const
{ {
S << "2d curve"; S << "2d curve";
} }
//======================================================================= //=======================================================================
//function : Is3D //function : Is3D
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean DrawTrSurf_Curve2d::Is3D() const Standard_Boolean DrawTrSurf_Curve2d::Is3D() const
{ {
return Standard_False; return Standard_False;

101
src/DrawTrSurf/DrawTrSurf_Curve2d.hxx
View File

@ -17,80 +17,68 @@
#ifndef _DrawTrSurf_Curve2d_HeaderFile #ifndef _DrawTrSurf_Curve2d_HeaderFile
#define _DrawTrSurf_Curve2d_HeaderFile #define _DrawTrSurf_Curve2d_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Real.hxx>
#include <DrawTrSurf_Drawable.hxx> #include <DrawTrSurf_Drawable.hxx>
#include <Standard_Integer.hxx>
#include <Standard_OStream.hxx>
#include <Draw_Interpretor.hxx> #include <Draw_Interpretor.hxx>
class Geom2d_Curve; class Geom2d_Curve;
class Draw_Color; class Draw_Color;
class Draw_Display;
class Draw_Drawable3D;
class DrawTrSurf_Curve2d;
DEFINE_STANDARD_HANDLE(DrawTrSurf_Curve2d, DrawTrSurf_Drawable) DEFINE_STANDARD_HANDLE(DrawTrSurf_Curve2d, DrawTrSurf_Drawable)
//! This class defines a drawable curve in 2d space. //! This class defines a drawable curve in 2d space.
//! The curve is drawned in the plane XOY. //! The curve is drawn in the plane XOY.
class DrawTrSurf_Curve2d : public DrawTrSurf_Drawable class DrawTrSurf_Curve2d : public DrawTrSurf_Drawable
{ {
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Curve2d, DrawTrSurf_Drawable)
Draw_Drawable3D_FACTORY
public: public:
//! creates a drawable curve from a curve of package Geom2d. //! creates a drawable curve from a curve of package Geom2d.
Standard_EXPORT DrawTrSurf_Curve2d(const Handle(Geom2d_Curve)& C, const Standard_Boolean DispOrigin = Standard_True); Standard_EXPORT DrawTrSurf_Curve2d (const Handle(Geom2d_Curve)& C, const Standard_Boolean DispOrigin = Standard_True);
Standard_EXPORT DrawTrSurf_Curve2d(const Handle(Geom2d_Curve)& C, const Draw_Color& aColor, 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 DrawTrSurf_Curve2d (const Handle(Geom2d_Curve)& C,
const Draw_Color& aColor, const Standard_Integer Discret,
Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; const Standard_Boolean DispOrigin = Standard_True, const Standard_Boolean DispCurvRadius = Standard_False,
const Standard_Real RadiusMax = 1.0e3, const Standard_Real RatioOfRadius = 0.1);
Handle(Geom2d_Curve) GetCurve() const;
Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
void SetColor (const Draw_Color& aColor);
Handle(Geom2d_Curve) GetCurve() const { return curv; }
void ShowCurvature();
void SetColor (const Draw_Color& theColor) { look = theColor; }
void ClearCurvature();
void ShowCurvature() { dispcurvradius = Standard_True; }
void SetRadiusMax (const Standard_Real Radius);
void ClearCurvature() { dispcurvradius = Standard_False; }
void SetRadiusRatio (const Standard_Real Ratio);
void SetRadiusMax (const Standard_Real theRadius) { radiusmax = theRadius; }
Draw_Color Color() const;
void SetRadiusRatio (const Standard_Real theRatio) { radiusratio = theRatio; }
Standard_Real RadiusMax() const;
Draw_Color Color() const { return look; }
Standard_Real RadiusRatio() const;
Standard_Real RadiusMax() const { return radiusmax; }
Standard_Real RadiusRatio() const { return radiusratio; }
//! For variable copy. //! For variable copy.
Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
//! For variable dump. //! For variable dump.
Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE; Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE;
//! Save drawable into stream.
Standard_EXPORT virtual void Save (Standard_OStream& theStream) const Standard_OVERRIDE;
//! Returns False. //! Returns False.
Standard_EXPORT virtual Standard_Boolean Is3D() const Standard_OVERRIDE; Standard_EXPORT virtual Standard_Boolean Is3D() const Standard_OVERRIDE;
//! For variable whatis command. Set as a result the //! For variable whatis command. Set as a result the type of the variable.
//! type of the variable.
Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE; Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Curve2d,DrawTrSurf_Drawable)
protected: protected:
Handle(Geom2d_Curve) curv; Handle(Geom2d_Curve) curv;
Draw_Color look; Draw_Color look;
Standard_Boolean disporigin; Standard_Boolean disporigin;
@ -98,19 +86,6 @@ protected:
Standard_Real radiusmax; Standard_Real radiusmax;
Standard_Real radiusratio; Standard_Real radiusratio;
private:
}; };
#include <DrawTrSurf_Curve2d.lxx>
#endif // _DrawTrSurf_Curve2d_HeaderFile #endif // _DrawTrSurf_Curve2d_HeaderFile

41
src/DrawTrSurf/DrawTrSurf_Curve2d.lxx
View File

@ -1,41 +0,0 @@
// 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.
inline Handle(Geom2d_Curve) DrawTrSurf_Curve2d::GetCurve () const {
return curv;
}
inline Draw_Color DrawTrSurf_Curve2d::Color () const { return look; }
inline void DrawTrSurf_Curve2d::ShowCurvature()
{ dispcurvradius = Standard_True;}
inline void DrawTrSurf_Curve2d::ClearCurvature()
{ dispcurvradius = Standard_False;}
inline Standard_Real DrawTrSurf_Curve2d::RadiusMax () const { return radiusmax; }
inline Standard_Real DrawTrSurf_Curve2d::RadiusRatio () const { return radiusratio; }
inline void DrawTrSurf_Curve2d::SetColor (const Draw_Color& aColor)
{ look = aColor; }
inline void DrawTrSurf_Curve2d::SetRadiusMax (const Standard_Real Radius)
{ radiusmax = Radius; }
inline void DrawTrSurf_Curve2d::SetRadiusRatio (const Standard_Real Ratio)
{ radiusratio = Ratio; }

45
src/DrawTrSurf/DrawTrSurf_Drawable.hxx
View File

@ -17,20 +17,13 @@
#ifndef _DrawTrSurf_Drawable_HeaderFile #ifndef _DrawTrSurf_Drawable_HeaderFile
#define _DrawTrSurf_Drawable_HeaderFile #define _DrawTrSurf_Drawable_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Standard_Integer.hxx>
#include <Standard_Real.hxx>
#include <Draw_Drawable3D.hxx> #include <Draw_Drawable3D.hxx>
#include <GeomAbs_IsoType.hxx> #include <GeomAbs_IsoType.hxx>
class Adaptor2d_Curve2d; class Adaptor2d_Curve2d;
class Draw_Display;
class Adaptor3d_Curve; class Adaptor3d_Curve;
class Adaptor3d_IsoCurve; class Adaptor3d_IsoCurve;
class DrawTrSurf_Drawable;
DEFINE_STANDARD_HANDLE(DrawTrSurf_Drawable, Draw_Drawable3D) DEFINE_STANDARD_HANDLE(DrawTrSurf_Drawable, Draw_Drawable3D)
//! this class adds to the Drawable3D methods to //! this class adds to the Drawable3D methods to
@ -40,10 +33,9 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_Drawable, Draw_Drawable3D)
//! is stored in this class. //! is stored in this class.
class DrawTrSurf_Drawable : public Draw_Drawable3D class DrawTrSurf_Drawable : public Draw_Drawable3D
{ {
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Drawable, Draw_Drawable3D)
public: public:
//! Draw a polygon of the curve on the Display //! Draw a polygon of the curve on the Display
Standard_EXPORT void DrawCurve2dOn (Adaptor2d_Curve2d& C, Draw_Display& D) const; Standard_EXPORT void DrawCurve2dOn (Adaptor2d_Curve2d& C, Draw_Display& D) const;
@ -57,47 +49,30 @@ public:
//! this is defined only to tell C++ not to complain //! this is defined only to tell C++ not to complain
//! about inheriting a pure virtual method. //! about inheriting a pure virtual method.
Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE = 0; Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE = 0;
void SetDiscretisation (const Standard_Integer Discret);
Standard_Integer GetDiscretisation() const;
void SetDeflection (const Standard_Real Deflection);
Standard_Real GetDeflection() const;
void SetDrawMode (const Standard_Integer DrawMode);
Standard_Integer GetDrawMode() const;
void SetDiscretisation (const Standard_Integer theDiscret) { myDiscret = theDiscret; }
Standard_Integer GetDiscretisation() const { return myDiscret; }
void SetDeflection (const Standard_Real theDeflection) { myDeflection = theDeflection; }
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Drawable,Draw_Drawable3D) Standard_Real GetDeflection() const { return myDeflection; }
void SetDrawMode (const Standard_Integer theDrawMode) { myDrawMode = theDrawMode; }
Standard_Integer GetDrawMode() const { return myDrawMode; }
protected: protected:
//! set the number of points on a curve at creation. //! set the number of points on a curve at creation.
Standard_EXPORT DrawTrSurf_Drawable(const Standard_Integer discret, const Standard_Real deflection = 0.01, const Standard_Integer DrawMode = 0); Standard_EXPORT DrawTrSurf_Drawable(const Standard_Integer discret, const Standard_Real deflection = 0.01, const Standard_Integer DrawMode = 0);
private: private:
Standard_Integer myDrawMode; Standard_Integer myDrawMode;
Standard_Integer myDiscret; Standard_Integer myDiscret;
Standard_Real myDeflection; Standard_Real myDeflection;
}; };
#include <DrawTrSurf_Drawable.lxx>
#endif // _DrawTrSurf_Drawable_HeaderFile #endif // _DrawTrSurf_Drawable_HeaderFile

58
src/DrawTrSurf/DrawTrSurf_Drawable.lxx
View File

@ -1,58 +0,0 @@
// Created on: 1991-07-16
// Created by: Christophe MARION
// Copyright (c) 1991-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.
inline void DrawTrSurf_Drawable::SetDrawMode (
const Standard_Integer DrawMode) {
myDrawMode = DrawMode;
}
inline void DrawTrSurf_Drawable::SetDiscretisation (
const Standard_Integer Discret) {
myDiscret = Discret;
}
inline void DrawTrSurf_Drawable::SetDeflection (
const Standard_Real Deflection) {
myDeflection = Deflection;
}
inline Standard_Integer DrawTrSurf_Drawable::GetDiscretisation () const {
return myDiscret;
}
inline Standard_Integer DrawTrSurf_Drawable::GetDrawMode () const {
return myDrawMode;
}
inline Standard_Real DrawTrSurf_Drawable::GetDeflection () const {
return myDeflection;
}

65
src/DrawTrSurf/DrawTrSurf_Params.hxx Normal file
View File

@ -0,0 +1,65 @@
// Copyright (c) 2021 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 DrawTrSurf_Params_HeaderFile
#define DrawTrSurf_Params_HeaderFile
#include <Draw_Color.hxx>
#include <Draw_MarkerShape.hxx>
//! DrawTrSurf parameters.
struct DrawTrSurf_Params
{
public:
Draw_Color PntColor;
Draw_Color CurvColor;
Draw_Color BoundsColor;
Draw_Color IsosColor;
Draw_Color PolesColor;
Draw_Color KnotsColor;
Draw_MarkerShape PntMarker;
Draw_MarkerShape KnotsMarker;
Standard_Boolean IsShowPoles;
Standard_Boolean IsShowKnots;
Standard_Boolean NeedKnotsIsos;
Standard_Real Deflection;
Standard_Integer KnotsSize;
Standard_Integer Discret;
Standard_Integer DrawMode;
Standard_Integer NbUIsos;
Standard_Integer NbVIsos;
DrawTrSurf_Params()
: PntColor (Draw_rouge),
CurvColor (Draw_jaune),
BoundsColor(Draw_vert),
IsosColor (Draw_bleu),
PolesColor (Draw_rouge),
KnotsColor (Draw_violet),
PntMarker (Draw_Plus),
KnotsMarker(Draw_Losange),
IsShowPoles (true),
IsShowKnots (true),
NeedKnotsIsos (true),
Deflection (0.01),
KnotsSize (5),
Discret (30),
DrawMode(0),
NbUIsos (10),
NbVIsos (10)
{}
};
#endif

197
src/DrawTrSurf/DrawTrSurf_Point.cxx
View File

@ -14,52 +14,51 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <DrawTrSurf_Point.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Draw_Display.hxx> #include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx> #include <DrawTrSurf.hxx>
#include <DrawTrSurf_Point.hxx> #include <DrawTrSurf_Params.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <gp_Pnt2d.hxx> #include <gp_Pnt2d.hxx>
#include <Standard_Stream.hxx>
#include <Standard_Type.hxx>
IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Point,Draw_Drawable3D) IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Point, Draw_Drawable3D)
//======================================================================= //=======================================================================
//function : DrawTrSurf_Point //function : DrawTrSurf_Point
//purpose : //purpose :
//======================================================================= //=======================================================================
DrawTrSurf_Point::DrawTrSurf_Point(const gp_Pnt& P, DrawTrSurf_Point::DrawTrSurf_Point (const gp_Pnt& P,
const Draw_MarkerShape Shape, const Draw_MarkerShape Shape,
const Draw_Color& Col) : const Draw_Color& Col)
myPoint(P), : myPoint(P),
is3D(Standard_True), is3D(Standard_True),
myShape(Shape), myShape(Shape),
myColor(Col) myColor(Col)
{ {
//
} }
//======================================================================= //=======================================================================
//function : DrawTrSurf_Point //function : DrawTrSurf_Point
//purpose : //purpose :
//======================================================================= //=======================================================================
DrawTrSurf_Point::DrawTrSurf_Point (const gp_Pnt2d& P,
DrawTrSurf_Point::DrawTrSurf_Point(const gp_Pnt2d& P, const Draw_MarkerShape Shape,
const Draw_MarkerShape Shape, const Draw_Color& Col)
const Draw_Color& Col) : : myPoint(P.X(),P.Y(),0.),
myPoint(P.X(),P.Y(),0.), is3D(Standard_False),
is3D(Standard_False), myShape(Shape),
myShape(Shape), myColor(Col)
myColor(Col)
{ {
//
} }
//======================================================================= //=======================================================================
//function : Is3D //function : Is3D
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean DrawTrSurf_Point::Is3D() const Standard_Boolean DrawTrSurf_Point::Is3D() const
{ {
return is3D; return is3D;
@ -67,10 +66,9 @@ Standard_Boolean DrawTrSurf_Point::Is3D() const
//======================================================================= //=======================================================================
//function : DrawOn //function : DrawOn
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Point::DrawOn (Draw_Display& dis) const
void DrawTrSurf_Point::DrawOn(Draw_Display& dis) const
{ {
dis.SetColor(myColor); dis.SetColor(myColor);
if (is3D) if (is3D)
@ -81,20 +79,9 @@ void DrawTrSurf_Point::DrawOn(Draw_Display& dis) const
//======================================================================= //=======================================================================
//function : Point //function : Point
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Point::Point (const gp_Pnt& P)
gp_Pnt DrawTrSurf_Point::Point() const
{
return myPoint;
}
//=======================================================================
//function : Point
//purpose :
//=======================================================================
void DrawTrSurf_Point::Point(const gp_Pnt& P)
{ {
myPoint = P; myPoint = P;
is3D = Standard_True; is3D = Standard_True;
@ -102,70 +89,18 @@ void DrawTrSurf_Point::Point(const gp_Pnt& P)
//======================================================================= //=======================================================================
//function : Point2d //function : Point2d
//purpose : //purpose :
//======================================================================= //=======================================================================
gp_Pnt2d DrawTrSurf_Point::Point2d() const
{
return gp_Pnt2d(myPoint.X(),myPoint.Y());
}
//=======================================================================
//function : Point2d
//purpose :
//=======================================================================
void DrawTrSurf_Point::Point2d(const gp_Pnt2d& P) void DrawTrSurf_Point::Point2d(const gp_Pnt2d& P)
{ {
myPoint.SetCoord(P.X(),P.Y(),0); myPoint.SetCoord(P.X(),P.Y(),0);
is3D = Standard_False; is3D = Standard_False;
} }
//=======================================================================
//function : Color
//purpose :
//=======================================================================
void DrawTrSurf_Point::Color(const Draw_Color& aColor)
{
myColor = aColor;
}
//=======================================================================
//function : Color
//purpose :
//=======================================================================
Draw_Color DrawTrSurf_Point::Color() const
{
return myColor;
}
//=======================================================================
//function : Shape
//purpose :
//=======================================================================
void DrawTrSurf_Point::Shape(const Draw_MarkerShape S)
{
myShape = S;
}
//=======================================================================
//function : Shape
//purpose :
//=======================================================================
Draw_MarkerShape DrawTrSurf_Point::Shape() const
{
return myShape;
}
//======================================================================= //=======================================================================
//function : Copy //function : Copy
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_Point::Copy() const Handle(Draw_Drawable3D) DrawTrSurf_Point::Copy() const
{ {
Handle(DrawTrSurf_Point) P; Handle(DrawTrSurf_Point) P;
@ -179,10 +114,9 @@ Handle(Draw_Drawable3D) DrawTrSurf_Point::Copy() const
//======================================================================= //=======================================================================
//function : Dump //function : Dump
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Point::Dump (Standard_OStream& S) const
void DrawTrSurf_Point::Dump(Standard_OStream& S) const
{ {
#if !defined(_MSC_VER) && !defined(__sgi) && !defined(IRIX) #if !defined(_MSC_VER) && !defined(__sgi) && !defined(IRIX)
std::ios::fmtflags F = S.flags(); std::ios::fmtflags F = S.flags();
@ -205,11 +139,70 @@ void DrawTrSurf_Point::Dump(Standard_OStream& S) const
} }
//======================================================================= //=======================================================================
//function : Whatis //function : Save
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Point::Save (Standard_OStream& theStream) const
void DrawTrSurf_Point::Whatis(Draw_Interpretor& S) const
{ {
S << "point"; #if !defined(_MSC_VER) && !defined(__sgi) && !defined(IRIX)
std::ios::fmtflags aFlags = theStream.flags();
theStream.setf (std::ios::scientific, std::ios::floatfield);
theStream.precision (15);
#else
long aForm = theStream.setf (std::ios::scientific);
std::streamsize aPrec = theStream.precision (15);
#endif
if (is3D)
{
theStream << "1 " << myPoint.X() << " " << myPoint.Y() << " " << myPoint.Z() << "\n";
}
else
{
theStream << "0 " << myPoint.X() << " " << myPoint.Y() << "\n";
}
#if !defined(_MSC_VER) && !defined(__sgi) && !defined(IRIX)
theStream.setf (aFlags);
#else
theStream.setf (aForm);
theStream.precision (aPrec);
#endif
}
//=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_Point::Restore (Standard_IStream& theStream)
{
const DrawTrSurf_Params& aParams = DrawTrSurf::Parameters();
Standard_Integer is3d = 0;
theStream >> is3d;
Standard_Real x,y,z = 0.0;
if (is3d)
{
theStream >> x >> y >> z;
}
else
{
theStream >> x >> y;
}
Handle(DrawTrSurf_Point) aDrawPoint;
if (is3d)
{
aDrawPoint = new DrawTrSurf_Point (gp_Pnt (x, y, z), aParams.PntMarker, aParams.PntColor);
}
else
{
aDrawPoint = new DrawTrSurf_Point (gp_Pnt2d (x, y), aParams.PntMarker, aParams.PntColor);
}
return aDrawPoint;
}
//=======================================================================
//function : Whatis
//purpose :
//=======================================================================
void DrawTrSurf_Point::Whatis (Draw_Interpretor& S) const
{
S << "point";
} }

82
src/DrawTrSurf/DrawTrSurf_Point.hxx
View File

@ -17,92 +17,68 @@
#ifndef _DrawTrSurf_Point_HeaderFile #ifndef _DrawTrSurf_Point_HeaderFile
#define _DrawTrSurf_Point_HeaderFile #define _DrawTrSurf_Point_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <Standard_Boolean.hxx>
#include <Draw_MarkerShape.hxx> #include <Draw_MarkerShape.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Draw_Drawable3D.hxx> #include <Draw_Drawable3D.hxx>
#include <Standard_OStream.hxx>
#include <Draw_Interpretor.hxx> #include <Draw_Interpretor.hxx>
class gp_Pnt;
class Draw_Color; class Draw_Color;
class gp_Pnt2d; class gp_Pnt2d;
class Draw_Display;
class Draw_Drawable3D;
class DrawTrSurf_Point;
DEFINE_STANDARD_HANDLE(DrawTrSurf_Point, Draw_Drawable3D) DEFINE_STANDARD_HANDLE(DrawTrSurf_Point, Draw_Drawable3D)
//! A drawable point. //! A drawable point.
class DrawTrSurf_Point : public Draw_Drawable3D class DrawTrSurf_Point : public Draw_Drawable3D
{ {
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Point, Draw_Drawable3D)
Draw_Drawable3D_FACTORY
public: public:
Standard_EXPORT DrawTrSurf_Point (const gp_Pnt& P, const Draw_MarkerShape Shape, const Draw_Color& Col);
Standard_EXPORT DrawTrSurf_Point(const gp_Pnt& P, const Draw_MarkerShape Shape, const Draw_Color& Col);
Standard_EXPORT DrawTrSurf_Point (const gp_Pnt2d& P, const Draw_MarkerShape Shape, const Draw_Color& Col);
Standard_EXPORT DrawTrSurf_Point(const gp_Pnt2d& P, const Draw_MarkerShape Shape, const Draw_Color& Col);
Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
//! Is a 3D object. (Default True). //! Is a 3D object. (Default True).
Standard_EXPORT virtual Standard_Boolean Is3D() const Standard_OVERRIDE; Standard_EXPORT virtual Standard_Boolean Is3D() const Standard_OVERRIDE;
Standard_EXPORT gp_Pnt Point() const; gp_Pnt Point() const { return myPoint; }
Standard_EXPORT void Point (const gp_Pnt& P); Standard_EXPORT void Point (const gp_Pnt& P);
Standard_EXPORT gp_Pnt2d Point2d() const; gp_Pnt2d Point2d() const { return gp_Pnt2d(myPoint.X(), myPoint.Y()); }
Standard_EXPORT void Point2d (const gp_Pnt2d& P); Standard_EXPORT void Point2d (const gp_Pnt2d& P);
Standard_EXPORT void Color (const Draw_Color& aColor); void Color (const Draw_Color& theColor) { myColor = theColor; }
Standard_EXPORT Draw_Color Color() const; Draw_Color Color() const { return myColor; }
Standard_EXPORT void Shape (const Draw_MarkerShape S); void Shape (const Draw_MarkerShape theS) { myShape = theS; }
Standard_EXPORT Draw_MarkerShape Shape() const; Draw_MarkerShape Shape() const { return myShape; }
//! For variable copy. //! For variable copy.
Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
//! For variable dump. //! For variable dump.
Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE; Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE;
//! Save drawable into stream.
Standard_EXPORT virtual void Save (Standard_OStream& theStream) const Standard_OVERRIDE;
//! For variable whatis command. //! For variable whatis command.
Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE; Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Point,Draw_Drawable3D)
protected:
private: private:
gp_Pnt myPoint; gp_Pnt myPoint;
Standard_Boolean is3D; Standard_Boolean is3D;
Draw_MarkerShape myShape; Draw_MarkerShape myShape;
Draw_Color myColor; Draw_Color myColor;
}; };
#endif // _DrawTrSurf_Point_HeaderFile #endif // _DrawTrSurf_Point_HeaderFile

108
src/DrawTrSurf/DrawTrSurf_Polygon2D.cxx
View File

@ -14,110 +14,104 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <DrawTrSurf_Polygon2D.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Draw_Display.hxx> #include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx>
#include <Draw_MarkerShape.hxx> #include <Draw_MarkerShape.hxx>
#include <DrawTrSurf_Polygon2D.hxx>
#include <Poly.hxx> #include <Poly.hxx>
#include <Poly_Polygon2D.hxx> #include <Poly_Polygon2D.hxx>
#include <Standard_Type.hxx>
IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Polygon2D,Draw_Drawable2D) IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Polygon2D, Draw_Drawable2D)
//======================================================================= //=======================================================================
//function : DrawTrSurf_Polygon2D //function : DrawTrSurf_Polygon2D
//purpose : //purpose :
//======================================================================= //=======================================================================
DrawTrSurf_Polygon2D::DrawTrSurf_Polygon2D(const Handle(Poly_Polygon2D)& P): DrawTrSurf_Polygon2D::DrawTrSurf_Polygon2D(const Handle(Poly_Polygon2D)& P)
myPolygon2D(P), : myPolygon2D(P),
myNodes(Standard_False) myNodes(Standard_False)
{ {
} }
//=======================================================================
//function : Polygon2D
//purpose :
//=======================================================================
Handle(Poly_Polygon2D) DrawTrSurf_Polygon2D::Polygon2D() const
{
return myPolygon2D;
}
//=======================================================================
//function : ShowNodes
//purpose :
//=======================================================================
void DrawTrSurf_Polygon2D::ShowNodes(const Standard_Boolean B)
{
myNodes = B;
}
//=======================================================================
//function : ShowNodes
//purpose :
//=======================================================================
Standard_Boolean DrawTrSurf_Polygon2D::ShowNodes() const
{
return myNodes;
}
//======================================================================= //=======================================================================
//function : DrawOn //function : DrawOn
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Polygon2D::DrawOn(Draw_Display& dis) const void DrawTrSurf_Polygon2D::DrawOn(Draw_Display& dis) const
{ {
dis.SetColor(Draw_jaune); dis.SetColor(Draw_jaune);
const TColgp_Array1OfPnt2d& Points = myPolygon2D->Nodes(); const TColgp_Array1OfPnt2d& Points = myPolygon2D->Nodes();
for (Standard_Integer i = Points.Lower(); i <= Points.Upper()-1; i++)
for (Standard_Integer i = Points.Lower(); i <= Points.Upper()-1; i++) { {
dis.Draw(Points(i), Points(i+1)); dis.Draw(Points(i), Points(i+1));
} }
if (myNodes) { if (myNodes)
for (Standard_Integer i = Points.Lower(); i <= Points.Upper(); i++) { {
for (Standard_Integer i = Points.Lower(); i <= Points.Upper(); i++)
{
dis.DrawMarker(Points(i), Draw_X); dis.DrawMarker(Points(i), Draw_X);
} }
} }
} }
//======================================================================= //=======================================================================
//function : Copy //function : Copy
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_Polygon2D::Copy() const
Handle(Draw_Drawable3D) DrawTrSurf_Polygon2D::Copy() const
{ {
return new DrawTrSurf_Polygon2D(myPolygon2D); return new DrawTrSurf_Polygon2D(myPolygon2D);
} }
//======================================================================= //=======================================================================
//function : Dump //function : Dump
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Polygon2D::Dump (Standard_OStream& S) const
void DrawTrSurf_Polygon2D::Dump(Standard_OStream& S) const
{ {
Poly::Dump(myPolygon2D, S); Poly::Dump(myPolygon2D, S);
} }
//======================================================================= //=======================================================================
//function : Whatis //function : Save
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Polygon2D::Save (Standard_OStream& theStream) const
{
#if !defined(_MSC_VER) && !defined(__sgi) && !defined(IRIX)
std::ios::fmtflags aFlags = theStream.flags();
theStream.setf (std::ios::scientific, std::ios::floatfield);
theStream.precision (15);
#else
long aForm = theStream.setf (std::ios::scientific);
std::streamsize aPrec = theStream.precision (15);
#endif
Poly::Write (myPolygon2D, theStream);
#if !defined(_MSC_VER) && !defined(__sgi) && !defined(IRIX)
theStream.setf (aFlags);
#else
theStream.setf (aForm);
theStream.precision (aPrec);
#endif
}
void DrawTrSurf_Polygon2D::Whatis(Draw_Interpretor& I) const //=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_Polygon2D::Restore (Standard_IStream& theStream)
{
return new DrawTrSurf_Polygon2D (Poly::ReadPolygon2D (theStream));
}
//=======================================================================
//function : Whatis
//purpose :
//=======================================================================
void DrawTrSurf_Polygon2D::Whatis (Draw_Interpretor& I) const
{ {
I << "polygon2D"; I << "polygon2D";
} }

63
src/DrawTrSurf/DrawTrSurf_Polygon2D.hxx
View File

@ -17,73 +17,48 @@
#ifndef _DrawTrSurf_Polygon2D_HeaderFile #ifndef _DrawTrSurf_Polygon2D_HeaderFile
#define _DrawTrSurf_Polygon2D_HeaderFile #define _DrawTrSurf_Polygon2D_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Standard_Boolean.hxx>
#include <Draw_Drawable2D.hxx> #include <Draw_Drawable2D.hxx>
#include <Standard_OStream.hxx>
#include <Draw_Interpretor.hxx> #include <Draw_Interpretor.hxx>
class Poly_Polygon2D; class Poly_Polygon2D;
class Draw_Display;
class Draw_Drawable3D;
class DrawTrSurf_Polygon2D;
DEFINE_STANDARD_HANDLE(DrawTrSurf_Polygon2D, Draw_Drawable2D) DEFINE_STANDARD_HANDLE(DrawTrSurf_Polygon2D, Draw_Drawable2D)
//! Used to display a 2d polygon. //! Used to display a 2d polygon.
//!
//! Optional display of nodes. //! Optional display of nodes.
class DrawTrSurf_Polygon2D : public Draw_Drawable2D class DrawTrSurf_Polygon2D : public Draw_Drawable2D
{ {
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Polygon2D, Draw_Drawable2D)
Draw_Drawable3D_FACTORY
public: public:
Standard_EXPORT DrawTrSurf_Polygon2D (const Handle(Poly_Polygon2D)& P);
Standard_EXPORT DrawTrSurf_Polygon2D(const Handle(Poly_Polygon2D)& P);
Handle(Poly_Polygon2D) Polygon2D() const { return myPolygon2D; }
Standard_EXPORT Handle(Poly_Polygon2D) Polygon2D() const;
void ShowNodes (const Standard_Boolean theB) { myNodes = theB; }
Standard_EXPORT void ShowNodes (const Standard_Boolean B);
Standard_Boolean ShowNodes() const { return myNodes; }
Standard_EXPORT Standard_Boolean ShowNodes() const;
Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
//! For variable copy. //! For variable copy.
Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
//! For variable dump. //! For variable dump.
Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE; Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE;
//! For variable whatis command. Set as a result the //! Save drawable into stream.
//! type of the variable. Standard_EXPORT virtual void Save (Standard_OStream& theStream) const Standard_OVERRIDE;
//! For variable whatis command. Set as a result the type of the variable.
Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE; Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Polygon2D,Draw_Drawable2D)
protected:
private: private:
Handle(Poly_Polygon2D) myPolygon2D; Handle(Poly_Polygon2D) myPolygon2D;
Standard_Boolean myNodes; Standard_Boolean myNodes;
}; };
#endif // _DrawTrSurf_Polygon2D_HeaderFile #endif // _DrawTrSurf_Polygon2D_HeaderFile

111
src/DrawTrSurf/DrawTrSurf_Polygon3D.cxx
View File

@ -14,110 +14,105 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <DrawTrSurf_Polygon3D.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Draw_Display.hxx> #include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx>
#include <Draw_MarkerShape.hxx> #include <Draw_MarkerShape.hxx>
#include <DrawTrSurf_Polygon3D.hxx>
#include <Poly.hxx> #include <Poly.hxx>
#include <Poly_Polygon3D.hxx> #include <Poly_Polygon3D.hxx>
#include <Standard_Type.hxx>
IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Polygon3D,Draw_Drawable3D) IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Polygon3D, Draw_Drawable3D)
//======================================================================= //=======================================================================
//function : DrawTrSurf_Polygon3D //function : DrawTrSurf_Polygon3D
//purpose : //purpose :
//======================================================================= //=======================================================================
DrawTrSurf_Polygon3D::DrawTrSurf_Polygon3D(const Handle(Poly_Polygon3D)& P): DrawTrSurf_Polygon3D::DrawTrSurf_Polygon3D (const Handle(Poly_Polygon3D)& P)
myPolygon3D(P), : myPolygon3D(P),
myNodes(Standard_False) myNodes(Standard_False)
{ {
//
}
//=======================================================================
//function : Polygon3D
//purpose :
//=======================================================================
Handle(Poly_Polygon3D) DrawTrSurf_Polygon3D::Polygon3D() const
{
return myPolygon3D;
}
//=======================================================================
//function : ShowNodes
//purpose :
//=======================================================================
void DrawTrSurf_Polygon3D::ShowNodes(const Standard_Boolean B)
{
myNodes = B;
}
//=======================================================================
//function : ShowNodes
//purpose :
//=======================================================================
Standard_Boolean DrawTrSurf_Polygon3D::ShowNodes() const
{
return myNodes;
} }
//======================================================================= //=======================================================================
//function : DrawOn //function : DrawOn
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Polygon3D::DrawOn(Draw_Display& dis) const void DrawTrSurf_Polygon3D::DrawOn(Draw_Display& dis) const
{ {
dis.SetColor(Draw_jaune); dis.SetColor(Draw_jaune);
const TColgp_Array1OfPnt& Points = myPolygon3D->Nodes();
for (Standard_Integer i = Points.Lower(); i <= Points.Upper()-1; i++) { const TColgp_Array1OfPnt& Points = myPolygon3D->Nodes();
for (Standard_Integer i = Points.Lower(); i <= Points.Upper()-1; i++)
{
dis.Draw(Points(i), Points(i+1)); dis.Draw(Points(i), Points(i+1));
} }
if (myNodes) { if (myNodes)
for (Standard_Integer i = Points.Lower(); i <= Points.Upper(); i++) { {
for (Standard_Integer i = Points.Lower(); i <= Points.Upper(); i++)
{
dis.DrawMarker(Points(i), Draw_X); dis.DrawMarker(Points(i), Draw_X);
} }
} }
} }
//======================================================================= //=======================================================================
//function : Copy //function : Copy
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_Polygon3D::Copy() const
Handle(Draw_Drawable3D) DrawTrSurf_Polygon3D::Copy() const
{ {
return new DrawTrSurf_Polygon3D(myPolygon3D); return new DrawTrSurf_Polygon3D(myPolygon3D);
} }
//======================================================================= //=======================================================================
//function : Dump //function : Dump
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Polygon3D::Dump (Standard_OStream& S) const
void DrawTrSurf_Polygon3D::Dump(Standard_OStream& S) const
{ {
Poly::Dump(myPolygon3D, S); Poly::Dump(myPolygon3D, S);
} }
//======================================================================= //=======================================================================
//function : Whatis //function : Save
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Polygon3D::Save (Standard_OStream& theStream) const
{
#if !defined(_MSC_VER) && !defined(__sgi) && !defined(IRIX)
std::ios::fmtflags aFlags = theStream.flags();
theStream.setf (std::ios::scientific,std::ios::floatfield);
theStream.precision (15);
#else
long aForm = theStream.setf (std::ios::scientific);
std::streamsize aPrec = theStream.precision (15);
#endif
Poly::Write (myPolygon3D, theStream);
#if !defined(_MSC_VER) && !defined(__sgi) && !defined(IRIX)
theStream.setf (aFlags);
#else
theStream.setf (aForm);
theStream.precision (aPrec);
#endif
}
void DrawTrSurf_Polygon3D::Whatis(Draw_Interpretor& I) const //=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_Polygon3D::Restore (Standard_IStream& theStream)
{
return new DrawTrSurf_Polygon3D (Poly::ReadPolygon3D (theStream));
}
//=======================================================================
//function : Whatis
//purpose :
//=======================================================================
void DrawTrSurf_Polygon3D::Whatis (Draw_Interpretor& I) const
{ {
I << "polygon3D"; I << "polygon3D";
} }

54
src/DrawTrSurf/DrawTrSurf_Polygon3D.hxx
View File

@ -17,38 +17,29 @@
#ifndef _DrawTrSurf_Polygon3D_HeaderFile #ifndef _DrawTrSurf_Polygon3D_HeaderFile
#define _DrawTrSurf_Polygon3D_HeaderFile #define _DrawTrSurf_Polygon3D_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Standard_Boolean.hxx>
#include <Draw_Drawable3D.hxx> #include <Draw_Drawable3D.hxx>
#include <Standard_OStream.hxx>
#include <Draw_Interpretor.hxx> #include <Draw_Interpretor.hxx>
class Poly_Polygon3D; class Poly_Polygon3D;
class Draw_Display;
class Draw_Drawable3D;
class DrawTrSurf_Polygon3D;
DEFINE_STANDARD_HANDLE(DrawTrSurf_Polygon3D, Draw_Drawable3D) DEFINE_STANDARD_HANDLE(DrawTrSurf_Polygon3D, Draw_Drawable3D)
//! Used to display a 3d polygon. //! Used to display a 3d polygon.
//!
//! Optional display of nodes. //! Optional display of nodes.
class DrawTrSurf_Polygon3D : public Draw_Drawable3D class DrawTrSurf_Polygon3D : public Draw_Drawable3D
{ {
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Polygon3D, Draw_Drawable3D)
Draw_Drawable3D_FACTORY
public: public:
Standard_EXPORT DrawTrSurf_Polygon3D (const Handle(Poly_Polygon3D)& P);
Standard_EXPORT DrawTrSurf_Polygon3D(const Handle(Poly_Polygon3D)& P);
Handle(Poly_Polygon3D) Polygon3D() const { return myPolygon3D; }
Standard_EXPORT Handle(Poly_Polygon3D) Polygon3D() const;
void ShowNodes (const Standard_Boolean theB) { myNodes = theB; }
Standard_EXPORT void ShowNodes (const Standard_Boolean B);
Standard_Boolean ShowNodes() const { return myNodes; }
Standard_EXPORT Standard_Boolean ShowNodes() const;
Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
//! For variable copy. //! For variable copy.
@ -56,34 +47,19 @@ public:
//! For variable dump. //! For variable dump.
Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE; Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE;
//! Save drawable into stream.
Standard_EXPORT virtual void Save (Standard_OStream& theStream) const Standard_OVERRIDE;
//! For variable whatis command. Set as a result the //! For variable whatis command. Set as a result the
//! type of the variable. //! type of the variable.
Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE; Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Polygon3D,Draw_Drawable3D)
protected:
private: private:
Handle(Poly_Polygon3D) myPolygon3D; Handle(Poly_Polygon3D) myPolygon3D;
Standard_Boolean myNodes; Standard_Boolean myNodes;
}; };
#endif // _DrawTrSurf_Polygon3D_HeaderFile #endif // _DrawTrSurf_Polygon3D_HeaderFile

87
src/DrawTrSurf/DrawTrSurf_Surface.cxx
View File

@ -12,28 +12,26 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <DrawTrSurf_Surface.hxx>
#include <Adaptor3d_IsoCurve.hxx> #include <Adaptor3d_IsoCurve.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Draw_Display.hxx> #include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx> #include <DrawTrSurf.hxx>
#include <DrawTrSurf_Surface.hxx> #include <DrawTrSurf_Params.hxx>
#include <Geom_Surface.hxx> #include <Geom_Surface.hxx>
#include <GeomAdaptor_Surface.hxx> #include <GeomAdaptor_Surface.hxx>
#include <GeomTools_SurfaceSet.hxx> #include <GeomTools_SurfaceSet.hxx>
#include <Precision.hxx> #include <Precision.hxx>
#include <Standard_Type.hxx>
IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Surface,DrawTrSurf_Drawable) IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Surface, DrawTrSurf_Drawable)
Standard_Real DrawTrSurf_SurfaceLimit = 400; Standard_Real DrawTrSurf_SurfaceLimit = 400;
//======================================================================= //=======================================================================
//function : DrawTrSurf_Surface //function : DrawTrSurf_Surface
//purpose : //purpose :
//======================================================================= //=======================================================================
DrawTrSurf_Surface::DrawTrSurf_Surface (const Handle(Geom_Surface)& S) DrawTrSurf_Surface::DrawTrSurf_Surface (const Handle(Geom_Surface)& S)
: DrawTrSurf_Drawable (16, 0.01, 1) : DrawTrSurf_Drawable (16, 0.01, 1)
{ {
@ -44,14 +42,10 @@ DrawTrSurf_Surface::DrawTrSurf_Surface (const Handle(Geom_Surface)& S)
nbVIsos = 1; nbVIsos = 1;
} }
//======================================================================= //=======================================================================
//function : DrawTrSurf_Surface //function : DrawTrSurf_Surface
//purpose : //purpose :
//======================================================================= //=======================================================================
DrawTrSurf_Surface::DrawTrSurf_Surface DrawTrSurf_Surface::DrawTrSurf_Surface
(const Handle(Geom_Surface)& S, const Standard_Integer Nu, (const Handle(Geom_Surface)& S, const Standard_Integer Nu,
const Standard_Integer Nv, const Standard_Integer Nv,
@ -67,13 +61,10 @@ DrawTrSurf_Surface::DrawTrSurf_Surface
nbVIsos = Abs(Nv); nbVIsos = Abs(Nv);
} }
//======================================================================= //=======================================================================
//function : DrawOn //function : DrawOn
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Surface::DrawOn (Draw_Display& dis) const void DrawTrSurf_Surface::DrawOn (Draw_Display& dis) const
{ {
DrawOn(dis,Standard_True); DrawOn(dis,Standard_True);
@ -81,11 +72,9 @@ void DrawTrSurf_Surface::DrawOn (Draw_Display& dis) const
//======================================================================= //=======================================================================
//function : DrawOn //function : DrawOn
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Surface::DrawOn (Draw_Display& dis, const Standard_Boolean Iso) const
void DrawTrSurf_Surface::DrawOn (Draw_Display& dis,
const Standard_Boolean Iso) const
{ {
Standard_Real UFirst, ULast, VFirst, VLast; Standard_Real UFirst, ULast, VFirst, VLast;
surf->Bounds (UFirst, ULast, VFirst, VLast); surf->Bounds (UFirst, ULast, VFirst, VLast);
@ -208,39 +197,21 @@ void DrawTrSurf_Surface::DrawOn (Draw_Display& dis,
dis); dis);
} }
//=======================================================================
//function : ShowIsos
//purpose :
//=======================================================================
void DrawTrSurf_Surface::ShowIsos ( const Standard_Integer Nu,
const Standard_Integer Nv)
{
nbUIsos = Abs(Nu);
nbVIsos = Abs(Nv);
}
//======================================================================= //=======================================================================
//function : ClearIsos //function : ClearIsos
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Surface::ClearIsos () void DrawTrSurf_Surface::ClearIsos ()
{ {
nbUIsos = 0; nbUIsos = 0;
nbVIsos = 0; nbVIsos = 0;
} }
//======================================================================= //=======================================================================
//function : Copy //function : Copy
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_Surface::Copy() const
Handle(Draw_Drawable3D) DrawTrSurf_Surface::Copy() const
{ {
Handle(DrawTrSurf_Surface) DS = new DrawTrSurf_Surface Handle(DrawTrSurf_Surface) DS = new DrawTrSurf_Surface
(Handle(Geom_Surface)::DownCast(surf->Copy()), (Handle(Geom_Surface)::DownCast(surf->Copy()),
@ -250,24 +221,44 @@ Handle(Draw_Drawable3D) DrawTrSurf_Surface::Copy() const
return DS; return DS;
} }
//======================================================================= //=======================================================================
//function : Dump //function : Dump
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Surface::Dump (Standard_OStream& S) const
void DrawTrSurf_Surface::Dump(Standard_OStream& S)const
{ {
GeomTools_SurfaceSet::PrintSurface(surf,S); GeomTools_SurfaceSet::PrintSurface(surf,S);
} }
//=======================================================================
//function : Save
//purpose :
//=======================================================================
void DrawTrSurf_Surface::Save (Standard_OStream& theStream) const
{
GeomTools_SurfaceSet::PrintSurface (surf, theStream, true);
}
//=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_Surface::Restore (std::istream& theStream)
{
const DrawTrSurf_Params& aParams = DrawTrSurf::Parameters();
Handle(Geom_Surface) aGeomSurface = GeomTools_SurfaceSet::ReadSurface (theStream);
Handle(DrawTrSurf_Surface) aDrawSurface = new DrawTrSurf_Surface (aGeomSurface,
aParams.NbUIsos, aParams.NbVIsos,
aParams.BoundsColor, aParams.IsosColor,
aParams.Discret, aParams.Deflection, aParams.DrawMode);
return aDrawSurface;
}
//======================================================================= //=======================================================================
//function : Whatis //function : Whatis
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Surface::Whatis (Draw_Interpretor& S) const
void DrawTrSurf_Surface::Whatis(Draw_Interpretor& S)const
{ {
S << "a surface"; S << "a surface";
} }

97
src/DrawTrSurf/DrawTrSurf_Surface.hxx
View File

@ -17,103 +17,86 @@
#ifndef _DrawTrSurf_Surface_HeaderFile #ifndef _DrawTrSurf_Surface_HeaderFile
#define _DrawTrSurf_Surface_HeaderFile #define _DrawTrSurf_Surface_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Standard_Integer.hxx>
#include <DrawTrSurf_Drawable.hxx> #include <DrawTrSurf_Drawable.hxx>
#include <Standard_Real.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_OStream.hxx>
#include <Draw_Interpretor.hxx> #include <Draw_Interpretor.hxx>
class Geom_Surface; class Geom_Surface;
class Draw_Color; class Draw_Color;
class Draw_Display;
class Draw_Drawable3D;
class DrawTrSurf_Surface;
DEFINE_STANDARD_HANDLE(DrawTrSurf_Surface, DrawTrSurf_Drawable) DEFINE_STANDARD_HANDLE(DrawTrSurf_Surface, DrawTrSurf_Drawable)
//! This class defines a drawable surface. //! This class defines a drawable surface.
//! With this class you can draw a general surface from //! With this class you can draw a general surface from package Geom.
//! package Geom.
class DrawTrSurf_Surface : public DrawTrSurf_Drawable class DrawTrSurf_Surface : public DrawTrSurf_Drawable
{ {
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Surface, DrawTrSurf_Drawable)
Draw_Drawable3D_FACTORY
public: public:
//! default drawing mode //! default drawing mode
//! Just the middle isoparametric curves are drawn. //! Just the middle isoparametric curves are drawn.
//! The boundaries are yellow, the isoparametric curves are blues. //! The boundaries are yellow, the isoparametric curves are blues.
//! For the discretisation 50 points are computed in each parametric //! For the discretisation 50 points are computed in each parametric direction.
//! direction. Standard_EXPORT DrawTrSurf_Surface (const Handle(Geom_Surface)& S);
Standard_EXPORT DrawTrSurf_Surface(const Handle(Geom_Surface)& S);
Standard_EXPORT DrawTrSurf_Surface (const Handle(Geom_Surface)& S,
Standard_EXPORT DrawTrSurf_Surface(const Handle(Geom_Surface)& S, const Standard_Integer Nu, const Standard_Integer Nv, const Draw_Color& BoundsColor, const Draw_Color& IsosColor, const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode); const Standard_Integer Nu, const Standard_Integer Nv,
const Draw_Color& BoundsColor, const Draw_Color& IsosColor,
Draw_Color BoundsColor() const; const Standard_Integer Discret, const Standard_Real Deflection, const Standard_Integer DrawMode);
Draw_Color BoundsColor() const { return boundsLook; }
//! rub out all the isoparametric curves. //! rub out all the isoparametric curves.
Standard_EXPORT virtual void ClearIsos(); Standard_EXPORT virtual void ClearIsos();
Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
//! Iso = True : Draw the isos, the boundaries, the UVMarker. //! Iso = True : Draw the isos, the boundaries, the UVMarker.
//! Iso = False: Only Draw the boundary and the UVMarker. //! Iso = False: Only Draw the boundary and the UVMarker.
Standard_EXPORT void DrawOn (Draw_Display& dis, const Standard_Boolean Iso) const; Standard_EXPORT void DrawOn (Draw_Display& dis, const Standard_Boolean Iso) const;
Handle(Geom_Surface) GetSurface() const; Handle(Geom_Surface) GetSurface() const { return surf; }
Draw_Color IsosColor() const; Draw_Color IsosColor() const { return isosLook; }
void NbIsos (Standard_Integer& Nu, Standard_Integer& Nb) const; void NbIsos (Standard_Integer& theNU, Standard_Integer& theNV) const
{
void SetBoundsColor (const Draw_Color& aColor); theNU = nbUIsos;
theNV = nbVIsos;
void SetIsosColor (const Draw_Color& aColor); }
void SetBoundsColor (const Draw_Color& theColor) { boundsLook = theColor; }
void SetIsosColor (const Draw_Color& theColor) { isosLook = theColor; }
//! change the number of isoparametric curves to be drawn. //! change the number of isoparametric curves to be drawn.
Standard_EXPORT virtual void ShowIsos (const Standard_Integer Nu, const Standard_Integer Nv); virtual void ShowIsos (const Standard_Integer theNu, const Standard_Integer theNv)
{
nbUIsos = Abs(theNu);
nbVIsos = Abs(theNv);
}
//! For variable copy. //! For variable copy.
Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
//! For variable dump. //! For variable dump.
Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE; Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE;
//! Save drawable into stream.
Standard_EXPORT virtual void Save (Standard_OStream& theStream) const Standard_OVERRIDE;
//! For variable whatis command. //! For variable whatis command.
Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE; Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Surface,DrawTrSurf_Drawable)
protected: protected:
Handle(Geom_Surface) surf; Handle(Geom_Surface) surf;
Draw_Color boundsLook; Draw_Color boundsLook;
Draw_Color isosLook; Draw_Color isosLook;
Standard_Integer nbUIsos; Standard_Integer nbUIsos;
Standard_Integer nbVIsos; Standard_Integer nbVIsos;
private:
}; };
#include <DrawTrSurf_Surface.lxx>
#endif // _DrawTrSurf_Surface_HeaderFile #endif // _DrawTrSurf_Surface_HeaderFile

46
src/DrawTrSurf/DrawTrSurf_Surface.lxx
View File

@ -1,46 +0,0 @@
// 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.
inline Handle(Geom_Surface) DrawTrSurf_Surface::GetSurface () const {
return surf;
}
inline Draw_Color DrawTrSurf_Surface::BoundsColor () const {
return boundsLook;
}
inline Draw_Color DrawTrSurf_Surface::IsosColor () const {
return isosLook;
}
inline void DrawTrSurf_Surface::SetIsosColor (const Draw_Color& aColor) {
isosLook = aColor;
}
inline void DrawTrSurf_Surface::SetBoundsColor (const Draw_Color& aColor) {
boundsLook = aColor;
}
inline void DrawTrSurf_Surface::NbIsos (Standard_Integer& Nu, Standard_Integer& Nv) const {
Nu = nbUIsos;
Nv = nbVIsos;
}

119
src/DrawTrSurf/DrawTrSurf_Triangulation.cxx
View File

@ -14,32 +14,30 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <DrawTrSurf_Triangulation.hxx>
#include <Draw_Color.hxx> #include <Draw_Color.hxx>
#include <Draw_Display.hxx> #include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx>
#include <DrawTrSurf_Triangulation.hxx>
#include <gp_Pnt.hxx> #include <gp_Pnt.hxx>
#include <Poly.hxx> #include <Poly.hxx>
#include <Poly_Array1OfTriangle.hxx> #include <Poly_Array1OfTriangle.hxx>
#include <Poly_Connect.hxx> #include <Poly_Connect.hxx>
#include <Poly_Triangle.hxx> #include <Poly_Triangle.hxx>
#include <Poly_Triangulation.hxx> #include <Poly_Triangulation.hxx>
#include <Standard_Type.hxx>
#include <TColStd_Array1OfInteger.hxx> #include <TColStd_Array1OfInteger.hxx>
#include <stdio.h> #include <stdio.h>
IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Triangulation,Draw_Drawable3D) IMPLEMENT_STANDARD_RTTIEXT(DrawTrSurf_Triangulation,Draw_Drawable3D)
//======================================================================= //=======================================================================
//function : DrawTrSurf_Triangulation //function : DrawTrSurf_Triangulation
//purpose : //purpose :
//======================================================================= //=======================================================================
DrawTrSurf_Triangulation::DrawTrSurf_Triangulation DrawTrSurf_Triangulation::DrawTrSurf_Triangulation (const Handle(Poly_Triangulation)& T)
(const Handle(Poly_Triangulation)& T): : myTriangulation(T),
myTriangulation(T), myNodes(Standard_False),
myNodes(Standard_False), myTriangles(Standard_False)
myTriangles(Standard_False)
{ {
// Build the connect tool // Build the connect tool
Poly_Connect pc(T); Poly_Connect pc(T);
@ -85,62 +83,11 @@ DrawTrSurf_Triangulation::DrawTrSurf_Triangulation
} }
} }
//=======================================================================
//function : Triangulation
//purpose :
//=======================================================================
Handle(Poly_Triangulation) DrawTrSurf_Triangulation::Triangulation() const
{
return myTriangulation;
}
//=======================================================================
//function : ShowNodes
//purpose :
//=======================================================================
void DrawTrSurf_Triangulation::ShowNodes(const Standard_Boolean B)
{
myNodes = B;
}
//=======================================================================
//function : ShowNodes
//purpose :
//=======================================================================
Standard_Boolean DrawTrSurf_Triangulation::ShowNodes() const
{
return myNodes;
}
//=======================================================================
//function : ShowTriangles
//purpose :
//=======================================================================
void DrawTrSurf_Triangulation::ShowTriangles(const Standard_Boolean B)
{
myTriangles = B;
}
//=======================================================================
//function : ShowTriangles
//purpose :
//=======================================================================
Standard_Boolean DrawTrSurf_Triangulation::ShowTriangles() const
{
return myTriangles;
}
//======================================================================= //=======================================================================
//function : DrawOn //function : DrawOn
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Triangulation::DrawOn (Draw_Display& dis) const
void DrawTrSurf_Triangulation::DrawOn(Draw_Display& dis) const
{ {
// Display the edges // Display the edges
Standard_Integer i,n; Standard_Integer i,n;
@ -196,31 +143,59 @@ void DrawTrSurf_Triangulation::DrawOn(Draw_Display& dis) const
//======================================================================= //=======================================================================
//function : Copy //function : Copy
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_Triangulation::Copy() const
Handle(Draw_Drawable3D) DrawTrSurf_Triangulation::Copy() const
{ {
return new DrawTrSurf_Triangulation(myTriangulation); return new DrawTrSurf_Triangulation(myTriangulation);
} }
//======================================================================= //=======================================================================
//function : Dump //function : Dump
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Triangulation::Dump (Standard_OStream& S) const
void DrawTrSurf_Triangulation::Dump(Standard_OStream& S) const
{ {
Poly::Dump(myTriangulation,S); Poly::Dump(myTriangulation,S);
} }
//======================================================================= //=======================================================================
//function : Whatis //function : Save
//purpose : //purpose :
//======================================================================= //=======================================================================
void DrawTrSurf_Triangulation::Save (Standard_OStream& theStream) const
{
#if !defined(_MSC_VER) && !defined(__sgi) && !defined(IRIX)
std::ios::fmtflags aFlags = theStream.flags();
theStream.setf (std::ios::scientific, std::ios::floatfield);
theStream.precision (15);
#else
long aForm = theStream.setf (std::ios::scientific);
std::streamsize aPrec = theStream.precision (15);
#endif
Poly::Write (myTriangulation, theStream);
#if !defined(_MSC_VER) && !defined(__sgi) && !defined(IRIX)
theStream.setf (aFlags);
#else
theStream.setf (aForm);
theStream.precision (aPrec);
#endif
}
void DrawTrSurf_Triangulation::Whatis(Draw_Interpretor& I) const //=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) DrawTrSurf_Triangulation::Restore (Standard_IStream& theStream)
{
return new DrawTrSurf_Triangulation (Poly::ReadTriangulation (theStream));
}
//=======================================================================
//function : Whatis
//purpose :
//=======================================================================
void DrawTrSurf_Triangulation::Whatis (Draw_Interpretor& I) const
{ {
I << "triangulation"; I << "triangulation";
} }

70
src/DrawTrSurf/DrawTrSurf_Triangulation.hxx
View File

@ -17,20 +17,12 @@
#ifndef _DrawTrSurf_Triangulation_HeaderFile #ifndef _DrawTrSurf_Triangulation_HeaderFile
#define _DrawTrSurf_Triangulation_HeaderFile #define _DrawTrSurf_Triangulation_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <TColStd_HArray1OfInteger.hxx> #include <TColStd_HArray1OfInteger.hxx>
#include <Standard_Boolean.hxx>
#include <Draw_Drawable3D.hxx> #include <Draw_Drawable3D.hxx>
#include <Standard_OStream.hxx>
#include <Draw_Interpretor.hxx> #include <Draw_Interpretor.hxx>
class Poly_Triangulation; class Poly_Triangulation;
class Draw_Display;
class Draw_Drawable3D;
class DrawTrSurf_Triangulation;
DEFINE_STANDARD_HANDLE(DrawTrSurf_Triangulation, Draw_Drawable3D) DEFINE_STANDARD_HANDLE(DrawTrSurf_Triangulation, Draw_Drawable3D)
//! Used to display a triangulation. //! Used to display a triangulation.
@ -40,60 +32,44 @@ DEFINE_STANDARD_HANDLE(DrawTrSurf_Triangulation, Draw_Drawable3D)
//! Optional display of triangles and nodes indices. //! Optional display of triangles and nodes indices.
class DrawTrSurf_Triangulation : public Draw_Drawable3D class DrawTrSurf_Triangulation : public Draw_Drawable3D
{ {
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Triangulation, Draw_Drawable3D)
Draw_Drawable3D_FACTORY
public: public:
Standard_EXPORT DrawTrSurf_Triangulation (const Handle(Poly_Triangulation)& T);
Handle(Poly_Triangulation) Triangulation() const { return myTriangulation; }
void ShowNodes (const Standard_Boolean theB) { myNodes = theB; }
Standard_Boolean ShowNodes() const { return myNodes; }
void ShowTriangles (const Standard_Boolean theB) { myTriangles = theB; }
Standard_Boolean ShowTriangles() const { return myTriangles; }
Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
Standard_EXPORT DrawTrSurf_Triangulation(const Handle(Poly_Triangulation)& T);
Standard_EXPORT Handle(Poly_Triangulation) Triangulation() const;
Standard_EXPORT void ShowNodes (const Standard_Boolean B);
Standard_EXPORT Standard_Boolean ShowNodes() const;
Standard_EXPORT void ShowTriangles (const Standard_Boolean B);
Standard_EXPORT Standard_Boolean ShowTriangles() const;
Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
//! For variable copy. //! For variable copy.
Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
//! For variable dump. //! For variable dump.
Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE; Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE;
//! For variable whatis command. Set as a result the //! Save drawable into stream.
//! type of the variable. Standard_EXPORT virtual void Save (Standard_OStream& theStream) const Standard_OVERRIDE;
//! For variable whatis command. Set as a result the type of the variable.
Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE; Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(DrawTrSurf_Triangulation,Draw_Drawable3D)
protected:
private: private:
Handle(Poly_Triangulation) myTriangulation; Handle(Poly_Triangulation) myTriangulation;
Handle(TColStd_HArray1OfInteger) myInternals; Handle(TColStd_HArray1OfInteger) myInternals;
Handle(TColStd_HArray1OfInteger) myFree; Handle(TColStd_HArray1OfInteger) myFree;
Standard_Boolean myNodes; Standard_Boolean myNodes;
Standard_Boolean myTriangles; Standard_Boolean myTriangles;
}; };
#endif // _DrawTrSurf_Triangulation_HeaderFile #endif // _DrawTrSurf_Triangulation_HeaderFile

11
src/DrawTrSurf/FILES
View File

@ -2,32 +2,24 @@ DrawTrSurf.cxx
DrawTrSurf.hxx DrawTrSurf.hxx
DrawTrSurf_BezierCurve.cxx DrawTrSurf_BezierCurve.cxx
DrawTrSurf_BezierCurve.hxx DrawTrSurf_BezierCurve.hxx
DrawTrSurf_BezierCurve.lxx
DrawTrSurf_BezierCurve2d.cxx DrawTrSurf_BezierCurve2d.cxx
DrawTrSurf_BezierCurve2d.hxx DrawTrSurf_BezierCurve2d.hxx
DrawTrSurf_BezierCurve2d.lxx
DrawTrSurf_BezierSurface.cxx DrawTrSurf_BezierSurface.cxx
DrawTrSurf_BezierSurface.hxx DrawTrSurf_BezierSurface.hxx
DrawTrSurf_BezierSurface.lxx
DrawTrSurf_BSplineCurve.cxx DrawTrSurf_BSplineCurve.cxx
DrawTrSurf_BSplineCurve.hxx DrawTrSurf_BSplineCurve.hxx
DrawTrSurf_BSplineCurve.lxx
DrawTrSurf_BSplineCurve2d.cxx DrawTrSurf_BSplineCurve2d.cxx
DrawTrSurf_BSplineCurve2d.hxx DrawTrSurf_BSplineCurve2d.hxx
DrawTrSurf_BSplineCurve2d.lxx
DrawTrSurf_BSplineSurface.cxx DrawTrSurf_BSplineSurface.cxx
DrawTrSurf_BSplineSurface.hxx DrawTrSurf_BSplineSurface.hxx
DrawTrSurf_BSplineSurface.lxx
DrawTrSurf_Curve.cxx DrawTrSurf_Curve.cxx
DrawTrSurf_Curve.hxx DrawTrSurf_Curve.hxx
DrawTrSurf_Curve.lxx
DrawTrSurf_Curve2d.cxx DrawTrSurf_Curve2d.cxx
DrawTrSurf_Curve2d.hxx DrawTrSurf_Curve2d.hxx
DrawTrSurf_Curve2d.lxx
DrawTrSurf_Debug.cxx DrawTrSurf_Debug.cxx
DrawTrSurf_Drawable.cxx DrawTrSurf_Drawable.cxx
DrawTrSurf_Drawable.hxx DrawTrSurf_Drawable.hxx
DrawTrSurf_Drawable.lxx DrawTrSurf_Params.hxx
DrawTrSurf_Point.cxx DrawTrSurf_Point.cxx
DrawTrSurf_Point.hxx DrawTrSurf_Point.hxx
DrawTrSurf_Polygon2D.cxx DrawTrSurf_Polygon2D.cxx
@ -36,7 +28,6 @@ DrawTrSurf_Polygon3D.cxx
DrawTrSurf_Polygon3D.hxx DrawTrSurf_Polygon3D.hxx
DrawTrSurf_Surface.cxx DrawTrSurf_Surface.cxx
DrawTrSurf_Surface.hxx DrawTrSurf_Surface.hxx
DrawTrSurf_Surface.lxx
DrawTrSurf_Triangulation.cxx DrawTrSurf_Triangulation.cxx
DrawTrSurf_Triangulation.hxx DrawTrSurf_Triangulation.hxx
DrawTrSurf_Triangulation2D.cxx DrawTrSurf_Triangulation2D.cxx

1
src/HLRTest/FILES
View File

@ -10,7 +10,6 @@ HLRTest_OutLiner.hxx
HLRTest_OutLiner.lxx HLRTest_OutLiner.lxx
HLRTest_Projector.cxx HLRTest_Projector.cxx
HLRTest_Projector.hxx HLRTest_Projector.hxx
HLRTest_Projector.lxx
HLRTest_ShapeData.cxx HLRTest_ShapeData.cxx
HLRTest_ShapeData.hxx HLRTest_ShapeData.hxx
HLRTest_ShapeData.lxx HLRTest_ShapeData.lxx

93
src/HLRTest/HLRTest.cxx
View File

@ -563,6 +563,9 @@ static Standard_Integer hlrin2d(Draw_Interpretor& , Standard_Integer n, const ch
void HLRTest::Commands (Draw_Interpretor& theCommands) void HLRTest::Commands (Draw_Interpretor& theCommands)
{ {
// Register save/restore tool
HLRTest_Projector::RegisterFactory();
const char* g = "ADVALGOS HLR Commands"; const char* g = "ADVALGOS HLR Commands";
theCommands.Add("hprj" ,"hprj name [view-id = 1]" ,__FILE__,hprj,g); theCommands.Add("hprj" ,"hprj name [view-id = 1]" ,__FILE__,hprj,g);
@ -594,93 +597,3 @@ void HLRTest::Commands (Draw_Interpretor& theCommands)
hider = new HLRBRep_Algo(); hider = new HLRBRep_Algo();
} }
//=======================================================================
//function : save and restore projector
//purpose :
//=======================================================================
static Standard_Boolean stest(const Handle(Draw_Drawable3D)& d)
{
return d->IsInstance(STANDARD_TYPE(HLRTest_Projector));
}
//=======================================================================
//function : ssave
//purpose :
//=======================================================================
static void ssave (const Handle(Draw_Drawable3D)&d, std::ostream& OS)
{
Handle(HLRTest_Projector) HP =
Handle(HLRTest_Projector)::DownCast(d);
const HLRAlgo_Projector& P = HP->Projector();
OS << (P.Perspective() ? "1" : "0") << "\n";
if (P.Perspective())
OS << P.Focus() << "\n";
gp_Trsf T = P.Transformation();
gp_XYZ V = T.TranslationPart();
gp_Mat M = T.VectorialPart();
OS << M(1,1) << " ";
OS << M(1,2) << " ";
OS << M(1,3) << " ";
OS << V.Coord(1) << " ";
OS << "\n";
OS << M(2,1) << " ";
OS << M(2,2) << " ";
OS << M(2,3) << " ";
OS << V.Coord(2) << " ";
OS << "\n";
OS << M(3,1) << " ";
OS << M(3,2) << " ";
OS << M(3,3) << " ";
OS << V.Coord(3) << " ";
OS << "\n";
}
//=======================================================================
//function : srestore
//purpose :
//=======================================================================
static Handle(Draw_Drawable3D) srestore (std::istream& IS)
{
Standard_Boolean pers;
IS >> pers;
Standard_Real focus = 1;
if (pers) IS >> focus;
gp_Trsf T;
Standard_Real V1[3],V2[3],V3[3];
Standard_Real V[3];
IS >> V1[0] >> V1[1] >> V1[2] >> V[0];
IS >> V2[0] >> V2[1] >> V2[2] >> V[1];
IS >> V3[0] >> V3[1] >> V3[2] >> V[2];
gp_Dir D1(V1[0],V1[1],V1[2]);
gp_Dir D2(V2[0],V2[1],V2[2]);
gp_Dir D3(V3[0],V3[1],V3[2]);
gp_Ax3 axes(gp_Pnt(0,0,0),D3,D1);
D3.Cross(D1);
if (D3.Dot(D2) < 0) axes.YReverse();
T.SetTransformation(axes);
T.SetTranslationPart(gp_Vec(V[0],V[1],V[2]));
HLRAlgo_Projector P(T,pers,focus);
Handle(HLRTest_Projector) HP = new HLRTest_Projector(P);
return HP;
}
//=======================================================================
//function : ssr
//purpose :
//=======================================================================
static Draw_SaveAndRestore ssr("HLRTest_Projector",stest,ssave,srestore);

107
src/HLRTest/HLRTest_Projector.cxx
View File

@ -14,50 +14,47 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <HLRTest_Projector.hxx>
#include <Draw_Display.hxx> #include <Draw_Display.hxx>
#include <Draw_Drawable3D.hxx> #include <gp_Ax3.hxx>
#include <HLRAlgo_Projector.hxx> #include <HLRAlgo_Projector.hxx>
#include <HLRTest_Projector.hxx>
#include <Standard_Stream.hxx>
#include <Standard_Type.hxx>
IMPLEMENT_STANDARD_RTTIEXT(HLRTest_Projector,Draw_Drawable3D) IMPLEMENT_STANDARD_RTTIEXT(HLRTest_Projector, Draw_Drawable3D)
//======================================================================= //=======================================================================
//function : HLRTest_Projector //function : HLRTest_Projector
//purpose : //purpose :
//======================================================================= //=======================================================================
HLRTest_Projector::HLRTest_Projector (const HLRAlgo_Projector& P) : HLRTest_Projector::HLRTest_Projector (const HLRAlgo_Projector& P)
myProjector(P) : myProjector(P)
{ {
//
} }
//======================================================================= //=======================================================================
//function : DrawOn //function : DrawOn
//purpose : //purpose :
//======================================================================= //=======================================================================
void HLRTest_Projector::DrawOn (Draw_Display&) const
void HLRTest_Projector::DrawOn (Draw_Display&) const
{ {
//
} }
//======================================================================= //=======================================================================
//function : Copy //function : Copy
//purpose : //purpose :
//======================================================================= //=======================================================================
Handle(Draw_Drawable3D) HLRTest_Projector::Copy() const
Handle(Draw_Drawable3D) HLRTest_Projector::Copy () const
{ {
return new HLRTest_Projector(myProjector); return new HLRTest_Projector(myProjector);
} }
//======================================================================= //=======================================================================
//function : Dump //function : Dump
//purpose : //purpose :
//======================================================================= //=======================================================================
void HLRTest_Projector::Dump (Standard_OStream& S) const
void HLRTest_Projector::Dump (Standard_OStream& S) const
{ {
S << "Projector : \n"; S << "Projector : \n";
if (myProjector.Perspective()) if (myProjector.Perspective())
@ -74,12 +71,80 @@ void HLRTest_Projector::Dump (Standard_OStream& S) const
} }
//======================================================================= //=======================================================================
//function : Whatis //function : Save
//purpose : //purpose :
//======================================================================= //=======================================================================
void HLRTest_Projector::Save (Standard_OStream& theStream) const
{
theStream << (myProjector.Perspective() ? "1" : "0") << "\n";
if (myProjector.Perspective())
{
theStream << myProjector.Focus() << "\n";
}
void HLRTest_Projector::Whatis (Draw_Interpretor& I) const const gp_Trsf aTransformation = myProjector.Transformation();
const gp_XYZ aTranslationVector = aTransformation.TranslationPart();
const gp_Mat aMatrix = aTransformation.VectorialPart();
theStream << aMatrix(1, 1) << " ";
theStream << aMatrix(1, 2) << " ";
theStream << aMatrix(1, 3) << " ";
theStream << aTranslationVector.Coord (1) << " ";
theStream << "\n";
theStream << aMatrix(2, 1) << " ";
theStream << aMatrix(2, 2) << " ";
theStream << aMatrix(2, 3) << " ";
theStream << aTranslationVector.Coord (2) << " ";
theStream << "\n";
theStream << aMatrix(3, 1) << " ";
theStream << aMatrix(3, 2) << " ";
theStream << aMatrix(3, 3) << " ";
theStream << aTranslationVector.Coord (3) << " ";
theStream << "\n";
}
//=======================================================================
//function : Restore
//purpose :
//=======================================================================
Handle(Draw_Drawable3D) HLRTest_Projector::Restore (Standard_IStream& theStream)
{
Standard_Boolean aPerspective = false;
Standard_Real aFocus = 1.0;
Standard_Real aDirVect1[3], aDirVect2[3], aDirVect3[3];
Standard_Real aTranslationVector[3];
theStream >> aPerspective;
if (aPerspective)
{
theStream >> aFocus;
}
theStream >> aDirVect1[0] >> aDirVect1[1] >> aDirVect1[2] >> aTranslationVector[0];
theStream >> aDirVect2[0] >> aDirVect2[1] >> aDirVect2[2] >> aTranslationVector[1];
theStream >> aDirVect3[0] >> aDirVect3[1] >> aDirVect3[2] >> aTranslationVector[2];
gp_Dir aDir1 (aDirVect1[0], aDirVect1[1], aDirVect1[2]);
gp_Dir aDir2 (aDirVect2[0], aDirVect2[1], aDirVect2[2]);
gp_Dir aDir3 (aDirVect3[0], aDirVect3[1], aDirVect3[2]);
gp_Ax3 anAxis (gp_Pnt (0, 0, 0), aDir3, aDir1);
aDir3.Cross (aDir1);
if (aDir3.Dot (aDir2) < 0.0)
{
anAxis.YReverse();
}
gp_Trsf aTransformation;
aTransformation.SetTransformation (anAxis);
aTransformation.SetTranslationPart (gp_Vec (aTranslationVector[0], aTranslationVector[1], aTranslationVector[2]));
HLRAlgo_Projector anAlgoProtector (aTransformation, aPerspective, aFocus);
Handle(HLRTest_Projector) aTestProjector = new HLRTest_Projector (anAlgoProtector);
return aTestProjector;
}
//=======================================================================
//function : Whatis
//purpose :
//=======================================================================
void HLRTest_Projector::Whatis (Draw_Interpretor& I) const
{ {
I << "projector"; I << "projector";
} }

51
src/HLRTest/HLRTest_Projector.hxx
View File

@ -17,68 +17,43 @@
#ifndef _HLRTest_Projector_HeaderFile #ifndef _HLRTest_Projector_HeaderFile
#define _HLRTest_Projector_HeaderFile #define _HLRTest_Projector_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <HLRAlgo_Projector.hxx> #include <HLRAlgo_Projector.hxx>
#include <Draw_Drawable3D.hxx> #include <Draw_Drawable3D.hxx>
#include <Standard_OStream.hxx>
#include <Draw_Interpretor.hxx> #include <Draw_Interpretor.hxx>
class HLRAlgo_Projector;
class Draw_Display;
class Draw_Drawable3D;
class HLRTest_Projector;
DEFINE_STANDARD_HANDLE(HLRTest_Projector, Draw_Drawable3D) DEFINE_STANDARD_HANDLE(HLRTest_Projector, Draw_Drawable3D)
//! Draw Variable Projector to test. //! Draw Variable Projector to test.
class HLRTest_Projector : public Draw_Drawable3D class HLRTest_Projector : public Draw_Drawable3D
{ {
DEFINE_STANDARD_RTTIEXT(HLRTest_Projector, Draw_Drawable3D)
Draw_Drawable3D_FACTORY
public: public:
Standard_EXPORT HLRTest_Projector(const HLRAlgo_Projector& P); Standard_EXPORT HLRTest_Projector(const HLRAlgo_Projector& P);
const HLRAlgo_Projector& Projector() const; const HLRAlgo_Projector& Projector() const { return myProjector; }
//! Does nothhing, //! Does nothing,
Standard_EXPORT void DrawOn (Draw_Display& dis) const Standard_OVERRIDE; Standard_EXPORT virtual void DrawOn (Draw_Display& dis) const Standard_OVERRIDE;
//! For variable copy. //! For variable copy.
Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE; Standard_EXPORT virtual Handle(Draw_Drawable3D) Copy() const Standard_OVERRIDE;
//! For variable dump. //! For variable dump.
Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE; Standard_EXPORT virtual void Dump (Standard_OStream& S) const Standard_OVERRIDE;
//! Save drawable into stream.
Standard_EXPORT virtual void Save (Standard_OStream& theStream) const Standard_OVERRIDE;
//! For variable whatis command. Set as a result the //! For variable whatis command. Set as a result the
//! type of the variable. //! type of the variable.
Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE; Standard_EXPORT virtual void Whatis (Draw_Interpretor& I) const Standard_OVERRIDE;
DEFINE_STANDARD_RTTIEXT(HLRTest_Projector,Draw_Drawable3D)
protected:
private: private:
HLRAlgo_Projector myProjector; HLRAlgo_Projector myProjector;
}; };
#include <HLRTest_Projector.lxx>
#endif // _HLRTest_Projector_HeaderFile #endif // _HLRTest_Projector_HeaderFile

26
src/HLRTest/HLRTest_Projector.lxx
View File

@ -1,26 +0,0 @@
// Created on: 1995-04-05
// Created by: Christophe MARION
// 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.
//=======================================================================
//function : Projector
//purpose :
//=======================================================================
inline const HLRAlgo_Projector & HLRTest_Projector::Projector () const
{
return myProjector;
}