Show generated images in 2D viewer when double-clicking on node #1776

mugulmd · 2022-09-21T12:49:46Z

Description

When double-clicking on the PrepareDenseScene, DepthMap or DepthMapFilter node, the generated images (undistorted images, depth maps, sim maps) corresponding to the currently selected viewpoint will automatically appear in the 2D viewer.

This behaviour can be applied on other nodes that generate images with the following changes in the node description :

if it doesn't already exist, add an output File attribute
set its 'semantic' field to 'image'
set its value to a string describing the output image files, using the <VIEW_ID> macro to represent the corresponding viewId
(see DepthMap.py for an example).

Implementation remarks

Viewer2D.qml: the ComboBox doesn't represent an image type anymore but rather the selected output attribute name (corresponding to the images to be visualized)
Viewer2D.qml: we now hold a reference to the node being displayed
onCurrentItemChanged in WorkspaceView.qml has been replaced with onSelectedViewIdChanged in Viewer2D.qml as it removes a dependency between 2 UI elements with a more manageable dependency between backend and frontend

fabiencastan · 2022-09-22T18:11:53Z

meshroom/ui/qml/main.qml

+                    viewer2D.displayedNode = node;
+
+                    // 3D viewer
+                    for(var i=0; i < node.attributes.count; ++i)


could be good to add semantic for 3D too

I think we should make a separate issue to normalize the use of the semantic field (so we can anticipate problems that may appear on the long term before using this concept in too many places of the code), and at this point yep sure it'll be a good idea to add 3D to semantics. What do you think ?

fabiencastan · 2022-09-22T18:26:05Z

Need to adjust size for the combobox width:

fabiencastan · 2022-09-22T18:29:42Z

meshroom/nodes/aliceVision/DepthMap.py

+            name='depth',
+            label='Depth Maps',
+            description='Generated depth maps.',
+            semantic='image',


semantic=desc.Semantic.Image,

Same answer as above : #1776 (comment)

fabiencastan · 2022-09-22T18:30:53Z

Maybe add "panoramicImage" for PanoramaMerging output that can be loaded in 2D and 3D.

fabiencastan · 2022-09-22T18:34:15Z

Need to check that the node is computed to load it in the 2D viewer (or at least running?).

fabiencastan · 2022-09-22T18:38:58Z

If there is no param of image type to a node, it should not replace the last active node of the 2D Viewer.
For instance, loading the Meshing node in the 3D Viewer should not unload the active node of the 2D Viewer, same for FeatureMatching, etc.
But we also need a way to unload it to see the original images from the ImageGallery.

fabiencastan · 2022-09-22T18:43:02Z

Not specific to the PR, it's an historical problem: when changing the selection in the ImageGallery using the keyboard, it would be good to update the UI accordingly, as it's done when changing the selected image with the mouse.

cbentejac · 2022-09-23T13:14:30Z

If there is no param of image type to a node, it should not replace the last active node of the 2D Viewer. For instance, loading the Meshing node in the 3D Viewer should not unload the active node of the 2D Viewer, same for FeatureMatching, etc. But we also need a way to unload it to see the original images from the ImageGallery.

I am not sure of how we could make such a behaviour user-friendly...
Right now, if you want to switch to the images from the ImageGallery while something's already loaded, you have to unload the node (by "loading" another node that doesn't output images). If loading a node in the 3D viewer shouldn't unload the current 2D viewer node (unless it also has 2D ouputs), and we shouldn't replace it by a node that has no output, then what could unload it (and how)?
Maybe this could be avoided by adding a classic "image" choice in the combo box for nodes that can be loaded in the 2D viewer:

