X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.hpp;h=f8506cf409ac1c73f9555a1bcfa0d72fd7cc1900;hb=e6d85b8936b5b7aee80b03834f095fd5b52fe6f4;hp=bf8b64325feef171b3c7fb17b01dff461985284f;hpb=6381b375ae391a79ab50f1f5dcbe0014ff9bd46c;p=pulseview.git
diff --git a/pv/views/trace/view.hpp b/pv/views/trace/view.hpp
index bf8b6432..f8506cf4 100644
--- a/pv/views/trace/view.hpp
+++ b/pv/views/trace/view.hpp
@@ -17,14 +17,14 @@
* along with this program; if not, see .
*/
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_VIEW_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_VIEW_HPP
#include
#include
#include
+#include
#include
-#include
#include
#include
@@ -43,8 +43,7 @@
#include "tracetreeitemowner.hpp"
using std::list;
-using std::unordered_map;
-using std::unordered_set;
+using std::map;
using std::set;
using std::shared_ptr;
using std::vector;
@@ -119,13 +118,13 @@ public:
/**
* Returns the signals contained in this view.
*/
- unordered_set< shared_ptr > signals() const;
+ vector< shared_ptr > signals() const;
shared_ptr get_signal_by_signalbase(shared_ptr base) const;
- virtual void clear_signals();
-
- void add_signal(const shared_ptr signal);
+ virtual void clear_signalbases();
+ virtual void add_signalbase(const shared_ptr signalbase);
+ virtual void remove_signalbase(const shared_ptr signalbase);
#ifdef ENABLE_DECODE
virtual void clear_decode_signals();
@@ -135,6 +134,8 @@ public:
virtual void remove_decode_signal(shared_ptr signal);
#endif
+ void remove_trace(shared_ptr trace);
+
shared_ptr get_signal_under_mouse_cursor() const;
/**
@@ -155,7 +156,6 @@ public:
const Ruler* ruler() const;
virtual void save_settings(QSettings &settings) const;
-
virtual void restore_settings(QSettings &settings);
/**
@@ -255,6 +255,8 @@ public:
void zoom_fit(bool gui_state);
+ virtual void focus_on_range(uint64_t start_sample, uint64_t end_sample);
+
/**
* Sets the scale and offset.
* @param scale The new view scale in seconds per pixel.
@@ -262,7 +264,7 @@ public:
*/
void set_scale_offset(double scale, const pv::util::Timestamp& offset);
- set< shared_ptr > get_visible_data() const;
+ vector< shared_ptr > get_visible_data() const;
pair get_time_extents() const;
@@ -391,9 +393,7 @@ private:
void adjust_top_margin();
void update_scroll();
-
void reset_scroll();
-
void set_scroll_default();
void determine_if_header_was_shrunk();
@@ -404,14 +404,12 @@ private:
TraceTreeItemOwner* find_prevalent_trace_group(
const shared_ptr &group,
- const unordered_map,
- shared_ptr > &signal_map);
+ const map, shared_ptr > &signal_map);
static vector< shared_ptr >
extract_new_traces_for_channels(
const vector< shared_ptr > &channels,
- const unordered_map,
- shared_ptr > &signal_map,
+ const map, shared_ptr > &signal_map,
set< shared_ptr > &add_list);
void determine_time_unit();
@@ -422,6 +420,7 @@ private:
void resizeEvent(QResizeEvent *event);
+ void update_view_range_metaobject() const;
void update_hover_point();
public:
@@ -511,7 +510,8 @@ private:
QShortcut *grab_ruler_left_shortcut_, *grab_ruler_right_shortcut_;
QShortcut *cancel_grab_shortcut_;
- unordered_set< shared_ptr > signals_;
+ mutable mutex signal_mutex_;
+ vector< shared_ptr > signals_;
#ifdef ENABLE_DECODE
vector< shared_ptr > decode_traces_;
@@ -535,7 +535,7 @@ private:
bool custom_zero_offset_set_;
bool updating_scroll_;
- bool settings_restored_;
+ bool restoring_state_;
bool header_was_shrunk_;
bool sticky_scrolling_;
@@ -568,22 +568,16 @@ private:
// This is true when the defaults couldn't be set due to insufficient info
bool scroll_needs_defaults_;
- // A nonzero value indicates the v offset to restore. See View::resizeEvent()
+ // The v offset to restore. See View::eventFilter()
int saved_v_offset_;
// These are used to determine whether the view was altered after acq started
double scale_at_acq_start_;
pv::util::Timestamp offset_at_acq_start_;
-
- // Used to suppress performing a "zoom to fit" when the session stops. This
- // is needed when the view's settings are restored before acquisition ends.
- // In that case we want to keep the restored settings, not have a "zoom to fit"
- // mess them up.
- bool suppress_zoom_to_fit_after_acq_;
};
} // namespace trace
} // namespace views
} // namespace pv
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_VIEW_HPP