Replaced using namespace with using class directives

[pulseview.git] / pv / view / ruler.cpp

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index 74bc1f979b5ee7b8f04a4643ad8f455bb9d3c1ab..aec3de979cf5171062df6777e78a42aaf4c74b03 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -30,16 +30,20 @@
 #include <math.h>
 #include <limits.h>
 
+#include <QApplication>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QTextStream>
 
-using namespace boost;
-using namespace std;
+#include <pv/widgets/popup.h>
+
+using namespace Qt;
+using boost::shared_ptr;
 
 namespace pv {
 namespace view {
 
+const int Ruler::RulerHeight = 30;
 const int Ruler::MinorTickSubdivision = 4;
 const int Ruler::ScaleUnits[3] = {1, 2, 5};
 
@@ -50,7 +54,8 @@ const int Ruler::FirstSIPrefixPower = -15;
 const int Ruler::HoverArrowSize = 5;
 
 Ruler::Ruler(View &parent) :
-       MarginWidget(parent)
+       MarginWidget(parent),
+       _dragging(false)
 {
        setMouseTracking(true);
 
@@ -70,7 +75,7 @@ QString Ruler::format_time(double t, unsigned int prefix,
        unsigned int precision)
 {
        const double multiplier = pow(10.0,
-               - prefix * 3 - FirstSIPrefixPower);
+               (int)- prefix * 3 - FirstSIPrefixPower);
 
        QString s;
        QTextStream ts(&s);
@@ -80,9 +85,13 @@ QString Ruler::format_time(double t, unsigned int prefix,
        return s;
 }
 
+QSize Ruler::sizeHint() const
+{
+       return QSize(0, RulerHeight);
+}
+
 void Ruler::paintEvent(QPaintEvent*)
 {
-       using namespace Qt;
 
        const double SpacingIncrement = 32.0f;
        const double MinValueSpacing = 32.0f;
@@ -102,7 +111,7 @@ void Ruler::paintEvent(QPaintEvent*)
                const double min_period = _view.scale() * min_width;
 
                const int order = (int)floorf(log10f(min_period));
-               const double order_decimal = pow(10, order);
+               const double order_decimal = pow(10.0, order);
 
                unsigned int unit = 0;
 
@@ -181,6 +190,15 @@ void Ruler::paintEvent(QPaintEvent*)
 
 void Ruler::mouseMoveEvent(QMouseEvent *e)
 {
+       if (!(e->buttons() & Qt::LeftButton))
+               return;
+       
+       if ((e->pos() - _mouse_down_point).manhattanLength() <
+               QApplication::startDragDistance())
+               return;
+
+       _dragging = true;
+
        if (shared_ptr<TimeMarker> m = _grabbed_marker.lock())
                m->set_time(_view.offset() +
                        ((double)e->x() + 0.5) * _view.scale());
@@ -188,7 +206,10 @@ void Ruler::mouseMoveEvent(QMouseEvent *e)
 
 void Ruler::mousePressEvent(QMouseEvent *e)
 {
-       if (e->buttons() & Qt::LeftButton) {
+       if (e->buttons() & Qt::LeftButton)
+       {
+               _mouse_down_point = e->pos();
+
                _grabbed_marker.reset();
 
                clear_selection();
@@ -212,6 +233,17 @@ void Ruler::mousePressEvent(QMouseEvent *e)
 
 void Ruler::mouseReleaseEvent(QMouseEvent *)
 {
+       using pv::widgets::Popup;
+
+       if (!_dragging)
+               if (shared_ptr<TimeMarker> m = _grabbed_marker.lock()) {
+                       Popup *const p = m->create_popup(&_view);
+                       p->set_position(mapToGlobal(QPoint(m->get_x(),
+                               height())), Popup::Bottom);
+                       p->show();
+               }
+
+       _dragging = false;
        _grabbed_marker.reset();
 }
 
@@ -219,7 +251,7 @@ void Ruler::draw_hover_mark(QPainter &p)
 {
        const int x = _view.hover_point().x();
 
-       if (x == -1 || !_grabbed_marker.expired())
+       if (x == -1 || _dragging)
                return;
 
        p.setPen(QPen(Qt::NoPen));