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

[TechDraw] Fix area balloon placement for scale != 1

Browse Source
This commit is contained in:
pavltom
2023-11-25 19:43:13 +01:00
committed by WandererFan
parent b3fc34d61b
commit 2e45b3f856
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Mod/TechDraw/Gui/CommandExtensionPack.cpp
View File

@@ -1823,7 +1823,10 @@ void CmdTechDrawExtensionAreaAnnotation::activated(int iMsg)
double faceArea = faceProps.Mass();
totalArea += faceArea;
center += faceArea*TechDraw::DrawUtil::toVector3d(faceProps.CentreOfMass());
center += faceArea*DrawUtil::toVector3d(faceProps.CentreOfMass());
}
if (totalArea > 0.0) {
center /= totalArea;
}
// if area calculation was successful, start the command
@@ -1836,8 +1839,10 @@ void CmdTechDrawExtensionAreaAnnotation::activated(int iMsg)
if (!balloon)
throw Base::TypeError("CmdTechDrawNewBalloon - balloon not found\n");
// the balloon has been created successfully
// calculate needed variables
double scale = objFeat->getScale();
center = DrawUtil::invertY(center/scale);
double scale2 = scale * scale;
totalArea = totalArea / scale2;//convert from view scale to internal mm2
@@ -1853,19 +1858,15 @@ void CmdTechDrawExtensionAreaAnnotation::activated(int iMsg)
}
std::string sUserString = Base::Tools::toStdString(qUserString);
if (totalArea > 0.0) {
center /= totalArea;
}
// set the attributes in the data tab's fields
// balloon->SourceView.setValue(objFeat);
balloon->BubbleShape.setValue("Rectangle");
balloon->EndType.setValue("None");
balloon->KinkLength.setValue(0.0);
balloon->X.setValue(center.x);
balloon->Y.setValue(-center.y);
balloon->Y.setValue(center.y);
balloon->OriginX.setValue(center.x);
balloon->OriginY.setValue(-center.y);
balloon->OriginY.setValue(center.y);
balloon->ScaleType.setValue("Page");
balloon->Text.setValue(sUserString);
// look for the ballons's view provider