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

[TD] Use isProjectGroupItem() in remaining cases

Browse Source 
- isDerivedFrom<DrawProjGroupItem>() is no longer reliable due to smart
  view creation changes.
This commit is contained in:
wandererfan
2025-09-21 09:56:35 -04:00
committed by Chris Hennes
parent bbb15ea940
commit 3d7db8fb83
5 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/TechDraw/App/AppTechDrawPy.cpp
View File

@@ -572,7 +572,7 @@ private:
TopoDS_Shape shape = ShapeUtils::mirrorShape(gObj->getVisHard());
double offX = 0.0;
double offY = 0.0;
if (dvp->isDerivedFrom<TechDraw::DrawProjGroupItem>()) {
if (DrawView::isProjGroupItem(dvp)) {
TechDraw::DrawProjGroupItem* dpgi = static_cast<TechDraw::DrawProjGroupItem*>(dvp);
TechDraw::DrawProjGroup* dpg = dpgi->getPGroup();
if (dpg) {

6
src/Mod/TechDraw/App/DrawPagePyImp.cpp
View File

@@ -87,7 +87,8 @@ PyObject* DrawPagePy::getViews(PyObject* args)
Py::List ret;
for (auto v: allViews) {
if (v->isDerivedFrom<TechDraw::DrawProjGroupItem>()) {
auto dvp = freecad_cast<DrawViewPart*>(v);
if (dvp && DrawView::isProjGroupItem(dvp)) {
TechDraw::DrawProjGroupItem* dpgi = static_cast<TechDraw::DrawProjGroupItem*>(v);
ret.append(Py::asObject(new TechDraw::DrawProjGroupItemPy(dpgi)));
}
@@ -119,7 +120,8 @@ PyObject* DrawPagePy::getAllViews(PyObject* args)
Py::List ret;
for (auto v: allViews) {
if (v->isDerivedFrom<TechDraw::DrawProjGroupItem>()) {
auto dvp = freecad_cast<DrawViewPart*>(v);
if (dvp && DrawView::isProjGroupItem(dvp)) {
TechDraw::DrawProjGroupItem* dpgi = static_cast<TechDraw::DrawProjGroupItem*>(v);
ret.append(Py::asObject(new TechDraw::DrawProjGroupItemPy(dpgi)));
}

3
src/Mod/TechDraw/Gui/QGIProjGroup.cpp
View File

@@ -109,7 +109,8 @@ QVariant QGIProjGroup::itemChange(GraphicsItemChange change, const QVariant &val
QGIView* gView = dynamic_cast<QGIView *>(childItem);
if(gView) {
TechDraw::DrawView *fView = gView->getViewObject();
if(fView->isDerivedFrom<TechDraw::DrawProjGroupItem>()) {
auto dvp = freecad_cast<TechDraw::DrawViewPart*>(fView);
if (dvp && TechDraw::DrawView::isProjGroupItem(dvp)) {
auto *projItemPtr = static_cast<TechDraw::DrawProjGroupItem *>(fView);
QString type = QString::fromLatin1(projItemPtr->Type.getValueAsString());

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

@@ -32,6 +32,7 @@
using namespace TechDrawGui;
using namespace TechDraw;
EXTENSION_PROPERTY_SOURCE(TechDrawGui::ViewProviderPageExtension, Gui::ViewProviderExtension)
@@ -122,7 +123,8 @@ void ViewProviderPageExtension::extensionDropObject(App::DocumentObject* obj)
//this code used to live in ViewProviderPage
void ViewProviderPageExtension::dropObject(App::DocumentObject* obj)
{
if (obj->isDerivedFrom<TechDraw::DrawProjGroupItem>()) {
auto dvp = freecad_cast<TechDraw::DrawViewPart*>(obj);
if (dvp && DrawView::isProjGroupItem(dvp)) {
//DPGI can not be dropped onto the Page if it belongs to DPG
auto* dpgi = static_cast<TechDraw::DrawProjGroupItem*>(obj);
if (dpgi->getPGroup()) {

4
src/Mod/TechDraw/Gui/ViewProviderViewClip.cpp
View File

@@ -35,6 +35,7 @@
#include "QGIViewClip.h"
using namespace TechDrawGui;
using namespace TechDraw;
PROPERTY_SOURCE(TechDrawGui::ViewProviderViewClip, TechDrawGui::ViewProviderDrawingView)
@@ -123,7 +124,8 @@ void ViewProviderViewClip::dragObject(App::DocumentObject* docObj)
void ViewProviderViewClip::dropObject(App::DocumentObject* docObj)
{
if (docObj->isDerivedFrom<TechDraw::DrawProjGroupItem>()) {
auto dvp = freecad_cast<DrawViewPart*>(docObj);
if (dvp && DrawView::isProjGroupItem(dvp)) {
//DPGI can not be dropped onto the Page if it belongs to DPG
auto* dpgi = static_cast<TechDraw::DrawProjGroupItem*>(docObj);
if (dpgi->getPGroup()) {