Skip to content

Fix photo target dir when using expression #4373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Withalion wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix photo target dir when using expression #4373

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da8d3ed
Fix target dir for photos using QGIS expression
Withalion Mar 6, 2026
ac0dc85
Minor improvements
Withalion Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions app/qml/form/editors/MMFormPhotoEditor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ MMFormPhotoViewer {
return
}

let absolutePath = __inputUtils.getAbsolutePath( root._fieldValue, internal.prefixToRelativePath )
const absolutePath = __inputUtils.getAbsolutePath( root._fieldValue, internal.prefixToRelativePath )

if ( __inputUtils.fileExists( absolutePath ) ) {
root.photoState = "valid"
Expand All @@ -286,6 +286,7 @@ MMFormPhotoViewer {
* Called when clicked on the camera icon to capture an image.
*/
function capturePhoto() {
updateTargetDir()
if ( !__inputUtils.createDirectory( targetDir ) )
{
__inputUtils.log( "Capture photo", "Could not create directory " + targetDir );
Expand Down Expand Up @@ -315,6 +316,7 @@ MMFormPhotoViewer {
* Then "imageSelected" caught the signal, handles changes and sends signal "valueChanged".
*/
function chooseFromGallery() {
updateTargetDir()
if ( __androidUtils.isAndroid ) {
__androidUtils.callImagePicker( targetDir, root._fieldIndex )
}
Expand Down Expand Up @@ -350,14 +352,21 @@ MMFormPhotoViewer {
* Used for Android and desktop builds
*/
function imageSelected( imgPath ) {
let filename = __inputUtils.getFileName( imgPath )
updateTargetDir()
if ( !targetDir ) {
__inputUtils.log( "Select image", "Failed to resolve target dir for new image" )
__notificationModel.addError( qsTr( "Failed to process the image, photo directory resolving failed" ) )
return
}

const filename = __inputUtils.getFileName( imgPath )

//! final absolute location of an image.
let absolutePath = __inputUtils.getAbsolutePath( filename, targetDir )
const absolutePath = __inputUtils.getAbsolutePath( filename, targetDir )

if ( !__inputUtils.fileExists( absolutePath ) ) { // we need to copy it!

let success = __inputUtils.copyFile( imgPath, absolutePath )
const success = __inputUtils.copyFile( imgPath, absolutePath )

if ( !success ) {
__inputUtils.log( "Select image", "Failed to copy image file to " + absolutePath )
Expand All @@ -377,7 +386,7 @@ MMFormPhotoViewer {
function imageCaptured( imgPath ) {
if ( imgPath ) {

let prefixPath = prefixToRelativePath.endsWith("/") ? prefixToRelativePath : prefixToRelativePath + "/"
const prefixPath = prefixToRelativePath.endsWith("/") ? prefixToRelativePath : prefixToRelativePath + "/"

confirmImage( prefixPath, imgPath )
}
Expand All @@ -394,13 +403,21 @@ MMFormPhotoViewer {
function confirmImage( prefixToRelativePath, imgPath ) {
if ( imgPath ) {
__inputUtils.rescaleImage( imgPath, __activeProject.qgsProject )
let newImgPath = __inputUtils.getRelativePath( imgPath, prefixToRelativePath )
const newImgPath = __inputUtils.getRelativePath( imgPath, prefixToRelativePath )

root.editorValueChanged( newImgPath, newImgPath === "" || newImgPath === null )
if ( photoSketchingLoader.active ) {
sketchingController.prepareController()
}
}
}

/**
* Function updates the targetDir property with a new value. Necessary when the photo field uses QGIS expression,
* which references another field in the same form, to save photos in certain directory.
*/
function updateTargetDir() {
targetDir = __inputUtils.resolveTargetDir( root._fieldHomePath, root._fieldConfig, root._fieldFeatureLayerPair, root._fieldActiveProject )
}
}
}
Loading