Skip to content

Commit

Permalink
Merge branch 'pathpocketshape_fix' of https://github.com/Russ4262/Fre…
Browse files Browse the repository at this point in the history 
…eCAD into pathpocketshape_fix
  • Loading branch information
@Russ4262
Russ4262 committed Jun 15, 2019
2 parents 77d1f89 + 70165ed commit 3e126bc
Show file tree
Hide file tree
Showing 7 changed files with 180 additions and 87 deletions.
82 changes: 56 additions & 26 deletions src/App/PropertyLinks.cpp
View file
Expand Up @@ -224,8 +224,10 @@ PropertyLinkList::~PropertyLinkList()
// before accessing internals make sure the object is not about to be destroyed
// otherwise the backlink contains dangling pointers
if (!parent->testStatus(ObjectStatus::Destroy)) {
for(auto *obj : _lValueList)
obj->_removeBackLink(parent);
for(auto *obj : _lValueList) {
if (obj)
obj->_removeBackLink(parent);
}
}
}
#endif
Expand All @@ -251,8 +253,10 @@ void PropertyLinkList::setValue(DocumentObject* lValue)
// before accessing internals make sure the object is not about to be destroyed
// otherwise the backlink contains dangling pointers
if (!parent->testStatus(ObjectStatus::Destroy)) {
for(auto *obj : _lValueList)
obj->_removeBackLink(parent);
for(auto *obj : _lValueList) {
if (obj)
obj->_removeBackLink(parent);
}
if (lValue)
lValue->_addBackLink(parent);
}
Expand Down Expand Up @@ -282,10 +286,14 @@ void PropertyLinkList::setValues(const std::vector<DocumentObject*>& lValue)
// before accessing internals make sure the object is not about to be destroyed
// otherwise the backlink contains dangling pointers
if (!parent->testStatus(ObjectStatus::Destroy)) {
for(auto *obj : _lValueList)
obj->_removeBackLink(parent);
for(auto *obj : lValue)
obj->_addBackLink(parent);
for(auto *obj : _lValueList) {
if (obj)
obj->_removeBackLink(parent);
}
for(auto *obj : lValue) {
if (obj)
obj->_addBackLink(parent);
}
}
}
#endif
Expand Down Expand Up @@ -651,8 +659,10 @@ PropertyLinkSubList::~PropertyLinkSubList()
// before accessing internals make sure the object is not about to be destroyed
// otherwise the backlink contains dangling pointers
if (!parent->testStatus(ObjectStatus::Destroy)) {
for(auto *obj : _lValueList)
obj->_removeBackLink(parent);
for(auto *obj : _lValueList) {
if (obj)
obj->_removeBackLink(parent);
}
}
}
#endif
Expand All @@ -678,8 +688,10 @@ void PropertyLinkSubList::setValue(DocumentObject* lValue,const char* SubName)
// before accessing internals make sure the object is not about to be destroyed
// otherwise the backlink contains dangling pointers
if (!parent->testStatus(ObjectStatus::Destroy)) {
for(auto *obj : _lValueList)
obj->_removeBackLink(parent);
for(auto *obj : _lValueList) {
if (obj)
obj->_removeBackLink(parent);
}
if (lValue)
lValue->_addBackLink(parent);
}
Expand Down Expand Up @@ -716,13 +728,17 @@ void PropertyLinkSubList::setValues(const std::vector<DocumentObject*>& lValue,c
if (!parent->testStatus(ObjectStatus::Destroy)) {
//_lValueList can contain items multiple times, but we trust the document
//object to ensure that this works
for(auto *obj : _lValueList)
obj->_removeBackLink(parent);
for(auto *obj : _lValueList) {
if (obj)
obj->_removeBackLink(parent);
}

//maintain backlinks. lValue can contain items multiple times, but we trust the document
//object to ensure that the backlink is only added once
for(auto *obj : lValue)
obj->_addBackLink(parent);
for(auto *obj : lValue) {
if (obj)
obj->_addBackLink(parent);
}
}
}
#endif
Expand Down Expand Up @@ -752,13 +768,17 @@ void PropertyLinkSubList::setValues(const std::vector<DocumentObject*>& lValue,c
if (!parent->testStatus(ObjectStatus::Destroy)) {
//_lValueList can contain items multiple times, but we trust the document
//object to ensure that this works
for(auto *obj : _lValueList)
obj->_removeBackLink(parent);
for(auto *obj : _lValueList) {
if (obj)
obj->_removeBackLink(parent);
}

//maintain backlinks. lValue can contain items multiple times, but we trust the document
//object to ensure that the backlink is only added once
for(auto *obj : lValue)
obj->_addBackLink(parent);
for(auto *obj : lValue) {
if (obj)
obj->_addBackLink(parent);
}
}
}
#endif
Expand All @@ -780,8 +800,10 @@ void PropertyLinkSubList::setValue(DocumentObject* lValue, const std::vector<str
if (!parent->testStatus(ObjectStatus::Destroy)) {
//_lValueList can contain items multiple times, but we trust the document
//object to ensure that this works
for(auto *obj : _lValueList)
obj->_removeBackLink(parent);
for(auto *obj : _lValueList) {
if (obj)
obj->_removeBackLink(parent);
}

//maintain backlinks. lValue can contain items multiple times, but we trust the document
//object to ensure that the backlink is only added once
Expand Down Expand Up @@ -1020,10 +1042,18 @@ void PropertyLinkSubList::Save (Base::Writer &writer) const
writer.Stream() << writer.ind() << "<LinkSubList count=\"" << getSize() <<"\">" << endl;
writer.incInd();
for (int i = 0; i < getSize(); i++) {
writer.Stream() << writer.ind() <<
"<Link " <<
"obj=\"" << _lValueList[i]->getNameInDocument() << "\" " <<
"sub=\"" << _lSubList[i] << "\"/>" << endl;
if (_lValueList[i]) {
writer.Stream() << writer.ind() <<
"<Link " <<
"obj=\"" << _lValueList[i]->getNameInDocument() << "\" " <<
"sub=\"" << _lSubList[i] << "\"/>" << endl;
}
else {
writer.Stream() << writer.ind() <<
"<Link " <<
"obj=\"\" " <<
"sub=\"" << _lSubList[i] << "\"/>" << endl;
}
}

writer.decInd();
Expand Down
126 changes: 82 additions & 44 deletions src/Mod/PartDesign/App/ShapeBinder.cpp
View file
Expand Up @@ -25,13 +25,17 @@
#ifndef _PreComp_
# include <cfloat>
# include <boost/bind.hpp>
# include <gp_Lin.hxx>
# include <gp_Pln.hxx>
# include <BRep_Builder.hxx>
# include <BRepBuilderAPI_MakeEdge.hxx>
# include <BRepBuilderAPI_MakeFace.hxx>
#endif

#include "ShapeBinder.h"
#include <App/Document.h>
#include <App/GroupExtension.h>
#include <App/OriginFeature.h>
#include <Mod/Part/App/TopoShape.h>

#ifndef M_PI
Expand Down Expand Up @@ -69,13 +73,14 @@ short int ShapeBinder::mustExecute(void) const {
App::DocumentObjectExecReturn* ShapeBinder::execute(void) {

if (!this->isRestoring()) {
Part::Feature* obj = nullptr;
App::GeoFeature* obj = nullptr;
std::vector<std::string> subs;

ShapeBinder::getFilteredReferences(&Support, obj, subs);

//if we have a link we rebuild the shape, but we change nothing if we are a simple copy
if (obj) {
Part::TopoShape shape = ShapeBinder::buildShapeFromReferences(obj, subs);
Part::TopoShape shape(ShapeBinder::buildShapeFromReferences(obj, subs));
//now, shape is in object's CS, and includes local Placement of obj but nothing else.

if (TraceSupport.getValue()) {
Expand All @@ -96,7 +101,7 @@ App::DocumentObjectExecReturn* ShapeBinder::execute(void) {
return Part::Feature::execute();
}

void ShapeBinder::getFilteredReferences(App::PropertyLinkSubList* prop, Part::Feature*& obj,
void ShapeBinder::getFilteredReferences(App::PropertyLinkSubList* prop, App::GeoFeature*& obj,
std::vector< std::string >& subobjects)
{
obj = nullptr;
Expand All @@ -111,63 +116,96 @@ void ShapeBinder::getFilteredReferences(App::PropertyLinkSubList* prop, Part::Fe

//we only allow one part feature, so get the first one we find
size_t index = 0;
while (index < objs.size() && !objs[index]->isDerivedFrom(Part::Feature::getClassTypeId()))
for (auto* it : objs) {
if (it && it->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) {
obj = static_cast<Part::Feature*>(it);
break;
}
index++;

//do we have any part feature?
if (index >= objs.size())
return;

obj = static_cast<Part::Feature*>(objs[index]);

//if we have no subshpape we use the whole shape
if (subs[index].empty()) {
return;
}

//collect all subshapes for the object
index = 0;
for (std::string sub : subs) {
//do we have any part feature?
if (obj) {
//if we have no subshpape we use the whole shape
if (subs[index].empty()) {
return;
}

//we only allow subshapes from a single Part::Feature
if (objs[index] != obj)
continue;
//collect all subshapes for the object
for (index = 0; index < objs.size(); index++) {
//we only allow subshapes from a single Part::Feature
if (objs[index] != obj)
continue;

//in this mode the full shape is not allowed, as we already started the subshape
//processing
if (sub.empty())
continue;
//in this mode the full shape is not allowed, as we already started the subshape
//processing
if (subs[index].empty())
continue;

subobjects.push_back(sub);
subobjects.push_back(subs[index]);
}
}
else {
// search for Origin features
for (auto* it : objs) {
if (it && it->getTypeId().isDerivedFrom(App::Line::getClassTypeId())) {
obj = static_cast<App::GeoFeature*>(it);
break;
}
else if (it && it->getTypeId().isDerivedFrom(App::Plane::getClassTypeId())) {
obj = static_cast<App::GeoFeature*>(it);
break;
}
}
}
}

Part::TopoShape ShapeBinder::buildShapeFromReferences( Part::Feature* obj, std::vector< std::string > subs) {
Part::TopoShape ShapeBinder::buildShapeFromReferences(App::GeoFeature* obj, std::vector< std::string > subs) {

if (!obj)
return TopoDS_Shape();

if (subs.empty())
return obj->Shape.getShape();
if (obj->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) {
Part::Feature* part = static_cast<Part::Feature*>(obj);
if (subs.empty())
return part->Shape.getValue();

std::vector<TopoDS_Shape> shapes;
for (std::string sub : subs) {
shapes.push_back(obj->Shape.getShape().getSubShape(sub.c_str()));
}
std::vector<TopoDS_Shape> shapes;
for (std::string sub : subs) {
shapes.push_back(part->Shape.getShape().getSubShape(sub.c_str()));
}

if (shapes.size() == 1){
//single subshape. Return directly.
return shapes[0];
} else {
//multiple subshapes. Make a compound.
BRep_Builder builder;
TopoDS_Compound cmp;
builder.MakeCompound(cmp);
for(const TopoDS_Shape& sh : shapes){
builder.Add(cmp, sh);
if (shapes.size() == 1) {
//single subshape. Return directly.
return shapes[0];
}
return cmp;
else {
//multiple subshapes. Make a compound.
BRep_Builder builder;
TopoDS_Compound cmp;
builder.MakeCompound(cmp);
for(const TopoDS_Shape& sh : shapes){
builder.Add(cmp, sh);
}
return cmp;
}
}
else if (obj->getTypeId().isDerivedFrom(App::Line::getClassTypeId())) {
gp_Lin line;
BRepBuilderAPI_MakeEdge mkEdge(line);
Part::TopoShape shape(mkEdge.Shape());
shape.setPlacement(obj->Placement.getValue());
return shape;
}
else if (obj->getTypeId().isDerivedFrom(App::Plane::getClassTypeId())) {
gp_Pln plane;
BRepBuilderAPI_MakeFace mkFace(plane);
Part::TopoShape shape(mkFace.Shape());
shape.setPlacement(obj->Placement.getValue());
return shape;
}

return TopoDS_Shape();
}

void ShapeBinder::handleChangedPropertyType(Base::XMLReader &reader, const char *TypeName, App::Property *prop)
Expand Down Expand Up @@ -199,7 +237,7 @@ void ShapeBinder::slotChangedObject(const App::DocumentObject& Obj, const App::P
if (!Prop.getTypeId().isDerivedFrom(App::PropertyPlacement::getClassTypeId()))
return;

Part::Feature* obj = nullptr;
App::GeoFeature* obj = nullptr;
std::vector<std::string> subs;
ShapeBinder::getFilteredReferences(&Support, obj, subs);
if (obj) {
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/PartDesign/App/ShapeBinder.h
View file
Expand Up @@ -51,8 +51,8 @@ class PartDesignExport ShapeBinder : public Part::Feature
App::PropertyLinkSubListGlobal Support;
App::PropertyBool TraceSupport;

static void getFilteredReferences(App::PropertyLinkSubList* prop, Part::Feature*& object, std::vector< std::string >& subobjects);
static Part::TopoShape buildShapeFromReferences(Feature* obj, std::vector< std::string > subs);
static void getFilteredReferences(App::PropertyLinkSubList* prop, App::GeoFeature*& object, std::vector< std::string >& subobjects);
static Part::TopoShape buildShapeFromReferences(App::GeoFeature* obj, std::vector< std::string > subs);

const char* getViewProviderName(void) const {
return "PartDesignGui::ViewProviderShapeBinder";
Expand Down
17 changes: 11 additions & 6 deletions src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
View file
Expand Up @@ -151,23 +151,28 @@ bool TaskDlgDatumParameters::accept() {
if (result == QDialog::DialogCode::Rejected)
return false;
else if (!dlg.radioXRef->isChecked()) {
std::vector<App::DocumentObject*> objs;
std::vector<App::DocumentObject*> copyObjects;
std::vector<std::string> copySubValues;
std::vector<std::string> subs = pcDatum->Support.getSubValues();
int index = 0;
for (App::DocumentObject* obj : pcDatum->Support.getValues()) {
if (!pcActiveBody->hasObject(obj) && !pcActiveBody->getOrigin()->hasObject(obj)) {
objs.push_back(PartDesignGui::TaskFeaturePick::makeCopy(obj, subs[index], dlg.radioIndependent->isChecked()));
copies.push_back(objs.back());
subs[index] = "";
auto* copy = PartDesignGui::TaskFeaturePick::makeCopy(obj, subs[index], dlg.radioIndependent->isChecked());
if (copy) {
copyObjects.push_back(copy);
copies.push_back(copyObjects.back());
copySubValues.push_back(std::string());
}
}
else {
objs.push_back(obj);
copyObjects.push_back(obj);
copySubValues.push_back(subs[index]);
}

index++;
}

pcDatum->Support.setValues(objs, subs);
pcDatum->Support.setValues(copyObjects, copySubValues);
}
}

Expand Down

0 comments on commit 3e126bc

Please sign in to comment.