tempo-plotter Changeset - 1e3fe1bbdd01 · protofusion repositories

Changeset - 1e3fe1bbdd01

Parent rev.

Child rev.

[Not reviewed]

feature/command-line-options

0 3 0

Mehmet Aslan - 7 years ago 2019-03-31 07:37:16
aaslan-mehmet@hotmail.com

Becasue commandline options handled in constructor, error logs dont have access to message handler. Solved.
Additionaly when MainWindow destroyed, logs messages still logged properly.

3 files changed with 43 insertions and 38 deletions:

src/main.cpp

src/mainwindow.cpp

src/mainwindow.h

0 comments (0 inline, 0 general)

src/main.cpp

➞

Show inline comments

@@ @@ -10,47 +10,81 @@ @@
   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 <QApplication>
 #include <QtGlobal>
 #include <iostream>
 #include "mainwindow.h"
 #include "tooltipfilter.h"
 #include "version.h"
 MainWindow* pMainWindow;
+MainWindow* pMainWindow = nullptr;
 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);
     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;
+    }
     std::cerr << logString.toStdString() << std::endl;
     if (pMainWindow != nullptr)
+    {
         // TODO: don't call MainWindow::messageHandler if window is destroyed
         pMainWindow->messageHandler(type, logString, msg);
+    }
     if (type == QtFatalMsg)
+    {
         __builtin_trap();
+    }
+}
 int main(int argc, char *argv[])
+{
     QApplication a(argc, argv);
     QApplication::setApplicationName(PROGRAM_NAME_STRING);
     QApplication::setApplicationVersion(VERSION_STRING);
     qInstallMessageHandler(messageHandler);
     MainWindow w;
     pMainWindow = &w;
     qInstallMessageHandler(messageHandler);
     ToolTipFilter ttf;
     a.installEventFilter(&ttf);
     // log application information
     qDebug() << "SerialPlot" << VERSION_STRING;
     qDebug() << "Revision" << VERSION_REVISION;
     w.show();
     return a.exec();
+}

src/mainwindow.cpp

➞

Show inline comments

@@ @@ -469,62 +469,34 @@ void MainWindow::onExportCsv() @@
         Snapshot* snapshot = snapshotMan.makeSnapshot();
         snapshot->save(fileName);
         delete snapshot;
+    }
+}
 PlotViewSettings MainWindow::viewSettings() const
+{
     return plotMenu.viewSettings();
+}
 void MainWindow::messageHandler(QtMsgType type,
-                                const QMessageLogContext &context,
+                                const QString &logString,
                                 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 (ui != NULL)
         ui->ptLog->appendPlainText(logString);
     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);
     stream.saveSettings(settings);
     plotControlPanel.saveSettings(settings);
     plotMenu.saveSettings(settings);
     commandPanel.saveSettings(settings);
     recordPanel.saveSettings(settings);

src/mainwindow.h

➞

Show inline comments

@@ @@ -53,26 +53,25 @@ class MainWindow; @@
+}
 class MainWindow : public QMainWindow
+{
     Q_OBJECT
 public:
     explicit MainWindow(QWidget *parent = 0);
     ~MainWindow();
     PlotViewSettings viewSettings() const;
     void messageHandler(QtMsgType type, const QMessageLogContext &context,
                         const QString &msg);
     void messageHandler(QtMsgType type, const QString &logString, const QString &msg);
 private:
     Ui::MainWindow *ui;
     QDialog aboutDialog;
     void setupAboutDialog();
     QSerialPort serialPort;
     PortControl portControl;
     unsigned int numOfSamples;

0 comments (0 inline, 0 general)