electron-rare/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[TD]fix ScaleType change behaviour

Browse Source
This commit is contained in:
Wanderer Fan
2022-03-07 09:30:39 -05:00
committed by WandererFan
parent 7653a9473d
commit 5926060281
4 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Mod/TechDraw/App/DrawProjGroup.cpp
+5 -5
View File
@@ -143,15 +143,15 @@ void DrawProjGroup::onChanged(const App::Property* prop)
}
if (prop == &ScaleType) {
double newScale = getScale();
if (ScaleType.isValue("Automatic")) {
//Nothing in particular
} else if (ScaleType.isValue("Page")) {
newScale = page->Scale.getValue();
double newScale = page->Scale.getValue();
if(std::abs(getScale() - newScale) > FLT_EPSILON) {
Scale.setValue(newScale);
}
}
updateChildrenScale();
}
if (prop == &Rotation) {
if (!DrawUtil::fpCompare(Rotation.getValue(),0.0)) {
@@ -1008,8 +1008,8 @@ void DrawProjGroup::updateChildrenScale(void)
Base::Console().Log("PROBLEM - DPG::updateChildrenScale - non DPGI entry in Views! %s\n",
getNameInDocument());
throw Base::TypeError("Error: projection in DPG list is not a DPGI!");
} else if(view->Scale.getValue() != Scale.getValue()) {
view->Scale.setValue(Scale.getValue());
} else {
view->Scale.setValue(getScale());
view->recomputeFeature();
}
}
@@ -1063,7 +1063,7 @@ void DrawProjGroup::updateViews(void) {
auto view(dynamic_cast<DrawProjGroupItem *>(it));
if (view == nullptr) {
//if an element in Views is not a DPGI, something really bad has happened somewhere
Base::Console().Log("PROBLEM - DPG::updateChildrenScale - non DPGI entry in Views! %s\n",
Base::Console().Log("PROBLEM - DPG::updateViews - non DPGI entry in Views! %s\n",
getNameInDocument());
throw Base::TypeError("Error: projection in DPG list is not a DPGI!");
}