Added the ability to create memory layer with 25d geometry

alisovenko · alisovenko · commit 6bc9a4a93f80 · 2016-12-26T12:36:54.000+03:00
diff --git a/src/gui/qgsnewmemorylayerdialog.cpp b/src/gui/qgsnewmemorylayerdialog.cpp
@@ -40,33 +40,9 @@ QgsVectorLayer *QgsNewMemoryLayerDialog::runAndCreateLayer( QWidget *parent )
 
   QgsWkbTypes::Type geometrytype = dialog.selectedType();
 
-  QString geomType;
-  switch ( geometrytype )
-  {
-    case QgsWkbTypes::Point:
-      geomType = QStringLiteral( "point" );
-      break;
-    case QgsWkbTypes::LineString:
-      geomType = QStringLiteral( "linestring" );
-      break;
-    case QgsWkbTypes::Polygon:
-      geomType = QStringLiteral( "polygon" );
-      break;
-    case QgsWkbTypes::MultiPoint:
-      geomType = QStringLiteral( "multipoint" );
-      break;
-    case QgsWkbTypes::MultiLineString:
-      geomType = QStringLiteral( "multilinestring" );
-      break;
-    case QgsWkbTypes::MultiPolygon:
-      geomType = QStringLiteral( "multipolygon" );
-      break;
-    case QgsWkbTypes::NoGeometry:
-      geomType = QStringLiteral( "none" );
-      break;
-    default:
-      geomType = QStringLiteral( "point" );
-  }
+  QString geomType = QgsWkbTypes::displayString(geometrytype);
+  if ( geomType.isNull())
+    geomType = "none";
 
   QString layerProperties = QStringLiteral( "%1?" ).arg( geomType );
   if ( QgsWkbTypes::NoGeometry != geometrytype )
@@ -103,35 +79,40 @@ QgsNewMemoryLayerDialog::~QgsNewMemoryLayerDialog()
 
 QgsWkbTypes::Type QgsNewMemoryLayerDialog::selectedType() const
 {
+  QgsWkbTypes::Type wkbType = QgsWkbTypes::Unknown;
   if ( !buttonGroupGeometry->isChecked() )
   {
-    return QgsWkbTypes::NoGeometry;
+    wkbType = QgsWkbTypes::NoGeometry;
   }
   else if ( mPointRadioButton->isChecked() )
   {
-    return QgsWkbTypes::Point;
+    wkbType = QgsWkbTypes::Point;
   }
   else if ( mLineRadioButton->isChecked() )
   {
-    return QgsWkbTypes::LineString;
+    wkbType = QgsWkbTypes::LineString;
   }
   else if ( mPolygonRadioButton->isChecked() )
   {
-    return QgsWkbTypes::Polygon;
+    wkbType = QgsWkbTypes::Polygon;
   }
   else if ( mMultiPointRadioButton->isChecked() )
   {
-    return QgsWkbTypes::MultiPoint;
+    wkbType = QgsWkbTypes::MultiPoint;
   }
   else if ( mMultiLineRadioButton->isChecked() )
   {
-    return QgsWkbTypes::MultiLineString;
+    wkbType = QgsWkbTypes::MultiLineString;
   }
   else if ( mMultiPolygonRadioButton->isChecked() )
   {
-    return QgsWkbTypes::MultiPolygon;
+    wkbType = QgsWkbTypes::MultiPolygon;
   }
-  return QgsWkbTypes::Unknown;
+
+  if (mGeometryWithZCheckBox->isChecked() && wkbType != QgsWkbTypes::Unknown && wkbType != QgsWkbTypes::NoGeometry)
+    wkbType = QgsWkbTypes::to25D(wkbType);
+
+  return wkbType;
 }
 
 QgsCoordinateReferenceSystem QgsNewMemoryLayerDialog::crs() const
