Don't use std:: in the code directly (where possible).

[pulseview.git] / pv / view / cursorpair.hpp

diff --git a/pv/view/cursorpair.hpp b/pv/view/cursorpair.hpp
index dd37b0edf72ed6250cfdce8f1f9d3224028d4f26..458f5cac0af186f08f7c4b3fa47e851bb815a68e 100644 (file)
--- a/pv/view/cursorpair.hpp
+++ b/pv/view/cursorpair.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 <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEW_CURSORPAIR_H
-#define PULSEVIEW_PV_VIEW_CURSORPAIR_H
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP
 
 #include "cursor.hpp"
 
@@ -27,15 +26,20 @@
 
 #include <QPainter>
 
+using std::pair;
+using std::shared_ptr;
+
 class QPainter;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
-class CursorPair
+class CursorPair : public TimeItem
 {
 private:
        static const int DeltaPadding;
+       static const QColor ViewportFillColour;
 
 public:
        /**
@@ -44,38 +48,68 @@ public:
         */
        CursorPair(View &view);
 
+public:
+       /**
+        * Returns true if the item is visible and enabled.
+        */
+       bool enabled() const override;
+
        /**
         * Returns a pointer to the first cursor.
         */
-       std::shared_ptr<Cursor> first() const;
+       shared_ptr<Cursor> first() const;
 
        /**
         * Returns a pointer to the second cursor.
         */
-       std::shared_ptr<Cursor> second() const;
+       shared_ptr<Cursor> second() const;
+
+       /**
+        * Sets the time of the marker.
+        */
+       void set_time(const pv::util::Timestamp& time) override;
+
+       float get_x() const override;
+
+       QPoint point(const QRect &rect) const override;
+
+       pv::widgets::Popup* create_popup(QWidget *parent) override;
 
 public:
-       QRectF get_label_rect(const QRect &rect) const;
+       QRectF label_rect(const QRectF &rect) const override;
 
-       void draw_markers(QPainter &p,
-               const QRect &rect, unsigned int prefix);
+       /**
+        * Paints the marker's label to the ruler.
+        * @param p The painter to draw with.
+        * @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) override;
 
-       void draw_viewport_background(QPainter &p, const QRect &rect);
+       /**
+        * Paints the background 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_back(QPainter &p, const ViewItemPaintParams &pp) override;
 
-       void draw_viewport_foreground(QPainter &p, const QRect &rect);
+       /**
+        * Constructs the string to display.
+        */
+       QString format_string();
 
-       void compute_text_size(QPainter &p, unsigned int prefix);
+       void compute_text_size(QPainter &p);
 
-       std::pair<float, float> get_cursor_offsets() const;
+       pair<float, float> get_cursor_offsets() const;
 
 private:
-       std::shared_ptr<Cursor> first_, second_;
-       const View &view_;
+       shared_ptr<Cursor> first_, second_;
 
        QSizeF text_size_;
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_CURSORPAIR_H
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_CURSORPAIR_HPP