fix entering negative values in range field (#2560)

* fix entering negative values * better fix for range editor issue with negative numbers * add tests
MerginMaps · Feb 20, 2023 · 55f61ed · 55f61ed · inputapp-bot · Feb 20, 2023
1 parent 769865a
commit 55f61ed
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/app/attributes/attributecontroller.cpp b/app/attributes/attributecontroller.cpp
@@ -647,7 +647,7 @@ bool AttributeController::recalculateDefaultValues(
           {
             mFeatureLayerPair.featureRef().setAttribute( item->fieldIndex(), val );
             item->setRawValue( val );
-            emit formDataChanged( item->id(), { AttributeFormModel::RawValue } );
+            emit formDataChanged( item->id(), { AttributeFormModel::RawValue, AttributeFormModel::RawValueIsNull } );
             // Update also expression context after an attribute change
             expressionContext.setFeature( featureLayerPair().featureRef() );
             changedFormItems.insert( item->id() );
@@ -1202,7 +1202,7 @@ bool AttributeController::setFormValue( const QUuid &id, QVariant value )
     else
     {
       mFeatureLayerPair.featureRef().setAttribute( item->fieldIndex(), val );
-      emit formDataChanged( item->id(), { AttributeFormModel::AttributeValue, AttributeFormModel::AttributeValueIsNull } );
+      emit formDataChanged( item->id(), { AttributeFormModel::AttributeValue, AttributeFormModel::RawValueIsNull } );
     }
     recalculateDerivedItems( true, false );
     return true;

diff --git a/app/attributes/attributeformmodel.cpp b/app/attributes/attributeformmodel.cpp
@@ -58,8 +58,8 @@ QVariant AttributeFormModel::data( const QModelIndex &index, int role ) const
       return item->type();
     case AttributeValue:
       return mController->formValue( item->fieldIndex() );
-    case AttributeValueIsNull:
-      return mController->formValue( item->fieldIndex() ).isNull();
+    case RawValueIsNull:
+      return item->rawValue().isNull();
     case AttributeEditable:
       return item->isEditable();
     case AttributeFormModel::EditorWidget:
@@ -117,7 +117,7 @@ QHash<int, QByteArray> AttributeFormModel::roleNames() const
   roles[Type] = QByteArray( "Type" );
   roles[Name] = QByteArray( "Name" );
   roles[AttributeValue] = QByteArray( "AttributeValue" );
-  roles[AttributeValueIsNull] = QByteArray( "AttributeValueIsNull" );
+  roles[RawValueIsNull] = QByteArray( "RawValueIsNull" );
   roles[AttributeEditable] = QByteArray( "AttributeEditable" );
   roles[EditorWidget] = QByteArray( "EditorWidget" );
   roles[EditorWidgetConfig] = QByteArray( "EditorWidgetConfig" );

diff --git a/app/attributes/attributeformmodel.h b/app/attributes/attributeformmodel.h
@@ -49,7 +49,7 @@ class  AttributeFormModel : public QAbstractListModel
       Type = Qt::UserRole + 1, //!< User role used to identify either "field" or "container" type of item
       Name, //!< Field Name
       AttributeValue, //!< Field Value
-      AttributeValueIsNull, //!< Whether field value is null (QVariant with set type, but NULL flag)
+      RawValueIsNull, //!< Whether field raw value is null (QVariant with set type, but NULL flag)
       AttributeEditable,  //!< Whether is field editable
       EditorWidget, //!< Widget type to represent the data (text field, value map, ...)
       EditorWidgetConfig, //!< Widget configuration

diff --git a/app/qml/form/FeatureForm.qml b/app/qml/form/FeatureForm.qml
@@ -496,7 +496,7 @@ Item {
             anchors { left: placeholder.left; right: placeholder.right }
 
             property var value: RawValue
-            property bool valueIsNull: AttributeValueIsNull
+            property bool valueIsNull: RawValueIsNull
 
             property var field: Field
             property var widget: EditorWidget

diff --git a/app/test/testattributecontroller.cpp b/app/test/testattributecontroller.cpp
@@ -381,6 +381,8 @@ void TestAttributeController::testValidationMessages()
     { items.at( 3 ), "13", V::softUniqueFailed, FieldValidator::Warning }, // there should already be feature with such value
     { items.at( 3 ), "14", "", FieldValidator::Valid },
     { items.at( 3 ), "14sad", V::numberInvalid, FieldValidator::Error },
+    { items.at( 3 ), "-", V::numberInvalid, FieldValidator::Error },
+    { items.at( 3 ), ".", V::numberInvalid, FieldValidator::Error },
     { items.at( 3 ), "14", "", FieldValidator::Valid },
 
     // Attribute - Occupied Expression, must be TRUE - HARD, expression descriptionn: 'Must be true'