tempo-plotter Changeset - 8edbdb6e43df · protofusion repositories

Changeset - 8edbdb6e43df

Parent rev.

Child rev.

[Not reviewed]

gain-offset

0 4 0

Hasan Yavuz ÖZDERYA - 7 years ago 2018-07-16 16:15:27
hy@ozderya.net

reset menu item for gain and offset

4 files changed with 35 insertions and 1 deletions:

src/channelinfomodel.cpp

src/channelinfomodel.h

src/plotcontrolpanel.cpp

src/plotcontrolpanel.h

0 comments (0 inline, 0 general)

src/channelinfomodel.cpp

➞

Show inline comments

@@ @@ -380,78 +380,101 @@ void ChannelInfoModel::setNumOfChannels( @@
+    }
     _numOfChannels = number;
     if (isInserting)
+    {
         endInsertRows();
+    }
     else
+    {
         endRemoveRows();
+    }
+}
 void ChannelInfoModel::resetInfos()
+{
     beginResetModel();
     for (unsigned ci = 0; (int) ci < infos.length(); ci++)
+    {
         infos[ci] = ChannelInfo(ci);
+    }
     endResetModel();
+}
 // TODO: fix repetitive code, ChannelInfoModel::reset* functions
 void ChannelInfoModel::resetNames()
+{
     beginResetModel();
     for (unsigned ci = 0; (int) ci < infos.length(); ci++)
+    {
         infos[ci].name = ChannelInfo(ci).name;
+    }
     endResetModel();
+}
 void ChannelInfoModel::resetColors()
+{
     beginResetModel();
     for (unsigned ci = 0; (int) ci < infos.length(); ci++)
+    {
         infos[ci].color = ChannelInfo(ci).color;
+    }
     endResetModel();
+}
 void ChannelInfoModel::resetVisibility(bool visible)
+{
     beginResetModel();
     for (unsigned ci = 0; (int) ci < infos.length(); ci++)
+    {
         infos[ci].visibility = visible;
+    }
     endResetModel();
+}
 void ChannelInfoModel::resetGains()
+{
     beginResetModel();
     for (unsigned ci = 0; (int) ci < infos.length(); ci++)
+    {
         infos[ci].gain = ChannelInfo(ci).gain;
         infos[ci].gainEn = ChannelInfo(ci).gainEn;
+    }
     endResetModel();
+}
 void ChannelInfoModel::resetOffsets()
+{
     beginResetModel();
     for (unsigned ci = 0; (int) ci < infos.length(); ci++)
+    {
         infos[ci].offset = ChannelInfo(ci).offset;
         infos[ci].offsetEn = ChannelInfo(ci).offsetEn;
+    }
     endResetModel();
+}
 void ChannelInfoModel::saveSettings(QSettings* settings) const
+{
     settings->beginGroup(SettingGroup_Channels);
     settings->beginWriteArray(SG_Channels_Channel);
     // save all channel information regardless of current number of channels
     for (unsigned ci = 0; (int) ci < infos.length(); ci++)
+    {
         settings->setArrayIndex(ci);
         settings->setValue(SG_Channels_Name, infos[ci].name);
         settings->setValue(SG_Channels_Color, infos[ci].color);
         settings->setValue(SG_Channels_Visible, infos[ci].visibility);
+    }
     settings->endArray();
     settings->endGroup();
+}
 void ChannelInfoModel::loadSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Channels);
     unsigned size = settings->beginReadArray(SG_Channels_Channel);
     for (unsigned ci = 0; ci < size; ci++)

src/channelinfomodel.h

➞

Show inline comments

@@ @@ -53,48 +53,52 @@ public: @@
     /// Returns a list of channel names
     QStringList channelNames() const;
     // implemented from QAbstractItemModel
     int           rowCount(const QModelIndex &parent = QModelIndex()) const;
     int           columnCount(const QModelIndex &parent = QModelIndex()) const;
     QVariant      data(const QModelIndex &index, int role = Qt::DisplayRole) const;
     bool          setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
     Qt::ItemFlags flags(const QModelIndex &index) const;
     QVariant      headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
     void setNumOfChannels(unsigned number);
     /// Stores all channel info into a `QSettings`
     void saveSettings(QSettings* settings) const;
     /// Loads all channel info from a `QSettings`.
     void loadSettings(QSettings* settings);
 public slots:
     /// reset all channel info (names, color etc.)
     void resetInfos();
     /// reset all channel names
     void resetNames();
     /// reset all channel colors
     void resetColors();
     /// reset all channel gain values and disables gains
     void resetGains();
     /// reset all channel offset values and disables offsets
     void resetOffsets();
     /// reset visibility
     void resetVisibility(bool visible);
 private:
     struct ChannelInfo
