Differential D20535 Diff 57644 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 <QLoggingCategory>
28
29		Q_LOGGING_CATEGORY(MACHINE_INFO, "org.kde.atelier.core.machineInfo")
30
31		const QMap<MachineInfo::KEY, MachineInfo::keyInfo> MachineInfo::decoderMap = {
32		{KEY::NAME, {QStringLiteral("Name"), QStringLiteral("ProfileName")}},
33		{KEY::BAUDRATE, {QStringLiteral("bps"), 115200}},
	patrickelectricUnsubmitted Done Use `{foo},` to create a single indentation patrickelectric: Use `{foo},` to create a single indentation
34		{KEY::FIRMWARE, {QStringLiteral("firmware"), QStringLiteral("Auto-Detect")}},
35		{KEY::MAXBEDTEMP, {QStringLiteral("maximumTemperatureBed"), 0}},
36		{KEY::MAXEXTTEMP, {QStringLiteral("maximumTemperatureExtruder"), 0}},
37		{KEY::POSTPAUSE, {QStringLiteral("postPause"), QString()}},
38		{KEY::ISCARTESIAN, {QStringLiteral("isCartesian"), false}},
39		{KEY::XMAX, {QStringLiteral("dimensionX"), 200}},
40		{KEY::YMAX, {QStringLiteral("dimensionY"), 200}},
41		{KEY::ZMAX, {QStringLiteral("dimensionZ"), 180}},
42		{KEY::AUTOTEMPREPORT, {QStringLiteral("autoReportTemp"), false}}
43		};
44
45		MachineInfo *MachineInfo::instance()
46		{
	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		static MachineInfo m;
48		return &m;
49		}
50
51		MachineInfo::MachineInfo(QObject *parent) :
52		QObject(parent)
53		, m_settings(new QSettings(QSettings::IniFormat, QSettings::UserScope, QStringLiteral("atcore"), QStringLiteral("profiles"), this))
54		{
55		}
56
57		QObject MachineInfo::qmlSingletonRegister(QQmlEngine engine, QJSEngine *scriptEngine)
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		Q_UNUSED(scriptEngine)
	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		engine->setObjectOwnership(instance(), QQmlEngine::CppOwnership);
61		return instance();
62		}
63
64		QVariantMap MachineInfo::readProfile(const QString &profileName) const
65		{
	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		m_settings->sync();
67		m_settings->beginGroup(profileName);
68		QVariantMap data{{decoderMap[KEY::NAME].name, m_settings->group()}};
	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		for (int i = 1 ; i <= 10; i++) {
	patrickelectricUnsubmitted Not Done does not need to be a pointer. patrickelectric: does not need to be a pointer.
70		data.insert(decoderMap[MachineInfo::KEY(i)].name, m_settings->value(decoderMap[MachineInfo::KEY(i)].name, decoderMap[MachineInfo::KEY(i)].defaultValue));
71		}
72		m_settings->endGroup();
73		return data;
74		}
75
76		QVariant MachineInfo::readKey(const QString &profileName, MachineInfo::KEY key) const
77		{
	patrickelectricUnsubmitted Done This line is huge. patrickelectric: This line is huge.
78		if (profileName.isEmpty()) {
79		return decoderMap[key].defaultValue;
80		}
81
82		if (key == KEY::NAME) {
83		return profileName;
	patrickelectricUnsubmitted Done qCWarning missing patrickelectric: qCWarning missing
84		}
85
86		m_settings->sync();
87		return m_settings->value(QStringLiteral("%1/%2").arg(profileName, decoderMap[key].name), decoderMap[key].defaultValue);
	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		}
89
90		bool MachineInfo::storeKey(const QString &profileName, const MachineInfo::KEY key, const QVariant &value) const
91		{
92		if (key == KEY::NAME) {
93		//copyProfile emits profilesChanged
94		return copyProfile(profileName, value.toString(), true);
95		}
96
97		if (!profileNames().contains(profileName)) {
98		qCWarning(MACHINE_INFO) << "Keysave: Profile does not exsits, create profile before attempting to store keys.";
99		return false;
100		}
101
	patrickelectricUnsubmitted Done if does not contain return false, avoid indentation. patrickelectric: if does not contain return false, avoid indentation.
102		if (readKey(profileName, key) == value) {
103		return false;
104		}
105
	patrickelectricUnsubmitted Done qCWarning missing patrickelectric: qCWarning missing
106		m_settings->beginGroup(profileName);
107		m_settings->setValue(decoderMap[key].name, value);
108		m_settings->endGroup();
109		m_settings->sync();
	patrickelectricUnsubmitted Done qCWarning missing patrickelectric: qCWarning missing
110		emit profilesChanged();
111		return true;
112		}
113
	patrickelectricUnsubmitted Done qCWarning missing patrickelectric: qCWarning missing
114		bool MachineInfo::copyProfile(const QString &srcProfile, const QString &destProfile, bool rmSrc) const
115		{
116		if (srcProfile.isEmpty() \|\| destProfile.isEmpty()) {
117		qCWarning(MACHINE_INFO) << "Profile Copy Error: Source or Destination Profile Is Empty.";
118		return false;
119		}
120
121		if (!profileNames().contains(srcProfile)) {
122		qCWarning(MACHINE_INFO) << "Profile Copy Error: Source Not Found.";
123		return false;
124		}
125
126		if (srcProfile == destProfile) {
127		qCWarning(MACHINE_INFO) << "Profile Copy Error: Source is Destination.";
128		return false;
129		}
130		QVariantMap newProfile = readProfile(srcProfile);
131		m_settings->beginGroup(destProfile);
	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		for (int i = 1 ; i <= 10; i++) {
133		m_settings->setValue(decoderMap[MachineInfo::KEY(i)].name, newProfile[decoderMap[MachineInfo::KEY(i)].name]);
134		}
135		m_settings->endGroup();
136		m_settings->sync();
137		if (rmSrc) {
138		removeProfile(srcProfile);
139		//removeProfile emits profilesChanged
140		} else {
141		emit profilesChanged();
142		}
	patrickelectricUnsubmitted Done qCWarning missing patrickelectric: qCWarning missing
143		return true;
144		}
145
146		bool MachineInfo::removeProfile(const QString &profileName) const
147		{
148		if (!profileNames().contains(profileName)) {
149		qCWarning(MACHINE_INFO) << "Profile Remove Error: Profile not found.";
150		return false;
151		}
152		m_settings->beginGroup(profileName);
153		m_settings->remove(QString());
154		m_settings->endGroup();
155		m_settings->sync();
156		emit profilesChanged();
157		return true;
158		}
159
160		void MachineInfo::storeProfile(const QMap<MachineInfo::KEY, QVariant> &profile) const
161		{
162		m_settings->beginGroup(profile[KEY::NAME].toString());
163		for (int i = 1 ; i <= 10; i++) {
	patrickelectricUnsubmitted Done is it possible to do that with a for ? patrickelectric: is it possible to do that with a for ?
164		m_settings->setValue(decoderMap[MachineInfo::KEY(i)].name, profile[MachineInfo::KEY(i)]);
165		}
166		m_settings->endGroup();
167		m_settings->sync();
168		emit profilesChanged();
169		}
170
171		QStringList MachineInfo::profileNames() const
172		{
173		m_settings->sync();
174		return m_settings->childGroups();
175		}
176