const uint64_t SignalBase::ConversionBlockSize = 4096;
const uint32_t SignalBase::ConversionDelay = 1000; // 1 second
+
+SignalGroup::SignalGroup(const QString& name)
+{
+ name_ = name;
+}
+
+void SignalGroup::append_signal(shared_ptr<SignalBase> signal)
+{
+ if (!signal)
+ return;
+
+ signals_.push_back(signal);
+ signal->set_group(this);
+}
+
+void SignalGroup::remove_signal(shared_ptr<SignalBase> signal)
+{
+ if (!signal)
+ return;
+
+ signals_.erase(std::remove_if(signals_.begin(), signals_.end(),
+ [&](shared_ptr<SignalBase> s) { return s == signal; }),
+ signals_.end());
+}
+
+deque<shared_ptr<SignalBase>> SignalGroup::signals() const
+{
+ return signals_;
+}
+
+void SignalGroup::clear()
+{
+ for (shared_ptr<SignalBase> sb : signals_)
+ sb->set_group(nullptr);
+
+ signals_.clear();
+}
+
+const QString SignalGroup::name() const
+{
+ return name_;
+}
+
+
SignalBase::SignalBase(shared_ptr<sigrok::Channel> channel, ChannelType channel_type) :
channel_(channel),
channel_type_(channel_type),
+ group_(nullptr),
conversion_type_(NoConversion),
min_value_(0),
max_value_(0)
{
- if (channel_)
+ if (channel_) {
internal_name_ = QString::fromStdString(channel_->name());
+ index_ = channel_->index();
+ }
connect(&delayed_conversion_starter_, SIGNAL(timeout()),
this, SLOT(on_delayed_conversion_start()));
return channel_;
}
-QString SignalBase::name() const
+bool SignalBase::is_generated() const
{
- return (channel_) ? QString::fromStdString(channel_->name()) : name_;
-}
-
-QString SignalBase::internal_name() const
-{
- return internal_name_;
-}
-
-QString SignalBase::display_name() const
-{
- if (name() != internal_name_)
- return name() + " (" + internal_name_ + ")";
- else
- return name();
-}
-
-void SignalBase::set_name(QString name)
-{
- if (channel_)
- channel_->set_name(name.toUtf8().constData());
-
- name_ = name;
-
- name_changed(name);
+ // Only signals associated with a device have a corresponding sigrok channel
+ return channel_ == nullptr;
}
bool SignalBase::enabled() const
unsigned int SignalBase::index() const
{
- return (channel_) ? channel_->index() : 0;
+ return index_;
+}
+
+void SignalBase::set_index(unsigned int index)
+{
+ index_ = index;
}
unsigned int SignalBase::logic_bit_index() const
{
if (channel_type_ == LogicChannel)
- return channel_->index();
+ return index_;
else
return 0;
}
+void SignalBase::set_group(SignalGroup* group)
+{
+ group_ = group;
+}
+
+SignalGroup* SignalBase::group() const
+{
+ return group_;
+}
+
+QString SignalBase::name() const
+{
+ return (channel_) ? QString::fromStdString(channel_->name()) : name_;
+}
+
+QString SignalBase::internal_name() const
+{
+ return internal_name_;
+}
+
+void SignalBase::set_internal_name(QString internal_name)
+{
+ internal_name_ = internal_name;
+}
+
+QString SignalBase::display_name() const
+{
+ if ((name() != internal_name_) && (!internal_name_.isEmpty()))
+ return name() + " (" + internal_name_ + ")";
+ else
+ return name();
+}
+
+void SignalBase::set_name(QString name)
+{
+ if (channel_)
+ channel_->set_name(name.toUtf8().constData());
+
+ name_ = name;
+
+ name_changed(name);
+}
+
QColor SignalBase::color() const
{
return color_;
if (data_) {
disconnect(data.get(), SIGNAL(samples_cleared()),
this, SLOT(on_samples_cleared()));
- disconnect(data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
- this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t)));
-
- if (channel_type_ == AnalogChannel) {
- shared_ptr<Analog> analog = analog_data();
- assert(analog);
+ disconnect(data.get(), SIGNAL(samples_added(shared_ptr<Segment>, uint64_t, uint64_t)),
+ this, SLOT(on_samples_added(shared_ptr<Segment>, uint64_t, uint64_t)));
+ shared_ptr<Analog> analog = analog_data();
+ if (analog)
disconnect(analog.get(), SIGNAL(min_max_changed(float, float)),
this, SLOT(on_min_max_changed(float, float)));
- }
}
data_ = data;
if (data_) {
connect(data.get(), SIGNAL(samples_cleared()),
this, SLOT(on_samples_cleared()));
- connect(data.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
- this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t)));
-
- if (channel_type_ == AnalogChannel) {
- shared_ptr<Analog> analog = analog_data();
- assert(analog);
+ connect(data.get(), SIGNAL(samples_added(SharedPtrToSegment, uint64_t, uint64_t)),
+ this, SLOT(on_samples_added(SharedPtrToSegment, uint64_t, uint64_t)));
+ shared_ptr<Analog> analog = analog_data();
+ if (analog)
connect(analog.get(), SIGNAL(min_max_changed(float, float)),
this, SLOT(on_min_max_changed(float, float)));
- }
}
}
-shared_ptr<data::Analog> SignalBase::analog_data() const
+void SignalBase::clear_sample_data()
{
- shared_ptr<Analog> result = nullptr;
+ if (analog_data())
+ analog_data()->clear();
- if (channel_type_ == AnalogChannel)
- result = dynamic_pointer_cast<Analog>(data_);
+ if (logic_data())
+ logic_data()->clear();
+}
- return result;
+shared_ptr<data::Analog> SignalBase::analog_data() const
+{
+ return dynamic_pointer_cast<Analog>(data_);
}
shared_ptr<data::Logic> SignalBase::logic_data() const
{
- shared_ptr<Logic> result = nullptr;
-
- if (channel_type_ == LogicChannel)
- result = dynamic_pointer_cast<Logic>(data_);
+ shared_ptr<Logic> result = dynamic_pointer_cast<Logic>(data_);
if (((conversion_type_ == A2LConversionByThreshold) ||
(conversion_type_ == A2LConversionBySchmittTrigger)))
{
bool result = true;
- if (channel_type_ == AnalogChannel)
+ shared_ptr<Analog> adata = analog_data();
+ if (adata)
{
- shared_ptr<Analog> data = dynamic_pointer_cast<Analog>(data_);
- auto segments = data->analog_segments();
+ auto segments = adata->analog_segments();
try {
result = segments.at(segment_id)->is_complete();
} catch (out_of_range&) {
// Do nothing
}
- }
-
- if (channel_type_ == LogicChannel)
- {
- shared_ptr<Logic> data = dynamic_pointer_cast<Logic>(data_);
- auto segments = data->logic_segments();
- try {
- result = segments.at(segment_id)->is_complete();
- } catch (out_of_range&) {
- // Do nothing
+ } else {
+ shared_ptr<Logic> ldata = logic_data();
+ if (ldata) {
+ shared_ptr<Logic> data = dynamic_pointer_cast<Logic>(data_);
+ auto segments = data->logic_segments();
+ try {
+ result = segments.at(segment_id)->is_complete();
+ } catch (out_of_range&) {
+ // Do nothing
+ }
}
}
{
bool result = false;
- if (channel_type_ == AnalogChannel)
+ shared_ptr<Analog> adata = analog_data();
+ if (adata)
{
- shared_ptr<Analog> data = dynamic_pointer_cast<Analog>(data_);
- if (data) {
- auto segments = data->analog_segments();
+ auto segments = adata->analog_segments();
+ if ((segments.size() > 0) && (segments.front()->get_sample_count() > 0))
+ result = true;
+ } else {
+ shared_ptr<Logic> ldata = logic_data();
+ if (ldata) {
+ auto segments = ldata->logic_segments();
if ((segments.size() > 0) && (segments.front()->get_sample_count() > 0))
result = true;
}
}
- if (channel_type_ == LogicChannel)
- {
- shared_ptr<Logic> data = dynamic_pointer_cast<Logic>(data_);
- if (data) {
- auto segments = data->logic_segments();
- if ((segments.size() > 0) && (segments.front()->get_sample_count() > 0))
- result = true;
- }
+ return result;
+}
+
+double SignalBase::get_samplerate() const
+{
+ shared_ptr<Analog> adata = analog_data();
+ if (adata)
+ return adata->get_samplerate();
+ else {
+ shared_ptr<Logic> ldata = logic_data();
+ if (ldata)
+ return ldata->get_samplerate();
}
- return result;
+ // Default samplerate is 1 Hz
+ return 1.0;
}
SignalBase::ConversionType SignalBase::get_conversion_type() const
{
settings.setValue("name", name());
settings.setValue("enabled", enabled());
- settings.setValue("color", color());
+ settings.setValue("color", color().rgba());
settings.setValue("conversion_type", (int)conversion_type_);
settings.setValue("conv_options", (int)(conversion_options_.size()));
int i = 0;
- for (auto kvp : conversion_options_) {
+ for (auto& kvp : conversion_options_) {
settings.setValue(QString("conv_option%1_key").arg(i), kvp.first);
settings.setValue(QString("conv_option%1_value").arg(i), kvp.second);
i++;
if (settings.contains("enabled"))
set_enabled(settings.value("enabled").toBool());
- if (settings.contains("color"))
- set_color(settings.value("color").value<QColor>());
+ if (settings.contains("color")) {
+ QVariant value = settings.value("color");
+
+ // Workaround for Qt QColor serialization bug on OSX
+ if ((QMetaType::Type)(value.type()) == QMetaType::QColor)
+ set_color(value.value<QColor>());
+ else
+ set_color(QColor::fromRgba(value.value<uint32_t>()));
+
+ // A color with an alpha value of 0 makes the signal marker invisible
+ if (color() == QColor(0, 0, 0, 0))
+ set_color(Qt::gray);
+ }
if (settings.contains("conversion_type"))
set_conversion_type((ConversionType)settings.value("conversion_type").toInt());
bool SignalBase::conversion_is_a2l() const
{
- return ((channel_type_ == AnalogChannel) &&
- ((conversion_type_ == A2LConversionByThreshold) ||
+ return (((conversion_type_ == A2LConversionByThreshold) ||
(conversion_type_ == A2LConversionBySchmittTrigger)));
}
uint8_t *lsamples = new uint8_t[ConversionBlockSize];
vector<shared_ptr<sigrok::Channel> > channels;
- channels.push_back(channel_);
+ if (channel_)
+ channels.push_back(channel_);
vector<const sigrok::QuantityFlag*> mq_flags;
const sigrok::Quantity * const mq = sigrok::Quantity::VOLTAGE;
samples_cleared();
}
-void SignalBase::on_samples_added(QObject* segment, uint64_t start_sample,
+void SignalBase::on_samples_added(SharedPtrToSegment segment, uint64_t start_sample,
uint64_t end_sample)
{
if (conversion_type_ != NoConversion) {
}
}
- data::Segment* s = qobject_cast<data::Segment*>(segment);
- samples_added(s->segment_id(), start_sample, end_sample);
+ samples_added(segment->segment_id(), start_sample, end_sample);
}
void SignalBase::on_min_max_changed(float min, float max)
projects / pulseview.git / blobdiff