projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add new dependency: libgstreamermm >= 1.8.0.
[pulseview.git]
/
pv
/
data
/
signalbase.hpp
diff --git
a/pv/data/signalbase.hpp
b/pv/data/signalbase.hpp
index 6a3af14b3f0115c64dee8f1438fc21accfc37168..c3e0d3d64ef56d02b289451c7cb3d54ca89c44f9 100644
(file)
--- a/
pv/data/signalbase.hpp
+++ b/
pv/data/signalbase.hpp
@@
-86,7
+86,7
@@
public:
};
private:
};
private:
- static const int Colo
u
rBGAlpha;
+ static const int ColorBGAlpha;
static const uint64_t ConversionBlockSize;
static const uint32_t ConversionDelay;
static const uint64_t ConversionBlockSize;
static const uint32_t ConversionDelay;
@@
-140,25
+140,31
@@
public:
*/
QString internal_name() const;
*/
QString internal_name() const;
+ /**
+ * Produces a string for this signal that can be used for display,
+ * i.e. it contains one or both of the signal/internal names.
+ */
+ QString display_name() const;
+
/**
* Sets the name of the signal.
*/
virtual void set_name(QString name);
/**
/**
* Sets the name of the signal.
*/
virtual void set_name(QString name);
/**
- * Get the colo
u
r of the signal.
+ * Get the color of the signal.
*/
*/
- QColor colo
u
r() const;
+ QColor color() const;
/**
/**
- * Set the colo
u
r of the signal.
+ * Set the color of the signal.
*/
*/
- void set_colo
ur(QColor colou
r);
+ void set_colo
r(QColor colo
r);
/**
/**
- * Get the background colo
u
r of the signal.
+ * Get the background color of the signal.
*/
*/
- QColor bgcolo
u
r() const;
+ QColor bgcolor() const;
/**
* Sets the internal data object.
/**
* Sets the internal data object.
@@
-181,6
+187,16
@@
public:
*/
bool segment_is_complete(uint32_t segment_id) const;
*/
bool segment_is_complete(uint32_t segment_id) const;
+ /**
+ * Determines whether this signal has any sample data at all.
+ */
+ bool has_samples() const;
+
+ /**
+ * Returns the sample rate for this signal.
+ */
+ double get_samplerate() const;
+
/**
* Queries the kind of conversion performed on this channel.
*/
/**
* Queries the kind of conversion performed on this channel.
*/
@@
-274,6
+290,8
@@
private:
uint8_t convert_a2l_schmitt_trigger(float lo_thr, float hi_thr,
float value, uint8_t &state);
uint8_t convert_a2l_schmitt_trigger(float lo_thr, float hi_thr,
float value, uint8_t &state);
+ void convert_single_segment_range(AnalogSegment *asegment,
+ LogicSegment *lsegment, uint64_t start_sample, uint64_t end_sample);
void convert_single_segment(pv::data::AnalogSegment *asegment,
pv::data::LogicSegment *lsegment);
void conversion_thread_proc();
void convert_single_segment(pv::data::AnalogSegment *asegment,
pv::data::LogicSegment *lsegment);
void conversion_thread_proc();
@@
-285,13
+303,13
@@
Q_SIGNALS:
void name_changed(const QString &name);
void name_changed(const QString &name);
- void colo
ur_changed(const QColor &colou
r);
+ void colo
r_changed(const QColor &colo
r);
void conversion_type_changed(const ConversionType t);
void samples_cleared();
void conversion_type_changed(const ConversionType t);
void samples_cleared();
- void samples_added(
QObject* segment
, uint64_t start_sample,
+ void samples_added(
uint64_t segment_id
, uint64_t start_sample,
uint64_t end_sample);
void min_max_changed(float min, float max);
uint64_t end_sample);
void min_max_changed(float min, float max);
@@
-325,7
+343,7
@@
protected:
QTimer delayed_conversion_starter_;
QString internal_name_, name_;
QTimer delayed_conversion_starter_;
QString internal_name_, name_;
- QColor colo
ur_, bgcolou
r_;
+ QColor colo
r_, bgcolo
r_;
};
} // namespace data
};
} // namespace data