if no node has been loaded in the 2D viewer yet, then images from the ImageGallery are displayed as usual
if a node has been loaded in the 2D viewer (let's say a DepthMap node), then the user can chose to see the depth, sim or classic image from the ImageGallery with the combo box
if a node is loaded in the 3D viewer (with no 2D outputs) while another is already loaded in the 2D viewer, then it is correctly loaded in the 3D viewer and nothing happens in the 2D viewer (and the "image" choice in the combo box is still available to display the regular images)
if a node is loaded in the 2D viewer and another node that has no output is double-clicked, then nothing happens

The issue is that there won't be any way to unload a node without replacing it by another.

meshroom/ui/qml/Viewer/Viewer2D.qml

cbentejac · 2022-09-23T12:55:41Z

meshroom/ui/qml/Viewer/Viewer2D.qml

@@ -990,18 +1043,18 @@ FocusScope {
                        }

                        ComboBox {
-                            id: imageType
+                            id: outputAttribute
                            property var activeNode: root.oiioPluginAvailable ? _reconstruction.activeNodes.get('allDepthMap').node : null


You removed the "imageType" ID as well as references to it everywhere but at line 563. It generates a "Viewer2D.qml:563: ReferenceError: imageType is not defined" warning when Meshroom is started.

Good point sorry about that ^^

This raises a question though : this depthMapNodeName Label doesn't really make much sense now since we don't display just depth maps but any sequence of output images related to the viewpoints, and in addition users should be aware of what is being displayed since you actually need to double click a node to visualize it, so shouldn't we just remove that Label ?

It took me a little time to find where this label was displayed (I had to add the red background shown in the image below to find it...), but now that I see it, I think that it should definitely be kept but renamed on the QML side.
It is not specific to the depth maps anymore, but since it displays the name of the node that's currently loaded in the viewer, it is quite useful. Considering that double-clicking on a node might not necessarily change the node loaded in the 2D viewer, it's a good way to keep track of what's shown in there.

meshroom/ui/qml/main.qml

fabiencastan · 2022-09-23T22:31:03Z

The issue is that there won't be any way to unload a node without replacing it by another.

Yes, but IMH that's not a problem as long as we can still display the source image as you suggested.
BTW I have not double checked, if the behavior is fine if we remove the active node from the Graph.

fabiencastan · 2022-09-28T21:08:54Z

Detail: maybe good to add mask and weight to PanoramaWarping.

fabiencastan · 2022-09-28T21:11:04Z

We need to keep the capability to drag&drop external images into the 2D Viewer.

fabiencastan · 2022-09-28T21:13:16Z

In the combobox, use the Label instead of the technical name of the attribute to match the information displayed in the NodeEditor.

fabiencastan · 2022-09-28T21:30:39Z

Need to be able to load the node when we have chunks with mixed status:

fabiencastan · 2022-09-29T17:27:51Z

Double click on a node when already on "Gallery" should switch to the first element of the combobox again.
Currently it's doing if I am on DepthMap node, switch to gallery, then double clic on PrepareDenseScene.
But it's not doing it if I'm on DepthMap node and switch to DepthMapFilter node (as the list of output is the same.

BUT it's a good think that I can be on "Sim Maps" and switch between DepthMap node and DepthMapFilter node.

fabiencastan · 2022-09-29T17:29:54Z

Maybe rename "Gallery" as "Image Gallery" in the combo box.
And also update the label of the Image Gallery widget from "Images" to "Image Gallery".

fabiencastan · 2022-09-29T17:34:24Z

BTW could you update the labels of the output params of PanoramaMerging from "Output Folder" to "Panorama"?
And remove the "Output" prefix from all the labels (mainly in the Panorama pipeline).

fabiencastan · 2022-09-29T17:51:42Z

Maybe good also to add a close button at the right of the node name to remove it from the 2D Viewer:

mugulmd · 2022-09-30T12:21:44Z

Double click on a node when already on "Gallery" should switch to the first element of the combobox again. Currently it's doing if I am on DepthMap node, switch to gallery, then double clic on PrepareDenseScene. But it's not doing it if I'm on DepthMap node and switch to DepthMapFilter node (as the list of output is the same.

BUT it's a good think that I can be on "Sim Maps" and switch between DepthMap node and DepthMapFilter node.

So should we keep the current behavior or change to always re-initialize the ComboBox index when we change node ?

It seems like the current behavior can be useful for comparing the output of DepthMap and DepthMapFilter without clicking too many things, and it doesn't impact anything else, so maybe keep it (for now at least) ?

mugulmd · 2022-09-30T12:34:36Z

Maybe good also to add a close button at the right of the node name to remove it from the 2D Viewer:

There's already a menu item in the image viewer header to toggle on/off the visibility of the node name and image filepath, so that would be a bit redundant don't you think ?

cbentejac · 2022-10-04T07:40:42Z

There's already a menu item in the image viewer header to toggle on/off the visibility of the node name and image filepath, so that would be a bit redundant don't you think ?

I think the "close" button would unload the node from the viewer, not hide the node's name and path.

meshroom/nodes/aliceVision/LdrToHdrCalibration.py

…combo box when double clicking a node

…played node in 2D viewer to adapt UI

…eir output

mugulmd self-assigned this Sep 21, 2022

mugulmd requested a review from fabiencastan September 21, 2022 12:51

mugulmd marked this pull request as ready for review September 21, 2022 13:02

fabiencastan added this to the Meshroom 2022.1.0 milestone Sep 21, 2022

fabiencastan reviewed Sep 22, 2022

View reviewed changes

cbentejac reviewed Sep 23, 2022

View reviewed changes

fabiencastan approved these changes Oct 18, 2022

View reviewed changes

fabiencastan reviewed Oct 18, 2022

View reviewed changes

meshroom/nodes/aliceVision/LdrToHdrCalibration.py Outdated Show resolved Hide resolved

mugulmd added 3 commits October 19, 2022 09:50

added outputImageTypes in node desc to update the viewer2D imageType …

fc5ab54

…combo box when double clicking a node

use semantic field in file attributes to specify images and store dis…

a574c0f

…played node in 2D viewer to adapt UI

added some comments

b4f0b53

mugulmd and others added 26 commits October 19, 2022 09:50

[ui] adapt combobox width to contained attr names

e35c5a7

[ui] check node is computed or running before loading in viewer2D

592dc11

[ui] update selected view from grid when using keys

4e19cf4

[ui] ensure viewpoints are always accessible in 2D viewer using combobox

f1c6b48

[ui] only load in 2D viewer nodes that output images

f90942b

[ui] minor code cleanup

9de858e

[ui] fix outputAttribute.name property updating

b1a800d

[ui] replaced depthMapNodeName Label with displayedNodeName Label

f899e24

[ui] always enable outputAttribute ComboBox

44c0086

[ui] prevent loading image output attributes in 3D viewer

6b7d4d6

[ui] update outputAttributes when displayedNode is undefined

8abe45d

[ui] do nothing when double clicking attribute

400c68a

[ui] disable outputAttributes ComboBox when it is empty

a36abd9

[nodes] update desc for nodes in panoramaHDR pipeline to visualize th…

a94be6c

…eir output

[node] PanoramaWarping: add visualization for mask and weight maps

38b1caf

[ui] use label instead of name in outputAttribute ComboBox

c714495

[ui] only load nodes in Viewer2D when at least one chunk is finished

b91d0b3

[ui] fix drag and drop external images on Viewer2D

88e822a

[ui] coherent naming "Image Gallery" across app

91cc786

[node] output labels renaming without 'Output' prefix

a5fbbe7

[ui] always display at least "Image Gallery" in ComboBox

18b5f4b

[ui] button to clear node from 2d viewer

0496f0c

[ui] minor fix

72218ed

[ui] use tempCameraInit node to get viewpoints when it exists

426cdbe

[ui] fix metadata display bug

61a10a2

[nodes] LdrToHdrCalibration: fix trailing space in label

0424ae1

fcastan force-pushed the dev/lv/adapt2DViewerToNode branch from 4c01703 to 0424ae1 Compare October 19, 2022 08:56

fabiencastan merged commit 1f78158 into develop Oct 19, 2022

fabiencastan deleted the dev/lv/adapt2DViewerToNode branch October 19, 2022 14:16

cbentejac mentioned this pull request Jun 9, 2023

[ui] Display an icon on nodes that have viewable outputs #2047

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Show generated images in 2D viewer when double-clicking on node #1776

Show generated images in 2D viewer when double-clicking on node #1776

mugulmd commented Sep 21, 2022 •

edited

Loading

fabiencastan Sep 22, 2022

mugulmd Sep 23, 2022

fabiencastan commented Sep 22, 2022

fabiencastan Sep 22, 2022

mugulmd Sep 23, 2022

fabiencastan commented Sep 22, 2022

fabiencastan commented Sep 22, 2022 •

edited

Loading

fabiencastan commented Sep 22, 2022 •

edited

Loading

fabiencastan commented Sep 22, 2022

cbentejac commented Sep 23, 2022

cbentejac Sep 23, 2022

mugulmd Sep 23, 2022

cbentejac Sep 26, 2022

fabiencastan commented Sep 23, 2022

fabiencastan commented Sep 28, 2022

fabiencastan commented Sep 28, 2022

fabiencastan commented Sep 28, 2022

fabiencastan commented Sep 28, 2022

fabiencastan commented Sep 29, 2022

fabiencastan commented Sep 29, 2022

fabiencastan commented Sep 29, 2022 •

edited

Loading

fabiencastan commented Sep 29, 2022

mugulmd commented Sep 30, 2022

mugulmd commented Sep 30, 2022

cbentejac commented Oct 4, 2022 •

edited

Loading

Show generated images in 2D viewer when double-clicking on node #1776

Show generated images in 2D viewer when double-clicking on node #1776

Conversation

mugulmd commented Sep 21, 2022 • edited Loading

Description

Implementation remarks

fabiencastan Sep 22, 2022

Choose a reason for hiding this comment

mugulmd Sep 23, 2022

Choose a reason for hiding this comment

fabiencastan commented Sep 22, 2022

fabiencastan Sep 22, 2022

Choose a reason for hiding this comment

mugulmd Sep 23, 2022

Choose a reason for hiding this comment

fabiencastan commented Sep 22, 2022

fabiencastan commented Sep 22, 2022 • edited Loading

fabiencastan commented Sep 22, 2022 • edited Loading

fabiencastan commented Sep 22, 2022

cbentejac commented Sep 23, 2022

cbentejac Sep 23, 2022

Choose a reason for hiding this comment

mugulmd Sep 23, 2022

Choose a reason for hiding this comment

cbentejac Sep 26, 2022

Choose a reason for hiding this comment

fabiencastan commented Sep 23, 2022

fabiencastan commented Sep 28, 2022

fabiencastan commented Sep 28, 2022

fabiencastan commented Sep 28, 2022

fabiencastan commented Sep 28, 2022

fabiencastan commented Sep 29, 2022

fabiencastan commented Sep 29, 2022

fabiencastan commented Sep 29, 2022 • edited Loading

fabiencastan commented Sep 29, 2022

mugulmd commented Sep 30, 2022

mugulmd commented Sep 30, 2022

cbentejac commented Oct 4, 2022 • edited Loading

mugulmd commented Sep 21, 2022 •

edited

Loading

fabiencastan commented Sep 22, 2022 •

edited

Loading

fabiencastan commented Sep 22, 2022 •

edited

Loading

fabiencastan commented Sep 29, 2022 •

edited

Loading

cbentejac commented Oct 4, 2022 •

edited

Loading