fix #3153

jef · jef · commit bdcca916ff1a · 2010-10-25T15:56:55.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14433 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/postgres/qgspgsourceselect.cpp b/src/app/postgres/qgspgsourceselect.cpp
@@ -548,7 +548,10 @@ void QgsPgSourceSelect::setSql( const QModelIndex &index )
     return;
   }
 
-  QgsVectorLayer *vlayer = new QgsVectorLayer( layerURI( mProxyModel.mapToSource( index ) ), "querybuilder", "postgres" );
+  QModelIndex idx = mProxyModel.mapToSource( index );
+  QString tableName = mTableModel.itemFromIndex( idx.sibling( idx.row(), QgsDbTableModel::dbtmTable ) )->text();
+
+  QgsVectorLayer *vlayer = new QgsVectorLayer( layerURI( idx ), tableName, "postgres" );
 
   if ( !vlayer->isValid() )
   {
diff --git a/src/app/qgsquerybuilder.cpp b/src/app/qgsquerybuilder.cpp
@@ -44,7 +44,7 @@ QgsQueryBuilder::QgsQueryBuilder( QgsVectorLayer *layer,
 
   mOrigSubsetString = layer->subsetString();
 
-  lblDataUri->setText( layer->publicSource() );
+  lblDataUri->setText( layer->name() );
   txtSQL->setText( mOrigSubsetString );
 
   populateFields();
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -4150,8 +4150,15 @@ void QgsVectorLayer::setCoordinateSystem()
   //we only nee to do that if the srs is not alreay valid
   if ( !mCRS->isValid() )
   {
-    mCRS->setValidationHint( tr( "Specify CRS for layer %1" ).arg( name() ) );
-    mCRS->validate();
+    if ( geometryType() != QGis::NoGeometry )
+    {
+      mCRS->setValidationHint( tr( "Specify CRS for layer %1" ).arg( name() ) );
+      mCRS->validate();
+    }
+    else
+    {
+      mCRS->createFromProj4( GEOPROJ4 );
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -548,7 +548,10 @@ void QgsPgSourceSelect::setSql( const QModelIndex &index )`
`548`	`548`	`return;`
`549`	`549`	`}`
`550`	`550`
`551`		`- QgsVectorLayer *vlayer = new QgsVectorLayer( layerURI( mProxyModel.mapToSource( index ) ), "querybuilder", "postgres" );`
	`551`	`+ QModelIndex idx = mProxyModel.mapToSource( index );`
	`552`	`+ QString tableName = mTableModel.itemFromIndex( idx.sibling( idx.row(), QgsDbTableModel::dbtmTable ) )->text();`
	`553`	`+`
	`554`	`+ QgsVectorLayer *vlayer = new QgsVectorLayer( layerURI( idx ), tableName, "postgres" );`
`552`	`555`
`553`	`556`	`if ( !vlayer->isValid() )`
`554`	`557`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4150,8 +4150,15 @@ void QgsVectorLayer::setCoordinateSystem()`
`4150`	`4150`	`//we only nee to do that if the srs is not alreay valid`
`4151`	`4151`	`if ( !mCRS->isValid() )`
`4152`	`4152`	`{`
`4153`		`- mCRS->setValidationHint( tr( "Specify CRS for layer %1" ).arg( name() ) );`
`4154`		`- mCRS->validate();`
	`4153`	`+ if ( geometryType() != QGis::NoGeometry )`
	`4154`	`+ {`
	`4155`	`+ mCRS->setValidationHint( tr( "Specify CRS for layer %1" ).arg( name() ) );`
	`4156`	`+ mCRS->validate();`
	`4157`	`+ }`
	`4158`	`+ else`
	`4159`	`+ {`
	`4160`	`+ mCRS->createFromProj4( GEOPROJ4 );`
	`4161`	`+ }`
`4155`	`4162`	`}`
`4156`	`4163`	`}`
`4157`	`4164`