X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdata%2Fsignalbase.hpp;h=97dbd8477d58dea4537e117a25946338f48f64c3;hb=ad908057e13224eee9f983685e0ccc7db1ded0e9;hp=a682a56e1f52cadbb60a8a3a1dba9a80e2eacbc2;hpb=bb7dd726eb7159ddd80d94ede791f2e2a9eaef0f;p=pulseview.git
diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp
index a682a56..97dbd84 100644
--- a/pv/data/signalbase.hpp
+++ b/pv/data/signalbase.hpp
@@ -15,23 +15,25 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifndef PULSEVIEW_PV_DATA_SIGNALBASE_HPP
#define PULSEVIEW_PV_DATA_SIGNALBASE_HPP
+#include
+
#include
#include
+#include
#include
#include
+using std::shared_ptr;
namespace sigrok {
class Channel;
-class ChannelType;
}
namespace pv {
@@ -46,18 +48,33 @@ class SignalBase : public QObject
{
Q_OBJECT
+public:
+ enum ChannelType {
+ AnalogChannel = 1,
+ LogicChannel,
+ DecodeChannel,
+ A2LChannel, // Analog converted to logic, joint representation
+ MathChannel
+ };
+
+ enum ConversionType {
+ NoConversion = 0,
+ A2LConversionByTreshold = 1,
+ A2LConversionBySchmittTrigger = 2
+ };
+
private:
static const int ColourBGAlpha;
public:
- SignalBase(std::shared_ptr channel);
- virtual ~SignalBase() {}
+ SignalBase(shared_ptr channel, ChannelType channel_type);
+ virtual ~SignalBase();
public:
/**
* Returns the underlying SR channel.
*/
- std::shared_ptr channel() const;
+ shared_ptr channel() const;
/**
* Returns enabled status of this channel.
@@ -73,7 +90,7 @@ public:
/**
* Gets the type of this channel.
*/
- const sigrok::ChannelType *type() const;
+ ChannelType type() const;
/**
* Gets the index number of this channel.
@@ -85,6 +102,11 @@ public:
*/
QString name() const;
+ /**
+ * Gets the internal name of this signal, i.e. how the device calls it.
+ */
+ QString internal_name() const;
+
/**
* Sets the name of the signal.
*/
@@ -108,27 +130,41 @@ public:
/**
* Sets the internal data object.
*/
- void set_data(std::shared_ptr data);
+ void set_data(shared_ptr data);
/**
* Get the internal data as analog data object in case of analog type.
*/
- std::shared_ptr analog_data() const;
+ shared_ptr analog_data() const;
/**
* Get the internal data as logic data object in case of logic type.
*/
- std::shared_ptr logic_data() const;
+ shared_ptr logic_data() const;
-#ifdef ENABLE_DECODE
- bool is_decode_signal() const;
+ /**
+ * Changes the kind of conversion performed on this channel.
+ */
+ void set_conversion_type(ConversionType t);
- std::shared_ptr decoder_stack() const;
+#ifdef ENABLE_DECODE
+ virtual bool is_decode_signal() const;
- void set_decoder_stack(std::shared_ptr
- decoder_stack);
+ virtual shared_ptr decoder_stack() const;
#endif
+ void save_settings(QSettings &settings) const;
+
+ void restore_settings(QSettings &settings);
+
+private:
+ uint8_t convert_a2l_threshold(float threshold, float value);
+ uint8_t convert_a2l_schmitt_trigger(float lo_thr, float hi_thr,
+ float value, uint8_t &state);
+
+ void conversion_thread_proc(QObject* segment, uint64_t start_sample,
+ uint64_t end_sample);
+
Q_SIGNALS:
void enabled_changed(const bool &value);
@@ -136,15 +172,31 @@ Q_SIGNALS:
void colour_changed(const QColor &colour);
-private:
- std::shared_ptr channel_;
- std::shared_ptr data_;
+ void conversion_type_changed(const ConversionType t);
-#ifdef ENABLE_DECODE
- std::shared_ptr decoder_stack_;
-#endif
+ void samples_cleared();
+
+ void samples_added(QObject* segment, uint64_t start_sample,
+ uint64_t end_sample);
+
+private Q_SLOTS:
+ void on_samples_cleared();
+
+ void on_samples_added(QObject* segment, uint64_t start_sample,
+ uint64_t end_sample);
+
+ void on_capture_state_changed(int state);
+
+protected:
+ shared_ptr channel_;
+ ChannelType channel_type_;
+ shared_ptr data_;
+ shared_ptr converted_data_;
+ int conversion_type_;
+
+ std::thread conversion_thread_;
- QString name_;
+ QString internal_name_, name_;
QColor colour_, bgcolour_;
};