# HG changeset patch # User Hasan Yavuz Ă–ZDERYA # Date 2016-03-22 18:03:56 # Node ID 10c58812dac54a7adfd32badc8a0d74687360b5b # Parent 1a05d0ad46b086b0ef84e7b173d3118c1e9fafcd added channel name list to plot tab diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -164,12 +164,9 @@ MainWindow::MainWindow(QWidget *parent) connect(&channelMan, &ChannelManager::channelNameChanged, this, &MainWindow::onChannelNameChanged); - // TODO: move this into the plot tab - QListView* channelNamesView = new QListView(); - channelNamesView->setModel(channelMan.channelNames()); - channelNamesView->show(); + ui->lvChannelNames->setModel(channelMan.channelNames()); - // init channel data and curve list + // init curve list for (unsigned int i = 0; i < numOfChannels; i++) { curves.append(new QwtPlotCurve(channelMan.channelName(i))); diff --git a/src/mainwindow.ui b/src/mainwindow.ui --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -57,17 +57,21 @@ - - - Qt::Horizontal - - - - 370 - 20 - - - + + + + + font-weight: bold; + + + Channel Names: + + + + + + +