sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-04 00:06:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3359 from jef-n/api-updates-v2

Browse Source 
Replace V2 in API
This commit is contained in:
Jürgen Fischer 2016-08-10 13:29:53 +02:00 committed by GitHub
commit f38856e738
624 changed files with 8889 additions and 9674 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
doc/api_break.dox
View File

@ -22,23 +22,146 @@ This page tries to maintain a list with incompatible changes that happened in pr
<table>
<caption id="renamed_classes">Renamed classes</caption>
<tr><th>API 2.x <th>API 3.X
<tr><td>QgsAttributeAction <td>QgsActionManager
<tr><td>QgsColorButtonV2 <td>QgsColorButton
<tr><td>QgsSymbolLayerV2 <td>QgsSymbolLayer
<tr><td>QgsSymbolLayerV2AbstractMetadata <td>QgsSymbolLayerAbstractMetadata
<tr><td>QgsSymbolLayerV2Metadata <td>QgsSymbolLayerMetadata
<tr><td>QgsSymbolLayerV2Registry <td>QgsSymbolLayerRegistry
<tr><td>QgsSymbolLayerV2Utils <td>QgsSymbolLayerUtils
<tr><td>QgsSymbolLayerV2Widget <td>QgsSymbolLayerWidget
<tr><td>QgsSymbolLevelsV2Dialog <td>QgsSymbolLevelsDialog
<tr><td>QgsSymbologyV2Conversion <td>QgsSymbologyConversion
<tr><th>QgsSymbolV2 <th>QgsSymbol
<tr><td>QgsSymbolV2LegendNode <td>QgsSymbolLegendNode
<tr><td>QgsSymbolV2LevelItem <td>QgsSymbolLevelItem
<tr><td>QgsSymbolV2RenderContext <td>QgsSymbolRenderContext
<tr><td>QgsSymbolV2SelectorDialog <td>QgsSymbolSelectorDialog
<tr><td>QgsSymbolV2SelectorWidget <td>QgsSymbolSelectorWidget
<tr><th>API 2.x<th>API 3.X
<tr><td>QgsAttributeAction<td>QgsActionManager
<tr><td>QgsAbstractGeometryV2<td>QgsAbstractGeometry
<tr><td>QgsCategorizedSymbolRendererV2<td>QgsCategorizedSymbolRenderer
<tr><td>QgsCategorizedSymbolRendererV2Model<td>QgsCategorizedSymbolRendererModel
<tr><td>QgsCategorizedSymbolRendererV2ViewStyle<td>QgsCategorizedSymbolRendererViewStyle
<tr><td>QgsCategorizedSymbolRendererV2Widget<td>QgsCategorizedSymbolRendererWidget
<tr><td>QgsCentroidFillSymbolLayerV2<td>QgsCentroidFillSymbolLayer
<tr><td>QgsCentroidFillSymbolLayerV2Widget<td>QgsCentroidFillSymbolLayerWidget
<tr><td>QgsCircularStringV2<td>QgsCircularString
<tr><td>QgsColorButtonV2<td>QgsColorButton
<tr><td>QgsComposerSymbolV2Item<td>QgsComposerSymbolItem
<tr><td>QgsComposerTableAvailableSortProxyModelV2<td>QgsComposerTableAvailableSortProxyModel
<tr><td>QgsCompoundCurveV2<td>QgsCompoundCurve
<tr><td>QgsCoordinateSequenceV2<td>QgsCoordinateSequence
<tr><td>QgsCptCityColorRampV2<td>QgsCptCityColorRamp
<tr><td>QgsCptCityColorRampV2Dialog<td>QgsCptCityColorRampDialog
<tr><td>QgsCptCityColorRampV2DialogBase<td>QgsCptCityColorRampDialogBase
<tr><td>QgsCurvePolygonV2<td>QgsCurvePolygon
<tr><td>QgsCurveV2<td>QgsCurve
<tr><td>QgsDiagramRendererV2<td>QgsDiagramRenderer
<tr><td>QgsEditorWidgetV2<td>QgsEditorWidget
<tr><td>QgsEllipseSymbolLayerV2<td>QgsEllipseSymbolLayer
<tr><td>QgsEllipseSymbolLayerV2Widget<td>QgsEllipseSymbolLayerWidget
<tr><td>QgsFeatureRendererV2<td>QgsFeatureRenderer
<tr><td>QgsFillSymbolLayerV2<td>QgsFillSymbolLayer
<tr><td>QgsFillSymbolV2<td>QgsFillSymbol
<tr><td>QgsFontMarkerSymbolLayerV2<td>QgsFontMarkerSymbolLayer
<tr><td>QgsFontMarkerSymbolLayerV2Widget<td>QgsFontMarkerSymbolLayerWidget
<tr><td>QgsGeometryCollectionV2<td>QgsGeometryCollection
<tr><td>QgsGeometryGeneratorSymbolLayerV2<td>QgsGeometryGeneratorSymbolLayer
<tr><td>QgsGradientFillSymbolLayerV2<td>QgsGradientFillSymbolLayer
<tr><td>QgsGradientFillSymbolLayerV2Widget<td>QgsGradientFillSymbolLayerWidget
<tr><td>QgsGraduatedSymbolRendererV2<td>QgsGraduatedSymbolRenderer
<tr><td>QgsGraduatedSymbolRendererV2Model<td>QgsGraduatedSymbolRendererModel
<tr><td>QgsGraduatedSymbolRendererV2ViewStyle<td>QgsGraduatedSymbolRendererViewStyle
<tr><td>QgsGraduatedSymbolRendererV2Widget<td>QgsGraduatedSymbolRendererWidget
<tr><td>QgsLabelingEngineV2<td>QgsLabelingEngine
<tr><td>QgsLegendSymbolItemV2<td>QgsLegendSymbolItem
<tr><td>QgsLineStringV2<td>QgsLineString
<tr><td>QgsLineSymbolLayerV2<td>QgsLineSymbolLayer
<tr><td>QgsLineSymbolV2<td>QgsLineSymbol
<tr><td>QgsMarkerLineSymbolLayerV2<td>QgsMarkerLineSymbolLayer
<tr><td>QgsMarkerLineSymbolLayerV2Widget<td>QgsMarkerLineSymbolLayerWidget
<tr><td>QgsMarkerSymbolLayerV2<td>QgsMarkerSymbolLayer
<tr><td>QgsMarkerSymbolV2<td>QgsMarkerSymbol
<tr><td>QgsMultiCurveV2<td>QgsMultiCurve
<tr><td>QgsMultiLineStringV2<td>QgsMultiLineString
<tr><td>QgsMultiSurfaceV2<td>QgsMultiSurface
<tr><td>QgsPointSequenceV2<td>QgsPointSequence
<tr><td>QgsRandomColorsV2<td>QgsRandomColors
<tr><td>QgsRendererCategoryV2<td>QgsRendererCategory
<tr><td>QgsRendererRangeV2<td>QgsRendererRange
<tr><td>QgsRendererRangeV2LabelFomat<td>QgsRendererRangeLabelFomat
<tr><td>QgsRendererRangeV2LabelFormat<td>QgsRendererRangeLabelFormat
<tr><td>QgsRendererV2<td>QgsRenderer
<tr><td>QgsRendererV2AbstractMetadata<td>QgsRendererAbstractMetadata
<tr><td>QgsRendererV2CreateFromSldFunc<td>QgsRendererCreateFromSldFunc
<tr><td>QgsRendererV2CreateFunc<td>QgsRendererCreateFunc
<tr><td>QgsRendererV2DataDefinedMenus<td>QgsRendererDataDefinedMenus
<tr><td>QgsRendererV2Metadata<td>QgsRendererMetadata
<tr><td>QgsRendererV2PropertiesDialog<td>QgsRendererPropertiesDialog
<tr><td>QgsRendererV2PropsDialogBase<td>QgsRendererPropsDialogBase
<tr><td>QgsRendererV2Registry<td>QgsRendererRegistry
<tr><td>QgsRendererV2Widget<td>QgsRendererWidget
<tr><td>QgsRendererV2WidgetFunc<td>QgsRendererWidgetFunc
<tr><td>QgsRingSequenceV2<td>QgsRingSequence
<tr><td>QgsRuleBasedRendererV2<td>QgsRuleBasedRenderer
<tr><td>QgsRuleBasedRendererV2Count<td>QgsRuleBasedRendererCount
<tr><td>QgsRuleBasedRendererV2Model<td>QgsRuleBasedRendererModel
<tr><td>QgsRuleBasedRendererV2Widget<td>QgsRuleBasedRendererWidget
<tr><td>QgsShapeburstFillSymbolLayerV2<td>QgsShapeburstFillSymbolLayer
<tr><td>QgsShapeburstFillSymbolLayerV2Widget<td>QgsShapeburstFillSymbolLayerWidget
<tr><td>QgsSimpleFillSymbolLayerV2<td>QgsSimpleFillSymbolLayer
<tr><td>QgsSimpleFillSymbolLayerV2Widget<td>QgsSimpleFillSymbolLayerWidget
<tr><td>QgsSimpleLineSymbolLayerV2<td>QgsSimpleLineSymbolLayer
<tr><td>QgsSimpleLineSymbolLayerV2Widget<td>QgsSimpleLineSymbolLayerWidget
<tr><td>QgsSimpleMarkerSymbolLayerV2<td>QgsSimpleMarkerSymbolLayer
<tr><td>QgsSimpleMarkerSymbolLayerV2Widget<td>QgsSimpleMarkerSymbolLayerWidget
<tr><td>QgsSingleSymbolRendererV2<td>QgsSingleSymbolRenderer
<tr><td>QgsSingleSymbolRendererV2Widget<td>QgsSingleSymbolRendererWidget
<tr><td>QgsStyleV2<td>QgsStyle
<tr><td>QgsStyleV2ExportImportDialog<td>QgsStyleExportImportDialog
<tr><td>QgsStyleV2ExportImportDialogBase<td>QgsStyleExportImportDialogBase
<tr><td>QgsStyleV2GroupSelectionDialog<td>QgsStyleGroupSelectionDialog
<tr><td>QgsStyleV2ManagerDialog<td>QgsStyleManagerDialog
<tr><td>QgsStyleV2ManagerDialogBase<td>QgsStyleManagerDialogBase
<tr><td>QgsSurfaceV2<td>QgsSurface
<tr><td>QgsSvgMarkerSymbolLayerV2<td>QgsSvgMarkerSymbolLayer
<tr><td>QgsSvgMarkerSymbolLayerV2Widget<td>QgsSvgMarkerSymbolLayerWidget
<tr><td>QgsSymbolLayerV2<td>QgsSymbolLayer
<tr><td>QgsSymbolLayerV2AbstractMetadata<td>QgsSymbolLayerAbstractMetadata
<tr><td>QgsSymbolLayerV2Metadata<td>QgsSymbolLayerMetadata
<tr><td>QgsSymbolLayerV2Registry<td>QgsSymbolLayerRegistry
<tr><td>QgsSymbolLayerV2Utils<td>QgsSymbolLayerUtils
<tr><td>QgsSymbolLayerV2Widget<td>QgsSymbolLayerWidget
<tr><td>QgsSymbolLevelsV2Dialog<td>QgsSymbolLevelsDialog
<tr><td>QgsSymbolV2LegendNode<td>QgsSymbolLegendNode
<tr><td>QgsSymbolV2LevelItem<td>QgsSymbolLevelItem
<tr><td>QgsSymbolV2RenderContext<td>QgsSymbolRenderContext
<tr><td>QgsSymbolV2SelectorDialog<td>QgsSymbolSelectorDialog
<tr><td>QgsSymbolV2SelectorWidget<td>QgsSymbolSelectorWidget
<tr><td>QgsSymbologyV2Conversion<td>QgsSymbologyConversion
<tr><td>QgsVectorColorBrewerColorRampV2<td>QgsVectorColorBrewerColorRamp
<tr><td>QgsVectorColorBrewerColorRampV2Dialog<td>QgsVectorColorBrewerColorRampDialog
<tr><td>QgsVectorColorBrewerColorRampV2DialogBase<td>QgsVectorColorBrewerColorRampDialogBase
<tr><td>QgsVectorColorRampV2<td>QgsVectorColorRamp
<tr><td>QgsVectorColorRampV2Map<td>QgsVectorColorRampMap
<tr><td>QgsVectorGradientColorRampV2<td>QgsVectorGradientColorRamp
<tr><td>QgsVectorGradientColorRampV2Dialog<td>QgsVectorGradientColorRampDialog
<tr><td>QgsVectorGradientColorRampV2DialogBase<td>QgsVectorGradientColorRampDialogBase
<tr><td>QgsVectorGradientRampV2<td>QgsVectorGradientRamp
<tr><td>QgsVectorLayersetRendererV2<td>QgsVectorLayersetRenderer
<tr><td>QgsVectorRandomColorRampV2<td>QgsVectorRandomColorRamp
<tr><td>QgsVectorRandomColorRampV2Dialog<td>QgsVectorRandomColorRampDialog
<tr><td>QgsVectorRandomColorRampV2DialogBase<td>QgsVectorRandomColorRampDialogBase
<tr><th>QgsSymbolV2<th>QgsSymbol
</table>
<table>
<caption id="renamed_enum_values">Renamed enum values</caption>
<tr><th>class</th><th>API 2.x<th>API 3.X
<tr><td>QgsLayerTreeModelLegendNode<td>SymbolV2LegacyRuleKeyRole<td>SymbolLegacyRuleKeyRole
<tr><td>QgsVectorLayer<td>EditorWidgetV2<td>EditorWidget
</table>
<table>
<caption id="renamed_methods">Renamed method names</caption>
<tr><th>class</th><th>API 2.x<th>API 3.X
<tr><td>QgsApplication<td>defaultStyleV2Path<td>defaultStylePath
<tr><td>QgsApplication<td>userStyleV2Path<td>userStylePath
<tr><td>QgsComposerShape<td>setUseSymbolV2<td>setUseSymbol
<tr><td>QgsSymbolLayerUtils<td>createSymbolLayerV2ListFromSld<td>createSymbolLayerListFromSld
<tr><td>QgsVectorLayer<td>editorWidgetV2Config<td>editorWidgetConfig
<tr><td>QgsVectorLayer<td>editorWidgetV2Text<td>editorWidgetText
<tr><td>QgsVectorLayer<td>editorWidgetV2Type<td>editorWidgetType
<tr><td>QgsVectorLayer<td>deleteVertexV2<td>deleteVertex
<tr><td>QgsVectorLayer<td>rendererV2<td>renderer
<tr><td>QgsVectorLayerEditUtils<td>deleteVertexV2<td>deleteVertex
<tr><td>QgsComposerSymbolItem<td>symbolV2<td>symbol
</table>
\subsection qgis_api_break_3_0_removed_classes Removed Classes
@ -56,6 +179,7 @@ should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinat
<li>QgsMapRenderer. It has been replaced by QgsMapRendererJob with subclasses and QgsMapSettings.</li>
<li>QgsPseudoColorShader. This shader has been broken for some time and was replaced by QgsSingleBandPseudoColorRenderer.</li>
<li>QgsRendererV2DataDefinedMenus was removed. Use QgsDataDefinedButton instead.</li>
<li>QgsLegacyHelpers.</li>
</ul>
\subsection qgis_api_break_3_0_global General changes
@ -713,6 +837,13 @@ displayExpression instead. For the map tip use mapTipTemplate() instead.</li>
<li>commitErrors() now returns an object, rather than a reference. This has no effect on PyQGIS code.</li>
<li>subsetString() was made const. This has no effect on PyQGIS code, but c++ code implementing derived layer classes will need to update the signature of this method to match.</li>
<li>label(), enableLabels(), hasLabelsEnabled(), drawLabels() have been removed. Replaced by labeling based on PAL library, see QgsLabelingEngineV2.</li>
<li>Signal layerDeleted() has been removed. Replaced by Qt signal destroyed().</li>
<li>Deprecated editor widget methods and enums and structs: struct RangeData, enum FeatureFormSuppress, enum EditType, addAttributeEditorWidget(), editorWidgetV2(), editorWidgetConfig(), attributeEditorElements(), editType(), setEditType(), editorLayout(), setEditorLayout, setEditorWidgetV2Config(), setCheckedState(), editForm(), setEditForm(), featureFormSuppress(), setFeatureFormSuppress(), editFormInit(), setEditFormInit(), valueMap(), range(), dateFormat(), fieldEditable(), labelOnTop(), setFieldEditable() and setLabelOnTop(). Use editFormConfig()</li>
<li>select() replaced by selectByRect()
<li>setSelectedFeatures() replaced by selectByIds()
<li>applyNamedStyle() replaced by applyNamedStyle()
<li>isReadOnly() use readOnly()
<li>Signal changeAttributeValue()
</ul>
\subsection qgis_api_break_3_0_QgsVectorLayerEditBuffer QgsVectorLayerEditBuffer

4
python/core/composer/qgscomposerarrow.sip
View File

@ -149,14 +149,14 @@ class QgsComposerArrow: QgsComposerItem
* @see lineSymbol
* @note added in 2.5
*/
void setLineSymbol( QgsLineSymbolV2* symbol /Transfer/ );
void setLineSymbol( QgsLineSymbol* symbol /Transfer/ );
/** Returns the line symbol used for drawing the line portion of the arrow
* @returns line symbol
* @see setLineSymbol
* @note added in 2.5
*/
QgsLineSymbolV2* lineSymbol();
QgsLineSymbol* lineSymbol();
/** Returns marker mode, which controls how the arrow endpoints are drawn
* @returns marker mode

14
python/core/composer/qgscomposerlegenditem.sip
View File

@ -41,17 +41,17 @@ class QgsComposerLegendItem : QStandardItem
};
class QgsComposerSymbolV2Item: QgsComposerLegendItem
class QgsComposerSymbolItem: QgsComposerLegendItem
{
%TypeHeaderCode
#include <qgscomposerlegenditem.h>
%End
public:
QgsComposerSymbolV2Item();
QgsComposerSymbolV2Item( const QString& text );
QgsComposerSymbolV2Item( const QIcon& icon, const QString& text );
virtual ~QgsComposerSymbolV2Item();
QgsComposerSymbolItem();
QgsComposerSymbolItem( const QString& text );
QgsComposerSymbolItem( const QIcon& icon, const QString& text );
virtual ~QgsComposerSymbolItem();
virtual QStandardItem* clone() const /Factory/;
@ -59,8 +59,8 @@ class QgsComposerSymbolV2Item: QgsComposerLegendItem
virtual void readXml( const QDomElement& itemElem, bool xServerAvailable = true );
/** Set symbol (takes ownership)*/
void setSymbolV2( QgsSymbol* s /Transfer/ );
QgsSymbol* symbolV2();
void setSymbol( QgsSymbol* s /Transfer/ );
QgsSymbol* symbol();
ItemType itemType() const;
};

8
python/core/composer/qgscomposermap.sip
View File

@ -510,12 +510,12 @@ class QgsComposerMap : QgsComposerItem
/**
* @deprecated use grid()->setLineSymbol() or grids() instead
*/
void setGridLineSymbol( QgsLineSymbolV2* symbol /Transfer/) /Deprecated/;
void setGridLineSymbol( QgsLineSymbol* symbol /Transfer/) /Deprecated/;
/**
* @deprecated use grid()->lineSymbol() or grids() instead
*/
QgsLineSymbolV2* gridLineSymbol() /Deprecated/;
QgsLineSymbol* gridLineSymbol() /Deprecated/;
/** Returns the grid's blending mode
* @deprecated use grid()->blendMode() or grids() instead
@ -612,12 +612,12 @@ class QgsComposerMap : QgsComposerItem
/**
* @deprecated use overview()->setFrameSymbol() or overviews() instead
*/
void setOverviewFrameMapSymbol( QgsFillSymbolV2* symbol /Transfer/ ) /Deprecated/;
void setOverviewFrameMapSymbol( QgsFillSymbol* symbol /Transfer/ ) /Deprecated/;
/**
* @deprecated use overview()->frameSymbol() or overviews() instead
*/
QgsFillSymbolV2* overviewFrameMapSymbol() /Deprecated/;
QgsFillSymbol* overviewFrameMapSymbol() /Deprecated/;
/** Returns the overview's blending mode
* @deprecated use overview()->blendMode() or overviews() instead

12
python/core/composer/qgscomposermapgrid.sip
View File

@ -451,7 +451,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
* @see setMarkerSymbol
* @see setStyle
*/
void setLineSymbol( QgsLineSymbolV2* symbol /Transfer/ );
void setLineSymbol( QgsLineSymbol* symbol /Transfer/ );
/** Gets the line symbol used for drawing grid lines. This is only used for grids with
* QgsComposerMapGrid::Solid or QgsComposerMapGrid::Cross styles.
@ -461,7 +461,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
* @see style
* @note not available in python bindings
*/
// const QgsLineSymbolV2* lineSymbol() const { return mGridLineSymbol; }
// const QgsLineSymbol* lineSymbol() const { return mGridLineSymbol; }
/** Gets the line symbol used for drawing grid lines. This is only used for grids with
* QgsComposerMapGrid::Solid or QgsComposerMapGrid::Cross styles.
@ -470,7 +470,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
* @see markerSymbol
* @see style
*/
QgsLineSymbolV2* lineSymbol();
QgsLineSymbol* lineSymbol();
/** Sets the marker symbol used for drawing grid points. This is only used for grids with a
* QgsComposerMapGrid::Markers style.
@ -479,7 +479,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
* @see setLineSymbol
* @see setStyle
*/
void setMarkerSymbol( QgsMarkerSymbolV2* symbol /Transfer/);
void setMarkerSymbol( QgsMarkerSymbol* symbol /Transfer/);
/** Gets the marker symbol used for drawing grid points. This is only used for grids with a
* QgsComposerMapGrid::Markers style.
@ -489,7 +489,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
* @see style
* @note not available in python bindings
*/
// const QgsMarkerSymbolV2* markerSymbol() const { return mGridMarkerSymbol; }
// const QgsMarkerSymbol* markerSymbol() const { return mGridMarkerSymbol; }
/** Gets the marker symbol used for drawing grid points. This is only used for grids with a
* QgsComposerMapGrid::Markers style.
@ -498,7 +498,7 @@ class QgsComposerMapGrid : QgsComposerMapItem
* @see lineSymbol
* @see style
*/
QgsMarkerSymbolV2* markerSymbol();
QgsMarkerSymbol* markerSymbol();
//
// ANNOTATIONS

6
python/core/composer/qgscomposermapoverview.sip
View File

@ -157,20 +157,20 @@ class QgsComposerMapOverview : QgsComposerMapItem
* @param symbol fill symbol for overview
* @see frameSymbol
*/
void setFrameSymbol( QgsFillSymbolV2* symbol /Transfer/ );
void setFrameSymbol( QgsFillSymbol* symbol /Transfer/ );
/** Gets the fill symbol used for drawing the overview extent.
* @returns fill symbol for overview
* @see setFrameSymbol
*/
QgsFillSymbolV2* frameSymbol();
QgsFillSymbol* frameSymbol();
/** Gets the fill symbol used for drawing the overview extent.
* @returns fill symbol for overview
* @see setFrameSymbol
* @note not available in python bindings
*/
// const QgsFillSymbolV2* frameSymbol() const { return mFrameSymbol; }
// const QgsFillSymbol* frameSymbol() const { return mFrameSymbol; }
/** Retrieves the blending mode used for drawing the overview.
* @returns blending mode for overview

4
python/core/composer/qgscomposerpolygon.sip
View File

@ -13,10 +13,10 @@ class QgsComposerPolygon: QgsComposerNodesItem
virtual QString displayName() const;
/** Returns the QgsSymbol used to draw the shape. */
QgsFillSymbolV2* polygonStyleSymbol();
QgsFillSymbol* polygonStyleSymbol();
/** Set the QgsSymbol used to draw the shape. */
void setPolygonStyleSymbol( QgsFillSymbolV2* symbol );
void setPolygonStyleSymbol( QgsFillSymbol* symbol );
/** Return correct graphics item type. */
virtual int type() const;

4
python/core/composer/qgscomposerpolyline.sip
View File

@ -13,10 +13,10 @@ class QgsComposerPolyline: QgsComposerNodesItem
virtual QString displayName() const;
/** Returns the QgsSymbol used to draw the shape. */
QgsLineSymbolV2* polylineStyleSymbol();
QgsLineSymbol* polylineStyleSymbol();
/** Set the QgsSymbol used to draw the shape. */
void setPolylineStyleSymbol( QgsLineSymbolV2* symbol );
void setPolylineStyleSymbol( QgsLineSymbol* symbol );
/** Overridden to return shape type */
virtual int type() const;

16
python/core/composer/qgscomposershape.sip
View File

@ -39,22 +39,22 @@ class QgsComposerShape: QgsComposerItem
QgsComposerShape::Shape shapeType() const;
void setShapeType( QgsComposerShape::Shape s );
/** Sets radius for rounded rectangle corners. Added in v2.1 */
/** Sets radius for rounded rectangle corners. Added in 2.1 */
void setCornerRadius( double radius );
/** Returns the radius for rounded rectangle corners*/
double cornerRadius() const;
/** Sets the QgsFillSymbolV2 used to draw the shape. Must also call setUseSymbolV2( true ) to
/** Sets the QgsFillSymbol used to draw the shape. Must also call setUseSymbol( true ) to
* enable drawing with a symbol.
* Note: added in version 2.1*/
void setShapeStyleSymbol( QgsFillSymbolV2* symbol );
/** Returns the QgsFillSymbolV2 used to draw the shape.
void setShapeStyleSymbol( QgsFillSymbol* symbol );
/** Returns the QgsFillSymbol used to draw the shape.
* Note: added in version 2.1*/
QgsFillSymbolV2* shapeStyleSymbol();
QgsFillSymbol* shapeStyleSymbol();
/** Controls whether the shape should be drawn using a QgsFillSymbolV2.
* Note: Added in v2.1 */
void setUseSymbolV2( bool useSymbolV2 );
/** Controls whether the shape should be drawn using a QgsFillSymbol.
* Note: Added in 2.1 */
void setUseSymbol( bool useSymbol );
/** Depending on the symbol style, the bounding rectangle can be larger than the shape
@note this function was added in version 2.3*/

4
python/core/composer/qgscomposition.sip
View File

