Skip to content

Commit

Permalink
Split Z/M checkbox into 2 checkboxes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-marcel
c-marcel committed Aug 24, 2017
1 parent 64df114 commit bd8dece
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 23 deletions.
10 changes: 5 additions & 5 deletions src/gui/qgsnewgeopackagelayerdialog.cpp
View file
Expand Up @@ -350,11 +350,11 @@ bool QgsNewGeoPackageLayerDialog::apply()
( mGeometryTypeBox->currentData( Qt::UserRole ).toInt() );

// z-coordinate & m-value.
if (mGeometryWithZCheckBox->isChecked())
{
wkbType = OGR_GT_SetZ(wkbType);
wkbType = OGR_GT_SetM(wkbType);
}
if ( mGeometryWithZCheckBox->isChecked() )
wkbType = OGR_GT_SetZ( wkbType );

if ( mGeometryWithMCheckBox->isChecked() )
wkbType = OGR_GT_SetM( wkbType );

OGRSpatialReferenceH hSRS = nullptr;
// consider spatial reference system of the layer
Expand Down
47 changes: 29 additions & 18 deletions src/ui/qgsnewgeopackagelayerdialogbase.ui
View file
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -421,19 +421,30 @@
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="QgsProjectionSelectionWidget" name="mCrsSelector" native="true">
<item row="6" column="0">
<widget class="QgsProjectionSelectionWidget" name="mCrsSelector">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="mGeometryWithZCheckBox">
<property name="text">
<string>Geometries with Z/M coordinate</string>
</property>
</widget>
<item row="3" column="0">
<layout class="QHBoxLayout" name="horizontalZMLayout">
<item>
<widget class="QCheckBox" name="mGeometryWithZCheckBox">
<property name="text">
<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>
Expand All @@ -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>
Expand Down

0 comments on commit bd8dece

Please sign in to comment.