projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Main: Create human-readable stack trace and notify user
[pulseview.git]
/
pv
/
data
/
signalbase.hpp
diff --git
a/pv/data/signalbase.hpp
b/pv/data/signalbase.hpp
index 6a3af14b3f0115c64dee8f1438fc21accfc37168..efe4a54abe484bbd571a1209aacdad6d729beaff 100644
(file)
--- a/
pv/data/signalbase.hpp
+++ b/
pv/data/signalbase.hpp
@@
-140,6
+140,12
@@
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.
*/
/**
* Sets the name of the signal.
*/
@@
-274,6
+280,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();
@@
-291,7
+299,7
@@
Q_SIGNALS:
void samples_cleared();
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);