projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename 'probe' to 'channel' everywhere.
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index 3d3b8eb233c74a9cc2498de16e3a7b7522019cfe..1d55e14f7c91f20f55d09bffc1d4540d8819ddb6 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-26,12
+26,11
@@
#include <limits.h>
#include <math.h>
#include <limits.h>
#include <math.h>
-#include <boost/foreach.hpp>
-
#include <QEvent>
#include <QMouseEvent>
#include <QScrollBar>
#include <QEvent>
#include <QMouseEvent>
#include <QScrollBar>
+#include "cursorheader.h"
#include "decodetrace.h"
#include "header.h"
#include "ruler.h"
#include "decodetrace.h"
#include "header.h"
#include "ruler.h"
@@
-43,8
+42,6
@@
#include "pv/data/logic.h"
#include "pv/data/logicsnapshot.h"
#include "pv/data/logic.h"
#include "pv/data/logicsnapshot.h"
-using boost::shared_ptr;
-using boost::weak_ptr;
using pv::data::SignalData;
using std::deque;
using std::list;
using pv::data::SignalData;
using std::deque;
using std::list;
@@
-53,7
+50,9
@@
using std::make_pair;
using std::min;
using std::pair;
using std::set;
using std::min;
using std::pair;
using std::set;
+using std::shared_ptr;
using std::vector;
using std::vector;
+using std::weak_ptr;
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-76,6
+75,7
@@
View::View(SigSession &session, QWidget *parent) :
_session(session),
_viewport(new Viewport(*this)),
_ruler(new Ruler(*this)),
_session(session),
_viewport(new Viewport(*this)),
_ruler(new Ruler(*this)),
+ _cursorheader(new CursorHeader(*this)),
_header(new Header(*this)),
_scale(1e-6),
_offset(0),
_header(new Header(*this)),
_scale(1e-6),
_offset(0),
@@
-108,24
+108,29
@@
View::View(SigSession &session, QWidget *parent) :
this, SLOT(on_signals_moved()));
connect(_header, SIGNAL(selection_changed()),
this, SLOT(on_signals_moved()));
connect(_header, SIGNAL(selection_changed()),
- _
rul
er, SLOT(clear_selection()));
- connect(_
rul
er, SIGNAL(selection_changed()),
+ _
cursorhead
er, SLOT(clear_selection()));
+ connect(_
cursorhead
er, SIGNAL(selection_changed()),
_header, SLOT(clear_selection()));
connect(_header, SIGNAL(selection_changed()),
this, SIGNAL(selection_changed()));
_header, SLOT(clear_selection()));
connect(_header, SIGNAL(selection_changed()),
this, SIGNAL(selection_changed()));
- connect(_
rul
er, SIGNAL(selection_changed()),
+ connect(_
cursorhead
er, SIGNAL(selection_changed()),
this, SIGNAL(selection_changed()));
setViewport(_viewport);
_viewport->installEventFilter(this);
_ruler->installEventFilter(this);
this, SIGNAL(selection_changed()));
setViewport(_viewport);
_viewport->installEventFilter(this);
_ruler->installEventFilter(this);
+ _cursorheader->installEventFilter(this);
_header->installEventFilter(this);
// Trigger the initial event manually. The default device has signals
// which were created before this object came into being
signals_changed();
_header->installEventFilter(this);
// Trigger the initial event manually. The default device has signals
// which were created before this object came into being
signals_changed();
+
+ // make sure the transparent widgets are on the top
+ _cursorheader->raise();
+ _header->raise();
}
SigSession& View::session()
}
SigSession& View::session()
@@
-192,7
+197,7
@@
void View::zoom_one_to_one()
return;
double samplerate = 0.0;
return;
double samplerate = 0.0;
-
BOOST_FOREACH(const shared_ptr<SignalData> d,
visible_data) {
+
for (const shared_ptr<SignalData> d :
visible_data) {
assert(d);
samplerate = max(samplerate, d->samplerate());
}
assert(d);
samplerate = max(samplerate, d->samplerate());
}
@@
-215,6
+220,7
@@
void View::set_scale_offset(double scale, double offset)
update_scroll();
_ruler->update();
update_scroll();
_ruler->update();
+ _cursorheader->update();
_viewport->update();
scale_offset_changed();
}
_viewport->update();
scale_offset_changed();
}
@@
-248,7
+254,7
@@
list<weak_ptr<SelectableItem> > View::selected_items() const
// List the selected signals
const vector< shared_ptr<Trace> > traces(get_traces());
// List the selected signals
const vector< shared_ptr<Trace> > traces(get_traces());
-
BOOST_FOREACH (shared_ptr<Trace> t,
traces) {
+
for (shared_ptr<Trace> t :
traces) {
assert(t);
if (t->selected())
items.push_back(t);
assert(t);
if (t->selected())
items.push_back(t);
@@
-270,7
+276,7
@@
set< shared_ptr<SignalData> > View::get_visible_data() const
// Make a set of all the visible data objects
set< shared_ptr<SignalData> > visible_data;
// Make a set of all the visible data objects
set< shared_ptr<SignalData> > visible_data;
-
BOOST_FOREACH(const shared_ptr<Signal> sig,
sigs)
+
for (const shared_ptr<Signal> sig :
sigs)
if (sig->enabled())
visible_data.insert(sig->data());
if (sig->enabled())
visible_data.insert(sig->data());
@@
-284,7
+290,7
@@
pair<double, double> View::get_time_extents() const
return make_pair(0.0, 0.0);
double left_time = DBL_MAX, right_time = DBL_MIN;
return make_pair(0.0, 0.0);
double left_time = DBL_MAX, right_time = DBL_MIN;
-
BOOST_FOREACH(const shared_ptr<SignalData> d,
visible_data)
+
for (const shared_ptr<SignalData> d :
visible_data)
{
const double start_time = d->get_start_time();
double samplerate = d->samplerate();
{
const double start_time = d->get_start_time();
double samplerate = d->samplerate();
@@
-307,7
+313,7
@@
bool View::cursors_shown() const
void View::show_cursors(bool show)
{
_show_cursors = show;
void View::show_cursors(bool show)
{
_show_cursors = show;
- _
rul
er->update();
+ _
cursorhead
er->update();
_viewport->update();
}
_viewport->update();
}
@@
-316,7
+322,7
@@
void View::centre_cursors()
const double time_width = _scale * _viewport->width();
_cursors.first()->set_time(_offset + time_width * 0.4);
_cursors.second()->set_time(_offset + time_width * 0.6);
const double time_width = _scale * _viewport->width();
_cursors.first()->set_time(_offset + time_width * 0.4);
_cursors.second()->set_time(_offset + time_width * 0.6);
- _
rul
er->update();
+ _
cursorhead
er->update();
_viewport->update();
}
_viewport->update();
}
@@
-340,11
+346,11
@@
void View::normalize_layout()
const vector< shared_ptr<Trace> > traces(get_traces());
int v_min = INT_MAX;
const vector< shared_ptr<Trace> > traces(get_traces());
int v_min = INT_MAX;
-
BOOST_FOREACH(const shared_ptr<Trace> t,
traces)
+
for (const shared_ptr<Trace> t :
traces)
v_min = min(t->get_v_offset(), v_min);
const int delta = -min(v_min, 0);
v_min = min(t->get_v_offset(), v_min);
const int delta = -min(v_min, 0);
-
BOOST_FOREACH(shared_ptr<Trace> t,
traces)
+
for (shared_ptr<Trace> t :
traces)
t->set_v_offset(t->get_v_offset() + delta);
verticalScrollBar()->setSliderPosition(_v_offset + delta);
t->set_v_offset(t->get_v_offset() + delta);
verticalScrollBar()->setSliderPosition(_v_offset + delta);
@@
-407,12
+413,17
@@
void View::update_scroll()
void View::update_layout()
{
void View::update_layout()
{
- setViewportMargins(_header->sizeHint().width(),
+ setViewportMargins(
+ _header->sizeHint().width() - pv::view::Header::BaselineOffset,
_ruler->sizeHint().height(), 0, 0);
_ruler->setGeometry(_viewport->x(), 0,
_viewport->width(), _viewport->y());
_ruler->sizeHint().height(), 0, 0);
_ruler->setGeometry(_viewport->x(), 0,
_viewport->width(), _viewport->y());
+ _cursorheader->setGeometry(
+ _viewport->x(),
+ _ruler->sizeHint().height() - _cursorheader->sizeHint().height() / 2,
+ _viewport->width(), _cursorheader->sizeHint().height());
_header->setGeometry(0, _viewport->y(),
_header->setGeometry(0, _viewport->y(),
- _
viewport->x
(), _viewport->height());
+ _
header->sizeHint().width
(), _viewport->height());
update_scroll();
}
update_scroll();
}
@@
-432,7
+443,7
@@
bool View::eventFilter(QObject *object, QEvent *event)
const QMouseEvent *const mouse_event = (QMouseEvent*)event;
if (object == _viewport)
_hover_point = mouse_event->pos();
const QMouseEvent *const mouse_event = (QMouseEvent*)event;
if (object == _viewport)
_hover_point = mouse_event->pos();
- else if (object == _ruler)
+ else if (object == _ruler
|| object == _cursorheader
)
_hover_point = QPoint(mouse_event->x(), 0);
else if (object == _header)
_hover_point = QPoint(0, mouse_event->y());
_hover_point = QPoint(mouse_event->x(), 0);
else if (object == _header)
_hover_point = QPoint(0, mouse_event->y());
@@
-458,6
+469,9
@@
bool View::viewportEvent(QEvent *e)
case QEvent::MouseButtonDblClick:
case QEvent::MouseMove:
case QEvent::Wheel:
case QEvent::MouseButtonDblClick:
case QEvent::MouseMove:
case QEvent::Wheel:
+ case QEvent::TouchBegin:
+ case QEvent::TouchUpdate:
+ case QEvent::TouchEnd:
return false;
default:
return false;
default:
@@
-485,6
+499,7
@@
void View::h_scroll_value_changed(int value)
}
_ruler->update();
}
_ruler->update();
+ _cursorheader->update();
_viewport->update();
}
_viewport->update();
}
@@
-499,7
+514,7
@@
void View::signals_changed()
{
int offset = SignalMargin + SignalHeight;
const vector< shared_ptr<Trace> > traces(get_traces());
{
int offset = SignalMargin + SignalHeight;
const vector< shared_ptr<Trace> > traces(get_traces());
-
BOOST_FOREACH(shared_ptr<Trace> t,
traces) {
+
for (shared_ptr<Trace> t :
traces) {
t->set_view(this);
t->set_v_offset(offset);
offset += SignalHeight + 2 * SignalMargin;
t->set_view(this);
t->set_v_offset(offset);
offset += SignalHeight + 2 * SignalMargin;
@@
-520,7
+535,7
@@
void View::data_updated()
void View::marker_time_changed()
{
void View::marker_time_changed()
{
- _
rul
er->update();
+ _
cursorhead
er->update();
_viewport->update();
}
_viewport->update();
}