Skip to content

Commit 1051f9b

Browse files
nyalldawsonnyalldawson
committedJan 8, 2019
Rename some methods for consistency/clarity
1 parent a6849ca commit 1051f9b

File tree

3 files changed

+30
-17
lines changed

3 files changed

+30
-17
lines changed
 

‎src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -557,9 +557,9 @@ QgsCategorizedSymbolRendererWidget::QgsCategorizedSymbolRendererWidget( QgsVecto
557557
mExpressionWidget->registerExpressionContextGenerator( this );
558558

559559
mMergeCategoriesAction = new QAction( tr( "Merge Categories" ), this );
560-
connect( mMergeCategoriesAction, &QAction::triggered, this, &QgsCategorizedSymbolRendererWidget::mergeClicked );
560+
connect( mMergeCategoriesAction, &QAction::triggered, this, &QgsCategorizedSymbolRendererWidget::mergeSelectedCategories );
561561
mUnmergeCategoriesAction = new QAction( tr( "Unmerge Categories" ), this );
562-
connect( mUnmergeCategoriesAction, &QAction::triggered, this, &QgsCategorizedSymbolRendererWidget::unmerge );
562+
connect( mUnmergeCategoriesAction, &QAction::triggered, this, &QgsCategorizedSymbolRendererWidget::unmergeSelectedCategories );
563563
}
564564

565565
QgsCategorizedSymbolRendererWidget::~QgsCategorizedSymbolRendererWidget()
@@ -1163,7 +1163,7 @@ void QgsCategorizedSymbolRendererWidget::dataDefinedSizeLegend()
11631163
}
11641164
}
11651165

1166-
void QgsCategorizedSymbolRendererWidget::mergeClicked()
1166+
void QgsCategorizedSymbolRendererWidget::mergeSelectedCategories()
11671167
{
11681168
const QgsCategoryList &categories = mRenderer->categories();
11691169

@@ -1214,7 +1214,7 @@ void QgsCategorizedSymbolRendererWidget::mergeClicked()
12141214
emit widgetChanged();
12151215
}
12161216

1217-
void QgsCategorizedSymbolRendererWidget::unmerge()
1217+
void QgsCategorizedSymbolRendererWidget::unmergeSelectedCategories()
12181218
{
12191219
const QList<int> categoryIndexes = selectedCategories();
12201220
if ( categoryIndexes.isEmpty() )

‎src/gui/symbology/qgscategorizedsymbolrendererwidget.h

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,21 @@ class GUI_EXPORT QgsCategorizedSymbolRendererWidget : public QgsRendererWidget,
153153
void cleanUpSymbolSelector( QgsPanelWidget *container );
154154
void updateSymbolsFromWidget();
155155
void dataDefinedSizeLegend();
156-
void mergeClicked();
157-
void unmerge();
156+
157+
/**
158+
* Merges all selected categories into a single multi-value category.
159+
*
160+
* \see unmergeSelectedCategories()
161+
*/
162+
void mergeSelectedCategories();
163+
164+
/**
165+
* Unmerges all selected multi-value categories into a individual value categories.
166+
*
167+
* \see mergeSelectedCategories()
168+
*/
169+
void unmergeSelectedCategories();
170+
158171
void showContextMenu( QPoint p );
159172

160173
protected:

‎tests/src/gui/testqgscategorizedrendererwidget.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -151,17 +151,17 @@ void TestQgsCategorizedRendererWidget::merge()
151151
QCOMPARE( static_cast< QgsCategorizedSymbolRenderer * >( widget->renderer() )->categories().at( 5 ).value().toString(), QString() );
152152

153153
// no selection, should have no effect
154-
widget->mergeClicked();
154+
widget->mergeSelectedCategories();
155155
QCOMPARE( static_cast< QgsCategorizedSymbolRenderer * >( widget->renderer() )->categories().count(), 6 );
156156

157157
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 1, 0 ), QItemSelectionModel::Select | QItemSelectionModel::Rows );
158158
// one selection, should have no effect
159-
widget->mergeClicked();
159+
widget->mergeSelectedCategories();
160160
QCOMPARE( static_cast< QgsCategorizedSymbolRenderer * >( widget->renderer() )->categories().count(), 6 );
161161

162162
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 3, 0 ), QItemSelectionModel::Select | QItemSelectionModel::Rows );
163163
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 4, 0 ), QItemSelectionModel::Select | QItemSelectionModel::Rows );
164-
widget->mergeClicked();
164+
widget->mergeSelectedCategories();
165165
QCOMPARE( static_cast< QgsCategorizedSymbolRenderer * >( widget->renderer() )->categories().count(), 4 );
166166

