3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-05-16 10:36:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

[Lens Distorsion] Renaming PanoramaViewer into Lens Distorsion

Browse source
This commit is contained in:
Landrodie 2021-01-13 18:31:28 +01:00 • committed by Fabien Castan
parent 5e7f4faab2
commit cd97601fc3
4 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

0
meshroom/ui/qml/Viewer/PanoramaImageToolbar.qml → meshroom/ui/qml/Viewer/LensDistorsionToolbar.qml
View file

0
meshroom/ui/qml/Viewer/PanoramaViewer.qml → meshroom/ui/qml/Viewer/LensDistorsionViewer.qml
View file

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

@ -15,7 +15,7 @@ FocusScope {
property Component floatViewerComp: Qt.createComponent("FloatImage.qml") property Component floatViewerComp: Qt.createComponent("FloatImage.qml")
property alias useFloatImageViewer: displayHDR.checked property alias useFloatImageViewer: displayHDR.checked
property alias usePanoramaImageViewer: displayPanoramaViewer.checked property alias useLensDistorsionViewer: displayLensDistorsionViewer.checked
Loader { Loader {
id: aliceVisionPluginLoader id: aliceVisionPluginLoader
@ -183,10 +183,10 @@ FocusScope {
} }
} }
PanoramaImageToolbar { LensDistorsionToolbar {
id: panoramaImageToolbar id: lensDistorsionImageToolbar
anchors.margins: 0 anchors.margins: 0
visible: displayPanoramaToolBarAction.checked && displayPanoramaToolBarAction.enabled visible: displayLensDistorsionToolBarAction.checked && displayLensDistorsionToolBarAction.enabled
Layout.fillWidth: true Layout.fillWidth: true
} }
@ -215,7 +215,7 @@ FocusScope {
// qtAliceVision Image Viewer // qtAliceVision Image Viewer
Loader { Loader {
id: floatImageViewerLoader id: floatImageViewerLoader
active: root.aliceVisionPluginAvailable && root.useFloatImageViewer && !panoramaViewerLoader.active active: root.aliceVisionPluginAvailable && root.useFloatImageViewer && !lensDistortionViewerLoader.active
visible: (floatImageViewerLoader.status === Loader.Ready) visible: (floatImageViewerLoader.status === Loader.Ready)
anchors.centerIn: parent anchors.centerIn: parent
@ -240,9 +240,9 @@ FocusScope {
// qtAliceVision Panorama Viewer // qtAliceVision Panorama Viewer
Loader { Loader {
id: panoramaViewerLoader id: lensDistorsionViewerLoader
active: root.aliceVisionPluginAvailable && root.usePanoramaImageViewer && !floatImageViewerLoader.active active: root.aliceVisionPluginAvailable && root.useLensDistorsionViewer && !floatImageViewerLoader.active
visible: (panoramaViewerLoader.status === Loader.Ready) visible: (lensDistorsionViewerLoader.status === Loader.Ready)
anchors.centerIn: parent anchors.centerIn: parent
onActiveChanged: { onActiveChanged: {
@ -250,15 +250,15 @@ FocusScope {
// instantiate and initialize a FeaturesViewer component dynamically using Loader.setSource // instantiate and initialize a FeaturesViewer component dynamically using Loader.setSource
// Note: It does not work to use previously created component, so we re-create it with setSource. // Note: It does not work to use previously created component, so we re-create it with setSource.
// floatViewerComp.createObject(floatImageViewerLoader, { // floatViewerComp.createObject(floatImageViewerLoader, {
setSource("PanoramaViewer.qml", { setSource("LensDistorsionViewer.qml", {
'source': Qt.binding(function() { return getImageFile(imageType.type); }), 'source': Qt.binding(function() { return getImageFile(imageType.type); }),
'gamma': Qt.binding(function() { return panoramaImageToolbar.gammaValue; }), 'gamma': Qt.binding(function() { return lensDistorsionImageToolbar.gammaValue; }),
'gain': Qt.binding(function() { return panoramaImageToolbar.gainValue; }), 'gain': Qt.binding(function() { return lensDistorsionImageToolbar.gainValue; }),
'channelModeString': Qt.binding(function() { return panoramaImageToolbar.channelModeValue; }), 'channelModeString': Qt.binding(function() { return lensDistorsionImageToolbar.channelModeValue; }),
'isCtrlPointsDisplayed' : Qt.binding(function(){ return panoramaImageToolbar.displayPoints;}), 'isCtrlPointsDisplayed' : Qt.binding(function(){ return lensDistorsionImageToolbar.displayPoints;}),
'isGridDisplayed' : Qt.binding(function(){ return panoramaImageToolbar.displayGrid;}), 'isGridDisplayed' : Qt.binding(function(){ return lensDistorsionImageToolbar.displayGrid;}),
'gridOpacity' : Qt.binding(function(){ return panoramaImageToolbar.opacityValue;}), 'gridOpacity' : Qt.binding(function(){ return lensDistorsionImageToolbar.opacityValue;}),
'gridColor' : Qt.binding(function(){ return panoramaImageToolbar.color;}), 'gridColor' : Qt.binding(function(){ return lensDistorsionImageToolbar.color;}),
}) })
} else { } else {
// Force the unload (instead of using Component.onCompleted to load it once and for all) is necessary since Qt 5.14 // Force the unload (instead of using Component.onCompleted to load it once and for all) is necessary since Qt 5.14
@ -270,7 +270,7 @@ FocusScope {
// Simple QML Image Viewer (using Qt or qtOIIO to load images) // Simple QML Image Viewer (using Qt or qtOIIO to load images)
Loader { Loader {
id: qtImageViewerLoader id: qtImageViewerLoader
active: !floatImageViewerLoader.active && !panoramaViewerLoader.active active: !floatImageViewerLoader.active && !lensDistorsionViewerLoader.active
anchors.centerIn: parent anchors.centerIn: parent
sourceComponent: Image { sourceComponent: Image {
id: qtImageViewer id: qtImageViewer
@ -306,8 +306,8 @@ FocusScope {
//qtImageViewerLoader.active ? qtImageViewerLoader.item : floatImageViewerLoader.item //qtImageViewerLoader.active ? qtImageViewerLoader.item : floatImageViewerLoader.item
if (floatImageViewerLoader.active) if (floatImageViewerLoader.active)
floatImageViewerLoader.item floatImageViewerLoader.item
else if (panoramaViewerLoader.active) else if (lensDistorsionViewerLoader.active)
panoramaViewerLoader.item lensDistorsionViewerLoader.item
else else
qtImageViewerLoader.item qtImageViewerLoader.item
} }
@ -744,8 +744,8 @@ FocusScope {
enabled: root.aliceVisionPluginAvailable enabled: root.aliceVisionPluginAvailable
} }
MaterialToolButton { MaterialToolButton {
id: displayPanoramaViewer id: displayLensDistorsionViewer
ToolTip.text: "Panorama Viewer" ToolTip.text: "Lens Distorsion Viewer"
text: MaterialIcons.panorama_horizontal text: MaterialIcons.panorama_horizontal
font.pointSize: 16 font.pointSize: 16
padding: 0 padding: 0

6
meshroom/ui/qml/WorkspaceView.qml
View file

@ -106,11 +106,11 @@ Item {
enabled: viewer2D.useFloatImageViewer enabled: viewer2D.useFloatImageViewer
} }
Action { Action {
id: displayPanoramaToolBarAction id: displayLensDistorsionToolBarAction
text: "Display Panorama Toolbar" text: "Display Lens Distorsion Toolbar"
checkable: true checkable: true
checked: true checked: true
enabled: viewer2D.usePanoramaImageViewer enabled: viewer2D.useLensDistorsionViewer
} }
Action { Action {
id: displayImagePathAction id: displayImagePathAction