projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #958 by using new method that auto-converts analog samples
[pulseview.git]
/
pv
/
view
/
logicsignal.cpp
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 440a11903d4277f15d6dfeff6961630d20bfa868..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>
@@
-53,9
+53,7
@@
using std::vector;
using sigrok::ConfigKey;
using sigrok::Capability;
using sigrok::ConfigKey;
using sigrok::Capability;
-using sigrok::Error;
using sigrok::Trigger;
using sigrok::Trigger;
-using sigrok::TriggerStage;
using sigrok::TriggerMatch;
using sigrok::TriggerMatchType;
using sigrok::TriggerMatch;
using sigrok::TriggerMatchType;
@@
-156,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;
@@
-178,8
+176,7
@@
void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
if (segments.empty())
return;
if (segments.empty())
return;
- const shared_ptr<pv::data::LogicSegment> &segment =
- segments.front();
+ const shared_ptr<pv::data::LogicSegment> &segment = segments.front();
double samplerate = segment->samplerate();
double samplerate = segment->samplerate();
@@
-256,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())
@@
-397,7
+394,7
@@
QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type)
action = trigger_change_;
break;
default:
action = trigger_change_;
break;
default:
- assert(
0
);
+ assert(
false
);
}
}
}
}