X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=8a36afaf116f9d76fca1154ca53cac9d558090b0;hb=a9627352f283dd4f83906dc1710a1d9d327fbe57;hp=52a2d22dab76050dfdf4345801dd74724dcf198b;hpb=73a25a6e488f1813c1cd12da085a16e4f91ed4da;p=pulseview.git
diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 52a2d22..8a36afa 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#include
@@ -32,12 +31,13 @@
#include "logicsignal.hpp"
#include "view.hpp"
-#include
-#include
-#include
#include
#include
#include
+#include
+#include
+#include
+#include
#include
#include
@@ -46,26 +46,27 @@ using std::deque;
using std::max;
using std::make_pair;
using std::min;
+using std::none_of;
using std::pair;
using std::shared_ptr;
using std::vector;
using sigrok::ConfigKey;
using sigrok::Capability;
-using sigrok::Error;
using sigrok::Trigger;
-using sigrok::TriggerStage;
using sigrok::TriggerMatch;
using sigrok::TriggerMatchType;
namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
const float LogicSignal::Oversampling = 2.0f;
const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80);
const QColor LogicSignal::HighColour(0x00, 0xC0, 0x00);
const QColor LogicSignal::LowColour(0xC0, 0x00, 0x00);
+const QColor LogicSignal::SamplingPointColour(0x77, 0x77, 0x77);
const QColor LogicSignal::SignalColours[10] = {
QColor(0x16, 0x19, 0x1A), // Black
@@ -99,12 +100,10 @@ QCache LogicSignal::pixmap_cache_;
LogicSignal::LogicSignal(
pv::Session &session,
shared_ptr device,
- shared_ptr base,
- shared_ptr data) :
+ shared_ptr base) :
Signal(session, base),
signal_height_(QFontMetrics(QApplication::font()).height() * 2),
device_(device),
- data_(data),
trigger_none_(nullptr),
trigger_rising_(nullptr),
trigger_high_(nullptr),
@@ -128,20 +127,15 @@ LogicSignal::LogicSignal(
shared_ptr LogicSignal::data() const
{
- return data_;
+ return base_->logic_data();
}
shared_ptr LogicSignal::logic_data() const
{
- return data_;
+ return base_->logic_data();
}
-void LogicSignal::set_logic_data(std::shared_ptr data)
-{
- data_ = data;
-}
-
-std::pair LogicSignal::v_extents() const
+pair LogicSignal::v_extents() const
{
const int signal_margin =
QFontMetrics(QApplication::font()).height() / 2;
@@ -160,14 +154,13 @@ void LogicSignal::scale_handle_dragged(int offset)
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;
vector< pair > edges;
assert(base_);
- assert(data_);
assert(owner_);
const int y = get_visual_y();
@@ -179,12 +172,11 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
const float low_offset = y + 0.5f;
const deque< shared_ptr > &segments =
- data_->logic_segments();
+ base_->logic_data()->logic_segments();
if (segments.empty())
return;
- const shared_ptr &segment =
- segments.front();
+ const shared_ptr &segment = segments.front();
double samplerate = segment->samplerate();
@@ -196,6 +188,7 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
const pv::util::Timestamp& start_time = segment->start_time();
const int64_t last_sample = segment->get_sample_count() - 1;
const double samples_per_pixel = samplerate * pp.scale();
+ const double pixels_per_sample = 1 / samples_per_pixel;
const pv::util::Timestamp start = samplerate * (pp.offset() - start_time);
const pv::util::Timestamp end = start + samples_per_pixel * pp.width();
@@ -208,6 +201,22 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
samples_per_pixel / Oversampling, base_->index());
assert(edges.size() >= 2);
+ // Check whether we need to paint the sampling points
+ GlobalSettings settings;
+ const bool show_sampling_points =
+ settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool() &&
+ (samples_per_pixel < 0.25);
+
+ vector sampling_points;
+ float sampling_point_x = 0.0f;
+ int64_t sampling_point_sample = start_sample;
+ const int w = 2;
+
+ if (show_sampling_points) {
+ sampling_points.reserve(end_sample - start_sample + 1);
+ sampling_point_x = (edges.cbegin()->first / samples_per_pixel - pixels_offset) + pp.left();
+ }
+
// Paint the edges
const unsigned int edge_count = edges.size() - 2;
QLineF *const edge_lines = new QLineF[edge_count];
@@ -217,8 +226,28 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
const float x = ((*i).first / samples_per_pixel -
pixels_offset) + pp.left();
*line++ = QLineF(x, high_offset, x, low_offset);
+
+ if (show_sampling_points)
+ while (sampling_point_sample < (*i).first) {
+ const float y = (*i).second ? low_offset : high_offset;
+ sampling_points.emplace_back(
+ QRectF(sampling_point_x - (w / 2), y - (w / 2), w, w));
+ sampling_point_sample++;
+ sampling_point_x += pixels_per_sample;
+ };
}
+ // Calculate the sample points from the last edge to the end of the trace
+ if (show_sampling_points)
+ while ((uint64_t)sampling_point_sample <= end_sample) {
+ // Signal changed after the last edge, so the level is inverted
+ const float y = (edges.cend() - 1)->second ? high_offset : low_offset;
+ sampling_points.emplace_back(
+ QRectF(sampling_point_x - (w / 2), y - (w / 2), w, w));
+ sampling_point_sample++;
+ sampling_point_x += pixels_per_sample;
+ };
+
p.setPen(EdgeColour);
p.drawLines(edge_lines, edge_count);
delete[] edge_lines;
@@ -235,9 +264,15 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
pixels_offset, pp.left(), low_offset);
delete[] cap_lines;
+
+ // Paint the sampling points
+ if (show_sampling_points) {
+ p.setPen(SamplingPointColour);
+ p.drawRects(sampling_points.data(), sampling_points.size());
+ }
}
-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())
@@ -328,6 +363,10 @@ void LogicSignal::init_trigger_actions(QWidget *parent)
const vector LogicSignal::get_trigger_types() const
{
+ // We may not be associated with a device
+ if (!device_)
+ return vector();
+
const auto sr_dev = device_->device();
if (sr_dev->config_check(ConfigKey::TRIGGER_MATCH, Capability::LIST)) {
const Glib::VariantContainerBase gvar =
@@ -374,7 +413,7 @@ QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type)
action = trigger_change_;
break;
default:
- assert(0);
+ assert(false);
}
}
@@ -428,7 +467,7 @@ void LogicSignal::modify_trigger()
if (trigger) {
for (auto stage : trigger->stages()) {
const auto &matches = stage->matches();
- if (std::none_of(matches.begin(), matches.end(),
+ if (none_of(matches.begin(), matches.end(),
[&](shared_ptr match) {
return match->channel() != base_->channel(); }))
continue;
@@ -493,5 +532,6 @@ void LogicSignal::on_trigger()
modify_trigger();
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv