[ui] split Z/M values checkbox in new memory layer dialog (#5685)

qgis · Nov 21, 2017 · 4bc4494 · 4bc4494
1 parent 0b3f86d
commit 4bc4494
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/src/gui/qgsnewmemorylayerdialog.cpp b/src/gui/qgsnewmemorylayerdialog.cpp
@@ -98,8 +98,13 @@ QgsWkbTypes::Type QgsNewMemoryLayerDialog::selectedType() const
     wkbType = QgsWkbTypes::MultiPolygon;
   }
 
-  if ( mGeometryWithZCheckBox->isChecked() && wkbType != QgsWkbTypes::Unknown && wkbType != QgsWkbTypes::NoGeometry )
-    wkbType = QgsWkbTypes::zmType( wkbType, true, true );
+  if ( wkbType != QgsWkbTypes::Unknown && wkbType != QgsWkbTypes::NoGeometry )
+  {
+    if ( mGeometryWithZCheckBox->isChecked() )
+      wkbType = QgsWkbTypes::addZ( wkbType );
+    if ( mGeometryWithMCheckBox->isChecked() )
+      wkbType = QgsWkbTypes::addM( wkbType );
+  }
 
   return wkbType;
 }

diff --git a/src/ui/qgsnewmemorylayerdialogbase.ui b/src/ui/qgsnewmemorylayerdialogbase.ui
@@ -79,11 +79,22 @@
        </layout>
       </item>
       <item>
-       <widget class="QCheckBox" name="mGeometryWithZCheckBox">
-        <property name="text">
-         <string>Geometries with Z/M coordinate</string>
-        </property>
-       </widget>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QCheckBox" name="mGeometryWithZCheckBox">
+          <property name="text">
+           <string>Include Z dimension</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="mGeometryWithMCheckBox">
+          <property name="text">
+           <string>Include M values</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
       <item>
        <widget class="QgsProjectionSelectionWidget" name="mCrsSelector" native="true">