projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
samplingbar: Replace sr_info_get(SR_DI_SAMPLERATES) with sr_config_list(SR_CONF_SAMPL...
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index e0fce889fe06431c6122c4eaad1ec2a9938b6d39..b52d689f22c12d988ef3d2f56499bc0b3e9f4629 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-34,9
+34,9
@@
#include "view.h"
#include "viewport.h"
#include "view.h"
#include "viewport.h"
-#include "
../logicdata
.h"
-#include "
../logicdatasnapshot
.h"
-#include "
../sigsession
.h"
+#include "
pv/sigsession
.h"
+#include "
pv/data/logic
.h"
+#include "
pv/data/logicsnapshot
.h"
using namespace boost;
using namespace std;
using namespace boost;
using namespace std;
@@
-75,8
+75,8
@@
View::View(SigSession &session, QWidget *parent) :
Cursor(*this, 1.0))),
_hover_point(-1, -1)
{
Cursor(*this, 1.0))),
_hover_point(-1, -1)
{
- connect(horizontalScrollBar(), SIGNAL(
valueChang
ed(int)),
- this, SLOT(h_scroll_
value_chang
ed(int)));
+ connect(horizontalScrollBar(), SIGNAL(
sliderMov
ed(int)),
+ this, SLOT(h_scroll_
mov
ed(int)));
connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
this, SLOT(v_scroll_value_changed(int)));
connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
this, SLOT(v_scroll_value_changed(int)));
@@
-189,8
+189,8
@@
void View::normalize_layout()
void View::get_scroll_layout(double &length, double &offset) const
{
void View::get_scroll_layout(double &length, double &offset) const
{
- const shared_ptr<SignalData> sig_data = _session.get_data();
- if(!sig_data)
+ const shared_ptr<
data::
SignalData> sig_data = _session.get_data();
+ if
(!sig_data)
return;
length = _data_length / (sig_data->get_samplerate() * _scale);
return;
length = _data_length / (sig_data->get_samplerate() * _scale);
@@
-210,7
+210,7
@@
void View::update_scroll()
horizontalScrollBar()->setPageStep(areaSize.width());
horizontalScrollBar()->setPageStep(areaSize.width());
- if(length < MaxScrollValue) {
+ if
(length < MaxScrollValue) {
horizontalScrollBar()->setRange(0, length);
horizontalScrollBar()->setSliderPosition(offset);
} else {
horizontalScrollBar()->setRange(0, length);
horizontalScrollBar()->setSliderPosition(offset);
} else {
@@
-228,7
+228,7
@@
void View::update_scroll()
void View::reset_signal_layout()
{
void View::reset_signal_layout()
{
- int offset = SignalMargin;
+ int offset = SignalMargin
+ SignalHeight
;
const vector< shared_ptr<Signal> > sigs(_session.get_signals());
BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
s->set_v_offset(offset);
const vector< shared_ptr<Signal> > sigs(_session.get_signals());
BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
s->set_v_offset(offset);
@@
-241,21
+241,21
@@
void View::reset_signal_layout()
bool View::eventFilter(QObject *object, QEvent *event)
{
const QEvent::Type type = event->type();
bool View::eventFilter(QObject *object, QEvent *event)
{
const QEvent::Type type = event->type();
- if(type == QEvent::MouseMove) {
+ if
(type == QEvent::MouseMove) {
const QMouseEvent *const mouse_event = (QMouseEvent*)event;
const QMouseEvent *const mouse_event = (QMouseEvent*)event;
- if(object == _viewport)
+ if
(object == _viewport)
_hover_point = mouse_event->pos();
_hover_point = mouse_event->pos();
- else if(object == _ruler)
+ else if
(object == _ruler)
_hover_point = QPoint(mouse_event->x(), 0);
_hover_point = QPoint(mouse_event->x(), 0);
- else if(object == _header)
+ else if
(object == _header)
_hover_point = QPoint(0, mouse_event->y());
else
_hover_point = QPoint(-1, -1);
hover_point_changed();
_hover_point = QPoint(0, mouse_event->y());
else
_hover_point = QPoint(-1, -1);
hover_point_changed();
- } else if(type == QEvent::Leave) {
+ } else if
(type == QEvent::Leave) {
_hover_point = QPoint(-1, -1);
hover_point_changed();
}
_hover_point = QPoint(-1, -1);
hover_point_changed();
}
@@
-279,7
+279,7
@@
bool View::viewportEvent(QEvent *e)
}
}
}
}
-void View::resizeEvent(QResizeEvent
*e
)
+void View::resizeEvent(QResizeEvent
*
)
{
_ruler->setGeometry(_viewport->x(), 0,
_viewport->width(), _viewport->y());
{
_ruler->setGeometry(_viewport->x(), 0,
_viewport->width(), _viewport->y());
@@
-288,10
+288,10
@@
void View::resizeEvent(QResizeEvent *e)
update_scroll();
}
update_scroll();
}
-void View::h_scroll_
value_chang
ed(int value)
+void View::h_scroll_
mov
ed(int value)
{
const int range = horizontalScrollBar()->maximum();
{
const int range = horizontalScrollBar()->maximum();
- if(range < MaxScrollValue)
+ if
(range < MaxScrollValue)
_offset = _scale * value;
else {
double length = 0, offset;
_offset = _scale * value;
else {
double length = 0, offset;
@@
-319,12
+319,12
@@
void View::data_updated()
{
// Get the new data length
_data_length = 0;
{
// Get the new data length
_data_length = 0;
- shared_ptr<
LogicData
> sig_data = _session.get_data();
- if(sig_data) {
- deque< shared_ptr<
LogicData
Snapshot> > &snapshots =
+ shared_ptr<
data::Logic
> sig_data = _session.get_data();
+ if
(sig_data) {
+ deque< shared_ptr<
data::Logic
Snapshot> > &snapshots =
sig_data->get_snapshots();
sig_data->get_snapshots();
- BOOST_FOREACH(shared_ptr<
LogicData
Snapshot> s, snapshots)
- if(s)
+ BOOST_FOREACH(shared_ptr<
data::Logic
Snapshot> s, snapshots)
+ if
(s)
_data_length = max(_data_length,
s->get_sample_count());
}
_data_length = max(_data_length,
s->get_sample_count());
}