@ -157,9 +157,9 @@ class QgsComposition : QGraphicsScene
bool shouldExportPage( const int page ) const;
/** Note: added in version 2.1*/
void setPageStyleSymbol( QgsFillSymbolV2* symbol );
void setPageStyleSymbol( QgsFillSymbol* symbol );
/** Note: added in version 2.1*/
QgsFillSymbolV2* pageStyleSymbol();
QgsFillSymbol* pageStyleSymbol();
/** Returns the position within a page of a point in the composition
@note Added in QGIS 2.1

58
python/core/core.sip
View File

@ -216,7 +216,7 @@
%Include diagram/qgshistogramdiagram.sip
%Include diagram/qgspiediagram.sip
%Include diagram/qgstextdiagram.sip
%Include qgsdiagramrendererv2.sip
%Include qgsdiagramrenderer.sip
%Include effects/qgsblureffect.sip
%Include effects/qgscoloreffect.sip
@ -287,29 +287,29 @@
%Include symbology-ng/qgscolorbrewerpalette.sip
%Include symbology-ng/qgscptcityarchive.sip
%Include symbology-ng/qgsstylev2.sip
%Include symbology-ng/qgsstyle.sip
%Include symbology-ng/qgssvgcache.sip
%Include symbology-ng/qgssymbol.sip
%Include symbology-ng/qgsvectorcolorrampv2.sip
%Include symbology-ng/qgsvectorcolorramp.sip
%Include symbology-ng/qgs25drenderer.sip
%Include symbology-ng/qgscategorizedsymbolrendererv2.sip
%Include symbology-ng/qgsgraduatedsymbolrendererv2.sip
%Include symbology-ng/qgscategorizedsymbolrenderer.sip
%Include symbology-ng/qgsgraduatedsymbolrenderer.sip
%Include symbology-ng/qgsheatmaprenderer.sip
%Include symbology-ng/qgsinvertedpolygonrenderer.sip
%Include symbology-ng/qgslegendsymbolitemv2.sip
%Include symbology-ng/qgslegendsymbolitem.sip
%Include symbology-ng/qgsnullsymbolrenderer.sip
%Include symbology-ng/qgspointdisplacementrenderer.sip
%Include symbology-ng/qgsrendererv2.sip
%Include symbology-ng/qgsrendererv2registry.sip
%Include symbology-ng/qgsrulebasedrendererv2.sip
%Include symbology-ng/qgssinglesymbolrendererv2.sip
%Include symbology-ng/qgsrenderer.sip
%Include symbology-ng/qgsrendererregistry.sip
%Include symbology-ng/qgsrulebasedrenderer.sip
%Include symbology-ng/qgssinglesymbolrenderer.sip
%Include symbology-ng/qgsellipsesymbollayerv2.sip
%Include symbology-ng/qgsfillsymbollayerv2.sip
%Include symbology-ng/qgsgeometrygeneratorsymbollayerv2.sip
%Include symbology-ng/qgslinesymbollayerv2.sip
%Include symbology-ng/qgsmarkersymbollayerv2.sip
%Include symbology-ng/qgsellipsesymbollayer.sip
%Include symbology-ng/qgsfillsymbollayer.sip
%Include symbology-ng/qgsgeometrygeneratorsymbollayer.sip
%Include symbology-ng/qgslinesymbollayer.sip
%Include symbology-ng/qgsmarkersymbollayer.sip
%Include symbology-ng/qgssymbollayer.sip
%Include symbology-ng/qgssymbollayerregistry.sip
%Include symbology-ng/qgssymbollayerutils.sip
@ -320,22 +320,22 @@
%Include dxf/qgsdxfexport.sip
%Include geometry/qgsabstractgeometryv2.sip
%Include geometry/qgscircularstringv2.sip
%Include geometry/qgscompoundcurvev2.sip
%Include geometry/qgscurvepolygonv2.sip
%Include geometry/qgscurvev2.sip
%Include geometry/qgsabstractgeometry.sip
%Include geometry/qgscircularstring.sip
%Include geometry/qgscompoundcurve.sip
%Include geometry/qgscurvepolygon.sip
%Include geometry/qgscurve.sip
%Include geometry/qgsgeometry.sip
%Include geometry/qgsgeometrycollectionv2.sip
%Include geometry/qgsgeometrycollection.sip
%Include geometry/qgsgeometryengine.sip
%Include geometry/qgslinestringv2.sip
%Include geometry/qgsmulticurvev2.sip
%Include geometry/qgsmultilinestringv2.sip
%Include geometry/qgsmultipointv2.sip
%Include geometry/qgsmultipolygonv2.sip
%Include geometry/qgsmultisurfacev2.sip
%Include geometry/qgslinestring.sip
%Include geometry/qgsmulticurve.sip
%Include geometry/qgsmultilinestring.sip
%Include geometry/qgsmultipoint.sip
%Include geometry/qgsmultipolygon.sip
%Include geometry/qgsmultisurface.sip
%Include geometry/qgspointv2.sip
%Include geometry/qgspolygonv2.sip
%Include geometry/qgssurfacev2.sip
%Include geometry/qgspolygon.sip
%Include geometry/qgssurface.sip
%Include geometry/qgswkbtypes.sip
%Include geometry/qgswkbptr.sip

6
python/core/dxf/qgsdxfexport.sip
View File

@ -240,7 +240,7 @@ class QgsDxfExport
* @note not available in Python bindings
* @note added in 2.15
*/
// void writePolyline( const QgsPointSequenceV2 &line, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 );
// void writePolyline( const QgsPointSequence &line, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 );
/**
* Draw dxf filled polygon (HATCH)
@ -248,7 +248,7 @@ class QgsDxfExport
* @param layer layer name to use
* @param hatchPattern hatchPattern to use
* @param color color to use
* @deprecated use version with QgsRingSequenceV2
* @deprecated use version with QgsRingSequence
*/
void writePolygon( const QgsPolygon &polygon, const QString &layer, const QString &hatchPattern, const QColor& color ) /Deprecated/;
@ -261,7 +261,7 @@ class QgsDxfExport
* @note not available in Python bindings
* @note added in 2.15
*/
// void writePolygon( const QgsRingSequenceV2 &polygon, const QString &layer, const QString &hatchPattern, const QColor& color );
// void writePolygon( const QgsRingSequence &polygon, const QString &layer, const QString &hatchPattern, const QColor& color );
/**
* Draw dxf filled polygon (SOLID)

8
python/core/effects/qgsgloweffect.sip
View File

@ -129,7 +129,7 @@ class QgsGlowEffect : QgsPaintEffect
* @see ramp
* @see setColorType
*/
void setRamp( QgsVectorColorRampV2* ramp /Transfer/ );
void setRamp( QgsVectorColorRamp* ramp /Transfer/ );
/** Returns the color ramp used for the glow. This only applies if the @link colorType @endlink
* is set to ColorRamp. The glow will utilise colors from the ramp.
@ -137,7 +137,7 @@ class QgsGlowEffect : QgsPaintEffect
* @see setRamp
* @see colorType
*/
QgsVectorColorRampV2* ramp() const;
QgsVectorColorRamp* ramp() const;
/** Sets the blend mode for the effect
* @param mode blend mode used for drawing the effect on to a destination
@ -153,7 +153,7 @@ class QgsGlowEffect : QgsPaintEffect
*/
QPainter::CompositionMode blendMode() const;
/** Sets the color mode to use for the glow. The glow can either be drawn using a QgsVectorColorRampV2
/** Sets the color mode to use for the glow. The glow can either be drawn using a QgsVectorColorRamp
* color ramp or by simply specificing a single color. setColorType is used to specify which mode to use
* for the glow.
* @param colorType color type to use for glow
@ -163,7 +163,7 @@ class QgsGlowEffect : QgsPaintEffect
*/
void setColorType( GlowColorType colorType );
/** Returns the color mode used for the glow. The glow can either be drawn using a QgsVectorColorRampV2
/** Returns the color mode used for the glow. The glow can either be drawn using a QgsVectorColorRamp
* color ramp or by specificing a single color.
* @returns current color mode used for the glow
* @see setColorType

2
python/core/effects/qgsimageoperation.sip
View File

@ -96,7 +96,7 @@ class QgsImageOperation
double spread;
/** Color ramp to use for shading the distance transform
*/
QgsVectorColorRampV2* ramp;
QgsVectorColorRamp* ramp;
};
/** Performs a distance transform on the source image and shades the result

66
python/core/geometry/qgsabstractgeometryv2.sip → python/core/geometry/qgsabstractgeometry.sip
View File

@ -1,7 +1,7 @@
struct QgsVertexId
{
%TypeHeaderCode
#include <qgsabstractgeometryv2.h>
#include <qgsabstractgeometry.h>
%End
enum VertexType
@ -19,7 +19,7 @@ struct QgsVertexId
bool partEqual( QgsVertexId o ) const;
bool ringEqual( QgsVertexId o ) const;
bool vertexEqual( QgsVertexId o ) const;
bool isValid(const QgsAbstractGeometryV2* geom) const;
bool isValid(const QgsAbstractGeometry* geom) const;
int part;
int ring;
@ -28,42 +28,42 @@ struct QgsVertexId
};
/** \ingroup core
* \class QgsAbstractGeometryV2
* \class QgsAbstractGeometry
* \brief Abstract base class for all geometries
* \note added in QGIS 2.10
*/
class QgsAbstractGeometryV2
class QgsAbstractGeometry
{
%TypeHeaderCode
#include <qgsabstractgeometryv2.h>
#include <qgslinestringv2.h>
#include <qgsabstractgeometry.h>
#include <qgslinestring.h>
%End
%ConvertToSubClassCode
if (dynamic_cast<QgsPointV2*>(sipCpp) != NULL)
sipType = sipType_QgsPointV2;
else if (dynamic_cast<QgsLineStringV2*>(sipCpp) != NULL )
sipType = sipType_QgsLineStringV2;
else if (dynamic_cast<QgsCircularStringV2*>(sipCpp) != NULL )
sipType = sipType_QgsCircularStringV2;
else if (dynamic_cast<QgsCompoundCurveV2*>(sipCpp) != NULL )
sipType = sipType_QgsCompoundCurveV2;
else if (dynamic_cast<QgsLineString*>(sipCpp) != NULL )
sipType = sipType_QgsLineString;
else if (dynamic_cast<QgsCircularString*>(sipCpp) != NULL )
sipType = sipType_QgsCircularString;
else if (dynamic_cast<QgsCompoundCurve*>(sipCpp) != NULL )
sipType = sipType_QgsCompoundCurve;
else if (dynamic_cast<QgsPolygonV2*>(sipCpp) != NULL )
sipType = sipType_QgsPolygonV2;
else if (dynamic_cast<QgsCurvePolygonV2*>(sipCpp) != NULL )
sipType = sipType_QgsCurvePolygonV2;
else if (dynamic_cast<QgsCurvePolygon*>(sipCpp) != NULL )
sipType = sipType_QgsCurvePolygon;
else if (dynamic_cast<QgsMultiPointV2*>(sipCpp) != NULL )
sipType = sipType_QgsMultiPointV2;
else if (dynamic_cast<QgsMultiLineStringV2*>(sipCpp) != NULL )
sipType = sipType_QgsMultiLineStringV2;
else if (dynamic_cast<QgsMultiLineString*>(sipCpp) != NULL )
sipType = sipType_QgsMultiLineString;
else if (dynamic_cast<QgsMultiPolygonV2*>(sipCpp) != NULL )
sipType = sipType_QgsMultiPolygonV2;
else if (dynamic_cast<QgsMultiSurfaceV2*>(sipCpp) != NULL )
sipType = sipType_QgsMultiSurfaceV2;
else if (dynamic_cast<QgsMultiCurveV2*>(sipCpp) != NULL )
sipType = sipType_QgsMultiCurveV2;
else if (dynamic_cast<QgsGeometryCollectionV2*>(sipCpp) != NULL )
sipType = sipType_QgsGeometryCollectionV2;
else if (dynamic_cast<QgsMultiSurface*>(sipCpp) != NULL )
sipType = sipType_QgsMultiSurface;
else if (dynamic_cast<QgsMultiCurve*>(sipCpp) != NULL )
sipType = sipType_QgsMultiCurve;
else if (dynamic_cast<QgsGeometryCollection*>(sipCpp) != NULL )
sipType = sipType_QgsGeometryCollection;
else
sipType = 0;
%End
@ -78,14 +78,14 @@ class QgsAbstractGeometryV2
};
QgsAbstractGeometryV2();
virtual ~QgsAbstractGeometryV2();
QgsAbstractGeometryV2( const QgsAbstractGeometryV2& geom );
//virtual QgsAbstractGeometryV2& operator=( const QgsAbstractGeometryV2& geom );
QgsAbstractGeometry();
virtual ~QgsAbstractGeometry();
QgsAbstractGeometry( const QgsAbstractGeometry& geom );
//virtual QgsAbstractGeometry& operator=( const QgsAbstractGeometry& geom );
/** Clones the geometry by performing a deep copy
*/
virtual QgsAbstractGeometryV2* clone() const = 0;
virtual QgsAbstractGeometry* clone() const = 0;
/** Clears the geometry, ie reset it to a null geometry
*/
@ -135,7 +135,7 @@ class QgsAbstractGeometryV2
* @returns boundary for geometry. May be null for some geometry types.
* @note added in QGIS 3.0
*/
virtual QgsAbstractGeometryV2* boundary() const = 0;
virtual QgsAbstractGeometry* boundary() const = 0;
//import
@ -327,13 +327,13 @@ class QgsAbstractGeometryV2
* @param tolerance segmentation tolerance
* @param toleranceType maximum segmentation angle or maximum difference between approximation and curve
*/
virtual QgsAbstractGeometryV2* segmentize( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
virtual QgsAbstractGeometry* segmentize( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
/** Returns the geometry converted to the more generic curve type.
E.g. QgsLineStringV2 -> QgsCompoundCurveV2, QgsPolygonV2 -> QgsCurvePolygonV2,
QgsMultiLineStringV2 -> QgsMultiCurveV2, QgsMultiPolygonV2 -> QgsMultiSurfaceV2
E.g. QgsLineString -> QgsCompoundCurve, QgsPolygonV2 -> QgsCurvePolygon,
QgsMultiLineString -> QgsMultiCurve, QgsMultiPolygonV2 -> QgsMultiSurface
@return the converted geometry. Caller takes ownership*/
virtual QgsAbstractGeometryV2* toCurveType() const /Factory/;
virtual QgsAbstractGeometry* toCurveType() const /Factory/;
/** Returns approximate angle at a vertex. This is usually the average angle between adjacent
* segments, and can be pictured as the orientation of a line following the curvature of the
@ -396,7 +396,7 @@ class QgsAbstractGeometryV2
/** Updates the geometry type based on whether sub geometries contain z or m values.
*/
void setZMTypeFromSubGeometry( const QgsAbstractGeometryV2* subggeom, QgsWkbTypes::Type baseGeomType );
void setZMTypeFromSubGeometry( const QgsAbstractGeometry* subggeom, QgsWkbTypes::Type baseGeomType );
/** Default calculator for the minimal bounding box for the geometry. Derived classes should override this method
* if a more efficient bounding box calculation is available.

34
python/core/geometry/qgscircularstringv2.sip → python/core/geometry/qgscircularstring.sip
View File

@ -1,19 +1,19 @@
class QgsCircularStringV2: public QgsCurveV2
class QgsCircularString: public QgsCurve
{
%TypeHeaderCode
#include <qgscircularstringv2.h>
#include <qgscircularstring.h>
%End
public:
QgsCircularStringV2();
~QgsCircularStringV2();
QgsCircularString();
~QgsCircularString();
virtual bool operator==( const QgsCurveV2& other ) const;
virtual bool operator!=( const QgsCurveV2& other ) const;
virtual bool operator==( const QgsCurve& other ) const;
virtual bool operator!=( const QgsCurve& other ) const;
virtual QString geometryType() const;
virtual int dimension() const;
virtual QgsCircularStringV2* clone() const;
virtual QgsCircularString* clone() const;
virtual void clear();
virtual bool fromWkb( QgsConstWkbPtr wkb );
@ -33,7 +33,7 @@ class QgsCircularStringV2: public QgsCurveV2
QgsPointV2 pointN( int i ) const;
/**
* @copydoc QgsCurveV2::points()
* @copydoc QgsCurve::points()
*/
void points( QList<QgsPointV2>& pts ) const;
@ -42,23 +42,23 @@ class QgsCircularStringV2: public QgsCurveV2
void setPoints( const QList<QgsPointV2>& points );
/**
* @copydoc QgsAbstractGeometryV2::length()
* @copydoc QgsAbstractGeometry::length()
*/
virtual double length() const;
/**
* @copydoc QgsCurveV2::startPoint()
* @copydoc QgsCurve::startPoint()
*/
virtual QgsPointV2 startPoint() const;
/**
* @copydoc QgsCurveV2::endPoint()
* @copydoc QgsCurve::endPoint()
*/
virtual QgsPointV2 endPoint() const;
/** Returns a new line string geometry corresponding to a segmentized approximation
* of the curve.
* @param tolerance segmentation tolerance
* @param toleranceType maximum segmentation angle or maximum difference between approximation and curve*/
virtual QgsLineStringV2* curveToLine( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const;
virtual QgsLineString* curveToLine( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const;
void draw( QPainter& p ) const;
void transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
@ -67,7 +67,7 @@ class QgsCircularStringV2: public QgsCurveV2
void addToPainterPath( QPainterPath& path ) const;
/**
* @copydoc QgsCurveV2::drawAsPolygon()
* @copydoc QgsCurve::drawAsPolygon()
*/
void drawAsPolygon( QPainter& p ) const;
@ -77,17 +77,17 @@ class QgsCircularStringV2: public QgsCurveV2
double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const;
/**
* @copydoc QgsCurveV2::pointAt()
* @copydoc QgsCurve::pointAt()
*/
bool pointAt( int node, QgsPointV2& point, QgsVertexId::VertexType& type ) const;
/**
* @copydoc QgsCurveV2::sumUpArea()
* @copydoc QgsCurve::sumUpArea()
*/
void sumUpArea( double& sum ) const;
/**
* @copydoc QgsAbstractGeometryV2::hasCurvedSegments()
* @copydoc QgsAbstractGeometry::hasCurvedSegments()
*/
bool hasCurvedSegments() const;
@ -96,7 +96,7 @@ class QgsCircularStringV2: public QgsCurveV2
@return rotation in radians, clockwise from north*/
double vertexAngle( QgsVertexId vertex ) const;
virtual QgsCircularStringV2* reversed() const /Factory/;
virtual QgsCircularString* reversed() const /Factory/;
virtual bool addZValue( double zValue = 0 );
virtual bool addMValue( double mValue = 0 );

26
python/core/geometry/qgscompoundcurvev2.sip → python/core/geometry/qgscompoundcurve.sip
View File

@ -1,21 +1,21 @@
class QgsCompoundCurveV2: public QgsCurveV2
class QgsCompoundCurve: public QgsCurve
{
%TypeHeaderCode
#include <qgscompoundcurvev2.h>
#include <qgscompoundcurve.h>
%End
public:
QgsCompoundCurveV2();
QgsCompoundCurveV2( const QgsCompoundCurveV2& curve );
//QgsCompoundCurveV2 &operator=( const QgsCompoundCurveV2 & curve );
~QgsCompoundCurveV2();
QgsCompoundCurve();
QgsCompoundCurve( const QgsCompoundCurve& curve );
//QgsCompoundCurve &operator=( const QgsCompoundCurve & curve );
~QgsCompoundCurve();
virtual bool operator==( const QgsCurveV2& other ) const;
virtual bool operator!=( const QgsCurveV2& other ) const;
virtual bool operator==( const QgsCurve& other ) const;
virtual bool operator!=( const QgsCurve& other ) const;
virtual QString geometryType() const;
virtual int dimension() const;
virtual QgsCompoundCurveV2* clone() const;
virtual QgsCompoundCurve* clone() const;
virtual void clear();
virtual bool fromWkb( QgsConstWkbPtr wkb );
@ -38,7 +38,7 @@ class QgsCompoundCurveV2: public QgsCurveV2
* of the curve.
* @param tolerance segmentation tolerance
* @param toleranceType maximum segmentation angle or maximum difference between approximation and curve*/
virtual QgsLineStringV2* curveToLine( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const;
virtual QgsLineString* curveToLine( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const;
/** Returns the number of curves in the geometry.
*/
@ -46,11 +46,11 @@ class QgsCompoundCurveV2: public QgsCurveV2
/** Returns the curve at the specified index.
*/
const QgsCurveV2* curveAt( int i ) const;
const QgsCurve* curveAt( int i ) const;
/** Adds a curve to the geometr (takes ownership)
*/
void addCurve( QgsCurveV2* c /Transfer/ );
void addCurve( QgsCurve* c /Transfer/ );
/** Removes a curve from the geometry.
* @param i index of curve to remove
@ -87,7 +87,7 @@ class QgsCompoundCurveV2: public QgsCurveV2
@return rotation in radians, clockwise from north*/
double vertexAngle( QgsVertexId vertex ) const;
virtual QgsCompoundCurveV2* reversed() const /Factory/;
virtual QgsCompoundCurve* reversed() const /Factory/;
virtual bool addZValue( double zValue = 0 );
virtual bool addMValue( double mValue = 0 );

22
python/core/geometry/qgscurvev2.sip → python/core/geometry/qgscurve.sip
View File

@ -1,16 +1,16 @@
class QgsCurveV2: public QgsAbstractGeometryV2
class QgsCurve: public QgsAbstractGeometry
{
%TypeHeaderCode
#include <qgscurvev2.h>
#include <qgscurve.h>
%End
public:
QgsCurveV2();
virtual ~QgsCurveV2();
QgsCurve();
virtual ~QgsCurve();
virtual bool operator==( const QgsCurveV2& other ) const = 0;
virtual bool operator!=( const QgsCurveV2& other ) const = 0;
virtual bool operator==( const QgsCurve& other ) const = 0;
virtual bool operator!=( const QgsCurve& other ) const = 0;
virtual QgsCurveV2* clone() const = 0;
virtual QgsCurve* clone() const = 0;
/** Returns the starting point of the curve.
* @see endPoint
@ -35,7 +35,7 @@ class QgsCurveV2: public QgsAbstractGeometryV2
* @param tolerance segmentation tolerance
* @param toleranceType maximum segmentation angle or maximum difference between approximation and curve
*/
virtual QgsLineStringV2* curveToLine( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const = 0;
virtual QgsLineString* curveToLine( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const = 0;
/** Adds a curve to a painter path.
*/
@ -73,14 +73,14 @@ class QgsCurveV2: public QgsAbstractGeometryV2
/** Returns a reversed copy of the curve, where the direction of the curve has been flipped.
* @note added in QGIS 2.14
*/
virtual QgsCurveV2* reversed() const = 0 /Factory/;
virtual QgsCurve* reversed() const = 0 /Factory/;
virtual QgsAbstractGeometryV2* boundary() const /Factory/;
virtual QgsAbstractGeometry* boundary() const /Factory/;
/** Returns a geometry without curves. Caller takes ownership
* @param tolerance segmentation tolerance
* @param toleranceType maximum segmentation angle or maximum difference between approximation and curve*/
virtual QgsCurveV2* segmentize( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
virtual QgsCurve* segmentize( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
virtual int vertexCount( int part = 0, int ring = 0 ) const;
virtual int ringCount( int part = 0 ) const;

28
python/core/geometry/qgscurvepolygonv2.sip → python/core/geometry/qgscurvepolygon.sip
View File

@ -1,18 +1,18 @@
class QgsCurvePolygonV2: public QgsSurfaceV2
class QgsCurvePolygon: public QgsSurface
{
%TypeHeaderCode
#include <qgscurvepolygonv2.h>
#include <qgscurvepolygon.h>
%End
public:
QgsCurvePolygonV2();
QgsCurvePolygonV2( const QgsCurvePolygonV2& p );
//QgsCurvePolygonV2& operator=( const QgsCurvePolygonV2& p );
~QgsCurvePolygonV2();
QgsCurvePolygon();
QgsCurvePolygon( const QgsCurvePolygon& p );
//QgsCurvePolygon& operator=( const QgsCurvePolygon& p );
~QgsCurvePolygon();
virtual QString geometryType() const;
virtual int dimension() const;
virtual QgsCurvePolygonV2* clone() const;
virtual QgsCurvePolygon* clone() const;
void clear();
virtual bool fromWkb( QgsConstWkbPtr wkb );
@ -29,13 +29,13 @@ class QgsCurvePolygonV2: public QgsSurfaceV2
virtual double area() const;
virtual double perimeter() const;
QgsPolygonV2* surfaceToPolygon() const;
virtual QgsAbstractGeometryV2* boundary() const /Factory/;
virtual QgsAbstractGeometry* boundary() const /Factory/;
//curve polygon interface
int numInteriorRings() const;
const QgsCurveV2* exteriorRing() const;
const QgsCurveV2* interiorRing( int i ) const;
const QgsCurve* exteriorRing() const;
const QgsCurve* interiorRing( int i ) const;
/** Returns a new polygon geometry corresponding to a segmentized approximation
* of the curve.
* @param tolerance segmentation tolerance
@ -49,12 +49,12 @@ class QgsCurvePolygonV2: public QgsSurfaceV2
* @see setInteriorRings()
* @see exteriorRing()
*/
virtual void setExteriorRing( QgsCurveV2* ring /Transfer/ );
virtual void setExteriorRing( QgsCurve* ring /Transfer/ );
/** Sets all interior rings (takes ownership)*/
void setInteriorRings( const QList<QgsCurveV2*>& rings );
void setInteriorRings( const QList<QgsCurve*>& rings );
/** Adds an interior ring to the geometry (takes ownership)*/
virtual void addInteriorRing( QgsCurveV2* ring /Transfer/ );
virtual void addInteriorRing( QgsCurve* ring /Transfer/ );
/** Removes ring. Exterior ring is 0, first interior ring 1, ...*/
bool removeInteriorRing( int nr );
@ -75,7 +75,7 @@ class QgsCurvePolygonV2: public QgsSurfaceV2
/** Returns a geometry without curves. Caller takes ownership
* @param tolerance segmentation tolerance
* @param toleranceType maximum segmentation angle or maximum difference between approximation and curve*/
QgsAbstractGeometryV2* segmentize( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
QgsAbstractGeometry* segmentize( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
/** Returns approximate rotation angle for a vertex. Usually average angle between adjacent segments.
* @param vertex the vertex id

14
python/core/geometry/qgsgeometry.sip
View File

@ -19,7 +19,7 @@ typedef QVector< QVector< QVector<QgsPoint> > > QgsMultiPolygon;
* for geometry objects. QgsGeometry is implicitly shared, so making copies of geometries is inexpensive. The geometry
* container class can also be stored inside a QVariant object.
*
* The actual geometry representation is stored as a @link QgsAbstractGeometryV2 @endlink within the container, and
* The actual geometry representation is stored as a @link QgsAbstractGeometry @endlink within the container, and
* can be accessed via the @link geometry @endlink method or set using the @link setGeometry @endlink method.
*/
@ -40,7 +40,7 @@ class QgsGeometry
* geom is transferred.
* @note added in QGIS 2.10
*/
explicit QgsGeometry( QgsAbstractGeometryV2* geom /Transfer/ );
explicit QgsGeometry( QgsAbstractGeometry* geom /Transfer/ );
//! Destructor
~QgsGeometry();
@ -49,13 +49,13 @@ class QgsGeometry
* @note added in QGIS 2.10
* @see setGeometry
*/
QgsAbstractGeometryV2* geometry() const;
QgsAbstractGeometry* geometry() const;
/** Sets the underlying geometry store. Ownership of geometry is transferred.
* @note added in QGIS 2.10
* @see geometry
*/
void setGeometry( QgsAbstractGeometryV2* geometry /Transfer/ );
void setGeometry( QgsAbstractGeometry* geometry /Transfer/ );
/** Returns true if the geometry is empty (ie, contains no underlying geometry
* accessible via @link geometry @endlink).
@ -303,7 +303,7 @@ class QgsGeometry
@return 0 in case of success (ring added), 1 problem with geometry type, 2 ring not closed,
3 ring is not valid geometry, 4 ring not disjoint with existing rings, 5 no polygon found which contained the ring*/
// TODO QGIS 3.0 returns an enum instead of a magic constant
int addRing( QgsCurveV2* ring );
int addRing( QgsCurve* ring );
/** Adds a new part to a the geometry.
* @param points points describing part to add
@ -330,7 +330,7 @@ class QgsGeometry
* not disjoint with existing polygons of the feature
*/
// TODO QGIS 3.0 returns an enum instead of a magic constant
int addPart( QgsAbstractGeometryV2* part /Transfer/, QgsWkbTypes::GeometryType geomType = QgsWkbTypes::UnknownGeometry );
int addPart( QgsAbstractGeometry* part /Transfer/, QgsWkbTypes::GeometryType geomType = QgsWkbTypes::UnknownGeometry );
/** Adds a new island polygon to a multipolygon feature
* @param newPart part to add. Ownership is NOT transferred.
@ -777,7 +777,7 @@ class QgsGeometry
/** Creates and returns a new geometry engine
*/
static QgsGeometryEngine* createGeometryEngine( const QgsAbstractGeometryV2* geometry ) /Factory/;
static QgsGeometryEngine* createGeometryEngine( const QgsAbstractGeometry* geometry ) /Factory/;
/** Upgrades a point list from QgsPoint to QgsPointV2
* @param input list of QgsPoint objects to be upgraded

28
python/core/geometry/qgsgeometrycollectionv2.sip → python/core/geometry/qgsgeometrycollection.sip
View File

@ -1,16 +1,16 @@
class QgsGeometryCollectionV2: public QgsAbstractGeometryV2
class QgsGeometryCollection: public QgsAbstractGeometry
{
%TypeHeaderCode
#include <qgsgeometrycollectionv2.h>
#include <qgsgeometrycollection.h>
%End
public:
QgsGeometryCollectionV2();
QgsGeometryCollectionV2( const QgsGeometryCollectionV2& c );
//QgsGeometryCollectionV2& operator=( const QgsGeometryCollectionV2& c );
virtual ~QgsGeometryCollectionV2();
QgsGeometryCollection();
QgsGeometryCollection( const QgsGeometryCollection& c );
//QgsGeometryCollection& operator=( const QgsGeometryCollection& c );
virtual ~QgsGeometryCollection();
virtual QgsGeometryCollectionV2* clone() const;
virtual QgsGeometryCollection* clone() const;
/** Returns the number of geometries within the collection.
*/
@ -19,27 +19,27 @@ class QgsGeometryCollectionV2: public QgsAbstractGeometryV2
/** Returns a const reference to a geometry from within the collection.
* @param n index of geometry to return
*/
//const QgsAbstractGeometryV2* geometryN( int n ) const;
//const QgsAbstractGeometry* geometryN( int n ) const;
/** Returns a geometry from within the collection.
* @param n index of geometry to return
*/
QgsAbstractGeometryV2* geometryN( int n );
QgsAbstractGeometry* geometryN( int n );
//methods inherited from QgsAbstractGeometry
virtual int dimension() const;
virtual QString geometryType() const;
virtual void clear();
virtual QgsAbstractGeometryV2* boundary() const /Factory/;
virtual QgsAbstractGeometry* boundary() const /Factory/;
/** Adds a geometry and takes ownership. Returns true in case of success.*/
virtual bool addGeometry( QgsAbstractGeometryV2* g /Transfer/ );
virtual bool addGeometry( QgsAbstractGeometry* g /Transfer/ );
/** Inserts a geometry before a specified index and takes ownership. Returns true in case of success.
* @param g geometry to insert. Ownership is transferred to the collection.
* @param index position to insert geometry before
*/
virtual bool insertGeometry( QgsAbstractGeometryV2* g /Transfer/, int index );
virtual bool insertGeometry( QgsAbstractGeometry* g /Transfer/, int index );
/** Removes a geometry from the collection.
* @param nr index of geometry to remove
@ -84,7 +84,7 @@ class QgsGeometryCollectionV2: public QgsAbstractGeometryV2
/** Returns a geometry without curves. Caller takes ownership
* @param tolerance segmentation tolerance
* @param toleranceType maximum segmentation angle or maximum difference between approximation and curve*/
QgsAbstractGeometryV2* segmentize( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const;
QgsAbstractGeometry* segmentize( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const;
/** Returns approximate rotation angle for a vertex. Usually average angle between adjacent segments.
* @param vertex the vertex id
@ -111,7 +111,7 @@ class QgsGeometryCollectionV2: public QgsAbstractGeometryV2
/** Reads a collection from a WKT string.
*/
bool fromCollectionWkt( const QString &wkt, const QList<QgsAbstractGeometryV2*>& subtypes, const QString& defaultChildWkbType = QString() );
bool fromCollectionWkt( const QString &wkt, const QList<QgsAbstractGeometry*>& subtypes, const QString& defaultChildWkbType = QString() );
virtual QgsRectangle calculateBoundingBox() const;
virtual void clearCache() const;

52
python/core/geometry/qgsgeometryengine.sip
View File

@ -5,33 +5,33 @@ class QgsGeometryEngine
%End
public:
QgsGeometryEngine( const QgsAbstractGeometryV2* geometry );
QgsGeometryEngine( const QgsAbstractGeometry* geometry );
virtual ~QgsGeometryEngine();
virtual void geometryChanged() = 0;
virtual void prepareGeometry() = 0;
virtual QgsAbstractGeometryV2* intersection( const QgsAbstractGeometryV2& geom, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometryV2* difference( const QgsAbstractGeometryV2& geom, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometryV2* combine( const QgsAbstractGeometryV2& geom, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometryV2* combine( const QList< QgsAbstractGeometryV2* >&, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometryV2* symDifference( const QgsAbstractGeometryV2& geom, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometryV2* buffer( double distance, int segments, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometryV2* buffer( double distance, int segments, int endCapStyle, int joinStyle, double mitreLimit, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometryV2* simplify( double tolerance, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometryV2* interpolate( double distance, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometryV2* envelope( QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometry* intersection( const QgsAbstractGeometry& geom, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometry* difference( const QgsAbstractGeometry& geom, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometry* combine( const QgsAbstractGeometry& geom, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometry* combine( const QList< QgsAbstractGeometry* >&, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometry* symDifference( const QgsAbstractGeometry& geom, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometry* buffer( double distance, int segments, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometry* buffer( double distance, int segments, int endCapStyle, int joinStyle, double mitreLimit, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometry* simplify( double tolerance, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometry* interpolate( double distance, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometry* envelope( QString* errorMsg = 0 ) const = 0;
virtual bool centroid( QgsPointV2& pt, QString* errorMsg = 0 ) const = 0;
virtual bool pointOnSurface( QgsPointV2& pt, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometryV2* convexHull( QString* errorMsg = 0 ) const = 0;
virtual double distance( const QgsAbstractGeometryV2& geom, QString* errorMsg = 0 ) const = 0;
virtual bool intersects( const QgsAbstractGeometryV2& geom, QString* errorMsg = 0 ) const = 0;
virtual bool touches( const QgsAbstractGeometryV2& geom, QString* errorMsg = 0 ) const = 0;
virtual bool crosses( const QgsAbstractGeometryV2& geom, QString* errorMsg = 0 ) const = 0;
virtual bool within( const QgsAbstractGeometryV2& geom, QString* errorMsg = 0 ) const = 0;
virtual bool overlaps( const QgsAbstractGeometryV2& geom, QString* errorMsg = 0 ) const = 0;
virtual bool contains( const QgsAbstractGeometryV2& geom, QString* errorMsg = 0 ) const = 0;
virtual bool disjoint( const QgsAbstractGeometryV2& geom, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometry* convexHull( QString* errorMsg = 0 ) const = 0;
virtual double distance( const QgsAbstractGeometry& geom, QString* errorMsg = 0 ) const = 0;
virtual bool intersects( const QgsAbstractGeometry& geom, QString* errorMsg = 0 ) const = 0;
virtual bool touches( const QgsAbstractGeometry& geom, QString* errorMsg = 0 ) const = 0;
virtual bool crosses( const QgsAbstractGeometry& geom, QString* errorMsg = 0 ) const = 0;
virtual bool within( const QgsAbstractGeometry& geom, QString* errorMsg = 0 ) const = 0;
virtual bool overlaps( const QgsAbstractGeometry& geom, QString* errorMsg = 0 ) const = 0;
virtual bool contains( const QgsAbstractGeometry& geom, QString* errorMsg = 0 ) const = 0;
virtual bool disjoint( const QgsAbstractGeometry& geom, QString* errorMsg = 0 ) const = 0;
/** Returns the Dimensional Extended 9 Intersection Model (DE-9IM) representation of the
* relationship between the geometries.
@ -40,7 +40,7 @@ class QgsGeometryEngine
* @returns DE-9IM string for relationship, or an empty string if an error occurred
* @note added in QGIS 2.12
*/
virtual QString relate( const QgsAbstractGeometryV2& geom, QString* errorMsg = 0 ) const = 0;
virtual QString relate( const QgsAbstractGeometry& geom, QString* errorMsg = 0 ) const = 0;
/** Tests whether two geometries are related by a specified Dimensional Extended 9 Intersection Model (DE-9IM)
* pattern.
@ -50,18 +50,18 @@ class QgsGeometryEngine
* @returns true if geometry relationship matches with pattern
* @note added in QGIS 2.14
*/
virtual bool relatePattern( const QgsAbstractGeometryV2& geom, const QString& pattern, QString* errorMsg = 0 ) const = 0;
virtual bool relatePattern( const QgsAbstractGeometry& geom, const QString& pattern, QString* errorMsg = 0 ) const = 0;
virtual double area( QString* errorMsg = 0 ) const = 0;
virtual double length( QString* errorMsg = 0 ) const = 0;
virtual bool isValid( QString* errorMsg = 0 ) const = 0;
virtual bool isEqual( const QgsAbstractGeometryV2& geom, QString* errorMsg = 0 ) const = 0;
virtual bool isEqual( const QgsAbstractGeometry& geom, QString* errorMsg = 0 ) const = 0;
virtual bool isEmpty( QString* errorMsg = 0 ) const = 0;
virtual int splitGeometry( const QgsLineStringV2& splitLine,
QList<QgsAbstractGeometryV2*>& newGeometries,
virtual int splitGeometry( const QgsLineString& splitLine,
QList<QgsAbstractGeometry*>& newGeometries,
bool topological,
QList<QgsPointV2> &topologyTestPoints, QString* errorMsg = nullptr ) const;
virtual QgsAbstractGeometryV2* offsetCurve( double distance, int segments, int joinStyle, double mitreLimit, QString* errorMsg = 0 ) const = 0;
virtual QgsAbstractGeometry* offsetCurve( double distance, int segments, int joinStyle, double mitreLimit, QString* errorMsg = 0 ) const = 0;
};

26
python/core/geometry/qgslinestringv2.sip → python/core/geometry/qgslinestring.sip
View File

@ -1,20 +1,20 @@
/** \ingroup core
* \class QgsLineStringV2
* \class QgsLineString
* \brief Line string geometry type, with support for z-dimension and m-values.
* \note added in QGIS 2.10
*/
class QgsLineStringV2: public QgsCurveV2
class QgsLineString: public QgsCurve
{
%TypeHeaderCode
#include <qgslinestringv2.h>
#include <qgslinestring.h>
%End
public:
QgsLineStringV2();
~QgsLineStringV2();
QgsLineString();
~QgsLineString();
bool operator==( const QgsCurveV2& other ) const;
bool operator!=( const QgsCurveV2& other ) const;
bool operator==( const QgsCurve& other ) const;
bool operator!=( const QgsCurve& other ) const;
/** Returns the specified point from inside the line string.
* @param i index of point, starting at 0 for the first point
@ -92,7 +92,7 @@ class QgsLineStringV2: public QgsCurveV2
/** Appends the contents of another line string to the end of this line string.
* @param line line to append. Ownership is not transferred.
*/
void append( const QgsLineStringV2* line );
void append( const QgsLineString* line );
/** Adds a new vertex to the end of the line string.
* @param pt vertex to add
@ -106,15 +106,15 @@ class QgsLineStringV2: public QgsCurveV2
*/
QPolygonF asQPolygonF() const;
/** Returns the geometry converted to the more generic curve type QgsCompoundCurveV2
/** Returns the geometry converted to the more generic curve type QgsCompoundCurve
@return the converted geometry. Caller takes ownership*/
QgsAbstractGeometryV2* toCurveType() const /Factory/;
QgsAbstractGeometry* toCurveType() const /Factory/;
//reimplemented methods
virtual QString geometryType() const;
virtual int dimension() const;
virtual QgsLineStringV2* clone() const /Factory/;
virtual QgsLineString* clone() const /Factory/;
virtual void clear();
virtual bool fromWkb( QgsConstWkbPtr wkb );
@ -135,7 +135,7 @@ class QgsLineStringV2: public QgsCurveV2
* of the curve.
* @param tolerance segmentation tolerance
* @param toleranceType maximum segmentation angle or maximum difference between approximation and curve*/
virtual QgsLineStringV2* curveToLine( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
virtual QgsLineString* curveToLine( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
int numPoints() const;
void points( QList<QgsPointV2>& pt ) const;
@ -152,7 +152,7 @@ class QgsLineStringV2: public QgsCurveV2
virtual bool moveVertex( QgsVertexId position, const QgsPointV2& newPos );
virtual bool deleteVertex( QgsVertexId position );
virtual QgsLineStringV2* reversed() const /Factory/;
virtual QgsLineString* reversed() const /Factory/;
double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const;
bool pointAt( int i, QgsPointV2& vertex, QgsVertexId::VertexType& type ) const;

14
python/core/geometry/qgsmulticurvev2.sip → python/core/geometry/qgsmulticurve.sip
View File

@ -1,12 +1,12 @@
class QgsMultiCurveV2: public QgsGeometryCollectionV2
class QgsMultiCurve: public QgsGeometryCollection
{
%TypeHeaderCode
#include <qgsmulticurvev2.h>
#include <qgsmulticurve.h>
%End
public:
virtual QString geometryType() const;
virtual QgsMultiCurveV2* clone() const;
virtual QgsMultiCurve* clone() const;
bool fromWkt( const QString& wkt );
@ -18,14 +18,14 @@ class QgsMultiCurveV2: public QgsGeometryCollectionV2
QString asJSON( int precision = 17 ) const;
/** Adds a geometry and takes ownership. Returns true in case of success*/
virtual bool addGeometry( QgsAbstractGeometryV2* g );
virtual bool addGeometry( QgsAbstractGeometry* g );
/** Returns a geometry without curves. Caller takes ownership*/
QgsAbstractGeometryV2* segmentize() const /Factory/;
QgsAbstractGeometry* segmentize() const /Factory/;
/** Returns a copy of the multi curve, where each component curve has had its line direction reversed.
* @note added in QGIS 2.14
*/
QgsMultiCurveV2* reversed() const /Factory/;
QgsMultiCurve* reversed() const /Factory/;
virtual QgsAbstractGeometryV2* boundary() const /Factory/;
virtual QgsAbstractGeometry* boundary() const /Factory/;
};

12
python/core/geometry/qgsmultilinestringv2.sip → python/core/geometry/qgsmultilinestring.sip
View File

@ -1,12 +1,12 @@
class QgsMultiLineStringV2: public QgsMultiCurveV2
class QgsMultiLineString: public QgsMultiCurve
{
%TypeHeaderCode
#include <qgsmultilinestringv2.h>
#include <qgsmultilinestring.h>
%End
public:
virtual QString geometryType() const;
virtual QgsMultiLineStringV2* clone() const;
virtual QgsMultiLineString* clone() const;
bool fromWkt( const QString& wkt );
@ -18,11 +18,11 @@ class QgsMultiLineStringV2: public QgsMultiCurveV2
QString asJSON( int precision = 17 ) const;
/** Adds a geometry and takes ownership. Returns true in case of success*/
virtual bool addGeometry( QgsAbstractGeometryV2* g );
virtual bool addGeometry( QgsAbstractGeometry* g );
/** Returns the geometry converted to the more generic curve type QgsMultiCurveV2
/** Returns the geometry converted to the more generic curve type QgsMultiCurve
@return the converted geometry. Caller takes ownership*/
QgsAbstractGeometryV2* toCurveType() const /Factory/;
QgsAbstractGeometry* toCurveType() const /Factory/;
protected:

8
python/core/geometry/qgsmultipointv2.sip → python/core/geometry/qgsmultipoint.sip
View File

@ -1,7 +1,7 @@
class QgsMultiPointV2: public QgsGeometryCollectionV2
class QgsMultiPointV2: public QgsGeometryCollection
{
%TypeHeaderCode
#include <qgsmultipointv2.h>
#include <qgsmultipoint.h>
%End
public:
virtual QString geometryType() const;
@ -18,9 +18,9 @@ class QgsMultiPointV2: public QgsGeometryCollectionV2
/** Adds a geometry and takes ownership. Returns true in case of success*/
virtual bool addGeometry( QgsAbstractGeometryV2* g );
virtual bool addGeometry( QgsAbstractGeometry* g );
virtual QgsAbstractGeometryV2* boundary() const /Factory/;
virtual QgsAbstractGeometry* boundary() const /Factory/;
protected:

12
python/core/geometry/qgsmultipolygonv2.sip → python/core/geometry/qgsmultipolygon.sip
View File

@ -1,7 +1,7 @@
class QgsMultiPolygonV2: public QgsMultiSurfaceV2
class QgsMultiPolygonV2: public QgsMultiSurface
{
%TypeHeaderCode
#include <qgsmultipolygonv2.h>
#include <qgsmultipolygon.h>
%End
public:
virtual QString geometryType() const;
@ -18,13 +18,13 @@ class QgsMultiPolygonV2: public QgsMultiSurfaceV2
/** Adds a geometry and takes ownership. Returns true in case of success*/
virtual bool addGeometry( QgsAbstractGeometryV2* g );
virtual bool addGeometry( QgsAbstractGeometry* g );
/** Returns the geometry converted to the more generic curve type QgsMultiSurfaceV2
/** Returns the geometry converted to the more generic curve type QgsMultiSurface
@return the converted geometry. Caller takes ownership*/
QgsAbstractGeometryV2* toCurveType() const /Factory/;
QgsAbstractGeometry* toCurveType() const /Factory/;
virtual QgsAbstractGeometryV2* boundary() const /Factory/;
virtual QgsAbstractGeometry* boundary() const /Factory/;
protected:

12
python/core/geometry/qgsmultisurfacev2.sip → python/core/geometry/qgsmultisurface.sip
View File

@ -1,11 +1,11 @@
class QgsMultiSurfaceV2: public QgsGeometryCollectionV2
class QgsMultiSurface: public QgsGeometryCollection
{
%TypeHeaderCode
#include <qgsmultisurfacev2.h>
#include <qgsmultisurface.h>
%End
public:
virtual QString geometryType() const;
virtual QgsMultiSurfaceV2* clone() const;
virtual QgsMultiSurface* clone() const;
bool fromWkt( const QString& wkt );
@ -18,10 +18,10 @@ class QgsMultiSurfaceV2: public QgsGeometryCollectionV2
/** Adds a geometry and takes ownership. Returns true in case of success*/
virtual bool addGeometry( QgsAbstractGeometryV2* g );
virtual bool addGeometry( QgsAbstractGeometry* g );
virtual QgsAbstractGeometryV2* boundary() const /Factory/;
virtual QgsAbstractGeometry* boundary() const /Factory/;
/** Returns a geometry without curves. Caller takes ownership*/
QgsAbstractGeometryV2* segmentize() const /Factory/;
QgsAbstractGeometry* segmentize() const /Factory/;
};

4
python/core/geometry/qgspointv2.sip
View File

@ -3,7 +3,7 @@
* \brief Point geometry type, with support for z-dimension and m-values.
* \note added in QGIS 2.10
*/
class QgsPointV2: public QgsAbstractGeometryV2
class QgsPointV2: public QgsAbstractGeometry
{
%TypeHeaderCode
#include <qgspointv2.h>
@ -157,7 +157,7 @@ class QgsPointV2: public QgsAbstractGeometryV2
bool transformZ = false );
void transform( const QTransform& t );
virtual QList< QList< QList< QgsPointV2 > > > coordinateSequence() const;
virtual QgsAbstractGeometryV2* boundary() const /Factory/;
virtual QgsAbstractGeometry* boundary() const /Factory/;
//low-level editing
virtual bool insertVertex( QgsVertexId position, const QgsPointV2& vertex );

14
python/core/geometry/qgspolygonv2.sip → python/core/geometry/qgspolygon.sip
View File

@ -1,7 +1,7 @@
class QgsPolygonV2: public QgsCurvePolygonV2
class QgsPolygonV2: public QgsCurvePolygon
{
%TypeHeaderCode
#include <qgspolygonv2.h>
#include <qgspolygon.h>
%End
public:
@ -27,13 +27,13 @@ class QgsPolygonV2: public QgsCurvePolygonV2
QgsPolygonV2* surfaceToPolygon() const;
/** Returns the geometry converted to the more generic curve type QgsCurvePolygonV2
/** Returns the geometry converted to the more generic curve type QgsCurvePolygon
@return the converted geometry. Caller takes ownership*/
QgsAbstractGeometryV2* toCurveType() const /Factory/;
QgsAbstractGeometry* toCurveType() const /Factory/;
void addInteriorRing( QgsCurveV2* ring /Transfer/ );
void addInteriorRing( QgsCurve* ring /Transfer/ );
//overridden to handle LineString25D rings
virtual void setExteriorRing( QgsCurveV2* ring /Transfer/ );
virtual void setExteriorRing( QgsCurve* ring /Transfer/ );
virtual QgsAbstractGeometryV2* boundary() const /Factory/;
virtual QgsAbstractGeometry* boundary() const /Factory/;
};

4
python/core/geometry/qgssurfacev2.sip → python/core/geometry/qgssurface.sip
View File

@ -1,7 +1,7 @@
class QgsSurfaceV2: public QgsAbstractGeometryV2
class QgsSurface: public QgsAbstractGeometry
{
%TypeHeaderCode
#include <qgssurfacev2.h>
#include <qgssurface.h>
%End
public:

4
python/core/layertree/qgslayertreemodellegendnode.sip
View File

@ -20,7 +20,7 @@ class QgsLayerTreeModelLegendNode : QObject
enum LegendNodeRoles
{
RuleKeyRole, //!< rule key of the node (QString)
SymbolV2LegacyRuleKeyRole, //!< for QgsSymbolLegendNode only - legacy rule key (void ptr, to be cast to QgsSymbol ptr)
SymbolLegacyRuleKeyRole, //!< for QgsSymbolLegendNode only - legacy rule key (void ptr, to be cast to QgsSymbol ptr)
ParentRuleKeyRole //!< rule key of the parent legend node - for legends with tree hierarchy (QString). Added in 2.8
};
@ -118,7 +118,7 @@ class QgsSymbolLegendNode : QgsLayerTreeModelLegendNode
#include <qgslayertreemodellegendnode.h>
%End
public:
QgsSymbolLegendNode( QgsLayerTreeLayer* nodeLayer, const QgsLegendSymbolItemV2& item, QObject* parent /TransferThis/ = 0 );
QgsSymbolLegendNode( QgsLayerTreeLayer* nodeLayer, const QgsLegendSymbolItem& item, QObject* parent /TransferThis/ = 0 );
~QgsSymbolLegendNode();
virtual Qt::ItemFlags flags() const;

4
python/core/qgsapplication.sip
View File

@ -225,7 +225,7 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
static QPixmap getThemePixmap( const QString &theName );
//! Returns the path to user's style.
static QString userStyleV2Path();
static QString userStylePath();
//! Returns the short name regular expression for line edit validator
static QRegExp shortNameRegExp();
@ -258,7 +258,7 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
static QString userThemesFolder();
//! Returns the path to default style (works as a starting point).
static QString defaultStyleV2Path();
static QString defaultStylePath();
//! Returns the path to default themes folder from install (works as a starting point).
static QString defaultThemesFolder();

42
python/core/qgsdiagramrendererv2.sip → python/core/qgsdiagramrenderer.sip
View File

@ -9,7 +9,7 @@
class QgsDiagramLayerSettings
{
%TypeHeaderCode
#include <qgsdiagramrendererv2.h>
#include <qgsdiagramrenderer.h>
%End
public:
@ -161,25 +161,25 @@ class QgsDiagramLayerSettings
* @note added in QGIS 2.16
*/
// TODO QGIS 3.0 - rename to renderer()
QgsDiagramRendererV2* getRenderer();
QgsDiagramRenderer* getRenderer();
/** Returns the diagram renderer associated with the layer.
* @see setRenderer()
* @note added in QGIS 2.16
*/
// TODO QGIS 3.0 - rename to renderer()
//const QgsDiagramRendererV2* getRenderer() const;
//const QgsDiagramRenderer* getRenderer() const;
/** Sets the diagram renderer associated with the layer.
* @param diagramRenderer diagram renderer. Ownership is transferred to the object.
* @see getRenderer()
* @note added in QGIS 2.16
*/
void setRenderer( QgsDiagramRendererV2* diagramRenderer /Transfer/ );
void setRenderer( QgsDiagramRenderer* diagramRenderer /Transfer/ );
//! Associated diagram renderer. Owned by this object.
// TODO QGIS 3.0 - make private, rename to mRenderer
QgsDiagramRendererV2* renderer;
QgsDiagramRenderer* renderer;
/** Returns the coordinate transform associated with the layer, or an
* invalid transform if no transformation is required.
@ -248,7 +248,7 @@ class QgsDiagramLayerSettings
class QgsDiagramSettings
{
%TypeHeaderCode
#include <qgsdiagramrendererv2.h>
#include <qgsdiagramrenderer.h>
%End
public:
@ -335,7 +335,7 @@ class QgsDiagramSettings
class QgsDiagramInterpolationSettings
{
%TypeHeaderCode
#include <qgsdiagramrendererv2.h>
#include <qgsdiagramrenderer.h>
%End
public:
QSizeF lowerSize;
@ -350,23 +350,23 @@ class QgsDiagramInterpolationSettings
/** \ingroup core
* \class QgsDiagramRendererV2
* \class QgsDiagramRenderer
* \brief Evaluates and returns the diagram settings relating to a diagram for a specific feature.
*/
class QgsDiagramRendererV2
class QgsDiagramRenderer
{
%TypeHeaderCode
#include <qgsdiagramrendererv2.h>
#include <qgsdiagramrenderer.h>
%End
public:
QgsDiagramRendererV2();
virtual ~QgsDiagramRendererV2();
QgsDiagramRenderer();
virtual ~QgsDiagramRenderer();
/** Returns new instance that is equivalent to this one
* @note added in 2.4 */
virtual QgsDiagramRendererV2* clone() const = 0 /Factory/;
virtual QgsDiagramRenderer* clone() const = 0 /Factory/;
/** Returns size of the diagram for a feature in map units. Returns an invalid QSizeF in case of error*/
virtual QSizeF sizeMapUnits( const QgsFeature& feature, const QgsRenderContext& c ) const;
@ -438,7 +438,7 @@ class QgsDiagramRendererV2
* @see setSizeLegendSymbol()
* @see sizeLegend()
*/
QgsMarkerSymbolV2* sizeLegendSymbol() const;
QgsMarkerSymbol* sizeLegendSymbol() const;
/** Sets the marker symbol used for rendering the diagram size legend.
* @param symbol marker symbol, ownership is transferred to the renderer.
@ -446,11 +446,11 @@ class QgsDiagramRendererV2
* @see sizeLegendSymbol()
* @see setSizeLegend()
*/
void setSizeLegendSymbol( QgsMarkerSymbolV2* symbol /Transfer/ );
void setSizeLegendSymbol( QgsMarkerSymbol* symbol /Transfer/ );
protected:
QgsDiagramRendererV2( const QgsDiagramRendererV2& other );
//QgsDiagramRendererV2& operator=( const QgsDiagramRendererV2& other );
QgsDiagramRenderer( const QgsDiagramRenderer& other );
//QgsDiagramRenderer& operator=( const QgsDiagramRenderer& other );
/** Returns diagram settings for a feature (or false if the diagram for the feature is not to be rendered). Used internally within renderDiagram()
* @param feature the feature
@ -474,10 +474,10 @@ class QgsDiagramRendererV2
};
/** Renders the diagrams for all features with the same settings*/
class QgsSingleCategoryDiagramRenderer : QgsDiagramRendererV2
class QgsSingleCategoryDiagramRenderer : QgsDiagramRenderer
{
%TypeHeaderCode
#include <qgsdiagramrendererv2.h>
#include <qgsdiagramrenderer.h>
%End
public:
@ -505,10 +505,10 @@ class QgsSingleCategoryDiagramRenderer : QgsDiagramRendererV2
QSizeF diagramSize( const QgsFeature&, const QgsRenderContext& c ) const;
};
class QgsLinearlyInterpolatedDiagramRenderer : QgsDiagramRendererV2
class QgsLinearlyInterpolatedDiagramRenderer : QgsDiagramRenderer
{
%TypeHeaderCode
#include <qgsdiagramrendererv2.h>
#include <qgsdiagramrenderer.h>
%End
public:

6
python/core/qgsmaphittest.sip
View File

@ -44,10 +44,10 @@ class QgsMapHitTest
protected:
//! @note not available in Python bindings
//typedef QSet<QString> SymbolV2Set;
//typedef QSet<QString> SymbolSet;
//! @note not available in Python bindings
//typedef QMap<QgsVectorLayer*, SymbolV2Set> HitTest;
//typedef QMap<QgsVectorLayer*, SymbolSet> HitTest;
/** Runs test for visible symbols within a layer
* @param vl vector layer
@ -57,7 +57,7 @@ class QgsMapHitTest
* @note added in QGIS 2.12
* @note not available in Python bindings
*/
//void runHitTestLayer( QgsVectorLayer* vl, SymbolV2Set& usedSymbols, SymbolV2Set& usedSymbolsRuleKey, QgsRenderContext& context );
//void runHitTestLayer( QgsVectorLayer* vl, SymbolSet& usedSymbols, SymbolSet& usedSymbolsRuleKey, QgsRenderContext& context );
};

4
python/core/qgsmaprendererjob.sip
View File

@ -113,7 +113,7 @@ class QgsMapRendererJob : QObject
static bool reprojectToLayerExtent( const QgsMapLayer *ml, const QgsCoordinateTransform& ct, QgsRectangle &extent, QgsRectangle &r2 );
//! @note not available in python bindings
// LayerRenderJobs prepareJobs( QPainter* painter, QgsLabelingEngineV2* labelingEngine2 );
// LayerRenderJobs prepareJobs( QPainter* painter, QgsLabelingEngine* labelingEngine2 );
//! @note not available in python bindings
// void cleanupJobs( LayerRenderJobs& jobs );
@ -123,7 +123,7 @@ class QgsMapRendererJob : QObject
bool needTemporaryImage( QgsMapLayer* ml );
//! @note not available in Python bindings
// static void drawLabeling( const QgsMapSettings& settings, QgsRenderContext& renderContext, QgsLabelingEngineV2* labelingEngine2, QPainter* painter );
// static void drawLabeling( const QgsMapSettings& settings, QgsRenderContext& renderContext, QgsLabelingEngine* labelingEngine2, QPainter* painter );
//! called when rendering has finished to update all layers' geometry caches
void updateLayerGeometryCaches();

4
python/core/qgsmapsettings.sip
View File

@ -238,9 +238,9 @@ class QgsMapSettings
double segmentationTolerance() const;
/** Sets segmentation tolerance type (maximum angle or maximum difference between curve and approximation)
@param type the segmentation tolerance typename*/
void setSegmentationToleranceType( QgsAbstractGeometryV2::SegmentationToleranceType type );
void setSegmentationToleranceType( QgsAbstractGeometry::SegmentationToleranceType type );
/** Gets segmentation tolerance type (maximum angle or maximum difference between curve and approximation)*/
QgsAbstractGeometryV2::SegmentationToleranceType segmentationToleranceType() const;
QgsAbstractGeometry::SegmentationToleranceType segmentationToleranceType() const;
protected:

14
python/core/qgspallabeling.sip
View File

@ -157,7 +157,7 @@ class QgsPalLayerSettings
{
%TypeHeaderCode
#include <qgspallabeling.h>
#include <qgsdiagramrendererv2.h>
#include <qgsdiagramrenderer.h>
%End
public:
QgsPalLayerSettings();
@ -169,7 +169,7 @@ class QgsPalLayerSettings
/** Placement modes which determine how label candidates are generated for a feature.
*/
//TODO QGIS 3.0 - move to QgsLabelingEngineV2
//TODO QGIS 3.0 - move to QgsLabelingEngine
enum Placement
{
AroundPoint, /**< Arranges candidates in a circle around a point (or centroid of a polygon). Applies to point or polygon layers only.*/
@ -183,7 +183,7 @@ class QgsPalLayerSettings
};
//! Positions for labels when using the QgsPalLabeling::OrderedPositionsAroundPoint placement mode
//TODO QGIS 3.0 - move to QgsLabelingEngineV2
//TODO QGIS 3.0 - move to QgsLabelingEngine
enum PredefinedPointPosition
{
TopLeft, //!< Label on top-left of point
@ -202,7 +202,7 @@ class QgsPalLayerSettings
//! Behaviour modifier for label offset and distance, only applies in some
//! label placement modes.
//TODO QGIS 3.0 - move to QgsLabelingEngineV2
//TODO QGIS 3.0 - move to QgsLabelingEngine
enum OffsetType
{
FromPoint, //!< Offset distance applies from point geometry
@ -211,7 +211,7 @@ class QgsPalLayerSettings
/** Line placement flags, which control how candidates are generated for a linear feature.
*/
//TODO QGIS 3.0 - move to QgsLabelingEngineV2, rename to LinePlacementFlag, use Q_DECLARE_FLAGS to make
//TODO QGIS 3.0 - move to QgsLabelingEngine, rename to LinePlacementFlag, use Q_DECLARE_FLAGS to make
//LinePlacementFlags type, and replace use of pal::LineArrangementFlag
enum LinePlacementFlags
{
@ -266,7 +266,7 @@ class QgsPalLayerSettings
/** Valid obstacle types, which affect how features within the layer will act as obstacles
* for labels.
*/
//TODO QGIS 3.0 - Move to QgsLabelingEngineV2
//TODO QGIS 3.0 - Move to QgsLabelingEngine
enum ObstacleType
{
PolygonInterior, /*!< avoid placing labels over interior of polygon (prefer placing labels totally
@ -628,7 +628,7 @@ class QgsPalLayerSettings
* @param f feature to label
* @param context render context. The QgsExpressionContext contained within the render context
* must have already had the feature and fields sets prior to calling this method.
* @param labelFeature if using QgsLabelingEngineV2, this will receive the label feature. Not available
* @param labelFeature if using QgsLabelingEngine, this will receive the label feature. Not available
* in Python bindings.
* @param obstacleGeometry optional obstacle geometry, if a different geometry to the feature's geometry
* should be used as an obstacle for labels (eg, if the feature has been rendered with an offset point

12
python/core/qgsrendercontext.sip
View File

@ -88,7 +88,7 @@ class QgsRenderContext
//! Get access to new labeling engine (may be nullptr)
//! @note not available in Python bindings
// QgsLabelingEngineV2* labelingEngineV2() const { return mLabelingEngine2; }
// QgsLabelingEngine* labelingEngineV2() const { return mLabelingEngine2; }
QColor selectionColor() const;
@ -121,7 +121,7 @@ class QgsRenderContext
void setLabelingEngine( QgsLabelingEngineInterface* iface );
//! Assign new labeling engine
//! @note not available in Python bindings
// void setLabelingEngineV2( QgsLabelingEngineV2* engine2 ) { mLabelingEngine2 = engine2; }
// void setLabelingEngineV2( QgsLabelingEngine* engine2 ) { mLabelingEngine2 = engine2; }
void setSelectionColor( const QColor& color );
/** Sets whether vector selections should be shown in the rendered map
@ -165,9 +165,9 @@ class QgsRenderContext
//const QgsExpressionContext& expressionContext() const;
/** Returns pointer to the unsegmentized geometry*/
const QgsAbstractGeometryV2* geometry() const;
const QgsAbstractGeometry* geometry() const;
/** Sets pointer to original (unsegmentized) geometry*/
void setGeometry( const QgsAbstractGeometryV2* geometry );
void setGeometry( const QgsAbstractGeometry* geometry );
/** Set a filter feature provider used for additional filtering of rendered features.
* @param ffp the filter feature provider
@ -191,7 +191,7 @@ class QgsRenderContext
/** Sets segmentation tolerance type (maximum angle or maximum difference between curve and approximation)
@param type the segmentation tolerance typename*/
void setSegmentationToleranceType( QgsAbstractGeometryV2::SegmentationToleranceType type );
void setSegmentationToleranceType( QgsAbstractGeometry::SegmentationToleranceType type );
/** Gets segmentation tolerance type (maximum angle or maximum difference between curve and approximation)*/
QgsAbstractGeometryV2::SegmentationToleranceType segmentationToleranceType() const;
QgsAbstractGeometry::SegmentationToleranceType segmentationToleranceType() const;
};

2
python/core/qgsvectorfilewriter.sip
View File

@ -258,7 +258,7 @@ class QgsVectorFileWriter
QString errorMessage();
/** Add feature to the currently opened data source */
bool addFeature( QgsFeature& feature, QgsFeatureRendererV2* renderer = 0, QgsUnitTypes::DistanceUnit outputUnit = QgsUnitTypes::DistanceMeters );
bool addFeature( QgsFeature& feature, QgsFeatureRenderer* renderer = 0, QgsUnitTypes::DistanceUnit outputUnit = QgsUnitTypes::DistanceMeters );
//! @note not available in python bindings
// QMap<int, int> attrIdxToOgrIdx();

681
python/core/qgsvectorlayer.sip
View File

@ -20,6 +20,7 @@ struct QgsVectorJoinInfo
bool memoryCache;
/** True if the cached join attributes need to be updated*/
bool cacheDirty;
/** Cache for joined attributes to provide fast lookup (size is 0 if no memory caching)
* @note not available in python bindings
*/
@ -41,6 +42,280 @@ struct QgsVectorJoinInfo
};
/** \ingroup core
* Represents a vector layer which manages a vector based data sets.
*
* The QgsVectorLayer is instantiated by specifying the name of a data provider,
* such as postgres or wfs, and url defining the specific data set to connect to.
* The vector layer constructor in turn instantiates a QgsVectorDataProvider subclass
* corresponding to the provider type, and passes it the url. The data provider
* connects to the data source.
*
* The QgsVectorLayer provides a common interface to the different data types. It also
* manages editing transactions.
*
* Sample usage of the QgsVectorLayer class:
*
* \code
* QString uri = "point?crs=epsg:4326&field=id:integer";
* QgsVectorLayer *scratchLayer = new QgsVectorLayer(uri, "Scratch point layer", "memory");
* \endcode
*
* The main data providers supported by QGIS are listed below.
*
* \section providers Vector data providers
*
* \subsection memory Memory data providerType (memory)
*
* The memory data provider is used to construct in memory data, for example scratch
* data or data generated from spatial operations such as contouring. There is no
* inherent persistent storage of the data. The data source uri is constructed. The
* url specifies the geometry type ("point", "linestring", "polygon",
* "multipoint","multilinestring","multipolygon"), optionally followed by url parameters
* as follows:
*
* - crs=definition
* Defines the coordinate reference system to use for the layer.
* definition is any string accepted by QgsCoordinateReferenceSystem::createFromString()
*
* - index=yes
* Specifies that the layer will be constructed with a spatial index
*
* - field=name:type(length,precision)
* Defines an attribute of the layer. Multiple field parameters can be added
* to the data provider definition. type is one of "integer", "double", "string".
*
* An example url is "Point?crs=epsg:4326&field=id:integer&field=name:string(20)&index=yes"
*
* \subsection ogr OGR data provider (ogr)
*
* Accesses data using the OGR drivers (http://www.gdal.org/ogr/ogr_formats.html). The url
* is the OGR connection string. A wide variety of data formats can be accessed using this
* driver, including file based formats used by many GIS systems, database formats, and
* web services. Some of these formats are also supported by custom data providers listed
* below.
*
* \subsection spatialite Spatialite data provider (spatialite)
*
* Access data in a spatialite database. The url defines the connection parameters, table,
* geometry column, and other attributes. The url can be constructed using the
* QgsDataSourceUri class.
*
* \subsection postgres Postgresql data provider (postgres)
*
* Connects to a postgresql database. The url defines the connection parameters, table,
* geometry column, and other attributes. The url can be constructed using the
* QgsDataSourceUri class.
*
* \subsection mssql Microsoft SQL server data provider (mssql)
*
* Connects to a Microsoft SQL server database. The url defines the connection parameters, table,
* geometry column, and other attributes. The url can be constructed using the
* QgsDataSourceUri class.
*
* \subsection wfs WFS (web feature service) data provider (wfs)
*
* Used to access data provided by a web feature service.
*
* The url can be a HTTP url to a WFS server (legacy, e.g. http://foobar/wfs?TYPENAME=xxx&SRSNAME=yyy[&FILTER=zzz]), or,
* starting with QGIS 2.16, a URI constructed using the QgsDataSourceUri class with the following parameters :
* - url=string (mandatory): HTTP url to a WFS server endpoint. e.g http://foobar/wfs
* - typename=string (mandatory): WFS typename
* - srsname=string (recommended): SRS like 'EPSG:XXXX'
* - username=string
* - password=string
* - authcfg=string
* - version=auto/1.0.0/1.1.0/2.0.0
* -sql=string: full SELECT SQL statement with optional WHERE, ORDER BY and possibly with JOIN if supported on server
* - filter=string: QGIS expression or OGC/FES filter
* - retrictToRequestBBOX=1: to download only features in the view extent (or more generally
* in the bounding box of the feature iterator)
* - maxNumFeatures=number
* - IgnoreAxisOrientation=1: to ignore EPSG axis order for WFS 1.1 or 2.0
* - InvertAxisOrientation=1: to invert axis order
* - hideDownloadProgressDialog=1: to hide the download progress dialog
*
* The ‘FILTER’ query string parameter can be used to filter
* the WFS feature type. The ‘FILTER’ key value can either be a QGIS expression
* or an OGC XML filter. If the value is set to a QGIS expression the driver will
* turn it into OGC XML filter before passing it to the WFS server. Beware the
* QGIS expression filter only supports” =, !=, <, >, <=, >=, AND, OR, NOT, LIKE, IS NULL”
* attribute operators, “BBOX, Disjoint, Intersects, Touches, Crosses, Contains, Overlaps, Within”
* spatial binary operators and the QGIS local “geomFromWKT, geomFromGML”
* geometry constructor functions.
*
* Also note:
*
* - You can use various functions available in the QGIS Expression list,
* however the function must exist server side and have the same name and arguments to work.
*
* - Use the special $geometry parameter to provide the layer geometry column as input
* into the spatial binary operators e.g intersects($geometry, geomFromWKT('POINT (5 6)'))
*
* \subsection delimitedtext Delimited text file data provider (delimitedtext)
*
* Accesses data in a delimited text file, for example CSV files generated by
* spreadsheets. The contents of the file are split into columns based on specified
* delimiter characters. Each record may be represented spatially either by an
* X and Y coordinate column, or by a WKT (well known text) formatted columns.
*
* The url defines the filename, the formatting options (how the
* text in the file is divided into data fields, and which fields contain the
* X,Y coordinates or WKT text definition. The options are specified as url query
* items.
*
* At its simplest the url can just be the filename, in which case it will be loaded
* as a CSV formatted file.
*
* The url may include the following items:
*
* - encoding=UTF-8
*
* Defines the character encoding in the file. The default is UTF-8. To use
* the default encoding for the operating system use "System".
*
* - type=(csv|regexp|whitespace|plain)
*
* Defines the algorithm used to split records into columns. Records are
* defined by new lines, except for csv format files for which quoted fields
* may span multiple records. The default type is csv.
*
* - "csv" splits the file based on three sets of characters:
* delimiter characters, quote characters,
* and escape characters. Delimiter characters mark the end
* of a field. Quote characters enclose a field which can contain
* delimiter characters, and newlines. Escape characters cause the
* following character to be treated literally (including delimiter,
* quote, and newline characters). Escape and quote characters must
* be different from delimiter characters. Escape characters that are
* also quote characters are treated specially - they can only
* escape themselves within quotes. Elsewhere they are treated as
* quote characters. The defaults for delimiter, quote, and escape
* are ',', '"', '"'.
* - "regexp" splits each record using a regular expression (see QRegExp
* documentation for details).
* - "whitespace" splits each record based on whitespace (on or more whitespace
* characters. Leading whitespace in the record is ignored.
* - "plain" is provided for backwards compatibility. It is equivalent to
* CSV except that the default quote characters are single and double quotes,
* and there is no escape characters.
*
* - delimiter=characters
*
* Defines the delimiter characters used for csv and plain type files, or the
* regular expression for regexp type files. It is a literal string of characters
* except that "\t" may be used to represent a tab character.
*
* - quote=characters
*
* Defines the characters that are used as quote characters for csv and plain type
* files.
*
* - escape=characters
*
* Defines the characters used to escape delimiter, quote, and newline characters.
*
* - skipLines=n
*
* Defines the number of lines to ignore at the beginning of the file (default 0)
*
* - useHeader=(yes|no)
*
* Defines whether the first record in the file (after skipped lines) contains
* column names (default yes)
*
* - trimFields=(yes|no)
*
* If yes then leading and trailing whitespace will be removed from fields
*
* - skipEmptyFields=(yes|no)
*
* If yes then empty fields will be discarded (eqivalent to concatenating consecutive
* delimiters)
*
* - maxFields=#
*
* Specifies the maximum number of fields to load for each record. Additional
* fields will be discarded. Default is 0 - load all fields.
*
* - decimalPoint=c
*
* Defines a character that is used as a decimal point in the numeric columns
* The default is '.'.
*
* - xField=column yField=column
*
* Defines the name of the columns holding the x and y coordinates for XY point geometries.
* If the useHeader is no (ie there are no column names), then this is the column
* number (with the first column as 1).
*
* - xyDms=(yes|no)
*
* If yes then the X and Y coordinates are interpreted as
* degrees/minutes/seconds format (fairly permissively),
* or degree/minutes format.
*
* - wktField=column
*
* Defines the name of the columns holding the WKT geometry definition for WKT geometries.
* If the useHeader is no (ie there are no column names), then this is the column
* number (with the first column as 1).
*
* - geomType=(point|line|polygon|none)
*
* Defines the geometry type for WKT type geometries. QGIS will only display one
* type of geometry for the layer - any others will be ignored when the file is
* loaded. By default the provider uses the type of the first geometry in the file.
* Use geomType to override this type.
*
* geomType can also be set to none, in which case the layer is loaded without
* geometries.
*
* - subset=expression
*
* Defines an expression that will identify a subset of records to display
*
* - crs=crsstring
*
* Defines the coordinate reference system used for the layer. This can be
* any string accepted by QgsCoordinateReferenceSystem::createFromString()
*
* -subsetIndex=(yes|no)
*
* Determines whether the provider generates an index to improve the efficiency
* of subsets. The default is yes
*
* -spatialIndex=(yes|no)
*
* Determines whether the provider generates a spatial index. The default is no.
*
* -watchFile=(yes|no)
*
* Defines whether the file will be monitored for changes. The default is
* to monitor for changes.
*
* - quiet
*
* Errors encountered loading the file will not be reported in a user dialog if
* quiet is included (They will still be shown in the output log).
*
* \subsection gpx GPX data provider (gpx)
*
* Provider reads tracks, routes, and waypoints from a GPX file. The url
* defines the name of the file, and the type of data to retrieve from it
* ("track", "route", or "waypoint").
*
* An example url is "/home/user/data/holiday.gpx?type=route"
*
* \subsection grass Grass data provider (grass)
*
* Provider to display vector data in a GRASS GIS layer.
*
* TODO QGIS3: Remove virtual from non-inherited methods (like isModified)
*/
class QgsVectorLayer : QgsMapLayer
{
%TypeHeaderCode
@ -72,18 +347,6 @@ class QgsVectorLayer : QgsMapLayer
UiFileLayout
};
struct RangeData
{
//! @deprecated Use the editorWidgetV2() system instead
RangeData() /Deprecated/;
//! @deprecated Use the editorWidgetV2() system instead
RangeData( const QVariant& theMin, const QVariant& theMax, const QVariant& theStep ) /Deprecated/;
QVariant mMin;
QVariant mMax;
QVariant mStep;
};
struct ValueRelationData
{
ValueRelationData();
@ -100,46 +363,6 @@ class QgsVectorLayer : QgsMapLayer
bool mAllowMulti; /* allow selection of multiple keys */
};
/**
* Types of feature form suppression after feature creation
* @note added in 2.1
* @deprecated in 2.14, Use QgsEditFormConfig instead
*/
enum FeatureFormSuppress
{
SuppressDefault, // use the application-wide setting
SuppressOn,
SuppressOff,
};
/**
* @deprecated Use the editorWidgetV2() system instead
*/
enum EditType
{
LineEdit,
UniqueValues,
UniqueValuesEditable,
ValueMap,
Classification,
EditRange,
SliderRange,
CheckBox,
FileName,
Enumeration,
Immutable, /**< The attribute value should not be changed in the attribute form */
Hidden, /**< The attribute value should not be shown in the attribute form */
TextEdit, /**< multiline edit */
Calendar, /**< calendar widget */
DialRange, /**< dial range */
ValueRelation, /**< value map from an table */
UuidGenerator, /**< uuid generator - readonly and automatically intialized */
Photo, /**< phote widget */
WebView, /**< webview widget */
Color, /**< color */
EditorWidgetV2, /**< modularized edit widgets @note added in 2.1 */
};
//! Result of an edit operation
enum EditResult
{
@ -202,7 +425,7 @@ class QgsVectorLayer : QgsMapLayer
* @param displayExpression The expression which will be used to preview features
* for this layer
*/
void setDisplayExpression( const QString &displayExpression );
void setDisplayExpression( const QString& displayExpression );
/**
* Get the preview expression, used to create a human readable preview string.
@ -264,7 +487,7 @@ class QgsVectorLayer : QgsMapLayer
void removeExpressionField( int index );
/**
* Returns the expressoin used for a given expression field
* Returns the expression used for a given expression field
*
* @param index An index of an epxression based (virtual) field
*
@ -285,7 +508,13 @@ class QgsVectorLayer : QgsMapLayer
*/
void updateExpressionField( int index, const QString& exp );
QgsActionManager *actions();
/**
* Get all layer actions defined on this layer.
*
* The pointer which is returned directly points to the actions object
* which is used by the layer, so any changes are immediately applied.
*/
QgsActionManager* actions();
/**
* The number of features that are selected in this layer
@ -294,18 +523,6 @@ class QgsVectorLayer : QgsMapLayer
*/
int selectedFeatureCount() const;
/**
* Select features found within the search rectangle (in layer's coordinates)
*
* @param rect The search rectangle
* @param addToSelection If set to true will not clear before selecting
*
* @see invertSelectionInRectangle(QgsRectangle & rect)
* @see selectByExpression()
* @deprecated use selectByRect() instead
*/
void select( QgsRectangle & rect, bool addToSelection ) /Deprecated/;
/**
* Select features found within the search rectangle (in layer's coordinates)
* @param rect search rectangle
@ -401,16 +618,6 @@ class QgsVectorLayer : QgsMapLayer
*/
const QgsFeatureIds &selectedFeaturesIds() const;
/**
* Change selection to the new set of features. Dismisses the current selection.
* Will emit the { @link selectionChanged( const QgsFeatureIds&, const QgsFeatureIds&qt_check_for_QOBJECT_macro, bool ) } signal with the
* clearAndSelect flag set.
*
* @param ids The ids which will be the new selection
* @deprecated use selectByIds() instead
*/
void setSelectedFeatures( const QgsFeatureIds &ids ) /Deprecated/;
/** Returns the bounding box of the selected features. If there is no selection, QgsRectangle(0,0,0,0) is returned */
QgsRectangle boundingBoxOfSelected() const;
@ -427,25 +634,25 @@ class QgsVectorLayer : QgsMapLayer
bool diagramsEnabled() const;
/** Sets diagram rendering object (takes ownership) */
void setDiagramRenderer( QgsDiagramRendererV2* r /Transfer/ );
const QgsDiagramRendererV2* diagramRenderer() const;
void setDiagramRenderer( QgsDiagramRenderer* r /Transfer/ );
const QgsDiagramRenderer* diagramRenderer() const;
void setDiagramLayerSettings( const QgsDiagramLayerSettings& s );
const QgsDiagramLayerSettings *diagramLayerSettings() const;
/** Return renderer V2. */
QgsFeatureRendererV2* rendererV2();
/** Return renderer. */
QgsFeatureRenderer* renderer();
/** Return const renderer V2.
/** Return const renderer.
* @note not available in python bindings
*/
// const QgsFeatureRendererV2* rendererV2() const { return mRendererV2; }
// const QgsFeatureRenderer* renderer() const { return mRendererV2; }
/**
* Set renderer which will be invoked to represent this layer.
* Ownership is transferred.
*/
void setRendererV2( QgsFeatureRendererV2* r /Transfer/ );
void setRenderer( QgsFeatureRenderer* r /Transfer/ );
/** Returns point, line or polygon */
QgsWkbTypes::GeometryType geometryType() const;
@ -460,12 +667,12 @@ class QgsVectorLayer : QgsMapLayer
QString providerType() const;
/** Reads vector layer specific state from project file Dom node.
* @note Called by QgsMapLayer::readXML().
* @note Called by QgsMapLayer::readXml().
*/
virtual bool readXml( const QDomNode& layer_node );
/** Write vector layer specific state to project file Dom node.
* @note Called by QgsMapLayer::writeXML().
* @note Called by QgsMapLayer::writeXml().
*/
virtual bool writeXml( QDomNode & layer_node, QDomDocument & doc ) const;
@ -511,18 +718,6 @@ class QgsVectorLayer : QgsMapLayer
*/
virtual QString loadNamedStyle( const QString &theURI, bool &theResultFlag );
/**
* Will load a named style from a provided QML string.
*
* @param namedStyle A QML string
* @param errorMsg An error message indicating problems if any
*
* @return true on success
*
* @deprecated Will be removed for QGIS 3 in favor of importNamedStyle
*/
virtual bool applyNamedStyle( const QString& namedStyle, QString &errorMsg /Out/ ) /Deprecated/;
/** Convert a saved attribute editor element into a AttributeEditor structure as it's used internally.
* @param elem the DOM element
* @param parent the QObject which will own this object
@ -605,9 +800,9 @@ class QgsVectorLayer : QgsMapLayer
virtual QString subsetString() const;
/**
* Query the layer for features specified in request.
* @param request feature request describing parameters of features to return
* @returns iterator for matching features from provider
* Query the layer for features specified in request.
* @param request feature request describing parameters of features to return
* @returns iterator for matching features from provider
*/
QgsFeatureIterator getFeatures( const QgsFeatureRequest& request = QgsFeatureRequest() ) const;
@ -633,11 +828,11 @@ class QgsVectorLayer : QgsMapLayer
QgsFeatureIterator getFeatures( const QgsRectangle& rectangle );
/** Adds a feature
@param f feature to add
@param feature feature to add
@param alsoUpdateExtent If True, will also go to the effort of e.g. updating the extents.
@return True in case of success and False in case of error
*/
bool addFeature( QgsFeature& f, bool alsoUpdateExtent = true );
bool addFeature( QgsFeature& feature, bool alsoUpdateExtent = true );
/** Updates an existing feature. This method needs to query the datasource
on every call. Consider using {@link changeAttributeValue()} or
@ -666,18 +861,12 @@ class QgsVectorLayer : QgsMapLayer
*/
bool moveVertex( const QgsPointV2& p, QgsFeatureId atFeatureId, int atVertex ) /PyName=moveVertexV2/;
/** Deletes a vertex from a feature
* @deprecated use deleteVertexV2() instead
*/
bool deleteVertex( QgsFeatureId atFeatureId, int atVertex ) /Deprecated/;
/** Deletes a vertex from a feature.
* @param featureId ID of feature to remove vertex from
* @param vertex index of vertex to delete
* @note added in QGIS 2.14
*/
//TODO QGIS 3.0 - rename back to deleteVertex
EditResult deleteVertexV2( QgsFeatureId featureId, int vertex );
EditResult deleteVertex( QgsFeatureId featureId, int vertex );
/** Deletes the selected features
* @return true in case of success and false otherwise
@ -708,7 +897,7 @@ class QgsVectorLayer : QgsMapLayer
* 6 layer not editable
* @note available in python as addCurvedRing
*/
int addRing( QgsCurveV2* ring /Transfer/, QgsFeatureId* featureId = 0 ) /PyName=addCurvedRing/;
int addRing( QgsCurve* ring /Transfer/, QgsFeatureId* featureId = 0 ) /PyName=addCurvedRing/;
/** Adds a new part polygon to a multipart feature
* @return
@ -738,7 +927,7 @@ class QgsVectorLayer : QgsMapLayer
int addPart( const QList<QgsPointV2>& ring ) /PyName=addPartV2/;
//! @note available in python as addCurvedPart
int addPart( QgsCurveV2* ring /Transfer/ ) /PyName=addCurvedPart/;
int addPart( QgsCurve* ring /Transfer/ ) /PyName=addCurvedPart/;
/** Translates feature by dx, dy
* @param featureId id of the feature to translate
@ -806,9 +995,6 @@ class QgsVectorLayer : QgsMapLayer
virtual bool isSpatial() const;
/** Returns true if the provider is in read-only mode */
virtual bool isReadOnly() const;
/** Returns true if the provider has been modified since the last commit */
virtual bool isModified() const;
@ -906,14 +1092,6 @@ class QgsVectorLayer : QgsMapLayer
/** Change feature's geometry */
bool changeGeometry( QgsFeatureId fid, const QgsGeometry& geom );
/**
* Changes an attribute value (but does not commit it)
*
* @deprecated The emitSignal parameter is obsolete and not considered at the moment. It will
* be removed in future releases. Remove it to be prepared for the future. (Since 2.1)
*/
bool changeAttributeValue( QgsFeatureId fid, int field, const QVariant& value, bool emitSignal ) /Deprecated/;
/**
* Changes an attribute value (but does not commit it)
*
@ -944,73 +1122,13 @@ class QgsVectorLayer : QgsMapLayer
*/
bool renameAttribute( int attIndex, const QString& newName );
/**
* Adds a tab (for the attribute editor form) holding groups and fields
*
* @deprecated Use `editFormConfig()->addTab()` instead
*/
void addAttributeEditorWidget( QgsAttributeEditorElement* data ) /Deprecated/;
/**
* Get the id for the editor widget used to represent the field at the given index
*
* @param fieldIdx The index of the field
*
* @return The id for the editor widget or a NULL string if not applicable
*
* @deprecated Use `editFormConfig()->widgetType()` instead
*/
const QString editorWidgetV2( int fieldIdx ) const /Deprecated/;
/**
* Get the id for the editor widget used to represent the field at the given index
*
* @param fieldName The name of the field
*
* @return The id for the editor widget or a NULL string if not applicable
*
* @note python method name editorWidgetV2ByName
*
* @deprecated Use `editFormConfig()->widgetType()` instead
*/
const QString editorWidgetV2( const QString& fieldName ) const /PyName=editorWidgetV2ByName, Deprecated/;
/**
* Get the configuration for the editor widget used to represent the field at the given index
*
* @param fieldIdx The index of the field
*
* @return The configuration for the editor widget or an empty config if the field does not exist
*
* @deprecated Use `editFormConfig()->widgetConfig()` instead
*/
const QgsEditorWidgetConfig editorWidgetV2Config( int fieldIdx ) const /Deprecated/;
/**
* Get the configuration for the editor widget used to represent the field with the given name
*
* @param fieldName The name of the field
*
* @return The configuration for the editor widget or an empty config if the field does not exist
*
* @note python method name is editorWidgetV2ConfigByName
*
* @deprecated Use `editFormConfig()->widgetConfig()` instead
*/
const QgsEditorWidgetConfig editorWidgetV2Config( const QString& fieldName ) const /PyName=editorWidgetV2ConfigByName, Deprecated/;
/**
* Returns a list of tabs holding groups and fields
*
* @deprecated Use `editFormConfig()->tabs()` instead
*/
QList< QgsAttributeEditorElement* > attributeEditorElements() /Deprecated/;
/**
* Get the configuration of the form used to represent this vector layer.
* This is a writable configuration that can directly be changed in place.
*
* @return The configuration of this layers' form
*
* @note Added in QGIS 2.14
*/
QgsEditFormConfig* editFormConfig() const;
@ -1019,7 +1137,12 @@ class QgsVectorLayer : QgsMapLayer
*/
void clearAttributeEditorWidgets();
/** Returns the alias of an attribute name or an empty string if there is no alias */
/**
* Returns the alias of an attribute name or a null string if there is no alias.
*
* @see {attributeDisplayName( int attributeIndex )} which returns the field name
* if no alias is defined.
*/
QString attributeAlias( int attributeIndex ) const;
/** Convenience function that returns the attribute alias if defined or the field name else */
@ -1089,148 +1212,12 @@ class QgsVectorLayer : QgsMapLayer
*/
bool rollBack( bool deleteBuffer = true );
/**
* Get edit type
*
* @deprecated Use `editFormConfig()->widgetType()` instead
*/
EditType editType( int idx ) /Deprecated/;
/**
* Set edit type
*
* @deprecated Use `editFormConfig()->setWidgetType()` instead
*/
void setEditType( int idx, EditType edit ) /Deprecated/;
/**
* Get the active layout for the attribute editor for this layer
* @deprecated Use `editFormConfig()->layout()` instead
*/
EditorLayout editorLayout() /Deprecated/;
/**
* Set the active layout for the attribute editor for this layer
* @deprecated Use `editFormConfig()->setLayout()` instead
*/
void setEditorLayout( EditorLayout editorLayout ) /Deprecated/;
/**
* Set the editor widget type for a field
*
* QGIS ships the following widget types, additional types may be available depending
* on plugins.
*
* <ul>
* <li>CheckBox (QgsCheckboxWidgetWrapper)</li>
* <li>Classification (QgsClassificationWidgetWrapper)</li>
* <li>Color (QgsColorWidgetWrapper)</li>
* <li>DateTime (QgsDateTimeEditWrapper)</li>
* <li>Enumeration (QgsEnumerationWidgetWrapper)</li>
* <li>FileName (QgsFileNameWidgetWrapper)</li>
* <li>Hidden (QgsHiddenWidgetWrapper)</li>
* <li>Photo (QgsPhotoWidgetWrapper)</li>
* <li>Range (QgsRangeWidgetWrapper)</li>
* <li>RelationReference (QgsRelationReferenceWidgetWrapper)</li>
* <li>TextEdit (QgsTextEditWrapper)</li>
* <li>UniqueValues (QgsUniqueValuesWidgetWrapper)</li>
* <li>UuidGenerator (QgsUuidWidgetWrapper)</li>
* <li>ValueMap (QgsValueMapWidgetWrapper)</li>
* <li>ValueRelation (QgsValueRelationWidgetWrapper)</li>
* <li>WebView (QgsWebViewWidgetWrapper)</li>
* </ul>
*
* @param attrIdx Index of the field
* @param widgetType Type id of the editor widget to use
*
* @deprecated Use `editFormConfig()->setWidgetType()` instead
*/
void setEditorWidgetV2( int attrIdx, const QString& widgetType ) /Deprecated/;
/**
* Set the editor widget config for a field.
*
* Python: Will accept a map.
*
* Example:
* \code{.py}
* layer.setEditorWidgetV2Config( 1, { 'Layer': 'otherlayerid_1234', 'Key': 'Keyfield', 'Value': 'ValueField' } )
* \endcode
*
* @param attrIdx Index of the field
* @param config The config to set for this field
*
* @see setEditorWidgetV2() for a list of widgets and choose the widget to see the available options.
*
* @deprecated Use `editFormConfig()->setWidgetConfig()` instead
*/
void setEditorWidgetV2Config( int attrIdx, const QMap<QString, QVariant>& config ) /Deprecated/;
/**
* Set string representing 'true' for a checkbox
*
* @deprecated Use @deprecated Use `editFormConfig()->setWidgetConfig()` instead
*/
void setCheckedState( int idx, const QString& checked, const QString& notChecked ) /Deprecated/;
/**
* Get edit form
*
* @deprecated Use `editFormConfig()->uiForm()` instead
*/
QString editForm() /Deprecated/;
/**
* Set edit form
* @deprecated Use `editFormConfig()->setUiForm()` instead
*/
void setEditForm( const QString& ui ) /Deprecated/;
/** Type of feature form pop-up suppression after feature creation (overrides app setting)
* @note added in 2.1
* @deprecated Use `editFormConfig()->suppress()` instead
*/
QgsVectorLayer::FeatureFormSuppress featureFormSuppress() const /Deprecated/;
/** Set type of feature form pop-up suppression after feature creation (overrides app setting)
* @note added in 2.1
* @deprecated Use `editFormConfig()->setSuppress()` instead
*/
void setFeatureFormSuppress( QgsVectorLayer::FeatureFormSuppress s ) /Deprecated/;
/** Get annotation form */
QString annotationForm() const;
/** Set annotation form for layer */
void setAnnotationForm( const QString& ui );
/**
* Get python function for edit form initialization
*
* @deprecated Use `editFormConfig()->initFunction()` instead
*/
QString editFormInit() /Deprecated/;
/**
* Set python function for edit form initialization
*
* @deprecated Use `editFormConfig()->setInitFunction()` instead
*/
void setEditFormInit( const QString& function ) /Deprecated/;
/**
* Access value map
* @deprecated Use `editFormConfig()->widgetConfig()` instead
*/
QMap<QString, QVariant> valueMap( int idx ) /Deprecated/;
/**
* Access range widget config data
*
* @deprecated Use `editFormConfig()->widgetConfig()` instead
*/
RangeData range( int idx ) /Deprecated/;
/** Access value relation widget data */
ValueRelationData valueRelation( int idx ) const;
@ -1242,45 +1229,6 @@ class QgsVectorLayer : QgsMapLayer
*/
QList<QgsRelation> referencingRelations( int idx ) const;
/**
* Access date format
*
* @deprecated Use `editFormConfig()->widgetConfig()` instead
*/
QString dateFormat( int idx ) /Deprecated/;
/**
* Access widget size for photo and webview widget
*
* @deprecated Use `editFormConfig()->widgetConfig()` instead
*/
QSize widgetSize( int idx ) /Deprecated/;
/**
* Is edit widget editable
*
* @deprecated Use `editFormConfig()->fieldEditable()` instead
*/
bool fieldEditable( int idx );
/**
* Label widget on top
* @deprecated Use `editFormConfig()->labelOnTop()` instead
*/
bool labelOnTop( int idx );
/**
* Set edit widget editable
* @deprecated Use `editFormConfig()->setFieldEditable()` instead
*/
void setFieldEditable( int idx, bool editable );
/**
* Label widget on top
* @deprecated Use `editFormConfig()->setLabelOnTop()` instead
*/
void setLabelOnTop( int idx, bool onTop );
//! Buffer with uncommitted editing operations. Only valid after editing has been turned on.
QgsVectorLayerEditBuffer* editBuffer();
@ -1314,6 +1262,7 @@ class QgsVectorLayer : QgsMapLayer
void updateFields();
/** Caches joined attributes if required (and not already done) */
// marked as const as these are just caches, and need to be created from const accessors
void createJoinCaches() const;
/** Returns unique values for column
@ -1385,6 +1334,7 @@ class QgsVectorLayer : QgsMapLayer
* @note added in 2.2
*/
void setSimplifyMethod( const QgsVectorSimplifyMethod& simplifyMethod );
/** Returns the simplification settings for fast rendering of features
* @note added in 2.2
*/
@ -1475,7 +1425,7 @@ class QgsVectorLayer : QgsMapLayer
/**
* Clear selection
*
* @see setSelectedFeatures(const QgsFeatureIds&)
* @see selectByIds()
*/
void removeSelection();
@ -1604,10 +1554,6 @@ class QgsVectorLayer : QgsMapLayer
*/
void updatedFields();
/**
* @deprecated use QObject::destroyed instead
*/
void layerDeleted() /Deprecated/;
/**
* Is emitted whenever an attribute value change is done in the edit buffer.
@ -1641,9 +1587,6 @@ class QgsVectorLayer : QgsMapLayer
/** This signal is emitted, when geometry changes are saved to the provider */
void committedGeometriesChanges( const QString& layerId, const QgsGeometryMap& changedGeometries );
/** Deprecated: This signal has never been emitted */
void saveLayerToProject() /Deprecated/;
/** Emitted when the font family defined for labeling layer is not found on system */
void labelingFontNotFound( QgsVectorLayer* layer, const QString& fontfamily );

12
python/core/qgsvectorlayereditutils.sip
View File

@ -28,18 +28,12 @@ class QgsVectorLayerEditUtils
*/
bool moveVertex( const QgsPointV2& p, QgsFeatureId atFeatureId, int atVertex ) /PyName=moveVertexV2/;
/** Deletes a vertex from a feature
* @deprecated use deleteVertexV2() instead
*/
bool deleteVertex( QgsFeatureId atFeatureId, int atVertex ) /Deprecated/;
/** Deletes a vertex from a feature.
* @param featureId ID of feature to remove vertex from
* @param vertex index of vertex to delete
* @note added in QGIS 2.14
*/
//TODO QGIS 3.0 - rename to deleteVertex
QgsVectorLayer::EditResult deleteVertexV2( QgsFeatureId featureId, int vertex );
QgsVectorLayer::EditResult deleteVertex( QgsFeatureId featureId, int vertex );
/** Adds a ring to polygon/multipolygon features
* @param ring ring to add
@ -72,7 +66,7 @@ class QgsVectorLayerEditUtils
* @note available in python bindings as addCurvedRing
*/
// TODO QGIS 3.0 returns an enum instead of a magic constant
int addRing( QgsCurveV2* ring, const QgsFeatureIds& targetFeatureIds = QgsFeatureIds(), QgsFeatureId* modifiedFeatureId = nullptr ) /PyName=addCurvedRing/;
int addRing( QgsCurve* ring, const QgsFeatureIds& targetFeatureIds = QgsFeatureIds(), QgsFeatureId* modifiedFeatureId = nullptr ) /PyName=addCurvedRing/;
/** Adds a new part polygon to a multipart feature
* @return
@ -103,7 +97,7 @@ class QgsVectorLayerEditUtils
// @note available in python bindings as addCurvedPart
// TODO QGIS 3.0 returns an enum instead of a magic constant
int addPart( QgsCurveV2* ring, QgsFeatureId featureId ) /PyName=addCurvedPart/;
int addPart( QgsCurve* ring, QgsFeatureId featureId ) /PyName=addCurvedPart/;
/** Translates feature by dx, dy
* @param featureId id of the feature to translate

8
python/core/symbology-ng/qgs25drenderer.sip
View File

@ -14,7 +14,7 @@
* *
***************************************************************************/
class Qgs25DRenderer : QgsFeatureRendererV2
class Qgs25DRenderer : QgsFeatureRenderer
{
%TypeHeaderCode
#include "qgs25drenderer.h"
@ -27,14 +27,14 @@ class Qgs25DRenderer : QgsFeatureRendererV2
*
* @param element XML information
*/
static QgsFeatureRendererV2* create( QDomElement& element );
static QgsFeatureRenderer* create( QDomElement& element );
QDomElement save( QDomDocument& doc );
void startRender( QgsRenderContext& context, const QgsFields& fields );
void stopRender( QgsRenderContext& context );
QList<QString> usedAttributes();
QgsFeatureRendererV2* clone() const;
QgsFeatureRenderer* clone() const;
virtual QgsSymbol* symbolForFeature( QgsFeature& feature, QgsRenderContext& context );
virtual QgsSymbolList symbols( QgsRenderContext& context );
@ -93,7 +93,7 @@ class Qgs25DRenderer : QgsFeatureRendererV2
* we assume that the internals are not compatible and create a new default
* 2.5D renderer.
*/
static Qgs25DRenderer* convertFromRenderer( QgsFeatureRendererV2* renderer );
static Qgs25DRenderer* convertFromRenderer( QgsFeatureRenderer* renderer );
/**
* Is the shadow enabled

2
python/core/symbology-ng/qgsarrowsymbollayer.sip
View File

@ -4,7 +4,7 @@
* \note Added in version 2.16
*/
class QgsArrowSymbolLayer : public QgsLineSymbolLayerV2
class QgsArrowSymbolLayer : public QgsLineSymbolLayer
{
%TypeHeaderCode
#include <qgsarrowsymbollayer.h>

44
python/core/symbology-ng/qgscategorizedsymbolrendererv2.sip → python/core/symbology-ng/qgscategorizedsymbolrenderer.sip
View File

@ -1,17 +1,17 @@
class QgsRendererCategoryV2
class QgsRendererCategory
{
%TypeHeaderCode
#include <qgscategorizedsymbolrendererv2.h>
#include <qgscategorizedsymbolrenderer.h>
%End
public:
//! takes ownership of symbol
QgsRendererCategoryV2( const QVariant& value, QgsSymbol* symbol /Transfer/, const QString& label, bool render = true );
QgsRendererCategory( const QVariant& value, QgsSymbol* symbol /Transfer/, const QString& label, bool render = true );
//! copy constructor
QgsRendererCategoryV2( const QgsRendererCategoryV2& cat );
QgsRendererCategory( const QgsRendererCategory& cat );
~QgsRendererCategoryV2();
~QgsRendererCategory();
QVariant value() const;
QgsSymbol* symbol() const;
@ -32,22 +32,22 @@ class QgsRendererCategoryV2
protected:
void swap( QgsRendererCategoryV2 & other );
void swap( QgsRendererCategory & other );
};
typedef QList<QgsRendererCategoryV2> QgsCategoryList;
typedef QList<QgsRendererCategory> QgsCategoryList;
class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
class QgsCategorizedSymbolRenderer : QgsFeatureRenderer
{
%TypeHeaderCode
#include <qgscategorizedsymbolrendererv2.h>
#include <qgscategorizedsymbolrenderer.h>
%End
public:
QgsCategorizedSymbolRendererV2( const QString& attrName = QString(), const QgsCategoryList& categories = QgsCategoryList() );
QgsCategorizedSymbolRenderer( const QString& attrName = QString(), const QgsCategoryList& categories = QgsCategoryList() );
virtual ~QgsCategorizedSymbolRendererV2();
virtual ~QgsCategorizedSymbolRenderer();
//! @note available in python as symbolForFeature2
virtual QgsSymbol* symbolForFeature( QgsFeature& feature, QgsRenderContext& context ) /PyName=symbolForFeature2/;
@ -63,12 +63,12 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
virtual QString dump() const;
virtual QgsCategorizedSymbolRendererV2* clone() const /Factory/;
virtual QgsCategorizedSymbolRenderer* clone() const /Factory/;
virtual void toSld( QDomDocument& doc, QDomElement &element ) const;
//! returns bitwise OR-ed capabilities of the renderer
virtual QgsFeatureRendererV2::Capabilities capabilities();
virtual QgsFeatureRenderer::Capabilities capabilities();
virtual QString filter( const QgsFields& fields = QgsFields() );
@ -98,7 +98,7 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
//! @note added in 2.5
bool updateCategoryRenderState( int catIndex, bool render );
void addCategory( const QgsRendererCategoryV2 &category );
void addCategory( const QgsRendererCategory &category );
bool deleteCategory( int catIndex );
void deleteAllCategories();
@ -112,7 +112,7 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
void setClassAttribute( const QString& attr );
//! create renderer from XML element
static QgsFeatureRendererV2* create( QDomElement& element ) /Factory/;
static QgsFeatureRenderer* create( QDomElement& element ) /Factory/;
//! store renderer info to XML element
virtual QDomElement save( QDomDocument& doc );
@ -148,14 +148,14 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
* @see setSourceColorRamp()
* @see sourceSymbol()
*/
QgsVectorColorRampV2* sourceColorRamp();
QgsVectorColorRamp* sourceColorRamp();
/** Sets the source color ramp.
* @param ramp color ramp. Ownership is transferred to the renderer
* @see sourceColorRamp()
* @see setSourceSymbol()
*/
void setSourceColorRamp( QgsVectorColorRampV2* ramp /Transfer/ );
void setSourceColorRamp( QgsVectorColorRamp* ramp /Transfer/ );
//! @note added in 2.1
bool invertedColorRamp();
@ -166,7 +166,7 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
* @param inverted set to true to invert ramp colors
* @note added in 2.5
*/
void updateColorRamp( QgsVectorColorRampV2* ramp /Transfer/, bool inverted = false );
void updateColorRamp( QgsVectorColorRamp* ramp /Transfer/, bool inverted = false );
void setRotationField( const QString& fieldOrExpression ) /Deprecated/;
QString rotationField() const /Deprecated/;
@ -195,10 +195,10 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
//! @note added in 2.6
virtual QString legendClassificationAttribute() const;
//! creates a QgsCategorizedSymbolRendererV2 from an existing renderer.
//! creates a QgsCategorizedSymbolRenderer from an existing renderer.
//! @note added in 2.5
//! @returns a new renderer if the conversion was possible, otherwise 0.
static QgsCategorizedSymbolRendererV2* convertFromRenderer( const QgsFeatureRendererV2 *renderer ) /Factory/;
static QgsCategorizedSymbolRenderer* convertFromRenderer( const QgsFeatureRenderer *renderer ) /Factory/;
protected:
void rebuildHash();
@ -208,7 +208,7 @@ class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2
QgsSymbol* symbolForValue( const QVariant& value );
private:
QgsCategorizedSymbolRendererV2( const QgsCategorizedSymbolRendererV2 & );
QgsCategorizedSymbolRendererV2 & operator=( const QgsCategorizedSymbolRendererV2 & );
QgsCategorizedSymbolRenderer( const QgsCategorizedSymbolRenderer & );
QgsCategorizedSymbolRenderer & operator=( const QgsCategorizedSymbolRenderer & );
};

2
python/core/symbology-ng/qgscptcityarchive.sip
View File

@ -166,7 +166,7 @@ class QgsCptCityColorRampItem : QgsCptCityDataItem
virtual int leafCount() const;
// --- New virtual methods for layer item derived classes ---
const QgsCptCityColorRampV2& ramp() const;
const QgsCptCityColorRamp& ramp() const;
QIcon icon();
QIcon icon( QSize size );
void init();

10
python/core/symbology-ng/qgsellipsesymbollayerv2.sip → python/core/symbology-ng/qgsellipsesymbollayer.sip
View File

@ -1,12 +1,12 @@
class QgsEllipseSymbolLayerV2 : QgsMarkerSymbolLayerV2
class QgsEllipseSymbolLayer : QgsMarkerSymbolLayer
{
%TypeHeaderCode
#include <qgsellipsesymbollayerv2.h>
#include <qgsellipsesymbollayer.h>
%End
public:
QgsEllipseSymbolLayerV2();
~QgsEllipseSymbolLayerV2();
QgsEllipseSymbolLayer();
~QgsEllipseSymbolLayer();
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
@ -15,7 +15,7 @@ class QgsEllipseSymbolLayerV2 : QgsMarkerSymbolLayerV2
QString layerType() const;
void startRender( QgsSymbolRenderContext& context );
void stopRender( QgsSymbolRenderContext& context );
virtual QgsEllipseSymbolLayerV2* clone() const /Factory/;
virtual QgsEllipseSymbolLayer* clone() const /Factory/;
QgsStringMap properties() const;
void toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap& props ) const;

64
python/core/symbology-ng/qgsfillsymbollayerv2.sip → python/core/symbology-ng/qgsfillsymbollayer.sip
View File

@ -1,11 +1,11 @@
class QgsSimpleFillSymbolLayerV2 : QgsFillSymbolLayerV2
class QgsSimpleFillSymbolLayer : QgsFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End
public:
QgsSimpleFillSymbolLayerV2( const QColor& color = DEFAULT_SIMPLEFILL_COLOR,
QgsSimpleFillSymbolLayer( const QColor& color = DEFAULT_SIMPLEFILL_COLOR,
Qt::BrushStyle style = DEFAULT_SIMPLEFILL_STYLE,
const QColor& borderColor = DEFAULT_SIMPLEFILL_BORDERCOLOR,
Qt::PenStyle borderStyle = DEFAULT_SIMPLEFILL_BORDERSTYLE,
@ -30,7 +30,7 @@ class QgsSimpleFillSymbolLayerV2 : QgsFillSymbolLayerV2
QgsStringMap properties() const;
virtual QgsSimpleFillSymbolLayerV2* clone() const /Factory/;
virtual QgsSimpleFillSymbolLayer* clone() const /Factory/;
void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const;
@ -111,10 +111,10 @@ class QgsSimpleFillSymbolLayerV2 : QgsFillSymbolLayerV2
Qt::BrushStyle dxfBrushStyle() const;
};
class QgsGradientFillSymbolLayerV2 : QgsFillSymbolLayerV2
class QgsGradientFillSymbolLayer : QgsFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End
public:
@ -144,7 +144,7 @@ class QgsGradientFillSymbolLayerV2 : QgsFillSymbolLayerV2
Repeat
};
QgsGradientFillSymbolLayerV2( const QColor& color = DEFAULT_SIMPLEFILL_COLOR,
QgsGradientFillSymbolLayer( const QColor& color = DEFAULT_SIMPLEFILL_COLOR,
const QColor& color2 = Qt::white,
GradientColorType gradientColorType = SimpleTwoColor,
GradientType gradientType = Linear,
@ -152,7 +152,7 @@ class QgsGradientFillSymbolLayerV2 : QgsFillSymbolLayerV2
GradientSpread gradientSpread = Pad
);
virtual ~QgsGradientFillSymbolLayerV2();
virtual ~QgsGradientFillSymbolLayer();
// static stuff
@ -170,7 +170,7 @@ class QgsGradientFillSymbolLayerV2 : QgsFillSymbolLayerV2
QgsStringMap properties() const;
virtual QgsGradientFillSymbolLayerV2* clone() const /Factory/;
virtual QgsGradientFillSymbolLayer* clone() const /Factory/;
double estimateMaxBleed() const;
@ -183,8 +183,8 @@ class QgsGradientFillSymbolLayerV2 : QgsFillSymbolLayerV2
void setGradientColorType( GradientColorType gradientColorType );
/** Color ramp used for the gradient fill, only used if the gradient color type is set to ColorRamp*/
QgsVectorColorRampV2* colorRamp();
void setColorRamp( QgsVectorColorRampV2* ramp );
QgsVectorColorRamp* colorRamp();
void setColorRamp( QgsVectorColorRamp* ramp );
/** Color for endpoint of gradient, only used if the gradient color type is set to SimpleTwoColor*/
QColor color2() const;
@ -233,10 +233,10 @@ class QgsGradientFillSymbolLayerV2 : QgsFillSymbolLayerV2
};
class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2
class QgsShapeburstFillSymbolLayer : QgsFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End
public:
@ -246,11 +246,11 @@ class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2
ColorRamp
};
QgsShapeburstFillSymbolLayerV2( const QColor& color = DEFAULT_SIMPLEFILL_COLOR, const QColor& color2 = Qt::white,
QgsShapeburstFillSymbolLayer( const QColor& color = DEFAULT_SIMPLEFILL_COLOR, const QColor& color2 = Qt::white,
ShapeburstColorType colorType = SimpleTwoColor,
int blurRadius = 0, bool useWholeShape = true, double maxDistance = 5 );
virtual ~QgsShapeburstFillSymbolLayerV2();
virtual ~QgsShapeburstFillSymbolLayer();
// static stuff
@ -268,7 +268,7 @@ class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2
QgsStringMap properties() const;
virtual QgsShapeburstFillSymbolLayerV2* clone() const /Factory/;
virtual QgsShapeburstFillSymbolLayer* clone() const /Factory/;
double estimateMaxBleed() const;
@ -336,7 +336,7 @@ class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2
void setDistanceMapUnitScale( const QgsMapUnitScale& scale );
const QgsMapUnitScale& distanceMapUnitScale() const;
/** Sets the color mode to use for the shapeburst fill. Shapeburst can either be drawn using a QgsVectorColorRampV2 color ramp
/** Sets the color mode to use for the shapeburst fill. Shapeburst can either be drawn using a QgsVectorColorRamp color ramp
* or by simply specificing a start and end color. setColorType is used to specify which mode to use for the fill.
* @param colorType color type to use for shapeburst fill
* @note added in 2.3
@ -346,7 +346,7 @@ class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2
* @see setColorRamp
*/
void setColorType( ShapeburstColorType colorType );
/** Returns the color mode used for the shapeburst fill. Shapeburst can either be drawn using a QgsVectorColorRampV2 color ramp
/** Returns the color mode used for the shapeburst fill. Shapeburst can either be drawn using a QgsVectorColorRamp color ramp
* or by simply specificing a start and end color.
* @returns current color mode used for the shapeburst fill
* @note added in 2.3
@ -363,14 +363,14 @@ class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2
* @see setColorType
* @see colorRamp
*/
void setColorRamp( QgsVectorColorRampV2* ramp );
void setColorRamp( QgsVectorColorRamp* ramp );
/** Returns the color ramp used for the shapeburst fill. The color ramp is only used if the colorType is set to ShapeburstColorType::ColorRamp
* @returns a QgsVectorColorRampV2 color ramp
* @returns a QgsVectorColorRamp color ramp
* @note added in 2.3
* @see setColorRamp
* @see colorType
*/
QgsVectorColorRampV2* colorRamp();
QgsVectorColorRamp* colorRamp();
/** Sets the color for the endpoint of the shapeburst fill. This color is only used if setColorType is set ShapeburstColorType::SimpleTwoColor.
* @param color2 QColor to use for endpoint of gradient
@ -442,10 +442,10 @@ class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2
};
/** Base class for polygon renderers generating texture images*/
class QgsImageFillSymbolLayer: QgsFillSymbolLayerV2
class QgsImageFillSymbolLayer: QgsFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End
public:
@ -497,7 +497,7 @@ class QgsImageFillSymbolLayer: QgsFillSymbolLayerV2
class QgsRasterFillSymbolLayer: QgsImageFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End
public:
@ -663,7 +663,7 @@ class QgsRasterFillSymbolLayer: QgsImageFillSymbolLayer
class QgsSVGFillSymbolLayer: QgsImageFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End
public:
@ -741,7 +741,7 @@ class QgsSVGFillSymbolLayer: QgsImageFillSymbolLayer
class QgsLinePatternFillSymbolLayer: QgsImageFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End
public:
QgsLinePatternFillSymbolLayer();
@ -849,7 +849,7 @@ class QgsLinePatternFillSymbolLayer: QgsImageFillSymbolLayer
class QgsPointPatternFillSymbolLayer : QgsImageFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End
public:
QgsPointPatternFillSymbolLayer();
@ -947,15 +947,15 @@ class QgsPointPatternFillSymbolLayer : QgsImageFillSymbolLayer
void applyDataDefinedSettings( QgsSymbolRenderContext& context );
};
class QgsCentroidFillSymbolLayerV2 : QgsFillSymbolLayerV2
class QgsCentroidFillSymbolLayer : QgsFillSymbolLayer
{
%TypeHeaderCode
#include <qgsfillsymbollayerv2.h>
#include <qgsfillsymbollayer.h>
%End
public:
QgsCentroidFillSymbolLayerV2();
~QgsCentroidFillSymbolLayerV2();
QgsCentroidFillSymbolLayer();
~QgsCentroidFillSymbolLayer();
// static stuff
@ -974,7 +974,7 @@ class QgsCentroidFillSymbolLayerV2 : QgsFillSymbolLayerV2
QgsStringMap properties() const;
virtual QgsCentroidFillSymbolLayerV2* clone() const /Factory/;
virtual QgsCentroidFillSymbolLayer* clone() const /Factory/;
void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const;

8
python/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.sip → python/core/symbology-ng/qgsgeometrygeneratorsymbollayer.sip
View File

@ -1,5 +1,5 @@
/***************************************************************************
qgsgeometrygeneratorsymbollayerv2.sip
qgsgeometrygeneratorsymbollayer.sip
---------------------
begin : November 2015
copyright : (C) 2015 by Matthias Kuhn
@ -12,10 +12,10 @@
* (at your option) any later version. *
* *
***************************************************************************/
class QgsGeometryGeneratorSymbolLayerV2 : QgsSymbolLayer
class QgsGeometryGeneratorSymbolLayer : QgsSymbolLayer
{
%TypeHeaderCode
#include "qgsgeometrygeneratorsymbollayerv2.h"
#include "qgsgeometrygeneratorsymbollayer.h"
%End
public:
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() );
@ -84,5 +84,5 @@ class QgsGeometryGeneratorSymbolLayerV2 : QgsSymbolLayer
void setColor( const QColor& color );
private:
QgsGeometryGeneratorSymbolLayerV2( const QgsGeometryGeneratorSymbolLayerV2& copy );
QgsGeometryGeneratorSymbolLayer( const QgsGeometryGeneratorSymbolLayer& copy );
};

70
python/core/symbology-ng/qgsgraduatedsymbolrendererv2.sip → python/core/symbology-ng/qgsgraduatedsymbolrenderer.sip
View File

@ -1,15 +1,15 @@
class QgsRendererRangeV2
class QgsRendererRange
{
%TypeHeaderCode
#include <qgsgraduatedsymbolrendererv2.h>
#include <qgsgraduatedsymbolrenderer.h>
%End
public:
QgsRendererRangeV2();
QgsRendererRangeV2( double lowerValue, double upperValue, QgsSymbol* symbol /Transfer/, const QString& label, bool render = true );
QgsRendererRangeV2( const QgsRendererRangeV2& range );
QgsRendererRange();
QgsRendererRange( double lowerValue, double upperValue, QgsSymbol* symbol /Transfer/, const QString& label, bool render = true );
QgsRendererRange( const QgsRendererRange& range );
~QgsRendererRangeV2();
~QgsRendererRange();
double lowerValue() const;
double upperValue() const;
@ -40,24 +40,24 @@ class QgsRendererRangeV2
protected:
// for cpy+swap idiom
void swap( QgsRendererRangeV2 & other );
void swap( QgsRendererRange & other );
};
typedef QList<QgsRendererRangeV2> QgsRangeList;
typedef QList<QgsRendererRange> QgsRangeList;
// @note added in 2.6
class QgsRendererRangeV2LabelFormat
class QgsRendererRangeLabelFormat
{
%TypeHeaderCode
#include <qgsgraduatedsymbolrendererv2.h>
#include <qgsgraduatedsymbolrenderer.h>
%End
public:
QgsRendererRangeV2LabelFormat();
QgsRendererRangeV2LabelFormat( const QString& format, int precision = 4, bool trimTrailingZeroes = false );
QgsRendererRangeLabelFormat();
QgsRendererRangeLabelFormat( const QString& format, int precision = 4, bool trimTrailingZeroes = false );
bool operator==( const QgsRendererRangeV2LabelFormat & other ) const;
bool operator!=( const QgsRendererRangeV2LabelFormat & other ) const;
bool operator==( const QgsRendererRangeLabelFormat & other ) const;
bool operator!=( const QgsRendererRangeLabelFormat & other ) const;
QString format() const;
void setFormat( const QString& format );
@ -70,7 +70,7 @@ class QgsRendererRangeV2LabelFormat
//! @note labelForLowerUpper in python bindings
QString labelForRange( double lower, double upper ) const /PyName=labelForLowerUpper/;
QString labelForRange( const QgsRendererRangeV2 &range ) const;
QString labelForRange( const QgsRendererRange &range ) const;
QString formatNumber( double value ) const;
void setFromDomElement( QDomElement &element );
@ -82,16 +82,16 @@ class QgsRendererRangeV2LabelFormat
};
class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
class QgsGraduatedSymbolRenderer : QgsFeatureRenderer
{
%TypeHeaderCode
#include <qgsgraduatedsymbolrendererv2.h>
#include <qgsgraduatedsymbolrenderer.h>
%End
public:
QgsGraduatedSymbolRendererV2( const QString& attrName = QString(), const QgsRangeList& ranges = QgsRangeList() );
QgsGraduatedSymbolRenderer( const QString& attrName = QString(), const QgsRangeList& ranges = QgsRangeList() );
virtual ~QgsGraduatedSymbolRendererV2();
virtual ~QgsGraduatedSymbolRenderer();
//! @note labelForLowerUpper in python bindings
virtual QgsSymbol* symbolForFeature( QgsFeature& feature, QgsRenderContext& context ) /PyName=symbolForFeature2/;
@ -106,12 +106,12 @@ class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
virtual QString dump() const;
virtual QgsGraduatedSymbolRendererV2* clone() const /Factory/;
virtual QgsGraduatedSymbolRenderer* clone() const /Factory/;
virtual void toSld( QDomDocument& doc, QDomElement &element ) const;
//! returns bitwise OR-ed capabilities of the renderer
virtual QgsFeatureRendererV2::Capabilities capabilities();
virtual QgsFeatureRenderer::Capabilities capabilities();
//! @note symbol2 in python bindings
virtual QgsSymbolList symbols( QgsRenderContext& context ) /PyName=symbols2/;
@ -130,7 +130,7 @@ class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
void addClass( QgsSymbol* symbol );
//! @note available in python bindings as addClassRange
void addClass( const QgsRendererRangeV2& range ) /PyName=addClassRange/;
void addClass( const QgsRendererRange& range ) /PyName=addClassRange/;
//! @note available in python bindings as addClassLowerUpper
void addClass( double lower, double upper ) /PyName=addClassLowerUpper/;
@ -191,31 +191,31 @@ class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
//! Return the label format used to generate default classification labels
//! @note Added in 2.6
const QgsRendererRangeV2LabelFormat &labelFormat() const;
const QgsRendererRangeLabelFormat &labelFormat() const;
//! Set the label format used to generate default classification labels
//! @param labelFormat The string appended to classification labels
//! @param updateRanges If true then ranges ending with the old unit string are updated to the new.
//! @note Added in 2.6
void setLabelFormat( const QgsRendererRangeV2LabelFormat &labelFormat, bool updateRanges = false );
void setLabelFormat( const QgsRendererRangeLabelFormat &labelFormat, bool updateRanges = false );
//! Reset the label decimal places to a numberbased on the minimum class interval
//! @param updateRanges if true then ranges currently using the default label will be updated
//! @note Added in 2.6
void calculateLabelPrecision( bool updateRanges = true );
static QgsGraduatedSymbolRendererV2* createRenderer(
static QgsGraduatedSymbolRenderer* createRenderer(
QgsVectorLayer* vlayer,
const QString& attrName,
int classes,
Mode mode,
QgsSymbol* symbol /Transfer/,
QgsVectorColorRampV2* ramp /Transfer/,
QgsVectorColorRamp* ramp /Transfer/,
bool inverted = false,
const QgsRendererRangeV2LabelFormat& legendFormat = QgsRendererRangeV2LabelFormat()
const QgsRendererRangeLabelFormat& legendFormat = QgsRendererRangeLabelFormat()
);
//! create renderer from XML element
static QgsFeatureRendererV2* create( QDomElement& element ) /Factory/;
static QgsFeatureRenderer* create( QDomElement& element ) /Factory/;
//! store renderer info to XML element
virtual QDomElement save( QDomDocument& doc );
@ -251,12 +251,12 @@ class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
* @see setSourceColorRamp()
* @see sourceSymbol()
*/
QgsVectorColorRampV2* sourceColorRamp();
QgsVectorColorRamp* sourceColorRamp();
/** Sets the source color ramp.
* @param ramp color ramp. Ownership is transferred to the renderer
*/
void setSourceColorRamp( QgsVectorColorRampV2* ramp /Transfer/ );
void setSourceColorRamp( QgsVectorColorRamp* ramp /Transfer/ );
//! @note added in 2.1
bool invertedColorRamp();
@ -267,7 +267,7 @@ class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
* @param ramp color ramp. Ownership is transferred to the renderer
* @param inverted set to true to invert ramp colors
*/
void updateColorRamp( QgsVectorColorRampV2* ramp /Transfer/ = 0, bool inverted = false );
void updateColorRamp( QgsVectorColorRamp* ramp /Transfer/ = 0, bool inverted = false );
/** Update all the symbols but leave breaks and colors. This method also sets the source
* symbol for the renderer.
@ -326,10 +326,10 @@ class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
//! @note added in 2.6
virtual QString legendClassificationAttribute();
//! creates a QgsGraduatedSymbolRendererV2 from an existing renderer.
//! creates a QgsGraduatedSymbolRenderer from an existing renderer.
//! @note added in 2.6
//! @returns a new renderer if the conversion was possible, otherwise 0.
static QgsGraduatedSymbolRendererV2* convertFromRenderer( const QgsFeatureRendererV2 *renderer ) /Factory/;
static QgsGraduatedSymbolRenderer* convertFromRenderer( const QgsFeatureRenderer *renderer ) /Factory/;
protected:
QgsSymbol* symbolForValue( double value );
@ -340,6 +340,6 @@ class QgsGraduatedSymbolRendererV2 : QgsFeatureRendererV2
private:
QgsGraduatedSymbolRendererV2( const QgsGraduatedSymbolRendererV2 & );
QgsGraduatedSymbolRendererV2 & operator=( const QgsGraduatedSymbolRendererV2 & );
QgsGraduatedSymbolRenderer( const QgsGraduatedSymbolRenderer & );
QgsGraduatedSymbolRenderer & operator=( const QgsGraduatedSymbolRenderer & );
};

10
python/core/symbology-ng/qgsheatmaprenderer.sip
View File

@ -1,4 +1,4 @@
class QgsHeatmapRenderer : QgsFeatureRendererV2
class QgsHeatmapRenderer : QgsFeatureRenderer
{
%TypeHeaderCode
#include <qgsheatmaprenderer.h>
@ -19,9 +19,9 @@ class QgsHeatmapRenderer : QgsFeatureRendererV2
virtual QgsSymbolList symbols( QgsRenderContext& context ) /PyName=symbols2/;
virtual QString dump() const;
virtual QList<QString> usedAttributes();
static QgsFeatureRendererV2* create( QDomElement& element ) /Factory/;
static QgsFeatureRenderer* create( QDomElement& element ) /Factory/;
virtual QDomElement save( QDomDocument& doc );
static QgsHeatmapRenderer* convertFromRenderer( const QgsFeatureRendererV2* renderer ) /Factory/;
static QgsHeatmapRenderer* convertFromRenderer( const QgsFeatureRenderer* renderer ) /Factory/;
//reimplemented to extent the request so that points up to heatmap's radius distance outside
//visible area are included
@ -33,12 +33,12 @@ class QgsHeatmapRenderer : QgsFeatureRendererV2
* @returns color ramp for heatmap
* @see setColorRamp
*/
QgsVectorColorRampV2* colorRamp() const;
QgsVectorColorRamp* colorRamp() const;
/** Sets the color ramp to use for shading the heatmap.
* @param ramp color ramp for heatmap. Ownership of ramp is transferred to the renderer.
* @see colorRamp
*/
void setColorRamp( QgsVectorColorRampV2* ramp /Transfer/ );
void setColorRamp( QgsVectorColorRamp* ramp /Transfer/ );
/** Returns whether the ramp is inverted
* @returns true if color ramp is inverted

14
python/core/symbology-ng/qgsinvertedpolygonrenderer.sip
View File

@ -1,4 +1,4 @@
class QgsInvertedPolygonRenderer : QgsFeatureRendererV2
class QgsInvertedPolygonRenderer : QgsFeatureRenderer
{
%TypeHeaderCode
#include <qgsinvertedpolygonrenderer.h>
@ -9,7 +9,7 @@ class QgsInvertedPolygonRenderer : QgsFeatureRendererV2
* @param embeddedRenderer optional embeddedRenderer. If null, a default one will be assigned.
* Ownership will be transferred.
*/
QgsInvertedPolygonRenderer( QgsFeatureRendererV2* embeddedRenderer /Transfer/ = 0 );
QgsInvertedPolygonRenderer( QgsFeatureRenderer* embeddedRenderer /Transfer/ = 0 );
virtual ~QgsInvertedPolygonRenderer();
@ -41,7 +41,7 @@ class QgsInvertedPolygonRenderer : QgsFeatureRendererV2
/** Proxy that will call this method on the embedded renderer. */
virtual QList<QString> usedAttributes();
/** Proxy that will call this method on the embedded renderer. */
virtual QgsFeatureRendererV2::Capabilities capabilities();
virtual QgsFeatureRenderer::Capabilities capabilities();
/** Proxy that will call this method on the embedded renderer.
* @note available in python bindings as symbol2
*/
@ -74,7 +74,7 @@ class QgsInvertedPolygonRenderer : QgsFeatureRendererV2
virtual bool willRenderFeature( QgsFeature& feat, QgsRenderContext& context ) /PyName=willRenderFeature2/;
/** Creates a renderer out of an XML, for loading*/
static QgsFeatureRendererV2* create( QDomElement& element ) /Factory/;
static QgsFeatureRenderer* create( QDomElement& element ) /Factory/;
/** Creates an XML representation of the renderer. Used for saving purpose
* @param doc the XML document where to create the XML subtree
@ -82,8 +82,8 @@ class QgsInvertedPolygonRenderer : QgsFeatureRendererV2
*/
virtual QDomElement save( QDomDocument& doc );
void setEmbeddedRenderer( QgsFeatureRendererV2* subRenderer /Transfer/ );
const QgsFeatureRendererV2* embeddedRenderer() const;
void setEmbeddedRenderer( QgsFeatureRenderer* subRenderer /Transfer/ );
const QgsFeatureRenderer* embeddedRenderer() const;
virtual void setLegendSymbolItem( const QString& key, QgsSymbol* symbol );
@ -101,5 +101,5 @@ class QgsInvertedPolygonRenderer : QgsFeatureRendererV2
* @note added in 2.5
* @returns a new renderer if the conversion was possible, otherwise 0.
*/
static QgsInvertedPolygonRenderer* convertFromRenderer( const QgsFeatureRendererV2* renderer ) /Factory/;
static QgsInvertedPolygonRenderer* convertFromRenderer( const QgsFeatureRenderer* renderer ) /Factory/;
};

16
python/core/symbology-ng/qgslegendsymbolitemv2.sip → python/core/symbology-ng/qgslegendsymbolitem.sip
View File

@ -6,20 +6,20 @@
* @see QgsSymbolLegendNode
* @note added in 2.6
*/
class QgsLegendSymbolItemV2
class QgsLegendSymbolItem
{
%TypeHeaderCode
#include <qgslegendsymbolitemv2.h>
#include <qgslegendsymbolitem.h>
%End
public:
QgsLegendSymbolItemV2();
QgsLegendSymbolItem();
//! Construct item. Does not take ownership of symbol (makes internal clone)
//! @note parentRuleKey added in 2.8
QgsLegendSymbolItemV2( QgsSymbol* symbol, const QString& label, const QString& ruleKey, bool checkable = false, int scaleMinDenom = -1, int scaleMaxDenom = -1, int level = 0, const QString& parentRuleKey = QString() );
~QgsLegendSymbolItemV2();
QgsLegendSymbolItemV2( const QgsLegendSymbolItemV2& other );
//QgsLegendSymbolItemV2& operator=( const QgsLegendSymbolItemV2& other );
QgsLegendSymbolItem( QgsSymbol* symbol, const QString& label, const QString& ruleKey, bool checkable = false, int scaleMinDenom = -1, int scaleMaxDenom = -1, int level = 0, const QString& parentRuleKey = QString() );
~QgsLegendSymbolItem();
QgsLegendSymbolItem( const QgsLegendSymbolItem& other );
//QgsLegendSymbolItem& operator=( const QgsLegendSymbolItem& other );
//! Return associated symbol. May be null.
QgsSymbol* symbol() const;
@ -54,4 +54,4 @@ class QgsLegendSymbolItemV2
};
typedef QList< QgsLegendSymbolItemV2 > QgsLegendSymbolListV2;
typedef QList< QgsLegendSymbolItem > QgsLegendSymbolListV2;

18
python/core/symbology-ng/qgslinesymbollayerv2.sip → python/core/symbology-ng/qgslinesymbollayer.sip
View File

@ -1,11 +1,11 @@
class QgsSimpleLineSymbolLayerV2 : QgsLineSymbolLayerV2
class QgsSimpleLineSymbolLayer : QgsLineSymbolLayer
{
%TypeHeaderCode
#include <qgslinesymbollayerv2.h>
#include <qgslinesymbollayer.h>
%End
public:
QgsSimpleLineSymbolLayerV2( const QColor& color = DEFAULT_SIMPLELINE_COLOR,
QgsSimpleLineSymbolLayer( const QColor& color = DEFAULT_SIMPLELINE_COLOR,
double width = DEFAULT_SIMPLELINE_WIDTH,
Qt::PenStyle penStyle = DEFAULT_SIMPLELINE_PENSTYLE );
@ -29,7 +29,7 @@ class QgsSimpleLineSymbolLayerV2 : QgsLineSymbolLayerV2
QgsStringMap properties() const;
virtual QgsSimpleLineSymbolLayerV2* clone() const /Factory/;
virtual QgsSimpleLineSymbolLayer* clone() const /Factory/;
void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const;
@ -89,17 +89,17 @@ class QgsSimpleLineSymbolLayerV2 : QgsLineSymbolLayerV2
/////////
class QgsMarkerLineSymbolLayerV2 : QgsLineSymbolLayerV2
class QgsMarkerLineSymbolLayer : QgsLineSymbolLayer
{
%TypeHeaderCode
#include <qgslinesymbollayerv2.h>
#include <qgslinesymbollayer.h>
%End
public:
QgsMarkerLineSymbolLayerV2( bool rotateMarker = DEFAULT_MARKERLINE_ROTATE,
QgsMarkerLineSymbolLayer( bool rotateMarker = DEFAULT_MARKERLINE_ROTATE,
double interval = DEFAULT_MARKERLINE_INTERVAL );
~QgsMarkerLineSymbolLayerV2();
~QgsMarkerLineSymbolLayer();
/**
* Defines how/where the marker should be placed on the line
@ -148,7 +148,7 @@ class QgsMarkerLineSymbolLayerV2 : QgsLineSymbolLayerV2
QgsStringMap properties() const;
virtual QgsMarkerLineSymbolLayerV2* clone() const;
virtual QgsMarkerLineSymbolLayer* clone() const;
void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const;

50
python/core/symbology-ng/qgsmarkersymbollayerv2.sip → python/core/symbology-ng/qgsmarkersymbollayer.sip
View File

@ -4,10 +4,10 @@
* leaves the actual drawing of the symbols to subclasses.
* \note Added in version 2.16
*/
class QgsSimpleMarkerSymbolLayerBase : QgsMarkerSymbolLayerV2
class QgsSimpleMarkerSymbolLayerBase : QgsMarkerSymbolLayer
{
%TypeHeaderCode
#include <qgsmarkersymbollayerv2.h>
#include <qgsmarkersymbollayer.h>
%End
public:
@ -137,18 +137,18 @@ class QgsSimpleMarkerSymbolLayerBase : QgsMarkerSymbolLayerV2
};
/** \ingroup core
* \class QgsSimpleMarkerSymbolLayerV2
* \class QgsSimpleMarkerSymbolLayer
* \brief Simple marker symbol layer, consisting of a rendered shape with solid fill color and an outline.
*/
class QgsSimpleMarkerSymbolLayerV2 : QgsSimpleMarkerSymbolLayerBase
class QgsSimpleMarkerSymbolLayer : QgsSimpleMarkerSymbolLayerBase
{
%TypeHeaderCode
#include <qgsmarkersymbollayerv2.h>
#include <qgsmarkersymbollayer.h>
%End
public:
/** Constructor for QgsSimpleMarkerSymbolLayerV2.
/** Constructor for QgsSimpleMarkerSymbolLayer.
* @param name symbol name, should be one of "square", "rectangle", "diamond",
* "pentagon", "hexagon", "triangle", "equilateral_triangle", "star", "arrow",
* "circle", "cross", "cross_fill", "cross2", "line", "x", "arrowhead", "filled_arrowhead",
@ -162,7 +162,7 @@ class QgsSimpleMarkerSymbolLayerV2 : QgsSimpleMarkerSymbolLayerBase
* @param penJoinStyle join style for outline pen
* @deprecated use variant which accepts QgsSimpleMarkerSymbolLayerBase::Shape instead
*/
QgsSimpleMarkerSymbolLayerV2( const QString& name,
QgsSimpleMarkerSymbolLayer( const QString& name,
const QColor& color = DEFAULT_SIMPLEMARKER_COLOR,
const QColor& borderColor = DEFAULT_SIMPLEMARKER_BORDERCOLOR,
double size = DEFAULT_SIMPLEMARKER_SIZE,
@ -170,7 +170,7 @@ class QgsSimpleMarkerSymbolLayerV2 : QgsSimpleMarkerSymbolLayerBase
QgsSymbol::ScaleMethod scaleMethod = DEFAULT_SCALE_METHOD,
Qt::PenJoinStyle penJoinStyle = DEFAULT_SIMPLEMARKER_JOINSTYLE ) /Deprecated/;
/** Constructor for QgsSimpleMarkerSymbolLayerV2.
/** Constructor for QgsSimpleMarkerSymbolLayer.
* @param shape symbol shape
* @param size symbol size (in mm)
* @param angle symbol rotation angle
@ -179,7 +179,7 @@ class QgsSimpleMarkerSymbolLayerV2 : QgsSimpleMarkerSymbolLayerBase
* @param borderColor border color for symbol
* @param penJoinStyle join style for outline pen
*/
QgsSimpleMarkerSymbolLayerV2( Shape shape = Circle,
QgsSimpleMarkerSymbolLayer( Shape shape = Circle,
double size = DEFAULT_SIMPLEMARKER_SIZE,
double angle = DEFAULT_SIMPLEMARKER_ANGLE,
QgsSymbol::ScaleMethod scaleMethod = DEFAULT_SCALE_METHOD,
@ -189,15 +189,15 @@ class QgsSimpleMarkerSymbolLayerV2 : QgsSimpleMarkerSymbolLayerBase
// static methods
/** Creates a new QgsSimpleMarkerSymbolLayerV2.
/** Creates a new QgsSimpleMarkerSymbolLayer.
* @param properties a property map containing symbol properties (see properties())
* @returns new QgsSimpleMarkerSymbolLayerV2
* @returns new QgsSimpleMarkerSymbolLayer
*/
static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
/** Creates a new QgsSimpleMarkerSymbolLayerV2 from an SLD XML element.
/** Creates a new QgsSimpleMarkerSymbolLayer from an SLD XML element.
* @param element XML element containing SLD definition of symbol
* @returns new QgsSimpleMarkerSymbolLayerV2
* @returns new QgsSimpleMarkerSymbolLayer
*/
static QgsSymbolLayer* createFromSld( QDomElement &element ) /Factory/;
@ -207,7 +207,7 @@ class QgsSimpleMarkerSymbolLayerV2 : QgsSimpleMarkerSymbolLayerBase
void startRender( QgsSymbolRenderContext& context );
void renderPoint( QPointF point, QgsSymbolRenderContext& context );
QgsStringMap properties() const;
virtual QgsSimpleMarkerSymbolLayerV2* clone() const /Factory/;
virtual QgsSimpleMarkerSymbolLayer* clone() const /Factory/;
void writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const;
QString ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const;
bool writeDxf( QgsDxfExport &e, double mmMapUnitScaleFactor, const QString &layerName, QgsSymbolRenderContext &context, QPointF shift = QPointF( 0.0, 0.0 ) ) const;
@ -355,14 +355,14 @@ class QgsSimpleMarkerSymbolLayerV2 : QgsSimpleMarkerSymbolLayerBase
/** \ingroup core
* \class QgsFilledMarkerSymbolLayer
* \brief Filled marker symbol layer, consisting of a shape which is rendered using a QgsFillSymbolV2. This allows
* \brief Filled marker symbol layer, consisting of a shape which is rendered using a QgsFillSymbol. This allows
* the symbol to support advanced styling of the interior and outline of the shape.
* \note Added in version 2.16
*/
class QgsFilledMarkerSymbolLayer : QgsSimpleMarkerSymbolLayerBase
{
%TypeHeaderCode
#include <qgsmarkersymbollayerv2.h>
#include <qgsmarkersymbollayer.h>
%End
public:
@ -403,14 +403,14 @@ class QgsFilledMarkerSymbolLayer : QgsSimpleMarkerSymbolLayerBase
};
class QgsSvgMarkerSymbolLayerV2 : QgsMarkerSymbolLayerV2
class QgsSvgMarkerSymbolLayer : QgsMarkerSymbolLayer
{
%TypeHeaderCode
#include <qgsmarkersymbollayerv2.h>
#include <qgsmarkersymbollayer.h>
%End
public:
QgsSvgMarkerSymbolLayerV2( const QString& name = DEFAULT_SVGMARKER_NAME,
QgsSvgMarkerSymbolLayer( const QString& name = DEFAULT_SVGMARKER_NAME,
double size = DEFAULT_SVGMARKER_SIZE,
double angle = DEFAULT_SVGMARKER_ANGLE,
QgsSymbol::ScaleMethod scaleMethod = DEFAULT_SCALE_METHOD );
@ -432,7 +432,7 @@ class QgsSvgMarkerSymbolLayerV2 : QgsMarkerSymbolLayerV2
QgsStringMap properties() const;
virtual QgsSvgMarkerSymbolLayerV2* clone() const /Factory/;
virtual QgsSvgMarkerSymbolLayer* clone() const /Factory/;
void writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const;
@ -473,20 +473,20 @@ class QgsSvgMarkerSymbolLayerV2 : QgsMarkerSymbolLayerV2
QRectF bounds( QPointF point, QgsSymbolRenderContext& context );
};
class QgsFontMarkerSymbolLayerV2 : QgsMarkerSymbolLayerV2
class QgsFontMarkerSymbolLayer : QgsMarkerSymbolLayer
{
%TypeHeaderCode
#include <qgsmarkersymbollayerv2.h>
#include <qgsmarkersymbollayer.h>
%End
public:
QgsFontMarkerSymbolLayerV2( const QString& fontFamily = DEFAULT_FONTMARKER_FONT,
QgsFontMarkerSymbolLayer( const QString& fontFamily = DEFAULT_FONTMARKER_FONT,
QChar chr = DEFAULT_FONTMARKER_CHR,
double pointSize = DEFAULT_FONTMARKER_SIZE,
const QColor& color = DEFAULT_FONTMARKER_COLOR,
double angle = DEFAULT_FONTMARKER_ANGLE );
~QgsFontMarkerSymbolLayerV2();
~QgsFontMarkerSymbolLayer();
// static stuff
@ -505,7 +505,7 @@ class QgsFontMarkerSymbolLayerV2 : QgsMarkerSymbolLayerV2
QgsStringMap properties() const;
virtual QgsFontMarkerSymbolLayerV2* clone() const /Factory/;
virtual QgsFontMarkerSymbolLayer* clone() const /Factory/;
void writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const;

8
python/core/symbology-ng/qgsnullsymbolrenderer.sip
View File

@ -5,7 +5,7 @@
* \note Added in version 2.16
*/
class QgsNullSymbolRenderer : QgsFeatureRendererV2
class QgsNullSymbolRenderer : QgsFeatureRenderer
{
%TypeHeaderCode
#include <qgsnullsymbolrenderer.h>
@ -26,14 +26,14 @@ class QgsNullSymbolRenderer : QgsFeatureRendererV2
virtual QList<QString> usedAttributes();
virtual QString dump() const;
virtual QgsFeatureRendererV2* clone() const /Factory/;
virtual QgsFeatureRenderer* clone() const /Factory/;
virtual QgsSymbolList symbols( QgsRenderContext& context ) /PyName=symbols2/;
/** Creates a null renderer from XML element.
* @param element DOM element
* @returns new null symbol renderer
*/
static QgsFeatureRendererV2* create( QDomElement& element ) /Factory/;
static QgsFeatureRenderer* create( QDomElement& element ) /Factory/;
virtual QDomElement save( QDomDocument& doc );
@ -41,6 +41,6 @@ class QgsNullSymbolRenderer : QgsFeatureRendererV2
* @param renderer renderer to convert from
* @returns a new renderer if the conversion was possible, otherwise nullptr.
*/
static QgsNullSymbolRenderer* convertFromRenderer( const QgsFeatureRendererV2 *renderer ) /Factory/;
static QgsNullSymbolRenderer* convertFromRenderer( const QgsFeatureRenderer *renderer ) /Factory/;
};

18
python/core/symbology-ng/qgspointdisplacementrenderer.sip
View File

@ -1,4 +1,4 @@
class QgsPointDisplacementRenderer : QgsFeatureRendererV2
class QgsPointDisplacementRenderer : QgsFeatureRenderer
{
%TypeHeaderCode
#include <qgspointdisplacementrenderer.h>
@ -20,13 +20,13 @@ class QgsPointDisplacementRenderer : QgsFeatureRendererV2
virtual void toSld( QDomDocument& doc, QDomElement &element ) const;
/** Reimplemented from QgsFeatureRendererV2*/
/** Reimplemented from QgsFeatureRenderer*/
bool renderFeature( QgsFeature& feature, QgsRenderContext& context, int layer = -1, bool selected = false, bool drawVertexMarker = false );
/** Partial proxy that will call this method on the embedded renderer. */
virtual QList<QString> usedAttributes();
/** Proxy that will call this method on the embedded renderer. */
virtual QgsFeatureRendererV2::Capabilities capabilities();
virtual QgsFeatureRenderer::Capabilities capabilities();
/** Proxy that will call this method on the embedded renderer.
@note available in python as symbols2
*/
@ -57,7 +57,7 @@ class QgsPointDisplacementRenderer : QgsFeatureRendererV2
void stopRender( QgsRenderContext& context );
//! create a renderer from XML element
static QgsFeatureRendererV2* create( QDomElement& symbologyElem ) /Factory/;
static QgsFeatureRenderer* create( QDomElement& symbologyElem ) /Factory/;
QDomElement save( QDomDocument& doc );
QgsLegendSymbologyList legendSymbologyItems( QSize iconSize );
@ -68,8 +68,8 @@ class QgsPointDisplacementRenderer : QgsFeatureRendererV2
void setLabelAttributeName( const QString& name );
QString labelAttributeName() const;
void setEmbeddedRenderer( QgsFeatureRendererV2* r /Transfer/ );
const QgsFeatureRendererV2* embeddedRenderer() const;
void setEmbeddedRenderer( QgsFeatureRenderer* r /Transfer/ );
const QgsFeatureRenderer* embeddedRenderer() const;
virtual void setLegendSymbolItem( const QString& key, QgsSymbol* symbol );
@ -113,9 +113,9 @@ class QgsPointDisplacementRenderer : QgsFeatureRendererV2
void setPlacement( Placement placement );
/** Returns the symbol for the center of a displacement group (but _not_ ownership of the symbol)*/
QgsMarkerSymbolV2* centerSymbol();
QgsMarkerSymbol* centerSymbol();
/** Sets the center symbol (takes ownership)*/
void setCenterSymbol( QgsMarkerSymbolV2* symbol /Transfer/ );
void setCenterSymbol( QgsMarkerSymbol* symbol /Transfer/ );
/** Sets the tolerance distance for grouping points. Units are specified using
* setToleranceUnit().
@ -165,7 +165,7 @@ class QgsPointDisplacementRenderer : QgsFeatureRendererV2
//! creates a QgsPointDisplacementRenderer from an existing renderer.
//! @note added in 2.5
//! @returns a new renderer if the conversion was possible, otherwise 0.
static QgsPointDisplacementRenderer* convertFromRenderer(const QgsFeatureRendererV2 *renderer ) /Factory/;
static QgsPointDisplacementRenderer* convertFromRenderer(const QgsFeatureRenderer *renderer ) /Factory/;
private:
QgsPointDisplacementRenderer( const QgsPointDisplacementRenderer & );

42
python/core/symbology-ng/qgsrendererv2.sip → python/core/symbology-ng/qgsrenderer.sip
View File

@ -9,7 +9,7 @@ typedef QList< QPair<QString, QgsSymbol*> > QgsLegendSymbolList;
class QgsSymbolLevelItem
{
%TypeHeaderCode
#include <qgsrendererv2.h>
#include <qgsrenderer.h>
%End
public:
QgsSymbolLevelItem( QgsSymbol* symbol, int layer );
@ -27,21 +27,21 @@ class QgsSymbolLevelItem
//////////////
// renderers
class QgsFeatureRendererV2
class QgsFeatureRenderer
{
%TypeHeaderCode
#include <qgsrendererv2.h>
#include <qgsrenderer.h>
%End
%ConvertToSubClassCode
if (sipCpp->type() == "singleSymbol")
sipType = sipType_QgsSingleSymbolRendererV2;
sipType = sipType_QgsSingleSymbolRenderer;
else if (sipCpp->type() == "categorizedSymbol")
sipType = sipType_QgsCategorizedSymbolRendererV2;
sipType = sipType_QgsCategorizedSymbolRenderer;
else if (sipCpp->type() == "graduatedSymbol")
sipType = sipType_QgsGraduatedSymbolRendererV2;
sipType = sipType_QgsGraduatedSymbolRenderer;
else if (sipCpp->type() == "RuleRenderer")
sipType = sipType_QgsRuleBasedRendererV2;
sipType = sipType_QgsRuleBasedRenderer;
else if (sipCpp->type() == "heatmapRenderer")
sipType = sipType_QgsHeatmapRenderer;
else if (sipCpp->type() == "invertedPolygonRenderer")
@ -60,7 +60,7 @@ class QgsFeatureRendererV2
// renderer takes ownership of its symbols!
//! return a new renderer - used by default in vector layers
static QgsFeatureRendererV2* defaultRenderer( QgsWkbTypes::GeometryType geomType ) /Factory/;
static QgsFeatureRenderer* defaultRenderer( QgsWkbTypes::GeometryType geomType ) /Factory/;
QString type() const;
@ -153,9 +153,9 @@ class QgsFeatureRendererV2
*/
virtual bool filterNeedsGeometry() const;
virtual ~QgsFeatureRendererV2();
virtual ~QgsFeatureRenderer();
virtual QgsFeatureRendererV2* clone() const = 0 /Factory/;
virtual QgsFeatureRenderer* clone() const = 0 /Factory/;
/**
* Render a feature using this renderer in the given context.
@ -181,10 +181,10 @@ class QgsFeatureRendererV2
ScaleDependent // depends on scale if feature will be rendered (rule based )
};
typedef QFlags<QgsFeatureRendererV2::Capability> Capabilities;
typedef QFlags<QgsFeatureRenderer::Capability> Capabilities;
//! returns bitwise OR-ed capabilities of the renderer
virtual QgsFeatureRendererV2::Capabilities capabilities();
virtual QgsFeatureRenderer::Capabilities capabilities();
/** For symbol levels
* @deprecated use symbols( QgsRenderContext& context ) instead
@ -203,7 +203,7 @@ class QgsFeatureRendererV2
void setUsingSymbolLevels( bool usingSymbolLevels );
//! create a renderer from XML element
static QgsFeatureRendererV2* load( QDomElement& symbologyElem ) /Factory/;
static QgsFeatureRenderer* load( QDomElement& symbologyElem ) /Factory/;
//! store renderer info to XML element
virtual QDomElement save( QDomDocument& doc );
@ -225,7 +225,7 @@ class QgsFeatureRendererV2
* went wrong
* @return the renderer
*/
static QgsFeatureRendererV2* loadSld( const QDomNode &node, QgsWkbTypes::GeometryType geomType, QString &errorMessage ) /Factory/;
static QgsFeatureRenderer* loadSld( const QDomNode &node, QgsWkbTypes::GeometryType geomType, QString &errorMessage ) /Factory/;
//! used from subclasses to create SLD Rule elements following SLD v1.1 specs
virtual void toSld( QDomDocument& doc, QDomElement &element ) const;
@ -399,17 +399,17 @@ class QgsFeatureRendererV2
* @see embeddedRenderer()
* @note added in QGIS 2.16
*/
virtual void setEmbeddedRenderer( QgsFeatureRendererV2* subRenderer /Transfer/ );
virtual void setEmbeddedRenderer( QgsFeatureRenderer* subRenderer /Transfer/ );
/** Returns the current embedded renderer (subrenderer) for this feature renderer. The base class
* implementation does not use subrenderers and will always return null.
* @see setEmbeddedRenderer()
* @note added in QGIS 2.16
*/
virtual const QgsFeatureRendererV2* embeddedRenderer() const;
virtual const QgsFeatureRenderer* embeddedRenderer() const;
protected:
QgsFeatureRendererV2( const QString& type );
QgsFeatureRenderer( const QString& type );
void renderFeatureWithSymbol( QgsFeature& feature,
QgsSymbol* symbol,
@ -453,13 +453,13 @@ class QgsFeatureRendererV2
*
* @param destRenderer destination renderer for copied effect
*/
void copyRendererData( QgsFeatureRendererV2 *destRenderer ) const;
void copyRendererData( QgsFeatureRenderer *destRenderer ) const;
/** Copies paint effect of this renderer to another renderer
* @param destRenderer destination renderer for copied effect
* @deprecated use copyRendererData instead
*/
void copyPaintEffect( QgsFeatureRendererV2 *destRenderer ) const /Deprecated/;
void copyPaintEffect( QgsFeatureRenderer *destRenderer ) const /Deprecated/;
/** @note this function is used to convert old sizeScale expresssions to symbol
* level DataDefined size
@ -471,7 +471,7 @@ class QgsFeatureRendererV2
static void convertSymbolRotation( QgsSymbol * symbol, const QString & field );
private:
QgsFeatureRendererV2( const QgsFeatureRendererV2 & );
QgsFeatureRendererV2 & operator=( const QgsFeatureRendererV2 & );
QgsFeatureRenderer( const QgsFeatureRenderer & );
QgsFeatureRenderer & operator=( const QgsFeatureRenderer & );
};

70
python/core/symbology-ng/qgsrendererv2registry.sip → python/core/symbology-ng/qgsrendererregistry.sip
View File

@ -1,15 +1,15 @@
class QgsRendererV2Widget /External/;
class QgsRendererWidget /External/;
/**
Stores metadata about one renderer class.
@note It's necessary to implement createRenderer() function.
In C++ you can use QgsRendererV2Metadata convenience class.
In C++ you can use QgsRendererMetadata convenience class.
*/
class QgsRendererV2AbstractMetadata
class QgsRendererAbstractMetadata
{
%TypeHeaderCode
#include <qgsrendererv2registry.h>
#include <qgsrendererregistry.h>
%End
public:
@ -24,10 +24,10 @@ class QgsRendererV2AbstractMetadata
PolygonLayer, //!< Compatible with polygon layers
All, //!< Compatible with all vector layers
};
typedef QFlags<QgsRendererV2AbstractMetadata::LayerType> LayerTypes;
typedef QFlags<QgsRendererAbstractMetadata::LayerType> LayerTypes;
QgsRendererV2AbstractMetadata( const QString& name, const QString& visibleName, const QIcon& icon = QIcon() );
virtual ~QgsRendererV2AbstractMetadata();
QgsRendererAbstractMetadata( const QString& name, const QString& visibleName, const QIcon& icon = QIcon() );
virtual ~QgsRendererAbstractMetadata();
QString name() const;
QString visibleName() const;
@ -38,11 +38,11 @@ class QgsRendererV2AbstractMetadata
/** Returns flags indicating the types of layer the renderer is compatible with.
* @note added in QGIS 2.16
*/
virtual QgsRendererV2AbstractMetadata::LayerTypes compatibleLayerTypes() const;
virtual QgsRendererAbstractMetadata::LayerTypes compatibleLayerTypes() const;
/** Return new instance of the renderer given the DOM element. Returns NULL on error.
* Pure virtual function: must be implemented in derived classes. */
virtual QgsFeatureRendererV2* createRenderer( QDomElement& elem ) = 0 /Factory/;
virtual QgsFeatureRenderer* createRenderer( QDomElement& elem ) = 0 /Factory/;
/** Return new instance of settings widget for the renderer. Returns NULL on error.
*
* The \a oldRenderer argument may refer to previously used renderer (or it is null).
@ -50,64 +50,64 @@ class QgsRendererV2AbstractMetadata
* The old renderer does not have to be of the same type as returned by createRenderer().
* When using \a oldRenderer make sure to make a copy of it - it will be deleted afterwards.
*/
virtual QgsRendererV2Widget* createRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* oldRenderer ) /Factory/;
virtual QgsRendererWidget* createRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* oldRenderer ) /Factory/;
/**
* Create a renderer from the SLD provided in ele and for the specified geometry type.
* This is done on a best effort basis.
*/
virtual QgsFeatureRendererV2* createRendererFromSld( QDomElement& elem, QgsWkbTypes::GeometryType geomType ) /Factory/;
virtual QgsFeatureRenderer* createRendererFromSld( QDomElement& elem, QgsWkbTypes::GeometryType geomType ) /Factory/;
};
QFlags<QgsRendererV2AbstractMetadata::LayerType> operator|(QgsRendererV2AbstractMetadata::LayerType f1, QFlags<QgsRendererV2AbstractMetadata::LayerType> f2);
QFlags<QgsRendererAbstractMetadata::LayerType> operator|(QgsRendererAbstractMetadata::LayerType f1, QFlags<QgsRendererAbstractMetadata::LayerType> f2);
/**
Convenience metadata class that uses static functions to create renderer and its widget.
*/
class QgsRendererV2Metadata : QgsRendererV2AbstractMetadata
class QgsRendererMetadata : QgsRendererAbstractMetadata
{
%TypeHeaderCode
#include <qgsrendererv2registry.h>
#include <qgsrendererregistry.h>
%End
public:
virtual QgsFeatureRendererV2* createRenderer( QDomElement& elem ) /Factory/;
virtual QgsRendererV2Widget* createRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) /Factory/;
virtual QgsFeatureRendererV2* createRendererFromSld( QDomElement& elem, QgsWkbTypes::GeometryType geomType ) /Factory/;
virtual QgsFeatureRenderer* createRenderer( QDomElement& elem ) /Factory/;
virtual QgsRendererWidget* createRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) /Factory/;
virtual QgsFeatureRenderer* createRendererFromSld( QDomElement& elem, QgsWkbTypes::GeometryType geomType ) /Factory/;
// QgsRendererV2CreateFunc createFunction() const;
// QgsRendererV2WidgetFunc widgetFunction() const;
// QgsFeatureRendererV2* (*)( QDomElement&, QgsWkbTypes::GeometryType geomType ) createFromSldFunction() const;
// void setWidgetFunction( QgsRendererV2WidgetFunc f );
// QgsRendererCreateFunc createFunction() const;
// QgsRendererWidgetFunc widgetFunction() const;
// QgsFeatureRenderer* (*)( QDomElement&, QgsWkbTypes::GeometryType geomType ) createFromSldFunction() const;
// void setWidgetFunction( QgsRendererWidgetFunc f );
virtual QgsRendererV2AbstractMetadata::LayerTypes compatibleLayerTypes() const;
virtual QgsRendererAbstractMetadata::LayerTypes compatibleLayerTypes() const;
private:
QgsRendererV2Metadata(); // pretend this is private
QgsRendererMetadata(); // pretend this is private
};
/** \ingroup core
* \class QgsRendererV2Registry
* \class QgsRendererRegistry
* \brief Registry of renderers.
*
* This is a singleton, renderers can be added / removed at any time
*/
class QgsRendererV2Registry
class QgsRendererRegistry
{
%TypeHeaderCode
#include <qgsrendererv2registry.h>
#include <qgsrendererregistry.h>
%End
public:
//! Returns a pointer to the QgsRendererV2Registry singleton
static QgsRendererV2Registry* instance();
//! Returns a pointer to the QgsRendererRegistry singleton
static QgsRendererRegistry* instance();
//! Adds a renderer to the registry. Takes ownership of the metadata object.
//! @param metadata renderer metadata
//! @returns true if renderer was added successfully, or false if renderer could not
//! be added (eg a renderer with a duplicate name already exists)
bool addRenderer( QgsRendererV2AbstractMetadata* metadata /Transfer/ );
bool addRenderer( QgsRendererAbstractMetadata* metadata /Transfer/ );
//! Removes a renderer from registry.
//! @param rendererName name of renderer to remove from registry
@ -117,11 +117,11 @@ class QgsRendererV2Registry
//! Returns the metadata for a specified renderer. Returns NULL if a matching
//! renderer was not found in the registry.
QgsRendererV2AbstractMetadata* rendererMetadata( const QString& rendererName );
QgsRendererAbstractMetadata* rendererMetadata( const QString& rendererName );
//! Returns a list of available renderers.
//! @param layerTypes flags to filter the renderers by compatible layer types
QStringList renderersList( QgsRendererV2AbstractMetadata::LayerTypes layerTypes = QgsRendererV2AbstractMetadata::All ) const;
QStringList renderersList( QgsRendererAbstractMetadata::LayerTypes layerTypes = QgsRendererAbstractMetadata::All ) const;
//! Returns a list of available renderers which are compatible with a specified layer.
//! @param layer vector layer
@ -130,11 +130,11 @@ class QgsRendererV2Registry
protected:
//! protected constructor
QgsRendererV2Registry();
~QgsRendererV2Registry();
QgsRendererRegistry();
~QgsRendererRegistry();
private:
QgsRendererV2Registry( const QgsRendererV2Registry& rh );
//QgsRendererV2Registry& operator=( const QgsRendererV2Registry& rh );
QgsRendererRegistry( const QgsRendererRegistry& rh );
//QgsRendererRegistry& operator=( const QgsRendererRegistry& rh );
};

74
python/core/symbology-ng/qgsrulebasedrendererv2.sip → python/core/symbology-ng/qgsrulebasedrenderer.sip
View File

@ -2,10 +2,10 @@
When drawing a vector layer with rule-based renderer, it goes through
the rules and draws features with symbols from rules that match.
*/
class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
class QgsRuleBasedRenderer : QgsFeatureRenderer
{
%TypeHeaderCode
#include <qgsrulebasedrendererv2.h>
#include <qgsrulebasedrenderer.h>
%End
public:
// TODO: use QVarLengthArray instead of QList
@ -24,8 +24,8 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
// (both f, symbol are _not_ owned by this class)
struct RenderJob
{
RenderJob( QgsRuleBasedRendererV2::FeatureToRender& _ftr, QgsSymbol* _s );
QgsRuleBasedRendererV2::FeatureToRender& ftr;
RenderJob( QgsRuleBasedRenderer::FeatureToRender& _ftr, QgsSymbol* _s );
QgsRuleBasedRenderer::FeatureToRender& ftr;
QgsSymbol* symbol;
};
@ -36,14 +36,14 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
RenderLevel( int z );
~RenderLevel();
int zIndex;
QList<QgsRuleBasedRendererV2::RenderJob*> jobs;
QList<QgsRuleBasedRenderer::RenderJob*> jobs;
RenderLevel( const QgsRuleBasedRendererV2::RenderLevel& other );
RenderLevel( const QgsRuleBasedRenderer::RenderLevel& other );
};
// rendering queue: a list of rendering levels
typedef QList<QgsRuleBasedRendererV2::RenderLevel> RenderQueue;
typedef QList<QgsRuleBasedRenderer::RenderLevel> RenderQueue;
/**
This class keeps data about a rules for rule-based renderer.
@ -201,10 +201,10 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
void setActive( bool state );
//! clone this rule, return new instance
QgsRuleBasedRendererV2::Rule* clone() const /Factory/;
QgsRuleBasedRenderer::Rule* clone() const /Factory/;
void toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props );
static QgsRuleBasedRendererV2::Rule* createFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType ) /Factory/;
static QgsRuleBasedRenderer::Rule* createFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType ) /Factory/;
QDomElement save( QDomDocument& doc, QgsSymbolMap& symbolMap );
@ -232,7 +232,7 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
* @return The result of the rendering. In explicit if the feature is added to the queue or
* the reason for not rendering the feature.
*/
QgsRuleBasedRendererV2::Rule::RenderResult renderFeature( QgsRuleBasedRendererV2::FeatureToRender& featToRender, QgsRenderContext& context, QgsRuleBasedRendererV2::RenderQueue& renderQueue );
QgsRuleBasedRenderer::Rule::RenderResult renderFeature( QgsRuleBasedRenderer::FeatureToRender& featToRender, QgsRenderContext& context, QgsRuleBasedRenderer::RenderQueue& renderQueue );
//! only tell whether a feature will be rendered without actually rendering it
bool willRenderFeature( QgsFeature& feat, QgsRenderContext* context = 0);
@ -246,7 +246,7 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
QSet< QString > legendKeysForFeature( QgsFeature& feat, QgsRenderContext* context = nullptr );
//! tell which rules will be used to render the feature
QList<QgsRuleBasedRendererV2::Rule*> rulesForFeature( QgsFeature& feat, QgsRenderContext* context = 0 );
QList<QgsRuleBasedRenderer::Rule*> rulesForFeature( QgsFeature& feat, QgsRenderContext* context = 0 );
/**
* Stop a rendering process. Used to clean up the internal state of this rule
@ -263,50 +263,50 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
*
* @return A new rule
*/
static QgsRuleBasedRendererV2::Rule* create( QDomElement& ruleElem, QgsSymbolMap& symbolMap ) /Factory/;
static QgsRuleBasedRenderer::Rule* create( QDomElement& ruleElem, QgsSymbolMap& symbolMap ) /Factory/;
/**
* Return all children rules of this rule
*
* @return A list of rules
*/
QList<QgsRuleBasedRendererV2::Rule*>& children();
QList<QgsRuleBasedRenderer::Rule*>& children();
/**
* Returns all children, grand-children, grand-grand-children, grand-gra... you get it
*
* @return A list of descendant rules
*/
QList<QgsRuleBasedRendererV2::Rule*> descendants() const;
QList<QgsRuleBasedRenderer::Rule*> descendants() const;
/**
* The parent rule
*
* @return Parent rule
*/
QgsRuleBasedRendererV2::Rule* parent();
QgsRuleBasedRenderer::Rule* parent();
//! add child rule, take ownership, sets this as parent
void appendChild( QgsRuleBasedRendererV2::Rule* rule /Transfer/ );
void appendChild( QgsRuleBasedRenderer::Rule* rule /Transfer/ );
//! add child rule, take ownership, sets this as parent
void insertChild( int i, QgsRuleBasedRendererV2::Rule* rule /Transfer/ );
void insertChild( int i, QgsRuleBasedRenderer::Rule* rule /Transfer/ );
//! delete child rule
void removeChild( QgsRuleBasedRendererV2::Rule* rule );
void removeChild( QgsRuleBasedRenderer::Rule* rule );
//! delete child rule
void removeChildAt( int i );
//! take child rule out, set parent as null
QgsRuleBasedRendererV2::Rule* takeChild( QgsRuleBasedRendererV2::Rule* rule ) /TransferBack/;
QgsRuleBasedRenderer::Rule* takeChild( QgsRuleBasedRenderer::Rule* rule ) /TransferBack/;
//! take child rule out, set parent as null
QgsRuleBasedRendererV2::Rule* takeChildAt( int i ) /TransferBack/;
QgsRuleBasedRenderer::Rule* takeChildAt( int i ) /TransferBack/;
//! Try to find a rule given its unique key
//! @note added in 2.6
QgsRuleBasedRendererV2::Rule* findRuleByKey( const QString& key );
QgsRuleBasedRenderer::Rule* findRuleByKey( const QString& key );
/**
* Check which child rules are else rules and update the internal list of else rules
@ -334,20 +334,20 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
private:
Rule( const QgsRuleBasedRendererV2::Rule& rh );
Rule( const QgsRuleBasedRenderer::Rule& rh );
};
/////
static QgsFeatureRendererV2* create( QDomElement& element ) /Factory/;
static QgsFeatureRenderer* create( QDomElement& element ) /Factory/;
//! Constructs the renderer from given tree of rules (takes ownership)
QgsRuleBasedRendererV2( QgsRuleBasedRendererV2::Rule* root /Transfer/ );
QgsRuleBasedRenderer( QgsRuleBasedRenderer::Rule* root /Transfer/ );
//! Constructor for convenience. Creates a root rule and adds a default rule with symbol (takes ownership)
QgsRuleBasedRendererV2( QgsSymbol* defaultSymbol /Transfer/ );
QgsRuleBasedRenderer( QgsSymbol* defaultSymbol /Transfer/ );
~QgsRuleBasedRendererV2();
~QgsRuleBasedRenderer();
//! return symbol for current feature. Should not be used individually: there could be more symbols for a feature
virtual QgsSymbol* symbolForFeature( QgsFeature& feature, QgsRenderContext &context );
@ -364,11 +364,11 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
virtual bool filterNeedsGeometry() const;
virtual QgsRuleBasedRendererV2* clone() const /Factory/;
virtual QgsRuleBasedRenderer* clone() const /Factory/;
virtual void toSld( QDomDocument& doc, QDomElement &element ) const;
static QgsFeatureRendererV2* createFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType ) /Factory/;
static QgsFeatureRenderer* createFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType ) /Factory/;
virtual QgsSymbolList symbols( QgsRenderContext &context );
@ -418,30 +418,30 @@ class QgsRuleBasedRendererV2 : QgsFeatureRendererV2
virtual QSet<QString> legendKeysForFeature( QgsFeature& feature, QgsRenderContext& context );
//! returns bitwise OR-ed capabilities of the renderer
virtual QgsFeatureRendererV2::Capabilities capabilities();
virtual QgsFeatureRenderer::Capabilities capabilities();
/////
QgsRuleBasedRendererV2::Rule* rootRule();
QgsRuleBasedRenderer::Rule* rootRule();
//////
//! take a rule and create a list of new rules based on the categories from categorized symbol renderer
static void refineRuleCategories( QgsRuleBasedRendererV2::Rule* initialRule, QgsCategorizedSymbolRendererV2* r );
static void refineRuleCategories( QgsRuleBasedRenderer::Rule* initialRule, QgsCategorizedSymbolRenderer* r );
//! take a rule and create a list of new rules based on the ranges from graduated symbol renderer
static void refineRuleRanges( QgsRuleBasedRendererV2::Rule* initialRule, QgsGraduatedSymbolRendererV2* r );
static void refineRuleRanges( QgsRuleBasedRenderer::Rule* initialRule, QgsGraduatedSymbolRenderer* r );
//! take a rule and create a list of new rules with intervals of scales given by the passed scale denominators
static void refineRuleScales( QgsRuleBasedRendererV2::Rule* initialRule, QList<int> scales );
static void refineRuleScales( QgsRuleBasedRenderer::Rule* initialRule, QList<int> scales );
//! creates a QgsRuleBasedRendererV2 from an existing renderer.
//! creates a QgsRuleBasedRenderer from an existing renderer.
//! @note added in 2.5
//! @returns a new renderer if the conversion was possible, otherwise 0.
static QgsRuleBasedRendererV2* convertFromRenderer( const QgsFeatureRendererV2 *renderer ) /Factory/;
static QgsRuleBasedRenderer* convertFromRenderer( const QgsFeatureRenderer *renderer ) /Factory/;
//! helper function to convert the size scale and rotation fields present in some other renderers to data defined symbology
static void convertToDataDefinedSymbology( QgsSymbol* symbol, const QString& sizeScaleField, const QString& rotationField = QString() );
private:
QgsRuleBasedRendererV2( const QgsRuleBasedRendererV2 & );
QgsRuleBasedRendererV2 & operator=( const QgsRuleBasedRendererV2 & );
QgsRuleBasedRenderer( const QgsRuleBasedRenderer & );
QgsRuleBasedRenderer & operator=( const QgsRuleBasedRenderer & );
};

24
python/core/symbology-ng/qgssinglesymbolrendererv2.sip → python/core/symbology-ng/qgssinglesymbolrenderer.sip
View File

@ -1,13 +1,13 @@
class QgsSingleSymbolRendererV2 : QgsFeatureRendererV2
class QgsSingleSymbolRenderer : QgsFeatureRenderer
{
%TypeHeaderCode
#include <qgssinglesymbolrendererv2.h>
#include <qgssinglesymbolrenderer.h>
%End
public:
QgsSingleSymbolRendererV2( QgsSymbol* symbol /Transfer/ );
QgsSingleSymbolRenderer( QgsSymbol* symbol /Transfer/ );
virtual ~QgsSingleSymbolRendererV2();
virtual ~QgsSingleSymbolRenderer();
//! @note available in python as symbolForFeature2
virtual QgsSymbol* symbolForFeature( QgsFeature& feature, QgsRenderContext& context ) /PyName=symbolForFeature2/;
@ -35,19 +35,19 @@ class QgsSingleSymbolRendererV2 : QgsFeatureRendererV2
virtual QString dump() const;
virtual QgsSingleSymbolRendererV2* clone() const /Factory/;
virtual QgsSingleSymbolRenderer* clone() const /Factory/;
virtual void toSld( QDomDocument& doc, QDomElement &element ) const;
static QgsFeatureRendererV2* createFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType );
static QgsFeatureRenderer* createFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType );
//! returns bitwise OR-ed capabilities of the renderer
virtual QgsFeatureRendererV2::Capabilities capabilities();
virtual QgsFeatureRenderer::Capabilities capabilities();
//! @note available in python as symbol2
virtual QgsSymbolList symbols( QgsRenderContext& context ) /PyName=symbols2/;
//! create renderer from XML element
static QgsFeatureRendererV2* create( QDomElement& element ) /Factory/;
static QgsFeatureRenderer* create( QDomElement& element ) /Factory/;
//! store renderer info to XML element
virtual QDomElement save( QDomDocument& doc );
@ -67,12 +67,12 @@ class QgsSingleSymbolRendererV2 : QgsFeatureRendererV2
virtual void setLegendSymbolItem( const QString& key, QgsSymbol* symbol /Transfer/ );
//! creates a QgsSingleSymbolRendererV2 from an existing renderer.
//! creates a QgsSingleSymbolRenderer from an existing renderer.
//! @note added in 2.5
//! @returns a new renderer if the conversion was possible, otherwise 0.
static QgsSingleSymbolRendererV2* convertFromRenderer( const QgsFeatureRendererV2 *renderer ) /Factory/;
static QgsSingleSymbolRenderer* convertFromRenderer( const QgsFeatureRenderer *renderer ) /Factory/;
private:
QgsSingleSymbolRendererV2( const QgsSingleSymbolRendererV2 & );
QgsSingleSymbolRendererV2 & operator=( const QgsSingleSymbolRendererV2 & );
QgsSingleSymbolRenderer( const QgsSingleSymbolRenderer & );
QgsSingleSymbolRenderer & operator=( const QgsSingleSymbolRenderer & );
};

20
python/core/symbology-ng/qgsstylev2.sip → python/core/symbology-ng/qgsstyle.sip
View File

@ -1,12 +1,12 @@
class QgsStyleV2 : QObject
class QgsStyle : QObject
{
%TypeHeaderCode
#include <qgsstylev2.h>
#include <qgsstyle.h>
%End
public:
QgsStyleV2();
~QgsStyleV2();
QgsStyle();
~QgsStyle();
//! Enum for Entities involved in a style
/*!
@ -24,7 +24,7 @@ class QgsStyleV2 : QObject
* \param update set to true when the style DB has to be updated, by default it is false
* \return success status of the operation
*/
bool addColorRamp( const QString& name, QgsVectorColorRampV2* colorRamp /Transfer/, bool update = false );
bool addColorRamp( const QString& name, QgsVectorColorRamp* colorRamp /Transfer/, bool update = false );
//! adds a new group and returns the group's id
/*!
@ -72,7 +72,7 @@ class QgsStyleV2 : QObject
void clear();
//! return a NEW copy of color ramp
QgsVectorColorRampV2* colorRamp( const QString& name ) /Factory/;
QgsVectorColorRamp* colorRamp( const QString& name ) /Factory/;
//! return count of color ramps
int colorRampCount();
@ -81,14 +81,14 @@ class QgsStyleV2 : QObject
QStringList colorRampNames();
//! return a const pointer to a symbol (doesn't create new instance)
const QgsVectorColorRampV2* colorRampRef( const QString& name ) const;
const QgsVectorColorRamp* colorRampRef( const QString& name ) const;
//! return the id in the style database for the given colorramp name
//! returns 0 if not found
int colorrampId( const QString& name );
//! return default application-wide style
static QgsStyleV2* defaultStyle();
static QgsStyle* defaultStyle();
//! tags the symbol with the tags in the list
/*!
@ -199,12 +199,12 @@ class QgsStyleV2 : QObject
//! add the colorramp to the DB
/*!
* \param name is the name of the colorramp as QString
* \param ramp is the pointer to the new QgsVectorColorRampV2 being saved
* \param ramp is the pointer to the new QgsVectorColorRamp being saved
* \param groupid is the id of the group to which the Color Ramp belongs. Pass 0 if it doesn't belong to any group or not known.
* \param tags is a list of tags that are associated with the color ramp as a QStringList.
* \return returns the success state of the save operation
*/
bool saveColorRamp( const QString& name, QgsVectorColorRampV2* ramp, int groupid, const QStringList& tags );
bool saveColorRamp( const QString& name, QgsVectorColorRamp* ramp, int groupid, const QStringList& tags );
//! remove color ramp from style (and delete it)
bool removeColorRamp( const QString& name );

30
python/core/symbology-ng/qgssymbol.sip
View File

@ -10,9 +10,9 @@ class QgsSymbol
%ConvertToSubClassCode
switch (sipCpp->type())
{
case QgsSymbol::Marker: sipType = sipType_QgsMarkerSymbolV2; break;
case QgsSymbol::Line: sipType = sipType_QgsLineSymbolV2; break;
case QgsSymbol::Fill: sipType = sipType_QgsFillSymbolV2; break;
case QgsSymbol::Marker: sipType = sipType_QgsMarkerSymbol; break;
case QgsSymbol::Line: sipType = sipType_QgsLineSymbol; break;
case QgsSymbol::Fill: sipType = sipType_QgsFillSymbol; break;
default: sipType = 0; break;
}
%End
@ -400,7 +400,7 @@ class QgsSymbolRenderContext
class QgsMarkerSymbolV2 : QgsSymbol
class QgsMarkerSymbol : QgsSymbol
{
%TypeHeaderCode
#include <qgssymbol.h>
@ -410,9 +410,9 @@ class QgsMarkerSymbolV2 : QgsSymbol
/** Create a marker symbol with one symbol layer: SimpleMarker with specified properties.
This is a convenience method for easier creation of marker symbols.
*/
static QgsMarkerSymbolV2* createSimple( const QgsStringMap& properties ) /Factory/;
static QgsMarkerSymbol* createSimple( const QgsStringMap& properties ) /Factory/;
QgsMarkerSymbolV2( const QgsSymbolLayerList& layers /Transfer/ = QgsSymbolLayerList() );
QgsMarkerSymbol( const QgsSymbolLayerList& layers /Transfer/ = QgsSymbolLayerList() );
/** Sets the angle for the whole symbol. Individual symbol layer sizes
* will be rotated to maintain their current relative angle to the whole symbol angle.
@ -538,12 +538,12 @@ class QgsMarkerSymbolV2 : QgsSymbol
*/
QRectF bounds(QPointF point, QgsRenderContext& context, const QgsFeature &feature = QgsFeature() ) const;
virtual QgsMarkerSymbolV2* clone() const /Factory/;
virtual QgsMarkerSymbol* clone() const /Factory/;
};
class QgsLineSymbolV2 : QgsSymbol
class QgsLineSymbol : QgsSymbol
{
%TypeHeaderCode
#include <qgssymbol.h>
@ -553,9 +553,9 @@ class QgsLineSymbolV2 : QgsSymbol
/** Create a line symbol with one symbol layer: SimpleLine with specified properties.
* This is a convenience method for easier creation of line symbols.
*/
static QgsLineSymbolV2* createSimple( const QgsStringMap& properties ) /Factory/;
static QgsLineSymbol* createSimple( const QgsStringMap& properties ) /Factory/;
QgsLineSymbolV2( const QgsSymbolLayerList& layers /Transfer/ = QgsSymbolLayerList() );
QgsLineSymbol( const QgsSymbolLayerList& layers /Transfer/ = QgsSymbolLayerList() );
void setWidth( double width );
double width() const;
@ -577,12 +577,12 @@ class QgsLineSymbolV2 : QgsSymbol
void renderPolyline( const QPolygonF& points, const QgsFeature* f, QgsRenderContext& context, int layer = -1, bool selected = false );
virtual QgsLineSymbolV2* clone() const /Factory/;
virtual QgsLineSymbol* clone() const /Factory/;
};
class QgsFillSymbolV2 : QgsSymbol
class QgsFillSymbol : QgsSymbol
{
%TypeHeaderCode
#include <qgssymbol.h>
@ -592,11 +592,11 @@ class QgsFillSymbolV2 : QgsSymbol
/** Create a fill symbol with one symbol layer: SimpleFill with specified properties.
* This is a convenience method for easier creation of fill symbols.
*/
static QgsFillSymbolV2* createSimple( const QgsStringMap& properties ) /Factory/;
static QgsFillSymbol* createSimple( const QgsStringMap& properties ) /Factory/;
QgsFillSymbolV2( const QgsSymbolLayerList& layers /Transfer/ = QgsSymbolLayerList() );
QgsFillSymbol( const QgsSymbolLayerList& layers /Transfer/ = QgsSymbolLayerList() );
void setAngle( double angle );
void renderPolygon( const QPolygonF& points, QList<QPolygonF>* rings, const QgsFeature* f, QgsRenderContext& context, int layer = -1, bool selected = false );
virtual QgsFillSymbolV2* clone() const /Factory/;
virtual QgsFillSymbol* clone() const /Factory/;
};

66
python/core/symbology-ng/qgssymbollayer.sip
View File

@ -2,43 +2,43 @@ class QgsSymbolLayer
{
%TypeHeaderCode
#include <qgssymbollayer.h>
#include <qgslinesymbollayerv2.h>
#include <qgslinesymbollayer.h>
%End
%ConvertToSubClassCode
switch (sipCpp->type())
{
case QgsSymbol::Marker:
if (dynamic_cast<QgsEllipseSymbolLayerV2*>(sipCpp) != NULL)
sipType = sipType_QgsEllipseSymbolLayerV2;
else if (dynamic_cast<QgsFontMarkerSymbolLayerV2*>(sipCpp) != NULL)
sipType = sipType_QgsFontMarkerSymbolLayerV2;
else if (dynamic_cast<QgsSimpleMarkerSymbolLayerV2*>(sipCpp) != NULL)
sipType = sipType_QgsSimpleMarkerSymbolLayerV2;
if (dynamic_cast<QgsEllipseSymbolLayer*>(sipCpp) != NULL)
sipType = sipType_QgsEllipseSymbolLayer;
else if (dynamic_cast<QgsFontMarkerSymbolLayer*>(sipCpp) != NULL)
sipType = sipType_QgsFontMarkerSymbolLayer;
else if (dynamic_cast<QgsSimpleMarkerSymbolLayer*>(sipCpp) != NULL)
sipType = sipType_QgsSimpleMarkerSymbolLayer;
else if (dynamic_cast<QgsFilledMarkerSymbolLayer*>(sipCpp) != NULL)
sipType = sipType_QgsFilledMarkerSymbolLayer;
else if (dynamic_cast<QgsSvgMarkerSymbolLayerV2*>(sipCpp) != NULL)
sipType = sipType_QgsSvgMarkerSymbolLayerV2;
else if (dynamic_cast<QgsSvgMarkerSymbolLayer*>(sipCpp) != NULL)
sipType = sipType_QgsSvgMarkerSymbolLayer;
else if (dynamic_cast<QgsVectorFieldSymbolLayer*>(sipCpp) != NULL)
sipType = sipType_QgsVectorFieldSymbolLayer;
else
sipType = sipType_QgsMarkerSymbolLayerV2;
sipType = sipType_QgsMarkerSymbolLayer;
break;
case QgsSymbol::Line:
if (dynamic_cast<QgsMarkerLineSymbolLayerV2*>(sipCpp) != NULL)
sipType = sipType_QgsMarkerLineSymbolLayerV2;
else if (dynamic_cast<QgsSimpleLineSymbolLayerV2*>(sipCpp) != NULL)
sipType = sipType_QgsSimpleLineSymbolLayerV2;
if (dynamic_cast<QgsMarkerLineSymbolLayer*>(sipCpp) != NULL)
sipType = sipType_QgsMarkerLineSymbolLayer;
else if (dynamic_cast<QgsSimpleLineSymbolLayer*>(sipCpp) != NULL)
sipType = sipType_QgsSimpleLineSymbolLayer;
else if (dynamic_cast<QgsArrowSymbolLayer*>(sipCpp) != NULL)
sipType = sipType_QgsArrowSymbolLayer;
else
sipType = sipType_QgsLineSymbolLayerV2;
sipType = sipType_QgsLineSymbolLayer;
break;
case QgsSymbol::Fill:
if (dynamic_cast<QgsSimpleFillSymbolLayerV2*>(sipCpp) != NULL)
sipType = sipType_QgsSimpleFillSymbolLayerV2;
if (dynamic_cast<QgsSimpleFillSymbolLayer*>(sipCpp) != NULL)
sipType = sipType_QgsSimpleFillSymbolLayer;
else if (dynamic_cast<QgsImageFillSymbolLayer*>(sipCpp) != NULL)
{
if (dynamic_cast<QgsLinePatternFillSymbolLayer*>(sipCpp) != NULL)
@ -52,18 +52,18 @@ class QgsSymbolLayer
else
sipType = sipType_QgsImageFillSymbolLayer;
}
else if (dynamic_cast<QgsCentroidFillSymbolLayerV2*>(sipCpp) != NULL)
sipType = sipType_QgsCentroidFillSymbolLayerV2;
else if (dynamic_cast<QgsGradientFillSymbolLayerV2*>(sipCpp) != NULL)
sipType = sipType_QgsGradientFillSymbolLayerV2;
else if (dynamic_cast<QgsShapeburstFillSymbolLayerV2*>(sipCpp) != NULL)
sipType = sipType_QgsShapeburstFillSymbolLayerV2;
else if (dynamic_cast<QgsCentroidFillSymbolLayer*>(sipCpp) != NULL)
sipType = sipType_QgsCentroidFillSymbolLayer;
else if (dynamic_cast<QgsGradientFillSymbolLayer*>(sipCpp) != NULL)
sipType = sipType_QgsGradientFillSymbolLayer;
else if (dynamic_cast<QgsShapeburstFillSymbolLayer*>(sipCpp) != NULL)
sipType = sipType_QgsShapeburstFillSymbolLayer;
else
sipType = sipType_QgsFillSymbolLayerV2;
sipType = sipType_QgsFillSymbolLayer;
break;
case QgsSymbol::Hybrid:
sipType = sipType_QgsGeometryGeneratorSymbolLayerV2;
sipType = sipType_QgsGeometryGeneratorSymbolLayer;
break;
}
%End
@ -342,10 +342,10 @@ class QgsSymbolLayer
//////////////////////
/** \ingroup core
* \class QgsMarkerSymbolLayerV2
* \class QgsMarkerSymbolLayer
* \brief Abstract base class for marker symbol layers.
*/
class QgsMarkerSymbolLayerV2 : QgsSymbolLayer
class QgsMarkerSymbolLayer : QgsSymbolLayer
{
%TypeHeaderCode
#include <qgssymbollayer.h>
@ -560,10 +560,10 @@ class QgsMarkerSymbolLayerV2 : QgsSymbolLayer
protected:
/** Constructor for QgsMarkerSymbolLayerV2.
/** Constructor for QgsMarkerSymbolLayer.
* @param locked set to true to lock symbol color
*/
QgsMarkerSymbolLayerV2( bool locked = false );
QgsMarkerSymbolLayer( bool locked = false );
/** Calculates the required marker offset, including both the symbol offset
* and any displacement required to align with the marker's anchor point.
@ -598,7 +598,7 @@ class QgsMarkerSymbolLayerV2 : QgsSymbolLayer
static QPointF _rotatedOffset( QPointF offset, double angle );
};
class QgsLineSymbolLayerV2 : QgsSymbolLayer
class QgsLineSymbolLayer : QgsSymbolLayer
{
%TypeHeaderCode
#include <qgssymbollayer.h>
@ -655,10 +655,10 @@ class QgsLineSymbolLayerV2 : QgsSymbolLayer
virtual double dxfOffset( const QgsDxfExport& e, QgsSymbolRenderContext& context ) const;
protected:
QgsLineSymbolLayerV2( bool locked = false );
QgsLineSymbolLayer( bool locked = false );
};
class QgsFillSymbolLayerV2 : QgsSymbolLayer
class QgsFillSymbolLayer : QgsSymbolLayer
{
%TypeHeaderCode
#include <qgssymbollayer.h>
@ -673,7 +673,7 @@ class QgsFillSymbolLayerV2 : QgsSymbolLayer
double angle() const;
protected:
QgsFillSymbolLayerV2( bool locked = false );
QgsFillSymbolLayer( bool locked = false );
/** Default method to render polygon*/
void _renderPolygon( QPainter* p, const QPolygonF& points, const QList<QPolygonF>* rings, QgsSymbolRenderContext& context );
};

10
python/core/symbology-ng/qgssymbollayerutils.sip
View File

@ -95,13 +95,13 @@ class QgsSymbolLayerUtils
*/
static QIcon symbolLayerPreviewIcon( QgsSymbolLayer* layer, QgsUnitTypes::RenderUnit u, QSize size, const QgsMapUnitScale& scale = QgsMapUnitScale() );
static QIcon colorRampPreviewIcon( QgsVectorColorRampV2* ramp, QSize size );
static QIcon colorRampPreviewIcon( QgsVectorColorRamp* ramp, QSize size );
static void drawStippledBackground( QPainter* painter, QRect rect );
//! @note customContext parameter added in 2.6
static QPixmap symbolPreviewPixmap( QgsSymbol* symbol, QSize size, QgsRenderContext* customContext = 0 );
static QPixmap colorRampPreviewPixmap( QgsVectorColorRampV2* ramp, QSize size );
static QPixmap colorRampPreviewPixmap( QgsVectorColorRamp* ramp, QSize size );
/** Returns the maximum estimated bleed for the symbol */
static double estimateMaxSymbolBleed( QgsSymbol* symbol );
@ -129,7 +129,7 @@ class QgsSymbolLayerUtils
*/
static QString symbolProperties( QgsSymbol* symbol );
static bool createSymbolLayerV2ListFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType, QgsSymbolLayerList &layers );
static bool createSymbolLayerListFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType, QgsSymbolLayerList &layers );
static QgsSymbolLayer* createFillLayerFromSld( QDomElement &element );
static QgsSymbolLayer* createLineLayerFromSld( QDomElement &element );
@ -241,8 +241,8 @@ class QgsSymbolLayerUtils
static void clearSymbolMap( QgsSymbolMap& symbols );
static QgsVectorColorRampV2* loadColorRamp( QDomElement& element ) /Factory/;
static QDomElement saveColorRamp( const QString& name, QgsVectorColorRampV2* ramp, QDomDocument& doc );
static QgsVectorColorRamp* loadColorRamp( QDomElement& element ) /Factory/;
static QDomElement saveColorRamp( const QString& name, QgsVectorColorRamp* ramp, QDomDocument& doc );
/**
* Returns a friendly display name for a color

2
python/core/symbology-ng/qgssymbologyconversion.sip
View File

@ -6,7 +6,7 @@ class QgsSymbologyConversion
public:
/** Read old renderer definition from XML and create matching new renderer */
static QgsFeatureRendererV2* readOldRenderer( const QDomNode& layerNode, QgsWkbTypes::GeometryType geomType );
static QgsFeatureRenderer* readOldRenderer( const QDomNode& layerNode, QgsWkbTypes::GeometryType geomType );
static QString penStyle2QString( Qt::PenStyle penstyle );
static Qt::PenStyle qString2PenStyle( const QString& string );

84
python/core/symbology-ng/qgsvectorcolorrampv2.sip → python/core/symbology-ng/qgsvectorcolorramp.sip
View File

@ -1,32 +1,32 @@
/** \ingroup core
* \class QgsVectorColorRampV2
* \class QgsVectorColorRamp
* \brief Abstract base class for color ramps
*/
//TODO QGIS 3.0 - rename to QgsColorRamp, since this is used by much more than just vectors
class QgsVectorColorRampV2
class QgsVectorColorRamp
{
%TypeHeaderCode
#include <qgsvectorcolorrampv2.h>
#include <qgsvectorcolorramp.h>
%End
%ConvertToSubClassCode
if (sipCpp->type() == "gradient")
sipType = sipType_QgsVectorGradientColorRampV2;
sipType = sipType_QgsVectorGradientColorRamp;
else if (sipCpp->type() == "random")
sipType = sipType_QgsVectorRandomColorRampV2;
sipType = sipType_QgsVectorRandomColorRamp;
else if (sipCpp->type() == "randomcolors")
sipType = sipType_QgsRandomColorsV2;
sipType = sipType_QgsRandomColors;
else if (sipCpp->type() == "colorbrewer")
sipType = sipType_QgsVectorColorBrewerColorRampV2;
sipType = sipType_QgsVectorColorBrewerColorRamp;
else if (sipCpp->type() == "cpt-city")
sipType = sipType_QgsCptCityColorRampV2;
sipType = sipType_QgsCptCityColorRamp;
else
sipType = 0;
%End
public:
virtual ~QgsVectorColorRampV2();
virtual ~QgsVectorColorRamp();
/** Returns number of defined colors, or -1 if undefined
*/
@ -48,7 +48,7 @@ class QgsVectorColorRampV2
/** Creates a clone of the color ramp.
*/
virtual QgsVectorColorRampV2* clone() const = 0 /Factory/;
virtual QgsVectorColorRamp* clone() const = 0 /Factory/;
/** Returns a string map containing all the color ramp's properties.
*/
@ -63,7 +63,7 @@ class QgsVectorColorRampV2
class QgsGradientStop
{
%TypeHeaderCode
#include <qgsvectorcolorrampv2.h>
#include <qgsvectorcolorramp.h>
%End
public:
@ -86,38 +86,38 @@ class QgsGradientStop
typedef QList<QgsGradientStop> QgsGradientStopsList;
/** \ingroup core
* \class QgsVectorGradientColorRampV2
* \class QgsVectorGradientColorRamp
* \brief Gradient color ramp, which smoothly interpolates between two colors and also
* supports optional extra color stops.
*/
//TODO QGIS 3.0 - rename to QgsGradientColorRamp, since this is used by much more than just vectors
class QgsVectorGradientColorRampV2 : QgsVectorColorRampV2
class QgsVectorGradientColorRamp : QgsVectorColorRamp
{
%TypeHeaderCode
#include <qgsvectorcolorrampv2.h>
#include <qgsvectorcolorramp.h>
%End
public:
/** Constructor for QgsVectorGradientColorRampV2
/** Constructor for QgsVectorGradientColorRamp
* @param color1 start color, corresponding to a position of 0.0
* @param color2 end color, corresponding to a position of 1.0
* @param discrete set to true for discrete interpolation instead of smoothly
* interpolating between colors
* @param stops optional list of additional color stops
*/
QgsVectorGradientColorRampV2( const QColor& color1 = DEFAULT_GRADIENT_COLOR1,
QgsVectorGradientColorRamp( const QColor& color1 = DEFAULT_GRADIENT_COLOR1,
const QColor& color2 = QColor(0,255,0),
bool discrete = false,
const QgsGradientStopsList& stops = QgsGradientStopsList() );
//! Creates a new QgsVectorColorRampV2 from a map of properties
static QgsVectorColorRampV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
//! Creates a new QgsVectorColorRamp from a map of properties
static QgsVectorColorRamp* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
virtual int count() const;
virtual double value( int index ) const;
virtual QColor color( double value ) const;
virtual QString type() const;
virtual QgsVectorGradientColorRampV2* clone() const /Factory/;
virtual QgsVectorGradientColorRamp* clone() const /Factory/;
virtual QgsStringMap properties() const;
/** Returns the gradient start color.
@ -200,22 +200,22 @@ class QgsVectorGradientColorRampV2 : QgsVectorColorRampV2
};
/** \ingroup core
* \class QgsVectorRandomColorRampV2
* \class QgsVectorRandomColorRamp
* \brief Random color ramp, which returns random colors based on preset parameters.
*/
//TODO QGIS 3.0 - rename to QgsRandomColorRamp, since this is used by much more than just vectors
class QgsVectorRandomColorRampV2 : QgsVectorColorRampV2
class QgsVectorRandomColorRamp : QgsVectorColorRamp
{
%TypeHeaderCode
#include <qgsvectorcolorrampv2.h>
#include <qgsvectorcolorramp.h>
%End
public:
QgsVectorRandomColorRampV2( int count = DEFAULT_RANDOM_COUNT,
QgsVectorRandomColorRamp( int count = DEFAULT_RANDOM_COUNT,
int hueMin = DEFAULT_RANDOM_HUE_MIN, int hueMax = DEFAULT_RANDOM_HUE_MAX,
int satMin = DEFAULT_RANDOM_SAT_MIN, int satMax = DEFAULT_RANDOM_SAT_MAX,
int valMin = DEFAULT_RANDOM_VAL_MIN, int valMax = DEFAULT_RANDOM_VAL_MAX );
static QgsVectorColorRampV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsVectorColorRamp* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
virtual double value( int index ) const;
@ -223,7 +223,7 @@ class QgsVectorRandomColorRampV2 : QgsVectorColorRampV2
virtual QString type() const;
virtual QgsVectorRandomColorRampV2* clone() const /Factory/;
virtual QgsVectorRandomColorRamp* clone() const /Factory/;
virtual QgsStringMap properties() const;
@ -254,11 +254,11 @@ class QgsVectorRandomColorRampV2 : QgsVectorColorRampV2
void setValMax( int val );
};
class QgsRandomColorsV2 : QgsVectorColorRampV2
class QgsRandomColors : QgsVectorColorRamp
{
public:
QgsRandomColorsV2();
~QgsRandomColorsV2();
QgsRandomColors();
~QgsRandomColors();
int count() const;
@ -276,21 +276,21 @@ class QgsRandomColorsV2 : QgsVectorColorRampV2
QString type() const;
virtual QgsRandomColorsV2* clone() const /Factory/;
virtual QgsRandomColors* clone() const /Factory/;
QgsStringMap properties() const;
};
class QgsVectorColorBrewerColorRampV2 : QgsVectorColorRampV2
class QgsVectorColorBrewerColorRamp : QgsVectorColorRamp
{
%TypeHeaderCode
#include <qgsvectorcolorrampv2.h>
#include <qgsvectorcolorramp.h>
%End
public:
QgsVectorColorBrewerColorRampV2( const QString& schemeName = DEFAULT_COLORBREWER_SCHEMENAME,
QgsVectorColorBrewerColorRamp( const QString& schemeName = DEFAULT_COLORBREWER_SCHEMENAME,
int colors = DEFAULT_COLORBREWER_COLORS );
static QgsVectorColorRampV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsVectorColorRamp* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
virtual double value( int index ) const;
@ -298,7 +298,7 @@ class QgsVectorColorBrewerColorRampV2 : QgsVectorColorRampV2
virtual QString type() const;
virtual QgsVectorColorBrewerColorRampV2* clone() const /Factory/;
virtual QgsVectorColorBrewerColorRamp* clone() const /Factory/;
virtual QgsStringMap properties() const;
@ -318,25 +318,25 @@ class QgsVectorColorBrewerColorRampV2 : QgsVectorColorRampV2
};
class QgsCptCityColorRampV2 : QgsVectorGradientColorRampV2
class QgsCptCityColorRamp : QgsVectorGradientColorRamp
{
%TypeHeaderCode
#include <qgsvectorcolorrampv2.h>
#include <qgsvectorcolorramp.h>
%End
public:
QgsCptCityColorRampV2( const QString& schemeName = DEFAULT_CPTCITY_SCHEMENAME,
QgsCptCityColorRamp( const QString& schemeName = DEFAULT_CPTCITY_SCHEMENAME,
const QString& variantName = DEFAULT_CPTCITY_VARIANTNAME,
bool doLoadFile = true );
QgsCptCityColorRampV2( const QString& schemeName, const QStringList& variantList,
QgsCptCityColorRamp( const QString& schemeName, const QStringList& variantList,
const QString& variantName = QString(), bool doLoadFile = true );
static QgsVectorColorRampV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
static QgsVectorColorRamp* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
virtual QString type() const;
virtual QgsCptCityColorRampV2* clone() const /Factory/;
void copy( const QgsCptCityColorRampV2* other );
QgsVectorGradientColorRampV2* cloneGradientRamp() const /Factory/;
virtual QgsCptCityColorRamp* clone() const /Factory/;
void copy( const QgsCptCityColorRamp* other );
QgsVectorGradientColorRamp* cloneGradientRamp() const /Factory/;
virtual QgsStringMap properties() const;

2
python/core/symbology-ng/qgsvectorfieldsymbollayer.sip
View File

@ -1,4 +1,4 @@
class QgsVectorFieldSymbolLayer : QgsMarkerSymbolLayerV2
class QgsVectorFieldSymbolLayer : QgsMarkerSymbolLayer
{
%TypeHeaderCode
#include <qgsvectorfieldsymbollayer.h>

28
python/gui/gui.sip
View File

@ -221,37 +221,37 @@
%Include symbology-ng/qgs25drendererwidget.sip
%Include symbology-ng/qgsarrowsymbollayerwidget.sip
%Include symbology-ng/qgsbrushstylecombobox.sip
%Include symbology-ng/qgscategorizedsymbolrendererv2widget.sip
%Include symbology-ng/qgscategorizedsymbolrendererwidget.sip
%Include symbology-ng/qgscolorrampcombobox.sip
%Include symbology-ng/qgscptcitycolorrampv2dialog.sip
%Include symbology-ng/qgscptcitycolorrampdialog.sip
%Include symbology-ng/qgsdashspacedialog.sip
%Include symbology-ng/qgsellipsesymbollayerv2widget.sip
%Include symbology-ng/qgsellipsesymbollayerwidget.sip
%Include symbology-ng/qgsgraduatedhistogramwidget.sip
%Include symbology-ng/qgsgraduatedsymbolrendererv2widget.sip
%Include symbology-ng/qgsgraduatedsymbolrendererwidget.sip
%Include symbology-ng/qgsheatmaprendererwidget.sip
%Include symbology-ng/qgsinvertedpolygonrendererwidget.sip
%Include symbology-ng/qgslayerpropertieswidget.sip
%Include symbology-ng/qgsnullsymbolrendererwidget.sip
%Include symbology-ng/qgspenstylecombobox.sip
%Include symbology-ng/qgspointdisplacementrendererwidget.sip
%Include symbology-ng/qgsrendererv2propertiesdialog.sip
%Include symbology-ng/qgsrendererv2widget.sip
%Include symbology-ng/qgsrulebasedrendererv2widget.sip
%Include symbology-ng/qgssinglesymbolrendererv2widget.sip
%Include symbology-ng/qgsrendererpropertiesdialog.sip
%Include symbology-ng/qgsrendererwidget.sip
%Include symbology-ng/qgsrulebasedrendererwidget.sip
%Include symbology-ng/qgssinglesymbolrendererwidget.sip
%Include symbology-ng/qgssizescalewidget.sip
%Include symbology-ng/qgssmartgroupeditordialog.sip
%Include symbology-ng/qgsstylev2exportimportdialog.sip
%Include symbology-ng/qgsstylev2groupselectiondialog.sip
%Include symbology-ng/qgsstylev2managerdialog.sip
%Include symbology-ng/qgsstyleexportimportdialog.sip
%Include symbology-ng/qgsstylegroupselectiondialog.sip
%Include symbology-ng/qgsstylemanagerdialog.sip
%Include symbology-ng/qgssvgselectorwidget.sip
%Include symbology-ng/qgssymbollayerwidget.sip
%Include symbology-ng/qgssymbollevelsdialog.sip
%Include symbology-ng/qgssymbolslistwidget.sip
%Include symbology-ng/qgssymbolselectordialog.sip
%Include symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.sip
%Include symbology-ng/qgsvectorcolorbrewercolorrampdialog.sip
%Include symbology-ng/qgsvectorfieldsymbollayerwidget.sip
%Include symbology-ng/qgsvectorgradientcolorrampv2dialog.sip
%Include symbology-ng/qgsvectorrandomcolorrampv2dialog.sip
%Include symbology-ng/qgsvectorgradientcolorrampdialog.sip
%Include symbology-ng/qgsvectorrandomcolorrampdialog.sip
%Include effects/qgseffectdrawmodecombobox.sip
%Include effects/qgseffectstackpropertieswidget.sip

4
python/gui/qgsannotationitem.sip
View File

@ -85,8 +85,8 @@ class QgsAnnotationItem: QgsMapCanvasItem, QgsAnnotation
QPointF offsetFromReferencePoint() const;
/** Set symbol that is drawn on map position. Takes ownership*/
void setMarkerSymbol( QgsMarkerSymbolV2* symbol /Transfer/ );
const QgsMarkerSymbolV2* markerSymbol() const;
void setMarkerSymbol( QgsMarkerSymbol* symbol /Transfer/ );
const QgsMarkerSymbol* markerSymbol() const;
void setFrameBorderWidth( double w );
double frameBorderWidth() const;

6
python/gui/qgsgeometryrubberband.sip
View File

@ -15,7 +15,7 @@
* *
***************************************************************************/
/** A rubberband class for QgsAbstractGeometryV2 (considering curved geometries)*/
/** A rubberband class for QgsAbstractGeometry (considering curved geometries)*/
class QgsGeometryRubberBand: QgsMapCanvasItem
{
%TypeHeaderCode
@ -54,9 +54,9 @@ class QgsGeometryRubberBand: QgsMapCanvasItem
~QgsGeometryRubberBand();
/** Sets geometry (takes ownership). Geometry is expected to be in map coordinates */
void setGeometry( QgsAbstractGeometryV2* geom );
void setGeometry( QgsAbstractGeometry* geom );
/** Returns a pointer to the geometry*/
const QgsAbstractGeometryV2* geometry();
const QgsAbstractGeometry* geometry();
/** Moves vertex to new position (in map coordinates)*/
void moveVertex( QgsVertexId id, const QgsPointV2& newPos );
/** Sets fill color for vertex markers*/

6
python/gui/qgsgradientstopeditor.sip
View File

@ -17,18 +17,18 @@ class QgsGradientStopEditor : QWidget
* @param parent parent widget
* @param ramp optional initial gradient ramp
*/
QgsGradientStopEditor( QWidget* parent /TransferThis/ = nullptr, QgsVectorGradientColorRampV2* ramp = nullptr );
QgsGradientStopEditor( QWidget* parent /TransferThis/ = nullptr, QgsVectorGradientColorRamp* ramp = nullptr );
/** Sets the current ramp shown in the editor.
* @param ramp color ramp
* @see gradientRamp()
*/
void setGradientRamp( const QgsVectorGradientColorRampV2& ramp );
void setGradientRamp( const QgsVectorGradientColorRamp& ramp );
/** Returns the current ramp created by the editor.
* @see setGradientRamp()
*/
QgsVectorGradientColorRampV2 gradientRamp() const;
QgsVectorGradientColorRamp gradientRamp() const;
/** Sets the currently selected stop.
* @param index index of stop, where 0 corresponds to the first stop

2
python/gui/qgsmapcanvas.sip
View File

@ -360,7 +360,7 @@ class QgsMapCanvas : QGraphicsView
void setSegmentationTolerance( double tolerance );
/** Sets segmentation tolerance type (maximum angle or maximum difference between curve and approximation)
@param type the segmentation tolerance typename*/
void setSegmentationToleranceType( QgsAbstractGeometryV2::SegmentationToleranceType type );
void setSegmentationToleranceType( QgsAbstractGeometry::SegmentationToleranceType type );
public slots:

4
python/gui/qgsmaptoolcapture.sip
View File

@ -32,14 +32,14 @@ class QgsMapToolCapture : public QgsMapToolAdvancedDigitizing
virtual void deactivate();
/** Adds a whole curve (e.g. circularstring) to the captured geometry. Curve must be in map CRS*/
int addCurve( QgsCurveV2* c );
int addCurve( QgsCurve* c );
/**
* Get the capture curve
*
* @return Capture curve
*/
const QgsCompoundCurveV2* captureCurve() const;
const QgsCompoundCurve* captureCurve() const;
/**

8
python/gui/symbology-ng/qgs25drendererwidget.sip
View File

@ -14,7 +14,7 @@
* *
***************************************************************************/
class Qgs25DRendererWidget : QgsRendererV2Widget
class Qgs25DRendererWidget : QgsRendererWidget
{
%TypeHeaderCode
#include "qgs25drendererwidget.h"
@ -25,16 +25,16 @@ class Qgs25DRendererWidget : QgsRendererV2Widget
* @param style
* @param renderer the mask renderer (will take ownership)
*/
static QgsRendererV2Widget* create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer );
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
/** Constructor
* @param layer the layer where this renderer is applied
* @param style
* @param renderer the mask renderer (will take ownership)
*/
Qgs25DRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer );
Qgs25DRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
QgsFeatureRendererV2* renderer();
QgsFeatureRenderer* renderer();
private:
void apply();

16
python/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.sip → python/gui/symbology-ng/qgscategorizedsymbolrendererwidget.sip
View File

@ -1,16 +1,16 @@
class QgsCategorizedSymbolRendererV2Widget : QgsRendererV2Widget
class QgsCategorizedSymbolRendererWidget : QgsRendererWidget
{
%TypeHeaderCode
#include <qgscategorizedsymbolrendererv2widget.h>
#include <qgscategorizedsymbolrendererwidget.h>
%End
public:
static QgsRendererV2Widget* create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) /Factory/;
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) /Factory/;
QgsCategorizedSymbolRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer );
~QgsCategorizedSymbolRendererV2Widget();
QgsCategorizedSymbolRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
~QgsCategorizedSymbolRendererWidget();
virtual QgsFeatureRendererV2* renderer();
virtual QgsFeatureRenderer* renderer();
/** Replaces category symbols with the symbols from a style that have a matching
* name.
@ -20,7 +20,7 @@ class QgsCategorizedSymbolRendererV2Widget : QgsRendererV2Widget
* @see matchToSymbolsFromXml
* @note added in QGIS 2.9
*/
int matchToSymbols( QgsStyleV2* style );
int matchToSymbols( QgsStyle* style );
public slots:
void changeCategorizedSymbol();
@ -75,7 +75,7 @@ class QgsCategorizedSymbolRendererV2Widget : QgsRendererV2Widget
void changeCategorySymbol();
QgsVectorColorRampV2* getColorRamp();
QgsVectorColorRamp* getColorRamp();
QList<QgsSymbol*> selectedSymbols();
QgsCategoryList selectedCategoryList();

6
python/gui/symbology-ng/qgscolorrampcombobox.sip
View File

@ -9,13 +9,13 @@ class QgsColorRampComboBox : QComboBox
~QgsColorRampComboBox();
//! initialize the combo box with color ramps from the style
void populate( QgsStyleV2* style );
void populate( QgsStyle* style );
//! add/select color ramp which was used previously by the renderer
void setSourceColorRamp( QgsVectorColorRampV2* sourceRamp );
void setSourceColorRamp( QgsVectorColorRamp* sourceRamp );
//! return new instance of the current color ramp or NULL if there is no active color ramp
QgsVectorColorRampV2* currentColorRamp();
QgsVectorColorRamp* currentColorRamp();
/** Returns true if the current selection in the combo box is the option for creating
* a new color ramp

8
python/gui/symbology-ng/qgscptcitycolorrampv2dialog.sip → python/gui/symbology-ng/qgscptcitycolorrampdialog.sip
View File

@ -1,12 +1,12 @@
class QgsCptCityColorRampV2Dialog : QDialog
class QgsCptCityColorRampDialog : QDialog
{
%TypeHeaderCode
#include <qgscptcitycolorrampv2dialog.h>
#include <qgscptcitycolorrampdialog.h>
%End
public:
QgsCptCityColorRampV2Dialog( QgsCptCityColorRampV2* ramp, QWidget* parent /TransferThis/ = NULL );
~QgsCptCityColorRampV2Dialog();
QgsCptCityColorRampDialog( QgsCptCityColorRamp* ramp, QWidget* parent /TransferThis/ = NULL );
~QgsCptCityColorRampDialog();
QString selectedName() const;

6
python/gui/symbology-ng/qgsellipsesymbollayerv2widget.sip → python/gui/symbology-ng/qgsellipsesymbollayerwidget.sip
View File

@ -1,10 +1,10 @@
class QgsEllipseSymbolLayerV2Widget: QgsSymbolLayerWidget
class QgsEllipseSymbolLayerWidget: QgsSymbolLayerWidget
{
%TypeHeaderCode
#include <qgsellipsesymbollayerv2widget.h>
#include <qgsellipsesymbollayerwidget.h>
%End
public:
QgsEllipseSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = 0 );
QgsEllipseSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = 0 );
static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) /Factory/;

8
python/gui/symbology-ng/qgsgraduatedhistogramwidget.sip
View File

@ -2,7 +2,7 @@
/** \ingroup gui
* \class QgsGraduatedHistogramWidget
* \brief Graphical histogram for displaying distribution of field values and
* editing range breaks for a QgsGraduatedSymbolRendererV2 renderer.
* editing range breaks for a QgsGraduatedSymbolRenderer renderer.
*
* \note Added in version 2.9
*/
@ -21,11 +21,11 @@ class QgsGraduatedHistogramWidget : QWidget
QgsGraduatedHistogramWidget( QWidget *parent /TransferThis/ = 0 );
~QgsGraduatedHistogramWidget();
/** Sets the QgsGraduatedSymbolRendererV2 renderer associated with the histogram.
/** Sets the QgsGraduatedSymbolRenderer renderer associated with the histogram.
* The histogram will fetch the ranges from the renderer before every refresh.
* @param renderer associated QgsGraduatedSymbolRendererV2
* @param renderer associated QgsGraduatedSymbolRenderer
*/
void setRenderer( QgsGraduatedSymbolRendererV2* renderer );
void setRenderer( QgsGraduatedSymbolRenderer* renderer );
signals:

12
python/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.sip → python/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.sip
View File

@ -1,15 +1,15 @@
class QgsGraduatedSymbolRendererV2Widget : QgsRendererV2Widget
class QgsGraduatedSymbolRendererWidget : QgsRendererWidget
{
%TypeHeaderCode
#include <qgsgraduatedsymbolrendererv2widget.h>
#include <qgsgraduatedsymbolrendererwidget.h>
%End
public:
static QgsRendererV2Widget* create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) /Factory/;
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) /Factory/;
QgsGraduatedSymbolRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer );
~QgsGraduatedSymbolRendererV2Widget();
QgsGraduatedSymbolRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
~QgsGraduatedSymbolRendererWidget();
virtual QgsFeatureRendererV2* renderer();
virtual QgsFeatureRenderer* renderer();
public slots:
void changeGraduatedSymbol();

8
python/gui/symbology-ng/qgsheatmaprendererwidget.sip
View File

@ -1,4 +1,4 @@
class QgsHeatmapRendererWidget : QgsRendererV2Widget
class QgsHeatmapRendererWidget : QgsRendererWidget
{
%TypeHeaderCode
#include <qgsheatmaprendererwidget.h>
@ -9,17 +9,17 @@ class QgsHeatmapRendererWidget : QgsRendererV2Widget
* @param style
* @param renderer the mask renderer (will take ownership)
*/
static QgsRendererV2Widget* create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) /Factory/;
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) /Factory/;
/** Constructor
* @param layer the layer where this renderer is applied
* @param style
* @param renderer the mask renderer (will take ownership)
*/
QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer );
QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
/** @returns the current feature renderer */
virtual QgsFeatureRendererV2* renderer();
virtual QgsFeatureRenderer* renderer();
void setMapCanvas( QgsMapCanvas* canvas );
};

8
python/gui/symbology-ng/qgsinvertedpolygonrendererwidget.sip
View File

@ -1,4 +1,4 @@
class QgsInvertedPolygonRendererWidget : QgsRendererV2Widget
class QgsInvertedPolygonRendererWidget : QgsRendererWidget
{
%TypeHeaderCode
#include <qgsinvertedpolygonrendererwidget.h>
@ -9,16 +9,16 @@ class QgsInvertedPolygonRendererWidget : QgsRendererV2Widget
* @param style
* @param renderer the mask renderer (will take ownership)
*/
static QgsRendererV2Widget* create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) /Factory/;
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) /Factory/;
/** Constructor
* @param layer the layer where this renderer is applied
* @param style
* @param renderer the mask renderer (will take ownership)
*/
QgsInvertedPolygonRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer );
QgsInvertedPolygonRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
/** @returns the current feature renderer */
virtual QgsFeatureRendererV2* renderer();
virtual QgsFeatureRenderer* renderer();
void setMapCanvas( QgsMapCanvas* canvas );
};

8
python/gui/symbology-ng/qgsnullsymbolrendererwidget.sip
View File

@ -4,7 +4,7 @@
* \note Added in version 2.16
*/
class QgsNullSymbolRendererWidget : QgsRendererV2Widget
class QgsNullSymbolRendererWidget : QgsRendererWidget
{
%TypeHeaderCode
#include <qgsnullsymbolrendererwidget.h>
@ -13,12 +13,12 @@ class QgsNullSymbolRendererWidget : QgsRendererV2Widget
public:
//! Creates a new QgsNullSymbolRendererWidget object
static QgsRendererV2Widget* create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) /Factory/;
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) /Factory/;
//! Constructor for QgsNullSymbolRendererWidget
QgsNullSymbolRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer );
QgsNullSymbolRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
~QgsNullSymbolRendererWidget();
//! Returns a pointer to the configured renderer
virtual QgsFeatureRendererV2* renderer();
virtual QgsFeatureRenderer* renderer();
};

8
python/gui/symbology-ng/qgspointdisplacementrendererwidget.sip
View File

@ -1,13 +1,13 @@
class QgsPointDisplacementRendererWidget: QgsRendererV2Widget
class QgsPointDisplacementRendererWidget: QgsRendererWidget
{
%TypeHeaderCode
#include <qgspointdisplacementrendererwidget.h>
%End
public:
static QgsRendererV2Widget* create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) /Factory/;
QgsPointDisplacementRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer );
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) /Factory/;
QgsPointDisplacementRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
~QgsPointDisplacementRendererWidget();
QgsFeatureRendererV2* renderer();
QgsFeatureRenderer* renderer();
void setMapCanvas( QgsMapCanvas* canvas );
};

10
python/gui/symbology-ng/qgsrendererv2propertiesdialog.sip → python/gui/symbology-ng/qgsrendererpropertiesdialog.sip
View File

@ -1,21 +1,21 @@
class QgsRendererV2PropertiesDialog : QDialog
class QgsRendererPropertiesDialog : QDialog
{
%TypeHeaderCode
#include <qgsrendererv2propertiesdialog.h>
#include <qgsrendererpropertiesdialog.h>
%End
public:
/** Constructor for QgsRendererV2PropertiesDialog.
/** Constructor for QgsRendererPropertiesDialog.
* @param layer associated layer
* @param style style collection
* @param embedded set to true to indicate that the dialog will be embedded in another widget, rather
* than shown as a dialog by itself
* @param parent parent widget
*/
QgsRendererV2PropertiesDialog( QgsVectorLayer* layer, QgsStyleV2* style, bool embedded = false, QWidget* parent /TransferThis/ = nullptr );
QgsRendererPropertiesDialog( QgsVectorLayer* layer, QgsStyle* style, bool embedded = false, QWidget* parent /TransferThis/ = nullptr );
~QgsRendererV2PropertiesDialog();
~QgsRendererPropertiesDialog();
/** Sets the map canvas associated with the dialog. This allows the widget to retrieve the current
* map scale and other properties from the canvas.

20
python/gui/symbology-ng/qgsrendererv2widget.sip → python/gui/symbology-ng/qgsrendererwidget.sip
View File

@ -1,19 +1,19 @@
class QgsRendererV2Widget : QgsPanelWidget
class QgsRendererWidget : QgsPanelWidget
{
%TypeHeaderCode
#include <qgsrendererv2widget.h>
#include <qgsrendererwidget.h>
%End
public:
QgsRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style );
QgsRendererWidget( QgsVectorLayer* layer, QgsStyle* style );
virtual ~QgsRendererV2Widget();
virtual ~QgsRendererWidget();
//! return pointer to the renderer (no transfer of ownership)
virtual QgsFeatureRendererV2* renderer() = 0;
virtual QgsFeatureRenderer* renderer() = 0;
//! show a dialog with renderer's symbol level settings
void showSymbolLevelsDialog( QgsFeatureRendererV2* r );
void showSymbolLevelsDialog( QgsFeatureRenderer* r );
/** Sets the map canvas associated with the widget. This allows the widget to retrieve the current
* map scale and other properties from the canvas.
@ -87,7 +87,7 @@ Utility classes for "en masse" size definition
class QgsDataDefinedValueDialog : QDialog
{
%TypeHeaderCode
#include <qgsrendererv2widget.h>
#include <qgsrendererwidget.h>
%End
public:
@ -133,7 +133,7 @@ class QgsDataDefinedValueDialog : QDialog
class QgsDataDefinedSizeDialog : QgsDataDefinedValueDialog
{
%TypeHeaderCode
#include <qgsrendererv2widget.h>
#include <qgsrendererwidget.h>
%End
public:
@ -150,7 +150,7 @@ class QgsDataDefinedSizeDialog : QgsDataDefinedValueDialog
class QgsDataDefinedRotationDialog : QgsDataDefinedValueDialog
{
%TypeHeaderCode
#include <qgsrendererv2widget.h>
#include <qgsrendererwidget.h>
%End
public:
@ -168,7 +168,7 @@ class QgsDataDefinedRotationDialog : QgsDataDefinedValueDialog
class QgsDataDefinedWidthDialog : QgsDataDefinedValueDialog
{
%TypeHeaderCode
#include <qgsrendererv2widget.h>
#include <qgsrendererwidget.h>
%End
public:

40
python/gui/symbology-ng/qgsrulebasedrendererv2widget.sip → python/gui/symbology-ng/qgsrulebasedrendererwidget.sip
View File

@ -1,11 +1,11 @@
class QgsRuleBasedRendererV2Model : QAbstractItemModel
class QgsRuleBasedRendererModel : QAbstractItemModel
{
%TypeHeaderCode
#include <qgsrulebasedrendererv2widget.h>
#include <qgsrulebasedrendererwidget.h>
%End
public:
QgsRuleBasedRendererV2Model( QgsRuleBasedRendererV2* r );
QgsRuleBasedRendererModel( QgsRuleBasedRenderer* r );
virtual Qt::ItemFlags flags( const QModelIndex &index ) const;
virtual QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const;
@ -31,9 +31,9 @@ class QgsRuleBasedRendererV2Model : QAbstractItemModel
// new methods
QgsRuleBasedRendererV2::Rule* ruleForIndex( const QModelIndex& index ) const;
QgsRuleBasedRenderer::Rule* ruleForIndex( const QModelIndex& index ) const;
void insertRule( const QModelIndex& parent, int before, QgsRuleBasedRendererV2::Rule* newrule );
void insertRule( const QModelIndex& parent, int before, QgsRuleBasedRenderer::Rule* newrule );
void updateRule( const QModelIndex& parent, int row );
// update rule and all its descendants
void updateRule( const QModelIndex& index );
@ -43,25 +43,25 @@ class QgsRuleBasedRendererV2Model : QAbstractItemModel
void finishedAddingRules(); // call endInsertRows
//! @note not available in python bindungs
// void setFeatureCounts( QMap<QgsRuleBasedRendererV2::Rule*, QgsRuleBasedRendererV2Count> theCountMap );
// void setFeatureCounts( QMap<QgsRuleBasedRenderer::Rule*, QgsRuleBasedRendererCount> theCountMap );
void clearFeatureCounts();
};
class QgsRuleBasedRendererV2Widget : QgsRendererV2Widget
class QgsRuleBasedRendererWidget : QgsRendererWidget
{
%TypeHeaderCode
#include <qgsrulebasedrendererv2widget.h>
#include <qgsrulebasedrendererwidget.h>
%End
public:
static QgsRendererV2Widget* create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) /Factory/;
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) /Factory/;
QgsRuleBasedRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer );
~QgsRuleBasedRendererV2Widget();
QgsRuleBasedRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
~QgsRuleBasedRendererWidget();
virtual QgsFeatureRendererV2* renderer();
virtual QgsFeatureRenderer* renderer();
public slots:
@ -90,10 +90,10 @@ class QgsRuleBasedRendererV2Widget : QgsRendererV2Widget
void refineRuleRangesGui( const QModelIndexList& index );
void refineRuleScalesGui( const QModelIndexList& index );
QgsRuleBasedRendererV2::Rule* currentRule();
QgsRuleBasedRenderer::Rule* currentRule();
QList<QgsSymbol*> selectedSymbols();
QList<QgsRuleBasedRendererV2::Rule*> selectedRules();
QList<QgsRuleBasedRenderer::Rule*> selectedRules();
void refreshSymbolView();
void keyPressEvent( QKeyEvent* event );
};
@ -103,14 +103,14 @@ class QgsRuleBasedRendererV2Widget : QgsRendererV2Widget
class QgsRendererRulePropsWidget: QgsPanelWidget
{
%TypeHeaderCode
#include <qgsrulebasedrendererv2widget.h>
#include <qgsrulebasedrendererwidget.h>
%End
public:
QgsRendererRulePropsWidget( QgsRuleBasedRendererV2::Rule* rule, QgsVectorLayer* layer, QgsStyleV2* style, QWidget* parent /TransferThis/ = 0, QgsMapCanvas* mapCanvas = 0 );
QgsRendererRulePropsWidget( QgsRuleBasedRenderer::Rule* rule, QgsVectorLayer* layer, QgsStyle* style, QWidget* parent /TransferThis/ = 0, QgsMapCanvas* mapCanvas = 0 );
~QgsRendererRulePropsWidget();
QgsRuleBasedRendererV2::Rule* rule();
QgsRuleBasedRenderer::Rule* rule();
public slots:
void testFilter();
@ -123,14 +123,14 @@ class QgsRendererRulePropsWidget: QgsPanelWidget
class QgsRendererRulePropsDialog : QDialog
{
%TypeHeaderCode
#include <qgsrulebasedrendererv2widget.h>
#include <qgsrulebasedrendererwidget.h>
%End
public:
QgsRendererRulePropsDialog( QgsRuleBasedRendererV2::Rule* rule, QgsVectorLayer* layer, QgsStyleV2* style, QWidget* parent /TransferThis/ = 0, QgsMapCanvas* mapCanvas = 0 );
QgsRendererRulePropsDialog( QgsRuleBasedRenderer::Rule* rule, QgsVectorLayer* layer, QgsStyle* style, QWidget* parent /TransferThis/ = 0, QgsMapCanvas* mapCanvas = 0 );
~QgsRendererRulePropsDialog();
QgsRuleBasedRendererV2::Rule* rule();
QgsRuleBasedRenderer::Rule* rule();
public slots:
void testFilter();

25
python/gui/symbology-ng/qgssinglesymbolrendererv2widget.sip
View File

@ -1,25 +0,0 @@
class QgsSingleSymbolRendererV2Widget : QgsRendererV2Widget
{
%TypeHeaderCode
#include <qgssinglesymbolrendererv2widget.h>
%End
public:
static QgsRendererV2Widget* create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) /Factory/;
QgsSingleSymbolRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer );
~QgsSingleSymbolRendererV2Widget();
virtual QgsFeatureRendererV2* renderer();
virtual void setMapCanvas( QgsMapCanvas* canvas );
virtual void setDockMode( bool dockMode );
public slots:
void changeSingleSymbol();
void sizeScaleFieldChanged( const QString& fldName );
void scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod );
void showSymbolLevels();
};

25
python/gui/symbology-ng/qgssinglesymbolrendererwidget.sip Normal file
View File

@ -0,0 +1,25 @@
class QgsSingleSymbolRendererWidget : QgsRendererWidget
{
%TypeHeaderCode
#include <qgssinglesymbolrendererwidget.h>
%End
public:
static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) /Factory/;
QgsSingleSymbolRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer );
~QgsSingleSymbolRendererWidget();
virtual QgsFeatureRenderer* renderer();
virtual void setMapCanvas( QgsMapCanvas* canvas );
virtual void setDockMode( bool dockMode );
public slots:
void changeSingleSymbol();
void sizeScaleFieldChanged( const QString& fldName );
void scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod );
void showSymbolLevels();
};

2
python/gui/symbology-ng/qgssizescalewidget.sip
View File

@ -4,7 +4,7 @@ class QgsSizeScaleWidget : QgsDataDefinedAssistant
#include <qgssizescalewidget.h>
%End
public:
QgsSizeScaleWidget( const QgsVectorLayer * layer, const QgsMarkerSymbolV2 * symbol );
QgsSizeScaleWidget( const QgsVectorLayer * layer, const QgsMarkerSymbol * symbol );
QgsDataDefined dataDefined() const;

2
python/gui/symbology-ng/qgssmartgroupeditordialog.sip
View File

@ -36,7 +36,7 @@ class QgsSmartGroupEditorDialog : QDialog
%End
public:
QgsSmartGroupEditorDialog( QgsStyleV2* style, QWidget* parent /TransferThis/ = NULL );
QgsSmartGroupEditorDialog( QgsStyle* style, QWidget* parent /TransferThis/ = NULL );
~QgsSmartGroupEditorDialog();
//! returns the value from mNameLineEdit

8
python/gui/symbology-ng/qgsstylev2exportimportdialog.sip → python/gui/symbology-ng/qgsstyleexportimportdialog.sip
View File

@ -1,7 +1,7 @@
class QgsStyleV2ExportImportDialog : QDialog
class QgsStyleExportImportDialog : QDialog
{
%TypeHeaderCode
#include <qgsstylev2exportimportdialog.h>
#include <qgsstyleexportimportdialog.h>
%End
public:
enum Mode
@ -12,8 +12,8 @@ class QgsStyleV2ExportImportDialog : QDialog
// constructor
// mode argument must be 0 for saving and 1 for loading
QgsStyleV2ExportImportDialog( QgsStyleV2* style, QWidget *parent /TransferThis/ = NULL, Mode mode = Export );
~QgsStyleV2ExportImportDialog();
QgsStyleExportImportDialog( QgsStyle* style, QWidget *parent /TransferThis/ = NULL, Mode mode = Export );
~QgsStyleExportImportDialog();
/**
* @brief selectSymbols select symbols by name

10
python/gui/symbology-ng/qgsstylev2groupselectiondialog.sip → python/gui/symbology-ng/qgsstylegroupselectiondialog.sip
View File

@ -1,5 +1,5 @@
/***************************************************************************
qgsstylev2groupselectiondialog.h
qgsstylegroupselectiondialog.h
---------------------
begin : Oct 2015
copyright : (C) 2015 by Alessandro Pasotti
@ -15,15 +15,15 @@
***************************************************************************/
class QgsStyleV2GroupSelectionDialog : public QDialog, private Ui::SymbolsV2GroupSelectionDialogBase
class QgsStyleGroupSelectionDialog : public QDialog, private Ui::SymbolsGroupSelectionDialogBase
{
%TypeHeaderCode
#include <qgsstylev2groupselectiondialog.h>
#include <qgsstylegroupselectiondialog.h>
%End
public:
QgsStyleV2GroupSelectionDialog( QgsStyleV2* style, QWidget *parent = 0 );
~QgsStyleV2GroupSelectionDialog();
QgsStyleGroupSelectionDialog( QgsStyle* style, QWidget *parent = 0 );
~QgsStyleGroupSelectionDialog();
//! Set bold font for item
void setBold( QStandardItem *item );

8
python/gui/symbology-ng/qgsstylev2managerdialog.sip → python/gui/symbology-ng/qgsstylemanagerdialog.sip
View File

@ -1,14 +1,14 @@
class QgsStyleV2ManagerDialog : QDialog
class QgsStyleManagerDialog : QDialog
{
%TypeHeaderCode
#include <qgsstylev2managerdialog.h>
#include <qgsstylemanagerdialog.h>
%End
public:
QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* parent /TransferThis/ = NULL );
QgsStyleManagerDialog( QgsStyle* style, QWidget* parent /TransferThis/ = NULL );
//! open add color ramp dialog, return color ramp's name if the ramp has been added
static QString addColorRampStatic( QWidget* parent, QgsStyleV2* style,
static QString addColorRampStatic( QWidget* parent, QgsStyle* style,
QString RampType = QString() );
public slots:

44
python/gui/symbology-ng/qgssymbollayerwidget.sip
View File

@ -81,14 +81,14 @@ class QgsSymbolLayerWidget : QWidget
///////////
class QgsSimpleLineSymbolLayerV2Widget : QgsSymbolLayerWidget
class QgsSimpleLineSymbolLayerWidget : QgsSymbolLayerWidget
{
%TypeHeaderCode
#include <qgssymbollayerwidget.h>
%End
public:
QgsSimpleLineSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
QgsSimpleLineSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) /Factory/;
@ -115,15 +115,15 @@ class QgsSimpleLineSymbolLayerV2Widget : QgsSymbolLayerWidget
///////////
class QgsSimpleMarkerSymbolLayerV2Widget : QgsSymbolLayerWidget
class QgsSimpleMarkerSymbolLayerWidget : QgsSymbolLayerWidget
{
%TypeHeaderCode
#include <qgssymbollayerwidget.h>
%End
public:
QgsSimpleMarkerSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
~QgsSimpleMarkerSymbolLayerV2Widget();
QgsSimpleMarkerSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
~QgsSimpleMarkerSymbolLayerWidget();
static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) /Factory/;
@ -149,14 +149,14 @@ class QgsSimpleMarkerSymbolLayerV2Widget : QgsSymbolLayerWidget
///////////
class QgsSimpleFillSymbolLayerV2Widget : QgsSymbolLayerWidget
class QgsSimpleFillSymbolLayerWidget : QgsSymbolLayerWidget
{
%TypeHeaderCode
#include <qgssymbollayerwidget.h>
%End
public:
QgsSimpleFillSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
QgsSimpleFillSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) /Factory/;
@ -213,13 +213,13 @@ class QgsFilledMarkerSymbolLayerWidget : QgsSymbolLayerWidget
///////////
class QgsGradientFillSymbolLayerV2Widget : QgsSymbolLayerWidget
class QgsGradientFillSymbolLayerWidget : QgsSymbolLayerWidget
{
%TypeHeaderCode
#include <qgssymbollayerwidget.h>
%End
public:
QgsGradientFillSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
QgsGradientFillSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) /Factory/;
@ -243,13 +243,13 @@ class QgsGradientFillSymbolLayerV2Widget : QgsSymbolLayerWidget
///////////
class QgsShapeburstFillSymbolLayerV2Widget : QgsSymbolLayerWidget
class QgsShapeburstFillSymbolLayerWidget : QgsSymbolLayerWidget
{
%TypeHeaderCode
#include <qgssymbollayerwidget.h>
%End
public:
QgsShapeburstFillSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
QgsShapeburstFillSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) /Factory/;
@ -273,13 +273,13 @@ class QgsShapeburstFillSymbolLayerV2Widget : QgsSymbolLayerWidget
///////////
class QgsMarkerLineSymbolLayerV2Widget : QgsSymbolLayerWidget
class QgsMarkerLineSymbolLayerWidget : QgsSymbolLayerWidget
{
%TypeHeaderCode
#include <qgssymbollayerwidget.h>
%End
public:
QgsMarkerLineSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
QgsMarkerLineSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) /Factory/;
@ -302,15 +302,15 @@ class QgsMarkerLineSymbolLayerV2Widget : QgsSymbolLayerWidget
///////////
class QgsSvgMarkerSymbolLayerV2Widget : QgsSymbolLayerWidget
class QgsSvgMarkerSymbolLayerWidget : QgsSymbolLayerWidget
{
%TypeHeaderCode
#include <qgssymbollayerwidget.h>
%End
public:
QgsSvgMarkerSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
~QgsSvgMarkerSymbolLayerV2Widget();
QgsSvgMarkerSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
~QgsSvgMarkerSymbolLayerWidget();
static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) /Factory/;
@ -340,7 +340,7 @@ class QgsSvgMarkerSymbolLayerV2Widget : QgsSymbolLayerWidget
void populateList();
//update gui for svg file (insert new path, update activation of gui elements for svg params)
void setGuiForSvg( const QgsSvgMarkerSymbolLayerV2* layer );
void setGuiForSvg( const QgsSvgMarkerSymbolLayer* layer );
};
///////////
@ -423,16 +423,16 @@ class QgsPointPatternFillSymbolLayerWidget: QgsSymbolLayerWidget
/////////
class QgsFontMarkerSymbolLayerV2Widget : QgsSymbolLayerWidget
class QgsFontMarkerSymbolLayerWidget : QgsSymbolLayerWidget
{
%TypeHeaderCode
#include <qgssymbollayerwidget.h>
%End
public:
QgsFontMarkerSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
QgsFontMarkerSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
~QgsFontMarkerSymbolLayerV2Widget();
~QgsFontMarkerSymbolLayerWidget();
static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) /Factory/;
@ -461,14 +461,14 @@ class QgsFontMarkerSymbolLayerV2Widget : QgsSymbolLayerWidget
//////////
class QgsCentroidFillSymbolLayerV2Widget : QgsSymbolLayerWidget
class QgsCentroidFillSymbolLayerWidget : QgsSymbolLayerWidget
{
%TypeHeaderCode
#include <qgssymbollayerwidget.h>
%End
public:
QgsCentroidFillSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
QgsCentroidFillSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = NULL );
static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) /Factory/;

4
python/gui/symbology-ng/qgssymbolselectordialog.sip
View File

@ -5,7 +5,7 @@ class QgsSymbolSelectorWidget : QgsPanelWidget
%End
public:
QgsSymbolSelectorWidget( QgsSymbol* symbol, QgsStyleV2* style, const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = 0);
QgsSymbolSelectorWidget( QgsSymbol* symbol, QgsStyle* style, const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = 0);
//! return menu for "advanced" button - create it if doesn't exist and show the advanced button
QMenu* advancedMenu();
@ -97,7 +97,7 @@ class QgsSymbolSelectorDialog : QDialog
%End
public:
QgsSymbolSelectorDialog( QgsSymbol* symbol, QgsStyleV2* style, const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = 0, bool embedded = false );
QgsSymbolSelectorDialog( QgsSymbol* symbol, QgsStyle* style, const QgsVectorLayer* vl, QWidget* parent /TransferThis/ = 0, bool embedded = false );
//! return menu for "advanced" button - create it if doesn't exist and show the advanced button
QMenu* advancedMenu();

2
python/gui/symbology-ng/qgssymbolslistwidget.sip
View File

@ -4,7 +4,7 @@ class QgsSymbolsListWidget : QWidget
#include <qgssymbolslistwidget.h>
%End
public:
QgsSymbolsListWidget( QgsSymbol* symbol, QgsStyleV2* style, QMenu* menu, QWidget* parent /TransferThis/ = 0, const QgsVectorLayer * layer = 0 );
QgsSymbolsListWidget( QgsSymbol* symbol, QgsStyle* style, QMenu* menu, QWidget* parent /TransferThis/ = 0, const QgsVectorLayer * layer = 0 );
/** Returns the expression context used for the widget, if set. This expression context is used for
* evaluating data defined symbol properties and for populating based expression widgets in

19
python/gui/symbology-ng/qgsvectorcolorbrewercolorrampdialog.sip Normal file
View File

@ -0,0 +1,19 @@
class QgsVectorColorBrewerColorRampDialog : QDialog
{
%TypeHeaderCode
#include <qgsvectorcolorbrewercolorrampdialog.h>
%End
public:
QgsVectorColorBrewerColorRampDialog( QgsVectorColorBrewerColorRamp* ramp, QWidget* parent /TransferThis/ = NULL );
public slots:
void setSchemeName();
void setColors();
void populateVariants();
protected:
void updatePreview();
};

19
python/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.sip
View File

@ -1,19 +0,0 @@
class QgsVectorColorBrewerColorRampV2Dialog : QDialog
{
%TypeHeaderCode
#include <qgsvectorcolorbrewercolorrampv2dialog.h>
%End
public:
QgsVectorColorBrewerColorRampV2Dialog( QgsVectorColorBrewerColorRampV2* ramp, QWidget* parent /TransferThis/ = NULL );
public slots:
void setSchemeName();
void setColors();
void populateVariants();
protected:
void updatePreview();
};

Some files were not shown because too many files have changed in this diff Show More