Fix few bugs + fix test images + allow data-defined size without tran…

…sformer
qgis · Jun 22, 2017 · 4976d59 · 4976d59
1 parent 59ca985
commit 4976d59
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 18 deletions.
diff --git a/python/gui/symbology-ng/qgsrendererwidget.sip b/python/gui/symbology-ng/qgsrendererwidget.sip
@@ -86,7 +86,7 @@ and by connecting the slot contextMenuViewCategories(const QPoint&)*
 %End
     virtual void refreshSymbolView();
 
-    QgsDataDefinedSizeLegendWidget *openDataDefinedSizeLegendWidget( const QgsMarkerSymbol *symbol, const QgsDataDefinedSizeLegend *ddsLegend );
+    QgsDataDefinedSizeLegendWidget *createDataDefinedSizeLegendWidget( const QgsMarkerSymbol *symbol, const QgsDataDefinedSizeLegend *ddsLegend ) /Factory/;
 %Docstring
 .. versionadded:: 3.0
  :rtype: QgsDataDefinedSizeLegendWidget

diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp b/src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp
@@ -1046,13 +1046,14 @@ QgsExpressionContext QgsCategorizedSymbolRendererWidget::createExpressionContext
 void QgsCategorizedSymbolRendererWidget::dataDefinedSizeLegend()
 {
   QgsMarkerSymbol *s = static_cast<QgsMarkerSymbol *>( mCategorizedSymbol ); // this should be only enabled for marker symbols
-  QgsDataDefinedSizeLegendWidget *panel = openDataDefinedSizeLegendWidget( s, mRenderer->dataDefinedSizeLegend() );
+  QgsDataDefinedSizeLegendWidget *panel = createDataDefinedSizeLegendWidget( s, mRenderer->dataDefinedSizeLegend() );
   if ( panel )
   {
     connect( panel, &QgsPanelWidget::widgetChanged, [ = ]
     {
       mRenderer->setDataDefinedSizeLegend( panel->dataDefinedSizeLegend() );
       emit widgetChanged();
     } );
+    openPanel( panel );  // takes ownership of the panel
   }
 }
diff --git a/src/gui/symbology-ng/qgsdatadefinedsizelegendwidget.cpp b/src/gui/symbology-ng/qgsdatadefinedsizelegendwidget.cpp
@@ -90,7 +90,6 @@ QgsDataDefinedSizeLegendWidget::QgsDataDefinedSizeLegendWidget( const QgsDataDef
     mSizeClassesModel->sort( 0 );
   }
 
-  connect( groupManualSizeClasses, &QGroupBox::clicked, this, &QgsDataDefinedSizeLegendWidget::updatePreview );
   connect( btnAddClass, &QToolButton::clicked, this, &QgsDataDefinedSizeLegendWidget::addSizeClass );
   connect( btnRemoveClass, &QToolButton::clicked, this, &QgsDataDefinedSizeLegendWidget::removeSizeClass );
 
@@ -109,6 +108,7 @@ QgsDataDefinedSizeLegendWidget::QgsDataDefinedSizeLegendWidget( const QgsDataDef
   connect( radDisabled, &QRadioButton::clicked, this, &QgsPanelWidget::widgetChanged );
   connect( radSeparated, &QRadioButton::clicked, this, &QgsPanelWidget::widgetChanged );
   connect( radCollapsed, &QRadioButton::clicked, this, &QgsPanelWidget::widgetChanged );
+  connect( groupManualSizeClasses, &QGroupBox::clicked, this, &QgsPanelWidget::widgetChanged );
   connect( btnChangeSymbol, &QPushButton::clicked, this, &QgsDataDefinedSizeLegendWidget::changeSymbol );
   connect( this, &QgsPanelWidget::widgetChanged, this, &QgsDataDefinedSizeLegendWidget::updatePreview );
   updatePreview();
@@ -187,7 +187,7 @@ void QgsDataDefinedSizeLegendWidget::changeSymbol()
   QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( mSourceSymbol.get(), btnChangeSymbol->iconSize() );
   btnChangeSymbol->setIcon( icon );
 
-  updatePreview();
+  emit widgetChanged();
 }
 
 void QgsDataDefinedSizeLegendWidget::addSizeClass()
@@ -203,7 +203,7 @@ void QgsDataDefinedSizeLegendWidget::addSizeClass()
   item->setData( v );
   mSizeClassesModel->appendRow( item );
   mSizeClassesModel->sort( 0 );
-  updatePreview();
+  emit widgetChanged();
 }
 
 void QgsDataDefinedSizeLegendWidget::removeSizeClass()
@@ -213,5 +213,5 @@ void QgsDataDefinedSizeLegendWidget::removeSizeClass()
     return;
 
   mSizeClassesModel->removeRow( idx.row() );
-  updatePreview();
+  emit widgetChanged();
 }
diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp b/src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp
@@ -1178,13 +1178,14 @@ void QgsGraduatedSymbolRendererWidget::keyPressEvent( QKeyEvent *event )
 void QgsGraduatedSymbolRendererWidget::dataDefinedSizeLegend()
 {
   QgsMarkerSymbol *s = static_cast<QgsMarkerSymbol *>( mGraduatedSymbol ); // this should be only enabled for marker symbols
-  QgsDataDefinedSizeLegendWidget *panel = openDataDefinedSizeLegendWidget( s, mRenderer->dataDefinedSizeLegend() );
+  QgsDataDefinedSizeLegendWidget *panel = createDataDefinedSizeLegendWidget( s, mRenderer->dataDefinedSizeLegend() );
   if ( panel )
   {
     connect( panel, &QgsPanelWidget::widgetChanged, [ = ]
     {
       mRenderer->setDataDefinedSizeLegend( panel->dataDefinedSizeLegend() );
       emit widgetChanged();
     } );
+    openPanel( panel );  // takes ownership of the panel
   }
 }
diff --git a/src/gui/symbology-ng/qgsrendererwidget.cpp b/src/gui/symbology-ng/qgsrendererwidget.cpp
@@ -275,23 +275,17 @@ void QgsRendererWidget::applyChanges()
   apply();
 }
 
-QgsDataDefinedSizeLegendWidget *QgsRendererWidget::openDataDefinedSizeLegendWidget( const QgsMarkerSymbol *symbol, const QgsDataDefinedSizeLegend *ddsLegend )
+QgsDataDefinedSizeLegendWidget *QgsRendererWidget::createDataDefinedSizeLegendWidget( const QgsMarkerSymbol *symbol, const QgsDataDefinedSizeLegend *ddsLegend )
 {
   QgsProperty ddSize = symbol->dataDefinedSize();
   if ( !ddSize || !ddSize.isActive() )
   {
     QMessageBox::warning( this, tr( "Data-defined size legend" ), tr( "Data-defined size is not enabled!" ) );
     return nullptr;
   }
-  if ( !ddSize.transformer() )
-  {
-    QMessageBox::warning( this, tr( "Data-defined size legend" ), tr( "Data-defined size is enabled, but without size scale transformer. Use assistant to define it." ) );
-    return nullptr;
-  }
 
   QgsDataDefinedSizeLegendWidget *panel = new QgsDataDefinedSizeLegendWidget( ddsLegend, ddSize, symbol->clone(), mContext.mapCanvas() );
   connect( panel, &QgsPanelWidget::widgetChanged, this, &QgsPanelWidget::widgetChanged );
-  openPanel( panel );
   return panel;
 }
 

diff --git a/src/gui/symbology-ng/qgsrendererwidget.h b/src/gui/symbology-ng/qgsrendererwidget.h
@@ -100,10 +100,10 @@ class GUI_EXPORT QgsRendererWidget : public QgsPanelWidget
     virtual QList<QgsSymbol *> selectedSymbols() { return QList<QgsSymbol *>(); }
     virtual void refreshSymbolView() {}
 
-    //! Shows GUI to setup data-defined size legend.
-    //! Returns newly open panel - may be null if it could not be opened. Ownership is not transferred.
+    //! Creates widget to setup data-defined size legend.
+    //! Returns newly created panel - may be null if it could not be opened. Ownership is transferred to the caller.
     //! \since QGIS 3.0
-    QgsDataDefinedSizeLegendWidget *openDataDefinedSizeLegendWidget( const QgsMarkerSymbol *symbol, const QgsDataDefinedSizeLegend *ddsLegend );
+    QgsDataDefinedSizeLegendWidget *createDataDefinedSizeLegendWidget( const QgsMarkerSymbol *symbol, const QgsDataDefinedSizeLegend *ddsLegend ) SIP_FACTORY;
 
   protected slots:
     void  contextMenuViewCategories( QPoint p );

diff --git a/src/gui/symbology-ng/qgssinglesymbolrendererwidget.cpp b/src/gui/symbology-ng/qgssinglesymbolrendererwidget.cpp
@@ -119,13 +119,14 @@ void QgsSingleSymbolRendererWidget::showSymbolLevels()
 void QgsSingleSymbolRendererWidget::dataDefinedSizeLegend()
 {
   QgsMarkerSymbol *s = static_cast<QgsMarkerSymbol *>( mSingleSymbol ); // this should be only enabled for marker symbols
-  QgsDataDefinedSizeLegendWidget *panel = openDataDefinedSizeLegendWidget( s, mRenderer->dataDefinedSizeLegend() );
+  QgsDataDefinedSizeLegendWidget *panel = createDataDefinedSizeLegendWidget( s, mRenderer->dataDefinedSizeLegend() );
   if ( panel )
   {
     connect( panel, &QgsPanelWidget::widgetChanged, [ = ]
     {
       mRenderer->setDataDefinedSizeLegend( panel->dataDefinedSizeLegend() );
       emit widgetChanged();
     } );
+    openPanel( panel );  // takes ownership of the panel
   }
 }
diff --git a/...images/data_defined_size_legend/expected_basic_bottom/expected_basic_bottom.png b/...images/data_defined_size_legend/expected_basic_bottom/expected_basic_bottom.png
diff --git a/...a/control_images/data_defined_size_legend/expected_crowded/expected_crowded.png b/...a/control_images/data_defined_size_legend/expected_crowded/expected_crowded.png