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

0025536: XmlMDataXtd_GeometryDriver doesn't support TDataXtd_SPLINE, TDataXtd_PLANE and TDataXtd_CYLINDER.

Browse Source 
Added support of the missed geometrical types into the XML driver.
This commit is contained in:
mpv 2017-05-25 13:11:50 +03:00 committed by bugmaster
parent a38db39de6
commit 354c94b724
2 changed files with 58 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/XmlMDataXtd/XmlMDataXtd_GeometryDriver.cxx
View File

@ -31,11 +31,14 @@ static Standard_Boolean GeometryTypeEnum
IMPLEMENT_DOMSTRING (TypeString, "geomtype") IMPLEMENT_DOMSTRING (TypeString, "geomtype")
IMPLEMENT_DOMSTRING (GeomAnyString, "any") IMPLEMENT_DOMSTRING (GeomAnyString, "any")
IMPLEMENT_DOMSTRING (GeomPointString, "point") IMPLEMENT_DOMSTRING (GeomPointString, "point")
IMPLEMENT_DOMSTRING (GeomLineString, "line") IMPLEMENT_DOMSTRING (GeomLineString, "line")
IMPLEMENT_DOMSTRING (GeomCircleString, "circle") IMPLEMENT_DOMSTRING (GeomCircleString, "circle")
IMPLEMENT_DOMSTRING (GeomEllipseString, "ellipse") IMPLEMENT_DOMSTRING (GeomEllipseString, "ellipse")
IMPLEMENT_DOMSTRING (GeomSplineString, "slpine")
IMPLEMENT_DOMSTRING (GeomPlaneString, "plane")
IMPLEMENT_DOMSTRING (GeomCylinderString, "cylinder")
//======================================================================= //=======================================================================
//function : XmlMDataXtd_GeometryDriver //function : XmlMDataXtd_GeometryDriver
@ -110,6 +113,12 @@ static Standard_Boolean GeometryTypeEnum (const XmlObjMgt_DOMString& theString,
aResult = TDataXtd_CIRCLE; aResult = TDataXtd_CIRCLE;
else if (theString.equals (::GeomEllipseString())) else if (theString.equals (::GeomEllipseString()))
aResult = TDataXtd_ELLIPSE; aResult = TDataXtd_ELLIPSE;
else if (theString.equals(::GeomSplineString()))
aResult = TDataXtd_SPLINE;
else if (theString.equals(::GeomPlaneString()))
aResult = TDataXtd_PLANE;
else if (theString.equals(::GeomCylinderString()))
aResult = TDataXtd_CYLINDER;
else else
return Standard_False; return Standard_False;
} }
@ -131,6 +140,9 @@ static const XmlObjMgt_DOMString& GeometryTypeString
case TDataXtd_LINE : return ::GeomLineString(); case TDataXtd_LINE : return ::GeomLineString();
case TDataXtd_CIRCLE : return ::GeomCircleString(); case TDataXtd_CIRCLE : return ::GeomCircleString();
case TDataXtd_ELLIPSE : return ::GeomEllipseString(); case TDataXtd_ELLIPSE : return ::GeomEllipseString();
case TDataXtd_SPLINE : return ::GeomSplineString();
case TDataXtd_PLANE : return ::GeomPlaneString();
case TDataXtd_CYLINDER : return ::GeomCylinderString();
default: default:
throw Standard_DomainError("TDataXtd_GeometryEnum; enum term unknown"); throw Standard_DomainError("TDataXtd_GeometryEnum; enum term unknown");

40
tests/bugs/caf/bug25536 Normal file
View File

@ -0,0 +1,40 @@
puts "============"
puts "OCC25536"
puts "============"
puts ""
#######################################################################
# XmlMDataXtd_GeometryDriver doesn't support TDataXtd_SPLINE, TDataXtd_PLANE and TDataXtd_CYLINDER.
#######################################################################
NewDocument Doc XmlOcaf
# set attributes not supported by geometry driver before this issue fix
Label Doc 0:2:1
SetGeometry Doc 0:2:1 spl
Label Doc 0:2:2
SetGeometry Doc 0:2:2 pln
Label Doc 0:2:3
SetGeometry Doc 0:2:3 cyl
set aFile ${imagedir}/bug25536_test.xml
SaveAs Doc ${aFile}
Close Doc
# check attributes are correctly restored
Open ${aFile} Doc2
set aType [GetGeometryType Doc2 0:2:1]
if {${aType} != "spl"} {
puts "Error: Restored Geometry Type '${aType}' is not stored 'spl'"
}
set aType [GetGeometryType Doc2 0:2:2]
if {${aType} != "pln"} {
puts "Error: Restored Geometry Type '${aType}' is not stored 'pln'"
}
set aType [GetGeometryType Doc2 0:2:3]
if {${aType} != "cyl"} {
puts "Error: Restored Geometry Type '${aType}' is not stored 'cyl'"
}
Close Doc2