Random simplifications, cosmetics/whitespace/consistency fixes.

[pulseview.git] / pv / view / logicsignal.cpp

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index b8be8bbad0eb4a7c2ab438291f131b436e559263..9c8f6b319cf7fbd1699b0810dea5ba17fe3bc753 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
  */
 
 #include <extdef.h>
@@ -39,6 +38,7 @@
 #include <pv/data/logicsegment.hpp>
 #include <pv/data/signalbase.hpp>
 #include <pv/view/view.hpp>
+#include <pv/globalsettings.hpp>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
@@ -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
@@ -134,7 +135,7 @@ shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
        return base_->logic_data();
 }
 
-std::pair<int, int> LogicSignal::v_extents() const
+pair<int, int> LogicSignal::v_extents() const
 {
        const int signal_margin =
                QFontMetrics(QApplication::font()).height() / 2;
@@ -175,8 +176,7 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
        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();
 
@@ -227,6 +227,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)
@@ -320,6 +344,10 @@ void LogicSignal::init_trigger_actions(QWidget *parent)
 
 const vector<int32_t> LogicSignal::get_trigger_types() const
 {
+       // We may not be associated with a device
+       if (!device_)
+               return vector<int32_t>();
+
        const auto sr_dev = device_->device();
        if (sr_dev->config_check(ConfigKey::TRIGGER_MATCH, Capability::LIST)) {
                const Glib::VariantContainerBase gvar =
@@ -366,7 +394,7 @@ QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type)
                        action = trigger_change_;
                        break;
                default:
-                       assert(0);
+                       assert(false);
                }
        }
 
@@ -420,7 +448,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<TriggerMatch> match) {
                                        return match->channel() != base_->channel(); }))
                                continue;
@@ -485,5 +513,6 @@ void LogicSignal::on_trigger()
        modify_trigger();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv