mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2025-01-12 08:50:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

FIXED: Barcharts were not filled with cycling patterns properly and the first default symbol was never used (in JKQTBasePlotter::getPlotStyle())

Browse Source
This commit is contained in:
jkriege2 2023-07-21 21:53:06 +02:00
parent c371899579
commit 7f6c5fc9aa
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/jkqtplotter/jkqtpbaseplotter.cpp
View File

@ -547,11 +547,15 @@ double JKQTBasePlotter::getAbsoluteYMax() const {
} }
void JKQTBasePlotter::addGridPrintingPlotter(size_t x, size_t y, JKQTBasePlotter *plotter) { void JKQTBasePlotter::addGridPrintingPlotter(size_t x, size_t y, JKQTBasePlotter *plotter) {
JKQTPGridPrintingItem i; if (plotter==this) {
i.x=x; setGridPrintingCurrentPos(x,y);
i.y=y; } else {
i.plotter=plotter; JKQTPGridPrintingItem i;
gridPrintingList.push_back(i); i.x=x;
i.y=y;
i.plotter=plotter;
gridPrintingList.push_back(i);
}
} }
void JKQTBasePlotter::clearGridPrintingPlotters() { void JKQTBasePlotter::clearGridPrintingPlotters() {
@ -1074,7 +1078,7 @@ void JKQTBasePlotter::drawSystemYAxis(JKQTPEnhancedPainter& painter) {
JKQTBasePlotter::JKQTPPen JKQTBasePlotter::getPlotStyle(int i, JKQTPPlotStyleType type) const{ JKQTBasePlotter::JKQTPPen JKQTBasePlotter::getPlotStyle(int i, JKQTPPlotStyleType type) const{
int colorI=-1; int colorI=-1;
int styleI=0; int styleI=0;
int symbolI=0; int symbolI=-1;
int brushI=0; int brushI=0;
for (int k=0; k<=i; k++) { for (int k=0; k<=i; k++) {
colorI++; colorI++;
@ -1109,9 +1113,6 @@ JKQTBasePlotter::JKQTPPen JKQTBasePlotter::getPlotStyle(int i, JKQTPPlotStyleTyp
if (type==JKQTPPlotStyleType::Barchart || type==JKQTPPlotStyleType::Boxplot || type==JKQTPPlotStyleType::Impulses) { if (type==JKQTPPlotStyleType::Barchart || type==JKQTPPlotStyleType::Boxplot || type==JKQTPPlotStyleType::Impulses) {
basePenStyle=Qt::SolidLine; basePenStyle=Qt::SolidLine;
} }
if (type==JKQTPPlotStyleType::Barchart) {
basebrushStyle=Qt::SolidPattern;
}
if (type==JKQTPPlotStyleType::Boxplot) { if (type==JKQTPPlotStyleType::Boxplot) {
basebrushStyle=Qt::SolidPattern; basebrushStyle=Qt::SolidPattern;
} }