diff --git a/src/gui/qgsnewvectorlayerdialog.cpp b/src/gui/qgsnewvectorlayerdialog.cpp
@@ -145,25 +145,24 @@ void QgsNewVectorLayerDialog::on_mTypeBox_currentIndexChanged( int index )
 
 QgsWkbTypes::Type QgsNewVectorLayerDialog::selectedType() const
 {
+  QgsWkbTypes::Type wkbType = QgsWkbTypes::Unknown;
   if ( mPointRadioButton->isChecked() )
   {
-    if (mGeometryWithZCheckBox->isChecked())
-      return QgsWkbTypes::Point25D;
-    return QgsWkbTypes::Point;
+    wkbType = QgsWkbTypes::Point;
   }
   else if ( mLineRadioButton->isChecked() )
   {
-    if (mGeometryWithZCheckBox->isChecked())
-      return QgsWkbTypes::LineString25D;
-    return QgsWkbTypes::LineString;
+    wkbType = QgsWkbTypes::LineString;
   }
   else if ( mPolygonRadioButton->isChecked() )
   {
-    if (mGeometryWithZCheckBox->isChecked())
-      return QgsWkbTypes::Polygon25D;
-    return QgsWkbTypes::Polygon;
+    wkbType = QgsWkbTypes::Polygon;
   }
-  return QgsWkbTypes::Unknown;
+
+  if (mGeometryWithZCheckBox->isChecked() && wkbType != QgsWkbTypes::Unknown)
+    wkbType = QgsWkbTypes::to25D(wkbType);
+
+  return wkbType;
 }
 
 int QgsNewVectorLayerDialog::selectedCrsId() const
diff --git a/src/ui/qgsnewmemorylayerdialogbase.ui b/src/ui/qgsnewmemorylayerdialogbase.ui
@@ -78,6 +78,13 @@
         </item>
        </layout>
       </item>
+      <item>
+       <widget class="QCheckBox" name="mGeometryWithZCheckBox">
+        <property name="text">
+         <string>Geometries with Z coordinate</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QgsProjectionSelectionWidget" name="mCrsSelector" native="true">
         <property name="focusPolicy">

Original file line number	Diff line number	Diff line change
`@@ -40,33 +40,9 @@ QgsVectorLayer QgsNewMemoryLayerDialog::runAndCreateLayer( QWidget parent )`
`40`	`40`
`41`	`41`	`QgsWkbTypes::Type geometrytype = dialog.selectedType();`
`42`	`42`
`43`		`- QString geomType;`
`44`		`- switch ( geometrytype )`
`45`		`- {`
`46`		`- case QgsWkbTypes::Point:`
`47`		`- geomType = QStringLiteral( "point" );`
`48`		`- break;`
`49`		`- case QgsWkbTypes::LineString:`
`50`		`- geomType = QStringLiteral( "linestring" );`
`51`		`- break;`
`52`		`- case QgsWkbTypes::Polygon:`
`53`		`- geomType = QStringLiteral( "polygon" );`
`54`		`- break;`
`55`		`- case QgsWkbTypes::MultiPoint:`
`56`		`- geomType = QStringLiteral( "multipoint" );`
`57`		`- break;`
`58`		`- case QgsWkbTypes::MultiLineString:`
`59`		`- geomType = QStringLiteral( "multilinestring" );`
`60`		`- break;`
`61`		`- case QgsWkbTypes::MultiPolygon:`
`62`		`- geomType = QStringLiteral( "multipolygon" );`
`63`		`- break;`
`64`		`- case QgsWkbTypes::NoGeometry:`
`65`		`- geomType = QStringLiteral( "none" );`
`66`		`- break;`
`67`		`- default:`
`68`		`- geomType = QStringLiteral( "point" );`
`69`		`- }`
	`43`	`+ QString geomType = QgsWkbTypes::displayString(geometrytype);`
	`44`	`+ if ( geomType.isNull())`
	`45`	`+ geomType = "none";`
`70`	`46`
`71`	`47`	`QString layerProperties = QStringLiteral( "%1?" ).arg( geomType );`
`72`	`48`	`if ( QgsWkbTypes::NoGeometry != geometrytype )`
`@@ -103,35 +79,40 @@ QgsNewMemoryLayerDialog::~QgsNewMemoryLayerDialog()`
`103`	`79`
`104`	`80`	`QgsWkbTypes::Type QgsNewMemoryLayerDialog::selectedType() const`
`105`	`81`	`{`
	`82`	`+ QgsWkbTypes::Type wkbType = QgsWkbTypes::Unknown;`
`106`	`83`	`if ( !buttonGroupGeometry->isChecked() )`
`107`	`84`	`{`
`108`		`- return QgsWkbTypes::NoGeometry;`
	`85`	`+ wkbType = QgsWkbTypes::NoGeometry;`
