X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fviewitempaintparams.hpp;h=3b150a883243b5a0d4ac52300627bee0731a86d5;hb=ddaded8bccdb05d700b4242b7b3ef59a55b39ac0;hp=a8b519067250976ff0990a510d93a5f2bca6df72;hpb=36e7001de1e6620deeb93fa77c2ec6c4ebc4b3ea;p=pulseview.git
diff --git a/pv/view/viewitempaintparams.hpp b/pv/view/viewitempaintparams.hpp
index a8b5190..3b150a8 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 .
*/
-#ifndef PULSEVIEW_PV_VIEW_ROWITEMPAINTPARAMS_H
-#define PULSEVIEW_PV_VIEW_ROWITEMPAINTPARAMS_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMPAINTPARAMS_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMPAINTPARAMS_HPP
+
+#include "pv/util.hpp"
#include
+#include
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_;
}
@@ -64,11 +68,11 @@ public:
}
int height() const {
- return rect_.width();
+ return rect_.height();
}
double pixels_offset() const {
- return offset_ / scale_;
+ return (offset_ / scale_).convert_to();
}
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_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEWITEMPAINTPARAMS_HPP