Fix #1292/1294 by snapping to any edge when not hovering over a signal

[pulseview.git] / pv / views / trace / signal.cpp

diff --git a/pv/views/trace/signal.cpp b/pv/views/trace/signal.cpp
index a286d95d3c6d07e9b299aefce8ef48701668a987..0c0cde05e18aa4d9d9f5cab9b748743b7fbffc7c 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),
-       name_widget_(nullptr),
-       current_segment_(0)
+       name_widget_(nullptr)
 {
        assert(base_);
 
@@ -73,7 +72,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);
@@ -89,16 +88,6 @@ shared_ptr<data::SignalBase> Signal::base() const
        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;
@@ -138,12 +127,12 @@ void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 
        form->addRow(tr("Name"), name_widget_);
 
-       add_colour_option(parent, 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();