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

[TD]fix Win link error in ViewProvider extensions

Browse Source
This commit is contained in:
wandererfan
2023-01-02 10:46:58 -05:00
committed by WandererFan
parent 9498691ea8
commit d1cf5f9c88
6 changed files with 91 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.cpp
View File

@@ -23,7 +23,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QMessageBox>
#include <QMessageBox>
#endif
#include <App/Document.h>
@@ -34,8 +34,8 @@
#include <Mod/TechDraw/App/DrawPage.h>
#include <Mod/TechDraw/App/DrawTemplate.h>
#include "ViewProviderDrawingViewExtension.h"
#include "ViewProviderDrawingView.h"
#include "ViewProviderDrawingViewExtension.h"
#include "ViewProviderPage.h"
using namespace TechDrawGui;
@@ -47,41 +47,40 @@ ViewProviderDrawingViewExtension::ViewProviderDrawingViewExtension()
initExtensionType(ViewProviderDrawingViewExtension::getExtensionClassTypeId());
}
ViewProviderDrawingViewExtension::~ViewProviderDrawingViewExtension()
{
}
ViewProviderDrawingViewExtension::~ViewProviderDrawingViewExtension() {}
bool ViewProviderDrawingViewExtension::extensionCanDragObjects() const {
return true;
}
bool ViewProviderDrawingViewExtension::extensionCanDragObjects() const { return true; }
//we don't support dragging children of Views (Dimensions, Balloons, Hatches, etc) now, but we don't want another
//extension to drag our children and cause problems
bool ViewProviderDrawingViewExtension::extensionCanDragObject(App::DocumentObject* docObj) const {
bool ViewProviderDrawingViewExtension::extensionCanDragObject(App::DocumentObject* docObj) const
{
(void)docObj;
return true;
}
//the default drag will remove the object from the document until it is dropped and re-added, so we claim
//to do the dragging.
void ViewProviderDrawingViewExtension::extensionDragObject(App::DocumentObject* obj) {
(void)obj;
}
void ViewProviderDrawingViewExtension::extensionDragObject(App::DocumentObject* obj) { (void)obj; }
//we don't support dropping of new children of Views (Dimensions, Balloons, Hatches, etc) now, but we don't want another
//extension to try to drop on us and cause problems
bool ViewProviderDrawingViewExtension::extensionCanDropObjects() const {
return true;
bool ViewProviderDrawingViewExtension::extensionCanDropObjects() const { return true; }
//let the page have any drops we receive
bool ViewProviderDrawingViewExtension::extensionCanDropObject(App::DocumentObject* obj) const
{
return getViewProviderDrawingView()
->getViewProviderPage()
->getVPPExtension()
->extensionCanDropObject(obj);
}
//let the page have any drops we receive
bool ViewProviderDrawingViewExtension::extensionCanDropObject(App::DocumentObject* obj) const {
return getViewProviderDrawingView()->getViewProviderPage()->getVPPExtension()->extensionCanDropObject(obj);
}
//let the page have any drops we receive
void ViewProviderDrawingViewExtension::extensionDropObject(App::DocumentObject* obj) {
getViewProviderDrawingView()->getViewProviderPage()->getVPPExtension()->extensionDropObject(obj);
void ViewProviderDrawingViewExtension::extensionDropObject(App::DocumentObject* obj)
{
getViewProviderDrawingView()->getViewProviderPage()->getVPPExtension()->extensionDropObject(
obj);
}
const ViewProviderDrawingView* ViewProviderDrawingViewExtension::getViewProviderDrawingView() const
@@ -89,7 +88,7 @@ const ViewProviderDrawingView* ViewProviderDrawingViewExtension::getViewProvider
return dynamic_cast<const ViewProviderDrawingView*>(getExtendedViewProvider());
}
const char* ViewProviderDrawingViewExtension::whoAmI() const
const char* ViewProviderDrawingViewExtension::whoAmI() const
{
auto parent = getViewProviderDrawingView();
if (parent) {
@@ -98,11 +97,12 @@ const char* ViewProviderDrawingViewExtension::whoAmI() const
return nullptr;
}
namespace Gui {
EXTENSION_PROPERTY_SOURCE_TEMPLATE(ViewProviderDrawingViewExtensionPython, ViewProviderDrawingViewExtension)
namespace Gui
{
EXTENSION_PROPERTY_SOURCE_TEMPLATE(TechDrawGui::ViewProviderDrawingViewExtensionPython,
TechDrawGui::ViewProviderDrawingViewExtension)
// explicit template instantiation
template class GuiExport ViewProviderExtensionPythonT<ViewProviderDrawingViewExtension>;
}
template class TechDrawGuiExport
ViewProviderExtensionPythonT<TechDrawGui::ViewProviderDrawingViewExtension>;
}// namespace Gui

13
src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.h
View File

@@ -23,16 +23,16 @@
#ifndef TECHDRAWGUI_VIEWPROVIDERDRAWINGVIEWEXTENSION_H
#define TECHDRAWGUI_VIEWPROVIDERDRAWINGVIEWEXTENSION_H
#include <Mod/TechDraw/TechDrawGlobal.h>
#include <Gui/ViewProviderExtension.h>
#include <Gui/ViewProviderExtensionPy.h>
#include <Gui/ViewProviderExtensionPython.h>
#include <Mod/TechDraw/TechDrawGlobal.h>
namespace TechDrawGui
{
class ViewProviderDrawingView;
class TechDrawGuiExport ViewProviderDrawingViewExtension : public Gui::ViewProviderExtension
class TechDrawGuiExport ViewProviderDrawingViewExtension: public Gui::ViewProviderExtension
{
EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderDrawingViewExtension);
@@ -54,10 +54,9 @@ public:
private:
};
using ViewProviderDrawingViewExtensionPython = Gui::ViewProviderExtensionPythonT<ViewProviderDrawingViewExtension>;
} //namespace Gui
#endif // TECHDRAWGUI_VIEWPROVIDERDRAWINGVIEWEXTENSION_H
using ViewProviderDrawingViewExtensionPython =
Gui::ViewProviderExtensionPythonT<TechDrawGui::ViewProviderDrawingViewExtension>;
}// namespace TechDrawGui
#endif// TECHDRAWGUI_VIEWPROVIDERDRAWINGVIEWEXTENSION_H

55
src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp
View File

@@ -23,7 +23,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QMessageBox>
#include <QMessageBox>
#endif
#include <App/Document.h>
@@ -32,11 +32,11 @@
#include <Base/Tools.h>
#include <Mod/TechDraw/App/DrawPage.h>
#include <Mod/TechDraw/App/DrawTemplate.h>
#include <Mod/TechDraw/App/DrawProjGroupItem.h>
#include <Mod/TechDraw/App/DrawTemplate.h>
#include "ViewProviderPageExtension.h"
#include "ViewProviderPage.h"
#include "ViewProviderPageExtension.h"
using namespace TechDrawGui;
@@ -47,36 +47,30 @@ ViewProviderPageExtension::ViewProviderPageExtension()
initExtensionType(ViewProviderPageExtension::getExtensionClassTypeId());
}
ViewProviderPageExtension::~ViewProviderPageExtension()
{
}
ViewProviderPageExtension::~ViewProviderPageExtension() {}
bool ViewProviderPageExtension::extensionCanDragObjects() const {
return true;
}
bool ViewProviderPageExtension::extensionCanDragObjects() const { return true; }
//we don't want another extension to drag our objects, so we say that we can handle this object
bool ViewProviderPageExtension::extensionCanDragObject(App::DocumentObject* docObj) const {
(void) docObj;
bool ViewProviderPageExtension::extensionCanDragObject(App::DocumentObject* docObj) const
{
(void)docObj;
return true;
}
//we don't take any action on drags. everything is handling in drop
void ViewProviderPageExtension::extensionDragObject(App::DocumentObject* obj) {
(void) obj;
}
void ViewProviderPageExtension::extensionDragObject(App::DocumentObject* obj) { (void)obj; }
//we handle our own drops
bool ViewProviderPageExtension::extensionCanDropObjects() const {
return true;
}
bool ViewProviderPageExtension::extensionCanDropObjects() const { return true; }
bool ViewProviderPageExtension::extensionCanDropObject(App::DocumentObject* obj) const {
bool ViewProviderPageExtension::extensionCanDropObject(App::DocumentObject* obj) const
{
//only DrawView objects can live on pages (except special case Template)
if ( obj->isDerivedFrom(TechDraw::DrawView::getClassTypeId()) ) {
if (obj->isDerivedFrom(TechDraw::DrawView::getClassTypeId())) {
return true;
}
if ( obj->isDerivedFrom(TechDraw::DrawTemplate::getClassTypeId()) ) {
if (obj->isDerivedFrom(TechDraw::DrawTemplate::getClassTypeId())) {
//don't let another extension try to drop templates
return true;
}
@@ -84,8 +78,9 @@ bool ViewProviderPageExtension::extensionCanDropObject(App::DocumentObject* obj)
return false;
}
void ViewProviderPageExtension::extensionDropObject(App::DocumentObject* obj) {
if ( obj->isDerivedFrom(TechDraw::DrawView::getClassTypeId()) ) {
void ViewProviderPageExtension::extensionDropObject(App::DocumentObject* obj)
{
if (obj->isDerivedFrom(TechDraw::DrawView::getClassTypeId())) {
dropObject(obj);
return;
}
@@ -98,7 +93,7 @@ void ViewProviderPageExtension::dropObject(App::DocumentObject* docObj)
//DPGI can not be dropped onto the Page as it belongs to DPG, not Page
return;
}
if (docObj->isDerivedFrom(TechDraw::DrawView::getClassTypeId()) ) {
if (docObj->isDerivedFrom(TechDraw::DrawView::getClassTypeId())) {
auto dv = static_cast<TechDraw::DrawView*>(docObj);
if (dv->findParentPage()) {
dv->findParentPage()->removeView(dv);
@@ -116,7 +111,7 @@ const ViewProviderPage* ViewProviderPageExtension::getViewProviderPage() const
}
const char* ViewProviderPageExtension::whoAmI() const
const char* ViewProviderPageExtension::whoAmI() const
{
auto parent = getViewProviderPage();
if (parent) {
@@ -125,10 +120,12 @@ const char* ViewProviderPageExtension::whoAmI() const
return nullptr;
}
namespace Gui {
EXTENSION_PROPERTY_SOURCE_TEMPLATE(ViewProviderPageExtensionPython, ViewProviderPageExtension)
namespace Gui
{
EXTENSION_PROPERTY_SOURCE_TEMPLATE(TechDrawGui::ViewProviderPageExtensionPython,
TechDrawGui::ViewProviderPageExtension)
// explicit template instantiation
template class GuiExport ViewProviderExtensionPythonT<ViewProviderPageExtension>;
}
template class TechDrawGuiExport
ViewProviderExtensionPythonT<TechDrawGui::ViewProviderPageExtension>;
}// namespace Gui

12
src/Mod/TechDraw/Gui/ViewProviderPageExtension.h
View File

@@ -23,16 +23,16 @@
#ifndef TECHDRAWGUI_VIEWPROVIDERPAGEEXTENSION_H
#define TECHDRAWGUI_VIEWPROVIDERPAGEEXTENSION_H
#include <Mod/TechDraw/TechDrawGlobal.h>
#include <Gui/ViewProviderExtension.h>
#include <Gui/ViewProviderExtensionPy.h>
#include <Gui/ViewProviderExtensionPython.h>
#include <Mod/TechDraw/TechDrawGlobal.h>
namespace TechDrawGui
{
class ViewProviderPage;
class TechDrawGuiExport ViewProviderPageExtension : public Gui::ViewProviderExtension
class TechDrawGuiExport ViewProviderPageExtension: public Gui::ViewProviderExtension
{
EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderPageExtension);
@@ -56,9 +56,9 @@ public:
private:
};
using ViewProviderPageExtensionPython = Gui::ViewProviderExtensionPythonT<ViewProviderPageExtension>;
using ViewProviderPageExtensionPython =
Gui::ViewProviderExtensionPythonT<TechDrawGui::ViewProviderPageExtension>;
} //namespace Gui
#endif // TECHDRAWGUI_VIEWPROVIDERPAGEEXTENSION_H
}// namespace TechDrawGui
#endif// TECHDRAWGUI_VIEWPROVIDERPAGEEXTENSION_H

42
src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.cpp
View File

@@ -23,7 +23,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QMessageBox>
#include <QMessageBox>
#endif
#include <App/Document.h>
@@ -34,9 +34,9 @@
#include <Mod/TechDraw/App/DrawPage.h>
#include <Mod/TechDraw/App/DrawTemplate.h>
#include "ViewProviderTemplateExtension.h"
#include "ViewProviderTemplate.h"
#include "ViewProviderPage.h"
#include "ViewProviderTemplate.h"
#include "ViewProviderTemplateExtension.h"
using namespace TechDrawGui;
@@ -47,31 +47,27 @@ ViewProviderTemplateExtension::ViewProviderTemplateExtension()
initExtensionType(ViewProviderTemplateExtension::getExtensionClassTypeId());
}
ViewProviderTemplateExtension::~ViewProviderTemplateExtension()
{
}
ViewProviderTemplateExtension::~ViewProviderTemplateExtension() {}
//there are no child objects to drag currently, so we will say we handle any dragging rather than letting some
//other extension trying to drag and causing problems.
bool ViewProviderTemplateExtension::extensionCanDragObjects() const {
return true;
}
bool ViewProviderTemplateExtension::extensionCanDragObjects() const { return true; }
//there are no child objects to drag currently, so we will say we handle any dragging
bool ViewProviderTemplateExtension::extensionCanDragObject(App::DocumentObject* docObj) const {
(void) docObj;
bool ViewProviderTemplateExtension::extensionCanDragObject(App::DocumentObject* docObj) const
{
(void)docObj;
return true;
}
//templates do not accept drops, so rather that let some other extension try to drop into a template, we will
//claim that we can handle drops
bool ViewProviderTemplateExtension::extensionCanDropObjects() const {
return true;
}
bool ViewProviderTemplateExtension::extensionCanDropObjects() const { return true; }
//templates do not accept drops, so rather that let some other extension try to drop into a template, we will
//claim that we can handle drops
bool ViewProviderTemplateExtension::extensionCanDropObject(App::DocumentObject* docObj) const {
bool ViewProviderTemplateExtension::extensionCanDropObject(App::DocumentObject* docObj) const
{
(void)docObj;
return true;
}
@@ -81,7 +77,7 @@ const ViewProviderTemplate* ViewProviderTemplateExtension::getViewProviderTempla
return dynamic_cast<const ViewProviderTemplate*>(getExtendedViewProvider());
}
const char* ViewProviderTemplateExtension::whoAmI() const
const char* ViewProviderTemplateExtension::whoAmI() const
{
auto parent = getViewProviderTemplate();
if (parent) {
@@ -90,12 +86,12 @@ const char* ViewProviderTemplateExtension::whoAmI() const
return nullptr;
}
namespace Gui {
EXTENSION_PROPERTY_SOURCE_TEMPLATE(ViewProviderTemplateExtensionPython, ViewProviderTemplateExtension)
namespace Gui
{
EXTENSION_PROPERTY_SOURCE_TEMPLATE(TechDrawGui::ViewProviderTemplateExtensionPython,
TechDrawGui::ViewProviderTemplateExtension)
// explicit template instantiation
template class GuiExport ViewProviderExtensionPythonT<ViewProviderTemplateExtension>;
}
template class TechDrawGuiExport
ViewProviderExtensionPythonT<TechDrawGui::ViewProviderTemplateExtension>;
}// namespace Gui

14
src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.h
View File

@@ -23,16 +23,16 @@
#ifndef TECHDRAWGUI_VIEWPROVIDERTEMPLATEEXTENSION_H
#define TECHDRAWGUI_VIEWPROVIDERTEMPLATEEXTENSION_H
#include <Mod/TechDraw/TechDrawGlobal.h>
#include <Gui/ViewProviderExtension.h>
#include <Gui/ViewProviderExtensionPy.h>
#include <Gui/ViewProviderExtensionPython.h>
#include <Mod/TechDraw/TechDrawGlobal.h>
namespace TechDrawGui
{
class ViewProviderTemplate;
class TechDrawGuiExport ViewProviderTemplateExtension : public Gui::ViewProviderExtension
class TechDrawGuiExport ViewProviderTemplateExtension: public Gui::ViewProviderExtension
{
EXTENSION_PROPERTY_HEADER_WITH_OVERRIDE(Gui::ViewProviderTemplateExtension);
@@ -52,11 +52,9 @@ public:
private:
};
using ViewProviderTemplateExtensionPython = Gui::ViewProviderExtensionPythonT<ViewProviderTemplateExtension>;
} //namespace Gui
#endif // TECHDRAWGUI_VIEWPROVIDERTEMPLATEEXTENSION_H
using ViewProviderTemplateExtensionPython =
Gui::ViewProviderExtensionPythonT<TechDrawGui::ViewProviderTemplateExtension>;
}// namespace TechDrawGui
#endif// TECHDRAWGUI_VIEWPROVIDERTEMPLATEEXTENSION_H