Change namespace for the trace view and implement ViewBase

[pulseview.git] / pv / view / viewitempaintparams.cpp

diff --git a/pv/view/viewitempaintparams.cpp b/pv/view/viewitempaintparams.cpp
index 4edc30a35e6a13a96dc0e645b0e67b91d3349683..1727bd5ae761a11b35e567b61c77510674ac878b 100644 (file)
--- a/pv/view/viewitempaintparams.cpp
+++ b/pv/view/viewitempaintparams.cpp
@@ -26,15 +26,15 @@
 #include "viewitempaintparams.hpp"
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 ViewItemPaintParams::ViewItemPaintParams(
-       int left, int right, double scale, double offset) :
-       left_(left),
-       right_(right),
+       const QRect &rect, double scale, const pv::util::Timestamp& offset) :
+       rect_(rect),
        scale_(scale),
-       offset_(offset) {
-       assert(left <= right);
+       offset_(offset)
+{
        assert(scale > 0.0);
 }
 
@@ -43,10 +43,11 @@ QFont ViewItemPaintParams::font()
        return QApplication::font();
 }
 
-int ViewItemPaintParams::text_height() {
-       QFontMetrics m(font());
-       return m.boundingRect(QRect(), 0, "Tg").height();
+int ViewItemPaintParams::text_height()
+{
+       return QFontMetrics(font()).height();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv