projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added missing includes and defintions
[pulseview.git]
/
pv
/
view
/
ruler.cpp
diff --git
a/pv/view/ruler.cpp
b/pv/view/ruler.cpp
index eb658e484bb4af8ec9f522a34869731144005230..a9a8452d47fc6784d6d736762ba4938ce3408895 100644
(file)
--- a/
pv/view/ruler.cpp
+++ b/
pv/view/ruler.cpp
@@
-30,10
+30,14
@@
#include <math.h>
#include <limits.h>
#include <math.h>
#include <limits.h>
+#include <QApplication>
#include <QMouseEvent>
#include <QPainter>
#include <QTextStream>
#include <QMouseEvent>
#include <QPainter>
#include <QTextStream>
+#include <pv/widgets/popup.h>
+
+using namespace boost;
using namespace std;
namespace pv {
using namespace std;
namespace pv {
@@
-49,9
+53,8
@@
const int Ruler::FirstSIPrefixPower = -15;
const int Ruler::HoverArrowSize = 5;
Ruler::Ruler(View &parent) :
const int Ruler::HoverArrowSize = 5;
Ruler::Ruler(View &parent) :
- QWidget(&parent),
- _view(parent),
- _grabbed_marker(NULL)
+ MarginWidget(parent),
+ _dragging(false)
{
setMouseTracking(true);
{
setMouseTracking(true);
@@
-59,6
+62,14
@@
Ruler::Ruler(View &parent) :
this, SLOT(hover_point_changed()));
}
this, SLOT(hover_point_changed()));
}
+void Ruler::clear_selection()
+{
+ CursorPair &cursors = _view.cursors();
+ cursors.first()->select(false);
+ cursors.second()->select(false);
+ update();
+}
+
QString Ruler::format_time(double t, unsigned int prefix,
unsigned int precision)
{
QString Ruler::format_time(double t, unsigned int prefix,
unsigned int precision)
{
@@
-130,19
+141,17
@@
void Ruler::paintEvent(QPaintEvent*)
const double t0 = first_major_division * tick_period;
int division = (int)round(first_minor_division -
const double t0 = first_major_division * tick_period;
int division = (int)round(first_minor_division -
- first_major_division * MinorTickSubdivision);
+ first_major_division * MinorTickSubdivision)
- 1
;
const int major_tick_y1 = text_height + ValueMargin * 2;
const int tick_y2 = height();
const int minor_tick_y1 = (major_tick_y1 + tick_y2) / 2;
const int major_tick_y1 = text_height + ValueMargin * 2;
const int tick_y2 = height();
const int minor_tick_y1 = (major_tick_y1 + tick_y2) / 2;
- while (1)
- {
- const double t = t0 + division * minor_tick_period;
- const double x = (t - _view.offset()) / _view.scale();
+ double x;
- if (x >= width())
- break;
+ do {
+ const double t = t0 + division * minor_tick_period;
+ x = (t - _view.offset()) / _view.scale();
if (division % MinorTickSubdivision == 0)
{
if (division % MinorTickSubdivision == 0)
{
@@
-161,10
+170,12
@@
void Ruler::paintEvent(QPaintEvent*)
}
division++;
}
division++;
- }
+
+ } while (x < width());
// Draw the cursors
// Draw the cursors
- draw_cursors(p, prefix);
+ if (_view.cursors_shown())
+ _view.cursors().draw_markers(p, rect(), prefix);
// Draw the hover mark
draw_hover_mark(p);
// Draw the hover mark
draw_hover_mark(p);
@@
-174,52
+185,68
@@
void Ruler::paintEvent(QPaintEvent*)
void Ruler::mouseMoveEvent(QMouseEvent *e)
{
void Ruler::mouseMoveEvent(QMouseEvent *e)
{
- if (!_grabbed_marker)
+ if (!(e->buttons() & Qt::LeftButton))
+ return;
+
+ if ((e->pos() - _mouse_down_point).manhattanLength() <
+ QApplication::startDragDistance())
return;
return;
- _grabbed_marker->set_time(_view.offset() +
- ((double)e->x() + 0.5) * _view.scale());
+ _dragging = true;
+
+ if (shared_ptr<TimeMarker> m = _grabbed_marker.lock())
+ m->set_time(_view.offset() +
+ ((double)e->x() + 0.5) * _view.scale());
}
void Ruler::mousePressEvent(QMouseEvent *e)
{
}
void Ruler::mousePressEvent(QMouseEvent *e)
{
- if (e->buttons() & Qt::LeftButton) {
- _grabbed_marker = NULL;
+ if (e->buttons() & Qt::LeftButton)
+ {
+ _mouse_down_point = e->pos();
+
+ _grabbed_marker.reset();
+
+ clear_selection();
if (_view.cursors_shown()) {
if (_view.cursors_shown()) {
- std::pair<Cursor, Cursor> &cursors =
- _view.cursors();
- if (cursors.first.get_label_rect(
+ CursorPair &cursors = _view.cursors();
+ if (cursors.first()->get_label_rect(
rect()).contains(e->pos()))
rect()).contains(e->pos()))
- _grabbed_marker =
&cursors.first
;
- else if (cursors.second
.
get_label_rect(
+ _grabbed_marker =
cursors.first()
;
+ else if (cursors.second
()->
get_label_rect(
rect()).contains(e->pos()))
rect()).contains(e->pos()))
- _grabbed_marker =
&cursors.second
;
+ _grabbed_marker =
cursors.second()
;
}
}
+
+ if (shared_ptr<TimeMarker> m = _grabbed_marker.lock())
+ m->select();
+
+ selection_changed();
}
}
void Ruler::mouseReleaseEvent(QMouseEvent *)
{
}
}
void Ruler::mouseReleaseEvent(QMouseEvent *)
{
- _grabbed_marker = NULL;
-}
-
-void Ruler::draw_cursors(QPainter &p, unsigned int prefix)
-{
- if (!_view.cursors_shown())
- return;
+ 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();
+ }
- const QRect r = rect();
- pair<Cursor, Cursor> &cursors = _view.cursors();
- cursors.first.paint_label(p, r, prefix);
- cursors.second.paint_label(p, r, prefix);
+ _dragging = false;
+ _grabbed_marker.reset();
}
void Ruler::draw_hover_mark(QPainter &p)
{
const int x = _view.hover_point().x();
}
void Ruler::draw_hover_mark(QPainter &p)
{
const int x = _view.hover_point().x();
- if (x == -1 || _
grabbed_marker
)
+ if (x == -1 || _
dragging
)
return;
p.setPen(QPen(Qt::NoPen));
return;
p.setPen(QPen(Qt::NoPen));