X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=4cfb39783319a258732b28e14a34b5f884d3b17f;hb=b93295580db08d9008b9c9e49a3a3a86ef562f14;hp=508b91c5c385ff7e34fae595105396ba94bc4d66;hpb=9cef95672622f4ecdb21edef9d81a10c789daf1e;p=pulseview.git diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 508b91c..4cfb397 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 + #include #include #include @@ -28,7 +30,7 @@ #include #include -#include "decodesignal.h" +#include "decodetrace.h" #include "header.h" #include "ruler.h" #include "signal.h" @@ -166,7 +168,7 @@ vector< shared_ptr > View::get_traces() const { const vector< shared_ptr > sigs( session().get_signals()); - const vector< shared_ptr > decode_sigs( + const vector< shared_ptr > decode_sigs( session().get_decode_signals()); vector< shared_ptr > traces( sigs.size() + decode_sigs.size()); @@ -390,7 +392,6 @@ void View::signals_changed() const vector< shared_ptr > traces(get_traces()); BOOST_FOREACH(shared_ptr t, traces) { t->set_view(this); - t->init_context_bar_actions(NULL); t->set_v_offset(offset); offset += SignalHeight + 2 * SignalMargin; }