`109`	`86`	`}`
`110`	`87`	`else if ( mPointRadioButton->isChecked() )`
`111`	`88`	`{`
`112`		`- return QgsWkbTypes::Point;`
	`89`	`+ wkbType = QgsWkbTypes::Point;`
`113`	`90`	`}`
`114`	`91`	`else if ( mLineRadioButton->isChecked() )`
`115`	`92`	`{`
`116`		`- return QgsWkbTypes::LineString;`
	`93`	`+ wkbType = QgsWkbTypes::LineString;`
`117`	`94`	`}`
`118`	`95`	`else if ( mPolygonRadioButton->isChecked() )`
`119`	`96`	`{`
`120`		`- return QgsWkbTypes::Polygon;`
	`97`	`+ wkbType = QgsWkbTypes::Polygon;`
`121`	`98`	`}`
`122`	`99`	`else if ( mMultiPointRadioButton->isChecked() )`
`123`	`100`	`{`
`124`		`- return QgsWkbTypes::MultiPoint;`
	`101`	`+ wkbType = QgsWkbTypes::MultiPoint;`
`125`	`102`	`}`
`126`	`103`	`else if ( mMultiLineRadioButton->isChecked() )`
`127`	`104`	`{`
`128`		`- return QgsWkbTypes::MultiLineString;`
	`105`	`+ wkbType = QgsWkbTypes::MultiLineString;`
`129`	`106`	`}`
`130`	`107`	`else if ( mMultiPolygonRadioButton->isChecked() )`
`131`	`108`	`{`
`132`		`- return QgsWkbTypes::MultiPolygon;`
	`109`	`+ wkbType = QgsWkbTypes::MultiPolygon;`
`133`	`110`	`}`
`134`		`- return QgsWkbTypes::Unknown;`
	`111`	`+`
	`112`	`+ if (mGeometryWithZCheckBox->isChecked() && wkbType != QgsWkbTypes::Unknown && wkbType != QgsWkbTypes::NoGeometry)`
	`113`	`+ wkbType = QgsWkbTypes::to25D(wkbType);`
	`114`	`+`
	`115`	`+ return wkbType;`
`135`	`116`	`}`
`136`	`117`
`137`	`118`	`QgsCoordinateReferenceSystem QgsNewMemoryLayerDialog::crs() const`
Original file line number	Diff line number	Diff line change
`@@ -145,25 +145,24 @@ void QgsNewVectorLayerDialog::on_mTypeBox_currentIndexChanged( int index )`
`145`	`145`
`146`	`146`	`QgsWkbTypes::Type QgsNewVectorLayerDialog::selectedType() const`
`147`	`147`	`{`
	`148`	`+ QgsWkbTypes::Type wkbType = QgsWkbTypes::Unknown;`
`148`	`149`	`if ( mPointRadioButton->isChecked() )`
`149`	`150`	`{`
`150`		`- if (mGeometryWithZCheckBox->isChecked())`
`151`		`- return QgsWkbTypes::Point25D;`
`152`		`- return QgsWkbTypes::Point;`
	`151`	`+ wkbType = QgsWkbTypes::Point;`
`153`	`152`	`}`
`154`	`153`	`else if ( mLineRadioButton->isChecked() )`
`155`	`154`	`{`
`156`		`- if (mGeometryWithZCheckBox->isChecked())`
`157`		`- return QgsWkbTypes::LineString25D;`
`158`		`- return QgsWkbTypes::LineString;`
	`155`	`+ wkbType = QgsWkbTypes::LineString;`
`159`	`156`	`}`
`160`	`157`	`else if ( mPolygonRadioButton->isChecked() )`
`161`	`158`	`{`
`162`		`- if (mGeometryWithZCheckBox->isChecked())`
`163`		`- return QgsWkbTypes::Polygon25D;`
`164`		`- return QgsWkbTypes::Polygon;`
	`159`	`+ wkbType = QgsWkbTypes::Polygon;`
`165`	`160`	`}`
`166`		`- return QgsWkbTypes::Unknown;`
	`161`	`+`
	`162`	`+ if (mGeometryWithZCheckBox->isChecked() && wkbType != QgsWkbTypes::Unknown)`
	`163`	`+ wkbType = QgsWkbTypes::to25D(wkbType);`
	`164`	`+`
	`165`	`+ return wkbType;`
`167`	`166`	`}`
`168`	`167`
`169`	`168`	`int QgsNewVectorLayerDialog::selectedCrsId() const`