TimeMarker: Replaced time_changed signal with View::time_item_apparance_changed

[pulseview.git] / pv / view / timemarker.cpp

diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 6571bea95c0eac9e6c98c3fca0f27bb9511a5c79..ed9df36064f74407b1a1ee81f80d11378adbc81c 100644 (file)
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -18,20 +18,32 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <algorithm>
+
+#include <extdef.h>
+
 #include "timemarker.hpp"
 
 #include "view.hpp"
 
+#include <QApplication>
 #include <QFormLayout>
+#include <QFontMetrics>
 #include <QPainter>
 
 #include <pv/widgets/popup.hpp>
 
+using std::max;
+using std::min;
+
 namespace pv {
 namespace view {
 
+const int TimeMarker::ArrowSize = 4;
+const int TimeMarker::Offset = 1;
+
 TimeMarker::TimeMarker(View &view, const QColor &colour, double time) :
-       view_(view),
+       TimeItem(view),
        colour_(colour),
        time_(time),
        value_action_(NULL),
@@ -45,6 +57,19 @@ double TimeMarker::time() const
        return time_;
 }
 
+void TimeMarker::set_time(double 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();
@@ -55,24 +80,85 @@ QPoint TimeMarker::point() const
        return QPoint(get_x(), 0);
 }
 
-void TimeMarker::set_time(double time)
+QRectF TimeMarker::label_rect(const QRectF &rect) const
 {
-       time_ = time;
+       const float x = (time_ - view_.offset()) / view_.scale();
+
+       QFontMetrics m(QApplication::font());
+       const float text_width =
+               max(m.boundingRect(get_text()).size().width(), ArrowSize);
+       const float text_height = m.boundingRect("Tg").size().height();
+
+       const QSizeF label_size(
+               text_width + View::LabelPadding.width() * 2,
+               text_height + View::LabelPadding.height() * 2);
+       const float top = rect.height() - label_size.height() -
+               TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
+       const float height = label_size.height();
+
+       return QRectF(x - label_size.width() / 2, top,
+               label_size.width(), height);
+}
 
-       if (value_widget_) {
-               updating_value_widget_ = true;
-               value_widget_->setValue(time);
-               updating_value_widget_ = false;
+void TimeMarker::paint_label(QPainter &p, const QRect &rect)
+{
+       if (!enabled())
+               return;
+
+       const qreal x = (time_ - view_.offset()) / view_.scale();
+       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(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)
@@ -100,10 +186,8 @@ pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
 
 void TimeMarker::on_value_changed(double value)
 {
-       if (!updating_value_widget_) {
-               time_ = value;
-               time_changed();
-       }
+       if (!updating_value_widget_)
+               set_time(value);
 }
 
 } // namespace view