projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ruler: Recombined with CursorHeader
[pulseview.git]
/
pv
/
view
/
view.hpp
diff --git
a/pv/view/view.hpp
b/pv/view/view.hpp
index a23f284825d17534b6edcf11df3a2e302610d661..344e252e7e9f8caa7a2a2e00c8cb4f2f2df74626 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:
@@
-159,12
+161,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
.
*/
*/
- const CursorPair& cursors() const;
+ void add_flag(double time);
+
+ /**
+ * Removes a flag from the list.
+ */
+ 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;
@@
-205,19
+217,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,
@@
-238,7
+248,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);
@@
-250,8
+261,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_signals_moved();
void process_sticky_events();
@@
-263,7
+272,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.
@@
-279,7
+287,10
@@
private:
unsigned int tick_prefix_;
bool show_cursors_;
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_;
QPoint hover_point_;