3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-05-31 09:56:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

[Panorama Viewer] Use msfmData to load images

Browse source
This commit is contained in:
Nils Landrodie 2021-07-26 19:57:27 +02:00 • committed by Fabien Castan
parent 223a389748
commit c4cb893b0a
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
meshroom/ui/qml/Viewer/PanoramaViewer.qml
View file

@ -246,6 +246,9 @@ AliceVision.PanoramaViewer {
loading = true; loading = true;
var idViewItem = msfmData.viewsIds[index]
var sourceItem = msfmData.getUrlFromViewId(idViewItem)
setSource("FloatImage.qml", { setSource("FloatImage.qml", {
'surface.viewerType': AliceVision.Surface.EViewerType.PANORAMA, 'surface.viewerType': AliceVision.Surface.EViewerType.PANORAMA,
'viewerTypeString': 'panorama', 'viewerTypeString': 'panorama',
@ -254,12 +257,12 @@ AliceVision.PanoramaViewer {
'surface.yaw': Qt.binding(function() { return root.yaw; }), 'surface.yaw': Qt.binding(function() { return root.yaw; }),
'surface.roll': Qt.binding(function() { return root.roll; }), 'surface.roll': Qt.binding(function() { return root.roll; }),
'index' : index, 'index' : index,
'idView': Qt.binding(function() { return cId; }), 'idView': Qt.binding(function() { return idViewItem; }),
'gamma': Qt.binding(function() { return hdrImageToolbar.gammaValue; }), 'gamma': Qt.binding(function() { return hdrImageToolbar.gammaValue; }),
'gain': Qt.binding(function() { return hdrImageToolbar.gainValue; }), 'gain': Qt.binding(function() { return hdrImageToolbar.gainValue; }),
'channelModeString': Qt.binding(function() { return hdrImageToolbar.channelModeValue; }), 'channelModeString': Qt.binding(function() { return hdrImageToolbar.channelModeValue; }),
'downscaleLevel' : Qt.binding(function() { return downscale; }), 'downscaleLevel' : Qt.binding(function() { return downscale; }),
'source': Qt.binding(function() { return cSource; }), 'source': Qt.binding(function() { return sourceItem; }),
'surface.msfmData': Qt.binding(function() { return root.msfmData }), 'surface.msfmData': Qt.binding(function() { return root.msfmData }),
'sfmRequired': true, 'sfmRequired': true,
'canBeHovered': true 'canBeHovered': true
@ -286,10 +289,10 @@ AliceVision.PanoramaViewer {
//We receive the map<ImgPath, idView> from C++ //We receive the map<ImgPath, idView> from C++
//Resetting arrays to avoid problem with push //Resetting arrays to avoid problem with push
for (var path in imagesData) { // for (var path in imagesData) {
root.pathList.push(path) // root.pathList.push(path)
root.idList.push(imagesData[path]) // root.idList.push(imagesData[path])
} // }
//Changing the repeater model (number of elements) //Changing the repeater model (number of elements)
panoImages.updateRepeater() panoImages.updateRepeater()
@ -303,10 +306,10 @@ AliceVision.PanoramaViewer {
} }
function updateRepeater() { function updateRepeater() {
if(repeater.model !== root.pathList.length){ if(repeater.model !== root.msfmData.viewsIds.length){
repeater.model = 0; repeater.model = 0;
} }
repeater.model = root.pathList.length; repeater.model = root.msfmData.viewsIds.length;
} }
} }