projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow: Restructure add_view()
[pulseview.git]
/
pv
/
popups
/
channels.cpp
diff --git
a/pv/popups/channels.cpp
b/pv/popups/channels.cpp
index 7489b93f81b832d0f8bb64586155c75b7502556c..89080c4fc45426fd5ccaf6b8d2abe8467be9ddad 100644
(file)
--- a/
pv/popups/channels.cpp
+++ b/
pv/popups/channels.cpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <map>
*/
#include <map>
@@
-82,8
+81,8
@@
Channels::Channels(Session &session, QWidget *parent) :
map<shared_ptr<Channel>, shared_ptr<SignalBase> > signal_map;
unordered_set< shared_ptr<SignalBase> > sigs;
map<shared_ptr<Channel>, shared_ptr<SignalBase> > signal_map;
unordered_set< shared_ptr<SignalBase> > sigs;
- for (const shared_ptr<
view::Signal> s : session_.signal
s())
- sigs.insert(
s->channel()
);
+ for (const shared_ptr<
data::SignalBase> b : session_.signalbase
s())
+ sigs.insert(
b
);
for (const shared_ptr<SignalBase> &sig : sigs)
signal_map[sig->channel()] = sig;
for (const shared_ptr<SignalBase> &sig : sigs)
signal_map[sig->channel()] = sig;