X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=4cfb39783319a258732b28e14a34b5f884d3b17f;hb=6e89374a6796f8d5d9cc61b0a2f7e98562a034ae;hp=e6ce6621f99d06786f230ede9714f82a6730f235;hpb=e31551da587f1c67e3e67364b73a33fc40bf13c2;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index e6ce6621..4cfb3978 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <libsigrokdecode/libsigrokdecode.h>
+
 #include <assert.h>
 #include <limits.h>
 #include <math.h>
@@ -28,7 +30,7 @@
 #include <QMouseEvent>
 #include <QScrollBar>
 
-#include "decodesignal.h"
+#include "decodetrace.h"
 #include "header.h"
 #include "ruler.h"
 #include "signal.h"
@@ -159,13 +161,14 @@ void View::set_scale_offset(double scale, double offset)
 	update_scroll();
 	_ruler->update();
 	_viewport->update();
+	scale_offset_changed();
 }
 
 vector< shared_ptr<Trace> > View::get_traces() const
 {
 	const vector< shared_ptr<Signal> > sigs(
 		session().get_signals());
-	const vector< shared_ptr<DecodeSignal> > decode_sigs(
+	const vector< shared_ptr<DecodeTrace> > decode_sigs(
 		session().get_decode_signals());
 	vector< shared_ptr<Trace> > traces(
 		sigs.size() + decode_sigs.size());
@@ -251,6 +254,12 @@ void View::normalize_layout()
 	v_scroll_value_changed(verticalScrollBar()->sliderPosition());
 }
 
+void View::update_viewport()
+{
+	assert(_viewport);
+	_viewport->update();
+}
+
 void View::get_scroll_layout(double &length, double &offset) const
 {
 	const shared_ptr<data::SignalData> sig_data = _session.get_data();
@@ -383,7 +392,6 @@ void View::signals_changed()
 	const vector< shared_ptr<Trace> > traces(get_traces());
 	BOOST_FOREACH(shared_ptr<Trace> t, traces) {
 		t->set_view(this);
-		t->init_context_bar_actions(NULL);
 		t->set_v_offset(offset);
 		offset += SignalHeight + 2 * SignalMargin;
 	}