#include <math.h>
#include "logicsignal.h"
-#include "../logicdata.h"
-#include "../logicdatasnapshot.h"
+#include "pv/data/logic.h"
+#include "pv/data/logicsnapshot.h"
using namespace boost;
using namespace std;
namespace pv {
namespace view {
-const float LogicSignal::Margin = 10.0f;
const float LogicSignal::Oversampling = 2.0f;
const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80);
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),
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::LogicDataSnapshot> > &snapshots =
+ const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
_data->get_snapshots();
- if(snapshots.empty())
+ if (snapshots.empty())
return;
- const shared_ptr<pv::LogicDataSnapshot> &snapshot =
+ const shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
const double pixels_offset = offset / scale;
QLineF *const edge_lines = new QLineF[edge_count];
line = edge_lines;
- for(vector<pv::LogicDataSnapshot::EdgePair>::const_iterator i =
+ for (vector<pv::data::LogicSnapshot::EdgePair>::const_iterator i =
edges.begin() + 1;
i != edges.end() - 1; i++) {
const float x = ((*i).first / samples_per_pixel -
{
QLineF *line = lines;
- for(vector<pv::LogicDataSnapshot::EdgePair>::const_iterator i =
+ for (vector<pv::data::LogicSnapshot::EdgePair>::const_iterator 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,
int LogicSignal::get_nominal_offset(const QRect &rect) const
{
- return rect.bottom() - Margin;
+ return rect.bottom();
}
} // namespace view