Commit graph

403 commits

Author SHA1 Message Date
Fabien Castan
85dd992927 [ui] Viewer2D: add MouseArea on zoom item
* reset zoom to fit image on left click
* right click menu
2020-03-10 12:11:31 +01:00
Fabien Castan
5f2cef7d9d [ui] ImageGallery: add button to reset thumbnails size to default value 2020-03-10 12:11:19 +01:00
Fabien Castan
089289beae [ui] add "New Pipeline" submenu 2020-03-10 12:11:13 +01:00
Fabien Castan
c9061f3fec [ui] Viewer2D: improve toolbar alignment/spacing
Conflicts:
	meshroom/ui/qml/Viewer/Viewer2D.qml
2020-03-10 12:10:56 +01:00
Fabien Castan
f34397c170 [ui] GraphEditor: more visible refresh nodes status button 2020-03-10 12:09:37 +01:00
Fabien Castan
7d0f1ec05f [ui] fix warnings for undefined _reconstruction.graph 2020-03-10 12:09:13 +01:00
Fabien Castan
eae0f4b1f4 [ui] Viewer2D: if imageType is disabled switch back to "image" type 2020-03-10 12:09:04 +01:00
Fabien Castan
540c0d1744 [ui] Viewer2D: minor adjustments
* more explicit variable name for hdrImageToolbar
* adjust padding, so the viewer2D.bottomToolbar is aligned with the
ImageGallery toolbar
* update tooltip for HDR image viewer
2020-03-10 12:08:56 +01:00
Fabien Castan
d70c625fac [ui] Viewer2D: refactoring to simplify layouts
* fix mousearea order
* add alpha backgroud
* move HDR as a tool button

Conflicts:
	meshroom/ui/qml/Viewer/CircleGizmo.qml
	meshroom/ui/qml/Viewer/Viewer2D.qml
2020-03-10 12:08:14 +01:00
Fabien Castan
c9c24b7ff0 [ui] Viewer2D: avoid error on empty metadata 2020-03-10 12:02:48 +01:00
Fabien Castan
ac82890461 [ui] Viewer2D: simplify naming
Conflicts:
	meshroom/ui/qml/Viewer/Viewer2D.qml
