tempo-plotter Changeset - 98500ddba1a3 · protofusion repositories

Changeset - 98500ddba1a3

Parent rev.

Child rev.

[Not reviewed]

feature/command-line-options

0 3 0

Mehmet Aslan - 7 years ago 2019-03-30 06:13:10
aaslan-mehmet@hotmail.com

Qapplication instance singleton. Reaching instance outside unnecessary, handleCommandLineOptions moved in to MW constructor.

3 files changed with 4 insertions and 2 deletions:

src/main.cpp

src/mainwindow.cpp

src/mainwindow.h

0 comments (0 inline, 0 general)

src/main.cpp

➞

Show inline comments

@@ @@ -33,25 +33,24 @@ void messageHandler(QtMsgType type, cons @@
     pMainWindow->messageHandler(type, context, msg);
+}
 int main(int argc, char *argv[])
+{
     QApplication a(argc, argv);
     QApplication::setApplicationName(PROGRAM_NAME_STRING);
     QApplication::setApplicationVersion(VERSION_STRING);
     MainWindow w;
     pMainWindow = &w;
     qInstallMessageHandler(messageHandler);
     w.handleCommandLineOptions(a);
     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

@@ @@ -261,24 +261,26 @@ MainWindow::MainWindow(QWidget *parent) @@
+    {
         commandPanel.newCommandAction()->trigger();
+    }
     // Important: This should be after newCommandAction is triggered
     // (above) we don't want user to be greeted with command panel on
     // the very first run.
     connect(commandPanel.newCommandAction(), &QAction::triggered, [this]()
+            {
                 this->ui->tabWidget->setCurrentWidget(&commandPanel);
                 this->ui->tabWidget->showTabs();
             });
     handleCommandLineOptions(*QApplication::instance());
+}
 MainWindow::~MainWindow()
+{
     if (serialPort.isOpen())
+    {
         serialPort.close();
+    }
     delete plotMan;
     delete ui;

src/mainwindow.h

➞

Show inline comments

@@ @@ -55,25 +55,24 @@ 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 handleCommandLineOptions(const QCoreApplication &app);
 private:
     Ui::MainWindow *ui;
     QDialog aboutDialog;
     void setupAboutDialog();
     QSerialPort serialPort;
     PortControl portControl;
     unsigned int numOfSamples;
@@ @@ -85,24 +84,26 @@ private: @@
     SnapshotManager snapshotMan;
     SampleCounter sampleCounter;
     QLabel spsLabel;
     CommandPanel commandPanel;
     DataFormatPanel dataFormatPanel;
     RecordPanel recordPanel;
     PlotControlPanel plotControlPanel;
     PlotMenu plotMenu;
     DataTextView textView;
     UpdateCheckDialog updateCheckDialog;
     void handleCommandLineOptions(const QCoreApplication &app);
     /// Returns true if demo is running
     bool isDemoRunning();
     /// Display a secondary plot in the splitter, removing and
     /// deleting previous one if it exists
     void showSecondary(QWidget* wid);
     /// Hide secondary plot
     void hideSecondary();
     /// Stores settings for all modules
     void saveAllSettings(QSettings* settings);
     /// Load settings for all modules
     void loadAllSettings(QSettings* settings);
     /// Stores main window settings into a `QSettings`

0 comments (0 inline, 0 general)