PartDesign: Modeling features work with faces
-Rename Sketchbased to ProfileBased to show new behavior -Adopt ProfileBased to make the relevant helper functions work with faces too -Adopt features for unified use of helper functions -Adopt commands to allow face selection
This commit is contained in:
@@ -49,7 +49,7 @@ using namespace PartDesign;
|
||||
namespace PartDesign {
|
||||
|
||||
|
||||
PROPERTY_SOURCE(PartDesign::Groove, PartDesign::SketchBased)
|
||||
PROPERTY_SOURCE(PartDesign::Groove, PartDesign::ProfileBased)
|
||||
|
||||
Groove::Groove()
|
||||
{
|
||||
@@ -69,7 +69,7 @@ short Groove::mustExecute() const
|
||||
Base.isTouched() ||
|
||||
Angle.isTouched())
|
||||
return 1;
|
||||
return SketchBased::mustExecute();
|
||||
return ProfileBased::mustExecute();
|
||||
}
|
||||
|
||||
App::DocumentObjectExecReturn *Groove::execute(void)
|
||||
@@ -86,9 +86,9 @@ App::DocumentObjectExecReturn *Groove::execute(void)
|
||||
if (Reversed.getValue() && !Midplane.getValue())
|
||||
angle *= (-1.0);
|
||||
|
||||
std::vector<TopoDS_Wire> wires;
|
||||
TopoDS_Shape sketchshape;
|
||||
try {
|
||||
wires = getSketchWires();
|
||||
sketchshape = getVerifiedFace();
|
||||
} catch (const Base::Exception& e) {
|
||||
return new App::DocumentObjectExecReturn(e.what());
|
||||
}
|
||||
@@ -110,7 +110,6 @@ App::DocumentObjectExecReturn *Groove::execute(void)
|
||||
gp_Dir dir(v.x,v.y,v.z);
|
||||
|
||||
try {
|
||||
TopoDS_Shape sketchshape = makeFace(wires);
|
||||
if (sketchshape.IsNull())
|
||||
return new App::DocumentObjectExecReturn("Creating a face from sketch failed");
|
||||
|
||||
@@ -177,7 +176,7 @@ App::DocumentObjectExecReturn *Groove::execute(void)
|
||||
bool Groove::suggestReversed(void)
|
||||
{
|
||||
updateAxis();
|
||||
return SketchBased::getReversedAngle(Base.getValue(), Axis.getValue()) > 0.0;
|
||||
return ProfileBased::getReversedAngle(Base.getValue(), Axis.getValue()) > 0.0;
|
||||
}
|
||||
|
||||
void Groove::updateAxis(void)
|
||||
|
||||
Reference in New Issue
Block a user