X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fdata%2Fmathsignal.cpp;h=079c297d828470e0060a329bfc3e21577a558f28;hb=79c0e0452fb025da84af9cc0953b85631af343f9;hp=24df0e71985b3688aa3d1953e323e13084d24d32;hpb=bee54d9ec103a35c86fa9e80fbdd2a07f8fb762d;p=pulseview.git diff --git a/pv/data/mathsignal.cpp b/pv/data/mathsignal.cpp index 24df0e71..079c297d 100644 --- a/pv/data/mathsignal.cpp +++ b/pv/data/mathsignal.cpp @@ -84,7 +84,6 @@ MathSignal::MathSignal(pv::Session &session) : use_custom_sample_rate_(false), use_custom_sample_count_(false), expression_(""), - error_message_(""), exprtk_unknown_symbol_table_(nullptr), exprtk_symbol_table_(nullptr), exprtk_expression_(nullptr), @@ -99,8 +98,6 @@ MathSignal::MathSignal(pv::Session &session) : connect(&session_, SIGNAL(capture_state_changed(int)), this, SLOT(on_capture_state_changed(int))); - connect(&session_, SIGNAL(data_received()), - this, SLOT(on_data_received())); } MathSignal::~MathSignal() @@ -113,6 +110,8 @@ MathSignal::~MathSignal() void MathSignal::save_settings(QSettings &settings) const { + SignalBase::save_settings(settings); + settings.setValue("expression", expression_); settings.setValue("custom_sample_rate", (qulonglong)custom_sample_rate_); @@ -123,6 +122,8 @@ void MathSignal::save_settings(QSettings &settings) const void MathSignal::restore_settings(QSettings &settings) { + SignalBase::restore_settings(settings); + if (settings.contains("expression")) expression_ = settings.value("expression").toString(); @@ -139,11 +140,6 @@ void MathSignal::restore_settings(QSettings &settings) use_custom_sample_count_ = settings.value("use_custom_sample_count").toBool(); } -QString MathSignal::error_message() const -{ - return error_message_; -} - QString MathSignal::get_expression() const { return expression_; @@ -161,6 +157,8 @@ void MathSignal::set_error_message(QString msg) error_message_ = msg; // TODO Emulate noquote() qDebug().nospace() << name() << ": " << msg << "(Expression: '" << expression_ << "')"; + + error_message_changed(msg); } uint64_t MathSignal::get_working_sample_count(uint32_t segment_id) const @@ -201,7 +199,7 @@ uint64_t MathSignal::get_working_sample_count(uint32_t segment_id) const return result; } -void MathSignal::update_completeness(uint32_t segment_id) +void MathSignal::update_completeness(uint32_t segment_id, uint64_t output_sample_count) { bool output_complete = true; @@ -224,9 +222,19 @@ void MathSignal::update_completeness(uint32_t segment_id) } const shared_ptr segment = analog_segments.at(segment_id); - if (!segment->is_complete()) + if (!segment->is_complete()) { + output_complete = false; + continue; + } + + if (output_sample_count < segment->get_sample_count()) output_complete = false; } + } else { + // We're done when we generated as many samples as the stopped session is long + if ((session_.get_capture_state() != Session::Stopped) || + (output_sample_count < session_.get_segment_sample_count(segment_id))) + output_complete = false; } if (output_complete) @@ -285,6 +293,8 @@ void MathSignal::begin_generation() return; } + disconnect(this, SLOT(on_data_received())); + fnc_sig_sample_ = new sig_sample(*this); exprtk_unknown_symbol_table_ = new exprtk::symbol_table(); @@ -303,7 +313,25 @@ void MathSignal::begin_generation() exprtk_parser_->enable_unknown_symbol_resolver(); if (!exprtk_parser_->compile(expression_.toStdString(), *exprtk_expression_)) { - set_error_message(tr("Error in expression")); + QString error_details; + size_t error_count = exprtk_parser_->error_count(); + + for (size_t i = 0; i < error_count; i++) { + typedef exprtk::parser_error::type error_t; + error_t error = exprtk_parser_->get_error(i); + exprtk::parser_error::update_error(error, expression_.toStdString()); + + QString error_detail = tr("%1 at line %2, column %3: %4"); + if ((error_count > 1) && (i < (error_count - 1))) + error_detail += "\n"; + + error_details += error_detail \ + .arg(exprtk::parser_error::to_str(error.mode).c_str()) \ + .arg(error.line_no) \ + .arg(error.column_no) \ + .arg(error.diagnostic.c_str()); + } + set_error_message(error_details); } else { // Resolve unknown scalars to signals and add them to the input signal list vector unknowns; @@ -320,6 +348,11 @@ void MathSignal::begin_generation() } if (error_message_.isEmpty()) { + // Connect to the session data notification if we have no input signals + if (input_signals_.empty()) + connect(&session_, SIGNAL(data_received()), + this, SLOT(on_data_received())); + gen_interrupt_ = false; gen_thread_ = std::thread(&MathSignal::generation_proc, this); } @@ -360,8 +393,6 @@ void MathSignal::generate_samples(uint32_t segment_id, const uint64_t start_samp void MathSignal::generation_proc() { - uint32_t segment_id = 0; - // Don't do anything until we have a valid sample rate do { if (use_custom_sample_rate_) @@ -378,6 +409,7 @@ void MathSignal::generation_proc() if (gen_interrupt_) return; + uint32_t segment_id = 0; shared_ptr analog = analog_data(); // Create initial analog segment @@ -408,28 +440,26 @@ void MathSignal::generation_proc() processed_samples += sample_count; // Notify consumers of this signal's data - // TODO Does this work when a conversion is active? samples_added(segment_id, start_sample, start_sample + processed_samples); } while (!gen_interrupt_ && (processed_samples < samples_to_process)); } - if (samples_to_process == 0) { - update_completeness(segment_id); + update_completeness(segment_id, output_sample_count); - if (segment_id < session_.get_highest_segment_id()) { + if (output_segment->is_complete() && (segment_id < session_.get_highest_segment_id())) { // Process next segment segment_id++; output_segment = make_shared(*analog.get(), segment_id, analog->get_samplerate()); analog->push_segment(output_segment); - } else { - // All segments have been processed, wait for more input - unique_lock gen_input_lock(input_mutex_); - gen_input_cond_.wait(gen_input_lock); - } } + if (!gen_interrupt_ && (samples_to_process == 0)) { + // Wait for more input + unique_lock gen_input_lock(input_mutex_); + gen_input_cond_.wait(gen_input_lock); + } } while (!gen_interrupt_); } @@ -450,6 +480,8 @@ signal_data* MathSignal::signal_from_name(const std::string& name) if (!sb->analog_data()) continue; + connect(sb->analog_data().get(), SIGNAL(samples_added(SharedPtrToSegment, uint64_t, uint64_t)), + this, SLOT(on_data_received())); connect(sb->analog_data().get(), SIGNAL(segment_completed()), this, SLOT(on_data_received())); @@ -479,7 +511,7 @@ void MathSignal::update_signal_sample(signal_data* sig_data, uint32_t segment_id sig_data->sample_num = sample_num; sig_data->sample_value = segment->get_sample(sample_num); - // We only have a reference if this signal is used as a scalar, + // We only have a reference if this signal is used as a scalar; // if it's used by a function, it's null if (sig_data->ref) *(sig_data->ref) = sig_data->sample_value; @@ -490,14 +522,9 @@ void MathSignal::on_capture_state_changed(int state) if (state == Session::Running) begin_generation(); - if (state == Session::Stopped) { - // If we have input signals, we use those as the indicators - if (input_signals_.empty()) { - shared_ptr analog = analog_data(); - if (!analog->analog_segments().empty()) - analog->analog_segments().back()->set_complete(); - } - } + // Make sure we don't miss any input samples, just in case + if (state == Session::Stopped) + gen_input_cond_.notify_one(); } void MathSignal::on_data_received()