X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=c7944179ad5a7185de2dc3c0bf2a30c69ef09860;hb=5f9b7de5c8c71801141d35497786bf57f75e3ca4;hp=ab458f26bf36e981d49a1992826dbddb41e3d6e1;hpb=489953884c0d7692fa20748314751e114ae54cf2;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index ab458f2..c794417 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -96,7 +96,6 @@ const Timestamp View::MaxScale("1e9");
 const Timestamp View::MinScale("1e-12");
 
 const int View::MaxScrollValue = INT_MAX / 2;
-const int View::MaxViewAutoUpdateRate = 25; // No more than 25 Hz with sticky scrolling
 
 const int View::ScaleUnits[3] = {1, 2, 5};
 
@@ -150,8 +149,7 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
 	trigger_markers_(),
 	hover_point_(-1, -1),
 	scroll_needs_defaults_(false),
-	saved_v_offset_(0),
-	size_finalized_(false)
+	saved_v_offset_(0)
 {
 	GlobalSettings settings;
 	coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
@@ -178,11 +176,6 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
 		this, SLOT(process_sticky_events()));
 	lazy_event_handler_.setSingleShot(true);
 
-	connect(&delayed_view_updater_, SIGNAL(timeout()),
-		this, SLOT(perform_delayed_view_update()));
-	delayed_view_updater_.setSingleShot(true);
-	delayed_view_updater_.setInterval(1000 / MaxViewAutoUpdateRate);
-
 	/* To let the scroll area fill up the parent QWidget (this), we need a layout */
 	QHBoxLayout *layout = new QHBoxLayout(this);
 	setLayout(layout);
@@ -224,11 +217,13 @@ unordered_set< shared_ptr<Signal> > View::signals() const
 
 void View::clear_signals()
 {
+	ViewBase::clear_signalbases();
 	signals_.clear();
 }
 
 void View::add_signal(const shared_ptr<Signal> signal)
 {
+	ViewBase::add_signalbase(signal->base());
 	signals_.insert(signal);
 }
 
@@ -323,7 +318,7 @@ void View::restore_settings(QSettings &settings)
 		saved_v_offset_ = settings.value("v_offset").toInt();
 		set_v_offset(saved_v_offset_);
 		scroll_needs_defaults_ = false;
-		// Note: see resizeEvent() for additional information
+		// Note: see eventFilter() for additional information
 	}
 }
 
@@ -655,12 +650,6 @@ void View::restack_all_trace_tree_items()
 	for (auto &o : sorted_owners)
 		o->restack_items();
 
-	// Re-assign background colors
-	bool next_bgcolour_state = false;
-
-	for (auto &o : sorted_owners)
-		next_bgcolour_state = o->reassign_bgcolour_states(next_bgcolour_state);
-
 	// Animate the items to their destination
 	for (const auto &i : items)
 		i->animate_to_layout_v_offset();
@@ -826,11 +815,6 @@ void View::set_scroll_default()
 	else
 		// Put the first trace at the top, letting the bottom ones overflow
 		set_v_offset(extents.first);
-
-	// If we're not sure whether setting the defaults worked as
-	// the window wasn't set up entirely yet, we want to be called
-	// again later to make sure
-	scroll_needs_defaults_ = !size_finalized_;
 }
 
 void View::update_layout()
@@ -946,6 +930,26 @@ bool View::eventFilter(QObject *object, QEvent *event)
 	} else if (type == QEvent::Leave) {
 		hover_point_ = QPoint(-1, -1);
 		hover_point_changed();
+	} else if (type == QEvent::Show) {
+
+		// This is somewhat of a hack, unfortunately. We cannot use
+		// set_v_offset() from within restore_settings() as the view
+		// at that point is neither visible nor properly sized.
+		// This is the least intrusive workaround I could come up
+		// with: set the vertical offset (or scroll defaults) when
+		// the view is shown, which happens after all widgets were
+		// resized to their final sizes.
+		update_layout();
+
+		if (scroll_needs_defaults_) {
+			set_scroll_default();
+			scroll_needs_defaults_ = false;
+		}
+
+		if (saved_v_offset_) {
+			set_v_offset(saved_v_offset_);
+			saved_v_offset_ = 0;
+		}
 	}
 
 	return QObject::eventFilter(object, event);
@@ -954,27 +958,6 @@ bool View::eventFilter(QObject *object, QEvent *event)
 void View::resizeEvent(QResizeEvent*)
 {
 	update_layout();
-
-	// This is somewhat of a hack, unfortunately. We cannot use
-	// set_v_offset() from within restore_settings() as the view
-	// at that point is neither visible nor properly sized.
-	// This is the least intrusive workaround I could come up
-	// with: set the vertical offset (or scroll defaults) when
-	// the view is visible and resized to its final size.
-	// Resize events that are sent when the view is not visible
-	// must be ignored as they have wrong sizes, potentially
-	// preventing the v offset from being set successfully.
-
-	if (isVisible())
-		size_finalized_ = true;
-
-	if (size_finalized_ && saved_v_offset_) {
-		set_v_offset(saved_v_offset_);
-		saved_v_offset_ = 0;
-	}
-
-	if (size_finalized_ && scroll_needs_defaults_)
-		set_scroll_default();
 }
 
 void View::row_item_appearance_changed(bool label, bool content)
@@ -998,6 +981,7 @@ void View::extents_changed(bool horz, bool vert)
 	sticky_events_ |=
 		(horz ? TraceTreeItemHExtentsChanged : 0) |
 		(vert ? TraceTreeItemVExtentsChanged : 0);
+
 	lazy_event_handler_.start();
 }
 
@@ -1241,19 +1225,6 @@ void View::capture_state_updated(int state)
 	}
 }
 
-void View::data_updated()
-{
-	if (always_zoom_to_fit_ || sticky_scrolling_) {
-		if (!delayed_view_updater_.isActive())
-			delayed_view_updater_.start();
-	} else {
-		determine_time_unit();
-		update_scroll();
-		ruler_->update();
-		viewport_->update();
-	}
-}
-
 void View::perform_delayed_view_update()
 {
 	if (always_zoom_to_fit_) {