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

Extensions: GeoFeatureGroup only for GeoFeature

Browse Source
This commit is contained in:
Stefan Tröger 2016-12-10 14:44:13 +01:00 committed by wmayer
parent dfbd6aa237
commit 47ed29fffd
15 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App/DocumentObjectExtension.cpp
View File

@ -37,7 +37,7 @@ EXTENSION_PROPERTY_SOURCE(App::DocumentObjectExtension, App::Extension)
DocumentObjectExtension::DocumentObjectExtension()
{
initExtension(App::DocumentObjectExtension::getExtensionClassTypeId());
initExtensionType(App::DocumentObjectExtension::getExtensionClassTypeId());
}
DocumentObjectExtension::~DocumentObjectExtension()

2
src/App/Extension.cpp
View File

@ -71,7 +71,7 @@ Extension::~Extension()
}
}
void Extension::initExtension(Base::Type type) {
void Extension::initExtensionType(Base::Type type) {
m_extensionType = type;
if(m_extensionType.isBad())

6
src/App/Extension.h
View File

@ -215,7 +215,7 @@ public:
Extension();
virtual ~Extension();
void initExtension(App::ExtensionContainer* obj);
virtual void initExtension(App::ExtensionContainer* obj);
App::ExtensionContainer* getExtendedContainer() {return m_base;}
const App::ExtensionContainer* getExtendedContainer() const {return m_base;}
@ -272,7 +272,7 @@ protected:
friend class App::ExtensionContainer;
protected:
void initExtension(Base::Type type);
void initExtensionType(Base::Type type);
bool m_isPythonExtension = false;
Py::Object ExtensionPythonObject;
@ -309,7 +309,7 @@ public:
ExtensionPythonT() {
ExtensionT::m_isPythonExtension = true;
ExtensionT::initExtension(ExtensionPythonT::getExtensionClassTypeId());
ExtensionT::initExtensionType(ExtensionPythonT::getExtensionClassTypeId());
EXTENSION_ADD_PROPERTY(ExtensionProxy,(Py::Object()));
}

25
src/App/GeoFeatureGroupExtension.cpp
View File

@ -45,21 +45,36 @@ EXTENSION_PROPERTY_SOURCE(App::GeoFeatureGroupExtension, App::GroupExtension)
GeoFeatureGroupExtension::GeoFeatureGroupExtension(void)
{
initExtension(GeoFeatureGroupExtension::getExtensionClassTypeId());
EXTENSION_ADD_PROPERTY(Placement,(Base::Placement()));
initExtensionType(GeoFeatureGroupExtension::getExtensionClassTypeId());
}
GeoFeatureGroupExtension::~GeoFeatureGroupExtension(void)
{
}
void GeoFeatureGroupExtension::initExtension(ExtensionContainer* obj) {
if(!obj->isDerivedFrom(App::GeoFeature::getClassTypeId()))
throw Base::Exception("GeoFeatureGroupExtension can only be applied to GeoFeatures");
App::Extension::initExtension(obj);
}
PropertyPlacement& GeoFeatureGroupExtension::placement() {
if(!getExtendedContainer())
throw Base::Exception("GeoFeatureGroupExtension was not applied to GeoFeature");
return static_cast<App::GeoFeature*>(getExtendedContainer())->Placement;
}
void GeoFeatureGroupExtension::transformPlacement(const Base::Placement &transform)
{
// NOTE: Keep in sync with APP::GeoFeature
Base::Placement plm = this->Placement.getValue();
Base::Placement plm = this->placement().getValue();
plm = transform * plm;
this->Placement.setValue(plm);
this->placement().setValue(plm);
}
std::vector<App::DocumentObject*> GeoFeatureGroupExtension::getGeoSubObjects () const {

4
src/App/GeoFeatureGroupExtension.h
View File

@ -41,7 +41,9 @@ class AppExport GeoFeatureGroupExtension : public App::GroupExtension
EXTENSION_PROPERTY_HEADER(App::GeoFeatureGroupExtension);
public:
PropertyPlacement Placement;
PropertyPlacement& placement();
virtual void initExtension(ExtensionContainer* obj);
/**
* @brief transformPlacement applies transform to placement of this shape.

2
src/App/GroupExtension.cpp
View File

@ -38,7 +38,7 @@ EXTENSION_PROPERTY_SOURCE(App::GroupExtension, App::DocumentObjectExtension)
GroupExtension::GroupExtension()
{
initExtension(GroupExtension::getExtensionClassTypeId());
initExtensionType(GroupExtension::getExtensionClassTypeId());
EXTENSION_ADD_PROPERTY_TYPE(Group,(0),"Base",(App::PropertyType)(Prop_Output),"List of referenced objects");
}

2
src/App/OriginGroupExtension.cpp
View File

@ -39,7 +39,7 @@ EXTENSION_PROPERTY_SOURCE(App::OriginGroupExtension, App::GeoFeatureGroupExtensi
OriginGroupExtension::OriginGroupExtension () {
initExtension(OriginGroupExtension::getExtensionClassTypeId());
initExtensionType(OriginGroupExtension::getExtensionClassTypeId());
EXTENSION_ADD_PROPERTY_TYPE ( Origin, (0), 0, App::Prop_Hidden, "Origin linked to the group" );
}

2
src/App/Part.cpp
View File

@ -35,7 +35,7 @@
using namespace App;
PROPERTY_SOURCE_WITH_EXTENSIONS(App::Part, App::DocumentObject)
PROPERTY_SOURCE_WITH_EXTENSIONS(App::Part, App::GeoFeature)
//===========================================================================

2
src/App/Part.h
View File

@ -35,7 +35,7 @@ namespace App
/** Base class of all geometric document objects.
*/
class AppExport Part : public App::DocumentObject, public App::OriginGroupExtension
class AppExport Part : public App::GeoFeature, public App::OriginGroupExtension
{
PROPERTY_HEADER_WITH_EXTENSIONS(App::Part);

2
src/Gui/ViewProviderExtension.cpp
View File

@ -37,7 +37,7 @@ EXTENSION_PROPERTY_SOURCE(Gui::ViewProviderExtension, App::Extension)
ViewProviderExtension::ViewProviderExtension()
{
initExtension(Gui::ViewProviderExtension::getExtensionClassTypeId());
initExtensionType(Gui::ViewProviderExtension::getExtensionClassTypeId());
}
ViewProviderExtension::~ViewProviderExtension()

2
src/Gui/ViewProviderExtension.h
View File

@ -97,7 +97,7 @@ public:
ViewProviderExtensionPythonT() {
ExtensionT::m_isPythonExtension = true;
ExtensionT::initExtension(ViewProviderExtensionPythonT::getExtensionClassTypeId());
ExtensionT::initExtensionType(ViewProviderExtensionPythonT::getExtensionClassTypeId());
EXTENSION_ADD_PROPERTY(ExtensionProxy,(Py::Object()));
}

6
src/Gui/ViewProviderGeoFeatureGroupExtension.cpp
View File

@ -38,7 +38,7 @@ EXTENSION_PROPERTY_SOURCE(Gui::ViewProviderGeoFeatureGroupExtension, Gui::ViewPr
ViewProviderGeoFeatureGroupExtension::ViewProviderGeoFeatureGroupExtension()
{
initExtension(ViewProviderGeoFeatureGroupExtension::getExtensionClassTypeId());
initExtensionType(ViewProviderGeoFeatureGroupExtension::getExtensionClassTypeId());
pcGroupChildren = new SoGroup();
pcGroupChildren->ref();
@ -84,8 +84,8 @@ std::vector<std::string> ViewProviderGeoFeatureGroupExtension::extensionGetDispl
void ViewProviderGeoFeatureGroupExtension::extensionUpdateData(const App::Property* prop)
{
auto obj = getExtendedViewProvider()->getObject()->getExtensionByType<App::GeoFeatureGroupExtension>();
if (obj && prop == &obj->Placement) {
getExtendedViewProvider()->setTransformation ( obj->Placement.getValue().toMatrix() );
if (obj && prop == &obj->placement()) {
getExtendedViewProvider()->setTransformation ( obj->placement().getValue().toMatrix() );
} else {
ViewProviderGroupExtension::extensionUpdateData ( prop );
}

2
src/Gui/ViewProviderGroupExtension.cpp
View File

@ -45,7 +45,7 @@ EXTENSION_PROPERTY_SOURCE(Gui::ViewProviderGroupExtension, Gui::ViewProviderExte
ViewProviderGroupExtension::ViewProviderGroupExtension() : visible(false)
{
initExtension(ViewProviderGroupExtension::getExtensionClassTypeId());
initExtensionType(ViewProviderGroupExtension::getExtensionClassTypeId());
}
ViewProviderGroupExtension::~ViewProviderGroupExtension()

2
src/Gui/ViewProviderOriginGroupExtension.cpp
View File

@ -48,7 +48,7 @@ EXTENSION_PROPERTY_SOURCE(Gui::ViewProviderOriginGroupExtension, Gui::ViewProvid
ViewProviderOriginGroupExtension::ViewProviderOriginGroupExtension()
{
initExtension(ViewProviderOriginGroupExtension::getExtensionClassTypeId());
initExtensionType(ViewProviderOriginGroupExtension::getExtensionClassTypeId());
}
ViewProviderOriginGroupExtension::~ViewProviderOriginGroupExtension()

2
src/Mod/Part/App/AttachExtension.cpp
View File

@ -59,7 +59,7 @@ AttachExtension::AttachExtension()
EXTENSION_ADD_PROPERTY_TYPE(superPlacement, (Base::Placement()), "Attachment", App::Prop_None, "Extra placement to apply in addition to attachment (in local coordinates)");
setAttacher(new AttachEngine3D);//default attacher
initExtension(AttachExtension::getExtensionClassTypeId());
initExtensionType(AttachExtension::getExtensionClassTypeId());
}
AttachExtension::~AttachExtension()