kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Core: Rename ViewProviderPythonFeature to ViewProviderFeaturePython

Browse Source 
Fixes #15888
This commit is contained in:
wmayer
2024-08-18 14:00:31 +02:00
committed by Yorik van Havre
parent ecf7e51ab3
commit 3e33f184b4
57 changed files with 217 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/App/FeaturePython.cpp
View File

@@ -607,7 +607,7 @@ bool FeaturePythonImp::editProperty(const char *name)
namespace App {
PROPERTY_SOURCE_TEMPLATE(App::FeaturePython, App::DocumentObject)
template<> const char* App::FeaturePython::getViewProviderName() const {
return "Gui::ViewProviderPythonFeature";
return "Gui::ViewProviderFeaturePython";
}
template<> PyObject* App::FeaturePython::getPyObject() {
if (PythonObject.is(Py::_None())) {
@@ -625,7 +625,7 @@ template class AppExport FeaturePythonT<DocumentObject>;
namespace App {
PROPERTY_SOURCE_TEMPLATE(App::GeometryPython, App::GeoFeature)
template<> const char* App::GeometryPython::getViewProviderName() const {
return "Gui::ViewProviderPythonGeometry";
return "Gui::ViewProviderGeometryPython";
}
// explicit template instantiation
template class AppExport FeaturePythonT<GeoFeature>;

1
src/App/FeaturePython.h
View File

@@ -209,7 +209,6 @@ public:
/// returns the type name of the ViewProvider
const char* getViewProviderName() const override {
return FeatureT::getViewProviderName();
//return "Gui::ViewProviderPythonFeature";
}
App::DocumentObject *getSubObject(const char *subname, PyObject **pyObj,

6
src/Gui/Application.cpp
View File

@@ -119,7 +119,7 @@
#include "ViewProviderPlacement.h"
#include "ViewProviderPlane.h"
#include "ViewProviderPart.h"
#include "ViewProviderPythonFeature.h"
#include "ViewProviderFeaturePython.h"
#include "ViewProviderTextDocument.h"
#include "ViewProviderTextureExtension.h"
#include "ViewProviderVRMLObject.h"
@@ -1928,8 +1928,8 @@ void Application::initTypes()
Gui::ViewProviderVRMLObject ::init();
Gui::ViewProviderAnnotation ::init();
Gui::ViewProviderAnnotationLabel ::init();
Gui::ViewProviderPythonFeature ::init();
Gui::ViewProviderPythonGeometry ::init();
Gui::ViewProviderFeaturePython ::init();
Gui::ViewProviderGeometryPython ::init();
Gui::ViewProviderPlacement ::init();
Gui::ViewProviderPlacementPython ::init();
Gui::ViewProviderOriginFeature ::init();

4
src/Gui/CMakeLists.txt
View File

@@ -947,7 +947,7 @@ SET(Viewprovider_CPP_SRCS
ViewProviderImagePlane.cpp
ViewProviderInventorObject.cpp
ViewProviderPyImp.cpp
ViewProviderPythonFeature.cpp
ViewProviderFeaturePython.cpp
ViewProviderVRMLObject.cpp
ViewProviderBuilder.cpp
ViewProviderPlacement.cpp
@@ -984,7 +984,7 @@ SET(Viewprovider_SRCS
ViewProviderGeometryObject.h
ViewProviderImagePlane.h
ViewProviderInventorObject.h
ViewProviderPythonFeature.h
ViewProviderFeaturePython.h
ViewProviderVRMLObject.h
ViewProviderBuilder.h
ViewProviderPlacement.h

2
src/Gui/ViewProviderDocumentObjectGroup.cpp
View File

@@ -91,5 +91,5 @@ PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderDocumentObjectGroupPython, Gui::ViewPr
/// @endcond
// explicit template instantiation
template class GuiExport ViewProviderPythonFeatureT<ViewProviderDocumentObjectGroup>;
template class GuiExport ViewProviderFeaturePythonT<ViewProviderDocumentObjectGroup>;
}

4
src/Gui/ViewProviderDocumentObjectGroup.h
View File

@@ -25,7 +25,7 @@
#include "ViewProviderDocumentObject.h"
#include "ViewProviderGroupExtension.h"
#include "ViewProviderPythonFeature.h"
#include "ViewProviderFeaturePython.h"
namespace Gui {
@@ -58,7 +58,7 @@ private:
std::vector<ViewProvider*> nodes;
};
using ViewProviderDocumentObjectGroupPython = ViewProviderPythonFeatureT<ViewProviderDocumentObjectGroup>;
using ViewProviderDocumentObjectGroupPython = ViewProviderFeaturePythonT<ViewProviderDocumentObjectGroup>;
} // namespace Gui

140
src/Gui/ViewProviderPythonFeature.cpp → src/Gui/ViewProviderFeaturePython.cpp
View File

@@ -37,7 +37,7 @@
#include <Base/Interpreter.h>
#include <Base/Tools.h>
#include "ViewProviderPythonFeature.h"
#include "ViewProviderFeaturePython.h"
#include "Application.h"
#include "BitmapFactory.h"
#include "Document.h"
@@ -46,7 +46,7 @@
#include "ViewProviderDocumentObjectPy.h"
FC_LOG_LEVEL_INIT("ViewProviderPythonFeature", true, true)
FC_LOG_LEVEL_INIT("ViewProviderFeaturePython", true, true)
using namespace Gui;
@@ -55,14 +55,14 @@ namespace sp = std::placeholders;
// ----------------------------------------------------------------------------
ViewProviderPythonFeatureImp::ViewProviderPythonFeatureImp(
ViewProviderFeaturePythonImp::ViewProviderFeaturePythonImp(
ViewProviderDocumentObject* vp, App::PropertyPythonObject &proxy)
: object(vp)
, Proxy(proxy)
{
}
ViewProviderPythonFeatureImp::~ViewProviderPythonFeatureImp()
ViewProviderFeaturePythonImp::~ViewProviderFeaturePythonImp()
{
Base::PyGILStateLocker lock;
#undef FC_PY_ELEMENT
@@ -76,7 +76,7 @@ ViewProviderPythonFeatureImp::~ViewProviderPythonFeatureImp()
}
}
void ViewProviderPythonFeatureImp::init(PyObject *pyobj) {
void ViewProviderFeaturePythonImp::init(PyObject *pyobj) {
Base::PyGILStateLocker lock;
has__object__ = !!PyObject_HasAttrString(pyobj, "__object__");
@@ -88,7 +88,7 @@ void ViewProviderPythonFeatureImp::init(PyObject *pyobj) {
#define FC_PY_CALL_CHECK(_name) _FC_PY_CALL_CHECK(_name,return(NotImplemented))
QIcon ViewProviderPythonFeatureImp::getIcon() const
QIcon ViewProviderFeaturePythonImp::getIcon() const
{
_FC_PY_CALL_CHECK(getIcon,return(QIcon()));
@@ -152,7 +152,7 @@ QIcon ViewProviderPythonFeatureImp::getIcon() const
return {};
}
bool ViewProviderPythonFeatureImp::claimChildren(std::vector<App::DocumentObject*> &children) const
bool ViewProviderFeaturePythonImp::claimChildren(std::vector<App::DocumentObject*> &children) const
{
_FC_PY_CALL_CHECK(claimChildren,return(false));
@@ -179,8 +179,8 @@ bool ViewProviderPythonFeatureImp::claimChildren(std::vector<App::DocumentObject
return true;
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::useNewSelectionModel() const
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::useNewSelectionModel() const
{
FC_PY_CALL_CHECK(useNewSelectionModel);
@@ -202,7 +202,7 @@ ViewProviderPythonFeatureImp::useNewSelectionModel() const
return Accepted;
}
bool ViewProviderPythonFeatureImp::getElement(const SoDetail *det, std::string &res) const
bool ViewProviderFeaturePythonImp::getElement(const SoDetail *det, std::string &res) const
{
_FC_PY_CALL_CHECK(getElement,return(false));
@@ -235,8 +235,8 @@ bool ViewProviderPythonFeatureImp::getElement(const SoDetail *det, std::string &
return true;
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::getElementPicked(const SoPickedPoint *pp, std::string &subname) const
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::getElementPicked(const SoPickedPoint *pp, std::string &subname) const
{
FC_PY_CALL_CHECK(getElementPicked);
@@ -267,7 +267,7 @@ ViewProviderPythonFeatureImp::getElementPicked(const SoPickedPoint *pp, std::str
return Rejected;
}
bool ViewProviderPythonFeatureImp::getDetail(const char* name, SoDetail *&det) const
bool ViewProviderFeaturePythonImp::getDetail(const char* name, SoDetail *&det) const
{
_FC_PY_CALL_CHECK(getDetail,return(false));
@@ -298,7 +298,7 @@ bool ViewProviderPythonFeatureImp::getDetail(const char* name, SoDetail *&det) c
return true;
}
ViewProviderPythonFeatureImp::ValueT ViewProviderPythonFeatureImp::getDetailPath(
ViewProviderFeaturePythonImp::ValueT ViewProviderFeaturePythonImp::getDetailPath(
const char* name, SoFullPath *path, bool append, SoDetail *&det) const
{
FC_PY_CALL_CHECK(getDetailPath);
@@ -342,13 +342,13 @@ ViewProviderPythonFeatureImp::ValueT ViewProviderPythonFeatureImp::getDetailPath
}
std::vector<Base::Vector3d> ViewProviderPythonFeatureImp::getSelectionShape(const char* /*Element*/) const
std::vector<Base::Vector3d> ViewProviderFeaturePythonImp::getSelectionShape(const char* /*Element*/) const
{
return {};
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::setEdit(int ModNum)
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::setEdit(int ModNum)
{
FC_PY_CALL_CHECK(setEdit)
@@ -388,8 +388,8 @@ ViewProviderPythonFeatureImp::setEdit(int ModNum)
return Rejected;
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::unsetEdit(int ModNum)
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::unsetEdit(int ModNum)
{
FC_PY_CALL_CHECK(unsetEdit)
@@ -429,8 +429,8 @@ ViewProviderPythonFeatureImp::unsetEdit(int ModNum)
return Rejected;
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::setEditViewer(View3DInventorViewer *viewer, int ModNum)
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::setEditViewer(View3DInventorViewer *viewer, int ModNum)
{
FC_PY_CALL_CHECK(setEditViewer)
@@ -454,8 +454,8 @@ ViewProviderPythonFeatureImp::setEditViewer(View3DInventorViewer *viewer, int Mo
return Rejected;
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::unsetEditViewer(View3DInventorViewer *viewer)
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::unsetEditViewer(View3DInventorViewer *viewer)
{
FC_PY_CALL_CHECK(unsetEditViewer)
@@ -479,8 +479,8 @@ ViewProviderPythonFeatureImp::unsetEditViewer(View3DInventorViewer *viewer)
return Rejected;
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::doubleClicked()
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::doubleClicked()
{
FC_PY_CALL_CHECK(doubleClicked)
@@ -512,7 +512,7 @@ ViewProviderPythonFeatureImp::doubleClicked()
return Rejected;
}
bool ViewProviderPythonFeatureImp::setupContextMenu(QMenu* menu)
bool ViewProviderFeaturePythonImp::setupContextMenu(QMenu* menu)
{
_FC_PY_CALL_CHECK(setupContextMenu,return(false));
@@ -548,7 +548,7 @@ bool ViewProviderPythonFeatureImp::setupContextMenu(QMenu* menu)
return true;
}
void ViewProviderPythonFeatureImp::attach(App::DocumentObject *pcObject)
void ViewProviderFeaturePythonImp::attach(App::DocumentObject *pcObject)
{
_FC_PY_CALL_CHECK(attach,return);
@@ -574,7 +574,7 @@ void ViewProviderPythonFeatureImp::attach(App::DocumentObject *pcObject)
}
}
void ViewProviderPythonFeatureImp::updateData(const App::Property* prop)
void ViewProviderFeaturePythonImp::updateData(const App::Property* prop)
{
if(py_updateData.isNone())
return;
@@ -606,7 +606,7 @@ void ViewProviderPythonFeatureImp::updateData(const App::Property* prop)
}
}
void ViewProviderPythonFeatureImp::onChanged(const App::Property* prop)
void ViewProviderFeaturePythonImp::onChanged(const App::Property* prop)
{
if(py_onChanged.isNone())
return;
@@ -638,11 +638,11 @@ void ViewProviderPythonFeatureImp::onChanged(const App::Property* prop)
}
}
void ViewProviderPythonFeatureImp::startRestoring()
void ViewProviderFeaturePythonImp::startRestoring()
{
}
void ViewProviderPythonFeatureImp::finishRestoring()
void ViewProviderFeaturePythonImp::finishRestoring()
{
Base::PyGILStateLocker lock;
try {
@@ -660,8 +660,8 @@ void ViewProviderPythonFeatureImp::finishRestoring()
}
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::onDelete(const std::vector<std::string> & sub)
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::onDelete(const std::vector<std::string> & sub)
{
FC_PY_CALL_CHECK(onDelete);
@@ -698,8 +698,8 @@ ViewProviderPythonFeatureImp::onDelete(const std::vector<std::string> & sub)
}
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::canDelete(App::DocumentObject *obj) const
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::canDelete(App::DocumentObject *obj) const
{
FC_PY_CALL_CHECK(canDelete);
@@ -720,8 +720,8 @@ ViewProviderPythonFeatureImp::canDelete(App::DocumentObject *obj) const
}
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::canAddToSceneGraph() const
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::canAddToSceneGraph() const
{
FC_PY_CALL_CHECK(canAddToSceneGraph);
@@ -740,7 +740,7 @@ ViewProviderPythonFeatureImp::canAddToSceneGraph() const
return Accepted;
}
bool ViewProviderPythonFeatureImp::getDefaultDisplayMode(std::string &mode) const
bool ViewProviderFeaturePythonImp::getDefaultDisplayMode(std::string &mode) const
{
_FC_PY_CALL_CHECK(getDefaultDisplayMode,return(0));
@@ -763,7 +763,7 @@ bool ViewProviderPythonFeatureImp::getDefaultDisplayMode(std::string &mode) cons
return true;
}
std::vector<std::string> ViewProviderPythonFeatureImp::getDisplayModes() const
std::vector<std::string> ViewProviderFeaturePythonImp::getDisplayModes() const
{
std::vector<std::string> modes;
_FC_PY_CALL_CHECK(getDisplayModes,return(modes));
@@ -800,7 +800,7 @@ std::vector<std::string> ViewProviderPythonFeatureImp::getDisplayModes() const
return modes;
}
std::string ViewProviderPythonFeatureImp::setDisplayMode(const char* ModeName)
std::string ViewProviderFeaturePythonImp::setDisplayMode(const char* ModeName)
{
_FC_PY_CALL_CHECK(setDisplayMode,return(ModeName));
@@ -820,8 +820,8 @@ std::string ViewProviderPythonFeatureImp::setDisplayMode(const char* ModeName)
return ModeName;
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::canDragObjects() const
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::canDragObjects() const
{
FC_PY_CALL_CHECK(canDragObjects);
@@ -842,8 +842,8 @@ ViewProviderPythonFeatureImp::canDragObjects() const
return Rejected;
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::canDragObject(App::DocumentObject* obj) const
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::canDragObject(App::DocumentObject* obj) const
{
FC_PY_CALL_CHECK(canDragObject);
@@ -866,8 +866,8 @@ ViewProviderPythonFeatureImp::canDragObject(App::DocumentObject* obj) const
return Rejected;
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::dragObject(App::DocumentObject* obj)
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::dragObject(App::DocumentObject* obj)
{
FC_PY_CALL_CHECK(dragObject);
@@ -900,8 +900,8 @@ ViewProviderPythonFeatureImp::dragObject(App::DocumentObject* obj)
return Rejected;
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::canDropObjects() const
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::canDropObjects() const
{
FC_PY_CALL_CHECK(canDropObjects);
@@ -922,8 +922,8 @@ ViewProviderPythonFeatureImp::canDropObjects() const
return Rejected;
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::canDropObject(App::DocumentObject* obj) const
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::canDropObject(App::DocumentObject* obj) const
{
FC_PY_CALL_CHECK(canDropObject);
@@ -946,8 +946,8 @@ ViewProviderPythonFeatureImp::canDropObject(App::DocumentObject* obj) const
return Rejected;
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::dropObject(App::DocumentObject* obj)
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::dropObject(App::DocumentObject* obj)
{
FC_PY_CALL_CHECK(dropObject);
@@ -978,8 +978,8 @@ ViewProviderPythonFeatureImp::dropObject(App::DocumentObject* obj)
return Rejected;
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::canDragAndDropObject(App::DocumentObject *obj) const
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::canDragAndDropObject(App::DocumentObject *obj) const
{
FC_PY_CALL_CHECK(canDragAndDropObject);
@@ -1001,8 +1001,8 @@ ViewProviderPythonFeatureImp::canDragAndDropObject(App::DocumentObject *obj) con
return Rejected;
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::canDropObjectEx(App::DocumentObject* obj,
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::canDropObjectEx(App::DocumentObject* obj,
App::DocumentObject *owner, const char *subname, const std::vector<std::string> &elements) const
{
FC_PY_CALL_CHECK(canDropObjectEx);
@@ -1033,7 +1033,7 @@ ViewProviderPythonFeatureImp::canDropObjectEx(App::DocumentObject* obj,
return Rejected;
}
bool ViewProviderPythonFeatureImp::dropObjectEx(App::DocumentObject* obj, App::DocumentObject *owner,
bool ViewProviderFeaturePythonImp::dropObjectEx(App::DocumentObject* obj, App::DocumentObject *owner,
const char *subname, const std::vector<std::string> &elements,std::string &ret)
{
_FC_PY_CALL_CHECK(dropObjectEx, return(false));
@@ -1065,8 +1065,8 @@ bool ViewProviderPythonFeatureImp::dropObjectEx(App::DocumentObject* obj, App::D
return true;
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::isShow() const
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::isShow() const
{
FC_PY_CALL_CHECK(isShow);
@@ -1088,8 +1088,8 @@ ViewProviderPythonFeatureImp::isShow() const
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::canRemoveChildrenFromRoot() const {
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::canRemoveChildrenFromRoot() const {
FC_PY_CALL_CHECK(canRemoveChildrenFromRoot);
@@ -1109,7 +1109,7 @@ ViewProviderPythonFeatureImp::canRemoveChildrenFromRoot() const {
return Rejected;
}
bool ViewProviderPythonFeatureImp::getDropPrefix(std::string &prefix) const {
bool ViewProviderFeaturePythonImp::getDropPrefix(std::string &prefix) const {
_FC_PY_CALL_CHECK(getDropPrefix,return(false));
@@ -1132,8 +1132,8 @@ bool ViewProviderPythonFeatureImp::getDropPrefix(std::string &prefix) const {
return true;
}
ViewProviderPythonFeatureImp::ValueT
ViewProviderPythonFeatureImp::replaceObject(
ViewProviderFeaturePythonImp::ValueT
ViewProviderFeaturePythonImp::replaceObject(
App::DocumentObject *oldObj, App::DocumentObject *newObj)
{
if(!oldObj || !oldObj->isAttachedToDocument()
@@ -1160,7 +1160,7 @@ ViewProviderPythonFeatureImp::replaceObject(
return Rejected;
}
bool ViewProviderPythonFeatureImp::getLinkedViewProvider(
bool ViewProviderFeaturePythonImp::getLinkedViewProvider(
ViewProviderDocumentObject *&vp, std::string *subname, bool recursive) const
{
_FC_PY_CALL_CHECK(getLinkedViewProvider,return(false));
@@ -1202,7 +1202,7 @@ bool ViewProviderPythonFeatureImp::getLinkedViewProvider(
return true;
}
bool ViewProviderPythonFeatureImp::editProperty(const char *name)
bool ViewProviderFeaturePythonImp::editProperty(const char *name)
{
_FC_PY_CALL_CHECK(editProperty,return false);
Base::PyGILStateLocker lock;
@@ -1227,17 +1227,17 @@ bool ViewProviderPythonFeatureImp::editProperty(const char *name)
// ---------------------------------------------------------
namespace Gui {
PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderPythonFeature, Gui::ViewProviderDocumentObject)
PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderFeaturePython, Gui::ViewProviderDocumentObject)
// explicit template instantiation
template class GuiExport ViewProviderPythonFeatureT<ViewProviderDocumentObject>;
template class GuiExport ViewProviderFeaturePythonT<ViewProviderDocumentObject>;
}
// ---------------------------------------------------------
namespace Gui {
PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderPythonGeometry, Gui::ViewProviderGeometryObject)
PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderGeometryPython, Gui::ViewProviderGeometryObject)
// explicit template instantiation
template class GuiExport ViewProviderPythonFeatureT<ViewProviderGeometryObject>;
template class GuiExport ViewProviderFeaturePythonT<ViewProviderGeometryObject>;
}

120
src/Gui/ViewProviderPythonFeature.h → src/Gui/ViewProviderFeaturePython.h
View File

@@ -20,8 +20,8 @@
* *
***************************************************************************/
#ifndef GUI_VIEWPROVIDERPYTHONFEATURE_H
#define GUI_VIEWPROVIDERPYTHONFEATURE_H
#ifndef GUI_VIEWPROVIDERFEATUREPYTHON_H
#define GUI_VIEWPROVIDERFEATUREPYTHON_H
#include <App/AutoTransaction.h>
#include <App/PropertyPythonObject.h>
@@ -37,7 +37,7 @@ class SoNode;
namespace Gui {
class GuiExport ViewProviderPythonFeatureImp
class GuiExport ViewProviderFeaturePythonImp
{
public:
enum ValueT {
@@ -47,9 +47,9 @@ public:
};
/// constructor.
ViewProviderPythonFeatureImp(ViewProviderDocumentObject*, App::PropertyPythonObject &);
ViewProviderFeaturePythonImp(ViewProviderDocumentObject*, App::PropertyPythonObject &);
/// destructor.
~ViewProviderPythonFeatureImp();
~ViewProviderFeaturePythonImp();
// Returns the icon
QIcon getIcon() const;
@@ -193,18 +193,18 @@ public:
};
template <class ViewProviderT>
class ViewProviderPythonFeatureT : public ViewProviderT
class ViewProviderFeaturePythonT : public ViewProviderT
{
PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderPythonFeatureT<ViewProviderT>);
PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderFeaturePythonT<ViewProviderT>);
public:
/// constructor.
ViewProviderPythonFeatureT() {
ViewProviderFeaturePythonT() {
ADD_PROPERTY(Proxy,(Py::Object()));
imp = new ViewProviderPythonFeatureImp(this,Proxy);
imp = new ViewProviderFeaturePythonImp(this,Proxy);
}
/// destructor.
~ViewProviderPythonFeatureT() override {
~ViewProviderFeaturePythonT() override {
delete imp;
}
@@ -243,9 +243,9 @@ public:
//@{
bool useNewSelectionModel() const override {
switch(imp->useNewSelectionModel()) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderFeaturePythonImp::Accepted:
return true;
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Rejected:
return false;
default:
return ViewProviderT::useNewSelectionModel();
@@ -253,9 +253,9 @@ public:
}
bool getElementPicked(const SoPickedPoint *pp, std::string &subname) const override {
auto ret = imp->getElementPicked(pp,subname);
if(ret == ViewProviderPythonFeatureImp::NotImplemented)
if(ret == ViewProviderFeaturePythonImp::NotImplemented)
return ViewProviderT::getElementPicked(pp,subname);
else if(ret == ViewProviderPythonFeatureImp::Accepted)
else if(ret == ViewProviderFeaturePythonImp::Accepted)
return true;
return false;
}
@@ -273,9 +273,9 @@ public:
}
bool getDetailPath(const char *name, SoFullPath *path, bool append,SoDetail *&det) const override {
auto ret = imp->getDetailPath(name,path,append,det);
if(ret == ViewProviderPythonFeatureImp::NotImplemented)
if(ret == ViewProviderFeaturePythonImp::NotImplemented)
return ViewProviderT::getDetailPath(name,path,append,det);
return ret == ViewProviderPythonFeatureImp::Accepted;
return ret == ViewProviderFeaturePythonImp::Accepted;
}
std::vector<Base::Vector3d> getSelectionShape(const char* Element) const override {
return ViewProviderT::getSelectionShape(Element);
@@ -298,9 +298,9 @@ public:
}
bool onDelete(const std::vector<std::string> & sub) override {
switch(imp->onDelete(sub)) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderFeaturePythonImp::Accepted:
return true;
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Rejected:
return false;
default:
return ViewProviderT::onDelete(sub);
@@ -308,9 +308,9 @@ public:
}
bool canDelete(App::DocumentObject *obj) const override {
switch(imp->canDelete(obj)) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderFeaturePythonImp::Accepted:
return true;
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Rejected:
return false;
default:
return ViewProviderT::canDelete(obj);
@@ -335,9 +335,9 @@ public:
/// Returns true if the view provider generally supports dragging objects
bool canDragObjects() const override {
switch (imp->canDragObjects()) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderFeaturePythonImp::Accepted:
return true;
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Rejected:
return false;
default:
return ViewProviderT::canDragObjects();
@@ -346,9 +346,9 @@ public:
/// Check whether the object can be removed from the view provider by drag and drop
bool canDragObject(App::DocumentObject* obj) const override {
switch (imp->canDragObject(obj)) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderFeaturePythonImp::Accepted:
return true;
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Rejected:
return false;
default:
return ViewProviderT::canDragObject(obj);
@@ -358,8 +358,8 @@ public:
void dragObject(App::DocumentObject* obj) override {
App::AutoTransaction committer;
switch (imp->dragObject(obj)) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Accepted:
case ViewProviderFeaturePythonImp::Rejected:
return;
default:
return ViewProviderT::dragObject(obj);
@@ -368,9 +368,9 @@ public:
/// Returns true if the view provider generally accepts dropping of objects
bool canDropObjects() const override {
switch (imp->canDropObjects()) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderFeaturePythonImp::Accepted:
return true;
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Rejected:
return false;
default:
return ViewProviderT::canDropObjects();
@@ -379,9 +379,9 @@ public:
/// Check whether the object can be dropped to the view provider by drag and drop
bool canDropObject(App::DocumentObject* obj) const override {
switch (imp->canDropObject(obj)) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderFeaturePythonImp::Accepted:
return true;
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Rejected:
return false;
default:
return ViewProviderT::canDropObject(obj);
@@ -391,8 +391,8 @@ public:
void dropObject(App::DocumentObject* obj) override {
App::AutoTransaction committer;
switch (imp->dropObject(obj)) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Accepted:
case ViewProviderFeaturePythonImp::Rejected:
return;
default:
return ViewProviderT::dropObject(obj);
@@ -401,9 +401,9 @@ public:
/** Return false to force drop only operation for a give object*/
bool canDragAndDropObject(App::DocumentObject *obj) const override {
switch (imp->canDragAndDropObject(obj)) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderFeaturePythonImp::Accepted:
return true;
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Rejected:
return false;
default:
return ViewProviderT::canDragAndDropObject(obj);
@@ -413,9 +413,9 @@ public:
const char *subname, const std::vector<std::string> &elements) const override
{
switch (imp->canDropObjectEx(obj,owner,subname,elements)) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderFeaturePythonImp::Accepted:
return true;
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Rejected:
return false;
default:
return ViewProviderT::canDropObjectEx(obj,owner,subname,elements);
@@ -438,9 +438,9 @@ public:
/// Returns true if the icon must always appear enabled in the tree view
bool isShow() const override {
switch(imp->isShow()) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderFeaturePythonImp::Accepted:
return true;
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Rejected:
return false;
default:
return ViewProviderT::isShow();
@@ -470,9 +470,9 @@ public:
bool canRemoveChildrenFromRoot() const override {
switch(imp->canRemoveChildrenFromRoot()) {
case ViewProviderPythonFeatureImp::NotImplemented:
case ViewProviderFeaturePythonImp::NotImplemented:
return ViewProviderT::canRemoveChildrenFromRoot();
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderFeaturePythonImp::Accepted:
return true;
default:
return false;
@@ -485,9 +485,9 @@ public:
bool canAddToSceneGraph() const override {
switch(imp->canAddToSceneGraph()) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderFeaturePythonImp::Accepted:
return true;
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Rejected:
return false;
default:
return ViewProviderT::canAddToSceneGraph();
@@ -522,9 +522,9 @@ protected:
bool setEdit(int ModNum) override
{
switch (imp->setEdit(ModNum)) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderFeaturePythonImp::Accepted:
return true;
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Rejected:
return false;
default:
return ViewProviderT::setEdit(ModNum);
@@ -534,19 +534,19 @@ protected:
void unsetEdit(int ModNum) override
{
switch (imp->unsetEdit(ModNum)) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderFeaturePythonImp::Accepted:
return;
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Rejected:
default:
return ViewProviderT::unsetEdit(ModNum);
}
}
void setEditViewer(View3DInventorViewer *viewer, int ModNum) override {
if (imp->setEditViewer(viewer,ModNum) == ViewProviderPythonFeatureImp::NotImplemented)
if (imp->setEditViewer(viewer,ModNum) == ViewProviderFeaturePythonImp::NotImplemented)
ViewProviderT::setEditViewer(viewer,ModNum);
}
void unsetEditViewer(View3DInventorViewer *viewer) override {
if (imp->unsetEditViewer(viewer) == ViewProviderPythonFeatureImp::NotImplemented)
if (imp->unsetEditViewer(viewer) == ViewProviderFeaturePythonImp::NotImplemented)
ViewProviderT::unsetEditViewer(viewer);
}
@@ -560,9 +560,9 @@ protected:
int replaceObject(App::DocumentObject *oldObj, App::DocumentObject *newObj) override {
App::AutoTransaction committer;
switch (imp->replaceObject(oldObj,newObj)) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderFeaturePythonImp::Accepted:
return 1;
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Rejected:
return 0;
default:
return ViewProviderT::replaceObject(oldObj,newObj);
@@ -594,9 +594,9 @@ protected:
{
App::AutoTransaction committer;
switch (imp->doubleClicked()) {
case ViewProviderPythonFeatureImp::Accepted:
case ViewProviderFeaturePythonImp::Accepted:
return true;
case ViewProviderPythonFeatureImp::Rejected:
case ViewProviderFeaturePythonImp::Rejected:
return false;
default:
return ViewProviderT::doubleClicked();
@@ -609,13 +609,13 @@ protected:
}
public:
ViewProviderPythonFeatureT(const ViewProviderPythonFeatureT&) = delete;
ViewProviderPythonFeatureT(ViewProviderPythonFeatureT&&) = delete;
ViewProviderPythonFeatureT& operator= (const ViewProviderPythonFeatureT&) = delete;
ViewProviderPythonFeatureT& operator= (ViewProviderPythonFeatureT&&) = delete;
ViewProviderFeaturePythonT(const ViewProviderFeaturePythonT&) = delete;
ViewProviderFeaturePythonT(ViewProviderFeaturePythonT&&) = delete;
ViewProviderFeaturePythonT& operator= (const ViewProviderFeaturePythonT&) = delete;
ViewProviderFeaturePythonT& operator= (ViewProviderFeaturePythonT&&) = delete;
private:
ViewProviderPythonFeatureImp* imp;
ViewProviderFeaturePythonImp* imp;
App::PropertyPythonObject Proxy;
mutable std::string defaultMode;
std::string viewerMode;
@@ -623,10 +623,10 @@ private:
};
// Special Feature-Python classes
using ViewProviderPythonFeature = ViewProviderPythonFeatureT<ViewProviderDocumentObject>;
using ViewProviderPythonGeometry = ViewProviderPythonFeatureT<ViewProviderGeometryObject>;
using ViewProviderFeaturePython = ViewProviderFeaturePythonT<ViewProviderDocumentObject>;
using ViewProviderGeometryPython = ViewProviderFeaturePythonT<ViewProviderGeometryObject>;
} // namespace Gui
#endif // GUI_VIEWPROVIDERPYTHONFEATURE_H
#endif // GUI_VIEWPROVIDERFEATUREPYTHON_H

2
src/Gui/ViewProviderGeoFeatureGroup.cpp
View File

@@ -47,5 +47,5 @@ PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderGeoFeatureGroupPython, Gui::ViewProvid
/// @endcond
// explicit template instantiation
template class GuiExport ViewProviderPythonFeatureT<ViewProviderGeoFeatureGroup>;
template class GuiExport ViewProviderFeaturePythonT<ViewProviderGeoFeatureGroup>;
}

4
src/Gui/ViewProviderGeoFeatureGroup.h
View File

@@ -28,7 +28,7 @@
#include "ViewProviderDocumentObject.h"
#include "ViewProviderGeoFeatureGroupExtension.h"
#include "ViewProviderPythonFeature.h"
#include "ViewProviderFeaturePython.h"
namespace Gui {
@@ -44,7 +44,7 @@ public:
~ViewProviderGeoFeatureGroup() override;
};
using ViewProviderGeoFeatureGroupPython = ViewProviderPythonFeatureT<ViewProviderGeoFeatureGroup>;
using ViewProviderGeoFeatureGroupPython = ViewProviderFeaturePythonT<ViewProviderGeoFeatureGroup>;
} // namespace Gui

2
src/Gui/ViewProviderLink.cpp
View File

@@ -3446,5 +3446,5 @@ void ViewProviderLink::setTransformation(const SbMatrix &rcMatrix)
namespace Gui {
PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderLinkPython, Gui::ViewProviderLink)
template class GuiExport ViewProviderPythonFeatureT<ViewProviderLink>;
template class GuiExport ViewProviderFeaturePythonT<ViewProviderLink>;
}

4
src/Gui/ViewProviderLink.h
View File

@@ -28,7 +28,7 @@
#include "SoFCUnifiedSelection.h"
#include "ViewProviderDocumentObject.h"
#include "ViewProviderExtension.h"
#include "ViewProviderPythonFeature.h"
#include "ViewProviderFeaturePython.h"
class SoBase;
@@ -339,7 +339,7 @@ protected:
mutable qint64 overlayCacheKey;
};
using ViewProviderLinkPython = ViewProviderPythonFeatureT<ViewProviderLink>;
using ViewProviderLinkPython = ViewProviderFeaturePythonT<ViewProviderLink>;
} //namespace Gui

2
src/Gui/ViewProviderMaterialObject.cpp
View File

@@ -73,5 +73,5 @@ PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderMaterialObjectPython, Gui::ViewProvide
/// @endcond
// explicit template instantiation
template class GuiExport ViewProviderPythonFeatureT<ViewProviderMaterialObject>;
template class GuiExport ViewProviderFeaturePythonT<ViewProviderMaterialObject>;
}

4
src/Gui/ViewProviderMaterialObject.h
View File

@@ -26,7 +26,7 @@
#include "ViewProviderDocumentObject.h"
#include "ViewProviderPythonFeature.h"
#include "ViewProviderFeaturePython.h"
namespace Gui {
@@ -49,7 +49,7 @@ public:
};
using ViewProviderMaterialObjectPython = ViewProviderPythonFeatureT<ViewProviderMaterialObject>;
using ViewProviderMaterialObjectPython = ViewProviderFeaturePythonT<ViewProviderMaterialObject>;
} // namespace Gui

2
src/Gui/ViewProviderPart.cpp
View File

@@ -144,5 +144,5 @@ PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderPartPython, Gui::ViewProviderPart)
/// @endcond
// explicit template instantiation
template class GuiExport ViewProviderPythonFeatureT<ViewProviderPart>;
template class GuiExport ViewProviderFeaturePythonT<ViewProviderPart>;
}

4
src/Gui/ViewProviderPart.h
View File

@@ -25,7 +25,7 @@
#include "ViewProviderDragger.h"
#include "ViewProviderOriginGroup.h"
#include "ViewProviderPythonFeature.h"
#include "ViewProviderFeaturePython.h"
namespace Gui {
@@ -61,7 +61,7 @@ protected:
};
using ViewProviderPartPython = ViewProviderPythonFeatureT<ViewProviderPart>;
using ViewProviderPartPython = ViewProviderFeaturePythonT<ViewProviderPart>;
} // namespace Gui

2
src/Gui/ViewProviderPlacement.cpp
View File

@@ -138,6 +138,6 @@ PROPERTY_SOURCE_TEMPLATE(Gui::ViewProviderPlacementPython, Gui::ViewProviderPlac
/// @endcond
// explicit template instantiation
template class GuiExport ViewProviderPythonFeatureT<ViewProviderPlacement>;
template class GuiExport ViewProviderFeaturePythonT<ViewProviderPlacement>;
}

4
src/Gui/ViewProviderPlacement.h
View File

@@ -25,7 +25,7 @@
#include "AxisOrigin.h"
#include "ViewProviderGeometryObject.h"
#include "ViewProviderPythonFeature.h"
#include "ViewProviderFeaturePython.h"
class SoFontStyle;
@@ -67,7 +67,7 @@ protected:
};
using ViewProviderPlacementPython = ViewProviderPythonFeatureT<ViewProviderPlacement>;
using ViewProviderPlacementPython = ViewProviderFeaturePythonT<ViewProviderPlacement>;
} //namespace Gui

4
src/Mod/CAM/Gui/ViewProviderArea.cpp
View File

@@ -190,7 +190,7 @@ PROPERTY_SOURCE_TEMPLATE(PathGui::ViewProviderAreaViewPython, PathGui::ViewProvi
/// @endcond
// explicit template instantiation
template class PathGuiExport ViewProviderPythonFeatureT<PathGui::ViewProviderArea>;
template class PathGuiExport ViewProviderPythonFeatureT<PathGui::ViewProviderAreaView>;
template class PathGuiExport ViewProviderFeaturePythonT<PathGui::ViewProviderArea>;
template class PathGuiExport ViewProviderFeaturePythonT<PathGui::ViewProviderAreaView>;
}

6
src/Mod/CAM/Gui/ViewProviderArea.h
View File

@@ -23,7 +23,7 @@
#ifndef PATH_ViewProviderArea_H
#define PATH_ViewProviderArea_H
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
#include <Mod/Part/Gui/ViewProviderPlaneParametric.h>
#include <Mod/CAM/PathGlobal.h>
@@ -52,7 +52,7 @@ public:
void dropObject(App::DocumentObject*) override;
};
using ViewProviderAreaPython = Gui::ViewProviderPythonFeatureT<ViewProviderArea>;
using ViewProviderAreaPython = Gui::ViewProviderFeaturePythonT<ViewProviderArea>;
class PathGuiExport ViewProviderAreaView : public PartGui::ViewProviderPlaneParametric
@@ -75,7 +75,7 @@ public:
void dropObject(App::DocumentObject*) override;
};
using ViewProviderAreaViewPython = Gui::ViewProviderPythonFeatureT<ViewProviderAreaView>;
using ViewProviderAreaViewPython = Gui::ViewProviderFeaturePythonT<ViewProviderAreaView>;
} //namespace PathGui

2
src/Mod/CAM/Gui/ViewProviderPath.cpp
View File

@@ -727,5 +727,5 @@ PROPERTY_SOURCE_TEMPLATE(PathGui::ViewProviderPathPython, PathGui::ViewProviderP
/// @endcond
// explicit template instantiation
template class PathGuiExport ViewProviderPythonFeatureT<PathGui::ViewProviderPath>;
template class PathGuiExport ViewProviderFeaturePythonT<PathGui::ViewProviderPath>;
}

4
src/Mod/CAM/Gui/ViewProviderPath.h
View File

@@ -26,7 +26,7 @@
#include <App/PropertyGeo.h>
#include <Gui/Selection.h>
#include <Gui/ViewProviderGeometryObject.h>
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
#include <Mod/Part/Gui/SoBrepEdgeSet.h>
#include <Mod/CAM/PathGlobal.h>
@@ -117,7 +117,7 @@ protected:
};
using ViewProviderPathPython = Gui::ViewProviderPythonFeatureT<ViewProviderPath>;
using ViewProviderPathPython = Gui::ViewProviderFeaturePythonT<ViewProviderPath>;
} //namespace PathGui

2
src/Mod/CAM/Gui/ViewProviderPathCompound.cpp
View File

@@ -87,5 +87,5 @@ PROPERTY_SOURCE_TEMPLATE(PathGui::ViewProviderPathCompoundPython, PathGui::ViewP
/// @endcond
// explicit template instantiation
template class PathGuiExport ViewProviderPythonFeatureT<PathGui::ViewProviderPathCompound>;
template class PathGuiExport ViewProviderFeaturePythonT<PathGui::ViewProviderPathCompound>;
}

2
src/Mod/CAM/Gui/ViewProviderPathCompound.h
View File

@@ -48,7 +48,7 @@ protected:
};
using ViewProviderPathCompoundPython = Gui::ViewProviderPythonFeatureT<ViewProviderPathCompound>;
using ViewProviderPathCompoundPython = Gui::ViewProviderFeaturePythonT<ViewProviderPathCompound>;
} //namespace PathGui

2
src/Mod/Draft/draftviewproviders/view_base.py
View File

@@ -56,7 +56,7 @@ class ViewProviderDraft(object):
vobj : a base C++ view provider
The view provider of the scripted object (`obj.ViewObject`),
which commonly may be of types `PartGui::ViewProvider2DObjectPython`,
`PartGui::ViewProviderPython`, or `Gui::ViewProviderPythonFeature`.
`PartGui::ViewProviderPython`, or `Gui::ViewProviderFeaturePython`.
A basic view provider is instantiated during the creation
of the base C++ object, for example,

2
src/Mod/Drawing/Gui/ViewProviderView.cpp
View File

@@ -127,7 +127,7 @@ PROPERTY_SOURCE_TEMPLATE(DrawingGui::ViewProviderDrawingViewPython,
/// @endcond
// explicit template instantiation
template class DrawingGuiExport ViewProviderPythonFeatureT<DrawingGui::ViewProviderDrawingView>;
template class DrawingGuiExport ViewProviderFeaturePythonT<DrawingGui::ViewProviderDrawingView>;
} // namespace Gui

3
src/Mod/Drawing/Gui/ViewProviderView.h
View File

@@ -24,6 +24,7 @@
#define DRAWINGGUI_VIEWPROVIDERVIEW_H
#include <Gui/ViewProviderDocumentObjectGroup.h>
#include <Mod/Drawing/DrawingGlobal.h>
namespace DrawingGui
@@ -63,7 +64,7 @@ public:
//@}
};
using ViewProviderDrawingViewPython = Gui::ViewProviderPythonFeatureT<ViewProviderDrawingView>;
using ViewProviderDrawingViewPython = Gui::ViewProviderFeaturePythonT<ViewProviderDrawingView>;
class DrawingGuiExport ViewProviderDrawingClip: public Gui::ViewProviderDocumentObjectGroup
{

2
src/Mod/Fem/App/FemAnalysis.cpp
View File

@@ -97,7 +97,7 @@ PROPERTY_SOURCE_TEMPLATE(Fem::FeaturePython, Fem::DocumentObject)
template<>
const char* Fem::FeaturePython::getViewProviderName() const
{
return "Gui::ViewProviderPythonFeature";
return "Gui::ViewProviderFeaturePython";
}
template<>
PyObject* Fem::FeaturePython::getPyObject()

2
src/Mod/Fem/Gui/ViewProviderAnalysis.cpp
View File

@@ -367,5 +367,5 @@ PROPERTY_SOURCE_TEMPLATE(FemGui::ViewProviderFemAnalysisPython, FemGui::ViewProv
/// @endcond
// explicit template instantiation
template class FemGuiExport ViewProviderPythonFeatureT<ViewProviderFemAnalysis>;
template class FemGuiExport ViewProviderFeaturePythonT<ViewProviderFemAnalysis>;
} // namespace Gui

4
src/Mod/Fem/Gui/ViewProviderAnalysis.h
View File

@@ -24,7 +24,7 @@
#define FEM_ViewProviderAnalysis_H
#include <Gui/ViewProviderDocumentObjectGroup.h>
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
#include <Mod/Fem/FemGlobal.h>
#include <QCoreApplication>
@@ -115,7 +115,7 @@ private:
ViewProviderFemHighlighter extension;
};
using ViewProviderFemAnalysisPython = Gui::ViewProviderPythonFeatureT<ViewProviderFemAnalysis>;
using ViewProviderFemAnalysisPython = Gui::ViewProviderFeaturePythonT<ViewProviderFemAnalysis>;
} // namespace FemGui

2
src/Mod/Fem/Gui/ViewProviderFemConstraint.cpp
View File

@@ -305,5 +305,5 @@ PROPERTY_SOURCE_TEMPLATE(FemGui::ViewProviderFemConstraintPython, FemGui::ViewPr
/// @endcond
// explicit template instantiation
template class FemGuiExport ViewProviderPythonFeatureT<ViewProviderFemConstraint>;
template class FemGuiExport ViewProviderFeaturePythonT<ViewProviderFemConstraint>;
} // namespace Gui

4
src/Mod/Fem/Gui/ViewProviderFemConstraint.h
View File

@@ -26,7 +26,7 @@
#define GUI_VIEWPROVIDERFEMCONSTRAINT_H
#include <Gui/ViewProviderGeometryObject.h>
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
#include <Mod/Fem/FemGlobal.h>
#include <Gui/ViewProviderSuppressibleExtension.h>
@@ -136,7 +136,7 @@ inline void ViewProviderFemConstraint::setRotateSymbol(bool rotate)
rotateSymbol = rotate;
}
using ViewProviderFemConstraintPython = Gui::ViewProviderPythonFeatureT<ViewProviderFemConstraint>;
using ViewProviderFemConstraintPython = Gui::ViewProviderFeaturePythonT<ViewProviderFemConstraint>;
} // namespace FemGui

2
src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
View File

@@ -3170,5 +3170,5 @@ PROPERTY_SOURCE_TEMPLATE(FemGui::ViewProviderFemMeshPython, FemGui::ViewProvider
/// @endcond
// explicit template instantiation
template class FemGuiExport ViewProviderPythonFeatureT<ViewProviderFemMesh>;
template class FemGuiExport ViewProviderFeaturePythonT<ViewProviderFemMesh>;
} // namespace Gui

4
src/Mod/Fem/Gui/ViewProviderFemMesh.h
View File

@@ -25,7 +25,7 @@
#include <Gui/ViewProviderBuilder.h>
#include <Gui/ViewProviderGeometryObject.h>
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
#include <Mod/Fem/FemGlobal.h>
class SoCoordinate3;
@@ -185,7 +185,7 @@ private:
class Private;
};
using ViewProviderFemMeshPython = Gui::ViewProviderPythonFeatureT<ViewProviderFemMesh>;
using ViewProviderFemMeshPython = Gui::ViewProviderFeaturePythonT<ViewProviderFemMesh>;
} // namespace FemGui

2
src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp
View File

@@ -51,6 +51,6 @@ PROPERTY_SOURCE_TEMPLATE(FemGui::ViewProviderFemMeshShapeBasePython,
FemGui::ViewProviderFemMeshShapeBase)
// explicit template instantiation
template class FemGuiExport ViewProviderPythonFeatureT<ViewProviderFemMeshShapeBase>;
template class FemGuiExport ViewProviderFeaturePythonT<ViewProviderFemMeshShapeBase>;
} // namespace Gui

4
src/Mod/Fem/Gui/ViewProviderFemMeshShape.h
View File

@@ -24,7 +24,7 @@
#ifndef FEM_ViewProviderFemMeshShape_H
#define FEM_ViewProviderFemMeshShape_H
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
#include "ViewProviderFemMesh.h"
@@ -58,7 +58,7 @@ public:
};
using ViewProviderFemMeshShapeBasePython =
Gui::ViewProviderPythonFeatureT<ViewProviderFemMeshShapeBase>;
Gui::ViewProviderFeaturePythonT<ViewProviderFemMeshShapeBase>;
} // namespace FemGui

2
src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h
View File

@@ -23,7 +23,7 @@
#ifndef FEM_VIEWPROVIDERFEMPOSTPIPELINE_H
#define FEM_VIEWPROVIDERFEMPOSTPIPELINE_H
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
#include <Mod/Fem/FemGlobal.h>
#include "ViewProviderFemPostObject.h"

2
src/Mod/Fem/Gui/ViewProviderResult.cpp
View File

@@ -46,5 +46,5 @@ PROPERTY_SOURCE_TEMPLATE(FemGui::ViewProviderResultPython, FemGui::ViewProviderR
/// @endcond
// explicit template instantiation
template class FemGuiExport ViewProviderPythonFeatureT<ViewProviderResult>;
template class FemGuiExport ViewProviderFeaturePythonT<ViewProviderResult>;
} // namespace Gui

4
src/Mod/Fem/Gui/ViewProviderResult.h
View File

@@ -25,7 +25,7 @@
#define FEM_ViewProviderResult_H
#include <Gui/ViewProviderDocumentObject.h>
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
#include <Mod/Fem/FemGlobal.h>
namespace FemGui
@@ -49,7 +49,7 @@ public:
}
};
using ViewProviderResultPython = Gui::ViewProviderPythonFeatureT<ViewProviderResult>;
using ViewProviderResultPython = Gui::ViewProviderFeaturePythonT<ViewProviderResult>;
} // namespace FemGui

2
src/Mod/Fem/Gui/ViewProviderSolver.cpp
View File

@@ -77,5 +77,5 @@ PROPERTY_SOURCE_TEMPLATE(FemGui::ViewProviderSolverPython, FemGui::ViewProviderS
/// @endcond
// explicit template instantiation
template class FemGuiExport ViewProviderPythonFeatureT<ViewProviderSolver>;
template class FemGuiExport ViewProviderFeaturePythonT<ViewProviderSolver>;
} // namespace Gui

4
src/Mod/Fem/Gui/ViewProviderSolver.h
View File

@@ -23,7 +23,7 @@
#ifndef FEM_ViewProviderSolver_H
#define FEM_ViewProviderSolver_H
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
#include <Mod/Fem/FemGlobal.h>
@@ -61,7 +61,7 @@ public:
bool canDelete(App::DocumentObject* obj) const override;
};
using ViewProviderSolverPython = Gui::ViewProviderPythonFeatureT<ViewProviderSolver>;
using ViewProviderSolverPython = Gui::ViewProviderFeaturePythonT<ViewProviderSolver>;
} // namespace FemGui

2
src/Mod/Mesh/Gui/ViewProviderPython.cpp
View File

@@ -33,5 +33,5 @@ PROPERTY_SOURCE_TEMPLATE(MeshGui::ViewProviderPython, MeshGui::ViewProviderMeshF
/// @endcond
// explicit template instantiation
template class MeshGuiExport ViewProviderPythonFeatureT<MeshGui::ViewProviderMeshFaceSet>;
template class MeshGuiExport ViewProviderFeaturePythonT<MeshGui::ViewProviderMeshFaceSet>;
} // namespace Gui

4
src/Mod/Mesh/Gui/ViewProviderPython.h
View File

@@ -24,13 +24,13 @@
#ifndef MESHGUI_VIEWPROVIDERPYTHON_H
#define MESHGUI_VIEWPROVIDERPYTHON_H
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
#include <Mod/Mesh/Gui/ViewProviderMeshFaceSet.h>
namespace MeshGui
{
using ViewProviderPython = Gui::ViewProviderPythonFeatureT<ViewProviderMeshFaceSet>;
using ViewProviderPython = Gui::ViewProviderFeaturePythonT<ViewProviderMeshFaceSet>;
} // namespace MeshGui

2
src/Mod/Part/Gui/ViewProvider2DObject.cpp
View File

@@ -346,5 +346,5 @@ PROPERTY_SOURCE_TEMPLATE(PartGui::ViewProvider2DObjectPython, PartGui::ViewProvi
/// @endcond
// explicit template instantiation
template class PartGuiExport ViewProviderPythonFeatureT<PartGui::ViewProvider2DObject>;
template class PartGuiExport ViewProviderFeaturePythonT<PartGui::ViewProvider2DObject>;
}

4
src/Mod/Part/Gui/ViewProvider2DObject.h
View File

@@ -26,7 +26,7 @@
#include "ViewProvider.h"
#include <App/PropertyUnits.h>
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
class TopoDS_Shape;
class TopoDS_Face;
@@ -98,7 +98,7 @@ private:
float MaxY;
};
using ViewProvider2DObjectPython = Gui::ViewProviderPythonFeatureT<ViewProvider2DObject>;
using ViewProvider2DObjectPython = Gui::ViewProviderFeaturePythonT<ViewProvider2DObject>;
} // namespace PartGui

4
src/Mod/Part/Gui/ViewProviderPython.cpp
View File

@@ -84,13 +84,13 @@ PROPERTY_SOURCE_TEMPLATE(PartGui::ViewProviderPython, PartGui::ViewProviderPart)
/// @endcond
// explicit template instantiation
template class PartGuiExport ViewProviderPythonFeatureT<PartGui::ViewProviderPart>;
template class PartGuiExport ViewProviderFeaturePythonT<PartGui::ViewProviderPart>;
/// @cond DOXERR
PROPERTY_SOURCE_TEMPLATE(PartGui::ViewProviderCustomPython, PartGui::ViewProviderCustom)
/// @endcond
// explicit template instantiation
template class PartGuiExport ViewProviderPythonFeatureT<PartGui::ViewProviderCustom>;
template class PartGuiExport ViewProviderFeaturePythonT<PartGui::ViewProviderCustom>;
}

6
src/Mod/Part/Gui/ViewProviderPython.h
View File

@@ -24,7 +24,7 @@
#ifndef PARTGUI_VIEWPROVIDERPYTHON_H
#define PARTGUI_VIEWPROVIDERPYTHON_H
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
#include <Mod/Part/Gui/ViewProvider.h>
namespace PartGui {
@@ -45,8 +45,8 @@ protected:
std::map<const App::Property*, Gui::ViewProvider*> propView;
};
using ViewProviderPython = Gui::ViewProviderPythonFeatureT<ViewProviderPart>;
using ViewProviderCustomPython = Gui::ViewProviderPythonFeatureT<ViewProviderCustom>;
using ViewProviderPython = Gui::ViewProviderFeaturePythonT<ViewProviderPart>;
using ViewProviderCustomPython = Gui::ViewProviderFeaturePythonT<ViewProviderCustom>;
} // namespace PartGui

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

@@ -314,6 +314,6 @@ PROPERTY_SOURCE_TEMPLATE(PartDesignGui::ViewProviderPython, PartDesignGui::ViewP
/// @endcond
// explicit template instantiation
template class PartDesignGuiExport ViewProviderPythonFeatureT<PartDesignGui::ViewProvider>;
template class PartDesignGuiExport ViewProviderFeaturePythonT<PartDesignGui::ViewProvider>;
}

4
src/Mod/PartDesign/Gui/ViewProvider.h
View File

@@ -26,7 +26,7 @@
#include <Mod/Part/Gui/ViewProvider.h>
#include "ViewProviderBody.h"
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
#include "Gui/ViewProviderSuppressibleExtension.h"
#include <Mod/Part/Gui/ViewProviderAttachExtension.h>
@@ -93,7 +93,7 @@ protected:
bool isSetTipIcon{false};
};
using ViewProviderPython = Gui::ViewProviderPythonFeatureT<ViewProvider>;
using ViewProviderPython = Gui::ViewProviderFeaturePythonT<ViewProvider>;
} // namespace PartDesignGui

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

@@ -440,5 +440,5 @@ std::vector<App::DocumentObject*> ViewProviderSubShapeBinder::claimChildren() co
namespace Gui {
PROPERTY_SOURCE_TEMPLATE(PartDesignGui::ViewProviderSubShapeBinderPython,
PartDesignGui::ViewProviderSubShapeBinder)
template class PartDesignGuiExport ViewProviderPythonFeatureT<ViewProviderSubShapeBinder>;
template class PartDesignGuiExport ViewProviderFeaturePythonT<ViewProviderSubShapeBinder>;
}

4
src/Mod/PartDesign/Gui/ViewProviderShapeBinder.h
View File

@@ -23,7 +23,7 @@
#ifndef PARTGUI_ViewProviderShapeBinder_H
#define PARTGUI_ViewProviderShapeBinder_H
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
#include <Mod/Part/Gui/ViewProvider.h>
#include <Mod/PartDesign/PartDesignGlobal.h>
@@ -84,7 +84,7 @@ private:
void updatePlacement(bool transaction);
};
using ViewProviderSubShapeBinderPython = Gui::ViewProviderPythonFeatureT<ViewProviderSubShapeBinder>;
using ViewProviderSubShapeBinderPython = Gui::ViewProviderFeaturePythonT<ViewProviderSubShapeBinder>;
} // namespace PartDesignGui

2
src/Mod/Points/Gui/ViewProvider.cpp
View File

@@ -670,7 +670,7 @@ PROPERTY_SOURCE_TEMPLATE(PointsGui::ViewProviderPython, PointsGui::ViewProviderS
/// @endcond
// explicit template instantiation
template class PointsGuiExport ViewProviderPythonFeatureT<PointsGui::ViewProviderScattered>;
template class PointsGuiExport ViewProviderFeaturePythonT<PointsGui::ViewProviderScattered>;
} // namespace Gui
// -------------------------------------------------

4
src/Mod/Points/Gui/ViewProvider.h
View File

@@ -27,7 +27,7 @@
#include <Gui/ViewProviderBuilder.h>
#include <Gui/ViewProviderGeometryObject.h>
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
#include <Mod/Points/PointsGlobal.h>
@@ -173,7 +173,7 @@ protected:
SoIndexedPointSet* pcPoints;
};
using ViewProviderPython = Gui::ViewProviderPythonFeatureT<ViewProviderScattered>;
using ViewProviderPython = Gui::ViewProviderFeaturePythonT<ViewProviderScattered>;
} // namespace PointsGui

4
src/Mod/Sketcher/Gui/ViewProviderPython.cpp
View File

@@ -88,12 +88,12 @@ PROPERTY_SOURCE_TEMPLATE(SketcherGui::ViewProviderPython, SketcherGui::ViewProvi
/// @endcond
// explicit template instantiation
template class SketcherGuiExport ViewProviderPythonFeatureT<SketcherGui::ViewProviderSketch>;
template class SketcherGuiExport ViewProviderFeaturePythonT<SketcherGui::ViewProviderSketch>;
/// @cond DOXERR
PROPERTY_SOURCE_TEMPLATE(SketcherGui::ViewProviderCustomPython, SketcherGui::ViewProviderCustom)
/// @endcond
// explicit template instantiation
template class SketcherGuiExport ViewProviderPythonFeatureT<SketcherGui::ViewProviderCustom>;
template class SketcherGuiExport ViewProviderFeaturePythonT<SketcherGui::ViewProviderCustom>;
} // namespace Gui

6
src/Mod/Sketcher/Gui/ViewProviderPython.h
View File

@@ -23,7 +23,7 @@
#ifndef SketcherGui_VIEWPROVIDERPYTHON_H
#define SketcherGui_VIEWPROVIDERPYTHON_H
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
#include <Mod/Sketcher/Gui/ViewProviderSketch.h>
@@ -46,8 +46,8 @@ protected:
std::map<const App::Property*, Gui::ViewProvider*> propView;
};
using ViewProviderPython = Gui::ViewProviderPythonFeatureT<ViewProviderSketch>;
using ViewProviderCustomPython = Gui::ViewProviderPythonFeatureT<ViewProviderCustom>;
using ViewProviderPython = Gui::ViewProviderFeaturePythonT<ViewProviderSketch>;
using ViewProviderCustomPython = Gui::ViewProviderFeaturePythonT<ViewProviderCustom>;
} // namespace SketcherGui

2
src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.cpp
View File

@@ -230,5 +230,5 @@ PROPERTY_SOURCE_TEMPLATE(SpreadsheetGui::ViewProviderSheetPython, SpreadsheetGui
/// @endcond
// explicit template instantiation
template class SpreadsheetGuiExport ViewProviderPythonFeatureT<ViewProviderSheet>;
template class SpreadsheetGuiExport ViewProviderFeaturePythonT<ViewProviderSheet>;
} // namespace Gui

4
src/Mod/Spreadsheet/Gui/ViewProviderSpreadsheet.h
View File

@@ -27,7 +27,7 @@
#include <QPointer>
#include <Gui/ViewProviderDocumentObject.h>
#include <Gui/ViewProviderPythonFeature.h>
#include <Gui/ViewProviderFeaturePython.h>
#include <Mod/Spreadsheet/SpreadsheetGlobal.h>
#include <Mod/Spreadsheet/Gui/SpreadsheetView.h>
@@ -90,7 +90,7 @@ private:
QPointer<SheetView> view;
};
using ViewProviderSheetPython = Gui::ViewProviderPythonFeatureT<ViewProviderSheet>;
using ViewProviderSheetPython = Gui::ViewProviderFeaturePythonT<ViewProviderSheet>;
} // namespace SpreadsheetGui