tempo-plotter Changeset - b517d615de6b · protofusion repositories

Changeset - b517d615de6b

Parent rev.

Child rev.

[Not reviewed]

channelmanager

0 2 0

Hasan Yavuz ÖZDERYA - 9 years ago 2017-01-03 07:14:57
hy@ozderya.net

fix snapshot opening crash

2 files changed with 6 insertions and 0 deletions:

src/channelmanager.cpp

src/mainwindow.cpp

0 comments (0 inline, 0 general)

src/channelmanager.cpp

➞

Show inline comments

@@ @@ -34,96 +34,97 @@ ChannelManager::ChannelManager(unsigned @@
     for (unsigned int i = 0; i < numberOfChannels; i++)
+    {
         channelBuffers.append(new FrameBuffer(numberOfSamples));
+    }
     connect(&_infoModel, &ChannelInfoModel::dataChanged,
             this, &ChannelManager::onChannelInfoChanged);
+}
 ChannelManager::~ChannelManager()
+{
     for (auto buffer : channelBuffers)
+    {
         delete buffer;
+    }
+}
 unsigned ChannelManager::numOfChannels()
+{
     return channelBuffers.size();
+}
 unsigned ChannelManager::numOfSamples()
+{
     return _numOfSamples;
+}
 void ChannelManager::setNumOfChannels(unsigned number)
+{
     unsigned int oldNum = channelBuffers.size();
     if (number > oldNum)
+    {
         // add new channels
         for (unsigned int i = 0; i < number - oldNum; i++)
+        {
             channelBuffers.append(new FrameBuffer(_numOfSamples));
+        }
+    }
     else if(number < oldNum)
+    {
         // remove channels
         for (unsigned int i = oldNum-1; i > number-1; i--)
+        {
             delete channelBuffers.takeLast();
+        }
+    }
     _numOfChannels = number;
     _infoModel.setNumOfChannels(number);
     emit numOfChannelsChanged(number);
+}
 void ChannelManager::setNumOfSamples(unsigned number)
+{
     _numOfSamples = number;
     for (int ci = 0; ci < channelBuffers.size(); ci++)
+    {
         channelBuffers[ci]->resize(_numOfSamples);
+    }
     emit numOfSamplesChanged(number);
+}
 FrameBuffer* ChannelManager::channelBuffer(unsigned channel)
+{
     return channelBuffers[channel];
+}
 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();

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -418,96 +418,101 @@ void MainWindow::onExportCsv() @@
     QString fileName = QFileDialog::getSaveFileName(this, tr("Export CSV File"));
     if (fileName.isNull())  // user canceled export
+    {
         ui->actionPause->setChecked(wasPaused);
+    }
     else
+    {
         Snapshot* snapshot = snapshotMan.makeSnapshot();
         snapshot->save(fileName);
         delete snapshot;
+    }
+}
 void MainWindow::messageHandler(QtMsgType type,
                                 const QMessageLogContext &context,
                                 const QString &msg)
+{
     QString logString;
     switch (type)
+    {
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))
         case QtInfoMsg:
             logString = "[Info] " + msg;
             break;
 #endif
         case QtDebugMsg:
             logString = "[Debug] " + msg;
             break;
         case QtWarningMsg:
             logString = "[Warning] " + msg;
             break;
         case QtCriticalMsg:
             logString = "[Error] " + msg;
             break;
         case QtFatalMsg:
             logString = "[Fatal] " + msg;
             break;
+    }
     if (ui != NULL) ui->ptLog->appendPlainText(logString);
     std::cerr << logString.toStdString() << std::endl;
     if (type != QtDebugMsg && ui != NULL)
+    {
         ui->statusBar->showMessage(msg, 5000);
+    }
     if (type == QtFatalMsg)
+    {
         __builtin_trap();
+    }
+}
 void MainWindow::saveAllSettings(QSettings* settings)
+{
     saveMWSettings(settings);
     portControl.saveSettings(settings);
     dataFormatPanel.saveSettings(settings);
     channelMan.saveSettings(settings);
     plotControlPanel.saveSettings(settings);
     plotMan->saveSettings(settings);
     commandPanel.saveSettings(settings);
+}
 void MainWindow::loadAllSettings(QSettings* settings)
+{
     loadMWSettings(settings);
     portControl.loadSettings(settings);
     dataFormatPanel.loadSettings(settings);
     channelMan.loadSettings(settings);
     plotControlPanel.loadSettings(settings);
     plotMan->loadSettings(settings);
     commandPanel.loadSettings(settings);
+}
 void MainWindow::saveMWSettings(QSettings* settings)
+{
     // save window geometry
     settings->beginGroup(SettingGroup_MainWindow);
     settings->setValue(SG_MainWindow_Size, size());
     settings->setValue(SG_MainWindow_Pos, pos());
     // save active panel
     settings->setValue(SG_MainWindow_ActivePanel,
                        panelSettingMap.value(ui->tabWidget->currentIndex()));
     // save panel minimization
     settings->setValue(SG_MainWindow_HidePanels,
                        ui->tabWidget->hideAction.isChecked());
     // save window maximized state
     settings->setValue(SG_MainWindow_Maximized,
                        bool(windowState() & Qt::WindowMaximized));
     // save toolbar/dockwidgets state
     settings->setValue(SG_MainWindow_State, saveState());
     settings->endGroup();
+}
 void MainWindow::loadMWSettings(QSettings* settings)
+{
     settings->beginGroup(SettingGroup_MainWindow);
     // load window geometry

0 comments (0 inline, 0 general)