mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-08-03 18:44:13 +02:00
Dieter Mayer
3bc2e8e712
DialogWaiting pumps the event loop while the folios of a project are built, so a second openAndAddProject() can run to completion nested inside the first one (drop on another editor window, queued open) and the plain reset/read counters would then report the wrong numbers. Replace them with a RAII counting window (FontRestorationScope): the constructor keeps the enclosing counts aside, the destructor restores them. The nesting is strictly LIFO - the nested load completes inside the pump of the outer one - so each load reports exactly its own numbers, and the early-return paths of openAndAddProject() restore the outer window automatically. Suggested by ispyisail in the review of the reporting change.
86 lines
2.4 KiB
C++
86 lines
2.4 KiB
C++
/*
|
|
Copyright 2006-2026 The QElectroTech Team
|
|
This file is part of QElectroTech.
|
|
|
|
QElectroTech is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
QElectroTech 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#ifndef QETUTILS_H
|
|
#define QETUTILS_H
|
|
|
|
#include <QMargins>
|
|
#include <QWeakPointer>
|
|
|
|
class QGraphicsItem;
|
|
|
|
/**
|
|
Provide some small utils function
|
|
*/
|
|
namespace QETUtils
|
|
{
|
|
QString marginsToString(const QMargins &margins);
|
|
QMargins marginsFromString(const QString &string);
|
|
qreal graphicsHandlerSize(QGraphicsItem *item);
|
|
void pixelSizedFont (QFont &font);
|
|
QString fontToString (const QFont &font);
|
|
bool fontFromString (QFont &font, const QString &description);
|
|
|
|
/**
|
|
RAII counting window for the font descriptions fontFromString()
|
|
salvages or fails to read: construction opens a fresh window, the
|
|
destructor restores the enclosing one. Windows nest strictly LIFO,
|
|
which covers project loads re-entered through the event loop
|
|
(DialogWaiting pumps it while the folios are built).
|
|
*/
|
|
class FontRestorationScope
|
|
{
|
|
public:
|
|
FontRestorationScope();
|
|
~FontRestorationScope();
|
|
FontRestorationScope(const FontRestorationScope &) = delete;
|
|
FontRestorationScope &operator=(const FontRestorationScope &) = delete;
|
|
|
|
int salvaged() const;
|
|
int unreadable() const;
|
|
|
|
private:
|
|
int m_outer_salvaged;
|
|
int m_outer_unreadable;
|
|
};
|
|
|
|
bool sortBeginIntString(const QString &str_a, const QString &str_b);
|
|
|
|
template <typename T>
|
|
QVector<QWeakPointer<T>> sharedVectorToWeak(const QVector<QSharedPointer<T>> &vector)
|
|
{
|
|
QVector<QWeakPointer<T>> return_vector;
|
|
for (const auto shared : vector) {
|
|
return_vector.append(shared.toWeakRef());
|
|
}
|
|
return return_vector;
|
|
}
|
|
|
|
|
|
template <typename T>
|
|
QVector<QSharedPointer<T>> weakVectorToShared(const QVector<QWeakPointer<T>> &vector)
|
|
{
|
|
QVector<QSharedPointer<T>> return_vector;
|
|
for (const auto weak : vector) {
|
|
return_vector.append(weak.toStrongRef());
|
|
}
|
|
return return_vector;
|
|
}
|
|
}
|
|
|
|
#endif // QETUTILS_H
|