sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

renamed QgsSymbolLevelsV2Dialog to QgsSymbolLevelsDialog

Browse Source
This commit is contained in:
Denis Rouzaud 2016-08-05 08:13:09 +02:00
parent 275736de92
commit f2c3fb003e
11 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/api_break.dox
View File

@ -30,6 +30,7 @@ This page tries to maintain a list with incompatible changes that happened in pr
<tr><td>QgsSymbolLayerV2Registry <td>QgsSymbolLayerRegistry
<tr><td>QgsSymbolLayerV2Utils <td>QgsSymbolLayerUtils
<tr><td>QgsSymbolLayerV2Widget <td>QgsSymbolLayerWidget
<tr><td>QgsSymbolLevelsV2Dialog <td>QgsSymbolLevelsDialog
<tr><th>QgsSymbolV2 <th>QgsSymbol
<tr><td>QgsSymbolV2LegendNode <td>QgsSymbolLegendNode
<tr><td>QgsSymbolV2LevelItem <td>QgsSymbolLevelItem

2
python/gui/gui.sip
View File

@ -244,7 +244,7 @@
%Include symbology-ng/qgsstylev2managerdialog.sip
%Include symbology-ng/qgssvgselectorwidget.sip
%Include symbology-ng/qgssymbollayerwidget.sip
%Include symbology-ng/qgssymbollevelsv2dialog.sip
%Include symbology-ng/qgssymbollevelsdialog.sip
%Include symbology-ng/qgssymbolslistwidget.sip
%Include symbology-ng/qgssymbolselectordialog.sip
%Include symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.sip

8
python/gui/symbology-ng/qgssymbollevelsv2dialog.sip → python/gui/symbology-ng/qgssymbollevelsdialog.sip
View File

@ -1,12 +1,12 @@
class QgsSymbolLevelsV2Dialog : QDialog
class QgsSymbolLevelsDialog : QDialog
{
%TypeHeaderCode
#include <qgssymbollevelsv2dialog.h>
#include <qgssymbollevelsdialog.h>
%End
public:
//! @note not available in python bindings
// QgsSymbolLevelsV2Dialog( const QList< QPair<QString, QgsSymbol*> >& list, bool usingSymbolLevels, QWidget* parent = NULL );
// QgsSymbolLevelsDialog( const QList< QPair<QString, QgsSymbol*> >& list, bool usingSymbolLevels, QWidget* parent = NULL );
bool usingLevels() const;
@ -25,5 +25,5 @@ class QgsSymbolLevelsV2Dialog : QDialog
//void setDefaultLevels();
private:
QgsSymbolLevelsV2Dialog();
QgsSymbolLevelsDialog();
};

2
resources/customization.xml
View File

@ -396,7 +396,7 @@
<widget objectName="QgsTileScaleWidget" class="QWidget" label="">
<widget objectName="mSlider" class="QSlider" label=""/>
</widget>
<widget objectName="QgsSymbolLevelsV2DialogBase" class="QDialog" label="">
<widget objectName="QgsSymbolLevelsDialogBase" class="QDialog" label="">
<widget objectName="chkEnable" class="QCheckBox" label="Enable symbol levels"/>
<widget objectName="label" class="QLabel" label="Define the order in which the symbol layers are rendered. The numbers in the cells define in which rendering pass the layer will be drawn."/>
<widget objectName="buttonBox" class="QDialogButtonBox" label=""/>

4
src/gui/CMakeLists.txt
View File

