diff --git a/doc/images/jkqtpxygraphlabels.png b/doc/images/jkqtpxygraphlabels.png deleted file mode 100644 index 69afd70824..0000000000 Binary files a/doc/images/jkqtpxygraphlabels.png and /dev/null differ diff --git a/doc/images/jkqtpxygraphlabelsmixin.png b/doc/images/jkqtpxygraphlabelsmixin.png new file mode 100644 index 0000000000..214ed53eb0 Binary files /dev/null and b/doc/images/jkqtpxygraphlabelsmixin.png differ diff --git a/doc/images/jkqtpxygraphlabels.svg b/doc/images/jkqtpxygraphlabelsmixin.svg similarity index 98% rename from doc/images/jkqtpxygraphlabels.svg rename to doc/images/jkqtpxygraphlabelsmixin.svg index 06f266338c..e9b9013bdf 100644 --- a/doc/images/jkqtpxygraphlabels.svg +++ b/doc/images/jkqtpxygraphlabelsmixin.svg @@ -7,9 +7,9 @@ id="svg3219" sodipodi:version="0.32" inkscape:version="1.1.2 (b8e25be833, 2022-02-05)" - sodipodi:docname="jkqtpxygraphlabels.svg" + sodipodi:docname="jkqtpxygraphlabelsmixin.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="C:\Jan\Programmieren\JKQtPlotter\doc\images\jkqtpxygraphlabels.png" + inkscape:export-filename="C:\Jan\Programmieren\JKQtPlotter\doc\images\jkqtpxygraphlabelsmixin.png" inkscape:export-xdpi="61.449596" inkscape:export-ydpi="61.449596" version="1.1" @@ -133,8 +133,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.2314489" - inkscape:cx="252.54803" - inkscape:cy="-73.084639" + inkscape:cx="252.54804" + inkscape:cy="-73.08464" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" diff --git a/lib/jkqtplotter/graphs/jkqtpgraphlabelstylemixin.h b/lib/jkqtplotter/graphs/jkqtpgraphlabelstylemixin.h index 5cba59c455..be89ca71f3 100644 --- a/lib/jkqtplotter/graphs/jkqtpgraphlabelstylemixin.h +++ b/lib/jkqtplotter/graphs/jkqtpgraphlabelstylemixin.h @@ -107,7 +107,7 @@ JKQTPLOTTER_LIB_EXPORT JKQTPGraphLabelBoxType String2JKQTPGraphLabelBoxType(cons - styling for the box around the label . - \image html jkqtpxygraphlabels.png + \image html jkqtpxygraphlabelsmixin.png \see JKQTPGraphTextStyleMixin, JKQTPGraphLineStyleMixin, JKQTPGraphFillStyleMixin, JKQTPXYGraphLabels */ @@ -241,22 +241,35 @@ protected: private: /** \brief offset of the box rectangle to the actual data point location [pt], this is used for simple boxes and is a rather close distance (e.g. JKQTPGLSimpleBox) + * + * \image html jkqtpxygraphlabelsmixin.png * * \see setLabelOffset(), getLabelOffset(), setLabelOffsetWithConnector(), getLabelOffsetWithConnector() */ double m_labelOffset; /** \brief offset of the box rectangle to the actual data point location [pt], this variant is used when a visible connector is shown (e.g. JKQTPGLSimpleBoxAndLine) + * + * \image html jkqtpxygraphlabelsmixin.png * * \see setLabelOffsetWithConnector(), getLabelOffsetWithConnector(), setLabelOffset(), getLabelOffset() */ double m_labelOffsetWithConnector; /** \brief rounding radius of the box rectangle (<=0 -> no rounded rectangle) [pt] */ double m_labelBoxRounding; - /** \brief padding in x-direction between label and surrounding box [pt] */ + /** \brief padding in x-direction between label and surrounding box [pt] + * + * \image html jkqtpxygraphlabelsmixin.png + */ double m_labelXPadding; - /** \brief padding in y-direction between label and surrounding box [pt] */ + /** \brief padding in y-direction between label and surrounding box [pt] * + * + * \image html jkqtpxygraphlabelsmixin.png + */ double m_labelYPadding; - /** \brief indicates whether to draw a frame around the box */ + /** \brief indicates whether to draw a frame around the box * + * + * \image html jkqtpxygraphlabelsmixin.png + */ bool m_drawLabelBoxFrame; /** \brief position of the label *