namespace pv {
namespace data {
-const int SignalBase::ColourBGAlpha = 8 * 256 / 100;
+const int SignalBase::ColorBGAlpha = 8 * 256 / 100;
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
-{
- return (channel_) ? QString::fromStdString(channel_->name()) : name_;
-}
-
-QString SignalBase::internal_name() const
-{
- return internal_name_;
-}
-
-void SignalBase::set_name(QString name)
+bool SignalBase::is_generated() const
{
- 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;
}
-QColor SignalBase::colour() const
+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 colour_;
+ return internal_name_;
}
-void SignalBase::set_colour(QColor colour)
+void SignalBase::set_internal_name(QString internal_name)
{
- colour_ = colour;
+ internal_name_ = internal_name;
+}
- bgcolour_ = colour;
- bgcolour_.setAlpha(ColourBGAlpha);
+QString SignalBase::display_name() const
+{
+ if ((name() != internal_name_) && (!internal_name_.isEmpty()))
+ return name() + " (" + internal_name_ + ")";
+ else
+ return name();
+}
- colour_changed(colour);
+void SignalBase::set_name(QString name)
+{
+ if (channel_)
+ channel_->set_name(name.toUtf8().constData());
+
+ name_ = name;
+
+ name_changed(name);
}
-QColor SignalBase::bgcolour() const
+QColor SignalBase::color() const
{
- return bgcolour_;
+ return color_;
+}
+
+void SignalBase::set_color(QColor color)
+{
+ color_ = color;
+
+ bgcolor_ = color;
+ bgcolor_.setAlpha(ColorBGAlpha);
+
+ color_changed(color);
+}
+
+QColor SignalBase::bgcolor() const
+{
+ return bgcolor_;
}
void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
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)))
return result;
}
+bool SignalBase::segment_is_complete(uint32_t segment_id) const
+{
+ bool result = true;
+
+ shared_ptr<Analog> adata = analog_data();
+ if (adata)
+ {
+ auto segments = adata->analog_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
+ }
+ }
+ }
+
+ return result;
+}
+
+bool SignalBase::has_samples() const
+{
+ bool result = false;
+
+ shared_ptr<Analog> adata = analog_data();
+ if (adata)
+ {
+ 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;
+ }
+ }
+
+ 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();
+ }
+
+ // Default samplerate is 1 Hz
+ return 1.0;
+}
+
SignalBase::ConversionType SignalBase::get_conversion_type() const
{
return conversion_type_;
{
settings.setValue("name", name());
settings.setValue("enabled", enabled());
- settings.setValue("colour", colour());
+ 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++;
void SignalBase::restore_settings(QSettings &settings)
{
- set_name(settings.value("name").toString());
- set_enabled(settings.value("enabled").toBool());
- set_colour(settings.value("colour").value<QColor>());
- set_conversion_type((ConversionType)settings.value("conversion_type").toInt());
+ if (settings.contains("name"))
+ set_name(settings.value("name").toString());
+
+ if (settings.contains("enabled"))
+ set_enabled(settings.value("enabled").toBool());
+
+ if (settings.contains("color")) {
+ QVariant value = settings.value("color");
- int conv_options = settings.value("conv_options").toInt();
+ // 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());
+
+ int conv_options = 0;
+ if (settings.contains("conv_options"))
+ conv_options = settings.value("conv_options").toInt();
if (conv_options)
for (int i = 0; i < conv_options; i++) {
- QString key = settings.value(QString("conv_option%1_key").arg(i)).toString();
- QVariant value = settings.value(QString("conv_option%1_value").arg(i));
- conversion_options_[key] = value;
+ const QString key_id = QString("conv_option%1_key").arg(i);
+ const QString value_id = QString("conv_option%1_value").arg(i);
+
+ if (settings.contains(key_id) && settings.contains(value_id))
+ conversion_options_[settings.value(key_id).toString()] =
+ settings.value(value_id);
}
}
bool SignalBase::conversion_is_a2l() const
{
- return ((channel_type_ == AnalogChannel) &&
- ((conversion_type_ == A2LConversionByThreshold) ||
+ return (((conversion_type_ == A2LConversionByThreshold) ||
(conversion_type_ == A2LConversionBySchmittTrigger)));
}
-void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *lsegment)
+void SignalBase::convert_single_segment_range(AnalogSegment *asegment,
+ LogicSegment *lsegment, uint64_t start_sample, uint64_t end_sample)
{
- uint64_t start_sample, end_sample;
- start_sample = end_sample = 0;
-
- start_sample = lsegment->get_sample_count();
- end_sample = asegment->get_sample_count();
-
if (end_sample > start_sample) {
tie(min_value_, max_value_) = asegment->get_min_max();
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;
analog->get_logic_via_threshold(threshold, lsamples);
lsegment->append_payload(logic->data_pointer(), logic->data_length());
-
- samples_added(lsegment, i, i + ConversionBlockSize);
+ samples_added(lsegment->segment_id(), i, i + ConversionBlockSize);
i += ConversionBlockSize;
}
shared_ptr<sigrok::Logic> logic =
analog->get_logic_via_threshold(threshold, lsamples);
lsegment->append_payload(logic->data_pointer(), logic->data_length());
- samples_added(lsegment, i, end_sample);
+ samples_added(lsegment->segment_id(), i, end_sample);
}
if (conversion_type_ == A2LConversionBySchmittTrigger) {
&state, lsamples);
lsegment->append_payload(logic->data_pointer(), logic->data_length());
-
- samples_added(lsegment, i, i + ConversionBlockSize);
+ samples_added(lsegment->segment_id(), i, i + ConversionBlockSize);
i += ConversionBlockSize;
}
analog->get_logic_via_schmitt_trigger(lo_thr, hi_thr,
&state, lsamples);
lsegment->append_payload(logic->data_pointer(), logic->data_length());
- samples_added(lsegment, i, end_sample);
+ samples_added(lsegment->segment_id(), i, end_sample);
}
// If acquisition is ongoing, start-/endsample may have changed
}
}
+void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *lsegment)
+{
+ uint64_t start_sample, end_sample, old_end_sample;
+ start_sample = end_sample = 0;
+ bool complete_state, old_complete_state;
+
+ start_sample = lsegment->get_sample_count();
+ end_sample = asegment->get_sample_count();
+ complete_state = asegment->is_complete();
+
+ // Don't do anything if the segment is still being filled and the sample count is too small
+ if ((!complete_state) && (end_sample - start_sample < ConversionBlockSize))
+ return;
+
+ do {
+ convert_single_segment_range(asegment, lsegment, start_sample, end_sample);
+
+ old_end_sample = end_sample;
+ old_complete_state = complete_state;
+
+ start_sample = lsegment->get_sample_count();
+ end_sample = asegment->get_sample_count();
+ complete_state = asegment->is_complete();
+
+ // If the segment has been incomplete when we were called and has been
+ // completed in the meanwhile, we convert the remaining samples as well.
+ // Also, if a sufficient number of samples was added in the meanwhile,
+ // we do another round of sample conversion.
+ } while ((complete_state != old_complete_state) ||
+ (end_sample - old_end_sample >= ConversionBlockSize));
+}
+
void SignalBase::conversion_thread_proc()
{
shared_ptr<Analog> analog_data;
if (conversion_is_a2l()) {
analog_data = dynamic_pointer_cast<Analog>(data_);
- if (analog_data->analog_segments().size() == 0)
- return;
+ if (analog_data->analog_segments().size() == 0) {
+ unique_lock<mutex> input_lock(conversion_input_mutex_);
+ conversion_input_cond_.wait(input_lock);
+ }
} else
// Currently, we only handle A2L conversions
return;
+ // If we had to wait for input data, we may have been notified to terminate
+ if (conversion_interrupt_)
+ return;
+
uint32_t segment_id = 0;
AnalogSegment *asegment = analog_data->analog_segments().front().get();
// Create the initial logic data segment if needed
if (logic_data->logic_segments().size() == 0) {
shared_ptr<LogicSegment> new_segment =
- make_shared<LogicSegment>(*logic_data.get(), 1, asegment->samplerate());
+ make_shared<LogicSegment>(*logic_data.get(), 0, 1, asegment->samplerate());
logic_data->push_segment(new_segment);
}
do {
convert_single_segment(asegment, lsegment);
- if (analog_data->analog_segments().size() > logic_data->logic_segments().size()) {
+ // Only advance to next segment if the current input segment is complete
+ if (asegment->is_complete() &&
+ analog_data->analog_segments().size() > logic_data->logic_segments().size()) {
// There are more segments to process
segment_id++;
try {
asegment = analog_data->analog_segments().at(segment_id).get();
- } catch (out_of_range) {
+ } catch (out_of_range&) {
qDebug() << "Conversion error for" << name() << ": no analog segment" \
<< segment_id << ", segments size is" << analog_data->analog_segments().size();
return;
}
- shared_ptr<LogicSegment> new_segment =
- make_shared<LogicSegment>(*logic_data.get(), 1, asegment->samplerate());
+ shared_ptr<LogicSegment> new_segment = make_shared<LogicSegment>(
+ *logic_data.get(), segment_id, 1, asegment->samplerate());
logic_data->push_segment(new_segment);
lsegment = logic_data->logic_segments().back().get();
} else {
- // No more segments to process, wait for data or interrupt
+ // No more samples/segments to process, wait for data or interrupt
if (!conversion_interrupt_) {
unique_lock<mutex> input_lock(conversion_input_mutex_);
conversion_input_cond_.wait(input_lock);
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) {
}
}
- samples_added(segment, 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