diff --git a/src/core/temperature.cpp b/src/core/temperature.cpp index dc45303..6bff9c0 100644 --- a/src/core/temperature.cpp +++ b/src/core/temperature.cpp @@ -1,126 +1,135 @@ /* AtCore Copyright (C) <2016> Authors: Tomaz Canabrava Patrick José Pereira Chris Rizzitello This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) version 3, or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 6 of version 3 of the license. This library 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 Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ #include #include #include "temperature.h" /** * @brief The TemperaturePrivate class * * Private Data of Temperature */ -class Temperature::TemperaturePrivate -{ -public: - float extruderTemp = 0.0; //!< @param extruderTemp: Extruder current temperature - float extruderTargetTemp = 0.0; //!< @param extruderTargetTemp: Extruder target temperature - float bedTemp = 0.0; //!< @param bedTemp: Bed current temperature - float bedTargetTemp = 0.0; //!< @param bedTargetTemp: Bed target temperature + +struct Temperature::TemperaturePrivate { + /** Regex to capture Bed Temperature grabs : B: to the next space */ + static const QRegularExpression bedRegEx; + /** bedTemp: Bed current temperature */ + float bedTemp = 0.0; + /** bedTargetTemp: Bed target temperature */ + float bedTargetTemp = 0.0; + /** extruderTemp: Extruder current temperature */ + float extruderTemp = 0.0; + /** extruderTargetTemp: Extruder target temperature */ + float extruderTargetTemp = 0.0; + /** Regex to capture Bed Target Temperature: Find B:## /## and grab the second set of numbers */ + static const QRegularExpression targetBedRegEx; + /** Regex to capture Extruder Target Temperature Finds T:## /## and grabs the second set of numbers */ + static const QRegularExpression targetTempRegEx; + /** Regex to capture Extruder Temperature Grabs "T: to next space" */ + static const QRegularExpression tempRegEx; }; +const QRegularExpression Temperature::TemperaturePrivate::bedRegEx = QRegularExpression(QStringLiteral(R"(B:(?\d+\.\d*))")); +const QRegularExpression Temperature::TemperaturePrivate::targetBedRegEx = QRegularExpression(QStringLiteral(R"(B:[^\/]*\/(?\d+\.?\d*))")); +const QRegularExpression Temperature::TemperaturePrivate::targetTempRegEx = QRegularExpression(QStringLiteral(R"(T:[^\/]*\/(?\d+\.?\d*))")); +const QRegularExpression Temperature::TemperaturePrivate::tempRegEx = QRegularExpression(QStringLiteral(R"(T:(?\d+\.\d*))")); + Temperature::Temperature(QObject *parent) : QObject(parent) , d(new TemperaturePrivate) { } float Temperature::bedTargetTemperature() const { return d->bedTargetTemp; } float Temperature::bedTemperature() const { return d->bedTemp; } float Temperature::extruderTargetTemperature() const { return d->extruderTargetTemp; } float Temperature::extruderTemperature() const { return d->extruderTemp; } void Temperature::setBedTargetTemperature(float temp) { d->bedTargetTemp = temp; emit bedTargetTemperatureChanged(temp); } void Temperature::setBedTemperature(float temp) { d->bedTemp = temp; emit bedTemperatureChanged(temp); } void Temperature::setExtruderTargetTemperature(float temp) { d->extruderTargetTemp = temp; emit extruderTargetTemperatureChanged(temp); } void Temperature::setExtruderTemperature(float temp) { d->extruderTemp = temp; emit extruderTemperatureChanged(temp); } void Temperature::decodeTemp(const QByteArray &msg) { - //Capture after T: until next space - static const QRegularExpression tempRegEx(QStringLiteral(R"(T:(?\d+\.\d*))")); - QRegularExpressionMatch tempCheck = tempRegEx.match(QString::fromLatin1(msg)); - //Find T:## /## and store the second set of numbers - static const QRegularExpression targetTempRegEx(QStringLiteral(R"(T:[^\/]*\/(?\d+\.?\d*))")); - QRegularExpressionMatch targetTempCheck = targetTempRegEx.match(QString::fromLatin1(msg)); + QString msgString = QString::fromLatin1(msg); + QRegularExpressionMatch tempCheck = d->tempRegEx.match(msgString); + QRegularExpressionMatch targetTempCheck = d->targetTempRegEx.match(msgString); if (tempCheck.hasMatch()) { setExtruderTemperature(tempCheck.captured(QStringLiteral("extruder")).toFloat()); } if (targetTempCheck.hasMatch()) { setExtruderTargetTemperature(targetTempCheck.captured(QStringLiteral("extruderTarget")).toFloat()); } if (msg.indexOf(QStringLiteral("B:")) != -1) { - //Capture after B: until next space - static const QRegularExpression bedRegEx(QStringLiteral(R"(B:(?\d+\.\d*))")); - QRegularExpressionMatch bedCheck = bedRegEx.match(QString::fromLatin1(msg)); - //Find B:## /## and store the second set of numbers - static QRegularExpression targetBedRegEx(QStringLiteral(R"(B:[^\/]*\/(?\d+\.?\d*))")); - QRegularExpressionMatch targetBedCheck = targetBedRegEx.match(QString::fromLatin1(msg)); + QRegularExpressionMatch bedCheck = d->bedRegEx.match(msgString); + QRegularExpressionMatch targetBedCheck = d->targetBedRegEx.match(msgString); if (bedCheck.hasMatch()) { setBedTemperature(bedCheck.captured(QStringLiteral("bed")).toFloat()); } if (targetBedCheck.hasMatch()) { setBedTargetTemperature(targetBedCheck.captured(QStringLiteral("bedTarget")).toFloat()); } } } diff --git a/src/core/temperature.h b/src/core/temperature.h index 1ca7aff..b4f76b2 100644 --- a/src/core/temperature.h +++ b/src/core/temperature.h @@ -1,129 +1,129 @@ /* AtCore Copyright (C) <2016> Authors: Tomaz Canabrava Patrick José Pereira This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) version 3, or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 6 of version 3 of the license. This library 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 Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ #pragma once #include #include "atcore_export.h" /** * @brief The Temperature class * * Read and hold the Temperature info for the printer */ class ATCORE_EXPORT Temperature : public QObject { Q_OBJECT Q_PROPERTY(float bedTemperature READ bedTemperature WRITE setBedTemperature NOTIFY bedTemperatureChanged) Q_PROPERTY(float bedTargetTemperature READ bedTargetTemperature WRITE setBedTargetTemperature NOTIFY bedTargetTemperatureChanged) Q_PROPERTY(float extruderTemperature READ extruderTemperature WRITE setExtruderTemperature NOTIFY extruderTemperatureChanged) Q_PROPERTY(float extruderTargetTemperature READ extruderTargetTemperature WRITE setExtruderTargetTemperature NOTIFY extruderTargetTemperatureChanged) public: /** * @brief Create a new Temperature object * @param parent */ explicit Temperature(QObject *parent = nullptr); /** * @brief Get bed current temperature */ float bedTemperature() const; /** * @brief Get bed target temperature */ float bedTargetTemperature() const; /** * @brief Get extruder temperature */ float extruderTemperature() const; /** * @brief Get extruder target temperature */ float extruderTargetTemperature() const; /** * @brief decode Temp values from string \p msg * @param msg: string to read vaules from */ void decodeTemp(const QByteArray &msg); public slots: /** * @brief Set bed temperature * @param temp: bed temperature */ void setBedTemperature(float temp); /** * @brief Set bed target temperature * @param temp: bed target temperature */ void setBedTargetTemperature(float temp); /** * @brief Set exturder temperature * @param temp: bed temperature */ void setExtruderTemperature(float temp); /** * @brief Set extruder target temperature * @param temp: extruder target temperature */ void setExtruderTargetTemperature(float temp); signals: /** * @brief bed temperature has changed * @param temp : new bed temperature */ void bedTemperatureChanged(float temp); /** * @brief bed target temperature has changed * @param temp : new bed target temperature */ void bedTargetTemperatureChanged(float temp); /** * @brief extruder temperature has changed * @param temp : new extruder temperature */ void extruderTemperatureChanged(float temp); /** * @brief extruder target temperature has changed * @param temp : new extruder target temperature */ void extruderTargetTemperatureChanged(float temp); private: - class TemperaturePrivate; + struct TemperaturePrivate; TemperaturePrivate *d; };