tempo-plotter Changeset - ec156a195fe7 · protofusion repositories

Changeset - ec156a195fe7

Parent rev.

Child rev.

[Not reviewed]

default

0 8 0

Hasan Yavuz ÖZDERYA - 8 years ago 2017-10-29 14:12:22
hy@ozderya.net

removed unused code

8 files changed with 0 insertions and 63 deletions:

src/channelmanager.cpp

src/channelmanager.h

src/plot.cpp

src/plot.h

src/plotmanager.cpp

src/plotmanager.h

src/recordpanel.cpp

src/recordpanel.h

0 comments (0 inline, 0 general)

src/channelmanager.cpp

➞

Show inline comments

@@ @@ -110,34 +110,24 @@ FrameBuffer* ChannelManager::channelBuff @@
 ChannelInfoModel* ChannelManager::infoModel()
+{
     return &_infoModel;
+}
 QString ChannelManager::channelName(unsigned channel)
+{
     return _infoModel.data(_infoModel.index(channel, ChannelInfoModel::COLUMN_NAME),
                            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<int> & roles)
+{
     int start = topLeft.row();
     int end = bottomRight.row();
     int col = topLeft.column();
     for (int ci = start; ci <= end; ci++)
+    {
         for (auto role : roles)
+        {

src/channelmanager.h

➞

Show inline comments

@@ @@ -37,26 +37,24 @@ public: @@
     ~ChannelManager();
     unsigned numOfChannels();
     unsigned numOfSamples();
     FrameBuffer* channelBuffer(unsigned channel);
     QString channelName(unsigned channel);
     /// Stores channel names into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads channel names from a `QSettings`.
     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);
     void numOfSamplesChanged(unsigned value);
     void channelNameChanged(unsigned channel, QString name);
     void dataAdded(); ///< emitted when data added to channel man.
 public slots:
     void setNumOfChannels(unsigned number);
     void setNumOfSamples(unsigned number);
     /**
      * Add data for all channels.
@@ @@ -73,21 +71,19 @@ public slots: @@
     /// When paused `addData` does nothing.
     void pause(bool paused);
 private:
     unsigned _numOfChannels;
     unsigned _numOfSamples;
     bool _paused;
     QList<FrameBuffer*> channelBuffers;
     // 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,
                               const QVector<int> & roles = QVector<int> ());
 };
 #endif // CHANNELMANAGER_H

src/plot.cpp

➞

Show inline comments

@@ @@ -204,54 +204,24 @@ void Plot::darkBackground(bool enabled) @@
         setCanvasBackground(QBrush(Qt::white));
         gridColor.setHsvF(0, 0, 0.80);
         grid.setPen(gridColor);
         zoomer.setRubberBandPen(QPen(Qt::black));
         zoomer.setTrackerPen(QPen(Qt::black));
         sZoomer.setPickerPen(QPen(Qt::black));
         legend.setTextPen(QPen(Qt::black));
+    }
     updateSymbols();
     replot();
+}
 /*
   Below crude drawing demostrates how color selection occurs for
   given channel index
 °                     <--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;
     QColor color;
     if(light)
+    {
         color = QColor(Qt::white);
+    }
     else
+    {
         color = QColor(Qt::black);

src/plot.h

➞

Show inline comments

@@ @@ -41,26 +41,24 @@ class Plot : public QwtPlot @@
 public:
     enum ShowSymbols
+    {
         ShowSymbolsAuto,
         ShowSymbolsShow,
         ShowSymbolsHide
     };
     Plot(QWidget* parent = 0);
     ~Plot();
     static QColor makeColor(unsigned int channelIndex);
 public slots:
     void showGrid(bool show = true);
     void showMinorGrid(bool show = true);
     void showLegend(bool show = true);
     void showDemoIndicator(bool show = true);
     void showNoChannel(bool show = true);
     void unzoom();
     void darkBackground(bool enabled = true);
     void setYAxis(bool autoScaled, double yMin = 0, double yMax = 1);
     void setXAxis(double xMin, double xMax);
     void setSymbols(ShowSymbols shown);

src/plotmanager.cpp

➞

Show inline comments

@@ @@ -328,31 +328,24 @@ void PlotManager::removeCurves(unsigned @@
+            {
                 delete plotWidgets.takeLast();
+            }
+        }
+    }
+}
 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)
+    {
         return plotWidgets[curveIndex];
+    }
     else
+    {
         return plotWidgets[0];
+    }
+}

src/plotmanager.h

➞

Show inline comments

@@ @@ -39,32 +39,28 @@ class PlotManager : public QObject @@
     Q_OBJECT
 public:
     explicit PlotManager(QWidget* plotArea, PlotMenu* menu,
                          ChannelInfoModel* infoModel = NULL,
                          QObject *parent = 0);
     ~PlotManager();
     /// Add a new curve with title and buffer. A color is
     /// automatically chosen for curve.
     void addCurve(QString title, FrameBuffer* buffer);
     /// Alternative of `addCurve` for static curve data (snapshots).
     void addCurve(QString title, QVector<QPointF> 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
     void setMulti(bool enabled);
     /// Update all plot widgets
     void replot();
     /// Enable display of a "DEMO" label on each plot
     void showDemoIndicator(bool show = true);
     /// Set the Y axis
     void setYAxis(bool autoScaled, double yMin = 0, double yMax = 1);
     /// Set the X axis
     void setXAxis(bool asIndex, double xMin = 0 , double xMax = 1);

src/recordpanel.cpp

➞

Show inline comments

@@ @@ -71,29 +71,24 @@ RecordPanel::RecordPanel(DataRecorder* r @@
+}
 RecordPanel::~RecordPanel()
+{
     delete ui;
+}
 QToolBar* RecordPanel::toolbar()
+{
     return &recordToolBar;
+}
 bool RecordPanel::isRecording()
+{
     return recordAction.isChecked();
+}
 bool RecordPanel::recordPaused()
+{
     return ui->cbRecordPaused->isChecked();
+}
 bool RecordPanel::selectFile()
+{
     QString fileName = QFileDialog::getSaveFileName(
         parentWidget(), tr("Select recording file"));
     if (fileName.isEmpty())
+    {

src/recordpanel.h

➞

Show inline comments

@@ @@ -34,25 +34,24 @@ class RecordPanel; @@
 class RecordPanel : public QWidget
+{
     Q_OBJECT
 public:
     explicit RecordPanel(DataRecorder* recorder, ChannelManager* channelMan,
                          QWidget* parent = 0);
     ~RecordPanel();
     QToolBar* toolbar();
     bool isRecording();
     bool recordPaused();
     /// Stores settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads settings from a `QSettings`.
     void loadSettings(QSettings* settings);
 signals:
     void recordStarted();
     void recordStopped();
     void recordPausedChanged(bool enabled);

0 comments (0 inline, 0 general)