projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #942 by making sure we always have at least one positive div
[pulseview.git]
/
pv
/
view
/
logicsignal.cpp
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 9c8f6b319cf7fbd1699b0810dea5ba17fe3bc753..3593a5d0a7035039e33ee312ee0de8ca0864e7e2 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-31,14
+31,14
@@
#include "logicsignal.hpp"
#include "view.hpp"
#include "logicsignal.hpp"
#include "view.hpp"
-#include <pv/session.hpp>
-#include <pv/devicemanager.hpp>
-#include <pv/devices/device.hpp>
#include <pv/data/logic.hpp>
#include <pv/data/logicsegment.hpp>
#include <pv/data/signalbase.hpp>
#include <pv/data/logic.hpp>
#include <pv/data/logicsegment.hpp>
#include <pv/data/signalbase.hpp>
-#include <pv/view/view.hpp>
+#include <pv/devicemanager.hpp>
+#include <pv/devices/device.hpp>
#include <pv/globalsettings.hpp>
#include <pv/globalsettings.hpp>
+#include <pv/session.hpp>
+#include <pv/view/view.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
@@
-154,7
+154,7
@@
void LogicSignal::scale_handle_dragged(int offset)
signal_height_ = ((units < 1) ? 1 : units) * font_height;
}
signal_height_ = ((units < 1) ? 1 : units) * font_height;
}
-void LogicSignal::paint_mid(QPainter &p,
const
ViewItemPaintParams &pp)
+void LogicSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
{
QLineF *line;
{
QLineF *line;
@@
-253,7
+253,7
@@
void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
delete[] sampling_points;
}
delete[] sampling_points;
}
-void LogicSignal::paint_fore(QPainter &p,
const
ViewItemPaintParams &pp)
+void LogicSignal::paint_fore(QPainter &p, ViewItemPaintParams &pp)
{
// Draw the trigger marker
if (!trigger_match_ || !base_->enabled())
{
// Draw the trigger marker
if (!trigger_match_ || !base_->enabled())