Add option to reset plot symbols back to their defaults

qgis · Jan 17, 2023 · cebf540 · cebf540
1 parent d6b6147
commit cebf540
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/python/core/auto_generated/plot/qgsplot.sip.in b/python/core/auto_generated/plot/qgsplot.sip.in
@@ -427,7 +427,7 @@ Returns the default line symbol to use for axis minor grid lines.
 .. seealso:: :py:func:`axisGridMajorSymbol`
 %End
 
-    static QgsFillSymbol *chartFillSymbol() /Factory/;
+    static QgsFillSymbol *chartBackgroundSymbol() /Factory/;
 %Docstring
 Returns the default fill symbol to use for the chart area background fill.
 
@@ -438,7 +438,7 @@ Returns the default fill symbol to use for the chart area background fill.
 %Docstring
 Returns the default fill symbol to use for the chart area border.
 
-.. seealso:: :py:func:`chartFillSymbol`
+.. seealso:: :py:func:`chartBackgroundSymbol`
 %End
 
 };

diff --git a/src/core/plot/qgsplot.cpp b/src/core/plot/qgsplot.cpp
@@ -145,7 +145,7 @@ Qgs2DPlot::Qgs2DPlot()
   : mMargins( 2, 2, 2, 2 )
 {
   // setup default style
-  mChartBackgroundSymbol.reset( QgsPlotDefaultSettings::chartFillSymbol() );
+  mChartBackgroundSymbol.reset( QgsPlotDefaultSettings::chartBackgroundSymbol() );
   mChartBorderSymbol.reset( QgsPlotDefaultSettings::chartBorderSymbol() );
 }
 
@@ -600,7 +600,7 @@ QgsLineSymbol *QgsPlotDefaultSettings::axisGridMinorSymbol()
   return new QgsLineSymbol( QgsSymbolLayerList( { gridMinor.release() } ) );
 }
 
-QgsFillSymbol *QgsPlotDefaultSettings::chartFillSymbol()
+QgsFillSymbol *QgsPlotDefaultSettings::chartBackgroundSymbol()
 {
   std::unique_ptr< QgsSimpleFillSymbolLayer > chartFill = std::make_unique< QgsSimpleFillSymbolLayer >( QColor( 255, 255, 255 ) );
   return new QgsFillSymbol( QgsSymbolLayerList( { chartFill.release() } ) );

diff --git a/src/core/plot/qgsplot.h b/src/core/plot/qgsplot.h
@@ -485,12 +485,12 @@ class CORE_EXPORT QgsPlotDefaultSettings
      *
      * \see chartBorderSymbol()
      */
-    static QgsFillSymbol *chartFillSymbol() SIP_FACTORY;
+    static QgsFillSymbol *chartBackgroundSymbol() SIP_FACTORY;
 
     /**
      * Returns the default fill symbol to use for the chart area border.
      *
-     * \see chartFillSymbol()
+     * \see chartBackgroundSymbol()
      */
     static QgsFillSymbol *chartBorderSymbol() SIP_FACTORY;
 

diff --git a/src/gui/layout/qgslayoutelevationprofilewidget.cpp b/src/gui/layout/qgslayoutelevationprofilewidget.cpp
@@ -96,6 +96,7 @@ QgsLayoutElevationProfileWidget::QgsLayoutElevationProfileWidget( QgsLayoutItemE
     mProfile->update();
     mProfile->endCommand();
   } );
+  mDistanceAxisMajorLinesSymbolButton->setDefaultSymbol( QgsPlotDefaultSettings::axisGridMajorSymbol() );
 
   mDistanceAxisMinorLinesSymbolButton->setSymbolType( Qgis::SymbolType::Line );
   connect( mDistanceAxisMinorLinesSymbolButton, &QgsSymbolButton::changed, this, [ = ]
@@ -108,6 +109,7 @@ QgsLayoutElevationProfileWidget::QgsLayoutElevationProfileWidget( QgsLayoutItemE
     mProfile->update();
     mProfile->endCommand();
   } );
+  mDistanceAxisMinorLinesSymbolButton->setDefaultSymbol( QgsPlotDefaultSettings::axisGridMinorSymbol() );
 
   connect( mDistanceAxisMajorIntervalSpin, qOverload< double >( &QDoubleSpinBox::valueChanged ), this, [ = ]( double value )
   {
@@ -153,6 +155,7 @@ QgsLayoutElevationProfileWidget::QgsLayoutElevationProfileWidget( QgsLayoutItemE
     mProfile->update();
     mProfile->endCommand();
   } );
+  mElevationAxisMajorLinesSymbolButton->setDefaultSymbol( QgsPlotDefaultSettings::axisGridMajorSymbol() );
 
   mElevationAxisMinorLinesSymbolButton->setSymbolType( Qgis::SymbolType::Line );
   connect( mElevationAxisMinorLinesSymbolButton, &QgsSymbolButton::changed, this, [ = ]
@@ -165,6 +168,7 @@ QgsLayoutElevationProfileWidget::QgsLayoutElevationProfileWidget( QgsLayoutItemE
     mProfile->update();
     mProfile->endCommand();
   } );
+  mElevationAxisMinorLinesSymbolButton->setDefaultSymbol( QgsPlotDefaultSettings::axisGridMinorSymbol() );
 
   connect( mElevationAxisLabelIntervalSpin, qOverload< double >( &QDoubleSpinBox::valueChanged ), this, [ = ]( double value )
   {
@@ -210,6 +214,7 @@ QgsLayoutElevationProfileWidget::QgsLayoutElevationProfileWidget( QgsLayoutItemE
     mProfile->update();
     mProfile->endCommand();
   } );
+  mChartBackgroundSymbolButton->setDefaultSymbol( QgsPlotDefaultSettings::chartBackgroundSymbol() );
 
   mChartBorderSymbolButton->setSymbolType( Qgis::SymbolType::Fill );
   connect( mChartBorderSymbolButton, &QgsSymbolButton::changed, this, [ = ]
@@ -222,6 +227,7 @@ QgsLayoutElevationProfileWidget::QgsLayoutElevationProfileWidget( QgsLayoutItemE
     mProfile->update();
     mProfile->endCommand();
   } );
+  mChartBorderSymbolButton->setDefaultSymbol( QgsPlotDefaultSettings::chartBorderSymbol() );
 
   connect( mDistanceAxisLabelFormatButton, &QPushButton::clicked, this, [ = ]
   {