X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fviewitempaintparams.hpp;h=3b150a883243b5a0d4ac52300627bee0731a86d5;hp=86742ba7ceb811ec1e3642f7ee15e1776ac1e36e;hb=24c29d4f917ffac5a280d572cc04d1edb66a81b9;hpb=7a01bd3654ed046216308fa64edfd79be7cd525f

diff --git a/pv/view/viewitempaintparams.hpp b/pv/view/viewitempaintparams.hpp
index 86742ba7..3b150a88 100644
--- a/pv/view/viewitempaintparams.hpp
+++ b/pv/view/viewitempaintparams.hpp
@@ -14,22 +14,26 @@
  * 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/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEW_ROWITEMPAINTPARAMS_HPP
-#define PULSEVIEW_PV_VIEW_ROWITEMPAINTPARAMS_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMPAINTPARAMS_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMPAINTPARAMS_HPP
+
+#include "pv/util.hpp"
 
 #include <QFont>
+#include <QRect>
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 class ViewItemPaintParams
 {
 public:
-	ViewItemPaintParams(const QRect &rect, double scale, double offset);
+	ViewItemPaintParams(
+		const QRect &rect, double scale, const pv::util::Timestamp& offset);
 
 	QRect rect() const {
 		return rect_;
@@ -39,7 +43,7 @@ public:
 		return scale_;
 	}
 
-	double offset() const {
+	const pv::util::Timestamp& offset() const {
 		return offset_;
 	}
 
@@ -68,7 +72,7 @@ public:
 	}
 
 	double pixels_offset() const {
-		return offset_ / scale_;
+		return (offset_ / scale_).convert_to<double>();
 	}
 
 public:
@@ -79,10 +83,11 @@ public:
 private:
 	QRect rect_;
 	double scale_;
-	double offset_;
+	pv::util::Timestamp offset_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_ROWITEMPAINTPARAMS_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMPAINTPARAMS_HPP