projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved data and snapshot classes into pv::data namespace
[pulseview.git]
/
pv
/
view
/
logicsignal.cpp
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index cf3f3e5a58dd076b1a58a9bfd39a3e93bf092de4..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;
@@
-32,7
+32,6
@@
using namespace std;
namespace pv {
namespace view {
namespace pv {
namespace view {
-const float LogicSignal::Margin = 10.0f;
const float LogicSignal::Oversampling = 2.0f;
const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80);
const float LogicSignal::Oversampling = 2.0f;
const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80);
@@
-52,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),
@@
-73,15
+72,15
@@
void LogicSignal::paint(QPainter &p, const QRect &rect, double scale,
assert(scale > 0);
assert(_data);
assert(scale > 0);
assert(_data);
- const float high_offset = rect.top() +
Margin +
0.5f;
- const float low_offset = rect.bottom()
- Margin
+ 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();
_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;
@@
-103,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 -
@@
-136,9
+135,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,
@@
-151,7
+150,7
@@
void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
int LogicSignal::get_nominal_offset(const QRect &rect) const
{
int LogicSignal::get_nominal_offset(const QRect &rect) const
{
- return rect.bottom()
- Margin
;
+ return rect.bottom();
}
} // namespace view
}
} // namespace view