Code refactoring, button label's corrections

Author: Mich

src/LICENSE renamed to LICENSE

@@ -30,7 +30,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
 CONFIG += c++11
 
 SOURCES += \
-        dataratechart.cpp \
         filereader.cpp \
         logger.cpp \
         main.cpp \
@@ -43,7 +42,6 @@ SOURCES += \
 HEADERS += \
         ../../../../../../Downloads/QCustomPlot.tar/qcustomplot/qcustomplot.h \
         config.h \
-        dataratechart.h \
         filereader.h \
         logger.h \
         mainwindow.h \

src/QtSerialMonitor.pro

@@ -7,7 +7,7 @@ FileReader::FileReader(QObject *parent) : QObject(parent)
 
 void FileReader::readLineSendLine()
 {
-    int progressPercent = lineReadIterator * 100 / readFileSplitLines.count() ;
+    int progressPercent = lineReadIterator * 100 / readFileSplitLines.count();
     emit lineReady(&readFileSplitLines[lineReadIterator], &progressPercent);
     lineReadIterator++;
 
@@ -21,7 +21,7 @@ void FileReader::readLineSendLine()
 }
 
 bool FileReader::startRead(QFile *fileToRead)
-{    
+{
     if (fileToRead->open(QIODevice::ReadOnly))
     {
         QTextStream stream(fileToRead);

src/advancedgraphmenu.cpp

@@ -1,33 +1,33 @@
 #ifndef FILEREADER_H
 #define FILEREADER_H
 
-#include <QObject>
-#include <QTimer>
 #include <QFile>
+#include <QObject>
 #include <QTextStream>
+#include <QTimer>
 
 class FileReader : public QObject
 {
     Q_OBJECT
 public:
     explicit FileReader(QObject *parent = nullptr);
+    bool readAllAtOnce(QFile *fileToRead);
     bool startRead(QFile *fileToRead);
-    void setReadInterval(int newVal);
     void abortRead();
-    bool readAllAtOnce(QFile *fileToRead);
+    void setReadInterval(int newVal);
 signals:
-    void lineReady(QString*, int*);
     void fileReadFinished();
-    void textReady(QString*);
+    void lineReady(QString *, int *);
+    void textReady(QString *);
 public slots:
-
 private slots:
     void readLineSendLine();
+
 private:
-    QTimer fileReadTimer;
+    int lineReadIterator = 0;
     int readInterval = 1; // ms
     QStringList readFileSplitLines;
-    int lineReadIterator = 0;
+    QTimer fileReadTimer;
 };
 
 #endif // FILEREADER_H

src/dataratechart.cpp

@@ -2,7 +2,6 @@
 
 Logger::Logger(QObject *parent) : QObject(parent)
 {
-
 }
 
 void Logger::openFile(QString fileName)
@@ -36,7 +35,7 @@ bool Logger::beginLog(QString path, bool autoLogging, QString fileName)
         if (autoLogging)
             openFile(path + "/" + QDateTime::currentDateTime().toString("dd.MM.yyyy_hh.mm.ss.zzz_") + "Log.txt");
         else
-            openFile(path +"/" + fileName);
+            openFile(path + "/" + fileName);
 
         return true;
     }
@@ -74,7 +73,7 @@ void Logger::writeLogParsedData(QStringList labelList, QList<double> dataList, b
 {
     QString text;
 
-    for (auto i = 0; i< labelList.count(); ++i)
+    for (auto i = 0; i < labelList.count(); ++i)
     {
         text.append(labelList[i] + " " + QString::number(dataList[i], 'f') + " :: ");
     }
@@ -94,4 +93,3 @@ void Logger::writeLogParsedData(QStringList labelList, QList<double> dataList, b
         out << text + "\r";
     }
 }
-

src/dataratechart.h

@@ -1,23 +1,22 @@
 #ifndef LOGGER_H
 #define LOGGER_H
 
-#include <QObject>
 #include <QDateTime>
+#include <QDir>
 #include <QFile>
-#include <QTextStream>
+#include <QObject>
 #include <QtDebug>
-#include <QDir>
+#include <QTextStream>
 
 class Logger : public QObject
 {
     Q_OBJECT
 public:
     explicit Logger(QObject *parent = nullptr);
-
-    void openFile(QString fileName);
-    void closeFile();
     bool beginLog(QString path, bool autoLogging, QString fileName);
     bool isOpen();
+    void closeFile();
+    void openFile(QString fileName);
     void writeLogLine(QString lineToAppend, bool simplifyText, bool appendDate);
     void writeLogParsedData(QStringList labelList, QList<double> dataList, bool appendDate = false);
 signals:
@@ -26,7 +25,6 @@ public slots:
 
 private:
     QFile *logFile = nullptr;
-
 };
 
 #endif // LOGGER_H