projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewItem: Added hit_box_rect
[pulseview.git]
/
pv
/
view
/
view.hpp
diff --git
a/pv/view/view.hpp
b/pv/view/view.hpp
index e763da7e398a9b563b8fc5927088ad3ed391a2aa..a355cf921cdb43c00bcb5132fec4cc4dfae7d8ae 100644
(file)
--- a/
pv/view/view.hpp
+++ b/
pv/view/view.hpp
@@
-23,6
+23,7
@@
#include <stdint.h>
#include <stdint.h>
+#include <list>
#include <memory>
#include <set>
#include <unordered_map>
#include <memory>
#include <set>
#include <unordered_map>
@@
-35,6
+36,7
@@
#include <pv/data/signaldata.hpp>
#include "cursorpair.hpp"
#include <pv/data/signaldata.hpp>
#include "cursorpair.hpp"
+#include "flag.hpp"
#include "rowitemowner.hpp"
namespace pv {
#include "rowitemowner.hpp"
namespace pv {
@@
-53,8
+55,8
@@
class View : public QAbstractScrollArea, public RowItemOwner {
private:
enum StickyEvents {
private:
enum StickyEvents {
-
Selectable
ItemHExtentsChanged = 1,
-
Selectable
ItemVExtentsChanged = 2
+
Row
ItemHExtentsChanged = 1,
+
Row
ItemVExtentsChanged = 2
};
private:
};
private:
@@
-63,10
+65,7
@@
private:
static const int MaxScrollValue;
static const int MaxScrollValue;
-public:
- static const QColor CursorAreaColour;
-
- static const QSizeF LabelPadding;
+ static const int ScaleUnits[3];
public:
explicit View(Session &session, QWidget *parent = 0);
public:
explicit View(Session &session, QWidget *parent = 0);
@@
-88,6
+87,11
@@
public:
const Viewport* viewport() const;
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.
*/
/**
* Returns the view time scale in seconds per pixel.
*/
@@
-100,6
+104,16
@@
public:
double offset() const;
int owner_visual_v_offset() const;
double offset() const;
int owner_visual_v_offset() const;
+ /**
+ * Returns the SI prefix to apply to the graticule time markings.
+ */
+ unsigned int tick_prefix() const;
+
+ /**
+ * Returns period of the graticule time markings.
+ */
+ double tick_period() const;
+
/**
* Returns the number of nested parents that this row item owner has.
*/
/**
* Returns the number of nested parents that this row item owner has.
*/
@@
-142,12
+156,22
@@
public:
/**
* Returns a reference to the pair of cursors.
*/
/**
* 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;
const QPoint& hover_point() const;
@@
-158,8
+182,6
@@
public:
Q_SIGNALS:
void hover_point_changed();
Q_SIGNALS:
void hover_point_changed();
- void signals_moved();
-
void selection_changed();
void scale_offset_changed();
void selection_changed();
void scale_offset_changed();
@@
-175,6
+197,12
@@
private:
*/
void set_zoom(double scale, int offset);
*/
void set_zoom(double scale, int offset);
+ /**
+ * Find a tick spacing and number formatting that does not cause
+ * the values to collide.
+ */
+ void calculate_tick_spacing();
+
void update_scroll();
void update_layout();
void update_scroll();
void update_layout();
@@
-182,19
+210,17
@@
private:
/**
* Satisifies RowItem functionality.
* @param p the QPainter to paint into.
/**
* 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.
*/
* @param hover true if the label is being hovered over by the mouse.
*/
- void paint_label(QPainter &p,
int righ
t, bool hover);
+ void paint_label(QPainter &p,
const QRect &rec
t, bool hover);
/**
* Computes the outline rectangle of a label.
/**
* 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.
*/
* @return Returns the rectangle of the signal label.
*/
- QRectF label_rect(
int righ
t);
+ QRectF label_rect(
const QRectF &rec
t);
static bool add_channels_to_owner(
const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
static bool add_channels_to_owner(
const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
@@
-215,7
+241,8
@@
private:
void resizeEvent(QResizeEvent *e);
public:
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);
void extents_changed(bool horz, bool vert);
@@
-227,10
+254,6
@@
private Q_SLOTS:
void signals_changed();
void data_updated();
void signals_changed();
void data_updated();
- void marker_time_changed();
-
- void on_signals_moved();
-
void process_sticky_events();
void on_hover_point_changed();
void process_sticky_events();
void on_hover_point_changed();
@@
-240,7
+263,6
@@
private:
Viewport *viewport_;
Ruler *ruler_;
Viewport *viewport_;
Ruler *ruler_;
- CursorHeader *cursorheader_;
Header *header_;
/// The view time scale in seconds per pixel.
Header *header_;
/// The view time scale in seconds per pixel.
@@
-252,8
+274,14
@@
private:
int v_offset_;
bool updating_scroll_;
int v_offset_;
bool updating_scroll_;
+ double tick_period_;
+ unsigned int tick_prefix_;
+
bool show_cursors_;
bool show_cursors_;
- CursorPair cursors_;
+ std::shared_ptr<CursorPair> cursors_;
+
+ std::list< std::shared_ptr<Flag> > flags_;
+ char next_flag_text_;
QPoint hover_point_;
QPoint hover_point_;