projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pv::prop::Double: Do not create a widget if the initial value could not be retrieved
[pulseview.git]
/
pv
/
view
/
ruler.cpp
diff --git
a/pv/view/ruler.cpp
b/pv/view/ruler.cpp
index 9e639383942ed1149702f9e369b16452a46eba1f..aec3de979cf5171062df6777e78a42aaf4c74b03 100644
(file)
--- a/
pv/view/ruler.cpp
+++ b/
pv/view/ruler.cpp
@@
-30,15
+30,20
@@
#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>
-using namespace std;
+#include <pv/widgets/popup.h>
+
+using namespace Qt;
+using boost::shared_ptr;
namespace pv {
namespace view {
namespace pv {
namespace view {
+const int Ruler::RulerHeight = 30;
const int Ruler::MinorTickSubdivision = 4;
const int Ruler::ScaleUnits[3] = {1, 2, 5};
const int Ruler::MinorTickSubdivision = 4;
const int Ruler::ScaleUnits[3] = {1, 2, 5};
@@
-49,9
+54,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,11
+63,19
@@
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)
{
const double multiplier = pow(10.0,
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);
QString s;
QTextStream ts(&s);
@@
-73,9
+85,13
@@
QString Ruler::format_time(double t, unsigned int prefix,
return s;
}
return s;
}
+QSize Ruler::sizeHint() const
+{
+ return QSize(0, RulerHeight);
+}
+
void Ruler::paintEvent(QPaintEvent*)
{
void Ruler::paintEvent(QPaintEvent*)
{
- using namespace Qt;
const double SpacingIncrement = 32.0f;
const double MinValueSpacing = 32.0f;
const double SpacingIncrement = 32.0f;
const double MinValueSpacing = 32.0f;
@@
-95,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 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;
unsigned int unit = 0;
@@
-163,7
+179,8
@@
void Ruler::paintEvent(QPaintEvent*)
} while (x < width());
// Draw the cursors
} while (x < width());
// 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);
@@
-173,52
+190,68
@@
void Ruler::paintEvent(QPaintEvent*)
void Ruler::mouseMoveEvent(QMouseEvent *e)
{
void Ruler::mouseMoveEvent(QMouseEvent *e)
{
- if (!
_grabbed_marker
)
+ if (!
(e->buttons() & Qt::LeftButton)
)
return;
return;
+
+ if ((e->pos() - _mouse_down_point).manhattanLength() <
+ QApplication::startDragDistance())
+ return;
+
+ _dragging = true;
- _grabbed_marker->set_time(_view.offset() +
- ((double)e->x() + 0.5) * _view.scale());
+ 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));