projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6dcdb32
)
View: Replaced signals_changed handler with signals_updated call
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Mon, 27 Oct 2014 19:00:35 +0000
(19:00 +0000)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Wed, 19 Nov 2014 10:23:02 +0000
(10:23 +0000)
pv/view/header.cpp
patch
|
blob
|
history
pv/view/header.h
patch
|
blob
|
history
pv/view/view.cpp
patch
|
blob
|
history
pv/view/viewport.cpp
patch
|
blob
|
history
pv/view/viewport.h
patch
|
blob
|
history
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index f3849fbe3f1db3ad3005a14273a1a00a9ea434ec..cda0848984a8cbf3d3ae144b5dc139703e929c5c 100644
(file)
--- a/
pv/view/header.cpp
+++ b/
pv/view/header.cpp
@@
-55,9
+55,6
@@
Header::Header(View &parent) :
setFocusPolicy(Qt::ClickFocus);
setMouseTracking(true);
setFocusPolicy(Qt::ClickFocus);
setMouseTracking(true);
- connect(&_view.session(), SIGNAL(signals_changed()),
- this, SLOT(on_signals_changed()));
-
connect(&_view, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
}
connect(&_view, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
}
@@
-87,6
+84,15
@@
void Header::clear_selection()
update();
}
update();
}
+void Header::signals_updated()
+{
+ for (shared_ptr<RowItem> r : _view) {
+ assert(r);
+ connect(r.get(), SIGNAL(appearance_changed()),
+ this, SLOT(on_trace_changed()));
+ }
+}
+
void Header::show_popup(const shared_ptr<RowItem> &item)
{
using pv::widgets::Popup;
void Header::show_popup(const shared_ptr<RowItem> &item)
{
using pv::widgets::Popup;
@@
-273,19
+279,6
@@
void Header::keyPressEvent(QKeyEvent *e)
}
}
}
}
-void Header::on_signals_changed()
-{
- for (shared_ptr<RowItem> r : _view) {
- assert(r);
- connect(r.get(), SIGNAL(visibility_changed()),
- this, SLOT(on_trace_changed()));
- connect(r.get(), SIGNAL(text_changed()),
- this, SLOT(on_trace_changed()));
- connect(r.get(), SIGNAL(colour_changed()),
- this, SLOT(update()));
- }
-}
-
void Header::on_signals_moved()
{
update();
void Header::on_signals_moved()
{
update();
diff --git
a/pv/view/header.h
b/pv/view/header.h
index 319f234e255e532f4f3a016c1c78bb6c40d1c821..76899b3ab424dcc7002dae4984eb30901b6cf5e3 100644
(file)
--- a/
pv/view/header.h
+++ b/
pv/view/header.h
@@
-51,6
+51,8
@@
public:
*/
static const int BaselineOffset;
*/
static const int BaselineOffset;
+ void signals_updated();
+
private:
std::shared_ptr<pv::view::RowItem> get_mouse_over_row_item(
const QPoint &pt);
private:
std::shared_ptr<pv::view::RowItem> get_mouse_over_row_item(
const QPoint &pt);
@@
-76,8
+78,6
@@
private:
void keyPressEvent(QKeyEvent *e);
private Q_SLOTS:
void keyPressEvent(QKeyEvent *e);
private Q_SLOTS:
- void on_signals_changed();
-
void on_signals_moved();
void on_trace_changed();
void on_signals_moved();
void on_trace_changed();
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index 035b7803bb83b96d78101602474c8684115e22d1..f754868c96b69b4efd0bc61856fa71d946aa3071 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-522,6
+522,10
@@
void View::signals_changed()
update_layout();
normalize_layout();
update_layout();
normalize_layout();
+
+ // Update the child widgets
+ _header->signals_updated();
+ _viewport->signals_updated();
}
void View::data_updated()
}
void View::data_updated()
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index 221714051504a81a7e48b47056217d98f67e05cb..8963e047b355dc8f3f0d2d2eba30fd2cb3b92766 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-52,9
+52,6
@@
Viewport::Viewport(View &parent) :
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
- connect(&_view.session(), SIGNAL(signals_changed()),
- this, SLOT(on_signals_changed()));
-
connect(&_view, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
}
connect(&_view, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
}
@@
-67,6
+64,15
@@
int Viewport::get_total_height() const
return h;
}
return h;
}
+void Viewport::signals_updated()
+{
+ for (shared_ptr<RowItem> r : _view) {
+ assert(r);
+ connect(r.get(), SIGNAL(appearance_changed()),
+ this, SLOT(update()));
+ }
+}
+
void Viewport::paintEvent(QPaintEvent*)
{
vector< shared_ptr<RowItem> > row_items(_view.begin(), _view.end());
void Viewport::paintEvent(QPaintEvent*)
{
vector< shared_ptr<RowItem> > row_items(_view.begin(), _view.end());
@@
-225,15
+231,6
@@
bool Viewport::touchEvent(QTouchEvent *event)
return true;
}
return true;
}
-void Viewport::on_signals_changed()
-{
- for (shared_ptr<RowItem> r : _view) {
- assert(r);
- connect(r.get(), SIGNAL(appearance_changed()),
- this, SLOT(update()));
- }
-}
-
void Viewport::on_signals_moved()
{
update();
void Viewport::on_signals_moved()
{
update();
diff --git
a/pv/view/viewport.h
b/pv/view/viewport.h
index 10b88b4c01d413e4d9a96fa5f1f96562d8836aed..1f8f8f61095748e4290911e1fe5caa2d4cbedd74 100644
(file)
--- a/
pv/view/viewport.h
+++ b/
pv/view/viewport.h
@@
-43,6
+43,8
@@
public:
int get_total_height() const;
int get_total_height() const;
+ void signals_updated();
+
protected:
void paintEvent(QPaintEvent *event);
protected:
void paintEvent(QPaintEvent *event);
@@
-56,7
+58,6
@@
private:
bool touchEvent(QTouchEvent *e);
private Q_SLOTS:
bool touchEvent(QTouchEvent *e);
private Q_SLOTS:
- void on_signals_changed();
void on_signals_moved();
private:
void on_signals_moved();
private: