X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=853f7c02675e0b594606e96eff8574734fcb2fff;hb=e1e2666e31d80016612762940605fc5bdbc63971;hp=f1424627d9aa27dae374175a5d11b4bf000e5f23;hpb=60d9b99a32e551cffd2b537d3e157d578a761c9b;p=pulseview.git
diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index f142462..853f7c0 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -14,21 +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 "pv/widgets/timestampspinbox.hpp"
#include "view.hpp"
#include
-#include
#include
+#include
#include
#include
@@ -37,7 +38,8 @@ using std::max;
using std::min;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const int TimeMarker::ArrowSize = 4;
@@ -63,7 +65,7 @@ void TimeMarker::set_time(const pv::util::Timestamp& time)
if (value_widget_) {
updating_value_widget_ = true;
- value_widget_->setValue(time.convert_to());
+ value_widget_->setValue(time);
updating_value_widget_ = false;
}
@@ -72,7 +74,8 @@ void TimeMarker::set_time(const pv::util::Timestamp& time)
float TimeMarker::get_x() const
{
- return ((time_ - view_.offset()) / view_.scale()).convert_to();
+ // Use roundf() from cmath, std::roundf() causes Android issues (see #945).
+ return roundf(((time_ - view_.offset()) / view_.scale()).convert_to()) + 0.5f;
}
QPoint TimeMarker::point(const QRect &rect) const
@@ -94,11 +97,11 @@ QRectF TimeMarker::label_rect(const QRectF &rect) const
return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
}
-QRectF TimeMarker::hit_box_rect(const QRectF &rect) const
+QRectF TimeMarker::hit_box_rect(const ViewItemPaintParams &pp) const
{
const float x = get_x();
const float h = QFontMetrics(QApplication::font()).height();
- return QRectF(x - h / 2.0f, rect.top(), h, rect.height());
+ return QRectF(x - h / 2.0f, pp.top(), h, pp.height());
}
void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
@@ -106,7 +109,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[] = {
@@ -152,7 +155,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;
@@ -173,26 +176,23 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
QFormLayout *const form = new QFormLayout(popup);
popup->setLayout(form);
- value_widget_ = new QDoubleSpinBox(parent);
- value_widget_->setDecimals(9);
- value_widget_->setSuffix("s");
- value_widget_->setSingleStep(1e-6);
- value_widget_->setRange(-1.0e9, 1.0e9);
- value_widget_->setValue(time_.convert_to());
+ value_widget_ = new pv::widgets::TimestampSpinBox(parent);
+ value_widget_->setValue(time_);
- connect(value_widget_, SIGNAL(valueChanged(double)),
- this, SLOT(on_value_changed(double)));
+ connect(value_widget_, SIGNAL(valueChanged(const pv::util::Timestamp&)),
+ this, SLOT(on_value_changed(const pv::util::Timestamp&)));
form->addRow(tr("Time"), value_widget_);
return popup;
}
-void TimeMarker::on_value_changed(double value)
+void TimeMarker::on_value_changed(const pv::util::Timestamp& value)
{
if (!updating_value_widget_)
set_time(value);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv