projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't try to store a reference to a shared pointer.
[pulseview.git]
/
pv
/
view
/
view.hpp
diff --git
a/pv/view/view.hpp
b/pv/view/view.hpp
index a23f284825d17534b6edcf11df3a2e302610d661..ff7795c5a68dbd55b92204d7236817e2dce35182 100644
(file)
--- a/
pv/view/view.hpp
+++ b/
pv/view/view.hpp
@@
-18,11
+18,12
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* 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_H
PP
+#define PULSEVIEW_PV_VIEW_VIEW_H
PP
#include <stdint.h>
#include <stdint.h>
+#include <list>
#include <memory>
#include <set>
#include <unordered_map>
#include <memory>
#include <set>
#include <unordered_map>
@@
-33,10
+34,16
@@
#include <QTimer>
#include <pv/data/signaldata.hpp>
#include <QTimer>
#include <pv/data/signaldata.hpp>
+#include <pv/util.hpp>
#include "cursorpair.hpp"
#include "cursorpair.hpp"
+#include "flag.hpp"
#include "rowitemowner.hpp"
#include "rowitemowner.hpp"
+namespace sigrok {
+class ChannelGroup;
+}
+
namespace pv {
class Session;
namespace pv {
class Session;
@@
-46,6
+53,7
@@
namespace view {
class CursorHeader;
class Header;
class Ruler;
class CursorHeader;
class Header;
class Ruler;
+class Trace;
class Viewport;
class View : public QAbstractScrollArea, public RowItemOwner {
class Viewport;
class View : public QAbstractScrollArea, public RowItemOwner {
@@
-53,8
+61,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:
@@
-62,14
+70,10
@@
private:
static const double MinScale;
static const int MaxScrollValue;
static const double MinScale;
static const int MaxScrollValue;
+ static const int MaxViewAutoUpdateRate;
static const int ScaleUnits[3];
static const int ScaleUnits[3];
-public:
- static const QColor CursorAreaColour;
-
- static const QSizeF LabelPadding;
-
public:
explicit View(Session &session, QWidget *parent = 0);
public:
explicit View(Session &session, QWidget *parent = 0);
@@
-105,18
+109,37
@@
public:
* seconds.
*/
double offset() const;
* seconds.
*/
double offset() const;
+
+ /**
+ * Returns the vertical scroll offset.
+ */
int owner_visual_v_offset() const;
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.
*/
unsigned int tick_prefix() const;
/**
* Returns the SI prefix to apply to the graticule time markings.
*/
unsigned int tick_prefix() const;
+ /**
+ * Returns the number of fractional digits shown for the time markings.
+ */
+ unsigned int tick_precision() const;
+
/**
* Returns period of the graticule time markings.
*/
double tick_period() const;
/**
* Returns period of the graticule time markings.
*/
double tick_period() const;
+ /**
+ * Returns the unit of time currently used.
+ */
+ util::TimeUnit time_unit() 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.
*/
@@
-125,7
+148,7
@@
public:
void zoom(double steps);
void zoom(double steps, int offset);
void zoom(double steps);
void zoom(double steps, int offset);
- void zoom_fit();
+ void zoom_fit(
bool gui_state
);
void zoom_one_to_one();
void zoom_one_to_one();
@@
-141,6
+164,12
@@
public:
std::pair<double, double> get_time_extents() const;
std::pair<double, double> get_time_extents() const;
+ /**
+ * Enables or disables sticky scrolling, i.e. the view always shows
+ * the most recent samples when capturing data.
+ */
+ void enable_sticky_scrolling(bool state);
+
/**
* Returns true if cursors are displayed. false otherwise.
*/
/**
* Returns true if cursors are displayed. false otherwise.
*/
@@
-159,12
+188,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.
+ */
+ void remove_flag(std::shared_ptr<Flag> flag);
+
+ /**
+ * Gets the list of flags.
*/
*/
-
const CursorPair& cursor
s() const;
+
std::vector< std::shared_ptr<Flag> > flag
s() const;
const QPoint& hover_point() const;
const QPoint& hover_point() const;
@@
-175,12
+214,14
@@
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();
+ void sticky_scrolling_changed(bool state);
+
+ void always_zoom_to_fit_changed(bool state);
+
private:
void get_scroll_layout(double &length, double &offset) const;
private:
void get_scroll_layout(double &length, double &offset) const;
@@
-205,30
+246,31
@@
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 right);
+ QRectF label_rect(const QRectF &rect);
+
+ RowItemOwner* find_prevalent_trace_group(
+ const std::shared_ptr<sigrok::ChannelGroup> &group,
+ const std::unordered_map<std::shared_ptr<sigrok::Channel>,
+ std::shared_ptr<Signal> > &signal_map);
- static bool add_channels_to_owner(
+ static std::vector< std::shared_ptr<Trace> >
+ extract_new_traces_for_channels(
const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
- RowItemOwner *owner, int &offset,
- std::unordered_map<std::shared_ptr<sigrok::Channel>,
+ const std::unordered_map<std::shared_ptr<sigrok::Channel>,
std::shared_ptr<Signal> > &signal_map,
std::shared_ptr<Signal> > &signal_map,
- std::function<bool (std::shared_ptr<RowItem>)> filter_func =
- std::function<bool (std::shared_ptr<RowItem>)>());
+ std::set< std::shared_ptr<Trace> > &add_list);
- static void apply_offset(
- std::shared_ptr<RowItem> row_item, int &offset);
+ void determine_time_unit();
private:
bool eventFilter(QObject *object, QEvent *event);
private:
bool eventFilter(QObject *object, QEvent *event);
@@
-238,21
+280,21
@@
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);
private Q_SLOTS:
void h_scroll_value_changed(int value);
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 signals_changed();
+ void capture_state_updated(int state);
void data_updated();
void data_updated();
- void marker_time_changed();
-
- void on_signals_moved();
+ void perform_delayed_view_update();
void process_sticky_events();
void process_sticky_events();
@@
-263,7
+305,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.
@@
-272,14
+313,21
@@
private:
/// The view time offset in seconds.
double offset_;
/// The view time offset in seconds.
double offset_;
- int v_offset_;
bool updating_scroll_;
bool updating_scroll_;
+ bool sticky_scrolling_;
+ bool always_zoom_to_fit_;
+ QTimer delayed_view_updater_;
double tick_period_;
unsigned int tick_prefix_;
double tick_period_;
unsigned int tick_prefix_;
+ unsigned int tick_precision_;
+ util::TimeUnit time_unit_;
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_;
@@
-290,4
+338,4
@@
private:
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv
-#endif // PULSEVIEW_PV_VIEW_VIEW_H
+#endif // PULSEVIEW_PV_VIEW_VIEW_H
PP