projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RowItem: Pass rect into label_rect
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index e0c49c20ad4b2f60b4e9ea1b16c69420318321ba..3df87e540b986b0e08b1242c9139950f65f12a5b 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-50,14
+50,14
@@
#include "pv/session.hpp"
#include "pv/data/logic.hpp"
#include "pv/session.hpp"
#include "pv/data/logic.hpp"
-#include "pv/data/logics
napsho
t.hpp"
+#include "pv/data/logics
egmen
t.hpp"
#include "pv/util.hpp"
using boost::shared_lock;
using boost::shared_mutex;
using pv::data::SignalData;
#include "pv/util.hpp"
using boost::shared_lock;
using boost::shared_mutex;
using pv::data::SignalData;
-using pv::data::S
napsho
t;
+using pv::data::S
egmen
t;
using pv::util::format_time;
using std::back_inserter;
using pv::util::format_time;
using std::back_inserter;
@@
-104,7
+104,7
@@
View::View(Session &session, QWidget *parent) :
tick_period_(0.0),
tick_prefix_(0),
show_cursors_(false),
tick_period_(0.0),
tick_prefix_(0),
show_cursors_(false),
- cursors_(
*this
),
+ cursors_(
new CursorPair(*this)
),
hover_point_(-1, -1)
{
connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
hover_point_(-1, -1)
{
connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
@@
-121,9
+121,9
@@
View::View(Session &session, QWidget *parent) :
connect(&session_, SIGNAL(frame_ended()),
this, SLOT(data_updated()));
connect(&session_, SIGNAL(frame_ended()),
this, SLOT(data_updated()));
- connect(cursors_
.
first().get(), SIGNAL(time_changed()),
+ connect(cursors_
->
first().get(), SIGNAL(time_changed()),
this, SLOT(marker_time_changed()));
this, SLOT(marker_time_changed()));
- connect(cursors_
.
second().get(), SIGNAL(time_changed()),
+ connect(cursors_
->
second().get(), SIGNAL(time_changed()),
this, SLOT(marker_time_changed()));
connect(header_, SIGNAL(signals_moved()),
this, SLOT(marker_time_changed()));
connect(header_, SIGNAL(signals_moved()),
@@
-195,6
+195,14
@@
const Viewport* View::viewport() const
return viewport_;
}
return viewport_;
}
+vector< shared_ptr<TimeItem> > View::time_items() const
+{
+ vector< shared_ptr<TimeItem> > items;
+ items.push_back(cursors_->first());
+ items.push_back(cursors_->second());
+ return items;
+}
+
double View::scale() const
{
return scale_;
double View::scale() const
{
return scale_;
@@
-263,9
+271,9
@@
void View::zoom_one_to_one()
double samplerate = 0.0;
for (const shared_ptr<SignalData> d : visible_data) {
assert(d);
double samplerate = 0.0;
for (const shared_ptr<SignalData> d : visible_data) {
assert(d);
- const vector< shared_ptr<S
napshot> > snapsho
ts =
- d->s
napsho
ts();
- for (const shared_ptr<S
napshot> &s : snapsho
ts)
+ const vector< shared_ptr<S
egment> > segmen
ts =
+ d->s
egmen
ts();
+ for (const shared_ptr<S
egment> &s : segmen
ts)
samplerate = max(samplerate, s->samplerate());
}
samplerate = max(samplerate, s->samplerate());
}
@@
-314,9
+322,9
@@
pair<double, double> View::get_time_extents() const
const set< shared_ptr<SignalData> > visible_data = get_visible_data();
for (const shared_ptr<SignalData> d : visible_data)
{
const set< shared_ptr<SignalData> > visible_data = get_visible_data();
for (const shared_ptr<SignalData> d : visible_data)
{
- const vector< shared_ptr<S
napshot> > snapsho
ts =
- d->s
napsho
ts();
- for (const shared_ptr<S
napshot> &s : snapsho
ts) {
+ const vector< shared_ptr<S
egment> > segmen
ts =
+ d->s
egmen
ts();
+ for (const shared_ptr<S
egment> &s : segmen
ts) {
double samplerate = s->samplerate();
samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
double samplerate = s->samplerate();
samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
@@
-349,18
+357,13
@@
void View::show_cursors(bool show)
void View::centre_cursors()
{
const double time_width = scale_ * viewport_->width();
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);
+ cursors_
->
first()->set_time(offset_ + time_width * 0.4);
+ cursors_
->
second()->set_time(offset_ + time_width * 0.6);
cursorheader_->update();
viewport_->update();
}
cursorheader_->update();
viewport_->update();
}
-CursorPair& View::cursors()
-{
- return cursors_;
-}
-
-const CursorPair& View::cursors() const
+std::shared_ptr<CursorPair> View::cursors() const
{
return cursors_;
}
{
return cursors_;
}
@@
-502,16
+505,16
@@
void View::update_layout()
update_scroll();
}
update_scroll();
}
-void View::paint_label(QPainter &p,
int righ
t, bool hover)
+void View::paint_label(QPainter &p,
const QRect &rec
t, bool hover)
{
(void)p;
{
(void)p;
- (void)r
igh
t;
+ (void)r
ec
t;
(void)hover;
}
(void)hover;
}
-QRectF View::label_rect(
int righ
t)
+QRectF View::label_rect(
const QRectF &rec
t)
{
{
- (void)r
igh
t;
+ (void)r
ec
t;
return QRectF();
}
return QRectF();
}