diff --git a/doc/dox/whatsnew.dox b/doc/dox/whatsnew.dox index 6aa931387a..8d0df1794a 100644 --- a/doc/dox/whatsnew.dox +++ b/doc/dox/whatsnew.dox @@ -21,7 +21,7 @@ Changes, compared to \ref page_whatsnew_V2019_11 "v2019.11" include:
  • fixed issue #37: CMake installs things into $PREFIX/doc/*.txt , thanks to user:certik
  • fixed issue #45: Build error on mac jkqtfastplotter.cpp:342:28: Variable has incomplete type 'QPainterPath', thanks to user:abdedixit
  • removed the usage of some deprecated functions and objects (e.g. QMatrix)
  • -
  • new: added geometric plot object JKQTPGeoArrow to draw (double-ended) arrows
  • +
  • new: added geometric plot objects JKQTPGeoArrow to draw arrows (aka lines with added line-end decorators, also extended JKQTPGeoLine, JKQTPGeoInfiniteLine, JKQTPGeoPolyLines to draw line-end decorator (aka arrows)
  • \subsection page_whatsnew_TRUNK_DOWNLOAD trunk: Download diff --git a/examples/geometric/README.md b/examples/geometric/README.md index a98b37ac2b..f632d396e6 100644 --- a/examples/geometric/README.md +++ b/examples/geometric/README.md @@ -29,7 +29,7 @@ The source code of the main application can be found in [`geometric.cpp`](https // a polyline QVector p; - p<appendPoint(2.1, 0.5); - polygraph->appendPoint(2.9, 0.9); - polygraph->appendPoint(2.2, 0.8); - polygraph->appendPoint(2.8, 0.25); - polygraph->appendPoint(2.6, 0.6); - polygraph->setAlpha(0.75); - plot.addGraph(polygraph); + JKQTPGeoPolygon* polygongraph=new JKQTPGeoPolygon(&plot, QColor("red"), 2, Qt::PenStyle::DashLine, QColor("salmon")); + polygongraph->appendPoint(2.1, 0.5); + polygongraph->appendPoint(2.9, 0.9); + polygongraph->appendPoint(2.2, 0.8); + polygongraph->appendPoint(2.8, 0.25); + polygongraph->appendPoint(2.6, 0.6); + polygongraph->setAlpha(0.75); + plot.addGraph(polygongraph); + // an arc from an ellipse from -10 degrees to 117 degrees, centered at 2.5,1.5 and full axes of 0.5 and 0.5 diff --git a/examples/geometric/geometric.cpp b/examples/geometric/geometric.cpp index 64405a271c..8b316a0fd5 100644 --- a/examples/geometric/geometric.cpp +++ b/examples/geometric/geometric.cpp @@ -40,13 +40,10 @@ int main(int argc, char* argv[]) plot.addGraph(new JKQTPGeoSymbol(&plot, 0.1,0.6, JKQTPCircle, 5, QColor("grey"))); - // 3.2 some lines elements (single lines and polylines) + // 3.2 some lines elements (single lines) plot.addGraph(new JKQTPGeoText(&plot, 1.1,0.95, "\\textbf{Lines:}", 14, QColor("red"))); plot.addGraph(new JKQTPGeoLine(&plot, 1, 0.05, 1.9, 0.9, QColor("red"), 2)); plot.addGraph(new JKQTPGeoLine(&plot, 1, 0.1, 1.9, 0.8, QColor("blue"), 1, Qt::PenStyle::DashLine)); - QVector p; - p<setTwoSided(false); infLine->setAlpha(0.5); @@ -129,7 +126,13 @@ int main(int argc, char* argv[]) plot.addGraph(polygraph); - // 3.7 some arcs + // 3.7 a poly-line element + QVector p; + p< JKQTPDrawEllipse(double x, double y, doub \param x x-coordinate of position the tooltip points to \param y y-coordinate of position the tooltip points to \param rect rectangle of the main tooltip area + + \image html tooltiptool_example.png */ template inline void JKQTPDrawTooltip(TPainter& painter, double x, double y, const QRectF& rect); diff --git a/lib/jkqtcommon/jkqtpmathtools.h b/lib/jkqtcommon/jkqtpmathtools.h index b6ee9e9fa8..06b2cb369f 100644 --- a/lib/jkqtcommon/jkqtpmathtools.h +++ b/lib/jkqtcommon/jkqtpmathtools.h @@ -426,7 +426,7 @@ inline bool JKQTPIsOKFloat(T v) { /** \brief evaluates a gaussian propability density function * \ingroup jkqtptools_math_basic * - * \f[ f(x,\mu, \sigma)=\frac{1}{\sqrt{2\pi\sigma^2}}\cdot\eJKQTPSTATISTICS_PIeft(-\frac{(x-\mu)^2}{2\sigma^2}\right) + * \f[ f(x,\mu, \sigma)=\frac{1}{\sqrt{2\pi\sigma^2}}\cdot\exp\left(-\frac{(x-\mu)^2}{2\sigma^2}\right) \f] */ inline double jkqtp_gaussdist(double x, double mu=0.0, double sigma=1.0) { return exp(-0.5*jkqtp_sqr(x-mu)/jkqtp_sqr(sigma))/sqrt(2.0*JKQTPSTATISTICS_PI*sigma*sigma); diff --git a/screenshots/geometric.png b/screenshots/geometric.png index d779cf624c..e6635b70ac 100644 Binary files a/screenshots/geometric.png and b/screenshots/geometric.png differ diff --git a/screenshots/geometric_small.png b/screenshots/geometric_small.png index edb074e2d1..6baaa8abc3 100644 Binary files a/screenshots/geometric_small.png and b/screenshots/geometric_small.png differ