suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0000144: Add several tools to Part module

Browse Source
This commit is contained in:
wmayer 2012-06-09 15:55:11 +02:00
parent 245cae03ef
commit 2a7e6f3e96
4 changed files with 78 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/Mod/Part/App/PartFeatures.cpp
View File

@ -28,6 +28,8 @@
# include <TopoDS_Face.hxx>
# include <TopoDS_Shell.hxx>
# include <BRepBuilderAPI_MakeWire.hxx>
# include <BRepOffsetAPI_MakePipeShell.hxx>
# include <TopTools_ListIteratorOfListOfShape.hxx>
#endif
@ -199,6 +201,8 @@ App::DocumentObjectExecReturn *Loft::execute(void)
// ----------------------------------------------------------------------------
const char* Part::Sweep::TransitionEnums[]= {"Transformed","Right corner", "Round corner",NULL};
PROPERTY_SOURCE(Part::Sweep, Part::Feature)
Sweep::Sweep()
@ -207,7 +211,9 @@ Sweep::Sweep()
Sections.setSize(0);
ADD_PROPERTY_TYPE(Spine,(0),"Sweep",App::Prop_None,"Path to sweep along");
ADD_PROPERTY_TYPE(Solid,(false),"Sweep",App::Prop_None,"Create solid");
ADD_PROPERTY_TYPE(Fresnet,(false),"Sweep",App::Prop_None,"Fresnet");
ADD_PROPERTY_TYPE(Frenet,(false),"Sweep",App::Prop_None,"Frenet");
ADD_PROPERTY_TYPE(Transition,(long(0)),"Sweep",App::Prop_None,"Transition mode");
Transition.setEnums(TransitionEnums);
}
short Sweep::mustExecute() const
@ -218,7 +224,9 @@ short Sweep::mustExecute() const
return 1;
if (Solid.isTouched())
return 1;
if (Fresnet.isTouched())
if (Frenet.isTouched())
return 1;
if (Transition.isTouched())
return 1;
return 0;
}
@ -234,22 +242,24 @@ App::DocumentObjectExecReturn *Sweep::execute(void)
return new App::DocumentObjectExecReturn("No sections linked.");
App::DocumentObject* spine = Spine.getValue();
if (!(spine && spine->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())))
return new App::DocumentObjectExecReturn("No shape linked.");
return new App::DocumentObjectExecReturn("No spine linked.");
const std::vector<std::string>& subedge = Spine.getSubValues();
if (subedge.size() != 1)
return new App::DocumentObjectExecReturn("Not exactly one sub-shape linked.");
TopoDS_Shape edge;
TopoDS_Shape path;
const Part::TopoShape& shape = static_cast<Part::Feature*>(spine)->Shape.getValue();
if (!shape._Shape.IsNull()) {
if (!subedge[0].empty()) {
edge = shape.getSubShape(subedge[0].c_str());
path = shape.getSubShape(subedge[0].c_str());
}
else {
if (shape._Shape.ShapeType() == TopAbs_EDGE)
edge = shape._Shape;
path = shape._Shape;
else if (shape._Shape.ShapeType() == TopAbs_WIRE)
edge = shape._Shape;
path = shape._Shape;
else
return new App::DocumentObjectExecReturn("Spine is neither an edge nor a wire.");
}
}
@ -279,11 +289,37 @@ App::DocumentObjectExecReturn *Sweep::execute(void)
}
Standard_Boolean isSolid = Solid.getValue() ? Standard_True : Standard_False;
Standard_Boolean isFresnet = Fresnet.getValue() ? Standard_True : Standard_False;
Standard_Boolean isFrenet = Frenet.getValue() ? Standard_True : Standard_False;
BRepBuilderAPI_TransitionMode transMode;
switch (Transition.getValue()) {
case 1: transMode = BRepBuilderAPI_RightCorner;
break;
case 2: transMode = BRepBuilderAPI_RoundCorner;
break;
default: transMode = BRepBuilderAPI_Transformed;
break;
}
BRepBuilderAPI_MakeWire mkWire(TopoDS::Edge(edge));
TopoShape myShape(mkWire.Wire());
this->Shape.setValue(myShape.makePipeShell(profiles, isSolid, isFresnet));
if (path.ShapeType() == TopAbs_EDGE) {
BRepBuilderAPI_MakeWire mkWire(TopoDS::Edge(path));
path = mkWire.Wire();
}
BRepOffsetAPI_MakePipeShell mkPipeShell(TopoDS::Wire(path));
mkPipeShell.SetMode(isFrenet);
mkPipeShell.SetTransitionMode(transMode);
TopTools_ListIteratorOfListOfShape iter;
for (iter.Initialize(profiles); iter.More(); iter.Next()) {
mkPipeShell.Add(TopoDS_Shape(iter.Value()));
}
if (!mkPipeShell.IsReady())
Standard_Failure::Raise("shape is not ready to build");
mkPipeShell.Build();
if (isSolid)
mkPipeShell.MakeSolid();
this->Shape.setValue(mkPipeShell.Shape());
return App::DocumentObject::StdReturn;
}
catch (Standard_Failure) {

6
src/Mod/Part/App/PartFeatures.h
View File

@ -83,7 +83,8 @@ public:
App::PropertyLinkList Sections;
App::PropertyLinkSub Spine;
App::PropertyBool Solid;
App::PropertyBool Fresnet;
App::PropertyBool Frenet;
App::PropertyEnumeration Transition;
/** @name methods override feature */
//@{
@ -94,6 +95,9 @@ public:
protected:
void onChanged (const App::Property* prop);
private:
static const char* TransitionEnums[];
};
} //namespace Part

36
src/Mod/Part/Gui/TaskSweep.cpp
View File

@ -118,25 +118,37 @@ void SweepWidget::findShapes()
bool SweepWidget::accept()
{
Gui::SelectionFilter edgeFilter ("SELECT Part::Feature SUBELEMENT Edge COUNT 1");
if (!edgeFilter.match()) {
QMessageBox::critical(this, tr("Sweep path"), tr("Select an edge you want to sweep along."));
Gui::SelectionFilter partFilter ("SELECT Part::Feature COUNT 1");
bool matchEdge = edgeFilter.match();
bool matchPart = partFilter.match();
if (!matchEdge && !matchPart) {
QMessageBox::critical(this, tr("Sweep path"), tr("Select an edge or wire you want to sweep along."));
return false;
}
// get the selected object
const std::vector<Gui::SelectionObject>& result = edgeFilter.Result[0];
const std::vector<std::string>& edges = result[0].getSubNames();
std::string objectName, subShape;
if (matchEdge) {
const std::vector<Gui::SelectionObject>& result = edgeFilter.Result[0];
const std::vector<std::string>& edges = result[0].getSubNames();
objectName = result.front().getFeatName();
subShape = edges.front();
}
else {
const std::vector<Gui::SelectionObject>& result = partFilter.Result[0];
objectName = result.front().getFeatName();
}
QString list, solid, fresnet;
QString list, solid, frenet;
if (d->ui.checkSolid->isChecked())
solid = QString::fromAscii("True");
else
solid = QString::fromAscii("False");
if (d->ui.checkFresnet->isChecked())
fresnet = QString::fromAscii("True");
if (d->ui.checkFrenet->isChecked())
frenet = QString::fromAscii("True");
else
fresnet = QString::fromAscii("False");
frenet = QString::fromAscii("False");
QTextStream str(&list);
@ -158,11 +170,11 @@ bool SweepWidget::accept()
"App.getDocument('%6').ActiveObject.Sections=[%1]\n"
"App.getDocument('%6').ActiveObject.Spine=(FreeCAD.ActiveDocument.%2,['%3'])\n"
"App.getDocument('%6').ActiveObject.Solid=%4\n"
"App.getDocument('%6').ActiveObject.Fresnet=%5\n"
"App.getDocument('%6').ActiveObject.Frenet=%5\n"
)
.arg(list).arg(QLatin1String(result.front().getFeatName()))
.arg(QLatin1String(edges.front().c_str()))
.arg(solid).arg(fresnet).arg(QString::fromAscii(d->document.c_str()));
.arg(list).arg(QLatin1String(objectName.c_str()))
.arg(QLatin1String(subShape.c_str()))
.arg(solid).arg(frenet).arg(QString::fromAscii(d->document.c_str()));
Gui::Document* doc = Gui::Application::Instance->getDocument(d->document.c_str());
if (!doc) throw Base::Exception("Document doesn't exist anymore");

4
src/Mod/Part/Gui/TaskSweep.ui
View File

@ -38,9 +38,9 @@
</spacer>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="checkFresnet">
<widget class="QCheckBox" name="checkFrenet">
<property name="text">
<string>Fresnet</string>
<string>Frenet</string>
</property>
</widget>
</item>