projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Don't try to close a session when there is none
[pulseview.git]
/
pv
/
view
/
view.hpp
diff --git
a/pv/view/view.hpp
b/pv/view/view.hpp
index 9fac1a67f8d400933d4a95b2c2b12eca29c483d0..08e17d6056867f45be84bee8b62d61cad70f45df 100644
(file)
--- a/
pv/view/view.hpp
+++ b/
pv/view/view.hpp
@@
-29,7
+29,7
@@
#include <QAbstractScrollArea>
#include <QSizeF>
#include <QAbstractScrollArea>
#include <QSizeF>
-#include <Q
Tim
er>
+#include <Q
Splitt
er>
#include <pv/data/signaldata.hpp>
#include <pv/util.hpp>
#include <pv/data/signaldata.hpp>
#include <pv/util.hpp>
@@
-54,6
+54,10
@@
namespace pv {
class Session;
class Session;
+namespace data {
+class Logic;
+}
+
namespace views {
namespace TraceView {
namespace views {
namespace TraceView {
@@
-67,13
+71,12
@@
class Trace;
class Viewport;
class TriggerMarker;
class Viewport;
class TriggerMarker;
-class Custom
Abstract
ScrollArea : public QAbstractScrollArea
+class CustomScrollArea : public QAbstractScrollArea
{
Q_OBJECT
public:
{
Q_OBJECT
public:
- CustomAbstractScrollArea(QWidget *parent = nullptr);
- void setViewportMargins(int left, int top, int right, int bottom);
+ CustomScrollArea(QWidget *parent = nullptr);
bool viewportEvent(QEvent *event);
};
bool viewportEvent(QEvent *event);
};
@@
-92,7
+95,6
@@
private:
static const pv::util::Timestamp MinScale;
static const int MaxScrollValue;
static const pv::util::Timestamp MinScale;
static const int MaxScrollValue;
- static const int MaxViewAutoUpdateRate;
static const int ScaleUnits[3];
static const int ScaleUnits[3];
@@
-109,7
+111,7
@@
public:
virtual void clear_signals();
virtual void clear_signals();
- v
irtual v
oid add_signal(const shared_ptr<Signal> signal);
+ void add_signal(const shared_ptr<Signal> signal);
#ifdef ENABLE_DECODE
virtual void clear_decode_signals();
#ifdef ENABLE_DECODE
virtual void clear_decode_signals();
@@
-313,12
+315,18
@@
private:
*/
void calculate_tick_spacing();
*/
void calculate_tick_spacing();
+ void adjust_top_margin();
+
void update_scroll();
void reset_scroll();
void set_scroll_default();
void update_scroll();
void reset_scroll();
void set_scroll_default();
+ bool header_was_shrunk() const;
+
+ void expand_header_to_fit();
+
void update_layout();
TraceTreeItemOwner* find_prevalent_trace_group(
void update_layout();
TraceTreeItemOwner* find_prevalent_trace_group(
@@
-347,14
+355,16
@@
public:
private Q_SLOTS:
private Q_SLOTS:
+ void on_splitter_moved();
+ void on_repeat_splitter_expansion();
+
void h_scroll_value_changed(int value);
void v_scroll_value_changed();
void signals_changed();
void capture_state_updated(int state);
void h_scroll_value_changed(int value);
void v_scroll_value_changed();
void signals_changed();
void capture_state_updated(int state);
- void data_updated();
- void perform_delayed_view_update();
+ v
irtual v
oid perform_delayed_view_update();
void process_sticky_events();
void process_sticky_events();
@@
-397,9
+407,11
@@
private Q_SLOTS:
void set_time_unit(pv::util::TimeUnit time_unit);
private:
void set_time_unit(pv::util::TimeUnit time_unit);
private:
+ CustomScrollArea *scrollarea_;
Viewport *viewport_;
Ruler *ruler_;
Header *header_;
Viewport *viewport_;
Ruler *ruler_;
Header *header_;
+ QSplitter *splitter_;
unordered_set< shared_ptr<Signal> > signals_;
unordered_set< shared_ptr<Signal> > signals_;
@@
-407,8
+419,6
@@
private:
vector< shared_ptr<DecodeTrace> > decode_traces_;
#endif
vector< shared_ptr<DecodeTrace> > decode_traces_;
#endif
- CustomAbstractScrollArea scrollarea_;
-
/// The view time scale in seconds per pixel.
double scale_;
/// The view time scale in seconds per pixel.
double scale_;
@@
-416,10
+426,11
@@
private:
pv::util::Timestamp offset_;
bool updating_scroll_;
pv::util::Timestamp offset_;
bool updating_scroll_;
+ bool settings_restored_;
+
bool sticky_scrolling_;
bool coloured_bg_;
bool always_zoom_to_fit_;
bool sticky_scrolling_;
bool coloured_bg_;
bool always_zoom_to_fit_;
- QTimer delayed_view_updater_;
pv::util::Timestamp tick_period_;
pv::util::SIPrefix tick_prefix_;
pv::util::Timestamp tick_period_;
pv::util::SIPrefix tick_prefix_;
@@
-444,8
+455,6
@@
private:
// A nonzero value indicates the v offset to restore. See View::resizeEvent()
int saved_v_offset_;
// A nonzero value indicates the v offset to restore. See View::resizeEvent()
int saved_v_offset_;
-
- bool size_finalized_;
};
} // namespace TraceView
};
} // namespace TraceView