X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Flogicsignal.cpp;h=f78170b01a30a0028a95befaf7665e7d8a33e649;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hp=bc0961f6a685afa15ffd7b1bd95732682d9fa0b9;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;p=pulseview.git
diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index bc0961f..f78170b 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
@@ -46,6 +46,7 @@ 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;
@@ -67,6 +68,7 @@ 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
@@ -135,7 +137,7 @@ shared_ptr LogicSignal::logic_data() const
return base_->logic_data();
}
-std::pair LogicSignal::v_extents() const
+pair LogicSignal::v_extents() const
{
const int signal_margin =
QFontMetrics(QApplication::font()).height() / 2;
@@ -228,6 +230,30 @@ 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)
@@ -421,7 +447,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;