2020-03-10 12:02:09 +01:00
Fabien Castan
77fc562a1e [ui] AttributeEditor: improve display of long floating point values 2020-03-10 11:59:41 +01:00
Fabien Castan
a4b42b3347 [ui] Viewer2D: disable menu when the plugin is not available 2020-03-03 17:41:03 +01:00
Fabien Castan
69ca95a590 [ui] Viewer2D: update wording in menu to "HDR Image Viewer" 2020-03-03 17:40:12 +01:00
Fabien Castan
302aaabd60 [ui] Viewer2D: add color picker to floating point image toolbar 2020-03-03 11:07:19 +01:00
Grégoire De Lillo
7a2fca185b [ui] Viewer2D : Add a FloatImageViewer and an ImageToolbar
Use an ImageViewerWrapper to handle the `FloatImageViewer` or the standard one.
2020-02-28 12:34:19 +01:00
Grégoire De Lillo
d21ef2e333 [ui] Add ImageToolbar component 2020-02-28 12:34:19 +01:00
Grégoire De Lillo
7a93ff3d3a [ui] Add FloatImage component 2020-02-28 12:34:19 +01:00
Fabien Castan
80e3afd9a9 [ui] GraphEditor: node status layout adjustments 2020-01-27 17:57:56 +01:00
Fabien Castan
2705c89130 [ui] GraphEditor: single tab group + status table
- Use a single tab group for attributes, log, statistics, status
- Use a ListView with key/value to display the node status fields (instead of a file viewer)
2020-01-27 16:08:18 +01:00
Fabien Castan
9bcad1ca4a [ui] Viewer2D: minor warning fixes 2020-01-27 13:16:25 +01:00
Fabien Castan
18ab1d1793 [ui] Viewer: update min values 2020-01-27 13:16:25 +01:00
Fabien Castan
dabf19dae9 [ui] Viewer: use RowLayout instead of manual relative sizes 2020-01-27 13:16:24 +01:00
Fabien Castan
fcdb3721c3 [ui] Viewer: use flat combobox for better integration in the Viewer 2020-01-27 13:16:24 +01:00
Fabien Castan
9c70ce5693 remove trailing comments 2020-01-27 13:16:24 +01:00
Fabien Castan
8fd7071787 [ui] Viewer: use label for DepthMap node instead of name 2020-01-27 13:16:23 +01:00
Fabien Castan
c38f0c3fa3 [ui] minor qml warning fix 2020-01-27 13:16:23 +01:00
Fabien Castan
7bea135993 [ui] viewer: move depthmap to 3D to the right and remove "Map" from combobox 2020-01-27 13:16:22 +01:00
ChemicalXandco
5c279f3584 use Filepath.stringToUrl instead of "file:///"+ 2020-01-27 13:16:22 +01:00
ChemicalXandco
4ddd25fb73 use getImageFile function to set image source 2020-01-27 13:16:22 +01:00
ChemicalXandco
b2db142cc2 add button on 2D Viewer to view depth maps in the 3D Viewer 2020-01-27 13:16:21 +01:00
ChemicalXandco
5652770a42 add ComboBox to select depth map file 2020-01-27 13:16:21 +01:00
Yann Lanthony
97e18e02e1
[ui] Node: only display File attributes as Node attribute pins 2019-12-13 19:27:15 +01:00
Yann Lanthony
5a4384916e
[ui][3D] expose status on EnvironmentMapEntity
get loading status when env map is loading in 3D view
2019-12-13 17:17:03 +01:00
Yann Lanthony
63ffb20819
[ui][3D] add EnvironmentMapEntity to display equirectangular images
Load EXR files in the 3D viewport as environment maps mapped on a sphere "attached"  to the camera.
* improve exr loading strategy by considering depthmaps and env maps
* update to DepthMapEntity 2.1 (required to get the loading status)
2019-12-13 17:17:03 +01:00
Yann Lanthony
fbfb7d6143
[ui] try to display attributes in both 2D and 3D editors 2019-12-13 17:17:03 +01:00
Fabien Castan
dbcfce7c90
[ui] WorkspaceView: open images in the 2D Viewer from the Graph/NodeEditor
Double click on a node or an attribute with an image file to display it
in the 2D viewer.
2019-12-12 18:50:18 +01:00
Yann Lanthony
633b8c0e00
Merge remote-tracking branch 'origin/develop' into dev/syncCamera 2019-09-16 12:24:22 +02:00
Yann Lanthony
b9999c01eb
[ui] Update MaterialToolButton style
* flatten the button 
* color its icon when checked
2019-09-11 10:49:09 +02:00
Yann Lanthony
1c873508ef
[ui] Inspector3D: double click on media now sets node as "active"
To be consistent with the Graph Editor behavior, double clicking on a node sets it as the active node of its type. This, for example, enables to switch from one SfM to another from the media list.
2019-09-11 10:49:09 +02:00
Yann Lanthony
f870e252b4
[ui] Reconstruction: add 'setActiveNodeOfType' method
Helper method to set a node as the active one of its type.
2019-09-11 10:49:09 +02:00
Yann Lanthony
03e91bea49
[ui] Inspector3D: simplify handling of scene media items hovering
* add MouseArea at root of media
* use flow to display media info and avoid text clipping
2019-09-11 10:49:09 +02:00
Yann Lanthony
312b9f5e0b
[ui] Inspector3D: provide camera from Viewer3D 2019-09-11 10:09:27 +02:00
Yann Lanthony
2a3093b292
[ui] AlembicLoader: only select cameras on still left-clicks
don't trigger Camera selection if mouse has moved to rotate camera
2019-09-10 19:43:14 +02:00
Yann Lanthony
796517ccb1
[ui] AlembicLoader: use CuboidMesh extent to disable picking
Using an additional scale Transform changes Cuboid's size relatively to the Camera locator, which was unwanted.
2019-09-10 19:41:38 +02:00
Yann Lanthony
6e47235c9c
[ui] Viewer3D: don't display contextual menu on alt+right-click zoom
Only prompt right-click contextual menu when it was not used to zoom in the 3D view.
2019-09-10 19:37:54 +02:00
Yann Lanthony
8dce4fc72f
[ui] Viewer3D: add "Sync with Image Selection" camera mode
* Inspector
   * changed "SETTINGS" to "DISPLAY"
   * new "CAMERA" section: activate camera synchronization + control image overlay
* ImageOverlay: new component to display (undistorted) image on top of the 3D view
* ViewpointCamera: new component that sets up a Camera based on a Viewpoint internal parameter
* Viewer3D: additional ViewpointCamera to perform synchronization with image selection
* Viewer3DSettings: new properties related to camera synchronization mode
2019-09-10 19:33:55 +02:00
Yann Lanthony
774675bd65
[ui] Viewer3D: move Inspector3D outside Viewer3D
Inspector3D is not an overlay anymore to simplify 3D manipulations, by having view center at the center of the 3D view.
2019-09-10 19:28:14 +02:00
Fabien Castan
40c3430707 [ui] StatViewer: do not display uninitialied values 2019-09-10 18:56:23 +02:00
Fabien Castan
4cc78ad5ec [ui] StatViewer: more compatibility with previous "statistics" files
* compute max peak ram if no total ram info
* hide GPU chart if the file is from a previous version
2019-09-10 18:56:22 +02:00