Split Z/M checkbox into 2 checkboxes.

qgis · Aug 24, 2017 · bd8dece · bd8dece
1 parent 64df114
commit bd8dece
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 23 deletions.
diff --git a/src/gui/qgsnewgeopackagelayerdialog.cpp b/src/gui/qgsnewgeopackagelayerdialog.cpp
@@ -350,11 +350,11 @@ bool QgsNewGeoPackageLayerDialog::apply()
                                ( mGeometryTypeBox->currentData( Qt::UserRole ).toInt() );
 
   // z-coordinate & m-value.
-  if (mGeometryWithZCheckBox->isChecked())
+  if ( mGeometryWithZCheckBox->isChecked() )
-  {
+    wkbType = OGR_GT_SetZ( wkbType );
-      wkbType = OGR_GT_SetZ(wkbType);
+
-      wkbType = OGR_GT_SetM(wkbType);
+  if ( mGeometryWithMCheckBox->isChecked() )
-  }
+    wkbType = OGR_GT_SetM( wkbType );
 
   OGRSpatialReferenceH hSRS = nullptr;
   // consider spatial reference system of the layer

diff --git a/src/ui/qgsnewgeopackagelayerdialogbase.ui b/src/ui/qgsnewgeopackagelayerdialogbase.ui
@@ -62,11 +62,11 @@
         <x>0</x>
         <y>0</y>
         <width>514</width>
-        <height>644</height>
+        <height>663</height>
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout_5">
-       <item row="5" column="0">
+       <item row="8" column="0">
         <widget class="QCheckBox" name="mCheckBoxCreateSpatialIndex">
          <property name="toolTip">
           <string>Add an integer id field as the primary key for the new layer</string>
@@ -79,7 +79,7 @@
        <item row="0" column="0">
         <layout class="QHBoxLayout" name="horizontalLayout_6"/>
        </item>
-       <item row="6" column="0">
+       <item row="9" column="0">
         <widget class="QGroupBox" name="groupBox_3">
          <property name="title">
           <string>New field</string>
@@ -342,7 +342,7 @@
          </item>
         </layout>
        </item>
-       <item row="7" column="0">
+       <item row="10" column="0">
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
           <string>Fields list</string>
@@ -421,19 +421,30 @@
          </layout>
         </widget>
        </item>
-       <item row="3" column="0">
+       <item row="6" column="0">
-        <widget class="QgsProjectionSelectionWidget" name="mCrsSelector" native="true">
+        <widget class="QgsProjectionSelectionWidget" name="mCrsSelector">
          <property name="focusPolicy">
           <enum>Qt::StrongFocus</enum>
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
+       <item row="3" column="0">
-        <widget class="QCheckBox" name="mGeometryWithZCheckBox">
+        <layout class="QHBoxLayout" name="horizontalZMLayout">
-         <property name="text">
+         <item>
-          <string>Geometries with Z/M coordinate</string>
+          <widget class="QCheckBox" name="mGeometryWithZCheckBox">
-         </property>
+           <property name="text">
-        </widget>
+            <string>Geometries with Z coordinate</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="mGeometryWithMCheckBox">
+           <property name="text">
+            <string>Geometries with M coordinate</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
       </layout>
      </widget>
@@ -443,18 +454,18 @@
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
-  <customwidget>
-   <class>QgsScrollArea</class>
-   <extends>QScrollArea</extends>
-   <header>qgsscrollarea.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>QgsProjectionSelectionWidget</class>
    <extends>QWidget</extends>
    <header>qgsprojectionselectionwidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsScrollArea</class>
+   <extends>QScrollArea</extends>
+   <header>qgsscrollarea.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>scrollArea</tabstop>