diff --git a/src/channelmanager.cpp b/src/channelmanager.cpp --- a/src/channelmanager.cpp +++ b/src/channelmanager.cpp @@ -119,16 +119,6 @@ QString ChannelManager::channelName(unsi Qt::DisplayRole).toString(); } -QStringList ChannelManager::channelNames() -{ - QStringList list; - for (unsigned ci = 0; ci < _numOfChannels; ci++) - { - list << channelName(ci); - } - return list; -} - void ChannelManager::onChannelInfoChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight, const QVector & roles) diff --git a/src/channelmanager.h b/src/channelmanager.h --- a/src/channelmanager.h +++ b/src/channelmanager.h @@ -46,8 +46,6 @@ public: void loadSettings(QSettings* settings); /// Returns a model that manages channel information (name, color etc) ChannelInfoModel* infoModel(); - /// Returns a list of channel names - QStringList channelNames(); signals: void numOfChannelsChanged(unsigned value); @@ -82,8 +80,6 @@ private: // QStringListModel _channelNames; ChannelInfoModel _infoModel; - void addChannelName(QString name); ///< appends a new channel name at the end of list - private slots: void onChannelInfoChanged(const QModelIndex & topLeft, const QModelIndex & bottomRight, diff --git a/src/plot.cpp b/src/plot.cpp --- a/src/plot.cpp +++ b/src/plot.cpp @@ -213,36 +213,6 @@ void Plot::darkBackground(bool enabled) replot(); } -/* - Below crude drawing demostrates how color selection occurs for - given channel index - - 0° <--Hue Value--> 360° - |* . o . + . o . * . o . + . o . * . o . + . o . * . o . + . o . | - - * -> 0-3 - + -> 4-7 - o -> 8-15 - . -> 16-31 - - */ -QColor Plot::makeColor(unsigned int channelIndex) -{ - auto i = channelIndex; - - if (i < 4) - { - return QColor::fromHsv(360*i/4, 255, 230); - } - else - { - double p = floor(log2(i)); - double n = pow(2, p); - i = i - n; - return QColor::fromHsv(360*i/n + 360/pow(2,p+1), 255, 230); - } -} - void Plot::flashSnapshotOverlay(bool light) { if (snapshotOverlay != NULL) delete snapshotOverlay; diff --git a/src/plot.h b/src/plot.h --- a/src/plot.h +++ b/src/plot.h @@ -50,8 +50,6 @@ public: Plot(QWidget* parent = 0); ~Plot(); - static QColor makeColor(unsigned int channelIndex); - public slots: void showGrid(bool show = true); void showMinorGrid(bool show = true); diff --git a/src/plotmanager.cpp b/src/plotmanager.cpp --- a/src/plotmanager.cpp +++ b/src/plotmanager.cpp @@ -337,13 +337,6 @@ unsigned PlotManager::numOfCurves() return curves.size(); } -void PlotManager::setTitle(unsigned index, QString title) -{ - curves[index]->setTitle(title); - - plotWidget(index)->replot(); -} - Plot* PlotManager::plotWidget(unsigned curveIndex) { if (isMulti) diff --git a/src/plotmanager.h b/src/plotmanager.h --- a/src/plotmanager.h +++ b/src/plotmanager.h @@ -48,14 +48,10 @@ public: void addCurve(QString title, FrameBuffer* buffer); /// Alternative of `addCurve` for static curve data (snapshots). void addCurve(QString title, QVector data); - /// Set the displayed title for a curve - void setTitle(unsigned index, QString title); /// Removes curves from the end void removeCurves(unsigned number); /// Returns current number of curves known by plot manager unsigned numOfCurves(); - /// Set the current state of view - void setViewSettings(const PlotViewSettings& settings); public slots: /// Enable/Disable multiple plot display diff --git a/src/recordpanel.cpp b/src/recordpanel.cpp --- a/src/recordpanel.cpp +++ b/src/recordpanel.cpp @@ -80,11 +80,6 @@ QToolBar* RecordPanel::toolbar() return &recordToolBar; } -bool RecordPanel::isRecording() -{ - return recordAction.isChecked(); -} - bool RecordPanel::recordPaused() { return ui->cbRecordPaused->isChecked(); diff --git a/src/recordpanel.h b/src/recordpanel.h --- a/src/recordpanel.h +++ b/src/recordpanel.h @@ -43,7 +43,6 @@ public: QToolBar* toolbar(); - bool isRecording(); bool recordPaused(); /// Stores settings into a `QSettings`