Trace: Removed coloured_bg state

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index ae37b912ca984c0d13f2ff371bfe53e5baa5fb3c..ab458f26bf36e981d49a1992826dbddb41e3d6e1 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -29,18 +29,16 @@
 #include <cmath>
 #include <iostream>
 #include <iterator>
-#include <mutex>
 #include <unordered_set>
 
 #include <boost/archive/text_iarchive.hpp>
 #include <boost/archive/text_oarchive.hpp>
 #include <boost/serialization/serialization.hpp>
-#include <boost/thread/locks.hpp>
 
 #include <QApplication>
-#include <QHBoxLayout>
 #include <QEvent>
 #include <QFontMetrics>
+#include <QHBoxLayout>
 #include <QMouseEvent>
 #include <QScrollBar>
 
@@ -56,20 +54,17 @@
 #include "view.hpp"
 #include "viewport.hpp"
 
-#include "pv/session.hpp"
-#include "pv/globalsettings.hpp"
-#include "pv/devices/device.hpp"
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
+#include "pv/devices/device.hpp"
+#include "pv/globalsettings.hpp"
+#include "pv/session.hpp"
 #include "pv/util.hpp"
 
 #ifdef ENABLE_DECODE
 #include "decodetrace.hpp"
 #endif
 
-using boost::shared_lock;
-using boost::shared_mutex;
-
 using pv::data::SignalData;
 using pv::data::Segment;
 using pv::util::TimeUnit;
@@ -78,11 +73,8 @@ using pv::util::Timestamp;
 using std::back_inserter;
 using std::copy_if;
 using std::count_if;
-using std::deque;
 using std::dynamic_pointer_cast;
 using std::inserter;
-using std::list;
-using std::lock_guard;
 using std::max;
 using std::make_pair;
 using std::make_shared;
@@ -95,7 +87,6 @@ using std::stringstream;
 using std::unordered_map;
 using std::unordered_set;
 using std::vector;
-using std::weak_ptr;
 
 namespace pv {
 namespace views {
@@ -452,7 +443,7 @@ void View::zoom(double steps)
 
 void View::zoom(double steps, int offset)
 {
-       set_zoom(scale_ * pow(3.0/2.0, -steps), offset);
+       set_zoom(scale_ * pow(3.0 / 2.0, -steps), offset);
 }
 
 void View::zoom_fit(bool gui_state)
@@ -541,8 +532,7 @@ pair<Timestamp, Timestamp> View::get_time_extents() const
        boost::optional<Timestamp> left_time, right_time;
        const set< shared_ptr<SignalData> > visible_data = get_visible_data();
        for (const shared_ptr<SignalData> d : visible_data) {
-               const vector< shared_ptr<Segment> > segments =
-                       d->segments();
+               const vector< shared_ptr<Segment> > segments = d->segments();
                for (const shared_ptr<Segment> &s : segments) {
                        double samplerate = s->samplerate();
                        samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
@@ -571,33 +561,24 @@ void View::enable_show_sampling_points(bool state)
        viewport_->update();
 }
 
-void View::enable_coloured_bg(bool state)
+void View::enable_show_analog_minor_grid(bool state)
 {
-       const vector<shared_ptr<TraceTreeItem>> items(
-               list_by_type<TraceTreeItem>());
-
-       for (shared_ptr<TraceTreeItem> i : items) {
-               // Can't cast to Trace because it's abstract, so we need to
-               // check for any derived classes individually
-
-               shared_ptr<AnalogSignal> a = dynamic_pointer_cast<AnalogSignal>(i);
-               if (a)
-                       a->set_coloured_bg(state);
-
-               shared_ptr<LogicSignal> l = dynamic_pointer_cast<LogicSignal>(i);
-               if (l)
-                       l->set_coloured_bg(state);
+       (void)state;
 
-#ifdef ENABLE_DECODE
-               shared_ptr<DecodeTrace> d = dynamic_pointer_cast<DecodeTrace>(i);
-               if (d)
-                       d->set_coloured_bg(state);
-#endif
-       }
+       viewport_->update();
+}
 
+void View::enable_coloured_bg(bool state)
+{
+       coloured_bg_ = state;
        viewport_->update();
 }
 
+bool View::coloured_bg() const
+{
+       return coloured_bg_;
+}
+
 bool View::cursors_shown() const
 {
        return show_cursors_;