Commit graph

67 commits

Author SHA1 Message Date
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
a4b42b3347 [ui] Viewer2D: disable menu when the plugin is not available 2020-03-03 17:41:03 +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
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
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
f5607cb127
[ui] downgrade QtQuick import version for retro-compatibility 2019-07-24 18:13:23 +02:00
Yann Lanthony
4563d32e3e
[ui] Viewer2D: add FeaturesViewer + dedicated overlay
Make FeaturesViewer available in Viewer2D to display the feature points of the current view, based on the current FeatureExtraction node.

* FeaturesInfoOverlay: overlay that displays info and provides controls over a FeaturesViewer component.
* ColorChart: color picker based on a set of predefined colors.
2019-07-04 18:25:02 +02:00
Yann Lanthony
8dd0a4be22
[ui] New FeaturesViewer component
FeaturesViewer wraps QtAliceVision plugin's FeaturesViewer component to display the extracted feature points of a View.
2019-07-04 17:51:44 +02:00
Yann Lanthony
b46a2dbba1 [ui] Controls: add SearchBar component + better keyboard focus handling
* use it in MetadataListView and GraphEditor 'add Node' menu
* GraphEditor: forward MenuItem key events to searchBar to be able to continue editing the filter even if it lost active focus
2019-01-07 16:48:17 +01:00
Yann Lanthony
7415c1d391 [ui] split 2D and 3D viewers into separate modules
+ remove historical MayaCameraController
2018-11-23 14:26:57 +01:00
Yann Lanthony
c0c28b5dcf [ui] Viewer3D: minor fixes
* remove unneeded hack to clear the SceneLoader
* don't display sfm checkbox if alembicPlugin is not available
2018-08-03 17:24:04 +02:00
Fabien Castan
44e34d7eb3 [ui] use shift to pan (instead of Ctrl) 2018-08-03 14:38:08 +02:00
Fabien Castan
10026e3281 [ui] mouse: add "Ctrl+Left click" as an alternative to Middle click 2018-07-21 14:54:28 +02:00
Yann Lanthony
2f2390e465 [ui] fix Palette propagation
* bugfix: in latest PySide2 versions, application palette is not properly applied to all QtQuick Controls 2 components. Force this by exposing QApplication palette and bind it to the root ApplicationWindow.
* rename all "palette" ids to "activePalette" to avoid clashes with "palette" property on QtQuick Controls 2
* use parent component palette when it makes sense to propagate active/disabled style (instead of always using Active SystemPalette)
2018-05-28 15:30:09 +02:00
Yann Lanthony
f87024b0c5 [ui] highlight selected view in 3D + 3D picking
Spawn a cube on each camera to display which one is selected + allow picking from the 3D view
2018-04-21 13:14:29 +02:00
Yann Lanthony
cfaa0bc012 [ui] Viewer2D: display image source path
* display selectable-by-mouse source filepath
* add radius property to FloatingPane to control border radius from outside
* use FloatingPane in ImageMetadataView
2018-04-16 12:14:04 +02:00
Yann Lanthony
1e462d94de [ui][3d] fix depthMap clearing
* must be fixed in qtOIIO plugin
2018-04-13 22:46:44 +02:00
Yann Lanthony
b64cfc856c [ui] ImageMetadataView: display image location on map when available 2018-04-13 19:29:30 +02:00
Yann Lanthony
472b860131 [ui] better handling of Reconstruction's current sfm node
* reset sfm node on graph change by using 'sfm' property (ensure previous sfm node is correctly disconnected)
* ui: clear viewers when graph changes
2018-04-06 14:24:45 +02:00
Yann Lanthony
11121039dc [ui] Viewer3D: reset polycount on source change 2018-04-05 22:00:20 +02:00
Yann Lanthony
a2dd3c22bd [ui][3D] tweak rotation/scale pane
* use a GridLayout
* reduce default sliders size
2018-03-23 11:23:47 +01:00
Yann Lanthony
35e89a3c9b [ui][3D] retrieve and display polycount after loading a scene
* use vertexPosition attribute buffer to determine the number of faces
* remove useless Qt.resolvedUrl()
2018-03-23 11:23:46 +01:00
Yann Lanthony
d4c0a4975a [ui] add "Controls" module to centralize common UI components
* add FloatingPane control + use it in Viewer3D
2018-03-23 11:17:11 +01:00
Yann Lanthony
74e80e70b5 [ui][3d] introduce Wireframe render mode
* add WireframeMaterial from Qt 3D example
* MaterialSwitcher now has 3 render modes: Solid, Wireframe, Textured
* Remove NodeInstantiator; always create the material and modify entity's components (avoid rendering issues when switching between materials)
* use DiffuseSpecularMaterial for Solid and Textured mode
* create a MaterialSwitcher for all types of meshes (with/without textures)
* add a render settings panel as part of 3D viewport overlay and remove "Textures" entry from outliner
2018-03-23 11:17:10 +01:00
Yann Lanthony
f1d4291219 [ui][3d] improve layout of mesh rotation/scale control 2018-03-21 17:24:19 +01:00
Yann Lanthony
9f39579e00 [ui][3d] reduce camera nearPlane
useful for close-up mesh inspection
2018-03-21 17:24:19 +01:00
Yann Lanthony
266f0985d2 [ui] convert string paths to urls outside Viewers
* fix external image drop on 2D Viewer
* fix 3D model loading from "Load Model" button
2018-03-21 15:53:34 +01:00
Yann Lanthony
f1b42acc14 [ui] add FilepathHelper Python class to manipulate paths and QUrls
* avoid non-cross platform hacks to convert string path to urls
* use standard python API
2018-03-06 15:32:33 +01:00
Yann Lanthony
2cdc83f06f [ui] add string <--> file representation convertors
* convenient methods to conform strings to Qt file reprensentation using the "file:/" protocol prefix
* use those methodes when manipulating files
2018-02-26 16:59:25 +01:00
Yann Lanthony
9501307256 [ui] MetadataView: move model delegate declatation in the ListView 2018-02-16 13:03:56 +01:00
Yann Lanthony
d2da971169 [ui] improve SortFilterDelegateModel
* use variant for filterValue and implement different logics to test filter matching based on value type
* allow redefinition of modelData and respectFilter functions to customize logic from outisde if need be
* add convenient 'reverseSortOrder' method
2018-02-16 13:02:18 +01:00
Yann Lanthony
53764812bd [ui] add ImageMetadataView + integration in Viewer2D
* display image metadata as a sorted table view with filtering  
* 2DViewer: new bottom toolbar with metadata toggle + image resolution
2018-02-15 16:10:25 +01:00
Yann Lanthony
6dec4c71c9 [ui][3D] fix error message at startup
use null instead of undefined as default Entity value for plugin-based viewers
2018-02-14 11:29:57 +01:00
Fabien Castan
2dceec447d Add 3D depth map viewer 2018-02-13 14:52:55 +01:00
Yann Lanthony
7da0bb16d0 [ui] 3D: improve scene lighting
attach a PointLight to the active camera to dynamically light the model
2018-02-01 15:24:37 +01:00