Value relation rework & more small updates#4525
Open
tomasMizera wants to merge 11 commits into
Open
Conversation
…completer and null values
📦 Build Artifacts Ready
|
📦 Build Artifacts Ready
|
Withalion
reviewed
Jun 15, 2026
Comment on lines
+93
to
+94
| fontColor: __style.darkGreyColor | ||
| fontColorHover: __style.nightColor |
Contributor
There was a problem hiding this comment.
shouldn't the text be red?
Comment on lines
+80
to
+81
| fontColor: __style.darkGreyColor | ||
| fontColorHover: __style.nightColor |
Contributor
There was a problem hiding this comment.
shouldn't the text be red?
| for ( let i = 0; i < formsStack.depth; i++ ) { | ||
| let form = formsStack.get( i ) | ||
| form.featureLayerPair = __inputUtils.createFeatureLayerPair() | ||
| form.featureLayerPair = __inputUtils.createFeatureLayerPair |
Contributor
There was a problem hiding this comment.
We are passing reference to the function here, that doesn't seem right
| return; | ||
| } | ||
|
|
||
| CoreUtils::log( u"Sync Manager"_s, u"Requested download of project %2"_s.arg( project.mergin.projectName ) ); |
Contributor
There was a problem hiding this comment.
Suggested change
| CoreUtils::log( u"Sync Manager"_s, u"Requested download of project %2"_s.arg( project.mergin.projectName ) ); | |
| CoreUtils::log( QStringLiteral( "Sync Manager" ), QStringLiteral( "Requested download of project %2" ).arg( project.mergin.projectName ) ); |
| return; | ||
| } | ||
|
|
||
| CoreUtils::log( u"Sync Manager"_s, u"Requested %1 sync of project %2"_s.arg( requestOrigin == SyncOptions::ManualRequest ? "manual" : "automatic" ).arg( project.projectName ) ); |
| } | ||
| } | ||
|
|
||
| return QStringList() << qgsValue.toString(); |
Contributor
There was a problem hiding this comment.
Suggested change
| return QStringList() << qgsValue.toString(); | |
| return { qgsValue.toString() }; |
Comment on lines
+139
to
+148
| if ( keyFieldDef.isNumeric() ) | ||
| { | ||
| bool ok = false; | ||
| const qlonglong numVal = k.toLongLong( &ok ); | ||
| if ( ok ) | ||
| { | ||
| typedKey = QVariant( numVal ); | ||
| } | ||
| } | ||
| quotedKeys << QgsExpression::quotedValue( typedKey ); |
Contributor
There was a problem hiding this comment.
So we convert string -> number -> string?
Comment on lines
+47
to
+62
| /** | ||
| * Parses a QGIS value-relation wire value into a list of key strings. | ||
| * allowMulti=true → "{1,2,3}" becomes ["1","2","3"] | ||
| * allowMulti=false → "1" becomes ["1"] | ||
| * An empty or null input always returns an empty list. | ||
| */ | ||
| Q_INVOKABLE QStringList qgisFormatToArray( const QVariant &qgsValue ) const; | ||
|
|
||
| /** | ||
| * Formats a list of key strings into the QGIS wire value "{k1,k2,...}". | ||
| * allowMulti=true → "["1","2","3"]" becomes ["1","2","3"] | ||
| * allowMulti=true → "["1"]" becomes "1" | ||
| * allowMulti=false → "1" becomes "1" | ||
| * An empty list produces "". | ||
| */ | ||
| Q_INVOKABLE QString arrayToQgisFormat( const QStringList &keys ) const; |
Contributor
There was a problem hiding this comment.
I still think these should be just static utility functions, not tied to the class
Comment on lines
335
to
+336
| qmlRegisterType< ValueRelationFeaturesModel >( "mm", 1, 0, "ValueRelationFeaturesModel" ); | ||
| qmlRegisterType< ValueRelationController >( "mm", 1, 0, "ValueRelationController" ); |
Contributor
There was a problem hiding this comment.
Suggested change
| qmlRegisterType< ValueRelationFeaturesModel >( "mm", 1, 0, "ValueRelationFeaturesModel" ); | |
| qmlRegisterType< ValueRelationController >( "mm", 1, 0, "ValueRelationController" ); |
Let's do it the declarative way, by using QML_ELEMENT
| #include "qgsexpressioncontextutils.h" | ||
| #include "qgsvectorlayer.h" | ||
|
|
||
| using namespace Qt::Literals; |
Withalion
changed the title
Coverage Report for CI Build 27562718106Warning No base build found for commit Coverage: 57.561%Details
Uncovered ChangesNo uncovered changes found. Coverage RegressionsRequires a base build to compare against. How to fix this → Coverage Stats
💛 - Coveralls |
📦 Build Artifacts Ready
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Introduces a new way of handling value relation editors. Improves performance and stability.
Changes:
ValueRelationControllerthat performs lookups fromkeytovalue, handles hot reload (filter expression) and conversions from/to QGIS format, e. g."{1,2,3}"to[1,2,3]Todos:
distance(@geometry, @current_geometry) <= 0.000135Other updates:
MMDrawerHeaderandMMListMultiselectDrawermultiselect drawer to make their API easier to useResolves #4255
Resolves #4497
Resolves #4443
Resolves #3297
Resolves #3737
Resolves #4508
Resolves #4505
Resolves #2148 (<- the only limitation is VR fields with filter expression)
Resolves (? needs to be tested) #4504