Commit 3c676312 authored by DreamSourceLab's avatar DreamSourceLab

add group signal display

parent adc2365e
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <QMouseEvent> #include <QMouseEvent>
#include <QScrollBar> #include <QScrollBar>
#include "groupsignal.h"
#include "decodetrace.h" #include "decodetrace.h"
#include "header.h" #include "header.h"
#include "devmode.h" #include "devmode.h"
...@@ -274,13 +275,14 @@ void View::set_preScale_preOffset() ...@@ -274,13 +275,14 @@ void View::set_preScale_preOffset()
vector< boost::shared_ptr<Trace> > View::get_traces() const vector< boost::shared_ptr<Trace> > View::get_traces() const
{ {
const vector< boost::shared_ptr<Signal> > sigs(_session.get_signals()); const vector< boost::shared_ptr<Signal> > sigs(_session.get_signals());
const vector< boost::shared_ptr<GroupSignal> > groups(_session.get_group_signals());
#ifdef ENABLE_DECODE #ifdef ENABLE_DECODE
const vector< boost::shared_ptr<DecodeTrace> > decode_sigs( const vector< boost::shared_ptr<DecodeTrace> > decode_sigs(
_session.get_decode_signals()); _session.get_decode_signals());
vector< boost::shared_ptr<Trace> > traces( vector< boost::shared_ptr<Trace> > traces(
sigs.size() + decode_sigs.size()); sigs.size() + groups.size() + decode_sigs.size());
#else #else
vector< boost::shared_ptr<Trace> > traces(sigs.size()); vector< boost::shared_ptr<Trace> > traces(sigs.size() + groups.size());
#endif #endif
vector< boost::shared_ptr<Trace> >::iterator i = traces.begin(); vector< boost::shared_ptr<Trace> >::iterator i = traces.begin();
...@@ -288,6 +290,7 @@ vector< boost::shared_ptr<Trace> > View::get_traces() const ...@@ -288,6 +290,7 @@ vector< boost::shared_ptr<Trace> > View::get_traces() const
#ifdef ENABLE_DECODE #ifdef ENABLE_DECODE
i = copy(decode_sigs.begin(), decode_sigs.end(), i); i = copy(decode_sigs.begin(), decode_sigs.end(), i);
#endif #endif
i = copy(groups.begin(), groups.end(), i);
stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets); stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets);
return traces; return traces;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment