tempo-plotter Changeset - a05995d9dbe1 · protofusion repositories

Changeset - a05995d9dbe1

Parent rev.

Child rev.

[Not reviewed]

value-tracker

0 1 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-10-01 15:49:25
hy@ozderya.net

v-center the text and add margin

1 file changed with 6 insertions and 2 deletions:

src/zoomer.cpp

0 comments (0 inline, 0 general)

src/zoomer.cpp

➞

Show inline comments

@@ @@ -15,24 +15,25 @@ @@
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "zoomer.h"
 #include <qwt_plot.h>
 #include <QPen>
 #include <QMouseEvent>
 #include <QtMath>
 static const int VALUE_POINT_DIAM = 4;
 static const int VALUE_TEXT_MARGIN = VALUE_POINT_DIAM + 2;
 Zoomer::Zoomer(QWidget* widget, const Stream* stream, bool doReplot) :
     ScrollZoomer(widget)
+{
     is_panning = false;
     _stream = stream;
     setTrackerMode(AlwaysOn);
     // set corner widget between the scrollbars with default background color
     auto cornerWidget = new QWidget();
     auto bgColor = cornerWidget->palette().color(QPalette::Window).name();
@@ @@ -136,25 +137,28 @@ void Zoomer::drawValues(QPainter* painte @@
     for (int ci = 0; ci < values.size(); ci++)
+    {
         double val = values[ci];
         if (!std::isnan(val))
+        {
             auto p = transform(QPointF(x, val));
             painter->setBrush(_stream->channel(ci)->color());
             painter->setPen(Qt::NoPen);
             painter->drawEllipse(p, VALUE_POINT_DIAM, VALUE_POINT_DIAM);
             painter->setPen(Qt::white);
             painter->drawText(p, QString("%1").arg(val));
             // We give a very small (1x1) rectangle but disable clipping
             painter->drawText(QRectF(p.x() + VALUE_TEXT_MARGIN, p.y(), 1, 1),
                               Qt::AlignVCenter | Qt::TextDontClip,
                               QString("%1").arg(val));
+        }
+    }
     painter->restore();
+}
 QVector<double> Zoomer::findValues(double x) const
+{
     // TODO: process only channel(s) of this plot
     unsigned nc = _stream->numChannels();
     QVector<double> r(nc);
     for (unsigned ci = 0; ci < nc; ci++)
@@ @@ -173,25 +177,25 @@ QRect Zoomer::trackerRect(const QFont& f @@
         return QwtPlotZoomer::trackerRect(font);
+    }
     else
+    {
         return valueTrackerRect(font);
+    }
+}
 QRect Zoomer::valueTrackerRect(const QFont& font) const
+{
     // TODO: consider using actual tracker values for width calculation
     const int textWidth = qCeil(QwtText("-8.8888888").textSize(font).width());
     const int width = textWidth + VALUE_POINT_DIAM;
+    const int width = textWidth + VALUE_POINT_DIAM + VALUE_TEXT_MARGIN;
     const int x = trackerPosition().x() - VALUE_POINT_DIAM;
     const auto pickRect = pickArea().boundingRect();
     return QRect(x, pickRect.y(), width, pickRect.height());
+}
 void Zoomer::widgetMousePressEvent(QMouseEvent* mouseEvent)
+{
     if (mouseEvent->modifiers() & Qt::ControlModifier)
+    {
         is_panning = true;
         parentWidget()->setCursor(Qt::ClosedHandCursor);

0 comments (0 inline, 0 general)