Skip to content

Commit

Permalink
TD annotation: use more suitable properties
Browse files Browse the repository at this point in the history
- see https://forum.freecadweb.org/viewtopic.php?f=35&t=40608 for details
- also simplify tooltips
  • Loading branch information
donovaly authored and WandererFan committed Nov 4, 2019
1 parent 64cf85c commit 3a34cf1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
15 changes: 7 additions & 8 deletions src/Mod/TechDraw/App/DrawViewAnnotation.cpp
Expand Up @@ -63,16 +63,15 @@ DrawViewAnnotation::DrawViewAnnotation(void)
std::string fontName = hGrp->GetASCII("LabelFont", "osifont");
double defFontSize = hGrp->GetFloat("LabelSize", 5.0);

ADD_PROPERTY_TYPE(Text ,("Default Text"),vgroup,App::Prop_None,"The text to be displayed");
ADD_PROPERTY_TYPE(Font ,(fontName.c_str()),vgroup,App::Prop_None, "The name of the font to use");
ADD_PROPERTY_TYPE(TextColor,(0.0f,0.0f,0.0f),vgroup,App::Prop_None,"The color of the text");

ADD_PROPERTY_TYPE(TextSize,(defFontSize),vgroup,App::Prop_None,"The size of the text in units");
ADD_PROPERTY_TYPE(MaxWidth,(-1.0),vgroup,App::Prop_None,"The maximum width of the Annotation block");
ADD_PROPERTY_TYPE(LineSpace,(80),vgroup,App::Prop_None,"Line spacing adjustment. 100 is normal spacing.");
ADD_PROPERTY_TYPE(Text ,("Default Text"),vgroup,App::Prop_None,"Annotation text");
ADD_PROPERTY_TYPE(Font ,(fontName.c_str()),vgroup,App::Prop_None, "Font name");
ADD_PROPERTY_TYPE(TextColor,(0.0f,0.0f,0.0f),vgroup,App::Prop_None,"Text color");
ADD_PROPERTY_TYPE(TextSize,(defFontSize),vgroup,App::Prop_None,"Text size");
ADD_PROPERTY_TYPE(MaxWidth,(-1.0),vgroup,App::Prop_None,"Maximum width of the annotation block.\n -1 means no maximum width.");
ADD_PROPERTY_TYPE(LineSpace,(80),vgroup,App::Prop_None,"Line spacing in %. 100 means the height of a line.");

TextStyle.setEnums(TextStyleEnums);
ADD_PROPERTY(TextStyle, ((long)0));
ADD_PROPERTY_TYPE(TextStyle,((long)0),vgroup,App::Prop_None,"Text style");

Scale.setStatus(App::Property::Hidden,true);
ScaleType.setStatus(App::Property::Hidden,true);
Expand Down
4 changes: 2 additions & 2 deletions src/Mod/TechDraw/App/DrawViewAnnotation.h
Expand Up @@ -51,9 +51,9 @@ class TechDrawExport DrawViewAnnotation : public TechDraw::DrawView
App::PropertyFont Font;
App::PropertyColor TextColor;
App::PropertyLength TextSize;
App::PropertyInteger LineSpace;
App::PropertyPercent LineSpace;
App::PropertyEnumeration TextStyle; // Plain,Bold,Italic,Bold-Italic
App::PropertyFloat MaxWidth;
App::PropertyLength MaxWidth;

virtual QRectF getRect() const;

Expand Down

0 comments on commit 3a34cf1

Please sign in to comment.