X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=80322f9b3a4258db05e9b53a7fc4cb3549cf9e76;hb=516d21289dafa7ce9b5352454a0eda31999c5efc;hp=ae98dc3a85a50c30c377929dede032a81bbcb894;hpb=476ca5f48e8a528d529f36b8b0c8471c655415ad;p=pulseview.git

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index ae98dc3a..80322f9b 100644
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -124,7 +124,7 @@ bool CustomScrollArea::viewportEvent(QEvent *event)
 	}
 }
 
-View::View(Session &session, bool is_main_view, QWidget *parent) :
+View::View(Session &session, bool is_main_view, QMainWindow *parent) :
 	ViewBase(session, is_main_view, parent),
 
 	// Note: Place defaults in View::reset_view_state(), not here
@@ -244,6 +244,11 @@ View::~View()
 	GlobalSettings::remove_change_handler(this);
 }
 
+ViewType View::get_type() const
+{
+	return ViewTypeTrace;
+}
+
 void View::reset_view_state()
 {
 	ViewBase::reset_view_state();
@@ -319,11 +324,14 @@ void View::add_signal(const shared_ptr<Signal> signal)
 #ifdef ENABLE_DECODE
 void View::clear_decode_signals()
 {
+	ViewBase::clear_decode_signals();
 	decode_traces_.clear();
 }
 
 void View::add_decode_signal(shared_ptr<data::DecodeSignal> signal)
 {
+	ViewBase::add_decode_signal(signal);
+
 	shared_ptr<DecodeTrace> d(
 		new DecodeTrace(session_, signal, decode_traces_.size()));
 	decode_traces_.push_back(d);
@@ -343,6 +351,8 @@ void View::remove_decode_signal(shared_ptr<data::DecodeSignal> signal)
 			signals_changed();
 			return;
 		}
+
+	ViewBase::remove_decode_signal(signal);
 }
 #endif
 
@@ -798,26 +808,6 @@ pair<Timestamp, Timestamp> View::get_time_extents() const
 	return make_pair(*left_time, *right_time);
 }
 
-void View::enable_show_sampling_points(bool state)
-{
-	(void)state;
-
-	viewport_->update();
-}
-
-void View::enable_show_analog_minor_grid(bool state)
-{
-	(void)state;
-
-	viewport_->update();
-}
-
-void View::enable_colored_bg(bool state)
-{
-	colored_bg_ = state;
-	viewport_->update();
-}
-
 bool View::colored_bg() const
 {
 	return colored_bg_;
@@ -1037,13 +1027,22 @@ int View::header_width() const
 
 void View::on_setting_changed(const QString &key, const QVariant &value)
 {
+	GlobalSettings settings;
+
+	if (key == GlobalSettings::Key_View_ColoredBG) {
+		colored_bg_ = settings.value(GlobalSettings::Key_View_ColoredBG).toBool();
+		viewport_->update();
+	}
+
+	if ((key == GlobalSettings::Key_View_ShowSamplingPoints) ||
+	   (key == GlobalSettings::Key_View_ShowAnalogMinorGrid))
+		viewport_->update();
+
 	if (key == GlobalSettings::Key_View_TriggerIsZeroTime)
 		on_settingViewTriggerIsZeroTime_changed(value);
 
-	if (key == GlobalSettings::Key_View_SnapDistance) {
-		GlobalSettings settings;
+	if (key == GlobalSettings::Key_View_SnapDistance)
 		snap_distance_ = settings.value(GlobalSettings::Key_View_SnapDistance).toInt();
-	}
 }
 
 void View::trigger_event(int segment_id, util::Timestamp location)