kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code

Browse Source
This commit is contained in:
wmayer
2015-01-10 15:15:42 +01:00
parent 8a86559842 4ac4347923
commit dad8cf7433
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/Draft/importDXF.py
View File

@@ -1357,6 +1357,9 @@ def getArcData(edge):
ang1,ang2=edge.ParameterRange
else:
ang2,ang1=edge.ParameterRange
if edge.Curve.XAxis != FreeCAD.Vector(1,0,0):
ang1 -= DraftVecUtils.angle(edge.Curve.XAxis)
ang2 -= DraftVecUtils.angle(edge.Curve.XAxis)
return DraftVecUtils.tup(ce), radius, math.degrees(ang1),\
math.degrees(ang2)

4
src/Mod/Part/App/modelRefine.cpp
View File

@@ -739,7 +739,7 @@ FaceTypedCylinder& ModelRefine::getCylinderObject()
/////////////////////////////////////////////////////////////////////////////////////////////////////////
// TODO: change this version after occ fix. Freecad Mantis 1450
#if OCC_VERSION_HEX <= 0x070000
#if OCC_VERSION_HEX <= 0x7fffff
void collectConicEdges(const TopoDS_Shell &shell, TopTools_IndexedMapOfShape &map)
{
TopTools_IndexedMapOfShape edges;
@@ -1026,7 +1026,7 @@ bool FaceUniter::process()
BRepLib_FuseEdges edgeFuse(workShell);
// TODO: change this version after occ fix. Freecad Mantis 1450
#if OCC_VERSION_HEX <= 0x070000
#if OCC_VERSION_HEX <= 0x7fffff
TopTools_IndexedMapOfShape map;
collectConicEdges(workShell, map);
edgeFuse.AvoidEdges(map);