X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.cpp;h=88616bf20fb2cdb1a06367aeb8ee77250fc2c55b;hp=105bbc143cdfef465a6586e5ff54f92bf7d1fdf7;hb=cb5a1216019ae561046f7812b7fc67c11ea3d6c5;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5
diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 105bbc14..88616bf2 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -14,65 +14,154 @@
* 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 "timemarker.h"
+#include
+#include
-#include "view.h"
+#include
+#include "timemarker.hpp"
+
+#include "pv/widgets/timestampspinbox.hpp"
+#include "view.hpp"
+
+#include
+#include
#include
#include
-#include
+#include
+
+using std::max;
+using std::min;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
-TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
- view_(view),
+const int TimeMarker::ArrowSize = 4;
+
+TimeMarker::TimeMarker(
+ View &view, const QColor &colour, const pv::util::Timestamp& time) :
+ TimeItem(view),
colour_(colour),
time_(time),
- value_action_(NULL),
- value_widget_(NULL),
+ value_action_(nullptr),
+ value_widget_(nullptr),
updating_value_widget_(false)
{
}
-double TimeMarker::time() const
+const pv::util::Timestamp& TimeMarker::time() const
{
return time_;
}
+void TimeMarker::set_time(const pv::util::Timestamp& time)
+{
+ time_ = time;
+
+ if (value_widget_) {
+ updating_value_widget_ = true;
+ value_widget_->setValue(time);
+ updating_value_widget_ = false;
+ }
+
+ view_.time_item_appearance_changed(true, true);
+}
+
float TimeMarker::get_x() const
{
- return (time_ - view_.offset()) / view_.scale();
+ return std::roundf(((time_ - view_.offset()) / view_.scale()).convert_to()) + 0.5f;
}
-QPoint TimeMarker::point() const
+QPoint TimeMarker::point(const QRect &rect) const
{
- return QPoint(get_x(), 0);
+ return QPoint(get_x(), rect.bottom());
}
-void TimeMarker::set_time(double time)
+QRectF TimeMarker::label_rect(const QRectF &rect) const
{
- time_ = time;
+ QFontMetrics m(QApplication::font());
+ const QSizeF text_size(
+ max(m.boundingRect(get_text()).size().width(), ArrowSize),
+ m.height());
+ const QSizeF label_size(text_size + LabelPadding * 2);
+ const float top = rect.height() - label_size.height() -
+ TimeMarker::ArrowSize - 0.5f;
+ const float x = get_x();
- if (value_widget_) {
- updating_value_widget_ = true;
- value_widget_->setValue(time);
- updating_value_widget_ = false;
+ return QRectF(QPointF(x - label_size.width() / 2, top), label_size);
+}
+
+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, pp.top(), h, pp.height());
+}
+
+void TimeMarker::paint_label(QPainter &p, const QRect &rect, bool hover)
+{
+ if (!enabled())
+ return;
+
+ const qreal x = get_x();
+ const QRectF r(label_rect(rect));
+
+ const QPointF points[] = {
+ r.topLeft(),
+ r.bottomLeft(),
+ QPointF(max(r.left(), x - ArrowSize), r.bottom()),
+ QPointF(x, rect.bottom()),
+ QPointF(min(r.right(), x + ArrowSize), r.bottom()),
+ r.bottomRight(),
+ r.topRight()
+ };
+
+ const QPointF highlight_points[] = {
+ QPointF(r.left() + 1, r.top() + 1),
+ QPointF(r.left() + 1, r.bottom() - 1),
+ QPointF(max(r.left() + 1, x - ArrowSize), r.bottom() - 1),
+ QPointF(min(max(r.left() + 1, x), r.right() - 1),
+ rect.bottom() - 1),
+ QPointF(min(r.right() - 1, x + ArrowSize), r.bottom() - 1),
+ QPointF(r.right() - 1, r.bottom() - 1),
+ QPointF(r.right() - 1, r.top() + 1),
+ };
+
+ if (selected()) {
+ p.setPen(highlight_pen());
+ p.setBrush(Qt::transparent);
+ p.drawPolygon(points, countof(points));
}
- time_changed();
+ p.setPen(Qt::transparent);
+ p.setBrush(hover ? colour_.lighter() : colour_);
+ p.drawPolygon(points, countof(points));
+
+ p.setPen(colour_.lighter());
+ p.setBrush(Qt::transparent);
+ p.drawPolygon(highlight_points, countof(highlight_points));
+
+ p.setPen(colour_.darker());
+ p.setBrush(Qt::transparent);
+ p.drawPolygon(points, countof(points));
+
+ p.setPen(select_text_colour(colour_));
+ p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter, get_text());
}
-void TimeMarker::paint(QPainter &p, const QRect &rect)
+void TimeMarker::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
{
+ if (!enabled())
+ return;
+
const float x = get_x();
- p.setPen(colour_);
- p.drawLine(QPointF(x, rect.top()), QPointF(x, rect.bottom()));
+ p.setPen(colour_.darker());
+ p.drawLine(QPointF(x, pp.top()), QPointF(x, pp.bottom()));
}
pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
@@ -80,30 +169,29 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
using pv::widgets::Popup;
Popup *const popup = new Popup(parent);
+ popup->set_position(parent->mapToGlobal(
+ point(parent->rect())), Popup::Bottom);
+
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_ = 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_) {
- time_ = value;
- time_changed();
- }
+ if (!updating_value_widget_)
+ set_time(value);
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv