projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #1198 by removing the 1:1 zoom button
[pulseview.git]
/
pv
/
views
/
trace
/
signal.cpp
diff --git
a/pv/views/trace/signal.cpp
b/pv/views/trace/signal.cpp
index 1e277f0d57196beb1ada1be3c4b016e4d44a5d95..d9a7a0841a78b99dc806868e55ebf3198a1cc870 100644
(file)
--- a/
pv/views/trace/signal.cpp
+++ b/
pv/views/trace/signal.cpp
@@
-72,7
+72,7
@@
Signal::Signal(pv::Session &session,
void Signal::set_name(QString name)
{
void Signal::set_name(QString name)
{
-
Trace::
set_name(name);
+
base_->
set_name(name);
if (name != name_widget_->currentText())
name_widget_->setEditText(name);
if (name != name_widget_->currentText())
name_widget_->setEditText(name);
@@
-127,7
+127,7
@@
void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
form->addRow(tr("Name"), name_widget_);
form->addRow(tr("Name"), name_widget_);
- add_colo
u
r_option(parent, form);
+ add_color_option(parent, form);
}
QMenu* Signal::create_context_menu(QWidget *parent)
}
QMenu* Signal::create_context_menu(QWidget *parent)