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 06cd1b1540ba3dca171d2cd286cdc35f66d1fd86..aec3de979cf5171062df6777e78a42aaf4c74b03 100644
(file)
--- a/
pv/view/ruler.cpp
+++ b/
pv/view/ruler.cpp
@@
-30,16
+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 boost;
-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};
@@
-71,7
+75,7
@@
QString Ruler::format_time(double t, unsigned int prefix,
unsigned int precision)
{
const double multiplier = pow(10.0,
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);
@@
-81,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;
@@
-103,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;
@@
-225,6
+233,16
@@
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();
}
_dragging = false;
_grabbed_marker.reset();
}