+    {
         explicit ChannelInfo(unsigned index);
         QString name;
         bool visibility;
         QColor color;
         double gain, offset;
         bool gainEn, offsetEn;
     };
     unsigned _numOfChannels;     ///< @note this is not necessarily the length of `infos`
     /**
      * Channel info is added here but never removed so that we can
      * remember user entered info (names, colors etc.).
      */
     QList<ChannelInfo> infos;
 };

src/plotcontrolpanel.cpp

➞

Show inline comments

@@ @@ -49,48 +49,50 @@ class SpinBoxDelegate : public QStyledIt @@
 public:
     QWidget* createEditor(QWidget *parent, const QStyleOptionViewItem &option,
                           const QModelIndex &index) const Q_DECL_OVERRIDE
+        {
             auto w = QStyledItemDelegate::createEditor(
                 parent, option, index);
             auto sp = qobject_cast<QDoubleSpinBox*>(w);
             if (sp)
+            {
                 sp->setDecimals(DOUBLESP_PRECISION);
+            }
             return w;
+        }
 };
 PlotControlPanel::PlotControlPanel(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::PlotControlPanel),
     resetAct(tr("Reset"), this),
     resetNamesAct(tr("Reset Names"), this),
     resetColorsAct(tr("Reset Colors"), this),
     showAllAct(tr("Show All"), this),
     hideAllAct(tr("Hide All"), this),
     resetGainsAct(tr("Reset All Gain"), this),
     resetOffsetsAct(tr("Reset All Offset"), this),
     resetMenu(tr("Reset Menu"), this)
+{
     ui->setupUi(this);
     delegate = new SpinBoxDelegate();
     ui->tvChannelInfo->setItemDelegate(delegate);
     warnNumOfSamples = true;    // TODO: load from settings
     _numOfSamples = ui->spNumOfSamples->value();
     // set limits for axis limit boxes
     ui->spYmin->setRange((-1) * std::numeric_limits<double>::max(),
                          std::numeric_limits<double>::max());
     ui->spYmax->setRange((-1) * std::numeric_limits<double>::max(),
                          std::numeric_limits<double>::max());
     ui->spXmin->setRange((-1) * std::numeric_limits<double>::max(),
                          std::numeric_limits<double>::max());
     ui->spXmax->setRange((-1) * std::numeric_limits<double>::max(),
                          std::numeric_limits<double>::max());
     // connect signals
@@ @@ -147,48 +149,50 @@ PlotControlPanel::PlotControlPanel(QWidg @@
     for (int nbits = 8; nbits <= 24; nbits++) // unsigned binary formats
+    {
         int rmax = pow(2, nbits)-1;
         ui->cbRangePresets->addItem(
             QString().sprintf("Unsigned %d bits %d to +%d", nbits, 0, rmax),
             QVariant::fromValue(Range{0, double(rmax)}));
+    }
     ui->cbRangePresets->addItem("-1 to +1", QVariant::fromValue(Range{-1, +1}));
     ui->cbRangePresets->addItem("0 to +1", QVariant::fromValue(Range{0, +1}));
     ui->cbRangePresets->addItem("-100 to +100", QVariant::fromValue(Range{-100, +100}));
     ui->cbRangePresets->addItem("0 to +100", QVariant::fromValue(Range{0, +100}));
     QObject::connect(ui->cbRangePresets, SIGNAL(activated(int)),
                      this, SLOT(onRangeSelected()));
     // color selector starts disabled until a channel is selected
     ui->colorSelector->setColor(QColor(0,0,0,0));
     ui->colorSelector->setDisplayMode(color_widgets::ColorPreview::AllAlpha);
     ui->colorSelector->setDisabled(true);
     // reset buttons
     resetAct.setToolTip(tr("Reset channel names and colors"));
     resetMenu.addAction(&resetNamesAct);
     resetMenu.addAction(&resetColorsAct);
     resetMenu.addAction(&resetGainsAct);
     resetMenu.addAction(&resetOffsetsAct);
     resetAct.setMenu(&resetMenu);
     ui->tbReset->setDefaultAction(&resetAct);
     showAllAct.setToolTip(tr("Show all channels"));
     hideAllAct.setToolTip(tr("Hide all channels"));
     ui->tbShowAll->setDefaultAction(&showAllAct);
     ui->tbHideAll->setDefaultAction(&hideAllAct);
+}
 PlotControlPanel::~PlotControlPanel()
+{
     delete ui;
+}
 unsigned PlotControlPanel::numOfSamples()
+{
     return ui->spNumOfSamples->value();
+}
 void PlotControlPanel::onNumOfSamples(int value)
+{
     if (warnNumOfSamples && value > NUMSAMPLES_CONFIRM_AT)
+    {
         // ask confirmation
@@ @@ -405,48 +409,50 @@ void PlotControlPanel::setChannelInfoMod @@
                 ui->tvChannelInfo->model()->setData(index, color, Qt::ForegroundRole);
             });
     connect(model, &QAbstractItemModel::dataChanged,
             [this](const QModelIndex & topLeft, const QModelIndex & bottomRight, const QVector<int> & roles = QVector<int> ())
+            {
                 auto current = ui->tvChannelInfo->selectionModel()->currentIndex();
                 // no current selection
                 if (!current.isValid()) return;
                 auto mod = ui->tvChannelInfo->model();
                 QColor color = mod->data(current, Qt::ForegroundRole).value<QColor>();
                 // temporarily block signals because `setColor` emits `colorChanged`
                 bool wasBlocked = ui->colorSelector->blockSignals(true);
                 ui->colorSelector->setColor(color);
                 ui->colorSelector->blockSignals(wasBlocked);
             });
     // reset actions
     connect(&resetAct, &QAction::triggered, model, &ChannelInfoModel::resetInfos);
     connect(&resetNamesAct, &QAction::triggered, model, &ChannelInfoModel::resetNames);
     connect(&resetColorsAct, &QAction::triggered, model, &ChannelInfoModel::resetColors);
     connect(&resetGainsAct, &QAction::triggered, model, &ChannelInfoModel::resetGains);
     connect(&resetOffsetsAct, &QAction::triggered, model, &ChannelInfoModel::resetOffsets);
     connect(&showAllAct, &QAction::triggered, [model]{model->resetVisibility(true);});
     connect(&hideAllAct, &QAction::triggered, [model]{model->resetVisibility(false);});
+}
 void PlotControlPanel::saveSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Plot);
     settings->setValue(SG_Plot_NumOfSamples, numOfSamples());
     settings->setValue(SG_Plot_PlotWidth, ui->spPlotWidth->value());
     settings->setValue(SG_Plot_IndexAsX, xAxisAsIndex());
     settings->setValue(SG_Plot_XMax, xMax());
     settings->setValue(SG_Plot_XMin, xMin());
     settings->setValue(SG_Plot_AutoScale, autoScale());
     settings->setValue(SG_Plot_YMax, yMax());
     settings->setValue(SG_Plot_YMin, yMin());
     settings->endGroup();
