version 2.22.0

blockview small code clean
add PIValueTree to BLockItem, BlockItemPin and BlockBusItem
add QAD::CursorOverrider::restore()
fix QCodeEdit escape key while block selection

libs/utils/qad_types.cpp

@@ -56,6 +56,8 @@ __QADTypesRegistrator__::__QADTypesRegistrator__() {
 __QADTypesRegistrator__ __registrator__(1);
 
 
+// QAD::Enum
+
 QAD::Enum::Enum(const QMetaEnum & meta, int selected) {
 	enum_name = meta.name();
 	for (int i = 0; i < meta.keyCount(); ++i) {
@@ -146,6 +148,8 @@ QAD::Enum & QAD::Enum::operator<<(const QStringList & v) {
 }
 
 
+// QAD::IODevice
+
 QString QAD::IODevice::toString() const {
 	QString s;
 	if (__QADTypesRegistrator__::instance()->toString_funcs.contains(qMetaTypeId<QAD::IODevice>())) {
@@ -157,6 +161,27 @@ QString QAD::IODevice::toString() const {
 }
 
 
+// QAD::CursorOverrider
+
+QAD::CursorOverrider::CursorOverrider(const QCursor & c) {
+	QApplication::setOverrideCursor(c);
+}
+
+
+QAD::CursorOverrider::~CursorOverrider() {
+	restore();
+}
+
+
+void QAD::CursorOverrider::restore() {
+	if (!on) return;
+	on = false;
+	QApplication::restoreOverrideCursor();
+}
+
+
+// global
+
 #if QT_VERSION_MAJOR <= 5
 QVariant::Type
 #else

libs/utils/qad_types.h

@@ -47,12 +47,14 @@ class QMetaEnum;
 
 namespace QAD {
 
+
 struct QAD_UTILS_EXPORT Enumerator {
 	Enumerator(int v = 0, const QString & n = QString()): value(v), name(n) {}
 	int value;
 	QString name;
 };
 
+
 struct QAD_UTILS_EXPORT Enum {
 	Enum(const QString & n = QString()): enum_name(n) {}
 	Enum(const QMetaEnum & meta, int selected = 0);
@@ -73,6 +75,7 @@ struct QAD_UTILS_EXPORT Enum {
 	Enum & operator<<(const QStringList & v);
 };
 
+
 struct QAD_UTILS_EXPORT File {
 	File(const QString & p = QString(), const QString & f = QString(), bool abs = false, bool save_mode = false)
 		: file(p)
@@ -86,6 +89,7 @@ struct QAD_UTILS_EXPORT File {
 	bool is_save;
 };
 
+
 struct QAD_UTILS_EXPORT Dir {
 	Dir(const QString & d = QString(), bool abs = false): dir(d), is_abs(abs) {}
 	QString toString() const { return dir; }
@@ -93,6 +97,7 @@ struct QAD_UTILS_EXPORT Dir {
 	bool is_abs;
 };
 
+
 struct QAD_UTILS_EXPORT IODevice {
 	IODevice(const QString & device_prefix             = QString(),
 	         const PropertyStorage & device_properties = PropertyStorage(),
@@ -110,22 +115,30 @@ struct QAD_UTILS_EXPORT IODevice {
 	PropertyStorage props;
 };
 
+
 struct QAD_UTILS_EXPORT MathVector {
 	MathVector(const QVector<double> & vec = QVector<double>()) { v = vec; }
 	QVector<double> v;
 };
 
+
 struct QAD_UTILS_EXPORT MathMatrix {
 	MathMatrix(const QVector<QVector<double>> & mat = QVector<QVector<double>>()) { m = mat; }
 	QVector<QVector<double>> m; // [Row][Column]
 };
 
+
 class QAD_UTILS_EXPORT CursorOverrider {
 public:
-	CursorOverrider(const QCursor & c = Qt::WaitCursor) { QApplication::setOverrideCursor(c); }
-	~CursorOverrider() { QApplication::restoreOverrideCursor(); }
+	CursorOverrider(const QCursor & c = Qt::WaitCursor);
+	~CursorOverrider();
+	void restore();
+
+private:
+	bool on = true;
 };
 
+
 } // namespace QAD
 
 Q_DECLARE_METATYPE(QAD::Enumerator)