[QgsQuick] Updated value relation widget

vsklencar · wonder-sk · commit 33139f343ac6 · 2019-04-10T22:23:34.000+02:00
Renamed and simplified shared ComboBox component - now its just styled component without functionality. All has to be defined when creating it.

Added docs to QgsQuickUtils::createValueRelationCache
diff --git a/src/quickgui/plugin/CMakeLists.txt b/src/quickgui/plugin/CMakeLists.txt
@@ -10,7 +10,7 @@ SET(QGIS_QUICK_PLUGIN_SRC
 )
 
 SET(QGIS_QUICK_PLUGIN_RESOURCES
-  editor/qgsquickcombobox.qml
+  editor/qgsquickeditorwidgetcombobox.qml
   editor/qgsquickcheckbox.qml
   editor/qgsquickdatetime.qml
   editor/qgsquickexternalresource.qml
diff --git a/src/quickgui/plugin/editor/qgsquickeditorwidgetcombobox.qml b/src/quickgui/plugin/editor/qgsquickeditorwidgetcombobox.qml
@@ -20,19 +20,13 @@ import QgsQuick 0.1 as QgsQuick
 
 /**
  * ComboBox for QGIS Attribute Form - used by QgsQuickValueMap and QgsQuickValueRelation
- * Requires various global properties set to function, see qgsquickfeatureform Loader section
  * Do not use directly from Application QML
  */
 ComboBox {
   id: comboBox
 
-  property var reverseConfig: ({})
-  property var currentValue
-  property var currentMap
-  property var currentKey
   property var comboStyle
   anchors { left: parent.left; right: parent.right }
-  currentIndex: find(reverseConfig[currentValue])
 
   MouseArea {
     anchors.fill: parent
diff --git a/src/quickgui/plugin/editor/qgsquickvaluemap.qml b/src/quickgui/plugin/editor/qgsquickvaluemap.qml
@@ -35,8 +35,11 @@ Item {
     rightMargin: 10 * QgsQuick.Utils.dp
   }
 
-  QgsQuick.ComboBox {
-    id: comboBox
+  QgsQuick.EditorWidgetComboBox {
+    // Reversed to model's key-value map. It is used to find index according current value
+    property var reverseConfig: ({})
+    property var currentValue: value
+
     comboStyle: customStyle
     textRole: 'text'
     height: parent.height
@@ -52,29 +55,28 @@ Item {
           //it's a list (>=QGIS3.0)
           for(var i=0; i<config['map'].length; i++)
           {
-            currentMap = config['map'][i]
-            currentKey = Object.keys(currentMap)[0]
+            var currentMap = config['map'][i]
+            var currentKey = Object.keys(currentMap)[0]
             listModel.append( { text: currentKey } )
             reverseConfig[currentMap[currentKey]] = currentKey;
           }
         }
         else
         {
           //it's a map (<=QGIS2.18)
-          currentMap= config['map'].length ? config['map'][currentIndex] : config['map']
-          currentKey = Object.keys(currentMap)[0]
+          var currentMap = config['map'].length ? config['map'][currentIndex] : config['map']
+          var currentKey = Object.keys(currentMap)[0]
           for(var key in config['map']) {
             listModel.append( { text: key } )
             reverseConfig[config['map'][key]] = key;
           }
         }
       }
-
       currentIndex = find(reverseConfig[value])
     }
 
     onCurrentTextChanged: {
-      currentMap= config['map'].length ? config['map'][currentIndex] : config['map']
+      var currentMap = config['map'].length ? config['map'][currentIndex] : config['map']
       valueChanged(currentMap[currentText], false)
     }
 
diff --git a/src/quickgui/plugin/editor/qgsquickvaluerelation.qml b/src/quickgui/plugin/editor/qgsquickvaluerelation.qml
@@ -35,30 +35,36 @@ Item {
     rightMargin: 10 * QgsQuick.Utils.dp
   }
 
-  QgsQuick.ComboBox {
+  QgsQuick.EditorWidgetComboBox {
+    // Value relation cache map
+    property var currentMap
+    // Reversed to currentMap. It is used to find key (currentValue) according value (currentText)
+    property var reversedMap: ({})
+    property var currentValue: value
+
     comboStyle: customStyle
+    textRole: 'text'
+    height: parent.height
     model: ListModel {
       id: listModel
     }
-    textRole: 'text'
-    height: parent.height
 
     Component.onCompleted: {
       currentMap = QgsQuick.Utils.createValueRelationCache(config)
       var keys = Object.keys(currentMap)
       for(var i=0; i< keys.length; i++)
       {
-        currentKey = keys[i]
+        var currentKey = keys[i]
         var valueText = currentMap[currentKey]
         listModel.append( { text: valueText } )
-        reverseConfig[valueText] = currentKey;
+        reversedMap[valueText] = currentKey;
       }
-      model=listModel
+      model = listModel
       currentIndex = find(currentMap[value])
     }
 
     onCurrentTextChanged: {
-      valueChanged(reverseConfig[currentText], false)
+      valueChanged(reversedMap[currentText], false)
     }
 
     // Workaround to get a signal when the value has changed
diff --git a/src/quickgui/plugin/qgsquick.qrc b/src/quickgui/plugin/qgsquick.qrc
@@ -1,7 +1,7 @@
 <RCC>
     <qresource prefix="/QgsQuick">
         <file>qmldir</file>
-        <file>editor/qgsquickcombobox.qml</file>
+        <file>editor/qgsquickeditorwidgetcombobox.qml</file>
         <file>editor/qgsquickcheckbox.qml</file>
         <file>editor/qgsquickdatetime.qml</file>
         <file>editor/qgsquickexternalresource.qml</file>
diff --git a/src/quickgui/plugin/qmldir b/src/quickgui/plugin/qmldir
@@ -13,7 +13,9 @@
 module QgsQuick
 plugin qgis_quick_plugin
 
-ComboBox 0.1 qgsquickcombobox.qml
+# suppose to be used only internaly in QgsQuick plugin
+EditorWidgetComboBox  0.1 qgsquickeditorwidgetcombobox.qml
+
 MapCanvas 0.1 qgsquickmapcanvas.qml
 FeatureForm 0.1 qgsquickfeatureform.qml
 FeatureFormStyling 0.1 qgsquickfeatureformstyling.qml
diff --git a/src/quickgui/qgsquickutils.h b/src/quickgui/qgsquickutils.h
@@ -229,6 +229,16 @@ class QUICK_EXPORT QgsQuickUtils: public QObject
     //! Returns a string with information about screen size and resolution - useful for debugging
     QString dumpScreenInfo() const;
 
+    /**
+     * Creates a cache for a value relation field.
+     * This can be used to keep the value map in the local memory
+     * if doing multiple lookups in a loop.
+     * \param config The widget configuration
+     * \param formFeature The feature currently being edited with current attribute values
+     * \return A kvp list of values for the widget
+     *
+     * \since QGIS 3.6
+     */
     Q_INVOKABLE static QVariantMap createValueRelationCache( const QVariantMap &config, const QgsFeature &formFeature = QgsFeature() );
 
   private:

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ SET(QGIS_QUICK_PLUGIN_SRC`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`SET(QGIS_QUICK_PLUGIN_RESOURCES`
`13`		`- editor/qgsquickcombobox.qml`
	`13`	`+ editor/qgsquickeditorwidgetcombobox.qml`
`14`	`14`	`editor/qgsquickcheckbox.qml`
`15`	`15`	`editor/qgsquickdatetime.qml`
`16`	`16`	`editor/qgsquickexternalresource.qml`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,11 @@ Item {`
`35`	`35`	`rightMargin: 10 * QgsQuick.Utils.dp`
`36`	`36`	`}`
`37`	`37`
`38`		`- QgsQuick.ComboBox {`
`39`		`- id: comboBox`
	`38`	`+ QgsQuick.EditorWidgetComboBox {`
	`39`	`+ // Reversed to model's key-value map. It is used to find index according current value`
	`40`	`+ property var reverseConfig: ({})`
	`41`	`+ property var currentValue: value`
	`42`	`+`
`40`	`43`	`comboStyle: customStyle`
`41`	`44`	`textRole: 'text'`
`42`	`45`	`height: parent.height`
`@@ -52,29 +55,28 @@ Item {`
`52`	`55`	`//it's a list (>=QGIS3.0)`
`53`	`56`	`for(var i=0; i<config['map'].length; i++)`
`54`	`57`	`{`
`55`		`- currentMap = config['map'][i]`
`56`		`- currentKey = Object.keys(currentMap)[0]`
	`58`	`+ var currentMap = config['map'][i]`
	`59`	`+ var currentKey = Object.keys(currentMap)[0]`
`57`	`60`	`listModel.append( { text: currentKey } )`
`58`	`61`	`reverseConfig[currentMap[currentKey]] = currentKey;`
`59`	`62`	`}`
`60`	`63`	`}`
`61`	`64`	`else`
`62`	`65`	`{`
`63`	`66`	`//it's a map (<=QGIS2.18)`
`64`		`- currentMap= config['map'].length ? config['map'][currentIndex] : config['map']`
`65`		`- currentKey = Object.keys(currentMap)[0]`
	`67`	`+ var currentMap = config['map'].length ? config['map'][currentIndex] : config['map']`
	`68`	`+ var currentKey = Object.keys(currentMap)[0]`
`66`	`69`	`for(var key in config['map']) {`
`67`	`70`	`listModel.append( { text: key } )`
`68`	`71`	`reverseConfig[config['map'][key]] = key;`
`69`	`72`	`}`
`70`	`73`	`}`
`71`	`74`	`}`
`72`		`-`
`73`	`75`	`currentIndex = find(reverseConfig[value])`
`74`	`76`	`}`
`75`	`77`
`76`	`78`	`onCurrentTextChanged: {`
`77`		`- currentMap= config['map'].length ? config['map'][currentIndex] : config['map']`
	`79`	`+ var currentMap = config['map'].length ? config['map'][currentIndex] : config['map']`
`78`	`80`	`valueChanged(currentMap[currentText], false)`
`79`	`81`	`}`
`80`	`82`