Differential D20535 Diff 56409 src/core/machineinfo.cpp

Changeset View

Standalone View

src/core/machineinfo.cpp

This file was added.

1		/* AtCore
2		Copyright (C) <2019>
3
4		Authors:
5		Chris Rizzitello <rizzitello@kde.org>
6
7		This library is free software; you can redistribute it and/or
8		modify it under the terms of the GNU Lesser General Public
9		License as published by the Free Software Foundation; either
10		version 2.1 of the License, or (at your option) version 3, or any
11		later version accepted by the membership of KDE e.V. (or its
12		successor approved by the membership of KDE e.V.), which shall
13		act as a proxy defined in Section 6 of version 3 of the license.
14
15		This library is distributed in the hope that it will be useful,
16		but WITHOUT ANY WARRANTY; without even the implied warranty of
17		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18		Lesser General Public License for more details.
19
20		You should have received a copy of the GNU Lesser General Public
21		License along with this library. If not, see <http://www.gnu.org/licenses/>.
22		*/
23
24		#include "machineinfo.h"
25
26		#include <QCoreApplication>
27		#include <QDir>
28		#include <QFile>
29		#include <QMetaEnum>
30
31		const QMap<MachineInfo::KEY, QString> MachineInfo::nameMap = {
32		{KEY::NAME, QStringLiteral("Name")},
33		{KEY::BAUDRATE, QStringLiteral("bps")},
	patrickelectricUnsubmitted Done Use `{foo},` to create a single indentation patrickelectric: Use `{foo},` to create a single indentation
34		{KEY::FIRMWARE, QStringLiteral("firmware")},
35		{KEY::MAXBEDTEMP, QStringLiteral("maximumTemperatureBed")},
36		{KEY::MAXEXTTEMP, QStringLiteral("maximumTemperatureExtruder")},
37		{KEY::POSTPAUSE, QStringLiteral("postPause")},
38		{KEY::ISCARTESIAN, QStringLiteral("isCartesian")},
39		{KEY::XMAX, QStringLiteral("dimensionX")},
40		{KEY::YMAX, QStringLiteral("dimensionY")},
41		{KEY::ZMAX, QStringLiteral("dimensionZ")},
42		{KEY::AUTOTEMPREPORT, QStringLiteral("autoReportTemp")}
43		};
44
45		const QMap<MachineInfo::KEY, QVariant> MachineInfo::defaultProfile = {
46		{KEY::NAME, QStringLiteral("ProfileName")},
	patrickelectricUnsubmitted Done This should be a pointer to be accessible in qml; patrickelectric: This should be a pointer to be accessible in qml;
	rizzitelloAuthorUnsubmitted Done I was thinking it would be used like this in the main cpp file qmlEngine.rootContext()->setContextProperty("machineInfo", MachineInfo::getInstance()); rizzitello: I was thinking it would be used like this in the main cpp file qmlEngine.rootContext()…
	patrickelectricUnsubmitted Done you just need to register as a singleton, please use a pointer. google for qmlregistersingletontype patrickelectric: you just need to register as a singleton, please use a pointer. google for…
	patrickelectricUnsubmitted Done You should return a pointer, but you don't need to create the object in the heap. static MachineInfo m; return &m; Do not forget to set the ownership to cpp patrickelectric: You should return a pointer, but you don't need to create the object in the heap. ```…
47		{KEY::BAUDRATE, QStringLiteral("115200")},
48		{KEY::FIRMWARE, QStringLiteral("Auto-Detect")},
49		{KEY::MAXBEDTEMP, 0},
50		{KEY::MAXEXTTEMP, 0},
51		{KEY::POSTPAUSE, QString()},
52		{KEY::ISCARTESIAN, true},
53		{KEY::XMAX, 200},
54		{KEY::YMAX, 200},
55		{KEY::ZMAX, 180},
56		{KEY::AUTOTEMPREPORT, false}
57		};
58
	patrickelectricUnsubmitted Done Why not a QMap<MachineInfo::KEY, QPair<QString, QVariant>> ? patrickelectric: Why not a QMap<MachineInfo::KEY, QPair<QString, QVariant>> ?
	rizzitelloAuthorUnsubmitted Not Done made a small struct with keyString and defaultValue Instaed but a similar idea. rizzitello: made a small struct with keyString and defaultValue Instaed but a similar idea.
59		const MachineInfo &MachineInfo::getInstance()
	patrickelectricUnsubmitted Done is it possible to do this population with a for loop ? patrickelectric: is it possible to do this population with a for loop ?
60		{
61		static MachineInfo m;
62		return m;
63		}
64
65		MachineInfo::MachineInfo(QObject *parent) : QObject(parent)
	patrickelectricUnsubmitted Done This values should be somewhere else no in the middle of the code. We should create a const standard profile in the class. patrickelectric: This values should be somewhere else no in the middle of the code. We should create a const…
66		{
67		if (QFile(QString(QCoreApplication::applicationDirPath() + QDir::separator() + QStringLiteral("profiles.ini"))).exists()) {
68		m_settings = new QSettings(QCoreApplication::applicationDirPath() + QDir::separator() + QStringLiteral("profiles"), QSettings::IniFormat, this);
	patrickelectricUnsubmitted Done this is not necessary, you just need to save the settings inside a profiles configuration list. patrickelectric: this is not necessary, you just need to save the settings inside a profiles configuration list.
69		} else {
	patrickelectricUnsubmitted Not Done does not need to be a pointer. patrickelectric: does not need to be a pointer.
70		m_settings = new QSettings(QSettings::IniFormat, QSettings::UserScope, QStringLiteral("atcore"), QStringLiteral("profiles"), this);
71		}
72		}
73
74		QVariantMap MachineInfo::readProfile(const QString &profileName) const
75		{
76		m_settings->beginGroup(profileName);
77		QVariantMap data{
	patrickelectricUnsubmitted Done This line is huge. patrickelectric: This line is huge.
78		{nameMap[KEY::BAUDRATE], m_settings->value(nameMap[KEY::BAUDRATE], defaultProfile[KEY::BAUDRATE])},
79		{nameMap[KEY::MAXBEDTEMP], m_settings->value(nameMap[KEY::MAXBEDTEMP], defaultProfile[KEY::MAXBEDTEMP])},
80		{nameMap[KEY::MAXEXTTEMP], m_settings->value(nameMap[KEY::MAXEXTTEMP], defaultProfile[KEY::MAXEXTTEMP])},
81		{nameMap[KEY::FIRMWARE], m_settings->value(nameMap[KEY::FIRMWARE], defaultProfile[KEY::FIRMWARE])},
82		{nameMap[KEY::POSTPAUSE], m_settings->value(nameMap[KEY::POSTPAUSE], defaultProfile[KEY::POSTPAUSE])},
83		{nameMap[KEY::NAME], m_settings->group()},
	patrickelectricUnsubmitted Done qCWarning missing patrickelectric: qCWarning missing
84		{nameMap[KEY::ISCARTESIAN], m_settings->value(nameMap[KEY::ISCARTESIAN], defaultProfile[KEY::ISCARTESIAN])},
85		{nameMap[KEY::XMAX], m_settings->value(nameMap[KEY::XMAX], defaultProfile[KEY::XMAX])},
86		{nameMap[KEY::YMAX], m_settings->value(nameMap[KEY::YMAX], defaultProfile[KEY::YMAX])},
87		{nameMap[KEY::ZMAX], m_settings->value(nameMap[KEY::ZMAX], defaultProfile[KEY::ZMAX])},
	patrickelectricUnsubmitted Done qCWarning missing patrickelectric: qCWarning missing
	rizzitelloAuthorUnsubmitted Done This is triggered a bunch of times. You see it with the profile manager If your starting profile shares any values with what the defaults are set to one warning per instance of that same if you change between profiles and they any profile data in common you will get more of these in the log. rizzitello: This is triggered a bunch of times. You see it with the profile manager If your starting…
88		{nameMap[KEY::AUTOTEMPREPORT], m_settings->value(nameMap[KEY::AUTOTEMPREPORT], defaultProfile[KEY::AUTOTEMPREPORT])}
89		};
90		m_settings->endGroup();
91		return data;
92		}
93
94		QVariant MachineInfo::readKey(const QString &profileName, MachineInfo::KEY key) const
95		{
96		m_settings->beginGroup(profileName);
97		QVariant data = m_settings->value(nameMap[key]);
98		m_settings->endGroup();
99		return data;
100		}
101
	patrickelectricUnsubmitted Done if does not contain return false, avoid indentation. patrickelectric: if does not contain return false, avoid indentation.
102		void MachineInfo::storeKey(const QString &profileName, const MachineInfo::KEY key, const QVariant &value) const
103		{
104		m_settings->beginGroup(profileName);
105		if (key != KEY::NAME) {
	patrickelectricUnsubmitted Done qCWarning missing patrickelectric: qCWarning missing
106		m_settings->setValue(nameMap[key], value);
107		}
108		m_settings->endGroup();
109		emit profilesChanged();
	patrickelectricUnsubmitted Done qCWarning missing patrickelectric: qCWarning missing
110		}
111
112		bool MachineInfo::removeProfile(const QString &profileName) const
113		{
	patrickelectricUnsubmitted Done qCWarning missing patrickelectric: qCWarning missing
114		if (!m_settings->childGroups().contains(profileName)) {
115		return false;
116		}
117		m_settings->beginGroup(profileName);
118		m_settings->remove(QString());
119		m_settings->endGroup();
120		emit profilesChanged();
121		return true;
122		}
123
124		void MachineInfo::storeProfile(const QMap<MachineInfo::KEY, QVariant> &profile) const
125		{
126		m_settings->beginGroup(profile[KEY::NAME].toString());
127		m_settings->setValue(nameMap[KEY::FIRMWARE], profile[KEY::FIRMWARE]);
128		m_settings->setValue(nameMap[KEY::BAUDRATE], profile[KEY::BAUDRATE]);
129		m_settings->setValue(nameMap[KEY::MAXBEDTEMP], profile[KEY::MAXBEDTEMP]);
130		m_settings->setValue(nameMap[KEY::MAXEXTTEMP], profile[KEY::MAXEXTTEMP]);
131		m_settings->setValue(nameMap[KEY::POSTPAUSE], profile[KEY::POSTPAUSE]);
	patrickelectricUnsubmitted Done can you return childGRoups directly ? why m_settings is a pointer ? patrickelectric: can you return childGRoups directly ? why m_settings is a pointer ?
132		m_settings->setValue(nameMap[KEY::ISCARTESIAN], profile[KEY::ISCARTESIAN]);
133		m_settings->setValue(nameMap[KEY::XMAX], profile[KEY::XMAX]);
134		m_settings->setValue(nameMap[KEY::YMAX], profile[KEY::YMAX]);
135		m_settings->setValue(nameMap[KEY::ZMAX], profile[KEY::ZMAX]);
136		m_settings->setValue(nameMap[KEY::AUTOTEMPREPORT], profile[KEY::AUTOTEMPREPORT]);
137		m_settings->endGroup();
138		emit profilesChanged();
139		}
140
141		QStringList MachineInfo::profileNames() const
142		{
	patrickelectricUnsubmitted Done qCWarning missing patrickelectric: qCWarning missing
143		return m_settings->childGroups();
144		}
145
	patrickelectricUnsubmitted Done is it possible to do that with a for ? patrickelectric: is it possible to do that with a for ?