TimeMarker: Align to a integer pixel offset

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

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 1b3d371748b844255e0f5ef8b29b311d8130a538..2ed43ba283b4f16c8f9c1a20a22e7138e2b3c63e 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -14,13 +14,12 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <algorithm>
 #include <cassert>
 #include <cmath>
-#include <algorithm>
 #include <limits>
 
 #include "signal.hpp"
@@ -32,20 +31,20 @@
 
 #include <QMouseEvent>
 
+#include <QDebug>
+
 using std::abs;
 using std::back_inserter;
 using std::copy;
 using std::dynamic_pointer_cast;
-using std::max;
-using std::min;
-using std::none_of;
-using std::numeric_limits;
+using std::none_of; // Used in assert()s.
 using std::shared_ptr;
 using std::stable_sort;
 using std::vector;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 Viewport::Viewport(View &parent) :
        ViewWidget(parent),
@@ -60,15 +59,14 @@ shared_ptr<ViewItem> Viewport::get_mouse_over_item(const QPoint &pt)
        const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
        const vector< shared_ptr<ViewItem> > items(this->items());
        for (auto i = items.rbegin(); i != items.rend(); i++)
-               if ((*i)->enabled() &&
-                       (*i)->hit_box_rect(pp).contains(pt))
+               if ((*i)->enabled() && (*i)->hit_box_rect(pp).contains(pt))
                        return *i;
        return nullptr;
 }
 
 void Viewport::item_hover(const shared_ptr<ViewItem> &item)
 {
-       if (item)
+       if (item && item->is_draggable())
                setCursor(dynamic_pointer_cast<RowItem>(item) ?
                        Qt::SizeVerCursor : Qt::SizeHorCursor);
        else
@@ -78,6 +76,7 @@ void Viewport::item_hover(const shared_ptr<ViewItem> &item)
 void Viewport::drag()
 {
        drag_offset_ = view_.offset();
+       drag_v_offset_ = view_.owner_visual_v_offset();
 }
 
 void Viewport::drag_by(const QPoint &delta)
@@ -87,6 +86,8 @@ void Viewport::drag_by(const QPoint &delta)
 
        view_.set_scale_offset(view_.scale(),
                (*drag_offset_ - delta.x() * view_.scale()));
+
+       view_.set_v_offset(-drag_v_offset_ - delta.y());
 }
 
 void Viewport::drag_release()
@@ -97,7 +98,7 @@ void Viewport::drag_release()
 vector< shared_ptr<ViewItem> > Viewport::items()
 {
        vector< shared_ptr<ViewItem> > items;
-       const std::vector< shared_ptr<ViewItem> > view_items(
+       const vector< shared_ptr<ViewItem> > view_items(
                view_.list_by_type<ViewItem>());
        copy(view_items.begin(), view_items.end(), back_inserter(items));
        const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
@@ -179,10 +180,9 @@ void Viewport::paintEvent(QPaintEvent*)
        for (const shared_ptr<RowItem> r : row_items)
                r->paint_mid(p, pp);
 
-       p.setRenderHint(QPainter::Antialiasing, false);
-
        for (const shared_ptr<RowItem> r : row_items)
                r->paint_fore(p, pp);
+
        for (const shared_ptr<TimeItem> t : time_items)
                t->paint_fore(p, pp);
 
@@ -199,29 +199,27 @@ void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
                view_.zoom(-2.0, event->x());
 }
 
-void Viewport::wheelEvent(QWheelEvent *e)
+void Viewport::wheelEvent(QWheelEvent *event)
 {
-       assert(e);
+       assert(event);
 
-       if (e->orientation() == Qt::Vertical)
-       {
-               if (e->modifiers() & Qt::ControlModifier) {
+       if (event->orientation() == Qt::Vertical) {
+               if (event->modifiers() & Qt::ControlModifier) {
                        // Vertical scrolling with the control key pressed
                        // is intrepretted as vertical scrolling
                        view_.set_v_offset(-view_.owner_visual_v_offset() -
-                               (e->delta() * height()) / (8 * 120));
+                               (event->delta() * height()) / (8 * 120));
                } else {
                        // Vertical scrolling is interpreted as zooming in/out
-                       view_.zoom(e->delta() / 120, e->x());
+                       view_.zoom(event->delta() / 120, event->x());
                }
-       }
-       else if (e->orientation() == Qt::Horizontal)
-       {
+       } else if (event->orientation() == Qt::Horizontal) {
                // Horizontal scrolling is interpreted as moving left/right
                view_.set_scale_offset(view_.scale(),
-                       e->delta() * view_.scale() + view_.offset());
+                       event->delta() * view_.scale() + view_.offset());
        }
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv