Skip to content

Commit a26434e

Browse files
nirvnnirvn
authoredDec 3, 2016
Merge pull request #3829 from nirvn/colorrampbutton_save
- [FEATURE] save existing color ramp function - improve new color ramp type naming
·
ltr-3_40final-3_0_0
2 parents 1560c7f + d863c44 commit a26434e

File tree

3 files changed

+46
-5
lines changed

3 files changed

+46
-5
lines changed
 

‎src/gui/qgscolorrampbutton.cpp

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@
2121
#include "qgsstyle.h"
2222

2323
#include "qgsstylemanagerdialog.h"
24+
#include "qgsstylesavedialog.h"
2425
#include "qgsgradientcolorrampdialog.h"
2526
#include "qgslimitedrandomcolorrampdialog.h"
2627
#include "qgscolorbrewercolorrampdialog.h"
2728
#include "qgscptcitycolorrampdialog.h"
2829
#include "qgspresetcolorrampdialog.h"
2930

3031
#include <QAction>
32+
#include <QMessageBox>
3133
#include <QMouseEvent>
3234
#include <QMenu>
3335
#include <QPainter>
@@ -316,6 +318,11 @@ void QgsColorRampButton::prepareMenu()
316318
editColorRampAction->setEnabled( !isNull() && !isRandomColorRamp() );
317319
connect( editColorRampAction, &QAction::triggered, this, &QgsColorRampButton::showColorRampDialog );
318320
mMenu->addAction( editColorRampAction );
321+
322+
QAction* saveColorRampAction = new QAction( tr( "Save color ramp..." ), this );
323+
saveColorRampAction->setEnabled( !isNull() && !isRandomColorRamp() );
324+
connect( saveColorRampAction, &QAction::triggered, this, &QgsColorRampButton::saveColorRamp );
325+
mMenu->addAction( saveColorRampAction );
319326
}
320327

321328
void QgsColorRampButton::loadColorRamp()
@@ -350,6 +357,36 @@ void QgsColorRampButton::createColorRamp()
350357
setColorRampFromName( name );
351358
}
352359

360+
void QgsColorRampButton::saveColorRamp()
361+
{
362+
QgsStyleSaveDialog saveDlg( this, QgsStyle::ColorrampEntity );
363+
if ( !saveDlg.exec() || saveDlg.name().isEmpty() )
364+
{
365+
return;
366+
}
367+
368+
// check if there is no symbol with same name
369+
if ( mStyle->symbolNames().contains( saveDlg.name() ) )
370+
{
371+
int res = QMessageBox::warning( this, tr( "Save color ramp" ),
372+
tr( "Color ramp with name '%1' already exists. Overwrite?" )
373+
.arg( saveDlg.name() ),
374+
QMessageBox::Yes | QMessageBox::No );
375+
if ( res != QMessageBox::Yes )
376+
{
377+
return;
378+
}
379+
mStyle->removeColorRamp( saveDlg.name() );
380+
}
381+
382+
QStringList colorRampTags = saveDlg.tags().split( ',' );
383+
384+
// add new symbol to style and re-populate the list
385+
QgsColorRamp* savedColorRamp = colorRamp();
386+
mStyle->addColorRamp( saveDlg.name(), savedColorRamp );
387+
mStyle->saveColorRamp( saveDlg.name(), savedColorRamp, saveDlg.isFavorite(), colorRampTags );
388+
}
389+
353390
void QgsColorRampButton::invertColorRamp()
354391
{
355392
mColorRamp->invert();

‎src/gui/qgscolorrampbutton.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,10 @@ class GUI_EXPORT QgsColorRampButton : public QToolButton
286286
*/
287287
void createColorRamp();
288288

289+
/** Creates a new color ramp
290+
*/
291+
void saveColorRamp();
292+
289293
/** Inverts the current color ramp
290294
*/
291295
void invertColorRamp();

‎src/gui/symbology-ng/qgsstylemanagerdialog.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -468,8 +468,8 @@ QString QgsStyleManagerDialog::addColorRampStatic( QWidget* parent, QgsStyle* st
468468
if ( rampType.isEmpty() )
469469
{
470470
QStringList rampTypes;
471-
rampTypes << tr( "Gradient" ) << tr( "Random" ) << tr( "ColorBrewer" ) << tr( "Preset colors" );
472-
rampTypes << tr( "cpt-city" ); // todo, only for rasters?
471+
rampTypes << tr( "Gradient" ) << tr( "Color presets" ) << tr( "Random" ) << tr( "Catalog: cpt-city" );
472+
rampTypes << tr( "Catalog: ColorBrewer" );
473473
rampType = QInputDialog::getItem( parent, tr( "Color ramp type" ),
474474
tr( "Please select color ramp type:" ), rampTypes, 0, false, &ok );
475475
}
@@ -499,7 +499,7 @@ QString QgsStyleManagerDialog::addColorRampStatic( QWidget* parent, QgsStyle* st
499499
ramp.reset( dlg.ramp().clone() );
500500
name = tr( "new random ramp" );
501501
}
502-
else if ( rampType == tr( "ColorBrewer" ) )
502+
else if ( rampType == tr( "Catalog: ColorBrewer" ) )
503503
{
504504
QgsColorBrewerColorRampDialog dlg( QgsColorBrewerColorRamp(), parent );
505505
if ( !dlg.exec() )
@@ -509,7 +509,7 @@ QString QgsStyleManagerDialog::addColorRampStatic( QWidget* parent, QgsStyle* st
509509
ramp.reset( dlg.ramp().clone() );
510510
name = dlg.ramp().schemeName() + QString::number( dlg.ramp().colors() );
511511
}
512-
else if ( rampType == tr( "Preset colors" ) )
512+
else if ( rampType == tr( "Color presets" ) )
513513
{
514514
QgsPresetColorRampDialog dlg( QgsPresetSchemeColorRamp(), parent );
515515
if ( !dlg.exec() )
@@ -519,7 +519,7 @@ QString QgsStyleManagerDialog::addColorRampStatic( QWidget* parent, QgsStyle* st
519519
ramp.reset( dlg.ramp().clone() );
520520
name = tr( "new preset ramp" );
521521
}
522-
else if ( rampType == tr( "cpt-city" ) )
522+
else if ( rampType == tr( "Catalog: cpt-city" ) )
523523
{
524524
QgsCptCityColorRampDialog dlg( QgsCptCityColorRamp( QLatin1String( "" ), QLatin1String( "" ) ), parent );
525525
if ( !dlg.exec() )

0 commit comments

Comments
 (0)
Please sign in to comment.