projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced boost::shared_ptr with std::shared_ptr
[pulseview.git]
/
pv
/
view
/
ruler.cpp
diff --git
a/pv/view/ruler.cpp
b/pv/view/ruler.cpp
index 74bc1f979b5ee7b8f04a4643ad8f455bb9d3c1ab..934b0a67edc0e5f6a974cd6ad81e64d141d1d910 100644
(file)
--- a/
pv/view/ruler.cpp
+++ b/
pv/view/ruler.cpp
@@
-23,34
+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 boost;
-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) :
- MarginWidget(parent)
+ MarginWidget(parent),
+ _dragging(false)
{
setMouseTracking(true);
{
setMouseTracking(true);
@@
-66,23
+64,14
@@
void Ruler::clear_selection()
update();
}
update();
}
-QString Ruler::format_time(double t, unsigned int prefix,
- unsigned int precision)
+
+QSize Ruler::sizeHint() const
{
{
- const double multiplier = pow(10.0,
- - prefix * 3 - FirstSIPrefixPower);
-
- QString s;
- QTextStream ts(&s);
- ts.setRealNumberPrecision(precision);
- ts << fixed << forcesign << (t * multiplier) <<
- SIPrefixes[prefix] << "s";
- return s;
+ 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;
@@
-102,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;
@@
-111,12
+100,10
@@
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));
-
+ 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(),
+ AlignLeft | AlignTop,
pv::util::
format_time(_view.offset(),
prefix)).width() + MinValueSpacing;
min_width += SpacingIncrement;
prefix)).width() + MinValueSpacing;
min_width += SpacingIncrement;
@@
-154,7
+141,7
@@
void Ruler::paintEvent(QPaintEvent*)
// Draw a major tick
p.drawText(x, ValueMargin, 0, text_height,
AlignCenter | AlignTop | TextDontClip,
// Draw a major tick
p.drawText(x, ValueMargin, 0, text_height,
AlignCenter | AlignTop | TextDontClip,
- format_time(t, 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));
}
@@
-181,6
+168,15
@@
void Ruler::paintEvent(QPaintEvent*)
void Ruler::mouseMoveEvent(QMouseEvent *e)
{
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());
if (shared_ptr<TimeMarker> m = _grabbed_marker.lock())
m->set_time(_view.offset() +
((double)e->x() + 0.5) * _view.scale());
@@
-188,7
+184,10
@@
void Ruler::mouseMoveEvent(QMouseEvent *e)
void Ruler::mousePressEvent(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();
_grabbed_marker.reset();
clear_selection();
@@
-212,6
+211,17
@@
void Ruler::mousePressEvent(QMouseEvent *e)
void Ruler::mouseReleaseEvent(QMouseEvent *)
{
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();
}
_grabbed_marker.reset();
}
@@
-219,7
+229,7
@@
void Ruler::draw_hover_mark(QPainter &p)
{
const int x = _view.hover_point().x();
{
const int x = _view.hover_point().x();
- if (x == -1 ||
!_grabbed_marker.expired()
)
+ if (x == -1 ||
_dragging
)
return;
p.setPen(QPen(Qt::NoPen));
return;
p.setPen(QPen(Qt::NoPen));