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

[TD]Allow balloons to be attached to non-part views

Browse Source
This commit is contained in:
wandererfan
2023-01-10 09:24:12 -05:00
committed by WandererFan
parent 12db3618df
commit 271e3c6b8a
15 changed files with 1491 additions and 1453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Mod/TechDraw/Gui/Command.cpp
View File

@@ -982,7 +982,7 @@ bool _checkDrawViewPartBalloon(Gui::Command* cmd)
return true;
}
bool _checkDirectPlacement(const QGIViewPart* viewPart, const std::vector<std::string>& subNames,
bool _checkDirectPlacement(const QGIView* view, const std::vector<std::string>& subNames,
QPointF& placement)
{
// Let's see, if we can help speed up the placement of the balloon:
@@ -997,6 +997,12 @@ bool _checkDirectPlacement(const QGIViewPart* viewPart, const std::vector<std::s
return false;
}
const QGIViewPart* viewPart = dynamic_cast<const QGIViewPart*>(view);
if (!viewPart) {
//not a view of a part, so no geometry to attach to
return false;
}
std::string geoType = TechDraw::DrawUtil::getGeomTypeFromName(subNames[0]);
if (geoType == "Vertex") {
int index = TechDraw::DrawUtil::getIndexFromName(subNames[0]);
@@ -1040,13 +1046,13 @@ void CmdTechDrawBalloon::activated(int iMsg)
bool result = _checkSelectionBalloon(this, 1);
if (!result)
return;
result = _checkDrawViewPartBalloon(this);
if (!result)
return;
// result = _checkDrawViewPartBalloon(this);
// if (!result)
// return;
std::vector<Gui::SelectionObject> selection = getSelection().getSelectionEx();
auto objFeat(dynamic_cast<TechDraw::DrawViewPart*>(selection[0].getObject()));
auto objFeat(dynamic_cast<TechDraw::DrawView*>(selection[0].getObject()));
if (!objFeat) {
return;
}
@@ -1054,23 +1060,21 @@ void CmdTechDrawBalloon::activated(int iMsg)
TechDraw::DrawPage* page = objFeat->findParentPage();
std::string PageName = page->getNameInDocument();
page->balloonParent = objFeat;
Gui::Document* guiDoc = Gui::Application::Instance->getDocument(page->getDocument());
ViewProviderPage* pageVP = dynamic_cast<ViewProviderPage*>(guiDoc->getViewProvider(page));
ViewProviderViewPart* partVP =
dynamic_cast<ViewProviderViewPart*>(guiDoc->getViewProvider(objFeat));
ViewProviderDrawingView* viewVP =
dynamic_cast<ViewProviderDrawingView*>(guiDoc->getViewProvider(objFeat));
if (pageVP && partVP) {
if (pageVP && viewVP) {
QGVPage* viewPage = pageVP->getQGVPage();
QGSPage* scenePage = pageVP->getQGSPage();
if (viewPage) {
viewPage->startBalloonPlacing();
viewPage->startBalloonPlacing(objFeat);
QGIViewPart* viewPart = dynamic_cast<QGIViewPart*>(partVP->getQView());
QGIView* view = dynamic_cast<QGIView*>(viewVP->getQView());
QPointF placement;
if (viewPart
&& _checkDirectPlacement(viewPart, selection[0].getSubNames(), placement)) {
if (view && _checkDirectPlacement(view, selection[0].getSubNames(), placement)) {
//this creates the balloon if something is already selected
scenePage->createBalloon(placement, objFeat);
}
}
@@ -1080,7 +1084,7 @@ void CmdTechDrawBalloon::activated(int iMsg)
bool CmdTechDrawBalloon::isActive()
{
bool havePage = DrawGuiUtil::needPage(this);
bool haveView = DrawGuiUtil::needView(this);
bool haveView = DrawGuiUtil::needView(this, false);
return (havePage && haveView);
}