Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
FreeCAD
FreeCAD
Commits
5d0ff355
Commit
5d0ff355
authored
Mar 03, 2013
by
wmayer
Browse files
Apply fix for #0001013 and SketchObjectPy::fillet() from master
parent
ec7636d7
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Mod/PartDesign/App/FeatureSketchBased.cpp
View file @
5d0ff355
...
...
@@ -197,6 +197,8 @@ const TopoDS_Face SketchBased::getSupportFace() const {
Part
::
Feature
*
SketchBased
::
getSupport
()
const
{
// get the support of the Sketch if any
if
(
!
Sketch
.
getValue
())
return
0
;
App
::
DocumentObject
*
SupportLink
=
static_cast
<
Part
::
Part2DObject
*>
(
Sketch
.
getValue
())
->
Support
.
getValue
();
Part
::
Feature
*
SupportObject
=
NULL
;
if
(
SupportLink
&&
SupportLink
->
getTypeId
().
isDerivedFrom
(
Part
::
Feature
::
getClassTypeId
()))
...
...
src/Mod/Sketcher/App/SketchObjectPyImp.cpp
View file @
5d0ff355
...
...
@@ -284,10 +284,11 @@ PyObject* SketchObjectPy::fillet(PyObject *args)
PyErr_SetString
(
PyExc_ValueError
,
str
.
str
().
c_str
());
return
0
;
}
// Point, radius
Py_Return
;
}
PyErr_Clear
();
PyErr_Clear
();
// Point, radius
if
(
PyArg_ParseTuple
(
args
,
"iid|i"
,
&
geoId1
,
&
posId1
,
&
radius
,
&
trim
))
{
if
(
this
->
getSketchObjectPtr
()
->
fillet
(
geoId1
,
(
Sketcher
::
PointPos
)
posId1
,
radius
,
trim
?
true
:
false
))
{
std
::
stringstream
str
;
...
...
@@ -295,8 +296,13 @@ PyObject* SketchObjectPy::fillet(PyObject *args)
PyErr_SetString
(
PyExc_ValueError
,
str
.
str
().
c_str
());
return
0
;
}
Py_Return
;
}
Py_Return
;
PyErr_SetString
(
PyExc_TypeError
,
"fillet() method accepts:
\n
"
"-- int,int,Vector,Vector,float,[int]
\n
"
"-- int,int,float,[int]
\n
"
);
return
0
;
}
PyObject
*
SketchObjectPy
::
trim
(
PyObject
*
args
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment