From a5a8dc662b24e15d6530cb2c5d94fb64dc615130 Mon Sep 17 00:00:00 2001 From: NeoTheFox Date: Sat, 14 Mar 2015 18:19:44 +0300 Subject: [PATCH] Cleanup and comments --- parser.cpp | 11 ++++++----- parser.h | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/parser.cpp b/parser.cpp index c3121ad..d4dcef7 100644 --- a/parser.cpp +++ b/parser.cpp @@ -3,15 +3,17 @@ Parser::Parser(QObject *parent): QObject(parent) { - this->setParent(parent); + //Init regexp temperatureRegxp.setCaseSensitivity(Qt::CaseInsensitive); temperatureRegxp.setPatternSyntax(QRegExp::RegExp); temperatureRegxp.setPattern("\\d+\\.\\d+"); // Find float in string + //Init values readingFiles = false; readingEEPROM = false; EEPROMReadingStarted = false; + //Load settings QSettings settings; firmware = settings.value("printer/firmware").toInt(); } @@ -23,9 +25,9 @@ Parser::~Parser() void Parser::parse(QByteArray data) { - if(!data.isEmpty()) + if(!data.isEmpty()) //Dont need to process empty strings { - if(readingFiles) + if(readingFiles) //SD files list reading mode { if(!data.contains("End file list")) SDFilesList.append(data); else @@ -36,7 +38,7 @@ void Parser::parse(QByteArray data) return; } - if(readingEEPROM) + if(readingEEPROM) // EEPROM reading mode { if(firmware == Repetier) { @@ -55,7 +57,6 @@ void Parser::parse(QByteArray data) return; } } - /* if(data.startsWith("ok")) { diff --git a/parser.h b/parser.h index c930086..f6af475 100644 --- a/parser.h +++ b/parser.h @@ -19,11 +19,11 @@ public: protected: QByteArray data; QStringList SDFilesList; + QRegExp temperatureRegxp; int firmware; bool readingFiles; bool readingEEPROM; bool EEPROMReadingStarted; - QRegExp temperatureRegxp; signals: void recievedTemperature(TemperatureReadings);