From 1b7511eef267f41ad78d0554799f4dc991c48a8a Mon Sep 17 00:00:00 2001
From: peri4 <peri4ko@yandex.ru>
Date: Wed, 17 May 2023 14:46:23 +0300
Subject: [PATCH] PIValueTreeEdit: fix default min/max attributes, hide
 "expression"

---
 libs/piqt_utils/pivaluetree_edit_parameters.cpp |  3 ++-
 libs/piqt_utils/pivariant_edit_widgets.cpp      | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/libs/piqt_utils/pivaluetree_edit_parameters.cpp b/libs/piqt_utils/pivaluetree_edit_parameters.cpp
index 9115dd4..a42316a 100644
--- a/libs/piqt_utils/pivaluetree_edit_parameters.cpp
+++ b/libs/piqt_utils/pivaluetree_edit_parameters.cpp
@@ -109,7 +109,8 @@ void PIValueTreeEditParameters::createAttributes(QList<PIVariantEdit *> & list,
 												 QFormLayout * lay,
 												 const PIVariantMap & attr,
 												 bool inv_filter) {
-	static PIStringList hidden({"type", Attribute::hidden, Attribute::readOnly, Attribute::isLabel, Attribute::arrayType});
+	static PIStringList hidden(
+		{"type", Attribute::hidden, Attribute::readOnly, Attribute::isLabel, Attribute::arrayType, Attribute::expression});
 	static PIStringList filter({Attribute::arrayMinCount, Attribute::arrayMaxCount, Attribute::arrayReorder, Attribute::arrayResize});
 	list.clear();
 	while (lay->rowCount() > 0)
diff --git a/libs/piqt_utils/pivariant_edit_widgets.cpp b/libs/piqt_utils/pivariant_edit_widgets.cpp
index 88f7b08..1f2519e 100644
--- a/libs/piqt_utils/pivariant_edit_widgets.cpp
+++ b/libs/piqt_utils/pivariant_edit_widgets.cpp
@@ -155,13 +155,13 @@ PIVariantMap PIVariantEditors::NumberBase::attributes() const {
 
 PIVariantMap PIVariantEditors::NumberBase::defaultAttributes() {
 	return {
-		{Attribute::widgetType, createTypes()                   },
-		{Attribute::minimum,    -std::numeric_limits<int>::max()},
-		{Attribute::maximum,    std::numeric_limits<int>::max() },
-		{Attribute::singleStep, 1.                              },
-		{Attribute::decimals,   3							   },
-		{Attribute::prefix,     ""							  },
-		{Attribute::suffix,     ""							  },
+		{Attribute::widgetType, createTypes()                     },
+		{Attribute::minimum,    -std::numeric_limits<short>::max()},
+		{Attribute::maximum,    std::numeric_limits<short>::max() },
+		{Attribute::singleStep, 1.                                },
+		{Attribute::decimals,   3								 },
+		{Attribute::prefix,     ""								},
+		{Attribute::suffix,     ""								},
 	};
 }