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

[TD]centralize balloon prefs

Browse Source
This commit is contained in:
wandererfan
2023-02-10 21:43:22 -05:00
committed by WandererFan
parent 7f2f5e9414
commit cd79b8744f
4 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,7 @@ DrawViewBalloon::DrawViewBalloon()
ADD_PROPERTY_TYPE(OriginY, (0), "", (App::PropertyType)(App::Prop_None), "Balloon origin y");
EndType.setEnums(ArrowPropEnum::ArrowTypeEnums);
ADD_PROPERTY_TYPE(EndType, (prefEnd()), "", (App::PropertyType)(App::Prop_None),
ADD_PROPERTY_TYPE(EndType, (Preferences::balloonArrow()), "", (App::PropertyType)(App::Prop_None),
"End symbol for the balloon line");
ADD_PROPERTY_TYPE(EndTypeScale, (1.0), "", (App::PropertyType)(App::Prop_None),
@@ -78,7 +78,7 @@ DrawViewBalloon::DrawViewBalloon()
EndTypeScale.setConstraints(&SymbolScaleRange);
BubbleShape.setEnums(balloonTypeEnums);
ADD_PROPERTY_TYPE(BubbleShape, (prefShape()), "", (App::PropertyType)(App::Prop_None),
ADD_PROPERTY_TYPE(BubbleShape, (Preferences::balloonShape()), "", (App::PropertyType)(App::Prop_None),
"Shape of the balloon bubble");
ADD_PROPERTY_TYPE(ShapeScale, (1.0), "", (App::PropertyType)(App::Prop_None),
@@ -88,7 +88,7 @@ DrawViewBalloon::DrawViewBalloon()
ADD_PROPERTY_TYPE(TextWrapLen, (-1), "", (App::PropertyType)(App::Prop_None),
"Text wrap length; -1 means no wrap");
ADD_PROPERTY_TYPE(KinkLength, (prefKinkLength()), "", (App::PropertyType)(App::Prop_None),
ADD_PROPERTY_TYPE(KinkLength, (Preferences::balloonKinkLength()), "", (App::PropertyType)(App::Prop_None),
"Distance from symbol to leader kink");
SourceView.setScope(App::LinkScope::Global);
@@ -222,28 +222,6 @@ void DrawViewBalloon::setOrigin(Base::Vector3d newOrigin)
origin = QPointF(newOrigin.x, newOrigin.y);
}
double DrawViewBalloon::prefKinkLength() const
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication()
.GetUserParameter()
.GetGroup("BaseApp")
->GetGroup("Preferences")
->GetGroup("Mod/TechDraw/Dimensions");
return hGrp->GetFloat("BalloonKink", 5.0);
}
int DrawViewBalloon::prefShape() const
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication()
.GetUserParameter()
.GetGroup("BaseApp")
->GetGroup("Preferences")
->GetGroup("Mod/TechDraw/Decorations");
return hGrp->GetInt("BalloonShape", 0);
}
int DrawViewBalloon::prefEnd() const { return Preferences::balloonArrow(); }
QPointF DrawViewBalloon::getOrigin()
{
double x = OriginX.getValue();

3
src/Mod/TechDraw/App/DrawViewBalloon.h
View File

@@ -78,9 +78,6 @@ public:
void handleXYLock() override;
double prefKinkLength() const;
int prefShape() const;
int prefEnd() const;
void setOrigin(Base::Vector3d newOrigin);
Base::Vector3d getOriginOffset() const;

20
src/Mod/TechDraw/App/Preferences.cpp
View File

@@ -242,6 +242,26 @@ int Preferences::balloonArrow()
return end;
}
double Preferences::balloonKinkLength()
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication()
.GetUserParameter()
.GetGroup("BaseApp")
->GetGroup("Preferences")
->GetGroup("Mod/TechDraw/Dimensions");
return hGrp->GetFloat("BalloonKink", 5.0);
}
int Preferences::balloonShape()
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication()
.GetUserParameter()
.GetGroup("BaseApp")
->GetGroup("Preferences")
->GetGroup("Mod/TechDraw/Decorations");
return hGrp->GetInt("BalloonShape", 0);
}
QString Preferences::defaultTemplate()
{
Base::Reference<ParameterGrp> hGrp = App::GetApplication()

2
src/Mod/TechDraw/App/Preferences.h
View File

@@ -63,6 +63,8 @@ public:
static int lineGroup();
static int balloonArrow();
static double balloonKinkLength();
static int balloonShape();
static QString defaultTemplate();
static QString defaultTemplateDir();