projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor whitespace cosmetics.
[pulseview.git]
/
pv
/
view
/
logicsignal.cpp
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 573d1b780645dd4304295f1543f66f0fb76f4835..717360b852fa65b9aedf5a513f578d47a45e1e40 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-25,6
+25,7
@@
#include <algorithm>
#include <algorithm>
+#include <QApplication>
#include <QFormLayout>
#include <QToolBar>
#include <QFormLayout>
#include <QToolBar>
@@
-59,9
+60,6
@@
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);
@@
-103,6
+101,7
@@
LogicSignal::LogicSignal(
shared_ptr<Channel> channel,
shared_ptr<data::Logic> data) :
Signal(session, channel),
shared_ptr<Channel> channel,
shared_ptr<data::Logic> data) :
Signal(session, channel),
+ signal_height_(QFontMetrics(QApplication::font()).height() * 2),
device_(device),
data_(data),
trigger_none_(nullptr),
device_(device),
data_(data),
trigger_none_(nullptr),
@@
-147,17
+146,21
@@
void LogicSignal::set_logic_data(std::shared_ptr<pv::data::Logic> data)
std::pair<int, int> LogicSignal::v_extents() const
{
std::pair<int, int> LogicSignal::v_extents() const
{
- return make_pair(-SignalHeight - SignalMargin, SignalMargin);
+ const int signal_margin =
+ QFontMetrics(QApplication::font()).height() / 2;
+ return make_pair(-signal_height_ - signal_margin, signal_margin);
}
int LogicSignal::scale_handle_offset() const
{
}
int LogicSignal::scale_handle_offset() const
{
- return
SignalHeight
;
+ return
-signal_height_
;
}
void LogicSignal::scale_handle_dragged(int offset)
{
}
void LogicSignal::scale_handle_dragged(int offset)
{
- (void)offset;
+ const int font_height = QFontMetrics(QApplication::font()).height();
+ const int units = (-offset / font_height);
+ signal_height_ = ((units < 1) ? 1 : units) * font_height;
}
void LogicSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
}
void LogicSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
@@
-181,7
+184,7
@@
void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
if (!channel_->enabled())
return;
if (!channel_->enabled())
return;
- const float high_offset = y -
SignalHeight
+ 0.5f;
+ const float high_offset = y -
signal_height_
+ 0.5f;
const float low_offset = y + 0.5f;
const deque< shared_ptr<pv::data::LogicSegment> > &segments =
const float low_offset = y + 0.5f;
const deque< shared_ptr<pv::data::LogicSegment> > &segments =
@@
-268,7
+271,7
@@
void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
const QSize size = pixmap->size();
const QPoint point(
pp.right() - size.width() - pad * 2,
const QSize size = pixmap->size();
const QPoint point(
pp.right() - size.width() - pad * 2,
- y - (
SignalHeight
+ size.height()) / 2);
+ y - (
signal_height_
+ size.height()) / 2);
p.setPen(QPen(TriggerMarkerBackgroundColour.darker()));
p.setBrush(TriggerMarkerBackgroundColour);
p.setPen(QPen(TriggerMarkerBackgroundColour.darker()));
p.setBrush(TriggerMarkerBackgroundColour);