TraceView: Restore vertical offset

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

diff --git a/pv/view/viewitempaintparams.cpp b/pv/view/viewitempaintparams.cpp
index b6a179251e0605a2361439c5c7ae501f40591b40..cf0e5b3c8d5dbabe5591abe66c6921c5f861dee3 100644 (file)
--- a/pv/view/viewitempaintparams.cpp
+++ b/pv/view/viewitempaintparams.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
@@ -26,13 +25,15 @@
 #include "viewitempaintparams.hpp"
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 ViewItemPaintParams::ViewItemPaintParams(
-       const QRect &rect, double scale, double offset) :
+       const QRect &rect, double scale, const pv::util::Timestamp& offset) :
        rect_(rect),
        scale_(scale),
-       offset_(offset) {
+       offset_(offset)
+{
        assert(scale > 0.0);
 }
 
@@ -41,10 +42,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