OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0025706: SIGSEGV after making existing BSplineCurve rational

Browse Source 
1. Eliminated exception after conversion non-rational B-spline to rational
2. Implemented DRAW command setweight to change weights of B-spline
3. Test cases were added
This commit is contained in:
azv
2015-01-14 10:00:06 +03:00
committed by bugmaster
parent 0fe1715f01
commit 52ba6031e8
7 changed files with 179 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/GeomliteTest/GeomliteTest_ModificationCommands.cxx
View File

@@ -24,6 +24,13 @@
#include <Precision.hxx>
#include <GeomLib.hxx>
#include <Geom2d_BezierCurve.hxx>
#include <Geom2d_BSplineCurve.hxx>
#include <Geom_BezierCurve.hxx>
#include <Geom_BezierSurface.hxx>
#include <Geom_BSplineCurve.hxx>
#include <Geom_BSplineSurface.hxx>
#ifdef WNT
#include <stdio.h>
//#define strcasecmp strcmp Already defined
@@ -125,6 +132,75 @@ static Standard_Integer samerange (Draw_Interpretor& /*di*/, Standard_Integer n,
}
//=======================================================================
//function : setweight
//purpose : Changes a weight of a pole on B-spline curve/surface
//=======================================================================
static Standard_Integer setweight(Draw_Interpretor& di, Standard_Integer n, const char** a)
{
if (n < 4 || n > 5)
{
std::cout << "Wrong parameters" << std::endl;
return 1;
}
Standard_Integer anIndex1 = Draw::Atoi(a[2]);
Standard_Integer anIndex2 = n == 5 ? Draw::Atoi(a[3]) : 0;
Standard_Real aWeight = Draw::Atof(a[n-1]);
Handle(Geom_BSplineCurve) aBSplCurve = DrawTrSurf::GetBSplineCurve(a[1]);
if (!aBSplCurve.IsNull())
{
aBSplCurve->SetWeight(anIndex1, aWeight);
return 0;
}
Handle(Geom_BezierCurve) aBezCurve = DrawTrSurf::GetBezierCurve(a[1]);
if (!aBezCurve.IsNull())
{
aBezCurve->SetWeight(anIndex1, aWeight);
return 0;
}
Handle(Geom2d_BSplineCurve) aBSplCurve2d = DrawTrSurf::GetBSplineCurve2d(a[1]);
if (!aBSplCurve2d.IsNull())
{
aBSplCurve2d->SetWeight(anIndex1, aWeight);
return 0;
}
Handle(Geom2d_BezierCurve) aBezCurve2d = DrawTrSurf::GetBezierCurve2d(a[1]);
if (!aBezCurve2d.IsNull())
{
aBezCurve2d->SetWeight(anIndex1, aWeight);
return 0;
}
Handle(Geom_BSplineSurface) aBSplSurf = DrawTrSurf::GetBSplineSurface(a[1]);
Handle(Geom_BezierSurface) aBezSurf = DrawTrSurf::GetBezierSurface(a[1]);
if (n != 5 && (!aBSplSurf.IsNull() || !aBezSurf.IsNull()))
{
std::cout << "Incorrect parameters" << std::endl;
return 1;
}
if (!aBSplSurf.IsNull())
{
aBSplSurf->SetWeight(anIndex1, anIndex2, aWeight);
return 0;
}
if (!aBezSurf.IsNull())
{
aBezSurf->SetWeight(anIndex1, anIndex2, aWeight);
return 0;
}
std::cout << a[1] << " is not a B-spline nor a Bezier curve/surface" << std::endl;
return 1;
}
//=======================================================================
//function : ModificationCommands
//purpose :
@@ -161,6 +237,12 @@ void GeomliteTest::ModificationCommands(Draw_Interpretor& theCommands)
__FILE__,
samerange, g);
theCommands.Add("setweight",
"setweight curve/surf index1 [index2] weight"
"\n\t\tchanges a weight of a pole of B-spline curve/surface (index2 is useful for surfaces only)",
__FILE__,
setweight,g);
}