Commit graph

59 commits

Author SHA1 Message Date
Fabien Castan
b14129a6c2 [qml] update import QtQuick to 2.15 2020-08-03 21:21:48 +02:00
Fabien Castan
5ed9de5e4e [ui] improve check if plugins are available and fix load/unload of tracks/sfmData 2020-07-25 18:30:22 +02:00
Fabien Castan
ec67c772fa [ui] new generic way to manage "active" nodes per node type 2020-07-07 22:05:53 +02:00
Fabien Castan
202c1db5ff [ui] Viewer: fix error when the image is not yet defined 2020-06-28 19:22:10 +02:00
Fabien Castan
0f07dfe482 [ui] Viewer: fix Node.isComputed is a property 2020-06-28 17:39:50 +02:00
Fabien Castan
9e03f67c9b [ui] Viewer2D: bug fix, node.isComputed is a property and no more a slot 2020-06-25 01:06:52 +02:00
Fabien Castan
c214b48aa5 [core] fix Node.isComputed property 2020-06-23 14:25:50 +02:00
Fabien Castan
451f5d65c0 Merge branch 'develop' of https://github.com/alicevision/meshroom into dev/panoramaFisheye
Conflicts:
	meshroom/ui/app.py
2020-06-22 17:04:24 +02:00
ChemicalXandco
04a15ee687 remove unnecessary warnings 2020-06-11 12:47:04 +01:00
Fabien Castan
90c480af21 Merge branch 'develop' of https://github.com/alicevision/meshroom into dev/panoramaFisheye
Conflicts:
	meshroom/ui/qml/Viewer/FeaturesInfoOverlay.qml
	meshroom/ui/qml/Viewer/Viewer2D.qml
2020-06-01 14:38:30 +02:00
Theo
3333a0ba5f [ui] Viewer2D: fix update of SfmData and Tracks 2020-05-14 20:24:30 +02:00
Theo
4f5a2eda6f [ui] Viewer2D: expose loading status on Image Viewer Panel 2020-05-14 14:07:23 +02:00
Theo
bb267ee801 [ui] Stats: use mTracks 2020-05-14 14:06:32 +02:00
Theo
5938b4f004 [ui] Viewer2D: load tracks/sfmData only when used 2020-05-14 14:05:18 +02:00
Theo
47f1743edc [ui] Viewer: new option to display tracks 2020-04-29 20:25:46 +02:00
Fabien Castan
07d78f9161 [ui] Features display with Qt >= 5.14 2020-04-29 20:25:46 +02:00
Theo
150e142f92 wip [ui] display global stats from sfm: residuals,landmarks per view 2020-04-29 20:25:46 +02:00
Theo
f07b959a2b [ui] New SfMStatsView 2020-04-29 20:25:46 +02:00
Fabien Castan
f19797c58f [ui] Viewer2D: fix Circle Viewer when image has an orientation 2020-03-24 16:03:01 +01:00
Fabien Castan
bb60c9b78d [ui] Add visualisation for automatically detected fisheye circle 2020-03-23 19:25:57 +01:00
Fabien Castan
b98c1e57ed [ui] Viewer2D: fisheye circle is enabled only when the option is activated 2020-03-20 17:59:32 +01:00
Fabien Castan
e88651ba01 [ui] Viewer2D: allow to change the size of the Fisheye circle with Ctrl+Wheel
* also add forceActiveFocus() to release other focus areas
2020-03-18 20:23:37 +01:00
Fabien Castan
9843b29670 [ui] Viewer2D: ensure that featureViewerLoader is ready
FeaturesInfoOverlay relies on the FeatureViewer, so we ensure that it is loaded first.
2020-03-17 19:58:17 +01:00
Fabien Castan
1b5ba3788e [ui] force unload of features & hdr viewers
This is necessary since version 5.14 of Qt, otherwise the model is not updated and remains empty.
2020-03-17 19:55:11 +01:00
Fabien Castan
dcf91c244e [nodes] PanoramaInit: fisheyeCenterOffset x/y are now 2 parameters on command line
Avoid error with negative values on "y" interpreted as a new argument
2020-03-11 12:14:09 +01:00
Grégoire De Lillo
042111671a [ui] Viewer2D: Add Fisheye Circle display on PanoramaInit node 2020-03-10 17:29:33 +01:00
Fabien Castan
1fb1304599 [ui] Viewer2D: rename ImageToolbar into HdrImageToolbar 2020-03-10 12:33:37 +01:00
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
c9061f3fec [ui] Viewer2D: improve toolbar alignment/spacing
Conflicts:
	meshroom/ui/qml/Viewer/Viewer2D.qml
2020-03-10 12:10:56 +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
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
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
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
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