projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced boost::function with std::function
[pulseview.git]
/
pv
/
view
/
ruler.cpp
diff --git
a/pv/view/ruler.cpp
b/pv/view/ruler.cpp
index 4649b10d69648ddfc4625acb8a94ef01b8d9a32c..934b0a67edc0e5f6a974cd6ad81e64d141d1d910 100644
(file)
--- a/
pv/view/ruler.cpp
+++ b/
pv/view/ruler.cpp
@@
-23,35
+23,32
@@
#include "cursor.h"
#include "view.h"
#include "viewport.h"
#include "cursor.h"
#include "view.h"
#include "viewport.h"
+#include "pv/util.h"
#include <extdef.h>
#include <extdef.h>
-#include <assert.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 std::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};
-const QString Ruler::SIPrefixes[9] =
- {"f", "p", "n", QChar(0x03BC), "m", "", "k", "M", "G"};
-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,9
+56,22
@@
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();
+}
+
+
+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;
@@
-73,7
+83,6
@@
void Ruler::paintEvent(QPaintEvent*)
double min_width = SpacingIncrement, typical_width;
double tick_period;
unsigned int prefix;
double min_width = SpacingIncrement, typical_width;
double tick_period;
unsigned int prefix;
- double multiplier;
// Find tick spacing, and number formatting that does not cause
// value to collide.
// Find tick spacing, and number formatting that does not cause
// value to collide.
@@
-82,7
+91,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;
@@
-91,14
+100,11
@@
void Ruler::paintEvent(QPaintEvent*)
tick_period = order_decimal * ScaleUnits[unit++];
} while (tick_period < min_period && unit < countof(ScaleUnits));
tick_period = order_decimal * ScaleUnits[unit++];
} while (tick_period < min_period && unit < countof(ScaleUnits));
- prefix = (order - FirstSIPrefixPower) / 3;
- assert(prefix < countof(SIPrefixes));
-
- multiplier = pow(10.0, - prefix * 3 - FirstSIPrefixPower);
+ prefix = (order - pv::util::FirstSIPrefixPower) / 3;
typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
typical_width = p.boundingRect(0, 0, INT_MAX, INT_MAX,
- AlignLeft | AlignTop, format_time(_view.offset(),
-
multiplier,
prefix)).width() + MinValueSpacing;
+ AlignLeft | AlignTop,
pv::util::
format_time(_view.offset(),
+ prefix)).width() + MinValueSpacing;
min_width += SpacingIncrement;
min_width += SpacingIncrement;
@@
-118,26
+124,24
@@
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)
{
// Draw a major tick
p.drawText(x, ValueMargin, 0, text_height,
AlignCenter | AlignTop | TextDontClip,
if (division % MinorTickSubdivision == 0)
{
// Draw a major tick
p.drawText(x, ValueMargin, 0, text_height,
AlignCenter | AlignTop | TextDontClip,
-
format_time(t, multiplier
, prefix));
+
pv::util::format_time(t
, prefix));
p.drawLine(QPointF(x, major_tick_y1),
QPointF(x, tick_y2));
}
p.drawLine(QPointF(x, major_tick_y1),
QPointF(x, tick_y2));
}
@@
-149,10
+153,12
@@
void Ruler::paintEvent(QPaintEvent*)
}
division++;
}
division++;
- }
+
+ } while (x < width());
// Draw the cursors
// Draw the cursors
- draw_cursors(p);
+ 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);
@@
-162,67
+168,72
@@
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()
;
}
}
- }
-}
-void Ruler::mouseReleaseEvent(QMouseEvent *)
-{
- _grabbed_marker = NULL;
-}
+ if (shared_ptr<TimeMarker> m = _grabbed_marker.lock())
+ m->select();
-QString Ruler::format_time(double t, double multiplier,
- unsigned int prefix)
-{
- QString s;
- QTextStream ts(&s);
- ts.setRealNumberPrecision(0);
- ts << fixed << forcesign << (t * multiplier) <<
- SIPrefixes[prefix] << "s";
- return s;
+ selection_changed();
+ }
}
}
-void Ruler::
draw_cursors(QPainter &p
)
+void Ruler::
mouseReleaseEvent(QMouseEvent *
)
{
{
- 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);
- cursors.second.paint_label(p, r);
+ _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));
- p.setBrush(QBrush(
QColor(Qt::black
)));
+ p.setBrush(QBrush(
palette().color(foregroundRole()
)));
const int b = height() - 1;
const QPointF points[] = {
const int b = height() - 1;
const QPointF points[] = {