@ -39,7 +39,7 @@ SET(QGIS_GUI_SRCS
symbology-ng/qgsstylev2managerdialog.cpp
symbology-ng/qgssvgselectorwidget.cpp
symbology-ng/qgssymbollayerwidget.cpp
symbology-ng/qgssymbollevelsv2dialog.cpp
symbology-ng/qgssymbollevelsdialog.cpp
symbology-ng/qgssymbolslistwidget.cpp
symbology-ng/qgssymbolselectordialog.cpp
symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
@ -488,7 +488,7 @@ SET(QGIS_GUI_MOC_HDRS
symbology-ng/qgsstylev2managerdialog.h
symbology-ng/qgssvgselectorwidget.h
symbology-ng/qgssymbollayerwidget.h
symbology-ng/qgssymbollevelsv2dialog.h
symbology-ng/qgssymbollevelsdialog.h
symbology-ng/qgssymbolslistwidget.h
symbology-ng/qgssymbolselectordialog.h
symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.h

4
src/gui/symbology-ng/qgsrendererv2widget.cpp
View File

@ -16,7 +16,7 @@
#include "qgssymbol.h"
#include "qgsvectorlayer.h"
#include "qgscolordialog.h"
#include "qgssymbollevelsv2dialog.h"
#include "qgssymbollevelsdialog.h"
#include "qgsexpressionbuilderdialog.h"
#include "qgsmapcanvas.h"
#include "qgspanelwidget.h"
@ -250,7 +250,7 @@ void QgsRendererV2Widget::showSymbolLevelsDialog( QgsFeatureRendererV2* r )
{
QgsLegendSymbolList symbols = r->legendSymbolItems();
QgsSymbolLevelsV2Dialog dlg( symbols, r->usingSymbolLevels(), this );
QgsSymbolLevelsDialog dlg( symbols, r->usingSymbolLevels(), this );
if ( dlg.exec() )
{

4
src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
View File

@ -392,13 +392,13 @@ void QgsRuleBasedRendererV2Widget::keyPressEvent( QKeyEvent* event )
}
}
#include "qgssymbollevelsv2dialog.h"
#include "qgssymbollevelsdialog.h"
void QgsRuleBasedRendererV2Widget::setRenderingOrder()
{
QgsLegendSymbolList lst = mRenderer->legendSymbolItems();
QgsSymbolLevelsV2Dialog dlg( lst, true, this );
QgsSymbolLevelsDialog dlg( lst, true, this );
dlg.setForceOrderingEnabled( true );
dlg.exec();

20
src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp → src/gui/symbology-ng/qgssymbollevelsdialog.cpp
View File

@ -1,5 +1,5 @@
/***************************************************************************
qgssymbollevelsv2dialog.cpp
qgssymbollevelsdialog.cpp
---------------------
begin : November 2009
copyright : (C) 2009 by Martin Dobias
@ -13,7 +13,7 @@
* *
***************************************************************************/
#include "qgssymbollevelsv2dialog.h"
#include "qgssymbollevelsdialog.h"
#include "qgssymbollayerutils.h"
#include "qgssymbollayer.h"
@ -27,7 +27,7 @@
////////////////
QgsSymbolLevelsV2Dialog::QgsSymbolLevelsV2Dialog( const QgsLegendSymbolList& list, bool usingSymbolLevels, QWidget* parent )
QgsSymbolLevelsDialog::QgsSymbolLevelsDialog( const QgsLegendSymbolList& list, bool usingSymbolLevels, QWidget* parent )
: QDialog( parent )
, mList( list )
, mForceOrderingEnabled( false )
@ -85,13 +85,13 @@ QgsSymbolLevelsV2Dialog::QgsSymbolLevelsV2Dialog( const QgsLegendSymbolList& lis
connect( tableLevels, SIGNAL( cellChanged( int, int ) ), this, SLOT( renderingPassChanged( int, int ) ) );
}
QgsSymbolLevelsV2Dialog::~QgsSymbolLevelsV2Dialog()
QgsSymbolLevelsDialog::~QgsSymbolLevelsDialog()
{
QSettings settings;
settings.setValue( "/Windows/symbolLevelsDlg/geometry", saveGeometry() );
}
void QgsSymbolLevelsV2Dialog::populateTable()
void QgsSymbolLevelsDialog::populateTable()
{
for ( int row = 0; row < mList.count(); row++ )
{
@ -121,12 +121,12 @@ void QgsSymbolLevelsV2Dialog::populateTable()
}
void QgsSymbolLevelsV2Dialog::updateUi()
void QgsSymbolLevelsDialog::updateUi()
{
tableLevels->setEnabled( chkEnable->isChecked() );
}
void QgsSymbolLevelsV2Dialog::setDefaultLevels()
void QgsSymbolLevelsDialog::setDefaultLevels()
{
for ( int i = 0; i < mList.count(); i++ )
{
@ -138,12 +138,12 @@ void QgsSymbolLevelsV2Dialog::setDefaultLevels()
}
}
bool QgsSymbolLevelsV2Dialog::usingLevels() const
bool QgsSymbolLevelsDialog::usingLevels() const
{
return chkEnable->isChecked();
}
void QgsSymbolLevelsV2Dialog::renderingPassChanged( int row, int column )
void QgsSymbolLevelsDialog::renderingPassChanged( int row, int column )
{
if ( row < 0 || row >= mList.count() )
return;
@ -153,7 +153,7 @@ void QgsSymbolLevelsV2Dialog::renderingPassChanged( int row, int column )
sym->symbolLayer( column - 1 )->setRenderingPass( tableLevels->item( row, column )->text().toInt() );
}
void QgsSymbolLevelsV2Dialog::setForceOrderingEnabled( bool enabled )
void QgsSymbolLevelsDialog::setForceOrderingEnabled( bool enabled )
{
mForceOrderingEnabled = enabled;
if ( enabled )

18
src/gui/symbology-ng/qgssymbollevelsv2dialog.h → src/gui/symbology-ng/qgssymbollevelsdialog.h
View File

@ -1,5 +1,5 @@
/***************************************************************************
qgssymbollevelsv2dialog.h
qgssymbollevelsdialog.h
---------------------
begin : November 2009
copyright : (C) 2009 by Martin Dobias
@ -12,8 +12,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef QGSSYMBOLLEVELSV2DIALOG_H
#define QGSSYMBOLLEVELSV2DIALOG_H
#ifndef QGSSYMBOLLEVELSDIALOG_H
#define QGSSYMBOLLEVELSDIALOG_H
#include <QDialog>
#include <QList>
@ -21,19 +21,19 @@
#include "qgsrendererv2.h"
#include "ui_qgssymbollevelsv2dialogbase.h"
#include "ui_qgssymbollevelsdialogbase.h"
/** \ingroup gui
* \class QgsSymbolLevelsV2Dialog
* \class QgsSymbolLevelsDialog
*/
class GUI_EXPORT QgsSymbolLevelsV2Dialog : public QDialog, private Ui::QgsSymbolLevelsV2DialogBase
class GUI_EXPORT QgsSymbolLevelsDialog : public QDialog, private Ui::QgsSymbolLevelsDialogBase
{
Q_OBJECT
public:
//! @note not available in python bindings
QgsSymbolLevelsV2Dialog( const QgsLegendSymbolList& list, bool usingSymbolLevels, QWidget* parent = nullptr );
QgsSymbolLevelsDialog( const QgsLegendSymbolList& list, bool usingSymbolLevels, QWidget* parent = nullptr );
~QgsSymbolLevelsV2Dialog();
~QgsSymbolLevelsDialog();
bool usingLevels() const;
@ -81,4 +81,4 @@ class SpinBoxDelegate : public QItemDelegate
///@endcond
#endif // QGSSYMBOLLEVELSV2DIALOG_H
#endif // QGSSYMBOLLEVELSDIALOG_H

8
src/ui/qgssymbollevelsv2dialogbase.ui → src/ui/qgssymbollevelsdialogbase.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QgsSymbolLevelsV2DialogBase</class>
<widget class="QDialog" name="QgsSymbolLevelsV2DialogBase">
<class>QgsSymbolLevelsDialogBase</class>
<widget class="QDialog" name="QgsSymbolLevelsDialogBase">
<property name="geometry">
<rect>
<x>0</x>
@ -58,7 +58,7 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>QgsSymbolLevelsV2DialogBase</receiver>
<receiver>QgsSymbolLevelsDialogBase</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@ -74,7 +74,7 @@
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>QgsSymbolLevelsV2DialogBase</receiver>
<receiver>QgsSymbolLevelsDialogBase</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">

6
tests/src/python/acceptable_missing_doc.py
View File

@ -590,7 +590,7 @@ ACCEPTABLE_MISSING_DOCS = {
"QgsMapUnitScaleDialog": ["QgsMapUnitScaleDialog(QWidget *parent=nullptr)"],
"QgsFieldExpressionWidget": ["currentFieldChanged()", "setLeftHandButtonStyle(bool isLeft)", "isExpressionValid(const QString &expressionStr)"],
"QgsRuleBasedRendererV2Widget": ["editRule(const QModelIndex &index)", "editRule()", "refineRuleScalesGui(const QModelIndexList &index)", "restoreSectionWidths()", "QgsRuleBasedRendererV2Widget(QgsVectorLayer *layer, QgsStyleV2 *style, QgsFeatureRendererV2 *renderer)", "currentRuleChanged(const QModelIndex &current=QModelIndex(), const QModelIndex &previous=QModelIndex())", "clearFeatureCounts()", "refineRuleRanges()", "setRenderingOrder()", "addRule()", "create(QgsVectorLayer *layer, QgsStyleV2 *style, QgsFeatureRendererV2 *renderer)", "refineRuleCategories()", "refineRuleRangesGui(const QModelIndexList &index)", "currentRule()", "selectedRulesChanged()", "refineRuleCategoriesGui(const QModelIndexList &index)", "saveSectionWidth(int section, int oldSize, int newSize)", "refineRule(int type)", "removeRule()", "selectedRules()", "countFeatures()", "refineRuleScales()"],
"QgsSymbolLevelsV2Dialog": ["renderingPassChanged(int row, int column)", "setForceOrderingEnabled(bool enabled)", "updateUi()", "usingLevels() const "],
"QgsSymbolLevelsDialog": ["renderingPassChanged(int row, int column)", "setForceOrderingEnabled(bool enabled)", "updateUi()", "usingLevels() const "],
"QgsAbstractGeometryV2": ["QgsAbstractGeometryV2(const QgsAbstractGeometryV2 &geom)", "ringCount(int part=0) const =0", "vertexCount(int part=0, int ring=0) const =0"],
"QgsUuidWidgetWrapper": ["QgsUuidWidgetWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor=nullptr, QWidget *parent=nullptr)"],
"QgsSimpleLineSymbolLayerV2Widget": ["penStyleChanged()", "penWidthChanged()", "create(const QgsVectorLayer *vl)", "offsetChanged()", "updatePatternIcon()", "colorChanged(const QColor &color)", "QgsSimpleLineSymbolLayerV2Widget(const QgsVectorLayer *vl, QWidget *parent=nullptr)"],
@ -1088,7 +1088,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [
"QgsNetworkDiskCache",
"QgsFillSymbolLayerV2",
"QgsRendererRulePropsDialog",
"QgsSymbolLevelsV2Dialog",
"QgsSymbolLevelsDialog",
"QWebPage",
"QgsPointLocator_VisitorNearestEdge",
"QgsStringStatisticalSummary",
@ -1637,7 +1637,7 @@ ACCEPTABLE_MISSING_BRIEF = ['QgsBrushStyleComboBox',
'QgsWkbPtr',
'QgsSymbolLayer',
'QgsVectorFileWriter::StringOption',
'QgsSymbolLevelsV2Dialog',
'QgsSymbolLevelsDialog',
'QgsPenJoinStyleComboBox',
'QgsValueRelationWidgetFactory',
'QgsGlowWidget',