diff --git a/DSView/pv/view/view.cpp b/DSView/pv/view/view.cpp index 66f2e41533ab7afcd7c7b3c1df317f83d51d9c2d..ef1e2f695ab137e9792126c6dc63a512a33a7ae2 100644 --- a/DSView/pv/view/view.cpp +++ b/DSView/pv/view/view.cpp @@ -32,6 +32,7 @@ #include #include +#include "groupsignal.h" #include "decodetrace.h" #include "header.h" #include "devmode.h" @@ -274,13 +275,14 @@ void View::set_preScale_preOffset() vector< boost::shared_ptr > View::get_traces() const { const vector< boost::shared_ptr > sigs(_session.get_signals()); + const vector< boost::shared_ptr > groups(_session.get_group_signals()); #ifdef ENABLE_DECODE const vector< boost::shared_ptr > decode_sigs( _session.get_decode_signals()); vector< boost::shared_ptr > traces( - sigs.size() + decode_sigs.size()); + sigs.size() + groups.size() + decode_sigs.size()); #else - vector< boost::shared_ptr > traces(sigs.size()); + vector< boost::shared_ptr > traces(sigs.size() + groups.size()); #endif vector< boost::shared_ptr >::iterator i = traces.begin(); @@ -288,6 +290,7 @@ vector< boost::shared_ptr > View::get_traces() const #ifdef ENABLE_DECODE i = copy(decode_sigs.begin(), decode_sigs.end(), i); #endif + i = copy(groups.begin(), groups.end(), i); stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets); return traces;