projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set PopupToolButton::_popup to NULL at construction
[pulseview.git]
/
pv
/
view
/
ruler.cpp
diff --git
a/pv/view/ruler.cpp
b/pv/view/ruler.cpp
index bf1507a7fab31d0117e67ec4d18e50db8a0bbab0..aec3de979cf5171062df6777e78a42aaf4c74b03 100644
(file)
--- a/
pv/view/ruler.cpp
+++ b/
pv/view/ruler.cpp
@@
-37,12
+37,13
@@
#include <pv/widgets/popup.h>
#include <pv/widgets/popup.h>
-using namespace
boos
t;
-using
namespace std
;
+using namespace
Q
t;
+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};
@@
-84,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;