X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewitempaintparams.cpp;h=cf0e5b3c8d5dbabe5591abe66c6921c5f861dee3;hp=4edc30a35e6a13a96dc0e645b0e67b91d3349683;hb=39ab01e794a0c13cfc012e90dd17eaebc234fb38;hpb=5b5fa4da3b7112414b9f51e6626ae7f4bf606f02

diff --git a/pv/view/viewitempaintparams.cpp b/pv/view/viewitempaintparams.cpp
index 4edc30a3..cf0e5b3c 100644
--- 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,15 +25,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 +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