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

[TechDraw] Improve readability of DrawViewBalloon.cpp

Browse Source
This commit is contained in:
Benjamin Bræstrup Sayoc
2022-07-16 22:46:00 +02:00
committed by WandererFan
parent 86ec5d0a09
commit 0072e423b8
1 changed files with 15 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/Mod/TechDraw/App/DrawViewBalloon.cpp
View File

@@ -199,45 +199,27 @@ void DrawViewBalloon::handleChangedPropertyType(Base::XMLReader &reader, const c
short DrawViewBalloon::mustExecute() const
{
bool result = 0;
if (!isRestoring()) {
result = Text.isTouched();
}
if (result) {
return result;
if (!isRestoring() && Text.isTouched()) {
return 1;
}
auto dvp = getViewPart();
if (dvp) {
result = dvp->isTouched();
}
if (result) {
return result;
if (dvp && dvp->isTouched()) {
return 1;
}
return DrawView::mustExecute();
}
void DrawViewBalloon::handleXYLock(void) {
if (isLocked()) {
if (!OriginX.testStatus(App::Property::ReadOnly)) {
OriginX.setStatus(App::Property::ReadOnly, true);
OriginX.purgeTouched();
}
if (!OriginY.testStatus(App::Property::ReadOnly)) {
OriginY.setStatus(App::Property::ReadOnly, true);
OriginY.purgeTouched();
}
} else {
if (OriginX.testStatus(App::Property::ReadOnly)) {
OriginX.setStatus(App::Property::ReadOnly, false);
OriginX.purgeTouched();
}
if (OriginY.testStatus(App::Property::ReadOnly)) {
OriginY.setStatus(App::Property::ReadOnly, false);
OriginY.purgeTouched();
}
bool on = isLocked();
if (!OriginX.testStatus(App::Property::ReadOnly)) {
OriginX.setStatus(App::Property::ReadOnly, on);
OriginX.purgeTouched();
}
if (!OriginY.testStatus(App::Property::ReadOnly)) {
OriginY.setStatus(App::Property::ReadOnly, on);
OriginY.purgeTouched();
}
DrawView::handleXYLock();
}
@@ -269,16 +251,14 @@ double DrawViewBalloon::prefKinkLength(void) const
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter().
GetGroup("BaseApp")->GetGroup("Preferences")->
GetGroup("Mod/TechDraw/Dimensions");
double length = hGrp->GetFloat("BalloonKink", 5.0);
return length;
return hGrp->GetFloat("BalloonKink", 5.0);
}
int DrawViewBalloon::prefShape(void) const
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Decorations");
int result = hGrp->GetInt("BalloonShape", 0);
return result;
return hGrp->GetInt("BalloonShape", 0);
}
int DrawViewBalloon::prefEnd(void) const
@@ -290,8 +270,7 @@ QPointF DrawViewBalloon::getOrigin()
{
double x = OriginX.getValue();
double y = OriginY.getValue();
QPointF result(x, y);
return result;
return QPointF(x, y);
}
void DrawViewBalloon::setOrigin(QPointF p)