X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fsignal.cpp;h=98cc0eae9d285ae46dbf739cf9575c0a20d92bf0;hb=0bb3dd25421a8638afb881d46799a13378d3f00b;hp=e6c2594f82dabd50b25f5211339c97bbadb56e73;hpb=641574bcc118be0b6dc3a65039ab3497f9d7241a;p=pulseview.git

diff --git a/pv/views/trace/signal.cpp b/pv/views/trace/signal.cpp
index e6c2594f..98cc0eae 100644
--- a/pv/views/trace/signal.cpp
+++ b/pv/views/trace/signal.cpp
@@ -44,18 +44,23 @@ namespace trace {
 const char *const ChannelNames[] = {
 	"CLK",
 	"DATA",
+	"EN",
 	"IN",
 	"OUT",
 	"RST",
 	"TX",
 	"RX",
-	"EN",
+	"SDA",
+	"SCL"
 	"SCLK",
 	"MOSI",
 	"MISO",
+	"/CS",
+	"nCS",
 	"/SS",
-	"SDA",
-	"SCL"
+	"nSS",
+	"/RST",
+	"nRST",
 };
 
 Signal::Signal(pv::Session &session,
@@ -72,7 +77,7 @@ Signal::Signal(pv::Session &session,
 
 void Signal::set_name(QString name)
 {
-	Trace::set_name(name);
+	base_->set_name(name);
 
 	if (name != name_widget_->currentText())
 		name_widget_->setEditText(name);
@@ -90,14 +95,34 @@ shared_ptr<data::SignalBase> Signal::base() const
 
 void Signal::save_settings(QSettings &settings) const
 {
-	(void)settings;
+	std::map<QString, QVariant> settings_map = save_settings();
+
+	for (auto& entry : settings_map)
+		settings.setValue(entry.first, entry.second);
+}
+
+std::map<QString, QVariant> Signal::save_settings() const
+{
+	return std::map<QString, QVariant>();
 }
 
 void Signal::restore_settings(QSettings &settings)
+{
+	std::map<QString, QVariant> settings_map;
+
+	QStringList keys = settings.allKeys();
+	for (int i = 0; i < keys.size(); i++)
+		settings_map[keys.at(i)] = settings.value(keys.at(i));
+
+	restore_settings(settings_map);
+}
+
+void Signal::restore_settings(std::map<QString, QVariant> settings)
 {
 	(void)settings;
 }
 
+
 void Signal::paint_back(QPainter &p, ViewItemPaintParams &pp)
 {
 	if (base_->enabled())
@@ -130,9 +155,9 @@ void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	add_color_option(parent, form);
 }
 
-QMenu* Signal::create_context_menu(QWidget *parent)
+QMenu* Signal::create_header_context_menu(QWidget *parent)
 {
-	QMenu *const menu = Trace::create_context_menu(parent);
+	QMenu *const menu = Trace::create_header_context_menu(parent);
 
 	menu->addSeparator();