Embedded/DSView
1
0
Fork 0
mirror of https://github.com/DreamSourceLab/DSView.git synced 2025-02-02 13:52:55 +08:00
Code Issues Projects Releases Wiki Activity

add group signal display

Browse Source
This commit is contained in:
DreamSourceLab 2015-05-07 19:51:23 +08:00
parent adc2365efe
commit 3c676312a2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DSView/pv/view/view.cpp
View File

@ -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()
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
#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;