projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed pv::dialogs::About to accomodate 42515b0f in libsigrokdecode
[pulseview.git]
/
pv
/
view
/
logicsignal.cpp
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 03d6aa253bd008a2381c1be3e880f36c157a01c5..d23da5bbf021815a5b668ccfb624ebfb401d9e38 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-23,8
+23,8
@@
#include <math.h>
#include "logicsignal.h"
#include <math.h>
#include "logicsignal.h"
-#include "
../logicdata
.h"
-#include "
../logicdata
snapshot.h"
+#include "
pv/data/logic
.h"
+#include "
pv/data/logic
snapshot.h"
using namespace boost;
using namespace std;
using namespace boost;
using namespace std;
@@
-51,7
+51,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),
@@
-75,12
+75,12
@@
void LogicSignal::paint(QPainter &p, const QRect &rect, double scale,
const float high_offset = rect.top() + 0.5f;
const float low_offset = rect.bottom() + 0.5f;
const float high_offset = rect.top() + 0.5f;
const float low_offset = rect.bottom() + 0.5f;
- const deque< shared_ptr<pv::
LogicData
Snapshot> > &snapshots =
+ const deque< shared_ptr<pv::
data::Logic
Snapshot> > &snapshots =
_data->get_snapshots();
if (snapshots.empty())
return;
_data->get_snapshots();
if (snapshots.empty())
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;
@@
-102,7
+102,7
@@
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 -
@@
-135,7
+135,7
@@
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++)
if ((*i).second == level) {
*line++ = QLineF(
edges.begin(); i != (edges.end() - 1); i++)
if ((*i).second == level) {
*line++ = QLineF(