Commit graph

1006 commits

Author SHA1 Message Date
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
Fabien Castan
7118c9489d Merge branch 'develop' into dev/imagesImport 2019-11-01 15:50:59 +01:00
Fabien Castan
2696a7054b [nodes] new SfMTransfer node to retrieve poses and intrinsics from another reconstruction with matching views 2019-09-26 14:50:26 +02:00
Fabien Castan
3dc6dea6c5 [nodes] SfMAlignment: support multiple methods: views ids, pose ids, filepath pattern, specific metadata, markers ids 2019-09-26 14:50:25 +02:00
Fabien Castan
5decc2facd [nodes] SfMTransform: new option to align on markers 2019-09-26 14:50:24 +02:00
Fabien Castan
7950b9f36b
Merge pull request #632 from alicevision/dev/commandline_args
Improve command line arguments
2019-09-26 14:42:17 +02:00
Fabien Castan
9a473ad7c4 [bin] meshroom_photogrammetry: add --inputRecursive 2019-09-26 11:35:08 +02:00
Fabien Castan
ce6dcbae4d [ui] simplify meshroom command line rules 2019-09-25 21:12:46 +02:00
Fabien Castan
a53940d29f [core] graph: variable rename 2019-09-25 21:07:28 +02:00
Fabien Castan
73afe38562
[nodes] FeatureExtraction: define "maxThreads" as an advanced param 2019-09-23 12:19:21 +02:00
Fabien Castan
06543f89a9 [core] use more explicit argument name: setupFileRef 2019-09-21 18:19:17 +02:00
Fabien Castan
fa7b4587ca [ui] meshroom: improve import command line arguments
-  explicit error messages
-  allow to combine multiple inputs with new --import and --importRecursive options
2019-09-21 18:04:26 +02:00
Fabien Castan
22d3e271b3 [nodes] FeatureExtraction: add maxThreads argument 2019-09-21 16:47:22 +02:00
Yann Lanthony
ae91f3bcd5
[reconstruction] ViewpointWrapper: fix uvCenterOffset for rotated images
correctly apply image transformation to principal point correction in uv coordinates.
2019-09-19 12:50:48 +02:00
Yann Lanthony
633b8c0e00
Merge remote-tracking branch 'origin/develop' into dev/syncCamera 2019-09-16 12:24:22 +02:00
Fabien Castan
37a8d20804
Merge pull request #584 from pramukta/unknown-feature-tag
Add option to include 'unknown' feature types in ConvertSfMFormat
2019-09-15 23:52:21 +02:00
Fabien Castan
a712613bd2 [ui] Add an error popup when there is no supported image to import and when the import failed 2019-09-14 16:06:45 +02:00
Fabien Castan
645d239333 [nodes] CameraInit: minor variable rename 2019-09-14 16:05:36 +02:00
Fabien Castan
ff28f1f045 Add ".dng" as supported extension 2019-09-14 15:34:53 +02:00
Fabien Castan
979ee4ba94 [bin] meshroom_photogrammetry: setup cache folder according to --save path
except if --cache is set explicitly
2019-09-12 21:36:36 +02:00
Fabien Castan
ee2fc63bd5 [multiview] use a single GraphModification when creating the default photogrammetry pipeline 2019-09-12 21:20:00 +02:00
Fabien Castan
ad9a2153c5 [core] use logging for plugins loaded message 2019-09-12 21:18:11 +02:00
Fabien Castan
231125efdf [ui] improve meshroom command line
- "meshroom -h / --help": now provides command line documentation (so
argparse is done before GUI creation)
- new positional argument to set project file or input folder
- new "--pipeline" option to set a default pipeline, also support an
environment variable
2019-09-12 21:14:52 +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
6c7523243a [core] stats: no processing in ComputerStatistics constructor
ComputerStatistics is instanciated for each NodeChunk, so any
computation here takes time. Instead we initialize the values on the
first update().
2019-09-10 18:56:24 +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
Fabien Castan
8c62437a68 [core] stats: use cElementTree on python 2 2019-09-10 18:56:20 +02:00
Yann Lanthony
94993d1212
[reconstruction] introduce ViewpointWrapper
* new class that wraps an input image (Viewpoint) in the context of a Reconstruction
* exposes properties to access image and camera data
2019-09-10 18:38:17 +02:00
Yann Lanthony
d46ed62b05
[reconstruction] add prepareDenseScene property
keep reference to active prepareDenseScene to be able to compose paths to undistorted images
2019-09-10 18:34:39 +02:00
Yann Lanthony
c7a55e56b7
[reconstruction] retrieve and expose solved intrinsics
* [nodes] SfM: make more generic method to get SfM results and return solved intrinsics in addition to views and poses
* [reconstruction] store and expose solved intrinsics by viewpoints
2019-09-10 18:23:35 +02:00
Fabien Castan
8f630d5c09 [ui] StatViewer: compatibility with previous "statistics" files 2019-09-10 17:52:37 +02:00
Fabien Castan
4d7ea32721 [core] stats bugfix: do not rely the ordering of the json entries
* do not rely on the ordering of the json entries, as it can vary from
one version to another.
* ensure variables are always initialized (even in case of exception)
* add some debug logging on errors in nvidia-smi parsing
2019-09-10 12:19:40 +02:00
Fabien Castan
dbeab285cf Merge branch 'develop' of github.com:alicevision/meshroom into dev/stats 2019-09-10 09:20:00 +02:00
Fabien Castan
9d8e3648b2 [core] submitters: if there is only one submitter, use it!
More explicit error messages when the submitter is not found.
2019-08-21 21:48:03 +02:00
Fabien Castan
3e483ea139 [release] Update multiview pipeline version to 2.2 2019-08-14 15:23:11 +02:00
Yann Lanthony
1fce38a128 [release] Update Meshroom version to 2019.2.0 2019-08-12 19:10:27 +02:00
Yann Lanthony
606cfc39c2
[ui] Viewer3D: fix Alembic visibility issues
Binding the "enabled" property of AlembicLoader's ObjectPicker to the parent MediaLoader's own "enabled" property caused invalid state where the loaded AlembicEntity was partially visible when toggling object visibility (since Qt 5.13).
In order to disable camera picking when AlembicEntity is disable, scale the camSelector component to 0.
2019-08-12 17:58:43 +02:00
Pramukta Kumar
f859f8759d add option to include 'unknown' feature types in order to support the conversion of dense point clouds via ConvertSfMFormat 2019-08-11 09:01:34 -05:00
Anouk Liberge
2881b712e6 [nodes][aliceVision] hdr: clarify descriptions 2019-08-08 11:23:34 +02:00
Anouk Liberge
6bb89397f3 [nodes][aliceVision] hdr: delete forgotten quotes 2019-08-07 15:27:41 +02:00