[QGIS Commit] r14386 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-10-16 15:08:47 -0700 (Sat, 16 Oct 2010)
New Revision: 14386

Modified:
   trunk/qgis/src/app/qgsquerybuilder.cpp
   trunk/qgis/src/app/qgsquerybuilder.h
Log:
fix #3124

Modified: trunk/qgis/src/app/qgsquerybuilder.cpp
===================================================================
--- trunk/qgis/src/app/qgsquerybuilder.cpp	2010-10-16 14:52:43 UTC (rev 14385)
+++ trunk/qgis/src/app/qgsquerybuilder.cpp	2010-10-16 22:08:47 UTC (rev 14386)
@@ -27,10 +27,10 @@
 // connection to the database
 QgsQueryBuilder::QgsQueryBuilder( QgsVectorLayer *layer,
                                   QWidget *parent, Qt::WFlags fl )
-    : QDialog( parent, fl ), mLayer( layer )
+    : QDialog( parent, fl )
+    , mLayer( layer )
 {
   setupUi( this );
-  connect( buttonBox, SIGNAL( helpRequested() ), this, SLOT( helpClicked() ) );
 
   QPushButton *pbn = new QPushButton( tr( "&Test" ) );
   buttonBox->addButton( pbn, QDialogButtonBox::ActionRole );
@@ -91,17 +91,11 @@
   lstValues->setAlternatingRowColors( true );
 }
 
-void QgsQueryBuilder::fillValues( int idx, QString subsetString, int limit )
+void QgsQueryBuilder::fillValues( int idx, int limit )
 {
   // clear the model
   mModelValues->clear();
 
-  if ( !mLayer->setSubsetString( subsetString ) )
-  {
-    QMessageBox::information( this, tr( "Invalid Query" ), tr( "Setting the query failed" ) );
-    return;
-  }
-
   // determine the field type
   QList<QVariant> values;
   mLayer->dataProvider()->uniqueValues( idx, values, limit );
@@ -122,7 +116,7 @@
   QStandardItemModel *tmp = new QStandardItemModel();
   lstValues->setModel( tmp );
   //Clear and fill the mModelValues
-  fillValues( mModelFields->data( lstFields->currentIndex(), Qt::UserRole + 1 ).toInt(), mOrigSubsetString, 25 );
+  fillValues( mModelFields->data( lstFields->currentIndex(), Qt::UserRole + 1 ).toInt(), 25 );
   lstValues->setModel( mModelValues );
   lstValues->setCursor( Qt::ArrowCursor );
   //delete the tmp
@@ -138,7 +132,7 @@
   QStandardItemModel *tmp = new QStandardItemModel();
   lstValues->setModel( tmp );
   //Clear and fill the mModelValues
-  fillValues( mModelFields->data( lstFields->currentIndex(), Qt::UserRole + 1 ).toInt(), mOrigSubsetString, -1 );
+  fillValues( mModelFields->data( lstFields->currentIndex(), Qt::UserRole + 1 ).toInt(), -1 );
   lstValues->setModel( mModelValues );
   lstValues->setCursor( Qt::ArrowCursor );
   //delete the tmp
@@ -151,16 +145,9 @@
   // by counting the number of records that would be
   // returned
 
-  // if there is no sql, issue a warning
-  if ( txtSQL->toPlainText().isEmpty() )
+  if ( mLayer->setSubsetString( txtSQL->toPlainText() ) )
   {
     QMessageBox::information( this,
-                              tr( "No Query" ),
-                              tr( "You must create a query before you can test it" ) );
-  }
-  else if ( mLayer->setSubsetString( txtSQL->toPlainText() ) )
-  {
-    QMessageBox::information( this,
                               tr( "Query Result" ),
                               tr( "The where clause returned %n row(s).", "returned test rows", mLayer->featureCount() ) );
   }
@@ -172,12 +159,6 @@
   }
 }
 
-// Slot for showing help
-void QgsQueryBuilder::helpClicked()
-{
-  // QgsContextHelp::run( context_id );
-}
-
 void QgsQueryBuilder::accept()
 {
   // if user hits Ok and there is no query, skip the validation

Modified: trunk/qgis/src/app/qgsquerybuilder.h
===================================================================
--- trunk/qgis/src/app/qgsquerybuilder.h	2010-10-16 14:52:43 UTC (rev 14385)
+++ trunk/qgis/src/app/qgsquerybuilder.h	2010-10-16 22:08:47 UTC (rev 14386)
@@ -68,7 +68,6 @@
   public slots:
     void accept();
     void reject();
-    void helpClicked();
     void clear();
     void on_btnEqual_clicked();
     void on_btnLessThan_clicked();
@@ -124,7 +123,7 @@
      */
     void setupGuiViews();
     void setupLstFieldsModel();
-    void fillValues( int idx, QString subsetString, int limit );
+    void fillValues( int idx, int limit );
 
     // private members
     //! Model for fields ListView