tempo-plotter Changeset - eec08765e920 · protofusion repositories

Changeset - eec08765e920

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-07-24 00:03:29
hy@ozderya.net

fix segmentation fault when closing application

2 files changed with 4 insertions and 2 deletions:

main.cpp

mainwindow.cpp

0 comments (0 inline, 0 general)

main.cpp

➞

Show inline comments

@@ @@ -7,42 +7,43 @@ @@
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
   serialplot is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "mainwindow.h"
 #include <QApplication>
 #include <QtGlobal>
 #include "version.h"
 MainWindow* pMainWindow;
 void messageHandler(QtMsgType type, const QMessageLogContext &context,
                     const QString &msg)
+{
     // TODO: don't call MainWindow::messageHandler if window is destroyed
     pMainWindow->messageHandler(type, context, msg);
+}
 int main(int argc, char *argv[])
+{
     QApplication a(argc, argv);
     MainWindow w;
     pMainWindow = &w;
     qInstallMessageHandler(messageHandler);
     // log application information
     qDebug() << "SerialPlot" << VERSION_STRING;
     qDebug() << "Revision" << VERSION_REVISION;
     w.show();
     return a.exec();
+}

mainwindow.cpp

➞

Show inline comments

@@ @@ -171,48 +171,49 @@ MainWindow::MainWindow(QWidget *parent) @@
         QwtText demoText(" DEMO RUNNING ");  // looks better with spaces
         demoText.setColor(QColor("white"));
         demoText.setBackgroundBrush(Qt::darkRed);
         demoText.setBorderRadius(4);
         demoText.setRenderFlags(Qt::AlignLeft | Qt::AlignTop);
         demoIndicator.setText(demoText);
         demoIndicator.hide();
         demoIndicator.attach(ui->plot);
+    }
+}
 MainWindow::~MainWindow()
+{
     for (auto curve : curves)
+    {
         delete curve;
+    }
     if (serialPort.isOpen())
+    {
         serialPort.close();
+    }
     delete ui;
     ui = NULL; // we check if ui is deleted in messageHandler
+}
 void MainWindow::setupAboutDialog()
+{
     Ui_AboutDialog uiAboutDialog;
     uiAboutDialog.setupUi(&aboutDialog);
     QObject::connect(uiAboutDialog.pbAboutQt, &QPushButton::clicked,
                      [](){ QApplication::aboutQt();});
     QString aboutText = uiAboutDialog.lbAbout->text();
     aboutText.replace("$VERSION_STRING$", VERSION_STRING);
     aboutText.replace("$VERSION_REVISION$", VERSION_REVISION);
     uiAboutDialog.lbAbout->setText(aboutText);
+}
 void MainWindow::onPortToggled(bool open)
+{
     // make sure demo mode is disabled
     if (open && isDemoRunning()) enableDemo(false);
     ui->actionDemoMode->setEnabled(!open);
+}
 void MainWindow::onDataReady()
@@ @@ -707,47 +708,47 @@ void MainWindow::onExportCsv() @@
+}
 void MainWindow::messageHandler(QtMsgType type,
                                 const QMessageLogContext &context,
                                 const QString &msg)
+{
     QString logString;
     switch (type)
+    {
         case QtDebugMsg:
             logString = "[Debug] " + msg;
             break;
         case QtWarningMsg:
             logString = "[Warning] " + msg;
             break;
         case QtCriticalMsg:
             logString = "[Error] " + msg;
             break;
         case QtFatalMsg:
             logString = "[Fatal] " + msg;
             break;
+    }
     ui->ptLog->appendPlainText(logString);
+    if (ui != NULL) ui->ptLog->appendPlainText(logString);
     std::cerr << logString.toStdString() << std::endl;
     if (type != QtDebugMsg)
+    if (type != QtDebugMsg && ui != NULL)
+    {
         ui->statusBar->showMessage(msg, 5000);
+    }
+}
 void MainWindow::unzoomed()
+{
     if (ui->cbAutoScale->isChecked())
+    {
         ui->plot->setAxisAutoScale(QwtPlot::yLeft);
+    }
     else
+    {
         ui->plot->setAxisScale(QwtPlot::yLeft, ui->spYmin->value(),
                                ui->spYmax->value());
+    }
     ui->plot->setAxisAutoScale(QwtPlot::xBottom);
     ui->plot->replot();
+}

0 comments (0 inline, 0 general)