X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Ftimemarker.hpp;h=dba52fa4efa5642a76c9c1150750d664bcadfd59;hb=303eec78f3c499cd30fc88b282aa1f336e82a806;hp=10e3331c639ba4eee64bd146d1ea1d07c7fdd49c;hpb=60d9b99a32e551cffd2b537d3e157d578a761c9b;p=pulseview.git
diff --git a/pv/view/timemarker.hpp b/pv/view/timemarker.hpp
index 10e3331..dba52fa 100644
--- a/pv/view/timemarker.hpp
+++ b/pv/view/timemarker.hpp
@@ -14,12 +14,11 @@
* 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_MARKER_HPP
-#define PULSEVIEW_PV_VIEW_MARKER_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP
#include
#include
@@ -33,7 +32,12 @@ class QPainter;
class QRect;
namespace pv {
-namespace view {
+namespace widgets {
+ class TimestampSpinBox;
+}
+
+namespace views {
+namespace TraceView {
class View;
@@ -64,27 +68,27 @@ public:
*/
void set_time(const pv::util::Timestamp& time) override;
- float get_x() const;
+ float get_x() const override;
/**
* Gets the arrow-tip point of the time marker.
* @param rect the rectangle of the ruler area.
*/
- QPoint point(const QRect &rect) const;
+ QPoint point(const QRect &rect) const override;
/**
* Computes the outline rectangle of a label.
* @param rect the rectangle of the header area.
* @return Returns the rectangle of the signal label.
*/
- QRectF label_rect(const QRectF &rect) const;
+ QRectF label_rect(const QRectF &rect) const override;
/**
* Computes the outline rectangle of the viewport hit-box.
* @param rect the rectangle of the viewport area.
* @return Returns the rectangle of the hit-box.
*/
- QRectF hit_box_rect(const QRectF &rect) const;
+ QRectF hit_box_rect(const ViewItemPaintParams &pp) const override;
/**
* Gets the text to show in the marker.
@@ -97,19 +101,19 @@ public:
* @param rect The rectangle of the ruler client area.
* @param hover true if the label is being hovered over by the mouse.
*/
- void paint_label(QPainter &p, const QRect &rect, bool hover);
+ void paint_label(QPainter &p, const QRect &rect, bool hover) override;
/**
* Paints the foreground layer of the item with a QPainter
* @param p the QPainter to paint into.
* @param pp the painting parameters object to paint with.
- **/
- void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
+ */
+ void paint_fore(QPainter &p, ViewItemPaintParams &pp) override;
- virtual pv::widgets::Popup* create_popup(QWidget *parent);
+ virtual pv::widgets::Popup* create_popup(QWidget *parent) override;
private Q_SLOTS:
- void on_value_changed(double value);
+ void on_value_changed(const pv::util::Timestamp& value);
protected:
const QColor &colour_;
@@ -119,11 +123,12 @@ protected:
QSizeF text_size_;
QWidgetAction *value_action_;
- QDoubleSpinBox *value_widget_;
+ pv::widgets::TimestampSpinBox *value_widget_;
bool updating_value_widget_;
};
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_MARKER_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_MARKER_HPP