Merge pull request #578 from alicevision/release/2019.2.0v2019.2.0

Release 2019.2.0

6 files changed, 52 insertions, 8 deletions

diff --git a/CHANGES.md b/CHANGES.md
index 280838f9..c8773c2b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,6 +3,40 @@
 For algorithmic changes related to the photogrammetric pipeline, 
 please refer to [AliceVision changelog](https://github.com/alicevision/AliceVision/blob/develop/CHANGES.md).
 
+
+## Release 2019.2.0 (2019.08.08)
+
+Based on [AliceVision 2.2.0](https://github.com/alicevision/AliceVision/tree/v2.2.0).
+
+Release Notes Summary:
+
+ - Visualisation: New visualization module of the features extraction. [PR](https://github.com/alicevision/meshroom/pull/539), [New QtAliceVision](https://github.com/alicevision/QtAliceVision)
+ - Support for RAW image files.
+ - Texturing: Largely improve the Texturing quality.
+ - Texturing: Speed improvements.
+ - Texturing: Add support for UDIM.
+ - Meshing: Export the dense point cloud in Alembic.
+ - Meshing: New option to export the full raw dense point cloud (with all 3D points candidates before cut and filtering).
+ - Meshing: Adds an option to export color data per vertex and MeshFiltering correctly preserves colors.
+
+Full Release Notes:
+
+ - Move to PySide2 / Qt 5.13
+ - SfMDataIO: Change root nodes (XForms instead of untyped objects) of Alembic SfMData for better interoperability with other 3D graphics applications (in particular Blender and Houdini).
+ - Improve performance of log display and node status update. [PR](https://github.com/alicevision/meshroom/pull/466) [PR](https://github.com/alicevision/meshroom/pull/548)
+ - Viewer3D: Add support for vertex-colored meshes. [PR](https://github.com/alicevision/meshroom/pull/550)
+ - New pipeline input for meshroom_photogrammetry command line and minor fixes to the input arguments. [PR](https://github.com/alicevision/meshroom/pull/567) [PR](https://github.com/alicevision/meshroom/pull/577)
+ - New arguments to meshroom. [PR](https://github.com/alicevision/meshroom/pull/413)
+ - HDR: New HDR module for the fusion of multiple LDR images.
+ - PrepareDenseScene: Add experimental option to correct Exposure Values (EV) of input images to uniformize dataset exposures.
+ - FeatureExtraction: Include CCTag in the release binaries both on Linux and Windows.
+ - ConvertSfMFormat: Enable to use simple regular expressions in the image white list of the ConvertSfMFormat. This enables to filter out cameras based on their filename.
+
+For more details see all PR merged: https://github.com/alicevision/meshroom/milestone/9
+See [AliceVision 2.2.0 Release Notes](https://github.com/alicevision/AliceVision/blob/v2.2.0/CHANGES.md)
+for more details about algorithmic changes.
+
+
 ## Release 2019.1.0 (2019.02.27)
 
 Based on [AliceVision 2.1.0](https://github.com/alicevision/AliceVision/tree/v2.1.0).
diff --git a/Dockerfile b/Dockerfile
index 3de3bb27..4d960ad6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 ARG CUDA_TAG=8.0
 ARG OS_TAG=7
-FROM alicevision/alicevision:centos${OS_TAG}-cuda${CUDA_TAG}
+FROM alicevision/alicevision:2.2.0-centos${OS_TAG}-cuda${CUDA_TAG}
 LABEL maintainer="AliceVision Team alicevision-team@googlegroups.com"
 
 # Execute with nvidia docker (https://github.com/nvidia/nvidia-docker/wiki/Installation-(version-2.0))
@@ -46,12 +46,9 @@ COPY . "${MESHROOM_DEV}"
 RUN source scl_source enable rh-python36 && cd "${MESHROOM_DEV}" && pip install -r dev_requirements.txt -r requirements.txt && python setup.py install_exe -d "${MESHROOM_BUNDLE}" && \
     find ${MESHROOM_BUNDLE} -name "*Qt5Web*" -delete && \
     find ${MESHROOM_BUNDLE} -name "*Qt5Designer*" -delete && \
-    rm ${MESHROOM_BUNDLE}/lib/PySide2/libclang.so* && \
     rm -rf ${MESHROOM_BUNDLE}/lib/PySide2/typesystems/ ${MESHROOM_BUNDLE}/lib/PySide2/examples/ ${MESHROOM_BUNDLE}/lib/PySide2/include/ ${MESHROOM_BUNDLE}/lib/PySide2/Qt/translations/ ${MESHROOM_BUNDLE}/lib/PySide2/Qt/resources/ && \
-    rm ${MESHROOM_BUNDLE}/lib/PySide2/libQt5* && \
     rm ${MESHROOM_BUNDLE}/lib/PySide2/QtWeb* && \
-    rm ${MESHROOM_BUNDLE}/lib/PySide2/libicu* && \
-    rm ${MESHROOM_BUNDLE}/lib/PySide2/pyside2-lupdate ${MESHROOM_BUNDLE}/lib/PySide2/pyside2-rcc ${MESHROOM_BUNDLE}/lib/PySide2/shiboken2
+    rm ${MESHROOM_BUNDLE}/lib/PySide2/pyside2-lupdate ${MESHROOM_BUNDLE}/lib/PySide2/pyside2-rcc
 
 # Install Qt (to build plugins)
 WORKDIR /tmp/qt
diff --git a/INSTALL.md b/INSTALL.md
index 3fd04ada..24756a48 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -36,6 +36,11 @@ pip install -r requirements.txt -r dev_requirements.txt
 ```
 > Note: `dev_requirements` is only related to testing and packaging. It is not mandatory to run Meshroom.
 
+### Qt/PySide
+* PySide >= 5.12.2
+Warning: On Windows, the plugin AssimpSceneParser is missing from pre-built binaries, so you need to add it manually (from an older version for instance).
+See https://bugreports.qt.io/browse/QTBUG-74535
+
 ### Qt Plugins
 Additional Qt plugins can be built to extend Meshroom UI features. They can be found on separate repositories,
 though they might get better integration in the future.
@@ -55,3 +60,11 @@ This plugin also provides a QML Qt3D Entity to load depthmaps files stored in EX
 QT_PLUGIN_PATH=/path/to/QtOIIO/install
 QML2_IMPORT_PATH=/path/to/QtOIIO/install/qml
 ```
+
+#### [QtAliceVision](https://github.com/alicevision/QtAliceVision)
+Use AliceVision to load and visualize intermediate reconstruction files.
+```
+QML2_IMPORT_PATH=/path/to/qtAliceVision/install/qml
+```
+
+
diff --git a/meshroom/__init__.py b/meshroom/__init__.py
index 2a2fc4bb..7bda50a1 100644
--- a/meshroom/__init__.py
+++ b/meshroom/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "2019.1.0"
+__version__ = "2019.2.0"
 __version_name__ = __version__
 
 import os
diff --git a/meshroom/multiview.py b/meshroom/multiview.py
index a6f8be38..1474b222 100644
--- a/meshroom/multiview.py
+++ b/meshroom/multiview.py
@@ -1,5 +1,5 @@
 # Multiview pipeline version
-__version__ = "2.1"
+__version__ = "2.2"
 
 import os
 
diff --git a/requirements.txt b/requirements.txt
index 20a6a627..a0994cf0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 # runtime
 psutil
 enum34;python_version<"3.4"
-PySide2==5.11.1
+PySide2==5.13.0
 markdown==2.6.11