projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RowItem: Replaced fixed signal heights with extents
[pulseview.git]
/
pv
/
view
/
logicsignal.cpp
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 69c495e609fafd84b8113e274b3d270305240ff8..37445d96072133e64fe3d90d1798e4840a7d2f9d 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-41,6
+41,7
@@
using std::deque;
using std::max;
using std::deque;
using std::max;
+using std::make_pair;
using std::min;
using std::pair;
using std::shared_ptr;
using std::min;
using std::pair;
using std::shared_ptr;
@@
-58,6
+59,9
@@
using sigrok::TriggerMatchType;
namespace pv {
namespace view {
namespace pv {
namespace view {
+const int LogicSignal::SignalHeight = 30;
+const int LogicSignal::SignalMargin = 10;
+
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);
@@
-120,6
+124,11
@@
shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
return _data;
}
return _data;
}
+std::pair<int, int> LogicSignal::v_extents() const
+{
+ return make_pair(-SignalHeight - SignalMargin, SignalMargin);
+}
+
void LogicSignal::paint_back(QPainter &p, int left, int right)
{
if (_channel->enabled())
void LogicSignal::paint_back(QPainter &p, int left, int right)
{
if (_channel->enabled())
@@
-152,7
+161,7
@@
void LogicSignal::paint_mid(QPainter &p, int left, int right)
if (!_channel->enabled())
return;
if (!_channel->enabled())
return;
- const float high_offset = y -
View::
SignalHeight + 0.5f;
+ const float high_offset = y - SignalHeight + 0.5f;
const float low_offset = y + 0.5f;
const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
const float low_offset = y + 0.5f;
const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =