projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change QApplication::translate to tr, removing deprecated UTF8 parameter
[pulseview.git]
/
pv
/
view
/
header.cpp
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index ca5df96fca250dc23666bbdcf59f644a07083139..2e497761b18a761ca6dd4785252e7bfc96e0030a 100644
(file)
--- a/
pv/view/header.cpp
+++ b/
pv/view/header.cpp
@@
-26,8
+26,6
@@
#include <assert.h>
#include <assert.h>
-#include <boost/foreach.hpp>
-
#include <QApplication>
#include <QMenu>
#include <QMouseEvent>
#include <QApplication>
#include <QMenu>
#include <QMouseEvent>
@@
-36,13
+34,17
@@
#include <pv/widgets/popup.h>
#include <pv/widgets/popup.h>
-using namespace boost;
-using namespace std;
+using std::max;
+using std::make_pair;
+using std::pair;
+using std::shared_ptr;
+using std::vector;
namespace pv {
namespace view {
const int Header::Padding = 12;
namespace pv {
namespace view {
const int Header::Padding = 12;
+const int Header::BaselineOffset = 5;
Header::Header(View &parent) :
MarginWidget(parent),
Header::Header(View &parent) :
MarginWidget(parent),
@@
-56,6
+58,10
@@
Header::Header(View &parent) :
connect(&_view, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
connect(&_view, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
+
+ // Trigger the initial event manually. The default device has signals
+ // which were created before this object came into being
+ on_signals_changed();
}
QSize Header::sizeHint() const
}
QSize Header::sizeHint() const
@@
-63,12
+69,15
@@
QSize Header::sizeHint() const
int max_width = 0;
const vector< shared_ptr<Trace> > traces(_view.get_traces());
int max_width = 0;
const vector< shared_ptr<Trace> > traces(_view.get_traces());
-
BOOST_FOREACH(shared_ptr<Trace> t,
traces) {
+
for (shared_ptr<Trace> t :
traces) {
assert(t);
assert(t);
- max_width = max(max_width, (int)t->get_label_rect(0).width());
+
+ if (t->enabled()) {
+ max_width = max(max_width, (int)t->get_label_rect(0).width());
+ }
}
}
- return QSize(max_width + Padding, 0);
+ return QSize(max_width + Padding
+ BaselineOffset
, 0);
}
shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
}
shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
@@
-76,7
+85,7
@@
shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
const int w = width();
const vector< shared_ptr<Trace> > traces(_view.get_traces());
const int w = width();
const vector< shared_ptr<Trace> > traces(_view.get_traces());
-
BOOST_FOREACH(const shared_ptr<Trace> t,
traces)
+
for (const shared_ptr<Trace> t :
traces)
{
assert(t);
if (t->pt_in_label_rect(0, w, pt))
{
assert(t);
if (t->pt_in_label_rect(0, w, pt))
@@
-89,7
+98,7
@@
shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
void Header::clear_selection()
{
const vector< shared_ptr<Trace> > traces(_view.get_traces());
void Header::clear_selection()
{
const vector< shared_ptr<Trace> > traces(_view.get_traces());
-
BOOST_FOREACH(const shared_ptr<Trace> t,
traces) {
+
for (const shared_ptr<Trace> t :
traces) {
assert(t);
t->select(false);
}
assert(t);
t->select(false);
}
@@
-99,14
+108,17
@@
void Header::clear_selection()
void Header::paintEvent(QPaintEvent*)
{
void Header::paintEvent(QPaintEvent*)
{
- const int w = width();
+ // The trace labels are not drawn with the arrows exactly on the
+ // left edge of the widget, because then the selection shadow
+ // would be clipped away.
+ const int w = width() - BaselineOffset;
const vector< shared_ptr<Trace> > traces(_view.get_traces());
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
const bool dragging = !_drag_traces.empty();
const vector< shared_ptr<Trace> > traces(_view.get_traces());
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
const bool dragging = !_drag_traces.empty();
-
BOOST_FOREACH(const shared_ptr<Trace> t,
traces)
+
for (const shared_ptr<Trace> t :
traces)
{
assert(t);
{
assert(t);
@@
-128,7
+140,7
@@
void Header::mousePressEvent(QMouseEvent *event)
_mouse_down_point = event->pos();
// Save the offsets of any signals which will be dragged
_mouse_down_point = event->pos();
// Save the offsets of any signals which will be dragged
-
BOOST_FOREACH(const shared_ptr<Trace> t,
traces)
+
for (const shared_ptr<Trace> t :
traces)
if (t->selected())
_drag_traces.push_back(
make_pair(t, t->get_v_offset()));
if (t->selected())
_drag_traces.push_back(
make_pair(t, t->get_v_offset()));
@@
-158,7
+170,7
@@
void Header::mousePressEvent(QMouseEvent *event)
if (~QApplication::keyboardModifiers() & Qt::ControlModifier) {
// Unselect all other signals because the Ctrl is not
// pressed
if (~QApplication::keyboardModifiers() & Qt::ControlModifier) {
// Unselect all other signals because the Ctrl is not
// pressed
-
BOOST_FOREACH(const shared_ptr<Trace> t,
traces)
+
for (const shared_ptr<Trace> t :
traces)
if (t != mouse_over_trace)
t->select(false);
}
if (t != mouse_over_trace)
t->select(false);
}
@@
-180,9
+192,10
@@
void Header::mouseReleaseEvent(QMouseEvent *event)
const shared_ptr<Trace> mouse_over_trace =
get_mouse_over_trace(event->pos());
if (mouse_over_trace) {
const shared_ptr<Trace> mouse_over_trace =
get_mouse_over_trace(event->pos());
if (mouse_over_trace) {
+ const int w = width() - BaselineOffset;
Popup *const p =
mouse_over_trace->create_popup(&_view);
Popup *const p =
mouse_over_trace->create_popup(&_view);
- p->set_position(mapToGlobal(QPoint(w
idth()
,
+ p->set_position(mapToGlobal(QPoint(w,
mouse_over_trace->get_y())),
Popup::Right);
p->show();
mouse_over_trace->get_y())),
Popup::Right);
p->show();
@@
-213,10
+226,8
@@
void Header::mouseMoveEvent(QMouseEvent *event)
const int delta = event->pos().y() - _mouse_down_point.y();
const int delta = event->pos().y() - _mouse_down_point.y();
- for (std::list<std::pair<boost::weak_ptr<Trace>,
- int> >::iterator i = _drag_traces.begin();
- i != _drag_traces.end(); i++) {
- const boost::shared_ptr<Trace> trace((*i).first);
+ for (auto i = _drag_traces.begin(); i != _drag_traces.end(); i++) {
+ const std::shared_ptr<Trace> trace((*i).first);
if (trace) {
const int y = (*i).second + delta;
const int y_snap =
if (trace) {
const int y = (*i).second + delta;
const int y_snap =
@@
-260,7
+271,7
@@
void Header::keyPressEvent(QKeyEvent *e)
case Qt::Key_Delete:
{
const vector< shared_ptr<Trace> > traces(_view.get_traces());
case Qt::Key_Delete:
{
const vector< shared_ptr<Trace> > traces(_view.get_traces());
-
BOOST_FOREACH(const shared_ptr<Trace> t,
traces)
+
for (const shared_ptr<Trace> t :
traces)
if (t->selected())
t->delete_pressed();
break;
if (t->selected())
t->delete_pressed();
break;
@@
-271,12
+282,12
@@
void Header::keyPressEvent(QKeyEvent *e)
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());
-
BOOST_FOREACH(shared_ptr<Trace> t,
traces) {
+
for (shared_ptr<Trace> t :
traces) {
assert(t);
connect(t.get(), SIGNAL(visibility_changed()),
assert(t);
connect(t.get(), SIGNAL(visibility_changed()),
- this, SLOT(
update
()));
+ this, SLOT(
on_trace_changed
()));
connect(t.get(), SIGNAL(text_changed()),
connect(t.get(), SIGNAL(text_changed()),
- this, SLOT(on_trace_
text_
changed()));
+ this, SLOT(on_trace_changed()));
connect(t.get(), SIGNAL(colour_changed()),
this, SLOT(update()));
}
connect(t.get(), SIGNAL(colour_changed()),
this, SLOT(update()));
}
@@
-287,7
+298,7
@@
void Header::on_signals_moved()
update();
}
update();
}
-void Header::on_trace_
text_
changed()
+void Header::on_trace_changed()
{
update();
geometry_updated();
{
update();
geometry_updated();