projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Save/restore view states and signal settings
[pulseview.git]
/
pv
/
view
/
analogsignal.hpp
diff --git
a/pv/view/analogsignal.hpp
b/pv/view/analogsignal.hpp
index dd2b31dc74f20e4d536accc5652c125af29d5947..1369a76cf24f2c7852cb27d7683cef103b26287e 100644
(file)
--- a/
pv/view/analogsignal.hpp
+++ b/
pv/view/analogsignal.hpp
@@
-25,33
+25,43
@@
#include <memory>
#include <memory>
+#include <QComboBox>
+
namespace pv {
namespace data {
class Analog;
class AnalogSegment;
namespace pv {
namespace data {
class Analog;
class AnalogSegment;
+class SignalBase;
}
namespace view {
class AnalogSignal : public Signal
{
}
namespace view {
class AnalogSignal : public Signal
{
+ Q_OBJECT
+
private:
static const QColor SignalColours[4];
static const QColor GridMajorColor, GridMinorColor;
static const float EnvelopeThreshold;
private:
static const QColor SignalColours[4];
static const QColor GridMajorColor, GridMinorColor;
static const float EnvelopeThreshold;
+ static const int MaximumVDivs;
+ static const int MaxScaleIndex, MinScaleIndex;
+ static const int InfoTextMarginRight, InfoTextMarginBottom;
+
public:
AnalogSignal(pv::Session &session,
public:
AnalogSignal(pv::Session &session,
- std::shared_ptr<sigrok::Channel> channel,
- std::shared_ptr<pv::data::Analog> data);
+ std::shared_ptr<data::SignalBase> base);
virtual ~AnalogSignal() = default;
std::shared_ptr<pv::data::SignalData> data() const;
virtual ~AnalogSignal() = default;
std::shared_ptr<pv::data::SignalData> data() const;
- std::shared_ptr<pv::data::Analog> analog_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.
/**
* Computes the vertical extents of the contents of this row item.
@@
-89,6
+99,13
@@
public:
*/
void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
*/
void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
+ /**
+ * Paints the foreground layer of the item with a QPainter
+ * @param p the QPainter to paint into.
+ * @param pp the painting parameters object to paint with.
+ */
+ void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
+
private:
void paint_grid(QPainter &p, int y, int left, int right);
private:
void paint_grid(QPainter &p, int y, int left, int right);
@@
-103,18
+120,30
@@
private:
const double pixels_offset, const double samples_per_pixel);
/**
const double pixels_offset, const double samples_per_pixel);
/**
- * Computes the scale factor from the scale index.
+ * Computes the scale factor from the scale index
and vdiv settings
.
*/
*/
- float scale() const;
+ float get_resolution(int scale_index);
+
+ void update_scale();
+
+protected:
+ void populate_popup_form(QWidget *parent, QFormLayout *form);
+
+private Q_SLOTS:
+ void on_vdivs_changed(int vdivs);
+
+ void on_resolution_changed(int index);
private:
private:
-
std::shared_ptr<pv::data::Analog> data
_;
+
QComboBox *resolution_cb
_;
+ float scale_;
int scale_index_;
int scale_index_drag_offset_;
int div_height_;
int vdivs_; // divs per positive/negative side
int scale_index_;
int scale_index_drag_offset_;
int div_height_;
int vdivs_; // divs per positive/negative side
+ float resolution_; // e.g. 10 for 10 V/div
};
} // namespace view
};
} // namespace view