From fdc4a1deb998115bd53257f086f0e96997c9fe40 Mon Sep 17 00:00:00 2001 From: jkriege2 Date: Thu, 30 May 2019 11:19:56 +0200 Subject: [PATCH] bugfixes (added missing DEFINE-compiler-flags for Visual C++, doxygen warnings/errors removed) --- doc/dox/jkqtplotter.dox | 8 +- doc/dox/whatsnew.dox | 4 +- .../jkqtfastplotter_test.pro | 2 + .../jkqtmathtext_simpletest.pro | 3 + .../jkqtmathtext_test/jkqtmathtext_test.pro | 3 + .../jkqtplotter_simpletest_barchart.pro | 2 + .../jkqtplotter_simpletest_boxplot.pro | 2 + .../jkqtplotter_simpletest_contourplot.pro | 2 + .../jkqtplotter_simpletest_dateaxes.pro | 2 + .../jkqtplotter_simpletest_errorbarstyles.pro | 2 + .../jkqtplotter_simpletest_filledgraphs.pro | 2 + .../jkqtplotter_simpletest_geometric.pro | 2 + .../jkqtplotter_simpletest_imageplot.pro | 2 + ...tplotter_simpletest_imageplot_modifier.pro | 2 + ...kqtplotter_simpletest_imageplot_opencv.pro | 3 + .../jkqtplotter_simpletest_logaxes.pro | 2 + .../jkqtplotter_simpletest_rgbimageplot.pro | 2 + ...plotter_simpletest_rgbimageplot_opencv.pro | 3 + ...jkqtplotter_simpletest_rgbimageplot_qt.pro | 2 + .../jkqtplotter_simpletest_stackedbars.pro | 2 + .../jkqtplotter_simpletest_stepplots.pro | 2 + .../test_distributionplot.pro | 1 + .../test_styledboxplot/test_styledboxplot.pro | 2 + lib/jkqtcommon/jkqtpbasicimagetools.h | 2 +- lib/jkqtcommon/jkqtpdrawingtools.h | 19 +---- lib/jkqtcommon/jkqtplinalgtools.h | 9 ++- lib/jkqtcommon/jkqtpstatisticstools.h | 9 ++- lib/jkqtfastplotter/jkqtfastplotter.h | 50 +++++++----- lib/jkqtplotter/jkqtpbaseplotter.h | 8 +- lib/jkqtplotter/jkqtpdatastorage.h | 2 +- .../jkqtpgraphsbasestylingmixins.h | 1 - lib/jkqtplotter/jkqtpgraphscontour.h | 2 +- .../jkqtpgraphsevaluatedfunction.h | 48 +++++------ lib/jkqtplotter/jkqtpgraphsgeometric.h | 80 ++++++++++--------- lib/jkqtplotter/jkqtpgraphsimage.h | 6 +- lib/jkqtplotter/jkqtpgraphsimagergb.h | 6 -- .../jkqtpgraphsstatisticsadaptors.h | 67 +++++++++------- .../jkqtfastplotterlib/jkqtfastplotterlib.pro | 3 + sharedlib/jkqtmathtextlib/jkqtmathtextlib.pro | 3 + sharedlib/jkqtpcommonlib/jkqtpcommonlib.pro | 3 + sharedlib/jkqtplotterlib/jkqtplotterlib.pro | 4 + .../jkqtfastplotterlib/jkqtfastplotterlib.pro | 3 + staticlib/jkqtmathtextlib/jkqtmathtextlib.pro | 3 + staticlib/jkqtpcommonlib/jkqtpcommonlib.pro | 3 + staticlib/jkqtplotterlib/jkqtplotterlib.pro | 3 + 45 files changed, 236 insertions(+), 155 deletions(-) diff --git a/doc/dox/jkqtplotter.dox b/doc/dox/jkqtplotter.dox index 0d7114fe5f..3528c7b42d 100644 --- a/doc/dox/jkqtplotter.dox +++ b/doc/dox/jkqtplotter.dox @@ -24,7 +24,7 @@ This group assembles a variety of mathematical tool functions that are used in d Functions in this group form the basis for the statistics (\ref jkqtptools_math_statistics ) and linear algebra libraries (\ref jkqtptools_math_linalg ), by providing allocation and freeing of (aligned) memory arrays. -\seeJKQTPlotterBasicJKQTPDatastoreStatistics +\see JKQTPlotterBasicJKQTPDatastoreStatistics \defgroup jkqtptools_math_linalg Linear Algebra Tools \ingroup jkqtptools_math @@ -42,6 +42,7 @@ This group contains a statistics library, which offers several basic methods and - \ref jkqtptools_math_statistics_1dkde - \ref jkqtptools_math_statistics_2dkde . +In addition there is a set of "adaptors" (see \ref jkqtptools_math_statistics_adaptors ) that shortcut the calculation of a statistical property and the subsequent parametrization of a plot with the results. With these adaptors you can add e.g. a boxplot or histogram chart to a plot by calling only one function. All statistics functions use an iterator-based interface, comparable to the interface of the algorithms in the C++ standard template library. To this end, the class `JKQTPDatastore` provides an iterator interface to its columns, using the functions `JKQTPDatastore::begin()` and `JKQTPDatastore::end()`. Both functions simply receive the column ID as parameter and exist in a const and a mutable variant. the latter allows to also edit the data. In addition the function `JKQTPDatastore::backInserter()` returns a back-inserter iterator (like generated for STL containers with `std::back_inserter(container)`) that also allows to append to the column. @@ -80,6 +81,9 @@ All statistics functions use all values in the given range and convert each valu \defgroup jkqtptools_math_statistics_2dkde 2-dimensional Kernel Density Estimates \ingroup jkqtptools_math_statistics +\defgroup jkqtptools_math_statistics_adaptors Statistics To Plot Adaptors +\ingroup jkqtptools_math_statistics + \defgroup jkqtptools_string String/String-Conversion Tool Functions @@ -360,6 +364,8 @@ This group assembles graphs that show their data with symbols and optionally wit JKQTPBoxplotVerticalGraph, JKQTPBoxplotHorizontalGraph +\see \ref jkqtptools_math_statistics_adaptors for shortcuts to calculate statistical properties of data and then adding a plot with the results. + \defgroup jkqtplotter_geoplots Geometric Elements (Lines, Rectangles, ...) \ingroup jkqtplotter_graphsgroup diff --git a/doc/dox/whatsnew.dox b/doc/dox/whatsnew.dox index 31cb734e34..dd8a64fda7 100644 --- a/doc/dox/whatsnew.dox +++ b/doc/dox/whatsnew.dox @@ -44,7 +44,7 @@ Changes, compared to \ref page_whatsnew_V2018_08 "v2018.08" include:
  • new: advanced styling options for boxplots + example for the styling: \ref JKQTPlotterBoxplotStyling
  • new: notched boxplots, see: \ref JKQTPlotterBoxplotStyling
  • new: several new plot symbols, see: JKQTPGraphSymbols
  • -
  • new: Statistics library with functions to calculate histograms, regression, kernel density estimates, ... see: \ref jkqtptools_statistics
  • +
  • new: Statistics library with functions to calculate histograms, regression, kernel density estimates, ... see: \ref jkqtptools_math_statistics
  • new: iterator interface and improved documentation for JKQTPDatastore
  • changed: removed old selection-code and replaced by general highlighting feature
  • changed: JKQTPStepHorizontalGraph has been renamed to JKQTPSpecialLineHorizontalGraph (vertical variants also) and have gained additional features (baseline for filling and drawing of symbols)
  • @@ -58,7 +58,7 @@ Changes, compared to \ref page_whatsnew_V2018_08 "v2018.08" include:
  • Updates to JKQTMathText: