projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
View: Fix snap-to-edge when using all signals
[pulseview.git]
/
pv
/
views
/
trace
/
signal.cpp
diff --git
a/pv/views/trace/signal.cpp
b/pv/views/trace/signal.cpp
index a55598cf3199854aacf98c4dad12558a6cecc4cb..0c0cde05e18aa4d9d9f5cab9b748743b7fbffc7c 100644
(file)
--- a/
pv/views/trace/signal.cpp
+++ b/
pv/views/trace/signal.cpp
@@
-36,7
+36,6
@@
#include "view.hpp"
using std::shared_ptr;
#include "view.hpp"
using std::shared_ptr;
-using std::make_shared;
namespace pv {
namespace views {
namespace pv {
namespace views {
@@
-63,8
+62,6
@@
Signal::Signal(pv::Session &session,
shared_ptr<data::SignalBase> channel) :
Trace(channel),
session_(session),
shared_ptr<data::SignalBase> channel) :
Trace(channel),
session_(session),
- scale_handle_(make_shared<SignalScaleHandle>(*this)),
- items_({scale_handle_}),
name_widget_(nullptr)
{
assert(base_);
name_widget_(nullptr)
{
assert(base_);
@@
-75,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);
@@
-101,11
+98,6
@@
void Signal::restore_settings(QSettings &settings)
(void)settings;
}
(void)settings;
}
-const ViewItemOwner::item_list& Signal::child_items() const
-{
- return items_;
-}
-
void Signal::paint_back(QPainter &p, ViewItemPaintParams &pp)
{
if (base_->enabled())
void Signal::paint_back(QPainter &p, ViewItemPaintParams &pp)
{
if (base_->enabled())
@@
-135,12
+127,12
@@
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_
header_
context_menu(QWidget *parent)
{
{
- QMenu *const menu = Trace::create_context_menu(parent);
+ QMenu *const menu = Trace::create_
header_
context_menu(parent);
menu->addSeparator();
menu->addSeparator();