mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-11-16 02:25:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
ea6db847d8
JKQtPlotter/lib/jkqtcommon/jkqtpdrawingtools.cpp

353 lines
21 KiB
C++
Raw Normal View History

new: Statistics library with functions to calculate histograms, regression, kernel density estimates, ... including a new example new: iterator interface and improved documentation for JKQTPDatastore reorganization of library (better separation of common code in jkqtpcommon and other code e.g. in jkqtplotter or jkqtmathtext)
2019-05-30 04:40:02 +08:00
/*
diverse code improvements, increased copyright year to 2020
2020-08-26 18:58:23 +08:00
Copyright (c) 2008-2020 Jan W. Krieger (<jan@jkrieger.de>)
new: Statistics library with functions to calculate histograms, regression, kernel density estimates, ... including a new example new: iterator interface and improved documentation for JKQTPDatastore reorganization of library (better separation of common code in jkqtpcommon and other code e.g. in jkqtplotter or jkqtmathtext)
2019-05-30 04:40:02 +08:00
This software is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License (LGPL) as published by
the Free Software Foundation, either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License (LGPL) for more details.
You should have received a copy of the GNU Lesser General Public License (LGPL)
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "jkqtcommon/jkqtpdrawingtools.h"
#include "jkqtcommon/jkqtpenhancedpainter.h"
#include <QDebug>
const double JKQTPlotterDrawingTools::ABS_MIN_LINEWIDTH= 0.02;
QString JKQTPGraphSymbols2String(JKQTPGraphSymbols pos) {
switch(pos) {
case JKQTPDot: return "symbol_dot";
case JKQTPCross: return "symbol_cross";
case JKQTPPlus: return "symbol_plus";
case JKQTPCircle: return "symbol_circle";
case JKQTPFilledCircle: return "symbol_filled_circle";
case JKQTPRect: return "symbol_rect";
case JKQTPFilledRect: return "symbol_filled_rect";
case JKQTPTriangle: return "symbol_triangle";
case JKQTPFilledTriangle: return "symbol_filled_triangle";
case JKQTPDownTriangle: return "symbol_down_triangle";
case JKQTPFilledDownTriangle: return "symbol_filled_down_triangle";
case JKQTPTarget: return "symbol_target";
case JKQTPstar: return "symbol_star";
case JKQTPFilledStar: return "symbol_filled_star";
case JKQTPDiamond: return "symbol_diamond";
case JKQTPFilledDiamond: return "symbol_filled_diamond";
case JKQTPPentagon: return "symbol_pentagon";
case JKQTPAsterisc: return "symbol_asterisc";
case JKQTPAsterisc6: return "symbol_asterisc6";
case JKQTPAsterisc8: return "symbol_asterisc8";
case JKQTPFilledPentagon: return "symbol_filled_pentagon";
case JKQTPHexagon: return "symbol_hexagon";
case JKQTPFilledHexagon: return "symbol_filled_hexagon";
case JKQTPOctagon: return "symbol_octagon";
case JKQTPFilledOctagon: return "symbol_filled_octagon";
case JKQTPRectCross: return "symbol_rect_cross";
case JKQTPRectPlus: return "symbol_rect_plus";
case JKQTPNoSymbol: return "none";
case JKQTPDiamondPlus: return "symbol_diamond_plus";
case JKQTPDiamondCross: return "symbol_diamond_cross";
case JKQTPCircleCross: return "symbol_circle_cross";
case JKQTPCirclePlus: return "symbol_circle_plus";
case JKQTPUpDownTriangle: return "symbol_updowntriangle";
case JKQTPFilledUpDownTriangle: return "symbol_filled_updowntriangle";
case JKQTPSantaClauseHouse: return "symbol_santaclause";
case JKQTPFilledSantaClauseHouse: return "symbol_filled_santaclause";
case JKQTPHourglass: return "symbol_hourglass";
case JKQTPFilledHourglass: return "symbol_filled_hourglass";
case JKQTPHorizontalHourglass: return "symbol_horizontal_hourglass";
case JKQTPFilledHorizontalHourglass: return "symbol_filled_horizontal_hourglass";
case JKQTPRectTriangle: return "symbol_rect_triangle";
case JKQTPRectDownTriangle: return "symbol_rect_downtriangle";
case JKQTPRectLeftTriangle: return "symbol_rect_lefttriangle";
case JKQTPRectRightTriangle: return "symbol_rect_righttriangle";
case JKQTPLeftTriangle: return "symbol_left_triangle";
case JKQTPFilledLeftTriangle: return "symbol_filled_left_triangle";
case JKQTPRightTriangle: return "symbol_right_triangle";
case JKQTPFilledRightTriangle: return "symbol_filled_right_triangle";
case JKQTPTripod: return "symbol_tripod";
case JKQTPDownTripod: return "symbol_down_tripod";
case JKQTPLeftTripod: return "symbol_left_tripod";
case JKQTPRightTripod: return "symbol_right_tripod";
case JKQTPFilledCurvedTriangle: return "symbol_filled_curved_triangle";
case JKQTPFilledDownCurvedTriangle: return "symbol_filled_down_curved_triangle";
case JKQTPFilledLeftCurvedTriangle: return "symbol_filled_left_curved_triangle";
case JKQTPFilledRightCurvedTriangle: return "symbol_filled_right_curved_triangle";
case JKQTPCurvedTriangle: return "symbol_curved_triangle";
case JKQTPDownCurvedTriangle: return "symbol_down_curved_triangle";
case JKQTPLeftCurvedTriangle: return "symbol_left_curved_triangle";
case JKQTPRightCurvedTriangle: return "symbol_right_curved_triangle";
case JKQTPPeace: return "symbol_peace";
case JKQTPFemale: return "symbol_female";
case JKQTPMale: return "symbol_male";
case JKQTPCirclePeace: return "symbol_circle_peace";
case JKQTPSymbolCount: JKQTPGraphSymbols2String(JKQTPMaxSymbolID);
}
return "";
}
QString JKQTPGraphSymbols2NameString(JKQTPGraphSymbols pos) {
switch(pos) {
case JKQTPDot: return QObject::tr("dot");
case JKQTPCross: return QObject::tr("cross");
case JKQTPPlus: return QObject::tr("plus");
case JKQTPCircle: return QObject::tr("circle");
case JKQTPFilledCircle: return QObject::tr("filled circle");
case JKQTPRect: return QObject::tr("rectangle");
case JKQTPFilledRect: return QObject::tr("filled rectangle");
case JKQTPTriangle: return QObject::tr("triangle");
case JKQTPFilledTriangle: return QObject::tr("filled triangle");
case JKQTPDownTriangle: return QObject::tr("down triangle");
case JKQTPFilledDownTriangle: return QObject::tr("filled down triangle");
case JKQTPstar: return QObject::tr("star");
case JKQTPFilledStar: return QObject::tr("filled star");
case JKQTPDiamond: return QObject::tr("diamond");
case JKQTPFilledDiamond: return QObject::tr("filled diamond");
case JKQTPPentagon: return QObject::tr("pentagon");
case JKQTPFilledPentagon: return QObject::tr("filled pentagon");
case JKQTPHexagon: return QObject::tr("hexagon");
case JKQTPFilledHexagon: return QObject::tr("filled hexagon");
case JKQTPOctagon: return QObject::tr("octagon");
case JKQTPFilledOctagon: return QObject::tr("filled octagon");
case JKQTPTarget: return QObject::tr("target");
case JKQTPAsterisc: return QObject::tr("asterisc, 5-arm");
case JKQTPAsterisc6: return QObject::tr("asterisc, 6-arm");
case JKQTPAsterisc8: return QObject::tr("asterisc, 8-arm");
case JKQTPRectCross: return QObject::tr("square with cross");
case JKQTPRectPlus: return QObject::tr("square with plus");
case JKQTPNoSymbol: return QObject::tr("none");
case JKQTPDiamondPlus: return QObject::tr("diamond with plus");
case JKQTPDiamondCross: return QObject::tr("diamond with cross");
case JKQTPCircleCross: return QObject::tr("circled cross");
case JKQTPCirclePlus: return QObject::tr("circled plus");
case JKQTPUpDownTriangle: return QObject::tr("up/down triangle");
case JKQTPFilledUpDownTriangle: return QObject::tr("filled up/down triangle");
case JKQTPSantaClauseHouse: return QObject::tr("santa clause");
case JKQTPFilledSantaClauseHouse: return QObject::tr("filled santa clause");
case JKQTPHourglass: return QObject::tr("hourglass");
case JKQTPFilledHourglass: return QObject::tr("filled hourglass");
case JKQTPHorizontalHourglass: return QObject::tr("horizontal hourglass");
case JKQTPFilledHorizontalHourglass: return QObject::tr("filled horizontal hourglass");
case JKQTPRectTriangle: return QObject::tr("rectangle with triangle");
case JKQTPRectDownTriangle: return QObject::tr("rectangle with downwards triangle");
case JKQTPRectLeftTriangle: return QObject::tr("rectangle with leftwards triangle");
case JKQTPRectRightTriangle: return QObject::tr("rectangle with rightwards triangle");
case JKQTPLeftTriangle: return QObject::tr("left triangle");
case JKQTPFilledLeftTriangle: return QObject::tr("filled left triangle");
case JKQTPRightTriangle: return QObject::tr("right triangle");
case JKQTPFilledRightTriangle: return QObject::tr("filled right triangle");
case JKQTPTripod: return QObject::tr("tripod");
case JKQTPDownTripod: return QObject::tr("down tripod");
case JKQTPLeftTripod: return QObject::tr("left tripod");
case JKQTPRightTripod: return QObject::tr("right tripod");
case JKQTPFilledCurvedTriangle: return QObject::tr("filled curved triangle");
case JKQTPFilledDownCurvedTriangle: return QObject::tr("filled down curved triangle");
case JKQTPFilledLeftCurvedTriangle: return QObject::tr("filled left curved triangle");
case JKQTPFilledRightCurvedTriangle: return QObject::tr("filled right curved triangle");
case JKQTPCurvedTriangle: return QObject::tr("curved triangle");
case JKQTPDownCurvedTriangle: return QObject::tr("down curved triangle");
case JKQTPLeftCurvedTriangle: return QObject::tr("left curved triangle");
case JKQTPRightCurvedTriangle: return QObject::tr("right curved triangle");
case JKQTPPeace: return QObject::tr("peace");
case JKQTPFemale: return QObject::tr("female");
case JKQTPMale: return QObject::tr("male");
case JKQTPCirclePeace: return QObject::tr("circled peace");
case JKQTPSymbolCount: JKQTPGraphSymbols2NameString(JKQTPMaxSymbolID);
}
return "";
}
JKQTPGraphSymbols String2JKQTPGraphSymbols(const QString& pos) {
QString s=pos.trimmed().toLower();
if (s=="symbol_dot"||s=="dot"||s==".") return JKQTPDot;
if (s=="symbol_cross"||s=="cross"||s=="x") return JKQTPCross;
if (s=="symbol_plus"||s=="plus"||s=="+") return JKQTPPlus;
if (s=="symbol_circle"||s=="circle"||s=="o") return JKQTPCircle;
if (s=="symbol_filled_circle"||s=="filled_circle"||s=="fo") return JKQTPFilledCircle;
if (s=="symbol_rect"||s=="rect"||s=="r") return JKQTPRect;
if (s=="symbol_filled_rect"||s=="filled_rect"||s=="fr") return JKQTPFilledRect;
if (s=="symbol_triangle"||s=="triangle"||s=="^") return JKQTPTriangle;
if (s=="symbol_filled_triangle"||s=="filled_triangle"||s=="f^") return JKQTPFilledTriangle;
if (s=="symbol_down_triangle"||s=="down_triangle"||s=="v") return JKQTPDownTriangle;
if (s=="symbol_filles_down_triangle"||s=="filles_down_triangle"||s=="symbol_filled_down_triangle"||s=="filled_down_triangle"||s=="fv") return JKQTPFilledDownTriangle;
if (s=="symbol_target"||s=="target"||s=="t") return JKQTPTarget;
if (s=="symbol_star"||s=="star"||s=="s") return JKQTPstar;
if (s=="symbol_filled_star"||s=="filled_star"||s=="fs") return JKQTPFilledStar;
if (s=="symbol_diamond"||s=="diamond"||s=="d") return JKQTPDiamond;
if (s=="symbol_filled_diamond"||s=="filled_diamond"||s=="fd") return JKQTPFilledDiamond;
if (s=="symbol_pentagon"||s=="pentagon"||s=="p") return JKQTPPentagon;
if (s=="symbol_filled_pentagon"||s=="filled_pentagon"||s=="fp") return JKQTPFilledPentagon;
if (s=="symbol_hexagon"||s=="hexagon"||s=="h") return JKQTPHexagon;
if (s=="symbol_filled_hexagon"||s=="filled_hexagon"||s=="fh") return JKQTPFilledHexagon;
if (s=="symbol_octagon"||s=="octagon"||s=="h") return JKQTPOctagon;
if (s=="symbol_filled_octagon"||s=="filled_octagon"||s=="fh") return JKQTPFilledOctagon;
if (s=="symbol_asterisc"||s=="asterisc"||s=="*") return JKQTPAsterisc;
if (s=="symbol_asterisc6"||s=="asterisc6"||s=="*6") return JKQTPAsterisc6;
if (s=="symbol_asterisc8"||s=="asterisc8"||s=="*8") return JKQTPAsterisc8;
if (s=="symbol_rect_cross"||s=="rect_cross"||s=="rx") return JKQTPRectCross;
if (s=="symbol_rect_plus"||s=="rect_plus"||s=="r+") return JKQTPRectPlus;
if (s=="symbol_diamond_plus" || s=="diamond_plus") return JKQTPDiamondPlus;
if (s=="symbol_diamond_cross" || s=="diamond_cross") return JKQTPDiamondCross;
if (s=="symbol_circle_cross" || s=="circle_cross") return JKQTPCircleCross;
if (s=="symbol_circle_plus" || s=="circle_plus") return JKQTPCirclePlus;
if (s=="symbol_updowntriangle" || s=="updowntriangle") return JKQTPUpDownTriangle;
if (s=="symbol_filled_updowntriangle" || s=="filled_updowntriangle") return JKQTPFilledUpDownTriangle;
if (s=="symbol_santaclause" || s=="santaclause") return JKQTPSantaClauseHouse;
if (s=="symbol_filled_santaclause" || s=="filled_santaclause") return JKQTPFilledSantaClauseHouse;
if (s=="symbol_hourglass" || s=="hourglass") return JKQTPHourglass;
if (s=="symbol_filled_hourglass" || s=="filled_hourglass") return JKQTPFilledHourglass;
if (s=="symbol_horizontal_hourglass" || s=="horizontal_hourglass") return JKQTPHorizontalHourglass;
if (s=="symbol_filled_horizontal_hourglass" || s=="filled_horizontal_hourglass") return JKQTPFilledHorizontalHourglass;
if (s=="symbol_rect_triangle" || s=="rect_triangle") return JKQTPRectTriangle;
if (s=="symbol_rect_downtriangle" || s=="rect_downtriangle") return JKQTPRectDownTriangle;
if (s=="symbol_rect_lefttriangle" || s=="rect_lefttriangle") return JKQTPRectLeftTriangle;
if (s=="symbol_rect_righttriangle" || s=="rect_righttriangle") return JKQTPRectRightTriangle;
if (s=="symbol_left_triangle" || s=="left_triangle") return JKQTPLeftTriangle;
if (s=="symbol_filled_left_triangle" || s=="filled_left_triangle") return JKQTPFilledLeftTriangle;
if (s=="symbol_right_triangle" || s=="right_triangle") return JKQTPRightTriangle;
if (s=="symbol_filled_right_triangle" || s=="filled_right_triangle") return JKQTPFilledRightTriangle;
if (s=="symbol_tripod" || s=="tripod") return JKQTPTripod;
if (s=="symbol_down_tripod" || s=="down_tripod") return JKQTPDownTripod;
if (s=="symbol_left_tripod" || s=="left_tripod") return JKQTPLeftTripod;
if (s=="symbol_right_tripod" || s=="right_tripod") return JKQTPRightTripod;
if (s=="symbol_filled_curved_triangle" || s=="filled_curved_triangle") return JKQTPFilledCurvedTriangle;
if (s=="symbol_filled_down_curved_triangle" || s=="filled_down_curved_triangle") return JKQTPFilledDownCurvedTriangle;
if (s=="symbol_filled_left_curved_triangle" || s=="filled_left_curved_triangle") return JKQTPFilledLeftCurvedTriangle;
if (s=="symbol_filled_right_curved_triangle" || s=="filled_right_curved_triangle") return JKQTPFilledRightCurvedTriangle;
if (s=="symbol_curved_triangle" || s=="curved_triangle") return JKQTPCurvedTriangle;
if (s=="symbol_down_curved_triangle" || s=="down_curved_triangle") return JKQTPDownCurvedTriangle;
if (s=="symbol_left_curved_triangle" || s=="left_curved_triangle") return JKQTPLeftCurvedTriangle;
if (s=="symbol_right_curved_triangle" || s=="right_curved_triangle") return JKQTPRightCurvedTriangle;
if (s=="symbol_peace" || s=="peace") return JKQTPPeace;
if (s=="symbol_circle_peace" || s=="circle_peace") return JKQTPCirclePeace;
if (s=="symbol_female" || s=="female") return JKQTPFemale;
if (s=="symbol_male" || s=="male") return JKQTPMale;
return JKQTPNoSymbol;
}
void JKQTPPlotSymbol(QPaintDevice &paintDevice, double x, double y, JKQTPGraphSymbols symbol, double size, double symbolLineWidth, QColor color, QColor fillColor) {
JKQTPEnhancedPainter p(&paintDevice);
JKQTPPlotSymbol(p, x, y, symbol, size, symbolLineWidth, color, fillColor);
}
added geometric plot JKQTPGeoArrow object to draw arrows
2020-08-22 00:31:58 +08:00
QString JKQTPLineDecoratorStyle2String(JKQTPLineDecoratorStyle pos)
{
switch(pos) {
case JKQTPNoDecorator: return "none";
case JKQTPArrow: return "arrow";
case JKQTPFilledArrow: return "filled_arrow";
case JKQTPTriangleDecorator: return "triangle";
case JKQTPFilledTriangleDecorator: return "filled_triangle";
improved arrows in geometric elements: - JKQTPGeoLine, JKQTPGeoPolyLines and JKQTPGeoInfiniteLine support decorators - improved decorator drawing - more decorator types - improved example geometry - added specific example geo_arrows - improved documentation - code cleanup
2020-08-23 19:13:53 +08:00
case JKQTPTriangleDecoratorAndBar: return "triangle_bar";
case JKQTPFilledTriangleDecoratorAndBar: return "filled_triangle_bar";
added geometric plot JKQTPGeoArrow object to draw arrows
2020-08-22 00:31:58 +08:00
case JKQTPDoubleArrow: return "double_arrow";
case JKQTPFilledDoubleArrow: return "filled_double_arrow";
case JKQTPCircleDecorator: return "circle";
case JKQTPFilledCircleDecorator: return "filled_circle";
case JKQTPRectangleDecorator: return "rectangle";
case JKQTPFilledRectangleDecorator: return "filled_rectangle";
improved arrows in geometric elements: - JKQTPGeoLine, JKQTPGeoPolyLines and JKQTPGeoInfiniteLine support decorators - improved decorator drawing - more decorator types - improved example geometry - added specific example geo_arrows - improved documentation - code cleanup
2020-08-23 19:13:53 +08:00
case JKQTPArrowAndBar: return "arrow_bar";
case JKQTPDoubleArrowAndBar: return "double_arrow_bar";
case JKQTPBarDecorator: return "bar";
added geometric plot JKQTPGeoArrow object to draw arrows
2020-08-22 00:31:58 +08:00
case JKQTPBracketDecorator: return "bracket";
improved arrows in geometric elements: - JKQTPGeoLine, JKQTPGeoPolyLines and JKQTPGeoInfiniteLine support decorators - improved decorator drawing - more decorator types - improved example geometry - added specific example geo_arrows - improved documentation - code cleanup
2020-08-23 19:13:53 +08:00
case JKQTPHalfBarDecorator: return "half_bar";
case JKQTPSkewedBarDecorator: return "skewed_bar";
case JKQTPHarpoonDecorator: return "harpoon";
case JKQTPHarpoonDecoratorAndBar: return "harpoon_bar";
case JKQTPDiamondDecorator: return "diamond";
case JKQTPFilledDiamondDecorator: return "filled_diamond";
case JKQTPDiamondDecoratorAndBar: return "diamond_bar";
case JKQTPFilledDiamondDecoratorAndBar: return "filled_diamond_bar";
added geometric plot JKQTPGeoArrow object to draw arrows
2020-08-22 00:31:58 +08:00
case JKQTPLineDecoratorCount: JKQTPLineDecoratorStyle2String(JKQTPMaxLineDecoratorID);
}
return "";
}
QString JKQTPLineDecoratorStyle2NameString(JKQTPLineDecoratorStyle pos)
{
switch(pos) {
case JKQTPNoDecorator: return QObject::tr("no decorator");
case JKQTPArrow: return QObject::tr("arrow");
case JKQTPFilledArrow: return QObject::tr("filled arrow");
case JKQTPTriangleDecorator: return QObject::tr("triangle");
case JKQTPFilledTriangleDecorator: return QObject::tr("filled triangle");
improved arrows in geometric elements: - JKQTPGeoLine, JKQTPGeoPolyLines and JKQTPGeoInfiniteLine support decorators - improved decorator drawing - more decorator types - improved example geometry - added specific example geo_arrows - improved documentation - code cleanup
2020-08-23 19:13:53 +08:00
case JKQTPTriangleDecoratorAndBar: return QObject::tr("triangle, with bar");
case JKQTPFilledTriangleDecoratorAndBar: return QObject::tr("filled triangle, with bar");
added geometric plot JKQTPGeoArrow object to draw arrows
2020-08-22 00:31:58 +08:00
case JKQTPDoubleArrow: return QObject::tr("double arrow");
case JKQTPFilledDoubleArrow: return QObject::tr("filled double arrow");
case JKQTPCircleDecorator: return QObject::tr("circle");
case JKQTPFilledCircleDecorator: return QObject::tr("filled circle");
case JKQTPRectangleDecorator: return QObject::tr("rectangle");
case JKQTPFilledRectangleDecorator: return QObject::tr("filled rectangle");
improved arrows in geometric elements: - JKQTPGeoLine, JKQTPGeoPolyLines and JKQTPGeoInfiniteLine support decorators - improved decorator drawing - more decorator types - improved example geometry - added specific example geo_arrows - improved documentation - code cleanup
2020-08-23 19:13:53 +08:00
case JKQTPArrowAndBar: return QObject::tr("arrow, with bar");
case JKQTPDoubleArrowAndBar: return QObject::tr("double arrow, with bar");
case JKQTPBarDecorator: return QObject::tr("full bar");
case JKQTPHalfBarDecorator: return QObject::tr("half bar");
case JKQTPSkewedBarDecorator: return QObject::tr("skewed bar");
case JKQTPHarpoonDecorator: return QObject::tr("harpoon");
case JKQTPHarpoonDecoratorAndBar: return QObject::tr("harpoon, with bar");
case JKQTPDiamondDecorator: return QObject::tr("diamond");
case JKQTPFilledDiamondDecorator: return QObject::tr("filled diamond");
case JKQTPDiamondDecoratorAndBar: return QObject::tr("diamond, with bar");
case JKQTPFilledDiamondDecoratorAndBar: return QObject::tr("filled diamond, with bar");
added geometric plot JKQTPGeoArrow object to draw arrows
2020-08-22 00:31:58 +08:00
case JKQTPBracketDecorator: return QObject::tr("bracket");
case JKQTPLineDecoratorCount: JKQTPLineDecoratorStyle2NameString(JKQTPMaxLineDecoratorID);
}
return "";
}
JKQTPLineDecoratorStyle String2JKQTPLineDecoratorStyle(const QString &pos)
{
QString s=pos.trimmed().toLower();
if (s=="line_decorator_none"||s=="decorator_none"||s=="no_line_decorator"||s=="no_decorator"||s=="none"||s=="-") return JKQTPNoDecorator;
if (s=="arrow"||s=="simple_arrow"||s=="arr"||s=="->"||s=="<-"||s==">"||s=="<") return JKQTPArrow;
if (s=="filled_arrow") return JKQTPFilledArrow;
if (s=="triangle") return JKQTPTriangleDecorator;
if (s=="filled_triangle") return JKQTPFilledTriangleDecorator;
improved arrows in geometric elements: - JKQTPGeoLine, JKQTPGeoPolyLines and JKQTPGeoInfiniteLine support decorators - improved decorator drawing - more decorator types - improved example geometry - added specific example geo_arrows - improved documentation - code cleanup
2020-08-23 19:13:53 +08:00
if (s=="triangle_bar") return JKQTPTriangleDecoratorAndBar;
if (s=="filled_triangle_bar") return JKQTPFilledTriangleDecoratorAndBar;
added geometric plot JKQTPGeoArrow object to draw arrows
2020-08-22 00:31:58 +08:00
if (s=="double_arrow") return JKQTPDoubleArrow;
if (s=="filled_double_arrow") return JKQTPFilledDoubleArrow;
if (s=="circle") return JKQTPCircleDecorator;
if (s=="filled_circle") return JKQTPFilledCircleDecorator;
if (s=="rectangle") return JKQTPRectangleDecorator;
if (s=="filled_rectangle") return JKQTPFilledRectangleDecorator;
improved arrows in geometric elements: - JKQTPGeoLine, JKQTPGeoPolyLines and JKQTPGeoInfiniteLine support decorators - improved decorator drawing - more decorator types - improved example geometry - added specific example geo_arrows - improved documentation - code cleanup
2020-08-23 19:13:53 +08:00
if (s=="arrow_bar") return JKQTPArrowAndBar;
if (s=="double_arrow_bar") return JKQTPDoubleArrowAndBar;
if (s=="bar" || s=="vertical_line") return JKQTPBarDecorator;
if (s=="half_bar") return JKQTPHalfBarDecorator;
if (s=="skewed_bar") return JKQTPSkewedBarDecorator;
if (s=="harpoon") return JKQTPHarpoonDecorator;
if (s=="harpoon_bar") return JKQTPHarpoonDecoratorAndBar;
if (s=="diamond") return JKQTPDiamondDecorator;
if (s=="filled_diamond") return JKQTPFilledDiamondDecorator;
if (s=="diamond_bar") return JKQTPDiamondDecoratorAndBar;
if (s=="filled_diamond_bar") return JKQTPFilledDiamondDecoratorAndBar;
added geometric plot JKQTPGeoArrow object to draw arrows
2020-08-22 00:31:58 +08:00
if (s=="bracket") return JKQTPBracketDecorator;
return JKQTPNoDecorator;
}
improved arrows in geometric elements: - JKQTPGeoLine, JKQTPGeoPolyLines and JKQTPGeoInfiniteLine support decorators - improved decorator drawing - more decorator types - improved example geometry - added specific example geo_arrows - improved documentation - code cleanup
2020-08-23 19:13:53 +08:00
double JKQTPLineDecoratorStyleCalcDecoratorSize(double line_width, double decoratorSizeFactor)
{
if (line_width<=0.75) return 3.0+(decoratorSizeFactor*0.75-3.0)/(0.75*0.75)*line_width*line_width;
if (line_width<=1.0) return decoratorSizeFactor*line_width;
return decoratorSizeFactor*pow(line_width, 0.7);
}
- improved: geometric objects now use an adaptive drawing algorithm to represent curves (before e.g. ellipses were always separated into a fixed number of line-segments) - improved: constructors and access functions for several geometric objects (e.g. more constructors, additional functions to retrieve parameters in diferent forms, iterators for polygons, ...) - new: all geometric objects can either be drawn as graphic element (i.e. lines are straight line, even on non-linear axes), or as mathematical curve (i.e. on non-linear axes, lines become the appropriate curve representing the linear function, connecting the given start/end-points). The only exceptions are ellipses (and the derived arcs,pies,chords), which are always drawn as mathematical curves
2020-09-04 05:08:52 +08:00
Reference in New Issue Copy Permalink