projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
view.cpp: Drop unneeded parenthesis.
[pulseview.git]
/
pv
/
views
/
trace
/
logicsignal.hpp
diff --git
a/pv/views/trace/logicsignal.hpp
b/pv/views/trace/logicsignal.hpp
index 2f5c66baa219fb69dcb8e9e42e08de1c01ad1849..4a52d379060523569e42628e94aa99d2aea6ee20 100644
(file)
--- a/
pv/views/trace/logicsignal.hpp
+++ b/
pv/views/trace/logicsignal.hpp
@@
-21,6
+21,8
@@
#define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
#include <QCache>
#define PULSEVIEW_PV_VIEWS_TRACEVIEW_LOGICSIGNAL_HPP
#include <QCache>
+#include <QDebug>
+#include <QSpinBox>
#include "signal.hpp"
#include "signal.hpp"
@@
-78,6
+80,9
@@
public:
shared_ptr<pv::data::Logic> logic_data() const;
shared_ptr<pv::data::Logic> logic_data() const;
+ virtual void save_settings(QSettings &settings) const;
+ virtual void restore_settings(QSettings &settings);
+
/**
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
/**
* Computes the vertical extents of the contents of this row item.
* @return A pair containing the minimum and maximum y-values.
@@
-115,6
+120,8
@@
private:
bool level, double samples_per_pixel, double pixels_offset,
float x_offset, float y_offset);
bool level, double samples_per_pixel, double pixels_offset,
float x_offset, float y_offset);
+ shared_ptr<pv::data::LogicSegment> get_logic_segment_to_paint() const;
+
void init_trigger_actions(QWidget *parent);
const vector<int32_t> get_trigger_types() const;
void init_trigger_actions(QWidget *parent);
const vector<int32_t> get_trigger_types() const;
@@
-130,11
+137,15
@@
private:
private Q_SLOTS:
void on_trigger();
private Q_SLOTS:
void on_trigger();
+ void on_signal_height_changed(int height);
+
private:
int signal_height_;
shared_ptr<pv::devices::Device> device_;
private:
int signal_height_;
shared_ptr<pv::devices::Device> device_;
+ QSpinBox *signal_height_sb_;
+
const sigrok::TriggerMatchType *trigger_match_;
QToolBar *trigger_bar_;
QAction *trigger_none_;
const sigrok::TriggerMatchType *trigger_match_;
QToolBar *trigger_bar_;
QAction *trigger_none_;