projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bar displaying undecoded area
[pulseview.git]
/
pv
/
views
/
trace
/
signal.cpp
diff --git
a/pv/views/trace/signal.cpp
b/pv/views/trace/signal.cpp
index a286d95d3c6d07e9b299aefce8ef48701668a987..d9a7a0841a78b99dc806868e55ebf3198a1cc870 100644
(file)
--- a/
pv/views/trace/signal.cpp
+++ b/
pv/views/trace/signal.cpp
@@
-62,8
+62,7
@@
Signal::Signal(pv::Session &session,
shared_ptr<data::SignalBase> channel) :
Trace(channel),
session_(session),
shared_ptr<data::SignalBase> channel) :
Trace(channel),
session_(session),
- name_widget_(nullptr),
- current_segment_(0)
+ name_widget_(nullptr)
{
assert(base_);
{
assert(base_);
@@
-73,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);
@@
-89,16
+88,6
@@
shared_ptr<data::SignalBase> Signal::base() const
return base_;
}
return base_;
}
-void Signal::set_current_segment(const int segment)
-{
- current_segment_ = segment;
-}
-
-int Signal::get_current_segment() const
-{
- return current_segment_;
-}
-
void Signal::save_settings(QSettings &settings) const
{
(void)settings;
void Signal::save_settings(QSettings &settings) const
{
(void)settings;
@@
-138,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)