Build/test fixes

qgis · May 16, 2018 · 94f56b61a8fbb932f728b52365ce76d499a41fab · 94f56b6
1 parent 3fc99c0
commit 94f56b61a8fbb932f728b52365ce76d499a41fab
Unified Split

Showing with 13 additions and 1 deletion.

+6 −0 python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in

+1 −1 python/core/core_auto.sip

+2 −0 src/core/mesh/qgsmeshdataprovider.h

+4 −0 src/providers/mdal/CMakeLists.txt
diff --git a/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in b/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in
@@ -106,10 +106,16 @@ as if the data is vector or scalar, etc.
 %End
   public:
     QgsMeshDatasetMetadata();
+%Docstring
+Constructs an empty metadata object
+%End
     QgsMeshDatasetMetadata( bool isScalar,
                             bool isValid,
                             bool isOnVertices,
                             const QMap<QString, QString> &extraOptions );
+%Docstring
+Consutructs a valid metadata object
+%End
 
     QMap<QString, QString> extraOptions() const;
 %Docstring

diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
@@ -228,6 +228,7 @@
 %Include auto_generated/raster/qgssinglebandgrayrenderer.sip
 %Include auto_generated/raster/qgssinglebandpseudocolorrenderer.sip
 %Include auto_generated/raster/qgshillshaderenderer.sip
+%Include auto_generated/mesh/qgsmeshrenderersettings.sip
 %Include auto_generated/scalebar/qgsdoubleboxscalebarrenderer.sip
 %Include auto_generated/scalebar/qgsnumericscalebarrenderer.sip
 %Include auto_generated/scalebar/qgsscalebarsettings.sip
@@ -381,7 +382,6 @@
 %Include auto_generated/raster/qgsrasterprojector.sip
 %Include auto_generated/mesh/qgsmeshdataprovider.sip
 %Include auto_generated/mesh/qgsmeshlayer.sip
-%Include auto_generated/mesh/qgsmeshrenderersettings.sip
 %Include auto_generated/geometry/qgsabstractgeometry.sip
 %Include auto_generated/geometry/qgsgeometry.sip
 %Include auto_generated/geometry/qgspoint.sip

diff --git a/src/core/mesh/qgsmeshdataprovider.h b/src/core/mesh/qgsmeshdataprovider.h
@@ -102,7 +102,9 @@ class CORE_EXPORT QgsMeshDatasetValue
 class CORE_EXPORT QgsMeshDatasetMetadata
 {
   public:
+    //! Constructs an empty metadata object
     QgsMeshDatasetMetadata() = default;
+    //! Consutructs a valid metadata object
     QgsMeshDatasetMetadata( bool isScalar,
                             bool isValid,
                             bool isOnVertices,

diff --git a/src/providers/mdal/CMakeLists.txt b/src/providers/mdal/CMakeLists.txt
@@ -25,6 +25,8 @@ IF (WITH_INTERNAL_MDAL)
     ${CMAKE_SOURCE_DIR}/external/mdal/mdal_utils.cpp
     ${CMAKE_SOURCE_DIR}/external/mdal/mdal_loader.cpp
     ${CMAKE_SOURCE_DIR}/external/mdal/frmts/mdal_2dm.cpp
+    ${CMAKE_SOURCE_DIR}/external/mdal/frmts/mdal_ascii_dat.cpp
+    ${CMAKE_SOURCE_DIR}/external/mdal/frmts/mdal_binary_dat.cpp
   )
 
   SET(MDAL_LIB_HDRS
@@ -33,6 +35,8 @@ IF (WITH_INTERNAL_MDAL)
     ${CMAKE_SOURCE_DIR}/external/mdal/mdal_loader.hpp
     ${CMAKE_SOURCE_DIR}/external/mdal/mdal_defines.hpp
     ${CMAKE_SOURCE_DIR}/external/mdal/frmts/mdal_2dm.hpp
+    ${CMAKE_SOURCE_DIR}/external/mdal/frmts/mdal_ascii_dat.hpp
+    ${CMAKE_SOURCE_DIR}/external/mdal/frmts/mdal_binary_dat.hpp
   )
 
   UNSET(MDAL_LIBRARY)