X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Flogicsignal.cpp;h=251190ece03b789df3c568c99fdba35fe905affa;hb=00f6bae935837b38b0d03a5928ba8175d460413f;hp=7bb2ee0caebaa9803e51f56af205d80520491e21;hpb=bf0edd2b0cbb5f4bd5d69b0f00bcea7d037e2287;p=pulseview.git
diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 7bb2ee0..251190e 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
@@ -39,6 +38,7 @@
#include
#include
#include
+#include
#include
@@ -59,13 +59,15 @@ 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 +101,10 @@ QCache LogicSignal::pixmap_cache_;
LogicSignal::LogicSignal(
pv::Session &session,
shared_ptr device,
- shared_ptr channel,
- shared_ptr data) :
- Signal(session, channel),
+ 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),
@@ -114,7 +114,7 @@ LogicSignal::LogicSignal(
{
shared_ptr trigger;
- channel_->set_colour(SignalColours[channel->index() % countof(SignalColours)]);
+ base_->set_colour(SignalColours[base->index() % countof(SignalColours)]);
/* Populate this channel's trigger setting with whatever we
* find in the current session trigger, if anything. */
@@ -122,23 +122,18 @@ LogicSignal::LogicSignal(
if ((trigger = session_.session()->trigger()))
for (auto stage : trigger->stages())
for (auto match : stage->matches())
- if (match->channel() == channel_->channel())
+ if (match->channel() == base_->channel())
trigger_match_ = match->type();
}
shared_ptr LogicSignal::data() const
{
- return data_;
+ return base_->logic_data();
}
shared_ptr LogicSignal::logic_data() const
{
- return data_;
-}
-
-void LogicSignal::set_logic_data(std::shared_ptr data)
-{
- data_ = data;
+ return base_->logic_data();
}
std::pair LogicSignal::v_extents() const
@@ -166,20 +161,19 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
vector< pair > edges;
- assert(channel_);
- assert(data_);
+ assert(base_);
assert(owner_);
const int y = get_visual_y();
- if (!channel_->enabled())
+ if (!base_->enabled())
return;
const float high_offset = y - signal_height_ + 0.5f;
const float low_offset = y + 0.5f;
const deque< shared_ptr > &segments =
- data_->logic_segments();
+ base_->logic_data()->logic_segments();
if (segments.empty())
return;
@@ -205,7 +199,7 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
(int64_t)0), last_sample);
segment->get_subsampled_edges(edges, start_sample, end_sample,
- samples_per_pixel / Oversampling, channel_->index());
+ samples_per_pixel / Oversampling, base_->index());
assert(edges.size() >= 2);
// Paint the edges
@@ -235,12 +229,36 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
pixels_offset, pp.left(), low_offset);
delete[] cap_lines;
+
+ // Return if we don't need to paint the sampling points
+ GlobalSettings settings;
+ const bool show_sampling_points =
+ settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
+
+ if (!show_sampling_points || (samples_per_pixel >= 0.25))
+ return;
+
+ // Paint the sampling points
+ const uint64_t sampling_points_count = end_sample - start_sample + 1;
+ QRectF *const sampling_points = new QRectF[sampling_points_count];
+ QRectF *sampling_point = sampling_points;
+
+ const int w = 1;
+ const float y_middle = high_offset - ((high_offset - low_offset) / 2);
+ for (uint64_t i = start_sample; i < end_sample + 1; ++i) {
+ const float x = (i / samples_per_pixel - pixels_offset) + pp.left();
+ *sampling_point++ = QRectF(x - (w / 2), y_middle - (w / 2), w, w);
+ }
+
+ p.setPen(SamplingPointColour);
+ p.drawRects(sampling_points, sampling_points_count);
+ delete[] sampling_points;
}
void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
{
// Draw the trigger marker
- if (!trigger_match_ || !channel_->enabled())
+ if (!trigger_match_ || !base_->enabled())
return;
const int y = get_visual_y();
@@ -430,12 +448,12 @@ void LogicSignal::modify_trigger()
const auto &matches = stage->matches();
if (std::none_of(matches.begin(), matches.end(),
[&](shared_ptr match) {
- return match->channel() != channel_->channel(); }))
+ return match->channel() != base_->channel(); }))
continue;
auto new_stage = new_trigger->add_stage();
for (auto match : stage->matches()) {
- if (match->channel() == channel_->channel())
+ if (match->channel() == base_->channel())
continue;
new_stage->add_match(match->channel(), match->type());
}
@@ -449,7 +467,7 @@ void LogicSignal::modify_trigger()
if (new_trigger->stages().empty())
new_trigger->add_stage();
- new_trigger->stages().back()->add_match(channel_->channel(),
+ new_trigger->stages().back()->add_match(base_->channel(),
trigger_match_);
}
@@ -493,5 +511,6 @@ void LogicSignal::on_trigger()
modify_trigger();
}
-} // namespace view
+} // namespace TraceView
+} // namespace views
} // namespace pv