diff --git a/doc/dox/jkqtplotter_plotelements_classdoc.dox b/doc/dox/jkqtplotter_plotelements_classdoc.dox index 61db3d6c24..b2df8f2521 100644 --- a/doc/dox/jkqtplotter_plotelements_classdoc.dox +++ b/doc/dox/jkqtplotter_plotelements_classdoc.dox @@ -41,6 +41,21 @@ These classes are used by JKQTPlotterBase to output the plot. \ingroup jkqtplotter_concretegraphs This group assembles graphs that show their data with symbols and optionally with connecting lines in diferent styles: + + + + +
Screenshot + Classes +
\image html symbols_and_styles_small.png + JKQTPXYLineGraph, JKQTPXYLineErrorGraph +
\image html stepplots_small.png + JKQTPSpecialLineHorizontalGraph, JKQTPSpecialLineVerticalGraph +
+ +\defgroup jkqtplotter_linesymbolgraphs_scatter Scatter Graphs +\ingroup jkqtplotter_linesymbolgraphs + - - -
Screenshot @@ -51,27 +66,16 @@ This group assembles graphs that show their data with symbols and optionally wit
\image html JKQTPXYScatterGraph_small.png JKQTPXYScatterGraph, JKQTPXYScatterErrorGraph -
\image html symbols_and_styles_small.png - JKQTPXYLineGraph, JKQTPXYLineErrorGraph -
\image html paramscatterplot_small.png - JKQTPXYParametrizedScatterGraph, JKQTPXYParametrizedErrorScatterGraph -
\image html stepplots_small.png - JKQTPSpecialLineHorizontalGraph, JKQTPSpecialLineVerticalGraph
-\defgroup jkqtplotter_linesymbolgraphs_simple Basic Line/Scatter Graphs + +\defgroup jkqtplotter_linesymbolgraphs_line Line Graphs \ingroup jkqtplotter_linesymbolgraphs -
Screenshot Classes -
\image html beeswarmplot_small.png - JKQTPSingleColumnSymbolsGraph
\image html symbols_and_styles_small.png JKQTPXYLineGraph, JKQTPXYLineErrorGraph @@ -81,7 +85,7 @@ This group assembles graphs that show their data with symbols and optionally wit
-\defgroup jkqtplotter_linesymbolgraphs_param Parametrized Line/Scatter Graphs +\defgroup jkqtplotter_linesymbolgraphs_param Bubble Charts / Parametrized Scatter Graphs \ingroup jkqtplotter_linesymbolgraphs @@ -93,6 +97,25 @@ This group assembles graphs that show their data with symbols and optionally wit
JKQTPXYParametrizedScatterGraph, JKQTPXYParametrizedErrorScatterGraph
+\defgroup jkqtplotter_functiongraphs Function Graphs +\ingroup jkqtplotter_linesymbolgraphs + + + + + + +
Screenshot + Classes +
\image html functionplot_small.png + JKQTPXFunctionLineGraph, JKQTPYFunctionLineGraph +
\image html functionplot_small.png + JKQTPXParsedFunctionLineGraph, JKQTPYParsedFunctionLineGraph +
\image html evalcurve_small.png + JKQTPXYFunctionLineGraph +
+ + \defgroup jkqtplotter_filledgraphs Filled Polygon/Area Graphs \ingroup jkqtplotter_concretegraphs @@ -111,34 +134,7 @@ This group assembles graphs that show their data with symbols and optionally wit JKQTPFilledVerticalRangeGraph, JKQTPFilledHorizontalRangeGraph -\defgroup jkqtplotter_functiongraphs Function Graphs -\ingroup jkqtplotter_linesymbolgraphs - - - - - -
Screenshot - Classes -
\image html functionplot_small.png - JKQTPXFunctionLineGraph, JKQTPYFunctionLineGraph -
\image html evalcurve_small.png - JKQTPXYFunctionLineGraph -
- -\defgroup jkqtplotter_parsedFgraphs Parsed Function Graphs -\ingroup jkqtplotter_linesymbolgraphs - - - - -
Screenshot - Classes -
\image html functionplot_small.png - JKQTPXParsedFunctionLineGraph, JKQTPYParsedFunctionLineGraph -
- -\defgroup jkqtplotter_barssticks Barcharts, Impulse-Charts, ... +\defgroup jkqtplotter_barcharts Barcharts \ingroup jkqtplotter_concretegraphs @@ -162,6 +158,22 @@ This group assembles graphs that show their data with symbols and optionally wit
JKQTPImpulsesHorizontalErrorGraph, JKQTPImpulsesVerticalErrorGraph
+\defgroup jkqtplotter_sticks Impulse-Charts +\ingroup jkqtplotter_concretegraphs + + + + + + +
Screenshot + Classes +
\image html JKQTPImpulsesVerticalGraph_Symbols_small.png + JKQTPImpulsesHorizontalGraph, JKQTPImpulsesVerticalGraph +
\image html JKQTPImpulsesVerticalErrorGraph_small.png + JKQTPImpulsesHorizontalErrorGraph, JKQTPImpulsesVerticalErrorGraph +
+ \defgroup jkqtplotter_statgraphs Statistical Graphs (e.g. Boxplots ...) \ingroup jkqtplotter_concretegraphs @@ -172,10 +184,13 @@ This group assembles graphs that show their data with symbols and optionally wit \image html boxplot_small.png JKQTPBoxplotVerticalGraph, JKQTPBoxplotHorizontalGraph + + \image html geo_boxplot_small.png + JKQTPBoxplotVerticalElement, JKQTPBoxplotHorizontalElement \image html JKQTPViolinplotVerticalElement_small.png JKQTPViolinplotVerticalElement, JKQTPViolinplotHorizontalElement - + /table> \see \ref jkqtptools_math_statistics_adaptors for shortcuts to calculate statistical properties of data and then adding a plot with the results. @@ -244,7 +259,7 @@ Examples: - \ref JKQTPlotterGeometricGraphs . -\defgroup jkqtplotter_diverse Diverse Other Graphs (Ranges, ...) +\defgroup jkqtplotter_eventgraphs Event Graphs \ingroup jkqtplotter_concretegraphs @@ -254,12 +269,6 @@ Examples: - -
\image html JKQTPPeakStreamGraphY_small.png JKQTPPeakStreamGraph -
\image html geo_boxplot_small.png - JKQTPBoxplotVerticalElement, JKQTPBoxplotHorizontalElement -
\image html JKQTPViolinplotVerticalElement_small.png - JKQTPViolinplotVerticalElement, JKQTPViolinplotHorizontalElement
\defgroup jkqtplotter_imagelots Matrix/Image Plotting @@ -284,9 +293,6 @@ Examples: \image html overlayimageenhanced_small.png JKQTPOverlayImageEnhanced, JKQTPColumnOverlayImageEnhanced - - \image html JKQTPColumnContourPlot_small.png - JKQTPContourPlot, JKQTPColumnContourPlot \defgroup jkqtplotter_imagelots_elements Image Graphs @@ -330,7 +336,7 @@ Examples: \ingroup jkqtplotter_imagelots_tools \defgroup jkqtplotter_imagelots_contour Contour Graphs (based on Image Data) -\ingroup jkqtplotter_imagelots +\ingroup jkqtplotter_concretegraphs diff --git a/lib/jkqtplotter/graphs/jkqtpbarchart.h b/lib/jkqtplotter/graphs/jkqtpbarchart.h index e28f3e794a..80576f813a 100644 --- a/lib/jkqtplotter/graphs/jkqtpbarchart.h +++ b/lib/jkqtplotter/graphs/jkqtpbarchart.h @@ -33,7 +33,7 @@ /*! \brief This implements a bar graph with bars starting at \f$ yoverride \f$ to \f$ y=f(x) \f$ - \ingroup jkqtplotter_barssticks + \ingroup jkqtplotter_barcharts This class plots a bargraph. This image explains the parameters: @@ -57,10 +57,21 @@ \image html JKQTPBarVerticalGraphTwoColorFilling.png - You can use JKQTPlotter::addHorizontalBargraph() to add a series of bargraphs, where the width and shift are determined - automatically. The y-columns are given as a QVector to this function. + If you use JKQTPBarGraphBase::FillMode::FunctorFilling you can specify the fill style by a functor, e.g. + \code + graph->setFillMode(JKQTPBarGraphBase::FillMode::FunctorFilling); + graph->setFillBrushFunctor( + [](double key, double value) { + return QBrush(QColor::fromHsvF(key/12.0, 1.0, 1.0)); + } + ); + \endcode - \see JKQTPBarHorizontalGraph, \ref JKQTPlotterBarcharts, jkqtpstatAddHHistogram1D(), jkqtpstatAddHHistogram1DAutoranged() + The result may look like this: + + \image html JKQTPBarVerticalGraphFunctorFilling.png + + \see JKQTPBarHorizontalGraph, \ref JKQTPlotterBarcharts, jkqtpstatAddHHistogram1D(), jkqtpstatAddHHistogram1DAutoranged() */ class JKQTPLOTTER_LIB_EXPORT JKQTPBarVerticalGraph: public JKQTPBarGraphBase { Q_OBJECT @@ -96,7 +107,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBarVerticalGraph: public JKQTPBarGraphBase { /*! \brief This implements a bar graph with bars starting at \f$ yoverride \f$ to \f$ y=f(x) \f$ * and error indicator - * \ingroup jkqtplotter_barssticks + * \ingroup jkqtplotter_barcharts * * This works much the same as JKQTPBarHorizontalGraph. Here is an example output: * \image html JKQTPBarVerticalErrorGraph.png @@ -154,7 +165,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBarVerticalErrorGraph: public JKQTPBarVertical /*! \brief This implements a bar graph with bars starting at \f$ xoverride \f$ to \f$ x=f(y) \f$ - \ingroup jkqtplotter_barssticks + \ingroup jkqtplotter_barcharts This works much the same as JKQTPBarHorizontalGraph. Here is an example output: @@ -165,6 +176,21 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBarVerticalErrorGraph: public JKQTPBarVertical \image html JKQTPBarHorizontalGraphTwoColorFilling.png + If you use JKQTPBarGraphBase::FillMode::FunctorFilling you can specify the fill style by a functor, e.g. + \code + graph->setFillMode(JKQTPBarGraphBase::FillMode::FunctorFilling); + graph->setFillBrushFunctor( + [](double key, double value) { + return QBrush(QColor::fromHsvF(key/12.0, 1.0, 1.0)); + } + ); + \endcode + + The result may look like this: + + \image html JKQTPBarHorizontalGraphFunctorFilling.png + + \see \ref JKQTPlotterBarcharts, jkqtpstatAddVHistogram1D(), jkqtpstatAddVHistogram1DAutoranged() */ class JKQTPLOTTER_LIB_EXPORT JKQTPBarHorizontalGraph: public JKQTPBarGraphBase { @@ -208,7 +234,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBarHorizontalGraph: public JKQTPBarGraphBase { /*! \brief This implements a bar graph with bars starting at \f$ xoverride \f$ to \f$ x=f(y) \f$ * and error indicator - * \ingroup jkqtplotter_barssticks + * \ingroup jkqtplotter_barcharts * * This works much the same as JKQTPBarHorizontalGraph. Here is an example output: * \image html JKQTPBarHorizontalErrorGraph.png @@ -277,9 +303,10 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBarHorizontalErrorGraph: public JKQTPBarHorizo /*! \brief This implements a bar graph with bars starting at \f$ yoverride \f$ to \f$ y=f(x) \f$ * Optionally several graphs of this type may be stacked on top of each other - * \ingroup jkqtplotter_barssticks + * \ingroup jkqtplotter_barcharts * * Draw stacked barcharts by connecting several plots by calling \c setStackedParent(belowPlot) for each plot + * * \image html JKQTPBarVerticalGraphStacked.png * * \see JKQTPBarVerticalGraph, \ref JKQTPlotterStackedBarChart @@ -325,9 +352,10 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBarVerticalStackableGraph: public JKQTPBarVert /*! \brief This implements a bar graph with bars starting at \f$ yoverride \f$ to \f$ y=f(x) \f$ * Optionally several graphs of this type may be stacked on top of each other - * \ingroup jkqtplotter_barssticks + * \ingroup jkqtplotter_barcharts * * Draw stacked barcharts by connecting several plots by calling \c setStackedParent(belowPlot) for each plot + * * \image html JKQTPBarHorizontalGraphStacked.png * * diff --git a/lib/jkqtplotter/graphs/jkqtpbarchartbase.h b/lib/jkqtplotter/graphs/jkqtpbarchartbase.h index 9ebf6c5675..4f506add23 100644 --- a/lib/jkqtplotter/graphs/jkqtpbarchartbase.h +++ b/lib/jkqtplotter/graphs/jkqtpbarchartbase.h @@ -31,7 +31,7 @@ /** \brief This is a base-class for all bar graphs with vertical or horizontal orientation (the orientation is implemented in dervied classes!) - * \ingroup jkqtplotter_barssticks + * \ingroup jkqtplotter_barcharts * * This class plots a bargraph. This image explains the parameters: * @@ -49,12 +49,12 @@ * * \image html JKQTPBarVerticalGraph.png * - * You can also set FillMode::TwoColorFilling, which uses different fill styles for bars above and below + * You can also set JKQTPBarGraphBase::FillMode::TwoColorFilling, which uses different fill styles for bars above and below * the baseline of the graph: * * \image html JKQTPBarVerticalGraphTwoColorFilling.png * - * If you use FillMode::FunctorFilling you can specify the fill style by a functor, e.g. + * If you use JKQTPBarGraphBase::FillMode::FunctorFilling you can specify the fill style by a functor, e.g. * \code * graph->setFillMode(JKQTPBarGraphBase::FillMode::FunctorFilling); * graph->setFillBrushFunctor( diff --git a/lib/jkqtplotter/graphs/jkqtpboxplot.h b/lib/jkqtplotter/graphs/jkqtpboxplot.h index debb8a9fc2..4d2c6b7c82 100644 --- a/lib/jkqtplotter/graphs/jkqtpboxplot.h +++ b/lib/jkqtplotter/graphs/jkqtpboxplot.h @@ -178,7 +178,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBoxplotHorizontalGraph: public JKQTPBoxplotGra /*! \brief This implements a single vertical (notched) boxplot as a "geometric element", where the data is directly given to the object and not stored in a column, as in JKQTPBoxplotVerticalGraph \ingroup jkqtplotter_statgraphs - \ingroup jkqtplotter_diverse + \ingroup jkqtplotter_statgraphs @@ -232,7 +232,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBoxplotVerticalElement: public JKQTPBoxplotEle /*! \brief This implements a horizontal (notched) boxplot where the data is directly given to the object and not stored in a column, as in JKQTPBoxplotVerticalGraph \ingroup jkqtplotter_statgraphs - \ingroup jkqtplotter_diverse + \ingroup jkqtplotter_statgraphs the x position is given in pos. All other data are given in the median, min, max, percentile25 and percentile75. diff --git a/lib/jkqtplotter/graphs/jkqtpboxplotbase.h b/lib/jkqtplotter/graphs/jkqtpboxplotbase.h index afc8597bb5..fe4d46000e 100644 --- a/lib/jkqtplotter/graphs/jkqtpboxplotbase.h +++ b/lib/jkqtplotter/graphs/jkqtpboxplotbase.h @@ -181,7 +181,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBoxplotGraphBase: public JKQTPGraph, public JK /** \brief Tbaseclass for a single (notched) boxplot as a "geometric element", * where the data is directly given to the object and not stored in a column, as in JKQTPBoxplotGraphBase * \ingroup jkqtplotter_statgraphs - * \ingroup jkqtplotter_diverse + * \ingroup jkqtplotter_statgraphs * * The different features of a boxplot are: * diff --git a/lib/jkqtplotter/graphs/jkqtpfilledcurve.h b/lib/jkqtplotter/graphs/jkqtpfilledcurve.h index 8e6c231707..8905e6dc0d 100644 --- a/lib/jkqtplotter/graphs/jkqtpfilledcurve.h +++ b/lib/jkqtplotter/graphs/jkqtpfilledcurve.h @@ -31,7 +31,7 @@ /** \brief a Base class for filled curve graphs like e.g. JKQTPFilledCurveXGraph - * \ingroup jkqtplotter_linesymbolgraphs_simple + * \ingroup jkqtplotter_filledgraphs * * \image html filledgraphs.png * diff --git a/lib/jkqtplotter/graphs/jkqtpimpulses.h b/lib/jkqtplotter/graphs/jkqtpimpulses.h index ea724ebcc1..0ee7b84efb 100644 --- a/lib/jkqtplotter/graphs/jkqtpimpulses.h +++ b/lib/jkqtplotter/graphs/jkqtpimpulses.h @@ -28,7 +28,7 @@ /** \brief This is a base class for all impulse graphs - * \ingroup jkqtplotter_barssticks + * \ingroup jkqtplotter_sticks * * \image html JKQTPImpulsesVerticalGraph.png * @@ -76,7 +76,7 @@ protected: /** \brief This implements an impulse plot with horizontal impulses in direction of the X axis (i.e. from x=0 to x=f(y) ) - * \ingroup jkqtplotter_barssticks + * \ingroup jkqtplotter_sticks * * \image html JKQTPImpulsesHorizontalGraph.png * @@ -117,7 +117,7 @@ protected: /** \brief This implements an impulse plot with horizontal impulses in direction of the X axis (i.e. from x=0 to x=f(y) ) - * \ingroup jkqtplotter_barssticks + * \ingroup jkqtplotter_sticks * * \image html JKQTPImpulsesHorizontalErrorGraph.png * @@ -169,7 +169,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPImpulsesHorizontalErrorGraph: public JKQTPImpu /*! \brief This implements an impulse plot with impulses in direction of the Y axis (i.e. from y=0 to y=f(x) ) - \ingroup jkqtplotter_barssticks + \ingroup jkqtplotter_sticks \image html JKQTPImpulsesVerticalGraph.png \image html JKQTPImpulsesVerticalGraph_Symbols.png "generated by setting setDrawSymbols(true)" @@ -197,7 +197,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPImpulsesVerticalGraph: public JKQTPImpulsesGra /*! \brief This implements an impulse plot with impulses in direction of the X axis (i.e. from x=0 to x=f(y) ) - \ingroup jkqtplotter_barssticks + \ingroup jkqtplotter_sticks \image html JKQTPImpulsesVerticalErrorGraph.png diff --git a/lib/jkqtplotter/graphs/jkqtplines.h b/lib/jkqtplotter/graphs/jkqtplines.h index bca1a34d20..d9fbc24eab 100644 --- a/lib/jkqtplotter/graphs/jkqtplines.h +++ b/lib/jkqtplotter/graphs/jkqtplines.h @@ -47,7 +47,7 @@ class JKQTPDatastore; /*! \brief This implements xy line plots. This also alows to draw symbols at the data points. - \ingroup jkqtplotter_linesymbolgraphs_simple + \ingroup jkqtplotter_linesymbolgraphs_line \image html JKQTPXYLineGraph.png @@ -101,7 +101,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPXYLineGraph: public JKQTPXYGraph, public JKQTP /*! \brief This implements xy line plots with x and y error indicators. - \ingroup jkqtplotter_linesymbolgraphs_simple + \ingroup jkqtplotter_linesymbolgraphs_line \image html JKQTPXYLineErrorGraph_JKQTPErrorBars.png "setYErrorStyle(JKQTPErrorBars)" \image html JKQTPXYLineErrorGraph_JKQTPErrorLines.png "setYErrorStyle(JKQTPErrorLines)" diff --git a/lib/jkqtplotter/graphs/jkqtpparsedfunction.h b/lib/jkqtplotter/graphs/jkqtpparsedfunction.h index b011a508da..3bb2cb4f4c 100644 --- a/lib/jkqtplotter/graphs/jkqtpparsedfunction.h +++ b/lib/jkqtplotter/graphs/jkqtpparsedfunction.h @@ -104,7 +104,7 @@ protected: /*! \brief This implements line plots where the data is taken from a user supplied function \f$ y=f(x) \f$ The function is defined as a string and parsed by JKMathParser - \ingroup jkqtplotter_parsedFgraphs + \ingroup jkqtplotter_functiongraphs Additional function parameters may be given in the vector parameters. They are accessible in the function as \c p1 , \c p2 , \c p3 , ... Parameters may also be given from a data column. Then first the params from the column and the the parameters from the vector are numbered. @@ -149,7 +149,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPXParsedFunctionLineGraph: public JKQTPParsedFu /*! \brief This implements line plots where the data is taken from a user supplied function \f$ x=f(y) \f$ The function is defined as a string and parsed by JKMathParser - \ingroup jkqtplotter_parsedFgraphs + \ingroup jkqtplotter_functiongraphs Additional function parameters may be given in the vector parameters. They are accessible in the function as \c p1 , \c p2 , \c p3 , ... Parameters may also be given from a data column. Then first the params from the column and the the parameters from the vector are numbered. diff --git a/lib/jkqtplotter/graphs/jkqtppeakstream.h b/lib/jkqtplotter/graphs/jkqtppeakstream.h index dea031b35f..16b87e4262 100644 --- a/lib/jkqtplotter/graphs/jkqtppeakstream.h +++ b/lib/jkqtplotter/graphs/jkqtppeakstream.h @@ -38,7 +38,7 @@ class JKQTPDatastore; /*! \brief interprets data as a stream of x- or y-positions \f$ p_i \f$ (depending in \a yPeaks ) ans plots a line on the height \a baseline and upright lines from baseline to baseline+peakHeight at each position \f$ p_i \f$. This can be used to display a stream of photons with given arrivaltimes \f$ p_i \f$. - \ingroup jkqtplotter_diverse + \ingroup jkqtplotter_eventgraphs \image html JKQTPPeakStreamGraphY.png "yPeaks=true" \image html JKQTPPeakStreamGraphX.png "yPeaks=false" diff --git a/lib/jkqtplotter/graphs/jkqtpscatter.h b/lib/jkqtplotter/graphs/jkqtpscatter.h index 9901573989..fe9e08f75f 100644 --- a/lib/jkqtplotter/graphs/jkqtpscatter.h +++ b/lib/jkqtplotter/graphs/jkqtpscatter.h @@ -46,7 +46,7 @@ class JKQTPDatastore; /*! \brief This implements xy scatter plots. This also alows to draw symbols at the data points. - \ingroup jkqtplotter_linesymbolgraphs_simple + \ingroup jkqtplotter_linesymbolgraphs_scatter \image html JKQTPXYScatterGraph.png @@ -87,7 +87,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPXYScatterGraph: public JKQTPXYGraph, public JK /*! \brief This implements xy scatter plots with x and y error indicators. - \ingroup jkqtplotter_linesymbolgraphs_simple + \ingroup jkqtplotter_linesymbolgraphs_scatter \image html JKQTPXYScatterErrorGraph.png diff --git a/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h b/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h index 0a19aab2e8..9337d9aff7 100644 --- a/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h +++ b/lib/jkqtplotter/graphs/jkqtpsinglecolumnsymbols.h @@ -32,7 +32,7 @@ /*! \brief plots a 1-column set of data-values with symbols onto a JKQtPlotter/JKQtBasePlotter. the data from the single column is either interpreted as x- or y-values and the missing coordinate is taken from a fixed value position. - \ingroup jkqtplotter_linesymbolgraphs_simple + \ingroup jkqtplotter_linesymbolgraphs_scatter The first coordinate of the data is taken from dataColumn i.e. - the x-values if dataDirection==DataDirection::X diff --git a/lib/jkqtplotter/graphs/jkqtpspecialline.h b/lib/jkqtplotter/graphs/jkqtpspecialline.h index b5d9b1f32c..e9aaa3e052 100644 --- a/lib/jkqtplotter/graphs/jkqtpspecialline.h +++ b/lib/jkqtplotter/graphs/jkqtpspecialline.h @@ -44,7 +44,7 @@ class JKQTPDatastore; /** \brief a Base class for special line graphs (steps ...) like e.g. JKQTPSpecialLineHorizontalGraph - * \ingroup jkqtplotter_linesymbolgraphs_simple + * \ingroup jkqtplotter_linesymbolgraphs_line * * \image html stepplots.png * @@ -88,7 +88,7 @@ protected: /** \brief This implements a step plot with values \f$ \left(x, f(x) \right) \f$ - * \ingroup jkqtplotter_linesymbolgraphs_simple + * \ingroup jkqtplotter_linesymbolgraphs_line * * \image html stepplots.png * @@ -112,7 +112,7 @@ protected: /*! \brief This implements a step plot with values \f$ \left(f(y), y \right) \f$ - \ingroup jkqtplotter_linesymbolgraphs_simple + \ingroup jkqtplotter_linesymbolgraphs_line \image html stepplots_vertical.png diff --git a/lib/jkqtplotter/graphs/jkqtpviolinplot.h b/lib/jkqtplotter/graphs/jkqtpviolinplot.h index 59c84bea12..4342ca026c 100644 --- a/lib/jkqtplotter/graphs/jkqtpviolinplot.h +++ b/lib/jkqtplotter/graphs/jkqtpviolinplot.h @@ -35,7 +35,7 @@ /** \brief This implements a single vertical Violin Plot as a "geometric element" * \ingroup jkqtplotter_statgraphs - * \ingroup jkqtplotter_diverse + * \ingroup jkqtplotter_statgraphs * * Represents a violin plot in one of the following styles: * @@ -138,7 +138,7 @@ protected: /*! \brief This implements a single vertical Violin Plot as a "geometric element" \ingroup jkqtplotter_statgraphs - \ingroup jkqtplotter_diverse + \ingroup jkqtplotter_statgraphs Draws a vertical violin plot in one of the following styles: @@ -195,7 +195,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPViolinplotVerticalElement: public JKQTPViolinp /*! \brief This implements a single horizontal Violin Plot as a "geometric element" \ingroup jkqtplotter_statgraphs - \ingroup jkqtplotter_diverse + \ingroup jkqtplotter_statgraphs Draws a horizontal violin plot in one of the following styles: diff --git a/lib/jkqtplotter/jkqtpbaseplotter.h b/lib/jkqtplotter/jkqtpbaseplotter.h index b4499c5946..ef048ad214 100644 --- a/lib/jkqtplotter/jkqtpbaseplotter.h +++ b/lib/jkqtplotter/jkqtpbaseplotter.h @@ -291,7 +291,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPPaintDeviceAdapter { * \see See \ref JKQTPlotterMultiPlotLayout for an extensive example of the functionality. * * - * \subsection JKQTBASEPLOTTER_SYNCMULTIPLOT_GRIDPRINT Grid Printing/Desclaring Relations between Plots + * \subsection JKQTBASEPLOTTER_SYNCMULTIPLOT_GRIDPRINT Grid Printing/Declaring Relations between Plots * * Usually each JKQTPlotter/JKQTBasePlotter prints or exports only itself. But in many cases you might want to * add several plots that form a grid layout and also want to export them as one image/print them on one page. @@ -334,9 +334,9 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPPaintDeviceAdapter { * Most commonly this invisible plotter class is used as basis for the widget JKQTPlotter. * \see JKQTPlotter * - * \subsection jkqtplotter_usage_baseplotter_standalone JKQTBasePlotter Standalone Usage + * \subsection jkqtplotter_usage_baseplotter_standalone JKQTBasePlotter Standalone Usage (non-visible class) * - * \copydetails jkqtplotter_general_usage_jkqtplotter + * \copydetails jkqtplotter_general_usage_jkqtbaseplotter * */ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject { diff --git a/lib/jkqtplotter/jkqtplotter.h b/lib/jkqtplotter/jkqtplotter.h index 4eb496041a..14718667c1 100644 --- a/lib/jkqtplotter/jkqtplotter.h +++ b/lib/jkqtplotter/jkqtplotter.h @@ -73,7 +73,7 @@ JKQTPLOTTER_LIB_EXPORT void initJKQTPlotterResources(); * * \section JKQTPLOTTER_BASICUSAGE Basic Usage of JKQTPlotter * - * \copydetails jkqtplotter_general_usage_jkqtbaseplotter + * \copydetails jkqtplotter_general_usage_jkqtplotter * * * \section JKQTPLOTTER_SYNCMULTIPLOT Synchronizing Several Plots diff --git a/lib/jkqtplotter/jkqtptools.h b/lib/jkqtplotter/jkqtptools.h index 6510841bbe..ea9b7aa0e6 100644 --- a/lib/jkqtplotter/jkqtptools.h +++ b/lib/jkqtplotter/jkqtptools.h @@ -654,7 +654,7 @@ JKQTPLOTTER_LIB_EXPORT JKQTPErrorPlotstyle String2JKQTPErrorPlotstyle(const QStr /** \brief plot styles for the error information - * \ingroup jkqtplotter_linesymbolgraphs_simple + * \ingroup jkqtplotter_linesymbolgraphs_line * * \see JKQTPSpecialLineTypeComboBox */ @@ -668,12 +668,12 @@ enum JKQTPSpecialLineType { /** \brief converts a JKQTPSpecialLineType variable into a human-readable string - * \ingroup jkqtplotter_linesymbolgraphs_simple + * \ingroup jkqtplotter_linesymbolgraphs_line */ JKQTPLOTTER_LIB_EXPORT QString JKQTPSpecialLineType2String(JKQTPSpecialLineType pos); /** \brief converts a String into a JKQTPSpecialLineType - * \ingroup jkqtplotter_linesymbolgraphs_simple + * \ingroup jkqtplotter_linesymbolgraphs_line */ JKQTPLOTTER_LIB_EXPORT JKQTPSpecialLineType String2JKQTPSpecialLineType(const QString& pos);