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

fix dependent copy references

Browse Source 
to make them work with sketches an additional Part2DObject reference needed to be created
This commit is contained in:
Stefan Tröger 2015-07-17 06:42:07 +02:00
parent 78f3e9786b
commit 9969aac671
10 changed files with 419 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/PartDesign/App/AppPartDesign.cpp
View File

@ -28,7 +28,7 @@
#include <Base/Console.h>
#include <Base/Interpreter.h>
#include "FeaturePad.h"
#include "FeatureSolid.h"
#include "FeaturePocket.h"
@ -56,6 +56,7 @@
#include "FeatureThickness.h"
#include "FeaturePipe.h"
#include "FeatureLoft.h"
#include "ShapeBinder.h"
namespace PartDesign {
extern PyObject* initModule();
@ -81,7 +82,7 @@ PyMODINIT_FUNC init_PartDesign()
// NOTE: To finish the initialization of our own type objects we must
// call PyType_Ready, otherwise we run into a segmentation fault, later on.
// This function is responsible for adding inherited slots from a type's base class.
PartDesign::Feature ::init();
PartDesign::Solid ::init();
PartDesign::DressUp ::init();
@ -109,6 +110,8 @@ PyMODINIT_FUNC init_PartDesign()
PartDesign::Loft ::init();
PartDesign::AdditiveLoft ::init();
PartDesign::SubtractiveLoft ::init();
PartDesign::ShapeBinder ::init();
PartDesign::ShapeBinder2D ::init();
PartDesign::Plane ::init();
PartDesign::Line ::init();
PartDesign::Point ::init();
@ -139,5 +142,4 @@ PyMODINIT_FUNC init_PartDesign()
PartDesign::Wedge ::init();
PartDesign::AdditiveWedge ::init();
PartDesign::SubtractiveWedge ::init();
}

2
src/Mod/PartDesign/App/CMakeLists.txt
View File

