#include <QDebug>
-#include <pv/binding/decoder.hpp>
+#include <extdef.h>
#include <pv/session.hpp>
+#include <pv/binding/decoder.hpp>
using std::dynamic_pointer_cast;
using std::make_shared;
namespace pv {
namespace data {
+const QColor SignalBase::AnalogSignalColors[8] =
+{
+ QColor(0xC4, 0xA0, 0x00), // Yellow HSV: 49 / 100 / 77
+ QColor(0x87, 0x20, 0x7A), // Magenta HSV: 308 / 70 / 53
+ QColor(0x20, 0x4A, 0x87), // Blue HSV: 216 / 76 / 53
+ QColor(0x4E, 0x9A, 0x06), // Green HSV: 91 / 96 / 60
+ QColor(0xBF, 0x6E, 0x00), // Orange HSV: 35 / 100 / 75
+ QColor(0x5E, 0x20, 0x80), // Purple HSV: 280 / 75 / 50
+ QColor(0x20, 0x80, 0x7A), // Turqoise HSV: 177 / 75 / 50
+ QColor(0x80, 0x20, 0x24) // Red HSV: 358 / 75 / 50
+};
+
+const QColor SignalBase::LogicSignalColors[10] =
+{
+ QColor(0x16, 0x19, 0x1A), // Black
+ QColor(0x8F, 0x52, 0x02), // Brown
+ QColor(0xCC, 0x00, 0x00), // Red
+ QColor(0xF5, 0x79, 0x00), // Orange
+ QColor(0xED, 0xD4, 0x00), // Yellow
+ QColor(0x73, 0xD2, 0x16), // Green
+ QColor(0x34, 0x65, 0xA4), // Blue
+ QColor(0x75, 0x50, 0x7B), // Violet
+ QColor(0x88, 0x8A, 0x85), // Grey
+ QColor(0xEE, 0xEE, 0xEC), // White
+};
+
+
const int SignalBase::ColorBGAlpha = 8 * 256 / 100;
const uint64_t SignalBase::ConversionBlockSize = 4096;
const uint32_t SignalBase::ConversionDelay = 1000; // 1 second
group_(nullptr),
conversion_type_(NoConversion),
min_value_(0),
- max_value_(0)
+ max_value_(0),
+ index_(0),
+ error_message_("")
{
if (channel_) {
- internal_name_ = QString::fromStdString(channel_->name());
- index_ = channel_->index();
+ set_internal_name(QString::fromStdString(channel_->name()));
+ set_index(channel_->index());
}
connect(&delayed_conversion_starter_, SIGNAL(timeout()),
this, SLOT(on_delayed_conversion_start()));
delayed_conversion_starter_.setSingleShot(true);
delayed_conversion_starter_.setInterval(ConversionDelay);
+
+ // Only logic and analog SR channels can have their colors auto-set
+ // because for them, we have an index that can be used
+ if (channel_type == LogicChannel)
+ set_color(LogicSignalColors[index() % countof(LogicSignalColors)]);
+ else if (channel_type == AnalogChannel)
+ set_color(AnalogSignalColors[index() % countof(AnalogSignalColors)]);
}
SignalBase::~SignalBase()
void SignalBase::set_internal_name(QString internal_name)
{
internal_name_ = internal_name;
+
+ // Use this name also for the QObject instance
+ setObjectName(internal_name);
}
QString SignalBase::display_name() const
return bgcolor_;
}
+QString SignalBase::get_error_message() const
+{
+ return error_message_;
+}
+
void SignalBase::set_data(shared_ptr<pv::data::SignalData> data)
{
if (data_) {
shared_ptr<data::Analog> SignalBase::analog_data() const
{
+ if (!data_)
+ return nullptr;
+
return dynamic_pointer_cast<Analog>(data_);
}
shared_ptr<data::Logic> SignalBase::logic_data() const
{
- shared_ptr<Logic> result = dynamic_pointer_cast<Logic>(data_);
+ if (!data_)
+ return nullptr;
+
+ shared_ptr<Logic> result;
if (((conversion_type_ == A2LConversionByThreshold) ||
(conversion_type_ == A2LConversionBySchmittTrigger)))
result = dynamic_pointer_cast<Logic>(converted_data_);
+ else
+ result = dynamic_pointer_cast<Logic>(data_);
return result;
}
+shared_ptr<pv::data::SignalData> SignalBase::data() const
+{
+ return data_;
+}
+
bool SignalBase::segment_is_complete(uint32_t segment_id) const
{
bool result = true;
QVariant value = settings.value("color");
// Workaround for Qt QColor serialization bug on OSX
- if ((QMetaType::Type)(value.type()) == QMetaType::QColor)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ bool is_qcolor = (QMetaType::Type)(value.typeId()) == QMetaType::QColor;
+#else
+ bool is_qcolor = (QMetaType::Type)(value.type()) == QMetaType::QColor;
+#endif
+ if (is_qcolor)
set_color(value.value<QColor>());
else
set_color(QColor::fromRgba(value.value<uint32_t>()));
(conversion_type_ == A2LConversionBySchmittTrigger)));
}
-void SignalBase::convert_single_segment_range(AnalogSegment *asegment,
- LogicSegment *lsegment, uint64_t start_sample, uint64_t end_sample)
+void SignalBase::convert_single_segment_range(shared_ptr<AnalogSegment> asegment,
+ shared_ptr<LogicSegment> lsegment, uint64_t start_sample, uint64_t end_sample)
{
if (end_sample > start_sample) {
tie(min_value_, max_value_) = asegment->get_min_max();
lsegment->append_payload(logic->data_pointer(), logic->data_length());
samples_added(lsegment->segment_id(), i, i + ConversionBlockSize);
+
i += ConversionBlockSize;
}
delete[] lsamples;
delete[] asamples;
}
+
+ samples_added(lsegment->segment_id(), start_sample, end_sample);
}
-void SignalBase::convert_single_segment(AnalogSegment *asegment, LogicSegment *lsegment)
+void SignalBase::convert_single_segment(shared_ptr<AnalogSegment> asegment,
+ shared_ptr<LogicSegment> lsegment)
{
uint64_t start_sample, end_sample, old_end_sample;
start_sample = end_sample = 0;
// we do another round of sample conversion.
} while ((complete_state != old_complete_state) ||
(end_sample - old_end_sample >= ConversionBlockSize));
+
+ if (complete_state)
+ lsegment->set_complete();
}
void SignalBase::conversion_thread_proc()
uint32_t segment_id = 0;
- AnalogSegment *asegment = analog_data->analog_segments().front().get();
+ shared_ptr<AnalogSegment> asegment = analog_data->analog_segments().front();
assert(asegment);
+ connect(asegment.get(), SIGNAL(completed()), this, SLOT(on_input_segment_completed()));
const shared_ptr<Logic> logic_data = dynamic_pointer_cast<Logic>(converted_data_);
assert(logic_data);
logic_data->push_segment(new_segment);
}
- LogicSegment *lsegment = logic_data->logic_segments().front().get();
+ shared_ptr<LogicSegment> lsegment = logic_data->logic_segments().front();
assert(lsegment);
do {
// 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()) {
+
+ disconnect(asegment.get(), SIGNAL(completed()), this, SLOT(on_input_segment_completed()));
+
// There are more segments to process
segment_id++;
try {
- asegment = analog_data->analog_segments().at(segment_id).get();
+ asegment = analog_data->analog_segments().at(segment_id);
+ disconnect(asegment.get(), SIGNAL(completed()), this, SLOT(on_input_segment_completed()));
+ connect(asegment.get(), SIGNAL(completed()), this, SLOT(on_input_segment_completed()));
} catch (out_of_range&) {
qDebug() << "Conversion error for" << name() << ": no analog segment" \
<< segment_id << ", segments size is" << analog_data->analog_segments().size();
*logic_data.get(), segment_id, 1, asegment->samplerate());
logic_data->push_segment(new_segment);
- lsegment = logic_data->logic_segments().back().get();
+ lsegment = logic_data->logic_segments().back();
} else {
// No more samples/segments to process, wait for data or interrupt
if (!conversion_interrupt_) {
}
}
} while (!conversion_interrupt_);
+
+ disconnect(asegment.get(), SIGNAL(completed()), this, SLOT(on_input_segment_completed()));
}
void SignalBase::start_conversion(bool delayed_start)
stop_conversion();
- if (converted_data_)
+ if (converted_data_ && (converted_data_->get_segment_count() > 0)) {
converted_data_->clear();
- samples_cleared();
+ samples_cleared();
+ }
conversion_interrupt_ = false;
- conversion_thread_ = std::thread(
- &SignalBase::conversion_thread_proc, this);
+ conversion_thread_ = std::thread(&SignalBase::conversion_thread_proc, this);
+}
+
+void SignalBase::set_error_message(QString msg)
+{
+ error_message_ = msg;
+ // TODO Emulate noquote()
+ qDebug().nospace() << name() << ": " << msg;
+
+ error_message_changed(msg);
}
void SignalBase::stop_conversion()
void SignalBase::on_samples_cleared()
{
- if (converted_data_)
+ if (converted_data_ && (converted_data_->get_segment_count() > 0)) {
converted_data_->clear();
-
- samples_cleared();
+ samples_cleared();
+ }
}
void SignalBase::on_samples_added(SharedPtrToSegment segment, uint64_t start_sample,
samples_added(segment->segment_id(), start_sample, end_sample);
}
+void SignalBase::on_input_segment_completed()
+{
+ if (conversion_type_ != NoConversion)
+ if (conversion_thread_.joinable()) {
+ // Notify the conversion thread since it's running
+ conversion_input_cond_.notify_one();
+ }
+}
+
void SignalBase::on_min_max_changed(float min, float max)
{
// Restart conversion if one is enabled and uses a calculated threshold
projects / pulseview.git / blobdiff