From c8395f2ada5dd23ca3f7ed4b376343163572aaa1 Mon Sep 17 00:00:00 2001
From: jkriege2 <jan@jkrieger.de>
Date: Sun, 16 Jun 2019 13:27:40 +0200
Subject: [PATCH] JKQTPSingleColumnSymbolsGraph: added Rug-Plot

---
 .../JKQTPSingleColumnSymbolsGraph_RugPlot.png | Bin 0 -> 4171 bytes
 .../jkqtpgraphssinglecolumnsymbols.cpp        |  38 ++++++++++++++++--
 .../jkqtpgraphssinglecolumnsymbols.h          |   1 +
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 doc/images/JKQTPSingleColumnSymbolsGraph_RugPlot.png

diff --git a/doc/images/JKQTPSingleColumnSymbolsGraph_RugPlot.png b/doc/images/JKQTPSingleColumnSymbolsGraph_RugPlot.png
new file mode 100644
index 0000000000000000000000000000000000000000..3434c6f588224e4765bd74ff59f4891f336167fc
GIT binary patch
literal 4171
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
Vg(&7`B*g##002ovPDHLkV1k%C_?-X%

literal 0
HcmV?d00001

diff --git a/lib/jkqtplotter/jkqtpgraphssinglecolumnsymbols.cpp b/lib/jkqtplotter/jkqtpgraphssinglecolumnsymbols.cpp
index 93ae9adee9..0981214fb2 100644
--- a/lib/jkqtplotter/jkqtpgraphssinglecolumnsymbols.cpp
+++ b/lib/jkqtplotter/jkqtpgraphssinglecolumnsymbols.cpp
@@ -119,6 +119,11 @@ void JKQTPSingleColumnSymbolsGraph::draw(JKQTPEnhancedPainter &painter)
         std::uniform_real_distribution<> dRandomScatter{position-width/2.0, position+width/2.0};
 
         const double symSize=parent->pt2px(painter, getSymbolSize());
+        QPen p=painter.pen();
+        p.setColor(getSymbolColor());
+        p.setWidthF(qMax(JKQTPlotterDrawingTools::ABS_MIN_LINEWIDTH,  parent->pt2px(painter, getSymbolLineWidth())));
+        p.setStyle(Qt::SolidLine);
+        p.setCapStyle(Qt::FlatCap);
 
 
         QVector<QPointF> plotSymbols; // collects symbol locations e.g. for BeeSwarmScatter-plots
@@ -154,7 +159,13 @@ void JKQTPSingleColumnSymbolsGraph::draw(JKQTPEnhancedPainter &painter)
                 }
                 plotSymbols.append(QPointF(x,y));
                 if (JKQTPIsOKFloat(xv) && JKQTPIsOKFloat(yv)) {
-                    plotStyledSymbol(parent, painter, x, y);
+                    if (positionScatterStyle!=RugPlot) {
+                        plotStyledSymbol(parent, painter, x, y);
+                    } else {
+                        painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
+                        painter.setPen(p);
+                        painter.drawLine(QLineF(x, y-symSize,x,y+symSize));
+                    }
                     addHitTestData(xv, yv,iii, datastore);
                 }
             }
@@ -180,8 +191,13 @@ void JKQTPSingleColumnSymbolsGraph::draw(JKQTPEnhancedPainter &painter)
                 }
                 plotSymbols.append(QPointF(x,y));
                 if (JKQTPIsOKFloat(xv) && JKQTPIsOKFloat(yv)) {
-                    plotSymbols.append(QPointF(x,y));
-                    plotStyledSymbol(parent, painter, x, y);
+                    if (positionScatterStyle!=RugPlot) {
+                        plotStyledSymbol(parent, painter, x, y);
+                    } else {
+                        painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
+                        painter.setPen(p);
+                        painter.drawLine(QLineF(x-symSize, y,x+symSize,y));
+                    }
                     addHitTestData(xv, yv,iii, datastore);
                 }
             }
@@ -206,7 +222,21 @@ void JKQTPSingleColumnSymbolsGraph::drawKeyMarker(JKQTPEnhancedPainter &painter,
     painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
     QPen p=getSymbolPen(painter, parent);
     painter.setPen(p);
-    JKQTPPlotSymbol(painter, rect.left()+rect.width()/2.0, rect.top()+rect.height()/2.0, getSymbolType(), symbolSize, symbolWidth, getKeyLabelColor(), getSymbolFillColor());
+    if (positionScatterStyle!=RugPlot) {
+        JKQTPPlotSymbol(painter, rect.left()+rect.width()/2.0, rect.top()+rect.height()/2.0, getSymbolType(), symbolSize, symbolWidth, getKeyLabelColor(), getSymbolFillColor());
+    } else {
+        painter.translate(rect.center());
+        if (dataDirection==DataDirection::X) {
+            painter.rotate(90);
+        }
+        painter.drawLine(QLineF(-rect.width()/4.0, rect.height()*(-0.4), rect.width()/4.0, rect.height()*(-0.4)));
+        painter.drawLine(QLineF(-rect.width()/4.0, rect.height()*(-0.2), rect.width()/4.0, rect.height()*(-0.2)));
+        painter.drawLine(QLineF(-rect.width()/4.0, rect.height()*0.0, rect.width()/4.0, rect.height()*0.0));
+        painter.drawLine(QLineF(-rect.width()/4.0, rect.height()*0.05, rect.width()/4.0, rect.height()*0.05));
+        painter.drawLine(QLineF(-rect.width()/4.0, rect.height()*0.15, rect.width()/4.0, rect.height()*0.15));
+        painter.drawLine(QLineF(-rect.width()/4.0, rect.height()*0.3, rect.width()/4.0, rect.height()*0.3));
+        painter.drawLine(QLineF(-rect.width()/4.0, rect.height()*0.45, rect.width()/4.0, rect.height()*0.45));
+    }
 
 }
 
diff --git a/lib/jkqtplotter/jkqtpgraphssinglecolumnsymbols.h b/lib/jkqtplotter/jkqtpgraphssinglecolumnsymbols.h
index 389b78a751..11855908e7 100644
--- a/lib/jkqtplotter/jkqtpgraphssinglecolumnsymbols.h
+++ b/lib/jkqtplotter/jkqtpgraphssinglecolumnsymbols.h
@@ -57,6 +57,7 @@ class JKQTP_LIB_EXPORT JKQTPSingleColumnSymbolsGraph: public JKQTPSingleColumnGr
             NoScatter, /*!< \brief missing coordinate is exactly position for every datapoint in dataColumn \image html JKQTPSingleColumnSymbolsGraph_NoScatter.png */
             RandomScatter, /*!< \brief missing coordinate scatters around position (with distribution-width width ) \image html JKQTPSingleColumnSymbolsGraph_RandomScatter.png */
             BeeSwarmScatter, /*!< \brief missing coordinate scatters around position and the algorithm tries to prevent overlay of two symbols ("bee swarm plot", see e.g. <a href="https://www.r-statistics.com/2011/03/beeswarm-boxplot-and-plotting-it-with-r/">https://www.r-statistics.com/2011/03/beeswarm-boxplot-and-plotting-it-with-r/</a>). Note that this algorithm can be rather slow!!! \image html JKQTPSingleColumnSymbolsGraph_BeeSwarmScatter.png */
+            RugPlot, /*!< \brief like NoScatter but draws each data-point as a horzintal/vertical line, centered around position, not as a symbol ("rug plot", see e.g. <a href="https://en.wikipedia.org/wiki/Rug_plot">https://en.wikipedia.org/wiki/Rug_plot</a>).  \image html JKQTPSingleColumnSymbolsGraph_RugPlot.png */
         };
 
         /** \brief class constructor */