@ -40,6 +40,8 @@ SET(Features_SRCS
SOURCE_GROUP("Features" FILES ${Features_SRCS})
SET(DatumFeatures_SRCS
ShapeBinder.h
ShapeBinder.cpp
DatumPlane.cpp
DatumPlane.h
DatumLine.cpp

144
src/Mod/PartDesign/App/ShapeBinder.cpp Normal file
View File

@ -0,0 +1,144 @@
/***************************************************************************
* Copyright (c) 2015 Stefan Tröger <stefantroeger@gmx.net> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <cfloat>
#include <BRepBuilderAPI_MakeFace.hxx>
#endif
#include "ShapeBinder.h"
#include <Mod/Part/App/TopoShape.h>
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
using namespace PartDesign;
// ============================================================================
PROPERTY_SOURCE(PartDesign::ShapeBinder, Part::Feature)
ShapeBinder::ShapeBinder()
{
ADD_PROPERTY_TYPE(Support, (0,0), "",(App::PropertyType)(App::Prop_None),"Support of the geometry");
}
ShapeBinder::~ShapeBinder()
{
}
// TODO Move this to mustExecute/execute (2015-09-11, Fat-Zer)
void ShapeBinder::onChanged(const App::Property *prop)
{
if(! this->isRestoring()){
if(prop == &Support) {
auto objs = Support.getValues();
auto subs = Support.getSubValues();
Shape.setValue(buildShapeFromReferences(objs, subs)._Shape);
}
}
Part::Feature::onChanged(prop);
}
TopoShape ShapeBinder::buildShapeFromReferences(std::vector< App::DocumentObject* > objs, std::vector< std::string > subs) {
if(objs.empty()) {
//kee the shape as it is, maybe we are just used as a copy
return TopoShape();
}
//we only allow part feature, so get the first one we find
Part::Feature* obj = nullptr;
int index = 0;
while(!objs[index]->isDerivedFrom(Part::Feature::getClassTypeId()) && index < objs.size())
index++;
//do we have any part feature?
if(index >= objs.size())
return TopoShape();
obj = static_cast<Part::Feature*>(objs[index]);
//if we have no subshpape we use the whole shape
if(subs[index].empty()) {
return obj->Shape.getShape();
}
//if we use multiple subshapes we build a shape from them by fusing them together
index = 0;
TopoShape base;
std::vector<TopoDS_Shape> operators;
for(std::string sub : subs) {
//we only allow subshapes from a single Part::Feature
if(objs[index] != obj)
continue;
//in this mode the full shape is allowed, as we already started the subshape
//prcessing
if(sub.empty())
continue;
if(base.isNull())
base = obj->Shape.getShape();
else
operators.push_back(obj->Shape.getShape().getSubShape(sub.c_str()));
}
base.multiFuse(operators);
return base;
}
PROPERTY_SOURCE(PartDesign::ShapeBinder2D, Part::Part2DObject)
ShapeBinder2D::ShapeBinder2D() {
}
ShapeBinder2D::~ShapeBinder2D() {
}
void ShapeBinder2D::onChanged(const App::Property* prop) {
if(! this->isRestoring()){
if(prop == &Support) {
auto objs = Support.getValues();
auto subs = Support.getSubValues();
Shape.setValue(ShapeBinder::buildShapeFromReferences(objs, subs)._Shape);
}
}
Part::Feature::onChanged(prop);
}

83
src/Mod/PartDesign/App/ShapeBinder.h Normal file
View File

@ -0,0 +1,83 @@
/***************************************************************************
* Copyright (c) 2015 Stefan Tröger <stefantroeger@gmx.net> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#ifndef PARTDESIGN_DATUMSHAPE_H
#define PARTDESIGN_DATUMSHAPE_H
#include <QString>
#include <App/PropertyLinks.h>
#include <Mod/Part/App/DatumFeature.h>
#include <Mod/Part/App/Part2DObject.h>
namespace PartDesign
{
/*Those two feature are not realy a classical datum. They are fully defined shapes and not
*infinit geometries likeplanes and lines. Also they are not calculated by references and hence
*are not "attaced" to anything. Furthermore real shapes must be visualized. This makes it hard
*to reuse the existing datum infrastructure and a special handling foor those two types is
*created.
*/
// TODO Add a better documentation (2015-09-11, Fat-Zer)
class PartDesignExport ShapeBinder : public Part::Feature
{
PROPERTY_HEADER(PartDesign::ShapeBinder);
public:
ShapeBinder();
virtual ~ShapeBinder();
App::PropertyLinkSubList Support;
static TopoShape buildShapeFromReferences(std::vector<App::DocumentObject*> objects, std::vector<std::string> subobjects);
const char* getViewProviderName(void) const {
return "PartDesignGui::ViewProviderShapeBinder";
}
protected:
virtual void onChanged(const App::Property* prop);
};
//this class is needed as long as sketch-based features can only work with Part2DObjects
class PartDesignExport ShapeBinder2D : public Part::Part2DObject
{
PROPERTY_HEADER(PartDesign::ShapeBinder2D);
public:
ShapeBinder2D();
virtual ~ShapeBinder2D();
const char* getViewProviderName(void) const {
return "PartDesignGui::ViewProviderShapeBinder";
}
protected:
virtual void onChanged(const App::Property* prop);
};
} //namespace PartDesign
#endif // PARTDESIGN_DATUMSHAPE_H

2
src/Mod/PartDesign/Gui/AppPartDesignGui.cpp
View File

@ -60,6 +60,7 @@
#include "ViewProviderThickness.h"
#include "ViewProviderPipe.h"
#include "ViewProviderLoft.h"
#include "ViewProviderShapeBinder.h"
// use a different name to CreateCommand()
void CreatePartDesignCommands(void);
@ -144,6 +145,7 @@ PyMODINIT_FUNC initPartDesignGui()
PartDesignGui::ViewProviderDatumLine ::init();
PartDesignGui::ViewProviderDatumPlane ::init();
PartDesignGui::ViewProviderDatumCoordinateSystem::init();
PartDesignGui::ViewProviderShapeBinder ::init();
PartDesignGui::ViewProviderBoolean ::init();
PartDesignGui::ViewProviderAddSub ::init();
PartDesignGui::ViewProviderPrimitive ::init();

2
src/Mod/PartDesign/Gui/CMakeLists.txt
View File

@ -133,6 +133,8 @@ SET(PartDesignGuiViewProvider_SRCS
ViewProviderDatumPlane.h
ViewProviderDatumCS.cpp
ViewProviderDatumCS.h
ViewProviderShapeBinder.h
ViewProviderShapeBinder.cpp
ViewProviderBoolean.cpp
ViewProviderBoolean.h
ViewProviderAddSub.cpp

4
src/Mod/PartDesign/Gui/Command.cpp
View File

@ -667,7 +667,7 @@ void prepareSketchBased(Gui::Command* cmd, const std::string& which,
// If there is more than one selection/possibility, show dialog and let user pick sketch
if ((bNoSketchWasSelected && validSketches > 1) ||
(!bNoSketchWasSelected && sketches.size() > 1) ||
ext ) {
(!bNoSketchWasSelected && ext) ) {
Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog();
PartDesignGui::TaskDlgFeaturePick *pickDlg = qobject_cast<PartDesignGui::TaskDlgFeaturePick *>(dlg);
@ -689,7 +689,7 @@ void prepareSketchBased(Gui::Command* cmd, const std::string& which,
Gui::Selection().clearSelection();
pickDlg = new PartDesignGui::TaskDlgFeaturePick(sketches, status, accepter, worker);
if(ext)
if(!bNoSketchWasSelected && ext)
pickDlg->showExternal(true);
Gui::Control().showDialog(pickDlg);

112
src/Mod/PartDesign/Gui/TaskFeaturePick.cpp
View File

@ -45,6 +45,11 @@
#include "ui_TaskFeaturePick.h"
#include "TaskFeaturePick.h"
#include <Mod/PartDesign/App/ShapeBinder.h>
#include <Mod/PartDesign/App/DatumPoint.h>
#include <Mod/PartDesign/App/DatumLine.h>
#include <Mod/PartDesign/App/DatumPlane.h>
#include <Mod/Part/App/DatumFeature.h>
using namespace PartDesignGui;
@ -266,50 +271,83 @@ std::vector<App::DocumentObject*> TaskFeaturePick::buildFeatures() {
}
App::DocumentObject* TaskFeaturePick::makeCopy(App::DocumentObject* obj, bool independent) {
App::DocumentObject* copy = nullptr;
if(independent) {
//we do know that the created instance is a document object, as obj is one. But we do not know which
//exact type
auto name = std::string("Copy") + std::string(obj->getNameInDocument());
copy = App::GetApplication().getActiveDocument()->addObject(obj->getTypeId().getName(), name.c_str());
//we do know that the created instance is a document object, as obj is one. But we do not know which
//exact type
auto name = std::string("Copy") + std::string(obj->getNameInDocument());
auto copy = App::GetApplication().getActiveDocument()->addObject(obj->getTypeId().getName(), name.c_str());
if(copy) {
//copy over all properties
std::vector<App::Property*> props;
std::vector<App::Property*> cprops;
obj->getPropertyList(props);
copy->getPropertyList(cprops);
try{
auto it = cprops.begin();
for( App::Property* prop : props ) {
//independent copys dont have links and are not attached
if(independent && (
prop->getTypeId() == App::PropertyLink::getClassTypeId() ||
prop->getTypeId() == App::PropertyLinkList::getClassTypeId() ||
prop->getTypeId() == App::PropertyLinkSub::getClassTypeId() ||
prop->getTypeId() == App::PropertyLinkSubList::getClassTypeId()||
( prop->getGroup() && strcmp(prop->getGroup(),"Attachment")==0) )) {
++it;
continue;
}
App::Property* cprop = *it++;
if( strcmp(prop->getName(), "Label") == 0 ) {
static_cast<App::PropertyString*>(cprop)->setValue("wuhahahahah");
continue;
}
cprop->Paste(*prop);
}
}
catch(const Base::Exception& e) {
Base::Console().Message("Exception: %s\n", e.what());
copy->getPropertyList(cprops);
auto it = cprops.begin();
for( App::Property* prop : props ) {
//independent copys dont have links and are not attached
if(independent && (
prop->getTypeId() == App::PropertyLink::getClassTypeId() ||
prop->getTypeId() == App::PropertyLinkList::getClassTypeId() ||
prop->getTypeId() == App::PropertyLinkSub::getClassTypeId() ||
prop->getTypeId() == App::PropertyLinkSubList::getClassTypeId()||
( prop->getGroup() && strcmp(prop->getGroup(),"Attachment")==0) )) {
++it;
continue;
}
App::Property* cprop = *it++;
if( strcmp(prop->getName(), "Label") == 0 ) {
static_cast<App::PropertyString*>(cprop)->setValue(name.c_str());
continue;
}
cprop->Paste(*prop);
}
}
else {
auto name = std::string("Reference") + std::string(obj->getNameInDocument());
// TODO Replace it with commands (2015-09-11, Fat-Zer)
if(obj->isDerivedFrom(Part::Datum::getClassTypeId())) {
copy = App::GetApplication().getActiveDocument()->addObject(
obj->getClassTypeId().getName(), name.c_str() );
//we need to reference the individual datums and make again datums. This is important as
//datum adjust their size dependend on the part size, hence simply copying the shape is
//not enough
Part::Datum *datumCopy = static_cast<Part::Datum*>(copy);
datumCopy->Support.setValue(obj, "");
if(obj->getTypeId() == PartDesign::Point::getClassTypeId()) {
datumCopy->MapMode.setValue(mm0Vertex);
}
else if(obj->getTypeId() == PartDesign::Line::getClassTypeId()) {
datumCopy->MapMode.setValue(mm1TwoPoints);
}
else if(obj->getTypeId() == PartDesign::Plane::getClassTypeId()) {
datumCopy->MapMode.setValue(mmFlatFace);
}
}
else if(obj->isDerivedFrom(Part::Part2DObject::getClassTypeId()) ||
obj->getTypeId() == PartDesign::ShapeBinder2D::getClassTypeId()) {
copy = App::GetApplication().getActiveDocument()->addObject("PartDesign::ShapeBinder2D", name.c_str());
static_cast<PartDesign::ShapeBinder2D*>(copy)->Support.setValue(obj, "");
}
else if(obj->getTypeId() == PartDesign::ShapeBinder::getClassTypeId() ||
obj->isDerivedFrom(Part::Feature::getClassTypeId())) {
copy = App::GetApplication().getActiveDocument()->addObject("PartDesign::ShapeBinder", name.c_str());
static_cast<PartDesign::ShapeBinder*>(copy)->Support.setValue(obj, "");
}
}
return copy;
}

54
src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp Normal file
View File

@ -0,0 +1,54 @@
/***************************************************************************
* Copyright (c) 2015 Stefan Tröger <stefantroeger@gmx.net> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Inventor/nodes/SoSeparator.h>
#endif
#include <Mod/PartDesign/App/ShapeBinder.h>
#include "ViewProviderShapeBinder.h"
using namespace PartDesignGui;
PROPERTY_SOURCE(PartDesignGui::ViewProviderShapeBinder,PartGui::ViewProviderPart)
ViewProviderShapeBinder::ViewProviderShapeBinder()
{
sPixmap = "PartDesign_ShapeBinder.svg";
}
ViewProviderShapeBinder::~ViewProviderShapeBinder()
{
}
bool ViewProviderShapeBinder::setEdit(int ModNum) {
return true;//PartGui::ViewProviderPartExt::setEdit(ModNum);
}
void ViewProviderShapeBinder::unsetEdit(int ModNum) {
return;//PartGui::ViewProviderPartExt::unsetEdit(ModNum);
}

50
src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h Normal file
View File

@ -0,0 +1,50 @@
/***************************************************************************
* Copyright (c) 2015 Stefan Tröger <stefantroeger@gmx.net> *
* *
* This file is part of the FreeCAD CAx development system. *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public *
* License along with this library; see the file COPYING.LIB. If not, *
* write to the Free Software Foundation, Inc., 59 Temple Place, *
* Suite 330, Boston, MA 02111-1307, USA *
* *
***************************************************************************/
#ifndef PARTGUI_ViewProviderShapeBinder_H
#define PARTGUI_ViewProviderShapeBinder_H
#include <Mod/Part/Gui/ViewProvider.h>
namespace PartDesignGui {
// TODO may be derive from something else e.g. ViewProviderGeometryObject (2015-09-11, Fat-Zer)
class PartDesignGuiExport ViewProviderShapeBinder : public PartGui::ViewProviderPart
{
PROPERTY_HEADER(PartDesignGui::ViewProviderShapeBinder);
public:
/// Constructor
ViewProviderShapeBinder();
virtual ~ViewProviderShapeBinder();
protected:
virtual bool setEdit(int ModNum);
virtual void unsetEdit(int ModNum);
};
} // namespace PartDesignGui
#endif // PARTGUI_ViewProviderShapeBinder_H