projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CPack: Only generate a .tar.gz file.
[pulseview.git]
/
pv
/
view
/
logicsignal.cpp
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index b2302e9e8cc75be8dd9a0aaca05d24a0b02e62d2..568d10b383652a438ddb88c8be09b44a6ac81e27 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-23,8
+23,9
@@
#include <math.h>
#include "logicsignal.h"
#include <math.h>
#include "logicsignal.h"
-#include "../logicdata.h"
-#include "../logicdatasnapshot.h"
+#include "view.h"
+#include "pv/data/logic.h"
+#include "pv/data/logicsnapshot.h"
using namespace boost;
using namespace std;
using namespace boost;
using namespace std;
@@
-51,7
+52,7
@@
const QColor LogicSignal::LogicSignalColours[10] = {
QColor(0xEE, 0xEE, 0xEC), // White
};
QColor(0xEE, 0xEE, 0xEC), // White
};
-LogicSignal::LogicSignal(QString name, shared_ptr<
LogicData
> data,
+LogicSignal::LogicSignal(QString name, shared_ptr<
data::Logic
> data,
int probe_index) :
Signal(name),
_probe_index(probe_index),
int probe_index) :
Signal(name),
_probe_index(probe_index),
@@
-62,25
+63,30
@@
LogicSignal::LogicSignal(QString name, shared_ptr<LogicData> data,
_probe_index % countof(LogicSignalColours)];
}
_probe_index % countof(LogicSignalColours)];
}
-void LogicSignal::paint(QPainter &p,
const QRect &rect, double scale
,
- double offset)
+void LogicSignal::paint(QPainter &p,
int y, int left, int right
,
+
double scale,
double offset)
{
{
+ using pv::view::View;
+
QLineF *line;
vector< pair<int64_t, bool> > edges;
assert(scale > 0);
assert(_data);
QLineF *line;
vector< pair<int64_t, bool> > edges;
assert(scale > 0);
assert(_data);
+ assert(right >= left);
+
+ paint_axis(p, y, left, right);
- const float high_offset =
rect.top()
+ 0.5f;
- const float low_offset =
rect.bottom()
+ 0.5f;
+ const float high_offset =
y - View::SignalHeight
+ 0.5f;
+ const float low_offset =
y
+ 0.5f;
- const deque< shared_ptr<pv::
LogicData
Snapshot> > &snapshots =
+ const deque< shared_ptr<pv::
data::Logic
Snapshot> > &snapshots =
_data->get_snapshots();
_data->get_snapshots();
- if(snapshots.empty())
+ if
(snapshots.empty())
return;
return;
- const shared_ptr<pv::
LogicData
Snapshot> &snapshot =
+ const shared_ptr<pv::
data::Logic
Snapshot> &snapshot =
snapshots.front();
const double pixels_offset = offset / scale;
snapshots.front();
const double pixels_offset = offset / scale;
@@
-89,7
+95,7
@@
void LogicSignal::paint(QPainter &p, const QRect &rect, double scale,
const int64_t last_sample = snapshot->get_sample_count() - 1;
const double samples_per_pixel = samplerate * scale;
const double start = samplerate * (offset - start_time);
const int64_t last_sample = snapshot->get_sample_count() - 1;
const double samples_per_pixel = samplerate * scale;
const double start = samplerate * (offset - start_time);
- const double end = start + samples_per_pixel *
rect.width(
);
+ const double end = start + samples_per_pixel *
(right - left
);
snapshot->get_subsampled_edges(edges,
min(max((int64_t)floor(start), (int64_t)0), last_sample),
snapshot->get_subsampled_edges(edges,
min(max((int64_t)floor(start), (int64_t)0), last_sample),
@@
-102,11
+108,11
@@
void LogicSignal::paint(QPainter &p, const QRect &rect, double scale,
QLineF *const edge_lines = new QLineF[edge_count];
line = edge_lines;
QLineF *const edge_lines = new QLineF[edge_count];
line = edge_lines;
- for
(vector<pv::LogicData
Snapshot::EdgePair>::const_iterator i =
+ for
(vector<pv::data::Logic
Snapshot::EdgePair>::const_iterator i =
edges.begin() + 1;
i != edges.end() - 1; i++) {
const float x = ((*i).first / samples_per_pixel -
edges.begin() + 1;
i != edges.end() - 1; i++) {
const float x = ((*i).first / samples_per_pixel -
- pixels_offset) +
rect.left()
;
+ pixels_offset) +
left
;
*line++ = QLineF(x, high_offset, x, low_offset);
}
*line++ = QLineF(x, high_offset, x, low_offset);
}
@@
-120,10
+126,10
@@
void LogicSignal::paint(QPainter &p, const QRect &rect, double scale,
p.setPen(HighColour);
paint_caps(p, cap_lines, edges, true, samples_per_pixel,
p.setPen(HighColour);
paint_caps(p, cap_lines, edges, true, samples_per_pixel,
- pixels_offset,
rect.left()
, high_offset);
+ pixels_offset,
left
, high_offset);
p.setPen(LowColour);
paint_caps(p, cap_lines, edges, false, samples_per_pixel,
p.setPen(LowColour);
paint_caps(p, cap_lines, edges, false, samples_per_pixel,
- pixels_offset,
rect.left()
, low_offset);
+ pixels_offset,
left
, low_offset);
delete[] cap_lines;
}
delete[] cap_lines;
}
@@
-135,9
+141,9
@@
void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
{
QLineF *line = lines;
{
QLineF *line = lines;
- for
(vector<pv::LogicData
Snapshot::EdgePair>::const_iterator i =
+ for
(vector<pv::data::Logic
Snapshot::EdgePair>::const_iterator i =
edges.begin(); i != (edges.end() - 1); i++)
edges.begin(); i != (edges.end() - 1); i++)
- if((*i).second == level) {
+ if
((*i).second == level) {
*line++ = QLineF(
((*i).first / samples_per_pixel -
pixels_offset) + x_offset, y_offset,
*line++ = QLineF(
((*i).first / samples_per_pixel -
pixels_offset) + x_offset, y_offset,
@@
-148,10
+154,5
@@
void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
p.drawLines(lines, line - lines);
}
p.drawLines(lines, line - lines);
}
-int LogicSignal::get_nominal_offset(const QRect &rect) const
-{
- return rect.bottom();
-}
-
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv