fix style selection when loading from database (fixes #12863)

jef-n · jef-n · commit d53d30d29023 · 2015-06-03T23:41:23.000+02:00
diff --git a/src/app/qgsloadstylefromdbdialog.cpp b/src/app/qgsloadstylefromdbdialog.cpp
@@ -20,7 +20,7 @@ QgsLoadStyleFromDBDialog::QgsLoadStyleFromDBDialog( QWidget *parent )
 {
   setupUi( this );
   setWindowTitle( "Load style from database" );
-  mSelectedStyleId = tr( "" );
+  mSelectedStyleId = "";
 
   mLoadButton->setDisabled( true );
   mRelatedTable->setEditTriggers( QTableWidget::NoEditTriggers );
@@ -35,10 +35,8 @@ QgsLoadStyleFromDBDialog::QgsLoadStyleFromDBDialog( QWidget *parent )
 
   connect( mRelatedTable, SIGNAL( cellClicked( int, int ) ), this, SLOT( cellSelectedRelatedTable( int ) ) );
   connect( mOthersTable, SIGNAL( cellClicked( int, int ) ), this, SLOT( cellSelectedOthersTable( int ) ) );
-  connect( mRelatedTable, SIGNAL( doubleClicked( QModelIndex ) ),
-           this, SLOT( accept() ) );
-  connect( mOthersTable, SIGNAL( doubleClicked( QModelIndex ) ),
-           this, SLOT( accept() ) );
+  connect( mRelatedTable, SIGNAL( doubleClicked( QModelIndex ) ), this, SLOT( accept() ) );
+  connect( mOthersTable, SIGNAL( doubleClicked( QModelIndex ) ), this, SLOT( accept() ) );
   connect( mCancelButton, SIGNAL( clicked() ), this, SLOT( reject() ) );
   connect( mLoadButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
 
@@ -59,35 +57,36 @@ QgsLoadStyleFromDBDialog::~QgsLoadStyleFromDBDialog()
 
 void QgsLoadStyleFromDBDialog::initializeLists( QStringList ids, QStringList names, QStringList descriptions, int sectionLimit )
 {
-  mIds = ids;
-  mNames = names;
-  mDescriptions = descriptions;
   mSectionLimit = sectionLimit;
-  int relatedTableNOfCols = ( sectionLimit > 0 ) ? 2 : 1;
-  int othersTableNOfCols = ( ids.count() - sectionLimit > 0 ) ? 2 : 1;
+  int relatedTableNOfCols = sectionLimit > 0 ? 2 : 1;
+  int othersTableNOfCols = ids.count() - sectionLimit > 0 ? 2 : 1;
   QString twoColsHeader( "Name;Description" );
   QString oneColsHeader( "No styles found in the database" );
-  QString relatedTableHeader = ( relatedTableNOfCols == 1 ) ? oneColsHeader : twoColsHeader;
-  QString othersTableHeader = ( othersTableNOfCols == 1 ) ? oneColsHeader : twoColsHeader;
+  QString relatedTableHeader = relatedTableNOfCols == 1 ? oneColsHeader : twoColsHeader;
+  QString othersTableHeader = othersTableNOfCols == 1 ? oneColsHeader : twoColsHeader;
 
   mRelatedTable->setColumnCount( relatedTableNOfCols );
   mOthersTable->setColumnCount( othersTableNOfCols );
   mRelatedTable->setHorizontalHeaderLabels( relatedTableHeader.split( ";" ) );
   mOthersTable->setHorizontalHeaderLabels( othersTableHeader.split( ";" ) );
   mRelatedTable->setRowCount( sectionLimit );
   mOthersTable->setRowCount( ids.count() - sectionLimit );
-  mRelatedTable->setDisabled(( relatedTableNOfCols == 1 ) );
-  mOthersTable->setDisabled(( othersTableNOfCols == 1 ) );
+  mRelatedTable->setDisabled( relatedTableNOfCols == 1 );
+  mOthersTable->setDisabled( othersTableNOfCols == 1 );
 
   for ( int i = 0; i < sectionLimit; i++ )
   {
-    mRelatedTable->setItem( i, 0, new QTableWidgetItem( names.value( i, "" ) ) );
+    QTableWidgetItem *item = new QTableWidgetItem( names.value( i, "" ) );
+    item->setData( Qt::UserRole, ids[i] );
+    mRelatedTable->setItem( i, 0, item );
     mRelatedTable->setItem( i, 1, new QTableWidgetItem( descriptions.value( i, "" ) ) );
   }
   for ( int i = sectionLimit; i < ids.count(); i++ )
   {
     int j = i - sectionLimit;
-    mOthersTable->setItem( j, 0, new QTableWidgetItem( names.value( i, "" ) ) );
+    QTableWidgetItem *item = new QTableWidgetItem( names.value( i, "" ) );
+    item->setData( Qt::UserRole, ids[i] );
+    mOthersTable->setItem( j, 0, item );
     mOthersTable->setItem( j, 1, new QTableWidgetItem( descriptions.value( i, "" ) ) );
   }
 }
@@ -100,11 +99,11 @@ QString QgsLoadStyleFromDBDialog::getSelectedStyleId()
 void QgsLoadStyleFromDBDialog::cellSelectedRelatedTable( int r )
 {
   mLoadButton->setEnabled( true );
-  mSelectedStyleId = mIds.value( r );
+  mSelectedStyleId = mRelatedTable->item( r, 0 )->data( Qt::UserRole ).toString();
 }
 
 void QgsLoadStyleFromDBDialog::cellSelectedOthersTable( int r )
 {
   mLoadButton->setEnabled( true );
-  mSelectedStyleId = mIds.value( r + mSectionLimit );
+  mSelectedStyleId = mOthersTable->item( r, 0 )->data( Qt::UserRole ).toString();
 }
diff --git a/src/app/qgsloadstylefromdbdialog.h b/src/app/qgsloadstylefromdbdialog.h
@@ -18,7 +18,6 @@ class APP_EXPORT QgsLoadStyleFromDBDialog : public QDialog, private Ui::QgsLoadS
 {
     QString mSelectedStyleId;
     int mSectionLimit;
-    QStringList mIds, mNames, mDescriptions;
     QString qmlStyle;
     Q_OBJECT
   public:
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -3400,6 +3400,8 @@ QStringList QgsPalLabeling::splitToGraphemes( const QString &text )
 
 QgsGeometry* QgsPalLabeling::prepareGeometry( const QgsGeometry* geometry, const QgsRenderContext& context, const QgsCoordinateTransform* ct, double minSize, QgsGeometry* clipGeometry )
 {
+  Q_UNUSED( minSize );
+
   if ( !geometry )
   {
     return 0;

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ class APP_EXPORT QgsLoadStyleFromDBDialog : public QDialog, private Ui::QgsLoadS`
`18`	`18`	`{`
`19`	`19`	`QString mSelectedStyleId;`
`20`	`20`	`int mSectionLimit;`
`21`		`- QStringList mIds, mNames, mDescriptions;`
`22`	`21`	`QString qmlStyle;`
`23`	`22`	`Q_OBJECT`
`24`	`23`	`public:`
Original file line number	Diff line number	Diff line change
`@@ -3400,6 +3400,8 @@ QStringList QgsPalLabeling::splitToGraphemes( const QString &text )`
`3400`	`3400`
`3401`	`3401`	`QgsGeometry* QgsPalLabeling::prepareGeometry( const QgsGeometry* geometry, const QgsRenderContext& context, const QgsCoordinateTransform* ct, double minSize, QgsGeometry* clipGeometry )`
`3402`	`3402`	`{`
	`3403`	`+ Q_UNUSED( minSize );`
	`3404`	`+`
`3403`	`3405`	`if ( !geometry )`
`3404`	`3406`	`{`
`3405`	`3407`	`return 0;`