+}
 void PlotControlPanel::loadSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_Plot);
     ui->spNumOfSamples->setValue(
         settings->value(SG_Plot_NumOfSamples, numOfSamples()).toInt());
     ui->spPlotWidth->setValue(

src/plotcontrolpanel.h

➞

Show inline comments

@@ @@ -50,42 +50,43 @@ public: @@
     /// Returns the plot width adjusted for x axis scaling.
     double plotWidth() const;
     void setChannelInfoModel(ChannelInfoModel* model);
     /// Stores plot settings into a `QSettings`
     void saveSettings(QSettings* settings);
     /// Loads plot settings from a `QSettings`.
     void loadSettings(QSettings* settings);
 signals:
     void numOfSamplesChanged(int value);
     void yScaleChanged(bool autoScaled, double yMin = 0, double yMax = 1);
     void xScaleChanged(bool asIndex, double xMin = 0, double xMax = 1);
     void plotWidthChanged(double width);
 private:
     Ui::PlotControlPanel *ui;
     /// Holds 'number of samples' after the confirmation
     unsigned _numOfSamples;
     /// User can disable this setting in the checkbox
     bool warnNumOfSamples;
     QAction resetAct, resetNamesAct, resetColorsAct, showAllAct, hideAllAct;
     QAction resetAct, resetNamesAct, resetColorsAct, showAllAct,
         hideAllAct, resetGainsAct, resetOffsetsAct;
     QMenu resetMenu;
     QStyledItemDelegate* delegate;
     /// Show a confirmation dialog before setting #samples to a big value
     bool askNSConfirmation(int value);
 private slots:
     void onNumOfSamples(int value);
     void onAutoScaleChecked(bool checked);
     void onYScaleChanged();
     void onRangeSelected();
     void onIndexChecked(bool checked);
     void onXScaleChanged();
     void onPlotWidthChanged();
 };
 #endif // PLOTCONTROLPANEL_H

0 comments (0 inline, 0 general)