X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=eaa03b942294e62c4500f7b59bdbccb1a4b3ef8d;hp=b5662e4b6ba32e3ec6b90945f11799cf68cc59ce;hb=60938e0430a0d08792ba53b86ca94153baaed74d;hpb=cbf0f87e496c9d9157591c94dc445aaa960fe79d
diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index b5662e4b..eaa03b94 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -14,22 +14,22 @@
* 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 .
*/
#include
+#include
#include
#include "timemarker.hpp"
-#include "view.hpp"
#include "pv/widgets/timestampspinbox.hpp"
+#include "view.hpp"
#include
-#include
#include
+#include
#include
#include
@@ -38,7 +38,8 @@ using std::max;
using std::min;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const int TimeMarker::ArrowSize = 4;
@@ -73,7 +74,7 @@ void TimeMarker::set_time(const pv::util::Timestamp& time)
float TimeMarker::get_x() const
{
- return ((time_ - view_.offset()) / view_.scale()).convert_to();
+ return std::roundf(((time_ - view_.offset()) / view_.scale()).convert_to()) + 0.5f;
}
QPoint TimeMarker::point(const QRect &rect) const
@@ -107,7 +108,7 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
if (!enabled())
return;
- const qreal x = ((time_ - view_.offset()) / view_.scale()).convert_to();
+ const qreal x = get_x();
const QRectF r(label_rect(rect));
const QPointF points[] = {
@@ -153,7 +154,7 @@ void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
}
-void TimeMarker::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
+void TimeMarker::paint_fore(QPainter &p, ViewItemPaintParams &pp)
{
if (!enabled())
return;
@@ -191,5 +192,6 @@ void TimeMarker::on_value_changed(const pv::util::Timestamp& value)
set_time(value);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv