3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-01 15:58:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

[ui] FloatImageViewer: compute target size

Browse source
This commit is contained in:
Loïc Vital 2023-08-08 17:07:59 +02:00
parent 516585c78f
commit 9aab7b2b57
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
meshroom/ui/qml/Viewer/Viewer2D.qml
View file

@ -151,8 +151,6 @@ FocusScope {
// make sure the image is ready for use
if(!imgContainer.image)
return;
if(imgContainer.image.status !== Image.Ready)
return;
// for Exif orientation tags 5 to 8, a 90 degrees rotation is applied
// therefore image dimensions must be inverted
@ -453,7 +451,7 @@ FocusScope {
* group has already been auto-fitted. If we change the group of images (when another project is
* opened, for example, and the images have a different size), then another auto-fit needs to be
* performed */
if ((!fittedOnce && imgContainer.image && imgContainer.image.status === Image.Ready && imgContainer.image.height > 0) ||
if ((!fittedOnce && imgContainer.image && imgContainer.image.height > 0) ||
(fittedOnce && ((width > 1 && previousWidth != width) || (height > 1 && previousHeight != height)))) {
fit();
fittedOnce = true;
@ -483,7 +481,8 @@ FocusScope {
'idView': Qt.binding(function() { return (_reconstruction ? _reconstruction.selectedViewId : -1); }),
'cropFisheye': false,
'sequence': Qt.binding(function() { return ((root.enableSequencePlayer && _reconstruction && _reconstruction.viewpoints.count > 0) ? getSequence() : []); }),
'useSequence': Qt.binding(function() { return root.enableSequencePlayer && !useExternal && _reconstruction; })
'targetSize': Qt.binding(function() { return imgLayout.width * imgContainer.scale; }),
'useSequence': Qt.binding(function() { return root.enableSequencePlayer && !useExternal && _reconstruction; }),
})
} else {
// Force the unload (instead of using Component.onCompleted to load it once and for all) is necessary since Qt 5.14