From bfecd1359b5cdf153d91448ee7afe77be71f1779 Mon Sep 17 00:00:00 2001 From: Wanderer Fan Date: Sun, 22 May 2022 12:05:32 -0400 Subject: [PATCH] [TD]fix checkFit to use current scale --- src/Mod/TechDraw/App/DrawView.cpp | 7 +++---- src/Mod/TechDraw/TechDrawTools/TDToolsMovers.py | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawView.cpp b/src/Mod/TechDraw/App/DrawView.cpp index c5be0e92f7..47c4887586 100644 --- a/src/Mod/TechDraw/App/DrawView.cpp +++ b/src/Mod/TechDraw/App/DrawView.cpp @@ -388,7 +388,6 @@ bool DrawView::checkFit(void) const } //!check if View is too big for page -//should check if unscaled rect is too big for page bool DrawView::checkFit(TechDraw::DrawPage* p) const { bool result = true; @@ -396,12 +395,12 @@ bool DrawView::checkFit(TechDraw::DrawPage* p) const double width = 0.0; double height = 0.0; - QRectF viewBox = getRect(); //rect is scaled + QRectF viewBox = getRect(); //rect is scaled if (!viewBox.isValid()) { result = true; } else { - width = viewBox.width() / getScale(); //unscaled rect w x h - height = viewBox.height() / getScale(); + width = viewBox.width(); //scaled rect w x h + height = viewBox.height(); width *= fudge; height *= fudge; if ( (width > p->getPageWidth()) || diff --git a/src/Mod/TechDraw/TechDrawTools/TDToolsMovers.py b/src/Mod/TechDraw/TechDrawTools/TDToolsMovers.py index a88c088ccd..0bbed0af1a 100644 --- a/src/Mod/TechDraw/TechDrawTools/TDToolsMovers.py +++ b/src/Mod/TechDraw/TechDrawTools/TDToolsMovers.py @@ -36,8 +36,7 @@ def simpleViewMove(view, fromPage, toPage, copy): for d in deps: toPage.addView(d) - view.recompute() #update the view feature - App.ActiveDocument.recompute() #update views dependents if necessary + App.ActiveDocument.recompute() #update views & dependents if necessary return #move a section view, its Base View and all its dependents (items, dimensions, balloons, etc) of both from fromPage to toPage