TabularDecView: Visually indent annotations by PD stack level

[pulseview.git] / pv / data / signalbase.cpp

diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 9f35725f8df1cc540e032680cb70d31b4fe6b5ad..fde99e2b4619a3cadf2b2acd01a862759c183d3f 100644 (file)
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -83,7 +83,7 @@ QString SignalBase::internal_name() const
 
 QString SignalBase::display_name() const
 {
-       if (name() != internal_name_)
+       if ((name() != internal_name_) && (!internal_name_.isEmpty()))
                return name() + " (" + internal_name_ + ")";
        else
                return name();
@@ -450,7 +450,7 @@ void SignalBase::save_settings(QSettings &settings) 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()));
@@ -470,8 +470,19 @@ void SignalBase::restore_settings(QSettings &settings)
        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());