167167
QCOMPARE( static_cast< QgsCategorizedSymbolRenderer * >( widget->renderer() )->categories().at( 0 ).value().toString(), QStringLiteral( "a" ) );
@@ -179,7 +179,7 @@ void TestQgsCategorizedRendererWidget::merge()
179179
// selection should always "merge into" first selected item
180180
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 2, 0 ), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows );
181181
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 0, 0 ), QItemSelectionModel::Select | QItemSelectionModel::Rows );
182-
widget->mergeClicked();
182+
widget->mergeSelectedCategories();
183183
QCOMPARE( static_cast< QgsCategorizedSymbolRenderer * >( widget->renderer() )->categories().count(), 3 );
184184

185185
QCOMPARE( static_cast< QgsCategorizedSymbolRenderer * >( widget->renderer() )->categories().at( 0 ).value().toList().at( 0 ).toString(), QStringLiteral( "b" ) );
@@ -198,7 +198,7 @@ void TestQgsCategorizedRendererWidget::merge()
198198
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 1, 0 ), QItemSelectionModel::Select | QItemSelectionModel::Rows );
199199
//"" entry should be ignored
200200
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 2, 0 ), QItemSelectionModel::Select | QItemSelectionModel::Rows );
201-
widget->mergeClicked();
201+
widget->mergeSelectedCategories();
202202

203203
QCOMPARE( static_cast< QgsCategorizedSymbolRenderer * >( widget->renderer() )->categories().count(), 2 );
204204

@@ -214,15 +214,15 @@ void TestQgsCategorizedRendererWidget::merge()
214214

215215
widget->viewCategories->selectionModel()->clearSelection();
216216
// unmerge
217-
widget->unmerge();
217+
widget->unmergeSelectedCategories();
218218
QCOMPARE( static_cast< QgsCategorizedSymbolRenderer * >( widget->renderer() )->categories().count(), 2 );
219219
// not a list
220220
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 1, 0 ), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows );
221-
widget->unmerge();
221+
widget->unmergeSelectedCategories();
222222
QCOMPARE( static_cast< QgsCategorizedSymbolRenderer * >( widget->renderer() )->categories().count(), 2 );
223223
// list
224224
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 0, 0 ), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows );
225-
widget->unmerge();
225+
widget->unmergeSelectedCategories();
226226

227227
QCOMPARE( static_cast< QgsCategorizedSymbolRenderer * >( widget->renderer() )->categories().count(), 6 );
228228
QCOMPARE( static_cast< QgsCategorizedSymbolRenderer * >( widget->renderer() )->categories().at( 0 ).value().toString(), QStringLiteral( "b" ) );
@@ -240,15 +240,15 @@ void TestQgsCategorizedRendererWidget::merge()
240240

241241
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 2, 0 ), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows );
242242
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 3, 0 ), QItemSelectionModel::Select | QItemSelectionModel::Rows );
243-
widget->mergeClicked();
243+
widget->mergeSelectedCategories();
244244
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 3, 0 ), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows );
245245
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 4, 0 ), QItemSelectionModel::Select | QItemSelectionModel::Rows );
246-
widget->mergeClicked();
246+
widget->mergeSelectedCategories();
247247
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 0, 0 ), QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows );
248248
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 1, 0 ), QItemSelectionModel::Select | QItemSelectionModel::Rows );
249249
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 2, 0 ), QItemSelectionModel::Select | QItemSelectionModel::Rows );
250250
widget->viewCategories->selectionModel()->select( widget->viewCategories->model()->index( 3, 0 ), QItemSelectionModel::Select | QItemSelectionModel::Rows );
251-
widget->unmerge();
251+
widget->unmergeSelectedCategories();
252252
QCOMPARE( static_cast< QgsCategorizedSymbolRenderer * >( widget->renderer() )->categories().count(), 6 );
253253
QCOMPARE( static_cast< QgsCategorizedSymbolRenderer * >( widget->renderer() )->categories().at( 0 ).value().toString(), QStringLiteral( "b" ) );
254254
QCOMPARE( static_cast< QgsCategorizedSymbolRenderer * >( widget->renderer() )->categories().at( 1 ).value().toString(), QString() );

0 commit comments

Comments
 (0)