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
return 0;
}
-QColor SignalBase::colour() const
+QColor SignalBase::color() const
{
- return colour_;
+ return color_;
}
-void SignalBase::set_colour(QColor colour)
+void SignalBase::set_color(QColor color)
{
- colour_ = colour;
+ color_ = color;
- bgcolour_ = colour;
- bgcolour_.setAlpha(ColourBGAlpha);
+ bgcolor_ = color;
+ bgcolor_.setAlpha(ColorBGAlpha);
- colour_changed(colour);
+ color_changed(color);
}
-QColor SignalBase::bgcolour() const
+QColor SignalBase::bgcolor() const
{
- return bgcolour_;
+ return bgcolor_;
}
void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
auto segments = data->analog_segments();
try {
result = segments.at(segment_id)->is_complete();
- } catch (out_of_range) {
+ } catch (out_of_range&) {
// Do nothing
}
}
auto segments = data->logic_segments();
try {
result = segments.at(segment_id)->is_complete();
- } catch (out_of_range) {
+ } catch (out_of_range&) {
// Do nothing
}
}
return result;
}
+bool SignalBase::has_samples() const
+{
+ bool result = false;
+
+ if (channel_type_ == AnalogChannel)
+ {
+ shared_ptr<Analog> data = dynamic_pointer_cast<Analog>(data_);
+ if (data) {
+ auto segments = data->analog_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;
+}
+
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());
settings.setValue("conversion_type", (int)conversion_type_);
settings.setValue("conv_options", (int)(conversion_options_.size()));
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());
- int conv_options = settings.value("conv_options").toInt();
+ if (settings.contains("enabled"))
+ set_enabled(settings.value("enabled").toBool());
+
+ if (settings.contains("color"))
+ set_color(settings.value("color").value<QColor>());
+
+ 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);
}
}
(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();
}
}
+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;
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;
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);
projects / pulseview.git / blobdiff