-
- Screenshot
- | Classes
- |
- \image html beeswarmplot_small.png
- | JKQTPSingleColumnSymbolsGraph
- |
- \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
-\ingroup jkqtplotter_linesymbolgraphs
-
-
-
- Screenshot
- | Classes
- |
- \image html barchart_small.png
- | JKQTPBarVerticalGraph, JKQTPBarHorizontalGraph
- |
- \image html barchart_error_small.png
- | JKQTPBarVerticalErrorGraph, JKQTPBarHorizontalErrorGraph
- |
- \image html JKQTPbarVerticalGraphStacked_small.png
- | JKQTPBarVerticalStackableGraph, JKQTPBarHorizontalStackableGraph
- |
- \image html impulsesplot_small.png
- | JKQTPImpulsesHorizontalGraph, JKQTPImpulsesVerticalGraph
- |
- \image html impulses_errors_small.png
- | JKQTPImpulsesHorizontalErrorGraph, JKQTPImpulsesVerticalErrorGraph
- |
-
-\defgroup jkqtplotter_statgraphs Statistical Graphs (e.g. Boxplots ...)
-\ingroup jkqtplotter_graphsgroup
-
-
-
- Screenshot
- | Classes
- |
- \image html symbol_filled_diamond.png
- | JKQTPGeoSymbol
- |
- \image html geo_text_small.png
- | JKQTPGeoText
- |
- \image html geo_line_small.png
- | JKQTPGeoLine, JKQTPGeoInfiniteLine, JKQTPGeoPolyLines
- |
- \image html geo_arrows_small.png
- | JKQTPGeoArrow
- |
- \image html geo_rect_small.png
- | JKQTPGeoRectangle
- |
- \image html geo_polygon_small.png
- | JKQTPGeoPolygon
- |
- \image html geo_ellipse_small.png
- | JKQTPGeoEllipse
- |
- \image html geo_arc_small.png
- | JKQTPGeoArc
- |
- \image html geo_pie_small.png
- | JKQTPGeoPie
- |
- \image html geo_chords_small.png
- | JKQTPGeoChord
- |
-
-Examples:
- - \ref JKQTPlotterGeometricGraphs
-.
-
-\defgroup jkqtplotter_annotations Graph Annotations
-\ingroup jkqtplotter_graphsgroup
-
-
-
- Screenshot
- | Classes
- |
- \image html rgbimageplot_qt_small.png
- | JKQTPImage
- |
- \image html JKQTPMathImageBaseModifyNone_small.png
- | JKQTPMathImage, JKQTPColumnMathImage
- |
- \image html rgbimageplots_small.png
- | JKQTPRGBMathImage, JKQTPColumnRGBMathImage
- |
- \image html overlayimage_small.png
- | JKQTPOverlayImage
- |
- \image html overlayimageenhanced_small.png
- | JKQTPOverlayImageEnhanced, JKQTPColumnOverlayImageEnhanced
- |
- \image html JKQTPColumnContourPlot_small.png
- | JKQTPContourPlot, JKQTPColumnContourPlot
- |
-
-\defgroup jkqtplotter_imagelots_elements Image Graphs
-\ingroup jkqtplotter_imagelots
-
-
-
-
-\see For a detailed example, see \ref JKQTPlotterStyling
-
-
-
\defgroup jkqtpqtwidgetsttools Qt Widgets/Tools to work with JKQTPlotter
\ingroup jkqtplotter
diff --git a/doc/dox/jkqtplotter_01naming.dox b/doc/dox/jkqtplotter_01naming.dox
new file mode 100644
index 0000000000..fd167e5642
--- /dev/null
+++ b/doc/dox/jkqtplotter_01naming.dox
@@ -0,0 +1,25 @@
+/*!
+
+ \defgroup jkqtplotter_naming Conventions Naming Conventions in JKQTPlotter
+ \ingroup jkqtplotter_general
+
+
+ This page assembles the naming conventions behind the implementation and documentation of JKQTPlotter:
+
+
+ Screenshot
+ | Classes
+ |
+ \image html beeswarmplot_small.png
+ | JKQTPSingleColumnSymbolsGraph
+ |
+ \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
+\ingroup jkqtplotter_linesymbolgraphs
+
+
+
+ Screenshot
+ | Classes
+ |
+ \image html barchart_small.png
+ | JKQTPBarVerticalGraph, JKQTPBarHorizontalGraph
+ |
+ \image html barchart_error_small.png
+ | JKQTPBarVerticalErrorGraph, JKQTPBarHorizontalErrorGraph
+ |
+ \image html JKQTPbarVerticalGraphStacked_small.png
+ | JKQTPBarVerticalStackableGraph, JKQTPBarHorizontalStackableGraph
+ |
+ \image html impulsesplot_small.png
+ | JKQTPImpulsesHorizontalGraph, JKQTPImpulsesVerticalGraph
+ |
+ \image html impulses_errors_small.png
+ | JKQTPImpulsesHorizontalErrorGraph, JKQTPImpulsesVerticalErrorGraph
+ |
+
+\defgroup jkqtplotter_statgraphs Statistical Graphs (e.g. Boxplots ...)
+\ingroup jkqtplotter_graphsgroup
+
+
+
+ Screenshot
+ | Classes
+ |
+ \image html symbol_filled_diamond.png
+ | JKQTPGeoSymbol
+ |
+ \image html geo_text_small.png
+ | JKQTPGeoText
+ |
+ \image html geo_line_small.png
+ | JKQTPGeoLine, JKQTPGeoInfiniteLine, JKQTPGeoPolyLines
+ |
+ \image html geo_arrows_small.png
+ | JKQTPGeoArrow
+ |
+ \image html geo_rect_small.png
+ | JKQTPGeoRectangle
+ |
+ \image html geo_polygon_small.png
+ | JKQTPGeoPolygon
+ |
+ \image html geo_ellipse_small.png
+ | JKQTPGeoEllipse
+ |
+ \image html geo_arc_small.png
+ | JKQTPGeoArc
+ |
+ \image html geo_pie_small.png
+ | JKQTPGeoPie
+ |
+ \image html geo_chords_small.png
+ | JKQTPGeoChord
+ |
+
+Examples:
+ - \ref JKQTPlotterGeometricGraphs
+.
+
+\defgroup jkqtplotter_annotations Graph Annotations
+\ingroup jkqtplotter_graphsgroup
+
+
+
+ Screenshot
+ | Classes
+ |
+ \image html rgbimageplot_qt_small.png
+ | JKQTPImage
+ |
+ \image html JKQTPMathImageBaseModifyNone_small.png
+ | JKQTPMathImage, JKQTPColumnMathImage
+ |
+ \image html rgbimageplots_small.png
+ | JKQTPRGBMathImage, JKQTPColumnRGBMathImage
+ |
+ \image html overlayimage_small.png
+ | JKQTPOverlayImage
+ |
+ \image html overlayimageenhanced_small.png
+ | JKQTPOverlayImageEnhanced, JKQTPColumnOverlayImageEnhanced
+ |
+ \image html JKQTPColumnContourPlot_small.png
+ | JKQTPContourPlot, JKQTPColumnContourPlot
+ |
+
+\defgroup jkqtplotter_imagelots_elements Image Graphs
+\ingroup jkqtplotter_imagelots
+
+
+
+
+\see For a detailed example, see \ref JKQTPlotterStyling
+
+
+
+*/
\ No newline at end of file
diff --git a/lib/jkqtcommon/jkqtpdrawingtools.h b/lib/jkqtcommon/jkqtpdrawingtools.h
index 1af934bfab..5a95b63800 100644
--- a/lib/jkqtcommon/jkqtpdrawingtools.h
+++ b/lib/jkqtcommon/jkqtpdrawingtools.h
@@ -334,7 +334,7 @@ enum JKQTPLineDecoratorStyle {
JKQTPDiamondDecorator, /*!< \brief an open diamond tip \image html linedecorators/diamond.png */
JKQTPDiamondDecoratorAndBar, /*!< \brief an open diamond tip \image html linedecorators/diamond_bar.png */
JKQTPFilledDiamondDecorator, /*!< \brief a filled diamond tip \image html linedecorators/filled_diamond.png */
- JKQTPFilledDiamondDecoratorAndBar, /*!< \brief a filled diamond tip \image html linedecorators/filled_dimanond_bar.png */
+ JKQTPFilledDiamondDecoratorAndBar, /*!< \brief a filled diamond tip \image html linedecorators/filled_diamond_bar.png */
JKQTPHalfBarDecorator, /*!< \brief a half vertical bar \image html linedecorators/half_bar.png */
JKQTPHarpoonDecorator, /*!< \brief an harpoon arrow \image html linedecorators/harpoon.png */
JKQTPHarpoonDecoratorAndBar, /*!< \brief an harpoon arrow, with vertical bar \image html linedecorators/harpoon_bar.png */
diff --git a/lib/jkqtcommon/jkqtpenhancedpainter.h b/lib/jkqtcommon/jkqtpenhancedpainter.h
index 28f3f230e5..7c536278ca 100644
--- a/lib/jkqtcommon/jkqtpenhancedpainter.h
+++ b/lib/jkqtcommon/jkqtpenhancedpainter.h
@@ -32,13 +32,20 @@
*/
class JKQTCOMMON_LIB_EXPORT JKQTPEnhancedPainter : public QPainter {
public:
-
+ /** \brief flags that are used to configure a JKQTPEnhancedPainter */
enum PainterFlag { DefaultPaintMode = 0x00, /*!< \brief the default mode, the JKQTPEnhancedPainter draws on a pixel-device */
VectorPainting = 0x01, /*!< \brief if set, the JKQTPEnhancedPainter draws onto a vector-device, like a printer, PDF or SVG-output */
};
- Q_ENUMS(PainterFlag)
- Q_FLAGS(PainterFlags)
+ Q_ENUM(PainterFlag)
+ /** \brief specifies the plot styles for the error information, e.g. error bars, boxes, lines ...
+ * \ingroup jkqtplotter_basegraphserrors
+ *
+ * \qFlagsNote{JKQTPErrorPlotstyle,JKQTPErrorPlotstyleElements}
+ *
+ * \see JKQTPErrorPlotstyleElements, JKQTPXGraphErrorData, JKQTPYGraphErrorData
+ */
Q_DECLARE_FLAGS(PainterFlags, PainterFlag)
+ Q_FLAG(PainterFlags)
JKQTPEnhancedPainter(QPaintDevice* device);
JKQTPEnhancedPainter();
diff --git a/lib/jkqtcommon/jkqtphighrestimer.h b/lib/jkqtcommon/jkqtphighrestimer.h
index fbce76bf1f..7e51963078 100644
--- a/lib/jkqtcommon/jkqtphighrestimer.h
+++ b/lib/jkqtcommon/jkqtphighrestimer.h
@@ -74,9 +74,10 @@
*
* \par win32 implementation issues:
* To implement this timer on windows systems I use two API calls from the windows kernel. They are:
- * -