projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
86e823c
)
Added Header delete key
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sun, 13 Oct 2013 22:44:33 +0000
(23:44 +0100)
committer
Joel Holdsworth
<joel.holdsworth@udptechnology.com>
Mon, 14 Oct 2013 12:00:26 +0000
(13:00 +0100)
pv/view/decodesignal.cpp
patch
|
blob
|
history
pv/view/decodesignal.h
patch
|
blob
|
history
pv/view/header.cpp
patch
|
blob
|
history
pv/view/header.h
patch
|
blob
|
history
pv/view/selectableitem.cpp
patch
|
blob
|
history
pv/view/selectableitem.h
patch
|
blob
|
history
pv/view/signal.cpp
patch
|
blob
|
history
pv/view/signal.h
patch
|
blob
|
history
diff --git
a/pv/view/decodesignal.cpp
b/pv/view/decodesignal.cpp
index bce58a1922751f145313bef0d53a39a992e92d61..5f6bfffcac63a95a5f3e45518405ddd5b1bf5353 100644
(file)
--- a/
pv/view/decodesignal.cpp
+++ b/
pv/view/decodesignal.cpp
@@
-123,6
+123,11
@@
void DecodeSignal::on_new_decode_data()
_view->update_viewport();
}
_view->update_viewport();
}
+void DecodeSignal::delete_pressed()
+{
+ on_delete();
+}
+
void DecodeSignal::on_delete()
{
_session.remove_decode_signal(this);
void DecodeSignal::on_delete()
{
_session.remove_decode_signal(this);
diff --git
a/pv/view/decodesignal.h
b/pv/view/decodesignal.h
index ab1a1608c692e52976c5caaa982eab19340095f6..f9113f5bee99298ef5951aafc97657d59d0d7c58 100644
(file)
--- a/
pv/view/decodesignal.h
+++ b/
pv/view/decodesignal.h
@@
-66,6
+66,8
@@
public:
QMenu* create_context_menu(QWidget *parent);
QMenu* create_context_menu(QWidget *parent);
+ void delete_pressed();
+
private:
/**
private:
/**
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index 77a887f9fe4c9b6b232fa78aaf31cd11b3b5ecd3..dec5c20cbabfad042ec785886a2a2be9ca747e40 100644
(file)
--- a/
pv/view/header.cpp
+++ b/
pv/view/header.cpp
@@
-46,6
+46,7
@@
Header::Header(View &parent) :
MarginWidget(parent),
_dragging(false)
{
MarginWidget(parent),
_dragging(false)
{
+ setFocusPolicy(Qt::ClickFocus);
setMouseTracking(true);
connect(&_view.session(), SIGNAL(signals_changed()),
setMouseTracking(true);
connect(&_view.session(), SIGNAL(signals_changed()),
@@
-235,6
+236,23
@@
void Header::contextMenuEvent(QContextMenuEvent *event)
t->create_context_menu(this)->exec(event->globalPos());
}
t->create_context_menu(this)->exec(event->globalPos());
}
+void Header::keyPressEvent(QKeyEvent *e)
+{
+ assert(e);
+
+ switch (e->key())
+ {
+ case Qt::Key_Delete:
+ {
+ const vector< shared_ptr<Trace> > traces(_view.get_traces());
+ BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+ if (t->selected())
+ t->delete_pressed();
+ break;
+ }
+ }
+}
+
void Header::on_signals_changed()
{
const vector< shared_ptr<Trace> > traces(_view.get_traces());
void Header::on_signals_changed()
{
const vector< shared_ptr<Trace> > traces(_view.get_traces());
diff --git
a/pv/view/header.h
b/pv/view/header.h
index 024227820b6635008216b38b290ec230fce528d8..806cc985c3d482877539cc07d6f90ee77c22cea5 100644
(file)
--- a/
pv/view/header.h
+++ b/
pv/view/header.h
@@
-62,6
+62,8
@@
private:
void contextMenuEvent(QContextMenuEvent *event);
void contextMenuEvent(QContextMenuEvent *event);
+ void keyPressEvent(QKeyEvent *e);
+
private slots:
void on_signals_changed();
private slots:
void on_signals_changed();
diff --git
a/pv/view/selectableitem.cpp
b/pv/view/selectableitem.cpp
index 31c45ef3b166fa9ff4f85894edc304d761b1ad72..3f4f6da92dbef767611c404c753210888b7247fe 100644
(file)
--- a/
pv/view/selectableitem.cpp
+++ b/
pv/view/selectableitem.cpp
@@
-51,6
+51,10
@@
QMenu* SelectableItem::create_context_menu(QWidget *parent)
return new QMenu(parent);
}
return new QMenu(parent);
}
+void SelectableItem::delete_pressed()
+{
+}
+
QPen SelectableItem::highlight_pen()
{
return QPen(QApplication::palette().brush(
QPen SelectableItem::highlight_pen()
{
return QPen(QApplication::palette().brush(
diff --git
a/pv/view/selectableitem.h
b/pv/view/selectableitem.h
index fa728c72745924f764c692a88b5fdb91c868aff0..d3217752289e4cea7ceffdc16b59482ddd862471 100644
(file)
--- a/
pv/view/selectableitem.h
+++ b/
pv/view/selectableitem.h
@@
-63,6
+63,8
@@
public:
virtual pv::widgets::Popup* create_popup(QWidget *parent) = 0;
virtual pv::widgets::Popup* create_popup(QWidget *parent) = 0;
+ virtual void delete_pressed();
+
protected:
static QPen highlight_pen();
protected:
static QPen highlight_pen();
diff --git
a/pv/view/signal.cpp
b/pv/view/signal.cpp
index 44341aeab5cfa406dd3fa65390169907e2089248..8ca55900b47c8002861a8bacbafdba403e366a9c 100644
(file)
--- a/
pv/view/signal.cpp
+++ b/
pv/view/signal.cpp
@@
-111,6
+111,11
@@
QMenu* Signal::create_context_menu(QWidget *parent)
return menu;
}
return menu;
}
+void Signal::delete_pressed()
+{
+ on_disable();
+}
+
void Signal::on_disable()
{
enable(false);
void Signal::on_disable()
{
enable(false);
diff --git
a/pv/view/signal.h
b/pv/view/signal.h
index ecd13dc92a17493d79f7f84a02a141fc5d6d30cf..e5e919548be0679147730823eaf113785c3871fe 100644
(file)
--- a/
pv/view/signal.h
+++ b/
pv/view/signal.h
@@
-64,6
+64,8
@@
public:
QMenu* create_context_menu(QWidget *parent);
QMenu* create_context_menu(QWidget *parent);
+ void delete_pressed();
+
private slots:
void on_disable();
private slots:
void on_disable();