From 3c676312a2b0187454ea749b6dae0fed743c08a0 Mon Sep 17 00:00:00 2001
From: DreamSourceLab <support@dreamsourcelab.com>
Date: Thu, 7 May 2015 19:51:23 +0800
Subject: [PATCH] add group signal display

---
 DSView/pv/view/view.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/DSView/pv/view/view.cpp b/DSView/pv/view/view.cpp
index 66f2e41..ef1e2f6 100644
--- a/DSView/pv/view/view.cpp
+++ b/DSView/pv/view/view.cpp
@@ -32,6 +32,7 @@
 #include <QMouseEvent>
 #include <QScrollBar>
 
+#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<Trace> > View::get_traces() const
 {
     const vector< boost::shared_ptr<Signal> > sigs(_session.get_signals());
+    const vector< boost::shared_ptr<GroupSignal> > groups(_session.get_group_signals());
 #ifdef ENABLE_DECODE
     const vector< boost::shared_ptr<DecodeTrace> > decode_sigs(
         _session.get_decode_signals());
     vector< boost::shared_ptr<Trace> > traces(
-        sigs.size() + decode_sigs.size());
+        sigs.size() + groups.size() + decode_sigs.size());
 #else
-    vector< boost::shared_ptr<Trace> > traces(sigs.size());
+    vector< boost::shared_ptr<Trace> > traces(sigs.size() + groups.size());
 #endif
 
     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
     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;
-- 
2.30.2