* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_VIEW_VIEW_H
-#define PULSEVIEW_PV_VIEW_VIEW_H
+#ifndef PULSEVIEW_PV_VIEW_VIEW_HPP
+#define PULSEVIEW_PV_VIEW_VIEW_HPP
#include <stdint.h>
+#include <list>
#include <memory>
#include <set>
#include <unordered_map>
#include <pv/data/signaldata.hpp>
#include "cursorpair.hpp"
+#include "flag.hpp"
#include "rowitemowner.hpp"
namespace pv {
private:
enum StickyEvents {
- SelectableItemHExtentsChanged = 1,
- SelectableItemVExtentsChanged = 2
+ RowItemHExtentsChanged = 1,
+ RowItemVExtentsChanged = 2
};
private:
static const int ScaleUnits[3];
-public:
- static const QColor CursorAreaColour;
-
- static const QSizeF LabelPadding;
-
public:
explicit View(Session &session, QWidget *parent = 0);
const Viewport* viewport() const;
+ /**
+ * Gets a list of time markers.
+ */
+ std::vector< std::shared_ptr<TimeItem> > time_items() const;
+
/**
* Returns the view time scale in seconds per pixel.
*/
* seconds.
*/
double offset() const;
+
+ /**
+ * Returns the vertical scroll offset.
+ */
int owner_visual_v_offset() const;
+ /**
+ * Sets the visual v-offset.
+ */
+ void set_v_offset(int offset);
+
/**
* Returns the SI prefix to apply to the graticule time markings.
*/
/**
* Returns a reference to the pair of cursors.
*/
- CursorPair& cursors();
+ std::shared_ptr<CursorPair> cursors() const;
/**
- * Returns a reference to the pair of cursors.
+ * Adds a new flag at a specified time.
+ */
+ void add_flag(double time);
+
+ /**
+ * Removes a flag from the list.
*/
- const CursorPair& cursors() const;
+ void remove_flag(std::shared_ptr<Flag> flag);
+
+ /**
+ * Gets the list of flags.
+ */
+ std::vector< std::shared_ptr<Flag> > flags() const;
const QPoint& hover_point() const;
Q_SIGNALS:
void hover_point_changed();
- void signals_moved();
-
void selection_changed();
void scale_offset_changed();
/**
* Satisifies RowItem functionality.
* @param p the QPainter to paint into.
- * @param right the x-coordinate of the right edge of the header
- * area.
+ * @param rect the rectangle of the header area.
* @param hover true if the label is being hovered over by the mouse.
*/
- void paint_label(QPainter &p, int right, bool hover);
+ void paint_label(QPainter &p, const QRect &rect, bool hover);
/**
* Computes the outline rectangle of a label.
- * @param right the x-coordinate of the right edge of the header
- * area.
+ * @param rect the rectangle of the header area.
* @return Returns the rectangle of the signal label.
*/
- QRectF label_rect(int right);
+ QRectF label_rect(const QRectF &rect);
static bool add_channels_to_owner(
const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
void resizeEvent(QResizeEvent *e);
public:
- void appearance_changed(bool label, bool content);
+ void row_item_appearance_changed(bool label, bool content);
+ void time_item_appearance_changed(bool label, bool content);
void extents_changed(bool horz, bool vert);
private Q_SLOTS:
void h_scroll_value_changed(int value);
- void v_scroll_value_changed(int value);
+ void v_scroll_value_changed();
void signals_changed();
void data_updated();
- void marker_time_changed();
-
- void on_signals_moved();
-
void process_sticky_events();
void on_hover_point_changed();
Viewport *viewport_;
Ruler *ruler_;
- CursorHeader *cursorheader_;
Header *header_;
/// The view time scale in seconds per pixel.
/// The view time offset in seconds.
double offset_;
- int v_offset_;
bool updating_scroll_;
double tick_period_;
unsigned int tick_prefix_;
bool show_cursors_;
- CursorPair cursors_;
+ std::shared_ptr<CursorPair> cursors_;
+
+ std::list< std::shared_ptr<Flag> > flags_;
+ char next_flag_text_;
QPoint hover_point_;
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_VIEW_H
+#endif // PULSEVIEW_PV_VIEW_VIEW_HPP