X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=18ce679df877f030b2f35a11e208f9ef72e63bcd;hp=f5f626b38a4be15bffaa84b13a187f8758dffdfb;hb=269528f55e7fd77f762c2008d257921cd30e1519;hpb=7c2838bd8586ce6d4682896ed4d7243876ca003e diff --git a/pv/view/view.cpp b/pv/view/view.cpp index f5f626b3..18ce679d 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifdef ENABLE_DECODE #include +#endif #include #include @@ -236,14 +238,20 @@ vector< shared_ptr > View::get_traces() const { const vector< shared_ptr > sigs( session().get_signals()); +#ifdef ENABLE_DECODE const vector< shared_ptr > decode_sigs( session().get_decode_signals()); vector< shared_ptr > traces( sigs.size() + decode_sigs.size()); +#else + vector< shared_ptr > traces(sigs.size()); +#endif vector< shared_ptr >::iterator i = traces.begin(); i = copy(sigs.begin(), sigs.end(), i); +#ifdef ENABLE_DECODE i = copy(decode_sigs.begin(), decode_sigs.end(), i); +#endif stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets); return traces;