Merge pull request #115 from FalsinSoft/Branch_v4.0.0

Fix custom labels draw
jkriege2 · Jan 6, 2024 · 0d4e3bf · 0d4e3bf
2 parents 24bebf1 + 194a3b0
commit 0d4e3bf
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/lib/jkqtplotter/jkqtpcoordinateaxes.cpp b/lib/jkqtplotter/jkqtpcoordinateaxes.cpp
@@ -1012,13 +1012,9 @@ bool JKQTPCoordinateAxis::getNextLabel(double& x, QString& label, bool init) {
  } else {
  for (int i=0; i<tickLabels.size(); i++) {
  if (x==tickLabels[i].first && i+1<tickLabels.size()) {
- if (x>=axismin && x<=axismax) {
- label=tickLabels[i+1].second;
- x=tickLabels[i+1].first;
- return true;
- } else {
- return false;
- }
+ x=tickLabels[i + 1].first;
+ label=tickLabels[i + 1].second;
+ return (x<=axismax);
  }
  }
  }