diff --git a/doc/api_break.dox b/doc/api_break.dox index 4615d7aaeb6..421b473cd2b 100644 --- a/doc/api_break.dox +++ b/doc/api_break.dox @@ -22,23 +22,146 @@ This page tries to maintain a list with incompatible changes that happened in pr -
Renamed classes
API 2.x API 3.X -
QgsAttributeAction QgsActionManager -
QgsColorButtonV2 QgsColorButton -
QgsSymbolLayerV2 QgsSymbolLayer -
QgsSymbolLayerV2AbstractMetadata QgsSymbolLayerAbstractMetadata -
QgsSymbolLayerV2Metadata QgsSymbolLayerMetadata -
QgsSymbolLayerV2Registry QgsSymbolLayerRegistry -
QgsSymbolLayerV2Utils QgsSymbolLayerUtils -
QgsSymbolLayerV2Widget QgsSymbolLayerWidget -
QgsSymbolLevelsV2Dialog QgsSymbolLevelsDialog -
QgsSymbologyV2Conversion QgsSymbologyConversion -
QgsSymbolV2 QgsSymbol -
QgsSymbolV2LegendNode QgsSymbolLegendNode -
QgsSymbolV2LevelItem QgsSymbolLevelItem -
QgsSymbolV2RenderContext QgsSymbolRenderContext -
QgsSymbolV2SelectorDialog QgsSymbolSelectorDialog -
QgsSymbolV2SelectorWidget QgsSymbolSelectorWidget +
API 2.xAPI 3.X +
QgsAttributeActionQgsActionManager +
QgsAbstractGeometryV2QgsAbstractGeometry +
QgsCategorizedSymbolRendererV2QgsCategorizedSymbolRenderer +
QgsCategorizedSymbolRendererV2ModelQgsCategorizedSymbolRendererModel +
QgsCategorizedSymbolRendererV2ViewStyleQgsCategorizedSymbolRendererViewStyle +
QgsCategorizedSymbolRendererV2WidgetQgsCategorizedSymbolRendererWidget +
QgsCentroidFillSymbolLayerV2QgsCentroidFillSymbolLayer +
QgsCentroidFillSymbolLayerV2WidgetQgsCentroidFillSymbolLayerWidget +
QgsCircularStringV2QgsCircularString +
QgsColorButtonV2QgsColorButton +
QgsComposerSymbolV2ItemQgsComposerSymbolItem +
QgsComposerTableAvailableSortProxyModelV2QgsComposerTableAvailableSortProxyModel +
QgsCompoundCurveV2QgsCompoundCurve +
QgsCoordinateSequenceV2QgsCoordinateSequence +
QgsCptCityColorRampV2QgsCptCityColorRamp +
QgsCptCityColorRampV2DialogQgsCptCityColorRampDialog +
QgsCptCityColorRampV2DialogBaseQgsCptCityColorRampDialogBase +
QgsCurvePolygonV2QgsCurvePolygon +
QgsCurveV2QgsCurve +
QgsDiagramRendererV2QgsDiagramRenderer +
QgsEditorWidgetV2QgsEditorWidget +
QgsEllipseSymbolLayerV2QgsEllipseSymbolLayer +
QgsEllipseSymbolLayerV2WidgetQgsEllipseSymbolLayerWidget +
QgsFeatureRendererV2QgsFeatureRenderer +
QgsFillSymbolLayerV2QgsFillSymbolLayer +
QgsFillSymbolV2QgsFillSymbol +
QgsFontMarkerSymbolLayerV2QgsFontMarkerSymbolLayer +
QgsFontMarkerSymbolLayerV2WidgetQgsFontMarkerSymbolLayerWidget +
QgsGeometryCollectionV2QgsGeometryCollection +
QgsGeometryGeneratorSymbolLayerV2QgsGeometryGeneratorSymbolLayer +
QgsGradientFillSymbolLayerV2QgsGradientFillSymbolLayer +
QgsGradientFillSymbolLayerV2WidgetQgsGradientFillSymbolLayerWidget +
QgsGraduatedSymbolRendererV2QgsGraduatedSymbolRenderer +
QgsGraduatedSymbolRendererV2ModelQgsGraduatedSymbolRendererModel +
QgsGraduatedSymbolRendererV2ViewStyleQgsGraduatedSymbolRendererViewStyle +
QgsGraduatedSymbolRendererV2WidgetQgsGraduatedSymbolRendererWidget +
QgsLabelingEngineV2QgsLabelingEngine +
QgsLegendSymbolItemV2QgsLegendSymbolItem +
QgsLineStringV2QgsLineString +
QgsLineSymbolLayerV2QgsLineSymbolLayer +
QgsLineSymbolV2QgsLineSymbol +
QgsMarkerLineSymbolLayerV2QgsMarkerLineSymbolLayer +
QgsMarkerLineSymbolLayerV2WidgetQgsMarkerLineSymbolLayerWidget +
QgsMarkerSymbolLayerV2QgsMarkerSymbolLayer +
QgsMarkerSymbolV2QgsMarkerSymbol +
QgsMultiCurveV2QgsMultiCurve +
QgsMultiLineStringV2QgsMultiLineString +
QgsMultiSurfaceV2QgsMultiSurface +
QgsPointSequenceV2QgsPointSequence +
QgsRandomColorsV2QgsRandomColors +
QgsRendererCategoryV2QgsRendererCategory +
QgsRendererRangeV2QgsRendererRange +
QgsRendererRangeV2LabelFomatQgsRendererRangeLabelFomat +
QgsRendererRangeV2LabelFormatQgsRendererRangeLabelFormat +
QgsRendererV2QgsRenderer +
QgsRendererV2AbstractMetadataQgsRendererAbstractMetadata +
QgsRendererV2CreateFromSldFuncQgsRendererCreateFromSldFunc +
QgsRendererV2CreateFuncQgsRendererCreateFunc +
QgsRendererV2DataDefinedMenusQgsRendererDataDefinedMenus +
QgsRendererV2MetadataQgsRendererMetadata +
QgsRendererV2PropertiesDialogQgsRendererPropertiesDialog +
QgsRendererV2PropsDialogBaseQgsRendererPropsDialogBase +
QgsRendererV2RegistryQgsRendererRegistry +
QgsRendererV2WidgetQgsRendererWidget +
QgsRendererV2WidgetFuncQgsRendererWidgetFunc +
QgsRingSequenceV2QgsRingSequence +
QgsRuleBasedRendererV2QgsRuleBasedRenderer +
QgsRuleBasedRendererV2CountQgsRuleBasedRendererCount +
QgsRuleBasedRendererV2ModelQgsRuleBasedRendererModel +
QgsRuleBasedRendererV2WidgetQgsRuleBasedRendererWidget +
QgsShapeburstFillSymbolLayerV2QgsShapeburstFillSymbolLayer +
QgsShapeburstFillSymbolLayerV2WidgetQgsShapeburstFillSymbolLayerWidget +
QgsSimpleFillSymbolLayerV2QgsSimpleFillSymbolLayer +
QgsSimpleFillSymbolLayerV2WidgetQgsSimpleFillSymbolLayerWidget +
QgsSimpleLineSymbolLayerV2QgsSimpleLineSymbolLayer +
QgsSimpleLineSymbolLayerV2WidgetQgsSimpleLineSymbolLayerWidget +
QgsSimpleMarkerSymbolLayerV2QgsSimpleMarkerSymbolLayer +
QgsSimpleMarkerSymbolLayerV2WidgetQgsSimpleMarkerSymbolLayerWidget +
QgsSingleSymbolRendererV2QgsSingleSymbolRenderer +
QgsSingleSymbolRendererV2WidgetQgsSingleSymbolRendererWidget +
QgsStyleV2QgsStyle +
QgsStyleV2ExportImportDialogQgsStyleExportImportDialog +
QgsStyleV2ExportImportDialogBaseQgsStyleExportImportDialogBase +
QgsStyleV2GroupSelectionDialogQgsStyleGroupSelectionDialog +
QgsStyleV2ManagerDialogQgsStyleManagerDialog +
QgsStyleV2ManagerDialogBaseQgsStyleManagerDialogBase +
QgsSurfaceV2QgsSurface +
QgsSvgMarkerSymbolLayerV2QgsSvgMarkerSymbolLayer +
QgsSvgMarkerSymbolLayerV2WidgetQgsSvgMarkerSymbolLayerWidget +
QgsSymbolLayerV2QgsSymbolLayer +
QgsSymbolLayerV2AbstractMetadataQgsSymbolLayerAbstractMetadata +
QgsSymbolLayerV2MetadataQgsSymbolLayerMetadata +
QgsSymbolLayerV2RegistryQgsSymbolLayerRegistry +
QgsSymbolLayerV2UtilsQgsSymbolLayerUtils +
QgsSymbolLayerV2WidgetQgsSymbolLayerWidget +
QgsSymbolLevelsV2DialogQgsSymbolLevelsDialog +
QgsSymbolV2LegendNodeQgsSymbolLegendNode +
QgsSymbolV2LevelItemQgsSymbolLevelItem +
QgsSymbolV2RenderContextQgsSymbolRenderContext +
QgsSymbolV2SelectorDialogQgsSymbolSelectorDialog +
QgsSymbolV2SelectorWidgetQgsSymbolSelectorWidget +
QgsSymbologyV2ConversionQgsSymbologyConversion +
QgsVectorColorBrewerColorRampV2QgsVectorColorBrewerColorRamp +
QgsVectorColorBrewerColorRampV2DialogQgsVectorColorBrewerColorRampDialog +
QgsVectorColorBrewerColorRampV2DialogBaseQgsVectorColorBrewerColorRampDialogBase +
QgsVectorColorRampV2QgsVectorColorRamp +
QgsVectorColorRampV2MapQgsVectorColorRampMap +
QgsVectorGradientColorRampV2QgsVectorGradientColorRamp +
QgsVectorGradientColorRampV2DialogQgsVectorGradientColorRampDialog +
QgsVectorGradientColorRampV2DialogBaseQgsVectorGradientColorRampDialogBase +
QgsVectorGradientRampV2QgsVectorGradientRamp +
QgsVectorLayersetRendererV2QgsVectorLayersetRenderer +
QgsVectorRandomColorRampV2QgsVectorRandomColorRamp +
QgsVectorRandomColorRampV2DialogQgsVectorRandomColorRampDialog +
QgsVectorRandomColorRampV2DialogBaseQgsVectorRandomColorRampDialogBase +
QgsSymbolV2QgsSymbol +
+ + + +
Renamed enum values
classAPI 2.xAPI 3.X +
QgsLayerTreeModelLegendNodeSymbolV2LegacyRuleKeyRoleSymbolLegacyRuleKeyRole +
QgsVectorLayerEditorWidgetV2EditorWidget +
+ + + +
Renamed method names
classAPI 2.xAPI 3.X +
QgsApplicationdefaultStyleV2PathdefaultStylePath +
QgsApplicationuserStyleV2PathuserStylePath +
QgsComposerShapesetUseSymbolV2setUseSymbol +
QgsSymbolLayerUtilscreateSymbolLayerV2ListFromSldcreateSymbolLayerListFromSld +
QgsVectorLayereditorWidgetV2ConfigeditorWidgetConfig +
QgsVectorLayereditorWidgetV2TexteditorWidgetText +
QgsVectorLayereditorWidgetV2TypeeditorWidgetType +
QgsVectorLayerdeleteVertexV2deleteVertex +
QgsVectorLayerrendererV2renderer +
QgsVectorLayerEditUtilsdeleteVertexV2deleteVertex +
QgsComposerSymbolItemsymbolV2symbol
\subsection qgis_api_break_3_0_removed_classes Removed Classes @@ -56,6 +179,7 @@ should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinat
  • QgsMapRenderer. It has been replaced by QgsMapRendererJob with subclasses and QgsMapSettings.
  • QgsPseudoColorShader. This shader has been broken for some time and was replaced by QgsSingleBandPseudoColorRenderer.
  • QgsRendererV2DataDefinedMenus was removed. Use QgsDataDefinedButton instead.
    • +
  • QgsLegacyHelpers.
    • \subsection qgis_api_break_3_0_global General changes @@ -713,6 +837,13 @@ displayExpression instead. For the map tip use mapTipTemplate() instead.
  • commitErrors() now returns an object, rather than a reference. This has no effect on PyQGIS code.
  • 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.
  • label(), enableLabels(), hasLabelsEnabled(), drawLabels() have been removed. Replaced by labeling based on PAL library, see QgsLabelingEngineV2.
    • +
  • Signal layerDeleted() has been removed. Replaced by Qt signal destroyed().
    • +
  • 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()
    • +
  • select() replaced by selectByRect() +
  • setSelectedFeatures() replaced by selectByIds() +
  • applyNamedStyle() replaced by applyNamedStyle() +
  • isReadOnly() use readOnly() +
  • Signal changeAttributeValue() \subsection qgis_api_break_3_0_QgsVectorLayerEditBuffer QgsVectorLayerEditBuffer diff --git a/python/core/composer/qgscomposerarrow.sip b/python/core/composer/qgscomposerarrow.sip index b13bb00b340..5508bcfb24f 100644 --- a/python/core/composer/qgscomposerarrow.sip +++ b/python/core/composer/qgscomposerarrow.sip @@ -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 diff --git a/python/core/composer/qgscomposerlegenditem.sip b/python/core/composer/qgscomposerlegenditem.sip index 66308743b36..3617de9adc8 100644 --- a/python/core/composer/qgscomposerlegenditem.sip +++ b/python/core/composer/qgscomposerlegenditem.sip @@ -41,17 +41,17 @@ class QgsComposerLegendItem : QStandardItem }; -class QgsComposerSymbolV2Item: QgsComposerLegendItem +class QgsComposerSymbolItem: QgsComposerLegendItem { %TypeHeaderCode #include %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; }; diff --git a/python/core/composer/qgscomposermap.sip b/python/core/composer/qgscomposermap.sip index 4e263e6d4b0..c4bf22c211a 100644 --- a/python/core/composer/qgscomposermap.sip +++ b/python/core/composer/qgscomposermap.sip @@ -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 diff --git a/python/core/composer/qgscomposermapgrid.sip b/python/core/composer/qgscomposermapgrid.sip index aaa3d3dfaed..850f9141dba 100644 --- a/python/core/composer/qgscomposermapgrid.sip +++ b/python/core/composer/qgscomposermapgrid.sip @@ -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 diff --git a/python/core/composer/qgscomposermapoverview.sip b/python/core/composer/qgscomposermapoverview.sip index 6bae63f9341..0fa610f67a4 100644 --- a/python/core/composer/qgscomposermapoverview.sip +++ b/python/core/composer/qgscomposermapoverview.sip @@ -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 diff --git a/python/core/composer/qgscomposerpolygon.sip b/python/core/composer/qgscomposerpolygon.sip index efdb99bd7b5..58542acbb46 100644 --- a/python/core/composer/qgscomposerpolygon.sip +++ b/python/core/composer/qgscomposerpolygon.sip @@ -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; diff --git a/python/core/composer/qgscomposerpolyline.sip b/python/core/composer/qgscomposerpolyline.sip index e22fe7a35b1..5b6e2849bb5 100644 --- a/python/core/composer/qgscomposerpolyline.sip +++ b/python/core/composer/qgscomposerpolyline.sip @@ -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; diff --git a/python/core/composer/qgscomposershape.sip b/python/core/composer/qgscomposershape.sip index 53c9ec82896..8f8f0ce0358 100644 --- a/python/core/composer/qgscomposershape.sip +++ b/python/core/composer/qgscomposershape.sip @@ -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*/ diff --git a/python/core/composer/qgscomposition.sip b/python/core/composer/qgscomposition.sip index d57f2636987..a7cd553fbd5 100644 --- a/python/core/composer/qgscomposition.sip +++ b/python/core/composer/qgscomposition.sip @@ -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 diff --git a/python/core/core.sip b/python/core/core.sip index 3db86364829..b73ee8e3d98 100644 --- a/python/core/core.sip +++ b/python/core/core.sip @@ -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 diff --git a/python/core/dxf/qgsdxfexport.sip b/python/core/dxf/qgsdxfexport.sip index 692555bcc09..c7bd4e44a96 100644 --- a/python/core/dxf/qgsdxfexport.sip +++ b/python/core/dxf/qgsdxfexport.sip @@ -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) diff --git a/python/core/effects/qgsgloweffect.sip b/python/core/effects/qgsgloweffect.sip index c411fe9caba..53fef402740 100644 --- a/python/core/effects/qgsgloweffect.sip +++ b/python/core/effects/qgsgloweffect.sip @@ -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 diff --git a/python/core/effects/qgsimageoperation.sip b/python/core/effects/qgsimageoperation.sip index 76f9cd59dc1..5e24cf90af9 100644 --- a/python/core/effects/qgsimageoperation.sip +++ b/python/core/effects/qgsimageoperation.sip @@ -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 diff --git a/python/core/geometry/qgsabstractgeometryv2.sip b/python/core/geometry/qgsabstractgeometry.sip similarity index 86% rename from python/core/geometry/qgsabstractgeometryv2.sip rename to python/core/geometry/qgsabstractgeometry.sip index 3c73e32d78b..11dc2c55ee8 100644 --- a/python/core/geometry/qgsabstractgeometryv2.sip +++ b/python/core/geometry/qgsabstractgeometry.sip @@ -1,7 +1,7 @@ struct QgsVertexId { %TypeHeaderCode -#include +#include %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 -#include +#include +#include %End %ConvertToSubClassCode if (dynamic_cast(sipCpp) != NULL) sipType = sipType_QgsPointV2; - else if (dynamic_cast(sipCpp) != NULL ) - sipType = sipType_QgsLineStringV2; - else if (dynamic_cast(sipCpp) != NULL ) - sipType = sipType_QgsCircularStringV2; - else if (dynamic_cast(sipCpp) != NULL ) - sipType = sipType_QgsCompoundCurveV2; + else if (dynamic_cast(sipCpp) != NULL ) + sipType = sipType_QgsLineString; + else if (dynamic_cast(sipCpp) != NULL ) + sipType = sipType_QgsCircularString; + else if (dynamic_cast(sipCpp) != NULL ) + sipType = sipType_QgsCompoundCurve; else if (dynamic_cast(sipCpp) != NULL ) sipType = sipType_QgsPolygonV2; - else if (dynamic_cast(sipCpp) != NULL ) - sipType = sipType_QgsCurvePolygonV2; + else if (dynamic_cast(sipCpp) != NULL ) + sipType = sipType_QgsCurvePolygon; else if (dynamic_cast(sipCpp) != NULL ) sipType = sipType_QgsMultiPointV2; - else if (dynamic_cast(sipCpp) != NULL ) - sipType = sipType_QgsMultiLineStringV2; + else if (dynamic_cast(sipCpp) != NULL ) + sipType = sipType_QgsMultiLineString; else if (dynamic_cast(sipCpp) != NULL ) sipType = sipType_QgsMultiPolygonV2; - else if (dynamic_cast(sipCpp) != NULL ) - sipType = sipType_QgsMultiSurfaceV2; - else if (dynamic_cast(sipCpp) != NULL ) - sipType = sipType_QgsMultiCurveV2; - else if (dynamic_cast(sipCpp) != NULL ) - sipType = sipType_QgsGeometryCollectionV2; + else if (dynamic_cast(sipCpp) != NULL ) + sipType = sipType_QgsMultiSurface; + else if (dynamic_cast(sipCpp) != NULL ) + sipType = sipType_QgsMultiCurve; + else if (dynamic_cast(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. diff --git a/python/core/geometry/qgscircularstringv2.sip b/python/core/geometry/qgscircularstring.sip similarity index 77% rename from python/core/geometry/qgscircularstringv2.sip rename to python/core/geometry/qgscircularstring.sip index 40f7af2e46c..5dbc3baf86e 100644 --- a/python/core/geometry/qgscircularstringv2.sip +++ b/python/core/geometry/qgscircularstring.sip @@ -1,19 +1,19 @@ -class QgsCircularStringV2: public QgsCurveV2 +class QgsCircularString: public QgsCurve { %TypeHeaderCode -#include +#include %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& pts ) const; @@ -42,23 +42,23 @@ class QgsCircularStringV2: public QgsCurveV2 void setPoints( const QList& 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 ); diff --git a/python/core/geometry/qgscompoundcurvev2.sip b/python/core/geometry/qgscompoundcurve.sip similarity index 80% rename from python/core/geometry/qgscompoundcurvev2.sip rename to python/core/geometry/qgscompoundcurve.sip index 75b5be2d489..a70c9f033c6 100644 --- a/python/core/geometry/qgscompoundcurvev2.sip +++ b/python/core/geometry/qgscompoundcurve.sip @@ -1,21 +1,21 @@ -class QgsCompoundCurveV2: public QgsCurveV2 +class QgsCompoundCurve: public QgsCurve { %TypeHeaderCode -#include +#include %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 ); diff --git a/python/core/geometry/qgscurvev2.sip b/python/core/geometry/qgscurve.sip similarity index 81% rename from python/core/geometry/qgscurvev2.sip rename to python/core/geometry/qgscurve.sip index 890ec31e251..a315bb54d17 100644 --- a/python/core/geometry/qgscurvev2.sip +++ b/python/core/geometry/qgscurve.sip @@ -1,16 +1,16 @@ -class QgsCurveV2: public QgsAbstractGeometryV2 +class QgsCurve: public QgsAbstractGeometry { %TypeHeaderCode -#include +#include %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; diff --git a/python/core/geometry/qgscurvepolygonv2.sip b/python/core/geometry/qgscurvepolygon.sip similarity index 82% rename from python/core/geometry/qgscurvepolygonv2.sip rename to python/core/geometry/qgscurvepolygon.sip index d6c4ee67967..3d0cb03bd6e 100644 --- a/python/core/geometry/qgscurvepolygonv2.sip +++ b/python/core/geometry/qgscurvepolygon.sip @@ -1,18 +1,18 @@ -class QgsCurvePolygonV2: public QgsSurfaceV2 +class QgsCurvePolygon: public QgsSurface { %TypeHeaderCode -#include +#include %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& rings ); + void setInteriorRings( const QList& 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 diff --git a/python/core/geometry/qgsgeometry.sip b/python/core/geometry/qgsgeometry.sip index 37793ad16dc..83cb2479924 100644 --- a/python/core/geometry/qgsgeometry.sip +++ b/python/core/geometry/qgsgeometry.sip @@ -19,7 +19,7 @@ typedef QVector< QVector< QVector > > 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 diff --git a/python/core/geometry/qgsgeometrycollectionv2.sip b/python/core/geometry/qgsgeometrycollection.sip similarity index 80% rename from python/core/geometry/qgsgeometrycollectionv2.sip rename to python/core/geometry/qgsgeometrycollection.sip index 2423dcc6576..18d427d9b22 100644 --- a/python/core/geometry/qgsgeometrycollectionv2.sip +++ b/python/core/geometry/qgsgeometrycollection.sip @@ -1,16 +1,16 @@ -class QgsGeometryCollectionV2: public QgsAbstractGeometryV2 +class QgsGeometryCollection: public QgsAbstractGeometry { %TypeHeaderCode -#include +#include %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& subtypes, const QString& defaultChildWkbType = QString() ); + bool fromCollectionWkt( const QString &wkt, const QList& subtypes, const QString& defaultChildWkbType = QString() ); virtual QgsRectangle calculateBoundingBox() const; virtual void clearCache() const; diff --git a/python/core/geometry/qgsgeometryengine.sip b/python/core/geometry/qgsgeometryengine.sip index 7273c02f45c..ba41cc79764 100644 --- a/python/core/geometry/qgsgeometryengine.sip +++ b/python/core/geometry/qgsgeometryengine.sip @@ -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& newGeometries, + virtual int splitGeometry( const QgsLineString& splitLine, + QList& newGeometries, bool topological, QList &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; }; diff --git a/python/core/geometry/qgslinestringv2.sip b/python/core/geometry/qgslinestring.sip similarity index 90% rename from python/core/geometry/qgslinestringv2.sip rename to python/core/geometry/qgslinestring.sip index 05a683fcfcf..5c4bdace87b 100644 --- a/python/core/geometry/qgslinestringv2.sip +++ b/python/core/geometry/qgslinestring.sip @@ -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 +#include %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& 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; diff --git a/python/core/geometry/qgsmulticurvev2.sip b/python/core/geometry/qgsmulticurve.sip similarity index 70% rename from python/core/geometry/qgsmulticurvev2.sip rename to python/core/geometry/qgsmulticurve.sip index bce85211ae7..45f9db0aa13 100644 --- a/python/core/geometry/qgsmulticurvev2.sip +++ b/python/core/geometry/qgsmulticurve.sip @@ -1,12 +1,12 @@ -class QgsMultiCurveV2: public QgsGeometryCollectionV2 +class QgsMultiCurve: public QgsGeometryCollection { %TypeHeaderCode -#include +#include %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/; }; diff --git a/python/core/geometry/qgsmultilinestringv2.sip b/python/core/geometry/qgsmultilinestring.sip similarity index 74% rename from python/core/geometry/qgsmultilinestringv2.sip rename to python/core/geometry/qgsmultilinestring.sip index f42c39ec53c..34726442aa6 100644 --- a/python/core/geometry/qgsmultilinestringv2.sip +++ b/python/core/geometry/qgsmultilinestring.sip @@ -1,12 +1,12 @@ -class QgsMultiLineStringV2: public QgsMultiCurveV2 +class QgsMultiLineString: public QgsMultiCurve { %TypeHeaderCode -#include +#include %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: diff --git a/python/core/geometry/qgsmultipointv2.sip b/python/core/geometry/qgsmultipoint.sip similarity index 77% rename from python/core/geometry/qgsmultipointv2.sip rename to python/core/geometry/qgsmultipoint.sip index ff355e6e428..d021ce99fe7 100644 --- a/python/core/geometry/qgsmultipointv2.sip +++ b/python/core/geometry/qgsmultipoint.sip @@ -1,7 +1,7 @@ -class QgsMultiPointV2: public QgsGeometryCollectionV2 +class QgsMultiPointV2: public QgsGeometryCollection { %TypeHeaderCode -#include +#include %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: diff --git a/python/core/geometry/qgsmultipolygonv2.sip b/python/core/geometry/qgsmultipolygon.sip similarity index 74% rename from python/core/geometry/qgsmultipolygonv2.sip rename to python/core/geometry/qgsmultipolygon.sip index 4ce428097f1..b8e019954fa 100644 --- a/python/core/geometry/qgsmultipolygonv2.sip +++ b/python/core/geometry/qgsmultipolygon.sip @@ -1,7 +1,7 @@ -class QgsMultiPolygonV2: public QgsMultiSurfaceV2 +class QgsMultiPolygonV2: public QgsMultiSurface { %TypeHeaderCode -#include +#include %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: diff --git a/python/core/geometry/qgsmultisurfacev2.sip b/python/core/geometry/qgsmultisurface.sip similarity index 68% rename from python/core/geometry/qgsmultisurfacev2.sip rename to python/core/geometry/qgsmultisurface.sip index 7b3d9ff1450..23ed2eaeade 100644 --- a/python/core/geometry/qgsmultisurfacev2.sip +++ b/python/core/geometry/qgsmultisurface.sip @@ -1,11 +1,11 @@ -class QgsMultiSurfaceV2: public QgsGeometryCollectionV2 +class QgsMultiSurface: public QgsGeometryCollection { %TypeHeaderCode -#include +#include %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/; }; diff --git a/python/core/geometry/qgspointv2.sip b/python/core/geometry/qgspointv2.sip index 5ab0c75d8bf..e472f38db94 100644 --- a/python/core/geometry/qgspointv2.sip +++ b/python/core/geometry/qgspointv2.sip @@ -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 @@ -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 ); diff --git a/python/core/geometry/qgspolygonv2.sip b/python/core/geometry/qgspolygon.sip similarity index 75% rename from python/core/geometry/qgspolygonv2.sip rename to python/core/geometry/qgspolygon.sip index 900e089829f..c5f6b8261a2 100644 --- a/python/core/geometry/qgspolygonv2.sip +++ b/python/core/geometry/qgspolygon.sip @@ -1,7 +1,7 @@ -class QgsPolygonV2: public QgsCurvePolygonV2 +class QgsPolygonV2: public QgsCurvePolygon { %TypeHeaderCode -#include +#include %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/; }; diff --git a/python/core/geometry/qgssurfacev2.sip b/python/core/geometry/qgssurface.sip similarity index 72% rename from python/core/geometry/qgssurfacev2.sip rename to python/core/geometry/qgssurface.sip index 571d337e9db..3796d28c3ed 100644 --- a/python/core/geometry/qgssurfacev2.sip +++ b/python/core/geometry/qgssurface.sip @@ -1,7 +1,7 @@ -class QgsSurfaceV2: public QgsAbstractGeometryV2 +class QgsSurface: public QgsAbstractGeometry { %TypeHeaderCode -#include +#include %End public: diff --git a/python/core/layertree/qgslayertreemodellegendnode.sip b/python/core/layertree/qgslayertreemodellegendnode.sip index f453d7f1408..9332867f8bf 100644 --- a/python/core/layertree/qgslayertreemodellegendnode.sip +++ b/python/core/layertree/qgslayertreemodellegendnode.sip @@ -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 %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; diff --git a/python/core/qgsapplication.sip b/python/core/qgsapplication.sip index be66870d819..05bcc95a51f 100644 --- a/python/core/qgsapplication.sip +++ b/python/core/qgsapplication.sip @@ -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(); diff --git a/python/core/qgsdiagramrendererv2.sip b/python/core/qgsdiagramrenderer.sip similarity index 95% rename from python/core/qgsdiagramrendererv2.sip rename to python/core/qgsdiagramrenderer.sip index 20845601c4b..214b4f6f557 100644 --- a/python/core/qgsdiagramrendererv2.sip +++ b/python/core/qgsdiagramrenderer.sip @@ -9,7 +9,7 @@ class QgsDiagramLayerSettings { %TypeHeaderCode -#include +#include %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 +#include %End public: @@ -335,7 +335,7 @@ class QgsDiagramSettings class QgsDiagramInterpolationSettings { %TypeHeaderCode -#include +#include %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 +#include %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 +#include %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 +#include %End public: diff --git a/python/core/qgsmaphittest.sip b/python/core/qgsmaphittest.sip index 48be145b005..5ad4237527b 100644 --- a/python/core/qgsmaphittest.sip +++ b/python/core/qgsmaphittest.sip @@ -44,10 +44,10 @@ class QgsMapHitTest protected: //! @note not available in Python bindings - //typedef QSet SymbolV2Set; + //typedef QSet SymbolSet; //! @note not available in Python bindings - //typedef QMap HitTest; + //typedef QMap 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 ); }; diff --git a/python/core/qgsmaprendererjob.sip b/python/core/qgsmaprendererjob.sip index 9776f31dab5..2375905db11 100644 --- a/python/core/qgsmaprendererjob.sip +++ b/python/core/qgsmaprendererjob.sip @@ -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(); diff --git a/python/core/qgsmapsettings.sip b/python/core/qgsmapsettings.sip index 9844ec95815..3ad695653b3 100644 --- a/python/core/qgsmapsettings.sip +++ b/python/core/qgsmapsettings.sip @@ -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: diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip index a104ee38126..6343f457ebe 100644 --- a/python/core/qgspallabeling.sip +++ b/python/core/qgspallabeling.sip @@ -157,7 +157,7 @@ class QgsPalLayerSettings { %TypeHeaderCode #include -#include +#include %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 diff --git a/python/core/qgsrendercontext.sip b/python/core/qgsrendercontext.sip index 65b71385f5e..7f588dcf099 100644 --- a/python/core/qgsrendercontext.sip +++ b/python/core/qgsrendercontext.sip @@ -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; }; diff --git a/python/core/qgsvectorfilewriter.sip b/python/core/qgsvectorfilewriter.sip index aefdc486bf3..0ef0f164d30 100644 --- a/python/core/qgsvectorfilewriter.sip +++ b/python/core/qgsvectorfilewriter.sip @@ -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 attrIdxToOgrIdx(); diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip index ffb92092613..f06ac990421 100644 --- a/python/core/qgsvectorlayer.sip +++ b/python/core/qgsvectorlayer.sip @@ -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& 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. - * - *
      - *
    • CheckBox (QgsCheckboxWidgetWrapper)
      • - *
    • Classification (QgsClassificationWidgetWrapper)
      • - *
    • Color (QgsColorWidgetWrapper)
      • - *
    • DateTime (QgsDateTimeEditWrapper)
      • - *
    • Enumeration (QgsEnumerationWidgetWrapper)
      • - *
    • FileName (QgsFileNameWidgetWrapper)
      • - *
    • Hidden (QgsHiddenWidgetWrapper)
      • - *
    • Photo (QgsPhotoWidgetWrapper)
      • - *
    • Range (QgsRangeWidgetWrapper)
      • - *
    • RelationReference (QgsRelationReferenceWidgetWrapper)
      • - *
    • TextEdit (QgsTextEditWrapper)
      • - *
    • UniqueValues (QgsUniqueValuesWidgetWrapper)
      • - *
    • UuidGenerator (QgsUuidWidgetWrapper)
      • - *
    • ValueMap (QgsValueMapWidgetWrapper)
      • - *
    • ValueRelation (QgsValueRelationWidgetWrapper)
      • - *
    • WebView (QgsWebViewWidgetWrapper)
      • - *
    - * - * @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& 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 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 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 ); diff --git a/python/core/qgsvectorlayereditutils.sip b/python/core/qgsvectorlayereditutils.sip index d82c179a472..295bc35dcdc 100644 --- a/python/core/qgsvectorlayereditutils.sip +++ b/python/core/qgsvectorlayereditutils.sip @@ -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 diff --git a/python/core/symbology-ng/qgs25drenderer.sip b/python/core/symbology-ng/qgs25drenderer.sip index 0ae0e5c66ea..56c58f60091 100644 --- a/python/core/symbology-ng/qgs25drenderer.sip +++ b/python/core/symbology-ng/qgs25drenderer.sip @@ -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 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 diff --git a/python/core/symbology-ng/qgsarrowsymbollayer.sip b/python/core/symbology-ng/qgsarrowsymbollayer.sip index 54f7ea66808..55982f19e84 100644 --- a/python/core/symbology-ng/qgsarrowsymbollayer.sip +++ b/python/core/symbology-ng/qgsarrowsymbollayer.sip @@ -4,7 +4,7 @@ * \note Added in version 2.16 */ -class QgsArrowSymbolLayer : public QgsLineSymbolLayerV2 +class QgsArrowSymbolLayer : public QgsLineSymbolLayer { %TypeHeaderCode #include diff --git a/python/core/symbology-ng/qgscategorizedsymbolrendererv2.sip b/python/core/symbology-ng/qgscategorizedsymbolrenderer.sip similarity index 80% rename from python/core/symbology-ng/qgscategorizedsymbolrendererv2.sip rename to python/core/symbology-ng/qgscategorizedsymbolrenderer.sip index 0cfa8fe43eb..68557eb68f2 100644 --- a/python/core/symbology-ng/qgscategorizedsymbolrendererv2.sip +++ b/python/core/symbology-ng/qgscategorizedsymbolrenderer.sip @@ -1,17 +1,17 @@ -class QgsRendererCategoryV2 +class QgsRendererCategory { %TypeHeaderCode -#include +#include %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 QgsCategoryList; +typedef QList QgsCategoryList; -class QgsCategorizedSymbolRendererV2 : QgsFeatureRendererV2 +class QgsCategorizedSymbolRenderer : QgsFeatureRenderer { %TypeHeaderCode -#include +#include %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 & ); }; diff --git a/python/core/symbology-ng/qgscptcityarchive.sip b/python/core/symbology-ng/qgscptcityarchive.sip index 5d5792ebbff..9453acc425a 100644 --- a/python/core/symbology-ng/qgscptcityarchive.sip +++ b/python/core/symbology-ng/qgscptcityarchive.sip @@ -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(); diff --git a/python/core/symbology-ng/qgsellipsesymbollayerv2.sip b/python/core/symbology-ng/qgsellipsesymbollayer.sip similarity index 93% rename from python/core/symbology-ng/qgsellipsesymbollayerv2.sip rename to python/core/symbology-ng/qgsellipsesymbollayer.sip index 28e9deae2f9..70e92dc2c24 100644 --- a/python/core/symbology-ng/qgsellipsesymbollayerv2.sip +++ b/python/core/symbology-ng/qgsellipsesymbollayer.sip @@ -1,12 +1,12 @@ -class QgsEllipseSymbolLayerV2 : QgsMarkerSymbolLayerV2 +class QgsEllipseSymbolLayer : QgsMarkerSymbolLayer { %TypeHeaderCode -#include +#include %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; diff --git a/python/core/symbology-ng/qgsfillsymbollayerv2.sip b/python/core/symbology-ng/qgsfillsymbollayer.sip similarity index 95% rename from python/core/symbology-ng/qgsfillsymbollayerv2.sip rename to python/core/symbology-ng/qgsfillsymbollayer.sip index 349d317a5eb..25f7343978b 100644 --- a/python/core/symbology-ng/qgsfillsymbollayerv2.sip +++ b/python/core/symbology-ng/qgsfillsymbollayer.sip @@ -1,11 +1,11 @@ -class QgsSimpleFillSymbolLayerV2 : QgsFillSymbolLayerV2 +class QgsSimpleFillSymbolLayer : QgsFillSymbolLayer { %TypeHeaderCode -#include +#include %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 +#include %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 +#include %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 +#include %End public: @@ -497,7 +497,7 @@ class QgsImageFillSymbolLayer: QgsFillSymbolLayerV2 class QgsRasterFillSymbolLayer: QgsImageFillSymbolLayer { %TypeHeaderCode -#include +#include %End public: @@ -663,7 +663,7 @@ class QgsRasterFillSymbolLayer: QgsImageFillSymbolLayer class QgsSVGFillSymbolLayer: QgsImageFillSymbolLayer { %TypeHeaderCode -#include +#include %End public: @@ -741,7 +741,7 @@ class QgsSVGFillSymbolLayer: QgsImageFillSymbolLayer class QgsLinePatternFillSymbolLayer: QgsImageFillSymbolLayer { %TypeHeaderCode -#include +#include %End public: QgsLinePatternFillSymbolLayer(); @@ -849,7 +849,7 @@ class QgsLinePatternFillSymbolLayer: QgsImageFillSymbolLayer class QgsPointPatternFillSymbolLayer : QgsImageFillSymbolLayer { %TypeHeaderCode -#include +#include %End public: QgsPointPatternFillSymbolLayer(); @@ -947,15 +947,15 @@ class QgsPointPatternFillSymbolLayer : QgsImageFillSymbolLayer void applyDataDefinedSettings( QgsSymbolRenderContext& context ); }; -class QgsCentroidFillSymbolLayerV2 : QgsFillSymbolLayerV2 +class QgsCentroidFillSymbolLayer : QgsFillSymbolLayer { %TypeHeaderCode -#include +#include %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; diff --git a/python/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.sip b/python/core/symbology-ng/qgsgeometrygeneratorsymbollayer.sip similarity index 92% rename from python/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.sip rename to python/core/symbology-ng/qgsgeometrygeneratorsymbollayer.sip index a9325934b61..789bc418177 100644 --- a/python/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.sip +++ b/python/core/symbology-ng/qgsgeometrygeneratorsymbollayer.sip @@ -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 ); }; diff --git a/python/core/symbology-ng/qgsgraduatedsymbolrendererv2.sip b/python/core/symbology-ng/qgsgraduatedsymbolrenderer.sip similarity index 81% rename from python/core/symbology-ng/qgsgraduatedsymbolrendererv2.sip rename to python/core/symbology-ng/qgsgraduatedsymbolrenderer.sip index 86bfd39eb94..9d75b0bb65e 100644 --- a/python/core/symbology-ng/qgsgraduatedsymbolrendererv2.sip +++ b/python/core/symbology-ng/qgsgraduatedsymbolrenderer.sip @@ -1,15 +1,15 @@ -class QgsRendererRangeV2 +class QgsRendererRange { %TypeHeaderCode -#include +#include %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 QgsRangeList; +typedef QList QgsRangeList; // @note added in 2.6 -class QgsRendererRangeV2LabelFormat +class QgsRendererRangeLabelFormat { %TypeHeaderCode -#include +#include %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 +#include %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 & ); }; diff --git a/python/core/symbology-ng/qgsheatmaprenderer.sip b/python/core/symbology-ng/qgsheatmaprenderer.sip index b912293ceab..bf2f7aaf3f8 100644 --- a/python/core/symbology-ng/qgsheatmaprenderer.sip +++ b/python/core/symbology-ng/qgsheatmaprenderer.sip @@ -1,4 +1,4 @@ -class QgsHeatmapRenderer : QgsFeatureRendererV2 +class QgsHeatmapRenderer : QgsFeatureRenderer { %TypeHeaderCode #include @@ -19,9 +19,9 @@ class QgsHeatmapRenderer : QgsFeatureRendererV2 virtual QgsSymbolList symbols( QgsRenderContext& context ) /PyName=symbols2/; virtual QString dump() const; virtual QList 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 diff --git a/python/core/symbology-ng/qgsinvertedpolygonrenderer.sip b/python/core/symbology-ng/qgsinvertedpolygonrenderer.sip index d6bfb99ee6f..4cb1b0dde15 100644 --- a/python/core/symbology-ng/qgsinvertedpolygonrenderer.sip +++ b/python/core/symbology-ng/qgsinvertedpolygonrenderer.sip @@ -1,4 +1,4 @@ -class QgsInvertedPolygonRenderer : QgsFeatureRendererV2 +class QgsInvertedPolygonRenderer : QgsFeatureRenderer { %TypeHeaderCode #include @@ -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 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/; }; diff --git a/python/core/symbology-ng/qgslegendsymbolitemv2.sip b/python/core/symbology-ng/qgslegendsymbolitem.sip similarity index 76% rename from python/core/symbology-ng/qgslegendsymbolitemv2.sip rename to python/core/symbology-ng/qgslegendsymbolitem.sip index 601e898961a..8a93a3985dd 100644 --- a/python/core/symbology-ng/qgslegendsymbolitemv2.sip +++ b/python/core/symbology-ng/qgslegendsymbolitem.sip @@ -6,20 +6,20 @@ * @see QgsSymbolLegendNode * @note added in 2.6 */ -class QgsLegendSymbolItemV2 +class QgsLegendSymbolItem { %TypeHeaderCode -#include +#include %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; diff --git a/python/core/symbology-ng/qgslinesymbollayerv2.sip b/python/core/symbology-ng/qgslinesymbollayer.sip similarity index 94% rename from python/core/symbology-ng/qgslinesymbollayerv2.sip rename to python/core/symbology-ng/qgslinesymbollayer.sip index cb608445d7c..18013a1f159 100644 --- a/python/core/symbology-ng/qgslinesymbollayerv2.sip +++ b/python/core/symbology-ng/qgslinesymbollayer.sip @@ -1,11 +1,11 @@ -class QgsSimpleLineSymbolLayerV2 : QgsLineSymbolLayerV2 +class QgsSimpleLineSymbolLayer : QgsLineSymbolLayer { %TypeHeaderCode -#include +#include %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 +#include %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; diff --git a/python/core/symbology-ng/qgsmarkersymbollayerv2.sip b/python/core/symbology-ng/qgsmarkersymbollayer.sip similarity index 93% rename from python/core/symbology-ng/qgsmarkersymbollayerv2.sip rename to python/core/symbology-ng/qgsmarkersymbollayer.sip index 05f5dcb1e3e..ff7ec73b5e6 100644 --- a/python/core/symbology-ng/qgsmarkersymbollayerv2.sip +++ b/python/core/symbology-ng/qgsmarkersymbollayer.sip @@ -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 +#include %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 +#include %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 +#include %End public: @@ -403,14 +403,14 @@ class QgsFilledMarkerSymbolLayer : QgsSimpleMarkerSymbolLayerBase }; -class QgsSvgMarkerSymbolLayerV2 : QgsMarkerSymbolLayerV2 +class QgsSvgMarkerSymbolLayer : QgsMarkerSymbolLayer { %TypeHeaderCode -#include +#include %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 +#include %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; diff --git a/python/core/symbology-ng/qgsnullsymbolrenderer.sip b/python/core/symbology-ng/qgsnullsymbolrenderer.sip index ab9b728aa1c..3d4127334fa 100644 --- a/python/core/symbology-ng/qgsnullsymbolrenderer.sip +++ b/python/core/symbology-ng/qgsnullsymbolrenderer.sip @@ -5,7 +5,7 @@ * \note Added in version 2.16 */ -class QgsNullSymbolRenderer : QgsFeatureRendererV2 +class QgsNullSymbolRenderer : QgsFeatureRenderer { %TypeHeaderCode #include @@ -26,14 +26,14 @@ class QgsNullSymbolRenderer : QgsFeatureRendererV2 virtual QList 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/; }; diff --git a/python/core/symbology-ng/qgspointdisplacementrenderer.sip b/python/core/symbology-ng/qgspointdisplacementrenderer.sip index 2be1d6ea37f..41cbae41379 100644 --- a/python/core/symbology-ng/qgspointdisplacementrenderer.sip +++ b/python/core/symbology-ng/qgspointdisplacementrenderer.sip @@ -1,4 +1,4 @@ -class QgsPointDisplacementRenderer : QgsFeatureRendererV2 +class QgsPointDisplacementRenderer : QgsFeatureRenderer { %TypeHeaderCode #include @@ -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 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 & ); diff --git a/python/core/symbology-ng/qgsrendererv2.sip b/python/core/symbology-ng/qgsrenderer.sip similarity index 93% rename from python/core/symbology-ng/qgsrendererv2.sip rename to python/core/symbology-ng/qgsrenderer.sip index 0ce0bc36db6..89b042b594e 100644 --- a/python/core/symbology-ng/qgsrendererv2.sip +++ b/python/core/symbology-ng/qgsrenderer.sip @@ -9,7 +9,7 @@ typedef QList< QPair > QgsLegendSymbolList; class QgsSymbolLevelItem { %TypeHeaderCode -#include +#include %End public: QgsSymbolLevelItem( QgsSymbol* symbol, int layer ); @@ -27,21 +27,21 @@ class QgsSymbolLevelItem ////////////// // renderers -class QgsFeatureRendererV2 +class QgsFeatureRenderer { %TypeHeaderCode -#include +#include %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 Capabilities; + typedef QFlags 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 & ); }; diff --git a/python/core/symbology-ng/qgsrendererv2registry.sip b/python/core/symbology-ng/qgsrendererregistry.sip similarity index 53% rename from python/core/symbology-ng/qgsrendererv2registry.sip rename to python/core/symbology-ng/qgsrendererregistry.sip index 16c2bd9fa78..0b27814905f 100644 --- a/python/core/symbology-ng/qgsrendererv2registry.sip +++ b/python/core/symbology-ng/qgsrendererregistry.sip @@ -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 +#include %End public: @@ -24,10 +24,10 @@ class QgsRendererV2AbstractMetadata PolygonLayer, //!< Compatible with polygon layers All, //!< Compatible with all vector layers }; - typedef QFlags LayerTypes; + typedef QFlags 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 operator|(QgsRendererV2AbstractMetadata::LayerType f1, QFlags f2); +QFlags operator|(QgsRendererAbstractMetadata::LayerType f1, QFlags f2); /** Convenience metadata class that uses static functions to create renderer and its widget. */ -class QgsRendererV2Metadata : QgsRendererV2AbstractMetadata +class QgsRendererMetadata : QgsRendererAbstractMetadata { %TypeHeaderCode -#include +#include %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 +#include %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 ); }; diff --git a/python/core/symbology-ng/qgsrulebasedrendererv2.sip b/python/core/symbology-ng/qgsrulebasedrenderer.sip similarity index 83% rename from python/core/symbology-ng/qgsrulebasedrendererv2.sip rename to python/core/symbology-ng/qgsrulebasedrenderer.sip index 7c298508240..2d7e358aaff 100644 --- a/python/core/symbology-ng/qgsrulebasedrendererv2.sip +++ b/python/core/symbology-ng/qgsrulebasedrenderer.sip @@ -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 +#include %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 jobs; + QList jobs; - RenderLevel( const QgsRuleBasedRendererV2::RenderLevel& other ); + RenderLevel( const QgsRuleBasedRenderer::RenderLevel& other ); }; // rendering queue: a list of rendering levels - typedef QList RenderQueue; + typedef QList 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 rulesForFeature( QgsFeature& feat, QgsRenderContext* context = 0 ); + QList 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& children(); + QList& children(); /** * Returns all children, grand-children, grand-grand-children, grand-gra... you get it * * @return A list of descendant rules */ - QList descendants() const; + QList 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 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 scales ); + static void refineRuleScales( QgsRuleBasedRenderer::Rule* initialRule, QList 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 & ); }; diff --git a/python/core/symbology-ng/qgssinglesymbolrendererv2.sip b/python/core/symbology-ng/qgssinglesymbolrenderer.sip similarity index 73% rename from python/core/symbology-ng/qgssinglesymbolrendererv2.sip rename to python/core/symbology-ng/qgssinglesymbolrenderer.sip index 29c93c6f66f..1406f2b55bb 100644 --- a/python/core/symbology-ng/qgssinglesymbolrendererv2.sip +++ b/python/core/symbology-ng/qgssinglesymbolrenderer.sip @@ -1,13 +1,13 @@ -class QgsSingleSymbolRendererV2 : QgsFeatureRendererV2 +class QgsSingleSymbolRenderer : QgsFeatureRenderer { %TypeHeaderCode -#include +#include %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 & ); }; diff --git a/python/core/symbology-ng/qgsstylev2.sip b/python/core/symbology-ng/qgsstyle.sip similarity index 95% rename from python/core/symbology-ng/qgsstylev2.sip rename to python/core/symbology-ng/qgsstyle.sip index ba6daa3f125..b2b1f674cc0 100644 --- a/python/core/symbology-ng/qgsstylev2.sip +++ b/python/core/symbology-ng/qgsstyle.sip @@ -1,12 +1,12 @@ -class QgsStyleV2 : QObject +class QgsStyle : QObject { %TypeHeaderCode -#include +#include %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 ); diff --git a/python/core/symbology-ng/qgssymbol.sip b/python/core/symbology-ng/qgssymbol.sip index 864d34666f4..0b55f0b063e 100644 --- a/python/core/symbology-ng/qgssymbol.sip +++ b/python/core/symbology-ng/qgssymbol.sip @@ -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 @@ -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 @@ -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 @@ -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* rings, const QgsFeature* f, QgsRenderContext& context, int layer = -1, bool selected = false ); - virtual QgsFillSymbolV2* clone() const /Factory/; + virtual QgsFillSymbol* clone() const /Factory/; }; diff --git a/python/core/symbology-ng/qgssymbollayer.sip b/python/core/symbology-ng/qgssymbollayer.sip index 62cbc5125c4..1e89d62e2fc 100644 --- a/python/core/symbology-ng/qgssymbollayer.sip +++ b/python/core/symbology-ng/qgssymbollayer.sip @@ -2,43 +2,43 @@ class QgsSymbolLayer { %TypeHeaderCode #include -#include +#include %End %ConvertToSubClassCode switch (sipCpp->type()) { case QgsSymbol::Marker: - if (dynamic_cast(sipCpp) != NULL) - sipType = sipType_QgsEllipseSymbolLayerV2; - else if (dynamic_cast(sipCpp) != NULL) - sipType = sipType_QgsFontMarkerSymbolLayerV2; - else if (dynamic_cast(sipCpp) != NULL) - sipType = sipType_QgsSimpleMarkerSymbolLayerV2; + if (dynamic_cast(sipCpp) != NULL) + sipType = sipType_QgsEllipseSymbolLayer; + else if (dynamic_cast(sipCpp) != NULL) + sipType = sipType_QgsFontMarkerSymbolLayer; + else if (dynamic_cast(sipCpp) != NULL) + sipType = sipType_QgsSimpleMarkerSymbolLayer; else if (dynamic_cast(sipCpp) != NULL) sipType = sipType_QgsFilledMarkerSymbolLayer; - else if (dynamic_cast(sipCpp) != NULL) - sipType = sipType_QgsSvgMarkerSymbolLayerV2; + else if (dynamic_cast(sipCpp) != NULL) + sipType = sipType_QgsSvgMarkerSymbolLayer; else if (dynamic_cast(sipCpp) != NULL) sipType = sipType_QgsVectorFieldSymbolLayer; else - sipType = sipType_QgsMarkerSymbolLayerV2; + sipType = sipType_QgsMarkerSymbolLayer; break; case QgsSymbol::Line: - if (dynamic_cast(sipCpp) != NULL) - sipType = sipType_QgsMarkerLineSymbolLayerV2; - else if (dynamic_cast(sipCpp) != NULL) - sipType = sipType_QgsSimpleLineSymbolLayerV2; + if (dynamic_cast(sipCpp) != NULL) + sipType = sipType_QgsMarkerLineSymbolLayer; + else if (dynamic_cast(sipCpp) != NULL) + sipType = sipType_QgsSimpleLineSymbolLayer; else if (dynamic_cast(sipCpp) != NULL) sipType = sipType_QgsArrowSymbolLayer; else - sipType = sipType_QgsLineSymbolLayerV2; + sipType = sipType_QgsLineSymbolLayer; break; case QgsSymbol::Fill: - if (dynamic_cast(sipCpp) != NULL) - sipType = sipType_QgsSimpleFillSymbolLayerV2; + if (dynamic_cast(sipCpp) != NULL) + sipType = sipType_QgsSimpleFillSymbolLayer; else if (dynamic_cast(sipCpp) != NULL) { if (dynamic_cast(sipCpp) != NULL) @@ -52,18 +52,18 @@ class QgsSymbolLayer else sipType = sipType_QgsImageFillSymbolLayer; } - else if (dynamic_cast(sipCpp) != NULL) - sipType = sipType_QgsCentroidFillSymbolLayerV2; - else if (dynamic_cast(sipCpp) != NULL) - sipType = sipType_QgsGradientFillSymbolLayerV2; - else if (dynamic_cast(sipCpp) != NULL) - sipType = sipType_QgsShapeburstFillSymbolLayerV2; + else if (dynamic_cast(sipCpp) != NULL) + sipType = sipType_QgsCentroidFillSymbolLayer; + else if (dynamic_cast(sipCpp) != NULL) + sipType = sipType_QgsGradientFillSymbolLayer; + else if (dynamic_cast(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 @@ -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 @@ -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 @@ -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* rings, QgsSymbolRenderContext& context ); }; diff --git a/python/core/symbology-ng/qgssymbollayerutils.sip b/python/core/symbology-ng/qgssymbollayerutils.sip index 4d572044211..28b82174a00 100644 --- a/python/core/symbology-ng/qgssymbollayerutils.sip +++ b/python/core/symbology-ng/qgssymbollayerutils.sip @@ -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 diff --git a/python/core/symbology-ng/qgssymbologyconversion.sip b/python/core/symbology-ng/qgssymbologyconversion.sip index ea67f1d697d..4171ab8c0ee 100644 --- a/python/core/symbology-ng/qgssymbologyconversion.sip +++ b/python/core/symbology-ng/qgssymbologyconversion.sip @@ -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 ); diff --git a/python/core/symbology-ng/qgsvectorcolorrampv2.sip b/python/core/symbology-ng/qgsvectorcolorramp.sip similarity index 79% rename from python/core/symbology-ng/qgsvectorcolorrampv2.sip rename to python/core/symbology-ng/qgsvectorcolorramp.sip index 75daeb8b617..d39fe0ad067 100644 --- a/python/core/symbology-ng/qgsvectorcolorrampv2.sip +++ b/python/core/symbology-ng/qgsvectorcolorramp.sip @@ -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 +#include %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 +#include %End public: @@ -86,38 +86,38 @@ class QgsGradientStop typedef QList 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 +#include %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 +#include %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 +#include %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 +#include %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; diff --git a/python/core/symbology-ng/qgsvectorfieldsymbollayer.sip b/python/core/symbology-ng/qgsvectorfieldsymbollayer.sip index 22cbd243314..b26adc31d1b 100644 --- a/python/core/symbology-ng/qgsvectorfieldsymbollayer.sip +++ b/python/core/symbology-ng/qgsvectorfieldsymbollayer.sip @@ -1,4 +1,4 @@ -class QgsVectorFieldSymbolLayer : QgsMarkerSymbolLayerV2 +class QgsVectorFieldSymbolLayer : QgsMarkerSymbolLayer { %TypeHeaderCode #include diff --git a/python/gui/gui.sip b/python/gui/gui.sip index c443a874a11..312b4793e76 100644 --- a/python/gui/gui.sip +++ b/python/gui/gui.sip @@ -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 diff --git a/python/gui/qgsannotationitem.sip b/python/gui/qgsannotationitem.sip index 04eff91196e..580851a8490 100644 --- a/python/gui/qgsannotationitem.sip +++ b/python/gui/qgsannotationitem.sip @@ -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; diff --git a/python/gui/qgsgeometryrubberband.sip b/python/gui/qgsgeometryrubberband.sip index 06b22edab83..fd83c6a01e4 100644 --- a/python/gui/qgsgeometryrubberband.sip +++ b/python/gui/qgsgeometryrubberband.sip @@ -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*/ diff --git a/python/gui/qgsgradientstopeditor.sip b/python/gui/qgsgradientstopeditor.sip index 0eedf6de3aa..d7a958723f0 100644 --- a/python/gui/qgsgradientstopeditor.sip +++ b/python/gui/qgsgradientstopeditor.sip @@ -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 diff --git a/python/gui/qgsmapcanvas.sip b/python/gui/qgsmapcanvas.sip index c494f44a848..6f8f10c7ca8 100644 --- a/python/gui/qgsmapcanvas.sip +++ b/python/gui/qgsmapcanvas.sip @@ -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: diff --git a/python/gui/qgsmaptoolcapture.sip b/python/gui/qgsmaptoolcapture.sip index 97dd5db411c..d0c8a366a85 100644 --- a/python/gui/qgsmaptoolcapture.sip +++ b/python/gui/qgsmaptoolcapture.sip @@ -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; /** diff --git a/python/gui/symbology-ng/qgs25drendererwidget.sip b/python/gui/symbology-ng/qgs25drendererwidget.sip index 0a6a9bb65e8..2b1b99c6c6c 100644 --- a/python/gui/symbology-ng/qgs25drendererwidget.sip +++ b/python/gui/symbology-ng/qgs25drendererwidget.sip @@ -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(); diff --git a/python/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.sip b/python/gui/symbology-ng/qgscategorizedsymbolrendererwidget.sip similarity index 79% rename from python/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.sip rename to python/gui/symbology-ng/qgscategorizedsymbolrendererwidget.sip index 873e60941e6..c65a7279ae7 100644 --- a/python/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.sip +++ b/python/gui/symbology-ng/qgscategorizedsymbolrendererwidget.sip @@ -1,16 +1,16 @@ -class QgsCategorizedSymbolRendererV2Widget : QgsRendererV2Widget +class QgsCategorizedSymbolRendererWidget : QgsRendererWidget { %TypeHeaderCode -#include +#include %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 selectedSymbols(); QgsCategoryList selectedCategoryList(); diff --git a/python/gui/symbology-ng/qgscolorrampcombobox.sip b/python/gui/symbology-ng/qgscolorrampcombobox.sip index ec53676fb68..9841415b5fb 100644 --- a/python/gui/symbology-ng/qgscolorrampcombobox.sip +++ b/python/gui/symbology-ng/qgscolorrampcombobox.sip @@ -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 diff --git a/python/gui/symbology-ng/qgscptcitycolorrampv2dialog.sip b/python/gui/symbology-ng/qgscptcitycolorrampdialog.sip similarity index 82% rename from python/gui/symbology-ng/qgscptcitycolorrampv2dialog.sip rename to python/gui/symbology-ng/qgscptcitycolorrampdialog.sip index 1cbc2f4b512..596b5cba005 100644 --- a/python/gui/symbology-ng/qgscptcitycolorrampv2dialog.sip +++ b/python/gui/symbology-ng/qgscptcitycolorrampdialog.sip @@ -1,12 +1,12 @@ -class QgsCptCityColorRampV2Dialog : QDialog +class QgsCptCityColorRampDialog : QDialog { %TypeHeaderCode -#include +#include %End public: - QgsCptCityColorRampV2Dialog( QgsCptCityColorRampV2* ramp, QWidget* parent /TransferThis/ = NULL ); - ~QgsCptCityColorRampV2Dialog(); + QgsCptCityColorRampDialog( QgsCptCityColorRamp* ramp, QWidget* parent /TransferThis/ = NULL ); + ~QgsCptCityColorRampDialog(); QString selectedName() const; diff --git a/python/gui/symbology-ng/qgsellipsesymbollayerv2widget.sip b/python/gui/symbology-ng/qgsellipsesymbollayerwidget.sip similarity index 54% rename from python/gui/symbology-ng/qgsellipsesymbollayerv2widget.sip rename to python/gui/symbology-ng/qgsellipsesymbollayerwidget.sip index b9ec449d966..5d18b45ac06 100644 --- a/python/gui/symbology-ng/qgsellipsesymbollayerv2widget.sip +++ b/python/gui/symbology-ng/qgsellipsesymbollayerwidget.sip @@ -1,10 +1,10 @@ -class QgsEllipseSymbolLayerV2Widget: QgsSymbolLayerWidget +class QgsEllipseSymbolLayerWidget: QgsSymbolLayerWidget { %TypeHeaderCode -#include +#include %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/; diff --git a/python/gui/symbology-ng/qgsgraduatedhistogramwidget.sip b/python/gui/symbology-ng/qgsgraduatedhistogramwidget.sip index bf49745325c..3d64420fd93 100644 --- a/python/gui/symbology-ng/qgsgraduatedhistogramwidget.sip +++ b/python/gui/symbology-ng/qgsgraduatedhistogramwidget.sip @@ -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: diff --git a/python/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.sip b/python/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.sip similarity index 80% rename from python/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.sip rename to python/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.sip index 1b19ee8397b..043485cee1f 100644 --- a/python/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.sip +++ b/python/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.sip @@ -1,15 +1,15 @@ -class QgsGraduatedSymbolRendererV2Widget : QgsRendererV2Widget +class QgsGraduatedSymbolRendererWidget : QgsRendererWidget { %TypeHeaderCode -#include +#include %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(); diff --git a/python/gui/symbology-ng/qgsheatmaprendererwidget.sip b/python/gui/symbology-ng/qgsheatmaprendererwidget.sip index 080d15b73ea..1af48979a43 100644 --- a/python/gui/symbology-ng/qgsheatmaprendererwidget.sip +++ b/python/gui/symbology-ng/qgsheatmaprendererwidget.sip @@ -1,4 +1,4 @@ -class QgsHeatmapRendererWidget : QgsRendererV2Widget +class QgsHeatmapRendererWidget : QgsRendererWidget { %TypeHeaderCode #include @@ -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 ); }; diff --git a/python/gui/symbology-ng/qgsinvertedpolygonrendererwidget.sip b/python/gui/symbology-ng/qgsinvertedpolygonrendererwidget.sip index 760a8c57ecd..0069aaf06e4 100644 --- a/python/gui/symbology-ng/qgsinvertedpolygonrendererwidget.sip +++ b/python/gui/symbology-ng/qgsinvertedpolygonrendererwidget.sip @@ -1,4 +1,4 @@ -class QgsInvertedPolygonRendererWidget : QgsRendererV2Widget +class QgsInvertedPolygonRendererWidget : QgsRendererWidget { %TypeHeaderCode #include @@ -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 ); }; diff --git a/python/gui/symbology-ng/qgsnullsymbolrendererwidget.sip b/python/gui/symbology-ng/qgsnullsymbolrendererwidget.sip index 3a2668f951e..699216669f5 100644 --- a/python/gui/symbology-ng/qgsnullsymbolrendererwidget.sip +++ b/python/gui/symbology-ng/qgsnullsymbolrendererwidget.sip @@ -4,7 +4,7 @@ * \note Added in version 2.16 */ -class QgsNullSymbolRendererWidget : QgsRendererV2Widget +class QgsNullSymbolRendererWidget : QgsRendererWidget { %TypeHeaderCode #include @@ -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(); }; diff --git a/python/gui/symbology-ng/qgspointdisplacementrendererwidget.sip b/python/gui/symbology-ng/qgspointdisplacementrendererwidget.sip index 19444aa7abc..6a4106ceb96 100644 --- a/python/gui/symbology-ng/qgspointdisplacementrendererwidget.sip +++ b/python/gui/symbology-ng/qgspointdisplacementrendererwidget.sip @@ -1,13 +1,13 @@ -class QgsPointDisplacementRendererWidget: QgsRendererV2Widget +class QgsPointDisplacementRendererWidget: QgsRendererWidget { %TypeHeaderCode #include %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 ); }; diff --git a/python/gui/symbology-ng/qgsrendererv2propertiesdialog.sip b/python/gui/symbology-ng/qgsrendererpropertiesdialog.sip similarity index 89% rename from python/gui/symbology-ng/qgsrendererv2propertiesdialog.sip rename to python/gui/symbology-ng/qgsrendererpropertiesdialog.sip index 86ab7bf35fa..4f7520c3fc1 100644 --- a/python/gui/symbology-ng/qgsrendererv2propertiesdialog.sip +++ b/python/gui/symbology-ng/qgsrendererpropertiesdialog.sip @@ -1,21 +1,21 @@ -class QgsRendererV2PropertiesDialog : QDialog +class QgsRendererPropertiesDialog : QDialog { %TypeHeaderCode -#include +#include %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. diff --git a/python/gui/symbology-ng/qgsrendererv2widget.sip b/python/gui/symbology-ng/qgsrendererwidget.sip similarity index 92% rename from python/gui/symbology-ng/qgsrendererv2widget.sip rename to python/gui/symbology-ng/qgsrendererwidget.sip index 61be50b69c7..25b0cb6cc7d 100644 --- a/python/gui/symbology-ng/qgsrendererv2widget.sip +++ b/python/gui/symbology-ng/qgsrendererwidget.sip @@ -1,19 +1,19 @@ -class QgsRendererV2Widget : QgsPanelWidget +class QgsRendererWidget : QgsPanelWidget { %TypeHeaderCode -#include +#include %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 +#include %End public: @@ -133,7 +133,7 @@ class QgsDataDefinedValueDialog : QDialog class QgsDataDefinedSizeDialog : QgsDataDefinedValueDialog { %TypeHeaderCode -#include +#include %End public: @@ -150,7 +150,7 @@ class QgsDataDefinedSizeDialog : QgsDataDefinedValueDialog class QgsDataDefinedRotationDialog : QgsDataDefinedValueDialog { %TypeHeaderCode -#include +#include %End public: @@ -168,7 +168,7 @@ class QgsDataDefinedRotationDialog : QgsDataDefinedValueDialog class QgsDataDefinedWidthDialog : QgsDataDefinedValueDialog { %TypeHeaderCode -#include +#include %End public: diff --git a/python/gui/symbology-ng/qgsrulebasedrendererv2widget.sip b/python/gui/symbology-ng/qgsrulebasedrendererwidget.sip similarity index 69% rename from python/gui/symbology-ng/qgsrulebasedrendererv2widget.sip rename to python/gui/symbology-ng/qgsrulebasedrendererwidget.sip index 75b59c54df9..286ee8713bc 100644 --- a/python/gui/symbology-ng/qgsrulebasedrendererv2widget.sip +++ b/python/gui/symbology-ng/qgsrulebasedrendererwidget.sip @@ -1,11 +1,11 @@ -class QgsRuleBasedRendererV2Model : QAbstractItemModel +class QgsRuleBasedRendererModel : QAbstractItemModel { %TypeHeaderCode -#include +#include %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 theCountMap ); + // void setFeatureCounts( QMap theCountMap ); void clearFeatureCounts(); }; -class QgsRuleBasedRendererV2Widget : QgsRendererV2Widget +class QgsRuleBasedRendererWidget : QgsRendererWidget { %TypeHeaderCode -#include +#include %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 selectedSymbols(); - QList selectedRules(); + QList selectedRules(); void refreshSymbolView(); void keyPressEvent( QKeyEvent* event ); }; @@ -103,14 +103,14 @@ class QgsRuleBasedRendererV2Widget : QgsRendererV2Widget class QgsRendererRulePropsWidget: QgsPanelWidget { %TypeHeaderCode -#include +#include %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 +#include %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(); diff --git a/python/gui/symbology-ng/qgssinglesymbolrendererv2widget.sip b/python/gui/symbology-ng/qgssinglesymbolrendererv2widget.sip deleted file mode 100644 index 3348032c5d5..00000000000 --- a/python/gui/symbology-ng/qgssinglesymbolrendererv2widget.sip +++ /dev/null @@ -1,25 +0,0 @@ -class QgsSingleSymbolRendererV2Widget : QgsRendererV2Widget -{ -%TypeHeaderCode -#include -%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(); -}; diff --git a/python/gui/symbology-ng/qgssinglesymbolrendererwidget.sip b/python/gui/symbology-ng/qgssinglesymbolrendererwidget.sip new file mode 100644 index 00000000000..b173b433fd6 --- /dev/null +++ b/python/gui/symbology-ng/qgssinglesymbolrendererwidget.sip @@ -0,0 +1,25 @@ +class QgsSingleSymbolRendererWidget : QgsRendererWidget +{ +%TypeHeaderCode +#include +%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(); +}; diff --git a/python/gui/symbology-ng/qgssizescalewidget.sip b/python/gui/symbology-ng/qgssizescalewidget.sip index cacfbd674c8..3ed93141e8e 100644 --- a/python/gui/symbology-ng/qgssizescalewidget.sip +++ b/python/gui/symbology-ng/qgssizescalewidget.sip @@ -4,7 +4,7 @@ class QgsSizeScaleWidget : QgsDataDefinedAssistant #include %End public: - QgsSizeScaleWidget( const QgsVectorLayer * layer, const QgsMarkerSymbolV2 * symbol ); + QgsSizeScaleWidget( const QgsVectorLayer * layer, const QgsMarkerSymbol * symbol ); QgsDataDefined dataDefined() const; diff --git a/python/gui/symbology-ng/qgssmartgroupeditordialog.sip b/python/gui/symbology-ng/qgssmartgroupeditordialog.sip index 50713df63a2..3deb9d7933e 100644 --- a/python/gui/symbology-ng/qgssmartgroupeditordialog.sip +++ b/python/gui/symbology-ng/qgssmartgroupeditordialog.sip @@ -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 diff --git a/python/gui/symbology-ng/qgsstylev2exportimportdialog.sip b/python/gui/symbology-ng/qgsstyleexportimportdialog.sip similarity index 87% rename from python/gui/symbology-ng/qgsstylev2exportimportdialog.sip rename to python/gui/symbology-ng/qgsstyleexportimportdialog.sip index f8f16960491..678403050e9 100644 --- a/python/gui/symbology-ng/qgsstylev2exportimportdialog.sip +++ b/python/gui/symbology-ng/qgsstyleexportimportdialog.sip @@ -1,7 +1,7 @@ -class QgsStyleV2ExportImportDialog : QDialog +class QgsStyleExportImportDialog : QDialog { %TypeHeaderCode -#include +#include %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 diff --git a/python/gui/symbology-ng/qgsstylev2groupselectiondialog.sip b/python/gui/symbology-ng/qgsstylegroupselectiondialog.sip similarity index 83% rename from python/gui/symbology-ng/qgsstylev2groupselectiondialog.sip rename to python/gui/symbology-ng/qgsstylegroupselectiondialog.sip index 7bc79069862..0579ebb6dbf 100644 --- a/python/gui/symbology-ng/qgsstylev2groupselectiondialog.sip +++ b/python/gui/symbology-ng/qgsstylegroupselectiondialog.sip @@ -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 +#include %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 ); diff --git a/python/gui/symbology-ng/qgsstylev2managerdialog.sip b/python/gui/symbology-ng/qgsstylemanagerdialog.sip similarity index 94% rename from python/gui/symbology-ng/qgsstylev2managerdialog.sip rename to python/gui/symbology-ng/qgsstylemanagerdialog.sip index 3152f10e574..012907dbf67 100644 --- a/python/gui/symbology-ng/qgsstylev2managerdialog.sip +++ b/python/gui/symbology-ng/qgsstylemanagerdialog.sip @@ -1,14 +1,14 @@ -class QgsStyleV2ManagerDialog : QDialog +class QgsStyleManagerDialog : QDialog { %TypeHeaderCode -#include +#include %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: diff --git a/python/gui/symbology-ng/qgssymbollayerwidget.sip b/python/gui/symbology-ng/qgssymbollayerwidget.sip index 52deade2d7c..ae68e463929 100644 --- a/python/gui/symbology-ng/qgssymbollayerwidget.sip +++ b/python/gui/symbology-ng/qgssymbollayerwidget.sip @@ -81,14 +81,14 @@ class QgsSymbolLayerWidget : QWidget /////////// -class QgsSimpleLineSymbolLayerV2Widget : QgsSymbolLayerWidget +class QgsSimpleLineSymbolLayerWidget : QgsSymbolLayerWidget { %TypeHeaderCode #include %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 %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 %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 %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 %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 %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 %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 %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 %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/; diff --git a/python/gui/symbology-ng/qgssymbolselectordialog.sip b/python/gui/symbology-ng/qgssymbolselectordialog.sip index 14984898037..13af629ca7c 100644 --- a/python/gui/symbology-ng/qgssymbolselectordialog.sip +++ b/python/gui/symbology-ng/qgssymbolselectordialog.sip @@ -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(); diff --git a/python/gui/symbology-ng/qgssymbolslistwidget.sip b/python/gui/symbology-ng/qgssymbolslistwidget.sip index 03b40f755a3..0bf5d1fc521 100644 --- a/python/gui/symbology-ng/qgssymbolslistwidget.sip +++ b/python/gui/symbology-ng/qgssymbolslistwidget.sip @@ -4,7 +4,7 @@ class QgsSymbolsListWidget : QWidget #include %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 diff --git a/python/gui/symbology-ng/qgsvectorcolorbrewercolorrampdialog.sip b/python/gui/symbology-ng/qgsvectorcolorbrewercolorrampdialog.sip new file mode 100644 index 00000000000..fa29d0a4ba3 --- /dev/null +++ b/python/gui/symbology-ng/qgsvectorcolorbrewercolorrampdialog.sip @@ -0,0 +1,19 @@ +class QgsVectorColorBrewerColorRampDialog : QDialog +{ +%TypeHeaderCode +#include +%End + + public: + QgsVectorColorBrewerColorRampDialog( QgsVectorColorBrewerColorRamp* ramp, QWidget* parent /TransferThis/ = NULL ); + + public slots: + void setSchemeName(); + void setColors(); + + void populateVariants(); + + protected: + + void updatePreview(); +}; diff --git a/python/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.sip b/python/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.sip deleted file mode 100644 index 192817dfc5d..00000000000 --- a/python/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.sip +++ /dev/null @@ -1,19 +0,0 @@ -class QgsVectorColorBrewerColorRampV2Dialog : QDialog -{ -%TypeHeaderCode -#include -%End - - public: - QgsVectorColorBrewerColorRampV2Dialog( QgsVectorColorBrewerColorRampV2* ramp, QWidget* parent /TransferThis/ = NULL ); - - public slots: - void setSchemeName(); - void setColors(); - - void populateVariants(); - - protected: - - void updatePreview(); -}; diff --git a/python/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.sip b/python/gui/symbology-ng/qgsvectorgradientcolorrampdialog.sip similarity index 55% rename from python/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.sip rename to python/gui/symbology-ng/qgsvectorgradientcolorrampdialog.sip index 95b7914a2f3..a71c1fe0d72 100644 --- a/python/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.sip +++ b/python/gui/symbology-ng/qgsvectorgradientcolorrampdialog.sip @@ -1,11 +1,11 @@ -class QgsVectorGradientColorRampV2Dialog : QDialog +class QgsVectorGradientColorRampDialog : QDialog { %TypeHeaderCode -#include +#include %End public: - QgsVectorGradientColorRampV2Dialog( QgsVectorGradientColorRampV2* ramp, QWidget* parent /TransferThis/ = NULL ); + QgsVectorGradientColorRampDialog( QgsVectorGradientColorRamp* ramp, QWidget* parent /TransferThis/ = NULL ); public slots: void setColor1( const QColor& color ); diff --git a/python/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.sip b/python/gui/symbology-ng/qgsvectorrandomcolorrampdialog.sip similarity index 58% rename from python/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.sip rename to python/gui/symbology-ng/qgsvectorrandomcolorrampdialog.sip index 86edacbba52..be795a1f2c0 100644 --- a/python/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.sip +++ b/python/gui/symbology-ng/qgsvectorrandomcolorrampdialog.sip @@ -1,11 +1,11 @@ -class QgsVectorRandomColorRampV2Dialog : QDialog +class QgsVectorRandomColorRampDialog : QDialog { %TypeHeaderCode -#include +#include %End public: - QgsVectorRandomColorRampV2Dialog( QgsVectorRandomColorRampV2* ramp, QWidget* parent /TransferThis/ = NULL ); + QgsVectorRandomColorRampDialog( QgsVectorRandomColorRamp* ramp, QWidget* parent /TransferThis/ = NULL ); public slots: void setCount( int val ); diff --git a/python/plugins/processing/algs/qgis/ConcaveHull.py b/python/plugins/processing/algs/qgis/ConcaveHull.py index ee316b87da0..dc490f792c8 100644 --- a/python/plugins/processing/algs/qgis/ConcaveHull.py +++ b/python/plugins/processing/algs/qgis/ConcaveHull.py @@ -95,7 +95,7 @@ class ConcaveHull(GeoAlgorithm): i += 1 # Remove features - delaunay_layer.setSelectedFeatures(ids) + delaunay_layer.selectByIds(ids) delaunay_layer.startEditing() delaunay_layer.deleteSelectedFeatures() delaunay_layer.commitChanges() diff --git a/python/plugins/processing/algs/qgis/Eliminate.py b/python/plugins/processing/algs/qgis/Eliminate.py index 52b11e5a76d..f07acc4dd1a 100644 --- a/python/plugins/processing/algs/qgis/Eliminate.py +++ b/python/plugins/processing/algs/qgis/Eliminate.py @@ -206,7 +206,7 @@ class Eliminate(GeoAlgorithm): if match: selected.append(feature.id()) - processLayer.setSelectedFeatures(selected) + processLayer.selectByIds(selected) if processLayer.selectedFeatureCount() == 0: ProcessingLog.addToLog(ProcessingLog.LOG_WARNING, diff --git a/python/plugins/processing/algs/qgis/RandomSelection.py b/python/plugins/processing/algs/qgis/RandomSelection.py index 8f515e90667..4fe571c5608 100644 --- a/python/plugins/processing/algs/qgis/RandomSelection.py +++ b/python/plugins/processing/algs/qgis/RandomSelection.py @@ -91,5 +91,5 @@ class RandomSelection(GeoAlgorithm): selran = random.sample(xrange(featureCount), value) - layer.setSelectedFeatures(selran) + layer.selectByIds(selran) self.setOutputValue(self.OUTPUT, filename) diff --git a/python/plugins/processing/algs/qgis/RandomSelectionWithinSubsets.py b/python/plugins/processing/algs/qgis/RandomSelectionWithinSubsets.py index 4465da2f085..c21b3936f6a 100644 --- a/python/plugins/processing/algs/qgis/RandomSelectionWithinSubsets.py +++ b/python/plugins/processing/algs/qgis/RandomSelectionWithinSubsets.py @@ -128,8 +128,8 @@ class RandomSelectionWithinSubsets(GeoAlgorithm): selFeat = random.sample(FIDs, selValue) selran.extend(selFeat) - layer.setSelectedFeatures(selran) + layer.selectByIds(selran) else: - layer.setSelectedFeatures(range(featureCount)) + layer.selectByIds(range(featureCount)) # FIXME: implies continuous feature ids self.setOutputValue(self.OUTPUT, filename) diff --git a/python/plugins/processing/algs/qgis/SelectByAttribute.py b/python/plugins/processing/algs/qgis/SelectByAttribute.py index 042bd4e0f58..dddef4dd433 100644 --- a/python/plugins/processing/algs/qgis/SelectByAttribute.py +++ b/python/plugins/processing/algs/qgis/SelectByAttribute.py @@ -116,5 +116,5 @@ class SelectByAttribute(GeoAlgorithm): raise GeoAlgorithmExecutionException(qExp.parserErrorString()) selected = [f.id() for f in layer.getFeatures(qReq)] - layer.setSelectedFeatures(selected) + layer.selectByIds(selected) self.setOutputValue(self.OUTPUT, fileName) diff --git a/python/plugins/processing/algs/qgis/SelectByAttributeSum.py b/python/plugins/processing/algs/qgis/SelectByAttributeSum.py index 22428167e07..b63ce13ab5d 100644 --- a/python/plugins/processing/algs/qgis/SelectByAttributeSum.py +++ b/python/plugins/processing/algs/qgis/SelectByAttributeSum.py @@ -90,5 +90,5 @@ class SelectByAttributeSum(GeoAlgorithm): completed = True break - layer.setSelectedFeatures(selected) + layer.selectByIds(selected) self.setOutputValue(self.OUTPUT, fileName) diff --git a/python/plugins/processing/algs/qgis/SelectByLocation.py b/python/plugins/processing/algs/qgis/SelectByLocation.py index a67a0ce156c..9fc2c9e7280 100644 --- a/python/plugins/processing/algs/qgis/SelectByLocation.py +++ b/python/plugins/processing/algs/qgis/SelectByLocation.py @@ -148,5 +148,5 @@ class SelectByLocation(GeoAlgorithm): elif method == 2: selectedSet = list(oldSelection.difference(selectedSet)) - inputLayer.setSelectedFeatures(selectedSet) + inputLayer.selectByIds(selectedSet) self.setOutputValue(self.OUTPUT, filename) diff --git a/python/server/qgswmserver.sip b/python/server/qgswmserver.sip index 2bb95f51f3b..087a81ae1ed 100644 --- a/python/server/qgswmserver.sip +++ b/python/server/qgswmserver.sip @@ -30,7 +30,7 @@ class QgsComposerLegendItem; class QgsComposition; class QgsConfigParser; class QgsFeature; -class QgsFeatureRendererV2; +class QgsFeatureRenderer; class QgsMapLayer; class QgsMapRenderer; class QgsPoint; @@ -74,8 +74,8 @@ class QgsWmsServer: public QgsOWSServer of the image object*/ QImage* getLegendGraphics(); - typedef QSet SymbolV2Set; - typedef QMap HitTest; + typedef QSet SymbolSet; + typedef QMap HitTest; /** Returns the map as an image (or a null pointer in case of error). The caller takes ownership of the image object). If an instance to existing hit test structure is passed, instead of rendering diff --git a/scripts/replacev2.sh b/scripts/replacev2.sh new file mode 100755 index 00000000000..aedcf07a5dd --- /dev/null +++ b/scripts/replacev2.sh @@ -0,0 +1,66 @@ +#!/bin/bash + +set -e + +codepaths=$(echo python/{analysis,console,core,custom_widgets,gui,networkanalysis,plugins,pyplugin_installer,server,sip_helpers,testing} src/ tests/) +repl= + +s=$(mktemp -t skipped.XXXX.log) +r=$(mktemp -t repl.XXXX.pl) +d=$(mktemp -t apibreak.XXXX.txt) + +# Rename classes +for i in $(git --no-pager grep "Qgs[a-zA-Z0-9_]*V2" $codepaths | perl -pe 's#^.*(Qgs[a-zA-Z0-9_]*)V2([a-zA-Z0-9_]*).*$#$1V2$2#' | sort -u) +do + src=$i + dst=${src/V2/} + if git --no-pager grep -l "\<$dst\>" $codepaths; then + echo "$src vs $dst" >>$s + else + echo " REPLACE $src => $dst" + echo "s/\b$src\b/$dst/g;" >>$r + echo "s/\bsipType_$src\b/sipType_$dst/;" >>$r + echo "$src$dst" >>$d + fi +done + +for i in $(git --no-pager grep "::[a-zA-Z0-9_]*V2" $codepaths | perl -pe 's#^.*::([a-zA-Z0-9_]*)V2([a-zA-Z0-9_]*).*$#$1V2$2#' | egrep -v "^Qgs|SslV2" | sort -u) +do + src=$i + dst=${src/V2/} + + if git --no-pager grep -l "\<$dst\>" $codepaths; then + echo "$src vs $dst" >>$s + else + echo " REPLACE $src => $dst" + echo "s/\b$src\b/$dst/g;" >>$r + echo "$src$dst" >>$d + fi +done + +find $codepaths \( -name "*v2*.h" -o -name "*v2*.cpp" -o -name "*v2*.sip" \) -type f | while read f; do + s=${f##*/} + d=${s/v2/} + echo "FIND $d" + if [ $(find $codepaths -name "$d" -print | wc -l) -gt 0 ]; then + echo "$f vs $b" >>$s + continue + fi + + git mv "$f" "${f/v2/}" + + case "$s" in + *.sip) + echo "s#\b$s\b#$d#g;" >>$r + ;; + + *) + echo "s#\b$s\b#$d#g;" >>$r + ;; + esac +done + +echo "API breaks logged to: $d" +echo "Skipped V2 symbols: $s" +echo "Replacing from $r" +find $codepaths -type f | xargs perl -i -p $r diff --git a/src/app/composer/qgsattributeselectiondialog.h b/src/app/composer/qgsattributeselectiondialog.h index 52a63c18c27..38991d19a9e 100644 --- a/src/app/composer/qgsattributeselectiondialog.h +++ b/src/app/composer/qgsattributeselectiondialog.h @@ -33,7 +33,7 @@ class QgsComposerAttributeTableColumnModel; class QgsComposerAttributeTableColumnModelV2; class QgsComposerTableSortColumnsProxyModel; class QgsComposerTableSortColumnsProxyModelV2; -class QgsComposerTableAvailableSortProxyModelV2; +class QgsComposerTableAvailableSortProxyModel; class QgsComposerObject; // QgsComposerColumnAlignmentDelegate diff --git a/src/app/composer/qgscomposerarrowwidget.cpp b/src/app/composer/qgscomposerarrowwidget.cpp index c427332c70b..8e52aee6551 100644 --- a/src/app/composer/qgscomposerarrowwidget.cpp +++ b/src/app/composer/qgscomposerarrowwidget.cpp @@ -19,7 +19,7 @@ #include "qgscomposerarrow.h" #include "qgscomposeritemwidget.h" #include "qgssymbolselectordialog.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgssymbol.h" #include #include @@ -309,8 +309,8 @@ void QgsComposerArrowWidget::on_mLineStyleButton_clicked() return; } - QgsLineSymbolV2* newSymbol = mArrow->lineSymbol()->clone(); - QgsSymbolSelectorDialog d( newSymbol, QgsStyleV2::defaultStyle(), nullptr, this ); + QgsLineSymbol* newSymbol = mArrow->lineSymbol()->clone(); + QgsSymbolSelectorDialog d( newSymbol, QgsStyle::defaultStyle(), nullptr, this ); d.setExpressionContext( mArrow->createExpressionContext() ); if ( d.exec() == QDialog::Accepted ) diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp index 481a5939c3e..ef2ae6322e0 100644 --- a/src/app/composer/qgscomposermapwidget.cpp +++ b/src/app/composer/qgscomposermapwidget.cpp @@ -25,7 +25,7 @@ #include "qgscomposeritemwidget.h" #include "qgscomposition.h" #include "qgsmaplayerstylemanager.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgssymbol.h" #include "qgssymbolselectordialog.h" #include "qgssymbollayerutils.h" @@ -1574,7 +1574,7 @@ void QgsComposerMapWidget::updateGridLineSymbolMarker( const QgsComposerMapGrid* { if ( grid ) { - QgsLineSymbolV2* nonConstSymbol = const_cast( grid->lineSymbol() ); //bad + QgsLineSymbol* nonConstSymbol = const_cast( grid->lineSymbol() ); //bad QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( nonConstSymbol, mGridLineStyleButton->iconSize() ); mGridLineStyleButton->setIcon( icon ); } @@ -1584,7 +1584,7 @@ void QgsComposerMapWidget::updateGridMarkerSymbolMarker( const QgsComposerMapGri { if ( grid ) { - QgsMarkerSymbolV2* nonConstSymbol = const_cast( grid->markerSymbol() ); //bad + QgsMarkerSymbol* nonConstSymbol = const_cast( grid->markerSymbol() ); //bad QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( nonConstSymbol, mGridMarkerStyleButton->iconSize() ); mGridMarkerStyleButton->setIcon( icon ); } @@ -1598,8 +1598,8 @@ void QgsComposerMapWidget::on_mGridLineStyleButton_clicked() return; } - QgsLineSymbolV2* newSymbol = static_cast( grid->lineSymbol()->clone() ); - QgsSymbolSelectorDialog d( newSymbol, QgsStyleV2::defaultStyle(), nullptr, this ); + QgsLineSymbol* newSymbol = static_cast( grid->lineSymbol()->clone() ); + QgsSymbolSelectorDialog d( newSymbol, QgsStyle::defaultStyle(), nullptr, this ); if ( d.exec() == QDialog::Accepted ) { @@ -1623,8 +1623,8 @@ void QgsComposerMapWidget::on_mGridMarkerStyleButton_clicked() return; } - QgsMarkerSymbolV2* newSymbol = static_cast( grid->markerSymbol()->clone() ); - QgsSymbolSelectorDialog d( newSymbol, QgsStyleV2::defaultStyle(), nullptr, this ); + QgsMarkerSymbol* newSymbol = static_cast( grid->markerSymbol()->clone() ); + QgsSymbolSelectorDialog d( newSymbol, QgsStyle::defaultStyle(), nullptr, this ); if ( d.exec() == QDialog::Accepted ) { @@ -2463,7 +2463,7 @@ void QgsComposerMapWidget::updateOverviewFrameSymbolMarker( const QgsComposerMap { if ( overview ) { - QgsFillSymbolV2* nonConstSymbol = const_cast( overview->frameSymbol() ); //bad + QgsFillSymbol* nonConstSymbol = const_cast( overview->frameSymbol() ); //bad QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( nonConstSymbol, mOverviewFrameStyleButton->iconSize() ); mOverviewFrameStyleButton->setIcon( icon ); } @@ -2565,8 +2565,8 @@ void QgsComposerMapWidget::on_mOverviewFrameStyleButton_clicked() return; } - QgsFillSymbolV2* newSymbol = static_cast( overview->frameSymbol()->clone() ); - QgsSymbolSelectorDialog d( newSymbol, QgsStyleV2::defaultStyle(), nullptr, this ); + QgsFillSymbol* newSymbol = static_cast( overview->frameSymbol()->clone() ); + QgsSymbolSelectorDialog d( newSymbol, QgsStyle::defaultStyle(), nullptr, this ); if ( d.exec() == QDialog::Accepted ) { diff --git a/src/app/composer/qgscomposerpolygonwidget.cpp b/src/app/composer/qgscomposerpolygonwidget.cpp index f9f266fd2bd..3e14ab58c55 100644 --- a/src/app/composer/qgscomposerpolygonwidget.cpp +++ b/src/app/composer/qgscomposerpolygonwidget.cpp @@ -18,7 +18,7 @@ #include "qgscomposerpolygon.h" #include "qgscomposeritemwidget.h" #include "qgssymbolselectordialog.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgssymbollayerutils.h" QgsComposerPolygonWidget::QgsComposerPolygonWidget( QgsComposerPolygon* composerPolygon ): @@ -58,11 +58,11 @@ void QgsComposerPolygonWidget::on_mPolygonStyleButton_clicked() // use the atlas coverage layer, if any QgsVectorLayer* coverageLayer = atlasCoverageLayer(); - QScopedPointer newSymbol; + QScopedPointer newSymbol; newSymbol.reset( mComposerPolygon->polygonStyleSymbol()->clone() ); - QgsSymbolSelectorDialog d( newSymbol.data(), QgsStyleV2::defaultStyle(), - coverageLayer, this ); + QgsSymbolSelectorDialog d( newSymbol.data(), QgsStyle::defaultStyle(), + coverageLayer, this ); d.setExpressionContext( mComposerPolygon->createExpressionContext() ); if ( d.exec() == QDialog::Accepted ) diff --git a/src/app/composer/qgscomposerpolylinewidget.cpp b/src/app/composer/qgscomposerpolylinewidget.cpp index c8e0715c9a6..f732e546787 100644 --- a/src/app/composer/qgscomposerpolylinewidget.cpp +++ b/src/app/composer/qgscomposerpolylinewidget.cpp @@ -18,7 +18,7 @@ #include "qgscomposerpolyline.h" #include "qgscomposeritemwidget.h" #include "qgssymbolselectordialog.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgssymbollayerutils.h" QgsComposerPolylineWidget::QgsComposerPolylineWidget( QgsComposerPolyline* composerPolyline ): @@ -50,11 +50,11 @@ void QgsComposerPolylineWidget::on_mLineStyleButton_clicked() if ( !mComposerPolyline ) return; - QScopedPointer newSymbol; + QScopedPointer newSymbol; newSymbol.reset( mComposerPolyline->polylineStyleSymbol()->clone() ); - QgsSymbolSelectorDialog d( newSymbol.data(), QgsStyleV2::defaultStyle(), - nullptr, this ); + QgsSymbolSelectorDialog d( newSymbol.data(), QgsStyle::defaultStyle(), + nullptr, this ); d.setExpressionContext( mComposerPolyline->createExpressionContext() ); if ( d.exec() == QDialog::Accepted ) diff --git a/src/app/composer/qgscomposershapewidget.cpp b/src/app/composer/qgscomposershapewidget.cpp index f9f1e1ed544..54d2cbf6151 100644 --- a/src/app/composer/qgscomposershapewidget.cpp +++ b/src/app/composer/qgscomposershapewidget.cpp @@ -19,7 +19,7 @@ #include "qgscomposershape.h" #include "qgscomposeritemwidget.h" #include "qgscomposition.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgssymbolselectordialog.h" #include "qgssymbollayerutils.h" #include @@ -107,8 +107,8 @@ void QgsComposerShapeWidget::on_mShapeStyleButton_clicked() // use the atlas coverage layer, if any QgsVectorLayer* coverageLayer = atlasCoverageLayer(); - QgsFillSymbolV2* newSymbol = mComposerShape->shapeStyleSymbol()->clone(); - QgsSymbolSelectorDialog d( newSymbol, QgsStyleV2::defaultStyle(), coverageLayer, this ); + QgsFillSymbol* newSymbol = mComposerShape->shapeStyleSymbol()->clone(); + QgsSymbolSelectorDialog d( newSymbol, QgsStyle::defaultStyle(), coverageLayer, this ); d.setExpressionContext( mComposerShape->createExpressionContext() ); if ( d.exec() == QDialog::Accepted ) diff --git a/src/app/composer/qgscompositionwidget.cpp b/src/app/composer/qgscompositionwidget.cpp index 619d2b1352e..1b4d68d920e 100644 --- a/src/app/composer/qgscompositionwidget.cpp +++ b/src/app/composer/qgscompositionwidget.cpp @@ -19,7 +19,7 @@ #include "qgscomposition.h" #include "qgscomposermap.h" #include "qgscomposeritem.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgssymbolselectordialog.h" #include "qgssymbollayerutils.h" #include "qgsexpressioncontext.h" @@ -578,12 +578,12 @@ void QgsCompositionWidget::on_mPageStyleButton_clicked() coverageLayer = mComposition->atlasComposition().coverageLayer(); } - QgsFillSymbolV2* newSymbol = mComposition->pageStyleSymbol()->clone(); + QgsFillSymbol* newSymbol = mComposition->pageStyleSymbol()->clone(); if ( !newSymbol ) { - newSymbol = new QgsFillSymbolV2(); + newSymbol = new QgsFillSymbol(); } - QgsSymbolSelectorDialog d( newSymbol, QgsStyleV2::defaultStyle(), coverageLayer, this ); + QgsSymbolSelectorDialog d( newSymbol, QgsStyle::defaultStyle(), coverageLayer, this ); d.setExpressionContext( mComposition->createExpressionContext() ); if ( d.exec() == QDialog::Accepted ) diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp index 327be00ef68..0bdb77eca84 100644 --- a/src/app/nodetool/qgsmaptoolnodetool.cpp +++ b/src/app/nodetool/qgsmaptoolnodetool.cpp @@ -97,7 +97,7 @@ void QgsMapToolNodeTool::createTopologyRubberBands() rb->setOutlineColor( color ); rb->setBrushStyle( Qt::NoBrush ); rb->setOutlineWidth( settings.value( "/qgis/digitizing/line_width", 1 ).toInt() ); - QgsAbstractGeometryV2* rbGeom = feature.geometry().geometry()->clone(); + QgsAbstractGeometry* rbGeom = feature.geometry().geometry()->clone(); if ( mCanvas->mapSettings().layerTransform( vlayer ).isValid() ) rbGeom->transform( mCanvas->mapSettings().layerTransform( vlayer ) ); rb->setGeometry( rbGeom ); @@ -140,7 +140,7 @@ void QgsMapToolNodeTool::canvasMoveEvent( QgsMapMouseEvent* e ) rb->setOutlineColor( color ); rb->setBrushStyle( Qt::NoBrush ); rb->setOutlineWidth( settings.value( "/qgis/digitizing/line_width", 1 ).toInt() ); - QgsAbstractGeometryV2* rbGeom = mSelectedFeature->geometry()->geometry()->clone(); + QgsAbstractGeometry* rbGeom = mSelectedFeature->geometry()->geometry()->clone(); if ( mCanvas->mapSettings().layerTransform( vlayer ).isValid() ) rbGeom->transform( mCanvas->mapSettings().layerTransform( vlayer ) ); rb->setGeometry( rbGeom ); @@ -401,7 +401,7 @@ void QgsMapToolNodeTool::updateSelectFeature( const QgsGeometry &geom ) color.setAlphaF( myAlpha ); mSelectRubberBand->setFillColor( color ); - QgsAbstractGeometryV2* rbGeom = geom.geometry()->clone(); + QgsAbstractGeometry* rbGeom = geom.geometry()->clone(); QgsVectorLayer *vlayer = mSelectedFeature->vlayer(); if ( mCanvas->mapSettings().layerTransform( vlayer ).isValid() ) rbGeom->transform( mCanvas->mapSettings().layerTransform( vlayer ) ); diff --git a/src/app/nodetool/qgsselectedfeature.cpp b/src/app/nodetool/qgsselectedfeature.cpp index 14fa5446fa9..5118cf1a450 100644 --- a/src/app/nodetool/qgsselectedfeature.cpp +++ b/src/app/nodetool/qgsselectedfeature.cpp @@ -268,7 +268,7 @@ void QgsSelectedFeature::deleteSelectedVertexes() endGeometryChange(); if ( res != QgsVectorLayer::EmptyGeometry ) - res = mVlayer->deleteVertexV2( mFeatureId, i ); + res = mVlayer->deleteVertex( mFeatureId, i ); if ( res != QgsVectorLayer::Success && res != QgsVectorLayer::EmptyGeometry ) { @@ -287,7 +287,7 @@ void QgsSelectedFeature::deleteSelectedVertexes() { // move all other if ( mFeatureId != resultIt.value().snappedAtGeometry ) - mVlayer->deleteVertexV2( resultIt.value().snappedAtGeometry, resultIt.value().snappedVertexNr ); + mVlayer->deleteVertex( resultIt.value().snappedAtGeometry, resultIt.value().snappedVertexNr ); } } @@ -424,7 +424,7 @@ void QgsSelectedFeature::createVertexMap() return; } - const QgsAbstractGeometryV2* geom = mGeometry->geometry(); + const QgsAbstractGeometry* geom = mGeometry->geometry(); if ( !geom ) { return; diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index 484d349a558..38456cd7df7 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -221,7 +221,7 @@ #include "qgsstatusbarcoordinateswidget.h" #include "qgsstatusbarmagnifierwidget.h" #include "qgsstatusbarscalewidget.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgssvgannotationitem.h" #include "qgssymbolselectordialog.h" #include "qgstextannotationitem.h" @@ -448,7 +448,7 @@ void QgisApp::layerTreeViewDoubleClicked( const QModelIndex& index ) QScopedPointer< QgsSymbol > symbol( originalSymbol->clone() ); QgsVectorLayer* vlayer = qobject_cast( node->layerNode()->layer() ); - QgsSymbolSelectorDialog dlg( symbol.data(), QgsStyleV2::defaultStyle(), vlayer, this ); + QgsSymbolSelectorDialog dlg( symbol.data(), QgsStyle::defaultStyle(), vlayer, this ); dlg.setMapCanvas( mMapCanvas ); if ( dlg.exec() ) { @@ -1648,7 +1648,7 @@ void QgisApp::createActions() connect( mActionOptions, SIGNAL( triggered() ), this, SLOT( options() ) ); connect( mActionCustomProjection, SIGNAL( triggered() ), this, SLOT( customProjection() ) ); connect( mActionConfigureShortcuts, SIGNAL( triggered() ), this, SLOT( configureShortcuts() ) ); - connect( mActionStyleManagerV2, SIGNAL( triggered() ), this, SLOT( showStyleManagerV2() ) ); + connect( mActionStyleManagerV2, SIGNAL( triggered() ), this, SLOT( showStyleManager() ) ); connect( mActionCustomization, SIGNAL( triggered() ), this, SLOT( customize() ) ); #ifdef Q_OS_MAC @@ -1744,12 +1744,12 @@ void QgisApp::createActions() } -#include "qgsstylev2.h" -#include "qgsstylev2managerdialog.h" +#include "qgsstyle.h" +#include "qgsstylemanagerdialog.h" -void QgisApp::showStyleManagerV2() +void QgisApp::showStyleManager() { - QgsStyleV2ManagerDialog dlg( QgsStyleV2::defaultStyle(), this ); + QgsStyleManagerDialog dlg( QgsStyle::defaultStyle(), this ); dlg.exec(); } @@ -8910,7 +8910,7 @@ void QgisApp::showOptionsDialog( QWidget *parent, const QString& currentPage ) mLayerTreeCanvasBridge->setAutoEnableCrsTransform( otfTransformAutoEnable ); mMapCanvas->setSegmentationTolerance( mySettings.value( "/qgis/segmentationTolerance", "0.01745" ).toDouble() ); - mMapCanvas->setSegmentationToleranceType( QgsAbstractGeometryV2::SegmentationToleranceType( mySettings.value( "/qgis/segmentationToleranceType", "0" ).toInt() ) ); + mMapCanvas->setSegmentationToleranceType( QgsAbstractGeometry::SegmentationToleranceType( mySettings.value( "/qgis/segmentationToleranceType", "0" ).toInt() ) ); double factor = mySettings.value( "/qgis/magnifier_factor_default", 1.0 ).toDouble(); mMagnifierWidget->setDefaultFactor( factor ); diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h index 9ba7aa7803f..0f1c0ce0075 100644 --- a/src/app/qgisapp.h +++ b/src/app/qgisapp.h @@ -1254,7 +1254,7 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow //! Stops rendering of the main map void stopRendering(); - void showStyleManagerV2(); + void showStyleManager(); void writeAnnotationItemsToProject( QDomDocument& doc ); diff --git a/src/app/qgsannotationwidget.cpp b/src/app/qgsannotationwidget.cpp index 6a5c58a8d00..9163242b657 100644 --- a/src/app/qgsannotationwidget.cpp +++ b/src/app/qgsannotationwidget.cpp @@ -17,7 +17,7 @@ #include "qgsannotationwidget.h" #include "qgsannotationitem.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgssymbollayerutils.h" #include "qgssymbol.h" #include "qgssymbolselectordialog.h" @@ -56,7 +56,7 @@ QgsAnnotationWidget::QgsAnnotationWidget( QgsAnnotationItem* item, QWidget * par connect( mBackgroundColorButton, SIGNAL( colorChanged( QColor ) ), this, SIGNAL( backgroundColorChanged( QColor ) ) ); - const QgsMarkerSymbolV2* symbol = mItem->markerSymbol(); + const QgsMarkerSymbol* symbol = mItem->markerSymbol(); if ( symbol ) { mMarkerSymbol.reset( symbol->clone() ); @@ -98,8 +98,8 @@ void QgsAnnotationWidget::on_mMapMarkerButton_clicked() { return; } - QgsMarkerSymbolV2* markerSymbol = mMarkerSymbol->clone(); - QgsSymbolSelectorDialog dlg( markerSymbol, QgsStyleV2::defaultStyle(), nullptr, this ); + QgsMarkerSymbol* markerSymbol = mMarkerSymbol->clone(); + QgsSymbolSelectorDialog dlg( markerSymbol, QgsStyle::defaultStyle(), nullptr, this ); if ( dlg.exec() == QDialog::Rejected ) { delete markerSymbol; diff --git a/src/app/qgsannotationwidget.h b/src/app/qgsannotationwidget.h index c690f5bfa78..91f7f657a87 100644 --- a/src/app/qgsannotationwidget.h +++ b/src/app/qgsannotationwidget.h @@ -21,7 +21,7 @@ #include "ui_qgsannotationwidgetbase.h" class QgsAnnotationItem; -class QgsMarkerSymbolV2; +class QgsMarkerSymbol; /** A configuration widget to configure the annotation item properties. Usually embedded by QgsAnnotationItem subclass configuration dialogs*/ @@ -44,7 +44,7 @@ class APP_EXPORT QgsAnnotationWidget: public QWidget, private Ui::QgsAnnotationW private: QgsAnnotationItem* mItem; - QScopedPointer< QgsMarkerSymbolV2 > mMarkerSymbol; + QScopedPointer< QgsMarkerSymbol > mMarkerSymbol; void blockAllSignals( bool block ); void updateCenterIcon(); diff --git a/src/app/qgsapplayertreeviewmenuprovider.cpp b/src/app/qgsapplayertreeviewmenuprovider.cpp index c3890217625..dc2c316aefa 100644 --- a/src/app/qgsapplayertreeviewmenuprovider.cpp +++ b/src/app/qgsapplayertreeviewmenuprovider.cpp @@ -30,14 +30,14 @@ #include "qgsmaplayerregistry.h" #include "qgsproject.h" #include "qgsrasterlayer.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgssymbol.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" #include "qgslayertreeregistrybridge.h" #include "qgssymbolselectordialog.h" -#include "qgssinglesymbolrendererv2.h" +#include "qgssinglesymbolrenderer.h" QgsAppLayerTreeViewMenuProvider::QgsAppLayerTreeViewMenuProvider( QgsLayerTreeView* view, QgsMapCanvas* canvas ) : mView( view ) @@ -73,7 +73,7 @@ QMenu* QgsAppLayerTreeViewMenuProvider::createContextMenu() menu->addAction( QgsApplication::getThemeIcon( "/mActionRemoveLayer.svg" ), tr( "&Remove" ), QgisApp::instance(), SLOT( removeLayer() ) ); menu->addAction( QgsApplication::getThemeIcon( "/mActionSetCRS.png" ), - tr( "&Set Group CRS" ), QgisApp::instance(), SLOT( legendGroupSetCRS() ) ); + tr( "&Set Group CRS" ), QgisApp::instance(), SLOT( legendGroupSetCrs() ) ); menu->addAction( actions->actionRenameGroupOrLayer( menu ) ); @@ -124,10 +124,10 @@ QMenu* QgsAppLayerTreeViewMenuProvider::createContextMenu() menu->addAction( tr( "Zoom to &Visible Scale" ), QgisApp::instance(), SLOT( zoomToLayerScale() ) ); // set layer crs - menu->addAction( QgsApplication::getThemeIcon( "/mActionSetCRS.png" ), tr( "Set Layer CRS" ), QgisApp::instance(), SLOT( setLayerCRS() ) ); + menu->addAction( QgsApplication::getThemeIcon( "/mActionSetCRS.png" ), tr( "Set Layer CRS" ), QgisApp::instance(), SLOT( setLayerCrs() ) ); // assign layer crs to project - menu->addAction( QgsApplication::getThemeIcon( "/mActionSetProjectCRS.png" ), tr( "Set &Project CRS from Layer" ), QgisApp::instance(), SLOT( setProjectCRSFromLayer() ) ); + menu->addAction( QgsApplication::getThemeIcon( "/mActionSetProjectCRS.png" ), tr( "Set &Project CRS from Layer" ), QgisApp::instance(), SLOT( setProjectCrsFromLayer() ) ); } // style-related actions @@ -147,10 +147,10 @@ QMenu* QgsAppLayerTreeViewMenuProvider::createContextMenu() if ( vlayer ) { - const QgsSingleSymbolRendererV2* singleRenderer = dynamic_cast< const QgsSingleSymbolRendererV2* >( vlayer->rendererV2() ); - if ( !singleRenderer && vlayer->rendererV2() && vlayer->rendererV2()->embeddedRenderer() ) + const QgsSingleSymbolRenderer* singleRenderer = dynamic_cast< const QgsSingleSymbolRenderer* >( vlayer->renderer() ); + if ( !singleRenderer && vlayer->renderer() && vlayer->renderer()->embeddedRenderer() ) { - singleRenderer = dynamic_cast< const QgsSingleSymbolRendererV2* >( vlayer->rendererV2()->embeddedRenderer() ); + singleRenderer = dynamic_cast< const QgsSingleSymbolRenderer* >( vlayer->renderer()->embeddedRenderer() ); } if ( singleRenderer && singleRenderer->symbol() ) { @@ -488,12 +488,12 @@ void QgsAppLayerTreeViewMenuProvider::editVectorSymbol() if ( !layer ) return; - QgsSingleSymbolRendererV2* singleRenderer = dynamic_cast< QgsSingleSymbolRendererV2* >( layer->rendererV2() ); + QgsSingleSymbolRenderer* singleRenderer = dynamic_cast< QgsSingleSymbolRenderer* >( layer->renderer() ); if ( !singleRenderer ) return; QScopedPointer< QgsSymbol > symbol( singleRenderer->symbol() ? singleRenderer->symbol()->clone() : nullptr ); - QgsSymbolSelectorDialog dlg( symbol.data(), QgsStyleV2::defaultStyle(), layer, mView->window() ); + QgsSymbolSelectorDialog dlg( symbol.data(), QgsStyle::defaultStyle(), layer, mView->window() ); dlg.setWindowTitle( tr( "Symbol selector" ) ); dlg.setMapCanvas( mCanvas ); if ( dlg.exec() ) @@ -515,16 +515,16 @@ void QgsAppLayerTreeViewMenuProvider::setVectorSymbolColor( const QColor& color if ( !layer ) return; - QgsSingleSymbolRendererV2* singleRenderer = dynamic_cast< QgsSingleSymbolRendererV2* >( layer->rendererV2() ); + QgsSingleSymbolRenderer* singleRenderer = dynamic_cast< QgsSingleSymbolRenderer* >( layer->renderer() ); QgsSymbol* newSymbol = nullptr; if ( singleRenderer && singleRenderer->symbol() ) newSymbol = singleRenderer->symbol()->clone(); - const QgsSingleSymbolRendererV2* embeddedRenderer = nullptr; - if ( !newSymbol && layer->rendererV2()->embeddedRenderer() ) + const QgsSingleSymbolRenderer* embeddedRenderer = nullptr; + if ( !newSymbol && layer->renderer()->embeddedRenderer() ) { - embeddedRenderer = dynamic_cast< const QgsSingleSymbolRendererV2* >( layer->rendererV2()->embeddedRenderer() ); + embeddedRenderer = dynamic_cast< const QgsSingleSymbolRenderer* >( layer->renderer()->embeddedRenderer() ); if ( embeddedRenderer && embeddedRenderer->symbol() ) newSymbol = embeddedRenderer->symbol()->clone(); } @@ -539,9 +539,9 @@ void QgsAppLayerTreeViewMenuProvider::setVectorSymbolColor( const QColor& color } else if ( embeddedRenderer ) { - QgsSingleSymbolRendererV2* newRenderer = embeddedRenderer->clone(); + QgsSingleSymbolRenderer* newRenderer = embeddedRenderer->clone(); newRenderer->setSymbol( newSymbol ); - layer->rendererV2()->setEmbeddedRenderer( newRenderer ); + layer->renderer()->setEmbeddedRenderer( newRenderer ); } layer->triggerRepaint(); @@ -568,7 +568,7 @@ void QgsAppLayerTreeViewMenuProvider::editSymbolLegendNodeSymbol() QScopedPointer< QgsSymbol > symbol( originalSymbol->clone() ); QgsVectorLayer* vlayer = qobject_cast( node->layerNode()->layer() ); - QgsSymbolSelectorDialog dlg( symbol.data(), QgsStyleV2::defaultStyle(), vlayer, mView->window() ); + QgsSymbolSelectorDialog dlg( symbol.data(), QgsStyle::defaultStyle(), vlayer, mView->window() ); dlg.setWindowTitle( tr( "Symbol selector" ) ); dlg.setMapCanvas( mCanvas ); if ( dlg.exec() ) diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp index cf0e7a98c69..91b587295cd 100644 --- a/src/app/qgsattributetabledialog.cpp +++ b/src/app/qgsattributetabledialog.cpp @@ -180,7 +180,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid // info from layer to table connect( mLayer, SIGNAL( editingStarted() ), this, SLOT( editingToggled() ) ); connect( mLayer, SIGNAL( editingStopped() ), this, SLOT( editingToggled() ) ); - connect( mLayer, SIGNAL( layerDeleted() ), this, SLOT( close() ) ); + connect( mLayer, SIGNAL( destroyed() ), this, SLOT( close() ) ); connect( mLayer, SIGNAL( selectionChanged() ), this, SLOT( updateTitle() ) ); connect( mLayer, SIGNAL( featureAdded( QgsFeatureId ) ), this, SLOT( updateTitle() ) ); connect( mLayer, SIGNAL( featuresDeleted( QgsFeatureIds ) ), this, SLOT( updateTitle() ) ); diff --git a/src/app/qgsattributetypedialog.cpp b/src/app/qgsattributetypedialog.cpp index 6791bd94bf0..f8c57c1fd0e 100644 --- a/src/app/qgsattributetypedialog.cpp +++ b/src/app/qgsattributetypedialog.cpp @@ -83,7 +83,7 @@ QgsAttributeTypeDialog::~QgsAttributeTypeDialog() qDeleteAll( mEditorConfigWidgets ); } -const QString QgsAttributeTypeDialog::editorWidgetV2Type() +const QString QgsAttributeTypeDialog::editorWidgetType() { QListWidgetItem* item = selectionListWidget->currentItem(); if ( item ) @@ -96,7 +96,7 @@ const QString QgsAttributeTypeDialog::editorWidgetV2Type() } } -const QString QgsAttributeTypeDialog::editorWidgetV2Text() +const QString QgsAttributeTypeDialog::editorWidgetText() { QListWidgetItem* item = selectionListWidget->currentItem(); if ( item ) @@ -109,7 +109,7 @@ const QString QgsAttributeTypeDialog::editorWidgetV2Text() } } -const QgsEditorWidgetConfig QgsAttributeTypeDialog::editorWidgetV2Config() +const QgsEditorWidgetConfig QgsAttributeTypeDialog::editorWidgetConfig() { QListWidgetItem* item = selectionListWidget->currentItem(); if ( item ) @@ -125,7 +125,7 @@ const QgsEditorWidgetConfig QgsAttributeTypeDialog::editorWidgetV2Config() return QgsEditorWidgetConfig(); } -void QgsAttributeTypeDialog::setWidgetV2Type( const QString& type ) +void QgsAttributeTypeDialog::setWidgetType( const QString& type ) { for ( int i = 0; i < selectionListWidget->count(); i++ ) { @@ -147,7 +147,7 @@ void QgsAttributeTypeDialog::setWidgetV2Type( const QString& type ) if ( cfgWdg ) { - cfgWdg->setConfig( mWidgetV2Config ); + cfgWdg->setConfig( mWidgetConfig ); stackedWidget->addWidget( cfgWdg ); stackedWidget->setCurrentWidget( cfgWdg ); @@ -160,9 +160,9 @@ void QgsAttributeTypeDialog::setWidgetV2Type( const QString& type ) } } -void QgsAttributeTypeDialog::setWidgetV2Config( const QgsEditorWidgetConfig& config ) +void QgsAttributeTypeDialog::setWidgetConfig( const QgsEditorWidgetConfig& config ) { - mWidgetV2Config = config; + mWidgetConfig = config; } bool QgsAttributeTypeDialog::fieldEditable() const @@ -219,5 +219,5 @@ void QgsAttributeTypeDialog::on_selectionListWidget_currentRowChanged( int index { const QString editType = selectionListWidget->item( index )->data( Qt::UserRole ).toString(); - setWidgetV2Type( editType ); + setWidgetType( editType ); } diff --git a/src/app/qgsattributetypedialog.h b/src/app/qgsattributetypedialog.h index 6b3ff82a381..244f20a218d 100644 --- a/src/app/qgsattributetypedialog.h +++ b/src/app/qgsattributetypedialog.h @@ -20,10 +20,8 @@ #include "ui_qgsattributetypeedit.h" #include "qgseditorconfigwidget.h" -#include "qgsvectorlayer.h" + class QDialog; -class QLayout; -class QgsField; class APP_EXPORT QgsAttributeTypeDialog: public QDialog, private Ui::QgsAttributeTypeDialog { @@ -33,34 +31,21 @@ class APP_EXPORT QgsAttributeTypeDialog: public QDialog, private Ui::QgsAttribut QgsAttributeTypeDialog( QgsVectorLayer *vl, int fieldIdx ); ~QgsAttributeTypeDialog(); - /** - * Setting index, which page should be selected - * @param index of page to be selected - * @param editTypeInt type of edit type which was selected before save - */ - void setIndex( int index, QgsVectorLayer::EditType type ); - /** * Setting page which is to be selected * @param index index of page which was selected */ void setPage( int index ); - /** - * Getter to get selected edit type - * @return selected edit type - */ - QgsVectorLayer::EditType type(); + const QString editorWidgetType(); - const QString editorWidgetV2Type(); + const QString editorWidgetText(); - const QString editorWidgetV2Text(); + void setWidgetType( const QString& type ); - void setWidgetV2Type( const QString& type ); + const QgsEditorWidgetConfig editorWidgetConfig(); - const QgsEditorWidgetConfig editorWidgetV2Config(); - - void setWidgetV2Config( const QgsEditorWidgetConfig& config ); + void setWidgetConfig( const QgsEditorWidgetConfig& config ); /** * Setter for checkbox to label on top @@ -130,7 +115,7 @@ class APP_EXPORT QgsAttributeTypeDialog: public QDialog, private Ui::QgsAttribut QgsVectorLayer *mLayer; int mFieldIdx; - QgsEditorWidgetConfig mWidgetV2Config; + QgsEditorWidgetConfig mWidgetConfig; //! Cached configuration dialog (lazy loaded) QMap< QString, QgsEditorConfigWidget* > mEditorConfigWidgets; diff --git a/src/app/qgsdecorationgrid.cpp b/src/app/qgsdecorationgrid.cpp index 72f0c7e5f5f..e0eb667d039 100644 --- a/src/app/qgsdecorationgrid.cpp +++ b/src/app/qgsdecorationgrid.cpp @@ -28,7 +28,7 @@ #include "qgsproject.h" #include "qgssymbollayerutils.h" //for pointOnLineWithDistance #include "qgssymbol.h" //for symbology -#include "qgsmarkersymbollayerv2.h" +#include "qgsmarkersymbollayer.h" #include "qgsrendercontext.h" #include "qgsmapcanvas.h" @@ -74,14 +74,14 @@ QgsDecorationGrid::~QgsDecorationGrid() delete mMarkerSymbol; } -void QgsDecorationGrid::setLineSymbol( QgsLineSymbolV2* symbol ) +void QgsDecorationGrid::setLineSymbol( QgsLineSymbol* symbol ) { if ( mLineSymbol ) delete mLineSymbol; mLineSymbol = symbol; } -void QgsDecorationGrid::setMarkerSymbol( QgsMarkerSymbolV2* symbol ) +void QgsDecorationGrid::setMarkerSymbol( QgsMarkerSymbol* symbol ) { if ( mMarkerSymbol ) delete mMarkerSymbol; @@ -134,10 +134,10 @@ void QgsDecorationGrid::projectRead() { doc.setContent( xml ); elem = doc.documentElement(); - mLineSymbol = QgsSymbolLayerUtils::loadSymbol( elem ); + mLineSymbol = QgsSymbolLayerUtils::loadSymbol( elem ); } if ( ! mLineSymbol ) - mLineSymbol = new QgsLineSymbolV2(); + mLineSymbol = new QgsLineSymbol(); if ( mMarkerSymbol ) setMarkerSymbol( nullptr ); @@ -146,15 +146,15 @@ void QgsDecorationGrid::projectRead() { doc.setContent( xml ); elem = doc.documentElement(); - mMarkerSymbol = QgsSymbolLayerUtils::loadSymbol( elem ); + mMarkerSymbol = QgsSymbolLayerUtils::loadSymbol( elem ); } if ( ! mMarkerSymbol ) { // set default symbol : cross with width=3 QgsSymbolLayerList symbolList; - symbolList << new QgsSimpleMarkerSymbolLayerV2( QgsSimpleMarkerSymbolLayerBase::Cross, 3, 0 ); - mMarkerSymbol = new QgsMarkerSymbolV2( symbolList ); - // mMarkerSymbol = new QgsMarkerSymbolV2(); + symbolList << new QgsSimpleMarkerSymbolLayer( QgsSimpleMarkerSymbolLayerBase::Cross, 3, 0 ); + mMarkerSymbol = new QgsMarkerSymbol( symbolList ); + // mMarkerSymbol = new QgsMarkerSymbol(); } } diff --git a/src/app/qgsdecorationgrid.h b/src/app/qgsdecorationgrid.h index e94ea96251c..3d6ccd3ce8b 100644 --- a/src/app/qgsdecorationgrid.h +++ b/src/app/qgsdecorationgrid.h @@ -22,8 +22,8 @@ #include class QPainter; -class QgsLineSymbolV2; -class QgsMarkerSymbolV2; +class QgsLineSymbol; +class QgsMarkerSymbol; #include #include @@ -116,12 +116,12 @@ class APP_EXPORT QgsDecorationGrid: public QgsDecorationItem /* double crossLength() {return mCrossLength;} */ /** Set symbol that is used to draw grid lines. Takes ownership*/ - void setLineSymbol( QgsLineSymbolV2* symbol ); - const QgsLineSymbolV2* lineSymbol() const { return mLineSymbol; } + void setLineSymbol( QgsLineSymbol* symbol ); + const QgsLineSymbol* lineSymbol() const { return mLineSymbol; } /** Set symbol that is used to draw markers. Takes ownership*/ - void setMarkerSymbol( QgsMarkerSymbolV2* symbol ); - const QgsMarkerSymbolV2* markerSymbol() const { return mMarkerSymbol; } + void setMarkerSymbol( QgsMarkerSymbol* symbol ); + const QgsMarkerSymbol* markerSymbol() const { return mMarkerSymbol; } /** Sets map unit type */ void setMapUnits( QgsUnitTypes::DistanceUnit t ) { mMapUnits = t; } @@ -190,8 +190,8 @@ class APP_EXPORT QgsDecorationGrid: public QgsDecorationItem /** The length of the cross sides for mGridStyle Cross*/ /* double mCrossLength; */ - QgsLineSymbolV2* mLineSymbol; - QgsMarkerSymbolV2* mMarkerSymbol; + QgsLineSymbol* mLineSymbol; + QgsMarkerSymbol* mMarkerSymbol; QgsUnitTypes::DistanceUnit mMapUnits; diff --git a/src/app/qgsdecorationgriddialog.cpp b/src/app/qgsdecorationgriddialog.cpp index 316b55b3462..57f4ec76889 100644 --- a/src/app/qgsdecorationgriddialog.cpp +++ b/src/app/qgsdecorationgriddialog.cpp @@ -21,7 +21,7 @@ #include "qgslogger.h" #include "qgscontexthelp.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgssymbol.h" #include "qgssymbolselectordialog.h" #include "qgisapp.h" @@ -91,7 +91,7 @@ void QgsDecorationGridDialog::updateGuiElements() delete mLineSymbol; if ( mDeco.lineSymbol() ) { - mLineSymbol = static_cast( mDeco.lineSymbol()->clone() ); + mLineSymbol = static_cast( mDeco.lineSymbol()->clone() ); QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( mLineSymbol, mLineSymbolButton->iconSize() ); mLineSymbolButton->setIcon( icon ); } @@ -99,7 +99,7 @@ void QgsDecorationGridDialog::updateGuiElements() delete mMarkerSymbol; if ( mDeco.markerSymbol() ) { - mMarkerSymbol = static_cast( mDeco.markerSymbol()->clone() ); + mMarkerSymbol = static_cast( mDeco.markerSymbol()->clone() ); QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( mMarkerSymbol, mMarkerSymbolButton->iconSize() ); mMarkerSymbolButton->setIcon( icon ); } @@ -213,8 +213,8 @@ void QgsDecorationGridDialog::on_mLineSymbolButton_clicked() if ( ! mLineSymbol ) return; - QgsLineSymbolV2* lineSymbol = mLineSymbol->clone(); - QgsSymbolSelectorDialog dlg( lineSymbol, QgsStyleV2::defaultStyle(), nullptr, this ); + QgsLineSymbol* lineSymbol = mLineSymbol->clone(); + QgsSymbolSelectorDialog dlg( lineSymbol, QgsStyle::defaultStyle(), nullptr, this ); if ( dlg.exec() == QDialog::Rejected ) { delete lineSymbol; @@ -236,8 +236,8 @@ void QgsDecorationGridDialog::on_mMarkerSymbolButton_clicked() if ( ! mMarkerSymbol ) return; - QgsMarkerSymbolV2* markerSymbol = mMarkerSymbol->clone(); - QgsSymbolSelectorDialog dlg( markerSymbol, QgsStyleV2::defaultStyle(), nullptr, this ); + QgsMarkerSymbol* markerSymbol = mMarkerSymbol->clone(); + QgsSymbolSelectorDialog dlg( markerSymbol, QgsStyle::defaultStyle(), nullptr, this ); if ( dlg.exec() == QDialog::Rejected ) { delete markerSymbol; diff --git a/src/app/qgsdecorationgriddialog.h b/src/app/qgsdecorationgriddialog.h index 084353ed4c7..6bcbc6028fa 100644 --- a/src/app/qgsdecorationgriddialog.h +++ b/src/app/qgsdecorationgriddialog.h @@ -22,8 +22,8 @@ #include class QgsDecorationGrid; -class QgsLineSymbolV2; -class QgsMarkerSymbolV2; +class QgsLineSymbol; +class QgsMarkerSymbol; /** @author Etienne Tourigny @@ -53,8 +53,8 @@ class APP_EXPORT QgsDecorationGridDialog : public QDialog, private Ui::QgsDecora private: QgsDecorationGrid& mDeco; - QgsLineSymbolV2* mLineSymbol; - QgsMarkerSymbolV2* mMarkerSymbol; + QgsLineSymbol* mLineSymbol; + QgsMarkerSymbol* mMarkerSymbol; void updateGuiElements(); void updateDecoFromGui(); diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp index 6a792254480..a983e8df735 100644 --- a/src/app/qgsdiagramproperties.cpp +++ b/src/app/qgsdiagramproperties.cpp @@ -23,7 +23,7 @@ #include "qgsproject.h" #include "qgsapplication.h" #include "qgsdiagramproperties.h" -#include "qgsdiagramrendererv2.h" +#include "qgsdiagramrenderer.h" #include "qgslabelengineconfigdialog.h" #include "qgsmessagebar.h" #include "qgsvectorlayerproperties.h" @@ -32,7 +32,7 @@ #include "qgscolordialog.h" #include "qgisgui.h" #include "qgssymbolselectordialog.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgsmapcanvas.h" #include "qgsexpressionbuilderdialog.h" @@ -194,7 +194,7 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, mDataDefinedVisibilityComboBox->addItem( layerFields.at( idx ).name(), idx ); } - const QgsDiagramRendererV2* dr = layer->diagramRenderer(); + const QgsDiagramRenderer* dr = layer->diagramRenderer(); if ( !dr ) //no diagram renderer yet, insert reasonable default { mDiagramTypeComboBox->blockSignals( true ); @@ -216,7 +216,7 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, mDataDefinedVisibilityGroupBox->setChecked( false ); mCheckBoxAttributeLegend->setChecked( true ); mCheckBoxSizeLegend->setChecked( false ); - mSizeLegendSymbol.reset( QgsMarkerSymbolV2::createSimple( QgsStringMap() ) ); + mSizeLegendSymbol.reset( QgsMarkerSymbol::createSimple( QgsStringMap() ) ); switch ( layerType ) { @@ -256,7 +256,7 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, mLinearScaleFrame->setEnabled( mAttributeBasedScalingRadio->isChecked() ); mCheckBoxAttributeLegend->setChecked( dr->attributeLegend() ); mCheckBoxSizeLegend->setChecked( dr->sizeLegend() ); - mSizeLegendSymbol.reset( dr->sizeLegendSymbol() ? dr->sizeLegendSymbol()->clone() : QgsMarkerSymbolV2::createSimple( QgsStringMap() ) ); + mSizeLegendSymbol.reset( dr->sizeLegendSymbol() ? dr->sizeLegendSymbol()->clone() : QgsMarkerSymbol::createSimple( QgsStringMap() ) ); QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( mSizeLegendSymbol.data(), mButtonSizeLegendSymbol->iconSize() ); mButtonSizeLegendSymbol->setIcon( icon ); @@ -755,7 +755,7 @@ void QgsDiagramProperties::apply() ds.barWidth = mBarWidthSpinBox->value(); - QgsDiagramRendererV2* renderer = nullptr; + QgsDiagramRenderer* renderer = nullptr; if ( mFixedSizeRadio->isChecked() ) { QgsSingleCategoryDiagramRenderer* dr = new QgsSingleCategoryDiagramRenderer(); @@ -915,8 +915,8 @@ void QgsDiagramProperties::on_mPlacementComboBox_currentIndexChanged( int index void QgsDiagramProperties::on_mButtonSizeLegendSymbol_clicked() { - QgsMarkerSymbolV2* newSymbol = mSizeLegendSymbol->clone(); - QgsSymbolSelectorDialog d( newSymbol, QgsStyleV2::defaultStyle(), nullptr, this ); + QgsMarkerSymbol* newSymbol = mSizeLegendSymbol->clone(); + QgsSymbolSelectorDialog d( newSymbol, QgsStyle::defaultStyle(), nullptr, this ); if ( d.exec() == QDialog::Accepted ) { diff --git a/src/app/qgsdiagramproperties.h b/src/app/qgsdiagramproperties.h index 93113f00936..f5eacebb12b 100644 --- a/src/app/qgsdiagramproperties.h +++ b/src/app/qgsdiagramproperties.h @@ -60,7 +60,7 @@ class APP_EXPORT QgsDiagramProperties : public QWidget, private Ui::QgsDiagramPr private: // Keeps track of the diagram type to properly save / restore settings when the diagram type combo box is set to no diagram. QString mDiagramType; - QScopedPointer< QgsMarkerSymbolV2 > mSizeLegendSymbol; + QScopedPointer< QgsMarkerSymbol > mSizeLegendSymbol; QString guessLegendText( const QString &expression ); QgsMapCanvas *mMapCanvas; diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp index db9d70bf92b..7a2db87d240 100644 --- a/src/app/qgsfieldsproperties.cpp +++ b/src/app/qgsfieldsproperties.cpp @@ -52,7 +52,6 @@ QgsFieldsProperties::QgsFieldsProperties( QgsVectorLayer *layer, QWidget* parent return; setupUi( this ); - setupEditTypes(); mSplitter->restoreState( QSettings().value( "/Windows/VectorLayerProperties/FieldsProperties/SplitState" ).toByteArray() ); @@ -324,7 +323,7 @@ void QgsFieldsProperties::setRow( int row, int idx, const QgsField& field ) FieldConfig cfg( mLayer, idx ); QPushButton *pb; - pb = new QPushButton( QgsEditorWidgetRegistry::instance()->name( cfg.mEditorWidgetV2Type ) ); + pb = new QPushButton( QgsEditorWidgetRegistry::instance()->name( cfg.mEditorWidgetType ) ); cfg.mButton = pb; mFieldsList->setCellWidget( row, attrEditTypeCol, pb ); @@ -546,8 +545,8 @@ void QgsFieldsProperties::attributeTypeDialog() attributeTypeDialog.setExpression( cfg.mConstraint ); attributeTypeDialog.setExpressionDescription( cfg.mConstraintDescription ); - attributeTypeDialog.setWidgetV2Config( cfg.mEditorWidgetV2Config ); - attributeTypeDialog.setWidgetV2Type( cfg.mEditorWidgetV2Type ); + attributeTypeDialog.setWidgetConfig( cfg.mEditorWidgetConfig ); + attributeTypeDialog.setWidgetType( cfg.mEditorWidgetType ); if ( !attributeTypeDialog.exec() ) return; @@ -558,10 +557,10 @@ void QgsFieldsProperties::attributeTypeDialog() cfg.mConstraintDescription = attributeTypeDialog.expressionDescription(); cfg.mConstraint = attributeTypeDialog.expression(); - cfg.mEditorWidgetV2Type = attributeTypeDialog.editorWidgetV2Type(); - cfg.mEditorWidgetV2Config = attributeTypeDialog.editorWidgetV2Config(); + cfg.mEditorWidgetType = attributeTypeDialog.editorWidgetType(); + cfg.mEditorWidgetConfig = attributeTypeDialog.editorWidgetConfig(); - pb->setText( attributeTypeDialog.editorWidgetV2Text() ); + pb->setText( attributeTypeDialog.editorWidgetText() ); setConfigForRow( row, cfg ); } @@ -815,41 +814,6 @@ void QgsFieldsProperties::on_mCalculateFieldButton_clicked() // methods reimplemented from qt designer base class // -QMap< QgsVectorLayer::EditType, QString > QgsFieldsProperties::editTypeMap; - -void QgsFieldsProperties::setupEditTypes() -{ - if ( !editTypeMap.isEmpty() ) - return; - - editTypeMap.insert( QgsVectorLayer::LineEdit, tr( "Line edit" ) ); - editTypeMap.insert( QgsVectorLayer::UniqueValues, tr( "Unique values" ) ); - editTypeMap.insert( QgsVectorLayer::UniqueValuesEditable, tr( "Unique values editable" ) ); - editTypeMap.insert( QgsVectorLayer::Classification, tr( "Classification" ) ); - editTypeMap.insert( QgsVectorLayer::ValueMap, tr( "Value map" ) ); - editTypeMap.insert( QgsVectorLayer::EditRange, tr( "Edit range" ) ); - editTypeMap.insert( QgsVectorLayer::SliderRange, tr( "Slider range" ) ); - editTypeMap.insert( QgsVectorLayer::DialRange, tr( "Dial range" ) ); - editTypeMap.insert( QgsVectorLayer::FileName, tr( "File name" ) ); - editTypeMap.insert( QgsVectorLayer::Enumeration, tr( "Enumeration" ) ); - editTypeMap.insert( QgsVectorLayer::Immutable, tr( "Immutable" ) ); - editTypeMap.insert( QgsVectorLayer::Hidden, tr( "Hidden" ) ); - editTypeMap.insert( QgsVectorLayer::CheckBox, tr( "Checkbox" ) ); - editTypeMap.insert( QgsVectorLayer::TextEdit, tr( "Text edit" ) ); - editTypeMap.insert( QgsVectorLayer::Calendar, tr( "Calendar" ) ); - editTypeMap.insert( QgsVectorLayer::ValueRelation, tr( "Value relation" ) ); - editTypeMap.insert( QgsVectorLayer::UuidGenerator, tr( "UUID generator" ) ); - editTypeMap.insert( QgsVectorLayer::Photo, tr( "Photo" ) ); - editTypeMap.insert( QgsVectorLayer::WebView, tr( "Web view" ) ); - editTypeMap.insert( QgsVectorLayer::Color, tr( "Color" ) ); - editTypeMap.insert( QgsVectorLayer::EditorWidgetV2, tr( "Editor Widget" ) ); -} - -QString QgsFieldsProperties::editTypeButtonText( QgsVectorLayer::EditType type ) -{ - return editTypeMap[ type ]; -} - void QgsFieldsProperties::updateFieldRenamingStatus() { bool canRenameFields = mLayer->isEditable() && ( mLayer->dataProvider()->capabilities() & QgsVectorDataProvider::RenameAttributes ) && !mLayer->readOnly(); @@ -968,8 +932,8 @@ void QgsFieldsProperties::apply() mLayer->editFormConfig()->setExpressionDescription( i, cfg.mConstraintDescription ); mLayer->editFormConfig()->setExpression( i, cfg.mConstraint ); - mLayer->editFormConfig()->setWidgetType( idx, cfg.mEditorWidgetV2Type ); - mLayer->editFormConfig()->setWidgetConfig( idx, cfg.mEditorWidgetV2Config ); + mLayer->editFormConfig()->setWidgetType( idx, cfg.mEditorWidgetType ); + mLayer->editFormConfig()->setWidgetConfig( idx, cfg.mEditorWidgetConfig ); if ( mFieldsList->item( i, attrWMSCol )->checkState() == Qt::Unchecked ) { @@ -1049,9 +1013,8 @@ QgsFieldsProperties::FieldConfig::FieldConfig( QgsVectorLayer* layer, int idx ) mNotNull = layer->editFormConfig()->notNull( idx ); mConstraint = layer->editFormConfig()->expression( idx ); mConstraintDescription = layer->editFormConfig()->expressionDescription( idx ); - mEditorWidgetV2Type = layer->editFormConfig()->widgetType( idx ); - mEditorWidgetV2Config = layer->editFormConfig()->widgetConfig( idx ); - + mEditorWidgetType = layer->editFormConfig()->widgetType( idx ); + mEditorWidgetConfig = layer->editFormConfig()->widgetConfig( idx ); } /* diff --git a/src/app/qgsfieldsproperties.h b/src/app/qgsfieldsproperties.h index 798ec97e3bf..29b072c4152 100644 --- a/src/app/qgsfieldsproperties.h +++ b/src/app/qgsfieldsproperties.h @@ -102,8 +102,8 @@ class APP_EXPORT QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPrope QString mConstraint; QString mConstraintDescription; QPushButton* mButton; - QString mEditorWidgetV2Type; - QMap mEditorWidgetV2Config; + QString mEditorWidgetType; + QMap mEditorWidgetConfig; }; public: @@ -219,12 +219,7 @@ class APP_EXPORT QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPrope RelColCount }; - static QMap< QgsVectorLayer::EditType, QString > editTypeMap; - static void setupEditTypes(); - static QString editTypeButtonText( QgsVectorLayer::EditType type ); - private: - void updateFieldRenamingStatus(); }; diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp index 906ed9f2fc0..42416cba077 100644 --- a/src/app/qgsidentifyresultsdialog.cpp +++ b/src/app/qgsidentifyresultsdialog.cpp @@ -65,7 +65,7 @@ #include #include #include -#include "qgsvectorcolorrampv2.h" // for random colors +#include "qgsvectorcolorramp.h" // for random colors QgsIdentifyResultsWebView::QgsIdentifyResultsWebView( QWidget *parent ) : QgsWebView( parent ) { @@ -396,7 +396,7 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer, const QgsFeat layItem->setData( 0, Qt::UserRole, QVariant::fromValue( qobject_cast( vlayer ) ) ); lstResults->addTopLevelItem( layItem ); - connect( vlayer, SIGNAL( layerDeleted() ), this, SLOT( layerDestroyed() ) ); + connect( vlayer, SIGNAL( destroyed() ), this, SLOT( layerDestroyed() ) ); connect( vlayer, SIGNAL( crsChanged() ), this, SLOT( layerDestroyed() ) ); connect( vlayer, SIGNAL( featureDeleted( QgsFeatureId ) ), this, SLOT( featureDeleted( QgsFeatureId ) ) ); connect( vlayer, SIGNAL( attributeValueChanged( QgsFeatureId, int, const QVariant & ) ), @@ -609,7 +609,7 @@ QgsIdentifyPlotCurve::QgsIdentifyPlotCurve( const QMap &attrib if ( color == QColor() ) { - color = QgsVectorRandomColorRampV2::randomColors( 1 ).at( 0 ); + color = QgsVectorRandomColorRamp::randomColors( 1 ).at( 0 ); } #if defined(QWT_VERSION) && QWT_VERSION>=0x060000 mPlotCurve->setSymbol( new QwtSymbol( QwtSymbol::Ellipse, QBrush( Qt::white ), @@ -1422,17 +1422,14 @@ void QgsIdentifyResultsDialog::disconnectLayer( QObject *layer ) QgsVectorLayer *vlayer = qobject_cast( layer ); if ( vlayer ) { - disconnect( vlayer, SIGNAL( layerDeleted() ), this, SLOT( layerDestroyed() ) ); disconnect( vlayer, SIGNAL( featureDeleted( QgsFeatureId ) ), this, SLOT( featureDeleted( QgsFeatureId ) ) ); disconnect( vlayer, SIGNAL( attributeValueChanged( QgsFeatureId, int, const QVariant & ) ), this, SLOT( attributeValueChanged( QgsFeatureId, int, const QVariant & ) ) ); disconnect( vlayer, SIGNAL( editingStarted() ), this, SLOT( editingToggled() ) ); disconnect( vlayer, SIGNAL( editingStopped() ), this, SLOT( editingToggled() ) ); } - else - { - disconnect( layer, SIGNAL( destroyed() ), this, SLOT( layerDestroyed() ) ); - } + + disconnect( layer, SIGNAL( destroyed() ), this, SLOT( layerDestroyed() ) ); } void QgsIdentifyResultsDialog::featureDeleted( QgsFeatureId fid ) diff --git a/src/app/qgslayerstylingwidget.cpp b/src/app/qgslayerstylingwidget.cpp index 0a117529b53..beef6e65b3a 100644 --- a/src/app/qgslayerstylingwidget.cpp +++ b/src/app/qgslayerstylingwidget.cpp @@ -24,19 +24,19 @@ #include "qgslabelingwidget.h" #include "qgslayerstylingwidget.h" #include "qgsrastertransparencywidget.h" -#include "qgsrendererv2propertiesdialog.h" +#include "qgsrendererpropertiesdialog.h" #include "qgsrendererrasterpropertieswidget.h" #include "qgsrasterhistogramwidget.h" #include "qgsrasterrenderer.h" #include "qgsrasterrendererwidget.h" #include "qgsmapcanvas.h" #include "qgsmaplayer.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgsvectorlayer.h" #include "qgsproject.h" #include "qgsundowidget.h" -#include "qgsrendererv2.h" -#include "qgsrendererv2registry.h" +#include "qgsrenderer.h" +#include "qgsrendererregistry.h" #include "qgsmaplayerregistry.h" #include "qgsrasterlayer.h" #include "qgsmaplayerconfigwidget.h" @@ -232,11 +232,11 @@ void QgsLayerStylingWidget::apply() } if ( QgsPanelWidgetWrapper* wrapper = qobject_cast( current ) ) { - if ( QgsRendererV2PropertiesDialog* widget = qobject_cast( wrapper->widget() ) ) + if ( QgsRendererPropertiesDialog* widget = qobject_cast( wrapper->widget() ) ) { widget->apply(); QgsVectorLayer* layer = qobject_cast( mCurrentLayer ); - QgsRendererV2AbstractMetadata* m = QgsRendererV2Registry::instance()->rendererMetadata( layer->rendererV2()->type() ); + QgsRendererAbstractMetadata* m = QgsRendererRegistry::instance()->rendererMetadata( layer->renderer()->type() ); undoName = QString( "Style Change - %1" ).arg( m->visibleName() ); styleWasChanged = true; } @@ -346,7 +346,7 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer() { case 0: // Style { - QgsRendererV2PropertiesDialog* styleWidget = new QgsRendererV2PropertiesDialog( vlayer, QgsStyleV2::defaultStyle(), true, mStackedWidget ); + QgsRendererPropertiesDialog* styleWidget = new QgsRendererPropertiesDialog( vlayer, QgsStyle::defaultStyle(), true, mStackedWidget ); styleWidget->setMapCanvas( mMapCanvas ); styleWidget->setDockMode( true ); connect( styleWidget, SIGNAL( widgetChanged() ), this, SLOT( autoApply() ) ); diff --git a/src/app/qgslayerstylingwidget.h b/src/app/qgslayerstylingwidget.h index c49f9539b2c..7725b9435ea 100644 --- a/src/app/qgslayerstylingwidget.h +++ b/src/app/qgslayerstylingwidget.h @@ -33,7 +33,7 @@ class QgsLabelingWidget; class QgsMapLayer; class QgsMapCanvas; -class QgsRendererV2PropertiesDialog; +class QgsRendererPropertiesDialog; class QgsRendererRasterPropertiesWidget; class QgsUndoWidget; class QgsRasterHistogramWidget; diff --git a/src/app/qgsmapthemes.cpp b/src/app/qgsmapthemes.cpp index e8ec8fb29a3..404804828ba 100644 --- a/src/app/qgsmapthemes.cpp +++ b/src/app/qgsmapthemes.cpp @@ -24,7 +24,7 @@ #include "qgsmaplayerregistry.h" #include "qgsmaplayerstylemanager.h" #include "qgsproject.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgsvectorlayer.h" #include "qgisapp.h" #include "qgsnewnamedialog.h" diff --git a/src/app/qgsmaptooladdcircularstring.cpp b/src/app/qgsmaptooladdcircularstring.cpp index 5de87f08ca0..ac8088ef3b3 100644 --- a/src/app/qgsmaptooladdcircularstring.cpp +++ b/src/app/qgsmaptooladdcircularstring.cpp @@ -14,12 +14,12 @@ ***************************************************************************/ #include "qgsmaptooladdcircularstring.h" -#include "qgscircularstringv2.h" -#include "qgscompoundcurvev2.h" -#include "qgscurvepolygonv2.h" +#include "qgscircularstring.h" +#include "qgscompoundcurve.h" +#include "qgscurvepolygon.h" #include "qgsgeometryrubberband.h" #include "qgsgeometryutils.h" -#include "qgslinestringv2.h" +#include "qgslinestring.h" #include "qgsmapcanvas.h" #include "qgspointv2.h" #include "qgisapp.h" @@ -125,7 +125,7 @@ void QgsMapToolAddCircularString::deactivate() mPoints.removeLast(); } - QgsCircularStringV2* c = new QgsCircularStringV2(); + QgsCircularString* c = new QgsCircularString(); c->setPoints( mPoints ); mParentTool->addCurve( c ); mPoints.clear(); @@ -145,10 +145,10 @@ void QgsMapToolAddCircularString::activate() if ( mPoints.isEmpty() ) { // if the parent tool has a curve, use its last point as the first point in this curve - const QgsCompoundCurveV2* compoundCurve = mParentTool->captureCurve(); + const QgsCompoundCurve* compoundCurve = mParentTool->captureCurve(); if ( compoundCurve && compoundCurve->nCurves() > 0 ) { - const QgsCurveV2* curve = compoundCurve->curveAt( compoundCurve->nCurves() - 1 ); + const QgsCurve* curve = compoundCurve->curveAt( compoundCurve->nCurves() - 1 ); if ( curve ) { //mParentTool->captureCurve() is in layer coordinates, but we need map coordinates @@ -160,8 +160,8 @@ void QgsMapToolAddCircularString::activate() mTempRubberBand = createGeometryRubberBand(( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true ); mTempRubberBand->show(); } - QgsCircularStringV2* c = new QgsCircularStringV2(); - QgsPointSequenceV2 rubberBandPoints = mPoints; + QgsCircularString* c = new QgsCircularString(); + QgsPointSequence rubberBandPoints = mPoints; rubberBandPoints.append( QgsPointV2( mapPoint ) ); c->setPoints( rubberBandPoints ); mTempRubberBand->setGeometry( c ); @@ -184,7 +184,7 @@ void QgsMapToolAddCircularString::createCenterPointRubberBand() if ( mTempRubberBand ) { - const QgsAbstractGeometryV2* rubberBandGeom = mTempRubberBand->geometry(); + const QgsAbstractGeometry* rubberBandGeom = mTempRubberBand->geometry(); if ( rubberBandGeom ) { QgsVertexId idx( 0, 0, 2 ); @@ -207,8 +207,8 @@ void QgsMapToolAddCircularString::updateCenterPointRubberBand( const QgsPointV2& } //create circular string - QgsCircularStringV2* cs = new QgsCircularStringV2(); - QgsPointSequenceV2 csPoints; + QgsCircularString* cs = new QgsCircularString(); + QgsPointSequence csPoints; csPoints.append( mPoints.at( mPoints.size() - 2 ) ); csPoints.append( mPoints.at( mPoints.size() - 1 ) ); csPoints.append( pt ); @@ -218,20 +218,20 @@ void QgsMapToolAddCircularString::updateCenterPointRubberBand( const QgsPointV2& double radius; QgsGeometryUtils::circleCenterRadius( csPoints.at( 0 ), csPoints.at( 1 ), csPoints.at( 2 ), radius, center.rx(), center.ry() ); - QgsLineStringV2* segment1 = new QgsLineStringV2(); + QgsLineString* segment1 = new QgsLineString(); segment1->addVertex( center ); segment1->addVertex( csPoints.at( 0 ) ); - QgsLineStringV2* segment2 = new QgsLineStringV2(); + QgsLineString* segment2 = new QgsLineString(); segment2->addVertex( csPoints.at( 2 ) ); segment2->addVertex( center ); - QgsCompoundCurveV2* cc = new QgsCompoundCurveV2(); + QgsCompoundCurve* cc = new QgsCompoundCurve(); cc->addCurve( segment1 ); cc->addCurve( cs ); cc->addCurve( segment2 ); - QgsCurvePolygonV2* cp = new QgsCurvePolygonV2(); + QgsCurvePolygon* cp = new QgsCurvePolygon(); cp->setExteriorRing( cc ); mCenterPointRubberBand->setGeometry( cp ); mCenterPointRubberBand->show(); diff --git a/src/app/qgsmaptooladdcircularstring.h b/src/app/qgsmaptooladdcircularstring.h index 766fa20088c..d21b9417614 100644 --- a/src/app/qgsmaptooladdcircularstring.h +++ b/src/app/qgsmaptooladdcircularstring.h @@ -45,7 +45,7 @@ class QgsMapToolAddCircularString: public QgsMapToolCapture * */ QgsMapToolCapture* mParentTool; /** Circular string points (in map coordinates)*/ - QgsPointSequenceV2 mPoints; + QgsPointSequence mPoints; //! The rubberband to show the already completed circular strings QgsGeometryRubberBand* mRubberBand; //! The rubberband to show the circular string currently working on diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp index 93e7a626748..44cb915492b 100644 --- a/src/app/qgsmaptooladdfeature.cpp +++ b/src/app/qgsmaptooladdfeature.cpp @@ -17,15 +17,15 @@ #include "qgsapplication.h" #include "qgsattributedialog.h" #include "qgscsexception.h" -#include "qgscurvepolygonv2.h" +#include "qgscurvepolygon.h" #include "qgsfield.h" #include "qgsgeometry.h" -#include "qgslinestringv2.h" -#include "qgsmultipointv2.h" +#include "qgslinestring.h" +#include "qgsmultipoint.h" #include "qgsmapcanvas.h" #include "qgsmaplayerregistry.h" #include "qgsmapmouseevent.h" -#include "qgspolygonv2.h" +#include "qgspolygon.h" #include "qgsproject.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" @@ -241,7 +241,7 @@ void QgsMapToolAddFeature::cadCanvasReleaseEvent( QgsMapMouseEvent* e ) bool hasCurvedSegments = captureCurve()->hasCurvedSegments(); bool providerSupportsCurvedSegments = vlayer->dataProvider()->capabilities() & QgsVectorDataProvider::CircularGeometries; - QgsCurveV2* curveToAdd = nullptr; + QgsCurve* curveToAdd = nullptr; if ( hasCurvedSegments && providerSupportsCurvedSegments ) { curveToAdd = captureCurve()->clone(); @@ -259,10 +259,10 @@ void QgsMapToolAddFeature::cadCanvasReleaseEvent( QgsMapMouseEvent* e ) } else { - QgsCurvePolygonV2* poly = nullptr; + QgsCurvePolygon* poly = nullptr; if ( hasCurvedSegments && providerSupportsCurvedSegments ) { - poly = new QgsCurvePolygonV2(); + poly = new QgsCurvePolygon(); } else { diff --git a/src/app/qgsmaptooladdpart.cpp b/src/app/qgsmaptooladdpart.cpp index 2a9660793dd..7fdcd7f36ec 100644 --- a/src/app/qgsmaptooladdpart.cpp +++ b/src/app/qgsmaptooladdpart.cpp @@ -15,9 +15,9 @@ #include "qgsmaptooladdpart.h" #include "qgsadvanceddigitizingdockwidget.h" -#include "qgscurvepolygonv2.h" +#include "qgscurvepolygon.h" #include "qgsgeometry.h" -#include "qgslinestringv2.h" +#include "qgslinestring.h" #include "qgsmapcanvas.h" #include "qgsproject.h" #include "qgsvectordataprovider.h" @@ -86,7 +86,7 @@ void QgsMapToolAddPart::cadCanvasReleaseEvent( QgsMapMouseEvent * e ) } vlayer->beginEditCommand( tr( "Part added" ) ); - errorCode = vlayer->addPart( QgsPointSequenceV2() << layerPoint ); + errorCode = vlayer->addPart( QgsPointSequence() << layerPoint ); } break; @@ -132,7 +132,7 @@ void QgsMapToolAddPart::cadCanvasReleaseEvent( QgsMapMouseEvent * e ) bool hasCurvedSegments = captureCurve()->hasCurvedSegments(); bool providerSupportsCurvedSegments = vlayer->dataProvider()->capabilities() & QgsVectorDataProvider::CircularGeometries; - QgsCurveV2* curveToAdd = nullptr; + QgsCurve* curveToAdd = nullptr; if ( hasCurvedSegments && providerSupportsCurvedSegments ) { curveToAdd = captureCurve()->clone(); @@ -146,12 +146,12 @@ void QgsMapToolAddPart::cadCanvasReleaseEvent( QgsMapMouseEvent * e ) if ( mode() == CapturePolygon ) { //avoid intersections - QgsCurvePolygonV2* cp = new QgsCurvePolygonV2(); + QgsCurvePolygon* cp = new QgsCurvePolygon(); cp->setExteriorRing( curveToAdd ); QgsGeometry* geom = new QgsGeometry( cp ); geom->avoidIntersections(); - const QgsCurvePolygonV2* cpGeom = dynamic_cast( geom->geometry() ); + const QgsCurvePolygon* cpGeom = dynamic_cast( geom->geometry() ); if ( !cpGeom ) { stopCapturing(); diff --git a/src/app/qgsmaptooladdring.cpp b/src/app/qgsmaptooladdring.cpp index 20d294458d0..1758b9cd175 100644 --- a/src/app/qgsmaptooladdring.cpp +++ b/src/app/qgsmaptooladdring.cpp @@ -17,7 +17,7 @@ #include "qgsmaptooladdring.h" #include "qgsgeometry.h" -#include "qgslinestringv2.h" +#include "qgslinestring.h" #include "qgsmapcanvas.h" #include "qgsproject.h" #include "qgsvectordataprovider.h" @@ -89,7 +89,7 @@ void QgsMapToolAddRing::cadCanvasReleaseEvent( QgsMapMouseEvent * e ) bool hasCurvedSegments = captureCurve()->hasCurvedSegments(); bool providerSupportsCurvedSegments = vlayer->dataProvider()->capabilities() & QgsVectorDataProvider::CircularGeometries; - QgsCurveV2* curveToAdd = nullptr; + QgsCurve* curveToAdd = nullptr; if ( hasCurvedSegments && providerSupportsCurvedSegments ) { curveToAdd = captureCurve()->clone(); diff --git a/src/app/qgsmaptoolcircularstringcurvepoint.cpp b/src/app/qgsmaptoolcircularstringcurvepoint.cpp index a0c45fa1cc8..2230e9afe97 100644 --- a/src/app/qgsmaptoolcircularstringcurvepoint.cpp +++ b/src/app/qgsmaptoolcircularstringcurvepoint.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ #include "qgsmaptoolcircularstringcurvepoint.h" -#include "qgscircularstringv2.h" -#include "qgscompoundcurvev2.h" +#include "qgscircularstring.h" +#include "qgscompoundcurve.h" #include "qgsgeometryrubberband.h" #include "qgsmapcanvas.h" #include "qgspointv2.h" @@ -51,8 +51,8 @@ void QgsMapToolCircularStringCurvePoint::cadCanvasReleaseEvent( QgsMapMouseEvent mTempRubberBand->show(); } - QgsCircularStringV2* c = new QgsCircularStringV2(); - QgsPointSequenceV2 rubberBandPoints = mPoints.mid( mPoints.size() - 1 - ( mPoints.size() + 1 ) % 2 ); + QgsCircularString* c = new QgsCircularString(); + QgsPointSequence rubberBandPoints = mPoints.mid( mPoints.size() - 1 - ( mPoints.size() + 1 ) % 2 ); rubberBandPoints.append( mapPoint ); c->setPoints( rubberBandPoints ); mTempRubberBand->setGeometry( c ); @@ -65,8 +65,8 @@ void QgsMapToolCircularStringCurvePoint::cadCanvasReleaseEvent( QgsMapMouseEvent mRubberBand->show(); } - QgsCircularStringV2* c = new QgsCircularStringV2(); - QgsPointSequenceV2 rubberBandPoints = mPoints; + QgsCircularString* c = new QgsCircularString(); + QgsPointSequence rubberBandPoints = mPoints; rubberBandPoints.append( mapPoint ); c->setPoints( rubberBandPoints ); mRubberBand->setGeometry( c ); diff --git a/src/app/qgsmaptoolcircularstringradius.cpp b/src/app/qgsmaptoolcircularstringradius.cpp index 33d6f7c2f33..150f6b25b3e 100644 --- a/src/app/qgsmaptoolcircularstringradius.cpp +++ b/src/app/qgsmaptoolcircularstringradius.cpp @@ -15,8 +15,8 @@ #include "qgsmaptoolcircularstringradius.h" #include "qgisapp.h" -#include "qgscircularstringv2.h" -#include "qgscompoundcurvev2.h" +#include "qgscircularstring.h" +#include "qgscompoundcurve.h" #include "qgsgeometryutils.h" #include "qgsgeometryrubberband.h" #include "qgsmapcanvas.h" @@ -110,7 +110,7 @@ void QgsMapToolCircularStringRadius::recalculateRubberBand() { if ( mPoints.size() >= 3 ) { - QgsCircularStringV2* cString = new QgsCircularStringV2(); + QgsCircularString* cString = new QgsCircularString(); int rubberBandSize = mPoints.size() - ( mPoints.size() + 1 ) % 2; cString->setPoints( mPoints.mid( 0, rubberBandSize ) ); delete mRubberBand; @@ -122,7 +122,7 @@ void QgsMapToolCircularStringRadius::recalculateRubberBand() void QgsMapToolCircularStringRadius::recalculateTempRubberBand( const QgsPoint& mousePosition ) { - QgsPointSequenceV2 rubberBandPoints; + QgsPointSequence rubberBandPoints; if ( !( mPoints.size() % 2 ) ) { //recalculate midpoint on circle segment @@ -142,7 +142,7 @@ void QgsMapToolCircularStringRadius::recalculateTempRubberBand( const QgsPoint& rubberBandPoints.append( mPoints.last() ); rubberBandPoints.append( QgsPointV2( mousePosition ) ); } - QgsCircularStringV2* cString = new QgsCircularStringV2(); + QgsCircularString* cString = new QgsCircularString(); cString->setPoints( rubberBandPoints ); delete mTempRubberBand; mTempRubberBand = createGeometryRubberBand(( mode() == CapturePolygon ) ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry, true ); diff --git a/src/app/qgsmaptoolidentifyaction.cpp b/src/app/qgsmaptoolidentifyaction.cpp index d5ff0356192..8a4f46b0606 100644 --- a/src/app/qgsmaptoolidentifyaction.cpp +++ b/src/app/qgsmaptoolidentifyaction.cpp @@ -35,7 +35,7 @@ #include "qgsvectorlayer.h" #include "qgsproject.h" #include "qgsmaplayerregistry.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgsunittypes.h" #include diff --git a/src/app/qgsmaptoollabel.cpp b/src/app/qgsmaptoollabel.cpp index 1189e569377..2f3597c9451 100644 --- a/src/app/qgsmaptoollabel.cpp +++ b/src/app/qgsmaptoollabel.cpp @@ -24,7 +24,7 @@ #include "qgsrubberband.h" #include "qgsvectorlayer.h" #include "qgsvectorlayerlabeling.h" -#include "qgsdiagramrendererv2.h" +#include "qgsdiagramrenderer.h" #include QgsMapToolLabel::QgsMapToolLabel( QgsMapCanvas* canvas ) diff --git a/src/app/qgsmaptooloffsetpointsymbol.cpp b/src/app/qgsmaptooloffsetpointsymbol.cpp index c415538b219..4ba161deb5f 100644 --- a/src/app/qgsmaptooloffsetpointsymbol.cpp +++ b/src/app/qgsmaptooloffsetpointsymbol.cpp @@ -17,7 +17,7 @@ #include "qgsapplication.h" #include "qgsmapcanvas.h" #include "qgspointmarkeritem.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgssnappingutils.h" #include "qgssymbol.h" #include "qgsvectorlayer.h" @@ -83,7 +83,7 @@ void QgsMapToolOffsetPointSymbol::canvasPressOnFeature( QgsMapMouseEvent *e, con mOffsetting = true; } -bool QgsMapToolOffsetPointSymbol::checkSymbolCompatibility( QgsMarkerSymbolV2* markerSymbol, QgsRenderContext &context ) +bool QgsMapToolOffsetPointSymbol::checkSymbolCompatibility( QgsMarkerSymbol* markerSymbol, QgsRenderContext &context ) { bool ok = false; @@ -168,7 +168,7 @@ void QgsMapToolOffsetPointSymbol::canvasReleaseEvent( QgsMapMouseEvent* e ) mActiveLayer->triggerRepaint(); } -void QgsMapToolOffsetPointSymbol::createPreviewItem( QgsMarkerSymbolV2* markerSymbol ) +void QgsMapToolOffsetPointSymbol::createPreviewItem( QgsMarkerSymbol* markerSymbol ) { delete mOffsetItem; mOffsetItem = nullptr; @@ -194,7 +194,7 @@ QMap QgsMapToolOffsetPointSymbol::calculateNewOffsetAttributes( c if ( layer->getDataDefinedProperty( "offset" )->useExpression() ) continue; - QgsMarkerSymbolLayerV2* ml = dynamic_cast< QgsMarkerSymbolLayerV2* >( layer ); + QgsMarkerSymbolLayer* ml = dynamic_cast< QgsMarkerSymbolLayer* >( layer ); if ( !ml ) continue; diff --git a/src/app/qgsmaptooloffsetpointsymbol.h b/src/app/qgsmaptooloffsetpointsymbol.h index 21740aee0e5..62dfa8e6492 100644 --- a/src/app/qgsmaptooloffsetpointsymbol.h +++ b/src/app/qgsmaptooloffsetpointsymbol.h @@ -19,7 +19,7 @@ #include "qgsmaptoolpointsymbol.h" #include "qgssymbol.h" -class QgsMarkerSymbolV2; +class QgsMarkerSymbol; class QgsPointMarkerItem; /** \ingroup app @@ -47,7 +47,7 @@ class APP_EXPORT QgsMapToolOffsetPointSymbol: public QgsMapToolPointSymbol protected: virtual void canvasPressOnFeature( QgsMapMouseEvent* e, const QgsFeature& feature, const QgsPoint& snappedPoint ) override; - virtual bool checkSymbolCompatibility( QgsMarkerSymbolV2* markerSymbol, QgsRenderContext& context ) override; + virtual bool checkSymbolCompatibility( QgsMarkerSymbol* markerSymbol, QgsRenderContext& context ) override; virtual void noCompatibleSymbols() override; private: @@ -59,7 +59,7 @@ class APP_EXPORT QgsMapToolOffsetPointSymbol: public QgsMapToolPointSymbol QgsPointMarkerItem* mOffsetItem; //! Clone of first found marker symbol for feature with offset attribute set - QScopedPointer< QgsMarkerSymbolV2 > mMarkerSymbol; + QScopedPointer< QgsMarkerSymbol > mMarkerSymbol; //! Feature which was clicked on QgsFeature mClickedFeature; @@ -71,7 +71,7 @@ class APP_EXPORT QgsMapToolOffsetPointSymbol: public QgsMapToolPointSymbol double mSymbolRotation; //! Create item with the point symbol for a specific feature. This will be used to show the offset to the user. - void createPreviewItem( QgsMarkerSymbolV2 *markerSymbol ); + void createPreviewItem( QgsMarkerSymbol *markerSymbol ); //! Calculates the new values for offset attributes, respecting the symbol's offset units //! @note start and end point are in map units diff --git a/src/app/qgsmaptoolpointsymbol.cpp b/src/app/qgsmaptoolpointsymbol.cpp index c113701b632..2c9c2895c7a 100644 --- a/src/app/qgsmaptoolpointsymbol.cpp +++ b/src/app/qgsmaptoolpointsymbol.cpp @@ -15,7 +15,7 @@ #include "qgsmaptoolpointsymbol.h" #include "qgsfeatureiterator.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgsvectorlayer.h" #include "qgsmapcanvas.h" #include "qgssnappingutils.h" @@ -71,7 +71,7 @@ void QgsMapToolPointSymbol::canvasPressEvent( QgsMapMouseEvent* e ) } //check whether selected feature has a modifiable symbol - QgsFeatureRendererV2* renderer = mActiveLayer->rendererV2(); + QgsFeatureRenderer* renderer = mActiveLayer->renderer(); if ( !renderer ) return; QgsRenderContext context = QgsRenderContext::fromMapSettings( mCanvas->mapSettings() ); @@ -81,14 +81,14 @@ void QgsMapToolPointSymbol::canvasPressEvent( QgsMapMouseEvent* e ) //test whether symbol is compatible with map tool bool hasCompatibleSymbol = false; - if ( renderer->capabilities() & QgsFeatureRendererV2::MoreSymbolsPerFeature ) + if ( renderer->capabilities() & QgsFeatureRenderer::MoreSymbolsPerFeature ) { //could be multiple symbols for this feature, so check them all Q_FOREACH ( QgsSymbol* s, renderer->originalSymbolsForFeature( feature, context ) ) { if ( s && s->type() == QgsSymbol::Marker ) { - hasCompatibleSymbol = hasCompatibleSymbol || checkSymbolCompatibility( static_cast< QgsMarkerSymbolV2* >( s ), context ); + hasCompatibleSymbol = hasCompatibleSymbol || checkSymbolCompatibility( static_cast< QgsMarkerSymbol* >( s ), context ); } } } @@ -97,7 +97,7 @@ void QgsMapToolPointSymbol::canvasPressEvent( QgsMapMouseEvent* e ) QgsSymbol* s = renderer->originalSymbolForFeature( feature, context ); if ( s && s->type() == QgsSymbol::Marker ) { - hasCompatibleSymbol = hasCompatibleSymbol || checkSymbolCompatibility( static_cast< QgsMarkerSymbolV2* >( s ), context ); + hasCompatibleSymbol = hasCompatibleSymbol || checkSymbolCompatibility( static_cast< QgsMarkerSymbol* >( s ), context ); } } diff --git a/src/app/qgsmaptoolpointsymbol.h b/src/app/qgsmaptoolpointsymbol.h index aea9a14a719..360110e83b4 100644 --- a/src/app/qgsmaptoolpointsymbol.h +++ b/src/app/qgsmaptoolpointsymbol.h @@ -19,7 +19,7 @@ #include "qgsmaptooledit.h" #include "qgsfeature.h" -class QgsMarkerSymbolV2; +class QgsMarkerSymbol; /** \ingroup app * \class QgsMapToolPointSymbol @@ -47,7 +47,7 @@ class APP_EXPORT QgsMapToolPointSymbol: public QgsMapToolEdit virtual void canvasPressOnFeature( QgsMapMouseEvent* e, const QgsFeature& feature, const QgsPoint& snappedPoint ) = 0; - virtual bool checkSymbolCompatibility( QgsMarkerSymbolV2* markerSymbol, QgsRenderContext& context ) = 0; + virtual bool checkSymbolCompatibility( QgsMarkerSymbol* markerSymbol, QgsRenderContext& context ) = 0; virtual void noCompatibleSymbols() {} diff --git a/src/app/qgsmaptoolrotatepointsymbols.cpp b/src/app/qgsmaptoolrotatepointsymbols.cpp index 1498b0eca34..72b3d2b0bdf 100644 --- a/src/app/qgsmaptoolrotatepointsymbols.cpp +++ b/src/app/qgsmaptoolrotatepointsymbols.cpp @@ -17,7 +17,7 @@ #include "qgsapplication.h" #include "qgsmapcanvas.h" #include "qgspointrotationitem.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgssnappingutils.h" #include "qgssymbol.h" #include "qgsvectorlayer.h" @@ -93,7 +93,7 @@ void QgsMapToolRotatePointSymbols::canvasPressOnFeature( QgsMapMouseEvent *e, co mRotating = true; } -bool QgsMapToolRotatePointSymbols::checkSymbolCompatibility( QgsMarkerSymbolV2* markerSymbol, QgsRenderContext& ) +bool QgsMapToolRotatePointSymbols::checkSymbolCompatibility( QgsMarkerSymbol* markerSymbol, QgsRenderContext& ) { bool ok = false; if ( markerSymbol->dataDefinedAngle().isActive() && !markerSymbol->dataDefinedAngle().useExpression() ) @@ -210,7 +210,7 @@ double QgsMapToolRotatePointSymbols::calculateAzimut( QPoint mousePos ) return 180 - atan2(( double ) dx, ( double ) dy ) * 180.0 / M_PI; } -void QgsMapToolRotatePointSymbols::createPixmapItem( QgsMarkerSymbolV2* markerSymbol ) +void QgsMapToolRotatePointSymbols::createPixmapItem( QgsMarkerSymbol* markerSymbol ) { if ( !mCanvas ) { @@ -223,7 +223,7 @@ void QgsMapToolRotatePointSymbols::createPixmapItem( QgsMarkerSymbolV2* markerSy if ( markerSymbol ) { QgsSymbol* clone = markerSymbol->clone(); - QgsMarkerSymbolV2* markerClone = static_cast( clone ); + QgsMarkerSymbol* markerClone = static_cast( clone ); markerClone->setDataDefinedAngle( QgsDataDefined() ); pointImage = markerClone->bigSymbolPreviewImage(); delete clone; diff --git a/src/app/qgsmaptoolrotatepointsymbols.h b/src/app/qgsmaptoolrotatepointsymbols.h index 66a50cac88a..82d1db4b2b6 100644 --- a/src/app/qgsmaptoolrotatepointsymbols.h +++ b/src/app/qgsmaptoolrotatepointsymbols.h @@ -19,7 +19,7 @@ #include "qgsmaptoolpointsymbol.h" class QgsPointRotationItem; -class QgsMarkerSymbolV2; +class QgsMarkerSymbol; /** \ingroup app * \class QgsMapToolRotatePointSymbols @@ -45,7 +45,7 @@ class APP_EXPORT QgsMapToolRotatePointSymbols: public QgsMapToolPointSymbol protected: virtual void canvasPressOnFeature( QgsMapMouseEvent* e, const QgsFeature& feature, const QgsPoint& snappedPoint ) override; - virtual bool checkSymbolCompatibility( QgsMarkerSymbolV2* markerSymbol, QgsRenderContext& context ) override; + virtual bool checkSymbolCompatibility( QgsMarkerSymbol* markerSymbol, QgsRenderContext& context ) override; virtual void noCompatibleSymbols() override; private: @@ -61,13 +61,13 @@ class APP_EXPORT QgsMapToolRotatePointSymbols: public QgsMapToolPointSymbol /** True if ctrl was pressed during the last mouse move event*/ bool mCtrlPressed; //! Clone of first found marker symbol for feature with rotation attribute set - QScopedPointer< QgsMarkerSymbolV2 > mMarkerSymbol; + QScopedPointer< QgsMarkerSymbol > mMarkerSymbol; void drawArrow( double azimut ) const; /** Calculates the azimut between mousePos and mSnappedPoint*/ double calculateAzimut( QPoint mousePos ); /** Create item with the point symbol for a specific feature. This will be used to show the rotation to the user*/ - void createPixmapItem( QgsMarkerSymbolV2 *markerSymbol ); + void createPixmapItem( QgsMarkerSymbol *markerSymbol ); /** Sets the rotation of the pixmap item*/ void setPixmapItemRotation( double rotation ); /** Rounds value to 15 degree integer (used if ctrl pressed)*/ diff --git a/src/app/qgsmaptoolselectutils.cpp b/src/app/qgsmaptoolselectutils.cpp index da138e0c180..df03e437a99 100644 --- a/src/app/qgsmaptoolselectutils.cpp +++ b/src/app/qgsmaptoolselectutils.cpp @@ -23,7 +23,7 @@ email : jpalmer at linz dot govt dot nz #include "qgsvectorlayer.h" #include "qgsfeature.h" #include "qgsgeometry.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgsrubberband.h" #include "qgscsexception.h" #include "qgslogger.h" @@ -232,7 +232,7 @@ QgsFeatureIds QgsMapToolSelectUtils::getMatchingFeatures( QgsMapCanvas* canvas, QgsRenderContext context = QgsRenderContext::fromMapSettings( canvas->mapSettings() ); context.expressionContext() << QgsExpressionContextUtils::layerScope( vlayer ); - QgsFeatureRendererV2* r = vlayer->rendererV2(); + QgsFeatureRenderer* r = vlayer->renderer(); if ( r ) r->startRender( context, vlayer->fields() ); diff --git a/src/app/qgspointmarkeritem.cpp b/src/app/qgspointmarkeritem.cpp index 69be402a365..158055436fd 100644 --- a/src/app/qgspointmarkeritem.cpp +++ b/src/app/qgspointmarkeritem.cpp @@ -86,12 +86,12 @@ void QgsPointMarkerItem::setPointLocation( const QgsPoint& p ) mLocation = toCanvasCoordinates( p ); } -void QgsPointMarkerItem::setSymbol( QgsMarkerSymbolV2 *symbol ) +void QgsPointMarkerItem::setSymbol( QgsMarkerSymbol *symbol ) { mMarkerSymbol.reset( symbol ); } -QgsMarkerSymbolV2*QgsPointMarkerItem::symbol() +QgsMarkerSymbol*QgsPointMarkerItem::symbol() { return mMarkerSymbol.data(); } diff --git a/src/app/qgspointmarkeritem.h b/src/app/qgspointmarkeritem.h index a087db813ac..f2400486a50 100644 --- a/src/app/qgspointmarkeritem.h +++ b/src/app/qgspointmarkeritem.h @@ -22,7 +22,7 @@ #include #include -class QgsMarkerSymbolV2; +class QgsMarkerSymbol; /** \ingroup app * \class QgsPointMarkerItem @@ -48,12 +48,12 @@ class APP_EXPORT QgsPointMarkerItem: public QgsMapCanvasItem * @see symbol() * @see updateSize() */ - void setSymbol( QgsMarkerSymbolV2* symbol ); + void setSymbol( QgsMarkerSymbol* symbol ); /** Returns the marker symbol used for rendering the point. * @see setSymbol() */ - QgsMarkerSymbolV2* symbol(); + QgsMarkerSymbol* symbol(); /** Sets the feature used for rendering the marker symbol. The feature's attributes * may affect the rendered symbol if data defined overrides are in place. @@ -90,7 +90,7 @@ class APP_EXPORT QgsPointMarkerItem: public QgsMapCanvasItem private: QgsFeature mFeature; - QScopedPointer< QgsMarkerSymbolV2 > mMarkerSymbol; + QScopedPointer< QgsMarkerSymbol > mMarkerSymbol; QPointF mLocation; QScopedPointer< QgsDrawSourceEffect > mOpacityEffect; diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp index 5285191674f..7932a45629c 100644 --- a/src/app/qgsprojectproperties.cpp +++ b/src/app/qgsprojectproperties.cpp @@ -37,10 +37,10 @@ #include "qgsvectordataprovider.h" #include "qgsscaleutils.h" #include "qgsgenericprojectionselector.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgssymbol.h" -#include "qgsstylev2managerdialog.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsstylemanagerdialog.h" +#include "qgsvectorcolorramp.h" #include "qgssymbolselectordialog.h" #include "qgsrelationmanagerdialog.h" #include "qgsrelationmanager.h" @@ -659,7 +659,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *pa twWCSLayers->verticalHeader()->setResizeMode( QHeaderView::ResizeToContents ); // Default Styles - mStyle = QgsStyleV2::defaultStyle(); + mStyle = QgsStyle::defaultStyle(); populateStyles(); // Color palette @@ -1659,7 +1659,7 @@ void QgsProjectProperties::on_pbnExportScales_clicked() void QgsProjectProperties::populateStyles() { - // Styles - taken from qgsstylev2managerdialog + // Styles - taken from qgsstylemanagerdialog // use QComboBox and QString lists for shorter code QStringList prefList; @@ -1713,7 +1713,7 @@ void QgsProjectProperties::populateStyles() for ( int i = 0; i < colorRamps.count(); ++i ) { QString name = colorRamps[i]; - QgsVectorColorRampV2* ramp = mStyle->colorRamp( name ); + QgsVectorColorRamp* ramp = mStyle->colorRamp( name ); QIcon icon = QgsSymbolLayerUtils::colorRampPreviewIcon( ramp, cboStyleColorRamp->iconSize() ); cboStyleColorRamp->addItem( icon, name ); delete ramp; @@ -1737,7 +1737,7 @@ void QgsProjectProperties::populateStyles() void QgsProjectProperties::on_pbtnStyleManager_clicked() { - QgsStyleV2ManagerDialog dlg( mStyle, this ); + QgsStyleManagerDialog dlg( mStyle, this ); dlg.exec(); populateStyles(); } @@ -1760,7 +1760,7 @@ void QgsProjectProperties::on_pbtnStyleFill_clicked() void QgsProjectProperties::on_pbtnStyleColorRamp_clicked() { // TODO for now just open style manager - // code in QgsStyleV2ManagerDialog::editColorRamp() + // code in QgsStyleManagerDialog::editColorRamp() on_pbtnStyleManager_clicked(); } diff --git a/src/app/qgsprojectproperties.h b/src/app/qgsprojectproperties.h index cc8e8578431..e21b6d62a03 100644 --- a/src/app/qgsprojectproperties.h +++ b/src/app/qgsprojectproperties.h @@ -26,7 +26,7 @@ class QgsMapCanvas; class QgsRelationManagerDialog; -class QgsStyleV2; +class QgsStyle; class QgsExpressionContext; class QgsLayerTreeGroup; @@ -193,7 +193,7 @@ class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui: QgsRelationManagerDialog *mRelationManagerDlg; QgsMapCanvas* mMapCanvas; - QgsStyleV2* mStyle; + QgsStyle* mStyle; void populateStyles(); void editSymbol( QComboBox* cbo ); diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp index 7987a46cfa8..a2a6e018f79 100644 --- a/src/app/qgsvectorlayerproperties.cpp +++ b/src/app/qgsvectorlayerproperties.cpp @@ -28,7 +28,7 @@ #include "qgscontexthelp.h" #include "qgscoordinatetransform.h" #include "qgsdiagramproperties.h" -#include "qgsdiagramrendererv2.h" +#include "qgsdiagramrenderer.h" #include "qgsexpressionbuilderdialog.h" #include "qgsfieldcalculator.h" #include "qgsfieldsproperties.h" @@ -50,7 +50,7 @@ #include "qgsvectordataprovider.h" #include "qgsquerybuilder.h" #include "qgsdatasourceuri.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgsexpressioncontext.h" #include @@ -65,8 +65,8 @@ #include #include -#include "qgsrendererv2propertiesdialog.h" -#include "qgsstylev2.h" +#include "qgsrendererpropertiesdialog.h" +#include "qgsstyle.h" #include "qgssymbologyconversion.h" QgsVectorLayerProperties::QgsVectorLayerProperties( @@ -413,7 +413,7 @@ void QgsVectorLayerProperties::syncToLayer() mSimplifyMaximumScaleComboBox->updateScales( myScalesList ); mSimplifyMaximumScaleComboBox->setScale( 1.0 / simplifyMethod.maximumScale() ); - mForceRasterCheckBox->setChecked( mLayer->rendererV2() && mLayer->rendererV2()->forceRasterRender() ); + mForceRasterCheckBox->setChecked( mLayer->renderer() && mLayer->renderer()->forceRasterRender() ); // load appropriate symbology page (V1 or V2) updateSymbologyPage(); @@ -503,9 +503,9 @@ void QgsVectorLayerProperties::apply() // Apply fields settings mFieldsPropertiesDialog->apply(); - if ( mLayer->rendererV2() ) + if ( mLayer->renderer() ) { - QgsRendererV2PropertiesDialog* dlg = static_cast( widgetStackRenderers->currentWidget() ); + QgsRendererPropertiesDialog* dlg = static_cast( widgetStackRenderers->currentWidget() ); dlg->apply(); } @@ -549,8 +549,8 @@ void QgsVectorLayerProperties::apply() simplifyMethod.setMaximumScale( 1.0 / mSimplifyMaximumScaleComboBox->scale() ); mLayer->setSimplifyMethod( simplifyMethod ); - if ( mLayer->rendererV2() ) - mLayer->rendererV2()->setForceRasterRender( mForceRasterCheckBox->isChecked() ); + if ( mLayer->renderer() ) + mLayer->renderer()->setForceRasterRender( mForceRasterCheckBox->isChecked() ); mOldJoins = mLayer->vectorJoins(); @@ -991,8 +991,11 @@ void QgsVectorLayerProperties::showListOfStylesFromDatabase() QMessageBox::warning( this, tr( "Error occurred retrieving styles from database" ), errorMsg ); return; } - Q_NOWARN_DEPRECATED_PUSH - if ( mLayer->applyNamedStyle( qmlStyle, errorMsg ) ) + + QDomDocument myDocument( "qgis" ); + myDocument.setContent( qmlStyle ); + + if ( mLayer->importNamedStyle( myDocument, errorMsg ) ) { syncToLayer(); } @@ -1002,7 +1005,6 @@ void QgsVectorLayerProperties::showListOfStylesFromDatabase() tr( "The retrieved style is not a valid named style. Error message: %1" ) .arg( errorMsg ) ); } - Q_NOWARN_DEPRECATED_POP } } @@ -1210,9 +1212,9 @@ void QgsVectorLayerProperties::updateSymbologyPage() delete mRendererDialog; mRendererDialog = nullptr; - if ( mLayer->rendererV2() ) + if ( mLayer->renderer() ) { - mRendererDialog = new QgsRendererV2PropertiesDialog( mLayer, QgsStyleV2::defaultStyle(), true, this ); + mRendererDialog = new QgsRendererPropertiesDialog( mLayer, QgsStyle::defaultStyle(), true, this ); mRendererDialog->setDockMode( false ); mRendererDialog->setMapCanvas( QgisApp::instance()->mapCanvas() ); connect( mRendererDialog, SIGNAL( showPanel( QgsPanelWidget* ) ), this, SLOT( openPanel( QgsPanelWidget* ) ) ); diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h index 7a41d22e2c8..a48901054a3 100644 --- a/src/app/qgsvectorlayerproperties.h +++ b/src/app/qgsvectorlayerproperties.h @@ -34,7 +34,7 @@ class QgsVectorLayer; class QgsLabelingWidget; class QgsDiagramProperties; class QgsFieldsProperties; -class QgsRendererV2PropertiesDialog; +class QgsRendererPropertiesDialog; class QgsMapLayerConfigWidgetFactory; class QgsMapLayerConfigWidget; class QgsPanelWidget; @@ -164,7 +164,7 @@ class APP_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private QAction* mActionSaveStyleAs; /** Renderer dialog which is shown*/ - QgsRendererV2PropertiesDialog* mRendererDialog; + QgsRendererPropertiesDialog* mRendererDialog; /** Labeling dialog. If apply is pressed, options are applied to vector's QgsLabel */ QgsLabelingWidget* labelingDialog; /** Actions dialog. If apply is pressed, the actions are stored for later use */ diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index cbb02e64cac..d68a33a01bb 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -17,32 +17,32 @@ SET(QGIS_CORE_SRCS symbology-ng/qgs25drenderer.cpp symbology-ng/qgsarrowsymbollayer.cpp - symbology-ng/qgscategorizedsymbolrendererv2.cpp + symbology-ng/qgscategorizedsymbolrenderer.cpp symbology-ng/qgscolorbrewerpalette.cpp symbology-ng/qgscptcityarchive.cpp - symbology-ng/qgsellipsesymbollayerv2.cpp - symbology-ng/qgsfillsymbollayerv2.cpp - symbology-ng/qgsgeometrygeneratorsymbollayerv2.cpp - symbology-ng/qgsgraduatedsymbolrendererv2.cpp + symbology-ng/qgsellipsesymbollayer.cpp + symbology-ng/qgsfillsymbollayer.cpp + symbology-ng/qgsgeometrygeneratorsymbollayer.cpp + symbology-ng/qgsgraduatedsymbolrenderer.cpp symbology-ng/qgsheatmaprenderer.cpp symbology-ng/qgsinvertedpolygonrenderer.cpp - symbology-ng/qgslegendsymbolitemv2.cpp - symbology-ng/qgslinesymbollayerv2.cpp - symbology-ng/qgsmarkersymbollayerv2.cpp + symbology-ng/qgslegendsymbolitem.cpp + symbology-ng/qgslinesymbollayer.cpp + symbology-ng/qgsmarkersymbollayer.cpp symbology-ng/qgsnullsymbolrenderer.cpp symbology-ng/qgspointdisplacementrenderer.cpp - symbology-ng/qgsrendererv2.cpp - symbology-ng/qgsrendererv2registry.cpp - symbology-ng/qgsrulebasedrendererv2.cpp - symbology-ng/qgssinglesymbolrendererv2.cpp - symbology-ng/qgsstylev2.cpp + symbology-ng/qgsrenderer.cpp + symbology-ng/qgsrendererregistry.cpp + symbology-ng/qgsrulebasedrenderer.cpp + symbology-ng/qgssinglesymbolrenderer.cpp + symbology-ng/qgsstyle.cpp symbology-ng/qgssvgcache.cpp symbology-ng/qgssymbollayer.cpp symbology-ng/qgssymbollayerregistry.cpp symbology-ng/qgssymbollayerutils.cpp symbology-ng/qgssymbologyconversion.cpp symbology-ng/qgssymbol.cpp - symbology-ng/qgsvectorcolorrampv2.cpp + symbology-ng/qgsvectorcolorramp.cpp symbology-ng/qgsvectorfieldsymbollayer.cpp diagram/qgsdiagram.cpp @@ -105,7 +105,7 @@ SET(QGIS_CORE_SRCS qgsdatetimestatisticalsummary.cpp qgsdatumtransformstore.cpp qgsdbfilterproxymodel.cpp - qgsdiagramrendererv2.cpp + qgsdiagramrenderer.cpp qgsdistancearea.cpp qgseditformconfig.cpp qgserror.cpp @@ -127,10 +127,9 @@ SET(QGIS_CORE_SRCS qgsinterval.cpp qgsjsonutils.cpp qgslabelfeature.cpp - qgslabelingenginev2.cpp + qgslabelingengine.cpp qgslabelsearchtree.cpp qgslayerdefinition.cpp - qgslegacyhelpers.cpp qgslegendrenderer.cpp qgslegendsettings.cpp qgslocalec.cpp @@ -330,26 +329,26 @@ SET(QGIS_CORE_SRCS raster/qgssinglebandpseudocolorrenderer.cpp raster/qgshillshaderenderer.cpp - geometry/qgsabstractgeometryv2.cpp - geometry/qgscircularstringv2.cpp - geometry/qgscompoundcurvev2.cpp - geometry/qgscurvepolygonv2.cpp - geometry/qgscurvev2.cpp + geometry/qgsabstractgeometry.cpp + geometry/qgscircularstring.cpp + geometry/qgscompoundcurve.cpp + geometry/qgscurvepolygon.cpp + geometry/qgscurve.cpp geometry/qgsgeometry.cpp - geometry/qgsgeometrycollectionv2.cpp + geometry/qgsgeometrycollection.cpp geometry/qgsgeometryeditutils.cpp geometry/qgsgeometryfactory.cpp geometry/qgsgeometryutils.cpp geometry/qgsgeos.cpp geometry/qgsinternalgeometryengine.cpp - geometry/qgslinestringv2.cpp - geometry/qgsmulticurvev2.cpp - geometry/qgsmultilinestringv2.cpp - geometry/qgsmultipointv2.cpp - geometry/qgsmultipolygonv2.cpp - geometry/qgsmultisurfacev2.cpp + geometry/qgslinestring.cpp + geometry/qgsmulticurve.cpp + geometry/qgsmultilinestring.cpp + geometry/qgsmultipoint.cpp + geometry/qgsmultipolygon.cpp + geometry/qgsmultisurface.cpp geometry/qgspointv2.cpp - geometry/qgspolygonv2.cpp + geometry/qgspolygon.cpp geometry/qgswkbptr.cpp geometry/qgswkbtypes.cpp geometry/qgswkbsimplifierptr.cpp @@ -544,7 +543,7 @@ SET(QGIS_CORE_MOC_HDRS symbology-ng/qgscptcityarchive.h symbology-ng/qgssvgcache.h - symbology-ng/qgsstylev2.h + symbology-ng/qgsstyle.h layertree/qgslayertreegroup.h layertree/qgslayertreelayer.h @@ -630,7 +629,7 @@ SET(QGIS_CORE_HDRS qgsdatetimestatisticalsummary.h qgsdatumtransformstore.h qgsdbfilterproxymodel.h - qgsdiagramrendererv2.h + qgsdiagramrenderer.h qgsdistancearea.h qgseditorwidgetconfig.h qgsfeaturefilterprovider.h @@ -654,9 +653,8 @@ SET(QGIS_CORE_HDRS qgsjsonutils.h qgslayerdefinition.h qgslabelfeature.h - qgslabelingenginev2.h + qgslabelingengine.h qgslabelsearchtree.h - qgslegacyhelpers.h qgslegendrenderer.h qgslegendsettings.h qgslogger.h @@ -806,19 +804,19 @@ SET(QGIS_CORE_HDRS raster/qgshillshaderenderer.h symbology-ng/qgs25drenderer.h - symbology-ng/qgscategorizedsymbolrendererv2.h + symbology-ng/qgscategorizedsymbolrenderer.h symbology-ng/qgscolorbrewerpalette.h - symbology-ng/qgsellipsesymbollayerv2.h - symbology-ng/qgsfillsymbollayerv2.h - symbology-ng/qgsgraduatedsymbolrendererv2.h - symbology-ng/qgslegendsymbolitemv2.h - symbology-ng/qgslinesymbollayerv2.h - symbology-ng/qgsmarkersymbollayerv2.h + symbology-ng/qgsellipsesymbollayer.h + symbology-ng/qgsfillsymbollayer.h + symbology-ng/qgsgraduatedsymbolrenderer.h + symbology-ng/qgslegendsymbolitem.h + symbology-ng/qgslinesymbollayer.h + symbology-ng/qgsmarkersymbollayer.h symbology-ng/qgspointdisplacementrenderer.h - symbology-ng/qgsrendererv2.h - symbology-ng/qgsrendererv2registry.h - symbology-ng/qgsrulebasedrendererv2.h - symbology-ng/qgssinglesymbolrendererv2.h + symbology-ng/qgsrenderer.h + symbology-ng/qgsrendererregistry.h + symbology-ng/qgsrulebasedrenderer.h + symbology-ng/qgssinglesymbolrenderer.h symbology-ng/qgsheatmaprenderer.h symbology-ng/qgsinvertedpolygonrenderer.h symbology-ng/qgsnullsymbolrenderer.h @@ -827,19 +825,19 @@ SET(QGIS_CORE_HDRS symbology-ng/qgssymbollayerutils.h symbology-ng/qgssymbologyconversion.h symbology-ng/qgssymbol.h - symbology-ng/qgsvectorcolorrampv2.h + symbology-ng/qgsvectorcolorramp.h symbology-ng/qgsvectorfieldsymbollayer.h - symbology-ng/qgsgeometrygeneratorsymbollayerv2.h + symbology-ng/qgsgeometrygeneratorsymbollayer.h layertree/qgslayertree.h layertree/qgslayertreeutils.h - geometry/qgsabstractgeometryv2.h - geometry/qgscircularstringv2.h - geometry/qgscompoundcurvev2.h - geometry/qgscurvepolygonv2.h - geometry/qgscurvev2.h - geometry/qgsgeometrycollectionv2.h + geometry/qgsabstractgeometry.h + geometry/qgscircularstring.h + geometry/qgscompoundcurve.h + geometry/qgscurvepolygon.h + geometry/qgscurve.h + geometry/qgsgeometrycollection.h geometry/qgsgeometryeditutils.h geometry/qgsgeometryengine.h geometry/qgsgeometryfactory.h @@ -847,15 +845,15 @@ SET(QGIS_CORE_HDRS geometry/qgsgeometryutils.h geometry/qgsgeos.h geometry/qgsinternalgeometryengine.h - geometry/qgslinestringv2.h - geometry/qgsmulticurvev2.h - geometry/qgsmultilinestringv2.h - geometry/qgsmultipointv2.h - geometry/qgsmultipolygonv2.h - geometry/qgsmultisurfacev2.h + geometry/qgslinestring.h + geometry/qgsmulticurve.h + geometry/qgsmultilinestring.h + geometry/qgsmultipoint.h + geometry/qgsmultipolygon.h + geometry/qgsmultisurface.h geometry/qgspointv2.h - geometry/qgspolygonv2.h - geometry/qgssurfacev2.h + geometry/qgspolygon.h + geometry/qgssurface.h geometry/qgswkbptr.h geometry/qgswkbsimplifierptr.h geometry/qgswkbtypes.h diff --git a/src/core/composer/qgscomposerarrow.cpp b/src/core/composer/qgscomposerarrow.cpp index c282ff68da9..7f56da70fed 100644 --- a/src/core/composer/qgscomposerarrow.cpp +++ b/src/core/composer/qgscomposerarrow.cpp @@ -85,7 +85,7 @@ void QgsComposerArrow::createDefaultLineSymbol() properties.insert( "color", "0,0,0,255" ); properties.insert( "width", "1" ); properties.insert( "capstyle", "square" ); - mLineSymbol = QgsLineSymbolV2::createSimple( properties ); + mLineSymbol = QgsLineSymbol::createSimple( properties ); } void QgsComposerArrow::paint( QPainter* painter, const QStyleOptionGraphicsItem *itemStyle, QWidget *pWidget ) @@ -397,7 +397,7 @@ void QgsComposerArrow::setArrowHeadOutlineWidth( const double width ) adaptItemSceneRect(); } -void QgsComposerArrow::setLineSymbol( QgsLineSymbolV2 *symbol ) +void QgsComposerArrow::setLineSymbol( QgsLineSymbol *symbol ) { delete mLineSymbol; mLineSymbol = symbol; @@ -522,7 +522,7 @@ bool QgsComposerArrow::readXml( const QDomElement& itemElem, const QDomDocument& if ( !lineStyleElem.isNull() ) { delete mLineSymbol; - mLineSymbol = QgsSymbolLayerUtils::loadSymbol( lineStyleElem ); + mLineSymbol = QgsSymbolLayerUtils::loadSymbol( lineStyleElem ); } } else @@ -559,7 +559,7 @@ bool QgsComposerArrow::readXml( const QDomElement& itemElem, const QDomDocument& mArrowHeadOutlineColor = QColor( red, green, blue, alpha ); } properties.insert( "color", QString( "%1,%2,%3,%4" ).arg( red ).arg( green ).arg( blue ).arg( alpha ) ); - mLineSymbol = QgsLineSymbolV2::createSimple( properties ); + mLineSymbol = QgsLineSymbol::createSimple( properties ); } mPen.setColor( mArrowHeadOutlineColor ); diff --git a/src/core/composer/qgscomposerarrow.h b/src/core/composer/qgscomposerarrow.h index 8e45b262d99..70f5543ac23 100644 --- a/src/core/composer/qgscomposerarrow.h +++ b/src/core/composer/qgscomposerarrow.h @@ -22,7 +22,7 @@ #include #include -class QgsLineSymbolV2; +class QgsLineSymbol; /** \ingroup core * An item that draws an arrow between two points. @@ -177,14 +177,14 @@ class CORE_EXPORT QgsComposerArrow: public QgsComposerItem * @see lineSymbol * @note added in 2.5 */ - void setLineSymbol( QgsLineSymbolV2* symbol ); + void setLineSymbol( QgsLineSymbol* symbol ); /** 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() { return mLineSymbol; } + QgsLineSymbol* lineSymbol() { return mLineSymbol; } /** Returns marker mode, which controls how the arrow endpoints are drawn * @returns marker mode @@ -251,7 +251,7 @@ class CORE_EXPORT QgsComposerArrow: public QgsComposerItem */ int mBoundsBehaviour; - QgsLineSymbolV2* mLineSymbol; + QgsLineSymbol* mLineSymbol; /** Adapts the item scene rect to contain the start point, the stop point including the arrow marker and the outline. * Needs to be called whenever the arrow width/height, the outline with or the endpoints are changed diff --git a/src/core/composer/qgscomposerattributetablemodelv2.cpp b/src/core/composer/qgscomposerattributetablemodelv2.cpp index 0b16da62898..e7ccb3401e7 100644 --- a/src/core/composer/qgscomposerattributetablemodelv2.cpp +++ b/src/core/composer/qgscomposerattributetablemodelv2.cpp @@ -21,7 +21,7 @@ #include "qgscomposertablecolumn.h" -//QgsComposerAttributeTableColumnModelV2V2 +//QgsComposerAttributeTableColumnModelV2 QgsComposerAttributeTableColumnModelV2::QgsComposerAttributeTableColumnModelV2( QgsComposerAttributeTableV2 *composerTable, QObject *parent ) : QAbstractTableModel( parent ) , mComposerTable( composerTable ) @@ -441,7 +441,7 @@ bool QgsComposerAttributeTableColumnModelV2::moveColumnInSortRank( QgsComposerTa -//QgsComposerTableSortColumnsProxyModelV2V2 +//QgsComposerTableSortColumnsProxyModelV2 QgsComposerTableSortColumnsProxyModelV2::QgsComposerTableSortColumnsProxyModelV2( QgsComposerAttributeTableV2 *composerTable, ColumnFilterType filterType, QObject *parent ) : QSortFilterProxyModel( parent ) diff --git a/src/core/composer/qgscomposerlegenditem.cpp b/src/core/composer/qgscomposerlegenditem.cpp index 58616f4bc74..2408d87bc0b 100644 --- a/src/core/composer/qgscomposerlegenditem.cpp +++ b/src/core/composer/qgscomposerlegenditem.cpp @@ -20,7 +20,7 @@ #include "qgscomposerlegend.h" #include "qgsmaplayerregistry.h" #include "qgsrasterlayer.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgssymbol.h" #include "qgssymbollayerutils.h" #include "qgsvectorlayer.h" @@ -62,44 +62,44 @@ void QgsComposerLegendItem::writeXmlChildren( QDomElement& elem, QDomDocument& d } -////////////////QgsComposerSymbolV2Item +////////////////QgsComposerSymbolItem -QgsComposerSymbolV2Item::QgsComposerSymbolV2Item(): QgsComposerLegendItem( QgsComposerLegendStyle::Symbol ), mSymbolV2( nullptr ) +QgsComposerSymbolItem::QgsComposerSymbolItem(): QgsComposerLegendItem( QgsComposerLegendStyle::Symbol ), mSymbol( nullptr ) { } -QgsComposerSymbolV2Item::QgsComposerSymbolV2Item( const QString& text ): QgsComposerLegendItem( text, QgsComposerLegendStyle::Symbol ), mSymbolV2( nullptr ) +QgsComposerSymbolItem::QgsComposerSymbolItem( const QString& text ): QgsComposerLegendItem( text, QgsComposerLegendStyle::Symbol ), mSymbol( nullptr ) { } -QgsComposerSymbolV2Item::QgsComposerSymbolV2Item( const QIcon& icon, const QString& text ): QgsComposerLegendItem( icon, text, QgsComposerLegendStyle::Symbol ), mSymbolV2( nullptr ) +QgsComposerSymbolItem::QgsComposerSymbolItem( const QIcon& icon, const QString& text ): QgsComposerLegendItem( icon, text, QgsComposerLegendStyle::Symbol ), mSymbol( nullptr ) { } -QgsComposerSymbolV2Item::~QgsComposerSymbolV2Item() +QgsComposerSymbolItem::~QgsComposerSymbolItem() { - delete mSymbolV2; + delete mSymbol; } -QStandardItem* QgsComposerSymbolV2Item::clone() const +QStandardItem* QgsComposerSymbolItem::clone() const { - QgsComposerSymbolV2Item* cloneItem = new QgsComposerSymbolV2Item(); + QgsComposerSymbolItem* cloneItem = new QgsComposerSymbolItem(); *cloneItem = *this; - if ( mSymbolV2 ) + if ( mSymbol ) { - cloneItem->setSymbolV2( mSymbolV2->clone() ); + cloneItem->setSymbol( mSymbol->clone() ); } return cloneItem; } -void QgsComposerSymbolV2Item::writeXml( QDomElement& elem, QDomDocument& doc ) const +void QgsComposerSymbolItem::writeXml( QDomElement& elem, QDomDocument& doc ) const { QDomElement vectorClassElem = doc.createElement( "VectorClassificationItemNg" ); - if ( mSymbolV2 ) + if ( mSymbol ) { QgsSymbolMap saveSymbolMap; - saveSymbolMap.insert( "classificationSymbol", mSymbolV2 ); + saveSymbolMap.insert( "classificationSymbol", mSymbol ); QDomElement symbolsElem = QgsSymbolLayerUtils::saveSymbols( saveSymbolMap, "symbols", doc ); vectorClassElem.appendChild( symbolsElem ); } @@ -108,7 +108,7 @@ void QgsComposerSymbolV2Item::writeXml( QDomElement& elem, QDomDocument& doc ) c elem.appendChild( vectorClassElem ); } -void QgsComposerSymbolV2Item::readXml( const QDomElement& itemElem, bool xServerAvailable ) +void QgsComposerSymbolItem::readXml( const QDomElement& itemElem, bool xServerAvailable ) { if ( itemElem.isNull() ) { @@ -128,7 +128,7 @@ void QgsComposerSymbolV2Item::readXml( const QDomElement& itemElem, bool xServer QgsSymbol* symbolNg = mapIt.value(); if ( symbolNg ) { - setSymbolV2( symbolNg ); + setSymbol( symbolNg ); if ( xServerAvailable ) { setIcon( QgsSymbolLayerUtils::symbolPreviewIcon( symbolNg, QSize( 30, 30 ) ) ); @@ -138,10 +138,10 @@ void QgsComposerSymbolV2Item::readXml( const QDomElement& itemElem, bool xServer } } -void QgsComposerSymbolV2Item::setSymbolV2( QgsSymbol* s ) +void QgsComposerSymbolItem::setSymbol( QgsSymbol* s ) { - delete mSymbolV2; - mSymbolV2 = s; + delete mSymbol; + mSymbol = s; } ////////////////////QgsComposerRasterSymbolItem @@ -270,7 +270,7 @@ void QgsComposerLayerItem::readXml( const QDomElement& itemElem, bool xServerAva } else if ( elemTag == "VectorClassificationItemNg" ) { - currentChildItem = new QgsComposerSymbolV2Item(); + currentChildItem = new QgsComposerSymbolItem(); } else if ( elemTag == "RasterClassificationItem" ) { @@ -291,7 +291,7 @@ void QgsComposerLayerItem::setDefaultStyle( double scaleDenominator, const QStri QgsVectorLayer* vLayer = qobject_cast( QgsMapLayerRegistry::instance()->mapLayer( layerId() ) ); if ( vLayer ) { - QgsFeatureRendererV2* renderer = vLayer->rendererV2(); + QgsFeatureRenderer* renderer = vLayer->renderer(); if ( renderer ) { QPair symbolItem = renderer->legendSymbolItems( scaleDenominator, rule ).value( 0 ); diff --git a/src/core/composer/qgscomposerlegenditem.h b/src/core/composer/qgscomposerlegenditem.h index 02e2235d6ed..3a0539e6ff3 100644 --- a/src/core/composer/qgscomposerlegenditem.h +++ b/src/core/composer/qgscomposerlegenditem.h @@ -73,15 +73,15 @@ class CORE_EXPORT QgsComposerLegendItem: public QStandardItem class QgsSymbol; /** \ingroup core - * \class QgsComposerSymbolV2Item + * \class QgsComposerSymbolItem */ -class CORE_EXPORT QgsComposerSymbolV2Item: public QgsComposerLegendItem +class CORE_EXPORT QgsComposerSymbolItem: public QgsComposerLegendItem { 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 override; @@ -89,13 +89,13 @@ class CORE_EXPORT QgsComposerSymbolV2Item: public QgsComposerLegendItem virtual void readXml( const QDomElement& itemElem, bool xServerAvailable = true ) override; /** Set symbol (takes ownership)*/ - void setSymbolV2( QgsSymbol* s ); - QgsSymbol* symbolV2() {return mSymbolV2;} + void setSymbol( QgsSymbol* s ); + QgsSymbol* symbol() {return mSymbol;} ItemType itemType() const override { return SymbologyV2Item; } private: - QgsSymbol* mSymbolV2; + QgsSymbol* mSymbol; }; /** \ingroup core diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp index 2c428bdb6d1..5e8078a43e5 100644 --- a/src/core/composer/qgscomposermap.cpp +++ b/src/core/composer/qgscomposermap.cpp @@ -1504,11 +1504,11 @@ bool QgsComposerMap::readXml( const QDomElement& itemElem, const QDomDocument& d mapGrid->setFrameFillColor2( QgsSymbolLayerUtils::decodeColor( gridElem.attribute( "frameFillColor2", "0,0,0,255" ) ) ); mapGrid->setBlendMode( QgsPainting::getCompositionMode( static_cast< QgsPainting::BlendMode >( itemElem.attribute( "gridBlendMode", "0" ).toUInt() ) ) ); QDomElement gridSymbolElem = gridElem.firstChildElement( "symbol" ); - QgsLineSymbolV2* lineSymbol = nullptr; + QgsLineSymbol* lineSymbol = nullptr; if ( gridSymbolElem.isNull() ) { //old project file, read penWidth /penColorRed, penColorGreen, penColorBlue - lineSymbol = QgsLineSymbolV2::createSimple( QgsStringMap() ); + lineSymbol = QgsLineSymbol::createSimple( QgsStringMap() ); lineSymbol->setWidth( gridElem.attribute( "penWidth", "0" ).toDouble() ); lineSymbol->setColor( QColor( gridElem.attribute( "penColorRed", "0" ).toInt(), gridElem.attribute( "penColorGreen", "0" ).toInt(), @@ -1516,7 +1516,7 @@ bool QgsComposerMap::readXml( const QDomElement& itemElem, const QDomDocument& d } else { - lineSymbol = QgsSymbolLayerUtils::loadSymbol( gridSymbolElem ); + lineSymbol = QgsSymbolLayerUtils::loadSymbol( gridSymbolElem ); } mapGrid->setLineSymbol( lineSymbol ); @@ -1557,11 +1557,11 @@ bool QgsComposerMap::readXml( const QDomElement& itemElem, const QDomDocument& d mapOverview->setInverted( overviewFrameElem.attribute( "overviewInverted" ).compare( "true", Qt::CaseInsensitive ) == 0 ); mapOverview->setCentered( overviewFrameElem.attribute( "overviewCentered" ).compare( "true", Qt::CaseInsensitive ) == 0 ); - QgsFillSymbolV2* fillSymbol = nullptr; + QgsFillSymbol* fillSymbol = nullptr; QDomElement overviewFrameSymbolElem = overviewFrameElem.firstChildElement( "symbol" ); if ( !overviewFrameSymbolElem.isNull() ) { - fillSymbol = QgsSymbolLayerUtils::loadSymbol( overviewFrameSymbolElem ); + fillSymbol = QgsSymbolLayerUtils::loadSymbol( overviewFrameSymbolElem ); mapOverview->setFrameSymbol( fillSymbol ); } mOverviewStack->addOverview( mapOverview ); @@ -1768,7 +1768,7 @@ QPen QgsComposerMap::gridPen() const QPen p; if ( g->lineSymbol() ) { - QgsLineSymbolV2* line = g->lineSymbol()->clone(); + QgsLineSymbol* line = g->lineSymbol()->clone(); if ( !line ) { return p; @@ -2237,13 +2237,13 @@ void QgsComposerMap::refreshDataDefinedProperty( const QgsComposerObject::DataDe QgsComposerItem::refreshDataDefinedProperty( property, evalContext ); } -void QgsComposerMap::setOverviewFrameMapSymbol( QgsFillSymbolV2* symbol ) +void QgsComposerMap::setOverviewFrameMapSymbol( QgsFillSymbol* symbol ) { QgsComposerMapOverview* o = overview(); o->setFrameSymbol( symbol ); } -QgsFillSymbolV2 *QgsComposerMap::overviewFrameMapSymbol() +QgsFillSymbol *QgsComposerMap::overviewFrameMapSymbol() { QgsComposerMapOverview* o = overview(); return o->frameSymbol(); @@ -2286,13 +2286,13 @@ void QgsComposerMap::setOverviewCentered( bool centered ) //overviewExtentChanged(); } -void QgsComposerMap::setGridLineSymbol( QgsLineSymbolV2* symbol ) +void QgsComposerMap::setGridLineSymbol( QgsLineSymbol* symbol ) { QgsComposerMapGrid* g = grid(); g->setLineSymbol( symbol ); } -QgsLineSymbolV2* QgsComposerMap::gridLineSymbol() +QgsLineSymbol* QgsComposerMap::gridLineSymbol() { QgsComposerMapGrid* g = grid(); return g->lineSymbol(); diff --git a/src/core/composer/qgscomposermap.h b/src/core/composer/qgscomposermap.h index fa1c3e3b5a4..420d938c226 100644 --- a/src/core/composer/qgscomposermap.h +++ b/src/core/composer/qgscomposermap.h @@ -33,8 +33,8 @@ class QDomNode; class QDomDocument; class QGraphicsView; class QPainter; -class QgsFillSymbolV2; -class QgsLineSymbolV2; +class QgsFillSymbol; +class QgsLineSymbol; class QgsVectorLayer; class QgsAnnotation; @@ -549,12 +549,12 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem /** * @deprecated use grid()->setLineSymbol() or grids() instead */ - Q_DECL_DEPRECATED void setGridLineSymbol( QgsLineSymbolV2* symbol ); + Q_DECL_DEPRECATED void setGridLineSymbol( QgsLineSymbol* symbol ); /** * @deprecated use grid()->lineSymbol() or grids() instead */ - Q_DECL_DEPRECATED QgsLineSymbolV2* gridLineSymbol(); + Q_DECL_DEPRECATED QgsLineSymbol* gridLineSymbol(); /** Returns the grid's blending mode * @deprecated use grid()->blendMode() or grids() instead @@ -651,12 +651,12 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem /** * @deprecated use overview()->setFrameSymbol() or overviews() instead */ - Q_DECL_DEPRECATED void setOverviewFrameMapSymbol( QgsFillSymbolV2* symbol ); + Q_DECL_DEPRECATED void setOverviewFrameMapSymbol( QgsFillSymbol* symbol ); /** * @deprecated use overview()->frameSymbol() or overviews() instead */ - Q_DECL_DEPRECATED QgsFillSymbolV2* overviewFrameMapSymbol(); + Q_DECL_DEPRECATED QgsFillSymbol* overviewFrameMapSymbol(); /** Returns the overview's blending mode * @deprecated use overview()->blendMode() or overviews() instead diff --git a/src/core/composer/qgscomposermapgrid.cpp b/src/core/composer/qgscomposermapgrid.cpp index a595e0b2157..7991e382926 100644 --- a/src/core/composer/qgscomposermapgrid.cpp +++ b/src/core/composer/qgscomposermapgrid.cpp @@ -244,7 +244,7 @@ void QgsComposerMapGrid::createDefaultGridLineSymbol() properties.insert( "color", "0,0,0,255" ); properties.insert( "width", "0.3" ); properties.insert( "capstyle", "flat" ); - mGridLineSymbol = QgsLineSymbolV2::createSimple( properties ); + mGridLineSymbol = QgsLineSymbol::createSimple( properties ); } void QgsComposerMapGrid::createDefaultGridMarkerSymbol() @@ -254,7 +254,7 @@ void QgsComposerMapGrid::createDefaultGridMarkerSymbol() properties.insert( "name", "circle" ); properties.insert( "size", "2.0" ); properties.insert( "color", "0,0,0,255" ); - mGridMarkerSymbol = QgsMarkerSymbolV2::createSimple( properties ); + mGridMarkerSymbol = QgsMarkerSymbol::createSimple( properties ); } void QgsComposerMapGrid::setGridLineWidth( const double width ) @@ -377,13 +377,13 @@ bool QgsComposerMapGrid::readXml( const QDomElement& itemElem, const QDomDocumen if ( !symbolElem.isNull() ) { delete mGridLineSymbol; - mGridLineSymbol = QgsSymbolLayerUtils::loadSymbol( symbolElem ); + mGridLineSymbol = QgsSymbolLayerUtils::loadSymbol( symbolElem ); } } else { //old project file, read penWidth /penColorRed, penColorGreen, penColorBlue - mGridLineSymbol = QgsLineSymbolV2::createSimple( QgsStringMap() ); + mGridLineSymbol = QgsLineSymbol::createSimple( QgsStringMap() ); mGridLineSymbol->setWidth( itemElem.attribute( "penWidth", "0" ).toDouble() ); mGridLineSymbol->setColor( QColor( itemElem.attribute( "penColorRed", "0" ).toInt(), itemElem.attribute( "penColorGreen", "0" ).toInt(), @@ -397,7 +397,7 @@ bool QgsComposerMapGrid::readXml( const QDomElement& itemElem, const QDomDocumen if ( !symbolElem.isNull() ) { delete mGridMarkerSymbol; - mGridMarkerSymbol = QgsSymbolLayerUtils::loadSymbol( symbolElem ); + mGridMarkerSymbol = QgsSymbolLayerUtils::loadSymbol( symbolElem ); } } @@ -2010,13 +2010,13 @@ QgsComposerMapGrid::BorderSide QgsComposerMapGrid::borderForLineCoord( QPointF p return distanceToSide.at( 0 ).second; } -void QgsComposerMapGrid::setLineSymbol( QgsLineSymbolV2* symbol ) +void QgsComposerMapGrid::setLineSymbol( QgsLineSymbol* symbol ) { delete mGridLineSymbol; mGridLineSymbol = symbol; } -void QgsComposerMapGrid::setMarkerSymbol( QgsMarkerSymbolV2 *symbol ) +void QgsComposerMapGrid::setMarkerSymbol( QgsMarkerSymbol *symbol ) { delete mGridMarkerSymbol; mGridMarkerSymbol = symbol; diff --git a/src/core/composer/qgscomposermapgrid.h b/src/core/composer/qgscomposermapgrid.h index 020de5d2d19..49f4b99dcb7 100644 --- a/src/core/composer/qgscomposermapgrid.h +++ b/src/core/composer/qgscomposermapgrid.h @@ -25,8 +25,8 @@ #include class QgsCoordinateTransform; -class QgsLineSymbolV2; -class QgsMarkerSymbolV2; +class QgsLineSymbol; +class QgsMarkerSymbol; class QgsComposerMapGrid; class QgsComposerMap; class QDomDocument; @@ -482,7 +482,7 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem * @see setMarkerSymbol * @see setStyle */ - void setLineSymbol( QgsLineSymbolV2* symbol ); + void setLineSymbol( QgsLineSymbol* symbol ); /** Gets the line symbol used for drawing grid lines. This is only used for grids with * QgsComposerMapGrid::Solid or QgsComposerMapGrid::Cross styles. @@ -492,7 +492,7 @@ class CORE_EXPORT QgsComposerMapGrid : public 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. @@ -501,7 +501,7 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem * @see markerSymbol * @see style */ - QgsLineSymbolV2* lineSymbol() { return mGridLineSymbol; } + QgsLineSymbol* lineSymbol() { return mGridLineSymbol; } /** Sets the marker symbol used for drawing grid points. This is only used for grids with a * QgsComposerMapGrid::Markers style. @@ -510,7 +510,7 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem * @see setLineSymbol * @see setStyle */ - void setMarkerSymbol( QgsMarkerSymbolV2* symbol ); + void setMarkerSymbol( QgsMarkerSymbol* symbol ); /** Gets the marker symbol used for drawing grid points. This is only used for grids with a * QgsComposerMapGrid::Markers style. @@ -520,7 +520,7 @@ class CORE_EXPORT QgsComposerMapGrid : public 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. @@ -529,7 +529,7 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem * @see lineSymbol * @see style */ - QgsMarkerSymbolV2* markerSymbol() { return mGridMarkerSymbol; } + QgsMarkerSymbol* markerSymbol() { return mGridMarkerSymbol; } // // ANNOTATIONS @@ -921,8 +921,8 @@ class CORE_EXPORT QgsComposerMapGrid : public QgsComposerMapItem /** Divisions for frame on bottom map side*/ DisplayMode mBottomFrameDivisions; - QgsLineSymbolV2* mGridLineSymbol; - QgsMarkerSymbolV2* mGridMarkerSymbol; + QgsLineSymbol* mGridLineSymbol; + QgsMarkerSymbol* mGridMarkerSymbol; QgsCoordinateReferenceSystem mCRS; diff --git a/src/core/composer/qgscomposermapoverview.cpp b/src/core/composer/qgscomposermapoverview.cpp index 01f54dda8ab..51d352462f4 100644 --- a/src/core/composer/qgscomposermapoverview.cpp +++ b/src/core/composer/qgscomposermapoverview.cpp @@ -53,7 +53,7 @@ void QgsComposerMapOverview::createDefaultFrameSymbol() properties.insert( "color", "255,0,0,255" ); properties.insert( "style", "solid" ); properties.insert( "style_border", "no" ); - mFrameSymbol = QgsFillSymbolV2::createSimple( properties ); + mFrameSymbol = QgsFillSymbol::createSimple( properties ); mFrameSymbol->setAlpha( 0.3 ); } @@ -193,7 +193,7 @@ bool QgsComposerMapOverview::readXml( const QDomElement &itemElem, const QDomDoc if ( !frameStyleElem.isNull() ) { delete mFrameSymbol; - mFrameSymbol = QgsSymbolLayerUtils::loadSymbol( frameStyleElem ); + mFrameSymbol = QgsSymbolLayerUtils::loadSymbol( frameStyleElem ); } return ok; } @@ -242,7 +242,7 @@ void QgsComposerMapOverview::connectSignals() } } -void QgsComposerMapOverview::setFrameSymbol( QgsFillSymbolV2 *symbol ) +void QgsComposerMapOverview::setFrameSymbol( QgsFillSymbol *symbol ) { delete mFrameSymbol; mFrameSymbol = symbol; diff --git a/src/core/composer/qgscomposermapoverview.h b/src/core/composer/qgscomposermapoverview.h index b2ca18f0f74..635dd3d9ec8 100644 --- a/src/core/composer/qgscomposermapoverview.h +++ b/src/core/composer/qgscomposermapoverview.h @@ -25,7 +25,7 @@ class QDomDocument; class QDomElement; -class QgsFillSymbolV2; +class QgsFillSymbol; class QgsComposerMapOverview; /** \ingroup core @@ -182,20 +182,20 @@ class CORE_EXPORT QgsComposerMapOverview : public QgsComposerMapItem * @param symbol fill symbol for overview * @see frameSymbol */ - void setFrameSymbol( QgsFillSymbolV2* symbol ); + void setFrameSymbol( QgsFillSymbol* symbol ); /** Gets the fill symbol used for drawing the overview extent. * @returns fill symbol for overview * @see setFrameSymbol */ - QgsFillSymbolV2* frameSymbol() { return mFrameSymbol; } + QgsFillSymbol* frameSymbol() { return mFrameSymbol; } /** 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 @@ -254,7 +254,7 @@ class CORE_EXPORT QgsComposerMapOverview : public QgsComposerMapItem int mFrameMapId; /** Drawing style for overview farme*/ - QgsFillSymbolV2* mFrameSymbol; + QgsFillSymbol* mFrameSymbol; /** Blend mode for overview*/ QPainter::CompositionMode mBlendMode; diff --git a/src/core/composer/qgscomposernodesitem.cpp b/src/core/composer/qgscomposernodesitem.cpp index d155db1f5d8..f84a923c9ed 100644 --- a/src/core/composer/qgscomposernodesitem.cpp +++ b/src/core/composer/qgscomposernodesitem.cpp @@ -136,8 +136,8 @@ void QgsComposerNodesItem::drawNodes( QPainter *painter ) const properties.insert( "name", "cross" ); properties.insert( "color_border", "red" ); - QScopedPointer symbol; - symbol.reset( QgsMarkerSymbolV2::createSimple( properties ) ); + QScopedPointer symbol; + symbol.reset( QgsMarkerSymbol::createSimple( properties ) ); symbol.data()->setSize( rectSize ); symbol.data()->setAngle( 45 ); @@ -173,8 +173,8 @@ void QgsComposerNodesItem::drawSelectedNode( QPainter *painter ) const properties.insert( "color_border", "blue" ); properties.insert( "width_border", "4" ); - QScopedPointer symbol; - symbol.reset( QgsMarkerSymbolV2::createSimple( properties ) ); + QScopedPointer symbol; + symbol.reset( QgsMarkerSymbol::createSimple( properties ) ); symbol.data()->setSize( rectSize ); QgsMapSettings ms = mComposition->mapSettings(); diff --git a/src/core/composer/qgscomposerpolygon.cpp b/src/core/composer/qgscomposerpolygon.cpp index 5a790da4539..812be8e0710 100644 --- a/src/core/composer/qgscomposerpolygon.cpp +++ b/src/core/composer/qgscomposerpolygon.cpp @@ -59,7 +59,7 @@ void QgsComposerPolygon::createDefaultPolygonStyleSymbol() properties.insert( "width_border", "0.3" ); properties.insert( "joinstyle", "miter" ); - mPolygonStyleSymbol.reset( QgsFillSymbolV2::createSimple( properties ) ); + mPolygonStyleSymbol.reset( QgsFillSymbol::createSimple( properties ) ); emit frameChanged(); } @@ -104,12 +104,12 @@ void QgsComposerPolygon::_draw( QPainter *painter ) void QgsComposerPolygon::_readXmlStyle( const QDomElement &elmt ) { - mPolygonStyleSymbol.reset( QgsSymbolLayerUtils::loadSymbol( elmt ) ); + mPolygonStyleSymbol.reset( QgsSymbolLayerUtils::loadSymbol( elmt ) ); } -void QgsComposerPolygon::setPolygonStyleSymbol( QgsFillSymbolV2* symbol ) +void QgsComposerPolygon::setPolygonStyleSymbol( QgsFillSymbol* symbol ) { - mPolygonStyleSymbol.reset( static_cast( symbol->clone() ) ); + mPolygonStyleSymbol.reset( static_cast( symbol->clone() ) ); update(); emit frameChanged(); } diff --git a/src/core/composer/qgscomposerpolygon.h b/src/core/composer/qgscomposerpolygon.h index 89ced63b14a..ea157a4fb37 100644 --- a/src/core/composer/qgscomposerpolygon.h +++ b/src/core/composer/qgscomposerpolygon.h @@ -21,7 +21,7 @@ #include #include -class QgsFillSymbolV2; +class QgsFillSymbol; /** \ingroup core * Composer item for polygons. @@ -52,10 +52,10 @@ class CORE_EXPORT QgsComposerPolygon: public QgsComposerNodesItem virtual QString displayName() const override; /** Returns the QgsSymbol used to draw the shape. */ - QgsFillSymbolV2* polygonStyleSymbol() { return mPolygonStyleSymbol.data(); } + QgsFillSymbol* polygonStyleSymbol() { return mPolygonStyleSymbol.data(); } /** 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 override { return ComposerPolygon; } @@ -63,7 +63,7 @@ class CORE_EXPORT QgsComposerPolygon: public QgsComposerNodesItem protected: /** QgsSymbol use to draw the shape. */ - QScopedPointer mPolygonStyleSymbol; + QScopedPointer mPolygonStyleSymbol; /** Add the node newPoint at the given position according to some * criteres. */ diff --git a/src/core/composer/qgscomposerpolyline.cpp b/src/core/composer/qgscomposerpolyline.cpp index d014fa795ec..cd6e6b9db3d 100644 --- a/src/core/composer/qgscomposerpolyline.cpp +++ b/src/core/composer/qgscomposerpolyline.cpp @@ -87,7 +87,7 @@ void QgsComposerPolyline::createDefaultPolylineStyleSymbol() properties.insert( "width", "0.3" ); properties.insert( "capstyle", "square" ); - mPolylineStyleSymbol.reset( QgsLineSymbolV2::createSimple( properties ) ); + mPolylineStyleSymbol.reset( QgsLineSymbol::createSimple( properties ) ); emit frameChanged(); } @@ -126,12 +126,12 @@ void QgsComposerPolyline::_draw( QPainter *painter ) void QgsComposerPolyline::_readXmlStyle( const QDomElement &elmt ) { - mPolylineStyleSymbol.reset( QgsSymbolLayerUtils::loadSymbol( elmt ) ); + mPolylineStyleSymbol.reset( QgsSymbolLayerUtils::loadSymbol( elmt ) ); } -void QgsComposerPolyline::setPolylineStyleSymbol( QgsLineSymbolV2* symbol ) +void QgsComposerPolyline::setPolylineStyleSymbol( QgsLineSymbol* symbol ) { - mPolylineStyleSymbol.reset( static_cast( symbol->clone() ) ); + mPolylineStyleSymbol.reset( static_cast( symbol->clone() ) ); update(); emit frameChanged(); } diff --git a/src/core/composer/qgscomposerpolyline.h b/src/core/composer/qgscomposerpolyline.h index e411d480191..d9472f17c79 100644 --- a/src/core/composer/qgscomposerpolyline.h +++ b/src/core/composer/qgscomposerpolyline.h @@ -21,7 +21,7 @@ #include #include -class QgsLineSymbolV2; +class QgsLineSymbol; /** \ingroup core * Composer item for polylines. @@ -51,10 +51,10 @@ class CORE_EXPORT QgsComposerPolyline: public QgsComposerNodesItem virtual QString displayName() const override; /** Returns the QgsSymbol used to draw the shape. */ - QgsLineSymbolV2* polylineStyleSymbol() { return mPolylineStyleSymbol.data(); } + QgsLineSymbol* polylineStyleSymbol() { return mPolylineStyleSymbol.data(); } /** 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 override { return ComposerPolyline; } @@ -62,7 +62,7 @@ class CORE_EXPORT QgsComposerPolyline: public QgsComposerNodesItem protected: /** QgsSymbol use to draw the shape. */ - QScopedPointer mPolylineStyleSymbol; + QScopedPointer mPolylineStyleSymbol; /** Add the node newPoint at the given position according to some * criteres. */ diff --git a/src/core/composer/qgscomposershape.cpp b/src/core/composer/qgscomposershape.cpp index 71110b55028..0b0d88e8886 100644 --- a/src/core/composer/qgscomposershape.cpp +++ b/src/core/composer/qgscomposershape.cpp @@ -27,7 +27,7 @@ QgsComposerShape::QgsComposerShape( QgsComposition* composition ) : QgsComposerItem( composition ) , mShape( Ellipse ) , mCornerRadius( 0 ) - , mUseSymbolV2( false ) //default to not using SymbolV2 for shapes, to preserve 2.0 api + , mUseSymbol( false ) //default to not using symbol for shapes, to preserve 2.0 api , mShapeStyleSymbol( nullptr ) , mMaxSymbolBleed( 0 ) { @@ -46,7 +46,7 @@ QgsComposerShape::QgsComposerShape( qreal x, qreal y, qreal width, qreal height, : QgsComposerItem( x, y, width, height, composition ) , mShape( Ellipse ) , mCornerRadius( 0 ) - , mUseSymbolV2( false ) //default to not using SymbolV2 for shapes, to preserve 2.0 api + , mUseSymbol( false ) //default to not using Symbol for shapes, to preserve 2.0 api , mShapeStyleSymbol( nullptr ) , mMaxSymbolBleed( 0 ) { @@ -67,16 +67,16 @@ QgsComposerShape::~QgsComposerShape() delete mShapeStyleSymbol; } -void QgsComposerShape::setUseSymbolV2( bool useSymbolV2 ) +void QgsComposerShape::setUseSymbol( bool useSymbol ) { - mUseSymbolV2 = useSymbolV2; - setFrameEnabled( !useSymbolV2 ); + mUseSymbol = useSymbol; + setFrameEnabled( !useSymbol ); } -void QgsComposerShape::setShapeStyleSymbol( QgsFillSymbolV2* symbol ) +void QgsComposerShape::setShapeStyleSymbol( QgsFillSymbol* symbol ) { delete mShapeStyleSymbol; - mShapeStyleSymbol = static_cast( symbol->clone() ); + mShapeStyleSymbol = static_cast( symbol->clone() ); refreshSymbol(); } @@ -99,7 +99,7 @@ void QgsComposerShape::createDefaultShapeStyleSymbol() properties.insert( "color_border", "black" ); properties.insert( "width_border", "0.3" ); properties.insert( "joinstyle", "miter" ); - mShapeStyleSymbol = QgsFillSymbolV2::createSimple( properties ); + mShapeStyleSymbol = QgsFillSymbol::createSimple( properties ); mMaxSymbolBleed = QgsSymbolLayerUtils::estimateMaxSymbolBleed( mShapeStyleSymbol ); updateBoundingRect(); @@ -132,7 +132,7 @@ void QgsComposerShape::paint( QPainter* painter, const QStyleOptionGraphicsItem* void QgsComposerShape::drawShape( QPainter* p ) { - if ( mUseSymbolV2 ) + if ( mUseSymbol ) { drawShapeUsingSymbol( p ); return; @@ -247,7 +247,7 @@ void QgsComposerShape::drawShapeUsingSymbol( QPainter* p ) void QgsComposerShape::drawFrame( QPainter* p ) { - if ( mFrame && p && !mUseSymbolV2 ) + if ( mFrame && p && !mUseSymbol ) { p->setPen( pen() ); p->setBrush( Qt::NoBrush ); @@ -258,7 +258,7 @@ void QgsComposerShape::drawFrame( QPainter* p ) void QgsComposerShape::drawBackground( QPainter* p ) { - if ( p && ( mBackground || mUseSymbolV2 ) ) + if ( p && ( mBackground || mUseSymbol ) ) { p->setBrush( brush() );//this causes a problem in atlas generation p->setPen( Qt::NoPen ); @@ -310,11 +310,11 @@ bool QgsComposerShape::readXml( const QDomElement& itemElem, const QDomDocument& if ( !shapeStyleSymbolElem.isNull() ) { delete mShapeStyleSymbol; - mShapeStyleSymbol = QgsSymbolLayerUtils::loadSymbol( shapeStyleSymbolElem ); + mShapeStyleSymbol = QgsSymbolLayerUtils::loadSymbol( shapeStyleSymbolElem ); } else { - //upgrade project file from 2.0 to use symbolV2 styling + //upgrade project file from 2.0 to use symbol styling delete mShapeStyleSymbol; QgsStringMap properties; properties.insert( "color", QgsSymbolLayerUtils::encodeColor( brush().color() ) ); @@ -386,7 +386,7 @@ bool QgsComposerShape::readXml( const QDomElement& itemElem, const QDomDocument& } } - mShapeStyleSymbol = QgsFillSymbolV2::createSimple( properties ); + mShapeStyleSymbol = QgsFillSymbol::createSimple( properties ); } emit itemChanged(); return true; diff --git a/src/core/composer/qgscomposershape.h b/src/core/composer/qgscomposershape.h index 870c583b350..0705fd0c509 100644 --- a/src/core/composer/qgscomposershape.h +++ b/src/core/composer/qgscomposershape.h @@ -22,7 +22,7 @@ #include #include -class QgsFillSymbolV2; +class QgsFillSymbol; /** \ingroup core * A composer items that draws common shapes (ellipse, triangle, rectangle)*/ @@ -69,17 +69,17 @@ class CORE_EXPORT QgsComposerShape: public QgsComposerItem /** Returns the radius for rounded rectangle corners*/ double cornerRadius() const { return mCornerRadius; } - /** 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() { return mShapeStyleSymbol; } + QgsFillSymbol* shapeStyleSymbol() { return mShapeStyleSymbol; } - /** Controls whether the shape should be drawn using a QgsFillSymbolV2. + /** Controls whether the shape should be drawn using a QgsFillSymbol. * Note: Added in v2.1 */ - void setUseSymbolV2( bool useSymbolV2 ); + 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*/ @@ -114,9 +114,9 @@ class CORE_EXPORT QgsComposerShape: public QgsComposerItem double mCornerRadius; - bool mUseSymbolV2; + bool mUseSymbol; - QgsFillSymbolV2* mShapeStyleSymbol; + QgsFillSymbol* mShapeStyleSymbol; double mMaxSymbolBleed; /** Current bounding rectangle of shape*/ QRectF mCurrentRectangle; diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp index 5cde2b39d4c..c7ccde07f95 100644 --- a/src/core/composer/qgscomposition.cpp +++ b/src/core/composer/qgscomposition.cpp @@ -556,10 +556,10 @@ bool QgsComposition::shouldExportPage( const int page ) const return true; } -void QgsComposition::setPageStyleSymbol( QgsFillSymbolV2* symbol ) +void QgsComposition::setPageStyleSymbol( QgsFillSymbol* symbol ) { delete mPageStyleSymbol; - mPageStyleSymbol = static_cast( symbol->clone() ); + mPageStyleSymbol = static_cast( symbol->clone() ); QgsProject::instance()->setDirty( true ); } @@ -571,7 +571,7 @@ void QgsComposition::createDefaultPageStyleSymbol() properties.insert( "style", "solid" ); properties.insert( "style_border", "no" ); properties.insert( "joinstyle", "miter" ); - mPageStyleSymbol = QgsFillSymbolV2::createSimple( properties ); + mPageStyleSymbol = QgsFillSymbol::createSimple( properties ); } QPointF QgsComposition::positionOnPage( QPointF position ) const @@ -963,7 +963,7 @@ bool QgsComposition::readXml( const QDomElement& compositionElem, const QDomDocu if ( !pageStyleSymbolElem.isNull() ) { delete mPageStyleSymbol; - mPageStyleSymbol = QgsSymbolLayerUtils::loadSymbol( pageStyleSymbolElem ); + mPageStyleSymbol = QgsSymbolLayerUtils::loadSymbol( pageStyleSymbolElem ); } if ( widthConversionOk && heightConversionOk ) @@ -1331,7 +1331,7 @@ void QgsComposition::addItemsFromXml( const QDomElement& elem, const QDomDocumen QgsComposerShape* newShape = new QgsComposerShape( this ); newShape->readXml( currentComposerShapeElem, doc ); //new shapes should default to symbol v2 - newShape->setUseSymbolV2( true ); + newShape->setUseSymbol( true ); if ( pos ) { if ( pasteInPlace ) diff --git a/src/core/composer/qgscomposition.h b/src/core/composer/qgscomposition.h index 78af4563e70..2cf48dab138 100644 --- a/src/core/composer/qgscomposition.h +++ b/src/core/composer/qgscomposition.h @@ -61,7 +61,7 @@ class QgsComposerMultiFrame; class QgsComposerMultiFrameCommand; class QgsVectorLayer; class QgsComposer; -class QgsFillSymbolV2; +class QgsFillSymbol; class QgsDataDefined; class QgsComposerModel; class QgsPaperItem; @@ -222,9 +222,9 @@ class CORE_EXPORT QgsComposition : public 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() { return mPageStyleSymbol; } + QgsFillSymbol* pageStyleSymbol() { return mPageStyleSymbol; } /** Returns the position within a page of a point in the composition @note Added in QGIS 2.1 @@ -926,7 +926,7 @@ class CORE_EXPORT QgsComposition : public QGraphicsScene double mSpaceBetweenPages; //space in preview between pages /** Drawing style for page*/ - QgsFillSymbolV2* mPageStyleSymbol; + QgsFillSymbol* mPageStyleSymbol; void createDefaultPageStyleSymbol(); /** List multiframe objects*/ diff --git a/src/core/composer/qgspaperitem.cpp b/src/core/composer/qgspaperitem.cpp index 57dc56dff4e..048af2f56a9 100644 --- a/src/core/composer/qgspaperitem.cpp +++ b/src/core/composer/qgspaperitem.cpp @@ -17,7 +17,7 @@ #include "qgspaperitem.h" #include "qgscomposition.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgslogger.h" #include "qgsmapsettings.h" #include diff --git a/src/core/diagram/qgsdiagram.cpp b/src/core/diagram/qgsdiagram.cpp index b6994487c23..ffe437d93b8 100644 --- a/src/core/diagram/qgsdiagram.cpp +++ b/src/core/diagram/qgsdiagram.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ #include "qgsdiagram.h" -#include "qgsdiagramrendererv2.h" +#include "qgsdiagramrenderer.h" #include "qgsrendercontext.h" #include "qgsexpression.h" #include "qgssymbollayerutils.h" diff --git a/src/core/diagram/qgshistogramdiagram.cpp b/src/core/diagram/qgshistogramdiagram.cpp index 7713fe6e187..565499f647c 100644 --- a/src/core/diagram/qgshistogramdiagram.cpp +++ b/src/core/diagram/qgshistogramdiagram.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ #include "qgshistogramdiagram.h" -#include "qgsdiagramrendererv2.h" +#include "qgsdiagramrenderer.h" #include "qgsrendercontext.h" #include "qgsexpression.h" diff --git a/src/core/diagram/qgspiediagram.cpp b/src/core/diagram/qgspiediagram.cpp index 9091dcda1fd..62060856ece 100644 --- a/src/core/diagram/qgspiediagram.cpp +++ b/src/core/diagram/qgspiediagram.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ #include "qgspiediagram.h" -#include "qgsdiagramrendererv2.h" +#include "qgsdiagramrenderer.h" #include "qgsrendercontext.h" #include "qgsexpression.h" diff --git a/src/core/diagram/qgstextdiagram.cpp b/src/core/diagram/qgstextdiagram.cpp index 5752194d400..467fcb65fda 100644 --- a/src/core/diagram/qgstextdiagram.cpp +++ b/src/core/diagram/qgstextdiagram.cpp @@ -13,7 +13,7 @@ * * ***************************************************************************/ #include "qgstextdiagram.h" -#include "qgsdiagramrendererv2.h" +#include "qgsdiagramrenderer.h" #include "qgsrendercontext.h" #include "qgsexpression.h" diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp index b709dd6efc7..c3e95a25579 100644 --- a/src/core/dxf/qgsdxfexport.cpp +++ b/src/core/dxf/qgsdxfexport.cpp @@ -30,11 +30,11 @@ #include "qgsdxfpallabeling.h" #include "qgsvectordataprovider.h" #include "qgspoint.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgssymbollayer.h" -#include "qgsfillsymbollayerv2.h" +#include "qgsfillsymbollayer.h" #include "qgsfeatureiterator.h" -#include "qgslinesymbollayerv2.h" +#include "qgslinesymbollayer.h" #include "qgsvectorlayer.h" #include "qgsmaplayerregistry.h" #include "qgsunittypes.h" @@ -622,7 +622,7 @@ void QgsDxfExport::writeTables() slIt = slList.constBegin(); for ( ; slIt != slList.constEnd(); ++slIt ) { - QgsMarkerSymbolLayerV2 *ml = dynamic_cast< QgsMarkerSymbolLayerV2*>( slIt->first ); + QgsMarkerSymbolLayer *ml = dynamic_cast< QgsMarkerSymbolLayer*>( slIt->first ); if ( !ml ) continue; @@ -847,7 +847,7 @@ void QgsDxfExport::writeBlocks() QList< QPair< QgsSymbolLayer*, QgsSymbol* > >::const_iterator slIt = slList.constBegin(); for ( ; slIt != slList.constEnd(); ++slIt ) { - QgsMarkerSymbolLayerV2 *ml = dynamic_cast< QgsMarkerSymbolLayerV2*>( slIt->first ); + QgsMarkerSymbolLayer *ml = dynamic_cast< QgsMarkerSymbolLayer*>( slIt->first ); if ( !ml ) continue; @@ -931,7 +931,7 @@ void QgsDxfExport::writeEntities() Q_NOWARN_DEPRECATED_POP // label engine - QgsLabelingEngineV2 engine; + QgsLabelingEngine engine; engine.readSettingsFromProject(); engine.setMapSettings( mapSettings ); @@ -946,7 +946,7 @@ void QgsDxfExport::writeEntities() } QgsSymbolRenderContext sctx( ctx, QgsUnitTypes::RenderMillimeters, 1.0, false, 0, nullptr ); - QgsFeatureRendererV2* renderer = vl->rendererV2(); + QgsFeatureRenderer* renderer = vl->renderer(); if ( !renderer ) { continue; @@ -989,7 +989,7 @@ void QgsDxfExport::writeEntities() } if ( mSymbologyExport == QgsDxfExport::SymbolLayerSymbology && - ( renderer->capabilities() & QgsFeatureRendererV2::SymbolLevels ) && + ( renderer->capabilities() & QgsFeatureRenderer::SymbolLevels ) && renderer->usingSymbolLevels() ) { writeEntitiesSymbolLevels( vl ); @@ -1072,7 +1072,7 @@ void QgsDxfExport::writeEntitiesSymbolLevels( QgsVectorLayer* layer ) return; } - QgsFeatureRendererV2* renderer = layer->rendererV2(); + QgsFeatureRenderer* renderer = layer->renderer(); if ( !renderer ) { // TODO return error @@ -3346,7 +3346,7 @@ void QgsDxfExport::writePoint( const QgsPointV2 &pt, const QString& layer, const { #if 0 // debug: draw rectangle for debugging - const QgsMarkerSymbolLayerV2* msl = dynamic_cast< const QgsMarkerSymbolLayerV2* >( symbolLayer ); + const QgsMarkerSymbolLayer* msl = dynamic_cast< const QgsMarkerSymbolLayer* >( symbolLayer ); if ( msl ) { double halfSize = msl->size() * mapUnitScaleFactor( mSymbologyScaleDenominator, @@ -3366,7 +3366,7 @@ void QgsDxfExport::writePoint( const QgsPointV2 &pt, const QString& layer, const if ( !symbolLayer || blockIt == mPointSymbolBlocks.constEnd() ) { // write symbol directly here - const QgsMarkerSymbolLayerV2* msl = dynamic_cast< const QgsMarkerSymbolLayerV2* >( symbolLayer ); + const QgsMarkerSymbolLayer* msl = dynamic_cast< const QgsMarkerSymbolLayer* >( symbolLayer ); if ( msl && symbol ) { if ( symbolLayer->writeDxf( *this, mapUnitScaleFactor( mSymbologyScaleDenominator, msl->sizeUnit(), mMapUnits ), layer, ctx, QPointF( pt.x(), pt.y() ) ) ) @@ -3392,13 +3392,13 @@ void QgsDxfExport::writePoint( const QgsPointV2 &pt, const QString& layer, const void QgsDxfExport::writePolyline( const QgsPolyline &line, const QString& layer, const QString& lineStyleName, const QColor& color, double width ) { - QgsPointSequenceV2 s; + QgsPointSequence s; Q_FOREACH ( const QgsPoint& p, line ) s << QgsPointV2( p ); writePolyline( s, layer, lineStyleName, color, width ); } -void QgsDxfExport::writePolyline( const QgsPointSequenceV2 &line, const QString& layer, const QString& lineStyleName, const QColor& color, double width ) +void QgsDxfExport::writePolyline( const QgsPointSequence &line, const QString& layer, const QString& lineStyleName, const QColor& color, double width ) { int n = line.size(); if ( n == 0 ) @@ -3466,11 +3466,11 @@ void QgsDxfExport::writePolyline( const QgsPointSequenceV2 &line, const QString& void QgsDxfExport::writePolygon( const QgsPolygon &polygon, const QString& layer, const QString& hatchPattern, const QColor& color ) { - QgsRingSequenceV2 r; + QgsRingSequence r; Q_FOREACH ( const QgsPolyline& l, polygon ) { - QgsPointSequenceV2 s; + QgsPointSequence s; Q_FOREACH ( const QgsPoint& p, l ) s << QgsPointV2( p ); r << s; @@ -3480,7 +3480,7 @@ void QgsDxfExport::writePolygon( const QgsPolygon &polygon, const QString& layer } -void QgsDxfExport::writePolygon( const QgsRingSequenceV2 &polygon, const QString& layer, const QString& hatchPattern, const QColor& color ) +void QgsDxfExport::writePolygon( const QgsRingSequence &polygon, const QString& layer, const QString& hatchPattern, const QColor& color ) { writeGroup( 0, "HATCH" ); // Entity type writeHandle(); @@ -3526,7 +3526,7 @@ void QgsDxfExport::writeLine( const QgsPoint& pt1, const QgsPoint& pt2, const QS void QgsDxfExport::writeLine( const QgsPointV2& pt1, const QgsPointV2& pt2, const QString& layer, const QString& lineStyleName, const QColor& color, double width ) { - writePolyline( QgsPointSequenceV2() << pt1 << pt2, layer, lineStyleName, color, width ); + writePolyline( QgsPointSequence() << pt1 << pt2, layer, lineStyleName, color, width ); } void QgsDxfExport::writePoint( const QString &layer, const QColor &color, const QgsPoint &pt ) @@ -3680,12 +3680,12 @@ void QgsDxfExport::writeSolid( const QString& layer, const QColor& color, const { // pt1 pt2 // pt3 pt4 - QgsPointSequenceV2 p; + QgsPointSequence p; p << QgsPointV2( pt1 ) << QgsPointV2( pt2 ) << QgsPointV2( pt4 ); if ( pt3 != pt4 ) p << QgsPointV2( pt3 ); p << QgsPointV2( pt1 ); - writePolygon( QgsRingSequenceV2() << p, layer, "SOLID", color ); + writePolygon( QgsRingSequence() << p, layer, "SOLID", color ); } QgsRectangle QgsDxfExport::dxfExtent() const @@ -3720,7 +3720,7 @@ void QgsDxfExport::addFeature( QgsSymbolRenderContext& ctx, const QString& layer return; QgsGeometry featGeom = fet->geometry(); - const QgsAbstractGeometryV2 *geom = featGeom.geometry(); + const QgsAbstractGeometry *geom = featGeom.geometry(); QgsWkbTypes::Type geometryType = geom->wkbType(); @@ -3764,7 +3764,7 @@ void QgsDxfExport::addFeature( QgsSymbolRenderContext& ctx, const QString& layer if ( QgsWkbTypes::flatType( geometryType ) == QgsWkbTypes::MultiPoint ) { - const QgsCoordinateSequenceV2 &cs = geom->coordinateSequence(); + const QgsCoordinateSequence &cs = geom->coordinateSequence(); for ( int i = 0; i < cs.size(); i++ ) { writePoint( cs.at( i ).at( 0 ).at( 0 ), layer, penColor, ctx, symbolLayer, symbol, angle ); @@ -3777,7 +3777,7 @@ void QgsDxfExport::addFeature( QgsSymbolRenderContext& ctx, const QString& layer // single line if ( QgsWkbTypes::flatType( geometryType ) == QgsWkbTypes::LineString ) { - const QgsAbstractGeometryV2 *offsetGeom = geom; + const QgsAbstractGeometry *offsetGeom = geom; if ( !qgsDoubleNear( offset, 0.0 ) ) { QgsGeos geos( geom ); @@ -3795,7 +3795,7 @@ void QgsDxfExport::addFeature( QgsSymbolRenderContext& ctx, const QString& layer // multiline if ( QgsWkbTypes::flatType( geometryType ) == QgsWkbTypes::MultiLineString ) { - const QgsAbstractGeometryV2 *offsetGeom = geom; + const QgsAbstractGeometry *offsetGeom = geom; if ( !qgsDoubleNear( offset, 0.0 ) ) { @@ -3805,7 +3805,7 @@ void QgsDxfExport::addFeature( QgsSymbolRenderContext& ctx, const QString& layer offsetGeom = geom; } - const QgsCoordinateSequenceV2 &cs = offsetGeom->coordinateSequence(); + const QgsCoordinateSequence &cs = offsetGeom->coordinateSequence(); for ( int i = 0; i < cs.size(); i++ ) { writePolyline( cs.at( i ).at( 0 ), layer, lineStyleName, penColor, width ); @@ -3818,7 +3818,7 @@ void QgsDxfExport::addFeature( QgsSymbolRenderContext& ctx, const QString& layer // polygon if ( QgsWkbTypes::flatType( geometryType ) == QgsWkbTypes::Polygon ) { - const QgsAbstractGeometryV2 *bufferGeom = geom; + const QgsAbstractGeometry *bufferGeom = geom; if ( !qgsDoubleNear( offset, 0.0 ) ) { @@ -3828,7 +3828,7 @@ void QgsDxfExport::addFeature( QgsSymbolRenderContext& ctx, const QString& layer bufferGeom = geom; } - const QgsCoordinateSequenceV2 &cs = bufferGeom->coordinateSequence(); + const QgsCoordinateSequence &cs = bufferGeom->coordinateSequence(); for ( int i = 0; i < cs.at( 0 ).size(); i++ ) { writePolyline( cs.at( 0 ).at( i ), layer, lineStyleName, penColor, width ); @@ -3841,7 +3841,7 @@ void QgsDxfExport::addFeature( QgsSymbolRenderContext& ctx, const QString& layer // multipolygon or polygon if ( QgsWkbTypes::flatType( geometryType ) == QgsWkbTypes::MultiPolygon ) { - const QgsAbstractGeometryV2 *bufferGeom = geom; + const QgsAbstractGeometry *bufferGeom = geom; if ( !qgsDoubleNear( offset, 0.0 ) ) { @@ -3851,7 +3851,7 @@ void QgsDxfExport::addFeature( QgsSymbolRenderContext& ctx, const QString& layer bufferGeom = geom; } - const QgsCoordinateSequenceV2 &cs = bufferGeom->coordinateSequence(); + const QgsCoordinateSequence &cs = bufferGeom->coordinateSequence(); for ( int i = 0; i < cs.size(); i++ ) for ( int j = 0; j < cs.at( i ).size(); j++ ) writePolyline( cs.at( i ).at( j ), layer, lineStyleName, penColor, width ); @@ -3872,7 +3872,7 @@ void QgsDxfExport::addFeature( QgsSymbolRenderContext& ctx, const QString& layer // multipolygon or polygon if ( QgsWkbTypes::flatType( geometryType ) == QgsWkbTypes::MultiPolygon ) { - const QgsCoordinateSequenceV2 &cs = geom->coordinateSequence(); + const QgsCoordinateSequence &cs = geom->coordinateSequence(); for ( int i = 0; i < cs.size(); i++ ) { writePolygon( cs.at( i ), layer, "SOLID", brushColor ); @@ -3985,8 +3985,8 @@ QList< QPair< QgsSymbolLayer*, QgsSymbol* > > QgsDxfExport::symbolLayers( QgsRen continue; } - // get rendererv2 - QgsFeatureRendererV2* r = vl->rendererV2(); + // get renderer + QgsFeatureRenderer* r = vl->renderer(); if ( !r ) { continue; @@ -4083,7 +4083,7 @@ int QgsDxfExport::nLineTypes( const QList< QPair< QgsSymbolLayer*, QgsSymbol* > QList< QPair< QgsSymbolLayer*, QgsSymbol*> >::const_iterator slIt = symbolLayers.constBegin(); for ( ; slIt != symbolLayers.constEnd(); ++slIt ) { - const QgsSimpleLineSymbolLayerV2* simpleLine = dynamic_cast< const QgsSimpleLineSymbolLayerV2* >( slIt->first ); + const QgsSimpleLineSymbolLayer* simpleLine = dynamic_cast< const QgsSimpleLineSymbolLayer* >( slIt->first ); if ( simpleLine ) { if ( simpleLine->useCustomDashPattern() ) diff --git a/src/core/dxf/qgsdxfexport.h b/src/core/dxf/qgsdxfexport.h index 698e5c70de8..0e66522996b 100644 --- a/src/core/dxf/qgsdxfexport.h +++ b/src/core/dxf/qgsdxfexport.h @@ -250,7 +250,7 @@ class CORE_EXPORT QgsDxfExport * @param lineStyleName line type to use * @param color color to use * @param width line width to use - * @deprecated use QgsPointSequenceV2 variant + * @deprecated use QgsPointSequence variant */ Q_DECL_DEPRECATED void writePolyline( const QgsPolyline &line, const QString &layer, const QString &lineStyleName, const QColor& color, double width = -1 ); @@ -264,7 +264,7 @@ class CORE_EXPORT 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) @@ -272,7 +272,7 @@ class CORE_EXPORT 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 */ Q_DECL_DEPRECATED void writePolygon( const QgsPolygon &polygon, const QString &layer, const QString &hatchPattern, const QColor& color ); @@ -285,7 +285,7 @@ class CORE_EXPORT 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) diff --git a/src/core/dxf/qgsdxfpaintengine.cpp b/src/core/dxf/qgsdxfpaintengine.cpp index d5db211091a..8746648e8d0 100644 --- a/src/core/dxf/qgsdxfpaintengine.cpp +++ b/src/core/dxf/qgsdxfpaintengine.cpp @@ -66,7 +66,7 @@ void QgsDxfPaintEngine::updateState( const QPaintEngineState& state ) mBrush = state.brush(); } -void QgsDxfPaintEngine::setRing( QgsPointSequenceV2 &polyline, const QPointF *points, int pointCount ) +void QgsDxfPaintEngine::setRing( QgsPointSequence &polyline, const QPointF *points, int pointCount ) { polyline.clear(); for ( int i = 0; i < pointCount; ++i ) @@ -79,8 +79,8 @@ void QgsDxfPaintEngine::drawPolygon( const QPointF *points, int pointCount, Poly if ( !mDxf || !mPaintDevice ) return; - QgsRingSequenceV2 polygon; - polygon << QgsPointSequenceV2(); + QgsRingSequence polygon; + polygon << QgsPointSequence(); setRing( polygon.last(), points, pointCount ); if ( mode == QPaintEngine::PolylineMode ) @@ -156,7 +156,7 @@ void QgsDxfPaintEngine::endPolygon() if ( mPen.style() != Qt::NoPen ) drawPolygon( mCurrentPolygon.constData(), mCurrentPolygon.size(), QPaintEngine::PolylineMode ); - mPolygon << QgsPointSequenceV2(); + mPolygon << QgsPointSequence(); setRing( mPolygon.last(), mCurrentPolygon.constData(), mCurrentPolygon.size() ); } mCurrentPolygon.clear(); diff --git a/src/core/dxf/qgsdxfpaintengine.h b/src/core/dxf/qgsdxfpaintengine.h index fdb7c0247d5..2cc9a1bbf8b 100644 --- a/src/core/dxf/qgsdxfpaintengine.h +++ b/src/core/dxf/qgsdxfpaintengine.h @@ -19,7 +19,7 @@ #define QGSDXFPAINTENGINE_H #include -#include "qgsabstractgeometryv2.h" +#include "qgsabstractgeometry.h" class QgsDxfExport; class QgsDxfPaintDevice; @@ -62,7 +62,7 @@ class CORE_EXPORT QgsDxfPaintEngine: public QPaintEngine QBrush mBrush; QString mLayer; QPointF mShift; - QgsRingSequenceV2 mPolygon; + QgsRingSequence mPolygon; QPolygonF mCurrentPolygon; QList mCurrentCurve; @@ -75,7 +75,7 @@ class CORE_EXPORT QgsDxfPaintEngine: public QPaintEngine void endPolygon(); void endCurve(); - void setRing( QgsPointSequenceV2 &polyline, const QPointF * points, int pointCount ); + void setRing( QgsPointSequence &polyline, const QPointF * points, int pointCount ); //utils for bezier curve calculation static QPointF bezierPoint( const QList& controlPolygon, double t ); diff --git a/src/core/effects/qgsgloweffect.cpp b/src/core/effects/qgsgloweffect.cpp index fc03fb6ce8c..7cb2299ef25 100644 --- a/src/core/effects/qgsgloweffect.cpp +++ b/src/core/effects/qgsgloweffect.cpp @@ -18,7 +18,7 @@ #include "qgsgloweffect.h" #include "qgssymbollayerutils.h" #include "qgsimageoperation.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgsunittypes.h" QgsGlowEffect::QgsGlowEffect() @@ -65,7 +65,7 @@ void QgsGlowEffect::draw( QgsRenderContext &context ) QImage im = sourceAsImage( context )->copy(); - QgsVectorColorRampV2* ramp = nullptr; + QgsVectorColorRamp* ramp = nullptr; if ( mColorType == ColorRamp && mRamp ) { ramp = mRamp; @@ -75,7 +75,7 @@ void QgsGlowEffect::draw( QgsRenderContext &context ) //create a temporary ramp QColor transparentColor = mColor; transparentColor.setAlpha( 0 ); - ramp = new QgsVectorGradientColorRampV2( mColor, transparentColor ); + ramp = new QgsVectorGradientColorRamp( mColor, transparentColor ); } QgsImageOperation::DistanceTransformProperties dtProps; @@ -176,10 +176,10 @@ void QgsGlowEffect::readProperties( const QgsStringMap &props ) //attempt to create color ramp from props delete mRamp; - mRamp = QgsVectorGradientColorRampV2::create( props ); + mRamp = QgsVectorGradientColorRamp::create( props ); } -void QgsGlowEffect::setRamp( QgsVectorColorRampV2 *ramp ) +void QgsGlowEffect::setRamp( QgsVectorColorRamp *ramp ) { delete mRamp; mRamp = ramp; diff --git a/src/core/effects/qgsgloweffect.h b/src/core/effects/qgsgloweffect.h index 0bb23ba42cd..cbebd56861b 100644 --- a/src/core/effects/qgsgloweffect.h +++ b/src/core/effects/qgsgloweffect.h @@ -21,7 +21,7 @@ #include "qgssymbol.h" #include -class QgsVectorColorRampV2; +class QgsVectorColorRamp; /** \ingroup core * \class QgsGlowEffect @@ -151,7 +151,7 @@ class CORE_EXPORT QgsGlowEffect : public QgsPaintEffect * @see ramp * @see setColorType */ - void setRamp( QgsVectorColorRampV2* ramp ); + void setRamp( QgsVectorColorRamp* ramp ); /** 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. @@ -159,7 +159,7 @@ class CORE_EXPORT QgsGlowEffect : public QgsPaintEffect * @see setRamp * @see colorType */ - QgsVectorColorRampV2* ramp() const { return mRamp; } + QgsVectorColorRamp* ramp() const { return mRamp; } /** Sets the blend mode for the effect * @param mode blend mode used for drawing the effect on to a destination @@ -175,7 +175,7 @@ class CORE_EXPORT QgsGlowEffect : public QgsPaintEffect */ QPainter::CompositionMode blendMode() const { return mBlendMode; } - /** 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 @@ -185,7 +185,7 @@ class CORE_EXPORT QgsGlowEffect : public QgsPaintEffect */ void setColorType( GlowColorType colorType ) { mColorType = 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 @@ -211,7 +211,7 @@ class CORE_EXPORT QgsGlowEffect : public QgsPaintEffect double mSpread; QgsUnitTypes::RenderUnit mSpreadUnit; QgsMapUnitScale mSpreadMapUnitScale; - QgsVectorColorRampV2* mRamp; + QgsVectorColorRamp* mRamp; int mBlurLevel; double mTransparency; QColor mColor; diff --git a/src/core/effects/qgsimageoperation.cpp b/src/core/effects/qgsimageoperation.cpp index bec27743a96..3f0c3a82996 100644 --- a/src/core/effects/qgsimageoperation.cpp +++ b/src/core/effects/qgsimageoperation.cpp @@ -17,7 +17,7 @@ #include "qgsimageoperation.h" #include "qgis.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgslogger.h" #include #include diff --git a/src/core/effects/qgsimageoperation.h b/src/core/effects/qgsimageoperation.h index 3805e54b345..aad6a8bb06f 100644 --- a/src/core/effects/qgsimageoperation.h +++ b/src/core/effects/qgsimageoperation.h @@ -22,7 +22,7 @@ #include #include -class QgsVectorColorRampV2; +class QgsVectorColorRamp; /** \ingroup core * \class QgsImageOperation @@ -126,7 +126,7 @@ class CORE_EXPORT 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 diff --git a/src/core/geometry/qgsabstractgeometryv2.cpp b/src/core/geometry/qgsabstractgeometry.cpp similarity index 80% rename from src/core/geometry/qgsabstractgeometryv2.cpp rename to src/core/geometry/qgsabstractgeometry.cpp index b51139eaae3..2e24612537b 100644 --- a/src/core/geometry/qgsabstractgeometryv2.cpp +++ b/src/core/geometry/qgsabstractgeometry.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsabstractgeometryv2.cpp + qgsabstractgeometry.cpp ------------------------------------------------------------------- Date : 04 Sept 2014 Copyright : (C) 2014 by Marco Hugentobler @@ -14,7 +14,7 @@ email : marco.hugentobler at sourcepole dot com ***************************************************************************/ #include "qgsapplication.h" -#include "qgsabstractgeometryv2.h" +#include "qgsabstractgeometry.h" #include "qgswkbptr.h" #include "qgsgeos.h" #include "qgsmaptopixel.h" @@ -23,20 +23,20 @@ email : marco.hugentobler at sourcepole dot com #include #include -QgsAbstractGeometryV2::QgsAbstractGeometryV2(): mWkbType( QgsWkbTypes::Unknown ) +QgsAbstractGeometry::QgsAbstractGeometry(): mWkbType( QgsWkbTypes::Unknown ) { } -QgsAbstractGeometryV2::~QgsAbstractGeometryV2() +QgsAbstractGeometry::~QgsAbstractGeometry() { } -QgsAbstractGeometryV2::QgsAbstractGeometryV2( const QgsAbstractGeometryV2& geom ) +QgsAbstractGeometry::QgsAbstractGeometry( const QgsAbstractGeometry& geom ) { mWkbType = geom.mWkbType; } -QgsAbstractGeometryV2& QgsAbstractGeometryV2::operator=( const QgsAbstractGeometryV2 & geom ) +QgsAbstractGeometry& QgsAbstractGeometry::operator=( const QgsAbstractGeometry & geom ) { if ( &geom != this ) { @@ -46,18 +46,18 @@ QgsAbstractGeometryV2& QgsAbstractGeometryV2::operator=( const QgsAbstractGeomet return *this; } -bool QgsAbstractGeometryV2::is3D() const +bool QgsAbstractGeometry::is3D() const { return QgsWkbTypes::hasZ( mWkbType ); } -bool QgsAbstractGeometryV2::isMeasure() const +bool QgsAbstractGeometry::isMeasure() const { return QgsWkbTypes::hasM( mWkbType ); } #if 0 -void QgsAbstractGeometryV2::clip( const QgsRectangle& rect ) +void QgsAbstractGeometry::clip( const QgsRectangle& rect ) { // TODO // - Implementation @@ -67,7 +67,7 @@ void QgsAbstractGeometryV2::clip( const QgsRectangle& rect ) } #endif -void QgsAbstractGeometryV2::setZMTypeFromSubGeometry( const QgsAbstractGeometryV2* subgeom, QgsWkbTypes::Type baseGeomType ) +void QgsAbstractGeometry::setZMTypeFromSubGeometry( const QgsAbstractGeometry* subgeom, QgsWkbTypes::Type baseGeomType ) { if ( !subgeom ) { @@ -109,7 +109,7 @@ void QgsAbstractGeometryV2::setZMTypeFromSubGeometry( const QgsAbstractGeometryV } } -QgsRectangle QgsAbstractGeometryV2::calculateBoundingBox() const +QgsRectangle QgsAbstractGeometry::calculateBoundingBox() const { double xmin = std::numeric_limits::max(); double ymin = std::numeric_limits::max(); @@ -136,13 +136,13 @@ QgsRectangle QgsAbstractGeometryV2::calculateBoundingBox() const return QgsRectangle( xmin, ymin, xmax, ymax ); } -int QgsAbstractGeometryV2::nCoordinates() const +int QgsAbstractGeometry::nCoordinates() const { int nCoords = 0; - Q_FOREACH ( const QgsRingSequenceV2 &r, coordinateSequence() ) + Q_FOREACH ( const QgsRingSequence &r, coordinateSequence() ) { - Q_FOREACH ( const QgsPointSequenceV2 &p, r ) + Q_FOREACH ( const QgsPointSequence &p, r ) { nCoords += p.size(); } @@ -151,7 +151,7 @@ int QgsAbstractGeometryV2::nCoordinates() const return nCoords; } -QString QgsAbstractGeometryV2::wktTypeStr() const +QString QgsAbstractGeometry::wktTypeStr() const { QString wkt = geometryType(); if ( is3D() ) @@ -161,7 +161,7 @@ QString QgsAbstractGeometryV2::wktTypeStr() const return wkt; } -QgsPointV2 QgsAbstractGeometryV2::centroid() const +QgsPointV2 QgsAbstractGeometry::centroid() const { // http://en.wikipedia.org/wiki/Centroid#Centroid_of_polygon // Pick the first ring of first part for the moment @@ -213,7 +213,7 @@ QgsPointV2 QgsAbstractGeometryV2::centroid() const } } -bool QgsAbstractGeometryV2::convertTo( QgsWkbTypes::Type type ) +bool QgsAbstractGeometry::convertTo( QgsWkbTypes::Type type ) { if ( type == mWkbType ) return true; @@ -244,7 +244,7 @@ bool QgsAbstractGeometryV2::convertTo( QgsWkbTypes::Type type ) return true; } -bool QgsAbstractGeometryV2::isEmpty() const +bool QgsAbstractGeometry::isEmpty() const { QgsVertexId vId; QgsPointV2 vertex; @@ -252,7 +252,7 @@ bool QgsAbstractGeometryV2::isEmpty() const } -QgsAbstractGeometryV2* QgsAbstractGeometryV2::segmentize( double tolerance, SegmentationToleranceType toleranceType ) const +QgsAbstractGeometry* QgsAbstractGeometry::segmentize( double tolerance, SegmentationToleranceType toleranceType ) const { Q_UNUSED( tolerance ); Q_UNUSED( toleranceType ); diff --git a/src/core/geometry/qgsabstractgeometryv2.h b/src/core/geometry/qgsabstractgeometry.h similarity index 91% rename from src/core/geometry/qgsabstractgeometryv2.h rename to src/core/geometry/qgsabstractgeometry.h index bbb107ee366..6ad9da4e9f6 100644 --- a/src/core/geometry/qgsabstractgeometryv2.h +++ b/src/core/geometry/qgsabstractgeometry.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsabstractgeometryv2.h + qgsabstractgeometry.h ------------------------------------------------------------------- Date : 04 Sept 2014 Copyright : (C) 2014 by Marco Hugentobler @@ -23,8 +23,8 @@ email : marco.hugentobler at sourcepole dot com #include class QgsMapToPixel; -class QgsCurveV2; -class QgsMultiCurveV2; +class QgsCurve; +class QgsMultiCurve; class QgsMultiPointV2; class QgsPointV2; struct QgsVertexId; @@ -32,16 +32,16 @@ class QPainter; class QDomDocument; class QDomElement; -typedef QList< QgsPointV2 > QgsPointSequenceV2; -typedef QList< QgsPointSequenceV2 > QgsRingSequenceV2; -typedef QList< QgsRingSequenceV2 > QgsCoordinateSequenceV2; +typedef QList< QgsPointV2 > QgsPointSequence; +typedef QList< QgsPointSequence > QgsRingSequence; +typedef QList< QgsRingSequence > QgsCoordinateSequence; /** \ingroup core - * \class QgsAbstractGeometryV2 + * \class QgsAbstractGeometry * \brief Abstract base class for all geometries * \note added in QGIS 2.10 */ -class CORE_EXPORT QgsAbstractGeometryV2 +class CORE_EXPORT QgsAbstractGeometry { public: @@ -52,14 +52,14 @@ class CORE_EXPORT QgsAbstractGeometryV2 MaximumDifference }; - 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 */ @@ -110,7 +110,7 @@ class CORE_EXPORT QgsAbstractGeometryV2 virtual bool isSimple() const = 0; virtual bool isValid() const = 0; virtual QgsMultiPointV2* locateAlong() const = 0; - virtual QgsMultiCurveV2* locateBetween() const = 0; + virtual QgsMultiCurve* locateBetween() const = 0; virtual QgsRectangle envelope() const = 0; #endif @@ -119,7 +119,7 @@ class CORE_EXPORT 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 @@ -229,7 +229,7 @@ class CORE_EXPORT QgsAbstractGeometryV2 /** Retrieves the sequence of geometries, rings and nodes. * @return coordinate sequence */ - virtual QgsCoordinateSequenceV2 coordinateSequence() const = 0; + virtual QgsCoordinateSequence coordinateSequence() const = 0; /** Returns the number of nodes contained in the geometry */ @@ -312,13 +312,13 @@ class CORE_EXPORT QgsAbstractGeometryV2 * @param tolerance segmentation tolerance * @param toleranceType maximum segmentation angle or maximum difference between approximation and curve */ - virtual QgsAbstractGeometryV2* segmentize( double tolerance = M_PI / 180., SegmentationToleranceType toleranceType = MaximumAngle ) const; + virtual QgsAbstractGeometry* segmentize( double tolerance = M_PI / 180., SegmentationToleranceType toleranceType = MaximumAngle ) const; /** 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 { return 0; } + virtual QgsAbstractGeometry* toCurveType() const { return 0; } /** 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 @@ -382,7 +382,7 @@ class CORE_EXPORT 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. @@ -440,7 +440,7 @@ struct CORE_EXPORT QgsVertexId { return ringEqual( o ) && ( vertex >= 0 && o.ring == ring ); } - bool isValid( const QgsAbstractGeometryV2* geom ) const + bool isValid( const QgsAbstractGeometry* geom ) const { return ( part >= 0 && part < geom->partCount() ) && ( ring < geom->ringCount( part ) ) && diff --git a/src/core/geometry/qgscircularstringv2.cpp b/src/core/geometry/qgscircularstring.cpp similarity index 84% rename from src/core/geometry/qgscircularstringv2.cpp rename to src/core/geometry/qgscircularstring.cpp index fe03cb69dab..f5d09ce8625 100644 --- a/src/core/geometry/qgscircularstringv2.cpp +++ b/src/core/geometry/qgscircularstring.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgscircularstringv2.cpp + qgscircularstring.cpp ----------------------- begin : September 2014 copyright : (C) 2014 by Marco Hugentobler @@ -15,47 +15,47 @@ * * ***************************************************************************/ -#include "qgscircularstringv2.h" +#include "qgscircularstring.h" #include "qgsapplication.h" #include "qgscoordinatetransform.h" #include "qgsgeometryutils.h" -#include "qgslinestringv2.h" +#include "qgslinestring.h" #include "qgsmaptopixel.h" #include "qgspointv2.h" #include "qgswkbptr.h" #include #include -QgsCircularStringV2::QgsCircularStringV2(): QgsCurveV2() +QgsCircularString::QgsCircularString(): QgsCurve() { mWkbType = QgsWkbTypes::CircularString; } -QgsCircularStringV2::~QgsCircularStringV2() +QgsCircularString::~QgsCircularString() { } -bool QgsCircularStringV2::operator==( const QgsCurveV2& other ) const +bool QgsCircularString::operator==( const QgsCurve& other ) const { - const QgsCircularStringV2* otherLine = dynamic_cast< const QgsCircularStringV2* >( &other ); + const QgsCircularString* otherLine = dynamic_cast< const QgsCircularString* >( &other ); if ( !otherLine ) return false; return *otherLine == *this; } -bool QgsCircularStringV2::operator!=( const QgsCurveV2& other ) const +bool QgsCircularString::operator!=( const QgsCurve& other ) const { return !operator==( other ); } -QgsCircularStringV2 *QgsCircularStringV2::clone() const +QgsCircularString *QgsCircularString::clone() const { - return new QgsCircularStringV2( *this ); + return new QgsCircularString( *this ); } -void QgsCircularStringV2::clear() +void QgsCircularString::clear() { mWkbType = QgsWkbTypes::CircularString; mX.clear(); @@ -65,7 +65,7 @@ void QgsCircularStringV2::clear() clearCache(); } -QgsRectangle QgsCircularStringV2::calculateBoundingBox() const +QgsRectangle QgsCircularString::calculateBoundingBox() const { QgsRectangle bbox; int nPoints = numPoints(); @@ -93,7 +93,7 @@ QgsRectangle QgsCircularStringV2::calculateBoundingBox() const return bbox; } -QgsRectangle QgsCircularStringV2::segmentBoundingBox( const QgsPointV2& pt1, const QgsPointV2& pt2, const QgsPointV2& pt3 ) +QgsRectangle QgsCircularString::segmentBoundingBox( const QgsPointV2& pt1, const QgsPointV2& pt2, const QgsPointV2& pt3 ) { double centerX, centerY, radius; QgsGeometryUtils::circleCenterRadius( pt1, pt2, pt3, radius, centerX, centerY ); @@ -118,8 +118,8 @@ QgsRectangle QgsCircularStringV2::segmentBoundingBox( const QgsPointV2& pt1, con QgsRectangle bbox( pt1.x(), pt1.y(), pt1.x(), pt1.y() ); bbox.combineExtentWith( pt3.x(), pt3.y() ); - QgsPointSequenceV2 compassPoints = compassPointsOnSegment( p1Angle, p2Angle, p3Angle, centerX, centerY, radius ); - QgsPointSequenceV2::const_iterator cpIt = compassPoints.constBegin(); + QgsPointSequence compassPoints = compassPointsOnSegment( p1Angle, p2Angle, p3Angle, centerX, centerY, radius ); + QgsPointSequence::const_iterator cpIt = compassPoints.constBegin(); for ( ; cpIt != compassPoints.constEnd(); ++cpIt ) { bbox.combineExtentWith( cpIt->x(), cpIt->y() ); @@ -127,9 +127,9 @@ QgsRectangle QgsCircularStringV2::segmentBoundingBox( const QgsPointV2& pt1, con return bbox; } -QgsPointSequenceV2 QgsCircularStringV2::compassPointsOnSegment( double p1Angle, double p2Angle, double p3Angle, double centerX, double centerY, double radius ) +QgsPointSequence QgsCircularString::compassPointsOnSegment( double p1Angle, double p2Angle, double p3Angle, double centerX, double centerY, double radius ) { - QgsPointSequenceV2 pointList; + QgsPointSequence pointList; QgsPointV2 nPoint( centerX, centerY + radius ); QgsPointV2 ePoint( centerX + radius, centerY ); @@ -207,7 +207,7 @@ QgsPointSequenceV2 QgsCircularStringV2::compassPointsOnSegment( double p1Angle, return pointList; } -bool QgsCircularStringV2::fromWkb( QgsConstWkbPtr wkbPtr ) +bool QgsCircularString::fromWkb( QgsConstWkbPtr wkbPtr ) { if ( !wkbPtr ) return false; @@ -246,7 +246,7 @@ bool QgsCircularStringV2::fromWkb( QgsConstWkbPtr wkbPtr ) return true; } -bool QgsCircularStringV2::fromWkt( const QString& wkt ) +bool QgsCircularString::fromWkt( const QString& wkt ) { clear(); @@ -260,47 +260,47 @@ bool QgsCircularStringV2::fromWkt( const QString& wkt ) return true; } -int QgsCircularStringV2::wkbSize() const +int QgsCircularString::wkbSize() const { int size = sizeof( char ) + sizeof( quint32 ) + sizeof( quint32 ); size += numPoints() * ( 2 + is3D() + isMeasure() ) * sizeof( double ); return size; } -unsigned char* QgsCircularStringV2::asWkb( int& binarySize ) const +unsigned char* QgsCircularString::asWkb( int& binarySize ) const { binarySize = wkbSize(); unsigned char* geomPtr = new unsigned char[binarySize]; QgsWkbPtr wkb( geomPtr, binarySize ); wkb << static_cast( QgsApplication::endian() ); wkb << static_cast( wkbType() ); - QgsPointSequenceV2 pts; + QgsPointSequence pts; points( pts ); QgsGeometryUtils::pointsToWKB( wkb, pts, is3D(), isMeasure() ); return geomPtr; } -QString QgsCircularStringV2::asWkt( int precision ) const +QString QgsCircularString::asWkt( int precision ) const { QString wkt = wktTypeStr() + ' '; - QgsPointSequenceV2 pts; + QgsPointSequence pts; points( pts ); wkt += QgsGeometryUtils::pointsToWKT( pts, precision, is3D(), isMeasure() ); return wkt; } -QDomElement QgsCircularStringV2::asGML2( QDomDocument& doc, int precision, const QString& ns ) const +QDomElement QgsCircularString::asGML2( QDomDocument& doc, int precision, const QString& ns ) const { // GML2 does not support curves - QgsLineStringV2* line = curveToLine(); + QgsLineString* line = curveToLine(); QDomElement gml = line->asGML2( doc, precision, ns ); delete line; return gml; } -QDomElement QgsCircularStringV2::asGML3( QDomDocument& doc, int precision, const QString& ns ) const +QDomElement QgsCircularString::asGML3( QDomDocument& doc, int precision, const QString& ns ) const { - QgsPointSequenceV2 pts; + QgsPointSequence pts; points( pts ); QDomElement elemCurve = doc.createElementNS( ns, "Curve" ); @@ -312,17 +312,17 @@ QDomElement QgsCircularStringV2::asGML3( QDomDocument& doc, int precision, const return elemCurve; } -QString QgsCircularStringV2::asJSON( int precision ) const +QString QgsCircularString::asJSON( int precision ) const { // GeoJSON does not support curves - QgsLineStringV2* line = curveToLine(); + QgsLineString* line = curveToLine(); QString json = line->asJSON( precision ); delete line; return json; } //curve interface -double QgsCircularStringV2::length() const +double QgsCircularString::length() const { int nPoints = numPoints(); double length = 0; @@ -333,7 +333,7 @@ double QgsCircularStringV2::length() const return length; } -QgsPointV2 QgsCircularStringV2::startPoint() const +QgsPointV2 QgsCircularString::startPoint() const { if ( numPoints() < 1 ) { @@ -342,7 +342,7 @@ QgsPointV2 QgsCircularStringV2::startPoint() const return pointN( 0 ); } -QgsPointV2 QgsCircularStringV2::endPoint() const +QgsPointV2 QgsCircularString::endPoint() const { if ( numPoints() < 1 ) { @@ -351,10 +351,10 @@ QgsPointV2 QgsCircularStringV2::endPoint() const return pointN( numPoints() - 1 ); } -QgsLineStringV2* QgsCircularStringV2::curveToLine( double tolerance, SegmentationToleranceType toleranceType ) const +QgsLineString* QgsCircularString::curveToLine( double tolerance, SegmentationToleranceType toleranceType ) const { - QgsLineStringV2* line = new QgsLineStringV2(); - QgsPointSequenceV2 points; + QgsLineString* line = new QgsLineString(); + QgsPointSequence points; int nPoints = numPoints(); for ( int i = 0; i < ( nPoints - 2 ) ; i += 2 ) @@ -366,12 +366,12 @@ QgsLineStringV2* QgsCircularStringV2::curveToLine( double tolerance, Segmentatio return line; } -int QgsCircularStringV2::numPoints() const +int QgsCircularString::numPoints() const { return qMin( mX.size(), mY.size() ); } -QgsPointV2 QgsCircularStringV2::pointN( int i ) const +QgsPointV2 QgsCircularString::pointN( int i ) const { if ( qMin( mX.size(), mY.size() ) <= i ) { @@ -408,7 +408,7 @@ QgsPointV2 QgsCircularStringV2::pointN( int i ) const return QgsPointV2( t, x, y, z, m ); } -void QgsCircularStringV2::points( QgsPointSequenceV2 &pts ) const +void QgsCircularString::points( QgsPointSequence &pts ) const { pts.clear(); int nPts = numPoints(); @@ -418,7 +418,7 @@ void QgsCircularStringV2::points( QgsPointSequenceV2 &pts ) const } } -void QgsCircularStringV2::setPoints( const QgsPointSequenceV2 &points ) +void QgsCircularString::setPoints( const QgsPointSequence &points ) { clearCache(); @@ -473,7 +473,7 @@ void QgsCircularStringV2::setPoints( const QgsPointSequenceV2 &points ) } } -void QgsCircularStringV2::segmentize( const QgsPointV2& p1, const QgsPointV2& p2, const QgsPointV2& p3, QgsPointSequenceV2 &points, double tolerance, SegmentationToleranceType toleranceType ) const +void QgsCircularString::segmentize( const QgsPointV2& p1, const QgsPointV2& p2, const QgsPointV2& p3, QgsPointSequence &points, double tolerance, SegmentationToleranceType toleranceType ) const { //adapted code from postgis double radius = 0; @@ -497,7 +497,7 @@ void QgsCircularStringV2::segmentize( const QgsPointV2& p1, const QgsPointV2& p2 } double increment = tolerance; //one segment per degree - if ( toleranceType == QgsAbstractGeometryV2::MaximumDifference ) + if ( toleranceType == QgsAbstractGeometry::MaximumDifference ) { double halfAngle = acos( -tolerance / radius + 1 ); increment = 2 * halfAngle; @@ -581,7 +581,7 @@ void QgsCircularStringV2::segmentize( const QgsPointV2& p1, const QgsPointV2& p2 points.append( p3 ); } -int QgsCircularStringV2::segmentSide( const QgsPointV2& pt1, const QgsPointV2& pt3, const QgsPointV2& pt2 ) const +int QgsCircularString::segmentSide( const QgsPointV2& pt1, const QgsPointV2& pt3, const QgsPointV2& pt2 ) const { double side = (( pt2.x() - pt1.x() ) * ( pt3.y() - pt1.y() ) - ( pt3.x() - pt1.x() ) * ( pt2.y() - pt1.y() ) ); if ( side == 0.0 ) @@ -602,7 +602,7 @@ int QgsCircularStringV2::segmentSide( const QgsPointV2& pt1, const QgsPointV2& p } } -double QgsCircularStringV2::interpolateArc( double angle, double a1, double a2, double a3, double zm1, double zm2, double zm3 ) const +double QgsCircularString::interpolateArc( double angle, double a1, double a2, double a3, double zm1, double zm2, double zm3 ) const { /* Counter-clockwise sweep */ if ( a1 < a2 ) @@ -622,14 +622,14 @@ double QgsCircularStringV2::interpolateArc( double angle, double a1, double a2, } } -void QgsCircularStringV2::draw( QPainter& p ) const +void QgsCircularString::draw( QPainter& p ) const { QPainterPath path; addToPainterPath( path ); p.drawPath( path ); } -void QgsCircularStringV2::transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d, bool transformZ ) +void QgsCircularString::transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d, bool transformZ ) { clearCache(); @@ -653,7 +653,7 @@ void QgsCircularStringV2::transform( const QgsCoordinateTransform& ct, QgsCoordi } } -void QgsCircularStringV2::transform( const QTransform& t ) +void QgsCircularString::transform( const QTransform& t ) { clearCache(); @@ -668,13 +668,13 @@ void QgsCircularStringV2::transform( const QTransform& t ) } #if 0 -void QgsCircularStringV2::clip( const QgsRectangle& rect ) +void QgsCircularString::clip( const QgsRectangle& rect ) { //todo... } #endif -void QgsCircularStringV2::addToPainterPath( QPainterPath& path ) const +void QgsCircularString::addToPainterPath( QPainterPath& path ) const { int nPoints = numPoints(); if ( nPoints < 1 ) @@ -689,7 +689,7 @@ void QgsCircularStringV2::addToPainterPath( QPainterPath& path ) const for ( int i = 0; i < ( nPoints - 2 ) ; i += 2 ) { - QgsPointSequenceV2 pt; + QgsPointSequence pt; segmentize( QgsPointV2( mX[i], mY[i] ), QgsPointV2( mX[i + 1], mY[i + 1] ), QgsPointV2( mX[i + 2], mY[i + 2] ), pt ); for ( int j = 1; j < pt.size(); ++j ) { @@ -705,7 +705,7 @@ void QgsCircularStringV2::addToPainterPath( QPainterPath& path ) const } } -void QgsCircularStringV2::arcTo( QPainterPath& path, QPointF pt1, QPointF pt2, QPointF pt3 ) +void QgsCircularString::arcTo( QPainterPath& path, QPointF pt1, QPointF pt2, QPointF pt3 ) { double centerX, centerY, radius; QgsGeometryUtils::circleCenterRadius( QgsPointV2( pt1.x(), pt1.y() ), QgsPointV2( pt2.x(), pt2.y() ), QgsPointV2( pt3.x(), pt3.y() ), @@ -718,12 +718,12 @@ void QgsCircularStringV2::arcTo( QPainterPath& path, QPointF pt1, QPointF pt2, Q path.arcTo( centerX - radius, centerY - radius, diameter, diameter, p1Angle, sweepAngle ); } -void QgsCircularStringV2::drawAsPolygon( QPainter& p ) const +void QgsCircularString::drawAsPolygon( QPainter& p ) const { draw( p ); } -bool QgsCircularStringV2::insertVertex( QgsVertexId position, const QgsPointV2& vertex ) +bool QgsCircularString::insertVertex( QgsVertexId position, const QgsPointV2& vertex ) { if ( position.vertex > mX.size() || position.vertex < 1 ) { @@ -754,7 +754,7 @@ bool QgsCircularStringV2::insertVertex( QgsVertexId position, const QgsPointV2& return true; } -bool QgsCircularStringV2::moveVertex( QgsVertexId position, const QgsPointV2& newPos ) +bool QgsCircularString::moveVertex( QgsVertexId position, const QgsPointV2& newPos ) { if ( position.vertex < 0 || position.vertex >= mX.size() ) { @@ -775,7 +775,7 @@ bool QgsCircularStringV2::moveVertex( QgsVertexId position, const QgsPointV2& ne return true; } -bool QgsCircularStringV2::deleteVertex( QgsVertexId position ) +bool QgsCircularString::deleteVertex( QgsVertexId position ) { int nVertices = this->numPoints(); if ( nVertices < 4 ) //circular string must have at least 3 vertices @@ -804,7 +804,7 @@ bool QgsCircularStringV2::deleteVertex( QgsVertexId position ) return true; } -void QgsCircularStringV2::deleteVertex( int i ) +void QgsCircularString::deleteVertex( int i ) { mX.remove( i ); mY.remove( i ); @@ -819,7 +819,7 @@ void QgsCircularStringV2::deleteVertex( int i ) clearCache(); } -double QgsCircularStringV2::closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const +double QgsCircularString::closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const { Q_UNUSED( epsilon ); double minDist = std::numeric_limits::max(); @@ -856,7 +856,7 @@ double QgsCircularStringV2::closestSegment( const QgsPointV2& pt, QgsPointV2& se return minDist; } -bool QgsCircularStringV2::pointAt( int node, QgsPointV2& point, QgsVertexId::VertexType& type ) const +bool QgsCircularString::pointAt( int node, QgsPointV2& point, QgsVertexId::VertexType& type ) const { if ( node >= numPoints() ) { @@ -867,7 +867,7 @@ bool QgsCircularStringV2::pointAt( int node, QgsPointV2& point, QgsVertexId::Ver return true; } -void QgsCircularStringV2::sumUpArea( double& sum ) const +void QgsCircularString::sumUpArea( double& sum ) const { int maxIndex = numPoints() - 1; @@ -928,7 +928,7 @@ void QgsCircularStringV2::sumUpArea( double& sum ) const } } -double QgsCircularStringV2::closestPointOnArc( double x1, double y1, double x2, double y2, double x3, double y3, +double QgsCircularString::closestPointOnArc( double x1, double y1, double x2, double y2, double x3, double y3, const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) { double radius, centerX, centerY; @@ -977,7 +977,7 @@ double QgsCircularStringV2::closestPointOnArc( double x1, double y1, double x2, return sqrDistance; } -void QgsCircularStringV2::insertVertexBetween( int after, int before, int pointOnCircle ) +void QgsCircularString::insertVertexBetween( int after, int before, int pointOnCircle ) { double xAfter = mX.at( after ); double yAfter = mY.at( after ); @@ -1007,7 +1007,7 @@ void QgsCircularStringV2::insertVertexBetween( int after, int before, int pointO clearCache(); } -double QgsCircularStringV2::vertexAngle( QgsVertexId vId ) const +double QgsCircularString::vertexAngle( QgsVertexId vId ) const { int before = vId.vertex - 1; int vertex = vId.vertex; @@ -1062,9 +1062,9 @@ double QgsCircularStringV2::vertexAngle( QgsVertexId vId ) const return 0.0; } -QgsCircularStringV2* QgsCircularStringV2::reversed() const +QgsCircularString* QgsCircularString::reversed() const { - QgsCircularStringV2* copy = clone(); + QgsCircularString* copy = clone(); std::reverse( copy->mX.begin(), copy->mX.end() ); std::reverse( copy->mY.begin(), copy->mY.end() ); if ( is3D() ) @@ -1078,7 +1078,7 @@ QgsCircularStringV2* QgsCircularStringV2::reversed() const return copy; } -bool QgsCircularStringV2::addZValue( double zValue ) +bool QgsCircularString::addZValue( double zValue ) { if ( QgsWkbTypes::hasZ( mWkbType ) ) return false; @@ -1096,7 +1096,7 @@ bool QgsCircularStringV2::addZValue( double zValue ) return true; } -bool QgsCircularStringV2::addMValue( double mValue ) +bool QgsCircularString::addMValue( double mValue ) { if ( QgsWkbTypes::hasM( mWkbType ) ) return false; @@ -1114,7 +1114,7 @@ bool QgsCircularStringV2::addMValue( double mValue ) return true; } -bool QgsCircularStringV2::dropZValue() +bool QgsCircularString::dropZValue() { if ( !QgsWkbTypes::hasZ( mWkbType ) ) return false; @@ -1126,7 +1126,7 @@ bool QgsCircularStringV2::dropZValue() return true; } -bool QgsCircularStringV2::dropMValue() +bool QgsCircularString::dropMValue() { if ( !QgsWkbTypes::hasM( mWkbType ) ) return false; diff --git a/src/core/geometry/qgscircularstringv2.h b/src/core/geometry/qgscircularstring.h similarity index 79% rename from src/core/geometry/qgscircularstringv2.h rename to src/core/geometry/qgscircularstring.h index df3e2674a84..e14eeaf2611 100644 --- a/src/core/geometry/qgscircularstringv2.h +++ b/src/core/geometry/qgscircularstring.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgscircularstringv2.h + qgscircularstring.h --------------------- begin : September 2014 copyright : (C) 2014 by Marco Hugentobler @@ -18,27 +18,27 @@ #ifndef QGSCIRCULARSTRING_H #define QGSCIRCULARSTRING_H -#include "qgscurvev2.h" +#include "qgscurve.h" #include /** \ingroup core - * \class QgsCircularStringV2 + * \class QgsCircularString * \brief Circular string geometry type * \note added in QGIS 2.10 * \note this API is not considered stable and may change for 2.12 */ -class CORE_EXPORT QgsCircularStringV2: public QgsCurveV2 +class CORE_EXPORT QgsCircularString: public QgsCurve { public: - QgsCircularStringV2(); - ~QgsCircularStringV2(); + QgsCircularString(); + ~QgsCircularString(); - virtual bool operator==( const QgsCurveV2& other ) const override; - virtual bool operator!=( const QgsCurveV2& other ) const override; + virtual bool operator==( const QgsCurve& other ) const override; + virtual bool operator!=( const QgsCurve& other ) const override; virtual QString geometryType() const override { return "CircularString"; } virtual int dimension() const override { return 1; } - virtual QgsCircularStringV2* clone() const override; + virtual QgsCircularString* clone() const override; virtual void clear() override; virtual bool fromWkb( QgsConstWkbPtr wkb ) override; @@ -58,32 +58,32 @@ class CORE_EXPORT QgsCircularStringV2: public QgsCurveV2 QgsPointV2 pointN( int i ) const; /** - * @copydoc QgsCurveV2::points() + * @copydoc QgsCurve::points() */ - void points( QgsPointSequenceV2 &pts ) const override; + void points( QgsPointSequence &pts ) const override; /** Sets the circular string's points */ - void setPoints( const QgsPointSequenceV2 &points ); + void setPoints( const QgsPointSequence &points ); /** - * @copydoc QgsAbstractGeometryV2::length() + * @copydoc QgsAbstractGeometry::length() */ virtual double length() const override; /** - * @copydoc QgsCurveV2::startPoint() + * @copydoc QgsCurve::startPoint() */ virtual QgsPointV2 startPoint() const override; /** - * @copydoc QgsCurveV2::endPoint() + * @copydoc QgsCurve::endPoint() */ virtual QgsPointV2 endPoint() const override; /** 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 override; + virtual QgsLineString* curveToLine( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const override; void draw( QPainter& p ) const override; void transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform, @@ -92,7 +92,7 @@ class CORE_EXPORT QgsCircularStringV2: public QgsCurveV2 void addToPainterPath( QPainterPath& path ) const override; /** - * @copydoc QgsCurveV2::drawAsPolygon() + * @copydoc QgsCurve::drawAsPolygon() */ void drawAsPolygon( QPainter& p ) const override; @@ -102,17 +102,17 @@ class CORE_EXPORT QgsCircularStringV2: public QgsCurveV2 double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const override; /** - * @copydoc QgsCurveV2::pointAt() + * @copydoc QgsCurve::pointAt() */ bool pointAt( int node, QgsPointV2& point, QgsVertexId::VertexType& type ) const override; /** - * @copydoc QgsCurveV2::sumUpArea() + * @copydoc QgsCurve::sumUpArea() */ void sumUpArea( double& sum ) const override; /** - * @copydoc QgsAbstractGeometryV2::hasCurvedSegments() + * @copydoc QgsAbstractGeometry::hasCurvedSegments() */ bool hasCurvedSegments() const override { return true; } @@ -121,7 +121,7 @@ class CORE_EXPORT QgsCircularStringV2: public QgsCurveV2 @return rotation in radians, clockwise from north*/ double vertexAngle( QgsVertexId vertex ) const override; - virtual QgsCircularStringV2* reversed() const override; + virtual QgsCircularString* reversed() const override; virtual bool addZValue( double zValue = 0 ) override; virtual bool addMValue( double mValue = 0 ) override; @@ -140,13 +140,13 @@ class CORE_EXPORT QgsCircularStringV2: public QgsCurveV2 QVector mM; //helper methods for curveToLine - void segmentize( const QgsPointV2& p1, const QgsPointV2& p2, const QgsPointV2& p3, QgsPointSequenceV2 &points, double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const; + void segmentize( const QgsPointV2& p1, const QgsPointV2& p2, const QgsPointV2& p3, QgsPointSequence &points, double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const; int segmentSide( const QgsPointV2& pt1, const QgsPointV2& pt3, const QgsPointV2& pt2 ) const; double interpolateArc( double angle, double a1, double a2, double a3, double zm1, double zm2, double zm3 ) const; static void arcTo( QPainterPath& path, QPointF pt1, QPointF pt2, QPointF pt3 ); //bounding box of a single segment static QgsRectangle segmentBoundingBox( const QgsPointV2& pt1, const QgsPointV2& pt2, const QgsPointV2& pt3 ); - static QgsPointSequenceV2 compassPointsOnSegment( double p1Angle, double p2Angle, double p3Angle, double centerX, double centerY, double radius ); + static QgsPointSequence compassPointsOnSegment( double p1Angle, double p2Angle, double p3Angle, double centerX, double centerY, double radius ); static double closestPointOnArc( double x1, double y1, double x2, double y2, double x3, double y3, const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ); void insertVertexBetween( int after, int before, int pointOnCircle ); diff --git a/src/core/geometry/qgscompoundcurvev2.cpp b/src/core/geometry/qgscompoundcurve.cpp similarity index 73% rename from src/core/geometry/qgscompoundcurvev2.cpp rename to src/core/geometry/qgscompoundcurve.cpp index fdd400ae5b7..5c4e4dc998a 100644 --- a/src/core/geometry/qgscompoundcurvev2.cpp +++ b/src/core/geometry/qgscompoundcurve.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgscompoundcurvev2.cpp + qgscompoundcurve.cpp ---------------------- begin : September 2014 copyright : (C) 2014 by Marco Hugentobler @@ -15,69 +15,69 @@ * * ***************************************************************************/ -#include "qgscompoundcurvev2.h" +#include "qgscompoundcurve.h" #include "qgsapplication.h" -#include "qgscircularstringv2.h" +#include "qgscircularstring.h" #include "qgsgeometryutils.h" -#include "qgslinestringv2.h" +#include "qgslinestring.h" #include "qgswkbptr.h" #include #include -QgsCompoundCurveV2::QgsCompoundCurveV2(): QgsCurveV2() +QgsCompoundCurve::QgsCompoundCurve(): QgsCurve() { mWkbType = QgsWkbTypes::CompoundCurve; } -QgsCompoundCurveV2::~QgsCompoundCurveV2() +QgsCompoundCurve::~QgsCompoundCurve() { clear(); } -bool QgsCompoundCurveV2::operator==( const QgsCurveV2& other ) const +bool QgsCompoundCurve::operator==( const QgsCurve& other ) const { - const QgsCompoundCurveV2* otherCurve = dynamic_cast< const QgsCompoundCurveV2* >( &other ); + const QgsCompoundCurve* otherCurve = dynamic_cast< const QgsCompoundCurve* >( &other ); if ( !otherCurve ) return false; return *otherCurve == *this; } -bool QgsCompoundCurveV2::operator!=( const QgsCurveV2& other ) const +bool QgsCompoundCurve::operator!=( const QgsCurve& other ) const { return !operator==( other ); } -QgsCompoundCurveV2::QgsCompoundCurveV2( const QgsCompoundCurveV2& curve ): QgsCurveV2( curve ) +QgsCompoundCurve::QgsCompoundCurve( const QgsCompoundCurve& curve ): QgsCurve( curve ) { mWkbType = QgsWkbTypes::CompoundCurve; - Q_FOREACH ( const QgsCurveV2* c, curve.mCurves ) + Q_FOREACH ( const QgsCurve* c, curve.mCurves ) { - mCurves.append( static_cast( c->clone() ) ); + mCurves.append( static_cast( c->clone() ) ); } } -QgsCompoundCurveV2& QgsCompoundCurveV2::operator=( const QgsCompoundCurveV2 & curve ) +QgsCompoundCurve& QgsCompoundCurve::operator=( const QgsCompoundCurve & curve ) { if ( &curve != this ) { clearCache(); - QgsCurveV2::operator=( curve ); - Q_FOREACH ( const QgsCurveV2* c, curve.mCurves ) + QgsCurve::operator=( curve ); + Q_FOREACH ( const QgsCurve* c, curve.mCurves ) { - mCurves.append( static_cast( c->clone() ) ); + mCurves.append( static_cast( c->clone() ) ); } } return *this; } -QgsCompoundCurveV2 *QgsCompoundCurveV2::clone() const +QgsCompoundCurve *QgsCompoundCurve::clone() const { - return new QgsCompoundCurveV2( *this ); + return new QgsCompoundCurve( *this ); } -void QgsCompoundCurveV2::clear() +void QgsCompoundCurve::clear() { mWkbType = QgsWkbTypes::CompoundCurve; qDeleteAll( mCurves ); @@ -85,7 +85,7 @@ void QgsCompoundCurveV2::clear() clearCache(); } -QgsRectangle QgsCompoundCurveV2::calculateBoundingBox() const +QgsRectangle QgsCompoundCurve::calculateBoundingBox() const { if ( mCurves.size() < 1 ) { @@ -101,7 +101,7 @@ QgsRectangle QgsCompoundCurveV2::calculateBoundingBox() const return bbox; } -bool QgsCompoundCurveV2::fromWkb( QgsConstWkbPtr wkbPtr ) +bool QgsCompoundCurve::fromWkb( QgsConstWkbPtr wkbPtr ) { clear(); if ( !wkbPtr ) @@ -118,7 +118,7 @@ bool QgsCompoundCurveV2::fromWkb( QgsConstWkbPtr wkbPtr ) int nCurves; wkbPtr >> nCurves; - QgsCurveV2* currentCurve = nullptr; + QgsCurve* currentCurve = nullptr; int currentCurveSize = 0; for ( int i = 0; i < nCurves; ++i ) { @@ -126,11 +126,11 @@ bool QgsCompoundCurveV2::fromWkb( QgsConstWkbPtr wkbPtr ) wkbPtr -= 1 + sizeof( int ); if ( QgsWkbTypes::flatType( curveType ) == QgsWkbTypes::LineString ) { - currentCurve = new QgsLineStringV2(); + currentCurve = new QgsLineString(); } else if ( QgsWkbTypes::flatType( curveType ) == QgsWkbTypes::CircularString ) { - currentCurve = new QgsCircularStringV2(); + currentCurve = new QgsCircularString(); } else { @@ -144,7 +144,7 @@ bool QgsCompoundCurveV2::fromWkb( QgsConstWkbPtr wkbPtr ) return true; } -bool QgsCompoundCurveV2::fromWkt( const QString& wkt ) +bool QgsCompoundCurve::fromWkt( const QString& wkt ) { clear(); @@ -161,9 +161,9 @@ bool QgsCompoundCurveV2::fromWkt( const QString& wkt ) QPair childParts = QgsGeometryUtils::wktReadBlock( childWkt ); if ( QgsWkbTypes::flatType( childParts.first ) == QgsWkbTypes::LineString ) - mCurves.append( new QgsLineStringV2() ); + mCurves.append( new QgsLineString() ); else if ( QgsWkbTypes::flatType( childParts.first ) == QgsWkbTypes::CircularString ) - mCurves.append( new QgsCircularStringV2() ); + mCurves.append( new QgsCircularString() ); else { clear(); @@ -180,7 +180,7 @@ bool QgsCompoundCurveV2::fromWkt( const QString& wkt ) //if so, update the type dimensionality of the compound curve to match bool hasZ = false; bool hasM = false; - Q_FOREACH ( const QgsCurveV2* curve, mCurves ) + Q_FOREACH ( const QgsCurve* curve, mCurves ) { hasZ = hasZ || curve->is3D(); hasM = hasM || curve->isMeasure(); @@ -195,17 +195,17 @@ bool QgsCompoundCurveV2::fromWkt( const QString& wkt ) return true; } -int QgsCompoundCurveV2::wkbSize() const +int QgsCompoundCurve::wkbSize() const { int size = sizeof( char ) + sizeof( quint32 ) + sizeof( quint32 ); - Q_FOREACH ( const QgsCurveV2 *curve, mCurves ) + Q_FOREACH ( const QgsCurve *curve, mCurves ) { size += curve->wkbSize(); } return size; } -unsigned char* QgsCompoundCurveV2::asWkb( int& binarySize ) const +unsigned char* QgsCompoundCurve::asWkb( int& binarySize ) const { binarySize = wkbSize(); unsigned char* geomPtr = new unsigned char[binarySize]; @@ -213,7 +213,7 @@ unsigned char* QgsCompoundCurveV2::asWkb( int& binarySize ) const wkb << static_cast( QgsApplication::endian() ); wkb << static_cast( wkbType() ); wkb << static_cast( mCurves.size() ); - Q_FOREACH ( const QgsCurveV2* curve, mCurves ) + Q_FOREACH ( const QgsCurve* curve, mCurves ) { int curveWkbLen = 0; unsigned char* curveWkb = curve->asWkb( curveWkbLen ); @@ -224,13 +224,13 @@ unsigned char* QgsCompoundCurveV2::asWkb( int& binarySize ) const return geomPtr; } -QString QgsCompoundCurveV2::asWkt( int precision ) const +QString QgsCompoundCurve::asWkt( int precision ) const { QString wkt = wktTypeStr() + " ("; - Q_FOREACH ( const QgsCurveV2* curve, mCurves ) + Q_FOREACH ( const QgsCurve* curve, mCurves ) { QString childWkt = curve->asWkt( precision ); - if ( dynamic_cast( curve ) ) + if ( dynamic_cast( curve ) ) { // Type names of linear geometries are omitted childWkt = childWkt.mid( childWkt.indexOf( '(' ) ); @@ -245,35 +245,35 @@ QString QgsCompoundCurveV2::asWkt( int precision ) const return wkt; } -QDomElement QgsCompoundCurveV2::asGML2( QDomDocument& doc, int precision, const QString& ns ) const +QDomElement QgsCompoundCurve::asGML2( QDomDocument& doc, int precision, const QString& ns ) const { // GML2 does not support curves - QgsLineStringV2* line = curveToLine(); + QgsLineString* line = curveToLine(); QDomElement gml = line->asGML2( doc, precision, ns ); delete line; return gml; } -QDomElement QgsCompoundCurveV2::asGML3( QDomDocument& doc, int precision, const QString& ns ) const +QDomElement QgsCompoundCurve::asGML3( QDomDocument& doc, int precision, const QString& ns ) const { QDomElement elemCurve = doc.createElementNS( ns, "Curve" ); QDomElement elemSegments = doc.createElementNS( ns, "segments" ); - Q_FOREACH ( const QgsCurveV2* curve, mCurves ) + Q_FOREACH ( const QgsCurve* curve, mCurves ) { - if ( dynamic_cast( curve ) ) + if ( dynamic_cast( curve ) ) { - QgsPointSequenceV2 pts; + QgsPointSequence pts; curve->points( pts ); QDomElement elemLineStringSegment = doc.createElementNS( ns, "LineStringSegment" ); elemLineStringSegment.appendChild( QgsGeometryUtils::pointsToGML3( pts, doc, precision, ns, is3D() ) ); elemSegments.appendChild( elemLineStringSegment ); } - else if ( dynamic_cast( curve ) ) + else if ( dynamic_cast( curve ) ) { - QgsPointSequenceV2 pts; + QgsPointSequence pts; curve->points( pts ); QDomElement elemArcString = doc.createElementNS( ns, "ArcString" ); @@ -285,19 +285,19 @@ QDomElement QgsCompoundCurveV2::asGML3( QDomDocument& doc, int precision, const return elemCurve; } -QString QgsCompoundCurveV2::asJSON( int precision ) const +QString QgsCompoundCurve::asJSON( int precision ) const { // GeoJSON does not support curves - QgsLineStringV2* line = curveToLine(); + QgsLineString* line = curveToLine(); QString json = line->asJSON( precision ); delete line; return json; } -double QgsCompoundCurveV2::length() const +double QgsCompoundCurve::length() const { double length = 0; - QList< QgsCurveV2* >::const_iterator curveIt = mCurves.constBegin(); + QList< QgsCurve* >::const_iterator curveIt = mCurves.constBegin(); for ( ; curveIt != mCurves.constEnd(); ++curveIt ) { length += ( *curveIt )->length(); @@ -305,7 +305,7 @@ double QgsCompoundCurveV2::length() const return length; } -QgsPointV2 QgsCompoundCurveV2::startPoint() const +QgsPointV2 QgsCompoundCurve::startPoint() const { if ( mCurves.size() < 1 ) { @@ -314,7 +314,7 @@ QgsPointV2 QgsCompoundCurveV2::startPoint() const return mCurves.at( 0 )->startPoint(); } -QgsPointV2 QgsCompoundCurveV2::endPoint() const +QgsPointV2 QgsCompoundCurve::endPoint() const { if ( mCurves.size() < 1 ) { @@ -323,7 +323,7 @@ QgsPointV2 QgsCompoundCurveV2::endPoint() const return mCurves.at( mCurves.size() - 1 )->endPoint(); } -void QgsCompoundCurveV2::points( QgsPointSequenceV2 &pts ) const +void QgsCompoundCurve::points( QgsPointSequence &pts ) const { pts.clear(); if ( mCurves.size() < 1 ) @@ -334,14 +334,14 @@ void QgsCompoundCurveV2::points( QgsPointSequenceV2 &pts ) const mCurves[0]->points( pts ); for ( int i = 1; i < mCurves.size(); ++i ) { - QgsPointSequenceV2 pList; + QgsPointSequence pList; mCurves[i]->points( pList ); pList.removeFirst(); //first vertex already added in previous line pts.append( pList ); } } -int QgsCompoundCurveV2::numPoints() const +int QgsCompoundCurve::numPoints() const { int nPoints = 0; int nCurves = mCurves.size(); @@ -358,11 +358,11 @@ int QgsCompoundCurveV2::numPoints() const return nPoints; } -QgsLineStringV2* QgsCompoundCurveV2::curveToLine( double tolerance, SegmentationToleranceType toleranceType ) const +QgsLineString* QgsCompoundCurve::curveToLine( double tolerance, SegmentationToleranceType toleranceType ) const { - QList< QgsCurveV2* >::const_iterator curveIt = mCurves.constBegin(); - QgsLineStringV2* line = new QgsLineStringV2(); - QgsLineStringV2* currentLine = nullptr; + QList< QgsCurve* >::const_iterator curveIt = mCurves.constBegin(); + QgsLineString* line = new QgsLineString(); + QgsLineString* currentLine = nullptr; for ( ; curveIt != mCurves.constEnd(); ++curveIt ) { currentLine = ( *curveIt )->curveToLine( tolerance, toleranceType ); @@ -372,7 +372,7 @@ QgsLineStringV2* QgsCompoundCurveV2::curveToLine( double tolerance, Segmentation return line; } -const QgsCurveV2* QgsCompoundCurveV2::curveAt( int i ) const +const QgsCurve* QgsCompoundCurve::curveAt( int i ) const { if ( i >= mCurves.size() ) { @@ -381,7 +381,7 @@ const QgsCurveV2* QgsCompoundCurveV2::curveAt( int i ) const return mCurves.at( i ); } -void QgsCompoundCurveV2::addCurve( QgsCurveV2* c ) +void QgsCompoundCurve::addCurve( QgsCurve* c ) { if ( c ) { @@ -404,7 +404,7 @@ void QgsCompoundCurveV2::addCurve( QgsCurveV2* c ) } } -void QgsCompoundCurveV2::removeCurve( int i ) +void QgsCompoundCurve::removeCurve( int i ) { if ( mCurves.size() - 1 < i ) { @@ -416,24 +416,24 @@ void QgsCompoundCurveV2::removeCurve( int i ) clearCache(); } -void QgsCompoundCurveV2::addVertex( const QgsPointV2& pt ) +void QgsCompoundCurve::addVertex( const QgsPointV2& pt ) { if ( mWkbType == QgsWkbTypes::Unknown ) { setZMTypeFromSubGeometry( &pt, QgsWkbTypes::CompoundCurve ); } - //is last curve QgsLineStringV2 - QgsCurveV2* lastCurve = nullptr; + //is last curve QgsLineString + QgsCurve* lastCurve = nullptr; if ( !mCurves.isEmpty() ) { lastCurve = mCurves.at( mCurves.size() - 1 ); } - QgsLineStringV2* line = nullptr; + QgsLineString* line = nullptr; if ( !lastCurve || QgsWkbTypes::flatType( lastCurve->wkbType() ) != QgsWkbTypes::LineString ) { - line = new QgsLineStringV2(); + line = new QgsLineString(); mCurves.append( line ); if ( lastCurve ) { @@ -441,45 +441,45 @@ void QgsCompoundCurveV2::addVertex( const QgsPointV2& pt ) } lastCurve = line; } - else //create new QgsLineStringV2* with point in it + else //create new QgsLineString* with point in it { - line = static_cast( lastCurve ); + line = static_cast( lastCurve ); } line->addVertex( pt ); clearCache(); } -void QgsCompoundCurveV2::draw( QPainter& p ) const +void QgsCompoundCurve::draw( QPainter& p ) const { - QList< QgsCurveV2* >::const_iterator it = mCurves.constBegin(); + QList< QgsCurve* >::const_iterator it = mCurves.constBegin(); for ( ; it != mCurves.constEnd(); ++it ) { ( *it )->draw( p ); } } -void QgsCompoundCurveV2::transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d, bool transformZ ) +void QgsCompoundCurve::transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d, bool transformZ ) { - Q_FOREACH ( QgsCurveV2* curve, mCurves ) + Q_FOREACH ( QgsCurve* curve, mCurves ) { curve->transform( ct, d, transformZ ); } clearCache(); } -void QgsCompoundCurveV2::transform( const QTransform& t ) +void QgsCompoundCurve::transform( const QTransform& t ) { - Q_FOREACH ( QgsCurveV2* curve, mCurves ) + Q_FOREACH ( QgsCurve* curve, mCurves ) { curve->transform( t ); } clearCache(); } -void QgsCompoundCurveV2::addToPainterPath( QPainterPath& path ) const +void QgsCompoundCurve::addToPainterPath( QPainterPath& path ) const { QPainterPath pp; - QList< QgsCurveV2* >::const_iterator it = mCurves.constBegin(); + QList< QgsCurve* >::const_iterator it = mCurves.constBegin(); for ( ; it != mCurves.constEnd(); ++it ) { ( *it )->addToPainterPath( pp ); @@ -487,10 +487,10 @@ void QgsCompoundCurveV2::addToPainterPath( QPainterPath& path ) const path.addPath( pp ); } -void QgsCompoundCurveV2::drawAsPolygon( QPainter& p ) const +void QgsCompoundCurve::drawAsPolygon( QPainter& p ) const { QPainterPath pp; - QList< QgsCurveV2* >::const_iterator it = mCurves.constBegin(); + QList< QgsCurve* >::const_iterator it = mCurves.constBegin(); for ( ; it != mCurves.constEnd(); ++it ) { ( *it )->addToPainterPath( pp ); @@ -498,7 +498,7 @@ void QgsCompoundCurveV2::drawAsPolygon( QPainter& p ) const p.drawPath( pp ); } -bool QgsCompoundCurveV2::insertVertex( QgsVertexId position, const QgsPointV2& vertex ) +bool QgsCompoundCurve::insertVertex( QgsVertexId position, const QgsPointV2& vertex ) { QList< QPair > curveIds = curveVertexId( position ); if ( curveIds.size() < 1 ) @@ -519,7 +519,7 @@ bool QgsCompoundCurveV2::insertVertex( QgsVertexId position, const QgsPointV2& v return success; } -bool QgsCompoundCurveV2::moveVertex( QgsVertexId position, const QgsPointV2& newPos ) +bool QgsCompoundCurve::moveVertex( QgsVertexId position, const QgsPointV2& newPos ) { QList< QPair > curveIds = curveVertexId( position ); QList< QPair >::const_iterator idIt = curveIds.constBegin(); @@ -536,7 +536,7 @@ bool QgsCompoundCurveV2::moveVertex( QgsVertexId position, const QgsPointV2& new return success; } -bool QgsCompoundCurveV2::deleteVertex( QgsVertexId position ) +bool QgsCompoundCurve::deleteVertex( QgsVertexId position ) { QList< QPair > curveIds = curveVertexId( position ); if ( curveIds.size() == 1 ) @@ -603,7 +603,7 @@ bool QgsCompoundCurveV2::deleteVertex( QgsVertexId position ) { removeCurve( curveIds.at( 1 ).first ); removeCurve( curveIds.at( 0 ).first ); - QgsLineStringV2* line = new QgsLineStringV2(); + QgsLineString* line = new QgsLineString(); line->insertVertex( QgsVertexId( 0, 0, 0 ), startPoint ); line->insertVertex( QgsVertexId( 0, 0, 1 ), endPoint ); mCurves.insert( curveIds.at( 0 ).first, line ); @@ -614,7 +614,7 @@ bool QgsCompoundCurveV2::deleteVertex( QgsVertexId position ) QgsPointV2 startPointOfSecond = mCurves.at( curveIds.at( 1 ).first ) ->startPoint(); if ( endPointOfFirst != startPointOfSecond ) { - QgsLineStringV2* line = new QgsLineStringV2(); + QgsLineString* line = new QgsLineString(); line->insertVertex( QgsVertexId( 0, 0, 0 ), endPointOfFirst ); line->insertVertex( QgsVertexId( 0, 0, 1 ), startPointOfSecond ); mCurves.insert( curveIds.at( 1 ).first, line ); @@ -630,7 +630,7 @@ bool QgsCompoundCurveV2::deleteVertex( QgsVertexId position ) return success; } -QList< QPair > QgsCompoundCurveV2::curveVertexId( QgsVertexId id ) const +QList< QPair > QgsCompoundCurve::curveVertexId( QgsVertexId id ) const { QList< QPair > curveIds; @@ -659,12 +659,12 @@ QList< QPair > QgsCompoundCurveV2::curveVertexId( QgsVertexId return curveIds; } -double QgsCompoundCurveV2::closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const +double QgsCompoundCurve::closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const { return QgsGeometryUtils::closestSegmentFromComponents( mCurves, QgsGeometryUtils::VERTEX, pt, segmentPt, vertexAfter, leftOf, epsilon ); } -bool QgsCompoundCurveV2::pointAt( int node, QgsPointV2& point, QgsVertexId::VertexType& type ) const +bool QgsCompoundCurve::pointAt( int node, QgsPointV2& point, QgsVertexId::VertexType& type ) const { int currentVertexId = 0; for ( int j = 0; j < mCurves.size(); ++j ) @@ -679,16 +679,16 @@ bool QgsCompoundCurveV2::pointAt( int node, QgsPointV2& point, QgsVertexId::Vert return false; } -void QgsCompoundCurveV2::sumUpArea( double& sum ) const +void QgsCompoundCurve::sumUpArea( double& sum ) const { - QList< QgsCurveV2* >::const_iterator curveIt = mCurves.constBegin(); + QList< QgsCurve* >::const_iterator curveIt = mCurves.constBegin(); for ( ; curveIt != mCurves.constEnd(); ++curveIt ) { ( *curveIt )->sumUpArea( sum ); } } -void QgsCompoundCurveV2::close() +void QgsCompoundCurve::close() { if ( numPoints() < 1 || isClosed() ) { @@ -697,9 +697,9 @@ void QgsCompoundCurveV2::close() addVertex( startPoint() ); } -bool QgsCompoundCurveV2::hasCurvedSegments() const +bool QgsCompoundCurve::hasCurvedSegments() const { - QList< QgsCurveV2* >::const_iterator curveIt = mCurves.constBegin(); + QList< QgsCurve* >::const_iterator curveIt = mCurves.constBegin(); for ( ; curveIt != mCurves.constEnd(); ++curveIt ) { if (( *curveIt )->hasCurvedSegments() ) @@ -710,18 +710,18 @@ bool QgsCompoundCurveV2::hasCurvedSegments() const return false; } -double QgsCompoundCurveV2::vertexAngle( QgsVertexId vertex ) const +double QgsCompoundCurve::vertexAngle( QgsVertexId vertex ) const { QList< QPair > curveIds = curveVertexId( vertex ); if ( curveIds.size() == 1 ) { - QgsCurveV2* curve = mCurves[curveIds.at( 0 ).first]; + QgsCurve* curve = mCurves[curveIds.at( 0 ).first]; return curve->vertexAngle( curveIds.at( 0 ).second ); } else if ( curveIds.size() > 1 ) { - QgsCurveV2* curve1 = mCurves[curveIds.at( 0 ).first]; - QgsCurveV2* curve2 = mCurves[curveIds.at( 1 ).first]; + QgsCurve* curve1 = mCurves[curveIds.at( 0 ).first]; + QgsCurve* curve2 = mCurves[curveIds.at( 1 ).first]; double angle1 = curve1->vertexAngle( curveIds.at( 0 ).second ); double angle2 = curve2->vertexAngle( curveIds.at( 1 ).second ); return QgsGeometryUtils::averageAngle( angle1, angle2 ); @@ -732,25 +732,25 @@ double QgsCompoundCurveV2::vertexAngle( QgsVertexId vertex ) const } } -QgsCompoundCurveV2* QgsCompoundCurveV2::reversed() const +QgsCompoundCurve* QgsCompoundCurve::reversed() const { - QgsCompoundCurveV2* clone = new QgsCompoundCurveV2(); - Q_FOREACH ( QgsCurveV2* curve, mCurves ) + QgsCompoundCurve* clone = new QgsCompoundCurve(); + Q_FOREACH ( QgsCurve* curve, mCurves ) { - QgsCurveV2* reversedCurve = curve->reversed(); + QgsCurve* reversedCurve = curve->reversed(); clone->addCurve( reversedCurve ); } return clone; } -bool QgsCompoundCurveV2::addZValue( double zValue ) +bool QgsCompoundCurve::addZValue( double zValue ) { if ( QgsWkbTypes::hasZ( mWkbType ) ) return false; mWkbType = QgsWkbTypes::addZ( mWkbType ); - Q_FOREACH ( QgsCurveV2* curve, mCurves ) + Q_FOREACH ( QgsCurve* curve, mCurves ) { curve->addZValue( zValue ); } @@ -758,14 +758,14 @@ bool QgsCompoundCurveV2::addZValue( double zValue ) return true; } -bool QgsCompoundCurveV2::addMValue( double mValue ) +bool QgsCompoundCurve::addMValue( double mValue ) { if ( QgsWkbTypes::hasM( mWkbType ) ) return false; mWkbType = QgsWkbTypes::addM( mWkbType ); - Q_FOREACH ( QgsCurveV2* curve, mCurves ) + Q_FOREACH ( QgsCurve* curve, mCurves ) { curve->addMValue( mValue ); } @@ -773,13 +773,13 @@ bool QgsCompoundCurveV2::addMValue( double mValue ) return true; } -bool QgsCompoundCurveV2::dropZValue() +bool QgsCompoundCurve::dropZValue() { if ( !QgsWkbTypes::hasZ( mWkbType ) ) return false; mWkbType = QgsWkbTypes::dropZ( mWkbType ); - Q_FOREACH ( QgsCurveV2* curve, mCurves ) + Q_FOREACH ( QgsCurve* curve, mCurves ) { curve->dropZValue(); } @@ -787,13 +787,13 @@ bool QgsCompoundCurveV2::dropZValue() return true; } -bool QgsCompoundCurveV2::dropMValue() +bool QgsCompoundCurve::dropMValue() { if ( !QgsWkbTypes::hasM( mWkbType ) ) return false; mWkbType = QgsWkbTypes::dropM( mWkbType ); - Q_FOREACH ( QgsCurveV2* curve, mCurves ) + Q_FOREACH ( QgsCurve* curve, mCurves ) { curve->dropMValue(); } diff --git a/src/core/geometry/qgscompoundcurvev2.h b/src/core/geometry/qgscompoundcurve.h similarity index 83% rename from src/core/geometry/qgscompoundcurvev2.h rename to src/core/geometry/qgscompoundcurve.h index d74af96b9f5..6491fe30b0d 100644 --- a/src/core/geometry/qgscompoundcurvev2.h +++ b/src/core/geometry/qgscompoundcurve.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgscompoundcurvev2.h + qgscompoundcurve.h --------------------- begin : September 2014 copyright : (C) 2014 by Marco Hugentobler @@ -18,28 +18,28 @@ #ifndef QGSCOMPOUNDCURVEV2_H #define QGSCOMPOUNDCURVEV2_H -#include "qgscurvev2.h" +#include "qgscurve.h" /** \ingroup core - * \class QgsCompoundCurveV2 + * \class QgsCompoundCurve * \brief Compound curve geometry type * \note added in QGIS 2.10 * \note this API is not considered stable and may change for 2.12 */ -class CORE_EXPORT QgsCompoundCurveV2: public QgsCurveV2 +class CORE_EXPORT QgsCompoundCurve: public QgsCurve { 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 override; - virtual bool operator!=( const QgsCurveV2& other ) const override; + virtual bool operator==( const QgsCurve& other ) const override; + virtual bool operator!=( const QgsCurve& other ) const override; virtual QString geometryType() const override { return "CompoundCurve"; } virtual int dimension() const override { return 1; } - virtual QgsCompoundCurveV2* clone() const override; + virtual QgsCompoundCurve* clone() const override; virtual void clear() override; virtual bool fromWkb( QgsConstWkbPtr wkb ) override; @@ -56,13 +56,13 @@ class CORE_EXPORT QgsCompoundCurveV2: public QgsCurveV2 virtual double length() const override; virtual QgsPointV2 startPoint() const override; virtual QgsPointV2 endPoint() const override; - virtual void points( QgsPointSequenceV2 &pts ) const override; + virtual void points( QgsPointSequence &pts ) const override; virtual int numPoints() const override; /** 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 override; + virtual QgsLineString* curveToLine( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const override; /** Returns the number of curves in the geometry. */ @@ -70,11 +70,11 @@ class CORE_EXPORT 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 ); + void addCurve( QgsCurve* c ); /** Removes a curve from the geometry. * @param i index of curve to remove @@ -111,7 +111,7 @@ class CORE_EXPORT QgsCompoundCurveV2: public QgsCurveV2 @return rotation in radians, clockwise from north*/ double vertexAngle( QgsVertexId vertex ) const override; - virtual QgsCompoundCurveV2* reversed() const override; + virtual QgsCompoundCurve* reversed() const override; virtual bool addZValue( double zValue = 0 ) override; virtual bool addMValue( double mValue = 0 ) override; @@ -124,7 +124,7 @@ class CORE_EXPORT QgsCompoundCurveV2: public QgsCurveV2 virtual QgsRectangle calculateBoundingBox() const override; private: - QList< QgsCurveV2* > mCurves; + QList< QgsCurve* > mCurves; /** Turns a vertex id for the compound curve into one or more ids for the subcurves @return the index of the subcurve or -1 in case of error*/ QList< QPair > curveVertexId( QgsVertexId id ) const; diff --git a/src/core/geometry/qgscurvev2.cpp b/src/core/geometry/qgscurve.cpp similarity index 75% rename from src/core/geometry/qgscurvev2.cpp rename to src/core/geometry/qgscurve.cpp index 2c70f6b2d89..6064b27c4de 100644 --- a/src/core/geometry/qgscurvev2.cpp +++ b/src/core/geometry/qgscurve.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgscurvev2.cpp + qgscurve.cpp -------------- begin : November 2014 copyright : (C) 2014 by Marco Hugentobler @@ -15,18 +15,18 @@ * * ***************************************************************************/ -#include "qgscurvev2.h" -#include "qgslinestringv2.h" +#include "qgscurve.h" +#include "qgslinestring.h" #include "qgspointv2.h" -#include "qgsmultipointv2.h" +#include "qgsmultipoint.h" -QgsCurveV2::QgsCurveV2(): QgsAbstractGeometryV2() +QgsCurve::QgsCurve(): QgsAbstractGeometry() {} -QgsCurveV2::~QgsCurveV2() +QgsCurve::~QgsCurve() {} -bool QgsCurveV2::isClosed() const +bool QgsCurve::isClosed() const { if ( numPoints() == 0 ) return false; @@ -39,24 +39,24 @@ bool QgsCurveV2::isClosed() const qgsDoubleNear( start.z(), end.z(), 1E-8 ) ); } -bool QgsCurveV2::isRing() const +bool QgsCurve::isRing() const { return ( isClosed() && numPoints() >= 4 ); } -QgsCoordinateSequenceV2 QgsCurveV2::coordinateSequence() const +QgsCoordinateSequence QgsCurve::coordinateSequence() const { if ( !mCoordinateSequence.isEmpty() ) return mCoordinateSequence; - mCoordinateSequence.append( QgsRingSequenceV2() ); - mCoordinateSequence.back().append( QgsPointSequenceV2() ); + mCoordinateSequence.append( QgsRingSequence() ); + mCoordinateSequence.back().append( QgsPointSequence() ); points( mCoordinateSequence.back().back() ); return mCoordinateSequence; } -bool QgsCurveV2::nextVertex( QgsVertexId& id, QgsPointV2& vertex ) const +bool QgsCurve::nextVertex( QgsVertexId& id, QgsPointV2& vertex ) const { if ( id.vertex < 0 ) { @@ -81,7 +81,7 @@ bool QgsCurveV2::nextVertex( QgsVertexId& id, QgsPointV2& vertex ) const return pointAt( id.vertex, vertex, id.type ); } -QgsAbstractGeometryV2* QgsCurveV2::boundary() const +QgsAbstractGeometry* QgsCurve::boundary() const { if ( isEmpty() ) return nullptr; @@ -95,12 +95,12 @@ QgsAbstractGeometryV2* QgsCurveV2::boundary() const return multiPoint; } -QgsCurveV2* QgsCurveV2::segmentize( double tolerance, SegmentationToleranceType toleranceType ) const +QgsCurve* QgsCurve::segmentize( double tolerance, SegmentationToleranceType toleranceType ) const { return curveToLine( tolerance, toleranceType ); } -QgsPointV2 QgsCurveV2::vertexAt( QgsVertexId id ) const +QgsPointV2 QgsCurve::vertexAt( QgsVertexId id ) const { QgsPointV2 v; QgsVertexId::VertexType type; @@ -108,7 +108,7 @@ QgsPointV2 QgsCurveV2::vertexAt( QgsVertexId id ) const return v; } -QgsRectangle QgsCurveV2::boundingBox() const +QgsRectangle QgsCurve::boundingBox() const { if ( mBoundingBox.isNull() ) { diff --git a/src/core/geometry/qgscurvev2.h b/src/core/geometry/qgscurve.h similarity index 78% rename from src/core/geometry/qgscurvev2.h rename to src/core/geometry/qgscurve.h index 7bffe984970..93626078cc2 100644 --- a/src/core/geometry/qgscurvev2.h +++ b/src/core/geometry/qgscurve.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgscurvev2.h + qgscurve.h ------------ begin : September 2014 copyright : (C) 2014 by Marco Hugentobler @@ -18,27 +18,27 @@ #ifndef QGSCURVEV2_H #define QGSCURVEV2_H -#include "qgsabstractgeometryv2.h" +#include "qgsabstractgeometry.h" #include "qgsrectangle.h" -class QgsLineStringV2; +class QgsLineString; class QPainterPath; /** \ingroup core - * \class QgsCurveV2 + * \class QgsCurve * \brief Abstract base class for curved geometry type * \note added in QGIS 2.10 */ -class CORE_EXPORT QgsCurveV2: public QgsAbstractGeometryV2 +class CORE_EXPORT QgsCurve: public QgsAbstractGeometry { 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 override = 0; + virtual QgsCurve* clone() const override = 0; /** Returns the starting point of the curve. * @see endPoint @@ -62,7 +62,7 @@ class CORE_EXPORT QgsCurveV2: public QgsAbstractGeometryV2 * 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 = 0; + virtual QgsLineString* curveToLine( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const = 0; /** Adds a curve to a painter path. */ @@ -75,7 +75,7 @@ class CORE_EXPORT QgsCurveV2: public QgsAbstractGeometryV2 /** Returns a list of points within the curve. */ - virtual void points( QgsPointSequenceV2 &pt ) const = 0; + virtual void points( QgsPointSequence &pt ) const = 0; /** Returns the number of points in the curve. */ @@ -86,7 +86,7 @@ class CORE_EXPORT QgsCurveV2: public QgsAbstractGeometryV2 */ virtual void sumUpArea( double& sum ) const = 0; - virtual QgsCoordinateSequenceV2 coordinateSequence() const override; + virtual QgsCoordinateSequence coordinateSequence() const override; virtual bool nextVertex( QgsVertexId& id, QgsPointV2& vertex ) const override; /** Returns the point and vertex id of a point within the curve. @@ -100,14 +100,14 @@ class CORE_EXPORT 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; + virtual QgsCurve* reversed() const = 0; - virtual QgsAbstractGeometryV2* boundary() const override; + virtual QgsAbstractGeometry* boundary() const override; /** Returns a geometry without curves. Caller takes ownership * @param tolerance segmentation tolerance * @param toleranceType maximum segmentation angle or maximum difference between approximation and curve*/ - QgsCurveV2* segmentize( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const override; + QgsCurve* segmentize( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const override; virtual int vertexCount( int part = 0, int ring = 0 ) const override { Q_UNUSED( part ); Q_UNUSED( ring ); return numPoints(); } virtual int ringCount( int part = 0 ) const override { Q_UNUSED( part ); return numPoints() > 0 ? 1 : 0; } @@ -118,12 +118,12 @@ class CORE_EXPORT QgsCurveV2: public QgsAbstractGeometryV2 protected: - virtual void clearCache() const override { mBoundingBox = QgsRectangle(); mCoordinateSequence.clear(); QgsAbstractGeometryV2::clearCache(); } + virtual void clearCache() const override { mBoundingBox = QgsRectangle(); mCoordinateSequence.clear(); QgsAbstractGeometry::clearCache(); } private: mutable QgsRectangle mBoundingBox; - mutable QgsCoordinateSequenceV2 mCoordinateSequence; + mutable QgsCoordinateSequence mCoordinateSequence; }; #endif // QGSCURVEV2_H diff --git a/src/core/geometry/qgscurvepolygonv2.cpp b/src/core/geometry/qgscurvepolygon.cpp similarity index 73% rename from src/core/geometry/qgscurvepolygonv2.cpp rename to src/core/geometry/qgscurvepolygon.cpp index 5510bbc7ccc..103bdb1549d 100644 --- a/src/core/geometry/qgscurvepolygonv2.cpp +++ b/src/core/geometry/qgscurvepolygon.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgscurvepolygonv2.cpp + qgscurvepolygon.cpp --------------------- begin : September 2014 copyright : (C) 2014 by Marco Hugentobler @@ -15,69 +15,69 @@ * * ***************************************************************************/ -#include "qgscurvepolygonv2.h" +#include "qgscurvepolygon.h" #include "qgsapplication.h" -#include "qgscircularstringv2.h" -#include "qgscompoundcurvev2.h" +#include "qgscircularstring.h" +#include "qgscompoundcurve.h" #include "qgsgeometryutils.h" -#include "qgslinestringv2.h" -#include "qgspolygonv2.h" +#include "qgslinestring.h" +#include "qgspolygon.h" #include "qgswkbptr.h" -#include "qgsmulticurvev2.h" +#include "qgsmulticurve.h" #include #include -QgsCurvePolygonV2::QgsCurvePolygonV2(): QgsSurfaceV2(), mExteriorRing( nullptr ) +QgsCurvePolygon::QgsCurvePolygon(): QgsSurface(), mExteriorRing( nullptr ) { mWkbType = QgsWkbTypes::CurvePolygon; } -QgsCurvePolygonV2::~QgsCurvePolygonV2() +QgsCurvePolygon::~QgsCurvePolygon() { clear(); } -QgsCurvePolygonV2::QgsCurvePolygonV2( const QgsCurvePolygonV2& p ) - : QgsSurfaceV2( p ) +QgsCurvePolygon::QgsCurvePolygon( const QgsCurvePolygon& p ) + : QgsSurface( p ) , mExteriorRing( nullptr ) { mWkbType = p.mWkbType; if ( p.mExteriorRing ) { - mExteriorRing = static_cast( p.mExteriorRing->clone() ); + mExteriorRing = static_cast( p.mExteriorRing->clone() ); } - Q_FOREACH ( const QgsCurveV2* ring, p.mInteriorRings ) + Q_FOREACH ( const QgsCurve* ring, p.mInteriorRings ) { - mInteriorRings.push_back( static_cast( ring->clone() ) ); + mInteriorRings.push_back( static_cast( ring->clone() ) ); } } -QgsCurvePolygonV2& QgsCurvePolygonV2::operator=( const QgsCurvePolygonV2 & p ) +QgsCurvePolygon& QgsCurvePolygon::operator=( const QgsCurvePolygon & p ) { if ( &p != this ) { clearCache(); - QgsSurfaceV2::operator=( p ); + QgsSurface::operator=( p ); if ( p.mExteriorRing ) { - mExteriorRing = static_cast( p.mExteriorRing->clone() ); + mExteriorRing = static_cast( p.mExteriorRing->clone() ); } - Q_FOREACH ( const QgsCurveV2* ring, p.mInteriorRings ) + Q_FOREACH ( const QgsCurve* ring, p.mInteriorRings ) { - mInteriorRings.push_back( static_cast( ring->clone() ) ); + mInteriorRings.push_back( static_cast( ring->clone() ) ); } } return *this; } -QgsCurvePolygonV2* QgsCurvePolygonV2::clone() const +QgsCurvePolygon* QgsCurvePolygon::clone() const { - return new QgsCurvePolygonV2( *this ); + return new QgsCurvePolygon( *this ); } -void QgsCurvePolygonV2::clear() +void QgsCurvePolygon::clear() { mWkbType = QgsWkbTypes::CurvePolygon; delete mExteriorRing; @@ -88,7 +88,7 @@ void QgsCurvePolygonV2::clear() } -bool QgsCurvePolygonV2::fromWkb( QgsConstWkbPtr wkbPtr ) +bool QgsCurvePolygon::fromWkb( QgsConstWkbPtr wkbPtr ) { clear(); if ( !wkbPtr ) @@ -105,7 +105,7 @@ bool QgsCurvePolygonV2::fromWkb( QgsConstWkbPtr wkbPtr ) int nRings; wkbPtr >> nRings; - QgsCurveV2* currentCurve = nullptr; + QgsCurve* currentCurve = nullptr; int currentCurveSize = 0; for ( int i = 0; i < nRings; ++i ) { @@ -114,15 +114,15 @@ bool QgsCurvePolygonV2::fromWkb( QgsConstWkbPtr wkbPtr ) QgsWkbTypes::Type flatCurveType = QgsWkbTypes::flatType( curveType ); if ( flatCurveType == QgsWkbTypes::LineString ) { - currentCurve = new QgsLineStringV2(); + currentCurve = new QgsLineString(); } else if ( flatCurveType == QgsWkbTypes::CircularString ) { - currentCurve = new QgsCircularStringV2(); + currentCurve = new QgsCircularString(); } else if ( flatCurveType == QgsWkbTypes::CompoundCurve ) { - currentCurve = new QgsCompoundCurveV2(); + currentCurve = new QgsCompoundCurve(); } else { @@ -144,7 +144,7 @@ bool QgsCurvePolygonV2::fromWkb( QgsConstWkbPtr wkbPtr ) return true; } -bool QgsCurvePolygonV2::fromWkt( const QString& wkt ) +bool QgsCurvePolygon::fromWkt( const QString& wkt ) { clear(); @@ -163,11 +163,11 @@ bool QgsCurvePolygonV2::fromWkt( const QString& wkt ) QgsWkbTypes::Type flatCurveType = QgsWkbTypes::flatType( childParts.first ); if ( flatCurveType == QgsWkbTypes::LineString ) - mInteriorRings.append( new QgsLineStringV2() ); + mInteriorRings.append( new QgsLineString() ); else if ( flatCurveType == QgsWkbTypes::CircularString ) - mInteriorRings.append( new QgsCircularStringV2() ); + mInteriorRings.append( new QgsCircularString() ); else if ( flatCurveType == QgsWkbTypes::CompoundCurve ) - mInteriorRings.append( new QgsCompoundCurveV2() ); + mInteriorRings.append( new QgsCompoundCurve() ); else { clear(); @@ -198,7 +198,7 @@ bool QgsCurvePolygonV2::fromWkt( const QString& wkt ) hasZ = hasZ || mExteriorRing->is3D(); hasM = hasM || mExteriorRing->isMeasure(); } - Q_FOREACH ( const QgsCurveV2* curve, mInteriorRings ) + Q_FOREACH ( const QgsCurve* curve, mInteriorRings ) { hasZ = hasZ || curve->is3D(); hasM = hasM || curve->isMeasure(); @@ -213,7 +213,7 @@ bool QgsCurvePolygonV2::fromWkt( const QString& wkt ) return true; } -QgsRectangle QgsCurvePolygonV2::calculateBoundingBox() const +QgsRectangle QgsCurvePolygon::calculateBoundingBox() const { if ( mExteriorRing ) { @@ -222,21 +222,21 @@ QgsRectangle QgsCurvePolygonV2::calculateBoundingBox() const return QgsRectangle(); } -int QgsCurvePolygonV2::wkbSize() const +int QgsCurvePolygon::wkbSize() const { int size = sizeof( char ) + sizeof( quint32 ) + sizeof( quint32 ); if ( mExteriorRing ) { size += mExteriorRing->wkbSize(); } - Q_FOREACH ( const QgsCurveV2* curve, mInteriorRings ) + Q_FOREACH ( const QgsCurve* curve, mInteriorRings ) { size += curve->wkbSize(); } return size; } -unsigned char* QgsCurvePolygonV2::asWkb( int& binarySize ) const +unsigned char* QgsCurvePolygon::asWkb( int& binarySize ) const { binarySize = wkbSize(); unsigned char* geomPtr = new unsigned char[binarySize]; @@ -251,7 +251,7 @@ unsigned char* QgsCurvePolygonV2::asWkb( int& binarySize ) const memcpy( wkbPtr, ringWkb, curveWkbLen ); wkbPtr += curveWkbLen; } - Q_FOREACH ( const QgsCurveV2* curve, mInteriorRings ) + Q_FOREACH ( const QgsCurve* curve, mInteriorRings ) { int curveWkbLen = 0; unsigned char *ringWkb = curve->asWkb( curveWkbLen ); @@ -261,23 +261,23 @@ unsigned char* QgsCurvePolygonV2::asWkb( int& binarySize ) const return geomPtr; } -QString QgsCurvePolygonV2::asWkt( int precision ) const +QString QgsCurvePolygon::asWkt( int precision ) const { QString wkt = wktTypeStr() + " ("; if ( mExteriorRing ) { QString childWkt = mExteriorRing->asWkt( precision ); - if ( dynamic_cast( mExteriorRing ) ) + if ( dynamic_cast( mExteriorRing ) ) { // Type names of linear geometries are omitted childWkt = childWkt.mid( childWkt.indexOf( '(' ) ); } wkt += childWkt + ','; } - Q_FOREACH ( const QgsCurveV2* curve, mInteriorRings ) + Q_FOREACH ( const QgsCurve* curve, mInteriorRings ) { QString childWkt = curve->asWkt( precision ); - if ( dynamic_cast( curve ) ) + if ( dynamic_cast( curve ) ) { // Type names of linear geometries are omitted childWkt = childWkt.mid( childWkt.indexOf( '(' ) ); @@ -292,12 +292,12 @@ QString QgsCurvePolygonV2::asWkt( int precision ) const return wkt; } -QDomElement QgsCurvePolygonV2::asGML2( QDomDocument& doc, int precision, const QString& ns ) const +QDomElement QgsCurvePolygon::asGML2( QDomDocument& doc, int precision, const QString& ns ) const { // GML2 does not support curves QDomElement elemPolygon = doc.createElementNS( ns, "Polygon" ); QDomElement elemOuterBoundaryIs = doc.createElementNS( ns, "outerBoundaryIs" ); - QgsLineStringV2* exteriorLineString = exteriorRing()->curveToLine(); + QgsLineString* exteriorLineString = exteriorRing()->curveToLine(); QDomElement outerRing = exteriorLineString->asGML2( doc, precision, ns ); outerRing.toElement().setTagName( "LinearRing" ); elemOuterBoundaryIs.appendChild( outerRing ); @@ -306,7 +306,7 @@ QDomElement QgsCurvePolygonV2::asGML2( QDomDocument& doc, int precision, const Q QDomElement elemInnerBoundaryIs = doc.createElementNS( ns, "innerBoundaryIs" ); for ( int i = 0, n = numInteriorRings(); i < n; ++i ) { - QgsLineStringV2* interiorLineString = interiorRing( i )->curveToLine(); + QgsLineString* interiorLineString = interiorRing( i )->curveToLine(); QDomElement innerRing = interiorLineString->asGML2( doc, precision, ns ); innerRing.toElement().setTagName( "LinearRing" ); elemInnerBoundaryIs.appendChild( innerRing ); @@ -316,7 +316,7 @@ QDomElement QgsCurvePolygonV2::asGML2( QDomDocument& doc, int precision, const Q return elemPolygon; } -QDomElement QgsCurvePolygonV2::asGML3( QDomDocument& doc, int precision, const QString& ns ) const +QDomElement QgsCurvePolygon::asGML3( QDomDocument& doc, int precision, const QString& ns ) const { QDomElement elemCurvePolygon = doc.createElementNS( ns, "Polygon" ); QDomElement elemExterior = doc.createElementNS( ns, "exterior" ); @@ -335,21 +335,21 @@ QDomElement QgsCurvePolygonV2::asGML3( QDomDocument& doc, int precision, const Q return elemCurvePolygon; } -QString QgsCurvePolygonV2::asJSON( int precision ) const +QString QgsCurvePolygon::asJSON( int precision ) const { // GeoJSON does not support curves QString json = "{\"type\": \"Polygon\", \"coordinates\": ["; - QgsLineStringV2* exteriorLineString = exteriorRing()->curveToLine(); - QgsPointSequenceV2 exteriorPts; + QgsLineString* exteriorLineString = exteriorRing()->curveToLine(); + QgsPointSequence exteriorPts; exteriorLineString->points( exteriorPts ); json += QgsGeometryUtils::pointsToJSON( exteriorPts, precision ) + ", "; delete exteriorLineString; for ( int i = 0, n = numInteriorRings(); i < n; ++i ) { - QgsLineStringV2* interiorLineString = interiorRing( i )->curveToLine(); - QgsPointSequenceV2 interiorPts; + QgsLineString* interiorLineString = interiorRing( i )->curveToLine(); + QgsPointSequence interiorPts; interiorLineString->points( interiorPts ); json += QgsGeometryUtils::pointsToJSON( interiorPts, precision ) + ", "; delete interiorLineString; @@ -362,7 +362,7 @@ QString QgsCurvePolygonV2::asJSON( int precision ) const return json; } -double QgsCurvePolygonV2::area() const +double QgsCurvePolygon::area() const { if ( !mExteriorRing ) { @@ -378,7 +378,7 @@ double QgsCurvePolygonV2::area() const totalArea += qAbs( area ); } - QList::const_iterator ringIt = mInteriorRings.constBegin(); + QList::const_iterator ringIt = mInteriorRings.constBegin(); for ( ; ringIt != mInteriorRings.constEnd(); ++ringIt ) { double area = 0.0; @@ -391,14 +391,14 @@ double QgsCurvePolygonV2::area() const return totalArea; } -double QgsCurvePolygonV2::perimeter() const +double QgsCurvePolygon::perimeter() const { if ( !mExteriorRing ) return 0.0; //sum perimeter of rings double perimeter = mExteriorRing->length(); - QList::const_iterator ringIt = mInteriorRings.constBegin(); + QList::const_iterator ringIt = mInteriorRings.constBegin(); for ( ; ringIt != mInteriorRings.constEnd(); ++ringIt ) { perimeter += ( *ringIt )->length(); @@ -406,11 +406,11 @@ double QgsCurvePolygonV2::perimeter() const return perimeter; } -QgsPolygonV2* QgsCurvePolygonV2::surfaceToPolygon() const +QgsPolygonV2* QgsCurvePolygon::surfaceToPolygon() const { QgsPolygonV2* polygon = new QgsPolygonV2(); polygon->setExteriorRing( exteriorRing()->curveToLine() ); - QList interiors; + QList interiors; int n = numInteriorRings(); interiors.reserve( n ); for ( int i = 0; i < n; ++i ) @@ -421,7 +421,7 @@ QgsPolygonV2* QgsCurvePolygonV2::surfaceToPolygon() const return polygon; } -QgsAbstractGeometryV2* QgsCurvePolygonV2::boundary() const +QgsAbstractGeometry* QgsCurvePolygon::boundary() const { if ( mInteriorRings.isEmpty() ) { @@ -429,7 +429,7 @@ QgsAbstractGeometryV2* QgsCurvePolygonV2::boundary() const } else { - QgsMultiCurveV2* multiCurve = new QgsMultiCurveV2(); + QgsMultiCurve* multiCurve = new QgsMultiCurve(); multiCurve->addGeometry( mExteriorRing->clone() ); int nInteriorRings = mInteriorRings.size(); for ( int i = 0; i < nInteriorRings; ++i ) @@ -440,7 +440,7 @@ QgsAbstractGeometryV2* QgsCurvePolygonV2::boundary() const } } -QgsPolygonV2* QgsCurvePolygonV2::toPolygon( double tolerance, SegmentationToleranceType toleranceType ) const +QgsPolygonV2* QgsCurvePolygon::toPolygon( double tolerance, SegmentationToleranceType toleranceType ) const { if ( !mExteriorRing ) { @@ -450,8 +450,8 @@ QgsPolygonV2* QgsCurvePolygonV2::toPolygon( double tolerance, SegmentationTolera QgsPolygonV2* poly = new QgsPolygonV2(); poly->setExteriorRing( mExteriorRing->curveToLine( tolerance, toleranceType ) ); - QList rings; - QList::const_iterator it = mInteriorRings.constBegin(); + QList rings; + QList::const_iterator it = mInteriorRings.constBegin(); for ( ; it != mInteriorRings.constEnd(); ++it ) { rings.push_back(( *it )->curveToLine( tolerance, toleranceType ) ); @@ -460,17 +460,17 @@ QgsPolygonV2* QgsCurvePolygonV2::toPolygon( double tolerance, SegmentationTolera return poly; } -int QgsCurvePolygonV2::numInteriorRings() const +int QgsCurvePolygon::numInteriorRings() const { return mInteriorRings.size(); } -const QgsCurveV2* QgsCurvePolygonV2::exteriorRing() const +const QgsCurve* QgsCurvePolygon::exteriorRing() const { return mExteriorRing; } -const QgsCurveV2* QgsCurvePolygonV2::interiorRing( int i ) const +const QgsCurve* QgsCurvePolygon::interiorRing( int i ) const { if ( i < 0 || i >= mInteriorRings.size() ) { @@ -479,7 +479,7 @@ const QgsCurveV2* QgsCurvePolygonV2::interiorRing( int i ) const return mInteriorRings.at( i ); } -void QgsCurvePolygonV2::setExteriorRing( QgsCurveV2* ring ) +void QgsCurvePolygon::setExteriorRing( QgsCurve* ring ) { if ( !ring ) { @@ -499,7 +499,7 @@ void QgsCurvePolygonV2::setExteriorRing( QgsCurveV2* ring ) } //match dimensionality for rings - Q_FOREACH ( QgsCurveV2* ring, mInteriorRings ) + Q_FOREACH ( QgsCurve* ring, mInteriorRings ) { if ( is3D() ) ring->addZValue(); @@ -514,20 +514,20 @@ void QgsCurvePolygonV2::setExteriorRing( QgsCurveV2* ring ) clearCache(); } -void QgsCurvePolygonV2::setInteriorRings( const QList& rings ) +void QgsCurvePolygon::setInteriorRings( const QList& rings ) { qDeleteAll( mInteriorRings ); mInteriorRings.clear(); //add rings one-by-one, so that they can each be converted to the correct type for the CurvePolygon - Q_FOREACH ( QgsCurveV2* ring, rings ) + Q_FOREACH ( QgsCurve* ring, rings ) { addInteriorRing( ring ); } clearCache(); } -void QgsCurvePolygonV2::addInteriorRing( QgsCurveV2* ring ) +void QgsCurvePolygon::addInteriorRing( QgsCurve* ring ) { if ( !ring ) return; @@ -547,7 +547,7 @@ void QgsCurvePolygonV2::addInteriorRing( QgsCurveV2* ring ) clearCache(); } -bool QgsCurvePolygonV2::removeInteriorRing( int nr ) +bool QgsCurvePolygon::removeInteriorRing( int nr ) { if ( nr < 0 || nr >= mInteriorRings.size() ) { @@ -558,7 +558,7 @@ bool QgsCurvePolygonV2::removeInteriorRing( int nr ) return true; } -void QgsCurvePolygonV2::draw( QPainter& p ) const +void QgsCurvePolygon::draw( QPainter& p ) const { if ( mInteriorRings.size() < 1 ) { @@ -572,7 +572,7 @@ void QgsCurvePolygonV2::draw( QPainter& p ) const QPainterPath path; mExteriorRing->addToPainterPath( path ); - QList::const_iterator it = mInteriorRings.constBegin(); + QList::const_iterator it = mInteriorRings.constBegin(); for ( ; it != mInteriorRings.constEnd(); ++it ) { ( *it )->addToPainterPath( path ); @@ -581,70 +581,70 @@ void QgsCurvePolygonV2::draw( QPainter& p ) const } } -void QgsCurvePolygonV2::transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d, bool transformZ ) +void QgsCurvePolygon::transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d, bool transformZ ) { if ( mExteriorRing ) { mExteriorRing->transform( ct, d, transformZ ); } - Q_FOREACH ( QgsCurveV2* curve, mInteriorRings ) + Q_FOREACH ( QgsCurve* curve, mInteriorRings ) { curve->transform( ct, d, transformZ ); } clearCache(); } -void QgsCurvePolygonV2::transform( const QTransform& t ) +void QgsCurvePolygon::transform( const QTransform& t ) { if ( mExteriorRing ) { mExteriorRing->transform( t ); } - Q_FOREACH ( QgsCurveV2* curve, mInteriorRings ) + Q_FOREACH ( QgsCurve* curve, mInteriorRings ) { curve->transform( t ); } clearCache(); } -QgsCoordinateSequenceV2 QgsCurvePolygonV2::coordinateSequence() const +QgsCoordinateSequence QgsCurvePolygon::coordinateSequence() const { if ( !mCoordinateSequence.isEmpty() ) return mCoordinateSequence; - mCoordinateSequence.append( QgsRingSequenceV2() ); + mCoordinateSequence.append( QgsRingSequence() ); if ( mExteriorRing ) { - mCoordinateSequence.back().append( QgsPointSequenceV2() ); + mCoordinateSequence.back().append( QgsPointSequence() ); mExteriorRing->points( mCoordinateSequence.back().back() ); } - QList::const_iterator it = mInteriorRings.constBegin(); + QList::const_iterator it = mInteriorRings.constBegin(); for ( ; it != mInteriorRings.constEnd(); ++it ) { - mCoordinateSequence.back().append( QgsPointSequenceV2() ); + mCoordinateSequence.back().append( QgsPointSequence() ); ( *it )->points( mCoordinateSequence.back().back() ); } return mCoordinateSequence; } -double QgsCurvePolygonV2::closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const +double QgsCurvePolygon::closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const { if ( !mExteriorRing ) { return 0.0; } - QList segmentList; + QList segmentList; segmentList.append( mExteriorRing ); segmentList.append( mInteriorRings ); return QgsGeometryUtils::closestSegmentFromComponents( segmentList, QgsGeometryUtils::RING, pt, segmentPt, vertexAfter, leftOf, epsilon ); } -bool QgsCurvePolygonV2::nextVertex( QgsVertexId& vId, QgsPointV2& vertex ) const +bool QgsCurvePolygon::nextVertex( QgsVertexId& vId, QgsPointV2& vertex ) const { if ( !mExteriorRing || vId.ring >= 1 + mInteriorRings.size() ) { @@ -663,7 +663,7 @@ bool QgsCurvePolygonV2::nextVertex( QgsVertexId& vId, QgsPointV2& vertex ) const } else { - QgsCurveV2* ring = vId.ring == 0 ? mExteriorRing : mInteriorRings[vId.ring - 1]; + QgsCurve* ring = vId.ring == 0 ? mExteriorRing : mInteriorRings[vId.ring - 1]; if ( ring->nextVertex( vId, vertex ) ) { @@ -680,14 +680,14 @@ bool QgsCurvePolygonV2::nextVertex( QgsVertexId& vId, QgsPointV2& vertex ) const } } -bool QgsCurvePolygonV2::insertVertex( QgsVertexId vId, const QgsPointV2& vertex ) +bool QgsCurvePolygon::insertVertex( QgsVertexId vId, const QgsPointV2& vertex ) { if ( !mExteriorRing || vId.ring < 0 || vId.ring >= 1 + mInteriorRings.size() ) { return false; } - QgsCurveV2* ring = vId.ring == 0 ? mExteriorRing : mInteriorRings.at( vId.ring - 1 ); + QgsCurve* ring = vId.ring == 0 ? mExteriorRing : mInteriorRings.at( vId.ring - 1 ); int n = ring->numPoints(); bool success = ring->insertVertex( QgsVertexId( 0, 0, vId.vertex ), vertex ); if ( !success ) @@ -706,14 +706,14 @@ bool QgsCurvePolygonV2::insertVertex( QgsVertexId vId, const QgsPointV2& vertex return true; } -bool QgsCurvePolygonV2::moveVertex( QgsVertexId vId, const QgsPointV2& newPos ) +bool QgsCurvePolygon::moveVertex( QgsVertexId vId, const QgsPointV2& newPos ) { if ( !mExteriorRing || vId.ring < 0 || vId.ring >= 1 + mInteriorRings.size() ) { return false; } - QgsCurveV2* ring = vId.ring == 0 ? mExteriorRing : mInteriorRings.at( vId.ring - 1 ); + QgsCurve* ring = vId.ring == 0 ? mExteriorRing : mInteriorRings.at( vId.ring - 1 ); int n = ring->numPoints(); bool success = ring->moveVertex( vId, newPos ); if ( success ) @@ -728,14 +728,14 @@ bool QgsCurvePolygonV2::moveVertex( QgsVertexId vId, const QgsPointV2& newPos ) return success; } -bool QgsCurvePolygonV2::deleteVertex( QgsVertexId vId ) +bool QgsCurvePolygon::deleteVertex( QgsVertexId vId ) { if ( !mExteriorRing || vId.ring < 0 || vId.ring >= 1 + mInteriorRings.size() ) { return false; } - QgsCurveV2* ring = vId.ring == 0 ? mExteriorRing : mInteriorRings.at( vId.ring - 1 ); + QgsCurve* ring = vId.ring == 0 ? mExteriorRing : mInteriorRings.at( vId.ring - 1 ); int n = ring->numPoints(); if ( n <= 4 ) { @@ -772,14 +772,14 @@ bool QgsCurvePolygonV2::deleteVertex( QgsVertexId vId ) return success; } -bool QgsCurvePolygonV2::hasCurvedSegments() const +bool QgsCurvePolygon::hasCurvedSegments() const { if ( mExteriorRing && mExteriorRing->hasCurvedSegments() ) { return true; } - QList::const_iterator it = mInteriorRings.constBegin(); + QList::const_iterator it = mInteriorRings.constBegin(); for ( ; it != mInteriorRings.constEnd(); ++it ) { if (( *it )->hasCurvedSegments() ) @@ -790,12 +790,12 @@ bool QgsCurvePolygonV2::hasCurvedSegments() const return false; } -QgsAbstractGeometryV2* QgsCurvePolygonV2::segmentize( double tolerance, SegmentationToleranceType toleranceType ) const +QgsAbstractGeometry* QgsCurvePolygon::segmentize( double tolerance, SegmentationToleranceType toleranceType ) const { return toPolygon( tolerance, toleranceType ); } -double QgsCurvePolygonV2::vertexAngle( QgsVertexId vertex ) const +double QgsCurvePolygon::vertexAngle( QgsVertexId vertex ) const { if ( !mExteriorRing || vertex.ring < 0 || vertex.ring >= 1 + mInteriorRings.size() ) { @@ -803,21 +803,21 @@ double QgsCurvePolygonV2::vertexAngle( QgsVertexId vertex ) const return false; } - QgsCurveV2* ring = vertex.ring == 0 ? mExteriorRing : mInteriorRings[vertex.ring - 1]; + QgsCurve* ring = vertex.ring == 0 ? mExteriorRing : mInteriorRings[vertex.ring - 1]; return ring->vertexAngle( vertex ); } -int QgsCurvePolygonV2::vertexCount( int /*part*/, int ring ) const +int QgsCurvePolygon::vertexCount( int /*part*/, int ring ) const { return ring == 0 ? mExteriorRing->vertexCount() : mInteriorRings[ring - 1]->vertexCount(); } -QgsPointV2 QgsCurvePolygonV2::vertexAt( QgsVertexId id ) const +QgsPointV2 QgsCurvePolygon::vertexAt( QgsVertexId id ) const { return id.ring == 0 ? mExteriorRing->vertexAt( id ) : mInteriorRings[id.ring - 1]->vertexAt( id ); } -bool QgsCurvePolygonV2::addZValue( double zValue ) +bool QgsCurvePolygon::addZValue( double zValue ) { if ( QgsWkbTypes::hasZ( mWkbType ) ) return false; @@ -826,7 +826,7 @@ bool QgsCurvePolygonV2::addZValue( double zValue ) if ( mExteriorRing ) mExteriorRing->addZValue( zValue ); - Q_FOREACH ( QgsCurveV2* curve, mInteriorRings ) + Q_FOREACH ( QgsCurve* curve, mInteriorRings ) { curve->addZValue( zValue ); } @@ -834,7 +834,7 @@ bool QgsCurvePolygonV2::addZValue( double zValue ) return true; } -bool QgsCurvePolygonV2::addMValue( double mValue ) +bool QgsCurvePolygon::addMValue( double mValue ) { if ( QgsWkbTypes::hasM( mWkbType ) ) return false; @@ -843,7 +843,7 @@ bool QgsCurvePolygonV2::addMValue( double mValue ) if ( mExteriorRing ) mExteriorRing->addMValue( mValue ); - Q_FOREACH ( QgsCurveV2* curve, mInteriorRings ) + Q_FOREACH ( QgsCurve* curve, mInteriorRings ) { curve->addMValue( mValue ); } @@ -851,7 +851,7 @@ bool QgsCurvePolygonV2::addMValue( double mValue ) return true; } -bool QgsCurvePolygonV2::dropZValue() +bool QgsCurvePolygon::dropZValue() { if ( !is3D() ) return false; @@ -859,7 +859,7 @@ bool QgsCurvePolygonV2::dropZValue() mWkbType = QgsWkbTypes::dropZ( mWkbType ); if ( mExteriorRing ) mExteriorRing->dropZValue(); - Q_FOREACH ( QgsCurveV2* curve, mInteriorRings ) + Q_FOREACH ( QgsCurve* curve, mInteriorRings ) { curve->dropZValue(); } @@ -867,7 +867,7 @@ bool QgsCurvePolygonV2::dropZValue() return true; } -bool QgsCurvePolygonV2::dropMValue() +bool QgsCurvePolygon::dropMValue() { if ( !isMeasure() ) return false; @@ -875,7 +875,7 @@ bool QgsCurvePolygonV2::dropMValue() mWkbType = QgsWkbTypes::dropM( mWkbType ); if ( mExteriorRing ) mExteriorRing->dropMValue(); - Q_FOREACH ( QgsCurveV2* curve, mInteriorRings ) + Q_FOREACH ( QgsCurve* curve, mInteriorRings ) { curve->dropMValue(); } diff --git a/src/core/geometry/qgscurvepolygonv2.h b/src/core/geometry/qgscurvepolygon.h similarity index 83% rename from src/core/geometry/qgscurvepolygonv2.h rename to src/core/geometry/qgscurvepolygon.h index 19f7dba8d96..818ebd80793 100644 --- a/src/core/geometry/qgscurvepolygonv2.h +++ b/src/core/geometry/qgscurvepolygon.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgscurvepolygonv2.h + qgscurvepolygon.h ------------------- begin : September 2014 copyright : (C) 2014 by Marco Hugentobler @@ -18,27 +18,27 @@ #ifndef QGSCURVEPOLYGONV2_H #define QGSCURVEPOLYGONV2_H -#include "qgssurfacev2.h" +#include "qgssurface.h" class QgsPolygonV2; /** \ingroup core - * \class QgsCurvePolygonV2 + * \class QgsCurvePolygon * \brief Curve polygon geometry type * \note added in QGIS 2.10 * \note this API is not considered stable and may change for 2.12 */ -class CORE_EXPORT QgsCurvePolygonV2: public QgsSurfaceV2 +class CORE_EXPORT QgsCurvePolygon: public QgsSurface { 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 override { return "CurvePolygon"; } virtual int dimension() const override { return 2; } - virtual QgsCurvePolygonV2* clone() const override; + virtual QgsCurvePolygon* clone() const override; void clear() override; virtual bool fromWkb( QgsConstWkbPtr wkb ) override; @@ -55,12 +55,12 @@ class CORE_EXPORT QgsCurvePolygonV2: public QgsSurfaceV2 virtual double area() const override; virtual double perimeter() const override; QgsPolygonV2* surfaceToPolygon() const override; - virtual QgsAbstractGeometryV2* boundary() const override; + virtual QgsAbstractGeometry* boundary() const override; //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 @@ -74,12 +74,12 @@ class CORE_EXPORT QgsCurvePolygonV2: public QgsSurfaceV2 * @see setInteriorRings() * @see exteriorRing() */ - virtual void setExteriorRing( QgsCurveV2* ring ); + virtual void setExteriorRing( QgsCurve* ring ); /** Sets all interior rings (takes ownership)*/ - void setInteriorRings( const QList& rings ); + void setInteriorRings( const QList& rings ); /** Adds an interior ring to the geometry (takes ownership)*/ - virtual void addInteriorRing( QgsCurveV2* ring ); + virtual void addInteriorRing( QgsCurve* ring ); /** Removes ring. Exterior ring is 0, first interior ring 1, ...*/ bool removeInteriorRing( int nr ); @@ -92,7 +92,7 @@ class CORE_EXPORT QgsCurvePolygonV2: public QgsSurfaceV2 virtual bool moveVertex( QgsVertexId position, const QgsPointV2& newPos ) override; virtual bool deleteVertex( QgsVertexId position ) override; - virtual QgsCoordinateSequenceV2 coordinateSequence() const override; + virtual QgsCoordinateSequence coordinateSequence() const override; double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const override; bool nextVertex( QgsVertexId& id, QgsPointV2& vertex ) const override; @@ -100,7 +100,7 @@ class CORE_EXPORT 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 override; + QgsAbstractGeometry* segmentize( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const override; /** Returns approximate rotation angle for a vertex. Usually average angle between adjacent segments. * @param vertex the vertex id @@ -120,8 +120,8 @@ class CORE_EXPORT QgsCurvePolygonV2: public QgsSurfaceV2 protected: - QgsCurveV2* mExteriorRing; - QList mInteriorRings; + QgsCurve* mExteriorRing; + QList mInteriorRings; virtual QgsRectangle calculateBoundingBox() const override; }; diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp index 14249d0c6f6..81976900f18 100644 --- a/src/core/geometry/qgsgeometry.cpp +++ b/src/core/geometry/qgsgeometry.cpp @@ -37,14 +37,14 @@ email : morb at ozemail dot com dot au #include "qgsproject.h" #include "qgsgeometryvalidator.h" -#include "qgsmulticurvev2.h" -#include "qgsmultilinestringv2.h" -#include "qgsmultipointv2.h" -#include "qgsmultipolygonv2.h" -#include "qgsmultisurfacev2.h" +#include "qgsmulticurve.h" +#include "qgsmultilinestring.h" +#include "qgsmultipoint.h" +#include "qgsmultipolygon.h" +#include "qgsmultisurface.h" #include "qgspointv2.h" -#include "qgspolygonv2.h" -#include "qgslinestringv2.h" +#include "qgspolygon.h" +#include "qgslinestring.h" #ifndef Q_WS_WIN #include @@ -57,7 +57,7 @@ struct QgsGeometryPrivate QgsGeometryPrivate(): ref( 1 ), geometry( nullptr ), mWkb( nullptr ), mWkbSize( 0 ), mGeos( nullptr ) {} ~QgsGeometryPrivate() { delete geometry; delete[] mWkb; GEOSGeom_destroy_r( QgsGeos::getGEOSHandler(), mGeos ); } QAtomicInt ref; - QgsAbstractGeometryV2* geometry; + QgsAbstractGeometry* geometry; mutable const unsigned char* mWkb; //store wkb pointer for backward compatibility mutable int mWkbSize; mutable GEOSGeometry* mGeos; @@ -73,7 +73,7 @@ QgsGeometry::~QgsGeometry() delete d; } -QgsGeometry::QgsGeometry( QgsAbstractGeometryV2* geom ): d( new QgsGeometryPrivate() ) +QgsGeometry::QgsGeometry( QgsAbstractGeometry* geom ): d( new QgsGeometryPrivate() ) { d->geometry = geom; d->ref = QAtomicInt( 1 ); @@ -102,7 +102,7 @@ void QgsGeometry::detach( bool cloneGeom ) if ( d->ref > 1 ) { ( void )d->ref.deref(); - QgsAbstractGeometryV2* cGeom = nullptr; + QgsAbstractGeometry* cGeom = nullptr; if ( d->geometry && cloneGeom ) { @@ -126,12 +126,12 @@ void QgsGeometry::removeWkbGeos() } } -QgsAbstractGeometryV2* QgsGeometry::geometry() const +QgsAbstractGeometry* QgsGeometry::geometry() const { return d->geometry; } -void QgsGeometry::setGeometry( QgsAbstractGeometryV2* geometry ) +void QgsGeometry::setGeometry( QgsAbstractGeometry* geometry ) { if ( d->geometry == geometry ) { @@ -156,7 +156,7 @@ bool QgsGeometry::isEmpty() const QgsGeometry QgsGeometry::fromWkt( const QString& wkt ) { - QgsAbstractGeometryV2* geom = QgsGeometryFactory::geomFromWkt( wkt ); + QgsAbstractGeometry* geom = QgsGeometryFactory::geomFromWkt( wkt ); if ( !geom ) { return QgsGeometry(); @@ -166,7 +166,7 @@ QgsGeometry QgsGeometry::fromWkt( const QString& wkt ) QgsGeometry QgsGeometry::fromPoint( const QgsPoint& point ) { - QgsAbstractGeometryV2* geom = QgsGeometryFactory::fromPoint( point ); + QgsAbstractGeometry* geom = QgsGeometryFactory::fromPoint( point ); if ( geom ) { return QgsGeometry( geom ); @@ -176,7 +176,7 @@ QgsGeometry QgsGeometry::fromPoint( const QgsPoint& point ) QgsGeometry QgsGeometry::fromPolyline( const QgsPolyline& polyline ) { - QgsAbstractGeometryV2* geom = QgsGeometryFactory::fromPolyline( polyline ); + QgsAbstractGeometry* geom = QgsGeometryFactory::fromPolyline( polyline ); if ( geom ) { return QgsGeometry( geom ); @@ -186,7 +186,7 @@ QgsGeometry QgsGeometry::fromPolyline( const QgsPolyline& polyline ) QgsGeometry QgsGeometry::fromPolygon( const QgsPolygon& polygon ) { - QgsAbstractGeometryV2* geom = QgsGeometryFactory::fromPolygon( polygon ); + QgsAbstractGeometry* geom = QgsGeometryFactory::fromPolygon( polygon ); if ( geom ) { return QgsGeometry( geom ); @@ -196,7 +196,7 @@ QgsGeometry QgsGeometry::fromPolygon( const QgsPolygon& polygon ) QgsGeometry QgsGeometry::fromMultiPoint( const QgsMultiPoint& multipoint ) { - QgsAbstractGeometryV2* geom = QgsGeometryFactory::fromMultiPoint( multipoint ); + QgsAbstractGeometry* geom = QgsGeometryFactory::fromMultiPoint( multipoint ); if ( geom ) { return QgsGeometry( geom ); @@ -206,7 +206,7 @@ QgsGeometry QgsGeometry::fromMultiPoint( const QgsMultiPoint& multipoint ) QgsGeometry QgsGeometry::fromMultiPolyline( const QgsMultiPolyline& multiline ) { - QgsAbstractGeometryV2* geom = QgsGeometryFactory::fromMultiPolyline( multiline ); + QgsAbstractGeometry* geom = QgsGeometryFactory::fromMultiPolyline( multiline ); if ( geom ) { return QgsGeometry( geom ); @@ -216,7 +216,7 @@ QgsGeometry QgsGeometry::fromMultiPolyline( const QgsMultiPolyline& multiline ) QgsGeometry QgsGeometry::fromMultiPolygon( const QgsMultiPolygon& multipoly ) { - QgsAbstractGeometryV2* geom = QgsGeometryFactory::fromMultiPolygon( multipoly ); + QgsAbstractGeometry* geom = QgsGeometryFactory::fromMultiPolygon( multipoly ); if ( geom ) { return QgsGeometry( geom ); @@ -455,7 +455,7 @@ bool QgsGeometry::deleteVertex( int atVertex ) detach( true ); removeWkbGeos(); //delete geometry instead of point - return static_cast< QgsGeometryCollectionV2* >( d->geometry )->removeGeometry( atVertex ); + return static_cast< QgsGeometryCollection* >( d->geometry )->removeGeometry( atVertex ); } //if it is a point, set the geometry to nullptr @@ -493,7 +493,7 @@ bool QgsGeometry::insertVertex( double x, double y, int beforeVertex ) detach( true ); removeWkbGeos(); //insert geometry instead of point - return static_cast< QgsGeometryCollectionV2* >( d->geometry )->insertGeometry( new QgsPointV2( x, y ), beforeVertex ); + return static_cast< QgsGeometryCollection* >( d->geometry )->insertGeometry( new QgsPointV2( x, y ), beforeVertex ); } QgsVertexId id; @@ -591,14 +591,14 @@ int QgsGeometry::addRing( const QList &ring ) detach( true ); removeWkbGeos(); - QgsLineStringV2* ringLine = new QgsLineStringV2(); - QgsPointSequenceV2 ringPoints; + QgsLineString* ringLine = new QgsLineString(); + QgsPointSequence ringPoints; convertPointList( ring, ringPoints ); ringLine->setPoints( ringPoints ); return addRing( ringLine ); } -int QgsGeometry::addRing( QgsCurveV2* ring ) +int QgsGeometry::addRing( QgsCurve* ring ) { if ( !d->geometry ) { @@ -614,28 +614,28 @@ int QgsGeometry::addRing( QgsCurveV2* ring ) int QgsGeometry::addPart( const QList &points, QgsWkbTypes::GeometryType geomType ) { - QgsPointSequenceV2 l; + QgsPointSequence l; convertPointList( points, l ); return addPart( l, geomType ); } -int QgsGeometry::addPart( const QgsPointSequenceV2 &points, QgsWkbTypes::GeometryType geomType ) +int QgsGeometry::addPart( const QgsPointSequence &points, QgsWkbTypes::GeometryType geomType ) { - QgsAbstractGeometryV2* partGeom = nullptr; + QgsAbstractGeometry* partGeom = nullptr; if ( points.size() == 1 ) { partGeom = new QgsPointV2( points[0] ); } else if ( points.size() > 1 ) { - QgsLineStringV2* ringLine = new QgsLineStringV2(); + QgsLineString* ringLine = new QgsLineString(); ringLine->setPoints( points ); partGeom = ringLine; } return addPart( partGeom, geomType ); } -int QgsGeometry::addPart( QgsAbstractGeometryV2* part, QgsWkbTypes::GeometryType geomType ) +int QgsGeometry::addPart( QgsAbstractGeometry* part, QgsWkbTypes::GeometryType geomType ) { if ( !d->geometry ) { @@ -646,7 +646,7 @@ int QgsGeometry::addPart( QgsAbstractGeometryV2* part, QgsWkbTypes::GeometryType d->geometry = new QgsMultiPointV2(); break; case QgsWkbTypes::LineGeometry: - d->geometry = new QgsMultiLineStringV2(); + d->geometry = new QgsMultiLineString(); break; case QgsWkbTypes::PolygonGeometry: d->geometry = new QgsMultiPolygonV2(); @@ -684,7 +684,7 @@ int QgsGeometry::addPart( GEOSGeometry *newPart ) detach( true ); - QgsAbstractGeometryV2* geom = QgsGeos::fromGeos( newPart ); + QgsAbstractGeometry* geom = QgsGeos::fromGeos( newPart ); removeWkbGeos(); return QgsGeometryEditUtils::addPart( d->geometry, geom ); } @@ -727,12 +727,12 @@ int QgsGeometry::splitGeometry( const QList& splitLine, QList newGeoms; - QgsLineStringV2 splitLineString; - QgsPointSequenceV2 splitLinePointsV2; + QList newGeoms; + QgsLineString splitLineString; + QgsPointSequence splitLinePointsV2; convertPointList( splitLine, splitLinePointsV2 ); splitLineString.setPoints( splitLinePointsV2 ); - QgsPointSequenceV2 tp; + QgsPointSequence tp; QgsGeos geos( d->geometry ); int result = geos.splitGeometry( splitLineString, newGeoms, topological, tp ); @@ -762,14 +762,14 @@ int QgsGeometry::reshapeGeometry( const QList& reshapeWithLine ) return 0; } - QgsPointSequenceV2 reshapeLine; + QgsPointSequence reshapeLine; convertPointList( reshapeWithLine, reshapeLine ); - QgsLineStringV2 reshapeLineString; + QgsLineString reshapeLineString; reshapeLineString.setPoints( reshapeLine ); QgsGeos geos( d->geometry ); int errorCode = 0; - QgsAbstractGeometryV2* geom = geos.reshapeGeometry( reshapeLineString, &errorCode ); + QgsAbstractGeometry* geom = geos.reshapeGeometry( reshapeLineString, &errorCode ); if ( errorCode == 0 && geom ) { detach( false ); @@ -790,7 +790,7 @@ int QgsGeometry::makeDifference( const QgsGeometry* other ) QgsGeos geos( d->geometry ); - QgsAbstractGeometryV2* diffGeom = geos.intersection( *( other->geometry() ) ); + QgsAbstractGeometry* diffGeom = geos.intersection( *( other->geometry() ) ); if ( !diffGeom ) { return 1; @@ -813,7 +813,7 @@ QgsGeometry QgsGeometry::makeDifference( const QgsGeometry& other ) const QgsGeos geos( d->geometry ); - QgsAbstractGeometryV2* diffGeom = geos.intersection( *other.geometry() ); + QgsAbstractGeometry* diffGeom = geos.intersection( *other.geometry() ); if ( !diffGeom ) { return QgsGeometry(); @@ -985,8 +985,8 @@ bool QgsGeometry::convertToMultiType() return true; } - QgsGeometryCollectionV2* multiGeom = dynamic_cast - ( QgsGeometryFactory::geomFromWkbType( QgsWkbTypes::multiType( d->geometry->wkbType() ) ) ); + QgsGeometryCollection* multiGeom = dynamic_cast + ( QgsGeometryFactory::geomFromWkbType( QgsWkbTypes::multiType( d->geometry->wkbType() ) ) ); if ( !multiGeom ) { return false; @@ -1011,11 +1011,11 @@ bool QgsGeometry::convertToSingleType() return true; } - QgsGeometryCollectionV2* multiGeom = dynamic_cast( d->geometry ); + QgsGeometryCollection* multiGeom = dynamic_cast( d->geometry ); if ( !multiGeom || multiGeom->partCount() < 1 ) return false; - QgsAbstractGeometryV2* firstPart = multiGeom->geometryN( 0 )->clone(); + QgsAbstractGeometry* firstPart = multiGeom->geometryN( 0 )->clone(); detach( false ); d->geometry = firstPart; @@ -1048,10 +1048,10 @@ QgsPolyline QgsGeometry::asPolyline() const bool doSegmentation = ( QgsWkbTypes::flatType( d->geometry->wkbType() ) == QgsWkbTypes::CompoundCurve || QgsWkbTypes::flatType( d->geometry->wkbType() ) == QgsWkbTypes::CircularString ); - QgsLineStringV2* line = nullptr; + QgsLineString* line = nullptr; if ( doSegmentation ) { - QgsCurveV2* curve = dynamic_cast( d->geometry ); + QgsCurve* curve = dynamic_cast( d->geometry ); if ( !curve ) { return polyLine; @@ -1060,7 +1060,7 @@ QgsPolyline QgsGeometry::asPolyline() const } else { - line = dynamic_cast( d->geometry ); + line = dynamic_cast( d->geometry ); if ( !line ) { return polyLine; @@ -1094,7 +1094,7 @@ QgsPolygon QgsGeometry::asPolygon() const QgsPolygonV2* p = nullptr; if ( doSegmentation ) { - QgsCurvePolygonV2* curvePoly = dynamic_cast( d->geometry ); + QgsCurvePolygon* curvePoly = dynamic_cast( d->geometry ); if ( !curvePoly ) { return QgsPolygon(); @@ -1152,7 +1152,7 @@ QgsMultiPolyline QgsGeometry::asMultiPolyline() const return QgsMultiPolyline(); } - QgsGeometryCollectionV2* geomCollection = dynamic_cast( d->geometry ); + QgsGeometryCollection* geomCollection = dynamic_cast( d->geometry ); if ( !geomCollection ) { return QgsMultiPolyline(); @@ -1168,10 +1168,10 @@ QgsMultiPolyline QgsGeometry::asMultiPolyline() const for ( int i = 0; i < nLines; ++i ) { bool deleteLine = false; - const QgsLineStringV2* line = dynamic_cast( geomCollection->geometryN( i ) ); + const QgsLineString* line = dynamic_cast( geomCollection->geometryN( i ) ); if ( !line ) { - const QgsCurveV2* curve = dynamic_cast( geomCollection->geometryN( i ) ); + const QgsCurve* curve = dynamic_cast( geomCollection->geometryN( i ) ); if ( !curve ) { continue; @@ -1180,7 +1180,7 @@ QgsMultiPolyline QgsGeometry::asMultiPolyline() const line = curve->curveToLine(); } - QgsPointSequenceV2 lineCoords; + QgsPointSequence lineCoords; line->points( lineCoords ); QgsPolyline polyLine; convertToPolyline( lineCoords, polyLine ); @@ -1201,7 +1201,7 @@ QgsMultiPolygon QgsGeometry::asMultiPolygon() const return QgsMultiPolygon(); } - QgsGeometryCollectionV2* geomCollection = dynamic_cast( d->geometry ); + QgsGeometryCollection* geomCollection = dynamic_cast( d->geometry ); if ( !geomCollection ) { return QgsMultiPolygon(); @@ -1219,7 +1219,7 @@ QgsMultiPolygon QgsGeometry::asMultiPolygon() const const QgsPolygonV2* polygon = dynamic_cast( geomCollection->geometryN( i ) ); if ( !polygon ) { - const QgsCurvePolygonV2* cPolygon = dynamic_cast( geomCollection->geometryN( i ) ); + const QgsCurvePolygon* cPolygon = dynamic_cast( geomCollection->geometryN( i ) ); if ( cPolygon ) { polygon = cPolygon->toPolygon(); @@ -1249,7 +1249,7 @@ double QgsGeometry::area() const //debug: compare geos area with calculation in QGIS double geosArea = g.area(); double qgisArea = 0; - QgsSurfaceV2* surface = dynamic_cast( d->geometry ); + QgsSurface* surface = dynamic_cast( d->geometry ); if ( surface ) { qgisArea = surface->area(); @@ -1288,7 +1288,7 @@ QgsGeometry QgsGeometry::buffer( double distance, int segments ) const } QgsGeos g( d->geometry ); - QgsAbstractGeometryV2* geom = g.buffer( distance, segments ); + QgsAbstractGeometry* geom = g.buffer( distance, segments ); if ( !geom ) { return QgsGeometry(); @@ -1304,7 +1304,7 @@ QgsGeometry QgsGeometry::buffer( double distance, int segments, int endCapStyle, } QgsGeos g( d->geometry ); - QgsAbstractGeometryV2* geom = g.buffer( distance, segments, endCapStyle, joinStyle, mitreLimit ); + QgsAbstractGeometry* geom = g.buffer( distance, segments, endCapStyle, joinStyle, mitreLimit ); if ( !geom ) { return QgsGeometry(); @@ -1320,7 +1320,7 @@ QgsGeometry QgsGeometry::offsetCurve( double distance, int segments, int joinSty } QgsGeos geos( d->geometry ); - QgsAbstractGeometryV2* offsetGeom = geos.offsetCurve( distance, segments, joinStyle, mitreLimit ); + QgsAbstractGeometry* offsetGeom = geos.offsetCurve( distance, segments, joinStyle, mitreLimit ); if ( !offsetGeom ) { return QgsGeometry(); @@ -1336,7 +1336,7 @@ QgsGeometry QgsGeometry::simplify( double tolerance ) const } QgsGeos geos( d->geometry ); - QgsAbstractGeometryV2* simplifiedGeom = geos.simplify( tolerance ); + QgsAbstractGeometry* simplifiedGeom = geos.simplify( tolerance ); if ( !simplifiedGeom ) { return QgsGeometry(); @@ -1385,7 +1385,7 @@ QgsGeometry QgsGeometry::convexHull() const return QgsGeometry(); } QgsGeos geos( d->geometry ); - QgsAbstractGeometryV2* cHull = geos.convexHull(); + QgsAbstractGeometry* cHull = geos.convexHull(); if ( !cHull ) { return QgsGeometry(); @@ -1400,7 +1400,7 @@ QgsGeometry QgsGeometry::interpolate( double distance ) const return QgsGeometry(); } QgsGeos geos( d->geometry ); - QgsAbstractGeometryV2* result = geos.interpolate( distance ); + QgsAbstractGeometry* result = geos.interpolate( distance ); if ( !result ) { return QgsGeometry(); @@ -1417,7 +1417,7 @@ QgsGeometry QgsGeometry::intersection( const QgsGeometry& geometry ) const QgsGeos geos( d->geometry ); - QgsAbstractGeometryV2* resultGeom = geos.intersection( *( geometry.d->geometry ) ); + QgsAbstractGeometry* resultGeom = geos.intersection( *( geometry.d->geometry ) ); return QgsGeometry( resultGeom ); } @@ -1430,7 +1430,7 @@ QgsGeometry QgsGeometry::combine( const QgsGeometry& geometry ) const QgsGeos geos( d->geometry ); - QgsAbstractGeometryV2* resultGeom = geos.combine( *( geometry.d->geometry ) ); + QgsAbstractGeometry* resultGeom = geos.combine( *( geometry.d->geometry ) ); if ( !resultGeom ) { return QgsGeometry(); @@ -1464,7 +1464,7 @@ QgsGeometry QgsGeometry::difference( const QgsGeometry& geometry ) const QgsGeos geos( d->geometry ); - QgsAbstractGeometryV2* resultGeom = geos.difference( *( geometry.d->geometry ) ); + QgsAbstractGeometry* resultGeom = geos.difference( *( geometry.d->geometry ) ); if ( !resultGeom ) { return QgsGeometry(); @@ -1481,7 +1481,7 @@ QgsGeometry QgsGeometry::symDifference( const QgsGeometry& geometry ) const QgsGeos geos( d->geometry ); - QgsAbstractGeometryV2* resultGeom = geos.symDifference( *( geometry.d->geometry ) ); + QgsAbstractGeometry* resultGeom = geos.symDifference( *( geometry.d->geometry ) ); if ( !resultGeom ) { return QgsGeometry(); @@ -1504,7 +1504,7 @@ QList QgsGeometry::asGeometryCollection() const return geometryList; } - QgsGeometryCollectionV2* gc = dynamic_cast( d->geometry ); + QgsGeometryCollection* gc = dynamic_cast( d->geometry ); if ( gc ) { int numGeom = gc->numGeometries(); @@ -1596,7 +1596,7 @@ int QgsGeometry::avoidIntersections( const QMapgeometry ), ignoreFeatures ); + QgsAbstractGeometry* diffGeom = QgsGeometryEditUtils::avoidIntersections( *( d->geometry ), ignoreFeatures ); if ( diffGeom ) { detach( false ); @@ -1648,7 +1648,7 @@ QgsGeometry QgsGeometry::unaryUnion( const QList& geometryList ) { QgsGeos geos( nullptr ); - QList geomV2List; + QList geomV2List; QList::const_iterator it = geometryList.constBegin(); for ( ; it != geometryList.constEnd(); ++it ) { @@ -1658,7 +1658,7 @@ QgsGeometry QgsGeometry::unaryUnion( const QList& geometryList ) } } - QgsAbstractGeometryV2* geom = geos.combine( geomV2List ); + QgsAbstractGeometry* geom = geos.combine( geomV2List ); return QgsGeometry( geom ); } @@ -1669,7 +1669,7 @@ void QgsGeometry::convertToStraightSegment() return; } - QgsAbstractGeometryV2* straightGeom = d->geometry->segmentize(); + QgsAbstractGeometry* straightGeom = d->geometry->segmentize(); detach( false ); d->geometry = straightGeom; @@ -1749,15 +1749,15 @@ bool QgsGeometry::vertexIdFromVertexNr( int nr, QgsVertexId& id ) const return false; } - QgsCoordinateSequenceV2 coords = d->geometry->coordinateSequence(); + QgsCoordinateSequence coords = d->geometry->coordinateSequence(); int vertexCount = 0; for ( int part = 0; part < coords.size(); ++part ) { - const QgsRingSequenceV2 &featureCoords = coords.at( part ); + const QgsRingSequence &featureCoords = coords.at( part ); for ( int ring = 0; ring < featureCoords.size(); ++ring ) { - const QgsPointSequenceV2 &ringCoords = featureCoords.at( ring ); + const QgsPointSequence &ringCoords = featureCoords.at( ring ); for ( int vertex = 0; vertex < ringCoords.size(); ++vertex ) { if ( vertexCount == nr ) @@ -1781,15 +1781,15 @@ int QgsGeometry::vertexNrFromVertexId( QgsVertexId id ) const return -1; } - QgsCoordinateSequenceV2 coords = d->geometry->coordinateSequence(); + QgsCoordinateSequence coords = d->geometry->coordinateSequence(); int vertexCount = 0; for ( int part = 0; part < coords.size(); ++part ) { - const QgsRingSequenceV2 &featureCoords = coords.at( part ); + const QgsRingSequence &featureCoords = coords.at( part ); for ( int ring = 0; ring < featureCoords.size(); ++ring ) { - const QgsPointSequenceV2 &ringCoords = featureCoords.at( ring ); + const QgsPointSequence &ringCoords = featureCoords.at( ring ); for ( int vertex = 0; vertex < ringCoords.size(); ++vertex ) { if ( vertex == id.vertex && ring == id.ring && part == id.part ) @@ -1803,7 +1803,7 @@ int QgsGeometry::vertexNrFromVertexId( QgsVertexId id ) const return -1; } -void QgsGeometry::convertPointList( const QList &input, QgsPointSequenceV2 &output ) +void QgsGeometry::convertPointList( const QList &input, QgsPointSequence &output ) { output.clear(); QList::const_iterator it = input.constBegin(); @@ -1813,10 +1813,10 @@ void QgsGeometry::convertPointList( const QList &input, QgsPointSequen } } -void QgsGeometry::convertPointList( const QgsPointSequenceV2 &input, QList &output ) +void QgsGeometry::convertPointList( const QgsPointSequence &input, QList &output ) { output.clear(); - QgsPointSequenceV2::const_iterator it = input.constBegin(); + QgsPointSequence::const_iterator it = input.constBegin(); for ( ; it != input.constEnd(); ++it ) { output.append( QgsPoint( it->x(), it->y() ) ); @@ -1828,7 +1828,7 @@ QgsGeometry::operator bool() const return d->geometry; } -void QgsGeometry::convertToPolyline( const QgsPointSequenceV2 &input, QgsPolyline& output ) +void QgsGeometry::convertToPolyline( const QgsPointSequence &input, QgsPolyline& output ) { output.clear(); output.resize( input.size() ); @@ -1844,12 +1844,12 @@ void QgsGeometry::convertToPolyline( const QgsPointSequenceV2 &input, QgsPolylin void QgsGeometry::convertPolygon( const QgsPolygonV2& input, QgsPolygon& output ) { output.clear(); - QgsCoordinateSequenceV2 coords = input.coordinateSequence(); + QgsCoordinateSequence coords = input.coordinateSequence(); if ( coords.size() < 1 ) { return; } - const QgsRingSequenceV2 &rings = coords[0]; + const QgsRingSequence &rings = coords[0]; output.resize( rings.size() ); for ( int i = 0; i < rings.size(); ++i ) { @@ -2365,7 +2365,7 @@ QgsGeometry QgsGeometry::convertToPolygon( bool destMultipart ) const } } -QgsGeometryEngine* QgsGeometry::createGeometryEngine( const QgsAbstractGeometryV2* geometry ) +QgsGeometryEngine* QgsGeometry::createGeometryEngine( const QgsAbstractGeometry* geometry ) { return new QgsGeos( geometry ); } diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h index 0043ce97b69..c80557ec8ef 100644 --- a/src/core/geometry/qgsgeometry.h +++ b/src/core/geometry/qgsgeometry.h @@ -30,7 +30,7 @@ email : morb at ozemail dot com dot au #define GEOSCoordSequence struct GEOSCoordSeq_t #endif -#include "qgsabstractgeometryv2.h" +#include "qgsabstractgeometry.h" #include "qgspoint.h" #include "qgspointv2.h" @@ -70,7 +70,7 @@ struct QgsGeometryPrivate; * 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. */ @@ -92,7 +92,7 @@ class CORE_EXPORT QgsGeometry * geom is transferred. * @note added in QGIS 2.10 */ - explicit QgsGeometry( QgsAbstractGeometryV2* geom ); + explicit QgsGeometry( QgsAbstractGeometry* geom ); //! Destructor ~QgsGeometry(); @@ -101,13 +101,13 @@ class CORE_EXPORT 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 ); + void setGeometry( QgsAbstractGeometry* geometry ); /** Returns true if the geometry is empty (ie, contains no underlying geometry * accessible via @link geometry @endlink). @@ -346,7 +346,7 @@ class CORE_EXPORT 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 @@ -364,7 +364,7 @@ class CORE_EXPORT QgsGeometry * not disjoint with existing polygons of the feature */ // TODO QGIS 3.0 returns an enum instead of a magic constant - int addPart( const QgsPointSequenceV2 &points, QgsWkbTypes::GeometryType geomType = QgsWkbTypes::UnknownGeometry ); + int addPart( const QgsPointSequence &points, QgsWkbTypes::GeometryType geomType = QgsWkbTypes::UnknownGeometry ); /** Adds a new part to this geometry. * @param part part to add (ownership is transferred) @@ -373,7 +373,7 @@ class CORE_EXPORT 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, QgsWkbTypes::GeometryType geomType = QgsWkbTypes::UnknownGeometry ); + int addPart( QgsAbstractGeometry* part, QgsWkbTypes::GeometryType geomType = QgsWkbTypes::UnknownGeometry ); /** Adds a new island polygon to a multipolygon feature * @param newPart part to add. Ownership is NOT transferred. @@ -825,19 +825,19 @@ class CORE_EXPORT QgsGeometry /** Creates and returns a new geometry engine */ - static QgsGeometryEngine* createGeometryEngine( const QgsAbstractGeometryV2* geometry ); + static QgsGeometryEngine* createGeometryEngine( const QgsAbstractGeometry* geometry ); /** Upgrades a point list from QgsPoint to QgsPointV2 * @param input list of QgsPoint objects to be upgraded * @param output destination for list of points converted to QgsPointV2 */ - static void convertPointList( const QList &input, QgsPointSequenceV2 &output ); + static void convertPointList( const QList &input, QgsPointSequence &output ); /** Downgrades a point list from QgsPointV2 to QgsPoint * @param input list of QgsPointV2 objects to be downgraded * @param output destination for list of points converted to QgsPoint */ - static void convertPointList( const QgsPointSequenceV2 &input, QList &output ); + static void convertPointList( const QgsPointSequence &input, QList &output ); //! Allows direct construction of QVariants from geometry. operator QVariant() const @@ -858,7 +858,7 @@ class CORE_EXPORT QgsGeometry void detach( bool cloneGeom = true ); //make sure mGeometry only referenced from this instance void removeWkbGeos(); - static void convertToPolyline( const QgsPointSequenceV2 &input, QgsPolyline& output ); + static void convertToPolyline( const QgsPointSequence &input, QgsPolyline& output ); static void convertPolygon( const QgsPolygonV2& input, QgsPolygon& output ); /** Try to convert the geometry to a point */ diff --git a/src/core/geometry/qgsgeometrycollectionv2.cpp b/src/core/geometry/qgsgeometrycollection.cpp similarity index 62% rename from src/core/geometry/qgsgeometrycollectionv2.cpp rename to src/core/geometry/qgsgeometrycollection.cpp index 20e6f19649c..33c22c35f9d 100644 --- a/src/core/geometry/qgsgeometrycollectionv2.cpp +++ b/src/core/geometry/qgsgeometrycollection.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsgeometrycollectionv2.cpp + qgsgeometrycollection.cpp ------------------------------------------------------------------- Date : 28 Oct 2014 Copyright : (C) 2014 by Marco Hugentobler @@ -13,26 +13,26 @@ email : marco.hugentobler at sourcepole dot com * * ***************************************************************************/ -#include "qgsgeometrycollectionv2.h" +#include "qgsgeometrycollection.h" #include "qgsapplication.h" #include "qgsgeometryfactory.h" #include "qgsgeometryutils.h" -#include "qgscircularstringv2.h" -#include "qgscompoundcurvev2.h" -#include "qgslinestringv2.h" -#include "qgsmultilinestringv2.h" +#include "qgscircularstring.h" +#include "qgscompoundcurve.h" +#include "qgslinestring.h" +#include "qgsmultilinestring.h" #include "qgspointv2.h" -#include "qgsmultipointv2.h" -#include "qgspolygonv2.h" -#include "qgsmultipolygonv2.h" +#include "qgsmultipoint.h" +#include "qgspolygon.h" +#include "qgsmultipolygon.h" #include "qgswkbptr.h" -QgsGeometryCollectionV2::QgsGeometryCollectionV2(): QgsAbstractGeometryV2() +QgsGeometryCollection::QgsGeometryCollection(): QgsAbstractGeometry() { mWkbType = QgsWkbTypes::GeometryCollection; } -QgsGeometryCollectionV2::QgsGeometryCollectionV2( const QgsGeometryCollectionV2& c ): QgsAbstractGeometryV2( c ) +QgsGeometryCollection::QgsGeometryCollection( const QgsGeometryCollection& c ): QgsAbstractGeometry( c ) { int nGeoms = c.mGeometries.size(); mGeometries.resize( nGeoms ); @@ -42,12 +42,12 @@ QgsGeometryCollectionV2::QgsGeometryCollectionV2( const QgsGeometryCollectionV2& } } -QgsGeometryCollectionV2& QgsGeometryCollectionV2::operator=( const QgsGeometryCollectionV2 & c ) +QgsGeometryCollection& QgsGeometryCollection::operator=( const QgsGeometryCollection & c ) { if ( &c != this ) { clearCache(); - QgsAbstractGeometryV2::operator=( c ); + QgsAbstractGeometry::operator=( c ); int nGeoms = c.mGeometries.size(); mGeometries.resize( nGeoms ); for ( int i = 0; i < nGeoms; ++i ) @@ -58,45 +58,45 @@ QgsGeometryCollectionV2& QgsGeometryCollectionV2::operator=( const QgsGeometryCo return *this; } -QgsGeometryCollectionV2::~QgsGeometryCollectionV2() +QgsGeometryCollection::~QgsGeometryCollection() { clear(); } -QgsGeometryCollectionV2 *QgsGeometryCollectionV2::clone() const +QgsGeometryCollection *QgsGeometryCollection::clone() const { - return new QgsGeometryCollectionV2( *this ); + return new QgsGeometryCollection( *this ); } -void QgsGeometryCollectionV2::clear() +void QgsGeometryCollection::clear() { qDeleteAll( mGeometries ); mGeometries.clear(); clearCache(); //set bounding box invalid } -QgsAbstractGeometryV2*QgsGeometryCollectionV2::boundary() const +QgsAbstractGeometry*QgsGeometryCollection::boundary() const { return nullptr; } -int QgsGeometryCollectionV2::numGeometries() const +int QgsGeometryCollection::numGeometries() const { return mGeometries.size(); } -const QgsAbstractGeometryV2* QgsGeometryCollectionV2::geometryN( int n ) const +const QgsAbstractGeometry* QgsGeometryCollection::geometryN( int n ) const { return mGeometries.value( n ); } -QgsAbstractGeometryV2* QgsGeometryCollectionV2::geometryN( int n ) +QgsAbstractGeometry* QgsGeometryCollection::geometryN( int n ) { clearCache(); return mGeometries.value( n ); } -bool QgsGeometryCollectionV2::addGeometry( QgsAbstractGeometryV2* g ) +bool QgsGeometryCollection::addGeometry( QgsAbstractGeometry* g ) { if ( !g ) { @@ -108,7 +108,7 @@ bool QgsGeometryCollectionV2::addGeometry( QgsAbstractGeometryV2* g ) return true; } -bool QgsGeometryCollectionV2::insertGeometry( QgsAbstractGeometryV2 *g, int index ) +bool QgsGeometryCollection::insertGeometry( QgsAbstractGeometry *g, int index ) { if ( !g ) { @@ -120,7 +120,7 @@ bool QgsGeometryCollectionV2::insertGeometry( QgsAbstractGeometryV2 *g, int inde return true; } -bool QgsGeometryCollectionV2::removeGeometry( int nr ) +bool QgsGeometryCollection::removeGeometry( int nr ) { if ( nr >= mGeometries.size() || nr < 0 ) { @@ -132,10 +132,10 @@ bool QgsGeometryCollectionV2::removeGeometry( int nr ) return true; } -int QgsGeometryCollectionV2::dimension() const +int QgsGeometryCollection::dimension() const { int maxDim = 0; - QVector< QgsAbstractGeometryV2* >::const_iterator it = mGeometries.constBegin(); + QVector< QgsAbstractGeometry* >::const_iterator it = mGeometries.constBegin(); for ( ; it != mGeometries.constEnd(); ++it ) { int dim = ( *it )->dimension(); @@ -147,18 +147,18 @@ int QgsGeometryCollectionV2::dimension() const return maxDim; } -void QgsGeometryCollectionV2::transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d, bool transformZ ) +void QgsGeometryCollection::transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d, bool transformZ ) { - Q_FOREACH ( QgsAbstractGeometryV2* g, mGeometries ) + Q_FOREACH ( QgsAbstractGeometry* g, mGeometries ) { g->transform( ct, d, transformZ ); } clearCache(); //set bounding box invalid } -void QgsGeometryCollectionV2::transform( const QTransform& t ) +void QgsGeometryCollection::transform( const QTransform& t ) { - Q_FOREACH ( QgsAbstractGeometryV2* g, mGeometries ) + Q_FOREACH ( QgsAbstractGeometry* g, mGeometries ) { g->transform( t ); } @@ -166,9 +166,9 @@ void QgsGeometryCollectionV2::transform( const QTransform& t ) } #if 0 -void QgsGeometryCollectionV2::clip( const QgsRectangle& rect ) +void QgsGeometryCollection::clip( const QgsRectangle& rect ) { - QVector< QgsAbstractGeometryV2* >::iterator it = mGeometries.begin(); + QVector< QgsAbstractGeometry* >::iterator it = mGeometries.begin(); for ( ; it != mGeometries.end(); ++it ) { ( *it )->clip( rect ); @@ -176,16 +176,16 @@ void QgsGeometryCollectionV2::clip( const QgsRectangle& rect ) } #endif -void QgsGeometryCollectionV2::draw( QPainter& p ) const +void QgsGeometryCollection::draw( QPainter& p ) const { - QVector< QgsAbstractGeometryV2* >::const_iterator it = mGeometries.constBegin(); + QVector< QgsAbstractGeometry* >::const_iterator it = mGeometries.constBegin(); for ( ; it != mGeometries.constEnd(); ++it ) { ( *it )->draw( p ); } } -bool QgsGeometryCollectionV2::fromWkb( QgsConstWkbPtr wkbPtr ) +bool QgsGeometryCollection::fromWkb( QgsConstWkbPtr wkbPtr ) { if ( !wkbPtr ) { @@ -197,11 +197,11 @@ bool QgsGeometryCollectionV2::fromWkb( QgsConstWkbPtr wkbPtr ) int nGeometries = 0; wkbPtr >> nGeometries; - QVector geometryListBackup = mGeometries; + QVector geometryListBackup = mGeometries; mGeometries.clear(); for ( int i = 0; i < nGeometries; ++i ) { - QgsAbstractGeometryV2* geom = QgsGeometryFactory::geomFromWkb( wkbPtr ); + QgsAbstractGeometry* geom = QgsGeometryFactory::geomFromWkb( wkbPtr ); if ( geom ) { if ( !addGeometry( geom ) ) @@ -220,20 +220,20 @@ bool QgsGeometryCollectionV2::fromWkb( QgsConstWkbPtr wkbPtr ) return true; } -bool QgsGeometryCollectionV2::fromWkt( const QString& wkt ) +bool QgsGeometryCollection::fromWkt( const QString& wkt ) { - return fromCollectionWkt( wkt, QList() << new QgsPointV2 << new QgsLineStringV2 << new QgsPolygonV2 - << new QgsCircularStringV2 << new QgsCompoundCurveV2 - << new QgsCurvePolygonV2 - << new QgsMultiPointV2 << new QgsMultiLineStringV2 - << new QgsMultiPolygonV2 << new QgsGeometryCollectionV2 - << new QgsMultiCurveV2 << new QgsMultiSurfaceV2, "GeometryCollection" ); + return fromCollectionWkt( wkt, QList() << new QgsPointV2 << new QgsLineString << new QgsPolygonV2 + << new QgsCircularString << new QgsCompoundCurve + << new QgsCurvePolygon + << new QgsMultiPointV2 << new QgsMultiLineString + << new QgsMultiPolygonV2 << new QgsGeometryCollection + << new QgsMultiCurve << new QgsMultiSurface, "GeometryCollection" ); } -int QgsGeometryCollectionV2::wkbSize() const +int QgsGeometryCollection::wkbSize() const { int size = sizeof( char ) + sizeof( quint32 ) + sizeof( quint32 ); - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { if ( geom ) { @@ -243,7 +243,7 @@ int QgsGeometryCollectionV2::wkbSize() const return size; } -unsigned char* QgsGeometryCollectionV2::asWkb( int& binarySize ) const +unsigned char* QgsGeometryCollection::asWkb( int& binarySize ) const { binarySize = wkbSize(); unsigned char* geomPtr = new unsigned char[binarySize]; @@ -251,7 +251,7 @@ unsigned char* QgsGeometryCollectionV2::asWkb( int& binarySize ) const wkb << static_cast( QgsApplication::endian() ); wkb << static_cast( wkbType() ); wkb << static_cast( mGeometries.size() ); - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { int geomWkbLen = 0; if ( geom ) @@ -265,10 +265,10 @@ unsigned char* QgsGeometryCollectionV2::asWkb( int& binarySize ) const return geomPtr; } -QString QgsGeometryCollectionV2::asWkt( int precision ) const +QString QgsGeometryCollection::asWkt( int precision ) const { QString wkt = wktTypeStr() + " ("; - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { QString childWkt = geom->asWkt( precision ); if ( wktOmitChildType() ) @@ -285,10 +285,10 @@ QString QgsGeometryCollectionV2::asWkt( int precision ) const return wkt; } -QDomElement QgsGeometryCollectionV2::asGML2( QDomDocument& doc, int precision, const QString& ns ) const +QDomElement QgsGeometryCollection::asGML2( QDomDocument& doc, int precision, const QString& ns ) const { QDomElement elemMultiGeometry = doc.createElementNS( ns, "MultiGeometry" ); - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { QDomElement elemGeometryMember = doc.createElementNS( ns, "geometryMember" ); elemGeometryMember.appendChild( geom->asGML2( doc, precision, ns ) ); @@ -297,10 +297,10 @@ QDomElement QgsGeometryCollectionV2::asGML2( QDomDocument& doc, int precision, c return elemMultiGeometry; } -QDomElement QgsGeometryCollectionV2::asGML3( QDomDocument& doc, int precision, const QString& ns ) const +QDomElement QgsGeometryCollection::asGML3( QDomDocument& doc, int precision, const QString& ns ) const { QDomElement elemMultiGeometry = doc.createElementNS( ns, "MultiGeometry" ); - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { QDomElement elemGeometryMember = doc.createElementNS( ns, "geometryMember" ); elemGeometryMember.appendChild( geom->asGML3( doc, precision, ns ) ); @@ -309,10 +309,10 @@ QDomElement QgsGeometryCollectionV2::asGML3( QDomDocument& doc, int precision, c return elemMultiGeometry; } -QString QgsGeometryCollectionV2::asJSON( int precision ) const +QString QgsGeometryCollection::asJSON( int precision ) const { QString json = "{\"type\": \"GeometryCollection\", \"geometries\": ["; - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { json += geom->asJSON( precision ) + ", "; } @@ -324,7 +324,7 @@ QString QgsGeometryCollectionV2::asJSON( int precision ) const return json; } -QgsRectangle QgsGeometryCollectionV2::boundingBox() const +QgsRectangle QgsGeometryCollection::boundingBox() const { if ( mBoundingBox.isNull() ) { @@ -333,7 +333,7 @@ QgsRectangle QgsGeometryCollectionV2::boundingBox() const return mBoundingBox; } -QgsRectangle QgsGeometryCollectionV2::calculateBoundingBox() const +QgsRectangle QgsGeometryCollection::calculateBoundingBox() const { if ( mGeometries.size() < 1 ) { @@ -349,17 +349,17 @@ QgsRectangle QgsGeometryCollectionV2::calculateBoundingBox() const return bbox; } -QgsCoordinateSequenceV2 QgsGeometryCollectionV2::coordinateSequence() const +QgsCoordinateSequence QgsGeometryCollection::coordinateSequence() const { if ( !mCoordinateSequence.isEmpty() ) return mCoordinateSequence; - QVector< QgsAbstractGeometryV2* >::const_iterator geomIt = mGeometries.constBegin(); + QVector< QgsAbstractGeometry* >::const_iterator geomIt = mGeometries.constBegin(); for ( ; geomIt != mGeometries.constEnd(); ++geomIt ) { - QgsCoordinateSequenceV2 geomCoords = ( *geomIt )->coordinateSequence(); + QgsCoordinateSequence geomCoords = ( *geomIt )->coordinateSequence(); - QgsCoordinateSequenceV2::const_iterator cIt = geomCoords.constBegin(); + QgsCoordinateSequence::const_iterator cIt = geomCoords.constBegin(); for ( ; cIt != geomCoords.constEnd(); ++cIt ) { mCoordinateSequence.push_back( *cIt ); @@ -369,12 +369,12 @@ QgsCoordinateSequenceV2 QgsGeometryCollectionV2::coordinateSequence() const return mCoordinateSequence; } -double QgsGeometryCollectionV2::closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const +double QgsGeometryCollection::closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const { return QgsGeometryUtils::closestSegmentFromComponents( mGeometries, QgsGeometryUtils::PART, pt, segmentPt, vertexAfter, leftOf, epsilon ); } -bool QgsGeometryCollectionV2::nextVertex( QgsVertexId& id, QgsPointV2& vertex ) const +bool QgsGeometryCollection::nextVertex( QgsVertexId& id, QgsPointV2& vertex ) const { if ( id.part < 0 ) { @@ -387,7 +387,7 @@ bool QgsGeometryCollectionV2::nextVertex( QgsVertexId& id, QgsPointV2& vertex ) return false; } - QgsAbstractGeometryV2* geom = mGeometries.at( id.part ); + QgsAbstractGeometry* geom = mGeometries.at( id.part ); if ( geom->nextVertex( id, vertex ) ) { return true; @@ -402,7 +402,7 @@ bool QgsGeometryCollectionV2::nextVertex( QgsVertexId& id, QgsPointV2& vertex ) return mGeometries.at( id.part )->nextVertex( id, vertex ); } -bool QgsGeometryCollectionV2::insertVertex( QgsVertexId position, const QgsPointV2& vertex ) +bool QgsGeometryCollection::insertVertex( QgsVertexId position, const QgsPointV2& vertex ) { if ( position.part >= mGeometries.size() ) { @@ -417,7 +417,7 @@ bool QgsGeometryCollectionV2::insertVertex( QgsVertexId position, const QgsPoint return success; } -bool QgsGeometryCollectionV2::moveVertex( QgsVertexId position, const QgsPointV2& newPos ) +bool QgsGeometryCollection::moveVertex( QgsVertexId position, const QgsPointV2& newPos ) { if ( position.part >= mGeometries.size() ) { @@ -432,14 +432,14 @@ bool QgsGeometryCollectionV2::moveVertex( QgsVertexId position, const QgsPointV2 return success; } -bool QgsGeometryCollectionV2::deleteVertex( QgsVertexId position ) +bool QgsGeometryCollection::deleteVertex( QgsVertexId position ) { if ( position.part >= mGeometries.size() ) { return false; } - QgsAbstractGeometryV2* geom = mGeometries.at( position.part ); + QgsAbstractGeometry* geom = mGeometries.at( position.part ); if ( !geom ) { return false; @@ -460,10 +460,10 @@ bool QgsGeometryCollectionV2::deleteVertex( QgsVertexId position ) return success; } -double QgsGeometryCollectionV2::length() const +double QgsGeometryCollection::length() const { double length = 0.0; - QVector< QgsAbstractGeometryV2* >::const_iterator geomIt = mGeometries.constBegin(); + QVector< QgsAbstractGeometry* >::const_iterator geomIt = mGeometries.constBegin(); for ( ; geomIt != mGeometries.constEnd(); ++geomIt ) { length += ( *geomIt )->length(); @@ -471,10 +471,10 @@ double QgsGeometryCollectionV2::length() const return length; } -double QgsGeometryCollectionV2::area() const +double QgsGeometryCollection::area() const { double area = 0.0; - QVector< QgsAbstractGeometryV2* >::const_iterator geomIt = mGeometries.constBegin(); + QVector< QgsAbstractGeometry* >::const_iterator geomIt = mGeometries.constBegin(); for ( ; geomIt != mGeometries.constEnd(); ++geomIt ) { area += ( *geomIt )->area(); @@ -482,10 +482,10 @@ double QgsGeometryCollectionV2::area() const return area; } -double QgsGeometryCollectionV2::perimeter() const +double QgsGeometryCollection::perimeter() const { double perimeter = 0.0; - QVector< QgsAbstractGeometryV2* >::const_iterator geomIt = mGeometries.constBegin(); + QVector< QgsAbstractGeometry* >::const_iterator geomIt = mGeometries.constBegin(); for ( ; geomIt != mGeometries.constEnd(); ++geomIt ) { perimeter += ( *geomIt )->perimeter(); @@ -493,7 +493,7 @@ double QgsGeometryCollectionV2::perimeter() const return perimeter; } -bool QgsGeometryCollectionV2::fromCollectionWkt( const QString &wkt, const QList& subtypes, const QString& defaultChildWkbType ) +bool QgsGeometryCollection::fromCollectionWkt( const QString &wkt, const QList& subtypes, const QString& defaultChildWkbType ) { clear(); @@ -510,7 +510,7 @@ bool QgsGeometryCollectionV2::fromCollectionWkt( const QString &wkt, const QList QPair childParts = QgsGeometryUtils::wktReadBlock( childWkt ); bool success = false; - Q_FOREACH ( const QgsAbstractGeometryV2* geom, subtypes ) + Q_FOREACH ( const QgsAbstractGeometry* geom, subtypes ) { if ( QgsWkbTypes::flatType( childParts.first ) == QgsWkbTypes::flatType( geom->wkbType() ) ) { @@ -535,7 +535,7 @@ bool QgsGeometryCollectionV2::fromCollectionWkt( const QString &wkt, const QList //if so, update the type dimensionality of the collection to match bool hasZ = false; bool hasM = false; - Q_FOREACH ( QgsAbstractGeometryV2* geom, mGeometries ) + Q_FOREACH ( QgsAbstractGeometry* geom, mGeometries ) { hasZ = hasZ || geom->is3D(); hasM = hasM || geom->isMeasure(); @@ -550,9 +550,9 @@ bool QgsGeometryCollectionV2::fromCollectionWkt( const QString &wkt, const QList return true; } -bool QgsGeometryCollectionV2::hasCurvedSegments() const +bool QgsGeometryCollection::hasCurvedSegments() const { - QVector< QgsAbstractGeometryV2* >::const_iterator it = mGeometries.constBegin(); + QVector< QgsAbstractGeometry* >::const_iterator it = mGeometries.constBegin(); for ( ; it != mGeometries.constEnd(); ++it ) { if (( *it )->hasCurvedSegments() ) @@ -563,17 +563,17 @@ bool QgsGeometryCollectionV2::hasCurvedSegments() const return false; } -QgsAbstractGeometryV2* QgsGeometryCollectionV2::segmentize( double tolerance, SegmentationToleranceType toleranceType ) const +QgsAbstractGeometry* QgsGeometryCollection::segmentize( double tolerance, SegmentationToleranceType toleranceType ) const { - QgsAbstractGeometryV2* geom = QgsGeometryFactory::geomFromWkbType( mWkbType ); - QgsGeometryCollectionV2* geomCollection = dynamic_cast( geom ); + QgsAbstractGeometry* geom = QgsGeometryFactory::geomFromWkbType( mWkbType ); + QgsGeometryCollection* geomCollection = dynamic_cast( geom ); if ( !geomCollection ) { delete geom; return clone(); } - QVector< QgsAbstractGeometryV2* >::const_iterator geomIt = mGeometries.constBegin(); + QVector< QgsAbstractGeometry* >::const_iterator geomIt = mGeometries.constBegin(); for ( ; geomIt != mGeometries.constEnd(); ++geomIt ) { geomCollection->addGeometry(( *geomIt )->segmentize( tolerance, toleranceType ) ); @@ -581,14 +581,14 @@ QgsAbstractGeometryV2* QgsGeometryCollectionV2::segmentize( double tolerance, Se return geomCollection; } -double QgsGeometryCollectionV2::vertexAngle( QgsVertexId vertex ) const +double QgsGeometryCollection::vertexAngle( QgsVertexId vertex ) const { if ( vertex.part >= mGeometries.size() ) { return 0.0; } - QgsAbstractGeometryV2* geom = mGeometries[vertex.part]; + QgsAbstractGeometry* geom = mGeometries[vertex.part]; if ( !geom ) { return 0.0; @@ -597,14 +597,14 @@ double QgsGeometryCollectionV2::vertexAngle( QgsVertexId vertex ) const return geom->vertexAngle( vertex ); } -bool QgsGeometryCollectionV2::addZValue( double zValue ) +bool QgsGeometryCollection::addZValue( double zValue ) { if ( QgsWkbTypes::hasZ( mWkbType ) ) return false; mWkbType = QgsWkbTypes::addZ( mWkbType ); - Q_FOREACH ( QgsAbstractGeometryV2* geom, mGeometries ) + Q_FOREACH ( QgsAbstractGeometry* geom, mGeometries ) { geom->addZValue( zValue ); } @@ -612,14 +612,14 @@ bool QgsGeometryCollectionV2::addZValue( double zValue ) return true; } -bool QgsGeometryCollectionV2::addMValue( double mValue ) +bool QgsGeometryCollection::addMValue( double mValue ) { if ( QgsWkbTypes::hasM( mWkbType ) ) return false; mWkbType = QgsWkbTypes::addM( mWkbType ); - Q_FOREACH ( QgsAbstractGeometryV2* geom, mGeometries ) + Q_FOREACH ( QgsAbstractGeometry* geom, mGeometries ) { geom->addMValue( mValue ); } @@ -628,13 +628,13 @@ bool QgsGeometryCollectionV2::addMValue( double mValue ) } -bool QgsGeometryCollectionV2::dropZValue() +bool QgsGeometryCollection::dropZValue() { if ( !is3D() ) return false; mWkbType = QgsWkbTypes::dropZ( mWkbType ); - Q_FOREACH ( QgsAbstractGeometryV2* geom, mGeometries ) + Q_FOREACH ( QgsAbstractGeometry* geom, mGeometries ) { geom->dropZValue(); } @@ -642,13 +642,13 @@ bool QgsGeometryCollectionV2::dropZValue() return true; } -bool QgsGeometryCollectionV2::dropMValue() +bool QgsGeometryCollection::dropMValue() { if ( !isMeasure() ) return false; mWkbType = QgsWkbTypes::dropM( mWkbType ); - Q_FOREACH ( QgsAbstractGeometryV2* geom, mGeometries ) + Q_FOREACH ( QgsAbstractGeometry* geom, mGeometries ) { geom->dropMValue(); } diff --git a/src/core/geometry/qgsgeometrycollectionv2.h b/src/core/geometry/qgsgeometrycollection.h similarity index 81% rename from src/core/geometry/qgsgeometrycollectionv2.h rename to src/core/geometry/qgsgeometrycollection.h index 241d39f7172..c6cbb7f4c6e 100644 --- a/src/core/geometry/qgsgeometrycollectionv2.h +++ b/src/core/geometry/qgsgeometrycollection.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsgeometrycollectionv2.h + qgsgeometrycollection.h ------------------------------------------------------------------- Date : 28 Oct 2014 Copyright : (C) 2014 by Marco Hugentobler @@ -16,25 +16,25 @@ email : marco.hugentobler at sourcepole dot com #ifndef QGSGEOMETRYCOLLECTIONV2_H #define QGSGEOMETRYCOLLECTIONV2_H -#include "qgsabstractgeometryv2.h" +#include "qgsabstractgeometry.h" #include "qgspointv2.h" #include /** \ingroup core - * \class QgsGeometryCollectionV2 + * \class QgsGeometryCollection * \brief Geometry collection * \note added in QGIS 2.10 * \note this API is not considered stable and may change for 2.12 */ -class CORE_EXPORT QgsGeometryCollectionV2: public QgsAbstractGeometryV2 +class CORE_EXPORT QgsGeometryCollection: public QgsAbstractGeometry { 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 override; + virtual QgsGeometryCollection* clone() const override; /** Returns the number of geometries within the collection. */ @@ -43,27 +43,27 @@ class CORE_EXPORT 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 override; virtual QString geometryType() const override { return "GeometryCollection"; } virtual void clear() override; - virtual QgsAbstractGeometryV2* boundary() const override; + virtual QgsAbstractGeometry* boundary() const override; /** Adds a geometry and takes ownership. Returns true in case of success.*/ - virtual bool addGeometry( QgsAbstractGeometryV2* g ); + virtual bool addGeometry( QgsAbstractGeometry* g ); /** 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, int index ); + virtual bool insertGeometry( QgsAbstractGeometry* g, int index ); /** Removes a geometry from the collection. * @param nr index of geometry to remove @@ -90,7 +90,7 @@ class CORE_EXPORT QgsGeometryCollectionV2: public QgsAbstractGeometryV2 virtual QgsRectangle boundingBox() const override; - virtual QgsCoordinateSequenceV2 coordinateSequence() const override; + virtual QgsCoordinateSequence coordinateSequence() const override; virtual double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const override; bool nextVertex( QgsVertexId& id, QgsPointV2& vertex ) const override; @@ -108,7 +108,7 @@ class CORE_EXPORT 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 override; + QgsAbstractGeometry* segmentize( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const override; /** Returns approximate rotation angle for a vertex. Usually average angle between adjacent segments. * @param vertex the vertex id @@ -127,7 +127,7 @@ class CORE_EXPORT QgsGeometryCollectionV2: public QgsAbstractGeometryV2 virtual bool dropMValue() override; protected: - QVector< QgsAbstractGeometryV2* > mGeometries; + QVector< QgsAbstractGeometry* > mGeometries; /** Returns whether child type names are omitted from Wkt representations of the collection * @note added in QGIS 2.12 @@ -136,15 +136,15 @@ class CORE_EXPORT QgsGeometryCollectionV2: public QgsAbstractGeometryV2 /** Reads a collection from a WKT string. */ - bool fromCollectionWkt( const QString &wkt, const QList& subtypes, const QString& defaultChildWkbType = QString() ); + bool fromCollectionWkt( const QString &wkt, const QList& subtypes, const QString& defaultChildWkbType = QString() ); virtual QgsRectangle calculateBoundingBox() const override; - virtual void clearCache() const override { mBoundingBox = QgsRectangle(); mCoordinateSequence.clear(); QgsAbstractGeometryV2::clearCache(); } + virtual void clearCache() const override { mBoundingBox = QgsRectangle(); mCoordinateSequence.clear(); QgsAbstractGeometry::clearCache(); } private: mutable QgsRectangle mBoundingBox; - mutable QgsCoordinateSequenceV2 mCoordinateSequence; + mutable QgsCoordinateSequence mCoordinateSequence; }; #endif // QGSGEOMETRYCOLLECTIONV2_H diff --git a/src/core/geometry/qgsgeometryeditutils.cpp b/src/core/geometry/qgsgeometryeditutils.cpp index cec0727a28b..fb657f1c359 100644 --- a/src/core/geometry/qgsgeometryeditutils.cpp +++ b/src/core/geometry/qgsgeometryeditutils.cpp @@ -15,28 +15,28 @@ email : marco.hugentobler at sourcepole dot com #include "qgsgeometryeditutils.h" #include "qgsfeatureiterator.h" -#include "qgscurvev2.h" -#include "qgscurvepolygonv2.h" -#include "qgspolygonv2.h" +#include "qgscurve.h" +#include "qgscurvepolygon.h" +#include "qgspolygon.h" #include "qgsgeometryutils.h" #include "qgsgeometry.h" #include "qgsgeos.h" #include "qgsmaplayerregistry.h" -#include "qgsmultisurfacev2.h" +#include "qgsmultisurface.h" #include "qgsproject.h" #include "qgsvectorlayer.h" #include -int QgsGeometryEditUtils::addRing( QgsAbstractGeometryV2* geom, QgsCurveV2* ring ) +int QgsGeometryEditUtils::addRing( QgsAbstractGeometry* geom, QgsCurve* ring ) { if ( !ring ) { return 1; } - QList< QgsCurvePolygonV2* > polygonList; - QgsCurvePolygonV2* curvePoly = dynamic_cast< QgsCurvePolygonV2* >( geom ); - QgsGeometryCollectionV2* multiGeom = dynamic_cast< QgsGeometryCollectionV2* >( geom ); + QList< QgsCurvePolygon* > polygonList; + QgsCurvePolygon* curvePoly = dynamic_cast< QgsCurvePolygon* >( geom ); + QgsGeometryCollection* multiGeom = dynamic_cast< QgsGeometryCollection* >( geom ); if ( curvePoly ) { polygonList.append( curvePoly ); @@ -46,7 +46,7 @@ int QgsGeometryEditUtils::addRing( QgsAbstractGeometryV2* geom, QgsCurveV2* ring polygonList.reserve( multiGeom->numGeometries() ); for ( int i = 0; i < multiGeom->numGeometries(); ++i ) { - polygonList.append( dynamic_cast< QgsCurvePolygonV2* >( multiGeom->geometryN( i ) ) ); + polygonList.append( dynamic_cast< QgsCurvePolygon* >( multiGeom->geometryN( i ) ) ); } } else @@ -71,7 +71,7 @@ int QgsGeometryEditUtils::addRing( QgsAbstractGeometryV2* geom, QgsCurveV2* ring ringGeom->prepareGeometry(); //for each polygon, test if inside outer ring and no intersection with other interior ring - QList< QgsCurvePolygonV2* >::iterator polyIter = polygonList.begin(); + QList< QgsCurvePolygon* >::iterator polyIter = polygonList.begin(); for ( ; polyIter != polygonList.end(); ++polyIter ) { if ( ringGeom->within( **polyIter ) ) @@ -101,7 +101,7 @@ int QgsGeometryEditUtils::addRing( QgsAbstractGeometryV2* geom, QgsCurveV2* ring return 5; //not contained in any outer ring } -int QgsGeometryEditUtils::addPart( QgsAbstractGeometryV2* geom, QgsAbstractGeometryV2* part ) +int QgsGeometryEditUtils::addPart( QgsAbstractGeometry* geom, QgsAbstractGeometry* part ) { if ( !geom ) { @@ -114,7 +114,7 @@ int QgsGeometryEditUtils::addPart( QgsAbstractGeometryV2* geom, QgsAbstractGeome } //multitype? - QgsGeometryCollectionV2* geomCollection = dynamic_cast( geom ); + QgsGeometryCollection* geomCollection = dynamic_cast( geom ); if ( !geomCollection ) { return 1; @@ -124,17 +124,17 @@ int QgsGeometryEditUtils::addPart( QgsAbstractGeometryV2* geom, QgsAbstractGeome if ( QgsWkbTypes::flatType( geom->wkbType() ) == QgsWkbTypes::MultiSurface || QgsWkbTypes::flatType( geom->wkbType() ) == QgsWkbTypes::MultiPolygon ) { - QgsCurveV2* curve = dynamic_cast( part ); + QgsCurve* curve = dynamic_cast( part ); if ( curve && curve->isClosed() && curve->numPoints() >= 4 ) { - QgsCurvePolygonV2 *poly = nullptr; + QgsCurvePolygon *poly = nullptr; if ( QgsWkbTypes::flatType( curve->wkbType() ) == QgsWkbTypes::LineString ) { poly = new QgsPolygonV2(); } else { - poly = new QgsCurvePolygonV2(); + poly = new QgsCurvePolygon(); } poly->setExteriorRing( curve ); added = geomCollection->addGeometry( poly ); @@ -145,7 +145,7 @@ int QgsGeometryEditUtils::addPart( QgsAbstractGeometryV2* geom, QgsAbstractGeome } else if ( QgsWkbTypes::flatType( part->wkbType() ) == QgsWkbTypes::MultiPolygon ) { - QgsGeometryCollectionV2 *parts = static_cast( part ); + QgsGeometryCollection *parts = static_cast( part ); int i; int n = geomCollection->numGeometries(); @@ -176,7 +176,7 @@ int QgsGeometryEditUtils::addPart( QgsAbstractGeometryV2* geom, QgsAbstractGeome return added ? 0 : 2; } -bool QgsGeometryEditUtils::deleteRing( QgsAbstractGeometryV2* geom, int ringNum, int partNum ) +bool QgsGeometryEditUtils::deleteRing( QgsAbstractGeometry* geom, int ringNum, int partNum ) { if ( !geom || partNum < 0 ) { @@ -188,8 +188,8 @@ bool QgsGeometryEditUtils::deleteRing( QgsAbstractGeometryV2* geom, int ringNum, return false; } - QgsAbstractGeometryV2* g = geom; - QgsGeometryCollectionV2* c = dynamic_cast( geom ); + QgsAbstractGeometry* g = geom; + QgsGeometryCollection* c = dynamic_cast( geom ); if ( c ) { g = c->geometryN( partNum ); @@ -200,7 +200,7 @@ bool QgsGeometryEditUtils::deleteRing( QgsAbstractGeometryV2* geom, int ringNum, return false; } - QgsCurvePolygonV2* cpoly = dynamic_cast( g ); + QgsCurvePolygon* cpoly = dynamic_cast( g ); if ( !cpoly ) { return false; @@ -209,14 +209,14 @@ bool QgsGeometryEditUtils::deleteRing( QgsAbstractGeometryV2* geom, int ringNum, return cpoly->removeInteriorRing( ringNum - 1 ); } -bool QgsGeometryEditUtils::deletePart( QgsAbstractGeometryV2* geom, int partNum ) +bool QgsGeometryEditUtils::deletePart( QgsAbstractGeometry* geom, int partNum ) { if ( !geom ) { return false; } - QgsGeometryCollectionV2* c = dynamic_cast( geom ); + QgsGeometryCollection* c = dynamic_cast( geom ); if ( !c ) { return false; @@ -225,7 +225,7 @@ bool QgsGeometryEditUtils::deletePart( QgsAbstractGeometryV2* geom, int partNum return c->removeGeometry( partNum ); } -QgsAbstractGeometryV2* QgsGeometryEditUtils::avoidIntersections( const QgsAbstractGeometryV2& geom, QMap > ignoreFeatures ) +QgsAbstractGeometry* QgsGeometryEditUtils::avoidIntersections( const QgsAbstractGeometry& geom, QMap > ignoreFeatures ) { QScopedPointer geomEngine( QgsGeometry::createGeometryEngine( &geom ) ); if ( geomEngine.isNull() ) @@ -247,7 +247,7 @@ QgsAbstractGeometryV2* QgsGeometryEditUtils::avoidIntersections( const QgsAbstra if ( !listReadOk ) return nullptr; //no intersections stored in project does not mean error - QList< QgsAbstractGeometryV2* > nearGeometries; + QList< QgsAbstractGeometry* > nearGeometries; //go through list, convert each layer to vector layer and call QgsVectorLayer::removePolygonIntersections for each QgsVectorLayer* currentLayer = nullptr; @@ -285,14 +285,14 @@ QgsAbstractGeometryV2* QgsGeometryEditUtils::avoidIntersections( const QgsAbstra } - QgsAbstractGeometryV2* combinedGeometries = geomEngine.data()->combine( nearGeometries ); + QgsAbstractGeometry* combinedGeometries = geomEngine.data()->combine( nearGeometries ); qDeleteAll( nearGeometries ); if ( !combinedGeometries ) { return nullptr; } - QgsAbstractGeometryV2* diffGeom = geomEngine.data()->difference( *combinedGeometries ); + QgsAbstractGeometry* diffGeom = geomEngine.data()->difference( *combinedGeometries ); delete combinedGeometries; return diffGeom; diff --git a/src/core/geometry/qgsgeometryeditutils.h b/src/core/geometry/qgsgeometryeditutils.h index fbcbb7383d0..78c9483c63e 100644 --- a/src/core/geometry/qgsgeometryeditutils.h +++ b/src/core/geometry/qgsgeometryeditutils.h @@ -16,8 +16,8 @@ email : marco.hugentobler at sourcepole dot com #ifndef QGSGEOMETRYEDITUTILS_H #define QGSGEOMETRYEDITUTILS_H -class QgsAbstractGeometryV2; -class QgsCurveV2; +class QgsAbstractGeometry; +class QgsCurve; class QgsGeometryEngine; class QgsVectorLayer; @@ -38,29 +38,29 @@ class QgsGeometryEditUtils @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 - static int addRing( QgsAbstractGeometryV2* geom, QgsCurveV2* ring ); + static int addRing( QgsAbstractGeometry* geom, QgsCurve* ring ); /** Adds part to multi type geometry (taking ownership) @return 0 in case of success, 1 if not a multigeometry, 2 if part is not a valid geometry, 3 if new polygon ring not disjoint with existing polygons of the feature*/ // TODO QGIS 3.0 returns an enum instead of a magic constant - static int addPart( QgsAbstractGeometryV2* geom, QgsAbstractGeometryV2* part ); + static int addPart( QgsAbstractGeometry* geom, QgsAbstractGeometry* part ); /** Deletes a ring from a geometry. * @returns true if delete was successful */ - static bool deleteRing( QgsAbstractGeometryV2* geom, int ringNum, int partNum = 0 ); + static bool deleteRing( QgsAbstractGeometry* geom, int ringNum, int partNum = 0 ); /** Deletes a part from a geometry. * @returns true if delete was successful */ - static bool deletePart( QgsAbstractGeometryV2* geom, int partNum ); + static bool deletePart( QgsAbstractGeometry* geom, int partNum ); /** Alters a geometry so that it avoids intersections with features from all open vector layers. * @param geom geometry to alter * @param ignoreFeatures map of layer to feature id of features to ignore */ - static QgsAbstractGeometryV2* avoidIntersections( const QgsAbstractGeometryV2& geom, QMap > ignoreFeatures = ( QMap >() ) ); + static QgsAbstractGeometry* avoidIntersections( const QgsAbstractGeometry& geom, QMap > ignoreFeatures = ( QMap >() ) ); }; #endif // QGSGEOMETRYEDITUTILS_H diff --git a/src/core/geometry/qgsgeometryengine.h b/src/core/geometry/qgsgeometryengine.h index 1c7a3a34bde..64ff3228df0 100644 --- a/src/core/geometry/qgsgeometryengine.h +++ b/src/core/geometry/qgsgeometryengine.h @@ -16,11 +16,11 @@ email : marco.hugentobler at sourcepole dot com #ifndef QGSGEOMETRYENGINE_H #define QGSGEOMETRYENGINE_H -#include "qgslinestringv2.h" +#include "qgslinestring.h" #include -class QgsAbstractGeometryV2; +class QgsAbstractGeometry; /** \ingroup core * \class QgsGeometryEngine @@ -31,33 +31,33 @@ class QgsAbstractGeometryV2; class CORE_EXPORT QgsGeometryEngine { public: - QgsGeometryEngine( const QgsAbstractGeometryV2* geometry ): mGeometry( geometry ) {} + QgsGeometryEngine( const QgsAbstractGeometry* geometry ): mGeometry( geometry ) {} virtual ~QgsGeometryEngine() {} virtual void geometryChanged() = 0; virtual void prepareGeometry() = 0; - virtual QgsAbstractGeometryV2* intersection( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const = 0; - virtual QgsAbstractGeometryV2* difference( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const = 0; - virtual QgsAbstractGeometryV2* combine( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const = 0; - virtual QgsAbstractGeometryV2* combine( const QList< QgsAbstractGeometryV2* >&, QString* errorMsg = nullptr ) const = 0; - virtual QgsAbstractGeometryV2* symDifference( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const = 0; - virtual QgsAbstractGeometryV2* buffer( double distance, int segments, QString* errorMsg = nullptr ) const = 0; - virtual QgsAbstractGeometryV2* buffer( double distance, int segments, int endCapStyle, int joinStyle, double mitreLimit, QString* errorMsg = nullptr ) const = 0; - virtual QgsAbstractGeometryV2* simplify( double tolerance, QString* errorMsg = nullptr ) const = 0; - virtual QgsAbstractGeometryV2* interpolate( double distance, QString* errorMsg = nullptr ) const = 0; - virtual QgsAbstractGeometryV2* envelope( QString* errorMsg = nullptr ) const = 0; + virtual QgsAbstractGeometry* intersection( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const = 0; + virtual QgsAbstractGeometry* difference( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const = 0; + virtual QgsAbstractGeometry* combine( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const = 0; + virtual QgsAbstractGeometry* combine( const QList< QgsAbstractGeometry* >&, QString* errorMsg = nullptr ) const = 0; + virtual QgsAbstractGeometry* symDifference( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const = 0; + virtual QgsAbstractGeometry* buffer( double distance, int segments, QString* errorMsg = nullptr ) const = 0; + virtual QgsAbstractGeometry* buffer( double distance, int segments, int endCapStyle, int joinStyle, double mitreLimit, QString* errorMsg = nullptr ) const = 0; + virtual QgsAbstractGeometry* simplify( double tolerance, QString* errorMsg = nullptr ) const = 0; + virtual QgsAbstractGeometry* interpolate( double distance, QString* errorMsg = nullptr ) const = 0; + virtual QgsAbstractGeometry* envelope( QString* errorMsg = nullptr ) const = 0; virtual bool centroid( QgsPointV2& pt, QString* errorMsg = nullptr ) const = 0; virtual bool pointOnSurface( QgsPointV2& pt, QString* errorMsg = nullptr ) const = 0; - virtual QgsAbstractGeometryV2* convexHull( QString* errorMsg = nullptr ) const = 0; - virtual double distance( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const = 0; - virtual bool intersects( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const = 0; - virtual bool touches( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const = 0; - virtual bool crosses( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const = 0; - virtual bool within( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const = 0; - virtual bool overlaps( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const = 0; - virtual bool contains( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const = 0; - virtual bool disjoint( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const = 0; + virtual QgsAbstractGeometry* convexHull( QString* errorMsg = nullptr ) const = 0; + virtual double distance( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const = 0; + virtual bool intersects( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const = 0; + virtual bool touches( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const = 0; + virtual bool crosses( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const = 0; + virtual bool within( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const = 0; + virtual bool overlaps( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const = 0; + virtual bool contains( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const = 0; + virtual bool disjoint( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const = 0; /** Returns the Dimensional Extended 9 Intersection Model (DE-9IM) representation of the * relationship between the geometries. @@ -66,7 +66,7 @@ class CORE_EXPORT 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 = nullptr ) const = 0; + virtual QString relate( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const = 0; /** Tests whether two geometries are related by a specified Dimensional Extended 9 Intersection Model (DE-9IM) * pattern. @@ -76,18 +76,18 @@ class CORE_EXPORT 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 = nullptr ) const = 0; + virtual bool relatePattern( const QgsAbstractGeometry& geom, const QString& pattern, QString* errorMsg = nullptr ) const = 0; virtual double area( QString* errorMsg = nullptr ) const = 0; virtual double length( QString* errorMsg = nullptr ) const = 0; virtual bool isValid( QString* errorMsg = nullptr ) const = 0; - virtual bool isEqual( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const = 0; + virtual bool isEqual( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const = 0; virtual bool isEmpty( QString* errorMsg ) const = 0; - virtual int splitGeometry( const QgsLineStringV2& splitLine, - QList& newGeometries, + virtual int splitGeometry( const QgsLineString& splitLine, + QList& newGeometries, bool topological, - QgsPointSequenceV2 &topologyTestPoints, QString* errorMsg = nullptr ) const + QgsPointSequence &topologyTestPoints, QString* errorMsg = nullptr ) const { Q_UNUSED( splitLine ); Q_UNUSED( newGeometries ); @@ -97,10 +97,10 @@ class CORE_EXPORT QgsGeometryEngine return 2; } - virtual QgsAbstractGeometryV2* offsetCurve( double distance, int segments, int joinStyle, double mitreLimit, QString* errorMsg = nullptr ) const = 0; + virtual QgsAbstractGeometry* offsetCurve( double distance, int segments, int joinStyle, double mitreLimit, QString* errorMsg = nullptr ) const = 0; protected: - const QgsAbstractGeometryV2* mGeometry; + const QgsAbstractGeometry* mGeometry; QgsGeometryEngine(); }; diff --git a/src/core/geometry/qgsgeometryfactory.cpp b/src/core/geometry/qgsgeometryfactory.cpp index 05275c1e9df..ddd27ece876 100644 --- a/src/core/geometry/qgsgeometryfactory.cpp +++ b/src/core/geometry/qgsgeometryfactory.cpp @@ -16,21 +16,21 @@ ***************************************************************************/ #include "qgsgeometryfactory.h" -#include "qgscircularstringv2.h" -#include "qgscompoundcurvev2.h" -#include "qgscurvepolygonv2.h" +#include "qgscircularstring.h" +#include "qgscompoundcurve.h" +#include "qgscurvepolygon.h" #include "qgspointv2.h" -#include "qgspolygonv2.h" -#include "qgslinestringv2.h" -#include "qgsmulticurvev2.h" -#include "qgsmultilinestringv2.h" -#include "qgsmultipointv2.h" -#include "qgsmultipolygonv2.h" -#include "qgsmultisurfacev2.h" +#include "qgspolygon.h" +#include "qgslinestring.h" +#include "qgsmulticurve.h" +#include "qgsmultilinestring.h" +#include "qgsmultipoint.h" +#include "qgsmultipolygon.h" +#include "qgsmultisurface.h" #include "qgswkbtypes.h" #include "qgslogger.h" -QgsAbstractGeometryV2* QgsGeometryFactory::geomFromWkb( QgsConstWkbPtr wkbPtr ) +QgsAbstractGeometry* QgsGeometryFactory::geomFromWkb( QgsConstWkbPtr wkbPtr ) { if ( !wkbPtr ) return nullptr; @@ -49,7 +49,7 @@ QgsAbstractGeometryV2* QgsGeometryFactory::geomFromWkb( QgsConstWkbPtr wkbPtr ) } wkbPtr -= 1 + sizeof( int ); - QgsAbstractGeometryV2* geom = nullptr; + QgsAbstractGeometry* geom = nullptr; geom = geomFromWkbType( type ); @@ -71,24 +71,24 @@ QgsAbstractGeometryV2* QgsGeometryFactory::geomFromWkb( QgsConstWkbPtr wkbPtr ) return geom; } -QgsAbstractGeometryV2* QgsGeometryFactory::geomFromWkt( const QString& text ) +QgsAbstractGeometry* QgsGeometryFactory::geomFromWkt( const QString& text ) { - QgsAbstractGeometryV2* geom = nullptr; + QgsAbstractGeometry* geom = nullptr; if ( text.startsWith( "Point", Qt::CaseInsensitive ) ) { geom = new QgsPointV2(); } else if ( text.startsWith( "LineString", Qt::CaseInsensitive ) ) { - geom = new QgsLineStringV2(); + geom = new QgsLineString(); } else if ( text.startsWith( "CircularString", Qt::CaseInsensitive ) ) { - geom = new QgsCircularStringV2(); + geom = new QgsCircularString(); } else if ( text.startsWith( "CompoundCurve" , Qt::CaseInsensitive ) ) { - geom = new QgsCompoundCurveV2(); + geom = new QgsCompoundCurve(); } else if ( text.startsWith( "Polygon", Qt::CaseInsensitive ) ) { @@ -96,7 +96,7 @@ QgsAbstractGeometryV2* QgsGeometryFactory::geomFromWkt( const QString& text ) } else if ( text.startsWith( "CurvePolygon", Qt::CaseInsensitive ) ) { - geom = new QgsCurvePolygonV2(); + geom = new QgsCurvePolygon(); } else if ( text.startsWith( "MultiPoint", Qt::CaseInsensitive ) ) { @@ -104,15 +104,15 @@ QgsAbstractGeometryV2* QgsGeometryFactory::geomFromWkt( const QString& text ) } else if ( text.startsWith( "MultiCurve", Qt::CaseInsensitive ) ) { - geom = new QgsMultiCurveV2(); + geom = new QgsMultiCurve(); } else if ( text.startsWith( "MultiLineString", Qt::CaseInsensitive ) ) { - geom = new QgsMultiLineStringV2(); + geom = new QgsMultiLineString(); } else if ( text.startsWith( "MultiSurface", Qt::CaseInsensitive ) ) { - geom = new QgsMultiSurfaceV2(); + geom = new QgsMultiSurface(); } else if ( text.startsWith( "MultiPolygon", Qt::CaseInsensitive ) ) { @@ -120,7 +120,7 @@ QgsAbstractGeometryV2* QgsGeometryFactory::geomFromWkt( const QString& text ) } else if ( text.startsWith( "GeometryCollection", Qt::CaseInsensitive ) ) { - geom = new QgsGeometryCollectionV2(); + geom = new QgsGeometryCollection(); } if ( geom ) @@ -134,12 +134,12 @@ QgsAbstractGeometryV2* QgsGeometryFactory::geomFromWkt( const QString& text ) return geom; } -QgsAbstractGeometryV2* QgsGeometryFactory::fromPoint( const QgsPoint& point ) +QgsAbstractGeometry* QgsGeometryFactory::fromPoint( const QgsPoint& point ) { return new QgsPointV2( point.x(), point.y() ); } -QgsAbstractGeometryV2* QgsGeometryFactory::fromMultiPoint( const QgsMultiPoint& multipoint ) +QgsAbstractGeometry* QgsGeometryFactory::fromMultiPoint( const QgsMultiPoint& multipoint ) { QgsMultiPointV2* mp = new QgsMultiPointV2(); QgsMultiPoint::const_iterator ptIt = multipoint.constBegin(); @@ -151,14 +151,14 @@ QgsAbstractGeometryV2* QgsGeometryFactory::fromMultiPoint( const QgsMultiPoint& return mp; } -QgsAbstractGeometryV2* QgsGeometryFactory::fromPolyline( const QgsPolyline& polyline ) +QgsAbstractGeometry* QgsGeometryFactory::fromPolyline( const QgsPolyline& polyline ) { return linestringFromPolyline( polyline ); } -QgsAbstractGeometryV2* QgsGeometryFactory::fromMultiPolyline( const QgsMultiPolyline& multiline ) +QgsAbstractGeometry* QgsGeometryFactory::fromMultiPolyline( const QgsMultiPolyline& multiline ) { - QgsMultiLineStringV2* mLine = new QgsMultiLineStringV2(); + QgsMultiLineString* mLine = new QgsMultiLineString(); for ( int i = 0; i < multiline.size(); ++i ) { mLine->addGeometry( fromPolyline( multiline.at( i ) ) ); @@ -166,14 +166,14 @@ QgsAbstractGeometryV2* QgsGeometryFactory::fromMultiPolyline( const QgsMultiPoly return mLine; } -QgsAbstractGeometryV2* QgsGeometryFactory::fromPolygon( const QgsPolygon& polygon ) +QgsAbstractGeometry* QgsGeometryFactory::fromPolygon( const QgsPolygon& polygon ) { QgsPolygonV2* poly = new QgsPolygonV2(); - QList holes; + QList holes; for ( int i = 0; i < polygon.size(); ++i ) { - QgsLineStringV2* l = linestringFromPolyline( polygon.at( i ) ); + QgsLineString* l = linestringFromPolyline( polygon.at( i ) ); l->close(); if ( i == 0 ) @@ -189,7 +189,7 @@ QgsAbstractGeometryV2* QgsGeometryFactory::fromPolygon( const QgsPolygon& polygo return poly; } -QgsAbstractGeometryV2* QgsGeometryFactory::fromMultiPolygon( const QgsMultiPolygon& multipoly ) +QgsAbstractGeometry* QgsGeometryFactory::fromMultiPolygon( const QgsMultiPolygon& multipoly ) { QgsMultiPolygonV2* mp = new QgsMultiPolygonV2(); for ( int i = 0; i < multipoly.size(); ++i ) @@ -199,7 +199,7 @@ QgsAbstractGeometryV2* QgsGeometryFactory::fromMultiPolygon( const QgsMultiPolyg return mp; } -QgsAbstractGeometryV2* QgsGeometryFactory::fromRect( const QgsRectangle& rect ) +QgsAbstractGeometry* QgsGeometryFactory::fromRect( const QgsRectangle& rect ) { QgsPolyline ring; ring.append( QgsPoint( rect.xMinimum(), rect.yMinimum() ) ); @@ -214,11 +214,11 @@ QgsAbstractGeometryV2* QgsGeometryFactory::fromRect( const QgsRectangle& rect ) return fromPolygon( polygon ); } -QgsLineStringV2* QgsGeometryFactory::linestringFromPolyline( const QgsPolyline& polyline ) +QgsLineString* QgsGeometryFactory::linestringFromPolyline( const QgsPolyline& polyline ) { - QgsLineStringV2* line = new QgsLineStringV2(); + QgsLineString* line = new QgsLineString(); - QgsPointSequenceV2 points; + QgsPointSequence points; QgsPolyline::const_iterator it = polyline.constBegin(); for ( ; it != polyline.constEnd(); ++it ) { @@ -228,7 +228,7 @@ QgsLineStringV2* QgsGeometryFactory::linestringFromPolyline( const QgsPolyline& return line; } -QgsAbstractGeometryV2* QgsGeometryFactory::geomFromWkbType( QgsWkbTypes::Type t ) +QgsAbstractGeometry* QgsGeometryFactory::geomFromWkbType( QgsWkbTypes::Type t ) { QgsWkbTypes::Type type = QgsWkbTypes::flatType( t ); switch ( type ) @@ -236,27 +236,27 @@ QgsAbstractGeometryV2* QgsGeometryFactory::geomFromWkbType( QgsWkbTypes::Type t case QgsWkbTypes::Point: return new QgsPointV2(); case QgsWkbTypes::LineString: - return new QgsLineStringV2(); + return new QgsLineString(); case QgsWkbTypes::CircularString: - return new QgsCircularStringV2(); + return new QgsCircularString(); case QgsWkbTypes::CompoundCurve: - return new QgsCompoundCurveV2(); + return new QgsCompoundCurve(); case QgsWkbTypes::Polygon: return new QgsPolygonV2(); case QgsWkbTypes::CurvePolygon: - return new QgsCurvePolygonV2(); + return new QgsCurvePolygon(); case QgsWkbTypes::MultiLineString: - return new QgsMultiLineStringV2(); + return new QgsMultiLineString(); case QgsWkbTypes::MultiPolygon: return new QgsMultiPolygonV2(); case QgsWkbTypes::MultiPoint: return new QgsMultiPointV2(); case QgsWkbTypes::MultiCurve: - return new QgsMultiCurveV2(); + return new QgsMultiCurve(); case QgsWkbTypes::MultiSurface: - return new QgsMultiSurfaceV2(); + return new QgsMultiSurface(); case QgsWkbTypes::GeometryCollection: - return new QgsGeometryCollectionV2(); + return new QgsGeometryCollection(); default: return nullptr; } diff --git a/src/core/geometry/qgsgeometryfactory.h b/src/core/geometry/qgsgeometryfactory.h index cdd285df95a..22ff4313d0e 100644 --- a/src/core/geometry/qgsgeometryfactory.h +++ b/src/core/geometry/qgsgeometryfactory.h @@ -20,8 +20,8 @@ #include -class QgsAbstractGeometryV2; -class QgsLineStringV2; +class QgsAbstractGeometry; +class QgsLineString; class QgsConstWkbPtr; class QgsRectangle; @@ -45,31 +45,31 @@ class CORE_EXPORT QgsGeometryFactory public: /** Construct geometry from a WKB string. */ - static QgsAbstractGeometryV2* geomFromWkb( QgsConstWkbPtr wkb ); + static QgsAbstractGeometry* geomFromWkb( QgsConstWkbPtr wkb ); /** Construct geometry from a WKT string. */ - static QgsAbstractGeometryV2* geomFromWkt( const QString& text ); + static QgsAbstractGeometry* geomFromWkt( const QString& text ); /** Construct geometry from a point */ - static QgsAbstractGeometryV2* fromPoint( const QgsPoint& point ); + static QgsAbstractGeometry* fromPoint( const QgsPoint& point ); /** Construct geometry from a multipoint */ - static QgsAbstractGeometryV2* fromMultiPoint( const QgsMultiPoint& multipoint ); + static QgsAbstractGeometry* fromMultiPoint( const QgsMultiPoint& multipoint ); /** Construct geometry from a polyline */ - static QgsAbstractGeometryV2* fromPolyline( const QgsPolyline& polyline ); + static QgsAbstractGeometry* fromPolyline( const QgsPolyline& polyline ); /** Construct geometry from a multipolyline*/ - static QgsAbstractGeometryV2* fromMultiPolyline( const QgsMultiPolyline& multiline ); + static QgsAbstractGeometry* fromMultiPolyline( const QgsMultiPolyline& multiline ); /** Construct geometry from a polygon */ - static QgsAbstractGeometryV2* fromPolygon( const QgsPolygon& polygon ); + static QgsAbstractGeometry* fromPolygon( const QgsPolygon& polygon ); /** Construct geometry from a multipolygon */ - static QgsAbstractGeometryV2* fromMultiPolygon( const QgsMultiPolygon& multipoly ); + static QgsAbstractGeometry* fromMultiPolygon( const QgsMultiPolygon& multipoly ); /** Construct geometry from a rectangle */ - static QgsAbstractGeometryV2* fromRect( const QgsRectangle& rect ); + static QgsAbstractGeometry* fromRect( const QgsRectangle& rect ); /** Return empty geometry from wkb type*/ - static QgsAbstractGeometryV2* geomFromWkbType( QgsWkbTypes::Type t ); + static QgsAbstractGeometry* geomFromWkbType( QgsWkbTypes::Type t ); private: - static QgsLineStringV2* linestringFromPolyline( const QgsPolyline& polyline ); + static QgsLineString* linestringFromPolyline( const QgsPolyline& polyline ); }; #endif // QGSGEOMETRYFACTORY_H diff --git a/src/core/geometry/qgsgeometryutils.cpp b/src/core/geometry/qgsgeometryutils.cpp index 263d323f546..6bb51c0598b 100644 --- a/src/core/geometry/qgsgeometryutils.cpp +++ b/src/core/geometry/qgsgeometryutils.cpp @@ -15,52 +15,52 @@ email : marco.hugentobler at sourcepole dot com #include "qgsgeometryutils.h" -#include "qgscurvev2.h" -#include "qgscurvepolygonv2.h" -#include "qgsgeometrycollectionv2.h" -#include "qgslinestringv2.h" +#include "qgscurve.h" +#include "qgscurvepolygon.h" +#include "qgsgeometrycollection.h" +#include "qgslinestring.h" #include "qgswkbptr.h" #include #include -QList QgsGeometryUtils::extractLineStrings( const QgsAbstractGeometryV2* geom ) +QList QgsGeometryUtils::extractLineStrings( const QgsAbstractGeometry* geom ) { - QList< QgsLineStringV2* > linestrings; + QList< QgsLineString* > linestrings; if ( !geom ) return linestrings; - QList< const QgsAbstractGeometryV2 * > geometries; + QList< const QgsAbstractGeometry * > geometries; geometries << geom; while ( ! geometries.isEmpty() ) { - const QgsAbstractGeometryV2* g = geometries.takeFirst(); - if ( const QgsCurveV2* curve = dynamic_cast< const QgsCurveV2* >( g ) ) + const QgsAbstractGeometry* g = geometries.takeFirst(); + if ( const QgsCurve* curve = dynamic_cast< const QgsCurve* >( g ) ) { - linestrings << static_cast< QgsLineStringV2* >( curve->segmentize() ); + linestrings << static_cast< QgsLineString* >( curve->segmentize() ); } - else if ( const QgsGeometryCollectionV2* collection = dynamic_cast< const QgsGeometryCollectionV2* >( g ) ) + else if ( const QgsGeometryCollection* collection = dynamic_cast< const QgsGeometryCollection* >( g ) ) { for ( int i = 0; i < collection->numGeometries(); ++i ) { geometries.append( collection->geometryN( i ) ); } } - else if ( const QgsCurvePolygonV2* curvePolygon = dynamic_cast< const QgsCurvePolygonV2* >( g ) ) + else if ( const QgsCurvePolygon* curvePolygon = dynamic_cast< const QgsCurvePolygon* >( g ) ) { if ( curvePolygon->exteriorRing() ) - linestrings << static_cast< QgsLineStringV2* >( curvePolygon->exteriorRing()->segmentize() ); + linestrings << static_cast< QgsLineString* >( curvePolygon->exteriorRing()->segmentize() ); for ( int i = 0; i < curvePolygon->numInteriorRings(); ++i ) { - linestrings << static_cast< QgsLineStringV2* >( curvePolygon->interiorRing( i )->segmentize() ); + linestrings << static_cast< QgsLineString* >( curvePolygon->interiorRing( i )->segmentize() ); } } } return linestrings; } -QgsPointV2 QgsGeometryUtils::closestVertex( const QgsAbstractGeometryV2& geom, const QgsPointV2& pt, QgsVertexId& id ) +QgsPointV2 QgsGeometryUtils::closestVertex( const QgsAbstractGeometry& geom, const QgsPointV2& pt, QgsVertexId& id ) { double minDist = std::numeric_limits::max(); double currentDist = 0; @@ -90,7 +90,7 @@ QgsPointV2 QgsGeometryUtils::closestVertex( const QgsAbstractGeometryV2& geom, c return minDistPoint; } -double QgsGeometryUtils::distanceToVertex( const QgsAbstractGeometryV2 &geom, const QgsVertexId &id ) +double QgsGeometryUtils::distanceToVertex( const QgsAbstractGeometry &geom, const QgsVertexId &id ) { double currentDist = 0; QgsVertexId vertexId; @@ -119,11 +119,11 @@ double QgsGeometryUtils::distanceToVertex( const QgsAbstractGeometryV2 &geom, co return -1; } -void QgsGeometryUtils::adjacentVertices( const QgsAbstractGeometryV2& geom, QgsVertexId atVertex, QgsVertexId& beforeVertex, QgsVertexId& afterVertex ) +void QgsGeometryUtils::adjacentVertices( const QgsAbstractGeometry& geom, QgsVertexId atVertex, QgsVertexId& beforeVertex, QgsVertexId& afterVertex ) { bool polygonType = ( geom.dimension() == 2 ); - QgsCoordinateSequenceV2 coords = geom.coordinateSequence(); + QgsCoordinateSequence coords = geom.coordinateSequence(); //get feature if ( coords.size() <= atVertex.part ) @@ -131,14 +131,14 @@ void QgsGeometryUtils::adjacentVertices( const QgsAbstractGeometryV2& geom, QgsV return; //error, no such feature } - const QgsRingSequenceV2 &part = coords.at( atVertex.part ); + const QgsRingSequence &part = coords.at( atVertex.part ); //get ring if ( part.size() <= atVertex.ring ) { return; //error, no such ring } - const QgsPointSequenceV2 &ring = part.at( atVertex.ring ); + const QgsPointSequence &ring = part.at( atVertex.ring ); if ( ring.size() <= atVertex.vertex ) { return; @@ -275,7 +275,7 @@ bool QgsGeometryUtils::segmentIntersection( const QgsPointV2 &p1, const QgsPoint return true; } -QList QgsGeometryUtils::getSelfIntersections( const QgsAbstractGeometryV2 *geom, int part, int ring, double tolerance ) +QList QgsGeometryUtils::getSelfIntersections( const QgsAbstractGeometry *geom, int part, int ring, double tolerance ) { QList intersections; @@ -553,10 +553,10 @@ double QgsGeometryUtils::circleTangentDirection( const QgsPointV2& tangentPoint, } } -QgsPointSequenceV2 QgsGeometryUtils::pointsFromWKT( const QString &wktCoordinateList, bool is3D, bool isMeasure ) +QgsPointSequence QgsGeometryUtils::pointsFromWKT( const QString &wktCoordinateList, bool is3D, bool isMeasure ) { int dim = 2 + is3D + isMeasure; - QgsPointSequenceV2 points; + QgsPointSequence points; QStringList coordList = wktCoordinateList.split( ',', QString::SkipEmptyParts ); //first scan through for extra unexpected dimensions @@ -620,7 +620,7 @@ QgsPointSequenceV2 QgsGeometryUtils::pointsFromWKT( const QString &wktCoordinate return points; } -void QgsGeometryUtils::pointsToWKB( QgsWkbPtr& wkb, const QgsPointSequenceV2 &points, bool is3D, bool isMeasure ) +void QgsGeometryUtils::pointsToWKB( QgsWkbPtr& wkb, const QgsPointSequence &points, bool is3D, bool isMeasure ) { wkb << static_cast( points.size() ); Q_FOREACH ( const QgsPointV2& point, points ) @@ -637,7 +637,7 @@ void QgsGeometryUtils::pointsToWKB( QgsWkbPtr& wkb, const QgsPointSequenceV2 &po } } -QString QgsGeometryUtils::pointsToWKT( const QgsPointSequenceV2 &points, int precision, bool is3D, bool isMeasure ) +QString QgsGeometryUtils::pointsToWKT( const QgsPointSequence &points, int precision, bool is3D, bool isMeasure ) { QString wkt = "("; Q_FOREACH ( const QgsPointV2& p, points ) @@ -656,7 +656,7 @@ QString QgsGeometryUtils::pointsToWKT( const QgsPointSequenceV2 &points, int pre return wkt; } -QDomElement QgsGeometryUtils::pointsToGML2( const QgsPointSequenceV2 &points, QDomDocument& doc, int precision, const QString &ns ) +QDomElement QgsGeometryUtils::pointsToGML2( const QgsPointSequence &points, QDomDocument& doc, int precision, const QString &ns ) { QDomElement elemCoordinates = doc.createElementNS( ns, "coordinates" ); @@ -672,7 +672,7 @@ QDomElement QgsGeometryUtils::pointsToGML2( const QgsPointSequenceV2 &points, QD return elemCoordinates; } -QDomElement QgsGeometryUtils::pointsToGML3( const QgsPointSequenceV2 &points, QDomDocument& doc, int precision, const QString &ns, bool is3D ) +QDomElement QgsGeometryUtils::pointsToGML3( const QgsPointSequence &points, QDomDocument& doc, int precision, const QString &ns, bool is3D ) { QDomElement elemPosList = doc.createElementNS( ns, "posList" ); elemPosList.setAttribute( "srsDimension", is3D ? 3 : 2 ); @@ -691,7 +691,7 @@ QDomElement QgsGeometryUtils::pointsToGML3( const QgsPointSequenceV2 &points, QD return elemPosList; } -QString QgsGeometryUtils::pointsToJSON( const QgsPointSequenceV2 &points, int precision ) +QString QgsGeometryUtils::pointsToJSON( const QgsPointSequence &points, int precision ) { QString json = "[ "; Q_FOREACH ( const QgsPointV2& p, points ) diff --git a/src/core/geometry/qgsgeometryutils.h b/src/core/geometry/qgsgeometryutils.h index 0c2bcf07850..a7167df4f42 100644 --- a/src/core/geometry/qgsgeometryutils.h +++ b/src/core/geometry/qgsgeometryutils.h @@ -19,7 +19,7 @@ email : marco.hugentobler at sourcepole dot com #include "qgspointv2.h" #include -class QgsLineStringV2; +class QgsLineString; /** \ingroup core * \class QgsGeometryUtils @@ -35,11 +35,11 @@ class CORE_EXPORT QgsGeometryUtils /** Returns list of linestrings extracted from the passed geometry. The returned objects * have to be deleted by the caller. */ - static QList extractLineStrings( const QgsAbstractGeometryV2* geom ); + static QList extractLineStrings( const QgsAbstractGeometry* geom ); /** Returns the closest vertex to a geometry for a specified point */ - static QgsPointV2 closestVertex( const QgsAbstractGeometryV2& geom, const QgsPointV2& pt, QgsVertexId& id ); + static QgsPointV2 closestVertex( const QgsAbstractGeometry& geom, const QgsPointV2& pt, QgsVertexId& id ); /** Returns the distance along a geometry from its first vertex to the specified vertex. * @param geom geometry @@ -47,11 +47,11 @@ class CORE_EXPORT QgsGeometryUtils * @returns distance to vertex (following geometry) * @note added in QGIS 2.16 */ - static double distanceToVertex( const QgsAbstractGeometryV2& geom, const QgsVertexId& id ); + static double distanceToVertex( const QgsAbstractGeometry& geom, const QgsVertexId& id ); /** Returns vertices adjacent to a specified vertex within a geometry. */ - static void adjacentVertices( const QgsAbstractGeometryV2& geom, QgsVertexId atVertex, QgsVertexId& beforeVertex, QgsVertexId& afterVertex ); + static void adjacentVertices( const QgsAbstractGeometry& geom, QgsVertexId atVertex, QgsVertexId& beforeVertex, QgsVertexId& afterVertex ); /** Returns the squared 2D distance between two points. */ @@ -115,7 +115,7 @@ class CORE_EXPORT QgsGeometryUtils * @return The list of self intersections * @note added in QGIS 2.12 */ - static QList getSelfIntersections( const QgsAbstractGeometryV2* geom, int part, int ring, double tolerance ); + static QList getSelfIntersections( const QgsAbstractGeometry* geom, int part, int ring, double tolerance ); /** Returns < 0 if point(x/y) is left of the line x1,y1 -> x2,y2*/ static double leftOfLine( double x, double y, double x1, double y1, double x2, double y2 ); @@ -156,17 +156,17 @@ class CORE_EXPORT QgsGeometryUtils /** Returns a list of points contained in a WKT string. */ - static QgsPointSequenceV2 pointsFromWKT( const QString& wktCoordinateList, bool is3D, bool isMeasure ); + static QgsPointSequence pointsFromWKT( const QString& wktCoordinateList, bool is3D, bool isMeasure ); /** Returns a LinearRing { uint32 numPoints; Point points[numPoints]; } */ - static void pointsToWKB( QgsWkbPtr &wkb, const QgsPointSequenceV2 &points, bool is3D, bool isMeasure ); + static void pointsToWKB( QgsWkbPtr &wkb, const QgsPointSequence &points, bool is3D, bool isMeasure ); /** Returns a WKT coordinate list */ - static QString pointsToWKT( const QgsPointSequenceV2 &points, int precision, bool is3D, bool isMeasure ); + static QString pointsToWKT( const QgsPointSequence &points, int precision, bool is3D, bool isMeasure ); /** Returns a gml::coordinates DOM element */ - static QDomElement pointsToGML2( const QgsPointSequenceV2 &points, QDomDocument &doc, int precision, const QString& ns ); + static QDomElement pointsToGML2( const QgsPointSequence &points, QDomDocument &doc, int precision, const QString& ns ); /** Returns a gml::posList DOM element */ - static QDomElement pointsToGML3( const QgsPointSequenceV2 &points, QDomDocument &doc, int precision, const QString& ns, bool is3D ); + static QDomElement pointsToGML3( const QgsPointSequence &points, QDomDocument &doc, int precision, const QString& ns, bool is3D ); /** Returns a geoJSON coordinates string */ - static QString pointsToJSON( const QgsPointSequenceV2 &points, int precision ); + static QString pointsToJSON( const QgsPointSequence &points, int precision ); /** Ensures that an angle is in the range 0 <= angle < 2 pi. * @param angle angle in radians diff --git a/src/core/geometry/qgsgeos.cpp b/src/core/geometry/qgsgeos.cpp index e212bf6ab3c..200e066ea92 100644 --- a/src/core/geometry/qgsgeos.cpp +++ b/src/core/geometry/qgsgeos.cpp @@ -14,17 +14,17 @@ email : marco.hugentobler at sourcepole dot com ***************************************************************************/ #include "qgsgeos.h" -#include "qgsabstractgeometryv2.h" -#include "qgsgeometrycollectionv2.h" +#include "qgsabstractgeometry.h" +#include "qgsgeometrycollection.h" #include "qgsgeometryfactory.h" -#include "qgslinestringv2.h" +#include "qgslinestring.h" #include "qgsmessagelog.h" -#include "qgsmulticurvev2.h" -#include "qgsmultilinestringv2.h" -#include "qgsmultipointv2.h" -#include "qgsmultipolygonv2.h" +#include "qgsmulticurve.h" +#include "qgsmultilinestring.h" +#include "qgsmultipoint.h" +#include "qgsmultipolygon.h" #include "qgslogger.h" -#include "qgspolygonv2.h" +#include "qgspolygon.h" #include "qgsgeometry.h" #include #include @@ -133,7 +133,7 @@ class GEOSGeomScopedPtr GEOSGeomScopedPtr& operator=( const GEOSGeomScopedPtr& rh ); }; -QgsGeos::QgsGeos( const QgsAbstractGeometryV2* geometry, double precision ) +QgsGeos::QgsGeos( const QgsAbstractGeometry* geometry, double precision ) : QgsGeometryEngine( geometry ) , mGeos( nullptr ) , mGeosPrepared( nullptr ) @@ -179,22 +179,22 @@ void QgsGeos::cacheGeos() const mGeos = asGeos( mGeometry, mPrecision ); } -QgsAbstractGeometryV2* QgsGeos::intersection( const QgsAbstractGeometryV2& geom, QString* errorMsg ) const +QgsAbstractGeometry* QgsGeos::intersection( const QgsAbstractGeometry& geom, QString* errorMsg ) const { return overlay( geom, INTERSECTION, errorMsg ); } -QgsAbstractGeometryV2* QgsGeos::difference( const QgsAbstractGeometryV2& geom, QString* errorMsg ) const +QgsAbstractGeometry* QgsGeos::difference( const QgsAbstractGeometry& geom, QString* errorMsg ) const { return overlay( geom, DIFFERENCE, errorMsg ); } -QgsAbstractGeometryV2* QgsGeos::combine( const QgsAbstractGeometryV2& geom, QString* errorMsg ) const +QgsAbstractGeometry* QgsGeos::combine( const QgsAbstractGeometry& geom, QString* errorMsg ) const { return overlay( geom, UNION, errorMsg ); } -QgsAbstractGeometryV2* QgsGeos::combine( const QList& geomList, QString* errorMsg ) const +QgsAbstractGeometry* QgsGeos::combine( const QList& geomList, QString* errorMsg ) const { QVector< GEOSGeometry* > geosGeometries; @@ -213,17 +213,17 @@ QgsAbstractGeometryV2* QgsGeos::combine( const QList& ge } CATCH_GEOS_WITH_ERRMSG( nullptr ) - QgsAbstractGeometryV2* result = fromGeos( geomUnion ); + QgsAbstractGeometry* result = fromGeos( geomUnion ); GEOSGeom_destroy_r( geosinit.ctxt, geomUnion ); return result; } -QgsAbstractGeometryV2* QgsGeos::symDifference( const QgsAbstractGeometryV2& geom, QString* errorMsg ) const +QgsAbstractGeometry* QgsGeos::symDifference( const QgsAbstractGeometry& geom, QString* errorMsg ) const { return overlay( geom, SYMDIFFERENCE, errorMsg ); } -double QgsGeos::distance( const QgsAbstractGeometryV2& geom, QString* errorMsg ) const +double QgsGeos::distance( const QgsAbstractGeometry& geom, QString* errorMsg ) const { double distance = -1.0; if ( !mGeos ) @@ -248,42 +248,42 @@ double QgsGeos::distance( const QgsAbstractGeometryV2& geom, QString* errorMsg ) return distance; } -bool QgsGeos::intersects( const QgsAbstractGeometryV2& geom, QString* errorMsg ) const +bool QgsGeos::intersects( const QgsAbstractGeometry& geom, QString* errorMsg ) const { return relation( geom, INTERSECTS, errorMsg ); } -bool QgsGeos::touches( const QgsAbstractGeometryV2& geom, QString* errorMsg ) const +bool QgsGeos::touches( const QgsAbstractGeometry& geom, QString* errorMsg ) const { return relation( geom, TOUCHES, errorMsg ); } -bool QgsGeos::crosses( const QgsAbstractGeometryV2& geom, QString* errorMsg ) const +bool QgsGeos::crosses( const QgsAbstractGeometry& geom, QString* errorMsg ) const { return relation( geom, CROSSES, errorMsg ); } -bool QgsGeos::within( const QgsAbstractGeometryV2& geom, QString* errorMsg ) const +bool QgsGeos::within( const QgsAbstractGeometry& geom, QString* errorMsg ) const { return relation( geom, WITHIN, errorMsg ); } -bool QgsGeos::overlaps( const QgsAbstractGeometryV2& geom, QString* errorMsg ) const +bool QgsGeos::overlaps( const QgsAbstractGeometry& geom, QString* errorMsg ) const { return relation( geom, OVERLAPS, errorMsg ); } -bool QgsGeos::contains( const QgsAbstractGeometryV2& geom, QString* errorMsg ) const +bool QgsGeos::contains( const QgsAbstractGeometry& geom, QString* errorMsg ) const { return relation( geom, CONTAINS, errorMsg ); } -bool QgsGeos::disjoint( const QgsAbstractGeometryV2& geom, QString* errorMsg ) const +bool QgsGeos::disjoint( const QgsAbstractGeometry& geom, QString* errorMsg ) const { return relation( geom, DISJOINT, errorMsg ); } -QString QgsGeos::relate( const QgsAbstractGeometryV2& geom, QString* errorMsg ) const +QString QgsGeos::relate( const QgsAbstractGeometry& geom, QString* errorMsg ) const { if ( !mGeos ) { @@ -317,7 +317,7 @@ QString QgsGeos::relate( const QgsAbstractGeometryV2& geom, QString* errorMsg ) return result; } -bool QgsGeos::relatePattern( const QgsAbstractGeometryV2& geom, const QString& pattern, QString* errorMsg ) const +bool QgsGeos::relatePattern( const QgsAbstractGeometry& geom, const QString& pattern, QString* errorMsg ) const { if ( !mGeos ) { @@ -379,10 +379,10 @@ double QgsGeos::length( QString* errorMsg ) const return length; } -int QgsGeos::splitGeometry( const QgsLineStringV2& splitLine, - QList&newGeometries, +int QgsGeos::splitGeometry( const QgsLineString& splitLine, + QList&newGeometries, bool topological, - QgsPointSequenceV2 &topologyTestPoints, + QgsPointSequence &topologyTestPoints, QString* errorMsg ) const { @@ -461,7 +461,7 @@ int QgsGeos::splitGeometry( const QgsLineStringV2& splitLine, -int QgsGeos::topologicalTestPointsSplit( const GEOSGeometry* splitLine, QgsPointSequenceV2 &testPoints, QString* errorMsg ) const +int QgsGeos::topologicalTestPointsSplit( const GEOSGeometry* splitLine, QgsPointSequence &testPoints, QString* errorMsg ) const { //Find out the intersection points between splitLineGeos and this geometry. //These points need to be tested for topological correctness by the calling function @@ -524,14 +524,14 @@ GEOSGeometry* QgsGeos::linePointDifference( GEOSGeometry* GEOSsplitPoint ) const { int type = GEOSGeomTypeId_r( geosinit.ctxt, mGeos ); - QgsMultiCurveV2* multiCurve = nullptr; + QgsMultiCurve* multiCurve = nullptr; if ( type == GEOS_MULTILINESTRING ) { - multiCurve = dynamic_cast( mGeometry->clone() ); + multiCurve = dynamic_cast( mGeometry->clone() ); } else if ( type == GEOS_LINESTRING ) { - multiCurve = new QgsMultiCurveV2(); + multiCurve = new QgsMultiCurve(); multiCurve->addGeometry( mGeometry->clone() ); } else @@ -545,7 +545,7 @@ GEOSGeometry* QgsGeos::linePointDifference( GEOSGeometry* GEOSsplitPoint ) const } - QgsAbstractGeometryV2* splitGeom = fromGeos( GEOSsplitPoint ); + QgsAbstractGeometry* splitGeom = fromGeos( GEOSsplitPoint ); QgsPointV2* splitPoint = dynamic_cast( splitGeom ); if ( !splitPoint ) { @@ -553,16 +553,16 @@ GEOSGeometry* QgsGeos::linePointDifference( GEOSGeometry* GEOSsplitPoint ) const return nullptr; } - QgsMultiCurveV2 lines; + QgsMultiCurve lines; //For each part for ( int i = 0; i < multiCurve->numGeometries(); ++i ) { - const QgsLineStringV2* line = dynamic_cast( multiCurve->geometryN( i ) ); + const QgsLineString* line = dynamic_cast( multiCurve->geometryN( i ) ); if ( line ) { //For each segment - QgsLineStringV2 newLine; + QgsLineString newLine; newLine.addVertex( line->pointN( 0 ) ); int nVertices = line->numPoints(); for ( int j = 1; j < ( nVertices - 1 ); ++j ) @@ -572,7 +572,7 @@ GEOSGeometry* QgsGeos::linePointDifference( GEOSGeometry* GEOSsplitPoint ) const if ( currentPoint == *splitPoint ) { lines.addGeometry( newLine.clone() ); - newLine = QgsLineStringV2(); + newLine = QgsLineString(); newLine.addVertex( currentPoint ); } } @@ -586,7 +586,7 @@ GEOSGeometry* QgsGeos::linePointDifference( GEOSGeometry* GEOSsplitPoint ) const return asGeos( &lines, mPrecision ); } -int QgsGeos::splitLinearGeometry( GEOSGeometry* splitLine, QList& newGeometries ) const +int QgsGeos::splitLinearGeometry( GEOSGeometry* splitLine, QList& newGeometries ) const { if ( !splitLine ) return 2; @@ -642,7 +642,7 @@ int QgsGeos::splitLinearGeometry( GEOSGeometry* splitLine, QList& newGeometries ) const +int QgsGeos::splitPolygonGeometry( GEOSGeometry* splitLine, QList& newGeometries ) const { if ( !splitLine ) return 2; @@ -863,7 +863,7 @@ GEOSGeometry* QgsGeos::createGeosCollection( int typeId, const QVectoraddGeometry( line ); @@ -935,11 +935,11 @@ QgsAbstractGeometryV2* QgsGeos::fromGeos( const GEOSGeometry* geos ) } case GEOS_GEOMETRYCOLLECTION: { - QgsGeometryCollectionV2* geomCollection = new QgsGeometryCollectionV2(); + QgsGeometryCollection* geomCollection = new QgsGeometryCollection(); int nParts = GEOSGetNumGeometries_r( geosinit.ctxt, geos ); for ( int i = 0; i < nParts; ++i ) { - QgsAbstractGeometryV2* geom = fromGeos( GEOSGetGeometryN_r( geosinit.ctxt, geos, i ) ); + QgsAbstractGeometry* geom = fromGeos( GEOSGetGeometryN_r( geosinit.ctxt, geos, i ) ); if ( geom ) { geomCollection->addGeometry( geom ); @@ -971,7 +971,7 @@ QgsPolygonV2* QgsGeos::fromGeosPolygon( const GEOSGeometry* geos ) polygon->setExteriorRing( sequenceToLinestring( ring, hasZ, hasM ) ); } - QList interiorRings; + QList interiorRings; for ( int i = 0; i < GEOSGetNumInteriorRings_r( geosinit.ctxt, geos ); ++i ) { ring = GEOSGetInteriorRingN_r( geosinit.ctxt, geos, i ); @@ -985,9 +985,9 @@ QgsPolygonV2* QgsGeos::fromGeosPolygon( const GEOSGeometry* geos ) return polygon; } -QgsLineStringV2* QgsGeos::sequenceToLinestring( const GEOSGeometry* geos, bool hasZ, bool hasM ) +QgsLineString* QgsGeos::sequenceToLinestring( const GEOSGeometry* geos, bool hasZ, bool hasM ) { - QgsPointSequenceV2 pts; + QgsPointSequence pts; const GEOSCoordSequence* cs = GEOSGeom_getCoordSeq_r( geosinit.ctxt, geos ); unsigned int nPoints; GEOSCoordSeq_getSize_r( geosinit.ctxt, cs, &nPoints ); @@ -996,7 +996,7 @@ QgsLineStringV2* QgsGeos::sequenceToLinestring( const GEOSGeometry* geos, bool h { pts.push_back( coordSeqPoint( cs, i, hasZ, hasM ) ); } - QgsLineStringV2* line = new QgsLineStringV2(); + QgsLineString* line = new QgsLineString(); line->setPoints( pts ); return line; } @@ -1052,7 +1052,7 @@ QgsPointV2 QgsGeos::coordSeqPoint( const GEOSCoordSequence* cs, int i, bool hasZ return QgsPointV2( t, x, y, z, m ); } -GEOSGeometry* QgsGeos::asGeos( const QgsAbstractGeometryV2* geom, double precision ) +GEOSGeometry* QgsGeos::asGeos( const QgsAbstractGeometry* geom, double precision ) { int coordDims = 2; if ( geom->is3D() ) @@ -1091,7 +1091,7 @@ GEOSGeometry* QgsGeos::asGeos( const QgsAbstractGeometryV2* geom, double precisi } } - const QgsGeometryCollectionV2* c = dynamic_cast( geom ); + const QgsGeometryCollection* c = dynamic_cast( geom ); if ( !c ) return nullptr; @@ -1111,7 +1111,7 @@ GEOSGeometry* QgsGeos::asGeos( const QgsAbstractGeometryV2* geom, double precisi break; case QgsWkbTypes::LineGeometry: - return createGeosLinestring( static_cast( geom ), precision ); + return createGeosLinestring( static_cast( geom ), precision ); break; case QgsWkbTypes::PolygonGeometry: @@ -1127,7 +1127,7 @@ GEOSGeometry* QgsGeos::asGeos( const QgsAbstractGeometryV2* geom, double precisi return nullptr; } -QgsAbstractGeometryV2* QgsGeos::overlay( const QgsAbstractGeometryV2& geom, Overlay op, QString* errorMsg ) const +QgsAbstractGeometry* QgsGeos::overlay( const QgsAbstractGeometry& geom, Overlay op, QString* errorMsg ) const { if ( !mGeos ) { @@ -1174,7 +1174,7 @@ QgsAbstractGeometryV2* QgsGeos::overlay( const QgsAbstractGeometryV2& geom, Over default: //unknown op return nullptr; } - QgsAbstractGeometryV2* opResult = fromGeos( opGeom.get() ); + QgsAbstractGeometry* opResult = fromGeos( opGeom.get() ); return opResult; } catch ( GEOSException &e ) @@ -1187,7 +1187,7 @@ QgsAbstractGeometryV2* QgsGeos::overlay( const QgsAbstractGeometryV2& geom, Over } } -bool QgsGeos::relation( const QgsAbstractGeometryV2& geom, Relation r, QString* errorMsg ) const +bool QgsGeos::relation( const QgsAbstractGeometry& geom, Relation r, QString* errorMsg ) const { if ( !mGeos ) { @@ -1273,7 +1273,7 @@ bool QgsGeos::relation( const QgsAbstractGeometryV2& geom, Relation r, QString* return result; } -QgsAbstractGeometryV2* QgsGeos::buffer( double distance, int segments, QString* errorMsg ) const +QgsAbstractGeometry* QgsGeos::buffer( double distance, int segments, QString* errorMsg ) const { if ( !mGeos ) { @@ -1289,7 +1289,7 @@ QgsAbstractGeometryV2* QgsGeos::buffer( double distance, int segments, QString* return fromGeos( geos.get() ); } -QgsAbstractGeometryV2 *QgsGeos::buffer( double distance, int segments, int endCapStyle, int joinStyle, double mitreLimit, QString* errorMsg ) const +QgsAbstractGeometry *QgsGeos::buffer( double distance, int segments, int endCapStyle, int joinStyle, double mitreLimit, QString* errorMsg ) const { if ( !mGeos ) { @@ -1311,7 +1311,7 @@ QgsAbstractGeometryV2 *QgsGeos::buffer( double distance, int segments, int endCa #endif //0 } -QgsAbstractGeometryV2* QgsGeos::simplify( double tolerance, QString* errorMsg ) const +QgsAbstractGeometry* QgsGeos::simplify( double tolerance, QString* errorMsg ) const { if ( !mGeos ) { @@ -1326,7 +1326,7 @@ QgsAbstractGeometryV2* QgsGeos::simplify( double tolerance, QString* errorMsg ) return fromGeos( geos.get() ); } -QgsAbstractGeometryV2* QgsGeos::interpolate( double distance, QString* errorMsg ) const +QgsAbstractGeometry* QgsGeos::interpolate( double distance, QString* errorMsg ) const { if ( !mGeos ) { @@ -1368,7 +1368,7 @@ bool QgsGeos::centroid( QgsPointV2& pt, QString* errorMsg ) const return true; } -QgsAbstractGeometryV2* QgsGeos::envelope( QString* errorMsg ) const +QgsAbstractGeometry* QgsGeos::envelope( QString* errorMsg ) const { if ( !mGeos ) { @@ -1412,7 +1412,7 @@ bool QgsGeos::pointOnSurface( QgsPointV2& pt, QString* errorMsg ) const return true; } -QgsAbstractGeometryV2* QgsGeos::convexHull( QString* errorMsg ) const +QgsAbstractGeometry* QgsGeos::convexHull( QString* errorMsg ) const { if ( !mGeos ) { @@ -1422,7 +1422,7 @@ QgsAbstractGeometryV2* QgsGeos::convexHull( QString* errorMsg ) const try { GEOSGeometry* cHull = GEOSConvexHull_r( geosinit.ctxt, mGeos ); - QgsAbstractGeometryV2* cHullGeom = fromGeos( cHull ); + QgsAbstractGeometry* cHullGeom = fromGeos( cHull ); GEOSGeom_destroy_r( geosinit.ctxt, cHull ); return cHullGeom; } @@ -1443,7 +1443,7 @@ bool QgsGeos::isValid( QString* errorMsg ) const CATCH_GEOS_WITH_ERRMSG( false ); } -bool QgsGeos::isEqual( const QgsAbstractGeometryV2& geom, QString* errorMsg ) const +bool QgsGeos::isEqual( const QgsAbstractGeometry& geom, QString* errorMsg ) const { if ( !mGeos ) { @@ -1477,10 +1477,10 @@ bool QgsGeos::isEmpty( QString* errorMsg ) const CATCH_GEOS_WITH_ERRMSG( false ); } -GEOSCoordSequence* QgsGeos::createCoordinateSequence( const QgsCurveV2* curve, double precision, bool forceClose ) +GEOSCoordSequence* QgsGeos::createCoordinateSequence( const QgsCurve* curve, double precision, bool forceClose ) { bool segmentize = false; - const QgsLineStringV2* line = dynamic_cast( curve ); + const QgsLineString* line = dynamic_cast( curve ); if ( !line ) { @@ -1566,7 +1566,7 @@ GEOSCoordSequence* QgsGeos::createCoordinateSequence( const QgsCurveV2* curve, d return coordSeq; } -GEOSGeometry* QgsGeos::createGeosPoint( const QgsAbstractGeometryV2* point, int coordDims, double precision ) +GEOSGeometry* QgsGeos::createGeosPoint( const QgsAbstractGeometry* point, int coordDims, double precision ) { const QgsPointV2* pt = dynamic_cast( point ); if ( !pt ) @@ -1612,9 +1612,9 @@ GEOSGeometry* QgsGeos::createGeosPoint( const QgsAbstractGeometryV2* point, int return geosPoint; } -GEOSGeometry* QgsGeos::createGeosLinestring( const QgsAbstractGeometryV2* curve , double precision ) +GEOSGeometry* QgsGeos::createGeosLinestring( const QgsAbstractGeometry* curve , double precision ) { - const QgsCurveV2* c = dynamic_cast( curve ); + const QgsCurve* c = dynamic_cast( curve ); if ( !c ) return nullptr; @@ -1631,13 +1631,13 @@ GEOSGeometry* QgsGeos::createGeosLinestring( const QgsAbstractGeometryV2* curve return geosGeom; } -GEOSGeometry* QgsGeos::createGeosPolygon( const QgsAbstractGeometryV2* poly , double precision ) +GEOSGeometry* QgsGeos::createGeosPolygon( const QgsAbstractGeometry* poly , double precision ) { - const QgsCurvePolygonV2* polygon = dynamic_cast( poly ); + const QgsCurvePolygon* polygon = dynamic_cast( poly ); if ( !polygon ) return nullptr; - const QgsCurveV2* exteriorRing = polygon->exteriorRing(); + const QgsCurve* exteriorRing = polygon->exteriorRing(); if ( !exteriorRing ) { return nullptr; @@ -1658,7 +1658,7 @@ GEOSGeometry* QgsGeos::createGeosPolygon( const QgsAbstractGeometryV2* poly , do for ( int i = 0; i < nHoles; ++i ) { - const QgsCurveV2* interiorRing = polygon->interiorRing( i ); + const QgsCurve* interiorRing = polygon->interiorRing( i ); holes[i] = GEOSGeom_createLinearRing_r( geosinit.ctxt, createCoordinateSequence( interiorRing, precision, true ) ); } geosPolygon = GEOSGeom_createPolygon_r( geosinit.ctxt, exteriorRingGeos, holes, nHoles ); @@ -1669,7 +1669,7 @@ GEOSGeometry* QgsGeos::createGeosPolygon( const QgsAbstractGeometryV2* poly , do return geosPolygon; } -QgsAbstractGeometryV2* QgsGeos::offsetCurve( double distance, int segments, int joinStyle, double mitreLimit, QString* errorMsg ) const +QgsAbstractGeometry* QgsGeos::offsetCurve( double distance, int segments, int joinStyle, double mitreLimit, QString* errorMsg ) const { if ( !mGeos ) return nullptr; @@ -1680,12 +1680,12 @@ QgsAbstractGeometryV2* QgsGeos::offsetCurve( double distance, int segments, int offset = GEOSOffsetCurve_r( geosinit.ctxt, mGeos, distance, segments, joinStyle, mitreLimit ); } CATCH_GEOS_WITH_ERRMSG( nullptr ) - QgsAbstractGeometryV2* offsetGeom = fromGeos( offset ); + QgsAbstractGeometry* offsetGeom = fromGeos( offset ); GEOSGeom_destroy_r( geosinit.ctxt, offset ); return offsetGeom; } -QgsAbstractGeometryV2* QgsGeos::reshapeGeometry( const QgsLineStringV2& reshapeWithLine, int* errorCode, QString* errorMsg ) const +QgsAbstractGeometry* QgsGeos::reshapeGeometry( const QgsLineString& reshapeWithLine, int* errorCode, QString* errorMsg ) const { if ( !mGeos || reshapeWithLine.numPoints() < 2 || mGeometry->dimension() == 0 ) { @@ -1724,7 +1724,7 @@ QgsAbstractGeometryV2* QgsGeos::reshapeGeometry( const QgsLineStringV2& reshapeW } if ( errorCode ) { *errorCode = 0; } - QgsAbstractGeometryV2* reshapeResult = fromGeos( reshapedGeometry ); + QgsAbstractGeometry* reshapeResult = fromGeos( reshapedGeometry ); GEOSGeom_destroy_r( geosinit.ctxt, reshapedGeometry ); GEOSGeom_destroy_r( geosinit.ctxt, reshapeLineGeos ); return reshapeResult; @@ -1778,7 +1778,7 @@ QgsAbstractGeometryV2* QgsGeos::reshapeGeometry( const QgsLineStringV2& reshapeW if ( reshapeTookPlace ) { if ( errorCode ) { *errorCode = 0; } - QgsAbstractGeometryV2* reshapedMultiGeom = fromGeos( newMultiGeom ); + QgsAbstractGeometry* reshapedMultiGeom = fromGeos( newMultiGeom ); GEOSGeom_destroy_r( geosinit.ctxt, newMultiGeom ); return reshapedMultiGeom; } @@ -1884,7 +1884,7 @@ QgsGeometry QgsGeos::shortestLine( const QgsGeometry& other, QString* errorMsg ) return QgsGeometry(); } - QgsLineStringV2* line = new QgsLineStringV2(); + QgsLineString* line = new QgsLineString(); line->addVertex( QgsPointV2( nx1, ny1 ) ); line->addVertex( QgsPointV2( nx2, ny2 ) ); return QgsGeometry( line ); diff --git a/src/core/geometry/qgsgeos.h b/src/core/geometry/qgsgeos.h index dc7d3d0439c..9fe473727f3 100644 --- a/src/core/geometry/qgsgeos.h +++ b/src/core/geometry/qgsgeos.h @@ -19,7 +19,7 @@ email : marco.hugentobler at sourcepole dot com #include "qgsgeometryengine.h" #include -class QgsLineStringV2; +class QgsLineString; class QgsPolygonV2; class QgsGeometry; @@ -35,40 +35,40 @@ class CORE_EXPORT QgsGeos: public QgsGeometryEngine * @param geometry The geometry * @param precision The precision of the grid to which to snap the geometry vertices. If 0, no snapping is performed. */ - QgsGeos( const QgsAbstractGeometryV2* geometry, double precision = 0 ); + QgsGeos( const QgsAbstractGeometry* geometry, double precision = 0 ); ~QgsGeos(); /** Removes caches*/ void geometryChanged() override; void prepareGeometry() override; - QgsAbstractGeometryV2* intersection( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const override; - QgsAbstractGeometryV2* difference( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const override; - QgsAbstractGeometryV2* combine( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const override; - QgsAbstractGeometryV2* combine( const QList< QgsAbstractGeometryV2*>&, QString* errorMsg = nullptr ) const override; - QgsAbstractGeometryV2* symDifference( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const override; - QgsAbstractGeometryV2* buffer( double distance, int segments, QString* errorMsg = nullptr ) const override; - QgsAbstractGeometryV2* buffer( double distance, int segments, int endCapStyle, int joinStyle, double mitreLimit, QString* errorMsg = nullptr ) const override; - QgsAbstractGeometryV2* simplify( double tolerance, QString* errorMsg = nullptr ) const override; - QgsAbstractGeometryV2* interpolate( double distance, QString* errorMsg = nullptr ) const override; - QgsAbstractGeometryV2* envelope( QString* errorMsg = nullptr ) const override; + QgsAbstractGeometry* intersection( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const override; + QgsAbstractGeometry* difference( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const override; + QgsAbstractGeometry* combine( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const override; + QgsAbstractGeometry* combine( const QList< QgsAbstractGeometry*>&, QString* errorMsg = nullptr ) const override; + QgsAbstractGeometry* symDifference( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const override; + QgsAbstractGeometry* buffer( double distance, int segments, QString* errorMsg = nullptr ) const override; + QgsAbstractGeometry* buffer( double distance, int segments, int endCapStyle, int joinStyle, double mitreLimit, QString* errorMsg = nullptr ) const override; + QgsAbstractGeometry* simplify( double tolerance, QString* errorMsg = nullptr ) const override; + QgsAbstractGeometry* interpolate( double distance, QString* errorMsg = nullptr ) const override; + QgsAbstractGeometry* envelope( QString* errorMsg = nullptr ) const override; bool centroid( QgsPointV2& pt, QString* errorMsg = nullptr ) const override; bool pointOnSurface( QgsPointV2& pt, QString* errorMsg = nullptr ) const override; - QgsAbstractGeometryV2* convexHull( QString* errorMsg = nullptr ) const override; - double distance( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const override; - bool intersects( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const override; - bool touches( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const override; - bool crosses( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const override; - bool within( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const override; - bool overlaps( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const override; - bool contains( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const override; - bool disjoint( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const override; - QString relate( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const override; - bool relatePattern( const QgsAbstractGeometryV2& geom, const QString& pattern, QString* errorMsg = nullptr ) const override; + QgsAbstractGeometry* convexHull( QString* errorMsg = nullptr ) const override; + double distance( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const override; + bool intersects( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const override; + bool touches( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const override; + bool crosses( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const override; + bool within( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const override; + bool overlaps( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const override; + bool contains( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const override; + bool disjoint( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const override; + QString relate( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const override; + bool relatePattern( const QgsAbstractGeometry& geom, const QString& pattern, QString* errorMsg = nullptr ) const override; double area( QString* errorMsg = nullptr ) const override; double length( QString* errorMsg = nullptr ) const override; bool isValid( QString* errorMsg = nullptr ) const override; - bool isEqual( const QgsAbstractGeometryV2& geom, QString* errorMsg = nullptr ) const override; + bool isEqual( const QgsAbstractGeometry& geom, QString* errorMsg = nullptr ) const override; bool isEmpty( QString* errorMsg = nullptr ) const override; /** Splits this geometry according to a given line. @@ -78,14 +78,14 @@ class CORE_EXPORT QgsGeos: public QgsGeometryEngine @param[out] topologyTestPoints points that need to be tested for topological completeness in the dataset @param[out] errorMsg error messages emitted, if any @return 0 in case of success, 1 if geometry has not been split, error else*/ - int splitGeometry( const QgsLineStringV2& splitLine, - QList& newGeometries, + int splitGeometry( const QgsLineString& splitLine, + QList& newGeometries, bool topological, - QgsPointSequenceV2 &topologyTestPoints, + QgsPointSequence &topologyTestPoints, QString* errorMsg = nullptr ) const override; - QgsAbstractGeometryV2* offsetCurve( double distance, int segments, int joinStyle, double mitreLimit, QString* errorMsg = nullptr ) const override; - QgsAbstractGeometryV2* reshapeGeometry( const QgsLineStringV2& reshapeWithLine, int* errorCode, QString* errorMsg = nullptr ) const; + QgsAbstractGeometry* offsetCurve( double distance, int segments, int joinStyle, double mitreLimit, QString* errorMsg = nullptr ) const override; + QgsAbstractGeometry* reshapeGeometry( const QgsLineString& reshapeWithLine, int* errorCode, QString* errorMsg = nullptr ) const; /** Merges any connected lines in a LineString/MultiLineString geometry and * converts them to single line strings. @@ -112,9 +112,9 @@ class CORE_EXPORT QgsGeos: public QgsGeometryEngine /** Create a geometry from a GEOSGeometry * @param geos GEOSGeometry. Ownership is NOT transferred. */ - static QgsAbstractGeometryV2* fromGeos( const GEOSGeometry* geos ); + static QgsAbstractGeometry* fromGeos( const GEOSGeometry* geos ); static QgsPolygonV2* fromGeosPolygon( const GEOSGeometry* geos ); - static GEOSGeometry* asGeos( const QgsAbstractGeometryV2* geom , double precision = 0 ); + static GEOSGeometry* asGeos( const QgsAbstractGeometry* geom , double precision = 0 ); static QgsPointV2 coordSeqPoint( const GEOSCoordSequence* cs, int i, bool hasZ, bool hasM ); static GEOSContextHandle_t getGEOSHandler(); @@ -145,10 +145,10 @@ class CORE_EXPORT QgsGeos: public QgsGeometryEngine //geos util functions void cacheGeos() const; - QgsAbstractGeometryV2* overlay( const QgsAbstractGeometryV2& geom, Overlay op, QString* errorMsg = nullptr ) const; - bool relation( const QgsAbstractGeometryV2& geom, Relation r, QString* errorMsg = nullptr ) const; - static GEOSCoordSequence* createCoordinateSequence( const QgsCurveV2* curve , double precision, bool forceClose = false ); - static QgsLineStringV2* sequenceToLinestring( const GEOSGeometry* geos, bool hasZ, bool hasM ); + QgsAbstractGeometry* overlay( const QgsAbstractGeometry& geom, Overlay op, QString* errorMsg = nullptr ) const; + bool relation( const QgsAbstractGeometry& geom, Relation r, QString* errorMsg = nullptr ) const; + static GEOSCoordSequence* createCoordinateSequence( const QgsCurve* curve , double precision, bool forceClose = false ); + static QgsLineString* sequenceToLinestring( const GEOSGeometry* geos, bool hasZ, bool hasM ); static int numberOfGeometries( GEOSGeometry* g ); static GEOSGeometry* nodeGeometries( const GEOSGeometry *splitLine, const GEOSGeometry *geom ); int mergeGeometriesMultiTypeSplit( QVector& splitResult ) const; @@ -157,15 +157,15 @@ class CORE_EXPORT QgsGeos: public QgsGeometryEngine */ static GEOSGeometry* createGeosCollection( int typeId, const QVector& geoms ); - static GEOSGeometry* createGeosPoint( const QgsAbstractGeometryV2* point, int coordDims , double precision ); - static GEOSGeometry* createGeosLinestring( const QgsAbstractGeometryV2* curve, double precision ); - static GEOSGeometry* createGeosPolygon( const QgsAbstractGeometryV2* poly, double precision ); + static GEOSGeometry* createGeosPoint( const QgsAbstractGeometry* point, int coordDims , double precision ); + static GEOSGeometry* createGeosLinestring( const QgsAbstractGeometry* curve, double precision ); + static GEOSGeometry* createGeosPolygon( const QgsAbstractGeometry* poly, double precision ); //utils for geometry split - int topologicalTestPointsSplit( const GEOSGeometry* splitLine, QgsPointSequenceV2 &testPoints, QString* errorMsg = nullptr ) const; + int topologicalTestPointsSplit( const GEOSGeometry* splitLine, QgsPointSequence &testPoints, QString* errorMsg = nullptr ) const; GEOSGeometry* linePointDifference( GEOSGeometry* GEOSsplitPoint ) const; - int splitLinearGeometry( GEOSGeometry* splitLine, QList& newGeometries ) const; - int splitPolygonGeometry( GEOSGeometry* splitLine, QList& newGeometries ) const; + int splitLinearGeometry( GEOSGeometry* splitLine, QList& newGeometries ) const; + int splitPolygonGeometry( GEOSGeometry* splitLine, QList& newGeometries ) const; //utils for reshape static GEOSGeometry* reshapeLine( const GEOSGeometry* line, const GEOSGeometry* reshapeLineGeos, double precision ); diff --git a/src/core/geometry/qgsinternalgeometryengine.cpp b/src/core/geometry/qgsinternalgeometryengine.cpp index 493de16b28b..811e3778d9b 100644 --- a/src/core/geometry/qgsinternalgeometryengine.cpp +++ b/src/core/geometry/qgsinternalgeometryengine.cpp @@ -16,10 +16,10 @@ #include "qgsinternalgeometryengine.h" -#include "qgslinestringv2.h" -#include "qgsmultipolygonv2.h" -#include "qgspolygonv2.h" -#include "qgsmulticurvev2.h" +#include "qgslinestring.h" +#include "qgsmultipolygon.h" +#include "qgspolygon.h" +#include "qgsmulticurve.h" #include "qgsgeometry.h" #include @@ -38,21 +38,21 @@ QgsInternalGeometryEngine::QgsInternalGeometryEngine( const QgsGeometry& geometr QgsGeometry QgsInternalGeometryEngine::extrude( double x, double y ) { - QList linesToProcess; + QList linesToProcess; - const QgsMultiCurveV2* multiCurve = dynamic_cast< const QgsMultiCurveV2* >( mGeometry ); + const QgsMultiCurve* multiCurve = dynamic_cast< const QgsMultiCurve* >( mGeometry ); if ( multiCurve ) { for ( int i = 0; i < multiCurve->partCount(); ++i ) { - linesToProcess << static_cast( multiCurve->geometryN( i )->clone() ); + linesToProcess << static_cast( multiCurve->geometryN( i )->clone() ); } } - const QgsCurveV2* curve = dynamic_cast< const QgsCurveV2* >( mGeometry ); + const QgsCurve* curve = dynamic_cast< const QgsCurve* >( mGeometry ); if ( curve ) { - linesToProcess << static_cast( curve->segmentize() ); + linesToProcess << static_cast( curve->segmentize() ); } QgsMultiPolygonV2 *multipolygon = linesToProcess.size() > 1 ? new QgsMultiPolygonV2() : nullptr; @@ -60,11 +60,11 @@ QgsGeometry QgsInternalGeometryEngine::extrude( double x, double y ) if ( !linesToProcess.empty() ) { - Q_FOREACH ( QgsLineStringV2* line, linesToProcess ) + Q_FOREACH ( QgsLineString* line, linesToProcess ) { QTransform transform = QTransform::fromTranslate( x, y ); - QgsLineStringV2* secondline = line->reversed(); + QgsLineString* secondline = line->reversed(); secondline->transform( transform ); line->append( secondline ); diff --git a/src/core/geometry/qgsinternalgeometryengine.h b/src/core/geometry/qgsinternalgeometryengine.h index dcbf3aabce3..462df0ff297 100644 --- a/src/core/geometry/qgsinternalgeometryengine.h +++ b/src/core/geometry/qgsinternalgeometryengine.h @@ -17,7 +17,7 @@ #define QGSINTERNALGEOMETRYENGINE_H class QgsGeometry; -class QgsAbstractGeometryV2; +class QgsAbstractGeometry; /** * \ingroup core @@ -50,7 +50,7 @@ class QgsInternalGeometryEngine QgsGeometry extrude( double x, double y ); private: - const QgsAbstractGeometryV2* mGeometry; + const QgsAbstractGeometry* mGeometry; }; #endif // QGSINTERNALGEOMETRYENGINE_H diff --git a/src/core/geometry/qgslinestringv2.cpp b/src/core/geometry/qgslinestring.cpp similarity index 84% rename from src/core/geometry/qgslinestringv2.cpp rename to src/core/geometry/qgslinestring.cpp index 007303c3664..9a08b143e2e 100644 --- a/src/core/geometry/qgslinestringv2.cpp +++ b/src/core/geometry/qgslinestring.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgslinestringv2.cpp + qgslinestring.cpp ------------------- begin : September 2014 copyright : (C) 2014 by Marco Hugentobler @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgslinestringv2.h" +#include "qgslinestring.h" #include "qgsapplication.h" -#include "qgscompoundcurvev2.h" +#include "qgscompoundcurve.h" #include "qgscoordinatetransform.h" #include "qgsgeometryutils.h" #include "qgsmaptopixel.h" @@ -35,17 +35,17 @@ * See details in QEP #17 ****************************************************************************/ -QgsLineStringV2::QgsLineStringV2(): QgsCurveV2() +QgsLineString::QgsLineString(): QgsCurve() { mWkbType = QgsWkbTypes::LineString; } -QgsLineStringV2::~QgsLineStringV2() +QgsLineString::~QgsLineString() {} -bool QgsLineStringV2::operator==( const QgsCurveV2& other ) const +bool QgsLineString::operator==( const QgsCurve& other ) const { - const QgsLineStringV2* otherLine = dynamic_cast< const QgsLineStringV2* >( &other ); + const QgsLineString* otherLine = dynamic_cast< const QgsLineString* >( &other ); if ( !otherLine ) return false; @@ -71,17 +71,17 @@ bool QgsLineStringV2::operator==( const QgsCurveV2& other ) const return true; } -bool QgsLineStringV2::operator!=( const QgsCurveV2& other ) const +bool QgsLineString::operator!=( const QgsCurve& other ) const { return !operator==( other ); } -QgsLineStringV2 *QgsLineStringV2::clone() const +QgsLineString *QgsLineString::clone() const { - return new QgsLineStringV2( *this ); + return new QgsLineString( *this ); } -void QgsLineStringV2::clear() +void QgsLineString::clear() { mX.clear(); mY.clear(); @@ -91,7 +91,7 @@ void QgsLineStringV2::clear() clearCache(); } -bool QgsLineStringV2::fromWkb( QgsConstWkbPtr wkbPtr ) +bool QgsLineString::fromWkb( QgsConstWkbPtr wkbPtr ) { if ( !wkbPtr ) { @@ -108,13 +108,13 @@ bool QgsLineStringV2::fromWkb( QgsConstWkbPtr wkbPtr ) return true; } -void QgsLineStringV2::fromWkbPoints( QgsWkbTypes::Type type, const QgsConstWkbPtr& wkb ) +void QgsLineString::fromWkbPoints( QgsWkbTypes::Type type, const QgsConstWkbPtr& wkb ) { mWkbType = type; importVerticesFromWkb( wkb ); } -QgsRectangle QgsLineStringV2::calculateBoundingBox() const +QgsRectangle QgsLineString::calculateBoundingBox() const { double xmin = std::numeric_limits::max(); double ymin = std::numeric_limits::max(); @@ -144,7 +144,7 @@ QgsRectangle QgsLineStringV2::calculateBoundingBox() const * See details in QEP #17 ****************************************************************************/ -bool QgsLineStringV2::fromWkt( const QString& wkt ) +bool QgsLineString::fromWkt( const QString& wkt ) { clear(); @@ -158,21 +158,21 @@ bool QgsLineStringV2::fromWkt( const QString& wkt ) return true; } -int QgsLineStringV2::wkbSize() const +int QgsLineString::wkbSize() const { int size = sizeof( char ) + sizeof( quint32 ) + sizeof( quint32 ); size += numPoints() * ( 2 + is3D() + isMeasure() ) * sizeof( double ); return size; } -unsigned char* QgsLineStringV2::asWkb( int& binarySize ) const +unsigned char* QgsLineString::asWkb( int& binarySize ) const { binarySize = wkbSize(); unsigned char* geomPtr = new unsigned char[binarySize]; QgsWkbPtr wkb( geomPtr, binarySize ); wkb << static_cast( QgsApplication::endian() ); wkb << static_cast( wkbType() ); - QgsPointSequenceV2 pts; + QgsPointSequence pts; points( pts ); QgsGeometryUtils::pointsToWKB( wkb, pts, is3D(), isMeasure() ); return geomPtr; @@ -184,18 +184,18 @@ unsigned char* QgsLineStringV2::asWkb( int& binarySize ) const * See details in QEP #17 ****************************************************************************/ -QString QgsLineStringV2::asWkt( int precision ) const +QString QgsLineString::asWkt( int precision ) const { QString wkt = wktTypeStr() + ' '; - QgsPointSequenceV2 pts; + QgsPointSequence pts; points( pts ); wkt += QgsGeometryUtils::pointsToWKT( pts, precision, is3D(), isMeasure() ); return wkt; } -QDomElement QgsLineStringV2::asGML2( QDomDocument& doc, int precision, const QString& ns ) const +QDomElement QgsLineString::asGML2( QDomDocument& doc, int precision, const QString& ns ) const { - QgsPointSequenceV2 pts; + QgsPointSequence pts; points( pts ); QDomElement elemLineString = doc.createElementNS( ns, "LineString" ); @@ -204,9 +204,9 @@ QDomElement QgsLineStringV2::asGML2( QDomDocument& doc, int precision, const QSt return elemLineString; } -QDomElement QgsLineStringV2::asGML3( QDomDocument& doc, int precision, const QString& ns ) const +QDomElement QgsLineString::asGML3( QDomDocument& doc, int precision, const QString& ns ) const { - QgsPointSequenceV2 pts; + QgsPointSequence pts; points( pts ); QDomElement elemCurve = doc.createElementNS( ns, "Curve" ); @@ -219,9 +219,9 @@ QDomElement QgsLineStringV2::asGML3( QDomDocument& doc, int precision, const QSt return elemCurve; } -QString QgsLineStringV2::asJSON( int precision ) const +QString QgsLineString::asJSON( int precision ) const { - QgsPointSequenceV2 pts; + QgsPointSequence pts; points( pts ); return "{\"type\": \"LineString\", \"coordinates\": " + QgsGeometryUtils::pointsToJSON( pts, precision ) + '}'; @@ -233,7 +233,7 @@ QString QgsLineStringV2::asJSON( int precision ) const * See details in QEP #17 ****************************************************************************/ -double QgsLineStringV2::length() const +double QgsLineString::length() const { double length = 0; int size = mX.size(); @@ -247,7 +247,7 @@ double QgsLineStringV2::length() const return length; } -QgsPointV2 QgsLineStringV2::startPoint() const +QgsPointV2 QgsLineString::startPoint() const { if ( numPoints() < 1 ) { @@ -256,7 +256,7 @@ QgsPointV2 QgsLineStringV2::startPoint() const return pointN( 0 ); } -QgsPointV2 QgsLineStringV2::endPoint() const +QgsPointV2 QgsLineString::endPoint() const { if ( numPoints() < 1 ) { @@ -271,19 +271,19 @@ QgsPointV2 QgsLineStringV2::endPoint() const * See details in QEP #17 ****************************************************************************/ -QgsLineStringV2* QgsLineStringV2::curveToLine( double tolerance, SegmentationToleranceType toleranceType ) const +QgsLineString* QgsLineString::curveToLine( double tolerance, SegmentationToleranceType toleranceType ) const { Q_UNUSED( tolerance ); Q_UNUSED( toleranceType ); - return static_cast( clone() ); + return static_cast( clone() ); } -int QgsLineStringV2::numPoints() const +int QgsLineString::numPoints() const { return mX.size(); } -QgsPointV2 QgsLineStringV2::pointN( int i ) const +QgsPointV2 QgsLineString::pointN( int i ) const { if ( i < 0 || i >= mX.size() ) { @@ -332,7 +332,7 @@ QgsPointV2 QgsLineStringV2::pointN( int i ) const * See details in QEP #17 ****************************************************************************/ -double QgsLineStringV2::xAt( int index ) const +double QgsLineString::xAt( int index ) const { if ( index >= 0 && index < mX.size() ) return mX.at( index ); @@ -340,7 +340,7 @@ double QgsLineStringV2::xAt( int index ) const return 0.0; } -double QgsLineStringV2::yAt( int index ) const +double QgsLineString::yAt( int index ) const { if ( index >= 0 && index < mY.size() ) return mY.at( index ); @@ -348,7 +348,7 @@ double QgsLineStringV2::yAt( int index ) const return 0.0; } -double QgsLineStringV2::zAt( int index ) const +double QgsLineString::zAt( int index ) const { if ( index >= 0 && index < mZ.size() ) return mZ.at( index ); @@ -356,7 +356,7 @@ double QgsLineStringV2::zAt( int index ) const return 0.0; } -double QgsLineStringV2::mAt( int index ) const +double QgsLineString::mAt( int index ) const { if ( index >= 0 && index < mM.size() ) return mM.at( index ); @@ -364,27 +364,27 @@ double QgsLineStringV2::mAt( int index ) const return 0.0; } -void QgsLineStringV2::setXAt( int index, double x ) +void QgsLineString::setXAt( int index, double x ) { if ( index >= 0 && index < mX.size() ) mX[ index ] = x; clearCache(); } -void QgsLineStringV2::setYAt( int index, double y ) +void QgsLineString::setYAt( int index, double y ) { if ( index >= 0 && index < mY.size() ) mY[ index ] = y; clearCache(); } -void QgsLineStringV2::setZAt( int index, double z ) +void QgsLineString::setZAt( int index, double z ) { if ( index >= 0 && index < mZ.size() ) mZ[ index ] = z; } -void QgsLineStringV2::setMAt( int index, double m ) +void QgsLineString::setMAt( int index, double m ) { if ( index >= 0 && index < mM.size() ) mM[ index ] = m; @@ -396,7 +396,7 @@ void QgsLineStringV2::setMAt( int index, double m ) * See details in QEP #17 ****************************************************************************/ -void QgsLineStringV2::points( QgsPointSequenceV2 &pts ) const +void QgsLineString::points( QgsPointSequence &pts ) const { pts.clear(); int nPoints = numPoints(); @@ -406,7 +406,7 @@ void QgsLineStringV2::points( QgsPointSequenceV2 &pts ) const } } -void QgsLineStringV2::setPoints( const QgsPointSequenceV2 &points ) +void QgsLineString::setPoints( const QgsPointSequence &points ) { clearCache(); //set bounding box invalid @@ -463,7 +463,7 @@ void QgsLineStringV2::setPoints( const QgsPointSequenceV2 &points ) * See details in QEP #17 ****************************************************************************/ -void QgsLineStringV2::append( const QgsLineStringV2* line ) +void QgsLineString::append( const QgsLineString* line ) { if ( !line ) { @@ -525,9 +525,9 @@ void QgsLineStringV2::append( const QgsLineStringV2* line ) clearCache(); //set bounding box invalid } -QgsLineStringV2* QgsLineStringV2::reversed() const +QgsLineString* QgsLineString::reversed() const { - QgsLineStringV2* copy = clone(); + QgsLineString* copy = clone(); std::reverse( copy->mX.begin(), copy->mX.end() ); std::reverse( copy->mY.begin(), copy->mY.end() ); if ( copy->is3D() ) @@ -547,12 +547,12 @@ QgsLineStringV2* QgsLineStringV2::reversed() const * See details in QEP #17 ****************************************************************************/ -void QgsLineStringV2::draw( QPainter& p ) const +void QgsLineString::draw( QPainter& p ) const { p.drawPolyline( asQPolygonF() ); } -void QgsLineStringV2::addToPainterPath( QPainterPath& path ) const +void QgsLineString::addToPainterPath( QPainterPath& path ) const { int nPoints = numPoints(); if ( nPoints < 1 ) @@ -571,12 +571,12 @@ void QgsLineStringV2::addToPainterPath( QPainterPath& path ) const } } -void QgsLineStringV2::drawAsPolygon( QPainter& p ) const +void QgsLineString::drawAsPolygon( QPainter& p ) const { p.drawPolygon( asQPolygonF() ); } -QPolygonF QgsLineStringV2::asQPolygonF() const +QPolygonF QgsLineString::asQPolygonF() const { QPolygonF points; for ( int i = 0; i < mX.count(); ++i ) @@ -586,9 +586,9 @@ QPolygonF QgsLineStringV2::asQPolygonF() const return points; } -QgsAbstractGeometryV2* QgsLineStringV2::toCurveType() const +QgsAbstractGeometry* QgsLineString::toCurveType() const { - QgsCompoundCurveV2* compoundCurve = new QgsCompoundCurveV2(); + QgsCompoundCurve* compoundCurve = new QgsCompoundCurve(); compoundCurve->addCurve( clone() ); return compoundCurve; } @@ -599,7 +599,7 @@ QgsAbstractGeometryV2* QgsLineStringV2::toCurveType() const * See details in QEP #17 ****************************************************************************/ -void QgsLineStringV2::transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d, bool transformZ ) +void QgsLineString::transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d, bool transformZ ) { double* zArray = mZ.data(); @@ -622,7 +622,7 @@ void QgsLineStringV2::transform( const QgsCoordinateTransform& ct, QgsCoordinate clearCache(); } -void QgsLineStringV2::transform( const QTransform& t ) +void QgsLineString::transform( const QTransform& t ) { int nPoints = numPoints(); for ( int i = 0; i < nPoints; ++i ) @@ -641,7 +641,7 @@ void QgsLineStringV2::transform( const QTransform& t ) * See details in QEP #17 ****************************************************************************/ -bool QgsLineStringV2::insertVertex( QgsVertexId position, const QgsPointV2& vertex ) +bool QgsLineString::insertVertex( QgsVertexId position, const QgsPointV2& vertex ) { if ( position.vertex < 0 || position.vertex > mX.size() ) { @@ -667,7 +667,7 @@ bool QgsLineStringV2::insertVertex( QgsVertexId position, const QgsPointV2& vert return true; } -bool QgsLineStringV2::moveVertex( QgsVertexId position, const QgsPointV2& newPos ) +bool QgsLineString::moveVertex( QgsVertexId position, const QgsPointV2& newPos ) { if ( position.vertex < 0 || position.vertex >= mX.size() ) { @@ -687,7 +687,7 @@ bool QgsLineStringV2::moveVertex( QgsVertexId position, const QgsPointV2& newPos return true; } -bool QgsLineStringV2::deleteVertex( QgsVertexId position ) +bool QgsLineString::deleteVertex( QgsVertexId position ) { if ( position.vertex >= mX.size() || position.vertex < 0 ) { @@ -720,7 +720,7 @@ bool QgsLineStringV2::deleteVertex( QgsVertexId position ) * See details in QEP #17 ****************************************************************************/ -void QgsLineStringV2::addVertex( const QgsPointV2& pt ) +void QgsLineString::addVertex( const QgsPointV2& pt ) { if ( mWkbType == QgsWkbTypes::Unknown || mX.isEmpty() ) { @@ -740,7 +740,7 @@ void QgsLineStringV2::addVertex( const QgsPointV2& pt ) clearCache(); //set bounding box invalid } -double QgsLineStringV2::closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const +double QgsLineString::closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const { double sqrDist = std::numeric_limits::max(); double testDist = 0; @@ -788,7 +788,7 @@ double QgsLineStringV2::closestSegment( const QgsPointV2& pt, QgsPointV2& segmen * See details in QEP #17 ****************************************************************************/ -bool QgsLineStringV2::pointAt( int node, QgsPointV2& point, QgsVertexId::VertexType& type ) const +bool QgsLineString::pointAt( int node, QgsPointV2& point, QgsVertexId::VertexType& type ) const { if ( node < 0 || node >= numPoints() ) { @@ -799,7 +799,7 @@ bool QgsLineStringV2::pointAt( int node, QgsPointV2& point, QgsVertexId::VertexT return true; } -QgsPointV2 QgsLineStringV2::centroid() const +QgsPointV2 QgsLineString::centroid() const { if ( mX.isEmpty() ) return QgsPointV2(); @@ -843,7 +843,7 @@ QgsPointV2 QgsLineStringV2::centroid() const * See details in QEP #17 ****************************************************************************/ -void QgsLineStringV2::sumUpArea( double& sum ) const +void QgsLineString::sumUpArea( double& sum ) const { int maxIndex = numPoints() - 1; if ( maxIndex == 1 ) @@ -855,7 +855,7 @@ void QgsLineStringV2::sumUpArea( double& sum ) const } } -void QgsLineStringV2::importVerticesFromWkb( const QgsConstWkbPtr& wkb ) +void QgsLineString::importVerticesFromWkb( const QgsConstWkbPtr& wkb ) { bool hasZ = is3D(); bool hasM = isMeasure(); @@ -887,7 +887,7 @@ void QgsLineStringV2::importVerticesFromWkb( const QgsConstWkbPtr& wkb ) * See details in QEP #17 ****************************************************************************/ -void QgsLineStringV2::close() +void QgsLineString::close() { if ( numPoints() < 1 || isClosed() ) { @@ -896,7 +896,7 @@ void QgsLineStringV2::close() addVertex( startPoint() ); } -double QgsLineStringV2::vertexAngle( QgsVertexId vertex ) const +double QgsLineString::vertexAngle( QgsVertexId vertex ) const { if ( mX.count() < 2 ) { @@ -945,7 +945,7 @@ double QgsLineStringV2::vertexAngle( QgsVertexId vertex ) const * See details in QEP #17 ****************************************************************************/ -bool QgsLineStringV2::addZValue( double zValue ) +bool QgsLineString::addZValue( double zValue ) { if ( QgsWkbTypes::hasZ( mWkbType ) ) return false; @@ -969,7 +969,7 @@ bool QgsLineStringV2::addZValue( double zValue ) return true; } -bool QgsLineStringV2::addMValue( double mValue ) +bool QgsLineString::addMValue( double mValue ) { if ( QgsWkbTypes::hasM( mWkbType ) ) return false; @@ -1000,7 +1000,7 @@ bool QgsLineStringV2::addMValue( double mValue ) return true; } -bool QgsLineStringV2::dropZValue() +bool QgsLineString::dropZValue() { if ( !is3D() ) return false; @@ -1011,7 +1011,7 @@ bool QgsLineStringV2::dropZValue() return true; } -bool QgsLineStringV2::dropMValue() +bool QgsLineString::dropMValue() { if ( !isMeasure() ) return false; @@ -1022,7 +1022,7 @@ bool QgsLineStringV2::dropMValue() return true; } -bool QgsLineStringV2::convertTo( QgsWkbTypes::Type type ) +bool QgsLineString::convertTo( QgsWkbTypes::Type type ) { if ( type == mWkbType ) return true; @@ -1038,6 +1038,6 @@ bool QgsLineStringV2::convertTo( QgsWkbTypes::Type type ) } else { - return QgsCurveV2::convertTo( type ); + return QgsCurve::convertTo( type ); } } diff --git a/src/core/geometry/qgslinestringv2.h b/src/core/geometry/qgslinestring.h similarity index 90% rename from src/core/geometry/qgslinestringv2.h rename to src/core/geometry/qgslinestring.h index dbbeae6fd44..e7dbd795976 100644 --- a/src/core/geometry/qgslinestringv2.h +++ b/src/core/geometry/qgslinestring.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgslinestringv2.h + qgslinestring.h ----------------- begin : September 2014 copyright : (C) 2014 by Marco Hugentobler @@ -18,7 +18,7 @@ #ifndef QGSLINESTRINGV2_H #define QGSLINESTRINGV2_H -#include "qgscurvev2.h" +#include "qgscurve.h" #include /*************************************************************************** @@ -28,18 +28,18 @@ ****************************************************************************/ /** \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 CORE_EXPORT QgsLineStringV2: public QgsCurveV2 +class CORE_EXPORT QgsLineString: public QgsCurve { public: - QgsLineStringV2(); - ~QgsLineStringV2(); + QgsLineString(); + ~QgsLineString(); - bool operator==( const QgsCurveV2& other ) const override; - bool operator!=( const QgsCurveV2& other ) const override; + bool operator==( const QgsCurve& other ) const override; + bool operator!=( const QgsCurve& other ) const override; /** Returns the specified point from inside the line string. * @param i index of point, starting at 0 for the first point @@ -112,12 +112,12 @@ class CORE_EXPORT QgsLineStringV2: public QgsCurveV2 * inherit the dimensionality of the first point in the list. * @param points new points for line string. If empty, line string will be cleared. */ - void setPoints( const QgsPointSequenceV2 &points ); + void setPoints( const QgsPointSequence &points ); /** 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 @@ -131,15 +131,15 @@ class CORE_EXPORT 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 override; + QgsAbstractGeometry* toCurveType() const override; //reimplemented methods virtual QString geometryType() const override { return "LineString"; } virtual int dimension() const override { return 1; } - virtual QgsLineStringV2* clone() const override; + virtual QgsLineString* clone() const override; virtual void clear() override; virtual bool fromWkb( QgsConstWkbPtr wkb ) override; @@ -160,10 +160,10 @@ class CORE_EXPORT 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 override; + virtual QgsLineString* curveToLine( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const override; int numPoints() const override; - void points( QgsPointSequenceV2 &pt ) const override; + void points( QgsPointSequence &pt ) const override; void draw( QPainter& p ) const override; @@ -178,7 +178,7 @@ class CORE_EXPORT QgsLineStringV2: public QgsCurveV2 virtual bool moveVertex( QgsVertexId position, const QgsPointV2& newPos ) override; virtual bool deleteVertex( QgsVertexId position ) override; - virtual QgsLineStringV2* reversed() const override; + virtual QgsLineString* reversed() const override; double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const override; bool pointAt( int node, QgsPointV2& point, QgsVertexId::VertexType& type ) const override; diff --git a/src/core/geometry/qgsmulticurvev2.cpp b/src/core/geometry/qgsmulticurve.cpp similarity index 59% rename from src/core/geometry/qgsmulticurvev2.cpp rename to src/core/geometry/qgsmulticurve.cpp index 2f16f60dd85..b8c094613c5 100644 --- a/src/core/geometry/qgsmulticurvev2.cpp +++ b/src/core/geometry/qgsmulticurve.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsmulticurvev2.cpp + qgsmulticurve.cpp ------------------------------------------------------------------- Date : 28 Oct 2014 Copyright : (C) 2014 by Marco Hugentobler @@ -13,42 +13,42 @@ email : marco.hugentobler at sourcepole dot com * * ***************************************************************************/ -#include "qgsmulticurvev2.h" +#include "qgsmulticurve.h" #include "qgsapplication.h" -#include "qgscurvev2.h" -#include "qgscircularstringv2.h" -#include "qgscompoundcurvev2.h" +#include "qgscurve.h" +#include "qgscircularstring.h" +#include "qgscompoundcurve.h" #include "qgsgeometryutils.h" -#include "qgslinestringv2.h" -#include "qgsmultipointv2.h" +#include "qgslinestring.h" +#include "qgsmultipoint.h" -QgsMultiCurveV2::QgsMultiCurveV2() - : QgsGeometryCollectionV2() +QgsMultiCurve::QgsMultiCurve() + : QgsGeometryCollection() { mWkbType = QgsWkbTypes::MultiCurve; } -QgsMultiCurveV2 *QgsMultiCurveV2::clone() const +QgsMultiCurve *QgsMultiCurve::clone() const { - return new QgsMultiCurveV2( *this ); + return new QgsMultiCurve( *this ); } -bool QgsMultiCurveV2::fromWkt( const QString& wkt ) +bool QgsMultiCurve::fromWkt( const QString& wkt ) { return fromCollectionWkt( wkt, - QList() << new QgsLineStringV2 << new QgsCircularStringV2 << new QgsCompoundCurveV2, + QList() << new QgsLineString << new QgsCircularString << new QgsCompoundCurve, "LineString" ); } -QDomElement QgsMultiCurveV2::asGML2( QDomDocument& doc, int precision, const QString& ns ) const +QDomElement QgsMultiCurve::asGML2( QDomDocument& doc, int precision, const QString& ns ) const { // GML2 does not support curves QDomElement elemMultiLineString = doc.createElementNS( ns, "MultiLineString" ); - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { - if ( dynamic_cast( geom ) ) + if ( dynamic_cast( geom ) ) { - QgsLineStringV2* lineString = static_cast( geom )->curveToLine(); + QgsLineString* lineString = static_cast( geom )->curveToLine(); QDomElement elemLineStringMember = doc.createElementNS( ns, "lineStringMember" ); elemLineStringMember.appendChild( lineString->asGML2( doc, precision, ns ) ); @@ -61,14 +61,14 @@ QDomElement QgsMultiCurveV2::asGML2( QDomDocument& doc, int precision, const QSt return elemMultiLineString; } -QDomElement QgsMultiCurveV2::asGML3( QDomDocument& doc, int precision, const QString& ns ) const +QDomElement QgsMultiCurve::asGML3( QDomDocument& doc, int precision, const QString& ns ) const { QDomElement elemMultiCurve = doc.createElementNS( ns, "MultiCurve" ); - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { - if ( dynamic_cast( geom ) ) + if ( dynamic_cast( geom ) ) { - const QgsCurveV2* curve = static_cast( geom ); + const QgsCurve* curve = static_cast( geom ); QDomElement elemCurveMember = doc.createElementNS( ns, "curveMember" ); elemCurveMember.appendChild( curve->asGML3( doc, precision, ns ) ); @@ -79,16 +79,16 @@ QDomElement QgsMultiCurveV2::asGML3( QDomDocument& doc, int precision, const QSt return elemMultiCurve; } -QString QgsMultiCurveV2::asJSON( int precision ) const +QString QgsMultiCurve::asJSON( int precision ) const { // GeoJSON does not support curves QString json = "{\"type\": \"MultiLineString\", \"coordinates\": ["; - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { - if ( dynamic_cast( geom ) ) + if ( dynamic_cast( geom ) ) { - QgsLineStringV2* lineString = static_cast( geom )->curveToLine(); - QgsPointSequenceV2 pts; + QgsLineString* lineString = static_cast( geom )->curveToLine(); + QgsPointSequence pts; lineString->points( pts ); json += QgsGeometryUtils::pointsToJSON( pts, precision ) + ", "; delete lineString; @@ -102,37 +102,37 @@ QString QgsMultiCurveV2::asJSON( int precision ) const return json; } -bool QgsMultiCurveV2::addGeometry( QgsAbstractGeometryV2* g ) +bool QgsMultiCurve::addGeometry( QgsAbstractGeometry* g ) { - if ( !dynamic_cast( g ) ) + if ( !dynamic_cast( g ) ) { delete g; return false; } setZMTypeFromSubGeometry( g, QgsWkbTypes::MultiCurve ); - return QgsGeometryCollectionV2::addGeometry( g ); + return QgsGeometryCollection::addGeometry( g ); } -QgsMultiCurveV2* QgsMultiCurveV2::reversed() const +QgsMultiCurve* QgsMultiCurve::reversed() const { - QgsMultiCurveV2* reversedMultiCurve = new QgsMultiCurveV2(); - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + QgsMultiCurve* reversedMultiCurve = new QgsMultiCurve(); + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { - if ( dynamic_cast( geom ) ) + if ( dynamic_cast( geom ) ) { - reversedMultiCurve->addGeometry( static_cast( geom )->reversed() ); + reversedMultiCurve->addGeometry( static_cast( geom )->reversed() ); } } return reversedMultiCurve; } -QgsAbstractGeometryV2* QgsMultiCurveV2::boundary() const +QgsAbstractGeometry* QgsMultiCurve::boundary() const { QgsMultiPointV2* multiPoint = new QgsMultiPointV2(); for ( int i = 0; i < mGeometries.size(); ++i ) { - if ( QgsCurveV2* curve = dynamic_cast( mGeometries.at( i ) ) ) + if ( QgsCurve* curve = dynamic_cast( mGeometries.at( i ) ) ) { if ( !curve->isClosed() ) { diff --git a/src/core/geometry/qgsmulticurvev2.h b/src/core/geometry/qgsmulticurve.h similarity index 82% rename from src/core/geometry/qgsmulticurvev2.h rename to src/core/geometry/qgsmulticurve.h index 3da550f164d..c30dfb1b306 100644 --- a/src/core/geometry/qgsmulticurvev2.h +++ b/src/core/geometry/qgsmulticurve.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsmulticurvev2.h + qgsmulticurve.h ------------------------------------------------------------------- Date : 28 Oct 2014 Copyright : (C) 2014 by Marco Hugentobler @@ -16,20 +16,20 @@ email : marco.hugentobler at sourcepole dot com #ifndef QGSMULTICURVEV2_H #define QGSMULTICURVEV2_H -#include "qgsgeometrycollectionv2.h" +#include "qgsgeometrycollection.h" /** \ingroup core - * \class QgsMultiCurveV2 + * \class QgsMultiCurve * \brief Multi curve geometry collection. * \note added in QGIS 2.10 * \note this API is not considered stable and may change for 2.12 */ -class CORE_EXPORT QgsMultiCurveV2: public QgsGeometryCollectionV2 +class CORE_EXPORT QgsMultiCurve: public QgsGeometryCollection { public: - QgsMultiCurveV2(); + QgsMultiCurve(); virtual QString geometryType() const override { return "MultiCurve"; } - QgsMultiCurveV2* clone() const override; + QgsMultiCurve* clone() const override; bool fromWkt( const QString& wkt ) override; @@ -41,14 +41,14 @@ class CORE_EXPORT QgsMultiCurveV2: public QgsGeometryCollectionV2 QString asJSON( int precision = 17 ) const override; /** Adds a geometry and takes ownership. Returns true in case of success*/ - virtual bool addGeometry( QgsAbstractGeometryV2* g ) override; + virtual bool addGeometry( QgsAbstractGeometry* g ) override; /** 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; + QgsMultiCurve* reversed() const; - virtual QgsAbstractGeometryV2* boundary() const override; + virtual QgsAbstractGeometry* boundary() const override; }; diff --git a/src/core/geometry/qgsmultilinestringv2.cpp b/src/core/geometry/qgsmultilinestring.cpp similarity index 57% rename from src/core/geometry/qgsmultilinestringv2.cpp rename to src/core/geometry/qgsmultilinestring.cpp index c0bf83482e2..6f39a244e0e 100644 --- a/src/core/geometry/qgsmultilinestringv2.cpp +++ b/src/core/geometry/qgsmultilinestring.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsmultilinestringv2.cpp + qgsmultilinestring.cpp ------------------------------------------------------------------- Date : 28 Oct 2014 Copyright : (C) 2014 by Marco Hugentobler @@ -13,39 +13,39 @@ email : marco.hugentobler at sourcepole dot com * * ***************************************************************************/ -#include "qgsmultilinestringv2.h" +#include "qgsmultilinestring.h" #include "qgsapplication.h" -#include "qgscurvev2.h" -#include "qgscircularstringv2.h" -#include "qgscompoundcurvev2.h" +#include "qgscurve.h" +#include "qgscircularstring.h" +#include "qgscompoundcurve.h" #include "qgsgeometryutils.h" -#include "qgslinestringv2.h" -#include "qgsmulticurvev2.h" +#include "qgslinestring.h" +#include "qgsmulticurve.h" -QgsMultiLineStringV2::QgsMultiLineStringV2() - : QgsMultiCurveV2() +QgsMultiLineString::QgsMultiLineString() + : QgsMultiCurve() { mWkbType = QgsWkbTypes::MultiLineString; } -QgsMultiLineStringV2* QgsMultiLineStringV2::clone() const +QgsMultiLineString* QgsMultiLineString::clone() const { - return new QgsMultiLineStringV2( *this ); + return new QgsMultiLineString( *this ); } -bool QgsMultiLineStringV2::fromWkt( const QString& wkt ) +bool QgsMultiLineString::fromWkt( const QString& wkt ) { - return fromCollectionWkt( wkt, QList() << new QgsLineStringV2, "LineString" ); + return fromCollectionWkt( wkt, QList() << new QgsLineString, "LineString" ); } -QDomElement QgsMultiLineStringV2::asGML2( QDomDocument& doc, int precision, const QString& ns ) const +QDomElement QgsMultiLineString::asGML2( QDomDocument& doc, int precision, const QString& ns ) const { QDomElement elemMultiLineString = doc.createElementNS( ns, "MultiLineString" ); - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { - if ( dynamic_cast( geom ) ) + if ( dynamic_cast( geom ) ) { - const QgsLineStringV2* lineString = static_cast( geom ); + const QgsLineString* lineString = static_cast( geom ); QDomElement elemLineStringMember = doc.createElementNS( ns, "lineStringMember" ); elemLineStringMember.appendChild( lineString->asGML2( doc, precision, ns ) ); @@ -58,14 +58,14 @@ QDomElement QgsMultiLineStringV2::asGML2( QDomDocument& doc, int precision, cons return elemMultiLineString; } -QDomElement QgsMultiLineStringV2::asGML3( QDomDocument& doc, int precision, const QString& ns ) const +QDomElement QgsMultiLineString::asGML3( QDomDocument& doc, int precision, const QString& ns ) const { QDomElement elemMultiCurve = doc.createElementNS( ns, "MultiLineString" ); - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { - if ( dynamic_cast( geom ) ) + if ( dynamic_cast( geom ) ) { - const QgsLineStringV2* lineString = static_cast( geom ); + const QgsLineString* lineString = static_cast( geom ); QDomElement elemCurveMember = doc.createElementNS( ns, "curveMember" ); elemCurveMember.appendChild( lineString->asGML3( doc, precision, ns ) ); @@ -76,15 +76,15 @@ QDomElement QgsMultiLineStringV2::asGML3( QDomDocument& doc, int precision, cons return elemMultiCurve; } -QString QgsMultiLineStringV2::asJSON( int precision ) const +QString QgsMultiLineString::asJSON( int precision ) const { QString json = "{\"type\": \"MultiLineString\", \"coordinates\": ["; - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { - if ( dynamic_cast( geom ) ) + if ( dynamic_cast( geom ) ) { - const QgsLineStringV2* lineString = static_cast( geom ); - QgsPointSequenceV2 pts; + const QgsLineString* lineString = static_cast( geom ); + QgsPointSequence pts; lineString->points( pts ); json += QgsGeometryUtils::pointsToJSON( pts, precision ) + ", "; } @@ -97,21 +97,21 @@ QString QgsMultiLineStringV2::asJSON( int precision ) const return json; } -bool QgsMultiLineStringV2::addGeometry( QgsAbstractGeometryV2* g ) +bool QgsMultiLineString::addGeometry( QgsAbstractGeometry* g ) { - if ( !dynamic_cast( g ) ) + if ( !dynamic_cast( g ) ) { delete g; return false; } setZMTypeFromSubGeometry( g, QgsWkbTypes::MultiLineString ); - return QgsGeometryCollectionV2::addGeometry( g ); + return QgsGeometryCollection::addGeometry( g ); } -QgsAbstractGeometryV2* QgsMultiLineStringV2::toCurveType() const +QgsAbstractGeometry* QgsMultiLineString::toCurveType() const { - QgsMultiCurveV2* multiCurve = new QgsMultiCurveV2(); + QgsMultiCurve* multiCurve = new QgsMultiCurve(); for ( int i = 0; i < mGeometries.size(); ++i ) { multiCurve->addGeometry( mGeometries.at( i )->clone() ); diff --git a/src/core/geometry/qgsmultilinestringv2.h b/src/core/geometry/qgsmultilinestring.h similarity index 83% rename from src/core/geometry/qgsmultilinestringv2.h rename to src/core/geometry/qgsmultilinestring.h index b2cacc76bf5..cc4f3f88165 100644 --- a/src/core/geometry/qgsmultilinestringv2.h +++ b/src/core/geometry/qgsmultilinestring.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsmultilinestringv2.h + qgsmultilinestring.h ------------------------------------------------------------------- Date : 28 Oct 2014 Copyright : (C) 2014 by Marco Hugentobler @@ -16,20 +16,20 @@ email : marco.hugentobler at sourcepole dot com #ifndef QGSMULTILINESTRINGV2_H #define QGSMULTILINESTRINGV2_H -#include "qgsmulticurvev2.h" +#include "qgsmulticurve.h" /** \ingroup core - * \class QgsMultiLineStringV2 + * \class QgsMultiLineString * \brief Multi line string geometry collection. * \note added in QGIS 2.10 * \note this API is not considered stable and may change for 2.12 */ -class CORE_EXPORT QgsMultiLineStringV2: public QgsMultiCurveV2 +class CORE_EXPORT QgsMultiLineString: public QgsMultiCurve { public: - QgsMultiLineStringV2(); + QgsMultiLineString(); virtual QString geometryType() const override { return "MultiLineString"; } - QgsMultiLineStringV2* clone() const override; + QgsMultiLineString* clone() const override; bool fromWkt( const QString& wkt ) override; @@ -41,11 +41,11 @@ class CORE_EXPORT QgsMultiLineStringV2: public QgsMultiCurveV2 QString asJSON( int precision = 17 ) const override; /** Adds a geometry and takes ownership. Returns true in case of success*/ - virtual bool addGeometry( QgsAbstractGeometryV2* g ) override; + virtual bool addGeometry( QgsAbstractGeometry* g ) override; - /** 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 override; + QgsAbstractGeometry* toCurveType() const override; protected: diff --git a/src/core/geometry/qgsmultipointv2.cpp b/src/core/geometry/qgsmultipoint.cpp similarity index 85% rename from src/core/geometry/qgsmultipointv2.cpp rename to src/core/geometry/qgsmultipoint.cpp index bab22b3bcc5..9ebca69c999 100644 --- a/src/core/geometry/qgsmultipointv2.cpp +++ b/src/core/geometry/qgsmultipoint.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsmultipointv2.cpp + qgsmultipoint.cpp ------------------------------------------------------------------- Date : 29 Oct 2014 Copyright : (C) 2014 by Marco Hugentobler @@ -13,14 +13,14 @@ email : marco.hugentobler at sourcepole dot com * * ***************************************************************************/ -#include "qgsmultipointv2.h" +#include "qgsmultipoint.h" #include "qgsapplication.h" #include "qgsgeometryutils.h" #include "qgspointv2.h" #include "qgswkbptr.h" QgsMultiPointV2::QgsMultiPointV2() - : QgsGeometryCollectionV2() + : QgsGeometryCollection() { mWkbType = QgsWkbTypes::MultiPoint; } @@ -42,13 +42,13 @@ bool QgsMultiPointV2::fromWkt( const QString& wkt ) collectionWkt.replace( '(', "((" ).replace( ')', "))" ).replace( ',', "),(" ); } - return fromCollectionWkt( collectionWkt, QList() << new QgsPointV2, "Point" ); + return fromCollectionWkt( collectionWkt, QList() << new QgsPointV2, "Point" ); } QDomElement QgsMultiPointV2::asGML2( QDomDocument& doc, int precision, const QString& ns ) const { QDomElement elemMultiPoint = doc.createElementNS( ns, "MultiPoint" ); - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { if ( dynamic_cast( geom ) ) { @@ -64,7 +64,7 @@ QDomElement QgsMultiPointV2::asGML2( QDomDocument& doc, int precision, const QSt QDomElement QgsMultiPointV2::asGML3( QDomDocument& doc, int precision, const QString& ns ) const { QDomElement elemMultiPoint = doc.createElementNS( ns, "MultiPoint" ); - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { if ( dynamic_cast( geom ) ) { @@ -81,8 +81,8 @@ QString QgsMultiPointV2::asJSON( int precision ) const { QString json = "{\"type\": \"MultiPoint\", \"coordinates\": "; - QgsPointSequenceV2 pts; - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + QgsPointSequence pts; + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { if ( dynamic_cast( geom ) ) { @@ -95,7 +95,7 @@ QString QgsMultiPointV2::asJSON( int precision ) const return json; } -bool QgsMultiPointV2::addGeometry( QgsAbstractGeometryV2* g ) +bool QgsMultiPointV2::addGeometry( QgsAbstractGeometry* g ) { if ( !dynamic_cast( g ) ) { @@ -103,10 +103,10 @@ bool QgsMultiPointV2::addGeometry( QgsAbstractGeometryV2* g ) return false; } setZMTypeFromSubGeometry( g, QgsWkbTypes::MultiPoint ); - return QgsGeometryCollectionV2::addGeometry( g ); + return QgsGeometryCollection::addGeometry( g ); } -QgsAbstractGeometryV2* QgsMultiPointV2::boundary() const +QgsAbstractGeometry* QgsMultiPointV2::boundary() const { return nullptr; } diff --git a/src/core/geometry/qgsmultipointv2.h b/src/core/geometry/qgsmultipoint.h similarity index 87% rename from src/core/geometry/qgsmultipointv2.h rename to src/core/geometry/qgsmultipoint.h index 8978ab50553..aea6fc5c512 100644 --- a/src/core/geometry/qgsmultipointv2.h +++ b/src/core/geometry/qgsmultipoint.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsmultipointv2.h + qgsmultipoint.h ------------------------------------------------------------------- Date : 29 Oct 2014 Copyright : (C) 2014 by Marco Hugentobler @@ -16,7 +16,7 @@ email : marco.hugentobler at sourcepole dot com #ifndef QGSMULTIPOINTV2_H #define QGSMULTIPOINTV2_H -#include "qgsgeometrycollectionv2.h" +#include "qgsgeometrycollection.h" /** \ingroup core * \class QgsMultiPointV2 @@ -24,7 +24,7 @@ email : marco.hugentobler at sourcepole dot com * \note added in QGIS 2.10 * \note this API is not considered stable and may change for 2.12 */ -class CORE_EXPORT QgsMultiPointV2: public QgsGeometryCollectionV2 +class CORE_EXPORT QgsMultiPointV2: public QgsGeometryCollection { public: QgsMultiPointV2(); @@ -42,9 +42,9 @@ class CORE_EXPORT QgsMultiPointV2: public QgsGeometryCollectionV2 /** Adds a geometry and takes ownership. Returns true in case of success*/ - virtual bool addGeometry( QgsAbstractGeometryV2* g ) override; + virtual bool addGeometry( QgsAbstractGeometry* g ) override; - virtual QgsAbstractGeometryV2* boundary() const override; + virtual QgsAbstractGeometry* boundary() const override; protected: diff --git a/src/core/geometry/qgsmultipolygonv2.cpp b/src/core/geometry/qgsmultipolygon.cpp similarity index 74% rename from src/core/geometry/qgsmultipolygonv2.cpp rename to src/core/geometry/qgsmultipolygon.cpp index 5620896eedf..ffa518de7d6 100644 --- a/src/core/geometry/qgsmultipolygonv2.cpp +++ b/src/core/geometry/qgsmultipolygon.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsmultipolygonv2.cpp + qgsmultipolygon.cpp ------------------------------------------------------------------- Date : 28 Oct 2014 Copyright : (C) 2014 by Marco Hugentobler @@ -13,17 +13,17 @@ email : marco.hugentobler at sourcepole dot com * * ***************************************************************************/ -#include "qgsmultipolygonv2.h" +#include "qgsmultipolygon.h" #include "qgsapplication.h" #include "qgsgeometryutils.h" -#include "qgssurfacev2.h" -#include "qgslinestringv2.h" -#include "qgspolygonv2.h" -#include "qgscurvepolygonv2.h" -#include "qgsmultilinestringv2.h" +#include "qgssurface.h" +#include "qgslinestring.h" +#include "qgspolygon.h" +#include "qgscurvepolygon.h" +#include "qgsmultilinestring.h" QgsMultiPolygonV2::QgsMultiPolygonV2() - : QgsMultiSurfaceV2() + : QgsMultiSurface() { mWkbType = QgsWkbTypes::MultiPolygon; } @@ -35,14 +35,14 @@ QgsMultiPolygonV2 *QgsMultiPolygonV2::clone() const bool QgsMultiPolygonV2::fromWkt( const QString& wkt ) { - return fromCollectionWkt( wkt, QList() << new QgsPolygonV2, "Polygon" ); + return fromCollectionWkt( wkt, QList() << new QgsPolygonV2, "Polygon" ); } QDomElement QgsMultiPolygonV2::asGML2( QDomDocument& doc, int precision, const QString& ns ) const { // GML2 does not support curves QDomElement elemMultiPolygon = doc.createElementNS( ns, "MultiPolygon" ); - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { if ( dynamic_cast( geom ) ) { @@ -58,7 +58,7 @@ QDomElement QgsMultiPolygonV2::asGML2( QDomDocument& doc, int precision, const Q QDomElement QgsMultiPolygonV2::asGML3( QDomDocument& doc, int precision, const QString& ns ) const { QDomElement elemMultiSurface = doc.createElementNS( ns, "MultiPolygon" ); - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { if ( dynamic_cast( geom ) ) { @@ -75,7 +75,7 @@ QString QgsMultiPolygonV2::asJSON( int precision ) const { // GeoJSON does not support curves QString json = "{\"type\": \"MultiPolygon\", \"coordinates\": ["; - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { if ( dynamic_cast( geom ) ) { @@ -83,16 +83,16 @@ QString QgsMultiPolygonV2::asJSON( int precision ) const const QgsPolygonV2* polygon = static_cast( geom ); - QgsLineStringV2* exteriorLineString = polygon->exteriorRing()->curveToLine(); - QgsPointSequenceV2 exteriorPts; + QgsLineString* exteriorLineString = polygon->exteriorRing()->curveToLine(); + QgsPointSequence exteriorPts; exteriorLineString->points( exteriorPts ); json += QgsGeometryUtils::pointsToJSON( exteriorPts, precision ) + ", "; delete exteriorLineString; for ( int i = 0, n = polygon->numInteriorRings(); i < n; ++i ) { - QgsLineStringV2* interiorLineString = polygon->interiorRing( i )->curveToLine(); - QgsPointSequenceV2 interiorPts; + QgsLineString* interiorLineString = polygon->interiorRing( i )->curveToLine(); + QgsPointSequence interiorPts; interiorLineString->points( interiorPts ); json += QgsGeometryUtils::pointsToJSON( interiorPts, precision ) + ", "; delete interiorLineString; @@ -113,7 +113,7 @@ QString QgsMultiPolygonV2::asJSON( int precision ) const return json; } -bool QgsMultiPolygonV2::addGeometry( QgsAbstractGeometryV2* g ) +bool QgsMultiPolygonV2::addGeometry( QgsAbstractGeometry* g ) { if ( !dynamic_cast( g ) ) { @@ -122,12 +122,12 @@ bool QgsMultiPolygonV2::addGeometry( QgsAbstractGeometryV2* g ) } setZMTypeFromSubGeometry( g, QgsWkbTypes::MultiPolygon ); - return QgsGeometryCollectionV2::addGeometry( g ); + return QgsGeometryCollection::addGeometry( g ); } -QgsAbstractGeometryV2* QgsMultiPolygonV2::toCurveType() const +QgsAbstractGeometry* QgsMultiPolygonV2::toCurveType() const { - QgsMultiSurfaceV2* multiSurface = new QgsMultiSurfaceV2(); + QgsMultiSurface* multiSurface = new QgsMultiSurface(); for ( int i = 0; i < mGeometries.size(); ++i ) { multiSurface->addGeometry( mGeometries.at( i )->clone() ); @@ -135,20 +135,20 @@ QgsAbstractGeometryV2* QgsMultiPolygonV2::toCurveType() const return multiSurface; } -QgsAbstractGeometryV2* QgsMultiPolygonV2::boundary() const +QgsAbstractGeometry* QgsMultiPolygonV2::boundary() const { - QgsMultiLineStringV2* multiLine = new QgsMultiLineStringV2(); + QgsMultiLineString* multiLine = new QgsMultiLineString(); for ( int i = 0; i < mGeometries.size(); ++i ) { if ( QgsPolygonV2* polygon = dynamic_cast( mGeometries.at( i ) ) ) { - QgsAbstractGeometryV2* polygonBoundary = polygon->boundary(); + QgsAbstractGeometry* polygonBoundary = polygon->boundary(); - if ( QgsLineStringV2* lineStringBoundary = dynamic_cast< QgsLineStringV2* >( polygonBoundary ) ) + if ( QgsLineString* lineStringBoundary = dynamic_cast< QgsLineString* >( polygonBoundary ) ) { multiLine->addGeometry( lineStringBoundary ); } - else if ( QgsMultiLineStringV2* multiLineStringBoundary = dynamic_cast< QgsMultiLineStringV2* >( polygonBoundary ) ) + else if ( QgsMultiLineString* multiLineStringBoundary = dynamic_cast< QgsMultiLineString* >( polygonBoundary ) ) { for ( int j = 0; j < multiLineStringBoundary->numGeometries(); ++j ) { diff --git a/src/core/geometry/qgsmultipolygonv2.h b/src/core/geometry/qgsmultipolygon.h similarity index 86% rename from src/core/geometry/qgsmultipolygonv2.h rename to src/core/geometry/qgsmultipolygon.h index def9db16b34..080c8bd9470 100644 --- a/src/core/geometry/qgsmultipolygonv2.h +++ b/src/core/geometry/qgsmultipolygon.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsmultipolygonv2.h + qgsmultipolygon.h ------------------------------------------------------------------- Date : 28 Oct 2014 Copyright : (C) 2014 by Marco Hugentobler @@ -16,7 +16,7 @@ email : marco.hugentobler at sourcepole dot com #ifndef QGSMULTIPOLYGONV2_H #define QGSMULTIPOLYGONV2_H -#include "qgsmultisurfacev2.h" +#include "qgsmultisurface.h" /** \ingroup core * \class QgsMultiPolygonV2 @@ -24,7 +24,7 @@ email : marco.hugentobler at sourcepole dot com * \note added in QGIS 2.10 * \note this API is not considered stable and may change for 2.12 */ -class CORE_EXPORT QgsMultiPolygonV2: public QgsMultiSurfaceV2 +class CORE_EXPORT QgsMultiPolygonV2: public QgsMultiSurface { public: QgsMultiPolygonV2(); @@ -41,13 +41,13 @@ class CORE_EXPORT QgsMultiPolygonV2: public QgsMultiSurfaceV2 QString asJSON( int precision = 17 ) const override; /** Adds a geometry and takes ownership. Returns true in case of success*/ - virtual bool addGeometry( QgsAbstractGeometryV2* g ) override; + virtual bool addGeometry( QgsAbstractGeometry* g ) override; - /** 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 override; + QgsAbstractGeometry* toCurveType() const override; - virtual QgsAbstractGeometryV2* boundary() const override; + virtual QgsAbstractGeometry* boundary() const override; protected: diff --git a/src/core/geometry/qgsmultisurfacev2.cpp b/src/core/geometry/qgsmultisurface.cpp similarity index 60% rename from src/core/geometry/qgsmultisurfacev2.cpp rename to src/core/geometry/qgsmultisurface.cpp index 54edbd1ec35..8f545e21efc 100644 --- a/src/core/geometry/qgsmultisurfacev2.cpp +++ b/src/core/geometry/qgsmultisurface.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - qgsmultisurfacev2.cpp + qgsmultisurface.cpp ------------------------------------------------------------------- Date : 28 Oct 2014 Copyright : (C) 2014 by Marco Hugentobler @@ -14,42 +14,42 @@ email : marco.hugentobler at sourcepole dot com * * ***************************************************************************/ -#include "qgsmultisurfacev2.h" +#include "qgsmultisurface.h" #include "qgsapplication.h" #include "qgsgeometryutils.h" -#include "qgssurfacev2.h" -#include "qgslinestringv2.h" -#include "qgspolygonv2.h" -#include "qgscurvepolygonv2.h" -#include "qgsmulticurvev2.h" +#include "qgssurface.h" +#include "qgslinestring.h" +#include "qgspolygon.h" +#include "qgscurvepolygon.h" +#include "qgsmulticurve.h" -QgsMultiSurfaceV2::QgsMultiSurfaceV2() - : QgsGeometryCollectionV2() +QgsMultiSurface::QgsMultiSurface() + : QgsGeometryCollection() { mWkbType = QgsWkbTypes::MultiSurface; } -QgsMultiSurfaceV2 *QgsMultiSurfaceV2::clone() const +QgsMultiSurface *QgsMultiSurface::clone() const { - return new QgsMultiSurfaceV2( *this ); + return new QgsMultiSurface( *this ); } -bool QgsMultiSurfaceV2::fromWkt( const QString& wkt ) +bool QgsMultiSurface::fromWkt( const QString& wkt ) { return fromCollectionWkt( wkt, - QList() << new QgsPolygonV2 << new QgsCurvePolygonV2, + QList() << new QgsPolygonV2 << new QgsCurvePolygon, "Polygon" ); } -QDomElement QgsMultiSurfaceV2::asGML2( QDomDocument& doc, int precision, const QString& ns ) const +QDomElement QgsMultiSurface::asGML2( QDomDocument& doc, int precision, const QString& ns ) const { // GML2 does not support curves QDomElement elemMultiPolygon = doc.createElementNS( ns, "MultiPolygon" ); - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { - if ( dynamic_cast( geom ) ) + if ( dynamic_cast( geom ) ) { - QgsPolygonV2* polygon = static_cast( geom )->surfaceToPolygon(); + QgsPolygonV2* polygon = static_cast( geom )->surfaceToPolygon(); QDomElement elemPolygonMember = doc.createElementNS( ns, "polygonMember" ); elemPolygonMember.appendChild( polygon->asGML2( doc, precision, ns ) ); @@ -62,12 +62,12 @@ QDomElement QgsMultiSurfaceV2::asGML2( QDomDocument& doc, int precision, const Q return elemMultiPolygon; } -QDomElement QgsMultiSurfaceV2::asGML3( QDomDocument& doc, int precision, const QString& ns ) const +QDomElement QgsMultiSurface::asGML3( QDomDocument& doc, int precision, const QString& ns ) const { QDomElement elemMultiSurface = doc.createElementNS( ns, "MultiSurface" ); - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { - if ( dynamic_cast( geom ) ) + if ( dynamic_cast( geom ) ) { QDomElement elemSurfaceMember = doc.createElementNS( ns, "surfaceMember" ); elemSurfaceMember.appendChild( geom->asGML3( doc, precision, ns ) ); @@ -78,28 +78,28 @@ QDomElement QgsMultiSurfaceV2::asGML3( QDomDocument& doc, int precision, const Q return elemMultiSurface; } -QString QgsMultiSurfaceV2::asJSON( int precision ) const +QString QgsMultiSurface::asJSON( int precision ) const { // GeoJSON does not support curves QString json = "{\"type\": \"MultiPolygon\", \"coordinates\": ["; - Q_FOREACH ( const QgsAbstractGeometryV2 *geom, mGeometries ) + Q_FOREACH ( const QgsAbstractGeometry *geom, mGeometries ) { - if ( dynamic_cast( geom ) ) + if ( dynamic_cast( geom ) ) { json += '['; - QgsPolygonV2* polygon = static_cast( geom )->surfaceToPolygon(); + QgsPolygonV2* polygon = static_cast( geom )->surfaceToPolygon(); - QgsLineStringV2* exteriorLineString = polygon->exteriorRing()->curveToLine(); - QgsPointSequenceV2 exteriorPts; + QgsLineString* exteriorLineString = polygon->exteriorRing()->curveToLine(); + QgsPointSequence exteriorPts; exteriorLineString->points( exteriorPts ); json += QgsGeometryUtils::pointsToJSON( exteriorPts, precision ) + ", "; delete exteriorLineString; for ( int i = 0, n = polygon->numInteriorRings(); i < n; ++i ) { - QgsLineStringV2* interiorLineString = polygon->interiorRing( i )->curveToLine(); - QgsPointSequenceV2 interiorPts; + QgsLineString* interiorLineString = polygon->interiorRing( i )->curveToLine(); + QgsPointSequence interiorPts; interiorLineString->points( interiorPts ); json += QgsGeometryUtils::pointsToJSON( interiorPts, precision ) + ", "; delete interiorLineString; @@ -122,24 +122,24 @@ QString QgsMultiSurfaceV2::asJSON( int precision ) const return json; } -bool QgsMultiSurfaceV2::addGeometry( QgsAbstractGeometryV2* g ) +bool QgsMultiSurface::addGeometry( QgsAbstractGeometry* g ) { - if ( !dynamic_cast( g ) ) + if ( !dynamic_cast( g ) ) { delete g; return false; } setZMTypeFromSubGeometry( g, QgsWkbTypes::MultiSurface ); - return QgsGeometryCollectionV2::addGeometry( g ); + return QgsGeometryCollection::addGeometry( g ); } -QgsAbstractGeometryV2* QgsMultiSurfaceV2::boundary() const +QgsAbstractGeometry* QgsMultiSurface::boundary() const { - QgsMultiCurveV2* multiCurve = new QgsMultiCurveV2(); + QgsMultiCurve* multiCurve = new QgsMultiCurve(); for ( int i = 0; i < mGeometries.size(); ++i ) { - if ( QgsSurfaceV2* surface = dynamic_cast( mGeometries.at( i ) ) ) + if ( QgsSurface* surface = dynamic_cast( mGeometries.at( i ) ) ) { multiCurve->addGeometry( surface->boundary() ); } diff --git a/src/core/geometry/qgsmultisurfacev2.h b/src/core/geometry/qgsmultisurface.h similarity index 82% rename from src/core/geometry/qgsmultisurfacev2.h rename to src/core/geometry/qgsmultisurface.h index a675d62c393..ff2d0a3ea25 100644 --- a/src/core/geometry/qgsmultisurfacev2.h +++ b/src/core/geometry/qgsmultisurface.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsmultisurfacev2.h + qgsmultisurface.h ------------------------------------------------------------------- Date : 28 Oct 2014 Copyright : (C) 2014 by Marco Hugentobler @@ -16,20 +16,20 @@ email : marco.hugentobler at sourcepole dot com #ifndef QGSMULTISURFACEV2_H #define QGSMULTISURFACEV2_H -#include "qgsgeometrycollectionv2.h" +#include "qgsgeometrycollection.h" /** \ingroup core - * \class QgsMultiSurfaceV2 + * \class QgsMultiSurface * \brief Multi surface geometry collection. * \note added in QGIS 2.10 * \note this API is not considered stable and may change for 2.12 */ -class CORE_EXPORT QgsMultiSurfaceV2: public QgsGeometryCollectionV2 +class CORE_EXPORT QgsMultiSurface: public QgsGeometryCollection { public: - QgsMultiSurfaceV2(); + QgsMultiSurface(); virtual QString geometryType() const override { return "MultiSurface"; } - QgsMultiSurfaceV2* clone() const override; + QgsMultiSurface* clone() const override; bool fromWkt( const QString& wkt ) override; @@ -42,9 +42,9 @@ class CORE_EXPORT QgsMultiSurfaceV2: public QgsGeometryCollectionV2 /** Adds a geometry and takes ownership. Returns true in case of success*/ - virtual bool addGeometry( QgsAbstractGeometryV2* g ) override; + virtual bool addGeometry( QgsAbstractGeometry* g ) override; - virtual QgsAbstractGeometryV2* boundary() const override; + virtual QgsAbstractGeometry* boundary() const override; }; #endif // QGSMULTISURFACEV2_H diff --git a/src/core/geometry/qgspointv2.cpp b/src/core/geometry/qgspointv2.cpp index 639a1781772..03c901fb4c0 100644 --- a/src/core/geometry/qgspointv2.cpp +++ b/src/core/geometry/qgspointv2.cpp @@ -31,7 +31,7 @@ ****************************************************************************/ QgsPointV2::QgsPointV2( double x, double y ) - : QgsAbstractGeometryV2() + : QgsAbstractGeometry() , mX( x ) , mY( y ) , mZ( 0.0 ) @@ -41,7 +41,7 @@ QgsPointV2::QgsPointV2( double x, double y ) } QgsPointV2::QgsPointV2( const QgsPoint& p ) - : QgsAbstractGeometryV2() + : QgsAbstractGeometry() , mX( p.x() ) , mY( p.y() ) , mZ( 0.0 ) @@ -51,7 +51,7 @@ QgsPointV2::QgsPointV2( const QgsPoint& p ) } QgsPointV2::QgsPointV2( QPointF p ) - : QgsAbstractGeometryV2() + : QgsAbstractGeometry() , mX( p.x() ) , mY( p.y() ) , mZ( 0.0 ) @@ -271,17 +271,17 @@ void QgsPointV2::transform( const QgsCoordinateTransform& ct, QgsCoordinateTrans } } -QgsCoordinateSequenceV2 QgsPointV2::coordinateSequence() const +QgsCoordinateSequence QgsPointV2::coordinateSequence() const { - QgsCoordinateSequenceV2 cs; + QgsCoordinateSequence cs; - cs.append( QgsRingSequenceV2() ); - cs.back().append( QgsPointSequenceV2() << QgsPointV2( *this ) ); + cs.append( QgsRingSequence() ); + cs.back().append( QgsPointSequence() << QgsPointV2( *this ) ); return cs; } -QgsAbstractGeometryV2* QgsPointV2::boundary() const +QgsAbstractGeometry* QgsPointV2::boundary() const { return nullptr; } diff --git a/src/core/geometry/qgspointv2.h b/src/core/geometry/qgspointv2.h index f2231a8fd50..9b576d3aa53 100644 --- a/src/core/geometry/qgspointv2.h +++ b/src/core/geometry/qgspointv2.h @@ -18,7 +18,7 @@ #ifndef QGSPOINTV2_H #define QGSPOINTV2_H -#include "qgsabstractgeometryv2.h" +#include "qgsabstractgeometry.h" #include "qgsrectangle.h" /*************************************************************************** @@ -32,7 +32,7 @@ * \brief Point geometry type, with support for z-dimension and m-values. * \note added in QGIS 2.10 */ -class CORE_EXPORT QgsPointV2: public QgsAbstractGeometryV2 +class CORE_EXPORT QgsPointV2: public QgsAbstractGeometry { public: @@ -169,8 +169,8 @@ class CORE_EXPORT QgsPointV2: public QgsAbstractGeometryV2 void transform( const QgsCoordinateTransform& ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) override; void transform( const QTransform& t ) override; - virtual QgsCoordinateSequenceV2 coordinateSequence() const override; - virtual QgsAbstractGeometryV2* boundary() const override; + virtual QgsCoordinateSequence coordinateSequence() const override; + virtual QgsAbstractGeometry* boundary() const override; //low-level editing virtual bool insertVertex( QgsVertexId position, const QgsPointV2& vertex ) override { Q_UNUSED( position ); Q_UNUSED( vertex ); return false; } diff --git a/src/core/geometry/qgspolygonv2.cpp b/src/core/geometry/qgspolygon.cpp similarity index 84% rename from src/core/geometry/qgspolygonv2.cpp rename to src/core/geometry/qgspolygon.cpp index bb02fd9a140..cf3ba723ecc 100644 --- a/src/core/geometry/qgspolygonv2.cpp +++ b/src/core/geometry/qgspolygon.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgspolygonv2.cpp + qgspolygon.cpp ---------------- begin : September 2014 copyright : (C) 2014 by Marco Hugentobler @@ -15,15 +15,15 @@ * * ***************************************************************************/ -#include "qgspolygonv2.h" +#include "qgspolygon.h" #include "qgsapplication.h" #include "qgsgeometryutils.h" -#include "qgslinestringv2.h" -#include "qgsmultilinestringv2.h" +#include "qgslinestring.h" +#include "qgsmultilinestring.h" #include "qgswkbptr.h" QgsPolygonV2::QgsPolygonV2() - : QgsCurvePolygonV2() + : QgsCurvePolygon() { mWkbType = QgsWkbTypes::Polygon; } @@ -73,7 +73,7 @@ QgsPolygonV2* QgsPolygonV2::clone() const void QgsPolygonV2::clear() { - QgsCurvePolygonV2::clear(); + QgsCurvePolygon::clear(); mWkbType = QgsWkbTypes::Polygon; } @@ -116,7 +116,7 @@ bool QgsPolygonV2::fromWkb( QgsConstWkbPtr wkbPtr ) wkbPtr >> nRings; for ( int i = 0; i < nRings; ++i ) { - QgsLineStringV2* line = new QgsLineStringV2(); + QgsLineString* line = new QgsLineString(); line->fromWkbPoints( ringType, wkbPtr ); /*if ( !line->isRing() ) { @@ -144,7 +144,7 @@ int QgsPolygonV2::wkbSize() const // Endianness and WkbType is not stored for LinearRings size += mExteriorRing->wkbSize() - ( sizeof( char ) + sizeof( quint32 ) ); } - Q_FOREACH ( const QgsCurveV2* curve, mInteriorRings ) + Q_FOREACH ( const QgsCurve* curve, mInteriorRings ) { // Endianness and WkbType is not stored for LinearRings size += curve->wkbSize() - ( sizeof( char ) + sizeof( quint32 ) ); @@ -162,13 +162,13 @@ unsigned char* QgsPolygonV2::asWkb( int& binarySize ) const wkb << static_cast(( nullptr != mExteriorRing ) + mInteriorRings.size() ); if ( mExteriorRing ) { - QgsPointSequenceV2 pts; + QgsPointSequence pts; mExteriorRing->points( pts ); QgsGeometryUtils::pointsToWKB( wkb, pts, mExteriorRing->is3D(), mExteriorRing->isMeasure() ); } - Q_FOREACH ( const QgsCurveV2* curve, mInteriorRings ) + Q_FOREACH ( const QgsCurve* curve, mInteriorRings ) { - QgsPointSequenceV2 pts; + QgsPointSequence pts; curve->points( pts ); QgsGeometryUtils::pointsToWKB( wkb, pts, curve->is3D(), curve->isMeasure() ); } @@ -176,7 +176,7 @@ unsigned char* QgsPolygonV2::asWkb( int& binarySize ) const return geomPtr; } -void QgsPolygonV2::addInteriorRing( QgsCurveV2* ring ) +void QgsPolygonV2::addInteriorRing( QgsCurve* ring ) { if ( !ring ) return; @@ -184,12 +184,12 @@ void QgsPolygonV2::addInteriorRing( QgsCurveV2* ring ) if ( ring->hasCurvedSegments() ) { //can't add a curved ring to a QgsPolygonV2 - QgsLineStringV2* segmented = ring->curveToLine(); + QgsLineString* segmented = ring->curveToLine(); delete ring; ring = segmented; } - QgsLineStringV2* lineString = dynamic_cast< QgsLineStringV2*>( ring ); + QgsLineString* lineString = dynamic_cast< QgsLineString*>( ring ); if ( lineString && !lineString->isClosed() ) { lineString->close(); @@ -202,12 +202,12 @@ void QgsPolygonV2::addInteriorRing( QgsCurveV2* ring ) } else { - QgsCurvePolygonV2::addInteriorRing( ring ); + QgsCurvePolygon::addInteriorRing( ring ); } clearCache(); } -void QgsPolygonV2::setExteriorRing( QgsCurveV2* ring ) +void QgsPolygonV2::setExteriorRing( QgsCurve* ring ) { if ( !ring ) { @@ -218,12 +218,12 @@ void QgsPolygonV2::setExteriorRing( QgsCurveV2* ring ) if ( ring->hasCurvedSegments() ) { //need to segmentize ring as polygon does not support curves - QgsCurveV2* line = ring->segmentize(); + QgsCurve* line = ring->segmentize(); delete ring; ring = line; } - QgsLineStringV2* lineString = dynamic_cast< QgsLineStringV2*>( ring ); + QgsLineString* lineString = dynamic_cast< QgsLineString*>( ring ); if ( lineString && !lineString->isClosed() ) { lineString->close(); @@ -235,7 +235,7 @@ void QgsPolygonV2::setExteriorRing( QgsCurveV2* ring ) setZMTypeFromSubGeometry( ring, QgsWkbTypes::Polygon ); //match dimensionality for rings - Q_FOREACH ( QgsCurveV2* ring, mInteriorRings ) + Q_FOREACH ( QgsCurve* ring, mInteriorRings ) { ring->convertTo( mExteriorRing->wkbType() ); } @@ -243,7 +243,7 @@ void QgsPolygonV2::setExteriorRing( QgsCurveV2* ring ) clearCache(); } -QgsAbstractGeometryV2* QgsPolygonV2::boundary() const +QgsAbstractGeometry* QgsPolygonV2::boundary() const { if ( !mExteriorRing ) return nullptr; @@ -254,7 +254,7 @@ QgsAbstractGeometryV2* QgsPolygonV2::boundary() const } else { - QgsMultiLineStringV2* multiLine = new QgsMultiLineStringV2(); + QgsMultiLineString* multiLine = new QgsMultiLineString(); multiLine->addGeometry( mExteriorRing->clone() ); int nInteriorRings = mInteriorRings.size(); for ( int i = 0; i < nInteriorRings; ++i ) @@ -270,9 +270,9 @@ QgsPolygonV2* QgsPolygonV2::surfaceToPolygon() const return clone(); } -QgsAbstractGeometryV2* QgsPolygonV2::toCurveType() const +QgsAbstractGeometry* QgsPolygonV2::toCurveType() const { - QgsCurvePolygonV2* curvePolygon = new QgsCurvePolygonV2(); + QgsCurvePolygon* curvePolygon = new QgsCurvePolygon(); curvePolygon->setExteriorRing( mExteriorRing->clone() ); int nInteriorRings = mInteriorRings.size(); for ( int i = 0; i < nInteriorRings; ++i ) diff --git a/src/core/geometry/qgspolygonv2.h b/src/core/geometry/qgspolygon.h similarity index 85% rename from src/core/geometry/qgspolygonv2.h rename to src/core/geometry/qgspolygon.h index e510092ad2a..40b366e34e9 100644 --- a/src/core/geometry/qgspolygonv2.h +++ b/src/core/geometry/qgspolygon.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgspolygonv2.h + qgspolygon.h ------------------- begin : September 2014 copyright : (C) 2014 by Marco Hugentobler @@ -18,7 +18,7 @@ #ifndef QGSPOLYGONV2_H #define QGSPOLYGONV2_H -#include "qgscurvepolygonv2.h" +#include "qgscurvepolygon.h" /** \ingroup core * \class QgsPolygonV2 @@ -26,7 +26,7 @@ * \note added in QGIS 2.10 * \note this API is not considered stable and may change for 2.12 */ -class CORE_EXPORT QgsPolygonV2: public QgsCurvePolygonV2 +class CORE_EXPORT QgsPolygonV2: public QgsCurvePolygon { public: QgsPolygonV2(); @@ -51,15 +51,15 @@ class CORE_EXPORT QgsPolygonV2: public QgsCurvePolygonV2 QgsPolygonV2* surfaceToPolygon() const override; - /** 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 override; + QgsAbstractGeometry* toCurveType() const override; - void addInteriorRing( QgsCurveV2* ring ) override; + void addInteriorRing( QgsCurve* ring ) override; //overridden to handle LineString25D rings - virtual void setExteriorRing( QgsCurveV2* ring ) override; + virtual void setExteriorRing( QgsCurve* ring ) override; - virtual QgsAbstractGeometryV2* boundary() const override; + virtual QgsAbstractGeometry* boundary() const override; }; #endif // QGSPOLYGONV2_H diff --git a/src/core/geometry/qgssurfacev2.h b/src/core/geometry/qgssurface.h similarity index 83% rename from src/core/geometry/qgssurfacev2.h rename to src/core/geometry/qgssurface.h index 4325cac387a..c115745a64c 100644 --- a/src/core/geometry/qgssurfacev2.h +++ b/src/core/geometry/qgssurface.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgssurfacev2.h + qgssurface.h -------------- begin : September 2014 copyright : (C) 2014 by Marco Hugentobler @@ -18,15 +18,15 @@ #ifndef QGSSURFACEV2_H #define QGSSURFACEV2_H -#include "qgsabstractgeometryv2.h" +#include "qgsabstractgeometry.h" #include "qgsrectangle.h" class QgsPolygonV2; /** \ingroup core - * \class QgsSurfaceV2 + * \class QgsSurface */ -class CORE_EXPORT QgsSurfaceV2: public QgsAbstractGeometryV2 +class CORE_EXPORT QgsSurface: public QgsAbstractGeometry { public: @@ -45,9 +45,9 @@ class CORE_EXPORT QgsSurfaceV2: public QgsAbstractGeometryV2 protected: - virtual void clearCache() const override { mBoundingBox = QgsRectangle(); mCoordinateSequence.clear(); QgsAbstractGeometryV2::clearCache(); } + virtual void clearCache() const override { mBoundingBox = QgsRectangle(); mCoordinateSequence.clear(); QgsAbstractGeometry::clearCache(); } - mutable QgsCoordinateSequenceV2 mCoordinateSequence; + mutable QgsCoordinateSequence mCoordinateSequence; mutable QgsRectangle mBoundingBox; }; diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp index 7119de3fc2b..5a5b675745e 100644 --- a/src/core/layertree/qgslayertreemodel.cpp +++ b/src/core/layertree/qgslayertreemodel.cpp @@ -28,7 +28,7 @@ #include "qgsmaplayerstylemanager.h" #include "qgspluginlayer.h" #include "qgsrasterlayer.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgssymbollayerutils.h" #include "qgsvectorlayer.h" @@ -1122,7 +1122,7 @@ QList QgsLayerTreeModel::filterLegendNodes( const { Q_FOREACH ( QgsLayerTreeModelLegendNode* node, nodes ) { - QgsSymbol* ruleKey = reinterpret_cast< QgsSymbol* >( node->data( QgsSymbolLegendNode::SymbolV2LegacyRuleKeyRole ).value() ); + QgsSymbol* ruleKey = reinterpret_cast< QgsSymbol* >( node->data( QgsSymbolLegendNode::SymbolLegacyRuleKeyRole ).value() ); bool checked = mLegendFilterUsesExtent || node->data( Qt::CheckStateRole ).toInt() == Qt::Checked; if ( ruleKey && checked ) { diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp index f57f742ad26..ec6e351f284 100644 --- a/src/core/layertree/qgslayertreemodellegendnode.cpp +++ b/src/core/layertree/qgslayertreemodellegendnode.cpp @@ -22,7 +22,7 @@ #include "qgslayertreemodel.h" #include "qgslegendsettings.h" #include "qgsrasterlayer.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgssymbollayerutils.h" #include "qgsimageoperation.h" #include "qgsvectorlayer.h" @@ -131,7 +131,7 @@ QSizeF QgsLayerTreeModelLegendNode::drawSymbolText( const QgsLegendSettings& set // ------------------------------------------------------------------------- -QgsSymbolLegendNode::QgsSymbolLegendNode( QgsLayerTreeLayer* nodeLayer, const QgsLegendSymbolItemV2& item, QObject* parent ) +QgsSymbolLegendNode::QgsSymbolLegendNode( QgsLayerTreeLayer* nodeLayer, const QgsLegendSymbolItem& item, QObject* parent ) : QgsLayerTreeModelLegendNode( nodeLayer, parent ) , mItem( item ) , mSymbolUsesMapUnits( false ) @@ -195,11 +195,11 @@ void QgsSymbolLegendNode::setSymbol( QgsSymbol* symbol ) return; QgsVectorLayer* vlayer = qobject_cast( mLayerNode->layer() ); - if ( !vlayer || !vlayer->rendererV2() ) + if ( !vlayer || !vlayer->renderer() ) return; mItem.setSymbol( symbol ); - vlayer->rendererV2()->setLegendSymbolItem( mItem.ruleKey(), symbol->clone() ); + vlayer->renderer()->setLegendSymbolItem( mItem.ruleKey(), symbol->clone() ); mPixmap = QPixmap(); @@ -238,13 +238,13 @@ QgsRenderContext * QgsSymbolLegendNode::createTemporaryRenderContext() const void QgsSymbolLegendNode::checkAll( bool state ) { QgsVectorLayer* vlayer = qobject_cast( mLayerNode->layer() ); - if ( !vlayer || !vlayer->rendererV2() ) + if ( !vlayer || !vlayer->renderer() ) return; - QgsLegendSymbolListV2 symbolList = vlayer->rendererV2()->legendSymbolItemsV2(); - Q_FOREACH ( const QgsLegendSymbolItemV2& item, symbolList ) + QgsLegendSymbolListV2 symbolList = vlayer->renderer()->legendSymbolItemsV2(); + Q_FOREACH ( const QgsLegendSymbolItem& item, symbolList ) { - vlayer->rendererV2()->checkLegendSymbolItem( item.ruleKey(), state ); + vlayer->renderer()->checkLegendSymbolItem( item.ruleKey(), state ); } emit dataChanged(); @@ -298,16 +298,16 @@ QVariant QgsSymbolLegendNode::data( int role ) const return QVariant(); QgsVectorLayer* vlayer = qobject_cast( mLayerNode->layer() ); - if ( !vlayer || !vlayer->rendererV2() ) + if ( !vlayer || !vlayer->renderer() ) return QVariant(); - return vlayer->rendererV2()->legendSymbolItemChecked( mItem.ruleKey() ) ? Qt::Checked : Qt::Unchecked; + return vlayer->renderer()->legendSymbolItemChecked( mItem.ruleKey() ) ? Qt::Checked : Qt::Unchecked; } else if ( role == RuleKeyRole ) { return mItem.ruleKey(); } - else if ( role == SymbolV2LegacyRuleKeyRole ) + else if ( role == SymbolLegacyRuleKeyRole ) { return QVariant::fromValue( mItem.legacyRuleKey() ); } @@ -328,10 +328,10 @@ bool QgsSymbolLegendNode::setData( const QVariant& value, int role ) return false; QgsVectorLayer* vlayer = qobject_cast( mLayerNode->layer() ); - if ( !vlayer || !vlayer->rendererV2() ) + if ( !vlayer || !vlayer->renderer() ) return false; - vlayer->rendererV2()->checkLegendSymbolItem( mItem.ruleKey(), value == Qt::Checked ); + vlayer->renderer()->checkLegendSymbolItem( mItem.ruleKey(), value == Qt::Checked ); emit dataChanged(); @@ -366,7 +366,7 @@ QSizeF QgsSymbolLegendNode::drawSymbol( const QgsLegendSettings& settings, ItemC double widthOffset = 0; double heightOffset = 0; - if ( QgsMarkerSymbolV2* markerSymbol = dynamic_cast( s ) ) + if ( QgsMarkerSymbol* markerSymbol = dynamic_cast( s ) ) { // allow marker symbol to occupy bigger area if necessary double size = QgsSymbolLayerUtils::convertToPainterUnits( context, markerSymbol->size(), markerSymbol->sizeUnit(), markerSymbol->sizeMapUnitScale() ) / context.scaleFactor(); diff --git a/src/core/layertree/qgslayertreemodellegendnode.h b/src/core/layertree/qgslayertreemodellegendnode.h index 4063d172074..906892aff4c 100644 --- a/src/core/layertree/qgslayertreemodellegendnode.h +++ b/src/core/layertree/qgslayertreemodellegendnode.h @@ -49,7 +49,7 @@ class CORE_EXPORT QgsLayerTreeModelLegendNode : public QObject enum LegendNodeRoles { RuleKeyRole = Qt::UserRole, //!< 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 }; @@ -135,7 +135,7 @@ class CORE_EXPORT QgsLayerTreeModelLegendNode : public QObject QString mUserLabel; }; -#include "qgslegendsymbolitemv2.h" +#include "qgslegendsymbolitem.h" /** \ingroup core * Implementation of legend node interface for displaying preview of vector symbols and their labels @@ -148,7 +148,7 @@ class CORE_EXPORT QgsSymbolLegendNode : public QgsLayerTreeModelLegendNode Q_OBJECT public: - QgsSymbolLegendNode( QgsLayerTreeLayer* nodeLayer, const QgsLegendSymbolItemV2& item, QObject* parent = nullptr ); + QgsSymbolLegendNode( QgsLayerTreeLayer* nodeLayer, const QgsLegendSymbolItem& item, QObject* parent = nullptr ); ~QgsSymbolLegendNode(); virtual Qt::ItemFlags flags() const override; @@ -207,7 +207,7 @@ class CORE_EXPORT QgsSymbolLegendNode : public QgsLayerTreeModelLegendNode void updateLabel(); private: - QgsLegendSymbolItemV2 mItem; + QgsLegendSymbolItem mItem; mutable QPixmap mPixmap; // cached symbol preview QString mLabel; bool mSymbolUsesMapUnits; diff --git a/src/core/pal/layer.cpp b/src/core/pal/layer.cpp index 4845291af8c..5bb787e306c 100644 --- a/src/core/pal/layer.cpp +++ b/src/core/pal/layer.cpp @@ -34,7 +34,7 @@ #include "feature.h" #include "geomfunction.h" #include "util.h" -#include "qgslabelingenginev2.h" +#include "qgslabelingengine.h" #include #include diff --git a/src/core/pal/problem.cpp b/src/core/pal/problem.cpp index e62479a5a06..8f015a15756 100644 --- a/src/core/pal/problem.cpp +++ b/src/core/pal/problem.cpp @@ -41,7 +41,7 @@ #include #include //for INT_MAX -#include "qgslabelingenginev2.h" +#include "qgslabelingengine.h" using namespace pal; diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp index cabe9067b57..e8bdba40cb6 100644 --- a/src/core/qgsapplication.cpp +++ b/src/core/qgsapplication.cpp @@ -736,7 +736,7 @@ QStringList QgsApplication::composerTemplatePaths() return myPathList; } -QString QgsApplication::userStyleV2Path() +QString QgsApplication::userStylePath() { return qgisSettingsDirPath() + QLatin1String( "symbology-ng-style.db" ); } @@ -840,7 +840,7 @@ QString QgsApplication::userThemesFolder() return qgisSettingsDirPath() + QLatin1String( "/themes" ); } -QString QgsApplication::defaultStyleV2Path() +QString QgsApplication::defaultStylePath() { return ABISYM( mPkgDataPath ) + QLatin1String( "/resources/symbology-ng-style.db" ); } diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h index 9b42aeffa71..9bb559f7296 100644 --- a/src/core/qgsapplication.h +++ b/src/core/qgsapplication.h @@ -188,7 +188,7 @@ class CORE_EXPORT QgsApplication : public QApplication 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(); @@ -221,7 +221,7 @@ class CORE_EXPORT QgsApplication : public QApplication 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(); diff --git a/src/core/qgsconditionalstyle.cpp b/src/core/qgsconditionalstyle.cpp index 0a14d6bc134..57cef585bd7 100644 --- a/src/core/qgsconditionalstyle.cpp +++ b/src/core/qgsconditionalstyle.cpp @@ -18,7 +18,7 @@ #include "qgsexpression.h" #include "qgsfontutils.h" #include "qgssymbollayerutils.h" -#include "qgsmarkersymbollayerv2.h" +#include "qgsmarkersymbollayer.h" QgsConditionalLayerStyles::QgsConditionalLayerStyles() : mRowStyles( QList() ) @@ -304,7 +304,7 @@ bool QgsConditionalStyle::readXml( const QDomNode &node ) QDomElement symbolElm = styleElm.firstChildElement( "symbol" ); if ( !symbolElm.isNull() ) { - QgsSymbol* symbol = QgsSymbolLayerUtils::loadSymbol( symbolElm ); + QgsSymbol* symbol = QgsSymbolLayerUtils::loadSymbol( symbolElm ); setSymbol( symbol ); } return true; diff --git a/src/core/qgsdiagramrendererv2.cpp b/src/core/qgsdiagramrenderer.cpp similarity index 93% rename from src/core/qgsdiagramrendererv2.cpp rename to src/core/qgsdiagramrenderer.cpp index fc6952db488..19d421710e6 100644 --- a/src/core/qgsdiagramrendererv2.cpp +++ b/src/core/qgsdiagramrenderer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsdiagramrendererv2.cpp + qgsdiagramrenderer.cpp --------------------- begin : March 2011 copyright : (C) 2011 by Marco Hugentobler @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsdiagramrendererv2.h" +#include "qgsdiagramrenderer.h" #include "qgsvectorlayer.h" #include "diagram/qgstextdiagram.h" #include "diagram/qgspiediagram.h" @@ -91,7 +91,7 @@ QgsDiagramLayerSettings::~QgsDiagramLayerSettings() } Q_NOWARN_DEPRECATED_POP -void QgsDiagramLayerSettings::setRenderer( QgsDiagramRendererV2 *diagramRenderer ) +void QgsDiagramLayerSettings::setRenderer( QgsDiagramRenderer *diagramRenderer ) { if ( diagramRenderer == renderer ) return; @@ -381,26 +381,26 @@ void QgsDiagramSettings::writeXml( QDomElement& rendererElem, QDomDocument& doc, rendererElem.appendChild( categoryElem ); } -QgsDiagramRendererV2::QgsDiagramRendererV2() +QgsDiagramRenderer::QgsDiagramRenderer() : mDiagram( nullptr ) , mShowAttributeLegend( true ) , mShowSizeLegend( false ) - , mSizeLegendSymbol( QgsMarkerSymbolV2::createSimple( QgsStringMap() ) ) + , mSizeLegendSymbol( QgsMarkerSymbol::createSimple( QgsStringMap() ) ) { } -QgsDiagramRendererV2::~QgsDiagramRendererV2() +QgsDiagramRenderer::~QgsDiagramRenderer() { delete mDiagram; } -void QgsDiagramRendererV2::setDiagram( QgsDiagram* d ) +void QgsDiagramRenderer::setDiagram( QgsDiagram* d ) { delete mDiagram; mDiagram = d; } -QgsDiagramRendererV2::QgsDiagramRendererV2( const QgsDiagramRendererV2& other ) +QgsDiagramRenderer::QgsDiagramRenderer( const QgsDiagramRenderer& other ) : mDiagram( other.mDiagram ? other.mDiagram->clone() : nullptr ) , mShowAttributeLegend( other.mShowAttributeLegend ) , mShowSizeLegend( other.mShowSizeLegend ) @@ -408,7 +408,7 @@ QgsDiagramRendererV2::QgsDiagramRendererV2( const QgsDiagramRendererV2& other ) { } -QgsDiagramRendererV2 &QgsDiagramRendererV2::operator=( const QgsDiagramRendererV2 & other ) +QgsDiagramRenderer &QgsDiagramRenderer::operator=( const QgsDiagramRenderer & other ) { mDiagram = other.mDiagram ? other.mDiagram->clone() : nullptr; mShowAttributeLegend = other.mShowAttributeLegend; @@ -417,7 +417,7 @@ QgsDiagramRendererV2 &QgsDiagramRendererV2::operator=( const QgsDiagramRendererV return *this; } -void QgsDiagramRendererV2::renderDiagram( const QgsFeature& feature, QgsRenderContext& c, QPointF pos ) const +void QgsDiagramRenderer::renderDiagram( const QgsFeature& feature, QgsRenderContext& c, QPointF pos ) const { if ( !mDiagram ) { @@ -433,7 +433,7 @@ void QgsDiagramRendererV2::renderDiagram( const QgsFeature& feature, QgsRenderCo mDiagram->renderDiagram( feature, c, s, pos ); } -QSizeF QgsDiagramRendererV2::sizeMapUnits( const QgsFeature& feature, const QgsRenderContext& c ) const +QSizeF QgsDiagramRenderer::sizeMapUnits( const QgsFeature& feature, const QgsRenderContext& c ) const { QgsDiagramSettings s; if ( !diagramSettings( feature, c, s ) ) @@ -451,7 +451,7 @@ QSizeF QgsDiagramRendererV2::sizeMapUnits( const QgsFeature& feature, const QgsR return size; } -QSet QgsDiagramRendererV2::referencedFields( const QgsExpressionContext &context, const QgsFields &fields ) const +QSet QgsDiagramRenderer::referencedFields( const QgsExpressionContext &context, const QgsFields &fields ) const { Q_UNUSED( fields ); @@ -471,7 +471,7 @@ QSet QgsDiagramRendererV2::referencedFields( const QgsExpressionContext return referenced; } -void QgsDiagramRendererV2::convertSizeToMapUnits( QSizeF& size, const QgsRenderContext& context ) const +void QgsDiagramRenderer::convertSizeToMapUnits( QSizeF& size, const QgsRenderContext& context ) const { if ( !size.isValid() ) { @@ -483,7 +483,7 @@ void QgsDiagramRendererV2::convertSizeToMapUnits( QSizeF& size, const QgsRenderC size.rheight() *= pixelToMap; } -int QgsDiagramRendererV2::dpiPaintDevice( const QPainter* painter ) +int QgsDiagramRenderer::dpiPaintDevice( const QPainter* painter ) { if ( painter ) { @@ -496,7 +496,7 @@ int QgsDiagramRendererV2::dpiPaintDevice( const QPainter* painter ) return -1; } -void QgsDiagramRendererV2::_readXml( const QDomElement& elem, const QgsVectorLayer* layer ) +void QgsDiagramRenderer::_readXml( const QDomElement& elem, const QgsVectorLayer* layer ) { Q_UNUSED( layer ) @@ -523,11 +523,11 @@ void QgsDiagramRendererV2::_readXml( const QDomElement& elem, const QgsVectorLay QDomElement sizeLegendSymbolElem = elem.firstChildElement( "symbol" ); if ( !sizeLegendSymbolElem.isNull() && sizeLegendSymbolElem.attribute( "name" ) == "sizeSymbol" ) { - mSizeLegendSymbol.reset( QgsSymbolLayerUtils::loadSymbol( sizeLegendSymbolElem ) ); + mSizeLegendSymbol.reset( QgsSymbolLayerUtils::loadSymbol( sizeLegendSymbolElem ) ); } } -void QgsDiagramRendererV2::_writeXml( QDomElement& rendererElem, QDomDocument& doc, const QgsVectorLayer* layer ) const +void QgsDiagramRenderer::_writeXml( QDomElement& rendererElem, QDomDocument& doc, const QgsVectorLayer* layer ) const { Q_UNUSED( doc ); Q_UNUSED( layer ) @@ -542,7 +542,7 @@ void QgsDiagramRendererV2::_writeXml( QDomElement& rendererElem, QDomDocument& d rendererElem.appendChild( sizeLegendSymbolElem ); } -QgsSingleCategoryDiagramRenderer::QgsSingleCategoryDiagramRenderer(): QgsDiagramRendererV2() +QgsSingleCategoryDiagramRenderer::QgsSingleCategoryDiagramRenderer(): QgsDiagramRenderer() { } @@ -595,7 +595,7 @@ void QgsSingleCategoryDiagramRenderer::writeXml( QDomElement& layerElem, QDomDoc } -QgsLinearlyInterpolatedDiagramRenderer::QgsLinearlyInterpolatedDiagramRenderer(): QgsDiagramRendererV2() +QgsLinearlyInterpolatedDiagramRenderer::QgsLinearlyInterpolatedDiagramRenderer(): QgsDiagramRenderer() { mInterpolationSettings.classificationAttributeIsExpression = false; } @@ -630,7 +630,7 @@ QList QgsLinearlyInterpolatedDiagramRenderer::diagramAttributes() const QSet QgsLinearlyInterpolatedDiagramRenderer::referencedFields( const QgsExpressionContext &context, const QgsFields& fields ) const { - QSet< QString > referenced = QgsDiagramRendererV2::referencedFields( context, fields ); + QSet< QString > referenced = QgsDiagramRenderer::referencedFields( context, fields ); if ( mInterpolationSettings.classificationAttributeIsExpression ) { QgsExpression* expression = mDiagram->getExpression( mInterpolationSettings.classificationAttributeExpression, context ); @@ -711,7 +711,7 @@ QList< QgsLayerTreeModelLegendNode* > QgsDiagramSettings::legendItems( QgsLayerT return list; } -QList< QgsLayerTreeModelLegendNode* > QgsDiagramRendererV2::legendItems( QgsLayerTreeLayer* ) const +QList< QgsLayerTreeModelLegendNode* > QgsDiagramRenderer::legendItems( QgsLayerTreeLayer* ) const { return QList< QgsLayerTreeModelLegendNode * >(); } @@ -737,8 +737,8 @@ QList< QgsLayerTreeModelLegendNode* > QgsLinearlyInterpolatedDiagramRenderer::le Q_FOREACH ( double v, QgsSymbolLayerUtils::prettyBreaks( mInterpolationSettings.lowerValue, mInterpolationSettings.upperValue, 4 ) ) { double size = mDiagram->legendSize( v, mSettings, mInterpolationSettings ); - QgsLegendSymbolItemV2 si( mSizeLegendSymbol.data(), QString::number( v ), QString() ); - QgsMarkerSymbolV2 * s = static_cast( si.symbol() ); + QgsLegendSymbolItem si( mSizeLegendSymbol.data(), QString::number( v ), QString() ); + QgsMarkerSymbol * s = static_cast( si.symbol() ); s->setSize( size ); s->setSizeUnit( mSettings.sizeType ); s->setSizeMapUnitScale( mSettings.sizeScale ); diff --git a/src/core/qgsdiagramrendererv2.h b/src/core/qgsdiagramrenderer.h similarity index 96% rename from src/core/qgsdiagramrendererv2.h rename to src/core/qgsdiagramrenderer.h index 5f211c42a55..2ffc3fa61ca 100644 --- a/src/core/qgsdiagramrendererv2.h +++ b/src/core/qgsdiagramrenderer.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsdiagramrendererv2.h + qgsdiagramrenderer.h --------------------- begin : March 2011 copyright : (C) 2011 by Marco Hugentobler @@ -28,7 +28,7 @@ #include "qgssymbol.h" class QgsDiagram; -class QgsDiagramRendererV2; +class QgsDiagramRenderer; class QgsFeature; class QgsRenderContext; class QDomElement; @@ -202,25 +202,25 @@ class CORE_EXPORT QgsDiagramLayerSettings * @note added in QGIS 2.16 */ // TODO QGIS 3.0 - rename to renderer() - QgsDiagramRendererV2* getRenderer() { return renderer; } + QgsDiagramRenderer* getRenderer() { return renderer; } /** 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 { return renderer; } + const QgsDiagramRenderer* getRenderer() const { return renderer; } /** 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 ); + void setRenderer( QgsDiagramRenderer* diagramRenderer ); //! 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. @@ -413,20 +413,20 @@ class CORE_EXPORT QgsDiagramInterpolationSettings /** \ingroup core - * \class QgsDiagramRendererV2 + * \class QgsDiagramRenderer * \brief Evaluates and returns the diagram settings relating to a diagram for a specific feature. */ -class CORE_EXPORT QgsDiagramRendererV2 +class CORE_EXPORT QgsDiagramRenderer { 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; + virtual QgsDiagramRenderer* clone() const = 0; /** 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; @@ -498,7 +498,7 @@ class CORE_EXPORT QgsDiagramRendererV2 * @see setSizeLegendSymbol() * @see sizeLegend() */ - QgsMarkerSymbolV2* sizeLegendSymbol() const { return mSizeLegendSymbol.data(); } + QgsMarkerSymbol* sizeLegendSymbol() const { return mSizeLegendSymbol.data(); } /** Sets the marker symbol used for rendering the diagram size legend. * @param symbol marker symbol, ownership is transferred to the renderer. @@ -506,11 +506,11 @@ class CORE_EXPORT QgsDiagramRendererV2 * @see sizeLegendSymbol() * @see setSizeLegend() */ - void setSizeLegendSymbol( QgsMarkerSymbolV2* symbol ) { mSizeLegendSymbol.reset( symbol ); } + void setSizeLegendSymbol( QgsMarkerSymbol* symbol ) { mSizeLegendSymbol.reset( symbol ); } 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 @@ -542,13 +542,13 @@ class CORE_EXPORT QgsDiagramRendererV2 bool mShowSizeLegend; //! Marker symbol to use in size legends - QScopedPointer< QgsMarkerSymbolV2 > mSizeLegendSymbol; + QScopedPointer< QgsMarkerSymbol > mSizeLegendSymbol; }; /** \ingroup core * Renders the diagrams for all features with the same settings */ -class CORE_EXPORT QgsSingleCategoryDiagramRenderer : public QgsDiagramRendererV2 +class CORE_EXPORT QgsSingleCategoryDiagramRenderer : public QgsDiagramRenderer { public: QgsSingleCategoryDiagramRenderer(); @@ -581,7 +581,7 @@ class CORE_EXPORT QgsSingleCategoryDiagramRenderer : public QgsDiagramRendererV2 /** \ingroup core * \class QgsLinearlyInterpolatedDiagramRenderer */ -class CORE_EXPORT QgsLinearlyInterpolatedDiagramRenderer : public QgsDiagramRendererV2 +class CORE_EXPORT QgsLinearlyInterpolatedDiagramRenderer : public QgsDiagramRenderer { public: QgsLinearlyInterpolatedDiagramRenderer(); diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp index 6970db55a08..ab9855911e5 100644 --- a/src/core/qgsdistancearea.cpp +++ b/src/core/qgsdistancearea.cpp @@ -24,16 +24,16 @@ #include "qgscoordinatetransform.h" #include "qgscoordinatereferencesystem.h" #include "qgsgeometry.h" -#include "qgsgeometrycollectionv2.h" +#include "qgsgeometrycollection.h" #include "qgsdistancearea.h" #include "qgsapplication.h" #include "qgslogger.h" #include "qgsmessagelog.h" -#include "qgsmultisurfacev2.h" +#include "qgsmultisurface.h" #include "qgswkbptr.h" -#include "qgslinestringv2.h" -#include "qgspolygonv2.h" -#include "qgssurfacev2.h" +#include "qgslinestring.h" +#include "qgspolygon.h" +#include "qgssurface.h" #include "qgsunittypes.h" #include "qgscsexception.h" @@ -262,7 +262,7 @@ bool QgsDistanceArea::setEllipsoid( double semiMajor, double semiMinor ) return true; } -double QgsDistanceArea::measure( const QgsAbstractGeometryV2* geomV2, MeasureType type ) const +double QgsDistanceArea::measure( const QgsAbstractGeometry* geomV2, MeasureType type ) const { if ( !geomV2 ) { @@ -296,7 +296,7 @@ double QgsDistanceArea::measure( const QgsAbstractGeometryV2* geomV2, MeasureTyp else { //multigeom is sum of measured parts - const QgsGeometryCollectionV2* collection = dynamic_cast( geomV2 ); + const QgsGeometryCollection* collection = dynamic_cast( geomV2 ); if ( collection ) { double sum = 0; @@ -309,32 +309,32 @@ double QgsDistanceArea::measure( const QgsAbstractGeometryV2* geomV2, MeasureTyp if ( measureType == Length ) { - const QgsCurveV2* curve = dynamic_cast( geomV2 ); + const QgsCurve* curve = dynamic_cast( geomV2 ); if ( !curve ) { return 0.0; } - QgsLineStringV2* lineString = curve->curveToLine(); + QgsLineString* lineString = curve->curveToLine(); double length = measureLine( lineString ); delete lineString; return length; } else { - const QgsSurfaceV2* surface = dynamic_cast( geomV2 ); + const QgsSurface* surface = dynamic_cast( geomV2 ); if ( !surface ) return 0.0; QgsPolygonV2* polygon = surface->surfaceToPolygon(); double area = 0; - const QgsCurveV2* outerRing = polygon->exteriorRing(); + const QgsCurve* outerRing = polygon->exteriorRing(); area += measurePolygon( outerRing ); for ( int i = 0; i < polygon->numInteriorRings(); ++i ) { - const QgsCurveV2* innerRing = polygon->interiorRing( i ); + const QgsCurve* innerRing = polygon->interiorRing( i ); area -= measurePolygon( innerRing ); } delete polygon; @@ -348,7 +348,7 @@ double QgsDistanceArea::measure( const QgsGeometry *geometry ) const if ( !geometry ) return 0.0; - const QgsAbstractGeometryV2* geomV2 = geometry->geometry(); + const QgsAbstractGeometry* geomV2 = geometry->geometry(); return measure( geomV2 ); } @@ -357,7 +357,7 @@ double QgsDistanceArea::measureArea( const QgsGeometry* geometry ) const if ( !geometry ) return 0.0; - const QgsAbstractGeometryV2* geomV2 = geometry->geometry(); + const QgsAbstractGeometry* geomV2 = geometry->geometry(); return measure( geomV2, Area ); } @@ -366,7 +366,7 @@ double QgsDistanceArea::measureArea( const QgsGeometry& geometry ) const if ( geometry.isEmpty() ) return 0.0; - const QgsAbstractGeometryV2* geomV2 = geometry.geometry(); + const QgsAbstractGeometry* geomV2 = geometry.geometry(); return measure( geomV2, Area ); } @@ -375,7 +375,7 @@ double QgsDistanceArea::measureLength( const QgsGeometry* geometry ) const if ( !geometry ) return 0.0; - const QgsAbstractGeometryV2* geomV2 = geometry->geometry(); + const QgsAbstractGeometry* geomV2 = geometry->geometry(); return measure( geomV2, Length ); } @@ -384,7 +384,7 @@ double QgsDistanceArea::measureLength( const QgsGeometry& geometry ) const if ( geometry.isEmpty() ) return 0.0; - const QgsAbstractGeometryV2* geomV2 = geometry.geometry(); + const QgsAbstractGeometry* geomV2 = geometry.geometry(); return measure( geomV2, Length ); } @@ -401,7 +401,7 @@ double QgsDistanceArea::measurePerimeter( const QgsGeometry& geometry ) const if ( geometry.isEmpty() ) return 0.0; - const QgsAbstractGeometryV2* geomV2 = geometry.geometry(); + const QgsAbstractGeometry* geomV2 = geometry.geometry(); if ( !geomV2 || geomV2->dimension() < 2 ) { return 0.0; @@ -413,24 +413,24 @@ double QgsDistanceArea::measurePerimeter( const QgsGeometry& geometry ) const } //create list with (single) surfaces - QList< const QgsSurfaceV2* > surfaces; - const QgsSurfaceV2* surf = dynamic_cast( geomV2 ); + QList< const QgsSurface* > surfaces; + const QgsSurface* surf = dynamic_cast( geomV2 ); if ( surf ) { surfaces.append( surf ); } - const QgsMultiSurfaceV2* multiSurf = dynamic_cast( geomV2 ); + const QgsMultiSurface* multiSurf = dynamic_cast( geomV2 ); if ( multiSurf ) { surfaces.reserve(( surf ? 1 : 0 ) + multiSurf->numGeometries() ); for ( int i = 0; i < multiSurf->numGeometries(); ++i ) { - surfaces.append( static_cast( multiSurf->geometryN( i ) ) ); + surfaces.append( static_cast( multiSurf->geometryN( i ) ) ); } } double length = 0; - QList::const_iterator surfaceIt = surfaces.constBegin(); + QList::const_iterator surfaceIt = surfaces.constBegin(); for ( ; surfaceIt != surfaces.constEnd(); ++surfaceIt ) { if ( !*surfaceIt ) @@ -439,7 +439,7 @@ double QgsDistanceArea::measurePerimeter( const QgsGeometry& geometry ) const } QgsPolygonV2* poly = ( *surfaceIt )->surfaceToPolygon(); - const QgsCurveV2* outerRing = poly->exteriorRing(); + const QgsCurve* outerRing = poly->exteriorRing(); if ( outerRing ) { length += measure( outerRing ); @@ -454,14 +454,14 @@ double QgsDistanceArea::measurePerimeter( const QgsGeometry& geometry ) const return length; } -double QgsDistanceArea::measureLine( const QgsCurveV2* curve ) const +double QgsDistanceArea::measureLine( const QgsCurve* curve ) const { if ( !curve ) { return 0.0; } - QgsPointSequenceV2 linePointsV2; + QgsPointSequence linePointsV2; QList linePoints; curve->points( linePointsV2 ); QgsGeometry::convertPointList( linePointsV2, linePoints ); @@ -658,14 +658,14 @@ QgsConstWkbPtr QgsDistanceArea::measurePolygon( QgsConstWkbPtr wkbPtr, double* a return wkbPtr; } -double QgsDistanceArea::measurePolygon( const QgsCurveV2* curve ) const +double QgsDistanceArea::measurePolygon( const QgsCurve* curve ) const { if ( !curve ) { return 0.0; } - QgsPointSequenceV2 linePointsV2; + QgsPointSequence linePointsV2; curve->points( linePointsV2 ); QList linePoints; QgsGeometry::convertPointList( linePointsV2, linePoints ); diff --git a/src/core/qgsdistancearea.h b/src/core/qgsdistancearea.h index f9347f903a9..78f3c0f2650 100644 --- a/src/core/qgsdistancearea.h +++ b/src/core/qgsdistancearea.h @@ -21,8 +21,8 @@ #include "qgsunittypes.h" class QgsGeometry; -class QgsAbstractGeometryV2; -class QgsCurveV2; +class QgsAbstractGeometry; +class QgsCurve; class QgsConstWkbPtr; /** \ingroup core @@ -375,9 +375,9 @@ class CORE_EXPORT QgsDistanceArea double getQ( double x ) const; double getQbar( double x ) const; - double measure( const QgsAbstractGeometryV2* geomV2, MeasureType type = Default ) const; - double measureLine( const QgsCurveV2* curve ) const; - double measurePolygon( const QgsCurveV2* curve ) const; + double measure( const QgsAbstractGeometry* geomV2, MeasureType type = Default ) const; + double measureLine( const QgsCurve* curve ) const; + double measurePolygon( const QgsCurve* curve ) const; // temporary area measurement stuff diff --git a/src/core/qgseditformconfig.cpp b/src/core/qgseditformconfig.cpp index 97c78e5a20a..c8734a8bf9c 100644 --- a/src/core/qgseditformconfig.cpp +++ b/src/core/qgseditformconfig.cpp @@ -30,12 +30,12 @@ QString QgsEditFormConfig::widgetType( int fieldIdx ) const if ( fieldIdx < 0 || fieldIdx >= mFields.count() ) return "TextEdit"; - return mEditorWidgetV2Types.value( mFields.at( fieldIdx ).name(), "TextEdit" ); + return mEditorWidgetTypes.value( mFields.at( fieldIdx ).name(), "TextEdit" ); } QString QgsEditFormConfig::widgetType( const QString& fieldName ) const { - return mEditorWidgetV2Types.value( fieldName, "TextEdit" ); + return mEditorWidgetTypes.value( fieldName, "TextEdit" ); } QgsEditorWidgetConfig QgsEditFormConfig::widgetConfig( int fieldIdx ) const @@ -59,7 +59,7 @@ void QgsEditFormConfig::setFields( const QgsFields& fields ) void QgsEditFormConfig::setWidgetType( int attrIdx, const QString& widgetType ) { if ( attrIdx >= 0 && attrIdx < mFields.count() ) - mEditorWidgetV2Types[ mFields.at( attrIdx ).name()] = widgetType; + mEditorWidgetTypes[ mFields.at( attrIdx ).name()] = widgetType; } void QgsEditFormConfig::setWidgetConfig( int attrIdx, const QgsEditorWidgetConfig& config ) diff --git a/src/core/qgseditformconfig.h b/src/core/qgseditformconfig.h index d85e3e17c95..9ae85fc895c 100644 --- a/src/core/qgseditformconfig.h +++ b/src/core/qgseditformconfig.h @@ -32,7 +32,7 @@ class QgsRelationManager; * * This can either be a container which will be represented on the screen * as a tab widget or ca collapsible group box. Or it can be a field which will - * then be represented based on the QgsEditorWidgetV2 type and configuration. + * then be represented based on the QgsEditorWidget type and configuration. * Or it can be a relation and embed the form of several children of another * layer. */ @@ -685,7 +685,7 @@ class CORE_EXPORT QgsEditFormConfig : public QObject QMap< QString, bool> mLabelOnTop; QMap< QString, bool> mNotNull; - QMap mEditorWidgetV2Types; + QMap mEditorWidgetTypes; QMap mWidgetConfigs; /** Defines the default layout to use for the attribute editor (Drag and drop, UI File, Generated) */ diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp index c7cb23f2737..625bb6c6d3a 100644 --- a/src/core/qgsexpression.cpp +++ b/src/core/qgsexpression.cpp @@ -38,17 +38,17 @@ #include "qgsogcutils.h" #include "qgsvectorlayer.h" #include "qgssymbollayerutils.h" -#include "qgsvectorcolorrampv2.h" -#include "qgsstylev2.h" +#include "qgsvectorcolorramp.h" +#include "qgsstyle.h" #include "qgsexpressioncontext.h" #include "qgsproject.h" #include "qgsstringutils.h" -#include "qgsgeometrycollectionv2.h" +#include "qgsgeometrycollection.h" #include "qgspointv2.h" -#include "qgspolygonv2.h" -#include "qgsmultipointv2.h" -#include "qgsmultilinestringv2.h" -#include "qgscurvepolygonv2.h" +#include "qgspolygon.h" +#include "qgsmultipoint.h" +#include "qgsmultilinestring.h" +#include "qgscurvepolygon.h" #include "qgsexpressionprivate.h" #include "qgsexpressionsorter.h" @@ -1643,9 +1643,9 @@ static QVariant fcnNodesToPoints( const QVariantList& values, const QgsExpressio QgsMultiPointV2* mp = new QgsMultiPointV2(); - Q_FOREACH ( const QgsRingSequenceV2 &part, geom.geometry()->coordinateSequence() ) + Q_FOREACH ( const QgsRingSequence &part, geom.geometry()->coordinateSequence() ) { - Q_FOREACH ( const QgsPointSequenceV2 &ring, part ) + Q_FOREACH ( const QgsPointSequence &ring, part ) { bool skipLast = false; if ( ignoreClosing && ring.count() > 2 && ring.first() == ring.last() ) @@ -1670,16 +1670,16 @@ static QVariant fcnSegmentsToLines( const QVariantList& values, const QgsExpress if ( geom.isEmpty() ) return QVariant(); - QList< QgsLineStringV2* > linesToProcess = QgsGeometryUtils::extractLineStrings( geom.geometry() ); + QList< QgsLineString* > linesToProcess = QgsGeometryUtils::extractLineStrings( geom.geometry() ); //ok, now we have a complete list of segmentized lines from the geometry - QgsMultiLineStringV2* ml = new QgsMultiLineStringV2(); - Q_FOREACH ( QgsLineStringV2* line, linesToProcess ) + QgsMultiLineString* ml = new QgsMultiLineString(); + Q_FOREACH ( QgsLineString* line, linesToProcess ) { for ( int i = 0; i < line->numPoints() - 1; ++i ) { - QgsLineStringV2* segment = new QgsLineStringV2(); - segment->setPoints( QgsPointSequenceV2() + QgsLineString* segment = new QgsLineString(); + segment->setPoints( QgsPointSequence() << line->pointN( i ) << line->pointN( i + 1 ) ); ml->addGeometry( segment ); @@ -1697,7 +1697,7 @@ static QVariant fcnInteriorRingN( const QVariantList& values, const QgsExpressio if ( geom.isEmpty() ) return QVariant(); - QgsCurvePolygonV2* curvePolygon = dynamic_cast< QgsCurvePolygonV2* >( geom.geometry() ); + QgsCurvePolygon* curvePolygon = dynamic_cast< QgsCurvePolygon* >( geom.geometry() ); if ( !curvePolygon ) return QVariant(); @@ -1707,7 +1707,7 @@ static QVariant fcnInteriorRingN( const QVariantList& values, const QgsExpressio if ( idx >= curvePolygon->numInteriorRings() || idx < 0 ) return QVariant(); - QgsCurveV2* curve = static_cast< QgsCurveV2* >( curvePolygon->interiorRing( idx )->clone() ); + QgsCurve* curve = static_cast< QgsCurve* >( curvePolygon->interiorRing( idx )->clone() ); QVariant result = curve ? QVariant::fromValue( QgsGeometry( curve ) ) : QVariant(); return result; } @@ -1719,7 +1719,7 @@ static QVariant fcnGeometryN( const QVariantList& values, const QgsExpressionCon if ( geom.isEmpty() ) return QVariant(); - QgsGeometryCollectionV2* collection = dynamic_cast< QgsGeometryCollectionV2* >( geom.geometry() ); + QgsGeometryCollection* collection = dynamic_cast< QgsGeometryCollection* >( geom.geometry() ); if ( !collection ) return QVariant(); @@ -1729,7 +1729,7 @@ static QVariant fcnGeometryN( const QVariantList& values, const QgsExpressionCon if ( idx < 0 || idx >= collection->numGeometries() ) return QVariant(); - QgsAbstractGeometryV2* part = collection->geometryN( idx )->clone(); + QgsAbstractGeometry* part = collection->geometryN( idx )->clone(); QVariant result = part ? QVariant::fromValue( QgsGeometry( part ) ) : QVariant(); return result; } @@ -1741,7 +1741,7 @@ static QVariant fcnBoundary( const QVariantList& values, const QgsExpressionCont if ( geom.isEmpty() ) return QVariant(); - QgsAbstractGeometryV2* boundary = geom.geometry()->boundary(); + QgsAbstractGeometry* boundary = geom.geometry()->boundary(); if ( !boundary ) return QVariant(); @@ -1801,7 +1801,7 @@ static QVariant fcnMakeLine( const QVariantList& values, const QgsExpressionCont return QVariant(); } - QgsLineStringV2* lineString = new QgsLineStringV2(); + QgsLineString* lineString = new QgsLineString(); lineString->clear(); Q_FOREACH ( const QVariant& value, values ) @@ -1836,7 +1836,7 @@ static QVariant fcnMakePolygon( const QVariantList& values, const QgsExpressionC return QVariant(); QgsPolygonV2* polygon = new QgsPolygonV2(); - polygon->setExteriorRing( dynamic_cast< QgsCurveV2* >( outerRing.geometry()->clone() ) ); + polygon->setExteriorRing( dynamic_cast< QgsCurve* >( outerRing.geometry()->clone() ) ); for ( int i = 1; i < values.count(); ++i ) { @@ -1847,7 +1847,7 @@ static QVariant fcnMakePolygon( const QVariantList& values, const QgsExpressionC if ( ringGeom.type() != QgsWkbTypes::LineGeometry || ringGeom.isMultipart() || ringGeom.isEmpty() ) continue; - polygon->addInteriorRing( dynamic_cast< QgsCurveV2* >( ringGeom.geometry()->clone() ) ); + polygon->addInteriorRing( dynamic_cast< QgsCurve* >( ringGeom.geometry()->clone() ) ); } return QVariant::fromValue( QgsGeometry( polygon ) ); @@ -2009,17 +2009,17 @@ static QVariant fcnGeomNumInteriorRings( const QVariantList& values, const QgsEx if ( geom.isEmpty() ) return QVariant(); - QgsCurvePolygonV2* curvePolygon = dynamic_cast< QgsCurvePolygonV2* >( geom.geometry() ); + QgsCurvePolygon* curvePolygon = dynamic_cast< QgsCurvePolygon* >( geom.geometry() ); if ( curvePolygon ) return QVariant( curvePolygon->numInteriorRings() ); - QgsGeometryCollectionV2* collection = dynamic_cast< QgsGeometryCollectionV2* >( geom.geometry() ); + QgsGeometryCollection* collection = dynamic_cast< QgsGeometryCollection* >( geom.geometry() ); if ( collection ) { //find first CurvePolygon in collection for ( int i = 0; i < collection->numGeometries(); ++i ) { - curvePolygon = dynamic_cast< QgsCurvePolygonV2*>( collection->geometryN( i ) ); + curvePolygon = dynamic_cast< QgsCurvePolygon*>( collection->geometryN( i ) ); if ( !curvePolygon ) continue; @@ -2037,19 +2037,19 @@ static QVariant fcnGeomNumRings( const QVariantList& values, const QgsExpression if ( geom.isEmpty() ) return QVariant(); - QgsCurvePolygonV2* curvePolygon = dynamic_cast< QgsCurvePolygonV2* >( geom.geometry() ); + QgsCurvePolygon* curvePolygon = dynamic_cast< QgsCurvePolygon* >( geom.geometry() ); if ( curvePolygon ) return QVariant( curvePolygon->ringCount() ); bool foundPoly = false; int ringCount = 0; - QgsGeometryCollectionV2* collection = dynamic_cast< QgsGeometryCollectionV2* >( geom.geometry() ); + QgsGeometryCollection* collection = dynamic_cast< QgsGeometryCollection* >( geom.geometry() ); if ( collection ) { //find CurvePolygons in collection for ( int i = 0; i < collection->numGeometries(); ++i ) { - curvePolygon = dynamic_cast< QgsCurvePolygonV2*>( collection->geometryN( i ) ); + curvePolygon = dynamic_cast< QgsCurvePolygon*>( collection->geometryN( i ) ); if ( !curvePolygon ) continue; @@ -2114,7 +2114,7 @@ static QVariant fcnIsClosed( const QVariantList& values, const QgsExpressionCont if ( fGeom.isEmpty() ) return QVariant(); - QgsCurveV2* curve = dynamic_cast< QgsCurveV2* >( fGeom.geometry() ); + QgsCurve* curve = dynamic_cast< QgsCurve* >( fGeom.geometry() ); if ( !curve ) return QVariant(); @@ -2256,11 +2256,11 @@ static QVariant fcnReverse( const QVariantList& values, const QgsExpressionConte if ( fGeom.isEmpty() ) return QVariant(); - QgsCurveV2* curve = dynamic_cast< QgsCurveV2* >( fGeom.geometry() ); + QgsCurve* curve = dynamic_cast< QgsCurve* >( fGeom.geometry() ); if ( !curve ) return QVariant(); - QgsCurveV2* reversed = curve->reversed(); + QgsCurve* reversed = curve->reversed(); QVariant result = reversed ? QVariant::fromValue( QgsGeometry( reversed ) ) : QVariant(); return result; } @@ -2271,11 +2271,11 @@ static QVariant fcnExteriorRing( const QVariantList& values, const QgsExpression if ( fGeom.isEmpty() ) return QVariant(); - QgsCurvePolygonV2* curvePolygon = dynamic_cast< QgsCurvePolygonV2* >( fGeom.geometry() ); + QgsCurvePolygon* curvePolygon = dynamic_cast< QgsCurvePolygon* >( fGeom.geometry() ); if ( !curvePolygon || !curvePolygon->exteriorRing() ) return QVariant(); - QgsCurveV2* exterior = static_cast< QgsCurveV2* >( curvePolygon->exteriorRing()->clone() ); + QgsCurve* exterior = static_cast< QgsCurve* >( curvePolygon->exteriorRing()->clone() ); QVariant result = exterior ? QVariant::fromValue( QgsGeometry( exterior ) ) : QVariant(); return result; } @@ -2454,7 +2454,7 @@ static QVariant fcnOrderParts( const QVariantList& values, const QgsExpressionCo unconstedContext = new QgsExpressionContext(); } - QgsGeometryCollectionV2* collection = dynamic_cast( fGeom.geometry() ); + QgsGeometryCollection* collection = dynamic_cast( fGeom.geometry() ); Q_ASSERT( collection ); // Should have failed the multipart check above QgsFeatureRequest::OrderBy orderBy; @@ -2470,7 +2470,7 @@ static QVariant fcnOrderParts( const QVariantList& values, const QgsExpressionCo sorter.sortFeatures( partFeatures, unconstedContext ); - QgsGeometryCollectionV2* orderedGeom = dynamic_cast( fGeom.geometry()->clone() ); + QgsGeometryCollection* orderedGeom = dynamic_cast( fGeom.geometry()->clone() ); Q_ASSERT( orderedGeom ); @@ -2612,7 +2612,7 @@ static QVariant fncColorRgba( const QVariantList &values, const QgsExpressionCon QVariant fcnRampColor( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent ) { QString rampName = getStringValue( values.at( 0 ), parent ); - const QgsVectorColorRampV2 *mRamp = QgsStyleV2::defaultStyle()->colorRampRef( rampName ); + const QgsVectorColorRamp *mRamp = QgsStyle::defaultStyle()->colorRampRef( rampName ); if ( ! mRamp ) { parent->setEvalErrorString( QObject::tr( "\"%1\" is not a valid color ramp" ).arg( rampName ) ); diff --git a/src/core/qgsexpressioncontext.cpp b/src/core/qgsexpressioncontext.cpp index cffcbcb02db..fdf3c23985d 100644 --- a/src/core/qgsexpressioncontext.cpp +++ b/src/core/qgsexpressioncontext.cpp @@ -776,7 +776,7 @@ QgsExpressionContextScope* QgsExpressionContextUtils::updateSymbolScope( const Q symbolScope->addVariable( QgsExpressionContextScope::StaticVariable( QgsExpressionContext::EXPR_SYMBOL_COLOR, symbol ? symbol->color() : QColor(), true ) ); double angle = 0.0; - const QgsMarkerSymbolV2* markerSymbol = dynamic_cast< const QgsMarkerSymbolV2* >( symbol ); + const QgsMarkerSymbol* markerSymbol = dynamic_cast< const QgsMarkerSymbol* >( symbol ); if ( markerSymbol ) { angle = markerSymbol->angle(); diff --git a/src/core/qgslabelfeature.h b/src/core/qgslabelfeature.h index a6f65b05a04..c7fdeb2ff5a 100644 --- a/src/core/qgslabelfeature.h +++ b/src/core/qgslabelfeature.h @@ -26,7 +26,7 @@ class QgsGeometry; * Individual label providers may create subclasses of QgsLabelFeature in order to add * more data to the instances that will be later used for drawing of labels. * - * @note this class is not a part of public API yet. See notes in QgsLabelingEngineV2 + * @note this class is not a part of public API yet. See notes in QgsLabelingEngine * @note added in QGIS 2.12 * @note not available in Python bindings */ diff --git a/src/core/qgslabelingenginev2.cpp b/src/core/qgslabelingengine.cpp similarity index 95% rename from src/core/qgslabelingenginev2.cpp rename to src/core/qgslabelingengine.cpp index ea7925935ea..82f591b18af 100644 --- a/src/core/qgslabelingenginev2.cpp +++ b/src/core/qgslabelingengine.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgslabelingenginev2.cpp + qgslabelingengine.cpp -------------------------------------- Date : September 2015 Copyright : (C) 2015 by Martin Dobias @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include "qgslabelingenginev2.h" +#include "qgslabelingengine.h" #include "qgslogger.h" #include "qgsproject.h" @@ -68,7 +68,7 @@ class QgsLabelSorter }; -QgsLabelingEngineV2::QgsLabelingEngineV2() +QgsLabelingEngine::QgsLabelingEngine() : mFlags( RenderOutlineLabels | UsePartialCandidates ) , mSearchMethod( QgsPalLabeling::Chain ) , mCandPoint( 16 ) @@ -79,20 +79,20 @@ QgsLabelingEngineV2::QgsLabelingEngineV2() mResults = new QgsLabelingResults; } -QgsLabelingEngineV2::~QgsLabelingEngineV2() +QgsLabelingEngine::~QgsLabelingEngine() { delete mResults; qDeleteAll( mProviders ); qDeleteAll( mSubProviders ); } -void QgsLabelingEngineV2::addProvider( QgsAbstractLabelProvider* provider ) +void QgsLabelingEngine::addProvider( QgsAbstractLabelProvider* provider ) { provider->setEngine( this ); mProviders << provider; } -void QgsLabelingEngineV2::removeProvider( QgsAbstractLabelProvider* provider ) +void QgsLabelingEngine::removeProvider( QgsAbstractLabelProvider* provider ) { int idx = mProviders.indexOf( provider ); if ( idx >= 0 ) @@ -101,7 +101,7 @@ void QgsLabelingEngineV2::removeProvider( QgsAbstractLabelProvider* provider ) } } -void QgsLabelingEngineV2::processProvider( QgsAbstractLabelProvider* provider, QgsRenderContext& context, pal::Pal& p ) +void QgsLabelingEngine::processProvider( QgsAbstractLabelProvider* provider, QgsRenderContext& context, pal::Pal& p ) { QgsAbstractLabelProvider::Flags flags = provider->flags(); @@ -174,7 +174,7 @@ void QgsLabelingEngineV2::processProvider( QgsAbstractLabelProvider* provider, Q } -void QgsLabelingEngineV2::run( QgsRenderContext& context ) +void QgsLabelingEngine::run( QgsRenderContext& context ) { pal::Pal p; @@ -329,7 +329,7 @@ void QgsLabelingEngineV2::run( QgsRenderContext& context ) } -QgsLabelingResults* QgsLabelingEngineV2::takeResults() +QgsLabelingResults* QgsLabelingEngine::takeResults() { QgsLabelingResults* res = mResults; mResults = nullptr; @@ -337,7 +337,7 @@ QgsLabelingResults* QgsLabelingEngineV2::takeResults() } -void QgsLabelingEngineV2::readSettingsFromProject() +void QgsLabelingEngine::readSettingsFromProject() { bool saved = false; QgsProject* prj = QgsProject::instance(); @@ -355,7 +355,7 @@ void QgsLabelingEngineV2::readSettingsFromProject() if ( prj->readBoolEntry( "PAL", "/DrawOutlineLabels", true, &saved ) ) mFlags |= RenderOutlineLabels; } -void QgsLabelingEngineV2::writeSettingsToProject() +void QgsLabelingEngine::writeSettingsToProject() { QgsProject::instance()->writeEntry( "PAL", "/SearchMethod", static_cast< int >( mSearchMethod ) ); QgsProject::instance()->writeEntry( "PAL", "/CandidatesPoint", mCandPoint ); diff --git a/src/core/qgslabelingenginev2.h b/src/core/qgslabelingengine.h similarity index 94% rename from src/core/qgslabelingenginev2.h rename to src/core/qgslabelingengine.h index 68dd4b7faff..030e0f74ee9 100644 --- a/src/core/qgslabelingenginev2.h +++ b/src/core/qgslabelingengine.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgslabelingenginev2.h + qgslabelingengine.h -------------------------------------- Date : September 2015 Copyright : (C) 2015 by Martin Dobias @@ -23,17 +23,17 @@ #include -class QgsLabelingEngineV2; +class QgsLabelingEngine; /** \ingroup core * @brief The QgsAbstractLabelProvider class is an interface class. Implementations * return list of labels and their associated geometries - these are used by - * QgsLabelingEngineV2 to compute the final layout of labels. + * QgsLabelingEngine to compute the final layout of labels. * * Implementations also take care of drawing the returned final label positions. * - * @note this class is not a part of public API yet. See notes in QgsLabelingEngineV2 + * @note this class is not a part of public API yet. See notes in QgsLabelingEngine * @note not available in Python bindings * @note added in QGIS 2.12 */ @@ -46,8 +46,8 @@ class CORE_EXPORT QgsAbstractLabelProvider //! Vritual destructor virtual ~QgsAbstractLabelProvider() {} - //! Associate provider with a labeling engine (should be only called internally from QgsLabelingEngineV2) - void setEngine( const QgsLabelingEngineV2* engine ) { mEngine = engine; } + //! Associate provider with a labeling engine (should be only called internally from QgsLabelingEngine) + void setEngine( const QgsLabelingEngine* engine ) { mEngine = engine; } enum Flag { @@ -99,7 +99,7 @@ class CORE_EXPORT QgsAbstractLabelProvider protected: //! Associated labeling engine - const QgsLabelingEngineV2* mEngine; + const QgsLabelingEngine* mEngine; //! Name of the layer QString mName; @@ -126,7 +126,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS( QgsAbstractLabelProvider::Flags ) /** \ingroup core - * @brief The QgsLabelingEngineV2 class provides map labeling functionality. + * @brief The QgsLabelingEngine class provides map labeling functionality. * The input for the engine is a list of label provider objects and map settings. * Based on the input, the engine computes layout of labels for the given map view * with no collisions between the labels. Drawing of resulting labels is done @@ -139,7 +139,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS( QgsAbstractLabelProvider::Flags ) * * The labeling engine may also be used independently from map rendering loop: * \code - * QgsLabelingEngineV2 engine; + * QgsLabelingEngine engine; * engine.setMapSettings( mapSettings ); * // add one or more providers * engine.addProvider( ... ); @@ -157,13 +157,13 @@ Q_DECLARE_OPERATORS_FOR_FLAGS( QgsAbstractLabelProvider::Flags ) * @note added in QGIS 2.12 * @note not available in Python bindings */ -class CORE_EXPORT QgsLabelingEngineV2 +class CORE_EXPORT QgsLabelingEngine { public: //! Construct the labeling engine with default settings - QgsLabelingEngineV2(); + QgsLabelingEngine(); //! Clean up everything (especially the registered providers) - ~QgsLabelingEngineV2(); + ~QgsLabelingEngine(); enum Flag { @@ -241,17 +241,17 @@ class CORE_EXPORT QgsLabelingEngineV2 private: - QgsLabelingEngineV2( const QgsLabelingEngineV2& rh ); - QgsLabelingEngineV2& operator=( const QgsLabelingEngineV2& rh ); + QgsLabelingEngine( const QgsLabelingEngine& rh ); + QgsLabelingEngine& operator=( const QgsLabelingEngine& rh ); }; -Q_DECLARE_OPERATORS_FOR_FLAGS( QgsLabelingEngineV2::Flags ) +Q_DECLARE_OPERATORS_FOR_FLAGS( QgsLabelingEngine::Flags ) /** \ingroup core * @class QgsLabelingUtils * @brief Contains helper utilities for working with QGIS' labeling engine. - * @note this class is not a part of public API yet. See notes in QgsLabelingEngineV2 + * @note this class is not a part of public API yet. See notes in QgsLabelingEngine * @note added in QGIS 2.14 * @note not available in Python bindings */ diff --git a/src/core/qgslegacyhelpers.cpp b/src/core/qgslegacyhelpers.cpp deleted file mode 100644 index ccc94bd6ab3..00000000000 --- a/src/core/qgslegacyhelpers.cpp +++ /dev/null @@ -1,318 +0,0 @@ -/*************************************************************************** - qgslegacyhelpers.cpp - -------------------------------------- - Date : 13.5.2014 - Copyright : (C) 2014 Matthias Kuhn - Email : matthias at opengis dot ch - *************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include "qgslegacyhelpers.h" - -#include "qgsvectorlayer.h" - -const QString QgsLegacyHelpers::convertEditType( QgsVectorLayer::EditType editType, QgsEditorWidgetConfig& cfg, QgsVectorLayer* vl, const QString& name, const QDomElement &editTypeElement ) -{ - Q_NOWARN_DEPRECATED_PUSH - QString widgetType = "TextEdit"; // Fallback - - switch ( editType ) - { - case QgsVectorLayer::ValueMap: - { - widgetType = "ValueMap"; - QDomNodeList valueMapNodes = editTypeElement.childNodes(); - - for ( int j = 0; j < valueMapNodes.size(); j++ ) - { - QDomElement value = valueMapNodes.at( j ).toElement(); - cfg.insert( value.attribute( "key" ), value.attribute( "value" ) ); - } - break; - } - - case QgsVectorLayer::EditRange: - { - widgetType = "Range"; - cfg.insert( "Style", "Edit" ); - cfg.insert( "Min", editTypeElement.attribute( "min" ).toFloat() ); - cfg.insert( "Max", editTypeElement.attribute( "max" ).toFloat() ); - cfg.insert( "Step", editTypeElement.attribute( "step" ).toFloat() ); - break; - } - - case QgsVectorLayer::SliderRange: - { - widgetType = "SliderRange"; - cfg.insert( "Style", "Slider" ); - cfg.insert( "Min", editTypeElement.attribute( "min" ).toFloat() ); - cfg.insert( "Max", editTypeElement.attribute( "max" ).toFloat() ); - cfg.insert( "Step", editTypeElement.attribute( "step" ).toFloat() ); - break; - } - - case QgsVectorLayer::DialRange: - { - widgetType = "DialRange"; - cfg.insert( "Style", "Dial" ); - cfg.insert( "Min", editTypeElement.attribute( "min" ).toFloat() ); - cfg.insert( "Max", editTypeElement.attribute( "max" ).toFloat() ); - cfg.insert( "Step", editTypeElement.attribute( "step" ).toFloat() ); - break; - } - - case QgsVectorLayer::CheckBox: - { - widgetType = "CheckBox"; - cfg.insert( "CheckedState", editTypeElement.attribute( "checked" ) ); - cfg.insert( "UncheckedState", editTypeElement.attribute( "unchecked" ) ); - break; - } - - case QgsVectorLayer::ValueRelation: - { - widgetType = "ValueRelation"; - cfg.insert( "AllowNull", editTypeElement.attribute( "allowNull" ) == "true" ); - cfg.insert( "OrderByValue", editTypeElement.attribute( "orderByValue" ) == "true" ); - cfg.insert( "AllowMulti", editTypeElement.attribute( "allowMulti", "false" ) == "true" ); - QString filterExpression; - if ( editTypeElement.hasAttribute( "filterAttributeColumn" ) && - editTypeElement.hasAttribute( "filterAttributeValue" ) ) - { - filterExpression = QString( "\"%1\"='%2'" ) - .arg( editTypeElement.attribute( "filterAttributeColumn" ), - editTypeElement.attribute( "filterAttributeValue" ) ); - } - else - { - filterExpression = editTypeElement.attribute( "filterExpression", QString::null ); - } - cfg.insert( "FilterExpression", filterExpression ); - cfg.insert( "Layer", editTypeElement.attribute( "layer" ) ); - cfg.insert( "Key", editTypeElement.attribute( "key" ) ); - cfg.insert( "Value", editTypeElement.attribute( "value" ) ); - - break; - } - - case QgsVectorLayer::Calendar: - { - widgetType = "DateTime"; - cfg.insert( "display_format", editTypeElement.attribute( "dateFormat" ) ); - cfg.insert( "field_format", "yyyy-MM-dd" ); - break; - } - - case QgsVectorLayer::Photo: - { - widgetType = "Photo"; - cfg.insert( "Width", editTypeElement.attribute( "widgetWidth" ).toInt() ); - cfg.insert( "Height", editTypeElement.attribute( "widgetHeight" ).toInt() ); - break; - } - - case QgsVectorLayer::WebView: - { - widgetType = "WebView"; - cfg.insert( "Width", editTypeElement.attribute( "widgetWidth" ).toInt() ); - cfg.insert( "Height", editTypeElement.attribute( "widgetHeight" ).toInt() ); - break; - } - - case QgsVectorLayer::Classification: - { - widgetType = "Classification"; - break; - } - - case QgsVectorLayer::FileName: - { - widgetType = "FileName"; - break; - } - - case QgsVectorLayer::Immutable: - { - widgetType = "TextEdit"; - cfg.insert( "IsMultiline", false ); - vl->setFieldEditable( vl->fields().fieldNameIndex( name ), false ); - break; - } - - case QgsVectorLayer::Hidden: - { - widgetType = "Hidden"; - break; - } - - case QgsVectorLayer::LineEdit: - { - widgetType = "TextEdit"; - cfg.insert( "IsMultiline", false ); - break; - } - - case QgsVectorLayer::TextEdit: - { - widgetType = "TextEdit"; - cfg.insert( "IsMultiline", true ); - cfg.insert( "UseHtml", false ); - break; - } - - case QgsVectorLayer::Enumeration: - { - widgetType = "Enumeration"; - break; - } - - case QgsVectorLayer::UniqueValues: - { - widgetType = "UniqueValues"; - cfg.insert( "Editable", false ); - break; - } - - case QgsVectorLayer::UniqueValuesEditable: - { - widgetType = "UniqueValues"; - cfg.insert( "Editable", true ); - break; - } - - case QgsVectorLayer::UuidGenerator: - { - widgetType = "UuidGenerator"; - break; - } - - case QgsVectorLayer::Color: - { - widgetType = "Color"; - break; - } - - case QgsVectorLayer::EditorWidgetV2: // Should not land here - break; - } - - return widgetType; - Q_NOWARN_DEPRECATED_POP -} - -QgsVectorLayer::EditType QgsLegacyHelpers::convertEditType( const QString& editType, const QgsEditorWidgetConfig& cfg, QgsVectorLayer* vl, const QString& name ) -{ - Q_NOWARN_DEPRECATED_PUSH - - int idx = vl->fieldNameIndex( name ); - - if ( !vl->fieldEditable( idx ) ) - { - return QgsVectorLayer::Immutable; - } - - if ( editType == "Hidden" ) - { - return QgsVectorLayer::Hidden; - } - - if ( editType == "ValueMap" ) - { - return QgsVectorLayer::ValueMap; - } - - if ( editType == "TextEdit" ) - { - if ( cfg.value( "IsMultiline" ).toBool() ) - { - return QgsVectorLayer::TextEdit; - } - else - { - return QgsVectorLayer::LineEdit; - } - } - - if ( editType == "Range" ) - { - if ( cfg.value( "Style" ).toString() == "SliderRange" ) - { - return QgsVectorLayer::SliderRange; - } - else if ( cfg.value( "Style" ).toString() == "DialRange" ) - { - return QgsVectorLayer::DialRange; - } - else - { - return QgsVectorLayer::EditRange; - } - } - - if ( editType == "UuidGenerator" ) - { - return QgsVectorLayer::UuidGenerator; - } - - if ( editType == "UniqueValues" ) - { - if ( cfg.value( "Editable" ).toBool() ) - { - return QgsVectorLayer::UniqueValuesEditable; - } - else - { - return QgsVectorLayer::UniqueValues; - - } - } - - if ( editType == "Classification" ) - { - return QgsVectorLayer::Classification; - } - - if ( editType == "CheckBox" ) - { - return QgsVectorLayer::CheckBox; - } - - if ( editType == "DateTime" ) - { - return QgsVectorLayer::Calendar; - } - - if ( editType == "FileName" ) - { - return QgsVectorLayer::FileName; - } - - if ( editType == "WebView" ) - { - return QgsVectorLayer::WebView; - } - - if ( editType == "Photo" ) - { - return QgsVectorLayer::Photo; - } - - if ( editType == "Color" ) - { - return QgsVectorLayer::Color; - } - - if ( editType == "Enumeration" ) - { - return QgsVectorLayer::Enumeration; - } - - return QgsVectorLayer::EditorWidgetV2; - Q_NOWARN_DEPRECATED_POP -} diff --git a/src/core/qgslegacyhelpers.h b/src/core/qgslegacyhelpers.h deleted file mode 100644 index ebb82ac51cc..00000000000 --- a/src/core/qgslegacyhelpers.h +++ /dev/null @@ -1,40 +0,0 @@ -/*************************************************************************** - qgslegacyhelpers.h - -------------------------------------- - Date : 13.5.2014 - Copyright : (C) 2014 Matthias Kuhn - Email : matthias at opengis dot ch - *************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#ifndef QGSLEGACYHELPERS_H -#define QGSLEGACYHELPERS_H - -#include - -#include "qgsvectorlayer.h" - -/** \ingroup core - * \class QgsLegacyHelpers - */ -class CORE_EXPORT QgsLegacyHelpers -{ - public: - //! @deprecated will be removed in QGIS 3.0 - Q_DECL_DEPRECATED static const QString convertEditType( QgsVectorLayer::EditType editType, QgsEditorWidgetConfig& cfg, QgsVectorLayer* vl, const QString& name, const QDomElement &editTypeElement = QDomElement() ); - - //! @deprecated will be removed in QGIS 3.0 - Q_DECL_DEPRECATED static QgsVectorLayer::EditType convertEditType( const QString& editType, const QgsEditorWidgetConfig& cfg, QgsVectorLayer* vl, const QString& name ); - - private: - QgsLegacyHelpers() - {} -}; - -#endif // QGSLEGACYHELPERS_H diff --git a/src/core/qgsmaphittest.cpp b/src/core/qgsmaphittest.cpp index 0023b2b41a9..f2abd5ca876 100644 --- a/src/core/qgsmaphittest.cpp +++ b/src/core/qgsmaphittest.cpp @@ -20,7 +20,7 @@ #include "qgsmaplayerregistry.h" #include "qgsrendercontext.h" #include "qgsmaplayerstylemanager.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgspointdisplacementrenderer.h" #include "qgsvectorlayer.h" #include "qgssymbollayerutils.h" @@ -59,15 +59,15 @@ void QgsMapHitTest::run() Q_FOREACH ( const QString& layerID, mSettings.layers() ) { QgsVectorLayer* vl = qobject_cast( QgsMapLayerRegistry::instance()->mapLayer( layerID ) ); - if ( !vl || !vl->rendererV2() ) + if ( !vl || !vl->renderer() ) continue; if ( !mOnlyExpressions ) { if ( !vl->isInScaleRange( mSettings.scale() ) ) { - mHitTest[vl] = SymbolV2Set(); // no symbols -> will not be shown - mHitTestRuleKey[vl] = SymbolV2Set(); + mHitTest[vl] = SymbolSet(); // no symbols -> will not be shown + mHitTestRuleKey[vl] = SymbolSet(); continue; } @@ -79,8 +79,8 @@ void QgsMapHitTest::run() } context.expressionContext() << QgsExpressionContextUtils::layerScope( vl ); - SymbolV2Set& usedSymbols = mHitTest[vl]; - SymbolV2Set& usedSymbolsRuleKey = mHitTestRuleKey[vl]; + SymbolSet& usedSymbols = mHitTest[vl]; + SymbolSet& usedSymbolsRuleKey = mHitTestRuleKey[vl]; runHitTestLayer( vl, usedSymbols, usedSymbolsRuleKey, context ); } @@ -103,14 +103,14 @@ bool QgsMapHitTest::legendKeyVisible( const QString& ruleKey, QgsVectorLayer* la return mHitTestRuleKey.value( layer ).contains( ruleKey ); } -void QgsMapHitTest::runHitTestLayer( QgsVectorLayer* vl, SymbolV2Set& usedSymbols, SymbolV2Set& usedSymbolsRuleKey, QgsRenderContext& context ) +void QgsMapHitTest::runHitTestLayer( QgsVectorLayer* vl, SymbolSet& usedSymbols, SymbolSet& usedSymbolsRuleKey, QgsRenderContext& context ) { bool hasStyleOverride = mSettings.layerStyleOverrides().contains( vl->id() ); if ( hasStyleOverride ) vl->styleManager()->setOverrideStyle( mSettings.layerStyleOverrides().value( vl->id() ) ); - QgsFeatureRendererV2* r = vl->rendererV2(); - bool moreSymbolsPerFeature = r->capabilities() & QgsFeatureRendererV2::MoreSymbolsPerFeature; + QgsFeatureRenderer* r = vl->renderer(); + bool moreSymbolsPerFeature = r->capabilities() & QgsFeatureRenderer::MoreSymbolsPerFeature; r->startRender( context, vl->fields() ); QgsGeometry transformedPolygon = mPolygon; @@ -139,8 +139,8 @@ void QgsMapHitTest::runHitTestLayer( QgsVectorLayer* vl, SymbolV2Set& usedSymbol } QgsFeatureIterator fi = vl->getFeatures( request ); - SymbolV2Set lUsedSymbols; - SymbolV2Set lUsedSymbolsRuleKey; + SymbolSet lUsedSymbols; + SymbolSet lUsedSymbolsRuleKey; bool allExpressionFalse = false; bool hasExpression = mLayerFilterExpression.contains( vl->id() ); QScopedPointer expr; diff --git a/src/core/qgsmaphittest.h b/src/core/qgsmaphittest.h index b58b8f59b7e..5bf6f7fd660 100644 --- a/src/core/qgsmaphittest.h +++ b/src/core/qgsmaphittest.h @@ -67,10 +67,10 @@ class CORE_EXPORT QgsMapHitTest protected: //! @note not available in Python bindings - typedef QSet SymbolV2Set; + typedef QSet SymbolSet; //! @note not available in Python bindings - typedef QMap HitTest; + typedef QMap HitTest; /** Runs test for visible symbols within a layer * @param vl vector layer @@ -80,7 +80,7 @@ class CORE_EXPORT 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 ); //! The initial map settings QgsMapSettings mSettings; diff --git a/src/core/qgsmaplayerlegend.cpp b/src/core/qgsmaplayerlegend.cpp index f4a77395d33..1cbfa82d589 100644 --- a/src/core/qgsmaplayerlegend.cpp +++ b/src/core/qgsmaplayerlegend.cpp @@ -21,9 +21,9 @@ #include "qgslayertreemodellegendnode.h" #include "qgspluginlayer.h" #include "qgsrasterlayer.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgsvectorlayer.h" -#include "qgsdiagramrendererv2.h" +#include "qgsdiagramrenderer.h" QgsMapLayerLegend::QgsMapLayerLegend( QObject *parent ) @@ -187,7 +187,7 @@ QList QgsDefaultVectorLayerLegend::createLayerTree { QList nodes; - QgsFeatureRendererV2* r = mLayer->rendererV2(); + QgsFeatureRenderer* r = mLayer->renderer(); if ( !r ) return nodes; @@ -200,7 +200,7 @@ QList QgsDefaultVectorLayerLegend::createLayerTree nodes.append( new QgsSimpleLegendNode( nodeLayer, r->legendClassificationAttribute() ) ); } - Q_FOREACH ( const QgsLegendSymbolItemV2& i, r->legendSymbolItemsV2() ) + Q_FOREACH ( const QgsLegendSymbolItem& i, r->legendSymbolItemsV2() ) { QgsSymbolLegendNode * n = new QgsSymbolLegendNode( nodeLayer, i ); nodes.append( n ); diff --git a/src/core/qgsmaprenderercustompainterjob.cpp b/src/core/qgsmaprenderercustompainterjob.cpp index a3e20902c4d..8a905c30a08 100644 --- a/src/core/qgsmaprenderercustompainterjob.cpp +++ b/src/core/qgsmaprenderercustompainterjob.cpp @@ -16,13 +16,13 @@ #include "qgsmaprenderercustompainterjob.h" #include "qgsfeedback.h" -#include "qgslabelingenginev2.h" +#include "qgslabelingengine.h" #include "qgslogger.h" #include "qgsmaplayerregistry.h" #include "qgsmaplayerrenderer.h" #include "qgspallabeling.h" #include "qgsvectorlayer.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" QgsMapRendererCustomPainterJob::QgsMapRendererCustomPainterJob( const QgsMapSettings& settings, QPainter* painter ) @@ -78,7 +78,7 @@ void QgsMapRendererCustomPainterJob::start() if ( mSettings.testFlag( QgsMapSettings::DrawLabeling ) ) { - mLabelingEngineV2 = new QgsLabelingEngineV2(); + mLabelingEngineV2 = new QgsLabelingEngine(); mLabelingEngineV2->readSettingsFromProject(); mLabelingEngineV2->setMapSettings( mSettings ); } @@ -274,7 +274,7 @@ void QgsMapRendererCustomPainterJob::doRender() } -void QgsMapRendererJob::drawLabeling( const QgsMapSettings& settings, QgsRenderContext& renderContext, QgsLabelingEngineV2* labelingEngine2, QPainter* painter ) +void QgsMapRendererJob::drawLabeling( const QgsMapSettings& settings, QgsRenderContext& renderContext, QgsLabelingEngine* labelingEngine2, QPainter* painter ) { QgsDebugMsg( "Draw labeling start" ); @@ -319,7 +319,7 @@ bool QgsMapRendererJob::needTemporaryImage( QgsMapLayer* ml ) if ( ml->type() == QgsMapLayer::VectorLayer ) { QgsVectorLayer* vl = qobject_cast( ml ); - if ( vl->rendererV2() && vl->rendererV2()->forceRasterRender() ) + if ( vl->renderer() && vl->renderer()->forceRasterRender() ) { //raster rendering is forced for this layer return true; diff --git a/src/core/qgsmaprenderercustompainterjob.h b/src/core/qgsmaprenderercustompainterjob.h index 3d5acdedda3..4f84b3c3df1 100644 --- a/src/core/qgsmaprenderercustompainterjob.h +++ b/src/core/qgsmaprenderercustompainterjob.h @@ -84,7 +84,7 @@ class CORE_EXPORT QgsMapRendererCustomPainterJob : public QgsMapRendererJob QFuture mFuture; QFutureWatcher mFutureWatcher; QgsRenderContext mLabelingRenderContext; - QgsLabelingEngineV2* mLabelingEngineV2; + QgsLabelingEngine* mLabelingEngineV2; bool mActive; LayerRenderJobs mLayerJobs; diff --git a/src/core/qgsmaprendererjob.cpp b/src/core/qgsmaprendererjob.cpp index f7a1165f55f..01c012447da 100644 --- a/src/core/qgsmaprendererjob.cpp +++ b/src/core/qgsmaprendererjob.cpp @@ -168,7 +168,7 @@ bool QgsMapRendererJob::reprojectToLayerExtent( const QgsMapLayer *ml, const Qgs -LayerRenderJobs QgsMapRendererJob::prepareJobs( QPainter* painter, QgsLabelingEngineV2* labelingEngine2 ) +LayerRenderJobs QgsMapRendererJob::prepareJobs( QPainter* painter, QgsLabelingEngine* labelingEngine2 ) { LayerRenderJobs layerJobs; diff --git a/src/core/qgsmaprendererjob.h b/src/core/qgsmaprendererjob.h index ba46067f87c..8d667f536ca 100644 --- a/src/core/qgsmaprendererjob.h +++ b/src/core/qgsmaprendererjob.h @@ -29,7 +29,7 @@ #include "qgsgeometrycache.h" -class QgsLabelingEngineV2; +class QgsLabelingEngine; class QgsLabelingResults; class QgsMapLayerRenderer; class QgsMapRendererCache; @@ -155,7 +155,7 @@ class CORE_EXPORT QgsMapRendererJob : public 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 ); @@ -168,7 +168,7 @@ class CORE_EXPORT QgsMapRendererJob : public 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(); diff --git a/src/core/qgsmaprendererparalleljob.cpp b/src/core/qgsmaprendererparalleljob.cpp index 92b788041a0..5db638f2578 100644 --- a/src/core/qgsmaprendererparalleljob.cpp +++ b/src/core/qgsmaprendererparalleljob.cpp @@ -16,7 +16,7 @@ #include "qgsmaprendererparalleljob.h" #include "qgsfeedback.h" -#include "qgslabelingenginev2.h" +#include "qgslabelingengine.h" #include "qgslogger.h" #include "qgsmaplayerrenderer.h" #include "qgspallabeling.h" @@ -56,7 +56,7 @@ void QgsMapRendererParallelJob::start() if ( mSettings.testFlag( QgsMapSettings::DrawLabeling ) ) { - mLabelingEngineV2 = new QgsLabelingEngineV2(); + mLabelingEngineV2 = new QgsLabelingEngine(); mLabelingEngineV2->readSettingsFromProject(); mLabelingEngineV2->setMapSettings( mSettings ); } diff --git a/src/core/qgsmaprendererparalleljob.h b/src/core/qgsmaprendererparalleljob.h index e32b53df6fb..945321c0755 100644 --- a/src/core/qgsmaprendererparalleljob.h +++ b/src/core/qgsmaprendererparalleljob.h @@ -67,7 +67,7 @@ class CORE_EXPORT QgsMapRendererParallelJob : public QgsMapRendererQImageJob LayerRenderJobs mLayerJobs; //! New labeling engine - QgsLabelingEngineV2* mLabelingEngineV2; + QgsLabelingEngine* mLabelingEngineV2; QgsRenderContext mLabelingRenderContext; QFuture mLabelingFuture; QFutureWatcher mLabelingFutureWatcher; diff --git a/src/core/qgsmapsettings.cpp b/src/core/qgsmapsettings.cpp index 9ef460cb72d..3441bf51d17 100644 --- a/src/core/qgsmapsettings.cpp +++ b/src/core/qgsmapsettings.cpp @@ -44,7 +44,7 @@ QgsMapSettings::QgsMapSettings() , mFlags( Antialiasing | UseAdvancedEffects | DrawLabeling | DrawSelection ) , mImageFormat( QImage::Format_ARGB32_Premultiplied ) , mSegmentationTolerance( M_PI_2 / 90 ) - , mSegmentationToleranceType( QgsAbstractGeometryV2::MaximumAngle ) + , mSegmentationToleranceType( QgsAbstractGeometry::MaximumAngle ) , mValid( false ) , mVisibleExtent() , mMapUnitsPerPixel( 1 ) diff --git a/src/core/qgsmapsettings.h b/src/core/qgsmapsettings.h index 26e11c249e5..8fc3e60cc86 100644 --- a/src/core/qgsmapsettings.h +++ b/src/core/qgsmapsettings.h @@ -21,7 +21,7 @@ #include #include -#include "qgsabstractgeometryv2.h" +#include "qgsabstractgeometry.h" #include "qgscoordinatereferencesystem.h" #include "qgsdatumtransformstore.h" #include "qgsmaptopixel.h" @@ -287,9 +287,9 @@ class CORE_EXPORT QgsMapSettings double segmentationTolerance() const { return mSegmentationTolerance; } /** Sets segmentation tolerance type (maximum angle or maximum difference between curve and approximation) @param type the segmentation tolerance typename*/ - void setSegmentationToleranceType( QgsAbstractGeometryV2::SegmentationToleranceType type ) { mSegmentationToleranceType = type; } + void setSegmentationToleranceType( QgsAbstractGeometry::SegmentationToleranceType type ) { mSegmentationToleranceType = type; } /** Gets segmentation tolerance type (maximum angle or maximum difference between curve and approximation)*/ - QgsAbstractGeometryV2::SegmentationToleranceType segmentationToleranceType() const { return mSegmentationToleranceType; } + QgsAbstractGeometry::SegmentationToleranceType segmentationToleranceType() const { return mSegmentationToleranceType; } protected: @@ -319,7 +319,7 @@ class CORE_EXPORT QgsMapSettings QImage::Format mImageFormat; double mSegmentationTolerance; - QgsAbstractGeometryV2::SegmentationToleranceType mSegmentationToleranceType; + QgsAbstractGeometry::SegmentationToleranceType mSegmentationToleranceType; // derived properties diff --git a/src/core/qgsmapthemecollection.cpp b/src/core/qgsmapthemecollection.cpp index 5d2bec5025c..60b07404d25 100644 --- a/src/core/qgsmapthemecollection.cpp +++ b/src/core/qgsmapthemecollection.cpp @@ -21,7 +21,7 @@ #include "qgsmaplayerregistry.h" #include "qgsmaplayerstylemanager.h" #include "qgsproject.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgsvectorlayer.h" #include @@ -113,20 +113,20 @@ void QgsMapThemeCollection::applyPresetCheckedLegendNodesToLayer( const QString& const PresetRecord& rec = mPresets[name]; QgsVectorLayer* vlayer = qobject_cast( layer ); - if ( !vlayer || !vlayer->rendererV2() ) + if ( !vlayer || !vlayer->renderer() ) return; - if ( !vlayer->rendererV2()->legendSymbolItemsCheckable() ) + if ( !vlayer->renderer()->legendSymbolItemsCheckable() ) return; // no need to do anything bool someNodesUnchecked = rec.mPerLayerCheckedLegendSymbols.contains( layerID ); - Q_FOREACH ( const QgsLegendSymbolItemV2& item, vlayer->rendererV2()->legendSymbolItemsV2() ) + Q_FOREACH ( const QgsLegendSymbolItem& item, vlayer->renderer()->legendSymbolItemsV2() ) { - bool checked = vlayer->rendererV2()->legendSymbolItemChecked( item.ruleKey() ); + bool checked = vlayer->renderer()->legendSymbolItemChecked( item.ruleKey() ); bool shouldBeChecked = someNodesUnchecked ? rec.mPerLayerCheckedLegendSymbols[layerID].contains( item.ruleKey() ) : true; if ( checked != shouldBeChecked ) - vlayer->rendererV2()->checkLegendSymbolItem( item.ruleKey(), shouldBeChecked ); + vlayer->renderer()->checkLegendSymbolItem( item.ruleKey(), shouldBeChecked ); } } diff --git a/src/core/qgspalgeometry.h b/src/core/qgspalgeometry.h index 05e6e5797de..d8d3864df13 100644 --- a/src/core/qgspalgeometry.h +++ b/src/core/qgspalgeometry.h @@ -19,7 +19,7 @@ #include "qgspallabeling.h" #include -#include "qgslabelingenginev2.h" +#include "qgslabelingengine.h" /** * Class that adds extra information to QgsLabelFeature for text labels diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp index 9c4b01ddbe2..7f32bca2f3f 100644 --- a/src/core/qgspallabeling.cpp +++ b/src/core/qgspallabeling.cpp @@ -39,12 +39,12 @@ #include #include "diagram/qgsdiagram.h" -#include "qgsdiagramrendererv2.h" +#include "qgsdiagramrenderer.h" #include "qgsfontutils.h" #include "qgslabelsearchtree.h" #include "qgsexpression.h" #include "qgsdatadefined.h" -#include "qgslabelingenginev2.h" +#include "qgslabelingengine.h" #include "qgsvectorlayerlabeling.h" #include @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #include "qgssymbollayerutils.h" @@ -2094,7 +2094,7 @@ void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF* fm, QString t void QgsPalLayerSettings::registerFeature( QgsFeature& f, QgsRenderContext &context, QgsLabelFeature** labelFeature , QgsGeometry* obstacleGeometry ) { - // either used in QgsPalLabeling (palLayer is set) or in QgsLabelingEngineV2 (labelFeature is set) + // either used in QgsPalLabeling (palLayer is set) or in QgsLabelingEngine (labelFeature is set) Q_ASSERT( labelFeature ); QVariant exprVal; // value() is repeatedly nulled on data defined evaluation and replaced when successful @@ -3900,7 +3900,7 @@ double QgsPalLayerSettings::scaleToPixelContext( double size, const QgsRenderCon // ------------- QgsPalLabeling::QgsPalLabeling() - : mEngine( new QgsLabelingEngineV2() ) + : mEngine( new QgsLabelingEngine() ) { } @@ -4199,7 +4199,7 @@ void QgsPalLabeling::init( const QgsMapSettings& mapSettings ) void QgsPalLabeling::exit() { delete mEngine; - mEngine = new QgsLabelingEngineV2(); + mEngine = new QgsLabelingEngine(); } QgsPalLayerSettings& QgsPalLabeling::layer( const QString& layerName ) @@ -4568,62 +4568,62 @@ QgsPalLabeling::Search QgsPalLabeling::searchMethod() const bool QgsPalLabeling::isShowingCandidates() const { - return mEngine->testFlag( QgsLabelingEngineV2::DrawCandidates ); + return mEngine->testFlag( QgsLabelingEngine::DrawCandidates ); } void QgsPalLabeling::setShowingCandidates( bool showing ) { - mEngine->setFlag( QgsLabelingEngineV2::DrawCandidates, showing ); + mEngine->setFlag( QgsLabelingEngine::DrawCandidates, showing ); } bool QgsPalLabeling::isShowingShadowRectangles() const { - return mEngine->testFlag( QgsLabelingEngineV2::DrawShadowRects ); + return mEngine->testFlag( QgsLabelingEngine::DrawShadowRects ); } void QgsPalLabeling::setShowingShadowRectangles( bool showing ) { - mEngine->setFlag( QgsLabelingEngineV2::DrawShadowRects, showing ); + mEngine->setFlag( QgsLabelingEngine::DrawShadowRects, showing ); } bool QgsPalLabeling::isShowingAllLabels() const { - return mEngine->testFlag( QgsLabelingEngineV2::UseAllLabels ); + return mEngine->testFlag( QgsLabelingEngine::UseAllLabels ); } void QgsPalLabeling::setShowingAllLabels( bool showing ) { - mEngine->setFlag( QgsLabelingEngineV2::UseAllLabels, showing ); + mEngine->setFlag( QgsLabelingEngine::UseAllLabels, showing ); } bool QgsPalLabeling::isShowingPartialsLabels() const { - return mEngine->testFlag( QgsLabelingEngineV2::UsePartialCandidates ); + return mEngine->testFlag( QgsLabelingEngine::UsePartialCandidates ); } void QgsPalLabeling::setShowingPartialsLabels( bool showing ) { - mEngine->setFlag( QgsLabelingEngineV2::UsePartialCandidates, showing ); + mEngine->setFlag( QgsLabelingEngine::UsePartialCandidates, showing ); } bool QgsPalLabeling::isDrawingOutlineLabels() const { - return mEngine->testFlag( QgsLabelingEngineV2::RenderOutlineLabels ); + return mEngine->testFlag( QgsLabelingEngine::RenderOutlineLabels ); } void QgsPalLabeling::setDrawingOutlineLabels( bool outline ) { - mEngine->setFlag( QgsLabelingEngineV2::RenderOutlineLabels, outline ); + mEngine->setFlag( QgsLabelingEngine::RenderOutlineLabels, outline ); } bool QgsPalLabeling::drawLabelRectOnly() const { - return mEngine->testFlag( QgsLabelingEngineV2::DrawLabelRectOnly ); + return mEngine->testFlag( QgsLabelingEngine::DrawLabelRectOnly ); } void QgsPalLabeling::setDrawLabelRectOnly( bool drawRect ) { - mEngine->setFlag( QgsLabelingEngineV2::DrawLabelRectOnly, drawRect ); + mEngine->setFlag( QgsLabelingEngine::DrawLabelRectOnly, drawRect ); } void QgsPalLabeling::drawLabelCandidateRect( pal::LabelPosition* lp, QPainter* painter, const QgsMapToPixel* xform, QList* candidates ) @@ -4852,8 +4852,8 @@ void QgsPalLabeling::drawLabelBackground( QgsRenderContext& context, shdwContext.setScaleFactor( context.scaleFactor() ); shdwContext.setPainter( &svgp ); - QgsSymbolLayer* symShdwL = QgsSvgMarkerSymbolLayerV2::create( shdwmap ); - QgsSvgMarkerSymbolLayerV2* svgShdwM = static_cast( symShdwL ); + QgsSymbolLayer* symShdwL = QgsSvgMarkerSymbolLayer::create( shdwmap ); + QgsSvgMarkerSymbolLayer* svgShdwM = static_cast( symShdwL ); QgsSymbolRenderContext svgShdwContext( shdwContext, QgsUnitTypes::RenderUnknownUnit, ( 100.0 - static_cast< double >( tmpLyr.shapeTransparency ) ) / 100.0 ); @@ -4887,8 +4887,8 @@ void QgsPalLabeling::drawLabelBackground( QgsRenderContext& context, } // draw the actual symbol - QgsSymbolLayer* symL = QgsSvgMarkerSymbolLayerV2::create( map ); - QgsSvgMarkerSymbolLayerV2* svgM = static_cast( symL ); + QgsSymbolLayer* symL = QgsSvgMarkerSymbolLayer::create( map ); + QgsSvgMarkerSymbolLayer* svgM = static_cast( symL ); QgsSymbolRenderContext svgContext( context, QgsUnitTypes::RenderUnknownUnit, ( 100.0 - static_cast< double >( tmpLyr.shapeTransparency ) ) / 100.0 ); diff --git a/src/core/qgspallabeling.h b/src/core/qgspallabeling.h index ea756f939e3..b9618de7023 100644 --- a/src/core/qgspallabeling.h +++ b/src/core/qgspallabeling.h @@ -58,7 +58,7 @@ class QgsCoordinateTransform; class QgsLabelSearchTree; class QgsMapSettings; class QgsLabelFeature; -class QgsLabelingEngineV2; +class QgsLabelingEngine; class QgsPalLayerSettings; class QgsVectorLayerLabelProvider; class QgsDxfExport; @@ -185,7 +185,7 @@ class CORE_EXPORT 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.*/ @@ -199,7 +199,7 @@ class CORE_EXPORT 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 @@ -218,7 +218,7 @@ class CORE_EXPORT 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 @@ -227,7 +227,7 @@ class CORE_EXPORT 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 { @@ -282,7 +282,7 @@ class CORE_EXPORT 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 @@ -644,7 +644,7 @@ class CORE_EXPORT 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 @@ -1188,7 +1188,7 @@ class CORE_EXPORT QgsPalLabeling : public QgsLabelingEngineInterface QgsPalLayerSettings mInvalidLayerSettings; //! New labeling engine to interface with PAL - QgsLabelingEngineV2* mEngine; + QgsLabelingEngine* mEngine; // list of candidates from last labeling QList mCandidates; diff --git a/src/core/qgsrelation.cpp b/src/core/qgsrelation.cpp index a51633e4ce9..7a6af645a86 100644 --- a/src/core/qgsrelation.cpp +++ b/src/core/qgsrelation.cpp @@ -171,15 +171,21 @@ QString QgsRelation::getRelatedFeaturesFilter( const QgsFeature& feature ) const int referencingIdx = referencingLayer()->fields().indexFromName( fieldPair.referencingField() ); QgsField referencingField = referencingLayer()->fields().at( referencingIdx ); - if ( referencingField.type() == QVariant::String ) + QVariant val( feature.attribute( fieldPair.referencedField() ) ); + + if ( val.isNull() ) + { + conditions << QString( "\"%1\" IS NULL" ).arg( fieldPair.referencingField() ); + } + else if ( referencingField.type() == QVariant::String ) { // Use quotes - conditions << QString( "\"%1\" = '%2'" ).arg( fieldPair.referencingField(), feature.attribute( fieldPair.referencedField() ).toString() ); + conditions << QString( "\"%1\" = '%2'" ).arg( fieldPair.referencingField(), val.toString() ); } else { // No quotes - conditions << QString( "\"%1\" = %2" ).arg( fieldPair.referencingField(), feature.attribute( fieldPair.referencedField() ).toString() ); + conditions << QString( "\"%1\" = %2" ).arg( fieldPair.referencingField(), val.toString() ); } } diff --git a/src/core/qgsrendercontext.cpp b/src/core/qgsrendercontext.cpp index 722b6100d94..bd98369f873 100644 --- a/src/core/qgsrendercontext.cpp +++ b/src/core/qgsrendercontext.cpp @@ -35,7 +35,7 @@ QgsRenderContext::QgsRenderContext() , mGeometry( nullptr ) , mFeatureFilterProvider( nullptr ) , mSegmentationTolerance( M_PI_2 / 90 ) - , mSegmentationToleranceType( QgsAbstractGeometryV2::MaximumAngle ) + , mSegmentationToleranceType( QgsAbstractGeometry::MaximumAngle ) { mVectorSimplifyMethod.setSimplifyHints( QgsVectorSimplifyMethod::NoSimplification ); } diff --git a/src/core/qgsrendercontext.h b/src/core/qgsrendercontext.h index 07580397ed4..c9102ce46ca 100644 --- a/src/core/qgsrendercontext.h +++ b/src/core/qgsrendercontext.h @@ -20,7 +20,7 @@ #include -#include "qgsabstractgeometryv2.h" +#include "qgsabstractgeometry.h" #include "qgscoordinatetransform.h" #include "qgsmaptopixel.h" #include "qgsrectangle.h" @@ -29,9 +29,9 @@ class QPainter; -class QgsAbstractGeometryV2; +class QgsAbstractGeometry; class QgsLabelingEngineInterface; -class QgsLabelingEngineV2; +class QgsLabelingEngine; class QgsMapSettings; class QgsFeatureFilterProvider; @@ -130,7 +130,7 @@ class CORE_EXPORT 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 { return mSelectionColor; } @@ -162,7 +162,7 @@ class CORE_EXPORT QgsRenderContext void setLabelingEngine( QgsLabelingEngineInterface* iface ) { mLabelingEngine = 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 ) { mSelectionColor = color; } /** Sets whether vector selections should be shown in the rendered map @@ -206,9 +206,9 @@ class CORE_EXPORT QgsRenderContext const QgsExpressionContext& expressionContext() const { return mExpressionContext; } /** Returns pointer to the unsegmentized geometry*/ - const QgsAbstractGeometryV2* geometry() const { return mGeometry; } + const QgsAbstractGeometry* geometry() const { return mGeometry; } /** Sets pointer to original (unsegmentized) geometry*/ - void setGeometry( const QgsAbstractGeometryV2* geometry ) { mGeometry = geometry; } + void setGeometry( const QgsAbstractGeometry* geometry ) { mGeometry = geometry; } /** Set a filter feature provider used for additional filtering of rendered features. * @param ffp the filter feature provider @@ -232,9 +232,9 @@ class CORE_EXPORT 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 ) { mSegmentationToleranceType = type; } + void setSegmentationToleranceType( QgsAbstractGeometry::SegmentationToleranceType type ) { mSegmentationToleranceType = type; } /** Gets segmentation tolerance type (maximum angle or maximum difference between curve and approximation)*/ - QgsAbstractGeometryV2::SegmentationToleranceType segmentationToleranceType() const { return mSegmentationToleranceType; } + QgsAbstractGeometry::SegmentationToleranceType segmentationToleranceType() const { return mSegmentationToleranceType; } private: @@ -266,7 +266,7 @@ class CORE_EXPORT QgsRenderContext QgsLabelingEngineInterface* mLabelingEngine; /** Newer labeling engine implementation (can be nullptr) */ - QgsLabelingEngineV2* mLabelingEngine2; + QgsLabelingEngine* mLabelingEngine2; /** Color used for features that are marked as selected */ QColor mSelectionColor; @@ -278,14 +278,14 @@ class CORE_EXPORT QgsRenderContext QgsExpressionContext mExpressionContext; /** Pointer to the (unsegmentized) geometry*/ - const QgsAbstractGeometryV2* mGeometry; + const QgsAbstractGeometry* mGeometry; /** The feature filter provider */ const QgsFeatureFilterProvider* mFeatureFilterProvider; double mSegmentationTolerance; - QgsAbstractGeometryV2::SegmentationToleranceType mSegmentationToleranceType; + QgsAbstractGeometry::SegmentationToleranceType mSegmentationToleranceType; }; Q_DECLARE_OPERATORS_FOR_FLAGS( QgsRenderContext::Flags ) diff --git a/src/core/qgsrulebasedlabeling.h b/src/core/qgsrulebasedlabeling.h index a1497bdc5e8..3d778f4656a 100644 --- a/src/core/qgsrulebasedlabeling.h +++ b/src/core/qgsrulebasedlabeling.h @@ -34,7 +34,7 @@ class QgsRuleBasedLabelProvider; /** \ingroup core * @class QgsRuleBasedLabeling * @note not available in Python bindings - * @note this class is not a part of public API yet. See notes in QgsLabelingEngineV2 + * @note this class is not a part of public API yet. See notes in QgsLabelingEngine */ class CORE_EXPORT QgsRuleBasedLabeling : public QgsAbstractVectorLayerLabeling @@ -48,7 +48,7 @@ class CORE_EXPORT QgsRuleBasedLabeling : public QgsAbstractVectorLayerLabeling * \ingroup core * @class QgsRuleBasedLabeling::Rule * @note not available in Python bindings - * @note this class is not a part of public API yet. See notes in QgsLabelingEngineV2 + * @note this class is not a part of public API yet. See notes in QgsLabelingEngine */ class CORE_EXPORT Rule { @@ -320,7 +320,7 @@ class CORE_EXPORT QgsRuleBasedLabeling : public QgsAbstractVectorLayerLabeling /** \ingroup core * @class QgsRuleBasedLabelProvider * @note not available in Python bindings - * @note this class is not a part of public API yet. See notes in QgsLabelingEngineV2 + * @note this class is not a part of public API yet. See notes in QgsLabelingEngine */ class CORE_EXPORT QgsRuleBasedLabelProvider : public QgsVectorLayerLabelProvider { diff --git a/src/core/qgstracer.cpp b/src/core/qgstracer.cpp index 17f98f0461d..92578e88050 100644 --- a/src/core/qgstracer.cpp +++ b/src/core/qgstracer.cpp @@ -416,7 +416,7 @@ void extractLinework( const QgsGeometry& g, QgsMultiPolyline& mpl ) // to find all intersections a bit later (so we need them segmentized anyway) if ( QgsWkbTypes::isCurvedType( g.geometry()->wkbType() ) ) { - QgsAbstractGeometryV2* segmentizedGeomV2 = g.geometry()->segmentize(); + QgsAbstractGeometry* segmentizedGeomV2 = g.geometry()->segmentize(); if ( !segmentizedGeomV2 ) return; diff --git a/src/core/qgstransactiongroup.cpp b/src/core/qgstransactiongroup.cpp index 325d55e0d13..94ae4700f81 100644 --- a/src/core/qgstransactiongroup.cpp +++ b/src/core/qgstransactiongroup.cpp @@ -54,7 +54,7 @@ bool QgsTransactionGroup::addLayer( QgsVectorLayer* layer ) mLayers.insert( layer ); connect( layer, SIGNAL( beforeEditingStarted() ), this, SLOT( onEditingStarted() ) ); - connect( layer, SIGNAL( layerDeleted() ), this, SLOT( onLayerDeleted() ) ); + connect( layer, SIGNAL( destroyed() ), this, SLOT( onLayerDeleted() ) ); return true; } @@ -95,7 +95,7 @@ void QgsTransactionGroup::onEditingStarted() void QgsTransactionGroup::onLayerDeleted() { - mLayers.remove( qobject_cast( sender() ) ); + mLayers.remove( static_cast( sender() ) ); } void QgsTransactionGroup::onCommitChanges() diff --git a/src/core/qgsvectordataprovider.cpp b/src/core/qgsvectordataprovider.cpp index 82cdd825909..00308460600 100644 --- a/src/core/qgsvectordataprovider.cpp +++ b/src/core/qgsvectordataprovider.cpp @@ -21,14 +21,14 @@ #include #include "qgsvectordataprovider.h" -#include "qgscircularstringv2.h" -#include "qgscompoundcurvev2.h" +#include "qgscircularstring.h" +#include "qgscompoundcurve.h" #include "qgsfeature.h" #include "qgsfeatureiterator.h" #include "qgsfeaturerequest.h" #include "qgsfield.h" #include "qgsgeometry.h" -#include "qgsgeometrycollectionv2.h" +#include "qgsgeometrycollection.h" #include "qgsgeometryfactory.h" #include "qgslogger.h" #include "qgsmessagelog.h" @@ -624,7 +624,7 @@ QgsGeometry* QgsVectorDataProvider::convertToProviderType( const QgsGeometry& ge return nullptr; } - QgsAbstractGeometryV2* geometry = geom.geometry(); + QgsAbstractGeometry* geometry = geom.geometry(); if ( !geometry ) { return nullptr; @@ -638,17 +638,17 @@ QgsGeometry* QgsVectorDataProvider::convertToProviderType( const QgsGeometry& ge return nullptr; } - QgsAbstractGeometryV2* outputGeom = nullptr; + QgsAbstractGeometry* outputGeom = nullptr; //convert compoundcurve to circularstring (possible if compoundcurve consists of one circular string) if ( QgsWkbTypes::flatType( providerGeomType ) == QgsWkbTypes::CircularString && QgsWkbTypes::flatType( geometry->wkbType() ) == QgsWkbTypes::CompoundCurve ) { - QgsCompoundCurveV2* compoundCurve = static_cast( geometry ); + QgsCompoundCurve* compoundCurve = static_cast( geometry ); if ( compoundCurve ) { if ( compoundCurve->nCurves() == 1 ) { - const QgsCircularStringV2* circularString = dynamic_cast( compoundCurve->curveAt( 0 ) ); + const QgsCircularString* circularString = dynamic_cast( compoundCurve->curveAt( 0 ) ); if ( circularString ) { outputGeom = circularString->clone(); @@ -661,7 +661,7 @@ QgsGeometry* QgsVectorDataProvider::convertToProviderType( const QgsGeometry& ge if ( QgsWkbTypes::isMultiType( providerGeomType ) && !QgsWkbTypes::isMultiType( geometry->wkbType() ) ) { outputGeom = QgsGeometryFactory::geomFromWkbType( providerGeomType ); - QgsGeometryCollectionV2* geomCollection = dynamic_cast( outputGeom ); + QgsGeometryCollection* geomCollection = dynamic_cast( outputGeom ); if ( geomCollection ) { geomCollection->addGeometry( geometry->clone() ); @@ -671,7 +671,7 @@ QgsGeometry* QgsVectorDataProvider::convertToProviderType( const QgsGeometry& ge //convert to curved type if necessary if ( !QgsWkbTypes::isCurvedType( geometry->wkbType() ) && QgsWkbTypes::isCurvedType( providerGeomType ) ) { - QgsAbstractGeometryV2* curveGeom = outputGeom ? outputGeom->toCurveType() : geometry->toCurveType(); + QgsAbstractGeometry* curveGeom = outputGeom ? outputGeom->toCurveType() : geometry->toCurveType(); if ( curveGeom ) { delete outputGeom; @@ -682,7 +682,7 @@ QgsGeometry* QgsVectorDataProvider::convertToProviderType( const QgsGeometry& ge //convert to linear type from curved type if ( QgsWkbTypes::isCurvedType( geometry->wkbType() ) && !QgsWkbTypes::isCurvedType( providerGeomType ) ) { - QgsAbstractGeometryV2* segmentizedGeom = nullptr; + QgsAbstractGeometry* segmentizedGeom = nullptr; segmentizedGeom = outputGeom ? outputGeom->segmentize() : geometry->segmentize(); if ( segmentizedGeom ) { diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp index f8e053d8867..e3e73514231 100644 --- a/src/core/qgsvectorfilewriter.cpp +++ b/src/core/qgsvectorfilewriter.cpp @@ -25,7 +25,7 @@ #include "qgsmessagelog.h" #include "qgscoordinatereferencesystem.h" #include "qgsvectorfilewriter.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgssymbollayer.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" @@ -1767,7 +1767,7 @@ QString QgsVectorFileWriter::errorMessage() return mErrorMessage; } -bool QgsVectorFileWriter::addFeature( QgsFeature& feature, QgsFeatureRendererV2* renderer, QgsUnitTypes::DistanceUnit outputUnit ) +bool QgsVectorFileWriter::addFeature( QgsFeature& feature, QgsFeatureRenderer* renderer, QgsUnitTypes::DistanceUnit outputUnit ) { // create the feature OGRFeatureH poFeature = createFeature( feature ); @@ -2296,8 +2296,8 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe if ( writer->symbologyExport() == SymbolLayerSymbology ) { - QgsFeatureRendererV2* r = layer->rendererV2(); - if ( r->capabilities() & QgsFeatureRendererV2::SymbolLevels + QgsFeatureRenderer* r = layer->renderer(); + if ( r->capabilities() & QgsFeatureRenderer::SymbolLevels && r->usingSymbolLevels() ) { QgsVectorFileWriter::WriterError error = writer->exportFeaturesSymbolLevels( layer, fit, ct, errorMessage ); @@ -2366,7 +2366,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormat( QgsVe fet.initAttributes( 0 ); } - if ( !writer->addFeature( fet, layer->rendererV2(), mapUnits ) ) + if ( !writer->addFeature( fet, layer->renderer(), mapUnits ) ) { WriterError err = writer->hasError(); if ( err != NoError && errorMessage ) @@ -2586,7 +2586,7 @@ void QgsVectorFileWriter::createSymbolLayerTable( QgsVectorLayer* vl, const Qgs return; } - QgsFeatureRendererV2* renderer = vl->rendererV2(); + QgsFeatureRenderer* renderer = vl->renderer(); if ( !renderer ) { return; @@ -2637,7 +2637,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::exportFeaturesSymbolLevels << QgsExpressionContextUtils::projectScope() << QgsExpressionContextUtils::layerScope( layer ); - QgsFeatureRendererV2 *renderer = layer->rendererV2(); + QgsFeatureRenderer *renderer = layer->renderer(); if ( !renderer ) return ErrInvalidLayer; @@ -2806,7 +2806,7 @@ double QgsVectorFileWriter::mapUnitScaleFactor( double scaleDenominator, QgsUnit void QgsVectorFileWriter::startRender( QgsVectorLayer* vl ) { - QgsFeatureRendererV2* renderer = symbologyRenderer( vl ); + QgsFeatureRenderer* renderer = symbologyRenderer( vl ); if ( !renderer ) { return; @@ -2817,7 +2817,7 @@ void QgsVectorFileWriter::startRender( QgsVectorLayer* vl ) void QgsVectorFileWriter::stopRender( QgsVectorLayer* vl ) { - QgsFeatureRendererV2* renderer = symbologyRenderer( vl ); + QgsFeatureRenderer* renderer = symbologyRenderer( vl ); if ( !renderer ) { return; @@ -2826,7 +2826,7 @@ void QgsVectorFileWriter::stopRender( QgsVectorLayer* vl ) renderer->stopRender( mRenderContext ); } -QgsFeatureRendererV2* QgsVectorFileWriter::symbologyRenderer( QgsVectorLayer* vl ) const +QgsFeatureRenderer* QgsVectorFileWriter::symbologyRenderer( QgsVectorLayer* vl ) const { if ( mSymbologyExport == NoSymbology ) { @@ -2837,12 +2837,12 @@ QgsFeatureRendererV2* QgsVectorFileWriter::symbologyRenderer( QgsVectorLayer* vl return nullptr; } - return vl->rendererV2(); + return vl->renderer(); } void QgsVectorFileWriter::addRendererAttributes( QgsVectorLayer* vl, QgsAttributeList& attList ) { - QgsFeatureRendererV2* renderer = symbologyRenderer( vl ); + QgsFeatureRenderer* renderer = symbologyRenderer( vl ); if ( renderer ) { QList rendererAttributes = renderer->usedAttributes(); diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h index ff22107e413..e7aef7739ae 100644 --- a/src/core/qgsvectorfilewriter.h +++ b/src/core/qgsvectorfilewriter.h @@ -325,7 +325,7 @@ class CORE_EXPORT QgsVectorFileWriter QString errorMessage(); /** Add feature to the currently opened data source */ - bool addFeature( QgsFeature& feature, QgsFeatureRendererV2* renderer = nullptr, QgsUnitTypes::DistanceUnit outputUnit = QgsUnitTypes::DistanceMeters ); + bool addFeature( QgsFeature& feature, QgsFeatureRenderer* renderer = nullptr, QgsUnitTypes::DistanceUnit outputUnit = QgsUnitTypes::DistanceMeters ); //! @note not available in python bindings QMap attrIdxToOgrIdx() { return mAttrIdxToOgrIdx; } @@ -441,7 +441,7 @@ class CORE_EXPORT QgsVectorFileWriter void startRender( QgsVectorLayer* vl ); void stopRender( QgsVectorLayer* vl ); - QgsFeatureRendererV2* symbologyRenderer( QgsVectorLayer* vl ) const; + QgsFeatureRenderer* symbologyRenderer( QgsVectorLayer* vl ) const; /** Adds attributes needed for classification*/ void addRendererAttributes( QgsVectorLayer* vl, QgsAttributeList& attList ); static QMap sDriverMetadata; diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp index a54e943effe..b498f8c039c 100644 --- a/src/core/qgsvectorlayer.cpp +++ b/src/core/qgsvectorlayer.cpp @@ -42,7 +42,7 @@ #include "qgscoordinatereferencesystem.h" #include "qgscoordinatetransform.h" #include "qgscsexception.h" -#include "qgscurvev2.h" +#include "qgscurve.h" #include "qgsdatasourceuri.h" #include "qgsexpressionfieldbuffer.h" #include "qgsfeature.h" @@ -50,7 +50,6 @@ #include "qgsfield.h" #include "qgsgeometrycache.h" #include "qgsgeometry.h" -#include "qgslegacyhelpers.h" #include "qgslogger.h" #include "qgsmaplayerlegend.h" #include "qgsmaplayerregistry.h" @@ -74,11 +73,11 @@ #include "qgsvectorlayerrenderer.h" #include "qgsvectorlayerundocommand.h" #include "qgspointv2.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgssymbollayer.h" -#include "qgssinglesymbolrendererv2.h" -#include "qgsdiagramrendererv2.h" -#include "qgsstylev2.h" +#include "qgssinglesymbolrenderer.h" +#include "qgsdiagramrenderer.h" +#include "qgsstyle.h" #include "qgssymbologyconversion.h" #include "qgspallabeling.h" #include "qgssimplifymethod.h" @@ -130,7 +129,7 @@ QgsVectorLayer::QgsVectorLayer( const QString& vectorLayerPath, , mReadOnly( false ) , mEditFormConfig( new QgsEditFormConfig( this ) ) , mWkbType( QgsWkbTypes::Unknown ) - , mRendererV2( nullptr ) + , mRenderer( nullptr ) , mLabeling( new QgsVectorLayerSimpleLabeling ) , mLabelFontNotFoundNotified( false ) , mFeatureBlendMode( QPainter::CompositionMode_SourceOver ) // Default to normal feature blending @@ -174,8 +173,6 @@ QgsVectorLayer::QgsVectorLayer( const QString& vectorLayerPath, QgsVectorLayer::~QgsVectorLayer() { - emit layerDeleted(); - mValid = false; delete mDataProvider; @@ -189,7 +186,7 @@ QgsVectorLayer::~QgsVectorLayer() delete mActions; - delete mRendererV2; + delete mRenderer; delete mConditionalStyles; } @@ -291,11 +288,6 @@ void QgsVectorLayer::deselect( const QgsFeatureIds& featureIds ) emit selectionChanged( QgsFeatureIds(), featureIds, false ); } -void QgsVectorLayer::select( QgsRectangle & rect, bool addToSelection ) -{ - selectByRect( rect, addToSelection ? AddToSelection : SetSelection ); -} - void QgsVectorLayer::selectByRect( QgsRectangle& rect, QgsVectorLayer::SelectBehaviour behaviour ) { // normalize the rectangle @@ -509,7 +501,7 @@ void QgsVectorLayer::setProviderEncoding( const QString& encoding ) } } -void QgsVectorLayer::setDiagramRenderer( QgsDiagramRendererV2* r ) +void QgsVectorLayer::setDiagramRenderer( QgsDiagramRenderer* r ) { delete mDiagramRenderer; mDiagramRenderer = r; @@ -699,13 +691,13 @@ bool QgsVectorLayer::countSymbolFeatures( bool showProgress ) QgsDebugMsg( "invoked with null mDataProvider" ); return false; } - if ( !mRendererV2 ) + if ( !mRenderer ) { - QgsDebugMsg( "invoked with null mRendererV2" ); + QgsDebugMsg( "invoked with null mRenderer" ); return false; } - QgsLegendSymbolList symbolList = mRendererV2->legendSymbolItems(); + QgsLegendSymbolList symbolList = mRenderer->legendSymbolItems(); QgsLegendSymbolList::const_iterator symbolIt = symbolList.constBegin(); for ( ; symbolIt != symbolList.constEnd(); ++symbolIt ) @@ -737,9 +729,9 @@ bool QgsVectorLayer::countSymbolFeatures( bool showProgress ) int featuresCounted = 0; QgsFeatureRequest request; - if ( !mRendererV2->filterNeedsGeometry() ) + if ( !mRenderer->filterNeedsGeometry() ) request.setFlags( QgsFeatureRequest::NoGeometry ); - request.setSubsetOfAttributes( mRendererV2->usedAttributes(), mUpdatedFields ); + request.setSubsetOfAttributes( mRenderer->usedAttributes(), mUpdatedFields ); QgsFeatureIterator fit = getFeatures( request ); QgsVectorLayerInterruptionCheckerDuringCountSymbolFeatures interruptionCheck( &progressDialog ); if ( showProgress ) @@ -754,7 +746,7 @@ bool QgsVectorLayer::countSymbolFeatures( bool showProgress ) << QgsExpressionContextUtils::projectScope() << QgsExpressionContextUtils::layerScope( this ); - mRendererV2->startRender( renderContext, fields() ); + mRenderer->startRender( renderContext, fields() ); QgsFeature f; QTime time; @@ -762,7 +754,7 @@ bool QgsVectorLayer::countSymbolFeatures( bool showProgress ) while ( fit.nextFeature( f ) ) { renderContext.expressionContext().setFeature( f ); - QgsSymbolList featureSymbolList = mRendererV2->originalSymbolsForFeature( f, renderContext ); + QgsSymbolList featureSymbolList = mRenderer->originalSymbolsForFeature( f, renderContext ); for ( QgsSymbolList::iterator symbolIt = featureSymbolList.begin(); symbolIt != featureSymbolList.end(); ++symbolIt ) { mSymbolFeatureCountMap[*symbolIt] += 1; @@ -796,12 +788,12 @@ bool QgsVectorLayer::countSymbolFeatures( bool showProgress ) if ( progressDialog.wasCanceled() ) { mSymbolFeatureCountMap.clear(); - mRendererV2->stopRender( renderContext ); + mRenderer->stopRender( renderContext ); return false; } } } - mRendererV2->stopRender( renderContext ); + mRenderer->stopRender( renderContext ); progressDialog.setValue( nFeatures ); mSymbolFeatureCounted = true; return true; @@ -1062,23 +1054,13 @@ bool QgsVectorLayer::moveVertex( const QgsPointV2& p, QgsFeatureId atFeatureId, return result; } -bool QgsVectorLayer::deleteVertex( QgsFeatureId atFeatureId, int atVertex ) -{ - QgsVectorLayer::EditResult res = deleteVertexV2( atFeatureId, atVertex ); - bool result = ( res == QgsVectorLayer::Success || res == QgsVectorLayer::EmptyGeometry ); - - if ( result ) - updateExtents(); - return result; -} - -QgsVectorLayer::EditResult QgsVectorLayer::deleteVertexV2( QgsFeatureId featureId, int vertex ) +QgsVectorLayer::EditResult QgsVectorLayer::deleteVertex( QgsFeatureId featureId, int vertex ) { if ( !mValid || !mEditBuffer || !mDataProvider ) return QgsVectorLayer::InvalidLayer; QgsVectorLayerEditUtils utils( this ); - EditResult result = utils.deleteVertexV2( featureId, vertex ); + EditResult result = utils.deleteVertex( featureId, vertex ); if ( result == Success ) updateExtents(); @@ -1141,7 +1123,7 @@ int QgsVectorLayer::addRing( const QList& ring, QgsFeatureId* featureI return result; } -int QgsVectorLayer::addRing( QgsCurveV2* ring, QgsFeatureId* featureId ) +int QgsVectorLayer::addRing( QgsCurve* ring, QgsFeatureId* featureId ) { if ( !mValid || !mEditBuffer || !mDataProvider ) { @@ -1166,13 +1148,13 @@ int QgsVectorLayer::addRing( QgsCurveV2* ring, QgsFeatureId* featureId ) //first try with selected features if ( !mSelectedFeatureIds.isEmpty() ) { - result = utils.addRing( static_cast< QgsCurveV2* >( ring->clone() ), mSelectedFeatureIds, featureId ); + result = utils.addRing( static_cast< QgsCurve* >( ring->clone() ), mSelectedFeatureIds, featureId ); } if ( result != 0 ) { //try with all intersecting features - result = utils.addRing( static_cast< QgsCurveV2* >( ring->clone() ), QgsFeatureIds(), featureId ); + result = utils.addRing( static_cast< QgsCurve* >( ring->clone() ), QgsFeatureIds(), featureId ); } delete ring; @@ -1205,7 +1187,7 @@ int QgsVectorLayer::addPart( const QList &points ) return result; } -int QgsVectorLayer::addPart( const QgsPointSequenceV2 &points ) +int QgsVectorLayer::addPart( const QgsPointSequence &points ) { if ( !mValid || !mEditBuffer || !mDataProvider ) return 7; @@ -1231,7 +1213,7 @@ int QgsVectorLayer::addPart( const QgsPointSequenceV2 &points ) return result; } -int QgsVectorLayer::addPart( QgsCurveV2* ring ) +int QgsVectorLayer::addPart( QgsCurve* ring ) { if ( !mValid || !mEditBuffer || !mDataProvider ) return 7; @@ -1500,7 +1482,7 @@ void QgsVectorLayer::setDataSource( const QString& dataSource, const QString& ba setCoordinateSystem(); // reset style if loading default style, style is missing, or geometry type has changed - if ( !rendererV2() || !legend() || geomType != geometryType() || loadDefaultStyleFlag ) + if ( !renderer() || !legend() || geomType != geometryType() || loadDefaultStyleFlag ) { // check if there is a default style / propertysheet defined // for this layer and if so apply it @@ -1514,7 +1496,7 @@ void QgsVectorLayer::setDataSource( const QString& dataSource, const QString& ba if ( !defaultLoadedFlag && hasGeometryType() ) { // add single symbol renderer - setRendererV2( QgsFeatureRendererV2::defaultRenderer( geometryType() ) ); + setRenderer( QgsFeatureRenderer::defaultRenderer( geometryType() ) ); } setLegend( QgsMapLayerLegend::defaultVectorLegend( this ) ); @@ -1769,19 +1751,19 @@ bool QgsVectorLayer::readStyle( const QDomNode &node, QString &errorMessage ) QDomElement rendererElement = node.firstChildElement( RENDERER_TAG_NAME ); if ( !rendererElement.isNull() ) { - QgsFeatureRendererV2* r = QgsFeatureRendererV2::load( rendererElement ); + QgsFeatureRenderer* r = QgsFeatureRenderer::load( rendererElement ); if ( !r ) return false; - setRendererV2( r ); + setRenderer( r ); } else { - QgsFeatureRendererV2* r = QgsSymbologyConversion::readOldRenderer( node, geometryType() ); + QgsFeatureRenderer* r = QgsSymbologyConversion::readOldRenderer( node, geometryType() ); if ( !r ) - r = QgsFeatureRendererV2::defaultRenderer( geometryType() ); + r = QgsFeatureRenderer::defaultRenderer( geometryType() ); - setRendererV2( r ); + setRenderer( r ); } QDomElement labelingElement = node.firstChildElement( "labeling" ); @@ -1934,7 +1916,7 @@ bool QgsVectorLayer::writeStyle( QDomNode &node, QDomDocument &doc, QString &err if ( hasGeometryType() ) { - QDomElement rendererElement = mRendererV2->save( doc ); + QDomElement rendererElement = mRenderer->save( doc ); node.appendChild( rendererElement ); if ( mLabeling ) @@ -1992,11 +1974,11 @@ bool QgsVectorLayer::readSld( const QDomNode& node, QString& errorMessage ) if ( hasGeometryType() ) { - QgsFeatureRendererV2* r = QgsFeatureRendererV2::loadSld( node, geometryType(), errorMessage ); + QgsFeatureRenderer* r = QgsFeatureRenderer::loadSld( node, geometryType(), errorMessage ); if ( !r ) return false; - setRendererV2( r ); + setRenderer( r ); // labeling readSldLabeling( node ); @@ -2016,7 +1998,7 @@ bool QgsVectorLayer::writeSld( QDomNode& node, QDomDocument& doc, QString& error if ( hasGeometryType() ) { - node.appendChild( mRendererV2->writeSld( doc, name() ) ); + node.appendChild( mRenderer->writeSld( doc, name() ) ); } return true; } @@ -2039,12 +2021,6 @@ bool QgsVectorLayer::changeGeometry( QgsFeatureId fid, const QgsGeometry& geom ) } -bool QgsVectorLayer::changeAttributeValue( QgsFeatureId fid, int field, const QVariant& value, bool emitSignal ) -{ - Q_UNUSED( emitSignal ); - return changeAttributeValue( fid, field, value ); -} - bool QgsVectorLayer::changeAttributeValue( QgsFeatureId fid, int field, const QVariant &newValue, const QVariant &oldValue ) { if ( !mEditBuffer || !mDataProvider ) @@ -2303,11 +2279,6 @@ bool QgsVectorLayer::rollBack( bool deleteBuffer ) return true; } -void QgsVectorLayer::setSelectedFeatures( const QgsFeatureIds& ids ) -{ - selectByIds( ids, SetSelection ); -} - int QgsVectorLayer::selectedFeatureCount() const { return mSelectedFeatureIds.size(); @@ -2649,79 +2620,20 @@ bool QgsVectorLayer::isModified() const return mEditBuffer && mEditBuffer->isModified(); } -QgsVectorLayer::EditType QgsVectorLayer::editType( int idx ) -{ - if ( idx < 0 || idx >= mUpdatedFields.count() ) - return Hidden; - - Q_NOWARN_DEPRECATED_PUSH - return QgsLegacyHelpers::convertEditType( editorWidgetV2( idx ), editorWidgetV2Config( idx ), this, mUpdatedFields[ idx ].name() ); - Q_NOWARN_DEPRECATED_POP -} - -void QgsVectorLayer::setEditType( int idx, EditType type ) -{ - if ( idx < 0 || idx >= mUpdatedFields.count() ) - return; - - QgsEditorWidgetConfig cfg; - - Q_NOWARN_DEPRECATED_PUSH - const QString widgetType = QgsLegacyHelpers::convertEditType( type, cfg, this, mUpdatedFields[idx].name() ); - - setEditorWidgetV2( idx, widgetType ); - setEditorWidgetV2Config( idx, cfg ); - Q_NOWARN_DEPRECATED_POP -} - void QgsVectorLayer::setAnnotationForm( const QString& ui ) { mAnnotationForm = ui; } -QMap< QString, QVariant > QgsVectorLayer::valueMap( int idx ) -{ - Q_NOWARN_DEPRECATED_PUSH - return editorWidgetV2Config( idx ); - Q_NOWARN_DEPRECATED_POP -} - -QgsVectorLayer::RangeData QgsVectorLayer::range( int idx ) -{ - Q_NOWARN_DEPRECATED_PUSH - const QgsEditorWidgetConfig cfg = editorWidgetV2Config( idx ); - return RangeData( - cfg.value( "Min" ), - cfg.value( "Max" ), - cfg.value( "Step" ) - ); - Q_NOWARN_DEPRECATED_POP -} - -QString QgsVectorLayer::dateFormat( int idx ) -{ - Q_NOWARN_DEPRECATED_PUSH - return editorWidgetV2Config( idx ).value( "DateFormat" ).toString(); - Q_NOWARN_DEPRECATED_POP -} - -QSize QgsVectorLayer::widgetSize( int idx ) -{ - Q_NOWARN_DEPRECATED_PUSH - const QgsEditorWidgetConfig cfg = editorWidgetV2Config( idx ); - return QSize( cfg.value( "Width" ).toInt(), cfg.value( "Height" ).toInt() ); - Q_NOWARN_DEPRECATED_POP -} - -void QgsVectorLayer::setRendererV2( QgsFeatureRendererV2 *r ) +void QgsVectorLayer::setRenderer( QgsFeatureRenderer *r ) { if ( !hasGeometryType() ) return; - if ( r != mRendererV2 ) + if ( r != mRenderer ) { - delete mRendererV2; - mRendererV2 = r; + delete mRenderer; + mRenderer = r; mSymbolFeatureCounted = false; mSymbolFeatureCountMap.clear(); @@ -2779,17 +2691,6 @@ void QgsVectorLayer::destroyEditCommand() } } - -void QgsVectorLayer::setCheckedState( int idx, const QString& checked, const QString& unchecked ) -{ - Q_NOWARN_DEPRECATED_PUSH - QgsEditorWidgetConfig cfg = editorWidgetV2Config( idx ); - cfg["CheckedState"] = checked; - cfg["UncheckedState"] = unchecked; - setEditorWidgetV2Config( idx, cfg ); - Q_NOWARN_DEPRECATED_POP -} - int QgsVectorLayer::fieldNameIndex( const QString& fieldName ) const { return fields().fieldNameIndex( fieldName ); @@ -3991,9 +3892,9 @@ QString QgsVectorLayer::loadNamedStyle( const QString &theURI, bool &theResultFl qml = loadStyleExternalMethod( mDataSource, errorMsg ); if ( !qml.isEmpty() ) { - Q_NOWARN_DEPRECATED_PUSH - theResultFlag = applyNamedStyle( qml, errorMsg ); - Q_NOWARN_DEPRECATED_POP + QDomDocument myDocument( "qgis" ); + myDocument.setContent( qml ); + theResultFlag = importNamedStyle( myDocument, errorMsg ); return QObject::tr( "Loaded from Provider" ); } } @@ -4003,15 +3904,6 @@ QString QgsVectorLayer::loadNamedStyle( const QString &theURI, bool &theResultFl return QgsMapLayer::loadNamedStyle( theURI, theResultFlag ); } -bool QgsVectorLayer::applyNamedStyle( const QString& namedStyle, QString& errorMsg ) -{ - QDomDocument myDocument( "qgis" ); - myDocument.setContent( namedStyle ); - - return importNamedStyle( myDocument, errorMsg ); -} - - QDomElement QgsAttributeEditorRelation::toDomElement( QDomDocument& doc ) const { QDomElement elem = doc.createElement( "attributeEditorRelation" ); diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h index bc8ec0233e9..58bef50a3e4 100644 --- a/src/core/qgsvectorlayer.h +++ b/src/core/qgsvectorlayer.h @@ -46,12 +46,12 @@ class QgsAbstractGeometrySimplifier; class QgsActionManager; class QgsConditionalLayerStyles; class QgsCoordinateTransform; -class QgsCurveV2; +class QgsCurve; class QgsDiagramLayerSettings; -class QgsDiagramRendererV2; +class QgsDiagramRenderer; class QgsEditorWidgetWrapper; class QgsExpressionFieldBuffer; -class QgsFeatureRendererV2; +class QgsFeatureRenderer; class QgsGeometry; class QgsGeometryCache; class QgsGeometryVertexIndex; @@ -60,7 +60,7 @@ class QgsRectangle; class QgsRectangle; class QgsRelation; class QgsRelationManager; -class QgsSingleSymbolRendererV2; +class QgsSingleSymbolRenderer; class QgsSymbol; class QgsVectorDataProvider; class QgsVectorLayerEditBuffer; @@ -70,7 +70,7 @@ class QgsPointV2; typedef QList QgsAttributeList; typedef QSet QgsAttributeIds; -typedef QList QgsPointSequenceV2; +typedef QList QgsPointSequence; struct CORE_EXPORT QgsVectorJoinInfo @@ -424,22 +424,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer UiFileLayout = 2 }; - struct RangeData - { - //! @deprecated Use the editorWidgetV2() system instead - Q_DECL_DEPRECATED RangeData() { mMin = QVariant( 0 ); mMax = QVariant( 5 ); mStep = QVariant( 1 );} - //! @deprecated Use the editorWidgetV2() system instead - Q_DECL_DEPRECATED RangeData( const QVariant& theMin, const QVariant& theMax, const QVariant& theStep ) - : mMin( theMin ) - , mMax( theMax ) - , mStep( theStep ) - {} - - QVariant mMin; - QVariant mMax; - QVariant mStep; - }; - struct ValueRelationData { ValueRelationData() @@ -468,46 +452,6 @@ class CORE_EXPORT QgsVectorLayer : public 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 = 0, // use the application-wide setting - SuppressOn = 1, - SuppressOff = 2 - }; - - /** - * @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 { @@ -668,18 +612,6 @@ class CORE_EXPORT QgsVectorLayer : public 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 - */ - Q_DECL_DEPRECATED void select( QgsRectangle & rect, bool addToSelection ); - /** * Select features found within the search rectangle (in layer's coordinates) * @param rect search rectangle @@ -775,16 +707,6 @@ class CORE_EXPORT QgsVectorLayer : public 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 - */ - Q_DECL_DEPRECATED void setSelectedFeatures( const QgsFeatureIds &ids ); - /** Returns the bounding box of the selected features. If there is no selection, QgsRectangle(0,0,0,0) is returned */ QgsRectangle boundingBoxOfSelected() const; @@ -801,25 +723,25 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer bool diagramsEnabled() const; /** Sets diagram rendering object (takes ownership) */ - void setDiagramRenderer( QgsDiagramRendererV2* r ); - const QgsDiagramRendererV2* diagramRenderer() const { return mDiagramRenderer; } + void setDiagramRenderer( QgsDiagramRenderer* r ); + const QgsDiagramRenderer* diagramRenderer() const { return mDiagramRenderer; } void setDiagramLayerSettings( const QgsDiagramLayerSettings& s ); const QgsDiagramLayerSettings *diagramLayerSettings() const { return mDiagramLayerSettings; } - /** Return renderer V2. */ - QgsFeatureRendererV2* rendererV2() { return mRendererV2; } + /** Return renderer. */ + QgsFeatureRenderer* renderer() { return mRenderer; } - /** Return const renderer V2. + /** Return const renderer. * @note not available in python bindings */ - const QgsFeatureRendererV2* rendererV2() const { return mRendererV2; } + const QgsFeatureRenderer* renderer() const { return mRenderer; } /** * Set renderer which will be invoked to represent this layer. * Ownership is transferred. */ - void setRendererV2( QgsFeatureRendererV2* r ); + void setRenderer( QgsFeatureRenderer* r ); /** Returns point, line or polygon */ QgsWkbTypes::GeometryType geometryType() const; @@ -885,18 +807,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer */ virtual QString loadNamedStyle( const QString &theURI, bool &theResultFlag ) override; - /** - * 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 - */ - Q_DECL_DEPRECATED virtual bool applyNamedStyle( const QString& namedStyle, QString &errorMsg ); - /** 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 @@ -1054,18 +964,12 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer */ bool moveVertex( const QgsPointV2& p, QgsFeatureId atFeatureId, int atVertex ); - /** Deletes a vertex from a feature - * @deprecated use deleteVertexV2() instead - */ - Q_DECL_DEPRECATED bool deleteVertex( QgsFeatureId atFeatureId, int atVertex ); - /** 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 @@ -1098,7 +1002,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer * @note available in python as addCurvedRing */ // TODO QGIS 3.0 returns an enum instead of a magic constant - int addRing( QgsCurveV2* ring, QgsFeatureId* featureId = nullptr ); + int addRing( QgsCurve* ring, QgsFeatureId* featureId = nullptr ); /** Adds a new part polygon to a multipart feature * @return @@ -1127,10 +1031,10 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer * @note available in python bindings as addPartV2 */ // TODO QGIS 3.0 returns an enum instead of a magic constant - int addPart( const QgsPointSequenceV2 &ring ); + int addPart( const QgsPointSequence &ring ); //! @note available in python as addCurvedPart - int addPart( QgsCurveV2* ring ); + int addPart( QgsCurve* ring ); /** Translates feature by dx, dy * @param featureId id of the feature to translate @@ -1200,15 +1104,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer virtual bool isSpatial() const override; - /** - * Returns true if the provider is in read-only mode - * - * @deprecated Use readOnly() instead. Will be made private with QGIS 3 - * - * TODO QGIS3: make private - */ - Q_DECL_DEPRECATED virtual bool isReadOnly() const override; - /** Returns true if the provider has been modified since the last commit */ virtual bool isModified() const; @@ -1245,6 +1140,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer */ bool draw( QgsRenderContext& rendererContext ) override; + /** Return the extent of the layer */ QgsRectangle extent() const override; /** @@ -1305,14 +1201,6 @@ class CORE_EXPORT QgsVectorLayer : public 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) - */ - Q_DECL_DEPRECATED bool changeAttributeValue( QgsFeatureId fid, int field, const QVariant& value, bool emitSignal ); - /** * Changes an attribute value (but does not commit it) * @@ -1343,68 +1231,6 @@ class CORE_EXPORT QgsVectorLayer : public 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 - */ - Q_DECL_DEPRECATED void addAttributeEditorWidget( QgsAttributeEditorElement* data ) {mEditFormConfig->addTab( data );} - - /** - * 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 - */ - Q_DECL_DEPRECATED const QString editorWidgetV2( int fieldIdx ) const { return mEditFormConfig->widgetType( fieldIdx ); } - - /** - * 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 - */ - Q_DECL_DEPRECATED const QString editorWidgetV2( const QString& fieldName ) const { return mEditFormConfig->widgetType( fieldName ); } - - /** - * 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 - */ - Q_DECL_DEPRECATED const QgsEditorWidgetConfig editorWidgetV2Config( int fieldIdx ) const { return mEditFormConfig->widgetConfig( fieldIdx ); } - - /** - * 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 - */ - Q_DECL_DEPRECATED const QgsEditorWidgetConfig editorWidgetV2Config( const QString& fieldName ) const { return mEditFormConfig->widgetConfig( fieldName ); } - - /** - * Returns a list of tabs holding groups and fields - * - * @deprecated Use `editFormConfig()->tabs()` instead - */ - Q_DECL_DEPRECATED QList< QgsAttributeEditorElement* > attributeEditorElements() { return mEditFormConfig->tabs(); } - /** * Get the configuration of the form used to represent this vector layer. * This is a writable configuration that can directly be changed in place. @@ -1495,148 +1321,12 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer */ bool rollBack( bool deleteBuffer = true ); - /** - * Get edit type - * - * @deprecated Use `editFormConfig()->widgetType()` instead - */ - Q_DECL_DEPRECATED EditType editType( int idx ); - - /** - * Set edit type - * - * @deprecated Use `editFormConfig()->setWidgetType()` instead - */ - Q_DECL_DEPRECATED void setEditType( int idx, EditType edit ); - - /** - * Get the active layout for the attribute editor for this layer - * @deprecated Use `editFormConfig()->layout()` instead - */ - Q_DECL_DEPRECATED EditorLayout editorLayout() { return static_cast< EditorLayout >( mEditFormConfig->layout() ); } - - /** - * Set the active layout for the attribute editor for this layer - * @deprecated Use `editFormConfig()->setLayout()` instead - */ - Q_DECL_DEPRECATED void setEditorLayout( EditorLayout editorLayout ) { mEditFormConfig->setLayout( static_cast< QgsEditFormConfig::EditorLayout >( editorLayout ) ); } - - /** - * Set the editor widget type for a field - * - * QGIS ships the following widget types, additional types may be available depending - * on plugins. - * - *
      - *
    • CheckBox (QgsCheckboxWidgetWrapper)
      • - *
    • Classification (QgsClassificationWidgetWrapper)
      • - *
    • Color (QgsColorWidgetWrapper)
      • - *
    • DateTime (QgsDateTimeEditWrapper)
      • - *
    • Enumeration (QgsEnumerationWidgetWrapper)
      • - *
    • FileName (QgsFileNameWidgetWrapper)
      • - *
    • Hidden (QgsHiddenWidgetWrapper)
      • - *
    • Photo (QgsPhotoWidgetWrapper)
      • - *
    • Range (QgsRangeWidgetWrapper)
      • - *
    • RelationReference (QgsRelationReferenceWidgetWrapper)
      • - *
    • TextEdit (QgsTextEditWrapper)
      • - *
    • UniqueValues (QgsUniqueValuesWidgetWrapper)
      • - *
    • UuidGenerator (QgsUuidWidgetWrapper)
      • - *
    • ValueMap (QgsValueMapWidgetWrapper)
      • - *
    • ValueRelation (QgsValueRelationWidgetWrapper)
      • - *
    • WebView (QgsWebViewWidgetWrapper)
      • - *
    - * - * @param attrIdx Index of the field - * @param widgetType Type id of the editor widget to use - * - * @deprecated Use `editFormConfig()->setWidgetType()` instead - */ - Q_DECL_DEPRECATED void setEditorWidgetV2( int attrIdx, const QString& widgetType ) { mEditFormConfig->setWidgetType( attrIdx, widgetType ); } - - /** - * 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 - */ - Q_DECL_DEPRECATED void setEditorWidgetV2Config( int attrIdx, const QgsEditorWidgetConfig& config ) { mEditFormConfig->setWidgetConfig( attrIdx, config ); } - - /** - * Set string representing 'true' for a checkbox - * - * @deprecated Use @deprecated Use `editFormConfig()->setWidgetConfig()` instead - */ - Q_DECL_DEPRECATED void setCheckedState( int idx, const QString& checked, const QString& notChecked ); - - /** - * Get edit form - * - * @deprecated Use `editFormConfig()->uiForm()` instead - */ - Q_DECL_DEPRECATED QString editForm() const { return mEditFormConfig->uiForm(); } - - /** - * Set edit form - * @deprecated Use `editFormConfig()->setUiForm()` instead - */ - Q_DECL_DEPRECATED void setEditForm( const QString& ui ) { mEditFormConfig->setUiForm( ui ); } - - /** Type of feature form pop-up suppression after feature creation (overrides app setting) - * @note added in 2.1 - * @deprecated Use `editFormConfig()->suppress()` instead - */ - Q_DECL_DEPRECATED QgsVectorLayer::FeatureFormSuppress featureFormSuppress() const { return static_cast< FeatureFormSuppress >( mEditFormConfig->suppress() ); } - - /** Set type of feature form pop-up suppression after feature creation (overrides app setting) - * @note added in 2.1 - * @deprecated Use `editFormConfig()->setSuppress()` instead - */ - Q_DECL_DEPRECATED void setFeatureFormSuppress( QgsVectorLayer::FeatureFormSuppress s ) { mEditFormConfig->setSuppress( static_cast< QgsEditFormConfig::FeatureFormSuppress >( s ) ); } - /** Get annotation form */ QString annotationForm() const { return mAnnotationForm; } /** Set annotation form for layer */ void setAnnotationForm( const QString& ui ); - /** - * Get python function for edit form initialization - * - * @deprecated Use `editFormConfig()->initFunction()` instead - */ - Q_DECL_DEPRECATED QString editFormInit() const { return mEditFormConfig->initFunction(); } - - /** - * Set python function for edit form initialization - * - * @deprecated Use `editFormConfig()->setInitFunction()` instead - */ - Q_DECL_DEPRECATED void setEditFormInit( const QString& function ) { mEditFormConfig->setInitFunction( function ); } - - /** - * Access value map - * @deprecated Use `editFormConfig()->widgetConfig()` instead - */ - Q_DECL_DEPRECATED QMap valueMap( int idx ); - - /** - * Access range widget config data - * - * @deprecated Use `editFormConfig()->widgetConfig()` instead - */ - Q_DECL_DEPRECATED RangeData range( int idx ); - /** Access value relation widget data */ ValueRelationData valueRelation( int idx ) const; @@ -1648,45 +1338,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer */ QList referencingRelations( int idx ) const; - /** - * Access date format - * - * @deprecated Use `editFormConfig()->widgetConfig()` instead - */ - Q_DECL_DEPRECATED QString dateFormat( int idx ); - - /** - * Access widget size for photo and webview widget - * - * @deprecated Use `editFormConfig()->widgetConfig()` instead - */ - Q_DECL_DEPRECATED QSize widgetSize( int idx ); - - /** - * Is edit widget editable - * - * @deprecated Use `editFormConfig()->fieldEditable()` instead - */ - Q_DECL_DEPRECATED bool fieldEditable( int idx ) { return !mEditFormConfig->readOnly( idx ); } - - /** - * Label widget on top - * @deprecated Use `editFormConfig()->labelOnTop()` instead - */ - Q_DECL_DEPRECATED bool labelOnTop( int idx ) { return mEditFormConfig->labelOnTop( idx ); } - - /** - * Set edit widget editable - * @deprecated Use `editFormConfig()->setFieldEditable()` instead - */ - Q_DECL_DEPRECATED void setFieldEditable( int idx, bool editable ) { mEditFormConfig->setReadOnly( idx, !editable ); } - - /** - * Label widget on top - * @deprecated Use `editFormConfig()->setLabelOnTop()` instead - */ - Q_DECL_DEPRECATED void setLabelOnTop( int idx, bool onTop ) { mEditFormConfig->setLabelOnTop( idx, onTop ); } - //! Buffer with uncommitted editing operations. Only valid after editing has been turned on. QgsVectorLayerEditBuffer* editBuffer() { return mEditBuffer; } @@ -1795,6 +1446,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer * @note added in 2.2 */ void setSimplifyMethod( const QgsVectorSimplifyMethod& simplifyMethod ) { mSimplifyMethod = simplifyMethod; } + /** Returns the simplification settings for fast rendering of features * @note added in 2.2 */ @@ -1885,7 +1537,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer /** * Clear selection * - * @see setSelectedFeatures(const QgsFeatureIds&) + * @see selectByIds() */ void removeSelection(); @@ -2014,10 +1666,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer */ void updatedFields(); - /** - * TODO QGIS3: remove in favor of QObject::destroyed - */ - void layerDeleted(); /** * Is emitted whenever an attribute value change is done in the edit buffer. @@ -2051,9 +1699,6 @@ class CORE_EXPORT QgsVectorLayer : public 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 */ - Q_DECL_DEPRECATED void saveLayerToProject(); - /** Emitted when the font family defined for labeling layer is not found on system */ void labelingFontNotFound( QgsVectorLayer* layer, const QString& fontfamily ); @@ -2134,6 +1779,10 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer void setExtent( const QgsRectangle &rect ) override; private: // Private methods + /** + * Returns true if the provider is in read-only mode + */ + virtual bool isReadOnly() const override; /** Vector layers are not copyable */ QgsVectorLayer( const QgsVectorLayer & rhs ); @@ -2218,7 +1867,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer QgsWkbTypes::Type mWkbType; /** Renderer object which holds the information about how to display the features */ - QgsFeatureRendererV2 *mRendererV2; + QgsFeatureRenderer *mRenderer; /** Simplification object which holds the information about how to simplify the features for fast rendering */ QgsVectorSimplifyMethod mSimplifyMethod; @@ -2257,7 +1906,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer QgsExpressionFieldBuffer* mExpressionFieldBuffer; //diagram rendering object. 0 if diagram drawing is disabled - QgsDiagramRendererV2* mDiagramRenderer; + QgsDiagramRenderer* mDiagramRenderer; //stores infos about diagram placement (placement type, priority, position distance) QgsDiagramLayerSettings *mDiagramLayerSettings; diff --git a/src/core/qgsvectorlayercache.cpp b/src/core/qgsvectorlayercache.cpp index 4708df0bf13..c46cb8e899c 100644 --- a/src/core/qgsvectorlayercache.cpp +++ b/src/core/qgsvectorlayercache.cpp @@ -28,7 +28,7 @@ QgsVectorLayerCache::QgsVectorLayerCache( QgsVectorLayer* layer, int cacheSize, connect( mLayer, SIGNAL( featureDeleted( QgsFeatureId ) ), SLOT( featureDeleted( QgsFeatureId ) ) ); connect( mLayer, SIGNAL( featureAdded( QgsFeatureId ) ), SLOT( onFeatureAdded( QgsFeatureId ) ) ); - connect( mLayer, SIGNAL( layerDeleted() ), SLOT( layerDeleted() ) ); + connect( mLayer, SIGNAL( destroyed() ), SLOT( layerDeleted() ) ); setCacheGeometry( true ); setCacheSubsetOfAttributes( mLayer->attributeList() ); diff --git a/src/core/qgsvectorlayerdiagramprovider.cpp b/src/core/qgsvectorlayerdiagramprovider.cpp index ac4573de51c..0c6e1438e28 100644 --- a/src/core/qgsvectorlayerdiagramprovider.cpp +++ b/src/core/qgsvectorlayerdiagramprovider.cpp @@ -27,7 +27,7 @@ QgsVectorLayerDiagramProvider::QgsVectorLayerDiagramProvider( const QgsDiagramLayerSettings* diagSettings, - const QgsDiagramRendererV2* diagRenderer, + const QgsDiagramRenderer* diagRenderer, const QString& layerId, const QgsFields& fields, const QgsCoordinateReferenceSystem& crs, @@ -199,7 +199,7 @@ QgsLabelFeature* QgsVectorLayerDiagramProvider::registerDiagram( QgsFeature& fea { const QgsMapSettings& mapSettings = mEngine->mapSettings(); - const QgsDiagramRendererV2* dr = mSettings.getRenderer(); + const QgsDiagramRenderer* dr = mSettings.getRenderer(); if ( dr ) { QList settingList = dr->diagramSettings(); diff --git a/src/core/qgsvectorlayerdiagramprovider.h b/src/core/qgsvectorlayerdiagramprovider.h index e1540431dc0..7d93dcfd41d 100644 --- a/src/core/qgsvectorlayerdiagramprovider.h +++ b/src/core/qgsvectorlayerdiagramprovider.h @@ -16,14 +16,14 @@ #ifndef QGSVECTORLAYERDIAGRAMPROVIDER_H #define QGSVECTORLAYERDIAGRAMPROVIDER_H -#include "qgslabelingenginev2.h" +#include "qgslabelingengine.h" #include "qgslabelfeature.h" -#include "qgsdiagramrendererv2.h" +#include "qgsdiagramrenderer.h" /** \ingroup core * Class that adds extra information to QgsLabelFeature for labeling of diagrams * - * @note this class is not a part of public API yet. See notes in QgsLabelingEngineV2 + * @note this class is not a part of public API yet. See notes in QgsLabelingEngine * @note not available in Python bindings */ class QgsDiagramLabelFeature : public QgsLabelFeature @@ -51,7 +51,7 @@ class QgsAbstractFeatureSource; * the labeling engine. Parameters for the diagrams are taken from the layer settings. * * @note added in QGIS 2.12 - * @note this class is not a part of public API yet. See notes in QgsLabelingEngineV2 + * @note this class is not a part of public API yet. See notes in QgsLabelingEngine * @note not available in Python bindings */ class CORE_EXPORT QgsVectorLayerDiagramProvider : public QgsAbstractLabelProvider @@ -63,7 +63,7 @@ class CORE_EXPORT QgsVectorLayerDiagramProvider : public QgsAbstractLabelProvide //! Construct diagram provider with all the necessary configuration parameters QgsVectorLayerDiagramProvider( const QgsDiagramLayerSettings* diagSettings, - const QgsDiagramRendererV2* diagRenderer, + const QgsDiagramRenderer* diagRenderer, const QString& layerId, const QgsFields& fields, const QgsCoordinateReferenceSystem& crs, @@ -112,7 +112,7 @@ class CORE_EXPORT QgsVectorLayerDiagramProvider : public QgsAbstractLabelProvide //! Diagram layer settings QgsDiagramLayerSettings mSettings; //! Diagram renderer instance (owned by mSettings) - QgsDiagramRendererV2* mDiagRenderer; + QgsDiagramRenderer* mDiagRenderer; // these are needed only if using own renderer loop diff --git a/src/core/qgsvectorlayereditutils.cpp b/src/core/qgsvectorlayereditutils.cpp index 0bd83966d89..cb4962bb53f 100644 --- a/src/core/qgsvectorlayereditutils.cpp +++ b/src/core/qgsvectorlayereditutils.cpp @@ -18,7 +18,7 @@ #include "qgsfeatureiterator.h" #include "qgsgeometrycache.h" #include "qgsvectorlayereditbuffer.h" -#include "qgslinestringv2.h" +#include "qgslinestring.h" #include "qgslogger.h" #include "qgspointv2.h" #include "qgsgeometryfactory.h" @@ -85,13 +85,7 @@ bool QgsVectorLayerEditUtils::moveVertex( const QgsPointV2& p, QgsFeatureId atFe } -bool QgsVectorLayerEditUtils::deleteVertex( QgsFeatureId atFeatureId, int atVertex ) -{ - QgsVectorLayer::EditResult res = deleteVertexV2( atFeatureId, atVertex ); - return res == QgsVectorLayer::Success || res == QgsVectorLayer::EmptyGeometry; -} - -QgsVectorLayer::EditResult QgsVectorLayerEditUtils::deleteVertexV2( QgsFeatureId featureId, int vertex ) +QgsVectorLayer::EditResult QgsVectorLayerEditUtils::deleteVertex( QgsFeatureId featureId, int vertex ) { if ( !L->hasGeometryType() ) return QgsVectorLayer::InvalidLayer; @@ -122,8 +116,8 @@ QgsVectorLayer::EditResult QgsVectorLayerEditUtils::deleteVertexV2( QgsFeatureId int QgsVectorLayerEditUtils::addRing( const QList& ring, const QgsFeatureIds& targetFeatureIds, QgsFeatureId* modifiedFeatureId ) { - QgsLineStringV2* ringLine = new QgsLineStringV2(); - QgsPointSequenceV2 ringPoints; + QgsLineString* ringLine = new QgsLineString(); + QgsPointSequence ringPoints; QList::const_iterator ringIt = ring.constBegin(); for ( ; ringIt != ring.constEnd(); ++ringIt ) { @@ -133,7 +127,7 @@ int QgsVectorLayerEditUtils::addRing( const QList& ring, const QgsFeat return addRing( ringLine, targetFeatureIds, modifiedFeatureId ); } -int QgsVectorLayerEditUtils::addRing( QgsCurveV2* ring, const QgsFeatureIds& targetFeatureIds, QgsFeatureId* modifiedFeatureId ) +int QgsVectorLayerEditUtils::addRing( QgsCurve* ring, const QgsFeatureIds& targetFeatureIds, QgsFeatureId* modifiedFeatureId ) { if ( !L->hasGeometryType() ) { @@ -166,7 +160,7 @@ int QgsVectorLayerEditUtils::addRing( QgsCurveV2* ring, const QgsFeatureIds& tar //add ring takes ownership of ring, and deletes it if there's an error QgsGeometry g = f.geometry(); - addRingReturnCode = g.addRing( static_cast< QgsCurveV2* >( ring->clone() ) ); + addRingReturnCode = g.addRing( static_cast< QgsCurve* >( ring->clone() ) ); if ( addRingReturnCode == 0 ) { L->editBuffer()->changeGeometry( f.id(), g ); @@ -184,7 +178,7 @@ int QgsVectorLayerEditUtils::addRing( QgsCurveV2* ring, const QgsFeatureIds& tar int QgsVectorLayerEditUtils::addPart( const QList &points, QgsFeatureId featureId ) { - QgsPointSequenceV2 l; + QgsPointSequence l; for ( QList::const_iterator it = points.constBegin(); it != points.constEnd(); ++it ) { l << QgsPointV2( *it ); @@ -192,7 +186,7 @@ int QgsVectorLayerEditUtils::addPart( const QList &points, QgsFeatureI return addPart( l, featureId ); } -int QgsVectorLayerEditUtils::addPart( const QgsPointSequenceV2 &points, QgsFeatureId featureId ) +int QgsVectorLayerEditUtils::addPart( const QgsPointSequence &points, QgsFeatureId featureId ) { if ( !L->hasGeometryType() ) return 6; @@ -231,7 +225,7 @@ int QgsVectorLayerEditUtils::addPart( const QgsPointSequenceV2 &points, QgsFeatu return errorCode; } -int QgsVectorLayerEditUtils::addPart( QgsCurveV2* ring, QgsFeatureId featureId ) +int QgsVectorLayerEditUtils::addPart( QgsCurve* ring, QgsFeatureId featureId ) { if ( !L->hasGeometryType() ) return 6; diff --git a/src/core/qgsvectorlayereditutils.h b/src/core/qgsvectorlayereditutils.h index 8da713842b4..ed96ae97af3 100644 --- a/src/core/qgsvectorlayereditutils.h +++ b/src/core/qgsvectorlayereditutils.h @@ -21,7 +21,7 @@ #include "qgsvectorlayer.h" class QgsGeometryCache; -class QgsCurveV2; +class QgsCurve; /** \ingroup core * \class QgsVectorLayerEditUtils @@ -53,18 +53,12 @@ class CORE_EXPORT QgsVectorLayerEditUtils */ bool moveVertex( const QgsPointV2& p, QgsFeatureId atFeatureId, int atVertex ); - /** Deletes a vertex from a feature - * @deprecated use deleteVertexV2() instead - */ - Q_DECL_DEPRECATED bool deleteVertex( QgsFeatureId atFeatureId, int atVertex ); - /** 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 @@ -97,7 +91,7 @@ class CORE_EXPORT 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 ); + int addRing( QgsCurve* ring, const QgsFeatureIds& targetFeatureIds = QgsFeatureIds(), QgsFeatureId* modifiedFeatureId = nullptr ); /** Adds a new part polygon to a multipart feature * @return @@ -124,11 +118,11 @@ class CORE_EXPORT QgsVectorLayerEditUtils * @note available in python bindings as addPartV2 */ // TODO QGIS 3.0 returns an enum instead of a magic constant - int addPart( const QgsPointSequenceV2 &ring, QgsFeatureId featureId ); + int addPart( const QgsPointSequence &ring, QgsFeatureId featureId ); // @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 ); + int addPart( QgsCurve* ring, QgsFeatureId featureId ); /** Translates feature by dx, dy * @param featureId id of the feature to translate diff --git a/src/core/qgsvectorlayerlabeling.h b/src/core/qgsvectorlayerlabeling.h index 2428a8aea13..86fa7d8c8a9 100644 --- a/src/core/qgsvectorlayerlabeling.h +++ b/src/core/qgsvectorlayerlabeling.h @@ -30,7 +30,7 @@ class QgsVectorLayerLabelProvider; * * @note added in 2.12 * @note not available in Python bindings - * @note this class is not a part of public API yet. See notes in QgsLabelingEngineV2 + * @note this class is not a part of public API yet. See notes in QgsLabelingEngine */ class CORE_EXPORT QgsAbstractVectorLayerLabeling { @@ -67,7 +67,7 @@ class CORE_EXPORT QgsAbstractVectorLayerLabeling * * @note added in 2.12 * @note not available in Python bindings - * @note this class is not a part of public API yet. See notes in QgsLabelingEngineV2 + * @note this class is not a part of public API yet. See notes in QgsLabelingEngine */ class CORE_EXPORT QgsVectorLayerSimpleLabeling : public QgsAbstractVectorLayerLabeling { diff --git a/src/core/qgsvectorlayerlabelprovider.cpp b/src/core/qgsvectorlayerlabelprovider.cpp index e278b5b7256..67cdf613125 100644 --- a/src/core/qgsvectorlayerlabelprovider.cpp +++ b/src/core/qgsvectorlayerlabelprovider.cpp @@ -22,10 +22,10 @@ #include "qgstextlabelfeature.h" #include "qgsvectorlayer.h" #include "qgsvectorlayerfeatureiterator.h" -#include "qgsrendererv2.h" -#include "qgspolygonv2.h" -#include "qgslinestringv2.h" -#include "qgsmultipolygonv2.h" +#include "qgsrenderer.h" +#include "qgspolygon.h" +#include "qgslinestring.h" +#include "qgsmultipolygon.h" #include "feature.h" #include "labelposition.h" @@ -53,7 +53,7 @@ QgsVectorLayerLabelProvider::QgsVectorLayerLabelProvider( QgsVectorLayer* layer, : QgsAbstractLabelProvider( layer->id(), providerId ) , mSettings( settings ? *settings : QgsPalLayerSettings::fromLayer( layer ) ) , mLayerGeometryType( layer->geometryType() ) - , mRenderer( layer->rendererV2() ) + , mRenderer( layer->renderer() ) , mFields( layer->fields() ) , mCrs( layer->crs() ) { @@ -78,7 +78,7 @@ QgsVectorLayerLabelProvider::QgsVectorLayerLabelProvider( const QgsPalLayerSetti const QgsFields& fields, const QgsCoordinateReferenceSystem& crs, QgsAbstractFeatureSource* source, - bool ownsSource, QgsFeatureRendererV2* renderer ) + bool ownsSource, QgsFeatureRenderer* renderer ) : QgsAbstractLabelProvider( layerId ) , mSettings( settings ) , mLayerGeometryType( QgsWkbTypes::UnknownGeometry ) @@ -319,7 +319,7 @@ QgsGeometry* QgsVectorLayerLabelProvider::getPointObstacleGeometry( QgsFeature& return nullptr; bool isMultiPoint = fet.geometry().geometry()->nCoordinates() > 1; - QgsAbstractGeometryV2* obstacleGeom = nullptr; + QgsAbstractGeometry* obstacleGeom = nullptr; if ( isMultiPoint ) obstacleGeom = new QgsMultiPolygonV2(); @@ -345,14 +345,14 @@ QgsGeometry* QgsVectorLayerLabelProvider::getPointObstacleGeometry( QgsFeature& if ( symbol->type() == QgsSymbol::Marker ) { if ( bounds.isValid() ) - bounds = bounds.united( static_cast< QgsMarkerSymbolV2* >( symbol )->bounds( pt, context, fet ) ); + bounds = bounds.united( static_cast< QgsMarkerSymbol* >( symbol )->bounds( pt, context, fet ) ); else - bounds = static_cast< QgsMarkerSymbolV2* >( symbol )->bounds( pt, context, fet ); + bounds = static_cast< QgsMarkerSymbol* >( symbol )->bounds( pt, context, fet ); } } //convert bounds to a geometry - QgsLineStringV2* boundLineString = new QgsLineStringV2(); + QgsLineString* boundLineString = new QgsLineString(); boundLineString->addVertex( QgsPointV2( bounds.topLeft() ) ); boundLineString->addVertex( QgsPointV2( bounds.topRight() ) ); boundLineString->addVertex( QgsPointV2( bounds.bottomRight() ) ); @@ -447,7 +447,7 @@ void QgsVectorLayerLabelProvider::drawLabel( QgsRenderContext& context, pal::Lab // update tmpLyr with any data defined drop shadow values QgsPalLabeling::dataDefinedDropShadow( tmpLyr, ddValues ); - tmpLyr.showingShadowRects = mEngine->testFlag( QgsLabelingEngineV2::DrawShadowRects ); + tmpLyr.showingShadowRects = mEngine->testFlag( QgsLabelingEngine::DrawShadowRects ); // Render the components of a label in reverse order // (backgrounds -> text) @@ -511,7 +511,7 @@ void QgsVectorLayerLabelProvider::drawLabelPrivate( pal::LabelPosition* label, Q component.setOrigin( outPt ); component.setRotation( label->getAlpha() ); - if ( mEngine->testFlag( QgsLabelingEngineV2::DrawLabelRectOnly ) ) // TODO: this should get directly to labeling engine + if ( mEngine->testFlag( QgsLabelingEngine::DrawLabelRectOnly ) ) // TODO: this should get directly to labeling engine { //debugging rect if ( drawType != QgsPalLabeling::LabelText ) @@ -747,7 +747,7 @@ void QgsVectorLayerLabelProvider::drawLabelPrivate( pal::LabelPosition* label, Q // scale for any print output or image saving @ specific dpi painter->scale( component.dpiRatio(), component.dpiRatio() ); - if ( mEngine->testFlag( QgsLabelingEngineV2::RenderOutlineLabels ) ) + if ( mEngine->testFlag( QgsLabelingEngine::RenderOutlineLabels ) ) { // draw outlined text _fixQPictureDPI( painter ); diff --git a/src/core/qgsvectorlayerlabelprovider.h b/src/core/qgsvectorlayerlabelprovider.h index 1ccb3972963..cc5c36daefc 100644 --- a/src/core/qgsvectorlayerlabelprovider.h +++ b/src/core/qgsvectorlayerlabelprovider.h @@ -16,11 +16,11 @@ #ifndef QGSVECTORLAYERLABELPROVIDER_H #define QGSVECTORLAYERLABELPROVIDER_H -#include "qgslabelingenginev2.h" -#include "qgsrendererv2.h" +#include "qgslabelingengine.h" +#include "qgsrenderer.h" class QgsAbstractFeatureSource; -class QgsFeatureRendererV2; +class QgsFeatureRenderer; class QgsSymbol; /** \ingroup core @@ -29,7 +29,7 @@ class QgsSymbol; * custom properties or from the given settings. * * @note added in QGIS 2.12 - * @note this class is not a part of public API yet. See notes in QgsLabelingEngineV2 + * @note this class is not a part of public API yet. See notes in QgsLabelingEngine * @note not available in Python bindings */ class CORE_EXPORT QgsVectorLayerLabelProvider : public QgsAbstractLabelProvider @@ -50,7 +50,7 @@ class CORE_EXPORT QgsVectorLayerLabelProvider : public QgsAbstractLabelProvider const QgsCoordinateReferenceSystem& crs, QgsAbstractFeatureSource* source, bool ownsSource, - QgsFeatureRendererV2* renderer = nullptr ); + QgsFeatureRenderer* renderer = nullptr ); ~QgsVectorLayerLabelProvider(); @@ -103,7 +103,7 @@ class CORE_EXPORT QgsVectorLayerLabelProvider : public QgsAbstractLabelProvider //! Geometry type of layer QgsWkbTypes::GeometryType mLayerGeometryType; - QgsFeatureRendererV2* mRenderer; + QgsFeatureRenderer* mRenderer; // these are needed only if using own renderer loop diff --git a/src/core/qgsvectorlayerrenderer.cpp b/src/core/qgsvectorlayerrenderer.cpp index 06e6b38ddde..c82cc07798c 100644 --- a/src/core/qgsvectorlayerrenderer.cpp +++ b/src/core/qgsvectorlayerrenderer.cpp @@ -17,13 +17,13 @@ //#include "qgsfeatureiterator.h" #include "diagram/qgsdiagram.h" -#include "qgsdiagramrendererv2.h" +#include "qgsdiagramrenderer.h" #include "qgsgeometrycache.h" #include "qgsmessagelog.h" #include "qgspallabeling.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgsrendercontext.h" -#include "qgssinglesymbolrendererv2.h" +#include "qgssinglesymbolrenderer.h" #include "qgssymbollayer.h" #include "qgssymbol.h" #include "qgsvectorlayer.h" @@ -48,7 +48,7 @@ QgsVectorLayerRenderer::QgsVectorLayerRenderer( QgsVectorLayer* layer, QgsRender , mInterruptionChecker( context ) , mLayer( layer ) , mFields( layer->fields() ) - , mRendererV2( nullptr ) + , mRenderer( nullptr ) , mCache( nullptr ) , mLabeling( false ) , mDiagrams( false ) @@ -58,7 +58,7 @@ QgsVectorLayerRenderer::QgsVectorLayerRenderer( QgsVectorLayer* layer, QgsRender { mSource = new QgsVectorLayerFeatureSource( layer ); - mRendererV2 = layer->rendererV2() ? layer->rendererV2()->clone() : nullptr; + mRenderer = layer->renderer() ? layer->renderer()->clone() : nullptr; mSelectedFeatureIds = layer->selectedFeaturesIds(); mDrawVertexMarkers = nullptr != layer->editBuffer(); @@ -90,20 +90,20 @@ QgsVectorLayerRenderer::QgsVectorLayerRenderer( QgsVectorLayer* layer, QgsRender mVertexMarkerSize = settings.value( "/qgis/digitizing/marker_size", 3 ).toInt(); - if ( !mRendererV2 ) + if ( !mRenderer ) return; - QgsDebugMsgLevel( "rendering v2:\n " + mRendererV2->dump(), 2 ); + QgsDebugMsgLevel( "rendering v2:\n " + mRenderer->dump(), 2 ); if ( mDrawVertexMarkers ) { // set editing vertex markers style - mRendererV2->setVertexMarkerAppearance( mVertexMarkerStyle, mVertexMarkerSize ); + mRenderer->setVertexMarkerAppearance( mVertexMarkerStyle, mVertexMarkerSize ); } mContext.expressionContext() << QgsExpressionContextUtils::layerScope( layer ); - mAttrNames = mRendererV2->usedAttributes(); + mAttrNames = mRenderer->usedAttributes(); //register label and diagram layer to the labeling engine prepareLabeling( layer, mAttrNames ); @@ -114,7 +114,7 @@ QgsVectorLayerRenderer::QgsVectorLayerRenderer( QgsVectorLayer* layer, QgsRender QgsVectorLayerRenderer::~QgsVectorLayerRenderer() { - delete mRendererV2; + delete mRenderer; delete mSource; } @@ -124,17 +124,17 @@ bool QgsVectorLayerRenderer::render() if ( mGeometryType == QgsWkbTypes::NullGeometry || mGeometryType == QgsWkbTypes::UnknownGeometry ) return true; - if ( !mRendererV2 ) + if ( !mRenderer ) { mErrors.append( QObject::tr( "No renderer for drawing." ) ); return false; } bool usingEffect = false; - if ( mRendererV2->paintEffect() && mRendererV2->paintEffect()->enabled() ) + if ( mRenderer->paintEffect() && mRenderer->paintEffect()->enabled() ) { usingEffect = true; - mRendererV2->paintEffect()->begin( mContext ); + mRenderer->paintEffect()->begin( mContext ); } // Per feature blending mode @@ -145,20 +145,20 @@ bool QgsVectorLayerRenderer::render() mContext.painter()->setCompositionMode( mFeatureBlendMode ); } - mRendererV2->startRender( mContext, mFields ); + mRenderer->startRender( mContext, mFields ); - QString rendererFilter = mRendererV2->filter( mFields ); + QString rendererFilter = mRenderer->filter( mFields ); QgsRectangle requestExtent = mContext.extent(); - mRendererV2->modifyRequestExtent( requestExtent, mContext ); + mRenderer->modifyRequestExtent( requestExtent, mContext ); QgsFeatureRequest featureRequest = QgsFeatureRequest() .setFilterRect( requestExtent ) .setSubsetOfAttributes( mAttrNames, mFields ) .setExpressionContext( mContext.expressionContext() ); - if ( mRendererV2->orderByEnabled() ) + if ( mRenderer->orderByEnabled() ) { - featureRequest.setOrderBy( mRendererV2->orderBy() ); + featureRequest.setOrderBy( mRenderer->orderBy() ); } const QgsFeatureFilterProvider* featureFilterProvider = mContext.featureFilterProvider(); @@ -250,17 +250,17 @@ bool QgsVectorLayerRenderer::render() // Attach an interruption checker so that iterators that have potentially // slow fetchFeature() implementations, such as in the WFS provider, can // check it, instead of relying on just the mContext.renderingStopped() check - // in drawRendererV2() + // in drawRenderer() fit.setInterruptionChecker( &mInterruptionChecker ); - if (( mRendererV2->capabilities() & QgsFeatureRendererV2::SymbolLevels ) && mRendererV2->usingSymbolLevels() ) - drawRendererV2Levels( fit ); + if (( mRenderer->capabilities() & QgsFeatureRenderer::SymbolLevels ) && mRenderer->usingSymbolLevels() ) + drawRendererLevels( fit ); else - drawRendererV2( fit ); + drawRenderer( fit ); if ( usingEffect ) { - mRendererV2->paintEffect()->end( mContext ); + mRenderer->paintEffect()->end( mContext ); } //apply layer transparency for vector layers @@ -291,7 +291,7 @@ void QgsVectorLayerRenderer::setGeometryCachePointer( QgsGeometryCache* cache ) -void QgsVectorLayerRenderer::drawRendererV2( QgsFeatureIterator& fit ) +void QgsVectorLayerRenderer::drawRenderer( QgsFeatureIterator& fit ) { QgsExpressionContextScope* symbolScope = QgsExpressionContextUtils::updateSymbolScope( nullptr, new QgsExpressionContextScope() ); mContext.expressionContext().appendScope( symbolScope ); @@ -322,7 +322,7 @@ void QgsVectorLayerRenderer::drawRendererV2( QgsFeatureIterator& fit ) } // render feature - bool rendered = mRendererV2->renderFeature( fet, mContext, -1, sel, drawMarker ); + bool rendered = mRenderer->renderFeature( fet, mContext, -1, sel, drawMarker ); // labeling - register feature if ( rendered ) @@ -342,7 +342,7 @@ void QgsVectorLayerRenderer::drawRendererV2( QgsFeatureIterator& fit ) if ( mContext.labelingEngineV2() ) { QScopedPointer obstacleGeometry; - QgsSymbolList symbols = mRendererV2->originalSymbolsForFeature( fet, mContext ); + QgsSymbolList symbols = mRenderer->originalSymbolsForFeature( fet, mContext ); if ( !symbols.isEmpty() && fet.geometry().type() == QgsWkbTypes::PointGeometry ) { @@ -375,17 +375,17 @@ void QgsVectorLayerRenderer::drawRendererV2( QgsFeatureIterator& fit ) delete mContext.expressionContext().popScope(); - stopRendererV2( nullptr ); + stopRenderer( nullptr ); } -void QgsVectorLayerRenderer::drawRendererV2Levels( QgsFeatureIterator& fit ) +void QgsVectorLayerRenderer::drawRendererLevels( QgsFeatureIterator& fit ) { QHash< QgsSymbol*, QList > features; // key = symbol, value = array of features - QgsSingleSymbolRendererV2* selRenderer = nullptr; + QgsSingleSymbolRenderer* selRenderer = nullptr; if ( !mSelectedFeatureIds.isEmpty() ) { - selRenderer = new QgsSingleSymbolRendererV2( QgsSymbol::defaultSymbol( mGeometryType ) ) ; + selRenderer = new QgsSingleSymbolRenderer( QgsSymbol::defaultSymbol( mGeometryType ) ) ; selRenderer->symbol()->setColor( mContext.selectionColor() ); selRenderer->setVertexMarkerAppearance( mVertexMarkerStyle, mVertexMarkerSize ); selRenderer->startRender( mContext, mFields ); @@ -401,7 +401,7 @@ void QgsVectorLayerRenderer::drawRendererV2Levels( QgsFeatureIterator& fit ) if ( mContext.renderingStopped() ) { qDebug( "rendering stop!" ); - stopRendererV2( selRenderer ); + stopRenderer( selRenderer ); delete mContext.expressionContext().popScope(); return; } @@ -410,7 +410,7 @@ void QgsVectorLayerRenderer::drawRendererV2Levels( QgsFeatureIterator& fit ) continue; // skip features without geometry mContext.expressionContext().setFeature( fet ); - QgsSymbol* sym = mRendererV2->symbolForFeature( fet, mContext ); + QgsSymbol* sym = mRenderer->symbolForFeature( fet, mContext ); if ( !sym ) { continue; @@ -444,7 +444,7 @@ void QgsVectorLayerRenderer::drawRendererV2Levels( QgsFeatureIterator& fit ) if ( mContext.labelingEngineV2() ) { QScopedPointer obstacleGeometry; - QgsSymbolList symbols = mRendererV2->originalSymbolsForFeature( fet, mContext ); + QgsSymbolList symbols = mRenderer->originalSymbolsForFeature( fet, mContext ); if ( !symbols.isEmpty() && fet.geometry().type() == QgsWkbTypes::PointGeometry ) { @@ -471,7 +471,7 @@ void QgsVectorLayerRenderer::drawRendererV2Levels( QgsFeatureIterator& fit ) // find out the order QgsSymbolLevelOrder levels; - QgsSymbolList symbols = mRendererV2->symbols( mContext ); + QgsSymbolList symbols = mRenderer->symbols( mContext ); for ( int i = 0; i < symbols.count(); i++ ) { QgsSymbol* sym = symbols[i]; @@ -506,7 +506,7 @@ void QgsVectorLayerRenderer::drawRendererV2Levels( QgsFeatureIterator& fit ) { if ( mContext.renderingStopped() ) { - stopRendererV2( selRenderer ); + stopRenderer( selRenderer ); return; } @@ -518,7 +518,7 @@ void QgsVectorLayerRenderer::drawRendererV2Levels( QgsFeatureIterator& fit ) try { - mRendererV2->renderFeature( *fit, mContext, layer, sel, drawMarker ); + mRenderer->renderFeature( *fit, mContext, layer, sel, drawMarker ); } catch ( const QgsCsException &cse ) { @@ -530,13 +530,13 @@ void QgsVectorLayerRenderer::drawRendererV2Levels( QgsFeatureIterator& fit ) } } - stopRendererV2( selRenderer ); + stopRenderer( selRenderer ); } -void QgsVectorLayerRenderer::stopRendererV2( QgsSingleSymbolRendererV2* selRenderer ) +void QgsVectorLayerRenderer::stopRenderer( QgsSingleSymbolRenderer* selRenderer ) { - mRendererV2->stopRender( mContext ); + mRenderer->stopRender( mContext ); if ( selRenderer ) { selRenderer->stopRender( mContext ); @@ -551,7 +551,7 @@ void QgsVectorLayerRenderer::prepareLabeling( QgsVectorLayer* layer, QStringList { if ( !mContext.labelingEngine() ) { - if ( QgsLabelingEngineV2* engine2 = mContext.labelingEngineV2() ) + if ( QgsLabelingEngine* engine2 = mContext.labelingEngineV2() ) { if ( layer->labeling() ) { @@ -608,7 +608,7 @@ void QgsVectorLayerRenderer::prepareDiagrams( QgsVectorLayer* layer, QStringList { if ( !mContext.labelingEngine() ) { - if ( QgsLabelingEngineV2* engine2 = mContext.labelingEngineV2() ) + if ( QgsLabelingEngine* engine2 = mContext.labelingEngineV2() ) { if ( layer->diagramsEnabled() ) { diff --git a/src/core/qgsvectorlayerrenderer.h b/src/core/qgsvectorlayerrenderer.h index cd67f57eb9a..412b2dce357 100644 --- a/src/core/qgsvectorlayerrenderer.h +++ b/src/core/qgsvectorlayerrenderer.h @@ -16,17 +16,17 @@ #ifndef QGSVECTORLAYERRENDERER_H #define QGSVECTORLAYERRENDERER_H -class QgsFeatureRendererV2; +class QgsFeatureRenderer; class QgsRenderContext; class QgsVectorLayer; class QgsVectorLayerFeatureSource; -class QgsDiagramRendererV2; +class QgsDiagramRenderer; class QgsDiagramLayerSettings; class QgsGeometryCache; class QgsFeatureIterator; -class QgsSingleSymbolRendererV2; +class QgsSingleSymbolRenderer; #include #include @@ -85,16 +85,16 @@ class QgsVectorLayerRenderer : public QgsMapLayerRenderer void prepareLabeling( QgsVectorLayer* layer, QStringList& attributeNames ); void prepareDiagrams( QgsVectorLayer* layer, QStringList& attributeNames ); - /** Draw layer with renderer V2. QgsFeatureRendererV2::startRender() needs to be called before using this method + /** Draw layer with renderer V2. QgsFeatureRenderer::startRender() needs to be called before using this method */ - void drawRendererV2( QgsFeatureIterator& fit ); + void drawRenderer( QgsFeatureIterator& fit ); - /** Draw layer with renderer V2 using symbol levels. QgsFeatureRendererV2::startRender() needs to be called before using this method + /** Draw layer with renderer V2 using symbol levels. QgsFeatureRenderer::startRender() needs to be called before using this method */ - void drawRendererV2Levels( QgsFeatureIterator& fit ); + void drawRendererLevels( QgsFeatureIterator& fit ); /** Stop version 2 renderer and selected renderer (if required) */ - void stopRendererV2( QgsSingleSymbolRendererV2* selRenderer ); + void stopRenderer( QgsSingleSymbolRenderer* selRenderer ); protected: @@ -112,7 +112,7 @@ class QgsVectorLayerRenderer : public QgsMapLayerRenderer QgsVectorLayerFeatureSource* mSource; - QgsFeatureRendererV2 *mRendererV2; + QgsFeatureRenderer *mRenderer; QgsGeometryCache* mCache; @@ -129,10 +129,10 @@ class QgsVectorLayerRenderer : public QgsMapLayerRenderer //! used with new labeling engine (QgsPalLabeling): whether diagrams are enabled bool mDiagrams; - //! used with new labeling engine (QgsLabelingEngineV2): provider for labels. + //! used with new labeling engine (QgsLabelingEngine): provider for labels. //! may be null. no need to delete: if exists it is owned by labeling engine QgsVectorLayerLabelProvider* mLabelProvider; - //! used with new labeling engine (QgsLabelingEngineV2): provider for diagrams. + //! used with new labeling engine (QgsLabelingEngine): provider for diagrams. //! may be null. no need to delete: if exists it is owned by labeling engine QgsVectorLayerDiagramProvider* mDiagramProvider; diff --git a/src/core/symbology-ng/qgs25drenderer.cpp b/src/core/symbology-ng/qgs25drenderer.cpp index 6ca85793981..7f9bbcda1d3 100644 --- a/src/core/symbology-ng/qgs25drenderer.cpp +++ b/src/core/symbology-ng/qgs25drenderer.cpp @@ -14,8 +14,8 @@ * * ***************************************************************************/ #include "qgs25drenderer.h" -#include "qgsgeometrygeneratorsymbollayerv2.h" -#include "qgsfillsymbollayerv2.h" +#include "qgsgeometrygeneratorsymbollayer.h" +#include "qgsfillsymbollayer.h" #include "qgspainteffect.h" #include "qgseffectstack.h" #include "qgsgloweffect.h" @@ -60,23 +60,23 @@ ")" Qgs25DRenderer::Qgs25DRenderer() - : QgsFeatureRendererV2( "25dRenderer" ) + : QgsFeatureRenderer( "25dRenderer" ) { - mSymbol.reset( new QgsFillSymbolV2() ); + mSymbol.reset( new QgsFillSymbol() ); mSymbol->deleteSymbolLayer( 0 ); // We never asked for the default layer - QgsSymbolLayer* floor = QgsSimpleFillSymbolLayerV2::create(); + QgsSymbolLayer* floor = QgsSimpleFillSymbolLayer::create(); QgsStringMap wallProperties; wallProperties.insert( "geometryModifier", WALL_EXPRESSION ); wallProperties.insert( "symbolType", "Fill" ); - QgsSymbolLayer* walls = QgsGeometryGeneratorSymbolLayerV2::create( wallProperties ); + QgsSymbolLayer* walls = QgsGeometryGeneratorSymbolLayer::create( wallProperties ); QgsStringMap roofProperties; roofProperties.insert( "geometryModifier", ROOF_EXPRESSION ); roofProperties.insert( "symbolType", "Fill" ); - QgsSymbolLayer* roof = QgsGeometryGeneratorSymbolLayerV2::create( roofProperties ); + QgsSymbolLayer* roof = QgsGeometryGeneratorSymbolLayer::create( roofProperties ); floor->setLocked( true ); @@ -123,7 +123,7 @@ QDomElement Qgs25DRenderer::save( QDomDocument& doc ) return rendererElem; } -QgsFeatureRendererV2* Qgs25DRenderer::create( QDomElement& element ) +QgsFeatureRenderer* Qgs25DRenderer::create( QDomElement& element ) { Qgs25DRenderer* renderer = new Qgs25DRenderer(); @@ -151,7 +151,7 @@ QList Qgs25DRenderer::usedAttributes() return mSymbol->usedAttributes().toList(); } -QgsFeatureRendererV2* Qgs25DRenderer::clone() const +QgsFeatureRenderer* Qgs25DRenderer::clone() const { Qgs25DRenderer* c = new Qgs25DRenderer(); c->mSymbol.reset( mSymbol->clone() ); @@ -173,14 +173,14 @@ QgsSymbolList Qgs25DRenderer::symbols( QgsRenderContext& context ) return lst; } -QgsFillSymbolLayerV2* Qgs25DRenderer::roofLayer() const +QgsFillSymbolLayer* Qgs25DRenderer::roofLayer() const { - return static_cast( mSymbol->symbolLayer( 2 )->subSymbol()->symbolLayer( 0 ) ); + return static_cast( mSymbol->symbolLayer( 2 )->subSymbol()->symbolLayer( 0 ) ); } -QgsFillSymbolLayerV2* Qgs25DRenderer::wallLayer() const +QgsFillSymbolLayer* Qgs25DRenderer::wallLayer() const { - return static_cast( mSymbol->symbolLayer( 1 )->subSymbol()->symbolLayer( 0 ) ); + return static_cast( mSymbol->symbolLayer( 1 )->subSymbol()->symbolLayer( 0 ) ); } QgsOuterGlowEffect* Qgs25DRenderer::glowEffect() const @@ -251,7 +251,7 @@ void Qgs25DRenderer::setRoofColor( const QColor& roofColor ) roofLayer()->setOutlineColor( roofColor ); } -Qgs25DRenderer* Qgs25DRenderer::convertFromRenderer( QgsFeatureRendererV2* renderer ) +Qgs25DRenderer* Qgs25DRenderer::convertFromRenderer( QgsFeatureRenderer* renderer ) { if ( renderer->type() == "25dRenderer" ) { diff --git a/src/core/symbology-ng/qgs25drenderer.h b/src/core/symbology-ng/qgs25drenderer.h index 7505b8421c6..6d0a9a438d6 100644 --- a/src/core/symbology-ng/qgs25drenderer.h +++ b/src/core/symbology-ng/qgs25drenderer.h @@ -16,14 +16,14 @@ #ifndef QGS25DRENDERER_H #define QGS25DRENDERER_H -#include "qgsrendererv2.h" +#include "qgsrenderer.h" class QgsOuterGlowEffect; /** \ingroup core * \class Qgs25DRenderer */ -class CORE_EXPORT Qgs25DRenderer : public QgsFeatureRendererV2 +class CORE_EXPORT Qgs25DRenderer : public QgsFeatureRenderer { public: Qgs25DRenderer(); @@ -33,14 +33,14 @@ class CORE_EXPORT Qgs25DRenderer : public QgsFeatureRendererV2 * * @param element XML information */ - static QgsFeatureRendererV2* create( QDomElement& element ); + static QgsFeatureRenderer* create( QDomElement& element ); QDomElement save( QDomDocument& doc ) override; void startRender( QgsRenderContext& context, const QgsFields& fields ) override; void stopRender( QgsRenderContext& context ) override; QList usedAttributes() override; - QgsFeatureRendererV2* clone() const override; + QgsFeatureRenderer* clone() const override; virtual QgsSymbol* symbolForFeature( QgsFeature& feature, QgsRenderContext& context ) override; virtual QgsSymbolList symbols( QgsRenderContext& context ) override; @@ -99,7 +99,7 @@ class CORE_EXPORT Qgs25DRenderer : public 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 @@ -112,8 +112,8 @@ class CORE_EXPORT Qgs25DRenderer : public QgsFeatureRendererV2 private: - QgsFillSymbolLayerV2* roofLayer() const; - QgsFillSymbolLayerV2* wallLayer() const; + QgsFillSymbolLayer* roofLayer() const; + QgsFillSymbolLayer* wallLayer() const; QgsOuterGlowEffect* glowEffect() const; QScopedPointer mSymbol; diff --git a/src/core/symbology-ng/qgsarrowsymbollayer.cpp b/src/core/symbology-ng/qgsarrowsymbollayer.cpp index 83ca705a41b..ad502c4447e 100644 --- a/src/core/symbology-ng/qgsarrowsymbollayer.cpp +++ b/src/core/symbology-ng/qgsarrowsymbollayer.cpp @@ -16,7 +16,7 @@ #include "qgsarrowsymbollayer.h" QgsArrowSymbolLayer::QgsArrowSymbolLayer() - : QgsLineSymbolLayerV2() + : QgsLineSymbolLayer() , mArrowWidth( 1.0 ) , mArrowWidthUnit( QgsUnitTypes::RenderMillimeters ) , mArrowStartWidth( 1.0 ) @@ -41,14 +41,14 @@ QgsArrowSymbolLayer::QgsArrowSymbolLayer() setOffset( 0.0 ); setOffsetUnit( QgsUnitTypes::RenderMillimeters ); - mSymbol.reset( static_cast( QgsFillSymbolV2::createSimple( QgsStringMap() ) ) ); + mSymbol.reset( static_cast( QgsFillSymbol::createSimple( QgsStringMap() ) ) ); } bool QgsArrowSymbolLayer::setSubSymbol( QgsSymbol* symbol ) { if ( symbol && symbol->type() == QgsSymbol::Fill ) { - mSymbol.reset( static_cast( symbol ) ); + mSymbol.reset( static_cast( symbol ) ); return true; } delete symbol; @@ -118,7 +118,7 @@ QgsSymbolLayer* QgsArrowSymbolLayer::create( const QgsStringMap& props ) l->restoreDataDefinedProperties( props ); - l->setSubSymbol( QgsFillSymbolV2::createSimple( props ) ); + l->setSubSymbol( QgsFillSymbol::createSimple( props ) ); return l; } @@ -173,7 +173,7 @@ QgsStringMap QgsArrowSymbolLayer::properties() const QSet QgsArrowSymbolLayer::usedAttributes() const { - QSet attributes = QgsLineSymbolLayerV2::usedAttributes(); + QSet attributes = QgsLineSymbolLayer::usedAttributes(); attributes.unite( mSymbol->usedAttributes() ); diff --git a/src/core/symbology-ng/qgsarrowsymbollayer.h b/src/core/symbology-ng/qgsarrowsymbollayer.h index fcd78ffa673..a121eb5c1f2 100644 --- a/src/core/symbology-ng/qgsarrowsymbollayer.h +++ b/src/core/symbology-ng/qgsarrowsymbollayer.h @@ -25,7 +25,7 @@ * \note Added in version 2.16 */ -class CORE_EXPORT QgsArrowSymbolLayer : public QgsLineSymbolLayerV2 +class CORE_EXPORT QgsArrowSymbolLayer : public QgsLineSymbolLayer { public: /** Simple constructor */ @@ -167,7 +167,7 @@ class CORE_EXPORT QgsArrowSymbolLayer : public QgsLineSymbolLayerV2 private: /** Filling sub symbol */ - QScopedPointer mSymbol; + QScopedPointer mSymbol; double mArrowWidth; QgsUnitTypes::RenderUnit mArrowWidthUnit; diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp b/src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp similarity index 73% rename from src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp rename to src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp index 189790acd49..829867c6dac 100644 --- a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp +++ b/src/core/symbology-ng/qgscategorizedsymbolrenderer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgscategorizedsymbolrendererv2.cpp + qgscategorizedsymbolrenderer.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -14,11 +14,11 @@ ***************************************************************************/ #include -#include "qgscategorizedsymbolrendererv2.h" +#include "qgscategorizedsymbolrenderer.h" #include "qgssymbol.h" #include "qgssymbollayerutils.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgspointdisplacementrenderer.h" #include "qgsinvertedpolygonrenderer.h" #include "qgspainteffect.h" @@ -34,12 +34,12 @@ #include #include // for legend -QgsRendererCategoryV2::QgsRendererCategoryV2() +QgsRendererCategory::QgsRendererCategory() : mRender( true ) { } -QgsRendererCategoryV2::QgsRendererCategoryV2( const QVariant& value, QgsSymbol* symbol, const QString& label, bool render ) +QgsRendererCategory::QgsRendererCategory( const QVariant& value, QgsSymbol* symbol, const QString& label, bool render ) : mValue( value ) , mSymbol( symbol ) , mLabel( label ) @@ -47,7 +47,7 @@ QgsRendererCategoryV2::QgsRendererCategoryV2( const QVariant& value, QgsSymbol* { } -QgsRendererCategoryV2::QgsRendererCategoryV2( const QgsRendererCategoryV2& cat ) +QgsRendererCategory::QgsRendererCategory( const QgsRendererCategory& cat ) : mValue( cat.mValue ) , mSymbol( cat.mSymbol.data() ? cat.mSymbol->clone() : nullptr ) , mLabel( cat.mLabel ) @@ -56,65 +56,65 @@ QgsRendererCategoryV2::QgsRendererCategoryV2( const QgsRendererCategoryV2& cat ) } // copy+swap idion, the copy is done through the 'pass by value' -QgsRendererCategoryV2& QgsRendererCategoryV2::operator=( QgsRendererCategoryV2 cat ) +QgsRendererCategory& QgsRendererCategory::operator=( QgsRendererCategory cat ) { swap( cat ); return *this; } -void QgsRendererCategoryV2::swap( QgsRendererCategoryV2 & cat ) +void QgsRendererCategory::swap( QgsRendererCategory & cat ) { qSwap( mValue, cat.mValue ); qSwap( mSymbol, cat.mSymbol ); qSwap( mLabel, cat.mLabel ); } -QVariant QgsRendererCategoryV2::value() const +QVariant QgsRendererCategory::value() const { return mValue; } -QgsSymbol* QgsRendererCategoryV2::symbol() const +QgsSymbol* QgsRendererCategory::symbol() const { return mSymbol.data(); } -QString QgsRendererCategoryV2::label() const +QString QgsRendererCategory::label() const { return mLabel; } -bool QgsRendererCategoryV2::renderState() const +bool QgsRendererCategory::renderState() const { return mRender; } -void QgsRendererCategoryV2::setValue( const QVariant &value ) +void QgsRendererCategory::setValue( const QVariant &value ) { mValue = value; } -void QgsRendererCategoryV2::setSymbol( QgsSymbol* s ) +void QgsRendererCategory::setSymbol( QgsSymbol* s ) { if ( mSymbol.data() != s ) mSymbol.reset( s ); } -void QgsRendererCategoryV2::setLabel( const QString &label ) +void QgsRendererCategory::setLabel( const QString &label ) { mLabel = label; } -void QgsRendererCategoryV2::setRenderState( bool render ) +void QgsRendererCategory::setRenderState( bool render ) { mRender = render; } -QString QgsRendererCategoryV2::dump() const +QString QgsRendererCategory::dump() const { return QString( "%1::%2::%3:%4\n" ).arg( mValue.toString(), mLabel, mSymbol->dump() ).arg( mRender ); } -void QgsRendererCategoryV2::toSld( QDomDocument &doc, QDomElement &element, QgsStringMap props ) const +void QgsRendererCategory::toSld( QDomDocument &doc, QDomElement &element, QgsStringMap props ) const { if ( !mSymbol.data() || props.value( "attribute", "" ).isEmpty() ) return; @@ -146,8 +146,8 @@ void QgsRendererCategoryV2::toSld( QDomDocument &doc, QDomElement &element, QgsS /////////////////// -QgsCategorizedSymbolRendererV2::QgsCategorizedSymbolRendererV2( const QString& attrName, const QgsCategoryList& categories ) - : QgsFeatureRendererV2( "categorizedSymbol" ) +QgsCategorizedSymbolRenderer::QgsCategorizedSymbolRenderer( const QString& attrName, const QgsCategoryList& categories ) + : QgsFeatureRenderer( "categorizedSymbol" ) , mAttrName( attrName ) , mInvertedColorRamp( false ) , mScaleMethod( DEFAULT_SCALE_METHOD ) @@ -155,9 +155,9 @@ QgsCategorizedSymbolRendererV2::QgsCategorizedSymbolRendererV2( const QString& a , mCounting( false ) { //important - we need a deep copy of the categories list, not a shared copy. This is required because - //QgsRendererCategoryV2::symbol() is marked const, and so retrieving the symbol via this method does not + //QgsRendererCategory::symbol() is marked const, and so retrieving the symbol via this method does not //trigger a detachment and copy of mCategories BUT that same method CAN be used to modify a symbol in place - Q_FOREACH ( const QgsRendererCategoryV2& cat, categories ) + Q_FOREACH ( const QgsRendererCategory& cat, categories ) { if ( cat.symbol() ) { @@ -167,31 +167,31 @@ QgsCategorizedSymbolRendererV2::QgsCategorizedSymbolRendererV2( const QString& a } } -QgsCategorizedSymbolRendererV2::~QgsCategorizedSymbolRendererV2() +QgsCategorizedSymbolRenderer::~QgsCategorizedSymbolRenderer() { } -void QgsCategorizedSymbolRendererV2::rebuildHash() +void QgsCategorizedSymbolRenderer::rebuildHash() { mSymbolHash.clear(); for ( int i = 0; i < mCategories.size(); ++i ) { - const QgsRendererCategoryV2& cat = mCategories.at( i ); + const QgsRendererCategory& cat = mCategories.at( i ); mSymbolHash.insert( cat.value().toString(), ( cat.renderState() || mCounting ) ? cat.symbol() : skipRender() ); } } -QgsSymbol*QgsCategorizedSymbolRendererV2::skipRender() +QgsSymbol*QgsCategorizedSymbolRenderer::skipRender() { - static QgsMarkerSymbolV2* skipRender = nullptr; + static QgsMarkerSymbol* skipRender = nullptr; if ( !skipRender ) - skipRender = new QgsMarkerSymbolV2(); + skipRender = new QgsMarkerSymbol(); return skipRender; } -QgsSymbol* QgsCategorizedSymbolRendererV2::symbolForValue( const QVariant& value ) +QgsSymbol* QgsCategorizedSymbolRenderer::symbolForValue( const QVariant& value ) { // TODO: special case for int, double QHash::const_iterator it = mSymbolHash.constFind( value.isNull() ? "" : value.toString() ); @@ -211,7 +211,7 @@ QgsSymbol* QgsCategorizedSymbolRendererV2::symbolForValue( const QVariant& value return *it; } -QgsSymbol* QgsCategorizedSymbolRendererV2::symbolForFeature( QgsFeature& feature, QgsRenderContext &context ) +QgsSymbol* QgsCategorizedSymbolRenderer::symbolForFeature( QgsFeature& feature, QgsRenderContext &context ) { QgsSymbol* symbol = originalSymbolForFeature( feature, context ); if ( !symbol ) @@ -230,22 +230,22 @@ QgsSymbol* QgsCategorizedSymbolRendererV2::symbolForFeature( QgsFeature& feature // modify the temporary symbol and return it if ( tempSymbol->type() == QgsSymbol::Marker ) { - QgsMarkerSymbolV2* markerSymbol = static_cast( tempSymbol ); + QgsMarkerSymbol* markerSymbol = static_cast( tempSymbol ); if ( mRotation.data() ) markerSymbol->setAngle( rotation ); - markerSymbol->setSize( sizeScale * static_cast( symbol )->size() ); + markerSymbol->setSize( sizeScale * static_cast( symbol )->size() ); markerSymbol->setScaleMethod( mScaleMethod ); } else if ( tempSymbol->type() == QgsSymbol::Line ) { - QgsLineSymbolV2* lineSymbol = static_cast( tempSymbol ); - lineSymbol->setWidth( sizeScale * static_cast( symbol )->width() ); + QgsLineSymbol* lineSymbol = static_cast( tempSymbol ); + lineSymbol->setWidth( sizeScale * static_cast( symbol )->width() ); } return tempSymbol; } -QVariant QgsCategorizedSymbolRendererV2::valueForFeature( QgsFeature& feature, QgsRenderContext &context ) const +QVariant QgsCategorizedSymbolRenderer::valueForFeature( QgsFeature& feature, QgsRenderContext &context ) const { QgsAttributes attrs = feature.attributes(); QVariant value; @@ -263,7 +263,7 @@ QVariant QgsCategorizedSymbolRendererV2::valueForFeature( QgsFeature& feature, Q return value; } -QgsSymbol* QgsCategorizedSymbolRendererV2::originalSymbolForFeature( QgsFeature& feature, QgsRenderContext &context ) +QgsSymbol* QgsCategorizedSymbolRenderer::originalSymbolForFeature( QgsFeature& feature, QgsRenderContext &context ) { QVariant value = valueForFeature( feature, context ); @@ -282,7 +282,7 @@ QgsSymbol* QgsCategorizedSymbolRendererV2::originalSymbolForFeature( QgsFeature& } -int QgsCategorizedSymbolRendererV2::categoryIndexForValue( const QVariant& val ) +int QgsCategorizedSymbolRenderer::categoryIndexForValue( const QVariant& val ) { for ( int i = 0; i < mCategories.count(); i++ ) { @@ -292,7 +292,7 @@ int QgsCategorizedSymbolRendererV2::categoryIndexForValue( const QVariant& val ) return -1; } -int QgsCategorizedSymbolRendererV2::categoryIndexForLabel( const QString& val ) +int QgsCategorizedSymbolRenderer::categoryIndexForLabel( const QString& val ) { int idx = -1; for ( int i = 0; i < mCategories.count(); i++ ) @@ -308,7 +308,7 @@ int QgsCategorizedSymbolRendererV2::categoryIndexForLabel( const QString& val ) return idx; } -bool QgsCategorizedSymbolRendererV2::updateCategoryValue( int catIndex, const QVariant &value ) +bool QgsCategorizedSymbolRenderer::updateCategoryValue( int catIndex, const QVariant &value ) { if ( catIndex < 0 || catIndex >= mCategories.size() ) return false; @@ -316,7 +316,7 @@ bool QgsCategorizedSymbolRendererV2::updateCategoryValue( int catIndex, const QV return true; } -bool QgsCategorizedSymbolRendererV2::updateCategorySymbol( int catIndex, QgsSymbol* symbol ) +bool QgsCategorizedSymbolRenderer::updateCategorySymbol( int catIndex, QgsSymbol* symbol ) { if ( catIndex < 0 || catIndex >= mCategories.size() ) return false; @@ -324,7 +324,7 @@ bool QgsCategorizedSymbolRendererV2::updateCategorySymbol( int catIndex, QgsSymb return true; } -bool QgsCategorizedSymbolRendererV2::updateCategoryLabel( int catIndex, const QString& label ) +bool QgsCategorizedSymbolRenderer::updateCategoryLabel( int catIndex, const QString& label ) { if ( catIndex < 0 || catIndex >= mCategories.size() ) return false; @@ -332,7 +332,7 @@ bool QgsCategorizedSymbolRendererV2::updateCategoryLabel( int catIndex, const QS return true; } -bool QgsCategorizedSymbolRendererV2::updateCategoryRenderState( int catIndex, bool render ) +bool QgsCategorizedSymbolRenderer::updateCategoryRenderState( int catIndex, bool render ) { if ( catIndex < 0 || catIndex >= mCategories.size() ) return false; @@ -340,7 +340,7 @@ bool QgsCategorizedSymbolRendererV2::updateCategoryRenderState( int catIndex, bo return true; } -void QgsCategorizedSymbolRendererV2::addCategory( const QgsRendererCategoryV2 &cat ) +void QgsCategorizedSymbolRenderer::addCategory( const QgsRendererCategory &cat ) { if ( !cat.symbol() ) { @@ -351,7 +351,7 @@ void QgsCategorizedSymbolRendererV2::addCategory( const QgsRendererCategoryV2 &c mCategories.append( cat ); } -bool QgsCategorizedSymbolRendererV2::deleteCategory( int catIndex ) +bool QgsCategorizedSymbolRenderer::deleteCategory( int catIndex ) { if ( catIndex < 0 || catIndex >= mCategories.size() ) return false; @@ -360,27 +360,27 @@ bool QgsCategorizedSymbolRendererV2::deleteCategory( int catIndex ) return true; } -void QgsCategorizedSymbolRendererV2::deleteAllCategories() +void QgsCategorizedSymbolRenderer::deleteAllCategories() { mCategories.clear(); } -void QgsCategorizedSymbolRendererV2::moveCategory( int from, int to ) +void QgsCategorizedSymbolRenderer::moveCategory( int from, int to ) { if ( from < 0 || from >= mCategories.size() || to < 0 || to >= mCategories.size() ) return; mCategories.move( from, to ); } -bool valueLessThan( const QgsRendererCategoryV2 &c1, const QgsRendererCategoryV2 &c2 ) +bool valueLessThan( const QgsRendererCategory &c1, const QgsRendererCategory &c2 ) { return qgsVariantLessThan( c1.value(), c2.value() ); } -bool valueGreaterThan( const QgsRendererCategoryV2 &c1, const QgsRendererCategoryV2 &c2 ) +bool valueGreaterThan( const QgsRendererCategory &c1, const QgsRendererCategory &c2 ) { return qgsVariantGreaterThan( c1.value(), c2.value() ); } -void QgsCategorizedSymbolRendererV2::sortByValue( Qt::SortOrder order ) +void QgsCategorizedSymbolRenderer::sortByValue( Qt::SortOrder order ) { if ( order == Qt::AscendingOrder ) { @@ -392,17 +392,17 @@ void QgsCategorizedSymbolRendererV2::sortByValue( Qt::SortOrder order ) } } -bool labelLessThan( const QgsRendererCategoryV2 &c1, const QgsRendererCategoryV2 &c2 ) +bool labelLessThan( const QgsRendererCategory &c1, const QgsRendererCategory &c2 ) { return QString::localeAwareCompare( c1.label(), c2.label() ) < 0; } -bool labelGreaterThan( const QgsRendererCategoryV2 &c1, const QgsRendererCategoryV2 &c2 ) +bool labelGreaterThan( const QgsRendererCategory &c1, const QgsRendererCategory &c2 ) { return !labelLessThan( c1, c2 ); } -void QgsCategorizedSymbolRendererV2::sortByLabel( Qt::SortOrder order ) +void QgsCategorizedSymbolRenderer::sortByLabel( Qt::SortOrder order ) { if ( order == Qt::AscendingOrder ) { @@ -414,7 +414,7 @@ void QgsCategorizedSymbolRendererV2::sortByLabel( Qt::SortOrder order ) } } -void QgsCategorizedSymbolRendererV2::startRender( QgsRenderContext& context, const QgsFields& fields ) +void QgsCategorizedSymbolRenderer::startRender( QgsRenderContext& context, const QgsFields& fields ) { mCounting = context.rendererScale() == 0.0; @@ -429,7 +429,7 @@ void QgsCategorizedSymbolRendererV2::startRender( QgsRenderContext& context, con mExpression->prepare( &context.expressionContext() ); } - Q_FOREACH ( const QgsRendererCategoryV2& cat, mCategories ) + Q_FOREACH ( const QgsRendererCategory& cat, mCategories ) { cat.symbol()->startRender( context, fields ); @@ -445,9 +445,9 @@ void QgsCategorizedSymbolRendererV2::startRender( QgsRenderContext& context, con return; } -void QgsCategorizedSymbolRendererV2::stopRender( QgsRenderContext& context ) +void QgsCategorizedSymbolRenderer::stopRender( QgsRenderContext& context ) { - Q_FOREACH ( const QgsRendererCategoryV2& cat, mCategories ) + Q_FOREACH ( const QgsRendererCategory& cat, mCategories ) { cat.symbol()->stopRender( context ); } @@ -463,7 +463,7 @@ void QgsCategorizedSymbolRendererV2::stopRender( QgsRenderContext& context ) mExpression.reset(); } -QList QgsCategorizedSymbolRendererV2::usedAttributes() +QList QgsCategorizedSymbolRenderer::usedAttributes() { QSet attributes; @@ -492,7 +492,7 @@ QList QgsCategorizedSymbolRendererV2::usedAttributes() return attributes.toList(); } -QString QgsCategorizedSymbolRendererV2::dump() const +QString QgsCategorizedSymbolRenderer::dump() const { QString s = QString( "CATEGORIZED: idx %1\n" ).arg( mAttrName ); for ( int i = 0; i < mCategories.count(); i++ ) @@ -500,9 +500,9 @@ QString QgsCategorizedSymbolRendererV2::dump() const return s; } -QgsCategorizedSymbolRendererV2* QgsCategorizedSymbolRendererV2::clone() const +QgsCategorizedSymbolRenderer* QgsCategorizedSymbolRenderer::clone() const { - QgsCategorizedSymbolRendererV2* r = new QgsCategorizedSymbolRendererV2( mAttrName, mCategories ); + QgsCategorizedSymbolRenderer* r = new QgsCategorizedSymbolRenderer( mAttrName, mCategories ); if ( mSourceSymbol.data() ) r->setSourceSymbol( mSourceSymbol->clone() ); if ( mSourceColorRamp.data() ) @@ -517,7 +517,7 @@ QgsCategorizedSymbolRendererV2* QgsCategorizedSymbolRendererV2::clone() const return r; } -void QgsCategorizedSymbolRendererV2::toSld( QDomDocument &doc, QDomElement &element ) const +void QgsCategorizedSymbolRenderer::toSld( QDomDocument &doc, QDomElement &element ) const { QgsStringMap props; props[ "attribute" ] = mAttrName; @@ -534,7 +534,7 @@ void QgsCategorizedSymbolRendererV2::toSld( QDomDocument &doc, QDomElement &elem } } -QString QgsCategorizedSymbolRendererV2::filter( const QgsFields& fields ) +QString QgsCategorizedSymbolRenderer::filter( const QgsFields& fields ) { int attrNum = fields.fieldNameIndex( mAttrName ); bool isExpression = ( attrNum == -1 ); @@ -549,7 +549,7 @@ QString QgsCategorizedSymbolRendererV2::filter( const QgsFields& fields ) QString activeValues; QString inactiveValues; - Q_FOREACH ( const QgsRendererCategoryV2& cat, mCategories ) + Q_FOREACH ( const QgsRendererCategory& cat, mCategories ) { if ( cat.value() == "" ) { @@ -605,19 +605,19 @@ QString QgsCategorizedSymbolRendererV2::filter( const QgsFields& fields ) } } -QgsSymbolList QgsCategorizedSymbolRendererV2::symbols( QgsRenderContext &context ) +QgsSymbolList QgsCategorizedSymbolRenderer::symbols( QgsRenderContext &context ) { Q_UNUSED( context ); QgsSymbolList lst; lst.reserve( mCategories.count() ); - Q_FOREACH ( const QgsRendererCategoryV2& cat, mCategories ) + Q_FOREACH ( const QgsRendererCategory& cat, mCategories ) { lst.append( cat.symbol() ); } return lst; } -QgsFeatureRendererV2* QgsCategorizedSymbolRendererV2::create( QDomElement& element ) +QgsFeatureRenderer* QgsCategorizedSymbolRenderer::create( QDomElement& element ) { QDomElement symbolsElem = element.firstChildElement( "symbols" ); if ( symbolsElem.isNull() ) @@ -642,7 +642,7 @@ QgsFeatureRendererV2* QgsCategorizedSymbolRendererV2::create( QDomElement& eleme if ( symbolMap.contains( symbolName ) ) { QgsSymbol* symbol = symbolMap.take( symbolName ); - cats.append( QgsRendererCategoryV2( value, symbol, label, render ) ); + cats.append( QgsRendererCategory( value, symbol, label, render ) ); } } catElem = catElem.nextSiblingElement(); @@ -650,7 +650,7 @@ QgsFeatureRendererV2* QgsCategorizedSymbolRendererV2::create( QDomElement& eleme QString attrName = element.attribute( "attr" ); - QgsCategorizedSymbolRendererV2* r = new QgsCategorizedSymbolRendererV2( attrName, cats ); + QgsCategorizedSymbolRenderer* r = new QgsCategorizedSymbolRenderer( attrName, cats ); // delete symbols if there are any more QgsSymbolLayerUtils::clearSymbolMap( symbolMap ); @@ -680,7 +680,7 @@ QgsFeatureRendererV2* QgsCategorizedSymbolRendererV2::create( QDomElement& eleme QDomElement rotationElem = element.firstChildElement( "rotation" ); if ( !rotationElem.isNull() && !rotationElem.attribute( "field" ).isEmpty() ) { - Q_FOREACH ( const QgsRendererCategoryV2& cat, r->mCategories ) + Q_FOREACH ( const QgsRendererCategory& cat, r->mCategories ) { convertSymbolRotation( cat.symbol(), rotationElem.attribute( "field" ) ); } @@ -693,7 +693,7 @@ QgsFeatureRendererV2* QgsCategorizedSymbolRendererV2::create( QDomElement& eleme QDomElement sizeScaleElem = element.firstChildElement( "sizescale" ); if ( !sizeScaleElem.isNull() && !sizeScaleElem.attribute( "field" ).isEmpty() ) { - Q_FOREACH ( const QgsRendererCategoryV2& cat, r->mCategories ) + Q_FOREACH ( const QgsRendererCategory& cat, r->mCategories ) { convertSymbolSizeScale( cat.symbol(), QgsSymbolLayerUtils::decodeScaleMethod( sizeScaleElem.attribute( "scalemethod" ) ), @@ -711,7 +711,7 @@ QgsFeatureRendererV2* QgsCategorizedSymbolRendererV2::create( QDomElement& eleme return r; } -QDomElement QgsCategorizedSymbolRendererV2::save( QDomDocument& doc ) +QDomElement QgsCategorizedSymbolRenderer::save( QDomDocument& doc ) { QDomElement rendererElem = doc.createElement( RENDERER_TAG_NAME ); rendererElem.setAttribute( "type", "categorizedSymbol" ); @@ -728,7 +728,7 @@ QDomElement QgsCategorizedSymbolRendererV2::save( QDomDocument& doc ) QgsCategoryList::const_iterator it = mCategories.constBegin(); for ( ; it != mCategories.constEnd(); ++it ) { - const QgsRendererCategoryV2& cat = *it; + const QgsRendererCategory& cat = *it; QString symbolName = QString::number( i ); symbols.insert( symbolName, cat.symbol() ); @@ -792,26 +792,26 @@ QDomElement QgsCategorizedSymbolRendererV2::save( QDomDocument& doc ) return rendererElem; } -QgsLegendSymbologyList QgsCategorizedSymbolRendererV2::legendSymbologyItems( QSize iconSize ) +QgsLegendSymbologyList QgsCategorizedSymbolRenderer::legendSymbologyItems( QSize iconSize ) { QgsLegendSymbologyList lst; int count = categories().count(); lst.reserve( count ); for ( int i = 0; i < count; i++ ) { - const QgsRendererCategoryV2& cat = categories()[i]; + const QgsRendererCategory& cat = categories()[i]; QPixmap pix = QgsSymbolLayerUtils::symbolPreviewPixmap( cat.symbol(), iconSize ); lst << qMakePair( cat.label(), pix ); } return lst; } -QgsLegendSymbolList QgsCategorizedSymbolRendererV2::legendSymbolItems( double scaleDenominator, const QString& rule ) +QgsLegendSymbolList QgsCategorizedSymbolRenderer::legendSymbolItems( double scaleDenominator, const QString& rule ) { Q_UNUSED( scaleDenominator ); QgsLegendSymbolList lst; - Q_FOREACH ( const QgsRendererCategoryV2& cat, mCategories ) + Q_FOREACH ( const QgsRendererCategory& cat, mCategories ) { if ( rule.isEmpty() || cat.label() == rule ) { @@ -821,20 +821,20 @@ QgsLegendSymbolList QgsCategorizedSymbolRendererV2::legendSymbolItems( double sc return lst; } -QgsLegendSymbolListV2 QgsCategorizedSymbolRendererV2::legendSymbolItemsV2() const +QgsLegendSymbolListV2 QgsCategorizedSymbolRenderer::legendSymbolItemsV2() const { QgsLegendSymbolListV2 lst; if ( mSourceSymbol.data() && mSourceSymbol->type() == QgsSymbol::Marker ) { // check that all symbols that have the same size expression QgsDataDefined ddSize; - Q_FOREACH ( const QgsRendererCategoryV2& category, mCategories ) + Q_FOREACH ( const QgsRendererCategory& category, mCategories ) { - const QgsMarkerSymbolV2 * symbol = static_cast( category.symbol() ); + const QgsMarkerSymbol * symbol = static_cast( category.symbol() ); if ( !ddSize.hasDefaultValues() && symbol->dataDefinedSize() != ddSize ) { // no common size expression - return QgsFeatureRendererV2::legendSymbolItemsV2(); + return QgsFeatureRenderer::legendSymbolItemsV2(); } else { @@ -844,39 +844,39 @@ QgsLegendSymbolListV2 QgsCategorizedSymbolRendererV2::legendSymbolItemsV2() cons if ( !ddSize.isActive() || !ddSize.useExpression() ) { - return QgsFeatureRendererV2::legendSymbolItemsV2(); + return QgsFeatureRenderer::legendSymbolItemsV2(); } QgsScaleExpression exp( ddSize.expressionString() ); if ( exp.type() != QgsScaleExpression::Unknown ) { - QgsLegendSymbolItemV2 title( nullptr, exp.baseExpression(), "" ); + QgsLegendSymbolItem title( nullptr, exp.baseExpression(), "" ); lst << title; Q_FOREACH ( double v, QgsSymbolLayerUtils::prettyBreaks( exp.minValue(), exp.maxValue(), 4 ) ) { - QgsLegendSymbolItemV2 si( mSourceSymbol.data(), QString::number( v ), "" ); - QgsMarkerSymbolV2 * s = static_cast( si.symbol() ); + QgsLegendSymbolItem si( mSourceSymbol.data(), QString::number( v ), "" ); + QgsMarkerSymbol * s = static_cast( si.symbol() ); s->setDataDefinedSize( QgsDataDefined() ); s->setSize( exp.size( v ) ); lst << si; } // now list the categorized symbols - const QgsLegendSymbolListV2 list2 = QgsFeatureRendererV2::legendSymbolItemsV2() ; - Q_FOREACH ( const QgsLegendSymbolItemV2& item, list2 ) + const QgsLegendSymbolListV2 list2 = QgsFeatureRenderer::legendSymbolItemsV2() ; + Q_FOREACH ( const QgsLegendSymbolItem& item, list2 ) lst << item; return lst; } } - return QgsFeatureRendererV2::legendSymbolItemsV2(); + return QgsFeatureRenderer::legendSymbolItemsV2(); } -QSet QgsCategorizedSymbolRendererV2::legendKeysForFeature( QgsFeature& feature, QgsRenderContext& context ) +QSet QgsCategorizedSymbolRenderer::legendKeysForFeature( QgsFeature& feature, QgsRenderContext& context ) { QString value = valueForFeature( feature, context ).toString(); int i = 0; - Q_FOREACH ( const QgsRendererCategoryV2& cat, mCategories ) + Q_FOREACH ( const QgsRendererCategory& cat, mCategories ) { if ( value == cat.value() ) { @@ -891,33 +891,33 @@ QSet QgsCategorizedSymbolRendererV2::legendKeysForFeature( QgsFeature& return QSet< QString >(); } -QgsSymbol* QgsCategorizedSymbolRendererV2::sourceSymbol() +QgsSymbol* QgsCategorizedSymbolRenderer::sourceSymbol() { return mSourceSymbol.data(); } -void QgsCategorizedSymbolRendererV2::setSourceSymbol( QgsSymbol* sym ) +void QgsCategorizedSymbolRenderer::setSourceSymbol( QgsSymbol* sym ) { mSourceSymbol.reset( sym ); } -QgsVectorColorRampV2* QgsCategorizedSymbolRendererV2::sourceColorRamp() +QgsVectorColorRamp* QgsCategorizedSymbolRenderer::sourceColorRamp() { return mSourceColorRamp.data(); } -void QgsCategorizedSymbolRendererV2::setSourceColorRamp( QgsVectorColorRampV2* ramp ) +void QgsCategorizedSymbolRenderer::setSourceColorRamp( QgsVectorColorRamp* ramp ) { mSourceColorRamp.reset( ramp ); } -void QgsCategorizedSymbolRendererV2::updateColorRamp( QgsVectorColorRampV2* ramp, bool inverted ) +void QgsCategorizedSymbolRenderer::updateColorRamp( QgsVectorColorRamp* ramp, bool inverted ) { setSourceColorRamp( ramp ); setInvertedColorRamp( inverted ); double num = mCategories.count() - 1; double count = 0; - QgsRandomColorsV2* randomRamp = dynamic_cast( ramp ); + QgsRandomColors* randomRamp = dynamic_cast( ramp ); if ( randomRamp ) { //ramp is a random colors ramp, so inform it of the total number of required colors @@ -925,7 +925,7 @@ void QgsCategorizedSymbolRendererV2::updateColorRamp( QgsVectorColorRampV2* ramp randomRamp->setTotalColorCount( mCategories.count() ); } - Q_FOREACH ( const QgsRendererCategoryV2 &cat, mCategories ) + Q_FOREACH ( const QgsRendererCategory &cat, mCategories ) { double value = count / num; if ( mInvertedColorRamp ) value = 1.0 - value; @@ -934,20 +934,20 @@ void QgsCategorizedSymbolRendererV2::updateColorRamp( QgsVectorColorRampV2* ramp } } -void QgsCategorizedSymbolRendererV2::setRotationField( const QString& fieldOrExpression ) +void QgsCategorizedSymbolRenderer::setRotationField( const QString& fieldOrExpression ) { if ( mSourceSymbol && mSourceSymbol->type() == QgsSymbol::Marker ) { - QgsMarkerSymbolV2 * s = static_cast( mSourceSymbol.data() ); + QgsMarkerSymbol * s = static_cast( mSourceSymbol.data() ); s->setDataDefinedAngle( QgsDataDefined( fieldOrExpression ) ); } } -QString QgsCategorizedSymbolRendererV2::rotationField() const +QString QgsCategorizedSymbolRenderer::rotationField() const { if ( mSourceSymbol && mSourceSymbol->type() == QgsSymbol::Marker ) { - QgsMarkerSymbolV2 * s = static_cast( mSourceSymbol.data() ); + QgsMarkerSymbol * s = static_cast( mSourceSymbol.data() ); QgsDataDefined ddAngle = s->dataDefinedAngle(); return ddAngle.useExpression() ? ddAngle.expressionString() : ddAngle.field(); } @@ -955,20 +955,20 @@ QString QgsCategorizedSymbolRendererV2::rotationField() const return QString(); } -void QgsCategorizedSymbolRendererV2::setSizeScaleField( const QString& fieldOrExpression ) +void QgsCategorizedSymbolRenderer::setSizeScaleField( const QString& fieldOrExpression ) { mSizeScale.reset( QgsSymbolLayerUtils::fieldOrExpressionToExpression( fieldOrExpression ) ); } -QString QgsCategorizedSymbolRendererV2::sizeScaleField() const +QString QgsCategorizedSymbolRenderer::sizeScaleField() const { return mSizeScale.data() ? QgsSymbolLayerUtils::fieldOrExpressionFromExpression( mSizeScale.data() ) : QString(); } -void QgsCategorizedSymbolRendererV2::updateSymbols( QgsSymbol * sym ) +void QgsCategorizedSymbolRenderer::updateSymbols( QgsSymbol * sym ) { int i = 0; - Q_FOREACH ( const QgsRendererCategoryV2& cat, mCategories ) + Q_FOREACH ( const QgsRendererCategory& cat, mCategories ) { QgsSymbol* symbol = sym->clone(); symbol->setColor( cat.symbol()->color() ); @@ -978,7 +978,7 @@ void QgsCategorizedSymbolRendererV2::updateSymbols( QgsSymbol * sym ) setSourceSymbol( sym->clone() ); } -void QgsCategorizedSymbolRendererV2::setScaleMethod( QgsSymbol::ScaleMethod scaleMethod ) +void QgsCategorizedSymbolRenderer::setScaleMethod( QgsSymbol::ScaleMethod scaleMethod ) { mScaleMethod = scaleMethod; QgsCategoryList::const_iterator catIt = mCategories.constBegin(); @@ -988,12 +988,12 @@ void QgsCategorizedSymbolRendererV2::setScaleMethod( QgsSymbol::ScaleMethod scal } } -bool QgsCategorizedSymbolRendererV2::legendSymbolItemsCheckable() const +bool QgsCategorizedSymbolRenderer::legendSymbolItemsCheckable() const { return true; } -bool QgsCategorizedSymbolRendererV2::legendSymbolItemChecked( const QString& key ) +bool QgsCategorizedSymbolRenderer::legendSymbolItemChecked( const QString& key ) { bool ok; int index = key.toInt( &ok ); @@ -1003,7 +1003,7 @@ bool QgsCategorizedSymbolRendererV2::legendSymbolItemChecked( const QString& key return true; } -void QgsCategorizedSymbolRendererV2::setLegendSymbolItem( const QString& key, QgsSymbol* symbol ) +void QgsCategorizedSymbolRenderer::setLegendSymbolItem( const QString& key, QgsSymbol* symbol ) { bool ok; int index = key.toInt( &ok ); @@ -1013,7 +1013,7 @@ void QgsCategorizedSymbolRendererV2::setLegendSymbolItem( const QString& key, Qg delete symbol; } -void QgsCategorizedSymbolRendererV2::checkLegendSymbolItem( const QString& key, bool state ) +void QgsCategorizedSymbolRenderer::checkLegendSymbolItem( const QString& key, bool state ) { bool ok; int index = key.toInt( &ok ); @@ -1021,12 +1021,12 @@ void QgsCategorizedSymbolRendererV2::checkLegendSymbolItem( const QString& key, updateCategoryRenderState( index, state ); } -QgsCategorizedSymbolRendererV2* QgsCategorizedSymbolRendererV2::convertFromRenderer( const QgsFeatureRendererV2 *renderer ) +QgsCategorizedSymbolRenderer* QgsCategorizedSymbolRenderer::convertFromRenderer( const QgsFeatureRenderer *renderer ) { - QgsCategorizedSymbolRendererV2* r = nullptr; + QgsCategorizedSymbolRenderer* r = nullptr; if ( renderer->type() == "categorizedSymbol" ) { - r = dynamic_cast( renderer->clone() ); + r = dynamic_cast( renderer->clone() ); } else if ( renderer->type() == "pointDisplacement" ) { @@ -1046,9 +1046,9 @@ QgsCategorizedSymbolRendererV2* QgsCategorizedSymbolRendererV2::convertFromRende if ( !r ) { - r = new QgsCategorizedSymbolRendererV2( "", QgsCategoryList() ); + r = new QgsCategorizedSymbolRenderer( "", QgsCategoryList() ); QgsRenderContext context; - QgsSymbolList symbols = const_cast( renderer )->symbols( context ); + QgsSymbolList symbols = const_cast( renderer )->symbols( context ); if ( !symbols.isEmpty() ) { r->setSourceSymbol( symbols.at( 0 )->clone() ); diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.h b/src/core/symbology-ng/qgscategorizedsymbolrenderer.h similarity index 85% rename from src/core/symbology-ng/qgscategorizedsymbolrendererv2.h rename to src/core/symbology-ng/qgscategorizedsymbolrenderer.h index 1b99c8c383c..b8d1c384139 100644 --- a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.h +++ b/src/core/symbology-ng/qgscategorizedsymbolrenderer.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgscategorizedsymbolrendererv2.h + qgscategorizedsymbolrenderer.h --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -16,32 +16,32 @@ #define QGSCATEGORIZEDSYMBOLRENDERERV2_H #include "qgssymbol.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgsexpression.h" #include #include -class QgsVectorColorRampV2; +class QgsVectorColorRamp; class QgsVectorLayer; /** \ingroup core * \brief categorized renderer */ -class CORE_EXPORT QgsRendererCategoryV2 +class CORE_EXPORT QgsRendererCategory { public: - QgsRendererCategoryV2(); + QgsRendererCategory(); //! takes ownership of symbol - QgsRendererCategoryV2( const QVariant& value, QgsSymbol* symbol, const QString& label, bool render = true ); + QgsRendererCategory( const QVariant& value, QgsSymbol* symbol, const QString& label, bool render = true ); //! copy constructor - QgsRendererCategoryV2( const QgsRendererCategoryV2& cat ); + QgsRendererCategory( const QgsRendererCategory& cat ); - ~QgsRendererCategoryV2() {} + ~QgsRendererCategory() {} - QgsRendererCategoryV2& operator=( QgsRendererCategoryV2 cat ); + QgsRendererCategory& operator=( QgsRendererCategory cat ); QVariant value() const; QgsSymbol* symbol() const; @@ -66,22 +66,22 @@ class CORE_EXPORT QgsRendererCategoryV2 QString mLabel; bool mRender; - void swap( QgsRendererCategoryV2 & other ); + void swap( QgsRendererCategory & other ); }; -typedef QList QgsCategoryList; +typedef QList QgsCategoryList; Q_NOWARN_DEPRECATED_PUSH /** \ingroup core - * \class QgsCategorizedSymbolRendererV2 + * \class QgsCategorizedSymbolRenderer */ -class CORE_EXPORT QgsCategorizedSymbolRendererV2 : public QgsFeatureRendererV2 +class CORE_EXPORT QgsCategorizedSymbolRenderer : public QgsFeatureRenderer { 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 ) override; @@ -97,7 +97,7 @@ class CORE_EXPORT QgsCategorizedSymbolRendererV2 : public QgsFeatureRendererV2 virtual QString dump() const override; - virtual QgsCategorizedSymbolRendererV2* clone() const override; + virtual QgsCategorizedSymbolRenderer* clone() const override; virtual void toSld( QDomDocument& doc, QDomElement &element ) const override; @@ -132,7 +132,7 @@ class CORE_EXPORT QgsCategorizedSymbolRendererV2 : public 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(); @@ -146,7 +146,7 @@ class CORE_EXPORT QgsCategorizedSymbolRendererV2 : public QgsFeatureRendererV2 void setClassAttribute( const QString& attr ) { mAttrName = attr; } //! create renderer from XML element - static QgsFeatureRendererV2* create( QDomElement& element ); + static QgsFeatureRenderer* create( QDomElement& element ); //! store renderer info to XML element virtual QDomElement save( QDomDocument& doc ) override; @@ -182,14 +182,14 @@ class CORE_EXPORT QgsCategorizedSymbolRendererV2 : public 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 ); + void setSourceColorRamp( QgsVectorColorRamp* ramp ); //! @note added in 2.1 bool invertedColorRamp() { return mInvertedColorRamp; } @@ -200,7 +200,7 @@ class CORE_EXPORT QgsCategorizedSymbolRendererV2 : public QgsFeatureRendererV2 * @param inverted set to true to invert ramp colors * @note added in 2.5 */ - void updateColorRamp( QgsVectorColorRampV2* ramp, bool inverted = false ); + void updateColorRamp( QgsVectorColorRamp* ramp, bool inverted = false ); Q_DECL_DEPRECATED void setRotationField( const QString& fieldOrExpression ) override; Q_DECL_DEPRECATED QString rotationField() const override; @@ -229,16 +229,16 @@ class CORE_EXPORT QgsCategorizedSymbolRendererV2 : public QgsFeatureRendererV2 //! @note added in 2.6 virtual QString legendClassificationAttribute() const override { return classAttribute(); } - //! 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 ); + static QgsCategorizedSymbolRenderer* convertFromRenderer( const QgsFeatureRenderer *renderer ); protected: QString mAttrName; QgsCategoryList mCategories; QScopedPointer mSourceSymbol; - QScopedPointer mSourceColorRamp; + QScopedPointer mSourceColorRamp; bool mInvertedColorRamp; QScopedPointer mRotation; QScopedPointer mSizeScale; diff --git a/src/core/symbology-ng/qgscptcityarchive.h b/src/core/symbology-ng/qgscptcityarchive.h index 89632b3c1dc..00c16f11577 100644 --- a/src/core/symbology-ng/qgscptcityarchive.h +++ b/src/core/symbology-ng/qgscptcityarchive.h @@ -17,14 +17,14 @@ #ifndef QGSCPTCITYARCHIVE_H #define QGSCPTCITYARCHIVE_H -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include #include #include #include -class QgsCptCityColorRampV2; +class QgsCptCityColorRamp; class QgsCptCityDataItem; class QgsCptCitySelectionItem; @@ -224,7 +224,7 @@ class CORE_EXPORT QgsCptCityColorRampItem : public QgsCptCityDataItem virtual int leafCount() const override { return 1; } // --- New virtual methods for layer item derived classes --- - const QgsCptCityColorRampV2& ramp() const { return mRamp; } + const QgsCptCityColorRamp& ramp() const { return mRamp; } QIcon icon() override; QIcon icon( QSize size ) override; void init(); @@ -232,7 +232,7 @@ class CORE_EXPORT QgsCptCityColorRampItem : public QgsCptCityDataItem protected: bool mInitialised; - QgsCptCityColorRampV2 mRamp; + QgsCptCityColorRamp mRamp; QList< QIcon > mIcons; }; diff --git a/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp b/src/core/symbology-ng/qgsellipsesymbollayer.cpp similarity index 90% rename from src/core/symbology-ng/qgsellipsesymbollayerv2.cpp rename to src/core/symbology-ng/qgsellipsesymbollayer.cpp index 56c7031c6b3..b2eabd7cf3c 100644 --- a/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp +++ b/src/core/symbology-ng/qgsellipsesymbollayer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsellipsesymbollayerv2.cpp + qgsellipsesymbollayer.cpp --------------------- begin : June 2011 copyright : (C) 2011 by Marco Hugentobler @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsellipsesymbollayerv2.h" +#include "qgsellipsesymbollayer.h" #include "qgsdxfexport.h" #include "qgsexpression.h" #include "qgsfeature.h" @@ -27,8 +27,8 @@ #include #include -QgsEllipseSymbolLayerV2::QgsEllipseSymbolLayerV2() - : QgsMarkerSymbolLayerV2() +QgsEllipseSymbolLayer::QgsEllipseSymbolLayer() + : QgsMarkerSymbolLayer() , mSymbolName( "circle" ) , mSymbolWidth( 4 ) , mSymbolWidthUnit( QgsUnitTypes::RenderMillimeters ) @@ -51,13 +51,13 @@ QgsEllipseSymbolLayerV2::QgsEllipseSymbolLayerV2() mAngle = 0; } -QgsEllipseSymbolLayerV2::~QgsEllipseSymbolLayerV2() +QgsEllipseSymbolLayer::~QgsEllipseSymbolLayer() { } -QgsSymbolLayer* QgsEllipseSymbolLayerV2::create( const QgsStringMap& properties ) +QgsSymbolLayer* QgsEllipseSymbolLayer::create( const QgsStringMap& properties ) { - QgsEllipseSymbolLayerV2* layer = new QgsEllipseSymbolLayerV2(); + QgsEllipseSymbolLayer* layer = new QgsEllipseSymbolLayer(); if ( properties.contains( "symbol_name" ) ) { layer->setSymbolName( properties[ "symbol_name" ] ); @@ -165,11 +165,11 @@ QgsSymbolLayer* QgsEllipseSymbolLayerV2::create( const QgsStringMap& properties } if ( properties.contains( "horizontal_anchor_point" ) ) { - layer->setHorizontalAnchorPoint( QgsMarkerSymbolLayerV2::HorizontalAnchorPoint( properties[ "horizontal_anchor_point" ].toInt() ) ); + layer->setHorizontalAnchorPoint( QgsMarkerSymbolLayer::HorizontalAnchorPoint( properties[ "horizontal_anchor_point" ].toInt() ) ); } if ( properties.contains( "vertical_anchor_point" ) ) { - layer->setVerticalAnchorPoint( QgsMarkerSymbolLayerV2::VerticalAnchorPoint( properties[ "vertical_anchor_point" ].toInt() ) ); + layer->setVerticalAnchorPoint( QgsMarkerSymbolLayer::VerticalAnchorPoint( properties[ "vertical_anchor_point" ].toInt() ) ); } //data defined properties @@ -208,7 +208,7 @@ QgsSymbolLayer* QgsEllipseSymbolLayerV2::create( const QgsStringMap& properties return layer; } -void QgsEllipseSymbolLayerV2::renderPoint( QPointF point, QgsSymbolRenderContext& context ) +void QgsEllipseSymbolLayer::renderPoint( QPointF point, QgsSymbolRenderContext& context ) { bool ok; if ( hasDataDefinedProperty( QgsSymbolLayer::EXPR_OUTLINE_WIDTH ) ) @@ -289,7 +289,7 @@ void QgsEllipseSymbolLayerV2::renderPoint( QPointF point, QgsSymbolRenderContext } -void QgsEllipseSymbolLayerV2::calculateOffsetAndRotation( QgsSymbolRenderContext& context, +void QgsEllipseSymbolLayer::calculateOffsetAndRotation( QgsSymbolRenderContext& context, double scaledWidth, double scaledHeight, bool& hasDataDefinedRotation, @@ -336,14 +336,14 @@ void QgsEllipseSymbolLayerV2::calculateOffsetAndRotation( QgsSymbolRenderContext offset = _rotatedOffset( offset, angle ); } -QString QgsEllipseSymbolLayerV2::layerType() const +QString QgsEllipseSymbolLayer::layerType() const { return "EllipseMarker"; } -void QgsEllipseSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) +void QgsEllipseSymbolLayer::startRender( QgsSymbolRenderContext& context ) { - QgsMarkerSymbolLayerV2::startRender( context ); // get anchor point expressions + QgsMarkerSymbolLayer::startRender( context ); // get anchor point expressions if ( !context.feature() || !hasDataDefinedProperties() ) { preparePath( mSymbolName, context ); @@ -356,13 +356,13 @@ void QgsEllipseSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) prepareExpressions( context ); } -void QgsEllipseSymbolLayerV2::stopRender( QgsSymbolRenderContext & ) +void QgsEllipseSymbolLayer::stopRender( QgsSymbolRenderContext & ) { } -QgsEllipseSymbolLayerV2* QgsEllipseSymbolLayerV2::clone() const +QgsEllipseSymbolLayer* QgsEllipseSymbolLayer::clone() const { - QgsEllipseSymbolLayerV2* m = new QgsEllipseSymbolLayerV2(); + QgsEllipseSymbolLayer* m = new QgsEllipseSymbolLayer(); m->setSymbolName( mSymbolName ); m->setSymbolWidth( mSymbolWidth ); m->setSymbolHeight( mSymbolHeight ); @@ -390,7 +390,7 @@ QgsEllipseSymbolLayerV2* QgsEllipseSymbolLayerV2::clone() const return m; } -void QgsEllipseSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const +void QgsEllipseSymbolLayer::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const { QDomElement symbolizerElem = doc.createElement( "se:PointSymbolizer" ); if ( !props.value( "uom", "" ).isEmpty() ) @@ -403,7 +403,7 @@ void QgsEllipseSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element, co writeSldMarker( doc, symbolizerElem, props ); } -void QgsEllipseSymbolLayerV2::writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const +void QgsEllipseSymbolLayer::writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const { // QDomElement graphicElem = doc.createElement( "se:Graphic" ); @@ -454,7 +454,7 @@ void QgsEllipseSymbolLayerV2::writeSldMarker( QDomDocument &doc, QDomElement &el QgsSymbolLayerUtils::createRotationElement( doc, graphicElem, angleFunc ); } -QgsSymbolLayer* QgsEllipseSymbolLayerV2::createFromSld( QDomElement &element ) +QgsSymbolLayer* QgsEllipseSymbolLayer::createFromSld( QDomElement &element ) { QgsDebugMsg( "Entered." ); @@ -493,7 +493,7 @@ QgsSymbolLayer* QgsEllipseSymbolLayerV2::createFromSld( QDomElement &element ) angle = d; } - QgsEllipseSymbolLayerV2 *m = new QgsEllipseSymbolLayerV2(); + QgsEllipseSymbolLayer *m = new QgsEllipseSymbolLayer(); m->setSymbolName( name ); m->setFillColor( fillColor ); m->setOutlineColor( borderColor ); @@ -505,7 +505,7 @@ QgsSymbolLayer* QgsEllipseSymbolLayerV2::createFromSld( QDomElement &element ) return m; } -QgsStringMap QgsEllipseSymbolLayerV2::properties() const +QgsStringMap QgsEllipseSymbolLayer::properties() const { QgsStringMap map; map["symbol_name"] = mSymbolName; @@ -535,7 +535,7 @@ QgsStringMap QgsEllipseSymbolLayerV2::properties() const return map; } -QSizeF QgsEllipseSymbolLayerV2::calculateSize( QgsSymbolRenderContext& context, double* scaledWidth, double* scaledHeight ) +QSizeF QgsEllipseSymbolLayer::calculateSize( QgsSymbolRenderContext& context, double* scaledWidth, double* scaledHeight ) { double width = 0; @@ -580,7 +580,7 @@ QSizeF QgsEllipseSymbolLayerV2::calculateSize( QgsSymbolRenderContext& context, return QSizeF( width, height ); } -void QgsEllipseSymbolLayerV2::preparePath( const QString& symbolName, QgsSymbolRenderContext& context, double* scaledWidth, double* scaledHeight, const QgsFeature* ) +void QgsEllipseSymbolLayer::preparePath( const QString& symbolName, QgsSymbolRenderContext& context, double* scaledWidth, double* scaledHeight, const QgsFeature* ) { mPainterPath = QPainterPath(); @@ -637,17 +637,17 @@ void QgsEllipseSymbolLayerV2::preparePath( const QString& symbolName, QgsSymbolR } } -void QgsEllipseSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit ) +void QgsEllipseSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit ) { - QgsMarkerSymbolLayerV2::setOutputUnit( unit ); + QgsMarkerSymbolLayer::setOutputUnit( unit ); mSymbolWidthUnit = unit; mSymbolHeightUnit = unit; mOutlineWidthUnit = unit; } -QgsUnitTypes::RenderUnit QgsEllipseSymbolLayerV2::outputUnit() const +QgsUnitTypes::RenderUnit QgsEllipseSymbolLayer::outputUnit() const { - QgsUnitTypes::RenderUnit unit = QgsMarkerSymbolLayerV2::outputUnit(); + QgsUnitTypes::RenderUnit unit = QgsMarkerSymbolLayer::outputUnit(); if ( mSymbolWidthUnit != unit || mSymbolHeightUnit != unit || mOutlineWidthUnit != unit ) { return QgsUnitTypes::RenderUnknownUnit; @@ -655,17 +655,17 @@ QgsUnitTypes::RenderUnit QgsEllipseSymbolLayerV2::outputUnit() const return unit; } -void QgsEllipseSymbolLayerV2::setMapUnitScale( const QgsMapUnitScale &scale ) +void QgsEllipseSymbolLayer::setMapUnitScale( const QgsMapUnitScale &scale ) { - QgsMarkerSymbolLayerV2::setMapUnitScale( scale ); + QgsMarkerSymbolLayer::setMapUnitScale( scale ); mSymbolWidthMapUnitScale = scale; mSymbolHeightMapUnitScale = scale; mOutlineWidthMapUnitScale = scale; } -QgsMapUnitScale QgsEllipseSymbolLayerV2::mapUnitScale() const +QgsMapUnitScale QgsEllipseSymbolLayer::mapUnitScale() const { - if ( QgsMarkerSymbolLayerV2::mapUnitScale() == mSymbolWidthMapUnitScale && + if ( QgsMarkerSymbolLayer::mapUnitScale() == mSymbolWidthMapUnitScale && mSymbolWidthMapUnitScale == mSymbolHeightMapUnitScale && mSymbolHeightMapUnitScale == mOutlineWidthMapUnitScale ) { @@ -674,7 +674,7 @@ QgsMapUnitScale QgsEllipseSymbolLayerV2::mapUnitScale() const return QgsMapUnitScale(); } -QRectF QgsEllipseSymbolLayerV2::bounds( QPointF point, QgsSymbolRenderContext& context ) +QRectF QgsEllipseSymbolLayer::bounds( QPointF point, QgsSymbolRenderContext& context ) { QSizeF size = calculateSize( context ); @@ -729,7 +729,7 @@ QRectF QgsEllipseSymbolLayerV2::bounds( QPointF point, QgsSymbolRenderContext& c return symbolBounds; } -bool QgsEllipseSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFactor, const QString& layerName, QgsSymbolRenderContext &context, QPointF shift ) const +bool QgsEllipseSymbolLayer::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFactor, const QString& layerName, QgsSymbolRenderContext &context, QPointF shift ) const { //width double symbolWidth = mSymbolWidth; @@ -845,7 +845,7 @@ bool QgsEllipseSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFa } else { - QgsPointSequenceV2 line; + QgsPointSequence line; double stepsize = 2 * M_PI / 40; for ( int i = 0; i < 39; ++i ) @@ -859,14 +859,14 @@ bool QgsEllipseSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFa line << line.at( 0 ); if ( mBrush.style() != Qt::NoBrush ) - e.writePolygon( QgsRingSequenceV2() << line, layerName, "SOLID", fc ); + e.writePolygon( QgsRingSequence() << line, layerName, "SOLID", fc ); if ( mPen.style() != Qt::NoPen ) e.writePolyline( line, layerName, "CONTINUOUS", oc, outlineWidth ); } } else if ( symbolName == "rectangle" ) { - QgsPointSequenceV2 p; + QgsPointSequence p; p << QgsPointV2( t.map( QPointF( -halfWidth, -halfHeight ) ) ) << QgsPointV2( t.map( QPointF( halfWidth, -halfHeight ) ) ) << QgsPointV2( t.map( QPointF( halfWidth, halfHeight ) ) ) @@ -874,18 +874,18 @@ bool QgsEllipseSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFa p << p[0]; if ( mBrush.style() != Qt::NoBrush ) - e.writePolygon( QgsRingSequenceV2() << p, layerName, "SOLID", fc ); + e.writePolygon( QgsRingSequence() << p, layerName, "SOLID", fc ); if ( mPen.style() != Qt::NoPen ) e.writePolyline( p, layerName, "CONTINUOUS", oc, outlineWidth ); return true; } else if ( symbolName == "cross" && mPen.style() != Qt::NoPen ) { - e.writePolyline( QgsPointSequenceV2() + e.writePolyline( QgsPointSequence() << QgsPointV2( t.map( QPointF( -halfWidth, 0 ) ) ) << QgsPointV2( t.map( QPointF( halfWidth, 0 ) ) ), layerName, "CONTINUOUS", oc, outlineWidth ); - e.writePolyline( QgsPointSequenceV2() + e.writePolyline( QgsPointSequence() << QgsPointV2( t.map( QPointF( 0, halfHeight ) ) ) << QgsPointV2( t.map( QPointF( 0, -halfHeight ) ) ), layerName, "CONTINUOUS", oc, outlineWidth ); @@ -893,13 +893,13 @@ bool QgsEllipseSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFa } else if ( symbolName == "triangle" ) { - QgsPointSequenceV2 p; + QgsPointSequence p; p << QgsPointV2( t.map( QPointF( -halfWidth, -halfHeight ) ) ) << QgsPointV2( t.map( QPointF( halfWidth, -halfHeight ) ) ) << QgsPointV2( t.map( QPointF( 0, halfHeight ) ) ); p << p[0]; if ( mBrush.style() != Qt::NoBrush ) - e.writePolygon( QgsRingSequenceV2() << p, layerName, "SOLID", fc ); + e.writePolygon( QgsRingSequence() << p, layerName, "SOLID", fc ); if ( mPen.style() != Qt::NoPen ) e.writePolyline( p, layerName, "CONTINUOUS", oc, outlineWidth ); return true; diff --git a/src/core/symbology-ng/qgsellipsesymbollayerv2.h b/src/core/symbology-ng/qgsellipsesymbollayer.h similarity index 96% rename from src/core/symbology-ng/qgsellipsesymbollayerv2.h rename to src/core/symbology-ng/qgsellipsesymbollayer.h index 4a3a0b288b2..2f9a8e9288d 100644 --- a/src/core/symbology-ng/qgsellipsesymbollayerv2.h +++ b/src/core/symbology-ng/qgsellipsesymbollayer.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsellipsesymbollayerv2.h + qgsellipsesymbollayer.h --------------------- begin : June 2011 copyright : (C) 2011 by Marco Hugentobler @@ -17,18 +17,18 @@ #define DEFAULT_ELLIPSE_JOINSTYLE Qt::MiterJoin -#include "qgsmarkersymbollayerv2.h" +#include "qgsmarkersymbollayer.h" #include class QgsExpression; /** \ingroup core * A symbol layer for rendering objects with major and minor axis (e.g. ellipse, rectangle )*/ -class CORE_EXPORT QgsEllipseSymbolLayerV2: public QgsMarkerSymbolLayerV2 +class CORE_EXPORT QgsEllipseSymbolLayer: public QgsMarkerSymbolLayer { public: - QgsEllipseSymbolLayerV2(); - ~QgsEllipseSymbolLayerV2(); + QgsEllipseSymbolLayer(); + ~QgsEllipseSymbolLayer(); static QgsSymbolLayer* create( const QgsStringMap& properties = QgsStringMap() ); static QgsSymbolLayer* createFromSld( QDomElement &element ); @@ -37,7 +37,7 @@ class CORE_EXPORT QgsEllipseSymbolLayerV2: public QgsMarkerSymbolLayerV2 QString layerType() const override; void startRender( QgsSymbolRenderContext& context ) override; void stopRender( QgsSymbolRenderContext& context ) override; - QgsEllipseSymbolLayerV2* clone() const override; + QgsEllipseSymbolLayer* clone() const override; QgsStringMap properties() const override; void toSld( QDomDocument& doc, QDomElement &element, const QgsStringMap& props ) const override; diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayer.cpp similarity index 91% rename from src/core/symbology-ng/qgsfillsymbollayerv2.cpp rename to src/core/symbology-ng/qgsfillsymbollayer.cpp index 2d2ea27a6b1..85b69947976 100644 --- a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp +++ b/src/core/symbology-ng/qgsfillsymbollayer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsfillsymbollayerv2.cpp + qgsfillsymbollayer.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -13,19 +13,19 @@ * * ***************************************************************************/ -#include "qgsfillsymbollayerv2.h" -#include "qgslinesymbollayerv2.h" -#include "qgsmarkersymbollayerv2.h" +#include "qgsfillsymbollayer.h" +#include "qgslinesymbollayer.h" +#include "qgsmarkersymbollayer.h" #include "qgssymbollayerutils.h" #include "qgsdxfexport.h" #include "qgsexpression.h" #include "qgsgeometry.h" -#include "qgsgeometrycollectionv2.h" +#include "qgsgeometrycollection.h" #include "qgsrendercontext.h" #include "qgsproject.h" #include "qgssvgcache.h" #include "qgslogger.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgsunittypes.h" #include @@ -34,7 +34,7 @@ #include #include -QgsSimpleFillSymbolLayerV2::QgsSimpleFillSymbolLayerV2( const QColor& color, Qt::BrushStyle style, const QColor& borderColor, Qt::PenStyle borderStyle, double borderWidth, +QgsSimpleFillSymbolLayer::QgsSimpleFillSymbolLayer( const QColor& color, Qt::BrushStyle style, const QColor& borderColor, Qt::PenStyle borderStyle, double borderWidth, Qt::PenJoinStyle penJoinStyle ) : mBrushStyle( style ) , mBorderColor( borderColor ) @@ -47,13 +47,13 @@ QgsSimpleFillSymbolLayerV2::QgsSimpleFillSymbolLayerV2( const QColor& color, Qt: mColor = color; } -void QgsSimpleFillSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit ) +void QgsSimpleFillSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit ) { mBorderWidthUnit = unit; mOffsetUnit = unit; } -QgsUnitTypes::RenderUnit QgsSimpleFillSymbolLayerV2::outputUnit() const +QgsUnitTypes::RenderUnit QgsSimpleFillSymbolLayer::outputUnit() const { QgsUnitTypes::RenderUnit unit = mBorderWidthUnit; if ( mOffsetUnit != unit ) @@ -63,13 +63,13 @@ QgsUnitTypes::RenderUnit QgsSimpleFillSymbolLayerV2::outputUnit() const return unit; } -void QgsSimpleFillSymbolLayerV2::setMapUnitScale( const QgsMapUnitScale &scale ) +void QgsSimpleFillSymbolLayer::setMapUnitScale( const QgsMapUnitScale &scale ) { mBorderWidthMapUnitScale = scale; mOffsetMapUnitScale = scale; } -QgsMapUnitScale QgsSimpleFillSymbolLayerV2::mapUnitScale() const +QgsMapUnitScale QgsSimpleFillSymbolLayer::mapUnitScale() const { if ( mBorderWidthMapUnitScale == mOffsetMapUnitScale ) { @@ -78,7 +78,7 @@ QgsMapUnitScale QgsSimpleFillSymbolLayerV2::mapUnitScale() const return QgsMapUnitScale(); } -void QgsSimpleFillSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolRenderContext& context, QBrush& brush, QPen& pen, QPen& selPen ) +void QgsSimpleFillSymbolLayer::applyDataDefinedSymbology( QgsSymbolRenderContext& context, QBrush& brush, QPen& pen, QPen& selPen ) { if ( !hasDataDefinedProperties() ) return; // shortcut @@ -137,7 +137,7 @@ void QgsSimpleFillSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolRenderConte } -QgsSymbolLayer* QgsSimpleFillSymbolLayerV2::create( const QgsStringMap& props ) +QgsSymbolLayer* QgsSimpleFillSymbolLayer::create( const QgsStringMap& props ) { QColor color = DEFAULT_SIMPLEFILL_COLOR; Qt::BrushStyle style = DEFAULT_SIMPLEFILL_STYLE; @@ -196,7 +196,7 @@ QgsSymbolLayer* QgsSimpleFillSymbolLayerV2::create( const QgsStringMap& props ) if ( props.contains( "joinstyle" ) ) penJoinStyle = QgsSymbolLayerUtils::decodePenJoinStyle( props["joinstyle"] ); - QgsSimpleFillSymbolLayerV2* sl = new QgsSimpleFillSymbolLayerV2( color, style, borderColor, borderStyle, borderWidth, penJoinStyle ); + QgsSimpleFillSymbolLayer* sl = new QgsSimpleFillSymbolLayer( color, style, borderColor, borderStyle, borderWidth, penJoinStyle ); sl->setOffset( offset ); if ( props.contains( "border_width_unit" ) ) { @@ -224,12 +224,12 @@ QgsSymbolLayer* QgsSimpleFillSymbolLayerV2::create( const QgsStringMap& props ) } -QString QgsSimpleFillSymbolLayerV2::layerType() const +QString QgsSimpleFillSymbolLayer::layerType() const { return "SimpleFill"; } -void QgsSimpleFillSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) +void QgsSimpleFillSymbolLayer::startRender( QgsSymbolRenderContext& context ) { QColor fillColor = mColor; fillColor.setAlphaF( context.alpha() * mColor.alphaF() ); @@ -261,12 +261,12 @@ void QgsSimpleFillSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) prepareExpressions( context ); } -void QgsSimpleFillSymbolLayerV2::stopRender( QgsSymbolRenderContext& context ) +void QgsSimpleFillSymbolLayer::stopRender( QgsSymbolRenderContext& context ) { Q_UNUSED( context ); } -void QgsSimpleFillSymbolLayerV2::renderPolygon( const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) +void QgsSimpleFillSymbolLayer::renderPolygon( const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) { QPainter* p = context.renderContext().painter(); if ( !p ) @@ -295,7 +295,7 @@ void QgsSimpleFillSymbolLayerV2::renderPolygon( const QPolygonF& points, QListsetOffset( mOffset ); sl->setOffsetUnit( mOffsetUnit ); sl->setOffsetMapUnitScale( mOffsetMapUnitScale ); @@ -326,7 +326,7 @@ QgsSimpleFillSymbolLayerV2* QgsSimpleFillSymbolLayerV2::clone() const return sl; } -void QgsSimpleFillSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const +void QgsSimpleFillSymbolLayer::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const { if ( mBrushStyle == Qt::NoBrush && mBorderStyle == Qt::NoPen ) return; @@ -359,7 +359,7 @@ void QgsSimpleFillSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element, QgsSymbolLayerUtils::createDisplacementElement( doc, symbolizerElem, mOffset ); } -QString QgsSimpleFillSymbolLayerV2::ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const +QString QgsSimpleFillSymbolLayer::ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const { //brush QString symbolStyle; @@ -370,7 +370,7 @@ QString QgsSimpleFillSymbolLayerV2::ogrFeatureStyle( double mmScaleFactor, doubl return symbolStyle; } -QgsSymbolLayer* QgsSimpleFillSymbolLayerV2::createFromSld( QDomElement &element ) +QgsSymbolLayer* QgsSimpleFillSymbolLayer::createFromSld( QDomElement &element ) { QgsDebugMsg( "Entered." ); @@ -388,19 +388,19 @@ QgsSymbolLayer* QgsSimpleFillSymbolLayerV2::createFromSld( QDomElement &element QPointF offset; QgsSymbolLayerUtils::displacementFromSldElement( element, offset ); - QgsSimpleFillSymbolLayerV2* sl = new QgsSimpleFillSymbolLayerV2( color, fillStyle, borderColor, borderStyle, borderWidth ); + QgsSimpleFillSymbolLayer* sl = new QgsSimpleFillSymbolLayer( color, fillStyle, borderColor, borderStyle, borderWidth ); sl->setOffset( offset ); return sl; } -double QgsSimpleFillSymbolLayerV2::estimateMaxBleed() const +double QgsSimpleFillSymbolLayer::estimateMaxBleed() const { double penBleed = mBorderStyle == Qt::NoPen ? 0 : ( mBorderWidth / 2.0 ); double offsetBleed = mOffset.x() > mOffset.y() ? mOffset.x() : mOffset.y(); return penBleed + offsetBleed; } -double QgsSimpleFillSymbolLayerV2::dxfWidth( const QgsDxfExport& e, QgsSymbolRenderContext &context ) const +double QgsSimpleFillSymbolLayer::dxfWidth( const QgsDxfExport& e, QgsSymbolRenderContext &context ) const { double width = mBorderWidth; if ( hasDataDefinedProperty( QgsSymbolLayer::EXPR_WIDTH_BORDER ) ) @@ -411,7 +411,7 @@ double QgsSimpleFillSymbolLayerV2::dxfWidth( const QgsDxfExport& e, QgsSymbolRen return width * e.mapUnitScaleFactor( e.symbologyScaleDenominator(), mBorderWidthUnit, e.mapUnits() ); } -QColor QgsSimpleFillSymbolLayerV2::dxfColor( QgsSymbolRenderContext &context ) const +QColor QgsSimpleFillSymbolLayer::dxfColor( QgsSymbolRenderContext &context ) const { if ( hasDataDefinedProperty( QgsSymbolLayer::EXPR_BORDER_COLOR ) ) { @@ -424,7 +424,7 @@ QColor QgsSimpleFillSymbolLayerV2::dxfColor( QgsSymbolRenderContext &context ) c return mBorderColor; } -double QgsSimpleFillSymbolLayerV2::dxfAngle( QgsSymbolRenderContext &context ) const +double QgsSimpleFillSymbolLayer::dxfAngle( QgsSymbolRenderContext &context ) const { double angle = mAngle; if ( hasDataDefinedProperty( QgsSymbolLayer::EXPR_ANGLE ) ) @@ -435,12 +435,12 @@ double QgsSimpleFillSymbolLayerV2::dxfAngle( QgsSymbolRenderContext &context ) c return angle; } -Qt::PenStyle QgsSimpleFillSymbolLayerV2::dxfPenStyle() const +Qt::PenStyle QgsSimpleFillSymbolLayer::dxfPenStyle() const { return mBorderStyle; } -QColor QgsSimpleFillSymbolLayerV2::dxfBrushColor( QgsSymbolRenderContext& context ) const +QColor QgsSimpleFillSymbolLayer::dxfBrushColor( QgsSymbolRenderContext& context ) const { if ( hasDataDefinedProperty( QgsSymbolLayer::EXPR_COLOR ) ) { @@ -453,14 +453,14 @@ QColor QgsSimpleFillSymbolLayerV2::dxfBrushColor( QgsSymbolRenderContext& contex return mColor; } -Qt::BrushStyle QgsSimpleFillSymbolLayerV2::dxfBrushStyle() const +Qt::BrushStyle QgsSimpleFillSymbolLayer::dxfBrushStyle() const { return mBrushStyle; } -//QgsGradientFillSymbolLayerV2 +//QgsGradientFillSymbolLayer -QgsGradientFillSymbolLayerV2::QgsGradientFillSymbolLayerV2( const QColor& color, const QColor& color2, +QgsGradientFillSymbolLayer::QgsGradientFillSymbolLayer( const QColor& color, const QColor& color2, GradientColorType colorType, GradientType gradientType, GradientCoordinateMode coordinateMode, GradientSpread spread ) : mGradientColorType( colorType ) @@ -478,18 +478,18 @@ QgsGradientFillSymbolLayerV2::QgsGradientFillSymbolLayerV2( const QColor& color, mColor2 = color2; } -QgsGradientFillSymbolLayerV2::~QgsGradientFillSymbolLayerV2() +QgsGradientFillSymbolLayer::~QgsGradientFillSymbolLayer() { delete mGradientRamp; } -QgsSymbolLayer* QgsGradientFillSymbolLayerV2::create( const QgsStringMap& props ) +QgsSymbolLayer* QgsGradientFillSymbolLayer::create( const QgsStringMap& props ) { //default to a two-color, linear gradient with feature mode and pad spreading - GradientType type = QgsGradientFillSymbolLayerV2::Linear; - GradientColorType colorType = QgsGradientFillSymbolLayerV2::SimpleTwoColor; - GradientCoordinateMode coordinateMode = QgsGradientFillSymbolLayerV2::Feature; - GradientSpread gradientSpread = QgsGradientFillSymbolLayerV2::Pad; + GradientType type = QgsGradientFillSymbolLayer::Linear; + GradientColorType colorType = QgsGradientFillSymbolLayer::SimpleTwoColor; + GradientCoordinateMode coordinateMode = QgsGradientFillSymbolLayer::Feature; + GradientSpread gradientSpread = QgsGradientFillSymbolLayer::Pad; //default to gradient from the default fill color to white QColor color = DEFAULT_SIMPLEFILL_COLOR, color2 = Qt::white; QPointF referencePoint1 = QPointF( 0.5, 0 ); @@ -537,10 +537,10 @@ QgsSymbolLayer* QgsGradientFillSymbolLayerV2::create( const QgsStringMap& props offset = QgsSymbolLayerUtils::decodePoint( props["offset"] ); //attempt to create color ramp from props - QgsVectorColorRampV2* gradientRamp = QgsVectorGradientColorRampV2::create( props ); + QgsVectorColorRamp* gradientRamp = QgsVectorGradientColorRamp::create( props ); //create a new gradient fill layer with desired properties - QgsGradientFillSymbolLayerV2* sl = new QgsGradientFillSymbolLayerV2( color, color2, colorType, type, coordinateMode, gradientSpread ); + QgsGradientFillSymbolLayer* sl = new QgsGradientFillSymbolLayer( color, color2, colorType, type, coordinateMode, gradientSpread ); sl->setOffset( offset ); if ( props.contains( "offset_unit" ) ) sl->setOffsetUnit( QgsUnitTypes::decodeRenderUnit( props["offset_unit"] ) ); @@ -559,18 +559,18 @@ QgsSymbolLayer* QgsGradientFillSymbolLayerV2::create( const QgsStringMap& props return sl; } -void QgsGradientFillSymbolLayerV2::setColorRamp( QgsVectorColorRampV2* ramp ) +void QgsGradientFillSymbolLayer::setColorRamp( QgsVectorColorRamp* ramp ) { delete mGradientRamp; mGradientRamp = ramp; } -QString QgsGradientFillSymbolLayerV2::layerType() const +QString QgsGradientFillSymbolLayer::layerType() const { return "GradientFill"; } -void QgsGradientFillSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolRenderContext& context, const QPolygonF& points ) +void QgsGradientFillSymbolLayer::applyDataDefinedSymbology( QgsSymbolRenderContext& context, const QPolygonF& points ) { if ( !hasDataDefinedProperties() && !mReferencePoint1IsCentroid && !mReferencePoint2IsCentroid ) { @@ -611,7 +611,7 @@ void QgsGradientFillSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolRenderCon } //gradient type - QgsGradientFillSymbolLayerV2::GradientType gradientType = mGradientType; + QgsGradientFillSymbolLayer::GradientType gradientType = mGradientType; if ( hasDataDefinedProperty( QgsSymbolLayer::EXPR_GRADIENT_TYPE ) ) { QString currentType = evaluateDataDefinedProperty( QgsSymbolLayer::EXPR_GRADIENT_TYPE, context, QVariant(), &ok ).toString(); @@ -619,15 +619,15 @@ void QgsGradientFillSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolRenderCon { if ( currentType == QObject::tr( "linear" ) ) { - gradientType = QgsGradientFillSymbolLayerV2::Linear; + gradientType = QgsGradientFillSymbolLayer::Linear; } else if ( currentType == QObject::tr( "radial" ) ) { - gradientType = QgsGradientFillSymbolLayerV2::Radial; + gradientType = QgsGradientFillSymbolLayer::Radial; } else if ( currentType == QObject::tr( "conical" ) ) { - gradientType = QgsGradientFillSymbolLayerV2::Conical; + gradientType = QgsGradientFillSymbolLayer::Conical; } } } @@ -641,11 +641,11 @@ void QgsGradientFillSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolRenderCon { if ( currentCoordMode == QObject::tr( "feature" ) ) { - coordinateMode = QgsGradientFillSymbolLayerV2::Feature; + coordinateMode = QgsGradientFillSymbolLayer::Feature; } else if ( currentCoordMode == QObject::tr( "viewport" ) ) { - coordinateMode = QgsGradientFillSymbolLayerV2::Viewport; + coordinateMode = QgsGradientFillSymbolLayer::Viewport; } } } @@ -659,15 +659,15 @@ void QgsGradientFillSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolRenderCon { if ( currentSpread == QObject::tr( "pad" ) ) { - spread = QgsGradientFillSymbolLayerV2::Pad; + spread = QgsGradientFillSymbolLayer::Pad; } else if ( currentSpread == QObject::tr( "repeat" ) ) { - spread = QgsGradientFillSymbolLayerV2::Repeat; + spread = QgsGradientFillSymbolLayer::Repeat; } else if ( currentSpread == QObject::tr( "reflect" ) ) { - spread = QgsGradientFillSymbolLayerV2::Reflect; + spread = QgsGradientFillSymbolLayer::Reflect; } } } @@ -738,7 +738,7 @@ void QgsGradientFillSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolRenderCon spread, QPointF( refPoint1X, refPoint1Y ), QPointF( refPoint2X, refPoint2Y ), angle ); } -QPointF QgsGradientFillSymbolLayerV2::rotateReferencePoint( QPointF refPoint, double angle ) +QPointF QgsGradientFillSymbolLayer::rotateReferencePoint( QPointF refPoint, double angle ) { //rotate a reference point by a specified angle around the point (0.5, 0.5) @@ -761,9 +761,9 @@ QPointF QgsGradientFillSymbolLayerV2::rotateReferencePoint( QPointF refPoint, do return rotatedReferencePoint; } -void QgsGradientFillSymbolLayerV2::applyGradient( const QgsSymbolRenderContext &context, QBrush &brush, +void QgsGradientFillSymbolLayer::applyGradient( const QgsSymbolRenderContext &context, QBrush &brush, const QColor &color, const QColor &color2, GradientColorType gradientColorType, - QgsVectorColorRampV2 *gradientRamp, GradientType gradientType, + QgsVectorColorRamp *gradientRamp, GradientType gradientType, GradientCoordinateMode coordinateMode, GradientSpread gradientSpread, QPointF referencePoint1, QPointF referencePoint2, const double angle ) { @@ -781,43 +781,43 @@ void QgsGradientFillSymbolLayerV2::applyGradient( const QgsSymbolRenderContext & QGradient gradient; switch ( gradientType ) { - case QgsGradientFillSymbolLayerV2::Linear: + case QgsGradientFillSymbolLayer::Linear: gradient = QLinearGradient( rotatedReferencePoint1, rotatedReferencePoint2 ); break; - case QgsGradientFillSymbolLayerV2::Radial: + case QgsGradientFillSymbolLayer::Radial: gradient = QRadialGradient( rotatedReferencePoint1, QLineF( rotatedReferencePoint1, rotatedReferencePoint2 ).length() ); break; - case QgsGradientFillSymbolLayerV2::Conical: + case QgsGradientFillSymbolLayer::Conical: gradient = QConicalGradient( rotatedReferencePoint1, QLineF( rotatedReferencePoint1, rotatedReferencePoint2 ).angle() ); break; } switch ( coordinateMode ) { - case QgsGradientFillSymbolLayerV2::Feature: + case QgsGradientFillSymbolLayer::Feature: gradient.setCoordinateMode( QGradient::ObjectBoundingMode ); break; - case QgsGradientFillSymbolLayerV2::Viewport: + case QgsGradientFillSymbolLayer::Viewport: gradient.setCoordinateMode( QGradient::StretchToDeviceMode ); break; } switch ( gradientSpread ) { - case QgsGradientFillSymbolLayerV2::Pad: + case QgsGradientFillSymbolLayer::Pad: gradient.setSpread( QGradient::PadSpread ); break; - case QgsGradientFillSymbolLayerV2::Reflect: + case QgsGradientFillSymbolLayer::Reflect: gradient.setSpread( QGradient::ReflectSpread ); break; - case QgsGradientFillSymbolLayerV2::Repeat: + case QgsGradientFillSymbolLayer::Repeat: gradient.setSpread( QGradient::RepeatSpread ); break; } //add stops to gradient - if ( gradientColorType == QgsGradientFillSymbolLayerV2::ColorRamp && gradientRamp && gradientRamp->type() == "gradient" ) + if ( gradientColorType == QgsGradientFillSymbolLayer::ColorRamp && gradientRamp && gradientRamp->type() == "gradient" ) { //color ramp gradient - QgsVectorGradientColorRampV2* gradRamp = static_cast( gradientRamp ); + QgsVectorGradientColorRamp* gradRamp = static_cast( gradientRamp ); gradRamp->addStopsToGradient( &gradient, context.alpha() ); } else @@ -831,7 +831,7 @@ void QgsGradientFillSymbolLayerV2::applyGradient( const QgsSymbolRenderContext & brush = QBrush( gradient ); } -void QgsGradientFillSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) +void QgsGradientFillSymbolLayer::startRender( QgsSymbolRenderContext& context ) { QColor selColor = context.renderContext().selectionColor(); if ( ! selectionIsOpaque ) selColor.setAlphaF( context.alpha() ); @@ -841,12 +841,12 @@ void QgsGradientFillSymbolLayerV2::startRender( QgsSymbolRenderContext& context prepareExpressions( context ); } -void QgsGradientFillSymbolLayerV2::stopRender( QgsSymbolRenderContext& context ) +void QgsGradientFillSymbolLayer::stopRender( QgsSymbolRenderContext& context ) { Q_UNUSED( context ); } -void QgsGradientFillSymbolLayerV2::renderPolygon( const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) +void QgsGradientFillSymbolLayer::renderPolygon( const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) { QPainter* p = context.renderContext().painter(); if ( !p ) @@ -875,7 +875,7 @@ void QgsGradientFillSymbolLayerV2::renderPolygon( const QPolygonF& points, QList } } -QgsStringMap QgsGradientFillSymbolLayerV2::properties() const +QgsStringMap QgsGradientFillSymbolLayer::properties() const { QgsStringMap map; map["color"] = QgsSymbolLayerUtils::encodeColor( mColor ); @@ -900,9 +900,9 @@ QgsStringMap QgsGradientFillSymbolLayerV2::properties() const return map; } -QgsGradientFillSymbolLayerV2* QgsGradientFillSymbolLayerV2::clone() const +QgsGradientFillSymbolLayer* QgsGradientFillSymbolLayer::clone() const { - QgsGradientFillSymbolLayerV2* sl = new QgsGradientFillSymbolLayerV2( mColor, mColor2, mGradientColorType, mGradientType, mCoordinateMode, mGradientSpread ); + QgsGradientFillSymbolLayer* sl = new QgsGradientFillSymbolLayer( mColor, mColor2, mGradientColorType, mGradientType, mCoordinateMode, mGradientSpread ); if ( mGradientRamp ) sl->setColorRamp( mGradientRamp->clone() ); sl->setReferencePoint1( mReferencePoint1 ); @@ -918,35 +918,35 @@ QgsGradientFillSymbolLayerV2* QgsGradientFillSymbolLayerV2::clone() const return sl; } -double QgsGradientFillSymbolLayerV2::estimateMaxBleed() const +double QgsGradientFillSymbolLayer::estimateMaxBleed() const { double offsetBleed = mOffset.x() > mOffset.y() ? mOffset.x() : mOffset.y(); return offsetBleed; } -void QgsGradientFillSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit ) +void QgsGradientFillSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit ) { mOffsetUnit = unit; } -QgsUnitTypes::RenderUnit QgsGradientFillSymbolLayerV2::outputUnit() const +QgsUnitTypes::RenderUnit QgsGradientFillSymbolLayer::outputUnit() const { return mOffsetUnit; } -void QgsGradientFillSymbolLayerV2::setMapUnitScale( const QgsMapUnitScale &scale ) +void QgsGradientFillSymbolLayer::setMapUnitScale( const QgsMapUnitScale &scale ) { mOffsetMapUnitScale = scale; } -QgsMapUnitScale QgsGradientFillSymbolLayerV2::mapUnitScale() const +QgsMapUnitScale QgsGradientFillSymbolLayer::mapUnitScale() const { return mOffsetMapUnitScale; } -//QgsShapeburstFillSymbolLayerV2 +//QgsShapeburstFillSymbolLayer -QgsShapeburstFillSymbolLayerV2::QgsShapeburstFillSymbolLayerV2( const QColor& color, const QColor& color2, ShapeburstColorType colorType, +QgsShapeburstFillSymbolLayer::QgsShapeburstFillSymbolLayer( const QColor& color, const QColor& color2, ShapeburstColorType colorType, int blurRadius, bool useWholeShape, double maxDistance ) : mBlurRadius( blurRadius ) , mUseWholeShape( useWholeShape ) @@ -962,15 +962,15 @@ QgsShapeburstFillSymbolLayerV2::QgsShapeburstFillSymbolLayerV2( const QColor& co mColor = color; } -QgsShapeburstFillSymbolLayerV2::~QgsShapeburstFillSymbolLayerV2() +QgsShapeburstFillSymbolLayer::~QgsShapeburstFillSymbolLayer() { delete mGradientRamp; } -QgsSymbolLayer* QgsShapeburstFillSymbolLayerV2::create( const QgsStringMap& props ) +QgsSymbolLayer* QgsShapeburstFillSymbolLayer::create( const QgsStringMap& props ) { //default to a two-color gradient - ShapeburstColorType colorType = QgsShapeburstFillSymbolLayerV2::SimpleTwoColor; + ShapeburstColorType colorType = QgsShapeburstFillSymbolLayer::SimpleTwoColor; QColor color = DEFAULT_SIMPLEFILL_COLOR, color2 = Qt::white; int blurRadius = 0; bool useWholeShape = true; @@ -1019,10 +1019,10 @@ QgsSymbolLayer* QgsShapeburstFillSymbolLayerV2::create( const QgsStringMap& prop } //attempt to create color ramp from props - QgsVectorColorRampV2* gradientRamp = QgsVectorGradientColorRampV2::create( props ); + QgsVectorColorRamp* gradientRamp = QgsVectorGradientColorRamp::create( props ); //create a new shapeburst fill layer with desired properties - QgsShapeburstFillSymbolLayerV2* sl = new QgsShapeburstFillSymbolLayerV2( color, color2, colorType, blurRadius, useWholeShape, maxDistance ); + QgsShapeburstFillSymbolLayer* sl = new QgsShapeburstFillSymbolLayer( color, color2, colorType, blurRadius, useWholeShape, maxDistance ); sl->setOffset( offset ); if ( props.contains( "offset_unit" ) ) { @@ -1054,18 +1054,18 @@ QgsSymbolLayer* QgsShapeburstFillSymbolLayerV2::create( const QgsStringMap& prop return sl; } -QString QgsShapeburstFillSymbolLayerV2::layerType() const +QString QgsShapeburstFillSymbolLayer::layerType() const { return "ShapeburstFill"; } -void QgsShapeburstFillSymbolLayerV2::setColorRamp( QgsVectorColorRampV2* ramp ) +void QgsShapeburstFillSymbolLayer::setColorRamp( QgsVectorColorRamp* ramp ) { delete mGradientRamp; mGradientRamp = ramp; } -void QgsShapeburstFillSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolRenderContext& context, QColor& color, QColor& color2, int& blurRadius, bool& useWholeShape, +void QgsShapeburstFillSymbolLayer::applyDataDefinedSymbology( QgsSymbolRenderContext& context, QColor& color, QColor& color2, int& blurRadius, bool& useWholeShape, double& maxDistance, bool& ignoreRings ) { bool ok; @@ -1124,7 +1124,7 @@ void QgsShapeburstFillSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolRenderC } -void QgsShapeburstFillSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) +void QgsShapeburstFillSymbolLayer::startRender( QgsSymbolRenderContext& context ) { //TODO - check this QColor selColor = context.renderContext().selectionColor(); @@ -1134,12 +1134,12 @@ void QgsShapeburstFillSymbolLayerV2::startRender( QgsSymbolRenderContext& contex prepareExpressions( context ); } -void QgsShapeburstFillSymbolLayerV2::stopRender( QgsSymbolRenderContext& context ) +void QgsShapeburstFillSymbolLayer::stopRender( QgsSymbolRenderContext& context ) { Q_UNUSED( context ); } -void QgsShapeburstFillSymbolLayerV2::renderPolygon( const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) +void QgsShapeburstFillSymbolLayer::renderPolygon( const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) { QPainter* p = context.renderContext().painter(); if ( !p ) @@ -1184,9 +1184,9 @@ void QgsShapeburstFillSymbolLayerV2::renderPolygon( const QPolygonF& points, QLi } //if we are using the two color mode, create a gradient ramp - if ( mColorType == QgsShapeburstFillSymbolLayerV2::SimpleTwoColor ) + if ( mColorType == QgsShapeburstFillSymbolLayer::SimpleTwoColor ) { - mTwoColorGradientRamp = new QgsVectorGradientColorRampV2( color1, color2 ); + mTwoColorGradientRamp = new QgsVectorGradientColorRamp( color1, color2 ); } //no border for shapeburst fills @@ -1244,12 +1244,12 @@ void QgsShapeburstFillSymbolLayerV2::renderPolygon( const QPolygonF& points, QLi double * dtArray = distanceTransform( fillImage ); //copy distance transform values back to QImage, shading by appropriate color ramp - dtArrayToQImage( dtArray, fillImage, mColorType == QgsShapeburstFillSymbolLayerV2::SimpleTwoColor ? mTwoColorGradientRamp : mGradientRamp, + dtArrayToQImage( dtArray, fillImage, mColorType == QgsShapeburstFillSymbolLayer::SimpleTwoColor ? mTwoColorGradientRamp : mGradientRamp, context.alpha(), useWholeShape, outputPixelMaxDist ); //clean up some variables delete [] dtArray; - if ( mColorType == QgsShapeburstFillSymbolLayerV2::SimpleTwoColor ) + if ( mColorType == QgsShapeburstFillSymbolLayer::SimpleTwoColor ) { delete mTwoColorGradientRamp; } @@ -1295,7 +1295,7 @@ void QgsShapeburstFillSymbolLayerV2::renderPolygon( const QPolygonF& points, QLi //fast distance transform code, adapted from http://cs.brown.edu/~pff/dt/ /* distance transform of a 1d function using squared distance */ -void QgsShapeburstFillSymbolLayerV2::distanceTransform1d( double *f, int n, int *v, double *z, double *d ) +void QgsShapeburstFillSymbolLayer::distanceTransform1d( double *f, int n, int *v, double *z, double *d ) { int k = 0; v[0] = 0; @@ -1325,7 +1325,7 @@ void QgsShapeburstFillSymbolLayerV2::distanceTransform1d( double *f, int n, int } /* distance transform of 2d function using squared distance */ -void QgsShapeburstFillSymbolLayerV2::distanceTransform2d( double * im, int width, int height ) +void QgsShapeburstFillSymbolLayer::distanceTransform2d( double * im, int width, int height ) { int maxDimension = qMax( width, height ); double *f = new double[ maxDimension ]; @@ -1368,7 +1368,7 @@ void QgsShapeburstFillSymbolLayerV2::distanceTransform2d( double * im, int width } /* distance transform of a binary QImage */ -double * QgsShapeburstFillSymbolLayerV2::distanceTransform( QImage *im ) +double * QgsShapeburstFillSymbolLayer::distanceTransform( QImage *im ) { int width = im->width(); int height = im->height(); @@ -1404,7 +1404,7 @@ double * QgsShapeburstFillSymbolLayerV2::distanceTransform( QImage *im ) return dtArray; } -void QgsShapeburstFillSymbolLayerV2::dtArrayToQImage( double * array, QImage *im, QgsVectorColorRampV2* ramp, double layerAlpha, bool useWholeShape, int maxPixelDistance ) +void QgsShapeburstFillSymbolLayer::dtArrayToQImage( double * array, QImage *im, QgsVectorColorRamp* ramp, double layerAlpha, bool useWholeShape, int maxPixelDistance ) { int width = im->width(); int height = im->height(); @@ -1476,7 +1476,7 @@ void QgsShapeburstFillSymbolLayerV2::dtArrayToQImage( double * array, QImage *im } } -QgsStringMap QgsShapeburstFillSymbolLayerV2::properties() const +QgsStringMap QgsShapeburstFillSymbolLayer::properties() const { QgsStringMap map; map["color"] = QgsSymbolLayerUtils::encodeColor( mColor ); @@ -1502,9 +1502,9 @@ QgsStringMap QgsShapeburstFillSymbolLayerV2::properties() const return map; } -QgsShapeburstFillSymbolLayerV2* QgsShapeburstFillSymbolLayerV2::clone() const +QgsShapeburstFillSymbolLayer* QgsShapeburstFillSymbolLayer::clone() const { - QgsShapeburstFillSymbolLayerV2* sl = new QgsShapeburstFillSymbolLayerV2( mColor, mColor2, mColorType, mBlurRadius, mUseWholeShape, mMaxDistance ); + QgsShapeburstFillSymbolLayer* sl = new QgsShapeburstFillSymbolLayer( mColor, mColor2, mColorType, mBlurRadius, mUseWholeShape, mMaxDistance ); if ( mGradientRamp ) { sl->setColorRamp( mGradientRamp->clone() ); @@ -1520,19 +1520,19 @@ QgsShapeburstFillSymbolLayerV2* QgsShapeburstFillSymbolLayerV2::clone() const return sl; } -double QgsShapeburstFillSymbolLayerV2::estimateMaxBleed() const +double QgsShapeburstFillSymbolLayer::estimateMaxBleed() const { double offsetBleed = qMax( mOffset.x(), mOffset.y() ); return offsetBleed; } -void QgsShapeburstFillSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit ) +void QgsShapeburstFillSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit ) { mDistanceUnit = unit; mOffsetUnit = unit; } -QgsUnitTypes::RenderUnit QgsShapeburstFillSymbolLayerV2::outputUnit() const +QgsUnitTypes::RenderUnit QgsShapeburstFillSymbolLayer::outputUnit() const { if ( mDistanceUnit == mOffsetUnit ) { @@ -1541,13 +1541,13 @@ QgsUnitTypes::RenderUnit QgsShapeburstFillSymbolLayerV2::outputUnit() const return QgsUnitTypes::RenderUnknownUnit; } -void QgsShapeburstFillSymbolLayerV2::setMapUnitScale( const QgsMapUnitScale &scale ) +void QgsShapeburstFillSymbolLayer::setMapUnitScale( const QgsMapUnitScale &scale ) { mDistanceMapUnitScale = scale; mOffsetMapUnitScale = scale; } -QgsMapUnitScale QgsShapeburstFillSymbolLayerV2::mapUnitScale() const +QgsMapUnitScale QgsShapeburstFillSymbolLayer::mapUnitScale() const { if ( mDistanceMapUnitScale == mOffsetMapUnitScale ) { @@ -1565,7 +1565,7 @@ QgsImageFillSymbolLayer::QgsImageFillSymbolLayer() , mOutlineWidthUnit( QgsUnitTypes::RenderMillimeters ) , mOutline( nullptr ) { - setSubSymbol( new QgsLineSymbolV2() ); + setSubSymbol( new QgsLineSymbol() ); } QgsImageFillSymbolLayer::~QgsImageFillSymbolLayer() @@ -1644,7 +1644,7 @@ bool QgsImageFillSymbolLayer::setSubSymbol( QgsSymbol* symbol ) return false; } - QgsLineSymbolV2* lineSymbol = dynamic_cast( symbol ); + QgsLineSymbol* lineSymbol = dynamic_cast( symbol ); if ( lineSymbol ) { delete mOutline; @@ -1724,7 +1724,7 @@ Qt::PenStyle QgsImageFillSymbolLayer::dxfPenStyle() const QSet QgsImageFillSymbolLayer::usedAttributes() const { - QSet attr = QgsFillSymbolLayerV2::usedAttributes(); + QSet attr = QgsFillSymbolLayer::usedAttributes(); if ( mOutline ) attr.unite( mOutline->usedAttributes() ); return attr; @@ -1762,7 +1762,7 @@ QgsSVGFillSymbolLayer::QgsSVGFillSymbolLayer( const QByteArray& svgData, double mColor = QColor( 255, 255, 255 ); mSvgOutlineColor = QColor( 0, 0, 0 ); mSvgOutlineWidth = 0.2; - setSubSymbol( new QgsLineSymbolV2() ); + setSubSymbol( new QgsLineSymbol() ); setDefaultSvgParams(); mSvgPattern = nullptr; } @@ -2178,7 +2178,7 @@ QgsSymbolLayer* QgsSVGFillSymbolLayer::createFromSld( QDomElement &element ) { QgsSymbolLayerList layers; layers.append( l ); - sl->setSubSymbol( new QgsLineSymbolV2( layers ) ); + sl->setSubSymbol( new QgsLineSymbol( layers ) ); } } @@ -2315,7 +2315,7 @@ QgsLinePatternFillSymbolLayer::QgsLinePatternFillSymbolLayer() , mOffsetUnit( QgsUnitTypes::RenderMillimeters ) , mFillLineSymbol( nullptr ) { - setSubSymbol( new QgsLineSymbolV2() ); + setSubSymbol( new QgsLineSymbol() ); QgsImageFillSymbolLayer::setSubSymbol( nullptr ); //no outline } @@ -2350,7 +2350,7 @@ bool QgsLinePatternFillSymbolLayer::setSubSymbol( QgsSymbol* symbol ) if ( symbol->type() == QgsSymbol::Line ) { - QgsLineSymbolV2* lineSymbol = dynamic_cast( symbol ); + QgsLineSymbol* lineSymbol = dynamic_cast( symbol ); if ( lineSymbol ) { delete mFillLineSymbol; @@ -2542,7 +2542,7 @@ void QgsLinePatternFillSymbolLayer::applyPattern( const QgsSymbolRenderContext& return; } // We have to make a copy because marker intervals will have to be adjusted - QgsLineSymbolV2* fillLineSymbol = mFillLineSymbol->clone(); + QgsLineSymbol* fillLineSymbol = mFillLineSymbol->clone(); if ( !fillLineSymbol ) { return; @@ -2563,14 +2563,14 @@ void QgsLinePatternFillSymbolLayer::applyPattern( const QgsSymbolRenderContext& double layerBleed = layer->estimateMaxBleed(); // TODO: to get real bleed we have to scale it using context and units, // unfortunately estimateMaxBleed() ignore units completely, e.g. - // QgsMarkerLineSymbolLayerV2::estimateMaxBleed() is mixing marker size and + // QgsMarkerLineSymbolLayer::estimateMaxBleed() is mixing marker size and // offset regardless units. This has to be fixed especially // in estimateMaxBleed(), context probably has to be used. // For now, we only support millimeters double outputPixelLayerBleed = layerBleed * QgsSymbolLayerUtils::pixelSizeScaleFactor( ctx, QgsUnitTypes::RenderMillimeters ); outputPixelBleed = qMax( outputPixelBleed, outputPixelLayerBleed ); - QgsMarkerLineSymbolLayerV2 *markerLineLayer = dynamic_cast( layer ); + QgsMarkerLineSymbolLayer *markerLineLayer = dynamic_cast( layer ); if ( markerLineLayer ) { double outputPixelLayerInterval = markerLineLayer->interval() * QgsSymbolLayerUtils::pixelSizeScaleFactor( ctx, markerLineLayer->intervalUnit(), markerLineLayer->intervalMapUnitScale() ); @@ -2595,7 +2595,7 @@ void QgsLinePatternFillSymbolLayer::applyPattern( const QgsSymbolRenderContext& { QgsSymbolLayer *layer = fillLineSymbol->symbolLayer( i ); - QgsMarkerLineSymbolLayerV2 *markerLineLayer = dynamic_cast( layer ); + QgsMarkerLineSymbolLayer *markerLineLayer = dynamic_cast( layer ); if ( markerLineLayer ) { markerLineLayer->setInterval( intervalScale * markerLineLayer->interval() ); @@ -3022,7 +3022,7 @@ QgsSymbolLayer* QgsLinePatternFillSymbolLayer::createFromSld( QDomElement &eleme { QgsSymbolLayerList layers; layers.append( l ); - sl->setSubSymbol( new QgsLineSymbolV2( layers ) ); + sl->setSubSymbol( new QgsLineSymbol( layers ) ); } } @@ -3048,7 +3048,7 @@ QgsPointPatternFillSymbolLayer::QgsPointPatternFillSymbolLayer() mDistanceY = 15; mDisplacementX = 0; mDisplacementY = 0; - setSubSymbol( new QgsMarkerSymbolV2() ); + setSubSymbol( new QgsMarkerSymbol() ); QgsImageFillSymbolLayer::setSubSymbol( nullptr ); //no outline } @@ -3311,7 +3311,7 @@ void QgsPointPatternFillSymbolLayer::toSld( QDomDocument &doc, QDomElement &elem symbolizerElem.appendChild( distanceElem ); QgsSymbolLayer *layer = mMarkerSymbol->symbolLayer( i ); - QgsMarkerSymbolLayerV2 *markerLayer = static_cast( layer ); + QgsMarkerSymbolLayer *markerLayer = static_cast( layer ); if ( !markerLayer ) { QString errorMsg = QString( "MarkerSymbolLayerV2 expected, %1 found. Skip it." ).arg( layer->layerType() ); @@ -3339,7 +3339,7 @@ bool QgsPointPatternFillSymbolLayer::setSubSymbol( QgsSymbol* symbol ) if ( symbol->type() == QgsSymbol::Marker ) { - QgsMarkerSymbolV2* markerSymbol = static_cast( symbol ); + QgsMarkerSymbol* markerSymbol = static_cast( symbol ); delete mMarkerSymbol; mMarkerSymbol = markerSymbol; } @@ -3412,24 +3412,24 @@ QColor QgsPointPatternFillSymbolLayer::color() const ////////////// -QgsCentroidFillSymbolLayerV2::QgsCentroidFillSymbolLayerV2() +QgsCentroidFillSymbolLayer::QgsCentroidFillSymbolLayer() : mMarker( nullptr ) , mPointOnSurface( false ) , mPointOnAllParts( true ) , mCurrentFeatureId( -1 ) , mBiggestPartIndex( -1 ) { - setSubSymbol( new QgsMarkerSymbolV2() ); + setSubSymbol( new QgsMarkerSymbol() ); } -QgsCentroidFillSymbolLayerV2::~QgsCentroidFillSymbolLayerV2() +QgsCentroidFillSymbolLayer::~QgsCentroidFillSymbolLayer() { delete mMarker; } -QgsSymbolLayer* QgsCentroidFillSymbolLayerV2::create( const QgsStringMap& properties ) +QgsSymbolLayer* QgsCentroidFillSymbolLayer::create( const QgsStringMap& properties ) { - QgsCentroidFillSymbolLayerV2* sl = new QgsCentroidFillSymbolLayerV2(); + QgsCentroidFillSymbolLayer* sl = new QgsCentroidFillSymbolLayer(); if ( properties.contains( "point_on_surface" ) ) sl->setPointOnSurface( properties["point_on_surface"].toInt() != 0 ); @@ -3439,23 +3439,23 @@ QgsSymbolLayer* QgsCentroidFillSymbolLayerV2::create( const QgsStringMap& proper return sl; } -QString QgsCentroidFillSymbolLayerV2::layerType() const +QString QgsCentroidFillSymbolLayer::layerType() const { return "CentroidFill"; } -void QgsCentroidFillSymbolLayerV2::setColor( const QColor& color ) +void QgsCentroidFillSymbolLayer::setColor( const QColor& color ) { mMarker->setColor( color ); mColor = color; } -QColor QgsCentroidFillSymbolLayerV2::color() const +QColor QgsCentroidFillSymbolLayer::color() const { return mMarker ? mMarker->color() : mColor; } -void QgsCentroidFillSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) +void QgsCentroidFillSymbolLayer::startRender( QgsSymbolRenderContext& context ) { mMarker->setAlpha( context.alpha() ); mMarker->startRender( context.renderContext(), context.fields() ); @@ -3464,12 +3464,12 @@ void QgsCentroidFillSymbolLayerV2::startRender( QgsSymbolRenderContext& context mBiggestPartIndex = 0; } -void QgsCentroidFillSymbolLayerV2::stopRender( QgsSymbolRenderContext& context ) +void QgsCentroidFillSymbolLayer::stopRender( QgsSymbolRenderContext& context ) { mMarker->stopRender( context.renderContext() ); } -void QgsCentroidFillSymbolLayerV2::renderPolygon( const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) +void QgsCentroidFillSymbolLayer::renderPolygon( const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) { Q_UNUSED( rings ); @@ -3486,7 +3486,7 @@ void QgsCentroidFillSymbolLayerV2::renderPolygon( const QPolygonF& points, QList if ( context.geometryPartCount() > 1 ) { QgsGeometry geom = feature->geometry(); - const QgsGeometryCollectionV2* geomCollection = static_cast( geom.geometry() ); + const QgsGeometryCollection* geomCollection = static_cast( geom.geometry() ); double area = 0; double areaBiggest = 0; @@ -3513,7 +3513,7 @@ void QgsCentroidFillSymbolLayerV2::renderPolygon( const QPolygonF& points, QList } } -QgsStringMap QgsCentroidFillSymbolLayerV2::properties() const +QgsStringMap QgsCentroidFillSymbolLayer::properties() const { QgsStringMap map; map["point_on_surface"] = QString::number( mPointOnSurface ); @@ -3521,9 +3521,9 @@ QgsStringMap QgsCentroidFillSymbolLayerV2::properties() const return map; } -QgsCentroidFillSymbolLayerV2* QgsCentroidFillSymbolLayerV2::clone() const +QgsCentroidFillSymbolLayer* QgsCentroidFillSymbolLayer::clone() const { - QgsCentroidFillSymbolLayerV2* x = new QgsCentroidFillSymbolLayerV2(); + QgsCentroidFillSymbolLayer* x = new QgsCentroidFillSymbolLayer(); x->mAngle = mAngle; x->mColor = mColor; x->setSubSymbol( mMarker->clone() ); @@ -3533,7 +3533,7 @@ QgsCentroidFillSymbolLayerV2* QgsCentroidFillSymbolLayerV2::clone() const return x; } -void QgsCentroidFillSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const +void QgsCentroidFillSymbolLayer::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const { // SLD 1.0 specs says: "if a line, polygon, or raster geometry is // used with PointSymbolizer, then the semantic is to use the centroid @@ -3541,7 +3541,7 @@ void QgsCentroidFillSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &elemen mMarker->toSld( doc, element, props ); } -QgsSymbolLayer* QgsCentroidFillSymbolLayerV2::createFromSld( QDomElement &element ) +QgsSymbolLayer* QgsCentroidFillSymbolLayer::createFromSld( QDomElement &element ) { QgsDebugMsg( "Entered." ); @@ -3551,20 +3551,20 @@ QgsSymbolLayer* QgsCentroidFillSymbolLayerV2::createFromSld( QDomElement &elemen QgsSymbolLayerList layers; layers.append( l ); - QgsMarkerSymbolV2 *marker = new QgsMarkerSymbolV2( layers ); + QgsMarkerSymbol *marker = new QgsMarkerSymbol( layers ); - QgsCentroidFillSymbolLayerV2* sl = new QgsCentroidFillSymbolLayerV2(); + QgsCentroidFillSymbolLayer* sl = new QgsCentroidFillSymbolLayer(); sl->setSubSymbol( marker ); return sl; } -QgsSymbol* QgsCentroidFillSymbolLayerV2::subSymbol() +QgsSymbol* QgsCentroidFillSymbolLayer::subSymbol() { return mMarker; } -bool QgsCentroidFillSymbolLayerV2::setSubSymbol( QgsSymbol* symbol ) +bool QgsCentroidFillSymbolLayer::setSubSymbol( QgsSymbol* symbol ) { if ( !symbol || symbol->type() != QgsSymbol::Marker ) { @@ -3573,14 +3573,14 @@ bool QgsCentroidFillSymbolLayerV2::setSubSymbol( QgsSymbol* symbol ) } delete mMarker; - mMarker = static_cast( symbol ); + mMarker = static_cast( symbol ); mColor = mMarker->color(); return true; } -QSet QgsCentroidFillSymbolLayerV2::usedAttributes() const +QSet QgsCentroidFillSymbolLayer::usedAttributes() const { - QSet attributes = QgsFillSymbolLayerV2::usedAttributes(); + QSet attributes = QgsFillSymbolLayer::usedAttributes(); if ( mMarker ) attributes.unite( mMarker->usedAttributes() ); @@ -3588,7 +3588,7 @@ QSet QgsCentroidFillSymbolLayerV2::usedAttributes() const return attributes; } -void QgsCentroidFillSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit ) +void QgsCentroidFillSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit ) { if ( mMarker ) { @@ -3596,7 +3596,7 @@ void QgsCentroidFillSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit } } -QgsUnitTypes::RenderUnit QgsCentroidFillSymbolLayerV2::outputUnit() const +QgsUnitTypes::RenderUnit QgsCentroidFillSymbolLayer::outputUnit() const { if ( mMarker ) { @@ -3605,7 +3605,7 @@ QgsUnitTypes::RenderUnit QgsCentroidFillSymbolLayerV2::outputUnit() const return QgsUnitTypes::RenderUnknownUnit; //mOutputUnit; } -void QgsCentroidFillSymbolLayerV2::setMapUnitScale( const QgsMapUnitScale &scale ) +void QgsCentroidFillSymbolLayer::setMapUnitScale( const QgsMapUnitScale &scale ) { if ( mMarker ) { @@ -3613,7 +3613,7 @@ void QgsCentroidFillSymbolLayerV2::setMapUnitScale( const QgsMapUnitScale &scale } } -QgsMapUnitScale QgsCentroidFillSymbolLayerV2::mapUnitScale() const +QgsMapUnitScale QgsCentroidFillSymbolLayer::mapUnitScale() const { if ( mMarker ) { diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.h b/src/core/symbology-ng/qgsfillsymbollayer.h similarity index 93% rename from src/core/symbology-ng/qgsfillsymbollayerv2.h rename to src/core/symbology-ng/qgsfillsymbollayer.h index 7d11e8a8139..f735c900ebf 100644 --- a/src/core/symbology-ng/qgsfillsymbollayerv2.h +++ b/src/core/symbology-ng/qgsfillsymbollayer.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsfillsymbollayerv2.h + qgsfillsymbollayer.h --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -31,18 +31,18 @@ #include /** \ingroup core - * \class QgsSimpleFillSymbolLayerV2 + * \class QgsSimpleFillSymbolLayer */ -class CORE_EXPORT QgsSimpleFillSymbolLayerV2 : public QgsFillSymbolLayerV2 +class CORE_EXPORT QgsSimpleFillSymbolLayer : public QgsFillSymbolLayer { public: - QgsSimpleFillSymbolLayerV2( const QColor& color = DEFAULT_SIMPLEFILL_COLOR, - Qt::BrushStyle style = DEFAULT_SIMPLEFILL_STYLE, - const QColor& borderColor = DEFAULT_SIMPLEFILL_BORDERCOLOR, - Qt::PenStyle borderStyle = DEFAULT_SIMPLEFILL_BORDERSTYLE, - double borderWidth = DEFAULT_SIMPLEFILL_BORDERWIDTH, - Qt::PenJoinStyle penJoinStyle = DEFAULT_SIMPLEFILL_JOINSTYLE - ); + 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, + double borderWidth = DEFAULT_SIMPLEFILL_BORDERWIDTH, + Qt::PenJoinStyle penJoinStyle = DEFAULT_SIMPLEFILL_JOINSTYLE + ); // static stuff @@ -61,7 +61,7 @@ class CORE_EXPORT QgsSimpleFillSymbolLayerV2 : public QgsFillSymbolLayerV2 QgsStringMap properties() const override; - QgsSimpleFillSymbolLayerV2* clone() const override; + QgsSimpleFillSymbolLayer* clone() const override; void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const override; @@ -165,12 +165,12 @@ class CORE_EXPORT QgsSimpleFillSymbolLayerV2 : public QgsFillSymbolLayerV2 void applyDataDefinedSymbology( QgsSymbolRenderContext& context, QBrush& brush, QPen& pen, QPen& selPen ); }; -class QgsVectorColorRampV2; +class QgsVectorColorRamp; /** \ingroup core - * \class QgsGradientFillSymbolLayerV2 + * \class QgsGradientFillSymbolLayer */ -class CORE_EXPORT QgsGradientFillSymbolLayerV2 : public QgsFillSymbolLayerV2 +class CORE_EXPORT QgsGradientFillSymbolLayer : public QgsFillSymbolLayer { public: @@ -200,15 +200,15 @@ class CORE_EXPORT QgsGradientFillSymbolLayerV2 : public QgsFillSymbolLayerV2 Repeat }; - QgsGradientFillSymbolLayerV2( const QColor& color = DEFAULT_SIMPLEFILL_COLOR, - const QColor& color2 = Qt::white, - GradientColorType gradientColorType = SimpleTwoColor, - GradientType gradientType = Linear, - GradientCoordinateMode coordinateMode = Feature, - GradientSpread gradientSpread = Pad - ); + QgsGradientFillSymbolLayer( const QColor& color = DEFAULT_SIMPLEFILL_COLOR, + const QColor& color2 = Qt::white, + GradientColorType gradientColorType = SimpleTwoColor, + GradientType gradientType = Linear, + GradientCoordinateMode coordinateMode = Feature, + GradientSpread gradientSpread = Pad + ); - virtual ~QgsGradientFillSymbolLayerV2(); + virtual ~QgsGradientFillSymbolLayer(); // static stuff @@ -226,7 +226,7 @@ class CORE_EXPORT QgsGradientFillSymbolLayerV2 : public QgsFillSymbolLayerV2 QgsStringMap properties() const override; - QgsGradientFillSymbolLayerV2* clone() const override; + QgsGradientFillSymbolLayer* clone() const override; double estimateMaxBleed() const override; @@ -239,8 +239,8 @@ class CORE_EXPORT QgsGradientFillSymbolLayerV2 : public QgsFillSymbolLayerV2 void setGradientColorType( GradientColorType gradientColorType ) { mGradientColorType = gradientColorType; } /** Color ramp used for the gradient fill, only used if the gradient color type is set to ColorRamp*/ - QgsVectorColorRampV2* colorRamp() { return mGradientRamp; } - void setColorRamp( QgsVectorColorRampV2* ramp ); + QgsVectorColorRamp* colorRamp() { return mGradientRamp; } + void setColorRamp( QgsVectorColorRamp* ramp ); /** Color for endpoint of gradient, only used if the gradient color type is set to SimpleTwoColor*/ QColor color2() const { return mColor2; } @@ -293,7 +293,7 @@ class CORE_EXPORT QgsGradientFillSymbolLayerV2 : public QgsFillSymbolLayerV2 GradientColorType mGradientColorType; QColor mColor2; - QgsVectorColorRampV2* mGradientRamp; + QgsVectorColorRamp* mGradientRamp; GradientType mGradientType; GradientCoordinateMode mCoordinateMode; GradientSpread mGradientSpread; @@ -314,7 +314,7 @@ class CORE_EXPORT QgsGradientFillSymbolLayerV2 : public QgsFillSymbolLayerV2 /** Applies the gradient to a brush*/ void applyGradient( const QgsSymbolRenderContext& context, QBrush& brush, const QColor& color, const QColor& color2, - GradientColorType gradientColorType, QgsVectorColorRampV2 *gradientRamp, GradientType gradientType, + GradientColorType gradientColorType, QgsVectorColorRamp *gradientRamp, GradientType gradientType, GradientCoordinateMode coordinateMode, GradientSpread gradientSpread, QPointF referencePoint1, QPointF referencePoint2, const double angle ); @@ -323,9 +323,9 @@ class CORE_EXPORT QgsGradientFillSymbolLayerV2 : public QgsFillSymbolLayerV2 }; /** \ingroup core - * \class QgsShapeburstFillSymbolLayerV2 + * \class QgsShapeburstFillSymbolLayer */ -class CORE_EXPORT QgsShapeburstFillSymbolLayerV2 : public QgsFillSymbolLayerV2 +class CORE_EXPORT QgsShapeburstFillSymbolLayer : public QgsFillSymbolLayer { public: @@ -335,11 +335,11 @@ class CORE_EXPORT QgsShapeburstFillSymbolLayerV2 : public QgsFillSymbolLayerV2 ColorRamp }; - QgsShapeburstFillSymbolLayerV2( const QColor& color = DEFAULT_SIMPLEFILL_COLOR, const QColor& color2 = Qt::white, - ShapeburstColorType colorType = SimpleTwoColor, - int blurRadius = 0, bool useWholeShape = true, double maxDistance = 5 ); + 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 @@ -357,7 +357,7 @@ class CORE_EXPORT QgsShapeburstFillSymbolLayerV2 : public QgsFillSymbolLayerV2 QgsStringMap properties() const override; - QgsShapeburstFillSymbolLayerV2* clone() const override; + QgsShapeburstFillSymbolLayer* clone() const override; double estimateMaxBleed() const override; @@ -425,7 +425,7 @@ class CORE_EXPORT QgsShapeburstFillSymbolLayerV2 : public QgsFillSymbolLayerV2 void setDistanceMapUnitScale( const QgsMapUnitScale& scale ) { mDistanceMapUnitScale = scale; } const QgsMapUnitScale& distanceMapUnitScale() const { return mDistanceMapUnitScale; } - /** 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 @@ -435,7 +435,7 @@ class CORE_EXPORT QgsShapeburstFillSymbolLayerV2 : public QgsFillSymbolLayerV2 * @see setColorRamp */ void setColorType( ShapeburstColorType colorType ) { mColorType = 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 @@ -452,14 +452,14 @@ class CORE_EXPORT QgsShapeburstFillSymbolLayerV2 : public 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() { return mGradientRamp; } + QgsVectorColorRamp* colorRamp() { return mGradientRamp; } /** 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 @@ -542,8 +542,8 @@ class CORE_EXPORT QgsShapeburstFillSymbolLayerV2 : public QgsFillSymbolLayerV2 ShapeburstColorType mColorType; QColor mColor2; - QgsVectorColorRampV2* mGradientRamp; - QgsVectorColorRampV2* mTwoColorGradientRamp; + QgsVectorColorRamp* mGradientRamp; + QgsVectorColorRamp* mTwoColorGradientRamp; bool mIgnoreRings; @@ -565,12 +565,12 @@ class CORE_EXPORT QgsShapeburstFillSymbolLayerV2 : public QgsFillSymbolLayerV2 double * distanceTransform( QImage * im ); /* fills a QImage with values from an array of doubles containing squared distance transform values */ - void dtArrayToQImage( double * array, QImage *im, QgsVectorColorRampV2* ramp, double layerAlpha = 1, bool useWholeShape = true, int maxPixelDistance = 0 ); + void dtArrayToQImage( double * array, QImage *im, QgsVectorColorRamp* ramp, double layerAlpha = 1, bool useWholeShape = true, int maxPixelDistance = 0 ); }; /** \ingroup core * Base class for polygon renderers generating texture images*/ -class CORE_EXPORT QgsImageFillSymbolLayer: public QgsFillSymbolLayerV2 +class CORE_EXPORT QgsImageFillSymbolLayer: public QgsFillSymbolLayer { public: @@ -620,7 +620,7 @@ class CORE_EXPORT QgsImageFillSymbolLayer: public QgsFillSymbolLayerV2 QgsMapUnitScale mOutlineWidthMapUnitScale; /** Custom outline*/ - QgsLineSymbolV2* mOutline; + QgsLineSymbol* mOutline; virtual void applyDataDefinedSettings( QgsSymbolRenderContext& context ) { Q_UNUSED( context ); } }; @@ -1048,7 +1048,7 @@ class CORE_EXPORT QgsLinePatternFillSymbolLayer: public QgsImageFillSymbolLayer void applyPattern( const QgsSymbolRenderContext& context, QBrush& brush, double lineAngle, double distance, double lineWidth, const QColor& color ); /** Fill line*/ - QgsLineSymbolV2* mFillLineSymbol; + QgsLineSymbol* mFillLineSymbol; }; /** \ingroup core @@ -1168,7 +1168,7 @@ class CORE_EXPORT QgsPointPatternFillSymbolLayer: public QgsImageFillSymbolLayer virtual QColor color() const override; protected: - QgsMarkerSymbolV2* mMarkerSymbol; + QgsMarkerSymbol* mMarkerSymbol; double mDistanceX; QgsUnitTypes::RenderUnit mDistanceXUnit; QgsMapUnitScale mDistanceXMapUnitScale; @@ -1190,13 +1190,13 @@ class CORE_EXPORT QgsPointPatternFillSymbolLayer: public QgsImageFillSymbolLayer }; /** \ingroup core - * \class QgsCentroidFillSymbolLayerV2 + * \class QgsCentroidFillSymbolLayer */ -class CORE_EXPORT QgsCentroidFillSymbolLayerV2 : public QgsFillSymbolLayerV2 +class CORE_EXPORT QgsCentroidFillSymbolLayer : public QgsFillSymbolLayer { public: - QgsCentroidFillSymbolLayerV2(); - ~QgsCentroidFillSymbolLayerV2(); + QgsCentroidFillSymbolLayer(); + ~QgsCentroidFillSymbolLayer(); // static stuff @@ -1215,7 +1215,7 @@ class CORE_EXPORT QgsCentroidFillSymbolLayerV2 : public QgsFillSymbolLayerV2 QgsStringMap properties() const override; - QgsCentroidFillSymbolLayerV2* clone() const override; + QgsCentroidFillSymbolLayer* clone() const override; void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const override; @@ -1244,7 +1244,7 @@ class CORE_EXPORT QgsCentroidFillSymbolLayerV2 : public QgsFillSymbolLayerV2 bool pointOnAllParts() const { return mPointOnAllParts; } protected: - QgsMarkerSymbolV2* mMarker; + QgsMarkerSymbol* mMarker; bool mPointOnSurface; bool mPointOnAllParts; diff --git a/src/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.cpp b/src/core/symbology-ng/qgsgeometrygeneratorsymbollayer.cpp similarity index 63% rename from src/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.cpp rename to src/core/symbology-ng/qgsgeometrygeneratorsymbollayer.cpp index 749a12630fc..307f515a6b8 100644 --- a/src/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.cpp +++ b/src/core/symbology-ng/qgsgeometrygeneratorsymbollayer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsgeometrygeneratorsymbollayerv2.cpp + qgsgeometrygeneratorsymbollayer.cpp --------------------- begin : November 2015 copyright : (C) 2015 by Matthias Kuhn @@ -13,42 +13,42 @@ * * ***************************************************************************/ -#include "qgsgeometrygeneratorsymbollayerv2.h" +#include "qgsgeometrygeneratorsymbollayer.h" #include "qgsgeometry.h" -QgsGeometryGeneratorSymbolLayerV2::~QgsGeometryGeneratorSymbolLayerV2() +QgsGeometryGeneratorSymbolLayer::~QgsGeometryGeneratorSymbolLayer() { delete mMarkerSymbol; delete mLineSymbol; delete mFillSymbol; } -QgsSymbolLayer* QgsGeometryGeneratorSymbolLayerV2::create( const QgsStringMap& properties ) +QgsSymbolLayer* QgsGeometryGeneratorSymbolLayer::create( const QgsStringMap& properties ) { QString expression = properties.value( "geometryModifier" ); if ( expression.isEmpty() ) { expression = "$geometry"; } - QgsGeometryGeneratorSymbolLayerV2* symbolLayer = new QgsGeometryGeneratorSymbolLayerV2( expression ); + QgsGeometryGeneratorSymbolLayer* symbolLayer = new QgsGeometryGeneratorSymbolLayer( expression ); if ( properties.value( "SymbolType" ) == "Marker" ) { - symbolLayer->setSubSymbol( QgsMarkerSymbolV2::createSimple( properties ) ); + symbolLayer->setSubSymbol( QgsMarkerSymbol::createSimple( properties ) ); } else if ( properties.value( "SymbolType" ) == "Line" ) { - symbolLayer->setSubSymbol( QgsLineSymbolV2::createSimple( properties ) ); + symbolLayer->setSubSymbol( QgsLineSymbol::createSimple( properties ) ); } else { - symbolLayer->setSubSymbol( QgsFillSymbolV2::createSimple( properties ) ); + symbolLayer->setSubSymbol( QgsFillSymbol::createSimple( properties ) ); } return symbolLayer; } -QgsGeometryGeneratorSymbolLayerV2::QgsGeometryGeneratorSymbolLayerV2( const QString& expression ) +QgsGeometryGeneratorSymbolLayer::QgsGeometryGeneratorSymbolLayer( const QString& expression ) : QgsSymbolLayer( QgsSymbol::Hybrid ) , mExpression( new QgsExpression( expression ) ) , mFillSymbol( nullptr ) @@ -60,29 +60,29 @@ QgsGeometryGeneratorSymbolLayerV2::QgsGeometryGeneratorSymbolLayerV2( const QStr } -QString QgsGeometryGeneratorSymbolLayerV2::layerType() const +QString QgsGeometryGeneratorSymbolLayer::layerType() const { return "GeometryGenerator"; } -void QgsGeometryGeneratorSymbolLayerV2::setSymbolType( QgsSymbol::SymbolType symbolType ) +void QgsGeometryGeneratorSymbolLayer::setSymbolType( QgsSymbol::SymbolType symbolType ) { if ( symbolType == QgsSymbol::Fill ) { if ( !mFillSymbol ) - mFillSymbol = QgsFillSymbolV2::createSimple( QgsStringMap() ); + mFillSymbol = QgsFillSymbol::createSimple( QgsStringMap() ); mSymbol = mFillSymbol; } else if ( symbolType == QgsSymbol::Line ) { if ( !mLineSymbol ) - mLineSymbol = QgsLineSymbolV2::createSimple( QgsStringMap() ); + mLineSymbol = QgsLineSymbol::createSimple( QgsStringMap() ); mSymbol = mLineSymbol; } else if ( symbolType == QgsSymbol::Marker ) { if ( !mMarkerSymbol ) - mMarkerSymbol = QgsMarkerSymbolV2::createSimple( QgsStringMap() ); + mMarkerSymbol = QgsMarkerSymbol::createSimple( QgsStringMap() ); mSymbol = mMarkerSymbol; } else @@ -91,22 +91,22 @@ void QgsGeometryGeneratorSymbolLayerV2::setSymbolType( QgsSymbol::SymbolType sym mSymbolType = symbolType; } -void QgsGeometryGeneratorSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) +void QgsGeometryGeneratorSymbolLayer::startRender( QgsSymbolRenderContext& context ) { mExpression->prepare( &context.renderContext().expressionContext() ); subSymbol()->startRender( context.renderContext() ); } -void QgsGeometryGeneratorSymbolLayerV2::stopRender( QgsSymbolRenderContext& context ) +void QgsGeometryGeneratorSymbolLayer::stopRender( QgsSymbolRenderContext& context ) { if ( mSymbol ) mSymbol->stopRender( context.renderContext() ); } -QgsSymbolLayer* QgsGeometryGeneratorSymbolLayerV2::clone() const +QgsSymbolLayer* QgsGeometryGeneratorSymbolLayer::clone() const { - QgsGeometryGeneratorSymbolLayerV2* clone = new QgsGeometryGeneratorSymbolLayerV2( mExpression->expression() ); + QgsGeometryGeneratorSymbolLayer* clone = new QgsGeometryGeneratorSymbolLayer( mExpression->expression() ); if ( mFillSymbol ) clone->mFillSymbol = mFillSymbol->clone(); @@ -120,7 +120,7 @@ QgsSymbolLayer* QgsGeometryGeneratorSymbolLayerV2::clone() const return clone; } -QgsStringMap QgsGeometryGeneratorSymbolLayerV2::properties() const +QgsStringMap QgsGeometryGeneratorSymbolLayer::properties() const { QgsStringMap props; props.insert( "geometryModifier" , mExpression->expression() ); @@ -140,31 +140,31 @@ QgsStringMap QgsGeometryGeneratorSymbolLayerV2::properties() const return props; } -void QgsGeometryGeneratorSymbolLayerV2::drawPreviewIcon( QgsSymbolRenderContext& context, QSize size ) +void QgsGeometryGeneratorSymbolLayer::drawPreviewIcon( QgsSymbolRenderContext& context, QSize size ) { if ( mSymbol ) mSymbol->drawPreviewIcon( context.renderContext().painter(), size ); } -void QgsGeometryGeneratorSymbolLayerV2::setGeometryExpression( const QString& exp ) +void QgsGeometryGeneratorSymbolLayer::setGeometryExpression( const QString& exp ) { mExpression.reset( new QgsExpression( exp ) ); } -bool QgsGeometryGeneratorSymbolLayerV2::setSubSymbol( QgsSymbol* symbol ) +bool QgsGeometryGeneratorSymbolLayer::setSubSymbol( QgsSymbol* symbol ) { switch ( symbol->type() ) { case QgsSymbol::Marker: - mMarkerSymbol = static_cast( symbol ); + mMarkerSymbol = static_cast( symbol ); break; case QgsSymbol::Line: - mLineSymbol = static_cast( symbol ); + mLineSymbol = static_cast( symbol ); break; case QgsSymbol::Fill: - mFillSymbol = static_cast( symbol ); + mFillSymbol = static_cast( symbol ); break; default: @@ -176,17 +176,17 @@ bool QgsGeometryGeneratorSymbolLayerV2::setSubSymbol( QgsSymbol* symbol ) return true; } -QSet QgsGeometryGeneratorSymbolLayerV2::usedAttributes() const +QSet QgsGeometryGeneratorSymbolLayer::usedAttributes() const { return mSymbol->usedAttributes() + mExpression->referencedColumns().toSet(); } -bool QgsGeometryGeneratorSymbolLayerV2::isCompatibleWithSymbol( QgsSymbol* symbol ) const +bool QgsGeometryGeneratorSymbolLayer::isCompatibleWithSymbol( QgsSymbol* symbol ) const { Q_UNUSED( symbol ) return true; } -void QgsGeometryGeneratorSymbolLayerV2::render( QgsSymbolRenderContext& context ) +void QgsGeometryGeneratorSymbolLayer::render( QgsSymbolRenderContext& context ) { if ( context.feature() ) { @@ -204,7 +204,7 @@ void QgsGeometryGeneratorSymbolLayerV2::render( QgsSymbolRenderContext& context } } -void QgsGeometryGeneratorSymbolLayerV2::setColor( const QColor& color ) +void QgsGeometryGeneratorSymbolLayer::setColor( const QColor& color ) { mSymbol->setColor( color ); } diff --git a/src/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.h b/src/core/symbology-ng/qgsgeometrygeneratorsymbollayer.h similarity index 90% rename from src/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.h rename to src/core/symbology-ng/qgsgeometrygeneratorsymbollayer.h index 37ed6dc7376..c7faf34fc15 100644 --- a/src/core/symbology-ng/qgsgeometrygeneratorsymbollayerv2.h +++ b/src/core/symbology-ng/qgsgeometrygeneratorsymbollayer.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsgeometrygeneratorsymbollayerv2.h + qgsgeometrygeneratorsymbollayer.h --------------------- begin : November 2015 copyright : (C) 2015 by Matthias Kuhn @@ -19,12 +19,12 @@ #include "qgssymbollayer.h" /** \ingroup core - * \class QgsGeometryGeneratorSymbolLayerV2 + * \class QgsGeometryGeneratorSymbolLayer */ -class CORE_EXPORT QgsGeometryGeneratorSymbolLayerV2 : public QgsSymbolLayer +class CORE_EXPORT QgsGeometryGeneratorSymbolLayer : public QgsSymbolLayer { public: - ~QgsGeometryGeneratorSymbolLayerV2(); + ~QgsGeometryGeneratorSymbolLayer(); static QgsSymbolLayer* create( const QgsStringMap& properties ); @@ -92,12 +92,12 @@ class CORE_EXPORT QgsGeometryGeneratorSymbolLayerV2 : public QgsSymbolLayer void setColor( const QColor& color ) override; private: - QgsGeometryGeneratorSymbolLayerV2( const QString& expression ); + QgsGeometryGeneratorSymbolLayer( const QString& expression ); QScopedPointer mExpression; - QgsFillSymbolV2* mFillSymbol; - QgsLineSymbolV2* mLineSymbol; - QgsMarkerSymbolV2* mMarkerSymbol; + QgsFillSymbol* mFillSymbol; + QgsLineSymbol* mLineSymbol; + QgsMarkerSymbol* mMarkerSymbol; QgsSymbol* mSymbol; /** diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp similarity index 78% rename from src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp rename to src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp index b281be9f403..c0971cd737a 100644 --- a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp +++ b/src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - qgsgraduatedsymbolrendererv2.cpp + qgsgraduatedsymbolrenderer.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -13,11 +13,11 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsgraduatedsymbolrendererv2.h" +#include "qgsgraduatedsymbolrenderer.h" #include "qgssymbol.h" #include "qgssymbollayerutils.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgspointdisplacementrenderer.h" #include "qgsinvertedpolygonrenderer.h" #include "qgspainteffect.h" @@ -37,7 +37,7 @@ #include // for jenks classification #include -QgsRendererRangeV2::QgsRendererRangeV2() +QgsRendererRange::QgsRendererRange() : mLowerValue( 0 ) , mUpperValue( 0 ) , mSymbol( nullptr ) @@ -46,7 +46,7 @@ QgsRendererRangeV2::QgsRendererRangeV2() { } -QgsRendererRangeV2::QgsRendererRangeV2( double lowerValue, double upperValue, QgsSymbol* symbol, const QString& label, bool render ) +QgsRendererRange::QgsRendererRange( double lowerValue, double upperValue, QgsSymbol* symbol, const QString& label, bool render ) : mLowerValue( lowerValue ) , mUpperValue( upperValue ) , mSymbol( symbol ) @@ -55,7 +55,7 @@ QgsRendererRangeV2::QgsRendererRangeV2( double lowerValue, double upperValue, Qg { } -QgsRendererRangeV2::QgsRendererRangeV2( const QgsRendererRangeV2& range ) +QgsRendererRange::QgsRendererRange( const QgsRendererRange& range ) : mLowerValue( range.mLowerValue ) , mUpperValue( range.mUpperValue ) , mSymbol( range.mSymbol.data() ? range.mSymbol->clone() : nullptr ) @@ -65,13 +65,13 @@ QgsRendererRangeV2::QgsRendererRangeV2( const QgsRendererRangeV2& range ) } // cpy and swap idiom, note that the cpy is done with 'pass by value' -QgsRendererRangeV2& QgsRendererRangeV2::operator=( QgsRendererRangeV2 range ) +QgsRendererRange& QgsRendererRange::operator=( QgsRendererRange range ) { swap( range ); return *this; } -bool QgsRendererRangeV2::operator<( const QgsRendererRangeV2 &other ) const +bool QgsRendererRange::operator<( const QgsRendererRange &other ) const { return lowerValue() < other.lowerValue() || @@ -79,7 +79,7 @@ bool QgsRendererRangeV2::operator<( const QgsRendererRangeV2 &other ) const } -void QgsRendererRangeV2::swap( QgsRendererRangeV2 & other ) +void QgsRendererRange::swap( QgsRendererRange & other ) { qSwap( mLowerValue, other.mLowerValue ); qSwap( mUpperValue, other.mUpperValue ); @@ -87,62 +87,62 @@ void QgsRendererRangeV2::swap( QgsRendererRangeV2 & other ) std::swap( mLabel, other.mLabel ); } -double QgsRendererRangeV2::lowerValue() const +double QgsRendererRange::lowerValue() const { return mLowerValue; } -double QgsRendererRangeV2::upperValue() const +double QgsRendererRange::upperValue() const { return mUpperValue; } -QgsSymbol* QgsRendererRangeV2::symbol() const +QgsSymbol* QgsRendererRange::symbol() const { return mSymbol.data(); } -QString QgsRendererRangeV2::label() const +QString QgsRendererRange::label() const { return mLabel; } -void QgsRendererRangeV2::setSymbol( QgsSymbol* s ) +void QgsRendererRange::setSymbol( QgsSymbol* s ) { if ( mSymbol.data() != s ) mSymbol.reset( s ); } -void QgsRendererRangeV2::setLabel( const QString& label ) +void QgsRendererRange::setLabel( const QString& label ) { mLabel = label; } -void QgsRendererRangeV2::setUpperValue( double upperValue ) +void QgsRendererRange::setUpperValue( double upperValue ) { mUpperValue = upperValue; } -void QgsRendererRangeV2::setLowerValue( double lowerValue ) +void QgsRendererRange::setLowerValue( double lowerValue ) { mLowerValue = lowerValue; } -bool QgsRendererRangeV2::renderState() const +bool QgsRendererRange::renderState() const { return mRender; } -void QgsRendererRangeV2::setRenderState( bool render ) +void QgsRendererRange::setRenderState( bool render ) { mRender = render; } -QString QgsRendererRangeV2::dump() const +QString QgsRendererRange::dump() const { return QString( "%1 - %2::%3::%4\n" ).arg( mLowerValue ).arg( mUpperValue ).arg( mLabel, mSymbol.data() ? mSymbol->dump() : "(no symbol)" ); } -void QgsRendererRangeV2::toSld( QDomDocument &doc, QDomElement &element, QgsStringMap props, bool firstRange ) const +void QgsRendererRange::toSld( QDomDocument &doc, QDomElement &element, QgsStringMap props, bool firstRange ) const { if ( !mSymbol.data() || props.value( "attribute", "" ).isEmpty() ) return; @@ -176,10 +176,10 @@ void QgsRendererRangeV2::toSld( QDomDocument &doc, QDomElement &element, QgsStri /////////// -int QgsRendererRangeV2LabelFormat::MaxPrecision = 15; -int QgsRendererRangeV2LabelFormat::MinPrecision = -6; +int QgsRendererRangeLabelFormat::MaxPrecision = 15; +int QgsRendererRangeLabelFormat::MinPrecision = -6; -QgsRendererRangeV2LabelFormat::QgsRendererRangeV2LabelFormat() +QgsRendererRangeLabelFormat::QgsRendererRangeLabelFormat() : mFormat( " %1 - %2 " ) , mPrecision( 4 ) , mTrimTrailingZeroes( false ) @@ -190,7 +190,7 @@ QgsRendererRangeV2LabelFormat::QgsRendererRangeV2LabelFormat() { } -QgsRendererRangeV2LabelFormat::QgsRendererRangeV2LabelFormat( const QString& format, int precision, bool trimTrailingZeroes ) +QgsRendererRangeLabelFormat::QgsRendererRangeLabelFormat( const QString& format, int precision, bool trimTrailingZeroes ) : mReTrailingZeroes( "[.,]?0*$" ) , mReNegativeZero( "^\\-0(?:[.,]0*)?$" ) { @@ -200,7 +200,7 @@ QgsRendererRangeV2LabelFormat::QgsRendererRangeV2LabelFormat( const QString& for } -bool QgsRendererRangeV2LabelFormat::operator==( const QgsRendererRangeV2LabelFormat &other ) const +bool QgsRendererRangeLabelFormat::operator==( const QgsRendererRangeLabelFormat &other ) const { return format() == other.format() && @@ -208,12 +208,12 @@ bool QgsRendererRangeV2LabelFormat::operator==( const QgsRendererRangeV2LabelFor trimTrailingZeroes() == other.trimTrailingZeroes(); } -bool QgsRendererRangeV2LabelFormat::operator!=( const QgsRendererRangeV2LabelFormat &other ) const +bool QgsRendererRangeLabelFormat::operator!=( const QgsRendererRangeLabelFormat &other ) const { return !( *this == other ); } -void QgsRendererRangeV2LabelFormat::setPrecision( int precision ) +void QgsRendererRangeLabelFormat::setPrecision( int precision ) { // Limit the range of decimal places to a reasonable range precision = qBound( MinPrecision, precision, MaxPrecision ); @@ -228,12 +228,12 @@ void QgsRendererRangeV2LabelFormat::setPrecision( int precision ) } } -QString QgsRendererRangeV2LabelFormat::labelForRange( const QgsRendererRangeV2 &range ) const +QString QgsRendererRangeLabelFormat::labelForRange( const QgsRendererRange &range ) const { return labelForRange( range.lowerValue(), range.upperValue() ); } -QString QgsRendererRangeV2LabelFormat::formatNumber( double value ) const +QString QgsRendererRangeLabelFormat::formatNumber( double value ) const { if ( mPrecision > 0 ) { @@ -255,7 +255,7 @@ QString QgsRendererRangeV2LabelFormat::formatNumber( double value ) const } } -QString QgsRendererRangeV2LabelFormat::labelForRange( double lower, double upper ) const +QString QgsRendererRangeLabelFormat::labelForRange( double lower, double upper ) const { QString lowerStr = formatNumber( lower ); QString upperStr = formatNumber( upper ); @@ -264,7 +264,7 @@ QString QgsRendererRangeV2LabelFormat::labelForRange( double lower, double upper return legend.replace( "%1", lowerStr ).replace( "%2", upperStr ); } -void QgsRendererRangeV2LabelFormat::setFromDomElement( QDomElement &element ) +void QgsRendererRangeLabelFormat::setFromDomElement( QDomElement &element ) { mFormat = element.attribute( "format", element.attribute( "prefix", " " ) + "%1" + @@ -275,7 +275,7 @@ void QgsRendererRangeV2LabelFormat::setFromDomElement( QDomElement &element ) mTrimTrailingZeroes = element.attribute( "trimtrailingzeroes", "false" ) == "true"; } -void QgsRendererRangeV2LabelFormat::saveToDomElement( QDomElement &element ) +void QgsRendererRangeLabelFormat::saveToDomElement( QDomElement &element ) { element.setAttribute( "format", mFormat ); element.setAttribute( "decimalplaces", mPrecision ); @@ -284,8 +284,8 @@ void QgsRendererRangeV2LabelFormat::saveToDomElement( QDomElement &element ) /////////// -QgsGraduatedSymbolRendererV2::QgsGraduatedSymbolRendererV2( const QString& attrName, const QgsRangeList& ranges ) - : QgsFeatureRendererV2( "graduatedSymbol" ) +QgsGraduatedSymbolRenderer::QgsGraduatedSymbolRenderer( const QString& attrName, const QgsRangeList& ranges ) + : QgsFeatureRenderer( "graduatedSymbol" ) , mAttrName( attrName ) , mMode( Custom ) , mInvertedColorRamp( false ) @@ -298,23 +298,23 @@ QgsGraduatedSymbolRendererV2::QgsGraduatedSymbolRendererV2( const QString& attrN // TODO: check ranges for sanity (NULL symbols, invalid ranges) //important - we need a deep copy of the ranges list, not a shared copy. This is required because - //QgsRendererRangeV2::symbol() is marked const, and so retrieving the symbol via this method does not + //QgsRendererRange::symbol() is marked const, and so retrieving the symbol via this method does not //trigger a detachment and copy of mRanges BUT that same method CAN be used to modify a symbol in place - Q_FOREACH ( const QgsRendererRangeV2& range, ranges ) + Q_FOREACH ( const QgsRendererRange& range, ranges ) { mRanges << range; } } -QgsGraduatedSymbolRendererV2::~QgsGraduatedSymbolRendererV2() +QgsGraduatedSymbolRenderer::~QgsGraduatedSymbolRenderer() { mRanges.clear(); // should delete all the symbols } -QgsSymbol* QgsGraduatedSymbolRendererV2::symbolForValue( double value ) +QgsSymbol* QgsGraduatedSymbolRenderer::symbolForValue( double value ) { - Q_FOREACH ( const QgsRendererRangeV2& range, mRanges ) + Q_FOREACH ( const QgsRendererRange& range, mRanges ) { if ( range.lowerValue() <= value && range.upperValue() >= value ) { @@ -328,10 +328,10 @@ QgsSymbol* QgsGraduatedSymbolRendererV2::symbolForValue( double value ) return nullptr; } -QString QgsGraduatedSymbolRendererV2::legendKeyForValue( double value ) const +QString QgsGraduatedSymbolRenderer::legendKeyForValue( double value ) const { int i = 0; - Q_FOREACH ( const QgsRendererRangeV2& range, mRanges ) + Q_FOREACH ( const QgsRendererRange& range, mRanges ) { if ( range.lowerValue() <= value && range.upperValue() >= value ) { @@ -346,7 +346,7 @@ QString QgsGraduatedSymbolRendererV2::legendKeyForValue( double value ) const return QString::null; } -QgsSymbol* QgsGraduatedSymbolRendererV2::symbolForFeature( QgsFeature& feature, QgsRenderContext &context ) +QgsSymbol* QgsGraduatedSymbolRenderer::symbolForFeature( QgsFeature& feature, QgsRenderContext &context ) { QgsSymbol* symbol = originalSymbolForFeature( feature, context ); if ( !symbol ) @@ -365,20 +365,20 @@ QgsSymbol* QgsGraduatedSymbolRendererV2::symbolForFeature( QgsFeature& feature, // modify the temporary symbol and return it if ( tempSymbol->type() == QgsSymbol::Marker ) { - QgsMarkerSymbolV2* markerSymbol = static_cast( tempSymbol ); + QgsMarkerSymbol* markerSymbol = static_cast( tempSymbol ); if ( mRotation.data() ) markerSymbol->setAngle( rotation ); - markerSymbol->setSize( sizeScale * static_cast( symbol )->size() ); + markerSymbol->setSize( sizeScale * static_cast( symbol )->size() ); markerSymbol->setScaleMethod( mScaleMethod ); } else if ( tempSymbol->type() == QgsSymbol::Line ) { - QgsLineSymbolV2* lineSymbol = static_cast( tempSymbol ); - lineSymbol->setWidth( sizeScale * static_cast( symbol )->width() ); + QgsLineSymbol* lineSymbol = static_cast( tempSymbol ); + lineSymbol->setWidth( sizeScale * static_cast( symbol )->width() ); } return tempSymbol; } -QVariant QgsGraduatedSymbolRendererV2::valueForFeature( QgsFeature& feature, QgsRenderContext &context ) const +QVariant QgsGraduatedSymbolRenderer::valueForFeature( QgsFeature& feature, QgsRenderContext &context ) const { QgsAttributes attrs = feature.attributes(); QVariant value; @@ -394,7 +394,7 @@ QVariant QgsGraduatedSymbolRendererV2::valueForFeature( QgsFeature& feature, Qgs return value; } -QgsSymbol* QgsGraduatedSymbolRendererV2::originalSymbolForFeature( QgsFeature& feature, QgsRenderContext &context ) +QgsSymbol* QgsGraduatedSymbolRenderer::originalSymbolForFeature( QgsFeature& feature, QgsRenderContext &context ) { QVariant value = valueForFeature( feature, context ); @@ -406,7 +406,7 @@ QgsSymbol* QgsGraduatedSymbolRendererV2::originalSymbolForFeature( QgsFeature& f return symbolForValue( value.toDouble() ); } -void QgsGraduatedSymbolRendererV2::startRender( QgsRenderContext& context, const QgsFields& fields ) +void QgsGraduatedSymbolRenderer::startRender( QgsRenderContext& context, const QgsFields& fields ) { mCounting = context.rendererScale() == 0.0; @@ -419,7 +419,7 @@ void QgsGraduatedSymbolRendererV2::startRender( QgsRenderContext& context, const mExpression->prepare( &context.expressionContext() ); } - Q_FOREACH ( const QgsRendererRangeV2& range, mRanges ) + Q_FOREACH ( const QgsRendererRange& range, mRanges ) { if ( !range.symbol() ) continue; @@ -438,9 +438,9 @@ void QgsGraduatedSymbolRendererV2::startRender( QgsRenderContext& context, const return; } -void QgsGraduatedSymbolRendererV2::stopRender( QgsRenderContext& context ) +void QgsGraduatedSymbolRenderer::stopRender( QgsRenderContext& context ) { - Q_FOREACH ( const QgsRendererRangeV2& range, mRanges ) + Q_FOREACH ( const QgsRendererRange& range, mRanges ) { if ( !range.symbol() ) continue; @@ -458,7 +458,7 @@ void QgsGraduatedSymbolRendererV2::stopRender( QgsRenderContext& context ) mTempSymbols.clear(); } -QList QgsGraduatedSymbolRendererV2::usedAttributes() +QList QgsGraduatedSymbolRenderer::usedAttributes() { QSet attributes; @@ -487,7 +487,7 @@ QList QgsGraduatedSymbolRendererV2::usedAttributes() return attributes.toList(); } -bool QgsGraduatedSymbolRendererV2::updateRangeSymbol( int rangeIndex, QgsSymbol* symbol ) +bool QgsGraduatedSymbolRenderer::updateRangeSymbol( int rangeIndex, QgsSymbol* symbol ) { if ( rangeIndex < 0 || rangeIndex >= mRanges.size() ) return false; @@ -495,7 +495,7 @@ bool QgsGraduatedSymbolRendererV2::updateRangeSymbol( int rangeIndex, QgsSymbol* return true; } -bool QgsGraduatedSymbolRendererV2::updateRangeLabel( int rangeIndex, const QString& label ) +bool QgsGraduatedSymbolRenderer::updateRangeLabel( int rangeIndex, const QString& label ) { if ( rangeIndex < 0 || rangeIndex >= mRanges.size() ) return false; @@ -503,29 +503,29 @@ bool QgsGraduatedSymbolRendererV2::updateRangeLabel( int rangeIndex, const QStri return true; } -bool QgsGraduatedSymbolRendererV2::updateRangeUpperValue( int rangeIndex, double value ) +bool QgsGraduatedSymbolRenderer::updateRangeUpperValue( int rangeIndex, double value ) { if ( rangeIndex < 0 || rangeIndex >= mRanges.size() ) return false; - QgsRendererRangeV2 &range = mRanges[rangeIndex]; + QgsRendererRange &range = mRanges[rangeIndex]; bool isDefaultLabel = range.label() == mLabelFormat.labelForRange( range ); range.setUpperValue( value ); if ( isDefaultLabel ) range.setLabel( mLabelFormat.labelForRange( range ) ); return true; } -bool QgsGraduatedSymbolRendererV2::updateRangeLowerValue( int rangeIndex, double value ) +bool QgsGraduatedSymbolRenderer::updateRangeLowerValue( int rangeIndex, double value ) { if ( rangeIndex < 0 || rangeIndex >= mRanges.size() ) return false; - QgsRendererRangeV2 &range = mRanges[rangeIndex]; + QgsRendererRange &range = mRanges[rangeIndex]; bool isDefaultLabel = range.label() == mLabelFormat.labelForRange( range ); range.setLowerValue( value ); if ( isDefaultLabel ) range.setLabel( mLabelFormat.labelForRange( range ) ); return true; } -bool QgsGraduatedSymbolRendererV2::updateRangeRenderState( int rangeIndex, bool value ) +bool QgsGraduatedSymbolRenderer::updateRangeRenderState( int rangeIndex, bool value ) { if ( rangeIndex < 0 || rangeIndex >= mRanges.size() ) return false; @@ -533,7 +533,7 @@ bool QgsGraduatedSymbolRendererV2::updateRangeRenderState( int rangeIndex, bool return true; } -QString QgsGraduatedSymbolRendererV2::dump() const +QString QgsGraduatedSymbolRenderer::dump() const { QString s = QString( "GRADUATED: attr %1\n" ).arg( mAttrName ); for ( int i = 0; i < mRanges.count(); i++ ) @@ -541,9 +541,9 @@ QString QgsGraduatedSymbolRendererV2::dump() const return s; } -QgsGraduatedSymbolRendererV2* QgsGraduatedSymbolRendererV2::clone() const +QgsGraduatedSymbolRenderer* QgsGraduatedSymbolRenderer::clone() const { - QgsGraduatedSymbolRendererV2* r = new QgsGraduatedSymbolRendererV2( mAttrName, mRanges ); + QgsGraduatedSymbolRenderer* r = new QgsGraduatedSymbolRenderer( mAttrName, mRanges ); r->setMode( mMode ); if ( mSourceSymbol.data() ) r->setSourceSymbol( mSourceSymbol->clone() ); @@ -560,7 +560,7 @@ QgsGraduatedSymbolRendererV2* QgsGraduatedSymbolRendererV2::clone() const return r; } -void QgsGraduatedSymbolRendererV2::toSld( QDomDocument& doc, QDomElement &element ) const +void QgsGraduatedSymbolRenderer::toSld( QDomDocument& doc, QDomElement &element ) const { QgsStringMap props; props[ "attribute" ] = mAttrName; @@ -580,12 +580,12 @@ void QgsGraduatedSymbolRendererV2::toSld( QDomDocument& doc, QDomElement &elemen } } -QgsSymbolList QgsGraduatedSymbolRendererV2::symbols( QgsRenderContext &context ) +QgsSymbolList QgsGraduatedSymbolRenderer::symbols( QgsRenderContext &context ) { Q_UNUSED( context ); QgsSymbolList lst; lst.reserve( mRanges.count() ); - Q_FOREACH ( const QgsRendererRangeV2& range, mRanges ) + Q_FOREACH ( const QgsRendererRange& range, mRanges ) { lst.append( range.symbol() ); } @@ -837,19 +837,19 @@ static QList _calcJenksBreaks( QList values, int classes, } //_calcJenksBreaks -QgsGraduatedSymbolRendererV2* QgsGraduatedSymbolRendererV2::createRenderer( +QgsGraduatedSymbolRenderer* QgsGraduatedSymbolRenderer::createRenderer( QgsVectorLayer* vlayer, const QString& attrName, int classes, Mode mode, QgsSymbol* symbol, - QgsVectorColorRampV2* ramp, + QgsVectorColorRamp* ramp, bool inverted, - const QgsRendererRangeV2LabelFormat& labelFormat + const QgsRendererRangeLabelFormat& labelFormat ) { QgsRangeList ranges; - QgsGraduatedSymbolRendererV2* r = new QgsGraduatedSymbolRendererV2( attrName, ranges ); + QgsGraduatedSymbolRenderer* r = new QgsGraduatedSymbolRenderer( attrName, ranges ); r->setSourceSymbol( symbol->clone() ); r->setSourceColorRamp( ramp->clone() ); r->setInvertedColorRamp( inverted ); @@ -859,13 +859,13 @@ QgsGraduatedSymbolRendererV2* QgsGraduatedSymbolRendererV2::createRenderer( return r; } -QList QgsGraduatedSymbolRendererV2::getDataValues( QgsVectorLayer *vlayer ) +QList QgsGraduatedSymbolRenderer::getDataValues( QgsVectorLayer *vlayer ) { bool ok; return vlayer->getDoubleValues( mAttrName, ok ); } -void QgsGraduatedSymbolRendererV2::updateClasses( QgsVectorLayer *vlayer, Mode mode, int nclasses ) +void QgsGraduatedSymbolRenderer::updateClasses( QgsVectorLayer *vlayer, Mode mode, int nclasses ) { if ( mAttrName.isEmpty() ) return; @@ -974,12 +974,12 @@ void QgsGraduatedSymbolRendererV2::updateClasses( QgsVectorLayer *vlayer, Mode m label = mLabelFormat.labelForRange( lower, upper ); } QgsSymbol* newSymbol = mSourceSymbol ? mSourceSymbol->clone() : QgsSymbol::defaultSymbol( vlayer->geometryType() ); - addClass( QgsRendererRangeV2( lower, upper, newSymbol, label ) ); + addClass( QgsRendererRange( lower, upper, newSymbol, label ) ); } updateColorRamp( nullptr, mInvertedColorRamp ); } -QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2::create( QDomElement& element ) +QgsFeatureRenderer* QgsGraduatedSymbolRenderer::create( QDomElement& element ) { QDomElement symbolsElem = element.firstChildElement( "symbols" ); if ( symbolsElem.isNull() ) @@ -1005,7 +1005,7 @@ QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2::create( QDomElement& element if ( symbolMap.contains( symbolName ) ) { QgsSymbol* symbol = symbolMap.take( symbolName ); - ranges.append( QgsRendererRangeV2( lowerValue, upperValue, symbol, label, render ) ); + ranges.append( QgsRendererRange( lowerValue, upperValue, symbol, label, render ) ); } } rangeElem = rangeElem.nextSiblingElement(); @@ -1013,7 +1013,7 @@ QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2::create( QDomElement& element QString attrName = element.attribute( "attr" ); - QgsGraduatedSymbolRendererV2* r = new QgsGraduatedSymbolRendererV2( attrName, ranges ); + QgsGraduatedSymbolRenderer* r = new QgsGraduatedSymbolRenderer( attrName, ranges ); QString attrMethod = element.attribute( "graduatedMethod" ); if ( !attrMethod.isEmpty() ) @@ -1070,7 +1070,7 @@ QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2::create( QDomElement& element QDomElement rotationElem = element.firstChildElement( "rotation" ); if ( !rotationElem.isNull() && !rotationElem.attribute( "field" ).isEmpty() ) { - Q_FOREACH ( const QgsRendererRangeV2& range, r->mRanges ) + Q_FOREACH ( const QgsRendererRange& range, r->mRanges ) { convertSymbolRotation( range.symbol(), rotationElem.attribute( "field" ) ); } @@ -1083,7 +1083,7 @@ QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2::create( QDomElement& element QDomElement sizeScaleElem = element.firstChildElement( "sizescale" ); if ( !sizeScaleElem.isNull() && !sizeScaleElem.attribute( "field" ).isEmpty() ) { - Q_FOREACH ( const QgsRendererRangeV2& range, r->mRanges ) + Q_FOREACH ( const QgsRendererRange& range, r->mRanges ) { convertSymbolSizeScale( range.symbol(), QgsSymbolLayerUtils::decodeScaleMethod( sizeScaleElem.attribute( "scalemethod" ) ), @@ -1100,7 +1100,7 @@ QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2::create( QDomElement& element QDomElement labelFormatElem = element.firstChildElement( "labelformat" ); if ( ! labelFormatElem.isNull() ) { - QgsRendererRangeV2LabelFormat labelFormat; + QgsRendererRangeLabelFormat labelFormat; labelFormat.setFromDomElement( labelFormatElem ); r->setLabelFormat( labelFormat ); } @@ -1108,7 +1108,7 @@ QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2::create( QDomElement& element return r; } -QDomElement QgsGraduatedSymbolRendererV2::save( QDomDocument& doc ) +QDomElement QgsGraduatedSymbolRenderer::save( QDomDocument& doc ) { QDomElement rendererElem = doc.createElement( RENDERER_TAG_NAME ); rendererElem.setAttribute( "type", "graduatedSymbol" ); @@ -1124,7 +1124,7 @@ QDomElement QgsGraduatedSymbolRendererV2::save( QDomDocument& doc ) QgsRangeList::const_iterator it = mRanges.constBegin(); for ( ; it != mRanges.constEnd(); ++it ) { - const QgsRendererRangeV2& range = *it; + const QgsRendererRange& range = *it; QString symbolName = QString::number( i ); symbols.insert( symbolName, range.symbol() ); @@ -1211,34 +1211,34 @@ QDomElement QgsGraduatedSymbolRendererV2::save( QDomDocument& doc ) return rendererElem; } -QgsLegendSymbologyList QgsGraduatedSymbolRendererV2::legendSymbologyItems( QSize iconSize ) +QgsLegendSymbologyList QgsGraduatedSymbolRenderer::legendSymbologyItems( QSize iconSize ) { QgsLegendSymbologyList lst; int count = ranges().count(); lst.reserve( count ); for ( int i = 0; i < count; i++ ) { - const QgsRendererRangeV2& range = ranges()[i]; + const QgsRendererRange& range = ranges()[i]; QPixmap pix = QgsSymbolLayerUtils::symbolPreviewPixmap( range.symbol(), iconSize ); lst << qMakePair( range.label(), pix ); } return lst; } -QgsLegendSymbolListV2 QgsGraduatedSymbolRendererV2::legendSymbolItemsV2() const +QgsLegendSymbolListV2 QgsGraduatedSymbolRenderer::legendSymbolItemsV2() const { QgsLegendSymbolListV2 list; if ( mSourceSymbol.data() && mSourceSymbol->type() == QgsSymbol::Marker ) { // check that all symbols that have the same size expression QgsDataDefined ddSize; - Q_FOREACH ( const QgsRendererRangeV2& range, mRanges ) + Q_FOREACH ( const QgsRendererRange& range, mRanges ) { - const QgsMarkerSymbolV2 * symbol = static_cast( range.symbol() ); + const QgsMarkerSymbol * symbol = static_cast( range.symbol() ); if ( !ddSize.hasDefaultValues() && symbol->dataDefinedSize() != ddSize ) { // no common size expression - return QgsFeatureRendererV2::legendSymbolItemsV2(); + return QgsFeatureRenderer::legendSymbolItemsV2(); } else { @@ -1248,34 +1248,34 @@ QgsLegendSymbolListV2 QgsGraduatedSymbolRendererV2::legendSymbolItemsV2() const if ( !ddSize.isActive() || !ddSize.useExpression() ) { - return QgsFeatureRendererV2::legendSymbolItemsV2(); + return QgsFeatureRenderer::legendSymbolItemsV2(); } QgsScaleExpression exp( ddSize.expressionString() ); if ( exp.type() != QgsScaleExpression::Unknown ) { - QgsLegendSymbolItemV2 title( nullptr, exp.baseExpression(), "" ); + QgsLegendSymbolItem title( nullptr, exp.baseExpression(), "" ); list << title; Q_FOREACH ( double v, QgsSymbolLayerUtils::prettyBreaks( exp.minValue(), exp.maxValue(), 4 ) ) { - QgsLegendSymbolItemV2 si( mSourceSymbol.data(), QString::number( v ), "" ); - QgsMarkerSymbolV2 * s = static_cast( si.symbol() ); + QgsLegendSymbolItem si( mSourceSymbol.data(), QString::number( v ), "" ); + QgsMarkerSymbol * s = static_cast( si.symbol() ); s->setDataDefinedSize( QgsDataDefined() ); s->setSize( exp.size( v ) ); list << si; } // now list the graduated symbols - const QgsLegendSymbolListV2 list2 = QgsFeatureRendererV2::legendSymbolItemsV2() ; - Q_FOREACH ( const QgsLegendSymbolItemV2& item, list2 ) + const QgsLegendSymbolListV2 list2 = QgsFeatureRenderer::legendSymbolItemsV2() ; + Q_FOREACH ( const QgsLegendSymbolItem& item, list2 ) list << item; return list; } } - return QgsFeatureRendererV2::legendSymbolItemsV2(); + return QgsFeatureRenderer::legendSymbolItemsV2(); } -QSet< QString > QgsGraduatedSymbolRendererV2::legendKeysForFeature( QgsFeature& feature, QgsRenderContext& context ) +QSet< QString > QgsGraduatedSymbolRenderer::legendKeysForFeature( QgsFeature& feature, QgsRenderContext& context ) { QVariant value = valueForFeature( feature, context ); @@ -1291,12 +1291,12 @@ QSet< QString > QgsGraduatedSymbolRendererV2::legendKeysForFeature( QgsFeature& return QSet< QString >(); } -QgsLegendSymbolList QgsGraduatedSymbolRendererV2::legendSymbolItems( double scaleDenominator, const QString& rule ) +QgsLegendSymbolList QgsGraduatedSymbolRenderer::legendSymbolItems( double scaleDenominator, const QString& rule ) { Q_UNUSED( scaleDenominator ); QgsLegendSymbolList lst; - Q_FOREACH ( const QgsRendererRangeV2& range, mRanges ) + Q_FOREACH ( const QgsRendererRange& range, mRanges ) { if ( rule.isEmpty() || range.label() == rule ) { @@ -1306,56 +1306,56 @@ QgsLegendSymbolList QgsGraduatedSymbolRendererV2::legendSymbolItems( double scal return lst; } -QgsSymbol* QgsGraduatedSymbolRendererV2::sourceSymbol() +QgsSymbol* QgsGraduatedSymbolRenderer::sourceSymbol() { return mSourceSymbol.data(); } -void QgsGraduatedSymbolRendererV2::setSourceSymbol( QgsSymbol* sym ) +void QgsGraduatedSymbolRenderer::setSourceSymbol( QgsSymbol* sym ) { mSourceSymbol.reset( sym ); } -QgsVectorColorRampV2* QgsGraduatedSymbolRendererV2::sourceColorRamp() +QgsVectorColorRamp* QgsGraduatedSymbolRenderer::sourceColorRamp() { return mSourceColorRamp.data(); } -void QgsGraduatedSymbolRendererV2::setSourceColorRamp( QgsVectorColorRampV2* ramp ) +void QgsGraduatedSymbolRenderer::setSourceColorRamp( QgsVectorColorRamp* ramp ) { mSourceColorRamp.reset( ramp ); } -double QgsGraduatedSymbolRendererV2::minSymbolSize() const +double QgsGraduatedSymbolRenderer::minSymbolSize() const { double min = DBL_MAX; for ( int i = 0; i < mRanges.count(); i++ ) { double sz = 0; if ( mRanges[i].symbol()->type() == QgsSymbol::Marker ) - sz = static_cast< QgsMarkerSymbolV2 * >( mRanges[i].symbol() )->size(); + sz = static_cast< QgsMarkerSymbol * >( mRanges[i].symbol() )->size(); else if ( mRanges[i].symbol()->type() == QgsSymbol::Line ) - sz = static_cast< QgsLineSymbolV2 * >( mRanges[i].symbol() )->width(); + sz = static_cast< QgsLineSymbol * >( mRanges[i].symbol() )->width(); min = qMin( sz, min ); } return min; } -double QgsGraduatedSymbolRendererV2::maxSymbolSize() const +double QgsGraduatedSymbolRenderer::maxSymbolSize() const { double max = DBL_MIN; for ( int i = 0; i < mRanges.count(); i++ ) { double sz = 0; if ( mRanges[i].symbol()->type() == QgsSymbol::Marker ) - sz = static_cast< QgsMarkerSymbolV2 * >( mRanges[i].symbol() )->size(); + sz = static_cast< QgsMarkerSymbol * >( mRanges[i].symbol() )->size(); else if ( mRanges[i].symbol()->type() == QgsSymbol::Line ) - sz = static_cast< QgsLineSymbolV2 * >( mRanges[i].symbol() )->width(); + sz = static_cast< QgsLineSymbol * >( mRanges[i].symbol() )->width(); max = qMax( sz, max ); } return max; } -void QgsGraduatedSymbolRendererV2::setSymbolSizes( double minSize, double maxSize ) +void QgsGraduatedSymbolRenderer::setSymbolSizes( double minSize, double maxSize ) { for ( int i = 0; i < mRanges.count(); i++ ) { @@ -1364,14 +1364,14 @@ void QgsGraduatedSymbolRendererV2::setSymbolSizes( double minSize, double maxSiz ? minSize + i * ( maxSize - minSize ) / ( mRanges.count() - 1 ) : .5 * ( maxSize + minSize ); if ( symbol->type() == QgsSymbol::Marker ) - static_cast< QgsMarkerSymbolV2 * >( symbol.data() )->setSize( size ); + static_cast< QgsMarkerSymbol * >( symbol.data() )->setSize( size ); if ( symbol->type() == QgsSymbol::Line ) - static_cast< QgsLineSymbolV2 * >( symbol.data() )->setWidth( size ); + static_cast< QgsLineSymbol * >( symbol.data() )->setWidth( size ); updateRangeSymbol( i, symbol.take() ); } } -void QgsGraduatedSymbolRendererV2::updateColorRamp( QgsVectorColorRampV2 *ramp, bool inverted ) +void QgsGraduatedSymbolRenderer::updateColorRamp( QgsVectorColorRamp *ramp, bool inverted ) { int i = 0; if ( ramp ) @@ -1382,7 +1382,7 @@ void QgsGraduatedSymbolRendererV2::updateColorRamp( QgsVectorColorRampV2 *ramp, if ( mSourceColorRamp ) { - Q_FOREACH ( const QgsRendererRangeV2& range, mRanges ) + Q_FOREACH ( const QgsRendererRange& range, mRanges ) { QgsSymbol *symbol = range.symbol() ? range.symbol()->clone() : nullptr; if ( symbol ) @@ -1401,13 +1401,13 @@ void QgsGraduatedSymbolRendererV2::updateColorRamp( QgsVectorColorRampV2 *ramp, } -void QgsGraduatedSymbolRendererV2::updateSymbols( QgsSymbol *sym ) +void QgsGraduatedSymbolRenderer::updateSymbols( QgsSymbol *sym ) { if ( !sym ) return; int i = 0; - Q_FOREACH ( const QgsRendererRangeV2& range, mRanges ) + Q_FOREACH ( const QgsRendererRange& range, mRanges ) { QScopedPointer symbol( sym->clone() ); if ( mGraduatedMethod == GraduatedColor ) @@ -1417,11 +1417,11 @@ void QgsGraduatedSymbolRendererV2::updateSymbols( QgsSymbol *sym ) else if ( mGraduatedMethod == GraduatedSize ) { if ( symbol->type() == QgsSymbol::Marker ) - static_cast( symbol.data() )->setSize( - static_cast( range.symbol() )->size() ); + static_cast( symbol.data() )->setSize( + static_cast( range.symbol() )->size() ); else if ( symbol->type() == QgsSymbol::Line ) - static_cast( symbol.data() )->setWidth( - static_cast( range.symbol() )->width() ); + static_cast( symbol.data() )->setWidth( + static_cast( range.symbol() )->width() ); } updateRangeSymbol( i, symbol.take() ); ++i; @@ -1429,21 +1429,21 @@ void QgsGraduatedSymbolRendererV2::updateSymbols( QgsSymbol *sym ) setSourceSymbol( sym->clone() ); } -void QgsGraduatedSymbolRendererV2::setRotationField( const QString& fieldOrExpression ) +void QgsGraduatedSymbolRenderer::setRotationField( const QString& fieldOrExpression ) { if ( mSourceSymbol->type() == QgsSymbol::Marker ) { - QgsMarkerSymbolV2 * s = static_cast( mSourceSymbol.data() ); + QgsMarkerSymbol * s = static_cast( mSourceSymbol.data() ); s->setDataDefinedAngle( QgsDataDefined( fieldOrExpression ) ); } } -QString QgsGraduatedSymbolRendererV2::rotationField() const +QString QgsGraduatedSymbolRenderer::rotationField() const { if ( mSourceSymbol->type() == QgsSymbol::Marker ) { - QgsMarkerSymbolV2 * s = static_cast( mSourceSymbol.data() ); + QgsMarkerSymbol * s = static_cast( mSourceSymbol.data() ); QgsDataDefined ddAngle = s->dataDefinedAngle(); return ddAngle.useExpression() ? ddAngle.expressionString() : ddAngle.field(); } @@ -1451,32 +1451,32 @@ QString QgsGraduatedSymbolRendererV2::rotationField() const return QString(); } -void QgsGraduatedSymbolRendererV2::setSizeScaleField( const QString& fieldOrExpression ) +void QgsGraduatedSymbolRenderer::setSizeScaleField( const QString& fieldOrExpression ) { mSizeScale.reset( QgsSymbolLayerUtils::fieldOrExpressionToExpression( fieldOrExpression ) ); } -QString QgsGraduatedSymbolRendererV2::sizeScaleField() const +QString QgsGraduatedSymbolRenderer::sizeScaleField() const { return mSizeScale.data() ? QgsSymbolLayerUtils::fieldOrExpressionFromExpression( mSizeScale.data() ) : QString(); } -void QgsGraduatedSymbolRendererV2::setScaleMethod( QgsSymbol::ScaleMethod scaleMethod ) +void QgsGraduatedSymbolRenderer::setScaleMethod( QgsSymbol::ScaleMethod scaleMethod ) { mScaleMethod = scaleMethod; - Q_FOREACH ( const QgsRendererRangeV2& range, mRanges ) + Q_FOREACH ( const QgsRendererRange& range, mRanges ) { if ( range.symbol() ) setScaleMethodToSymbol( range.symbol(), scaleMethod ); } } -bool QgsGraduatedSymbolRendererV2::legendSymbolItemsCheckable() const +bool QgsGraduatedSymbolRenderer::legendSymbolItemsCheckable() const { return true; } -bool QgsGraduatedSymbolRendererV2::legendSymbolItemChecked( const QString& key ) +bool QgsGraduatedSymbolRenderer::legendSymbolItemChecked( const QString& key ) { bool ok; int index = key.toInt( &ok ); @@ -1486,7 +1486,7 @@ bool QgsGraduatedSymbolRendererV2::legendSymbolItemChecked( const QString& key ) return true; } -void QgsGraduatedSymbolRendererV2::checkLegendSymbolItem( const QString& key, bool state ) +void QgsGraduatedSymbolRenderer::checkLegendSymbolItem( const QString& key, bool state ) { bool ok; int index = key.toInt( &ok ); @@ -1494,7 +1494,7 @@ void QgsGraduatedSymbolRendererV2::checkLegendSymbolItem( const QString& key, bo updateRangeRenderState( index, state ); } -void QgsGraduatedSymbolRendererV2::setLegendSymbolItem( const QString& key, QgsSymbol* symbol ) +void QgsGraduatedSymbolRenderer::setLegendSymbolItem( const QString& key, QgsSymbol* symbol ) { bool ok; int index = key.toInt( &ok ); @@ -1504,29 +1504,29 @@ void QgsGraduatedSymbolRendererV2::setLegendSymbolItem( const QString& key, QgsS delete symbol; } -void QgsGraduatedSymbolRendererV2::addClass( QgsSymbol* symbol ) +void QgsGraduatedSymbolRenderer::addClass( QgsSymbol* symbol ) { QgsSymbol* newSymbol = symbol->clone(); QString label = "0.0 - 0.0"; - mRanges.insert( 0, QgsRendererRangeV2( 0.0, 0.0, newSymbol, label ) ); + mRanges.insert( 0, QgsRendererRange( 0.0, 0.0, newSymbol, label ) ); } -void QgsGraduatedSymbolRendererV2::addClass( double lower, double upper ) +void QgsGraduatedSymbolRenderer::addClass( double lower, double upper ) { QgsSymbol* newSymbol = mSourceSymbol->clone(); QString label = mLabelFormat.labelForRange( lower, upper ); - mRanges.append( QgsRendererRangeV2( lower, upper, newSymbol, label ) ); + mRanges.append( QgsRendererRange( lower, upper, newSymbol, label ) ); } -void QgsGraduatedSymbolRendererV2::addBreak( double breakValue, bool updateSymbols ) +void QgsGraduatedSymbolRenderer::addBreak( double breakValue, bool updateSymbols ) { - QMutableListIterator< QgsRendererRangeV2 > it( mRanges ); + QMutableListIterator< QgsRendererRange > it( mRanges ); while ( it.hasNext() ) { - QgsRendererRangeV2 range = it.next(); + QgsRendererRange range = it.next(); if ( range.lowerValue() < breakValue && range.upperValue() > breakValue ) { - QgsRendererRangeV2 newRange = QgsRendererRangeV2(); + QgsRendererRange newRange = QgsRendererRange(); newRange.setLowerValue( breakValue ); newRange.setUpperValue( range.upperValue() ); newRange.setLabel( mLabelFormat.labelForRange( newRange ) ); @@ -1557,22 +1557,22 @@ void QgsGraduatedSymbolRendererV2::addBreak( double breakValue, bool updateSymbo } } -void QgsGraduatedSymbolRendererV2::addClass( const QgsRendererRangeV2& range ) +void QgsGraduatedSymbolRenderer::addClass( const QgsRendererRange& range ) { mRanges.append( range ); } -void QgsGraduatedSymbolRendererV2::deleteClass( int idx ) +void QgsGraduatedSymbolRenderer::deleteClass( int idx ) { mRanges.removeAt( idx ); } -void QgsGraduatedSymbolRendererV2::deleteAllClasses() +void QgsGraduatedSymbolRenderer::deleteAllClasses() { mRanges.clear(); } -void QgsGraduatedSymbolRendererV2::setLabelFormat( const QgsRendererRangeV2LabelFormat &labelFormat, bool updateRanges ) +void QgsGraduatedSymbolRenderer::setLabelFormat( const QgsRendererRangeLabelFormat &labelFormat, bool updateRanges ) { if ( updateRanges && labelFormat != mLabelFormat ) { @@ -1585,11 +1585,11 @@ void QgsGraduatedSymbolRendererV2::setLabelFormat( const QgsRendererRangeV2Label } -void QgsGraduatedSymbolRendererV2::calculateLabelPrecision( bool updateRanges ) +void QgsGraduatedSymbolRenderer::calculateLabelPrecision( bool updateRanges ) { // Find the minimum size of a class double minClassRange = 0.0; - Q_FOREACH ( const QgsRendererRangeV2& rendererRange, mRanges ) + Q_FOREACH ( const QgsRendererRange& rendererRange, mRanges ) { double range = rendererRange.upperValue() - rendererRange.lowerValue(); if ( range <= 0.0 ) @@ -1614,24 +1614,24 @@ void QgsGraduatedSymbolRendererV2::calculateLabelPrecision( bool updateRanges ) if ( updateRanges ) setLabelFormat( mLabelFormat, true ); } -void QgsGraduatedSymbolRendererV2::moveClass( int from, int to ) +void QgsGraduatedSymbolRenderer::moveClass( int from, int to ) { if ( from < 0 || from >= mRanges.size() || to < 0 || to >= mRanges.size() ) return; mRanges.move( from, to ); } -bool valueLessThan( const QgsRendererRangeV2 &r1, const QgsRendererRangeV2 &r2 ) +bool valueLessThan( const QgsRendererRange &r1, const QgsRendererRange &r2 ) { return r1 < r2; } -bool valueGreaterThan( const QgsRendererRangeV2 &r1, const QgsRendererRangeV2 &r2 ) +bool valueGreaterThan( const QgsRendererRange &r1, const QgsRendererRange &r2 ) { return !valueLessThan( r1, r2 ); } -void QgsGraduatedSymbolRendererV2::sortByValue( Qt::SortOrder order ) +void QgsGraduatedSymbolRenderer::sortByValue( Qt::SortOrder order ) { if ( order == Qt::AscendingOrder ) { @@ -1643,7 +1643,7 @@ void QgsGraduatedSymbolRendererV2::sortByValue( Qt::SortOrder order ) } } -bool QgsGraduatedSymbolRendererV2::rangesOverlap() const +bool QgsGraduatedSymbolRenderer::rangesOverlap() const { QgsRangeList sortedRanges = mRanges; qSort( sortedRanges.begin(), sortedRanges.end(), valueLessThan ); @@ -1671,7 +1671,7 @@ bool QgsGraduatedSymbolRendererV2::rangesOverlap() const return false; } -bool QgsGraduatedSymbolRendererV2::rangesHaveGaps() const +bool QgsGraduatedSymbolRenderer::rangesHaveGaps() const { QgsRangeList sortedRanges = mRanges; qSort( sortedRanges.begin(), sortedRanges.end(), valueLessThan ); @@ -1693,17 +1693,17 @@ bool QgsGraduatedSymbolRendererV2::rangesHaveGaps() const return false; } -bool labelLessThan( const QgsRendererRangeV2 &r1, const QgsRendererRangeV2 &r2 ) +bool labelLessThan( const QgsRendererRange &r1, const QgsRendererRange &r2 ) { return QString::localeAwareCompare( r1.label(), r2.label() ) < 0; } -bool labelGreaterThan( const QgsRendererRangeV2 &r1, const QgsRendererRangeV2 &r2 ) +bool labelGreaterThan( const QgsRendererRange &r1, const QgsRendererRange &r2 ) { return !labelLessThan( r1, r2 ); } -void QgsGraduatedSymbolRendererV2::sortByLabel( Qt::SortOrder order ) +void QgsGraduatedSymbolRenderer::sortByLabel( Qt::SortOrder order ) { if ( order == Qt::AscendingOrder ) { @@ -1715,12 +1715,12 @@ void QgsGraduatedSymbolRendererV2::sortByLabel( Qt::SortOrder order ) } } -QgsGraduatedSymbolRendererV2* QgsGraduatedSymbolRendererV2::convertFromRenderer( const QgsFeatureRendererV2 *renderer ) +QgsGraduatedSymbolRenderer* QgsGraduatedSymbolRenderer::convertFromRenderer( const QgsFeatureRenderer *renderer ) { - QgsGraduatedSymbolRendererV2* r = nullptr; + QgsGraduatedSymbolRenderer* r = nullptr; if ( renderer->type() == "graduatedSymbol" ) { - r = dynamic_cast( renderer->clone() ); + r = dynamic_cast( renderer->clone() ); } else if ( renderer->type() == "pointDisplacement" ) { @@ -1740,9 +1740,9 @@ QgsGraduatedSymbolRendererV2* QgsGraduatedSymbolRendererV2::convertFromRenderer( if ( !r ) { - r = new QgsGraduatedSymbolRendererV2( "", QgsRangeList() ); + r = new QgsGraduatedSymbolRenderer( "", QgsRangeList() ); QgsRenderContext context; - QgsSymbolList symbols = const_cast( renderer )->symbols( context ); + QgsSymbolList symbols = const_cast( renderer )->symbols( context ); if ( !symbols.isEmpty() ) { r->setSourceSymbol( symbols.at( 0 )->clone() ); @@ -1755,7 +1755,7 @@ QgsGraduatedSymbolRendererV2* QgsGraduatedSymbolRendererV2::convertFromRenderer( return r; } -const char * QgsGraduatedSymbolRendererV2::graduatedMethodStr( GraduatedMethod method ) +const char * QgsGraduatedSymbolRenderer::graduatedMethodStr( GraduatedMethod method ) { switch ( method ) { diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h b/src/core/symbology-ng/qgsgraduatedsymbolrenderer.h similarity index 84% rename from src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h rename to src/core/symbology-ng/qgsgraduatedsymbolrenderer.h index 2b8aefd3ef5..edfb3cd1ace 100644 --- a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h +++ b/src/core/symbology-ng/qgsgraduatedsymbolrenderer.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsgraduatedsymbolrendererv2.h + qgsgraduatedsymbolrenderer.h --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -16,27 +16,27 @@ #define QGSGRADUATEDSYMBOLRENDERERV2_H #include "qgssymbol.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgsexpression.h" #include #include /** \ingroup core - * \class QgsRendererRangeV2 + * \class QgsRendererRange */ -class CORE_EXPORT QgsRendererRangeV2 +class CORE_EXPORT QgsRendererRange { public: - QgsRendererRangeV2(); - QgsRendererRangeV2( double lowerValue, double upperValue, QgsSymbol* symbol, const QString& label, bool render = true ); - QgsRendererRangeV2( const QgsRendererRangeV2& range ); + QgsRendererRange(); + QgsRendererRange( double lowerValue, double upperValue, QgsSymbol* symbol, const QString& label, bool render = true ); + QgsRendererRange( const QgsRendererRange& range ); - ~QgsRendererRangeV2() {} + ~QgsRendererRange() {} // default dtor is ok - QgsRendererRangeV2& operator=( QgsRendererRangeV2 range ); + QgsRendererRange& operator=( QgsRendererRange range ); - bool operator<( const QgsRendererRangeV2 &other ) const; + bool operator<( const QgsRendererRange &other ) const; double lowerValue() const; double upperValue() const; @@ -72,24 +72,24 @@ class CORE_EXPORT QgsRendererRangeV2 bool mRender; // for cpy+swap idiom - void swap( QgsRendererRangeV2 & other ); + void swap( QgsRendererRange & other ); }; -typedef QList QgsRangeList; +typedef QList QgsRangeList; /** \ingroup core - * \class QgsRendererRangeV2LabelFormat + * \class QgsRendererRangeLabelFormat * \note added in QGIS 2.6 */ -class CORE_EXPORT QgsRendererRangeV2LabelFormat +class CORE_EXPORT QgsRendererRangeLabelFormat { 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 { return mFormat; } void setFormat( const QString& format ) { mFormat = format; } @@ -102,7 +102,7 @@ class CORE_EXPORT QgsRendererRangeV2LabelFormat //! @note labelForLowerUpper in python bindings QString labelForRange( double lower, double upper ) const; - QString labelForRange( const QgsRendererRangeV2 &range ) const; + QString labelForRange( const QgsRendererRange &range ) const; QString formatNumber( double value ) const; void setFromDomElement( QDomElement &element ); @@ -123,19 +123,19 @@ class CORE_EXPORT QgsRendererRangeV2LabelFormat }; class QgsVectorLayer; -class QgsVectorColorRampV2; +class QgsVectorColorRamp; Q_NOWARN_DEPRECATED_PUSH /** \ingroup core - * \class QgsGraduatedSymbolRendererV2 + * \class QgsGraduatedSymbolRenderer */ -class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2 +class CORE_EXPORT QgsGraduatedSymbolRenderer : public QgsFeatureRenderer { 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 ) override; @@ -150,7 +150,7 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2 virtual QString dump() const override; - virtual QgsGraduatedSymbolRendererV2* clone() const override; + virtual QgsGraduatedSymbolRenderer* clone() const override; virtual void toSld( QDomDocument& doc, QDomElement &element ) const override; @@ -174,7 +174,7 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2 void addClass( QgsSymbol* symbol ); //! @note available in python bindings as addClassRange - void addClass( const QgsRendererRangeV2& range ); + void addClass( const QgsRendererRange& range ); //! @note available in python bindings as addClassLowerUpper void addClass( double lower, double upper ); @@ -235,31 +235,31 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2 //! Return the label format used to generate default classification labels //! @note Added in 2.6 - const QgsRendererRangeV2LabelFormat &labelFormat() const { return mLabelFormat; } + const QgsRendererRangeLabelFormat &labelFormat() const { return mLabelFormat; } //! 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, - QgsVectorColorRampV2* ramp, + QgsVectorColorRamp* ramp, bool inverted = false, - const QgsRendererRangeV2LabelFormat& legendFormat = QgsRendererRangeV2LabelFormat() + const QgsRendererRangeLabelFormat& legendFormat = QgsRendererRangeLabelFormat() ); //! create renderer from XML element - static QgsFeatureRendererV2* create( QDomElement& element ); + static QgsFeatureRenderer* create( QDomElement& element ); //! store renderer info to XML element virtual QDomElement save( QDomDocument& doc ) override; @@ -295,12 +295,12 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public 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 ); + void setSourceColorRamp( QgsVectorColorRamp* ramp ); //! @note added in 2.1 bool invertedColorRamp() { return mInvertedColorRamp; } @@ -311,7 +311,7 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2 * @param ramp color ramp. Ownership is transferred to the renderer * @param inverted set to true to invert ramp colors */ - void updateColorRamp( QgsVectorColorRampV2* ramp = nullptr, bool inverted = false ); + void updateColorRamp( QgsVectorColorRamp* ramp = nullptr, bool inverted = false ); /** Update all the symbols but leave breaks and colors. This method also sets the source * symbol for the renderer. @@ -370,19 +370,19 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2 //! @note added in 2.6 virtual QString legendClassificationAttribute() const override { return classAttribute(); } - //! 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 ); + static QgsGraduatedSymbolRenderer* convertFromRenderer( const QgsFeatureRenderer *renderer ); protected: QString mAttrName; QgsRangeList mRanges; Mode mMode; QScopedPointer mSourceSymbol; - QScopedPointer mSourceColorRamp; + QScopedPointer mSourceColorRamp; bool mInvertedColorRamp; - QgsRendererRangeV2LabelFormat mLabelFormat; + QgsRendererRangeLabelFormat mLabelFormat; QScopedPointer mRotation; QScopedPointer mSizeScale; diff --git a/src/core/symbology-ng/qgsheatmaprenderer.cpp b/src/core/symbology-ng/qgsheatmaprenderer.cpp index be89c33ad54..ada2e5da0c7 100644 --- a/src/core/symbology-ng/qgsheatmaprenderer.cpp +++ b/src/core/symbology-ng/qgsheatmaprenderer.cpp @@ -23,7 +23,7 @@ #include "qgsvectorlayer.h" #include "qgssymbollayer.h" #include "qgsogcutils.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgsrendercontext.h" #include "qgspainteffect.h" #include "qgspainteffectregistry.h" @@ -32,7 +32,7 @@ #include QgsHeatmapRenderer::QgsHeatmapRenderer() - : QgsFeatureRendererV2( "heatmapRenderer" ) + : QgsFeatureRenderer( "heatmapRenderer" ) , mCalculatedMaxValue( 0 ) , mRadius( 10 ) , mRadiusPixels( 0 ) @@ -45,7 +45,7 @@ QgsHeatmapRenderer::QgsHeatmapRenderer() , mRenderQuality( 3 ) , mFeaturesRendered( 0 ) { - mGradientRamp = new QgsVectorGradientColorRampV2( QColor( 255, 255, 255 ), QColor( 0, 0, 0 ) ); + mGradientRamp = new QgsVectorGradientColorRamp( QColor( 255, 255, 255 ), QColor( 0, 0, 0 ) ); } @@ -322,7 +322,7 @@ void QgsHeatmapRenderer::modifyRequestExtent( QgsRectangle &extent, QgsRenderCon extent.setYMaximum( extent.yMaximum() + extension ); } -QgsFeatureRendererV2* QgsHeatmapRenderer::create( QDomElement& element ) +QgsFeatureRenderer* QgsHeatmapRenderer::create( QDomElement& element ) { QgsHeatmapRenderer* r = new QgsHeatmapRenderer(); r->setRadius( element.attribute( "radius", "50.0" ).toFloat() ); @@ -401,7 +401,7 @@ QList QgsHeatmapRenderer::usedAttributes() return attributes.toList(); } -QgsHeatmapRenderer* QgsHeatmapRenderer::convertFromRenderer( const QgsFeatureRendererV2 *renderer ) +QgsHeatmapRenderer* QgsHeatmapRenderer::convertFromRenderer( const QgsFeatureRenderer *renderer ) { if ( renderer->type() == "heatmapRenderer" ) { @@ -413,7 +413,7 @@ QgsHeatmapRenderer* QgsHeatmapRenderer::convertFromRenderer( const QgsFeatureRen } } -void QgsHeatmapRenderer::setColorRamp( QgsVectorColorRampV2 *ramp ) +void QgsHeatmapRenderer::setColorRamp( QgsVectorColorRamp *ramp ) { delete mGradientRamp; mGradientRamp = ramp; diff --git a/src/core/symbology-ng/qgsheatmaprenderer.h b/src/core/symbology-ng/qgsheatmaprenderer.h index 69daee644f3..e870bf22c94 100644 --- a/src/core/symbology-ng/qgsheatmaprenderer.h +++ b/src/core/symbology-ng/qgsheatmaprenderer.h @@ -16,20 +16,20 @@ #define QGSHEATMAPRENDERER_H #include "qgis.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgssymbol.h" #include "qgsexpression.h" #include "qgsgeometry.h" #include -class QgsVectorColorRampV2; +class QgsVectorColorRamp; /** \ingroup core * \class QgsHeatmapRenderer * \brief A renderer which draws points as a live heatmap * \note Added in version 2.7 */ -class CORE_EXPORT QgsHeatmapRenderer : public QgsFeatureRendererV2 +class CORE_EXPORT QgsHeatmapRenderer : public QgsFeatureRenderer { public: @@ -47,9 +47,9 @@ class CORE_EXPORT QgsHeatmapRenderer : public QgsFeatureRendererV2 virtual QgsSymbolList symbols( QgsRenderContext &context ) override; virtual QString dump() const override; virtual QList usedAttributes() override; - static QgsFeatureRendererV2* create( QDomElement& element ); + static QgsFeatureRenderer* create( QDomElement& element ); virtual QDomElement save( QDomDocument& doc ) override; - static QgsHeatmapRenderer* convertFromRenderer( const QgsFeatureRendererV2* renderer ); + static QgsHeatmapRenderer* convertFromRenderer( const QgsFeatureRenderer* renderer ); //reimplemented to extent the request so that points up to heatmap's radius distance outside //visible area are included @@ -61,12 +61,12 @@ class CORE_EXPORT QgsHeatmapRenderer : public QgsFeatureRendererV2 * @returns color ramp for heatmap * @see setColorRamp */ - QgsVectorColorRampV2* colorRamp() const { return mGradientRamp; } + QgsVectorColorRamp* colorRamp() const { return mGradientRamp; } /** 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 ); + void setColorRamp( QgsVectorColorRamp* ramp ); /** Returns whether the ramp is inverted * @returns true if color ramp is inverted @@ -185,7 +185,7 @@ class CORE_EXPORT QgsHeatmapRenderer : public QgsFeatureRendererV2 int mWeightAttrNum; QScopedPointer mWeightExpression; - QgsVectorColorRampV2* mGradientRamp; + QgsVectorColorRamp* mGradientRamp; bool mInvertRamp; double mExplicitMax; diff --git a/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp b/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp index 65e16128fec..b246bb52d23 100644 --- a/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp +++ b/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp @@ -29,8 +29,8 @@ #include #include -QgsInvertedPolygonRenderer::QgsInvertedPolygonRenderer( QgsFeatureRendererV2* subRenderer ) - : QgsFeatureRendererV2( "invertedPolygonRenderer" ) +QgsInvertedPolygonRenderer::QgsInvertedPolygonRenderer( QgsFeatureRenderer* subRenderer ) + : QgsFeatureRenderer( "invertedPolygonRenderer" ) , mPreprocessingEnabled( false ) { if ( subRenderer ) @@ -39,7 +39,7 @@ QgsInvertedPolygonRenderer::QgsInvertedPolygonRenderer( QgsFeatureRendererV2* su } else { - mSubRenderer.reset( QgsFeatureRendererV2::defaultRenderer( QgsWkbTypes::PolygonGeometry ) ); + mSubRenderer.reset( QgsFeatureRenderer::defaultRenderer( QgsWkbTypes::PolygonGeometry ) ); } } @@ -47,7 +47,7 @@ QgsInvertedPolygonRenderer::~QgsInvertedPolygonRenderer() { } -void QgsInvertedPolygonRenderer::setEmbeddedRenderer( QgsFeatureRendererV2* subRenderer ) +void QgsInvertedPolygonRenderer::setEmbeddedRenderer( QgsFeatureRenderer* subRenderer ) { if ( subRenderer ) { @@ -59,7 +59,7 @@ void QgsInvertedPolygonRenderer::setEmbeddedRenderer( QgsFeatureRendererV2* subR } } -const QgsFeatureRendererV2* QgsInvertedPolygonRenderer::embeddedRenderer() const +const QgsFeatureRenderer* QgsInvertedPolygonRenderer::embeddedRenderer() const { return mSubRenderer.data(); } @@ -373,14 +373,14 @@ QgsInvertedPolygonRenderer* QgsInvertedPolygonRenderer::clone() const return newRenderer; } -QgsFeatureRendererV2* QgsInvertedPolygonRenderer::create( QDomElement& element ) +QgsFeatureRenderer* QgsInvertedPolygonRenderer::create( QDomElement& element ) { QgsInvertedPolygonRenderer* r = new QgsInvertedPolygonRenderer(); //look for an embedded renderer QDomElement embeddedRendererElem = element.firstChildElement( "renderer-v2" ); if ( !embeddedRendererElem.isNull() ) { - QgsFeatureRendererV2* renderer = QgsFeatureRendererV2::load( embeddedRendererElem ); + QgsFeatureRenderer* renderer = QgsFeatureRenderer::load( embeddedRendererElem ); r->setEmbeddedRenderer( renderer ); } r->setPreprocessingEnabled( element.attribute( "preprocessing", "0" ).toInt() == 1 ); @@ -455,7 +455,7 @@ QgsSymbolList QgsInvertedPolygonRenderer::symbols( QgsRenderContext& context ) return mSubRenderer->symbols( context ); } -QgsFeatureRendererV2::Capabilities QgsInvertedPolygonRenderer::capabilities() +QgsFeatureRenderer::Capabilities QgsInvertedPolygonRenderer::capabilities() { if ( !mSubRenderer ) { @@ -500,7 +500,7 @@ bool QgsInvertedPolygonRenderer::willRenderFeature( QgsFeature& feat, QgsRenderC return mSubRenderer->willRenderFeature( feat, context ); } -QgsInvertedPolygonRenderer* QgsInvertedPolygonRenderer::convertFromRenderer( const QgsFeatureRendererV2 *renderer ) +QgsInvertedPolygonRenderer* QgsInvertedPolygonRenderer::convertFromRenderer( const QgsFeatureRenderer *renderer ) { if ( renderer->type() == "invertedPolygonRenderer" ) { diff --git a/src/core/symbology-ng/qgsinvertedpolygonrenderer.h b/src/core/symbology-ng/qgsinvertedpolygonrenderer.h index 7d49032789d..6c0ddb4bbda 100644 --- a/src/core/symbology-ng/qgsinvertedpolygonrenderer.h +++ b/src/core/symbology-ng/qgsinvertedpolygonrenderer.h @@ -16,7 +16,7 @@ #define QGSINVERTEDPOLYGONRENDERER_H #include "qgis.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgsexpression.h" #include "qgsfeature.h" #include "qgsgeometry.h" @@ -36,7 +36,7 @@ * * @note added in 2.4 */ -class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRendererV2 +class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRenderer { public: @@ -44,7 +44,7 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRendererV2 * @param embeddedRenderer optional embeddedRenderer. If null, a default one will be assigned. * Ownership will be transferred. */ - QgsInvertedPolygonRenderer( QgsFeatureRendererV2* embeddedRenderer = nullptr ); + QgsInvertedPolygonRenderer( QgsFeatureRenderer* embeddedRenderer = nullptr ); virtual ~QgsInvertedPolygonRenderer(); @@ -109,7 +109,7 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRendererV2 virtual bool willRenderFeature( QgsFeature& feat, QgsRenderContext& context ) override; /** Creates a renderer out of an XML, for loading*/ - static QgsFeatureRendererV2* create( QDomElement& element ); + static QgsFeatureRenderer* create( QDomElement& element ); /** Creates an XML representation of the renderer. Used for saving purpose * @param doc the XML document where to create the XML subtree @@ -117,8 +117,8 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRendererV2 */ virtual QDomElement save( QDomDocument& doc ) override; - void setEmbeddedRenderer( QgsFeatureRendererV2* subRenderer ) override; - const QgsFeatureRendererV2* embeddedRenderer() const override; + void setEmbeddedRenderer( QgsFeatureRenderer* subRenderer ) override; + const QgsFeatureRenderer* embeddedRenderer() const override; virtual void setLegendSymbolItem( const QString& key, QgsSymbol* symbol ) override; @@ -140,7 +140,7 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRendererV2 * @note added in 2.5 * @returns a new renderer if the conversion was possible, otherwise 0. */ - static QgsInvertedPolygonRenderer* convertFromRenderer( const QgsFeatureRendererV2* renderer ); + static QgsInvertedPolygonRenderer* convertFromRenderer( const QgsFeatureRenderer* renderer ); private: /** Private copy constructor. @see clone() */ @@ -149,7 +149,7 @@ class CORE_EXPORT QgsInvertedPolygonRenderer : public QgsFeatureRendererV2 QgsInvertedPolygonRenderer& operator=( const QgsInvertedPolygonRenderer& ); /** Embedded renderer */ - QScopedPointer mSubRenderer; + QScopedPointer mSubRenderer; /** Structure where the reversed geometry is built during renderFeature */ struct CombinedFeature diff --git a/src/core/symbology-ng/qgslegendsymbolitemv2.cpp b/src/core/symbology-ng/qgslegendsymbolitem.cpp similarity index 77% rename from src/core/symbology-ng/qgslegendsymbolitemv2.cpp rename to src/core/symbology-ng/qgslegendsymbolitem.cpp index 18d2cad7a88..e76417b2943 100644 --- a/src/core/symbology-ng/qgslegendsymbolitemv2.cpp +++ b/src/core/symbology-ng/qgslegendsymbolitem.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgslegendsymbolitemv2.cpp + qgslegendsymbolitem.cpp -------------------------------------- Date : August 2014 Copyright : (C) 2014 by Martin Dobias @@ -13,11 +13,11 @@ * * ***************************************************************************/ -#include "qgslegendsymbolitemv2.h" +#include "qgslegendsymbolitem.h" #include "qgssymbol.h" -QgsLegendSymbolItemV2::QgsLegendSymbolItemV2() +QgsLegendSymbolItem::QgsLegendSymbolItem() : mSymbol( nullptr ) , mCheckable( false ) , mOriginalSymbolPointer( nullptr ) @@ -27,7 +27,7 @@ QgsLegendSymbolItemV2::QgsLegendSymbolItemV2() { } -QgsLegendSymbolItemV2::QgsLegendSymbolItemV2( QgsSymbol* symbol, const QString& label, const QString& ruleKey, bool checkable, int scaleMinDenom, int scaleMaxDenom, int level, const QString& parentRuleKey ) +QgsLegendSymbolItem::QgsLegendSymbolItem( QgsSymbol* symbol, const QString& label, const QString& ruleKey, bool checkable, int scaleMinDenom, int scaleMaxDenom, int level, const QString& parentRuleKey ) : mSymbol( symbol ? symbol->clone() : nullptr ) , mLabel( label ) , mKey( ruleKey ) @@ -40,19 +40,19 @@ QgsLegendSymbolItemV2::QgsLegendSymbolItemV2( QgsSymbol* symbol, const QString& { } -QgsLegendSymbolItemV2::QgsLegendSymbolItemV2( const QgsLegendSymbolItemV2& other ) +QgsLegendSymbolItem::QgsLegendSymbolItem( const QgsLegendSymbolItem& other ) : mSymbol( nullptr ) , mOriginalSymbolPointer( nullptr ) { *this = other; } -QgsLegendSymbolItemV2::~QgsLegendSymbolItemV2() +QgsLegendSymbolItem::~QgsLegendSymbolItem() { delete mSymbol; } -QgsLegendSymbolItemV2& QgsLegendSymbolItemV2::operator=( const QgsLegendSymbolItemV2 & other ) +QgsLegendSymbolItem& QgsLegendSymbolItem::operator=( const QgsLegendSymbolItem & other ) { if ( this == &other ) return *this; @@ -70,7 +70,7 @@ QgsLegendSymbolItemV2& QgsLegendSymbolItemV2::operator=( const QgsLegendSymbolIt return *this; } -bool QgsLegendSymbolItemV2::isScaleOK( double scale ) const +bool QgsLegendSymbolItem::isScaleOK( double scale ) const { if ( scale <= 0 ) return true; @@ -83,7 +83,7 @@ bool QgsLegendSymbolItemV2::isScaleOK( double scale ) const return true; } -void QgsLegendSymbolItemV2::setSymbol( QgsSymbol* s ) +void QgsLegendSymbolItem::setSymbol( QgsSymbol* s ) { delete mSymbol; mSymbol = s ? s->clone() : nullptr; diff --git a/src/core/symbology-ng/qgslegendsymbolitemv2.h b/src/core/symbology-ng/qgslegendsymbolitem.h similarity index 87% rename from src/core/symbology-ng/qgslegendsymbolitemv2.h rename to src/core/symbology-ng/qgslegendsymbolitem.h index 9b23ed2523b..03e349ffeea 100644 --- a/src/core/symbology-ng/qgslegendsymbolitemv2.h +++ b/src/core/symbology-ng/qgslegendsymbolitem.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgslegendsymbolitemv2.h + qgslegendsymbolitem.h -------------------------------------- Date : August 2014 Copyright : (C) 2014 by Martin Dobias @@ -27,16 +27,16 @@ class QgsSymbol; * @see QgsSymbolLegendNode * @note added in 2.6 */ -class CORE_EXPORT QgsLegendSymbolItemV2 +class CORE_EXPORT QgsLegendSymbolItem { 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 { return mSymbol; } @@ -93,6 +93,6 @@ class CORE_EXPORT QgsLegendSymbolItemV2 }; -typedef QList< QgsLegendSymbolItemV2 > QgsLegendSymbolListV2; +typedef QList< QgsLegendSymbolItem > QgsLegendSymbolListV2; #endif // QGSLEGENDSYMBOLITEMV2_H diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayer.cpp similarity index 87% rename from src/core/symbology-ng/qgslinesymbollayerv2.cpp rename to src/core/symbology-ng/qgslinesymbollayer.cpp index dd1198e503a..853f2b2697b 100644 --- a/src/core/symbology-ng/qgslinesymbollayerv2.cpp +++ b/src/core/symbology-ng/qgslinesymbollayer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgslinesymbollayerv2.cpp + qgslinesymbollayer.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -13,9 +13,9 @@ * * ***************************************************************************/ -#include "qgslinesymbollayerv2.h" -#include "qgscurvev2.h" -#include "qgscurvepolygonv2.h" +#include "qgslinesymbollayer.h" +#include "qgscurve.h" +#include "qgscurvepolygon.h" #include "qgsdxfexport.h" #include "qgssymbollayerutils.h" #include "qgsexpression.h" @@ -31,7 +31,7 @@ #include -QgsSimpleLineSymbolLayerV2::QgsSimpleLineSymbolLayerV2( const QColor& color, double width, Qt::PenStyle penStyle ) +QgsSimpleLineSymbolLayer::QgsSimpleLineSymbolLayer( const QColor& color, double width, Qt::PenStyle penStyle ) : mPenStyle( penStyle ) , mPenJoinStyle( DEFAULT_SIMPLELINE_JOINSTYLE ) , mPenCapStyle( DEFAULT_SIMPLELINE_CAPSTYLE ) @@ -44,17 +44,17 @@ QgsSimpleLineSymbolLayerV2::QgsSimpleLineSymbolLayerV2( const QColor& color, dou mCustomDashVector << 5 << 2; } -void QgsSimpleLineSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit ) +void QgsSimpleLineSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit ) { - QgsLineSymbolLayerV2::setOutputUnit( unit ); + QgsLineSymbolLayer::setOutputUnit( unit ); mWidthUnit = unit; mOffsetUnit = unit; mCustomDashPatternUnit = unit; } -QgsUnitTypes::RenderUnit QgsSimpleLineSymbolLayerV2::outputUnit() const +QgsUnitTypes::RenderUnit QgsSimpleLineSymbolLayer::outputUnit() const { - QgsUnitTypes::RenderUnit unit = QgsLineSymbolLayerV2::outputUnit(); + QgsUnitTypes::RenderUnit unit = QgsLineSymbolLayer::outputUnit(); if ( mWidthUnit != unit || mOffsetUnit != unit || mCustomDashPatternUnit != unit ) { return QgsUnitTypes::RenderUnknownUnit; @@ -62,17 +62,17 @@ QgsUnitTypes::RenderUnit QgsSimpleLineSymbolLayerV2::outputUnit() const return unit; } -void QgsSimpleLineSymbolLayerV2::setMapUnitScale( const QgsMapUnitScale &scale ) +void QgsSimpleLineSymbolLayer::setMapUnitScale( const QgsMapUnitScale &scale ) { - QgsLineSymbolLayerV2::setMapUnitScale( scale ); + QgsLineSymbolLayer::setMapUnitScale( scale ); mWidthMapUnitScale = scale; mOffsetMapUnitScale = scale; mCustomDashPatternMapUnitScale = scale; } -QgsMapUnitScale QgsSimpleLineSymbolLayerV2::mapUnitScale() const +QgsMapUnitScale QgsSimpleLineSymbolLayer::mapUnitScale() const { - if ( QgsLineSymbolLayerV2::mapUnitScale() == mWidthMapUnitScale && + if ( QgsLineSymbolLayer::mapUnitScale() == mWidthMapUnitScale && mWidthMapUnitScale == mOffsetMapUnitScale && mOffsetMapUnitScale == mCustomDashPatternMapUnitScale ) { @@ -81,7 +81,7 @@ QgsMapUnitScale QgsSimpleLineSymbolLayerV2::mapUnitScale() const return QgsMapUnitScale(); } -QgsSymbolLayer* QgsSimpleLineSymbolLayerV2::create( const QgsStringMap& props ) +QgsSymbolLayer* QgsSimpleLineSymbolLayer::create( const QgsStringMap& props ) { QColor color = DEFAULT_SIMPLELINE_COLOR; double width = DEFAULT_SIMPLELINE_WIDTH; @@ -126,7 +126,7 @@ QgsSymbolLayer* QgsSimpleLineSymbolLayerV2::create( const QgsStringMap& props ) penStyle = QgsSymbolLayerUtils::decodePenStyle( props["penstyle"] ); } - QgsSimpleLineSymbolLayerV2* l = new QgsSimpleLineSymbolLayerV2( color, width, penStyle ); + QgsSimpleLineSymbolLayer* l = new QgsSimpleLineSymbolLayer( color, width, penStyle ); if ( props.contains( "line_width_unit" ) ) { l->setWidthUnit( QgsUnitTypes::decodeRenderUnit( props["line_width_unit"] ) ); @@ -181,12 +181,12 @@ QgsSymbolLayer* QgsSimpleLineSymbolLayerV2::create( const QgsStringMap& props ) } -QString QgsSimpleLineSymbolLayerV2::layerType() const +QString QgsSimpleLineSymbolLayer::layerType() const { return "SimpleLine"; } -void QgsSimpleLineSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) +void QgsSimpleLineSymbolLayer::startRender( QgsSymbolRenderContext& context ) { QColor penColor = mColor; penColor.setAlphaF( mColor.alphaF() * context.alpha() ); @@ -233,12 +233,12 @@ void QgsSimpleLineSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) prepareExpressions( context ); } -void QgsSimpleLineSymbolLayerV2::stopRender( QgsSymbolRenderContext& context ) +void QgsSimpleLineSymbolLayer::stopRender( QgsSymbolRenderContext& context ) { Q_UNUSED( context ); } -void QgsSimpleLineSymbolLayerV2::renderPolygonOutline( const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) +void QgsSimpleLineSymbolLayer::renderPolygonOutline( const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) { QPainter* p = context.renderContext().painter(); if ( !p ) @@ -285,7 +285,7 @@ void QgsSimpleLineSymbolLayerV2::renderPolygonOutline( const QPolygonF& points, } -void QgsSimpleLineSymbolLayerV2::renderPolyline( const QPolygonF& points, QgsSymbolRenderContext& context ) +void QgsSimpleLineSymbolLayer::renderPolyline( const QPolygonF& points, QgsSymbolRenderContext& context ) { QPainter* p = context.renderContext().painter(); if ( !p ) @@ -350,7 +350,7 @@ void QgsSimpleLineSymbolLayerV2::renderPolyline( const QPolygonF& points, QgsSym } } -QgsStringMap QgsSimpleLineSymbolLayerV2::properties() const +QgsStringMap QgsSimpleLineSymbolLayer::properties() const { QgsStringMap map; map["line_color"] = QgsSymbolLayerUtils::encodeColor( mColor ); @@ -372,9 +372,9 @@ QgsStringMap QgsSimpleLineSymbolLayerV2::properties() const return map; } -QgsSimpleLineSymbolLayerV2* QgsSimpleLineSymbolLayerV2::clone() const +QgsSimpleLineSymbolLayer* QgsSimpleLineSymbolLayer::clone() const { - QgsSimpleLineSymbolLayerV2* l = new QgsSimpleLineSymbolLayerV2( mColor, mWidth, mPenStyle ); + QgsSimpleLineSymbolLayer* l = new QgsSimpleLineSymbolLayer( mColor, mWidth, mPenStyle ); l->setWidthUnit( mWidthUnit ); l->setWidthMapUnitScale( mWidthMapUnitScale ); l->setOffsetUnit( mOffsetUnit ); @@ -392,7 +392,7 @@ QgsSimpleLineSymbolLayerV2* QgsSimpleLineSymbolLayerV2::clone() const return l; } -void QgsSimpleLineSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const +void QgsSimpleLineSymbolLayer::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const { if ( mPenStyle == Qt::NoPen ) return; @@ -411,7 +411,7 @@ void QgsSimpleLineSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element, Qt::PenStyle penStyle = mUseCustomDashPattern ? Qt::CustomDashLine : mPenStyle; QgsSymbolLayerUtils::lineToSld( doc, strokeElem, penStyle, mColor, mWidth, - &mPenJoinStyle, &mPenCapStyle, &mCustomDashVector ); + &mPenJoinStyle, &mPenCapStyle, &mCustomDashVector ); // if ( !qgsDoubleNear( mOffset, 0.0 ) ) @@ -422,7 +422,7 @@ void QgsSimpleLineSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element, } } -QString QgsSimpleLineSymbolLayerV2::ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const +QString QgsSimpleLineSymbolLayer::ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const { if ( mUseCustomDashPattern ) { @@ -437,7 +437,7 @@ QString QgsSimpleLineSymbolLayerV2::ogrFeatureStyle( double mmScaleFactor, doubl } } -QgsSymbolLayer* QgsSimpleLineSymbolLayerV2::createFromSld( QDomElement &element ) +QgsSymbolLayer* QgsSimpleLineSymbolLayer::createFromSld( QDomElement &element ) { QgsDebugMsg( "Entered." ); @@ -453,9 +453,9 @@ QgsSymbolLayer* QgsSimpleLineSymbolLayerV2::createFromSld( QDomElement &element QVector customDashVector; if ( !QgsSymbolLayerUtils::lineFromSld( strokeElem, penStyle, - color, width, - &penJoinStyle, &penCapStyle, - &customDashVector ) ) + color, width, + &penJoinStyle, &penCapStyle, + &customDashVector ) ) return nullptr; double offset = 0.0; @@ -468,7 +468,7 @@ QgsSymbolLayer* QgsSimpleLineSymbolLayerV2::createFromSld( QDomElement &element offset = d; } - QgsSimpleLineSymbolLayerV2* l = new QgsSimpleLineSymbolLayerV2( color, width, penStyle ); + QgsSimpleLineSymbolLayer* l = new QgsSimpleLineSymbolLayer( color, width, penStyle ); l->setOffset( offset ); l->setPenJoinStyle( penJoinStyle ); l->setPenCapStyle( penCapStyle ); @@ -477,14 +477,14 @@ QgsSymbolLayer* QgsSimpleLineSymbolLayerV2::createFromSld( QDomElement &element return l; } -void QgsSimpleLineSymbolLayerV2::applySizeScale( QgsSymbolRenderContext& context, QPen& pen, QPen& selPen ) +void QgsSimpleLineSymbolLayer::applySizeScale( QgsSymbolRenderContext& context, QPen& pen, QPen& selPen ) { double scaledWidth = QgsSymbolLayerUtils::convertToPainterUnits( context.renderContext(), mWidth, mWidthUnit, mWidthMapUnitScale ); pen.setWidthF( scaledWidth ); selPen.setWidthF( scaledWidth ); } -void QgsSimpleLineSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolRenderContext& context, QPen& pen, QPen& selPen, double& offset ) +void QgsSimpleLineSymbolLayer::applyDataDefinedSymbology( QgsSymbolRenderContext& context, QPen& pen, QPen& selPen, double& offset ) { if ( !hasDataDefinedProperties() ) return; // shortcut @@ -581,7 +581,7 @@ void QgsSimpleLineSymbolLayerV2::applyDataDefinedSymbology( QgsSymbolRenderConte } } -double QgsSimpleLineSymbolLayerV2::estimateMaxBleed() const +double QgsSimpleLineSymbolLayer::estimateMaxBleed() const { if ( mDrawInsidePolygon ) { @@ -594,18 +594,18 @@ double QgsSimpleLineSymbolLayerV2::estimateMaxBleed() const } } -QVector QgsSimpleLineSymbolLayerV2::dxfCustomDashPattern( QgsUnitTypes::RenderUnit& unit ) const +QVector QgsSimpleLineSymbolLayer::dxfCustomDashPattern( QgsUnitTypes::RenderUnit& unit ) const { unit = mCustomDashPatternUnit; return mUseCustomDashPattern ? mCustomDashVector : QVector(); } -Qt::PenStyle QgsSimpleLineSymbolLayerV2::dxfPenStyle() const +Qt::PenStyle QgsSimpleLineSymbolLayer::dxfPenStyle() const { return mPenStyle; } -double QgsSimpleLineSymbolLayerV2::dxfWidth( const QgsDxfExport& e, QgsSymbolRenderContext& context ) const +double QgsSimpleLineSymbolLayer::dxfWidth( const QgsDxfExport& e, QgsSymbolRenderContext& context ) const { double width = mWidth; @@ -622,7 +622,7 @@ double QgsSimpleLineSymbolLayerV2::dxfWidth( const QgsDxfExport& e, QgsSymbolRen return width * e.mapUnitScaleFactor( e.symbologyScaleDenominator(), widthUnit(), e.mapUnits() ); } -QColor QgsSimpleLineSymbolLayerV2::dxfColor( QgsSymbolRenderContext& context ) const +QColor QgsSimpleLineSymbolLayer::dxfColor( QgsSymbolRenderContext& context ) const { if ( hasDataDefinedProperty( QgsSymbolLayer::EXPR_COLOR ) ) { @@ -635,7 +635,7 @@ QColor QgsSimpleLineSymbolLayerV2::dxfColor( QgsSymbolRenderContext& context ) c return mColor; } -double QgsSimpleLineSymbolLayerV2::dxfOffset( const QgsDxfExport& e, QgsSymbolRenderContext &context ) const +double QgsSimpleLineSymbolLayer::dxfOffset( const QgsDxfExport& e, QgsSymbolRenderContext &context ) const { Q_UNUSED( e ); double offset = mOffset; @@ -717,7 +717,7 @@ class MyLine ///@endcond -QgsMarkerLineSymbolLayerV2::QgsMarkerLineSymbolLayerV2( bool rotateMarker, double interval ) +QgsMarkerLineSymbolLayer::QgsMarkerLineSymbolLayer( bool rotateMarker, double interval ) { mRotateMarker = rotateMarker; mInterval = interval; @@ -727,15 +727,15 @@ QgsMarkerLineSymbolLayerV2::QgsMarkerLineSymbolLayerV2( bool rotateMarker, doubl mOffsetAlongLine = 0; mOffsetAlongLineUnit = QgsUnitTypes::RenderMillimeters; - setSubSymbol( new QgsMarkerSymbolV2() ); + setSubSymbol( new QgsMarkerSymbol() ); } -QgsMarkerLineSymbolLayerV2::~QgsMarkerLineSymbolLayerV2() +QgsMarkerLineSymbolLayer::~QgsMarkerLineSymbolLayer() { delete mMarker; } -QgsSymbolLayer* QgsMarkerLineSymbolLayerV2::create( const QgsStringMap& props ) +QgsSymbolLayer* QgsMarkerLineSymbolLayer::create( const QgsStringMap& props ) { bool rotate = DEFAULT_MARKERLINE_ROTATE; double interval = DEFAULT_MARKERLINE_INTERVAL; @@ -746,7 +746,7 @@ QgsSymbolLayer* QgsMarkerLineSymbolLayerV2::create( const QgsStringMap& props ) if ( props.contains( "rotate" ) ) rotate = ( props["rotate"] == "1" ); - QgsMarkerLineSymbolLayerV2* x = new QgsMarkerLineSymbolLayerV2( rotate, interval ); + QgsMarkerLineSymbolLayer* x = new QgsMarkerLineSymbolLayer( rotate, interval ); if ( props.contains( "offset" ) ) { x->setOffset( props["offset"].toDouble() ); @@ -802,23 +802,23 @@ QgsSymbolLayer* QgsMarkerLineSymbolLayerV2::create( const QgsStringMap& props ) return x; } -QString QgsMarkerLineSymbolLayerV2::layerType() const +QString QgsMarkerLineSymbolLayer::layerType() const { return "MarkerLine"; } -void QgsMarkerLineSymbolLayerV2::setColor( const QColor& color ) +void QgsMarkerLineSymbolLayer::setColor( const QColor& color ) { mMarker->setColor( color ); mColor = color; } -QColor QgsMarkerLineSymbolLayerV2::color() const +QColor QgsMarkerLineSymbolLayer::color() const { return mMarker ? mMarker->color() : mColor; } -void QgsMarkerLineSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) +void QgsMarkerLineSymbolLayer::startRender( QgsSymbolRenderContext& context ) { mMarker->setAlpha( context.alpha() ); @@ -836,12 +836,12 @@ void QgsMarkerLineSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) prepareExpressions( context ); } -void QgsMarkerLineSymbolLayerV2::stopRender( QgsSymbolRenderContext& context ) +void QgsMarkerLineSymbolLayer::stopRender( QgsSymbolRenderContext& context ) { mMarker->stopRender( context.renderContext() ); } -void QgsMarkerLineSymbolLayerV2::renderPolyline( const QPolygonF& points, QgsSymbolRenderContext& context ) +void QgsMarkerLineSymbolLayer::renderPolyline( const QPolygonF& points, QgsSymbolRenderContext& context ) { double offset = mOffset; @@ -914,9 +914,9 @@ void QgsMarkerLineSymbolLayerV2::renderPolyline( const QPolygonF& points, QgsSym } } -void QgsMarkerLineSymbolLayerV2::renderPolygonOutline( const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) +void QgsMarkerLineSymbolLayer::renderPolygonOutline( const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) { - const QgsCurvePolygonV2* curvePolygon = dynamic_cast( context.renderContext().geometry() ); + const QgsCurvePolygon* curvePolygon = dynamic_cast( context.renderContext().geometry() ); if ( curvePolygon ) { @@ -938,7 +938,7 @@ void QgsMarkerLineSymbolLayerV2::renderPolygonOutline( const QPolygonF& points, } } -void QgsMarkerLineSymbolLayerV2::renderPolylineInterval( const QPolygonF& points, QgsSymbolRenderContext& context ) +void QgsMarkerLineSymbolLayer::renderPolylineInterval( const QPolygonF& points, QgsSymbolRenderContext& context ) { if ( points.isEmpty() ) return; @@ -1023,7 +1023,7 @@ static double _averageAngle( QPointF prevPt, QPointF pt, QPointF nextPt ) return atan2( unitY, unitX ); } -void QgsMarkerLineSymbolLayerV2::renderPolylineVertex( const QPolygonF& points, QgsSymbolRenderContext& context, Placement placement ) +void QgsMarkerLineSymbolLayer::renderPolylineVertex( const QPolygonF& points, QgsSymbolRenderContext& context, Placement placement ) { if ( points.isEmpty() ) return; @@ -1134,7 +1134,7 @@ void QgsMarkerLineSymbolLayerV2::renderPolylineVertex( const QPolygonF& points, mMarker->setAngle( origAngle ); } -double QgsMarkerLineSymbolLayerV2::markerAngle( const QPolygonF& points, bool isRing, int vertex ) +double QgsMarkerLineSymbolLayer::markerAngle( const QPolygonF& points, bool isRing, int vertex ) { double angle = 0; const QPointF& pt = points[vertex]; @@ -1209,7 +1209,7 @@ double QgsMarkerLineSymbolLayerV2::markerAngle( const QPolygonF& points, bool is return angle; } -void QgsMarkerLineSymbolLayerV2::renderOffsetVertexAlongLine( const QPolygonF &points, int vertex, double distance, QgsSymbolRenderContext& context ) +void QgsMarkerLineSymbolLayer::renderOffsetVertexAlongLine( const QPolygonF &points, int vertex, double distance, QgsSymbolRenderContext& context ) { if ( points.isEmpty() ) return; @@ -1268,7 +1268,7 @@ void QgsMarkerLineSymbolLayerV2::renderOffsetVertexAlongLine( const QPolygonF &p return; } -void QgsMarkerLineSymbolLayerV2::renderPolylineCentral( const QPolygonF& points, QgsSymbolRenderContext& context ) +void QgsMarkerLineSymbolLayer::renderPolylineCentral( const QPolygonF& points, QgsSymbolRenderContext& context ) { if ( !points.isEmpty() ) { @@ -1317,7 +1317,7 @@ void QgsMarkerLineSymbolLayerV2::renderPolylineCentral( const QPolygonF& points, } -QgsStringMap QgsMarkerLineSymbolLayerV2::properties() const +QgsStringMap QgsMarkerLineSymbolLayer::properties() const { QgsStringMap map; map["rotate"] = ( mRotateMarker ? "1" : "0" ); @@ -1347,12 +1347,12 @@ QgsStringMap QgsMarkerLineSymbolLayerV2::properties() const return map; } -QgsSymbol* QgsMarkerLineSymbolLayerV2::subSymbol() +QgsSymbol* QgsMarkerLineSymbolLayer::subSymbol() { return mMarker; } -bool QgsMarkerLineSymbolLayerV2::setSubSymbol( QgsSymbol* symbol ) +bool QgsMarkerLineSymbolLayer::setSubSymbol( QgsSymbol* symbol ) { if ( !symbol || symbol->type() != QgsSymbol::Marker ) { @@ -1361,14 +1361,14 @@ bool QgsMarkerLineSymbolLayerV2::setSubSymbol( QgsSymbol* symbol ) } delete mMarker; - mMarker = static_cast( symbol ); + mMarker = static_cast( symbol ); mColor = mMarker->color(); return true; } -QgsMarkerLineSymbolLayerV2* QgsMarkerLineSymbolLayerV2::clone() const +QgsMarkerLineSymbolLayer* QgsMarkerLineSymbolLayer::clone() const { - QgsMarkerLineSymbolLayerV2* x = new QgsMarkerLineSymbolLayerV2( mRotateMarker, mInterval ); + QgsMarkerLineSymbolLayer* x = new QgsMarkerLineSymbolLayer( mRotateMarker, mInterval ); x->setSubSymbol( mMarker->clone() ); x->setOffset( mOffset ); x->setPlacement( mPlacement ); @@ -1384,7 +1384,7 @@ QgsMarkerLineSymbolLayerV2* QgsMarkerLineSymbolLayerV2::clone() const return x; } -void QgsMarkerLineSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const +void QgsMarkerLineSymbolLayer::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const { for ( int i = 0; i < mMarker->symbolLayerCount(); i++ ) { @@ -1433,7 +1433,7 @@ void QgsMarkerLineSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element, strokeElem.appendChild( graphicStrokeElem ); QgsSymbolLayer *layer = mMarker->symbolLayer( i ); - QgsMarkerSymbolLayerV2 *markerLayer = static_cast( layer ); + QgsMarkerSymbolLayer *markerLayer = static_cast( layer ); if ( !markerLayer ) { graphicStrokeElem.appendChild( doc.createComment( QString( "MarkerSymbolLayerV2 expected, %1 found. Skip it." ).arg( layer->layerType() ) ) ); @@ -1459,7 +1459,7 @@ void QgsMarkerLineSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element, } } -QgsSymbolLayer* QgsMarkerLineSymbolLayerV2::createFromSld( QDomElement &element ) +QgsSymbolLayer* QgsMarkerLineSymbolLayer::createFromSld( QDomElement &element ) { QgsDebugMsg( "Entered." ); @@ -1491,14 +1491,14 @@ QgsSymbolLayer* QgsMarkerLineSymbolLayerV2::createFromSld( QDomElement &element } } - QgsMarkerSymbolV2 *marker = nullptr; + QgsMarkerSymbol *marker = nullptr; QgsSymbolLayer *l = QgsSymbolLayerUtils::createMarkerLayerFromSld( graphicStrokeElem ); if ( l ) { QgsSymbolLayerList layers; layers.append( l ); - marker = new QgsMarkerSymbolV2( layers ); + marker = new QgsMarkerSymbol( layers ); } if ( !marker ) @@ -1524,7 +1524,7 @@ QgsSymbolLayer* QgsMarkerLineSymbolLayerV2::createFromSld( QDomElement &element offset = d; } - QgsMarkerLineSymbolLayerV2* x = new QgsMarkerLineSymbolLayerV2( rotateMarker ); + QgsMarkerLineSymbolLayer* x = new QgsMarkerLineSymbolLayer( rotateMarker ); x->setPlacement( placement ); x->setInterval( interval ); x->setSubSymbol( marker ); @@ -1532,36 +1532,36 @@ QgsSymbolLayer* QgsMarkerLineSymbolLayerV2::createFromSld( QDomElement &element return x; } -void QgsMarkerLineSymbolLayerV2::setWidth( double width ) +void QgsMarkerLineSymbolLayer::setWidth( double width ) { mMarker->setSize( width ); } -void QgsMarkerLineSymbolLayerV2::setDataDefinedProperty( const QString& property, QgsDataDefined* dataDefined ) +void QgsMarkerLineSymbolLayer::setDataDefinedProperty( const QString& property, QgsDataDefined* dataDefined ) { if ( property == QgsSymbolLayer::EXPR_WIDTH && mMarker && dataDefined ) { mMarker->setDataDefinedSize( *dataDefined ); } - QgsLineSymbolLayerV2::setDataDefinedProperty( property, dataDefined ); + QgsLineSymbolLayer::setDataDefinedProperty( property, dataDefined ); } -double QgsMarkerLineSymbolLayerV2::width() const +double QgsMarkerLineSymbolLayer::width() const { return mMarker->size(); } -void QgsMarkerLineSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit ) +void QgsMarkerLineSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit ) { - QgsLineSymbolLayerV2::setOutputUnit( unit ); + QgsLineSymbolLayer::setOutputUnit( unit ); mIntervalUnit = unit; mOffsetUnit = unit; mOffsetAlongLineUnit = unit; } -QgsUnitTypes::RenderUnit QgsMarkerLineSymbolLayerV2::outputUnit() const +QgsUnitTypes::RenderUnit QgsMarkerLineSymbolLayer::outputUnit() const { - QgsUnitTypes::RenderUnit unit = QgsLineSymbolLayerV2::outputUnit(); + QgsUnitTypes::RenderUnit unit = QgsLineSymbolLayer::outputUnit(); if ( mIntervalUnit != unit || mOffsetUnit != unit || mOffsetAlongLineUnit != unit ) { return QgsUnitTypes::RenderUnknownUnit; @@ -1569,17 +1569,17 @@ QgsUnitTypes::RenderUnit QgsMarkerLineSymbolLayerV2::outputUnit() const return unit; } -void QgsMarkerLineSymbolLayerV2::setMapUnitScale( const QgsMapUnitScale &scale ) +void QgsMarkerLineSymbolLayer::setMapUnitScale( const QgsMapUnitScale &scale ) { - QgsLineSymbolLayerV2::setMapUnitScale( scale ); + QgsLineSymbolLayer::setMapUnitScale( scale ); mIntervalMapUnitScale = scale; mOffsetMapUnitScale = scale; mOffsetAlongLineMapUnitScale = scale; } -QgsMapUnitScale QgsMarkerLineSymbolLayerV2::mapUnitScale() const +QgsMapUnitScale QgsMarkerLineSymbolLayer::mapUnitScale() const { - if ( QgsLineSymbolLayerV2::mapUnitScale() == mIntervalMapUnitScale && + if ( QgsLineSymbolLayer::mapUnitScale() == mIntervalMapUnitScale && mIntervalMapUnitScale == mOffsetMapUnitScale && mOffsetMapUnitScale == mOffsetAlongLineMapUnitScale ) { @@ -1588,15 +1588,15 @@ QgsMapUnitScale QgsMarkerLineSymbolLayerV2::mapUnitScale() const return QgsMapUnitScale(); } -QSet QgsMarkerLineSymbolLayerV2::usedAttributes() const +QSet QgsMarkerLineSymbolLayer::usedAttributes() const { - QSet attr = QgsLineSymbolLayerV2::usedAttributes(); + QSet attr = QgsLineSymbolLayer::usedAttributes(); if ( mMarker ) attr.unite( mMarker->usedAttributes() ); return attr; } -double QgsMarkerLineSymbolLayerV2::estimateMaxBleed() const +double QgsMarkerLineSymbolLayer::estimateMaxBleed() const { return ( mMarker->size() / 2.0 ) + mOffset; } diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.h b/src/core/symbology-ng/qgslinesymbollayer.h similarity index 94% rename from src/core/symbology-ng/qgslinesymbollayerv2.h rename to src/core/symbology-ng/qgslinesymbollayer.h index 7cb3910e1a0..341229ad152 100644 --- a/src/core/symbology-ng/qgslinesymbollayerv2.h +++ b/src/core/symbology-ng/qgslinesymbollayer.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgslinesymbollayerv2.h + qgslinesymbollayer.h --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -30,14 +30,14 @@ class QgsExpression; #define DEFAULT_SIMPLELINE_CAPSTYLE Qt::SquareCap /** \ingroup core - * \class QgsSimpleLineSymbolLayerV2 + * \class QgsSimpleLineSymbolLayer */ -class CORE_EXPORT QgsSimpleLineSymbolLayerV2 : public QgsLineSymbolLayerV2 +class CORE_EXPORT QgsSimpleLineSymbolLayer : public QgsLineSymbolLayer { public: - QgsSimpleLineSymbolLayerV2( const QColor& color = DEFAULT_SIMPLELINE_COLOR, - double width = DEFAULT_SIMPLELINE_WIDTH, - Qt::PenStyle penStyle = DEFAULT_SIMPLELINE_PENSTYLE ); + QgsSimpleLineSymbolLayer( const QColor& color = DEFAULT_SIMPLELINE_COLOR, + double width = DEFAULT_SIMPLELINE_WIDTH, + Qt::PenStyle penStyle = DEFAULT_SIMPLELINE_PENSTYLE ); // static stuff @@ -59,7 +59,7 @@ class CORE_EXPORT QgsSimpleLineSymbolLayerV2 : public QgsLineSymbolLayerV2 QgsStringMap properties() const override; - QgsSimpleLineSymbolLayerV2* clone() const override; + QgsSimpleLineSymbolLayer* clone() const override; void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const override; @@ -145,15 +145,15 @@ class CORE_EXPORT QgsSimpleLineSymbolLayerV2 : public QgsLineSymbolLayerV2 #define DEFAULT_MARKERLINE_INTERVAL 3 /** \ingroup core - * \class QgsMarkerLineSymbolLayerV2 + * \class QgsMarkerLineSymbolLayer */ -class CORE_EXPORT QgsMarkerLineSymbolLayerV2 : public QgsLineSymbolLayerV2 +class CORE_EXPORT QgsMarkerLineSymbolLayer : public QgsLineSymbolLayer { public: - QgsMarkerLineSymbolLayerV2( bool rotateMarker = DEFAULT_MARKERLINE_ROTATE, - double interval = DEFAULT_MARKERLINE_INTERVAL ); + QgsMarkerLineSymbolLayer( bool rotateMarker = DEFAULT_MARKERLINE_ROTATE, + double interval = DEFAULT_MARKERLINE_INTERVAL ); - ~QgsMarkerLineSymbolLayerV2(); + ~QgsMarkerLineSymbolLayer(); /** * Defines how/where the marker should be placed on the line @@ -202,7 +202,7 @@ class CORE_EXPORT QgsMarkerLineSymbolLayerV2 : public QgsLineSymbolLayerV2 QgsStringMap properties() const override; - QgsMarkerLineSymbolLayerV2* clone() const override; + QgsMarkerLineSymbolLayer* clone() const override; void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const override; @@ -343,7 +343,7 @@ class CORE_EXPORT QgsMarkerLineSymbolLayerV2 : public QgsLineSymbolLayerV2 double mInterval; QgsUnitTypes::RenderUnit mIntervalUnit; QgsMapUnitScale mIntervalMapUnitScale; - QgsMarkerSymbolV2* mMarker; + QgsMarkerSymbol* mMarker; Placement mPlacement; double mOffsetAlongLine; //distance to offset along line before marker is drawn QgsUnitTypes::RenderUnit mOffsetAlongLineUnit; //unit for offset along line diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayer.cpp similarity index 91% rename from src/core/symbology-ng/qgsmarkersymbollayerv2.cpp rename to src/core/symbology-ng/qgsmarkersymbollayer.cpp index 1af7521d35f..a121e8eb577 100644 --- a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp +++ b/src/core/symbology-ng/qgsmarkersymbollayer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsmarkersymbollayerv2.cpp + qgsmarkersymbollayer.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include "qgsmarkersymbollayerv2.h" +#include "qgsmarkersymbollayer.h" #include "qgssymbollayerutils.h" #include "qgsdxfexport.h" @@ -162,7 +162,7 @@ void QgsSimpleMarkerSymbolLayerBase::startRender( QgsSymbolRenderContext &contex prepareExpressions( context ); - QgsMarkerSymbolLayerV2::startRender( context ); + QgsMarkerSymbolLayer::startRender( context ); } void QgsSimpleMarkerSymbolLayerBase::stopRender( QgsSymbolRenderContext &context ) @@ -679,10 +679,10 @@ void QgsSimpleMarkerSymbolLayerBase::calculateOffsetAndRotation( QgsSymbolRender // -// QgsSimpleMarkerSymbolLayerV2 +// QgsSimpleMarkerSymbolLayer // -QgsSimpleMarkerSymbolLayerV2::QgsSimpleMarkerSymbolLayerV2( const QString& name, const QColor& color, const QColor& borderColor, double size, double angle, QgsSymbol::ScaleMethod scaleMethod, +QgsSimpleMarkerSymbolLayer::QgsSimpleMarkerSymbolLayer( const QString& name, const QColor& color, const QColor& borderColor, double size, double angle, QgsSymbol::ScaleMethod scaleMethod, Qt::PenJoinStyle penJoinStyle ) : QgsSimpleMarkerSymbolLayerBase( decodeShape( name ), size, angle, scaleMethod ) , mBorderColor( borderColor ) @@ -696,7 +696,7 @@ QgsSimpleMarkerSymbolLayerV2::QgsSimpleMarkerSymbolLayerV2( const QString& name, mColor = color; } -QgsSimpleMarkerSymbolLayerV2::QgsSimpleMarkerSymbolLayerV2( QgsSimpleMarkerSymbolLayerBase::Shape shape, double size, double angle, QgsSymbol::ScaleMethod scaleMethod, const QColor& color, const QColor& borderColor, Qt::PenJoinStyle penJoinStyle ) +QgsSimpleMarkerSymbolLayer::QgsSimpleMarkerSymbolLayer( QgsSimpleMarkerSymbolLayerBase::Shape shape, double size, double angle, QgsSymbol::ScaleMethod scaleMethod, const QColor& color, const QColor& borderColor, Qt::PenJoinStyle penJoinStyle ) : QgsSimpleMarkerSymbolLayerBase( shape, size, angle, scaleMethod ) , mBorderColor( borderColor ) , mOutlineStyle( Qt::SolidLine ) @@ -709,7 +709,7 @@ QgsSimpleMarkerSymbolLayerV2::QgsSimpleMarkerSymbolLayerV2( QgsSimpleMarkerSymbo mColor = color; } -QgsSymbolLayer* QgsSimpleMarkerSymbolLayerV2::create( const QgsStringMap& props ) +QgsSymbolLayer* QgsSimpleMarkerSymbolLayer::create( const QgsStringMap& props ) { Shape shape = Circle; QColor color = DEFAULT_SIMPLEMARKER_COLOR; @@ -749,7 +749,7 @@ QgsSymbolLayer* QgsSimpleMarkerSymbolLayerV2::create( const QgsStringMap& props if ( props.contains( "scale_method" ) ) scaleMethod = QgsSymbolLayerUtils::decodeScaleMethod( props["scale_method"] ); - QgsSimpleMarkerSymbolLayerV2* m = new QgsSimpleMarkerSymbolLayerV2( shape, size, angle, scaleMethod, color, borderColor, penJoinStyle ); + QgsSimpleMarkerSymbolLayer* m = new QgsSimpleMarkerSymbolLayer( shape, size, angle, scaleMethod, color, borderColor, penJoinStyle ); if ( props.contains( "offset" ) ) m->setOffset( QgsSymbolLayerUtils::decodePoint( props["offset"] ) ); if ( props.contains( "offset_unit" ) ) @@ -792,11 +792,11 @@ QgsSymbolLayer* QgsSimpleMarkerSymbolLayerV2::create( const QgsStringMap& props if ( props.contains( "horizontal_anchor_point" ) ) { - m->setHorizontalAnchorPoint( QgsMarkerSymbolLayerV2::HorizontalAnchorPoint( props[ "horizontal_anchor_point" ].toInt() ) ); + m->setHorizontalAnchorPoint( QgsMarkerSymbolLayer::HorizontalAnchorPoint( props[ "horizontal_anchor_point" ].toInt() ) ); } if ( props.contains( "vertical_anchor_point" ) ) { - m->setVerticalAnchorPoint( QgsMarkerSymbolLayerV2::VerticalAnchorPoint( props[ "vertical_anchor_point" ].toInt() ) ); + m->setVerticalAnchorPoint( QgsMarkerSymbolLayer::VerticalAnchorPoint( props[ "vertical_anchor_point" ].toInt() ) ); } m->restoreDataDefinedProperties( props ); @@ -805,12 +805,12 @@ QgsSymbolLayer* QgsSimpleMarkerSymbolLayerV2::create( const QgsStringMap& props } -QString QgsSimpleMarkerSymbolLayerV2::layerType() const +QString QgsSimpleMarkerSymbolLayer::layerType() const { return "SimpleMarker"; } -void QgsSimpleMarkerSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) +void QgsSimpleMarkerSymbolLayer::startRender( QgsSymbolRenderContext& context ) { QgsSimpleMarkerSymbolLayerBase::startRender( context ); @@ -882,7 +882,7 @@ void QgsSimpleMarkerSymbolLayerV2::startRender( QgsSymbolRenderContext& context } -bool QgsSimpleMarkerSymbolLayerV2::prepareCache( QgsSymbolRenderContext& context ) +bool QgsSimpleMarkerSymbolLayer::prepareCache( QgsSymbolRenderContext& context ) { double scaledSize = QgsSymbolLayerUtils::convertToPainterUnits( context.renderContext(), mSize, mSizeUnit, mSizeMapUnitScale ); @@ -944,22 +944,22 @@ bool QgsSimpleMarkerSymbolLayerV2::prepareCache( QgsSymbolRenderContext& context return true; } -bool QgsSimpleMarkerSymbolLayerV2::prepareShape( const QString& name ) +bool QgsSimpleMarkerSymbolLayer::prepareShape( const QString& name ) { return shapeToPolygon( name.isNull() ? mShape : decodeShape( name ), mPolygon ); } -bool QgsSimpleMarkerSymbolLayerV2::prepareShape( const QString& name, QPolygonF &polygon ) const +bool QgsSimpleMarkerSymbolLayer::prepareShape( const QString& name, QPolygonF &polygon ) const { return shapeToPolygon( decodeShape( name ), polygon ); } -bool QgsSimpleMarkerSymbolLayerV2::preparePath( QString name ) +bool QgsSimpleMarkerSymbolLayer::preparePath( QString name ) { return prepareMarkerPath( decodeShape( name ) ); } -void QgsSimpleMarkerSymbolLayerV2::draw( QgsSymbolRenderContext &context, QgsSimpleMarkerSymbolLayerBase::Shape shape, const QPolygonF &polygon, const QPainterPath &path ) +void QgsSimpleMarkerSymbolLayer::draw( QgsSymbolRenderContext &context, QgsSimpleMarkerSymbolLayerBase::Shape shape, const QPolygonF &polygon, const QPainterPath &path ) { //making changes here? Don't forget to also update ::bounds if the changes affect the bounding box //of the rendered point! @@ -1035,7 +1035,7 @@ void QgsSimpleMarkerSymbolLayerV2::draw( QgsSymbolRenderContext &context, QgsSim p->drawPath( path ); } -void QgsSimpleMarkerSymbolLayerV2::renderPoint( QPointF point, QgsSymbolRenderContext& context ) +void QgsSimpleMarkerSymbolLayer::renderPoint( QPointF point, QgsSymbolRenderContext& context ) { //making changes here? Don't forget to also update ::bounds if the changes affect the bounding box //of the rendered point! @@ -1069,7 +1069,7 @@ void QgsSimpleMarkerSymbolLayerV2::renderPoint( QPointF point, QgsSymbolRenderCo } } -QgsStringMap QgsSimpleMarkerSymbolLayerV2::properties() const +QgsStringMap QgsSimpleMarkerSymbolLayer::properties() const { QgsStringMap map; map["name"] = encodeShape( mShape ); @@ -1097,9 +1097,9 @@ QgsStringMap QgsSimpleMarkerSymbolLayerV2::properties() const return map; } -QgsSimpleMarkerSymbolLayerV2* QgsSimpleMarkerSymbolLayerV2::clone() const +QgsSimpleMarkerSymbolLayer* QgsSimpleMarkerSymbolLayer::clone() const { - QgsSimpleMarkerSymbolLayerV2* m = new QgsSimpleMarkerSymbolLayerV2( mShape, mSize, mAngle, mScaleMethod, mColor, mBorderColor, mPenJoinStyle ); + QgsSimpleMarkerSymbolLayer* m = new QgsSimpleMarkerSymbolLayer( mShape, mSize, mAngle, mScaleMethod, mColor, mBorderColor, mPenJoinStyle ); m->setOffset( mOffset ); m->setSizeUnit( mSizeUnit ); m->setSizeMapUnitScale( mSizeMapUnitScale ); @@ -1116,7 +1116,7 @@ QgsSimpleMarkerSymbolLayerV2* QgsSimpleMarkerSymbolLayerV2::clone() const return m; } -void QgsSimpleMarkerSymbolLayerV2::writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const +void QgsSimpleMarkerSymbolLayer::writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const { // QDomElement graphicElem = doc.createElement( "se:Graphic" ); @@ -1142,7 +1142,7 @@ void QgsSimpleMarkerSymbolLayerV2::writeSldMarker( QDomDocument &doc, QDomElemen QgsSymbolLayerUtils::createDisplacementElement( doc, graphicElem, mOffset ); } -QString QgsSimpleMarkerSymbolLayerV2::ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const +QString QgsSimpleMarkerSymbolLayer::ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const { Q_UNUSED( mmScaleFactor ); Q_UNUSED( mapUnitScaleFactor ); @@ -1204,7 +1204,7 @@ QString QgsSimpleMarkerSymbolLayerV2::ogrFeatureStyle( double mmScaleFactor, dou return ogrString; } -QgsSymbolLayer* QgsSimpleMarkerSymbolLayerV2::createFromSld( QDomElement &element ) +QgsSymbolLayer* QgsSimpleMarkerSymbolLayer::createFromSld( QDomElement &element ) { QgsDebugMsg( "Entered." ); @@ -1235,7 +1235,7 @@ QgsSymbolLayer* QgsSimpleMarkerSymbolLayerV2::createFromSld( QDomElement &elemen Shape shape = decodeShape( name ); - QgsSimpleMarkerSymbolLayerV2 *m = new QgsSimpleMarkerSymbolLayerV2( shape, size ); + QgsSimpleMarkerSymbolLayer *m = new QgsSimpleMarkerSymbolLayer( shape, size ); m->setColor( color ); m->setBorderColor( borderColor ); m->setAngle( angle ); @@ -1244,7 +1244,7 @@ QgsSymbolLayer* QgsSimpleMarkerSymbolLayerV2::createFromSld( QDomElement &elemen return m; } -void QgsSimpleMarkerSymbolLayerV2::drawMarker( QPainter* p, QgsSymbolRenderContext& context ) +void QgsSimpleMarkerSymbolLayer::drawMarker( QPainter* p, QgsSymbolRenderContext& context ) { Q_UNUSED( context ); @@ -1258,7 +1258,7 @@ void QgsSimpleMarkerSymbolLayerV2::drawMarker( QPainter* p, QgsSymbolRenderConte } } -bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFactor, const QString& layerName, QgsSymbolRenderContext &context, QPointF shift ) const +bool QgsSimpleMarkerSymbolLayer::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFactor, const QString& layerName, QgsSymbolRenderContext &context, QPointF shift ) const { //data defined size? double size = mSize; @@ -1376,13 +1376,13 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc polygon = t.map( polygon ); - QgsPointSequenceV2 p; + QgsPointSequence p; for ( int i = 0; i < polygon.size(); i++ ) p << QgsPointV2( polygon[i] ); p << p[0]; if ( mBrush.style() != Qt::NoBrush ) - e.writePolygon( QgsRingSequenceV2() << p, layerName, "SOLID", bc ); + e.writePolygon( QgsRingSequence() << p, layerName, "SOLID", bc ); if ( mPen.style() != Qt::NoPen ) e.writePolyline( p, layerName, "CONTINUOUS", pc, outlineWidth ); } @@ -1449,37 +1449,37 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc } -void QgsSimpleMarkerSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit ) +void QgsSimpleMarkerSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit ) { - QgsMarkerSymbolLayerV2::setOutputUnit( unit ); + QgsMarkerSymbolLayer::setOutputUnit( unit ); mOutlineWidthUnit = unit; } -QgsUnitTypes::RenderUnit QgsSimpleMarkerSymbolLayerV2::outputUnit() const +QgsUnitTypes::RenderUnit QgsSimpleMarkerSymbolLayer::outputUnit() const { - if ( QgsMarkerSymbolLayerV2::outputUnit() == mOutlineWidthUnit ) + if ( QgsMarkerSymbolLayer::outputUnit() == mOutlineWidthUnit ) { return mOutlineWidthUnit; } return QgsUnitTypes::RenderUnknownUnit; } -void QgsSimpleMarkerSymbolLayerV2::setMapUnitScale( const QgsMapUnitScale& scale ) +void QgsSimpleMarkerSymbolLayer::setMapUnitScale( const QgsMapUnitScale& scale ) { - QgsMarkerSymbolLayerV2::setMapUnitScale( scale ); + QgsMarkerSymbolLayer::setMapUnitScale( scale ); mOutlineWidthMapUnitScale = scale; } -QgsMapUnitScale QgsSimpleMarkerSymbolLayerV2::mapUnitScale() const +QgsMapUnitScale QgsSimpleMarkerSymbolLayer::mapUnitScale() const { - if ( QgsMarkerSymbolLayerV2::mapUnitScale() == mOutlineWidthMapUnitScale ) + if ( QgsMarkerSymbolLayer::mapUnitScale() == mOutlineWidthMapUnitScale ) { return mOutlineWidthMapUnitScale; } return QgsMapUnitScale(); } -QRectF QgsSimpleMarkerSymbolLayerV2::bounds( QPointF point, QgsSymbolRenderContext& context ) +QRectF QgsSimpleMarkerSymbolLayer::bounds( QPointF point, QgsSymbolRenderContext& context ) { QRectF symbolBounds = QgsSimpleMarkerSymbolLayerBase::bounds( point, context ); @@ -1515,7 +1515,7 @@ QRectF QgsSimpleMarkerSymbolLayerV2::bounds( QPointF point, QgsSymbolRenderConte return symbolBounds; } -void QgsSimpleMarkerSymbolLayerV2::setColor( const QColor& color ) +void QgsSimpleMarkerSymbolLayer::setColor( const QColor& color ) { if ( shapeIsFilled( mShape ) ) { @@ -1527,7 +1527,7 @@ void QgsSimpleMarkerSymbolLayerV2::setColor( const QColor& color ) } } -QColor QgsSimpleMarkerSymbolLayerV2::color() const +QColor QgsSimpleMarkerSymbolLayer::color() const { if ( shapeIsFilled( mShape ) ) { @@ -1549,7 +1549,7 @@ QColor QgsSimpleMarkerSymbolLayerV2::color() const QgsFilledMarkerSymbolLayer::QgsFilledMarkerSymbolLayer( QgsSimpleMarkerSymbolLayerBase::Shape shape, double size, double angle, QgsSymbol::ScaleMethod scaleMethod ) : QgsSimpleMarkerSymbolLayerBase( shape, size, angle, scaleMethod ) { - mFill.reset( static_cast( QgsFillSymbolV2::createSimple( QgsStringMap() ) ) ); + mFill.reset( static_cast( QgsFillSymbol::createSimple( QgsStringMap() ) ) ); } QgsSymbolLayer *QgsFilledMarkerSymbolLayer::create( const QgsStringMap &props ) @@ -1581,14 +1581,14 @@ QgsSymbolLayer *QgsFilledMarkerSymbolLayer::create( const QgsStringMap &props ) m->setSizeMapUnitScale( QgsSymbolLayerUtils::decodeMapUnitScale( props["size_map_unit_scale"] ) ); if ( props.contains( "horizontal_anchor_point" ) ) { - m->setHorizontalAnchorPoint( QgsMarkerSymbolLayerV2::HorizontalAnchorPoint( props[ "horizontal_anchor_point" ].toInt() ) ); + m->setHorizontalAnchorPoint( QgsMarkerSymbolLayer::HorizontalAnchorPoint( props[ "horizontal_anchor_point" ].toInt() ) ); } if ( props.contains( "vertical_anchor_point" ) ) { - m->setVerticalAnchorPoint( QgsMarkerSymbolLayerV2::VerticalAnchorPoint( props[ "vertical_anchor_point" ].toInt() ) ); + m->setVerticalAnchorPoint( QgsMarkerSymbolLayer::VerticalAnchorPoint( props[ "vertical_anchor_point" ].toInt() ) ); } - m->setSubSymbol( QgsFillSymbolV2::createSimple( props ) ); + m->setSubSymbol( QgsFillSymbol::createSimple( props ) ); m->restoreDataDefinedProperties( props ); @@ -1660,7 +1660,7 @@ bool QgsFilledMarkerSymbolLayer::setSubSymbol( QgsSymbol *symbol ) { if ( symbol && symbol->type() == QgsSymbol::Fill ) { - mFill.reset( static_cast( symbol ) ); + mFill.reset( static_cast( symbol ) ); return true; } else @@ -1737,7 +1737,7 @@ void QgsFilledMarkerSymbolLayer::draw( QgsSymbolRenderContext &context, QgsSimpl ////////// -QgsSvgMarkerSymbolLayerV2::QgsSvgMarkerSymbolLayerV2( const QString& name, double size, double angle, QgsSymbol::ScaleMethod scaleMethod ) +QgsSvgMarkerSymbolLayer::QgsSvgMarkerSymbolLayer( const QString& name, double size, double angle, QgsSymbol::ScaleMethod scaleMethod ) { mPath = QgsSymbolLayerUtils::symbolNameToPath( name ); mSize = size; @@ -1751,7 +1751,7 @@ QgsSvgMarkerSymbolLayerV2::QgsSvgMarkerSymbolLayerV2( const QString& name, doubl } -QgsSymbolLayer* QgsSvgMarkerSymbolLayerV2::create( const QgsStringMap& props ) +QgsSymbolLayer* QgsSvgMarkerSymbolLayer::create( const QgsStringMap& props ) { QString name = DEFAULT_SVGMARKER_NAME; double size = DEFAULT_SVGMARKER_SIZE; @@ -1767,7 +1767,7 @@ QgsSymbolLayer* QgsSvgMarkerSymbolLayerV2::create( const QgsStringMap& props ) if ( props.contains( "scale_method" ) ) scaleMethod = QgsSymbolLayerUtils::decodeScaleMethod( props["scale_method"] ); - QgsSvgMarkerSymbolLayerV2* m = new QgsSvgMarkerSymbolLayerV2( name, size, angle, scaleMethod ); + QgsSvgMarkerSymbolLayer* m = new QgsSvgMarkerSymbolLayer( name, size, angle, scaleMethod ); //we only check the svg default parameters if necessary, since it could be expensive if ( !props.contains( "fill" ) && !props.contains( "color" ) && !props.contains( "outline" ) && @@ -1870,11 +1870,11 @@ QgsSymbolLayer* QgsSvgMarkerSymbolLayerV2::create( const QgsStringMap& props ) if ( props.contains( "horizontal_anchor_point" ) ) { - m->setHorizontalAnchorPoint( QgsMarkerSymbolLayerV2::HorizontalAnchorPoint( props[ "horizontal_anchor_point" ].toInt() ) ); + m->setHorizontalAnchorPoint( QgsMarkerSymbolLayer::HorizontalAnchorPoint( props[ "horizontal_anchor_point" ].toInt() ) ); } if ( props.contains( "vertical_anchor_point" ) ) { - m->setVerticalAnchorPoint( QgsMarkerSymbolLayerV2::VerticalAnchorPoint( props[ "vertical_anchor_point" ].toInt() ) ); + m->setVerticalAnchorPoint( QgsMarkerSymbolLayer::VerticalAnchorPoint( props[ "vertical_anchor_point" ].toInt() ) ); } m->restoreDataDefinedProperties( props ); @@ -1882,7 +1882,7 @@ QgsSymbolLayer* QgsSvgMarkerSymbolLayerV2::create( const QgsStringMap& props ) return m; } -void QgsSvgMarkerSymbolLayerV2::setPath( const QString& path ) +void QgsSvgMarkerSymbolLayer::setPath( const QString& path ) { mPath = path; QColor defaultFillColor, defaultOutlineColor; @@ -1927,24 +1927,24 @@ void QgsSvgMarkerSymbolLayerV2::setPath( const QString& path ) } -QString QgsSvgMarkerSymbolLayerV2::layerType() const +QString QgsSvgMarkerSymbolLayer::layerType() const { return "SvgMarker"; } -void QgsSvgMarkerSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) +void QgsSvgMarkerSymbolLayer::startRender( QgsSymbolRenderContext& context ) { - QgsMarkerSymbolLayerV2::startRender( context ); // get anchor point expressions + QgsMarkerSymbolLayer::startRender( context ); // get anchor point expressions Q_UNUSED( context ); prepareExpressions( context ); } -void QgsSvgMarkerSymbolLayerV2::stopRender( QgsSymbolRenderContext& context ) +void QgsSvgMarkerSymbolLayer::stopRender( QgsSymbolRenderContext& context ) { Q_UNUSED( context ); } -void QgsSvgMarkerSymbolLayerV2::renderPoint( QPointF point, QgsSymbolRenderContext& context ) +void QgsSvgMarkerSymbolLayer::renderPoint( QPointF point, QgsSymbolRenderContext& context ) { QPainter *p = context.renderContext().painter(); if ( !p ) @@ -2076,7 +2076,7 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( QPointF point, QgsSymbolRenderConte } -double QgsSvgMarkerSymbolLayerV2::calculateSize( QgsSymbolRenderContext& context, bool& hasDataDefinedSize ) const +double QgsSvgMarkerSymbolLayer::calculateSize( QgsSymbolRenderContext& context, bool& hasDataDefinedSize ) const { double scaledSize = mSize; hasDataDefinedSize = context.renderHints() & QgsSymbol::DataDefinedSizeScale || hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE ); @@ -2103,7 +2103,7 @@ double QgsSvgMarkerSymbolLayerV2::calculateSize( QgsSymbolRenderContext& context return scaledSize; } -void QgsSvgMarkerSymbolLayerV2::calculateOffsetAndRotation( QgsSymbolRenderContext& context, double scaledSize, QPointF& offset, double& angle ) const +void QgsSvgMarkerSymbolLayer::calculateOffsetAndRotation( QgsSymbolRenderContext& context, double scaledSize, QPointF& offset, double& angle ) const { //offset double offsetX = 0; @@ -2142,7 +2142,7 @@ void QgsSvgMarkerSymbolLayerV2::calculateOffsetAndRotation( QgsSymbolRenderConte } -QgsStringMap QgsSvgMarkerSymbolLayerV2::properties() const +QgsStringMap QgsSvgMarkerSymbolLayer::properties() const { QgsStringMap map; map["name"] = QgsSymbolLayerUtils::symbolPathToName( mPath ); @@ -2166,9 +2166,9 @@ QgsStringMap QgsSvgMarkerSymbolLayerV2::properties() const return map; } -QgsSvgMarkerSymbolLayerV2* QgsSvgMarkerSymbolLayerV2::clone() const +QgsSvgMarkerSymbolLayer* QgsSvgMarkerSymbolLayer::clone() const { - QgsSvgMarkerSymbolLayerV2* m = new QgsSvgMarkerSymbolLayerV2( mPath, mSize, mAngle ); + QgsSvgMarkerSymbolLayer* m = new QgsSvgMarkerSymbolLayer( mPath, mSize, mAngle ); m->setColor( mColor ); m->setOutlineColor( mOutlineColor ); m->setOutlineWidth( mOutlineWidth ); @@ -2186,15 +2186,15 @@ QgsSvgMarkerSymbolLayerV2* QgsSvgMarkerSymbolLayerV2::clone() const return m; } -void QgsSvgMarkerSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit ) +void QgsSvgMarkerSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit ) { - QgsMarkerSymbolLayerV2::setOutputUnit( unit ); + QgsMarkerSymbolLayer::setOutputUnit( unit ); mOutlineWidthUnit = unit; } -QgsUnitTypes::RenderUnit QgsSvgMarkerSymbolLayerV2::outputUnit() const +QgsUnitTypes::RenderUnit QgsSvgMarkerSymbolLayer::outputUnit() const { - QgsUnitTypes::RenderUnit unit = QgsMarkerSymbolLayerV2::outputUnit(); + QgsUnitTypes::RenderUnit unit = QgsMarkerSymbolLayer::outputUnit(); if ( unit != mOutlineWidthUnit ) { return QgsUnitTypes::RenderUnknownUnit; @@ -2202,22 +2202,22 @@ QgsUnitTypes::RenderUnit QgsSvgMarkerSymbolLayerV2::outputUnit() const return unit; } -void QgsSvgMarkerSymbolLayerV2::setMapUnitScale( const QgsMapUnitScale &scale ) +void QgsSvgMarkerSymbolLayer::setMapUnitScale( const QgsMapUnitScale &scale ) { - QgsMarkerSymbolLayerV2::setMapUnitScale( scale ); + QgsMarkerSymbolLayer::setMapUnitScale( scale ); mOutlineWidthMapUnitScale = scale; } -QgsMapUnitScale QgsSvgMarkerSymbolLayerV2::mapUnitScale() const +QgsMapUnitScale QgsSvgMarkerSymbolLayer::mapUnitScale() const { - if ( QgsMarkerSymbolLayerV2::mapUnitScale() == mOutlineWidthMapUnitScale ) + if ( QgsMarkerSymbolLayer::mapUnitScale() == mOutlineWidthMapUnitScale ) { return mOutlineWidthMapUnitScale; } return QgsMapUnitScale(); } -void QgsSvgMarkerSymbolLayerV2::writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const +void QgsSvgMarkerSymbolLayer::writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const { // QDomElement graphicElem = doc.createElement( "se:Graphic" ); @@ -2244,7 +2244,7 @@ void QgsSvgMarkerSymbolLayerV2::writeSldMarker( QDomDocument &doc, QDomElement & QgsSymbolLayerUtils::createDisplacementElement( doc, graphicElem, mOffset ); } -QgsSymbolLayer* QgsSvgMarkerSymbolLayerV2::createFromSld( QDomElement &element ) +QgsSymbolLayer* QgsSvgMarkerSymbolLayer::createFromSld( QDomElement &element ) { QgsDebugMsg( "Entered." ); @@ -2275,7 +2275,7 @@ QgsSymbolLayer* QgsSvgMarkerSymbolLayerV2::createFromSld( QDomElement &element ) QPointF offset; QgsSymbolLayerUtils::displacementFromSldElement( graphicElem, offset ); - QgsSvgMarkerSymbolLayerV2* m = new QgsSvgMarkerSymbolLayerV2( path, size ); + QgsSvgMarkerSymbolLayer* m = new QgsSvgMarkerSymbolLayer( path, size ); m->setFillColor( fillColor ); //m->setOutlineColor( outlineColor ); //m->setOutlineWidth( outlineWidth ); @@ -2284,7 +2284,7 @@ QgsSymbolLayer* QgsSvgMarkerSymbolLayerV2::createFromSld( QDomElement &element ) return m; } -bool QgsSvgMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFactor, const QString& layerName, QgsSymbolRenderContext &context, QPointF shift ) const +bool QgsSvgMarkerSymbolLayer::writeDxf( QgsDxfExport& e, double mmMapUnitScaleFactor, const QString& layerName, QgsSymbolRenderContext &context, QPointF shift ) const { Q_UNUSED( layerName ); Q_UNUSED( shift ); //todo... @@ -2415,7 +2415,7 @@ bool QgsSvgMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScale return true; } -QRectF QgsSvgMarkerSymbolLayerV2::bounds( QPointF point, QgsSymbolRenderContext& context ) +QRectF QgsSvgMarkerSymbolLayer::bounds( QPointF point, QgsSymbolRenderContext& context ) { bool hasDataDefinedSize = false; double scaledSize = calculateSize( context, hasDataDefinedSize ); @@ -2499,7 +2499,7 @@ QRectF QgsSvgMarkerSymbolLayerV2::bounds( QPointF point, QgsSymbolRenderContext& ////////// -QgsFontMarkerSymbolLayerV2::QgsFontMarkerSymbolLayerV2( const QString& fontFamily, QChar chr, double pointSize, const QColor& color, double angle ) +QgsFontMarkerSymbolLayer::QgsFontMarkerSymbolLayer( const QString& fontFamily, QChar chr, double pointSize, const QColor& color, double angle ) : mFontMetrics( nullptr ) , mChrWidth( 0 ) { @@ -2518,12 +2518,12 @@ QgsFontMarkerSymbolLayerV2::QgsFontMarkerSymbolLayerV2( const QString& fontFamil mPenJoinStyle = DEFAULT_FONTMARKER_JOINSTYLE; } -QgsFontMarkerSymbolLayerV2::~QgsFontMarkerSymbolLayerV2() +QgsFontMarkerSymbolLayer::~QgsFontMarkerSymbolLayer() { delete mFontMetrics; } -QgsSymbolLayer* QgsFontMarkerSymbolLayerV2::create( const QgsStringMap& props ) +QgsSymbolLayer* QgsFontMarkerSymbolLayer::create( const QgsStringMap& props ) { QString fontFamily = DEFAULT_FONTMARKER_FONT; QChar chr = DEFAULT_FONTMARKER_CHR; @@ -2542,7 +2542,7 @@ QgsSymbolLayer* QgsFontMarkerSymbolLayerV2::create( const QgsStringMap& props ) if ( props.contains( "angle" ) ) angle = props["angle"].toDouble(); - QgsFontMarkerSymbolLayerV2* m = new QgsFontMarkerSymbolLayerV2( fontFamily, chr, pointSize, color, angle ); + QgsFontMarkerSymbolLayer* m = new QgsFontMarkerSymbolLayer( fontFamily, chr, pointSize, color, angle ); if ( props.contains( "outline_color" ) ) m->setOutlineColor( QgsSymbolLayerUtils::decodeColor( props["outline_color"] ) ); @@ -2565,21 +2565,21 @@ QgsSymbolLayer* QgsFontMarkerSymbolLayerV2::create( const QgsStringMap& props ) if ( props.contains( "joinstyle" ) ) m->setPenJoinStyle( QgsSymbolLayerUtils::decodePenJoinStyle( props["joinstyle"] ) ); if ( props.contains( "horizontal_anchor_point" ) ) - m->setHorizontalAnchorPoint( QgsMarkerSymbolLayerV2::HorizontalAnchorPoint( props[ "horizontal_anchor_point" ].toInt() ) ); + m->setHorizontalAnchorPoint( QgsMarkerSymbolLayer::HorizontalAnchorPoint( props[ "horizontal_anchor_point" ].toInt() ) ); if ( props.contains( "vertical_anchor_point" ) ) - m->setVerticalAnchorPoint( QgsMarkerSymbolLayerV2::VerticalAnchorPoint( props[ "vertical_anchor_point" ].toInt() ) ); + m->setVerticalAnchorPoint( QgsMarkerSymbolLayer::VerticalAnchorPoint( props[ "vertical_anchor_point" ].toInt() ) ); m->restoreDataDefinedProperties( props ); return m; } -QString QgsFontMarkerSymbolLayerV2::layerType() const +QString QgsFontMarkerSymbolLayer::layerType() const { return "FontMarker"; } -void QgsFontMarkerSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) +void QgsFontMarkerSymbolLayer::startRender( QgsSymbolRenderContext& context ) { QColor brushColor = mColor; QColor penColor = mOutlineColor; @@ -2602,12 +2602,12 @@ void QgsFontMarkerSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) prepareExpressions( context ); } -void QgsFontMarkerSymbolLayerV2::stopRender( QgsSymbolRenderContext& context ) +void QgsFontMarkerSymbolLayer::stopRender( QgsSymbolRenderContext& context ) { Q_UNUSED( context ); } -QString QgsFontMarkerSymbolLayerV2::characterToRender( QgsSymbolRenderContext& context, QPointF& charOffset, double& charWidth ) +QString QgsFontMarkerSymbolLayer::characterToRender( QgsSymbolRenderContext& context, QPointF& charOffset, double& charWidth ) { charOffset = mChrOffset; QString charToRender = mChr; @@ -2624,7 +2624,7 @@ QString QgsFontMarkerSymbolLayerV2::characterToRender( QgsSymbolRenderContext& c return charToRender; } -void QgsFontMarkerSymbolLayerV2::calculateOffsetAndRotation( QgsSymbolRenderContext& context, +void QgsFontMarkerSymbolLayer::calculateOffsetAndRotation( QgsSymbolRenderContext& context, double scaledSize, bool& hasDataDefinedRotation, QPointF& offset, @@ -2670,7 +2670,7 @@ void QgsFontMarkerSymbolLayerV2::calculateOffsetAndRotation( QgsSymbolRenderCont offset = _rotatedOffset( offset, angle ); } -double QgsFontMarkerSymbolLayerV2::calculateSize( QgsSymbolRenderContext& context ) +double QgsFontMarkerSymbolLayer::calculateSize( QgsSymbolRenderContext& context ) { double scaledSize = mSize; bool hasDataDefinedSize = context.renderHints() & QgsSymbol::DataDefinedSizeScale || hasDataDefinedProperty( QgsSymbolLayer::EXPR_SIZE ); @@ -2696,7 +2696,7 @@ double QgsFontMarkerSymbolLayerV2::calculateSize( QgsSymbolRenderContext& contex return scaledSize; } -void QgsFontMarkerSymbolLayerV2::renderPoint( QPointF point, QgsSymbolRenderContext& context ) +void QgsFontMarkerSymbolLayer::renderPoint( QPointF point, QgsSymbolRenderContext& context ) { QPainter *p = context.renderContext().painter(); if ( !p ) @@ -2789,7 +2789,7 @@ void QgsFontMarkerSymbolLayerV2::renderPoint( QPointF point, QgsSymbolRenderCont p->restore(); } -QgsStringMap QgsFontMarkerSymbolLayerV2::properties() const +QgsStringMap QgsFontMarkerSymbolLayer::properties() const { QgsStringMap props; props["font"] = mFontFamily; @@ -2816,9 +2816,9 @@ QgsStringMap QgsFontMarkerSymbolLayerV2::properties() const return props; } -QgsFontMarkerSymbolLayerV2* QgsFontMarkerSymbolLayerV2::clone() const +QgsFontMarkerSymbolLayer* QgsFontMarkerSymbolLayer::clone() const { - QgsFontMarkerSymbolLayerV2* m = new QgsFontMarkerSymbolLayerV2( mFontFamily, mChr, mSize, mColor, mAngle ); + QgsFontMarkerSymbolLayer* m = new QgsFontMarkerSymbolLayer( mFontFamily, mChr, mSize, mColor, mAngle ); m->setOutlineColor( mOutlineColor ); m->setOutlineWidth( mOutlineWidth ); m->setOutlineWidthUnit( mOutlineWidthUnit ); @@ -2836,7 +2836,7 @@ QgsFontMarkerSymbolLayerV2* QgsFontMarkerSymbolLayerV2::clone() const return m; } -void QgsFontMarkerSymbolLayerV2::writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const +void QgsFontMarkerSymbolLayer::writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const { // QDomElement graphicElem = doc.createElement( "se:Graphic" ); @@ -2864,7 +2864,7 @@ void QgsFontMarkerSymbolLayerV2::writeSldMarker( QDomDocument &doc, QDomElement QgsSymbolLayerUtils::createDisplacementElement( doc, graphicElem, mOffset ); } -QRectF QgsFontMarkerSymbolLayerV2::bounds( QPointF point, QgsSymbolRenderContext& context ) +QRectF QgsFontMarkerSymbolLayer::bounds( QPointF point, QgsSymbolRenderContext& context ) { QPointF chrOffset = mChrOffset; double chrWidth = mChrWidth; @@ -2901,7 +2901,7 @@ QRectF QgsFontMarkerSymbolLayerV2::bounds( QPointF point, QgsSymbolRenderContext return symbolBounds; } -QgsSymbolLayer* QgsFontMarkerSymbolLayerV2::createFromSld( QDomElement &element ) +QgsSymbolLayer* QgsFontMarkerSymbolLayer::createFromSld( QDomElement &element ) { QgsDebugMsg( "Entered." ); @@ -2935,7 +2935,7 @@ QgsSymbolLayer* QgsFontMarkerSymbolLayerV2::createFromSld( QDomElement &element QPointF offset; QgsSymbolLayerUtils::displacementFromSldElement( graphicElem, offset ); - QgsMarkerSymbolLayerV2 *m = new QgsFontMarkerSymbolLayerV2( fontFamily, chr, size, color ); + QgsMarkerSymbolLayer *m = new QgsFontMarkerSymbolLayer( fontFamily, chr, size, color ); m->setAngle( angle ); m->setOffset( offset ); return m; diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.h b/src/core/symbology-ng/qgsmarkersymbollayer.h similarity index 91% rename from src/core/symbology-ng/qgsmarkersymbollayerv2.h rename to src/core/symbology-ng/qgsmarkersymbollayer.h index c696078ffba..02745cf2e7f 100644 --- a/src/core/symbology-ng/qgsmarkersymbollayerv2.h +++ b/src/core/symbology-ng/qgsmarkersymbollayer.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsmarkersymbollayerv2.h + qgsmarkersymbollayer.h --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -37,7 +37,7 @@ * leaves the actual drawing of the symbols to subclasses. * \note Added in version 2.16 */ -class CORE_EXPORT QgsSimpleMarkerSymbolLayerBase : public QgsMarkerSymbolLayerV2 +class CORE_EXPORT QgsSimpleMarkerSymbolLayerBase : public QgsMarkerSymbolLayer { public: @@ -179,14 +179,14 @@ class CORE_EXPORT QgsSimpleMarkerSymbolLayerBase : public 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 CORE_EXPORT QgsSimpleMarkerSymbolLayerV2 : public QgsSimpleMarkerSymbolLayerBase +class CORE_EXPORT QgsSimpleMarkerSymbolLayer : public QgsSimpleMarkerSymbolLayerBase { 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", @@ -200,7 +200,7 @@ class CORE_EXPORT QgsSimpleMarkerSymbolLayerV2 : public QgsSimpleMarkerSymbolLay * @param penJoinStyle join style for outline pen * @deprecated use variant which accepts QgsSimpleMarkerSymbolLayerBase::Shape instead */ - Q_DECL_DEPRECATED QgsSimpleMarkerSymbolLayerV2( const QString& name, + Q_DECL_DEPRECATED QgsSimpleMarkerSymbolLayer( const QString& name, const QColor& color = DEFAULT_SIMPLEMARKER_COLOR, const QColor& borderColor = DEFAULT_SIMPLEMARKER_BORDERCOLOR, double size = DEFAULT_SIMPLEMARKER_SIZE, @@ -208,7 +208,7 @@ class CORE_EXPORT QgsSimpleMarkerSymbolLayerV2 : public QgsSimpleMarkerSymbolLay QgsSymbol::ScaleMethod scaleMethod = DEFAULT_SCALE_METHOD, Qt::PenJoinStyle penJoinStyle = DEFAULT_SIMPLEMARKER_JOINSTYLE ); - /** Constructor for QgsSimpleMarkerSymbolLayerV2. + /** Constructor for QgsSimpleMarkerSymbolLayer. * @param shape symbol shape * @param size symbol size (in mm) * @param angle symbol rotation angle @@ -217,25 +217,25 @@ class CORE_EXPORT QgsSimpleMarkerSymbolLayerV2 : public QgsSimpleMarkerSymbolLay * @param borderColor border color for symbol * @param penJoinStyle join style for outline pen */ - QgsSimpleMarkerSymbolLayerV2( Shape shape = Circle, - double size = DEFAULT_SIMPLEMARKER_SIZE, - double angle = DEFAULT_SIMPLEMARKER_ANGLE, - QgsSymbol::ScaleMethod scaleMethod = DEFAULT_SCALE_METHOD, - const QColor& color = DEFAULT_SIMPLEMARKER_COLOR, - const QColor& borderColor = DEFAULT_SIMPLEMARKER_BORDERCOLOR, - Qt::PenJoinStyle penJoinStyle = DEFAULT_SIMPLEMARKER_JOINSTYLE ); + QgsSimpleMarkerSymbolLayer( Shape shape = Circle, + double size = DEFAULT_SIMPLEMARKER_SIZE, + double angle = DEFAULT_SIMPLEMARKER_ANGLE, + QgsSymbol::ScaleMethod scaleMethod = DEFAULT_SCALE_METHOD, + const QColor& color = DEFAULT_SIMPLEMARKER_COLOR, + const QColor& borderColor = DEFAULT_SIMPLEMARKER_BORDERCOLOR, + Qt::PenJoinStyle penJoinStyle = DEFAULT_SIMPLEMARKER_JOINSTYLE ); // 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() ); - /** 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 ); @@ -245,7 +245,7 @@ class CORE_EXPORT QgsSimpleMarkerSymbolLayerV2 : public QgsSimpleMarkerSymbolLay void startRender( QgsSymbolRenderContext& context ) override; void renderPoint( QPointF point, QgsSymbolRenderContext& context ) override; QgsStringMap properties() const override; - QgsSimpleMarkerSymbolLayerV2* clone() const override; + QgsSimpleMarkerSymbolLayer* clone() const override; void writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const override; QString ogrFeatureStyle( double mmScaleFactor, double mapUnitScaleFactor ) const override; bool writeDxf( QgsDxfExport &e, double mmMapUnitScaleFactor, const QString &layerName, QgsSymbolRenderContext &context, QPointF shift = QPointF( 0.0, 0.0 ) ) const override; @@ -425,7 +425,7 @@ class CORE_EXPORT QgsSimpleMarkerSymbolLayerV2 : public QgsSimpleMarkerSymbolLay /** \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 */ @@ -467,7 +467,7 @@ class CORE_EXPORT QgsFilledMarkerSymbolLayer : public QgsSimpleMarkerSymbolLayer virtual void draw( QgsSymbolRenderContext& context, Shape shape, const QPolygonF& polygon, const QPainterPath& path ) override; //! Fill subsymbol - QScopedPointer< QgsFillSymbolV2 > mFill; + QScopedPointer< QgsFillSymbol > mFill; }; ////////// @@ -477,15 +477,15 @@ class CORE_EXPORT QgsFilledMarkerSymbolLayer : public QgsSimpleMarkerSymbolLayer #define DEFAULT_SVGMARKER_ANGLE 0 /** \ingroup core - * \class QgsSvgMarkerSymbolLayerV2 + * \class QgsSvgMarkerSymbolLayer */ -class CORE_EXPORT QgsSvgMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2 +class CORE_EXPORT QgsSvgMarkerSymbolLayer : public QgsMarkerSymbolLayer { public: - QgsSvgMarkerSymbolLayerV2( const QString& name = DEFAULT_SVGMARKER_NAME, - double size = DEFAULT_SVGMARKER_SIZE, - double angle = DEFAULT_SVGMARKER_ANGLE, - QgsSymbol::ScaleMethod scaleMethod = DEFAULT_SCALE_METHOD ); + QgsSvgMarkerSymbolLayer( const QString& name = DEFAULT_SVGMARKER_NAME, + double size = DEFAULT_SVGMARKER_SIZE, + double angle = DEFAULT_SVGMARKER_ANGLE, + QgsSymbol::ScaleMethod scaleMethod = DEFAULT_SCALE_METHOD ); // static stuff @@ -504,7 +504,7 @@ class CORE_EXPORT QgsSvgMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2 QgsStringMap properties() const override; - QgsSvgMarkerSymbolLayerV2* clone() const override; + QgsSvgMarkerSymbolLayer* clone() const override; void writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const override; @@ -575,18 +575,18 @@ class CORE_EXPORT QgsSvgMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2 #define DEFAULT_FONTMARKER_ANGLE 0 /** \ingroup core - * \class QgsFontMarkerSymbolLayerV2 + * \class QgsFontMarkerSymbolLayer */ -class CORE_EXPORT QgsFontMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2 +class CORE_EXPORT QgsFontMarkerSymbolLayer : public QgsMarkerSymbolLayer { public: - QgsFontMarkerSymbolLayerV2( 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 ); + 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 @@ -605,7 +605,7 @@ class CORE_EXPORT QgsFontMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2 QgsStringMap properties() const override; - QgsFontMarkerSymbolLayerV2* clone() const override; + QgsFontMarkerSymbolLayer* clone() const override; void writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const override; diff --git a/src/core/symbology-ng/qgsnullsymbolrenderer.cpp b/src/core/symbology-ng/qgsnullsymbolrenderer.cpp index 2975b3025ab..a013c2c5e75 100644 --- a/src/core/symbology-ng/qgsnullsymbolrenderer.cpp +++ b/src/core/symbology-ng/qgsnullsymbolrenderer.cpp @@ -21,7 +21,7 @@ #include QgsNullSymbolRenderer::QgsNullSymbolRenderer() - : QgsFeatureRendererV2( "nullSymbol" ) + : QgsFeatureRenderer( "nullSymbol" ) { } @@ -94,7 +94,7 @@ QString QgsNullSymbolRenderer::dump() const return QString( "NULL" ); } -QgsFeatureRendererV2* QgsNullSymbolRenderer::clone() const +QgsFeatureRenderer* QgsNullSymbolRenderer::clone() const { QgsNullSymbolRenderer* r = new QgsNullSymbolRenderer(); return r; @@ -105,7 +105,7 @@ QgsSymbolList QgsNullSymbolRenderer::symbols( QgsRenderContext& ) return QgsSymbolList(); } -QgsFeatureRendererV2* QgsNullSymbolRenderer::create( QDomElement& element ) +QgsFeatureRenderer* QgsNullSymbolRenderer::create( QDomElement& element ) { Q_UNUSED( element ); QgsNullSymbolRenderer* r = new QgsNullSymbolRenderer(); @@ -119,7 +119,7 @@ QDomElement QgsNullSymbolRenderer::save( QDomDocument& doc ) return rendererElem; } -QgsNullSymbolRenderer* QgsNullSymbolRenderer::convertFromRenderer( const QgsFeatureRendererV2 *renderer ) +QgsNullSymbolRenderer* QgsNullSymbolRenderer::convertFromRenderer( const QgsFeatureRenderer *renderer ) { Q_UNUSED( renderer ); return new QgsNullSymbolRenderer(); diff --git a/src/core/symbology-ng/qgsnullsymbolrenderer.h b/src/core/symbology-ng/qgsnullsymbolrenderer.h index 16652de751c..eae2f8d0b29 100644 --- a/src/core/symbology-ng/qgsnullsymbolrenderer.h +++ b/src/core/symbology-ng/qgsnullsymbolrenderer.h @@ -16,7 +16,7 @@ #define QGSNULLSYMBOLRENDERER_H #include "qgis.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgssymbol.h" /** \ingroup core @@ -26,7 +26,7 @@ * \note Added in version 2.16 */ -class CORE_EXPORT QgsNullSymbolRenderer : public QgsFeatureRendererV2 +class CORE_EXPORT QgsNullSymbolRenderer : public QgsFeatureRenderer { public: @@ -44,14 +44,14 @@ class CORE_EXPORT QgsNullSymbolRenderer : public QgsFeatureRendererV2 virtual QList usedAttributes() override; virtual QString dump() const override; - virtual QgsFeatureRendererV2* clone() const override; + virtual QgsFeatureRenderer* clone() const override; virtual QgsSymbolList symbols( QgsRenderContext& context ) override; /** Creates a null renderer from XML element. * @param element DOM element * @returns new null symbol renderer */ - static QgsFeatureRendererV2* create( QDomElement& element ); + static QgsFeatureRenderer* create( QDomElement& element ); virtual QDomElement save( QDomDocument& doc ) override; @@ -59,7 +59,7 @@ class CORE_EXPORT QgsNullSymbolRenderer : public QgsFeatureRendererV2 * @param renderer renderer to convert from * @returns a new renderer if the conversion was possible, otherwise nullptr. */ - static QgsNullSymbolRenderer* convertFromRenderer( const QgsFeatureRendererV2 *renderer ); + static QgsNullSymbolRenderer* convertFromRenderer( const QgsFeatureRenderer *renderer ); private: diff --git a/src/core/symbology-ng/qgspointdisplacementrenderer.cpp b/src/core/symbology-ng/qgspointdisplacementrenderer.cpp index 50354835bea..63a2dd5def2 100644 --- a/src/core/symbology-ng/qgspointdisplacementrenderer.cpp +++ b/src/core/symbology-ng/qgspointdisplacementrenderer.cpp @@ -22,11 +22,11 @@ #include "qgssymbol.h" #include "qgssymbollayerutils.h" #include "qgsvectorlayer.h" -#include "qgssinglesymbolrendererv2.h" +#include "qgssinglesymbolrenderer.h" #include "qgspainteffect.h" #include "qgspainteffectregistry.h" #include "qgsfontutils.h" -#include "qgsmultipointv2.h" +#include "qgsmultipoint.h" #include "qgspointv2.h" #include "qgsunittypes.h" #include "qgswkbptr.h" @@ -41,7 +41,7 @@ #endif QgsPointDisplacementRenderer::QgsPointDisplacementRenderer( const QString& labelAttributeName ) - : QgsFeatureRendererV2( "pointDisplacement" ) + : QgsFeatureRenderer( "pointDisplacement" ) , mLabelAttributeName( labelAttributeName ) , mLabelIndex( -1 ) , mTolerance( 3 ) @@ -53,8 +53,8 @@ QgsPointDisplacementRenderer::QgsPointDisplacementRenderer( const QString& label , mMaxLabelScaleDenominator( -1 ) , mSpatialIndex( nullptr ) { - mRenderer = QgsFeatureRendererV2::defaultRenderer( QgsWkbTypes::PointGeometry ); - mCenterSymbol = new QgsMarkerSymbolV2(); //the symbol for the center of a displacement group + mRenderer = QgsFeatureRenderer::defaultRenderer( QgsWkbTypes::PointGeometry ); + mCenterSymbol = new QgsMarkerSymbol(); //the symbol for the center of a displacement group mDrawLabels = true; } @@ -157,14 +157,14 @@ void QgsPointDisplacementRenderer::drawGroup( const DisplacementGroup& group, Qg //get list of labels and symbols QStringList labelAttributeList; - QList< QgsMarkerSymbolV2* > symbolList; + QList< QgsMarkerSymbol* > symbolList; QgsFeatureList featureList; QgsMultiPointV2* groupMultiPoint = new QgsMultiPointV2(); for ( DisplacementGroup::const_iterator attIt = group.constBegin(); attIt != group.constEnd(); ++attIt ) { labelAttributeList << ( mDrawLabels ? getLabel( attIt.value().first ) : QString() ); - symbolList << dynamic_cast( attIt.value().second ); + symbolList << dynamic_cast( attIt.value().second ); featureList << attIt.value().first; groupMultiPoint->addGeometry( attIt.value().first.geometry().geometry()->clone() ); } @@ -178,7 +178,7 @@ void QgsPointDisplacementRenderer::drawGroup( const DisplacementGroup& group, Qg //calculate max diagonal size from all symbols in group double diagonal = 0; - Q_FOREACH ( QgsMarkerSymbolV2* symbol, symbolList ) + Q_FOREACH ( QgsMarkerSymbol* symbol, symbolList ) { if ( symbol ) { @@ -218,13 +218,13 @@ void QgsPointDisplacementRenderer::drawGroup( const DisplacementGroup& group, Qg drawLabels( pt, symbolContext, labelPositions, labelAttributeList ); } -void QgsPointDisplacementRenderer::setEmbeddedRenderer( QgsFeatureRendererV2* r ) +void QgsPointDisplacementRenderer::setEmbeddedRenderer( QgsFeatureRenderer* r ) { delete mRenderer; mRenderer = r; } -const QgsFeatureRendererV2* QgsPointDisplacementRenderer::embeddedRenderer() const +const QgsFeatureRenderer* QgsPointDisplacementRenderer::embeddedRenderer() const { return mRenderer; } @@ -275,7 +275,7 @@ QList QgsPointDisplacementRenderer::usedAttributes() return attributeList; } -QgsFeatureRendererV2::Capabilities QgsPointDisplacementRenderer::capabilities() +QgsFeatureRenderer::Capabilities QgsPointDisplacementRenderer::capabilities() { if ( !mRenderer ) { @@ -393,7 +393,7 @@ void QgsPointDisplacementRenderer::stopRender( QgsRenderContext& context ) } } -QgsFeatureRendererV2* QgsPointDisplacementRenderer::create( QDomElement& symbologyElem ) +QgsFeatureRenderer* QgsPointDisplacementRenderer::create( QDomElement& symbologyElem ) { QgsPointDisplacementRenderer* r = new QgsPointDisplacementRenderer(); r->setLabelAttributeName( symbologyElem.attribute( "labelAttributeName" ) ); @@ -417,14 +417,14 @@ QgsFeatureRendererV2* QgsPointDisplacementRenderer::create( QDomElement& symbolo QDomElement embeddedRendererElem = symbologyElem.firstChildElement( "renderer-v2" ); if ( !embeddedRendererElem.isNull() ) { - r->setEmbeddedRenderer( QgsFeatureRendererV2::load( embeddedRendererElem ) ); + r->setEmbeddedRenderer( QgsFeatureRenderer::load( embeddedRendererElem ) ); } //center symbol QDomElement centerSymbolElem = symbologyElem.firstChildElement( "symbol" ); if ( !centerSymbolElem.isNull() ) { - r->setCenterSymbol( QgsSymbolLayerUtils::loadSymbol( centerSymbolElem ) ); + r->setCenterSymbol( QgsSymbolLayerUtils::loadSymbol( centerSymbolElem ) ); } return r; } @@ -521,7 +521,7 @@ QString QgsPointDisplacementRenderer::getLabel( const QgsFeature& f ) return attribute; } -void QgsPointDisplacementRenderer::setCenterSymbol( QgsMarkerSymbolV2* symbol ) +void QgsPointDisplacementRenderer::setCenterSymbol( QgsMarkerSymbol* symbol ) { delete mCenterSymbol; mCenterSymbol = symbol; @@ -623,10 +623,10 @@ void QgsPointDisplacementRenderer::drawCircle( double radiusPainterUnits, QgsSym } void QgsPointDisplacementRenderer::drawSymbols( const QgsFeatureList& features, QgsRenderContext& context, - const QList< QgsMarkerSymbolV2* >& symbolList, const QList& symbolPositions, bool selected ) + const QList< QgsMarkerSymbol* >& symbolList, const QList& symbolPositions, bool selected ) { QList::const_iterator symbolPosIt = symbolPositions.constBegin(); - QList::const_iterator symbolIt = symbolList.constBegin(); + QList::const_iterator symbolIt = symbolList.constBegin(); QgsFeatureList::const_iterator featIt = features.constBegin(); for ( ; symbolPosIt != symbolPositions.constEnd() && symbolIt != symbolList.constEnd() && featIt != features.constEnd(); ++symbolPosIt, ++symbolIt, ++featIt ) @@ -686,7 +686,7 @@ void QgsPointDisplacementRenderer::drawLabels( QPointF centerPoint, QgsSymbolRen } } -QgsSymbol* QgsPointDisplacementRenderer::firstSymbolForFeature( QgsFeatureRendererV2* r, QgsFeature& f, QgsRenderContext &context ) +QgsSymbol* QgsPointDisplacementRenderer::firstSymbolForFeature( QgsFeatureRenderer* r, QgsFeature& f, QgsRenderContext &context ) { if ( !r ) { @@ -702,7 +702,7 @@ QgsSymbol* QgsPointDisplacementRenderer::firstSymbolForFeature( QgsFeatureRender return symbolList.at( 0 ); } -QgsPointDisplacementRenderer* QgsPointDisplacementRenderer::convertFromRenderer( const QgsFeatureRendererV2* renderer ) +QgsPointDisplacementRenderer* QgsPointDisplacementRenderer::convertFromRenderer( const QgsFeatureRenderer* renderer ) { if ( renderer->type() == "pointDisplacement" ) { diff --git a/src/core/symbology-ng/qgspointdisplacementrenderer.h b/src/core/symbology-ng/qgspointdisplacementrenderer.h index 181a5c38df6..bfd0fdfb98b 100644 --- a/src/core/symbology-ng/qgspointdisplacementrenderer.h +++ b/src/core/symbology-ng/qgspointdisplacementrenderer.h @@ -20,7 +20,7 @@ #include "qgsfeature.h" #include "qgssymbol.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include #include @@ -29,7 +29,7 @@ class QgsSpatialIndex; /** \ingroup core * A renderer that automatically displaces points with the same position */ -class CORE_EXPORT QgsPointDisplacementRenderer: public QgsFeatureRendererV2 +class CORE_EXPORT QgsPointDisplacementRenderer: public QgsFeatureRenderer { public: @@ -48,7 +48,7 @@ class CORE_EXPORT QgsPointDisplacementRenderer: public QgsFeatureRendererV2 virtual void toSld( QDomDocument& doc, QDomElement &element ) const override; - /** Reimplemented from QgsFeatureRendererV2*/ + /** Reimplemented from QgsFeatureRenderer*/ bool renderFeature( QgsFeature& feature, QgsRenderContext& context, int layer = -1, bool selected = false, bool drawVertexMarker = false ) override; /** Partial proxy that will call this method on the embedded renderer. */ @@ -85,7 +85,7 @@ class CORE_EXPORT QgsPointDisplacementRenderer: public QgsFeatureRendererV2 void stopRender( QgsRenderContext& context ) override; //! create a renderer from XML element - static QgsFeatureRendererV2* create( QDomElement& symbologyElem ); + static QgsFeatureRenderer* create( QDomElement& symbologyElem ); QDomElement save( QDomDocument& doc ) override; QgsLegendSymbologyList legendSymbologyItems( QSize iconSize ) override; @@ -96,8 +96,8 @@ class CORE_EXPORT QgsPointDisplacementRenderer: public QgsFeatureRendererV2 void setLabelAttributeName( const QString& name ) { mLabelAttributeName = name; } QString labelAttributeName() const { return mLabelAttributeName; } - void setEmbeddedRenderer( QgsFeatureRendererV2* r ) override; - const QgsFeatureRendererV2* embeddedRenderer() const override; + void setEmbeddedRenderer( QgsFeatureRenderer* r ) override; + const QgsFeatureRenderer* embeddedRenderer() const override; virtual void setLegendSymbolItem( const QString& key, QgsSymbol* symbol ) override; @@ -141,9 +141,9 @@ class CORE_EXPORT QgsPointDisplacementRenderer: public QgsFeatureRendererV2 void setPlacement( Placement placement ) { mPlacement = placement; } /** Returns the symbol for the center of a displacement group (but _not_ ownership of the symbol)*/ - QgsMarkerSymbolV2* centerSymbol() { return mCenterSymbol;} + QgsMarkerSymbol* centerSymbol() { return mCenterSymbol;} /** Sets the center symbol (takes ownership)*/ - void setCenterSymbol( QgsMarkerSymbolV2* symbol ); + void setCenterSymbol( QgsMarkerSymbol* symbol ); /** Sets the tolerance distance for grouping points. Units are specified using * setToleranceUnit(). @@ -193,12 +193,12 @@ class CORE_EXPORT QgsPointDisplacementRenderer: public 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 ); + static QgsPointDisplacementRenderer* convertFromRenderer( const QgsFeatureRenderer *renderer ); private: /** Embedded renderer. Like This, it is possible to use a classification together with point displacement*/ - QgsFeatureRendererV2* mRenderer; + QgsFeatureRenderer* mRenderer; /** Attribute name for labeling. Empty string means no labelling will be done*/ QString mLabelAttributeName; @@ -206,7 +206,7 @@ class CORE_EXPORT QgsPointDisplacementRenderer: public QgsFeatureRendererV2 int mLabelIndex; /** Center symbol for a displacement group*/ - QgsMarkerSymbolV2* mCenterSymbol; + QgsMarkerSymbol* mCenterSymbol; /** Tolerance. Points that are closer together are considered as equal*/ double mTolerance; @@ -248,17 +248,17 @@ class CORE_EXPORT QgsPointDisplacementRenderer: public QgsFeatureRendererV2 QString getLabel( const QgsFeature& f ); //rendering methods - void renderPoint( const QPointF& point, QgsSymbolRenderContext& context, const QList& symbols, + void renderPoint( const QPointF& point, QgsSymbolRenderContext& context, const QList& symbols, const QStringList& labels ); //helper functions void calculateSymbolAndLabelPositions( QgsSymbolRenderContext &symbolContext, QPointF centerPoint, int nPosition, double symbolDiagonal, QList& symbolPositions, QList& labelShifts , double &circleRadius ) const; void drawGroup( const DisplacementGroup& group, QgsRenderContext& context ); void drawCircle( double radiusPainterUnits, QgsSymbolRenderContext& context, QPointF centerPoint, int nSymbols ); - void drawSymbols( const QgsFeatureList& features, QgsRenderContext& context, const QList< QgsMarkerSymbolV2* >& symbolList, const QList& symbolPositions, bool selected = false ); + void drawSymbols( const QgsFeatureList& features, QgsRenderContext& context, const QList< QgsMarkerSymbol* >& symbolList, const QList& symbolPositions, bool selected = false ); void drawLabels( QPointF centerPoint, QgsSymbolRenderContext& context, const QList& labelShifts, const QStringList& labelList ); /** Returns first symbol for feature or 0 if none*/ - QgsSymbol* firstSymbolForFeature( QgsFeatureRendererV2* r, QgsFeature& f, QgsRenderContext& context ); + QgsSymbol* firstSymbolForFeature( QgsFeatureRenderer* r, QgsFeature& f, QgsRenderContext& context ); }; #endif // QGSPOINTDISPLACEMENTRENDERER_H diff --git a/src/core/symbology-ng/qgsrendererv2.cpp b/src/core/symbology-ng/qgsrenderer.cpp similarity index 65% rename from src/core/symbology-ng/qgsrendererv2.cpp rename to src/core/symbology-ng/qgsrenderer.cpp index 0fd5dbd6656..c4c408d5f8c 100644 --- a/src/core/symbology-ng/qgsrendererv2.cpp +++ b/src/core/symbology-ng/qgsrenderer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsrendererv2.cpp + qgsrenderer.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -13,20 +13,20 @@ * * ***************************************************************************/ -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgssymbol.h" #include "qgssymbollayerutils.h" -#include "qgsrulebasedrendererv2.h" +#include "qgsrulebasedrenderer.h" #include "qgsdatadefined.h" -#include "qgssinglesymbolrendererv2.h" // for default renderer +#include "qgssinglesymbolrenderer.h" // for default renderer -#include "qgsrendererv2registry.h" +#include "qgsrendererregistry.h" #include "qgsrendercontext.h" #include "qgsclipper.h" #include "qgsgeometry.h" -#include "qgsgeometrycollectionv2.h" +#include "qgsgeometrycollection.h" #include "qgsfeature.h" #include "qgslogger.h" #include "qgsvectorlayer.h" @@ -42,28 +42,28 @@ -QgsConstWkbPtr QgsFeatureRendererV2::_getPoint( QPointF& pt, QgsRenderContext& context, QgsConstWkbPtr& wkbPtr ) +QgsConstWkbPtr QgsFeatureRenderer::_getPoint( QPointF& pt, QgsRenderContext& context, QgsConstWkbPtr& wkbPtr ) { return QgsSymbol::_getPoint( pt, context, wkbPtr ); } -QgsConstWkbPtr QgsFeatureRendererV2::_getLineString( QPolygonF& pts, QgsRenderContext& context, QgsConstWkbPtr& wkbPtr, bool clipToExtent ) +QgsConstWkbPtr QgsFeatureRenderer::_getLineString( QPolygonF& pts, QgsRenderContext& context, QgsConstWkbPtr& wkbPtr, bool clipToExtent ) { return QgsSymbol::_getLineString( pts, context, wkbPtr, clipToExtent ); } -QgsConstWkbPtr QgsFeatureRendererV2::_getPolygon( QPolygonF& pts, QList& holes, QgsRenderContext& context, QgsConstWkbPtr& wkbPtr, bool clipToExtent ) +QgsConstWkbPtr QgsFeatureRenderer::_getPolygon( QPolygonF& pts, QList& holes, QgsRenderContext& context, QgsConstWkbPtr& wkbPtr, bool clipToExtent ) { return QgsSymbol::_getPolygon( pts, holes, context, wkbPtr, clipToExtent ); } -void QgsFeatureRendererV2::setScaleMethodToSymbol( QgsSymbol* symbol, int scaleMethod ) +void QgsFeatureRenderer::setScaleMethodToSymbol( QgsSymbol* symbol, int scaleMethod ) { if ( symbol ) { if ( symbol->type() == QgsSymbol::Marker ) { - QgsMarkerSymbolV2* ms = static_cast( symbol ); + QgsMarkerSymbol* ms = static_cast( symbol ); if ( ms ) { ms->setScaleMethod( static_cast< QgsSymbol::ScaleMethod >( scaleMethod ) ); @@ -72,7 +72,7 @@ void QgsFeatureRendererV2::setScaleMethodToSymbol( QgsSymbol* symbol, int scaleM } } -void QgsFeatureRendererV2::copyRendererData( QgsFeatureRendererV2* destRenderer ) const +void QgsFeatureRenderer::copyRendererData( QgsFeatureRenderer* destRenderer ) const { if ( !destRenderer || !mPaintEffect ) return; @@ -82,7 +82,7 @@ void QgsFeatureRendererV2::copyRendererData( QgsFeatureRendererV2* destRenderer destRenderer->mOrderByEnabled = mOrderByEnabled; } -void QgsFeatureRendererV2::copyPaintEffect( QgsFeatureRendererV2 *destRenderer ) const +void QgsFeatureRenderer::copyPaintEffect( QgsFeatureRenderer *destRenderer ) const { if ( !destRenderer || !mPaintEffect ) return; @@ -90,7 +90,7 @@ void QgsFeatureRendererV2::copyPaintEffect( QgsFeatureRendererV2 *destRenderer ) destRenderer->setPaintEffect( mPaintEffect->clone() ); } -QgsFeatureRendererV2::QgsFeatureRendererV2( const QString& type ) +QgsFeatureRenderer::QgsFeatureRenderer( const QString& type ) : mType( type ) , mUsingSymbolLevels( false ) , mCurrentVertexMarkerType( QgsVectorLayer::Cross ) @@ -103,24 +103,24 @@ QgsFeatureRendererV2::QgsFeatureRendererV2( const QString& type ) mPaintEffect->setEnabled( false ); } -QgsFeatureRendererV2::~QgsFeatureRendererV2() +QgsFeatureRenderer::~QgsFeatureRenderer() { delete mPaintEffect; } -QgsFeatureRendererV2* QgsFeatureRendererV2::defaultRenderer( QgsWkbTypes::GeometryType geomType ) +QgsFeatureRenderer* QgsFeatureRenderer::defaultRenderer( QgsWkbTypes::GeometryType geomType ) { - return new QgsSingleSymbolRendererV2( QgsSymbol::defaultSymbol( geomType ) ); + return new QgsSingleSymbolRenderer( QgsSymbol::defaultSymbol( geomType ) ); } -QgsSymbol* QgsFeatureRendererV2::symbolForFeature( QgsFeature& feature ) +QgsSymbol* QgsFeatureRenderer::symbolForFeature( QgsFeature& feature ) { QgsRenderContext context; context.setExpressionContext( QgsExpressionContextUtils::createFeatureBasedContext( feature, QgsFields() ) ); return symbolForFeature( feature, context ); } -QgsSymbol* QgsFeatureRendererV2::symbolForFeature( QgsFeature &feature, QgsRenderContext &context ) +QgsSymbol* QgsFeatureRenderer::symbolForFeature( QgsFeature &feature, QgsRenderContext &context ) { Q_UNUSED( context ); // base method calls deprecated symbolForFeature to maintain API @@ -129,36 +129,36 @@ QgsSymbol* QgsFeatureRendererV2::symbolForFeature( QgsFeature &feature, QgsRende Q_NOWARN_DEPRECATED_POP } -QgsSymbol *QgsFeatureRendererV2::originalSymbolForFeature( QgsFeature &feature ) +QgsSymbol *QgsFeatureRenderer::originalSymbolForFeature( QgsFeature &feature ) { Q_NOWARN_DEPRECATED_PUSH return symbolForFeature( feature ); Q_NOWARN_DEPRECATED_POP } -QgsSymbol *QgsFeatureRendererV2::originalSymbolForFeature( QgsFeature &feature, QgsRenderContext &context ) +QgsSymbol *QgsFeatureRenderer::originalSymbolForFeature( QgsFeature &feature, QgsRenderContext &context ) { return symbolForFeature( feature, context ); } -QSet< QString > QgsFeatureRendererV2::legendKeysForFeature( QgsFeature& feature, QgsRenderContext& context ) +QSet< QString > QgsFeatureRenderer::legendKeysForFeature( QgsFeature& feature, QgsRenderContext& context ) { Q_UNUSED( feature ); Q_UNUSED( context ); return QSet< QString >(); } -void QgsFeatureRendererV2::startRender( QgsRenderContext& context, const QgsVectorLayer* vlayer ) +void QgsFeatureRenderer::startRender( QgsRenderContext& context, const QgsVectorLayer* vlayer ) { startRender( context, vlayer->fields() ); } -bool QgsFeatureRendererV2::filterNeedsGeometry() const +bool QgsFeatureRenderer::filterNeedsGeometry() const { return false; } -bool QgsFeatureRendererV2::renderFeature( QgsFeature& feature, QgsRenderContext& context, int layer, bool selected, bool drawVertexMarker ) +bool QgsFeatureRenderer::renderFeature( QgsFeature& feature, QgsRenderContext& context, int layer, bool selected, bool drawVertexMarker ) { QgsSymbol* symbol = symbolForFeature( feature, context ); if ( !symbol ) @@ -168,23 +168,23 @@ bool QgsFeatureRendererV2::renderFeature( QgsFeature& feature, QgsRenderContext& return true; } -void QgsFeatureRendererV2::renderFeatureWithSymbol( QgsFeature& feature, QgsSymbol* symbol, QgsRenderContext& context, int layer, bool selected, bool drawVertexMarker ) +void QgsFeatureRenderer::renderFeatureWithSymbol( QgsFeature& feature, QgsSymbol* symbol, QgsRenderContext& context, int layer, bool selected, bool drawVertexMarker ) { symbol->renderFeature( feature, context, layer, selected, drawVertexMarker, mCurrentVertexMarkerType, mCurrentVertexMarkerSize ); } -QString QgsFeatureRendererV2::dump() const +QString QgsFeatureRenderer::dump() const { return "UNKNOWN RENDERER\n"; } -QgsSymbolList QgsFeatureRendererV2::symbols() +QgsSymbolList QgsFeatureRenderer::symbols() { QgsRenderContext context; return symbols( context ); } -QgsSymbolList QgsFeatureRendererV2::symbols( QgsRenderContext &context ) +QgsSymbolList QgsFeatureRenderer::symbols( QgsRenderContext &context ) { Q_UNUSED( context ); @@ -195,7 +195,7 @@ QgsSymbolList QgsFeatureRendererV2::symbols( QgsRenderContext &context ) } -QgsFeatureRendererV2* QgsFeatureRendererV2::load( QDomElement& element ) +QgsFeatureRenderer* QgsFeatureRenderer::load( QDomElement& element ) { // ... @@ -205,11 +205,11 @@ QgsFeatureRendererV2* QgsFeatureRendererV2::load( QDomElement& element ) // load renderer QString rendererType = element.attribute( "type" ); - QgsRendererV2AbstractMetadata* m = QgsRendererV2Registry::instance()->rendererMetadata( rendererType ); + QgsRendererAbstractMetadata* m = QgsRendererRegistry::instance()->rendererMetadata( rendererType ); if ( !m ) return nullptr; - QgsFeatureRendererV2* r = m->createRenderer( element ); + QgsFeatureRenderer* r = m->createRenderer( element ); if ( r ) { r->setUsingSymbolLevels( element.attribute( "symbollevels", "0" ).toInt() ); @@ -230,7 +230,7 @@ QgsFeatureRendererV2* QgsFeatureRendererV2::load( QDomElement& element ) return r; } -QDomElement QgsFeatureRendererV2::save( QDomDocument& doc ) +QDomElement QgsFeatureRenderer::save( QDomDocument& doc ) { // create empty renderer element QDomElement rendererElem = doc.createElement( RENDERER_TAG_NAME ); @@ -249,7 +249,7 @@ QDomElement QgsFeatureRendererV2::save( QDomDocument& doc ) return rendererElem; } -QgsFeatureRendererV2* QgsFeatureRendererV2::loadSld( const QDomNode &node, QgsWkbTypes::GeometryType geomType, QString &errorMessage ) +QgsFeatureRenderer* QgsFeatureRenderer::loadSld( const QDomNode &node, QgsWkbTypes::GeometryType geomType, QString &errorMessage ) { QDomElement element = node.toElement(); if ( element.isNull() ) @@ -327,23 +327,23 @@ QgsFeatureRendererV2* QgsFeatureRendererV2::loadSld( const QDomNode &node, QgsWk QgsDebugMsg( QString( "Instantiating a '%1' renderer..." ).arg( rendererType ) ); // create the renderer and return it - QgsRendererV2AbstractMetadata* m = QgsRendererV2Registry::instance()->rendererMetadata( rendererType ); + QgsRendererAbstractMetadata* m = QgsRendererRegistry::instance()->rendererMetadata( rendererType ); if ( !m ) { errorMessage = QString( "Error: Unable to get metadata for '%1' renderer." ).arg( rendererType ); return nullptr; } - QgsFeatureRendererV2* r = m->createRendererFromSld( featTypeStyleElem, geomType ); + QgsFeatureRenderer* r = m->createRendererFromSld( featTypeStyleElem, geomType ); return r; } -QDomElement QgsFeatureRendererV2::writeSld( QDomDocument& doc, const QgsVectorLayer &layer ) const +QDomElement QgsFeatureRenderer::writeSld( QDomDocument& doc, const QgsVectorLayer &layer ) const { return writeSld( doc, layer.name() ); } -QDomElement QgsFeatureRendererV2::writeSld( QDomDocument& doc, const QString& styleName ) const +QDomElement QgsFeatureRenderer::writeSld( QDomDocument& doc, const QString& styleName ) const { QDomElement userStyleElem = doc.createElement( "UserStyle" ); @@ -358,87 +358,87 @@ QDomElement QgsFeatureRendererV2::writeSld( QDomDocument& doc, const QString& st return userStyleElem; } -QgsLegendSymbologyList QgsFeatureRendererV2::legendSymbologyItems( QSize iconSize ) +QgsLegendSymbologyList QgsFeatureRenderer::legendSymbologyItems( QSize iconSize ) { Q_UNUSED( iconSize ); // empty list by default return QgsLegendSymbologyList(); } -bool QgsFeatureRendererV2::legendSymbolItemsCheckable() const +bool QgsFeatureRenderer::legendSymbolItemsCheckable() const { return false; } -bool QgsFeatureRendererV2::legendSymbolItemChecked( const QString& key ) +bool QgsFeatureRenderer::legendSymbolItemChecked( const QString& key ) { Q_UNUSED( key ); return false; } -void QgsFeatureRendererV2::checkLegendSymbolItem( const QString& key, bool state ) +void QgsFeatureRenderer::checkLegendSymbolItem( const QString& key, bool state ) { Q_UNUSED( key ); Q_UNUSED( state ); } -void QgsFeatureRendererV2::setLegendSymbolItem( const QString& key, QgsSymbol* symbol ) +void QgsFeatureRenderer::setLegendSymbolItem( const QString& key, QgsSymbol* symbol ) { Q_UNUSED( key ); delete symbol; } -QgsLegendSymbolList QgsFeatureRendererV2::legendSymbolItems( double scaleDenominator, const QString& rule ) +QgsLegendSymbolList QgsFeatureRenderer::legendSymbolItems( double scaleDenominator, const QString& rule ) { Q_UNUSED( scaleDenominator ); Q_UNUSED( rule ); return QgsLegendSymbolList(); } -QgsLegendSymbolListV2 QgsFeatureRendererV2::legendSymbolItemsV2() const +QgsLegendSymbolListV2 QgsFeatureRenderer::legendSymbolItemsV2() const { - QgsLegendSymbolList lst = const_cast( this )->legendSymbolItems(); + QgsLegendSymbolList lst = const_cast( this )->legendSymbolItems(); QgsLegendSymbolListV2 lst2; int i = 0; for ( QgsLegendSymbolList::const_iterator it = lst.begin(); it != lst.end(); ++it, ++i ) { - lst2 << QgsLegendSymbolItemV2( it->second, it->first, QString::number( i ), legendSymbolItemsCheckable() ); + lst2 << QgsLegendSymbolItem( it->second, it->first, QString::number( i ), legendSymbolItemsCheckable() ); } return lst2; } -void QgsFeatureRendererV2::setVertexMarkerAppearance( int type, int size ) +void QgsFeatureRenderer::setVertexMarkerAppearance( int type, int size ) { mCurrentVertexMarkerType = type; mCurrentVertexMarkerSize = size; } -bool QgsFeatureRendererV2::willRenderFeature( QgsFeature &feat ) +bool QgsFeatureRenderer::willRenderFeature( QgsFeature &feat ) { Q_NOWARN_DEPRECATED_PUSH return nullptr != symbolForFeature( feat ); Q_NOWARN_DEPRECATED_POP } -bool QgsFeatureRendererV2::willRenderFeature( QgsFeature &feat, QgsRenderContext &context ) +bool QgsFeatureRenderer::willRenderFeature( QgsFeature &feat, QgsRenderContext &context ) { return nullptr != symbolForFeature( feat, context ); } -void QgsFeatureRendererV2::renderVertexMarker( QPointF pt, QgsRenderContext& context ) +void QgsFeatureRenderer::renderVertexMarker( QPointF pt, QgsRenderContext& context ) { QgsVectorLayer::drawVertexMarker( pt.x(), pt.y(), *context.painter(), static_cast< QgsVectorLayer::VertexMarkerType >( mCurrentVertexMarkerType ), mCurrentVertexMarkerSize ); } -void QgsFeatureRendererV2::renderVertexMarkerPolyline( QPolygonF& pts, QgsRenderContext& context ) +void QgsFeatureRenderer::renderVertexMarkerPolyline( QPolygonF& pts, QgsRenderContext& context ) { Q_FOREACH ( QPointF pt, pts ) renderVertexMarker( pt, context ); } -void QgsFeatureRendererV2::renderVertexMarkerPolygon( QPolygonF& pts, QList* rings, QgsRenderContext& context ) +void QgsFeatureRenderer::renderVertexMarkerPolygon( QPolygonF& pts, QList* rings, QgsRenderContext& context ) { Q_FOREACH ( QPointF pt, pts ) renderVertexMarker( pt, context ); @@ -453,7 +453,7 @@ void QgsFeatureRendererV2::renderVertexMarkerPolygon( QPolygonF& pts, QListtype() == QgsSymbol::Marker ) { - QgsMarkerSymbolV2 * s = static_cast( symbol ); + QgsMarkerSymbol * s = static_cast( symbol ); if ( QgsSymbol::ScaleArea == QgsSymbol::ScaleMethod( method ) ) { const QgsDataDefined dd( "coalesce(sqrt(" + QString::number( s->size() ) + " * (" + field + ")),0)" ); @@ -539,17 +539,17 @@ void QgsFeatureRendererV2::convertSymbolSizeScale( QgsSymbol * symbol, QgsSymbol } else if ( symbol->type() == QgsSymbol::Line ) { - QgsLineSymbolV2 * s = static_cast( symbol ); + QgsLineSymbol * s = static_cast( symbol ); const QgsDataDefined dd( "coalesce(" + QString::number( s->width() ) + " * (" + field + "),0)" ); s->setDataDefinedWidth( dd ); } } -void QgsFeatureRendererV2::convertSymbolRotation( QgsSymbol * symbol, const QString & field ) +void QgsFeatureRenderer::convertSymbolRotation( QgsSymbol * symbol, const QString & field ) { if ( symbol->type() == QgsSymbol::Marker ) { - QgsMarkerSymbolV2 * s = static_cast( symbol ); + QgsMarkerSymbol * s = static_cast( symbol ); const QgsDataDefined dd(( s->angle() ? QString::number( s->angle() ) + " + " : QString() ) + field ); diff --git a/src/core/symbology-ng/qgsrendererv2.h b/src/core/symbology-ng/qgsrenderer.h similarity index 95% rename from src/core/symbology-ng/qgsrendererv2.h rename to src/core/symbology-ng/qgsrenderer.h index 8f3e01cb7cb..5bddd028b87 100644 --- a/src/core/symbology-ng/qgsrendererv2.h +++ b/src/core/symbology-ng/qgsrenderer.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsrendererv2.h + qgsrenderer.h --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -43,7 +43,7 @@ typedef QMap QgsSymbolMap; typedef QList< QPair > QgsLegendSymbologyList; typedef QList< QPair > QgsLegendSymbolList; -#include "qgslegendsymbolitemv2.h" +#include "qgslegendsymbolitem.h" #define RENDERER_TAG_NAME "renderer-v2" @@ -79,15 +79,15 @@ typedef QList< QgsSymbolLevel > QgsSymbolLevelOrder; // renderers /** \ingroup core - * \class QgsFeatureRendererV2 + * \class QgsFeatureRenderer */ -class CORE_EXPORT QgsFeatureRendererV2 +class CORE_EXPORT QgsFeatureRenderer { public: // renderer takes ownership of its symbols! //! return a new renderer - used by default in vector layers - static QgsFeatureRendererV2* defaultRenderer( QgsWkbTypes::GeometryType geomType ); + static QgsFeatureRenderer* defaultRenderer( QgsWkbTypes::GeometryType geomType ); QString type() const { return mType; } @@ -182,7 +182,7 @@ class CORE_EXPORT QgsFeatureRendererV2 */ virtual bool filterNeedsGeometry() const; - virtual ~QgsFeatureRendererV2(); + virtual ~QgsFeatureRenderer(); /** * Create a deep copy of this renderer. Should be implemented by all subclasses @@ -190,7 +190,7 @@ class CORE_EXPORT QgsFeatureRendererV2 * * @return A copy of this renderer */ - virtual QgsFeatureRendererV2* clone() const = 0; + virtual QgsFeatureRenderer* clone() const = 0; /** * Render a feature using this renderer in the given context. @@ -228,7 +228,7 @@ class CORE_EXPORT QgsFeatureRendererV2 * E.g. if you only want to deal with visible features: * * ~~~{.py} - * if not renderer.capabilities().testFlag(QgsFeatureRendererV2.Filter) or renderer.willRenderFeature(feature, context): + * if not renderer.capabilities().testFlag(QgsFeatureRenderer.Filter) or renderer.willRenderFeature(feature, context): * deal_with_my_feature() * else: * skip_the_curren_feature() @@ -253,7 +253,7 @@ class CORE_EXPORT QgsFeatureRendererV2 void setUsingSymbolLevels( bool usingSymbolLevels ) { mUsingSymbolLevels = usingSymbolLevels; } //! create a renderer from XML element - static QgsFeatureRendererV2* load( QDomElement& symbologyElem ); + static QgsFeatureRenderer* load( QDomElement& symbologyElem ); //! store renderer info to XML element virtual QDomElement save( QDomDocument& doc ); @@ -275,7 +275,7 @@ class CORE_EXPORT QgsFeatureRendererV2 * went wrong * @return the renderer */ - static QgsFeatureRendererV2* loadSld( const QDomNode &node, QgsWkbTypes::GeometryType geomType, QString &errorMessage ); + static QgsFeatureRenderer* loadSld( const QDomNode &node, QgsWkbTypes::GeometryType geomType, QString &errorMessage ); //! used from subclasses to create SLD Rule elements following SLD v1.1 specs virtual void toSld( QDomDocument& doc, QDomElement &element ) const @@ -450,17 +450,17 @@ class CORE_EXPORT QgsFeatureRendererV2 * @see embeddedRenderer() * @note added in QGIS 2.16 */ - virtual void setEmbeddedRenderer( QgsFeatureRendererV2* subRenderer ) { delete subRenderer; } + virtual void setEmbeddedRenderer( QgsFeatureRenderer* subRenderer ) { delete subRenderer; } /** 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 { return nullptr; } + virtual const QgsFeatureRenderer* embeddedRenderer() const { return nullptr; } protected: - QgsFeatureRendererV2( const QString& type ); + QgsFeatureRenderer( const QString& type ); void renderFeatureWithSymbol( QgsFeature& feature, QgsSymbol* symbol, @@ -504,13 +504,13 @@ class CORE_EXPORT 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 */ - Q_DECL_DEPRECATED void copyPaintEffect( QgsFeatureRendererV2 *destRenderer ) const; + Q_DECL_DEPRECATED void copyPaintEffect( QgsFeatureRenderer *destRenderer ) const; QString mType; @@ -539,13 +539,13 @@ class CORE_EXPORT QgsFeatureRendererV2 bool mOrderByEnabled; private: - Q_DISABLE_COPY( QgsFeatureRendererV2 ) + Q_DISABLE_COPY( QgsFeatureRenderer ) }; -Q_DECLARE_OPERATORS_FOR_FLAGS( QgsFeatureRendererV2::Capabilities ) +Q_DECLARE_OPERATORS_FOR_FLAGS( QgsFeatureRenderer::Capabilities ) // for some reason SIP compilation fails if these lines are not included: -class QgsRendererV2Widget; +class QgsRendererWidget; class QgsPaintEffectWidget; #endif // QGSRENDERERV2_H diff --git a/src/core/symbology-ng/qgsrendererregistry.cpp b/src/core/symbology-ng/qgsrendererregistry.cpp new file mode 100644 index 00000000000..61f5abd3406 --- /dev/null +++ b/src/core/symbology-ng/qgsrendererregistry.cpp @@ -0,0 +1,159 @@ +/*************************************************************************** + qgsrendererregistry.cpp + --------------------- + begin : November 2009 + copyright : (C) 2009 by Martin Dobias + email : wonder dot sk at gmail dot com + *************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ +#include "qgsrendererregistry.h" + +// default renderers +#include "qgssinglesymbolrenderer.h" +#include "qgscategorizedsymbolrenderer.h" +#include "qgsgraduatedsymbolrenderer.h" +#include "qgsrulebasedrenderer.h" +#include "qgspointdisplacementrenderer.h" +#include "qgsinvertedpolygonrenderer.h" +#include "qgsheatmaprenderer.h" +#include "qgs25drenderer.h" +#include "qgsnullsymbolrenderer.h" +#include "qgsvectorlayer.h" + +QgsRendererRegistry::QgsRendererRegistry() +{ + // add default renderers + addRenderer( new QgsRendererMetadata( "nullSymbol", + QObject::tr( "No symbols" ), + QgsNullSymbolRenderer::create ) ); + + addRenderer( new QgsRendererMetadata( "singleSymbol", + QObject::tr( "Single symbol" ), + QgsSingleSymbolRenderer::create, + QgsSingleSymbolRenderer::createFromSld ) ); + + addRenderer( new QgsRendererMetadata( "categorizedSymbol", + QObject::tr( "Categorized" ), + QgsCategorizedSymbolRenderer::create ) ); + + addRenderer( new QgsRendererMetadata( "graduatedSymbol", + QObject::tr( "Graduated" ), + QgsGraduatedSymbolRenderer::create ) ); + + addRenderer( new QgsRendererMetadata( "RuleRenderer", + QObject::tr( "Rule-based" ), + QgsRuleBasedRenderer::create, + QgsRuleBasedRenderer::createFromSld ) ); + + addRenderer( new QgsRendererMetadata( "pointDisplacement", + QObject::tr( "Point displacement" ), + QgsPointDisplacementRenderer::create, + QIcon(), + nullptr, + QgsRendererAbstractMetadata::PointLayer ) ); + + addRenderer( new QgsRendererMetadata( "invertedPolygonRenderer", + QObject::tr( "Inverted polygons" ), + QgsInvertedPolygonRenderer::create, + QIcon(), + nullptr, + QgsRendererAbstractMetadata::PolygonLayer ) ); + + addRenderer( new QgsRendererMetadata( "heatmapRenderer", + QObject::tr( "Heatmap" ), + QgsHeatmapRenderer::create, + QIcon(), + nullptr, + QgsRendererAbstractMetadata::PointLayer ) ); + + + addRenderer( new QgsRendererMetadata( "25dRenderer", + QObject::tr( "2.5 D" ), + Qgs25DRenderer::create, + QIcon(), + nullptr, + QgsRendererAbstractMetadata::PolygonLayer ) ); +} + +QgsRendererRegistry::~QgsRendererRegistry() +{ + qDeleteAll( mRenderers ); +} + +QgsRendererRegistry* QgsRendererRegistry::instance() +{ + static QgsRendererRegistry mInstance; + return &mInstance; +} + + +bool QgsRendererRegistry::addRenderer( QgsRendererAbstractMetadata* metadata ) +{ + if ( !metadata || mRenderers.contains( metadata->name() ) ) + return false; + + mRenderers[metadata->name()] = metadata; + mRenderersOrder << metadata->name(); + return true; +} + +bool QgsRendererRegistry::removeRenderer( const QString& rendererName ) +{ + if ( !mRenderers.contains( rendererName ) ) + return false; + + delete mRenderers[rendererName]; + mRenderers.remove( rendererName ); + mRenderersOrder.removeAll( rendererName ); + return true; +} + +QgsRendererAbstractMetadata* QgsRendererRegistry::rendererMetadata( const QString& rendererName ) +{ + return mRenderers.value( rendererName ); +} + +QgsRendererMetadata::~QgsRendererMetadata() {} + +QStringList QgsRendererRegistry::renderersList( QgsRendererAbstractMetadata::LayerTypes layerTypes ) const +{ + QStringList renderers; + Q_FOREACH ( const QString& renderer, mRenderersOrder ) + { + if ( mRenderers.value( renderer )->compatibleLayerTypes() & layerTypes ) + renderers << renderer; + } + return renderers; +} + +QStringList QgsRendererRegistry::renderersList( const QgsVectorLayer* layer ) const +{ + QgsRendererAbstractMetadata::LayerType layerType = QgsRendererAbstractMetadata::All; + + switch ( layer->geometryType() ) + { + case QgsWkbTypes::PointGeometry: + layerType = QgsRendererAbstractMetadata::PointLayer; + break; + + case QgsWkbTypes::LineGeometry: + layerType = QgsRendererAbstractMetadata::LineLayer; + break; + + case QgsWkbTypes::PolygonGeometry: + layerType = QgsRendererAbstractMetadata::PolygonLayer; + break; + + case QgsWkbTypes::UnknownGeometry: + case QgsWkbTypes::NullGeometry: + break; + } + + return renderersList( layerType ); +} diff --git a/src/core/symbology-ng/qgsrendererv2registry.h b/src/core/symbology-ng/qgsrendererregistry.h similarity index 59% rename from src/core/symbology-ng/qgsrendererv2registry.h rename to src/core/symbology-ng/qgsrendererregistry.h index a37188e8166..d34c0f11e88 100644 --- a/src/core/symbology-ng/qgsrendererv2registry.h +++ b/src/core/symbology-ng/qgsrendererregistry.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsrendererv2registry.h + qgsrendererregistry.h --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -22,18 +22,18 @@ #include "qgis.h" -class QgsFeatureRendererV2; +class QgsFeatureRenderer; class QgsVectorLayer; -class QgsStyleV2; -class QgsRendererV2Widget; +class QgsStyle; +class QgsRendererWidget; /** \ingroup core 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 CORE_EXPORT QgsRendererV2AbstractMetadata +class CORE_EXPORT QgsRendererAbstractMetadata { public: @@ -48,12 +48,12 @@ class CORE_EXPORT QgsRendererV2AbstractMetadata }; Q_DECLARE_FLAGS( LayerTypes, LayerType ) - QgsRendererV2AbstractMetadata( const QString& name, const QString& visibleName, const QIcon& icon = QIcon() ) + QgsRendererAbstractMetadata( const QString& name, const QString& visibleName, const QIcon& icon = QIcon() ) : mName( name ) , mVisibleName( visibleName ) , mIcon( icon ) {} - virtual ~QgsRendererV2AbstractMetadata() {} + virtual ~QgsRendererAbstractMetadata() {} QString name() const { return mName; } QString visibleName() const { return mVisibleName; } @@ -68,7 +68,7 @@ class CORE_EXPORT QgsRendererV2AbstractMetadata /** 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; + virtual QgsFeatureRenderer* createRenderer( QDomElement& elem ) = 0; /** 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). @@ -76,10 +76,10 @@ class CORE_EXPORT 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 ) + virtual QgsRendererWidget* createRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* oldRenderer ) { Q_UNUSED( layer ); Q_UNUSED( style ); Q_UNUSED( oldRenderer ); return nullptr; } - virtual QgsFeatureRendererV2* createRendererFromSld( QDomElement& elem, QgsWkbTypes::GeometryType geomType ) + virtual QgsFeatureRenderer* createRendererFromSld( QDomElement& elem, QgsWkbTypes::GeometryType geomType ) { Q_UNUSED( elem ); Q_UNUSED( geomType ); return nullptr; } protected: @@ -92,29 +92,29 @@ class CORE_EXPORT QgsRendererV2AbstractMetadata }; -Q_DECLARE_OPERATORS_FOR_FLAGS( QgsRendererV2AbstractMetadata::LayerTypes ) +Q_DECLARE_OPERATORS_FOR_FLAGS( QgsRendererAbstractMetadata::LayerTypes ) -typedef QgsFeatureRendererV2*( *QgsRendererV2CreateFunc )( QDomElement& ); -typedef QgsRendererV2Widget*( *QgsRendererV2WidgetFunc )( QgsVectorLayer*, QgsStyleV2*, QgsFeatureRendererV2* ); -typedef QgsFeatureRendererV2*( *QgsRendererV2CreateFromSldFunc )( QDomElement&, QgsWkbTypes::GeometryType geomType ); +typedef QgsFeatureRenderer*( *QgsRendererCreateFunc )( QDomElement& ); +typedef QgsRendererWidget*( *QgsRendererWidgetFunc )( QgsVectorLayer*, QgsStyle*, QgsFeatureRenderer* ); +typedef QgsFeatureRenderer*( *QgsRendererCreateFromSldFunc )( QDomElement&, QgsWkbTypes::GeometryType geomType ); /** \ingroup core Convenience metadata class that uses static functions to create renderer and its widget. */ -class CORE_EXPORT QgsRendererV2Metadata : public QgsRendererV2AbstractMetadata +class CORE_EXPORT QgsRendererMetadata : public QgsRendererAbstractMetadata { public: /** Construct metadata */ //! @note not available in python bindings - QgsRendererV2Metadata( const QString& name, - const QString& visibleName, - QgsRendererV2CreateFunc pfCreate, - const QIcon& icon = QIcon(), - QgsRendererV2WidgetFunc pfWidget = nullptr, - QgsRendererV2AbstractMetadata::LayerTypes layerTypes = QgsRendererV2AbstractMetadata::All ) - : QgsRendererV2AbstractMetadata( name, visibleName, icon ) + QgsRendererMetadata( const QString& name, + const QString& visibleName, + QgsRendererCreateFunc pfCreate, + const QIcon& icon = QIcon(), + QgsRendererWidgetFunc pfWidget = nullptr, + QgsRendererAbstractMetadata::LayerTypes layerTypes = QgsRendererAbstractMetadata::All ) + : QgsRendererAbstractMetadata( name, visibleName, icon ) , mCreateFunc( pfCreate ) , mWidgetFunc( pfWidget ) , mCreateFromSldFunc( nullptr ) @@ -122,73 +122,73 @@ class CORE_EXPORT QgsRendererV2Metadata : public QgsRendererV2AbstractMetadata {} //! @note not available in python bindings - QgsRendererV2Metadata( const QString& name, - const QString& visibleName, - QgsRendererV2CreateFunc pfCreate, - QgsRendererV2CreateFromSldFunc pfCreateFromSld, - const QIcon& icon = QIcon(), - QgsRendererV2WidgetFunc pfWidget = nullptr, - QgsRendererV2AbstractMetadata::LayerTypes layerTypes = QgsRendererV2AbstractMetadata::All ) - : QgsRendererV2AbstractMetadata( name, visibleName, icon ) + QgsRendererMetadata( const QString& name, + const QString& visibleName, + QgsRendererCreateFunc pfCreate, + QgsRendererCreateFromSldFunc pfCreateFromSld, + const QIcon& icon = QIcon(), + QgsRendererWidgetFunc pfWidget = nullptr, + QgsRendererAbstractMetadata::LayerTypes layerTypes = QgsRendererAbstractMetadata::All ) + : QgsRendererAbstractMetadata( name, visibleName, icon ) , mCreateFunc( pfCreate ) , mWidgetFunc( pfWidget ) , mCreateFromSldFunc( pfCreateFromSld ) , mLayerTypes( layerTypes ) {} - virtual ~QgsRendererV2Metadata(); + virtual ~QgsRendererMetadata(); - virtual QgsFeatureRendererV2* createRenderer( QDomElement& elem ) override { return mCreateFunc ? mCreateFunc( elem ) : nullptr; } - virtual QgsRendererV2Widget* createRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) override + virtual QgsFeatureRenderer* createRenderer( QDomElement& elem ) override { return mCreateFunc ? mCreateFunc( elem ) : nullptr; } + virtual QgsRendererWidget* createRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) override { return mWidgetFunc ? mWidgetFunc( layer, style, renderer ) : nullptr; } - virtual QgsFeatureRendererV2* createRendererFromSld( QDomElement& elem, QgsWkbTypes::GeometryType geomType ) override + virtual QgsFeatureRenderer* createRendererFromSld( QDomElement& elem, QgsWkbTypes::GeometryType geomType ) override { return mCreateFromSldFunc ? mCreateFromSldFunc( elem, geomType ) : nullptr; } //! @note not available in python bindings - QgsRendererV2CreateFunc createFunction() const { return mCreateFunc; } + QgsRendererCreateFunc createFunction() const { return mCreateFunc; } //! @note not available in python bindings - QgsRendererV2WidgetFunc widgetFunction() const { return mWidgetFunc; } + QgsRendererWidgetFunc widgetFunction() const { return mWidgetFunc; } //! @note not available in python bindings - QgsRendererV2CreateFromSldFunc createFromSldFunction() const { return mCreateFromSldFunc; } + QgsRendererCreateFromSldFunc createFromSldFunction() const { return mCreateFromSldFunc; } //! @note not available in python bindings - void setWidgetFunction( QgsRendererV2WidgetFunc f ) { mWidgetFunc = f; } + void setWidgetFunction( QgsRendererWidgetFunc f ) { mWidgetFunc = f; } - virtual QgsRendererV2AbstractMetadata::LayerTypes compatibleLayerTypes() const override { return mLayerTypes; } + virtual QgsRendererAbstractMetadata::LayerTypes compatibleLayerTypes() const override { return mLayerTypes; } protected: //! pointer to function that creates an instance of the renderer when loading project / style - QgsRendererV2CreateFunc mCreateFunc; + QgsRendererCreateFunc mCreateFunc; //! pointer to function that creates a widget for configuration of renderer's params - QgsRendererV2WidgetFunc mWidgetFunc; + QgsRendererWidgetFunc mWidgetFunc; //! pointer to function that creates an instance of the renderer from SLD - QgsRendererV2CreateFromSldFunc mCreateFromSldFunc; + QgsRendererCreateFromSldFunc mCreateFromSldFunc; private: - QgsRendererV2AbstractMetadata::LayerTypes mLayerTypes; + QgsRendererAbstractMetadata::LayerTypes mLayerTypes; }; /** \ingroup core - * \class QgsRendererV2Registry + * \class QgsRendererRegistry * \brief Registry of renderers. * * This is a singleton, renderers can be added / removed at any time */ -class CORE_EXPORT QgsRendererV2Registry +class CORE_EXPORT QgsRendererRegistry { 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 ); + bool addRenderer( QgsRendererAbstractMetadata* metadata ); //! Removes a renderer from registry. //! @param rendererName name of renderer to remove from registry @@ -198,11 +198,11 @@ class CORE_EXPORT 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 @@ -211,18 +211,18 @@ class CORE_EXPORT QgsRendererV2Registry protected: //! protected constructor - QgsRendererV2Registry(); - ~QgsRendererV2Registry(); + QgsRendererRegistry(); + ~QgsRendererRegistry(); //! Map of name to renderer - QMap mRenderers; + QMap mRenderers; //! List of renderers, maintained in the order that they have been added QStringList mRenderersOrder; private: - QgsRendererV2Registry( const QgsRendererV2Registry& rh ); - QgsRendererV2Registry& operator=( const QgsRendererV2Registry& rh ); + QgsRendererRegistry( const QgsRendererRegistry& rh ); + QgsRendererRegistry& operator=( const QgsRendererRegistry& rh ); }; #endif // QGSRENDERERV2REGISTRY_H diff --git a/src/core/symbology-ng/qgsrendererv2registry.cpp b/src/core/symbology-ng/qgsrendererv2registry.cpp deleted file mode 100644 index f6aee5b4bfb..00000000000 --- a/src/core/symbology-ng/qgsrendererv2registry.cpp +++ /dev/null @@ -1,159 +0,0 @@ -/*************************************************************************** - qgsrendererv2registry.cpp - --------------------- - begin : November 2009 - copyright : (C) 2009 by Martin Dobias - email : wonder dot sk at gmail dot com - *************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ -#include "qgsrendererv2registry.h" - -// default renderers -#include "qgssinglesymbolrendererv2.h" -#include "qgscategorizedsymbolrendererv2.h" -#include "qgsgraduatedsymbolrendererv2.h" -#include "qgsrulebasedrendererv2.h" -#include "qgspointdisplacementrenderer.h" -#include "qgsinvertedpolygonrenderer.h" -#include "qgsheatmaprenderer.h" -#include "qgs25drenderer.h" -#include "qgsnullsymbolrenderer.h" -#include "qgsvectorlayer.h" - -QgsRendererV2Registry::QgsRendererV2Registry() -{ - // add default renderers - addRenderer( new QgsRendererV2Metadata( "nullSymbol", - QObject::tr( "No symbols" ), - QgsNullSymbolRenderer::create ) ); - - addRenderer( new QgsRendererV2Metadata( "singleSymbol", - QObject::tr( "Single symbol" ), - QgsSingleSymbolRendererV2::create, - QgsSingleSymbolRendererV2::createFromSld ) ); - - addRenderer( new QgsRendererV2Metadata( "categorizedSymbol", - QObject::tr( "Categorized" ), - QgsCategorizedSymbolRendererV2::create ) ); - - addRenderer( new QgsRendererV2Metadata( "graduatedSymbol", - QObject::tr( "Graduated" ), - QgsGraduatedSymbolRendererV2::create ) ); - - addRenderer( new QgsRendererV2Metadata( "RuleRenderer", - QObject::tr( "Rule-based" ), - QgsRuleBasedRendererV2::create, - QgsRuleBasedRendererV2::createFromSld ) ); - - addRenderer( new QgsRendererV2Metadata( "pointDisplacement", - QObject::tr( "Point displacement" ), - QgsPointDisplacementRenderer::create, - QIcon(), - nullptr, - QgsRendererV2AbstractMetadata::PointLayer ) ); - - addRenderer( new QgsRendererV2Metadata( "invertedPolygonRenderer", - QObject::tr( "Inverted polygons" ), - QgsInvertedPolygonRenderer::create, - QIcon(), - nullptr, - QgsRendererV2AbstractMetadata::PolygonLayer ) ); - - addRenderer( new QgsRendererV2Metadata( "heatmapRenderer", - QObject::tr( "Heatmap" ), - QgsHeatmapRenderer::create, - QIcon(), - nullptr, - QgsRendererV2AbstractMetadata::PointLayer ) ); - - - addRenderer( new QgsRendererV2Metadata( "25dRenderer", - QObject::tr( "2.5 D" ), - Qgs25DRenderer::create, - QIcon(), - nullptr, - QgsRendererV2AbstractMetadata::PolygonLayer ) ); -} - -QgsRendererV2Registry::~QgsRendererV2Registry() -{ - qDeleteAll( mRenderers ); -} - -QgsRendererV2Registry* QgsRendererV2Registry::instance() -{ - static QgsRendererV2Registry mInstance; - return &mInstance; -} - - -bool QgsRendererV2Registry::addRenderer( QgsRendererV2AbstractMetadata* metadata ) -{ - if ( !metadata || mRenderers.contains( metadata->name() ) ) - return false; - - mRenderers[metadata->name()] = metadata; - mRenderersOrder << metadata->name(); - return true; -} - -bool QgsRendererV2Registry::removeRenderer( const QString& rendererName ) -{ - if ( !mRenderers.contains( rendererName ) ) - return false; - - delete mRenderers[rendererName]; - mRenderers.remove( rendererName ); - mRenderersOrder.removeAll( rendererName ); - return true; -} - -QgsRendererV2AbstractMetadata* QgsRendererV2Registry::rendererMetadata( const QString& rendererName ) -{ - return mRenderers.value( rendererName ); -} - -QgsRendererV2Metadata::~QgsRendererV2Metadata() {} - -QStringList QgsRendererV2Registry::renderersList( QgsRendererV2AbstractMetadata::LayerTypes layerTypes ) const -{ - QStringList renderers; - Q_FOREACH ( const QString& renderer, mRenderersOrder ) - { - if ( mRenderers.value( renderer )->compatibleLayerTypes() & layerTypes ) - renderers << renderer; - } - return renderers; -} - -QStringList QgsRendererV2Registry::renderersList( const QgsVectorLayer* layer ) const -{ - QgsRendererV2AbstractMetadata::LayerType layerType = QgsRendererV2AbstractMetadata::All; - - switch ( layer->geometryType() ) - { - case QgsWkbTypes::PointGeometry: - layerType = QgsRendererV2AbstractMetadata::PointLayer; - break; - - case QgsWkbTypes::LineGeometry: - layerType = QgsRendererV2AbstractMetadata::LineLayer; - break; - - case QgsWkbTypes::PolygonGeometry: - layerType = QgsRendererV2AbstractMetadata::PolygonLayer; - break; - - case QgsWkbTypes::UnknownGeometry: - case QgsWkbTypes::NullGeometry: - break; - } - - return renderersList( layerType ); -} diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrenderer.cpp similarity index 80% rename from src/core/symbology-ng/qgsrulebasedrendererv2.cpp rename to src/core/symbology-ng/qgsrulebasedrenderer.cpp index 052887e476e..d959bee75f5 100644 --- a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp +++ b/src/core/symbology-ng/qgsrulebasedrenderer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsrulebasedrendererv2.cpp - Rule-based renderer (symbology-ng) + qgsrulebasedrenderer.cpp - Rule-based renderer (symbology-ng) --------------------- begin : May 2010 copyright : (C) 2010 by Martin Dobias @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include "qgsrulebasedrendererv2.h" +#include "qgsrulebasedrenderer.h" #include "qgssymbollayer.h" #include "qgsexpression.h" #include "qgssymbollayerutils.h" @@ -21,7 +21,7 @@ #include "qgsvectorlayer.h" #include "qgslogger.h" #include "qgsogcutils.h" -#include "qgssinglesymbolrendererv2.h" +#include "qgssinglesymbolrenderer.h" #include "qgspointdisplacementrenderer.h" #include "qgsinvertedpolygonrenderer.h" #include "qgspainteffect.h" @@ -35,7 +35,7 @@ #include -QgsRuleBasedRendererV2::Rule::Rule( QgsSymbol* symbol, int scaleMinDenom, int scaleMaxDenom, const QString& filterExp, const QString& label, const QString& description, bool elseRule ) +QgsRuleBasedRenderer::Rule::Rule( QgsSymbol* symbol, int scaleMinDenom, int scaleMaxDenom, const QString& filterExp, const QString& label, const QString& description, bool elseRule ) : mParent( nullptr ) , mSymbol( symbol ) , mScaleMinDenom( scaleMinDenom ) @@ -54,7 +54,7 @@ QgsRuleBasedRendererV2::Rule::Rule( QgsSymbol* symbol, int scaleMinDenom, int sc initFilter(); } -QgsRuleBasedRendererV2::Rule::~Rule() +QgsRuleBasedRenderer::Rule::~Rule() { delete mSymbol; delete mFilter; @@ -62,7 +62,7 @@ QgsRuleBasedRendererV2::Rule::~Rule() // do NOT delete parent } -void QgsRuleBasedRendererV2::Rule::initFilter() +void QgsRuleBasedRenderer::Rule::initFilter() { if ( mFilterExp.trimmed().compare( "ELSE", Qt::CaseInsensitive ) == 0 ) { @@ -84,34 +84,34 @@ void QgsRuleBasedRendererV2::Rule::initFilter() } } -void QgsRuleBasedRendererV2::Rule::appendChild( Rule* rule ) +void QgsRuleBasedRenderer::Rule::appendChild( Rule* rule ) { mChildren.append( rule ); rule->mParent = this; updateElseRules(); } -void QgsRuleBasedRendererV2::Rule::insertChild( int i, Rule* rule ) +void QgsRuleBasedRenderer::Rule::insertChild( int i, Rule* rule ) { mChildren.insert( i, rule ); rule->mParent = this; updateElseRules(); } -void QgsRuleBasedRendererV2::Rule::removeChild( Rule* rule ) +void QgsRuleBasedRenderer::Rule::removeChild( Rule* rule ) { mChildren.removeAll( rule ); delete rule; updateElseRules(); } -void QgsRuleBasedRendererV2::Rule::removeChildAt( int i ) +void QgsRuleBasedRenderer::Rule::removeChildAt( int i ) { delete mChildren.takeAt( i ); updateElseRules(); } -QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::takeChild( Rule* rule ) +QgsRuleBasedRenderer::Rule* QgsRuleBasedRenderer::Rule::takeChild( Rule* rule ) { mChildren.removeAll( rule ); rule->mParent = nullptr; @@ -119,7 +119,7 @@ QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::takeChild( Rule* ru return rule; } -QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::takeChildAt( int i ) +QgsRuleBasedRenderer::Rule* QgsRuleBasedRenderer::Rule::takeChildAt( int i ) { Rule* rule = mChildren.takeAt( i ); rule->mParent = nullptr; @@ -127,7 +127,7 @@ QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::takeChildAt( int i ) return rule; } -QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::findRuleByKey( const QString& key ) +QgsRuleBasedRenderer::Rule* QgsRuleBasedRenderer::Rule::findRuleByKey( const QString& key ) { // we could use a hash / map for search if this will be slow... @@ -143,7 +143,7 @@ QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::findRuleByKey( const return nullptr; } -void QgsRuleBasedRendererV2::Rule::updateElseRules() +void QgsRuleBasedRenderer::Rule::updateElseRules() { mElseRules.clear(); Q_FOREACH ( Rule* rule, mChildren ) @@ -153,7 +153,7 @@ void QgsRuleBasedRendererV2::Rule::updateElseRules() } } -void QgsRuleBasedRendererV2::Rule::setIsElse( bool iselse ) +void QgsRuleBasedRenderer::Rule::setIsElse( bool iselse ) { mFilterExp = "ELSE"; mElseRule = iselse; @@ -162,7 +162,7 @@ void QgsRuleBasedRendererV2::Rule::setIsElse( bool iselse ) } -QString QgsRuleBasedRendererV2::Rule::dump( int indent ) const +QString QgsRuleBasedRenderer::Rule::dump( int indent ) const { QString off; off.fill( QChar( ' ' ), indent ); @@ -180,7 +180,7 @@ QString QgsRuleBasedRendererV2::Rule::dump( int indent ) const return msg; } -QSet QgsRuleBasedRendererV2::Rule::usedAttributes() const +QSet QgsRuleBasedRenderer::Rule::usedAttributes() const { // attributes needed by this rule QSet attrs; @@ -197,7 +197,7 @@ QSet QgsRuleBasedRendererV2::Rule::usedAttributes() const return attrs; } -bool QgsRuleBasedRendererV2::Rule::needsGeometry() const +bool QgsRuleBasedRenderer::Rule::needsGeometry() const { if ( mFilter && mFilter->needsGeometry() ) return true; @@ -211,7 +211,7 @@ bool QgsRuleBasedRendererV2::Rule::needsGeometry() const return false; } -QgsSymbolList QgsRuleBasedRendererV2::Rule::symbols( const QgsRenderContext& context ) const +QgsSymbolList QgsRuleBasedRenderer::Rule::symbols( const QgsRenderContext& context ) const { QgsSymbolList lst; if ( mSymbol ) @@ -224,19 +224,19 @@ QgsSymbolList QgsRuleBasedRendererV2::Rule::symbols( const QgsRenderContext& con return lst; } -void QgsRuleBasedRendererV2::Rule::setSymbol( QgsSymbol* sym ) +void QgsRuleBasedRenderer::Rule::setSymbol( QgsSymbol* sym ) { delete mSymbol; mSymbol = sym; } -void QgsRuleBasedRendererV2::Rule::setFilterExpression( const QString& filterExp ) +void QgsRuleBasedRenderer::Rule::setFilterExpression( const QString& filterExp ) { mFilterExp = filterExp; initFilter(); } -QgsLegendSymbolList QgsRuleBasedRendererV2::Rule::legendSymbolItems( double scaleDenominator, const QString& ruleFilter ) const +QgsLegendSymbolList QgsRuleBasedRenderer::Rule::legendSymbolItems( double scaleDenominator, const QString& ruleFilter ) const { QgsLegendSymbolList lst; if ( mSymbol && ( ruleFilter.isEmpty() || mLabel == ruleFilter ) ) @@ -252,12 +252,12 @@ QgsLegendSymbolList QgsRuleBasedRendererV2::Rule::legendSymbolItems( double scal return lst; } -QgsLegendSymbolListV2 QgsRuleBasedRendererV2::Rule::legendSymbolItemsV2( int currentLevel ) const +QgsLegendSymbolListV2 QgsRuleBasedRenderer::Rule::legendSymbolItemsV2( int currentLevel ) const { QgsLegendSymbolListV2 lst; if ( currentLevel != -1 ) // root rule should not be shown { - lst << QgsLegendSymbolItemV2( mSymbol, mLabel, mRuleKey, true, mScaleMinDenom, mScaleMaxDenom, currentLevel, mParent ? mParent->mRuleKey : QString() ); + lst << QgsLegendSymbolItem( mSymbol, mLabel, mRuleKey, true, mScaleMinDenom, mScaleMaxDenom, currentLevel, mParent ? mParent->mRuleKey : QString() ); } for ( RuleList::const_iterator it = mChildren.constBegin(); it != mChildren.constEnd(); ++it ) @@ -269,7 +269,7 @@ QgsLegendSymbolListV2 QgsRuleBasedRendererV2::Rule::legendSymbolItemsV2( int cur } -bool QgsRuleBasedRendererV2::Rule::isFilterOK( QgsFeature& f, QgsRenderContext* context ) const +bool QgsRuleBasedRenderer::Rule::isFilterOK( QgsFeature& f, QgsRenderContext* context ) const { if ( ! mFilter || mElseRule ) return true; @@ -279,7 +279,7 @@ bool QgsRuleBasedRendererV2::Rule::isFilterOK( QgsFeature& f, QgsRenderContext* return res.toInt() != 0; } -bool QgsRuleBasedRendererV2::Rule::isScaleOK( double scale ) const +bool QgsRuleBasedRenderer::Rule::isScaleOK( double scale ) const { if ( qgsDoubleNear( scale, 0.0 ) ) // so that we can count features in classes without scale context return true; @@ -292,7 +292,7 @@ bool QgsRuleBasedRendererV2::Rule::isScaleOK( double scale ) const return true; } -QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::clone() const +QgsRuleBasedRenderer::Rule* QgsRuleBasedRenderer::Rule::clone() const { QgsSymbol* sym = mSymbol ? mSymbol->clone() : nullptr; Rule* newrule = new Rule( sym, mScaleMinDenom, mScaleMaxDenom, mFilterExp, mLabel, mDescription ); @@ -303,7 +303,7 @@ QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::clone() const return newrule; } -QDomElement QgsRuleBasedRendererV2::Rule::save( QDomDocument& doc, QgsSymbolMap& symbolMap ) const +QDomElement QgsRuleBasedRenderer::Rule::save( QDomDocument& doc, QgsSymbolMap& symbolMap ) const { QDomElement ruleElem = doc.createElement( "rule" ); @@ -334,7 +334,7 @@ QDomElement QgsRuleBasedRendererV2::Rule::save( QDomDocument& doc, QgsSymbolMap& return ruleElem; } -void QgsRuleBasedRendererV2::Rule::toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props ) const +void QgsRuleBasedRenderer::Rule::toSld( QDomDocument& doc, QDomElement &element, QgsStringMap props ) const { // do not convert this rule if there are no symbols QgsRenderContext context; @@ -426,13 +426,13 @@ void QgsRuleBasedRendererV2::Rule::toSld( QDomDocument& doc, QDomElement &elemen } } -bool QgsRuleBasedRendererV2::Rule::startRender( QgsRenderContext& context, const QgsFields& fields ) +bool QgsRuleBasedRenderer::Rule::startRender( QgsRenderContext& context, const QgsFields& fields ) { QString filter; return startRender( context, fields, filter ); } -bool QgsRuleBasedRendererV2::Rule::startRender( QgsRenderContext& context, const QgsFields& fields, QString& filter ) +bool QgsRuleBasedRenderer::Rule::startRender( QgsRenderContext& context, const QgsFields& fields, QString& filter ) { mActiveChildren.clear(); @@ -503,7 +503,7 @@ bool QgsRuleBasedRendererV2::Rule::startRender( QgsRenderContext& context, const return true; } -QSet QgsRuleBasedRendererV2::Rule::collectZLevels() +QSet QgsRuleBasedRenderer::Rule::collectZLevels() { QSet symbolZLevelsSet; @@ -527,7 +527,7 @@ QSet QgsRuleBasedRendererV2::Rule::collectZLevels() return symbolZLevelsSet; } -void QgsRuleBasedRendererV2::Rule::setNormZLevels( const QMap& zLevelsToNormLevels ) +void QgsRuleBasedRenderer::Rule::setNormZLevels( const QMap& zLevelsToNormLevels ) { if ( mSymbol ) { @@ -546,7 +546,7 @@ void QgsRuleBasedRendererV2::Rule::setNormZLevels( const QMap& zLevels } -QgsRuleBasedRendererV2::Rule::RenderResult QgsRuleBasedRendererV2::Rule::renderFeature( QgsRuleBasedRendererV2::FeatureToRender& featToRender, QgsRenderContext& context, QgsRuleBasedRendererV2::RenderQueue& renderQueue ) +QgsRuleBasedRenderer::Rule::RenderResult QgsRuleBasedRenderer::Rule::renderFeature( QgsRuleBasedRenderer::FeatureToRender& featToRender, QgsRenderContext& context, QgsRuleBasedRenderer::RenderQueue& renderQueue ) { if ( !isFilterOK( featToRender.feat, &context ) ) return Filtered; @@ -596,7 +596,7 @@ QgsRuleBasedRendererV2::Rule::RenderResult QgsRuleBasedRendererV2::Rule::renderF return Filtered; } -bool QgsRuleBasedRendererV2::Rule::willRenderFeature( QgsFeature& feat, QgsRenderContext *context ) +bool QgsRuleBasedRenderer::Rule::willRenderFeature( QgsFeature& feat, QgsRenderContext *context ) { if ( !isFilterOK( feat, context ) ) return false; @@ -611,7 +611,7 @@ bool QgsRuleBasedRendererV2::Rule::willRenderFeature( QgsFeature& feat, QgsRende return false; } -QgsSymbolList QgsRuleBasedRendererV2::Rule::symbolsForFeature( QgsFeature& feat, QgsRenderContext* context ) +QgsSymbolList QgsRuleBasedRenderer::Rule::symbolsForFeature( QgsFeature& feat, QgsRenderContext* context ) { QgsSymbolList lst; if ( !isFilterOK( feat, context ) ) @@ -626,7 +626,7 @@ QgsSymbolList QgsRuleBasedRendererV2::Rule::symbolsForFeature( QgsFeature& feat, return lst; } -QSet QgsRuleBasedRendererV2::Rule::legendKeysForFeature( QgsFeature& feat, QgsRenderContext* context ) +QSet QgsRuleBasedRenderer::Rule::legendKeysForFeature( QgsFeature& feat, QgsRenderContext* context ) { QSet< QString> lst; if ( !isFilterOK( feat, context ) ) @@ -640,7 +640,7 @@ QSet QgsRuleBasedRendererV2::Rule::legendKeysForFeature( QgsFeature& fe return lst; } -QgsRuleBasedRendererV2::RuleList QgsRuleBasedRendererV2::Rule::rulesForFeature( QgsFeature& feat, QgsRenderContext* context ) +QgsRuleBasedRenderer::RuleList QgsRuleBasedRenderer::Rule::rulesForFeature( QgsFeature& feat, QgsRenderContext* context ) { RuleList lst; if ( !isFilterOK( feat, context ) ) @@ -656,7 +656,7 @@ QgsRuleBasedRendererV2::RuleList QgsRuleBasedRendererV2::Rule::rulesForFeature( return lst; } -void QgsRuleBasedRendererV2::Rule::stopRender( QgsRenderContext& context ) +void QgsRuleBasedRenderer::Rule::stopRender( QgsRenderContext& context ) { if ( mSymbol ) mSymbol->stopRender( context ); @@ -670,7 +670,7 @@ void QgsRuleBasedRendererV2::Rule::stopRender( QgsRenderContext& context ) mSymbolNormZLevels.clear(); } -QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::create( QDomElement& ruleElem, QgsSymbolMap& symbolMap ) +QgsRuleBasedRenderer::Rule* QgsRuleBasedRenderer::Rule::create( QDomElement& ruleElem, QgsSymbolMap& symbolMap ) { QString symbolIdx = ruleElem.attribute( "symbol" ); QgsSymbol* symbol = nullptr; @@ -717,7 +717,7 @@ QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::create( QDomElement& return rule; } -QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::createFromSld( QDomElement& ruleElem, QgsWkbTypes::GeometryType geomType ) +QgsRuleBasedRenderer::Rule* QgsRuleBasedRenderer::Rule::createFromSld( QDomElement& ruleElem, QgsWkbTypes::GeometryType geomType ) { if ( ruleElem.localName() != "Rule" ) { @@ -798,7 +798,7 @@ QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::createFromSld( QDomE else if ( childElem.localName().endsWith( "Symbolizer" ) ) { // create symbol layers for this symbolizer - QgsSymbolLayerUtils::createSymbolLayerV2ListFromSld( childElem, geomType, layers ); + QgsSymbolLayerUtils::createSymbolLayerListFromSld( childElem, geomType, layers ); } childElem = childElem.nextSiblingElement(); @@ -811,15 +811,15 @@ QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::createFromSld( QDomE switch ( geomType ) { case QgsWkbTypes::LineGeometry: - symbol = new QgsLineSymbolV2( layers ); + symbol = new QgsLineSymbol( layers ); break; case QgsWkbTypes::PolygonGeometry: - symbol = new QgsFillSymbolV2( layers ); + symbol = new QgsFillSymbol( layers ); break; case QgsWkbTypes::PointGeometry: - symbol = new QgsMarkerSymbolV2( layers ); + symbol = new QgsMarkerSymbol( layers ); break; default: @@ -835,32 +835,32 @@ QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2::Rule::createFromSld( QDomE ///////////////////// -QgsRuleBasedRendererV2::QgsRuleBasedRendererV2( QgsRuleBasedRendererV2::Rule* root ) - : QgsFeatureRendererV2( "RuleRenderer" ) +QgsRuleBasedRenderer::QgsRuleBasedRenderer( QgsRuleBasedRenderer::Rule* root ) + : QgsFeatureRenderer( "RuleRenderer" ) , mRootRule( root ) { } -QgsRuleBasedRendererV2::QgsRuleBasedRendererV2( QgsSymbol* defaultSymbol ) - : QgsFeatureRendererV2( "RuleRenderer" ) +QgsRuleBasedRenderer::QgsRuleBasedRenderer( QgsSymbol* defaultSymbol ) + : QgsFeatureRenderer( "RuleRenderer" ) { mRootRule = new Rule( nullptr ); // root has no symbol, no filter etc - just a container mRootRule->appendChild( new Rule( defaultSymbol ) ); } -QgsRuleBasedRendererV2::~QgsRuleBasedRendererV2() +QgsRuleBasedRenderer::~QgsRuleBasedRenderer() { delete mRootRule; } -QgsSymbol* QgsRuleBasedRendererV2::symbolForFeature( QgsFeature& , QgsRenderContext& ) +QgsSymbol* QgsRuleBasedRenderer::symbolForFeature( QgsFeature& , QgsRenderContext& ) { // not used at all return nullptr; } -bool QgsRuleBasedRendererV2::renderFeature( QgsFeature& feature, +bool QgsRuleBasedRenderer::renderFeature( QgsFeature& feature, QgsRenderContext& context, int layer, bool selected, @@ -876,7 +876,7 @@ bool QgsRuleBasedRendererV2::renderFeature( QgsFeature& feature, } -void QgsRuleBasedRendererV2::startRender( QgsRenderContext& context, const QgsFields& fields ) +void QgsRuleBasedRenderer::startRender( QgsRenderContext& context, const QgsFields& fields ) { // prepare active children mRootRule->startRender( context, fields, mFilter ); @@ -899,7 +899,7 @@ void QgsRuleBasedRendererV2::startRender( QgsRenderContext& context, const QgsFi mRootRule->setNormZLevels( zLevelsToNormLevels ); } -void QgsRuleBasedRendererV2::stopRender( QgsRenderContext& context ) +void QgsRuleBasedRenderer::stopRender( QgsRenderContext& context ) { // // do the actual rendering @@ -941,25 +941,25 @@ void QgsRuleBasedRendererV2::stopRender( QgsRenderContext& context ) mRootRule->stopRender( context ); } -QString QgsRuleBasedRendererV2::filter( const QgsFields& ) +QString QgsRuleBasedRenderer::filter( const QgsFields& ) { return mFilter; } -QList QgsRuleBasedRendererV2::usedAttributes() +QList QgsRuleBasedRenderer::usedAttributes() { QSet attrs = mRootRule->usedAttributes(); return attrs.toList(); } -bool QgsRuleBasedRendererV2::filterNeedsGeometry() const +bool QgsRuleBasedRenderer::filterNeedsGeometry() const { return mRootRule->needsGeometry(); } -QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::clone() const +QgsRuleBasedRenderer* QgsRuleBasedRenderer::clone() const { - QgsRuleBasedRendererV2::Rule* clonedRoot = mRootRule->clone(); + QgsRuleBasedRenderer::Rule* clonedRoot = mRootRule->clone(); // normally with clone() the individual rules get new keys (UUID), but here we want to keep // the tree of rules intact, so that other components that may use the rule keys work nicely (e.g. map themes) @@ -970,25 +970,25 @@ QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::clone() const for ( int i = 0; i < origDescendants.count(); ++i ) clonedDescendants[i]->setRuleKey( origDescendants[i]->ruleKey() ); - QgsRuleBasedRendererV2* r = new QgsRuleBasedRendererV2( clonedRoot ); + QgsRuleBasedRenderer* r = new QgsRuleBasedRenderer( clonedRoot ); r->setUsingSymbolLevels( usingSymbolLevels() ); copyRendererData( r ); return r; } -void QgsRuleBasedRendererV2::toSld( QDomDocument& doc, QDomElement &element ) const +void QgsRuleBasedRenderer::toSld( QDomDocument& doc, QDomElement &element ) const { mRootRule->toSld( doc, element, QgsStringMap() ); } // TODO: ideally this function should be removed in favor of legendSymbol(ogy)Items -QgsSymbolList QgsRuleBasedRendererV2::symbols( QgsRenderContext& context ) +QgsSymbolList QgsRuleBasedRenderer::symbols( QgsRenderContext& context ) { return mRootRule->symbols( context ); } -QDomElement QgsRuleBasedRendererV2::save( QDomDocument& doc ) +QDomElement QgsRuleBasedRenderer::save( QDomDocument& doc ) { QDomElement rendererElem = doc.createElement( RENDERER_TAG_NAME ); rendererElem.setAttribute( "type", "RuleRenderer" ); @@ -1018,7 +1018,7 @@ QDomElement QgsRuleBasedRendererV2::save( QDomDocument& doc ) return rendererElem; } -QgsLegendSymbologyList QgsRuleBasedRendererV2::legendSymbologyItems( QSize iconSize ) +QgsLegendSymbologyList QgsRuleBasedRenderer::legendSymbologyItems( QSize iconSize ) { QgsLegendSymbologyList lst; QgsLegendSymbolList items = legendSymbolItems(); @@ -1031,25 +1031,25 @@ QgsLegendSymbologyList QgsRuleBasedRendererV2::legendSymbologyItems( QSize iconS return lst; } -bool QgsRuleBasedRendererV2::legendSymbolItemsCheckable() const +bool QgsRuleBasedRenderer::legendSymbolItemsCheckable() const { return true; } -bool QgsRuleBasedRendererV2::legendSymbolItemChecked( const QString& key ) +bool QgsRuleBasedRenderer::legendSymbolItemChecked( const QString& key ) { Rule* rule = mRootRule->findRuleByKey( key ); return rule ? rule->active() : true; } -void QgsRuleBasedRendererV2::checkLegendSymbolItem( const QString& key, bool state ) +void QgsRuleBasedRenderer::checkLegendSymbolItem( const QString& key, bool state ) { Rule* rule = mRootRule->findRuleByKey( key ); if ( rule ) rule->setActive( state ); } -void QgsRuleBasedRendererV2::setLegendSymbolItem( const QString& key, QgsSymbol* symbol ) +void QgsRuleBasedRenderer::setLegendSymbolItem( const QString& key, QgsSymbol* symbol ) { Rule* rule = mRootRule->findRuleByKey( key ); if ( rule ) @@ -1058,18 +1058,18 @@ void QgsRuleBasedRendererV2::setLegendSymbolItem( const QString& key, QgsSymbol* delete symbol; } -QgsLegendSymbolList QgsRuleBasedRendererV2::legendSymbolItems( double scaleDenominator, const QString& rule ) +QgsLegendSymbolList QgsRuleBasedRenderer::legendSymbolItems( double scaleDenominator, const QString& rule ) { return mRootRule->legendSymbolItems( scaleDenominator, rule ); } -QgsLegendSymbolListV2 QgsRuleBasedRendererV2::legendSymbolItemsV2() const +QgsLegendSymbolListV2 QgsRuleBasedRenderer::legendSymbolItemsV2() const { return mRootRule->legendSymbolItemsV2(); } -QgsFeatureRendererV2* QgsRuleBasedRendererV2::create( QDomElement& element ) +QgsFeatureRenderer* QgsRuleBasedRenderer::create( QDomElement& element ) { // load symbols QDomElement symbolsElem = element.firstChildElement( "symbols" ); @@ -1084,7 +1084,7 @@ QgsFeatureRendererV2* QgsRuleBasedRendererV2::create( QDomElement& element ) if ( !root ) return nullptr; - QgsRuleBasedRendererV2* r = new QgsRuleBasedRendererV2( root ); + QgsRuleBasedRenderer* r = new QgsRuleBasedRenderer( root ); // delete symbols if there are any more QgsSymbolLayerUtils::clearSymbolMap( symbolMap ); @@ -1092,7 +1092,7 @@ QgsFeatureRendererV2* QgsRuleBasedRendererV2::create( QDomElement& element ) return r; } -QgsFeatureRendererV2* QgsRuleBasedRendererV2::createFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType ) +QgsFeatureRenderer* QgsRuleBasedRenderer::createFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType ) { // retrieve child rules Rule* root = nullptr; @@ -1120,13 +1120,13 @@ QgsFeatureRendererV2* QgsRuleBasedRendererV2::createFromSld( QDomElement& elemen } // create and return the new renderer - return new QgsRuleBasedRendererV2( root ); + return new QgsRuleBasedRenderer( root ); } -#include "qgscategorizedsymbolrendererv2.h" -#include "qgsgraduatedsymbolrendererv2.h" +#include "qgscategorizedsymbolrenderer.h" +#include "qgsgraduatedsymbolrenderer.h" -void QgsRuleBasedRendererV2::refineRuleCategories( QgsRuleBasedRendererV2::Rule* initialRule, QgsCategorizedSymbolRendererV2* r ) +void QgsRuleBasedRenderer::refineRuleCategories( QgsRuleBasedRenderer::Rule* initialRule, QgsCategorizedSymbolRenderer* r ) { QString attr = r->classAttribute(); // categorizedAttr could be either an attribute name or an expression. @@ -1138,7 +1138,7 @@ void QgsRuleBasedRendererV2::refineRuleCategories( QgsRuleBasedRendererV2::Rule* attr = QgsExpression::quotedColumnRef( attr ); } - Q_FOREACH ( const QgsRendererCategoryV2& cat, r->categories() ) + Q_FOREACH ( const QgsRendererCategory& cat, r->categories() ) { QString value; // not quoting numbers saves a type cast @@ -1156,7 +1156,7 @@ void QgsRuleBasedRendererV2::refineRuleCategories( QgsRuleBasedRendererV2::Rule* } } -void QgsRuleBasedRendererV2::refineRuleRanges( QgsRuleBasedRendererV2::Rule* initialRule, QgsGraduatedSymbolRendererV2* r ) +void QgsRuleBasedRenderer::refineRuleRanges( QgsRuleBasedRenderer::Rule* initialRule, QgsGraduatedSymbolRenderer* r ) { QString attr = r->classAttribute(); // categorizedAttr could be either an attribute name or an expression. @@ -1174,7 +1174,7 @@ void QgsRuleBasedRendererV2::refineRuleRanges( QgsRuleBasedRendererV2::Rule* ini } bool firstRange = true; - Q_FOREACH ( const QgsRendererRangeV2& rng, r->ranges() ) + Q_FOREACH ( const QgsRendererRange& rng, r->ranges() ) { // due to the loss of precision in double->string conversion we may miss out values at the limit of the range // TODO: have a possibility to construct expressions directly as a parse tree to avoid loss of precision @@ -1187,7 +1187,7 @@ void QgsRuleBasedRendererV2::refineRuleRanges( QgsRuleBasedRendererV2::Rule* ini } } -void QgsRuleBasedRendererV2::refineRuleScales( QgsRuleBasedRendererV2::Rule* initialRule, QList scales ) +void QgsRuleBasedRenderer::refineRuleScales( QgsRuleBasedRenderer::Rule* initialRule, QList scales ) { qSort( scales ); // make sure the scales are in ascending order int oldScale = initialRule->scaleMinDenom(); @@ -1206,53 +1206,53 @@ void QgsRuleBasedRendererV2::refineRuleScales( QgsRuleBasedRendererV2::Rule* ini initialRule->appendChild( new Rule( symbol->clone(), oldScale, maxDenom, QString(), QString( "%1 - %2" ).arg( oldScale ).arg( maxDenom ) ) ); } -QString QgsRuleBasedRendererV2::dump() const +QString QgsRuleBasedRenderer::dump() const { QString msg( "Rule-based renderer:\n" ); msg += mRootRule->dump(); return msg; } -bool QgsRuleBasedRendererV2::willRenderFeature( QgsFeature& feat, QgsRenderContext& context ) +bool QgsRuleBasedRenderer::willRenderFeature( QgsFeature& feat, QgsRenderContext& context ) { return mRootRule->willRenderFeature( feat, &context ); } -QgsSymbolList QgsRuleBasedRendererV2::symbolsForFeature( QgsFeature& feat, QgsRenderContext& context ) +QgsSymbolList QgsRuleBasedRenderer::symbolsForFeature( QgsFeature& feat, QgsRenderContext& context ) { return mRootRule->symbolsForFeature( feat, &context ); } -QgsSymbolList QgsRuleBasedRendererV2::originalSymbolsForFeature( QgsFeature& feat, QgsRenderContext& context ) +QgsSymbolList QgsRuleBasedRenderer::originalSymbolsForFeature( QgsFeature& feat, QgsRenderContext& context ) { return mRootRule->symbolsForFeature( feat, &context ); } -QSet< QString > QgsRuleBasedRendererV2::legendKeysForFeature( QgsFeature& feature, QgsRenderContext& context ) +QSet< QString > QgsRuleBasedRenderer::legendKeysForFeature( QgsFeature& feature, QgsRenderContext& context ) { return mRootRule->legendKeysForFeature( feature, &context ); } -QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFeatureRendererV2* renderer ) +QgsRuleBasedRenderer* QgsRuleBasedRenderer::convertFromRenderer( const QgsFeatureRenderer* renderer ) { - QgsRuleBasedRendererV2* r = nullptr; + QgsRuleBasedRenderer* r = nullptr; if ( renderer->type() == "RuleRenderer" ) { - r = dynamic_cast( renderer->clone() ); + r = dynamic_cast( renderer->clone() ); } else if ( renderer->type() == "singleSymbol" ) { - const QgsSingleSymbolRendererV2* singleSymbolRenderer = dynamic_cast( renderer ); + const QgsSingleSymbolRenderer* singleSymbolRenderer = dynamic_cast( renderer ); if ( !singleSymbolRenderer ) return nullptr; QgsSymbol* origSymbol = singleSymbolRenderer->symbol()->clone(); convertToDataDefinedSymbology( origSymbol, singleSymbolRenderer->sizeScaleField() ); - r = new QgsRuleBasedRendererV2( origSymbol ); + r = new QgsRuleBasedRenderer( origSymbol ); } else if ( renderer->type() == "categorizedSymbol" ) { - const QgsCategorizedSymbolRendererV2* categorizedRenderer = dynamic_cast( renderer ); + const QgsCategorizedSymbolRenderer* categorizedRenderer = dynamic_cast( renderer ); if ( !categorizedRenderer ) return nullptr; @@ -1266,15 +1266,15 @@ QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFe attr = QgsExpression::quotedColumnRef( attr ); } - QgsRuleBasedRendererV2::Rule* rootrule = new QgsRuleBasedRendererV2::Rule( nullptr ); + QgsRuleBasedRenderer::Rule* rootrule = new QgsRuleBasedRenderer::Rule( nullptr ); QString expression; QString value; - QgsRendererCategoryV2 category; + QgsRendererCategory category; for ( int i = 0; i < categorizedRenderer->categories().size(); ++i ) { category = categorizedRenderer->categories().value( i ); - QgsRuleBasedRendererV2::Rule* rule = new QgsRuleBasedRendererV2::Rule( nullptr ); + QgsRuleBasedRenderer::Rule* rule = new QgsRuleBasedRenderer::Rule( nullptr ); rule->setLabel( category.label() ); @@ -1311,11 +1311,11 @@ QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFe rootrule->appendChild( rule ); } - r = new QgsRuleBasedRendererV2( rootrule ); + r = new QgsRuleBasedRenderer( rootrule ); } else if ( renderer->type() == "graduatedSymbol" ) { - const QgsGraduatedSymbolRendererV2* graduatedRenderer = dynamic_cast( renderer ); + const QgsGraduatedSymbolRenderer* graduatedRenderer = dynamic_cast( renderer ); if ( !graduatedRenderer ) return nullptr; @@ -1334,14 +1334,14 @@ QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFe attr = QString( "(%1)" ).arg( attr ); } - QgsRuleBasedRendererV2::Rule* rootrule = new QgsRuleBasedRendererV2::Rule( nullptr ); + QgsRuleBasedRenderer::Rule* rootrule = new QgsRuleBasedRenderer::Rule( nullptr ); QString expression; - QgsRendererRangeV2 range; + QgsRendererRange range; for ( int i = 0; i < graduatedRenderer->ranges().size();++i ) { range = graduatedRenderer->ranges().value( i ); - QgsRuleBasedRendererV2::Rule* rule = new QgsRuleBasedRendererV2::Rule( nullptr ); + QgsRuleBasedRenderer::Rule* rule = new QgsRuleBasedRenderer::Rule( nullptr ); rule->setLabel( range.label() ); if ( i == 0 )//The lower boundary of the first range is included, while it is excluded for the others { @@ -1367,7 +1367,7 @@ QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFe rootrule->appendChild( rule ); } - r = new QgsRuleBasedRendererV2( rootrule ); + r = new QgsRuleBasedRenderer( rootrule ); } else if ( renderer->type() == "pointDisplacement" ) { @@ -1391,7 +1391,7 @@ QgsRuleBasedRendererV2* QgsRuleBasedRendererV2::convertFromRenderer( const QgsFe return r; } -void QgsRuleBasedRendererV2::convertToDataDefinedSymbology( QgsSymbol* symbol, const QString& sizeScaleField, const QString& rotationField ) +void QgsRuleBasedRenderer::convertToDataDefinedSymbology( QgsSymbol* symbol, const QString& sizeScaleField, const QString& rotationField ) { QString sizeExpression; switch ( symbol->type() ) @@ -1399,7 +1399,7 @@ void QgsRuleBasedRendererV2::convertToDataDefinedSymbology( QgsSymbol* symbol, c case QgsSymbol::Marker: for ( int j = 0; j < symbol->symbolLayerCount();++j ) { - QgsMarkerSymbolLayerV2* msl = static_cast( symbol->symbolLayer( j ) ); + QgsMarkerSymbolLayer* msl = static_cast( symbol->symbolLayer( j ) ); if ( ! sizeScaleField.isEmpty() ) { sizeExpression = QString( "%1*(%2)" ).arg( msl->size() ).arg( sizeScaleField ); @@ -1418,7 +1418,7 @@ void QgsRuleBasedRendererV2::convertToDataDefinedSymbology( QgsSymbol* symbol, c { if ( symbol->symbolLayer( j )->layerType() == "SimpleLine" ) { - QgsLineSymbolLayerV2* lsl = static_cast( symbol->symbolLayer( j ) ); + QgsLineSymbolLayer* lsl = static_cast( symbol->symbolLayer( j ) ); sizeExpression = QString( "%1*(%2)" ).arg( lsl->width() ).arg( sizeScaleField ); lsl->setDataDefinedProperty( "width", new QgsDataDefined( sizeExpression ) ); } @@ -1427,7 +1427,7 @@ void QgsRuleBasedRendererV2::convertToDataDefinedSymbology( QgsSymbol* symbol, c QgsSymbol* marker = symbol->symbolLayer( j )->subSymbol(); for ( int k = 0; k < marker->symbolLayerCount();++k ) { - QgsMarkerSymbolLayerV2* msl = static_cast( marker->symbolLayer( k ) ); + QgsMarkerSymbolLayer* msl = static_cast( marker->symbolLayer( k ) ); sizeExpression = QString( "%1*(%2)" ).arg( msl->size() ).arg( sizeScaleField ); msl->setDataDefinedProperty( "size", new QgsDataDefined( sizeExpression ) ); } diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.h b/src/core/symbology-ng/qgsrulebasedrenderer.h similarity index 95% rename from src/core/symbology-ng/qgsrulebasedrendererv2.h rename to src/core/symbology-ng/qgsrulebasedrenderer.h index 68dbc1f9616..3f41810f0cc 100644 --- a/src/core/symbology-ng/qgsrulebasedrendererv2.h +++ b/src/core/symbology-ng/qgsrulebasedrenderer.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsrulebasedrendererv2.h - Rule-based renderer (symbology-ng) + qgsrulebasedrenderer.h - Rule-based renderer (symbology-ng) --------------------- begin : May 2010 copyright : (C) 2010 by Martin Dobias @@ -20,18 +20,18 @@ #include "qgsfeature.h" #include "qgis.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" class QgsExpression; -class QgsCategorizedSymbolRendererV2; -class QgsGraduatedSymbolRendererV2; +class QgsCategorizedSymbolRenderer; +class QgsGraduatedSymbolRenderer; /** \ingroup core When drawing a vector layer with rule-based renderer, it goes through the rules and draws features with symbols from rules that match. */ -class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2 +class CORE_EXPORT QgsRuleBasedRenderer : public QgsFeatureRenderer { public: // TODO: use QVarLengthArray instead of QList @@ -415,14 +415,14 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2 ///// - static QgsFeatureRendererV2* create( QDomElement& element ); + static QgsFeatureRenderer* create( QDomElement& element ); //! Constructs the renderer from given tree of rules (takes ownership) - QgsRuleBasedRendererV2( QgsRuleBasedRendererV2::Rule* root ); + QgsRuleBasedRenderer( QgsRuleBasedRenderer::Rule* root ); //! Constructor for convenience. Creates a root rule and adds a default rule with symbol (takes ownership) - QgsRuleBasedRendererV2( QgsSymbol* defaultSymbol ); + QgsRuleBasedRenderer( QgsSymbol* defaultSymbol ); - ~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 ) override; @@ -439,11 +439,11 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2 virtual bool filterNeedsGeometry() const override; - virtual QgsRuleBasedRendererV2* clone() const override; + virtual QgsRuleBasedRenderer* clone() const override; virtual void toSld( QDomDocument& doc, QDomElement &element ) const override; - static QgsFeatureRendererV2* createFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType ); + static QgsFeatureRenderer* createFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType ); virtual QgsSymbolList symbols( QgsRenderContext& context ) override; @@ -502,16 +502,16 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2 ////// //! take a rule and create a list of new rules based on the categories from categorized symbol renderer - static void refineRuleCategories( Rule* initialRule, QgsCategorizedSymbolRendererV2* r ); + static void refineRuleCategories( 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( Rule* initialRule, QgsGraduatedSymbolRendererV2* r ); + static void refineRuleRanges( 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( Rule* initialRule, QList 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 ); + static QgsRuleBasedRenderer* convertFromRenderer( const QgsFeatureRenderer *renderer ); //! 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() ); diff --git a/src/core/symbology-ng/qgssinglesymbolrendererv2.cpp b/src/core/symbology-ng/qgssinglesymbolrenderer.cpp similarity index 74% rename from src/core/symbology-ng/qgssinglesymbolrendererv2.cpp rename to src/core/symbology-ng/qgssinglesymbolrenderer.cpp index a4cf6b20070..4dc82ef776d 100644 --- a/src/core/symbology-ng/qgssinglesymbolrendererv2.cpp +++ b/src/core/symbology-ng/qgssinglesymbolrenderer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgssinglesymbolrendererv2.cpp + qgssinglesymbolrenderer.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include "qgssinglesymbolrendererv2.h" +#include "qgssinglesymbolrenderer.h" #include "qgssymbol.h" #include "qgssymbollayerutils.h" @@ -33,8 +33,8 @@ #include #include -QgsSingleSymbolRendererV2::QgsSingleSymbolRendererV2( QgsSymbol* symbol ) - : QgsFeatureRendererV2( "singleSymbol" ) +QgsSingleSymbolRenderer::QgsSingleSymbolRenderer( QgsSymbol* symbol ) + : QgsFeatureRenderer( "singleSymbol" ) , mSymbol( symbol ) , mScaleMethod( DEFAULT_SCALE_METHOD ) , mOrigSize( 0.0 ) @@ -42,11 +42,11 @@ QgsSingleSymbolRendererV2::QgsSingleSymbolRendererV2( QgsSymbol* symbol ) Q_ASSERT( symbol ); } -QgsSingleSymbolRendererV2::~QgsSingleSymbolRendererV2() +QgsSingleSymbolRenderer::~QgsSingleSymbolRenderer() { } -QgsSymbol* QgsSingleSymbolRendererV2::symbolForFeature( QgsFeature& feature, QgsRenderContext &context ) +QgsSymbol* QgsSingleSymbolRenderer::symbolForFeature( QgsFeature& feature, QgsRenderContext &context ) { context.expressionContext().setFeature( feature ); if ( !mRotation.data() && !mSizeScale.data() ) return mSymbol.data(); @@ -56,33 +56,33 @@ QgsSymbol* QgsSingleSymbolRendererV2::symbolForFeature( QgsFeature& feature, Qgs if ( mTempSymbol->type() == QgsSymbol::Marker ) { - QgsMarkerSymbolV2* markerSymbol = static_cast( mTempSymbol.data() ); + QgsMarkerSymbol* markerSymbol = static_cast( mTempSymbol.data() ); if ( mRotation.data() ) markerSymbol->setAngle( rotation ); markerSymbol->setSize( sizeScale * mOrigSize ); markerSymbol->setScaleMethod( mScaleMethod ); } else if ( mTempSymbol->type() == QgsSymbol::Line ) { - QgsLineSymbolV2* lineSymbol = static_cast( mTempSymbol.data() ); + QgsLineSymbol* lineSymbol = static_cast( mTempSymbol.data() ); lineSymbol->setWidth( sizeScale * mOrigSize ); } else if ( mTempSymbol->type() == QgsSymbol::Fill ) { - QgsFillSymbolV2* fillSymbol = static_cast( mTempSymbol.data() ); + QgsFillSymbol* fillSymbol = static_cast( mTempSymbol.data() ); if ( mRotation.data() ) fillSymbol->setAngle( rotation ); } return mTempSymbol.data(); } -QgsSymbol* QgsSingleSymbolRendererV2::originalSymbolForFeature( QgsFeature& feature, QgsRenderContext &context ) +QgsSymbol* QgsSingleSymbolRenderer::originalSymbolForFeature( QgsFeature& feature, QgsRenderContext &context ) { Q_UNUSED( context ); Q_UNUSED( feature ); return mSymbol.data(); } -void QgsSingleSymbolRendererV2::startRender( QgsRenderContext& context, const QgsFields& fields ) +void QgsSingleSymbolRenderer::startRender( QgsRenderContext& context, const QgsFields& fields ) { if ( !mSymbol.data() ) return; @@ -105,11 +105,11 @@ void QgsSingleSymbolRendererV2::startRender( QgsRenderContext& context, const Qg if ( mSymbol->type() == QgsSymbol::Marker ) { - mOrigSize = static_cast( mSymbol.data() )->size(); + mOrigSize = static_cast( mSymbol.data() )->size(); } else if ( mSymbol->type() == QgsSymbol::Line ) { - mOrigSize = static_cast( mSymbol.data() )->width(); + mOrigSize = static_cast( mSymbol.data() )->width(); } else { @@ -120,7 +120,7 @@ void QgsSingleSymbolRendererV2::startRender( QgsRenderContext& context, const Qg return; } -void QgsSingleSymbolRendererV2::stopRender( QgsRenderContext& context ) +void QgsSingleSymbolRenderer::stopRender( QgsRenderContext& context ) { if ( !mSymbol.data() ) return; @@ -134,7 +134,7 @@ void QgsSingleSymbolRendererV2::stopRender( QgsRenderContext& context ) } } -QList QgsSingleSymbolRendererV2::usedAttributes() +QList QgsSingleSymbolRenderer::usedAttributes() { QSet attributes; if ( mSymbol.data() ) attributes.unite( mSymbol->usedAttributes() ); @@ -143,31 +143,31 @@ QList QgsSingleSymbolRendererV2::usedAttributes() return attributes.toList(); } -QgsSymbol* QgsSingleSymbolRendererV2::symbol() const +QgsSymbol* QgsSingleSymbolRenderer::symbol() const { return mSymbol.data(); } -void QgsSingleSymbolRendererV2::setSymbol( QgsSymbol* s ) +void QgsSingleSymbolRenderer::setSymbol( QgsSymbol* s ) { Q_ASSERT( s ); mSymbol.reset( s ); } -void QgsSingleSymbolRendererV2::setRotationField( const QString& fieldOrExpression ) +void QgsSingleSymbolRenderer::setRotationField( const QString& fieldOrExpression ) { if ( mSymbol->type() == QgsSymbol::Marker ) { - QgsMarkerSymbolV2 * s = static_cast( mSymbol.data() ); + QgsMarkerSymbol * s = static_cast( mSymbol.data() ); s->setDataDefinedAngle( QgsDataDefined( fieldOrExpression ) ); } } -QString QgsSingleSymbolRendererV2::rotationField() const +QString QgsSingleSymbolRenderer::rotationField() const { if ( mSymbol->type() == QgsSymbol::Marker ) { - QgsMarkerSymbolV2 * s = static_cast( mSymbol.data() ); + QgsMarkerSymbol * s = static_cast( mSymbol.data() ); QgsDataDefined ddAngle = s->dataDefinedAngle(); return ddAngle.useExpression() ? ddAngle.expressionString() : ddAngle.field(); } @@ -175,37 +175,37 @@ QString QgsSingleSymbolRendererV2::rotationField() const return QString(); } -void QgsSingleSymbolRendererV2::setSizeScaleField( const QString& fieldOrExpression ) +void QgsSingleSymbolRenderer::setSizeScaleField( const QString& fieldOrExpression ) { mSizeScale.reset( QgsSymbolLayerUtils::fieldOrExpressionToExpression( fieldOrExpression ) ); } -QString QgsSingleSymbolRendererV2::sizeScaleField() const +QString QgsSingleSymbolRenderer::sizeScaleField() const { return mSizeScale.data() ? QgsSymbolLayerUtils::fieldOrExpressionFromExpression( mSizeScale.data() ) : QString(); } -void QgsSingleSymbolRendererV2::setScaleMethod( QgsSymbol::ScaleMethod scaleMethod ) +void QgsSingleSymbolRenderer::setScaleMethod( QgsSymbol::ScaleMethod scaleMethod ) { mScaleMethod = scaleMethod; setScaleMethodToSymbol( mSymbol.data(), scaleMethod ); } -QString QgsSingleSymbolRendererV2::dump() const +QString QgsSingleSymbolRenderer::dump() const { return mSymbol.data() ? QString( "SINGLE: %1" ).arg( mSymbol->dump() ) : ""; } -QgsSingleSymbolRendererV2* QgsSingleSymbolRendererV2::clone() const +QgsSingleSymbolRenderer* QgsSingleSymbolRenderer::clone() const { - QgsSingleSymbolRendererV2* r = new QgsSingleSymbolRendererV2( mSymbol->clone() ); + QgsSingleSymbolRenderer* r = new QgsSingleSymbolRenderer( mSymbol->clone() ); r->setUsingSymbolLevels( usingSymbolLevels() ); r->setSizeScaleField( sizeScaleField() ); copyRendererData( r ); return r; } -void QgsSingleSymbolRendererV2::toSld( QDomDocument& doc, QDomElement &element ) const +void QgsSingleSymbolRenderer::toSld( QDomDocument& doc, QDomElement &element ) const { QgsStringMap props; if ( mRotation.data() ) @@ -223,7 +223,7 @@ void QgsSingleSymbolRendererV2::toSld( QDomDocument& doc, QDomElement &element ) if ( mSymbol.data() ) mSymbol->toSld( doc, ruleElem, props ); } -QgsSymbolList QgsSingleSymbolRendererV2::symbols( QgsRenderContext &context ) +QgsSymbolList QgsSingleSymbolRenderer::symbols( QgsRenderContext &context ) { Q_UNUSED( context ); QgsSymbolList lst; @@ -232,7 +232,7 @@ QgsSymbolList QgsSingleSymbolRendererV2::symbols( QgsRenderContext &context ) } -QgsFeatureRendererV2* QgsSingleSymbolRendererV2::create( QDomElement& element ) +QgsFeatureRenderer* QgsSingleSymbolRenderer::create( QDomElement& element ) { QDomElement symbolsElem = element.firstChildElement( "symbols" ); if ( symbolsElem.isNull() ) @@ -243,7 +243,7 @@ QgsFeatureRendererV2* QgsSingleSymbolRendererV2::create( QDomElement& element ) if ( !symbolMap.contains( "0" ) ) return nullptr; - QgsSingleSymbolRendererV2* r = new QgsSingleSymbolRendererV2( symbolMap.take( "0" ) ); + QgsSingleSymbolRenderer* r = new QgsSingleSymbolRenderer( symbolMap.take( "0" ) ); // delete symbols if there are any more QgsSymbolLayerUtils::clearSymbolMap( symbolMap ); @@ -266,7 +266,7 @@ QgsFeatureRendererV2* QgsSingleSymbolRendererV2::create( QDomElement& element ) return r; } -QgsFeatureRendererV2* QgsSingleSymbolRendererV2::createFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType ) +QgsFeatureRenderer* QgsSingleSymbolRenderer::createFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType ) { // XXX this renderer can handle only one Rule! @@ -320,7 +320,7 @@ QgsFeatureRendererV2* QgsSingleSymbolRendererV2::createFromSld( QDomElement& ele else if ( childElem.localName().endsWith( "Symbolizer" ) ) { // create symbol layers for this symbolizer - QgsSymbolLayerUtils::createSymbolLayerV2ListFromSld( childElem, geomType, layers ); + QgsSymbolLayerUtils::createSymbolLayerListFromSld( childElem, geomType, layers ); } childElem = childElem.nextSiblingElement(); @@ -334,15 +334,15 @@ QgsFeatureRendererV2* QgsSingleSymbolRendererV2::createFromSld( QDomElement& ele switch ( geomType ) { case QgsWkbTypes::LineGeometry: - symbol = new QgsLineSymbolV2( layers ); + symbol = new QgsLineSymbol( layers ); break; case QgsWkbTypes::PolygonGeometry: - symbol = new QgsFillSymbolV2( layers ); + symbol = new QgsFillSymbol( layers ); break; case QgsWkbTypes::PointGeometry: - symbol = new QgsMarkerSymbolV2( layers ); + symbol = new QgsMarkerSymbol( layers ); break; default: @@ -351,10 +351,10 @@ QgsFeatureRendererV2* QgsSingleSymbolRendererV2::createFromSld( QDomElement& ele } // and finally return the new renderer - return new QgsSingleSymbolRendererV2( symbol ); + return new QgsSingleSymbolRenderer( symbol ); } -QDomElement QgsSingleSymbolRendererV2::save( QDomDocument& doc ) +QDomElement QgsSingleSymbolRenderer::save( QDomDocument& doc ) { QDomElement rendererElem = doc.createElement( RENDERER_TAG_NAME ); rendererElem.setAttribute( "type", "singleSymbol" ); @@ -391,7 +391,7 @@ QDomElement QgsSingleSymbolRendererV2::save( QDomDocument& doc ) return rendererElem; } -QgsLegendSymbologyList QgsSingleSymbolRendererV2::legendSymbologyItems( QSize iconSize ) +QgsLegendSymbologyList QgsSingleSymbolRenderer::legendSymbologyItems( QSize iconSize ) { QgsLegendSymbologyList lst; if ( mSymbol.data() ) @@ -402,7 +402,7 @@ QgsLegendSymbologyList QgsSingleSymbolRendererV2::legendSymbologyItems( QSize ic return lst; } -QgsLegendSymbolList QgsSingleSymbolRendererV2::legendSymbolItems( double scaleDenominator, const QString& rule ) +QgsLegendSymbolList QgsSingleSymbolRenderer::legendSymbolItems( double scaleDenominator, const QString& rule ) { Q_UNUSED( scaleDenominator ); Q_UNUSED( rule ); @@ -411,24 +411,24 @@ QgsLegendSymbolList QgsSingleSymbolRendererV2::legendSymbolItems( double scaleDe return lst; } -QgsLegendSymbolListV2 QgsSingleSymbolRendererV2::legendSymbolItemsV2() const +QgsLegendSymbolListV2 QgsSingleSymbolRenderer::legendSymbolItemsV2() const { QgsLegendSymbolListV2 lst; if ( mSymbol->type() == QgsSymbol::Marker ) { - const QgsMarkerSymbolV2 * symbol = static_cast( mSymbol.data() ); + const QgsMarkerSymbol * symbol = static_cast( mSymbol.data() ); QgsDataDefined sizeDD = symbol->dataDefinedSize(); if ( sizeDD.isActive() && sizeDD.useExpression() ) { QgsScaleExpression scaleExp( sizeDD.expressionString() ); if ( scaleExp.type() != QgsScaleExpression::Unknown ) { - QgsLegendSymbolItemV2 title( nullptr, scaleExp.baseExpression(), QString() ); + QgsLegendSymbolItem title( nullptr, scaleExp.baseExpression(), QString() ); lst << title; Q_FOREACH ( double v, QgsSymbolLayerUtils::prettyBreaks( scaleExp.minValue(), scaleExp.maxValue(), 4 ) ) { - QgsLegendSymbolItemV2 si( mSymbol.data(), QString::number( v ), QString() ); - QgsMarkerSymbolV2 * s = static_cast( si.symbol() ); + QgsLegendSymbolItem si( mSymbol.data(), QString::number( v ), QString() ); + QgsMarkerSymbol * s = static_cast( si.symbol() ); s->setDataDefinedSize( 0 ); s->setSize( scaleExp.size( v ) ); lst << si; @@ -438,29 +438,29 @@ QgsLegendSymbolListV2 QgsSingleSymbolRendererV2::legendSymbolItemsV2() const } } - lst << QgsLegendSymbolItemV2( mSymbol.data(), QString(), QString() ); + lst << QgsLegendSymbolItem( mSymbol.data(), QString(), QString() ); return lst; } -QSet< QString > QgsSingleSymbolRendererV2::legendKeysForFeature( QgsFeature& feature, QgsRenderContext& context ) +QSet< QString > QgsSingleSymbolRenderer::legendKeysForFeature( QgsFeature& feature, QgsRenderContext& context ) { Q_UNUSED( feature ); Q_UNUSED( context ); return QSet< QString >() << QString(); } -void QgsSingleSymbolRendererV2::setLegendSymbolItem( const QString& key, QgsSymbol* symbol ) +void QgsSingleSymbolRenderer::setLegendSymbolItem( const QString& key, QgsSymbol* symbol ) { Q_UNUSED( key ); setSymbol( symbol ); } -QgsSingleSymbolRendererV2* QgsSingleSymbolRendererV2::convertFromRenderer( const QgsFeatureRendererV2 *renderer ) +QgsSingleSymbolRenderer* QgsSingleSymbolRenderer::convertFromRenderer( const QgsFeatureRenderer *renderer ) { - QgsSingleSymbolRendererV2* r = nullptr; + QgsSingleSymbolRenderer* r = nullptr; if ( renderer->type() == "singleSymbol" ) { - r = dynamic_cast( renderer->clone() ); + r = dynamic_cast( renderer->clone() ); } else if ( renderer->type() == "pointDisplacement" ) { @@ -478,10 +478,10 @@ QgsSingleSymbolRendererV2* QgsSingleSymbolRendererV2::convertFromRenderer( const if ( !r ) { QgsRenderContext context; - QgsSymbolList symbols = const_cast( renderer )->symbols( context ); + QgsSymbolList symbols = const_cast( renderer )->symbols( context ); if ( !symbols.isEmpty() ) { - r = new QgsSingleSymbolRendererV2( symbols.at( 0 )->clone() ); + r = new QgsSingleSymbolRenderer( symbols.at( 0 )->clone() ); } } diff --git a/src/core/symbology-ng/qgssinglesymbolrendererv2.h b/src/core/symbology-ng/qgssinglesymbolrenderer.h similarity index 85% rename from src/core/symbology-ng/qgssinglesymbolrendererv2.h rename to src/core/symbology-ng/qgssinglesymbolrenderer.h index cb8a3b97ad1..9422bff1828 100644 --- a/src/core/symbology-ng/qgssinglesymbolrendererv2.h +++ b/src/core/symbology-ng/qgssinglesymbolrenderer.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgssinglesymbolrendererv2.h + qgssinglesymbolrenderer.h --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -16,22 +16,22 @@ #define QGSSINGLESYMBOLRENDERERV2_H #include "qgis.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgssymbol.h" #include "qgsexpression.h" #include Q_NOWARN_DEPRECATED_PUSH /** \ingroup core - * \class QgsSingleSymbolRendererV2 + * \class QgsSingleSymbolRenderer */ -class CORE_EXPORT QgsSingleSymbolRendererV2 : public QgsFeatureRendererV2 +class CORE_EXPORT QgsSingleSymbolRenderer : public QgsFeatureRenderer { public: - QgsSingleSymbolRendererV2( QgsSymbol* symbol ); + QgsSingleSymbolRenderer( QgsSymbol* symbol ); - virtual ~QgsSingleSymbolRendererV2(); + virtual ~QgsSingleSymbolRenderer(); //! @note available in python as symbolForFeature2 virtual QgsSymbol* symbolForFeature( QgsFeature& feature, QgsRenderContext& context ) override; @@ -59,10 +59,10 @@ class CORE_EXPORT QgsSingleSymbolRendererV2 : public QgsFeatureRendererV2 virtual QString dump() const override; - virtual QgsSingleSymbolRendererV2* clone() const override; + virtual QgsSingleSymbolRenderer* clone() const override; virtual void toSld( QDomDocument& doc, QDomElement &element ) const override; - 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 Capabilities capabilities() override { return SymbolLevels | RotationField; } @@ -71,7 +71,7 @@ class CORE_EXPORT QgsSingleSymbolRendererV2 : public QgsFeatureRendererV2 virtual QgsSymbolList symbols( QgsRenderContext& context ) override; //! create renderer from XML element - static QgsFeatureRendererV2* create( QDomElement& element ); + static QgsFeatureRenderer* create( QDomElement& element ); //! store renderer info to XML element virtual QDomElement save( QDomDocument& doc ) override; @@ -91,10 +91,10 @@ class CORE_EXPORT QgsSingleSymbolRendererV2 : public QgsFeatureRendererV2 virtual void setLegendSymbolItem( const QString& key, QgsSymbol* symbol ) override; - //! 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 ); + static QgsSingleSymbolRenderer* convertFromRenderer( const QgsFeatureRenderer *renderer ); protected: QScopedPointer mSymbol; diff --git a/src/core/symbology-ng/qgsstylev2.cpp b/src/core/symbology-ng/qgsstyle.cpp similarity index 89% rename from src/core/symbology-ng/qgsstylev2.cpp rename to src/core/symbology-ng/qgsstyle.cpp index e02f072b309..7432da02305 100644 --- a/src/core/symbology-ng/qgsstylev2.cpp +++ b/src/core/symbology-ng/qgsstyle.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsstylev2.cpp + qgsstyle.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -13,10 +13,10 @@ * * ***************************************************************************/ -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgssymbol.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgssymbollayerregistry.h" @@ -35,39 +35,39 @@ #define STYLE_CURRENT_VERSION "1" -QgsStyleV2 *QgsStyleV2::mDefaultStyle = nullptr; +QgsStyle *QgsStyle::mDefaultStyle = nullptr; -QgsStyleV2::QgsStyleV2() : QObject() +QgsStyle::QgsStyle() : QObject() { mCurrentDB = nullptr; } -QgsStyleV2::~QgsStyleV2() +QgsStyle::~QgsStyle() { clear(); } -QgsStyleV2* QgsStyleV2::defaultStyle() // static +QgsStyle* QgsStyle::defaultStyle() // static { if ( !mDefaultStyle ) { - QString styleFilename = QgsApplication::userStyleV2Path(); + QString styleFilename = QgsApplication::userStylePath(); // copy default style if user style doesn't exist if ( !QFile::exists( styleFilename ) ) { - QFile::copy( QgsApplication::defaultStyleV2Path(), styleFilename ); + QFile::copy( QgsApplication::defaultStylePath(), styleFilename ); } - mDefaultStyle = new QgsStyleV2; + mDefaultStyle = new QgsStyle; mDefaultStyle->load( styleFilename ); } return mDefaultStyle; } -void QgsStyleV2::clear() +void QgsStyle::clear() { qDeleteAll( mSymbols ); qDeleteAll( mColorRamps ); @@ -78,7 +78,7 @@ void QgsStyleV2::clear() sqlite3_close( mCurrentDB ); } -bool QgsStyleV2::addSymbol( const QString& name, QgsSymbol* symbol, bool update ) +bool QgsStyle::addSymbol( const QString& name, QgsSymbol* symbol, bool update ) { if ( !symbol || name.isEmpty() ) return false; @@ -102,7 +102,7 @@ bool QgsStyleV2::addSymbol( const QString& name, QgsSymbol* symbol, bool update return true; } -bool QgsStyleV2::saveSymbol( const QString& name, QgsSymbol* symbol, int groupid, const QStringList& tags ) +bool QgsStyle::saveSymbol( const QString& name, QgsSymbol* symbol, int groupid, const QStringList& tags ) { // TODO add support for groups QDomDocument doc( "dummy" ); @@ -133,7 +133,7 @@ bool QgsStyleV2::saveSymbol( const QString& name, QgsSymbol* symbol, int groupid return true; } -bool QgsStyleV2::removeSymbol( const QString& name ) +bool QgsStyle::removeSymbol( const QString& name ) { QgsSymbol *symbol = mSymbols.take( name ); if ( !symbol ) @@ -161,29 +161,29 @@ bool QgsStyleV2::removeSymbol( const QString& name ) return true; } -QgsSymbol* QgsStyleV2::symbol( const QString& name ) +QgsSymbol* QgsStyle::symbol( const QString& name ) { const QgsSymbol *symbol = symbolRef( name ); return symbol ? symbol->clone() : nullptr; } -const QgsSymbol *QgsStyleV2::symbolRef( const QString& name ) const +const QgsSymbol *QgsStyle::symbolRef( const QString& name ) const { return mSymbols.value( name ); } -int QgsStyleV2::symbolCount() +int QgsStyle::symbolCount() { return mSymbols.count(); } -QStringList QgsStyleV2::symbolNames() +QStringList QgsStyle::symbolNames() { return mSymbols.keys(); } -bool QgsStyleV2::addColorRamp( const QString& name, QgsVectorColorRampV2* colorRamp, bool update ) +bool QgsStyle::addColorRamp( const QString& name, QgsVectorColorRamp* colorRamp, bool update ) { if ( !colorRamp || name.isEmpty() ) return false; @@ -207,7 +207,7 @@ bool QgsStyleV2::addColorRamp( const QString& name, QgsVectorColorRampV2* colorR return true; } -bool QgsStyleV2::saveColorRamp( const QString& name, QgsVectorColorRampV2* ramp, int groupid, const QStringList& tags ) +bool QgsStyle::saveColorRamp( const QString& name, QgsVectorColorRamp* ramp, int groupid, const QStringList& tags ) { // insert it into the database QDomDocument doc( "dummy" ); @@ -236,9 +236,9 @@ bool QgsStyleV2::saveColorRamp( const QString& name, QgsVectorColorRampV2* ramp, return true; } -bool QgsStyleV2::removeColorRamp( const QString& name ) +bool QgsStyle::removeColorRamp( const QString& name ) { - QgsVectorColorRampV2 *ramp = mColorRamps.take( name ); + QgsVectorColorRamp *ramp = mColorRamps.take( name ); if ( !ramp ) return false; @@ -254,28 +254,28 @@ bool QgsStyleV2::removeColorRamp( const QString& name ) return true; } -QgsVectorColorRampV2* QgsStyleV2::colorRamp( const QString& name ) +QgsVectorColorRamp* QgsStyle::colorRamp( const QString& name ) { - const QgsVectorColorRampV2 *ramp = colorRampRef( name ); + const QgsVectorColorRamp *ramp = colorRampRef( name ); return ramp ? ramp->clone() : nullptr; } -const QgsVectorColorRampV2* QgsStyleV2::colorRampRef( const QString& name ) const +const QgsVectorColorRamp* QgsStyle::colorRampRef( const QString& name ) const { return mColorRamps.value( name ); } -int QgsStyleV2::colorRampCount() +int QgsStyle::colorRampCount() { return mColorRamps.count(); } -QStringList QgsStyleV2::colorRampNames() +QStringList QgsStyle::colorRampNames() { return mColorRamps.keys(); } -bool QgsStyleV2::openDB( const QString& filename ) +bool QgsStyle::openDB( const QString& filename ) { int rc = sqlite3_open( filename.toUtf8(), &mCurrentDB ); if ( rc ) @@ -288,7 +288,7 @@ bool QgsStyleV2::openDB( const QString& filename ) return true; } -bool QgsStyleV2::load( const QString& filename ) +bool QgsStyle::load( const QString& filename ) { mErrorString.clear(); @@ -343,7 +343,7 @@ bool QgsStyleV2::load( const QString& filename ) continue; } QDomElement rampElement = doc.documentElement(); - QgsVectorColorRampV2 *ramp = QgsSymbolLayerUtils::loadColorRamp( rampElement ); + QgsVectorColorRamp *ramp = QgsSymbolLayerUtils::loadColorRamp( rampElement ); if ( ramp ) mColorRamps.insert( ramp_name, ramp ); } @@ -354,7 +354,7 @@ bool QgsStyleV2::load( const QString& filename ) -bool QgsStyleV2::save( QString filename ) +bool QgsStyle::save( QString filename ) { mErrorString.clear(); @@ -362,7 +362,7 @@ bool QgsStyleV2::save( QString filename ) filename = mFileName; // TODO evaluate the requirement of this function and change implementation accordingly - // TODO remove QEXPECT_FAIL from TestStyleV2::testSaveLoad() when done + // TODO remove QEXPECT_FAIL from TestStyle::testSaveLoad() when done #if 0 QDomDocument doc( "qgis_style" ); QDomElement root = doc.createElement( "qgis_style" ); @@ -374,7 +374,7 @@ bool QgsStyleV2::save( QString filename ) QDomElement rampsElem = doc.createElement( "colorramps" ); // save color ramps - for ( QMap::iterator itr = mColorRamps.begin(); itr != mColorRamps.end(); ++itr ) + for ( QMap::iterator itr = mColorRamps.begin(); itr != mColorRamps.end(); ++itr ) { QDomElement rampEl = QgsSymbolLayerUtils::saveColorRamp( itr.key(), itr.value(), doc ); rampsElem.appendChild( rampEl ); @@ -400,7 +400,7 @@ bool QgsStyleV2::save( QString filename ) return true; } -bool QgsStyleV2::renameSymbol( const QString& oldName, const QString& newName ) +bool QgsStyle::renameSymbol( const QString& oldName, const QString& newName ) { if ( mSymbols.contains( newName ) ) { @@ -432,7 +432,7 @@ bool QgsStyleV2::renameSymbol( const QString& oldName, const QString& newName ) return true; } -bool QgsStyleV2::renameColorRamp( const QString& oldName, const QString& newName ) +bool QgsStyle::renameColorRamp( const QString& oldName, const QString& newName ) { if ( mColorRamps.contains( newName ) ) { @@ -440,7 +440,7 @@ bool QgsStyleV2::renameColorRamp( const QString& oldName, const QString& newName return false; } - QgsVectorColorRampV2 *ramp = mColorRamps.take( oldName ); + QgsVectorColorRamp *ramp = mColorRamps.take( oldName ); if ( !ramp ) return false; @@ -460,7 +460,7 @@ bool QgsStyleV2::renameColorRamp( const QString& oldName, const QString& newName return true; } -QStringList QgsStyleV2::groupNames() +QStringList QgsStyle::groupNames() { QStringList groupNames; sqlite3_stmt *ppStmt; @@ -474,7 +474,7 @@ QStringList QgsStyleV2::groupNames() return groupNames; } -QList QgsStyleV2::groupIds() const +QList QgsStyle::groupIds() const { QList groupIds; sqlite3_stmt *ppStmt; @@ -488,7 +488,7 @@ QList QgsStyleV2::groupIds() const return groupIds; } -QgsSymbolGroupMap QgsStyleV2::childGroupNames( const QString& parent ) +QgsSymbolGroupMap QgsStyle::childGroupNames( const QString& parent ) { // get the name list from the sqlite database and return as a QStringList if ( !mCurrentDB ) @@ -535,7 +535,7 @@ QgsSymbolGroupMap QgsStyleV2::childGroupNames( const QString& parent ) return groupNames; } -QStringList QgsStyleV2::symbolsOfGroup( StyleEntity type, int groupid ) +QStringList QgsStyle::symbolsOfGroup( StyleEntity type, int groupid ) { if ( !mCurrentDB ) { @@ -572,7 +572,7 @@ QStringList QgsStyleV2::symbolsOfGroup( StyleEntity type, int groupid ) return symbols; } -QStringList QgsStyleV2::symbolsWithTag( StyleEntity type, int tagid ) +QStringList QgsStyle::symbolsWithTag( StyleEntity type, int tagid ) { if ( !mCurrentDB ) { @@ -621,7 +621,7 @@ QStringList QgsStyleV2::symbolsWithTag( StyleEntity type, int tagid ) return symbols; } -int QgsStyleV2::addGroup( const QString& groupName, int parentid ) +int QgsStyle::addGroup( const QString& groupName, int parentid ) { if ( !mCurrentDB ) return 0; @@ -638,7 +638,7 @@ int QgsStyleV2::addGroup( const QString& groupName, int parentid ) return static_cast< int >( sqlite3_last_insert_rowid( mCurrentDB ) ); } -int QgsStyleV2::addTag( const QString& tagname ) +int QgsStyle::addTag( const QString& tagname ) { if ( !mCurrentDB ) return 0; @@ -653,7 +653,7 @@ int QgsStyleV2::addTag( const QString& tagname ) return static_cast< int >( sqlite3_last_insert_rowid( mCurrentDB ) ); } -QStringList QgsStyleV2::tags() const +QStringList QgsStyle::tags() const { if ( !mCurrentDB ) return QStringList(); @@ -674,7 +674,7 @@ QStringList QgsStyleV2::tags() const return tagList; } -void QgsStyleV2::rename( StyleEntity type, int id, const QString& newName ) +void QgsStyle::rename( StyleEntity type, int id, const QString& newName ) { char *query; switch ( type ) @@ -702,7 +702,7 @@ void QgsStyleV2::rename( StyleEntity type, int id, const QString& newName ) mErrorString = "Could not rename!"; } -char* QgsStyleV2::getGroupRemoveQuery( int id ) +char* QgsStyle::getGroupRemoveQuery( int id ) { char *query = sqlite3_mprintf( "SELECT parent FROM symgroup WHERE id=%d", id ); @@ -720,7 +720,7 @@ char* QgsStyleV2::getGroupRemoveQuery( int id ) "DELETE FROM symgroup WHERE id=%d", parentid, id, parentid, id, id ); } -void QgsStyleV2::remove( StyleEntity type, int id ) +void QgsStyle::remove( StyleEntity type, int id ) { char *query; switch ( type ) @@ -751,7 +751,7 @@ void QgsStyleV2::remove( StyleEntity type, int id ) } } -bool QgsStyleV2::runEmptyQuery( char *query, bool freeQuery ) +bool QgsStyle::runEmptyQuery( char *query, bool freeQuery ) { if ( !mCurrentDB ) return false; @@ -772,7 +772,7 @@ bool QgsStyleV2::runEmptyQuery( char *query, bool freeQuery ) return zErr == SQLITE_OK; } -bool QgsStyleV2::group( StyleEntity type, const QString& name, int groupid ) +bool QgsStyle::group( StyleEntity type, const QString& name, int groupid ) { char *query; @@ -793,7 +793,7 @@ bool QgsStyleV2::group( StyleEntity type, const QString& name, int groupid ) return runEmptyQuery( query ); } -QStringList QgsStyleV2::findSymbols( StyleEntity type, const QString& qword ) +QStringList QgsStyle::findSymbols( StyleEntity type, const QString& qword ) { if ( !mCurrentDB ) { @@ -867,7 +867,7 @@ QStringList QgsStyleV2::findSymbols( StyleEntity type, const QString& qword ) return symbols.toList(); } -bool QgsStyleV2::tagSymbol( StyleEntity type, const QString& symbol, const QStringList& tags ) +bool QgsStyle::tagSymbol( StyleEntity type, const QString& symbol, const QStringList& tags ) { if ( !mCurrentDB ) { @@ -919,7 +919,7 @@ bool QgsStyleV2::tagSymbol( StyleEntity type, const QString& symbol, const QStri return true; } -bool QgsStyleV2::detagSymbol( StyleEntity type, const QString& symbol, const QStringList& tags ) +bool QgsStyle::detagSymbol( StyleEntity type, const QString& symbol, const QStringList& tags ) { if ( !mCurrentDB ) { @@ -977,7 +977,7 @@ bool QgsStyleV2::detagSymbol( StyleEntity type, const QString& symbol, const QSt return true; } -QStringList QgsStyleV2::tagsOfSymbol( StyleEntity type, const QString& symbol ) +QStringList QgsStyle::tagsOfSymbol( StyleEntity type, const QString& symbol ) { if ( !mCurrentDB ) { @@ -1016,7 +1016,7 @@ QStringList QgsStyleV2::tagsOfSymbol( StyleEntity type, const QString& symbol ) return tagList; } -int QgsStyleV2::getId( const QString& table, const QString& name ) +int QgsStyle::getId( const QString& table, const QString& name ) { char *query = sqlite3_mprintf( "SELECT id FROM %q WHERE name='%q'", table.toUtf8().constData(), name.toUtf8().constData() ); @@ -1034,7 +1034,7 @@ int QgsStyleV2::getId( const QString& table, const QString& name ) return id; } -QString QgsStyleV2::getName( const QString& table, int id ) const +QString QgsStyle::getName( const QString& table, int id ) const { char *query = sqlite3_mprintf( "SELECT name FROM %q WHERE id='%q'", table.toUtf8().constData(), QString::number( id ).toUtf8().constData() ); @@ -1052,37 +1052,37 @@ QString QgsStyleV2::getName( const QString& table, int id ) const return name; } -int QgsStyleV2::symbolId( const QString& name ) +int QgsStyle::symbolId( const QString& name ) { return getId( "symbol", name ); } -int QgsStyleV2::colorrampId( const QString& name ) +int QgsStyle::colorrampId( const QString& name ) { return getId( "colorramp", name ); } -int QgsStyleV2::groupId( const QString& name ) +int QgsStyle::groupId( const QString& name ) { return getId( "symgroup", name ); } -QString QgsStyleV2::groupName( int groupId ) const +QString QgsStyle::groupName( int groupId ) const { return getName( "symgroup", groupId ); } -int QgsStyleV2::tagId( const QString& name ) +int QgsStyle::tagId( const QString& name ) { return getId( "tag", name ); } -int QgsStyleV2::smartgroupId( const QString& name ) +int QgsStyle::smartgroupId( const QString& name ) { return getId( "smartgroup", name ); } -int QgsStyleV2::addSmartgroup( const QString& name, const QString& op, const QgsSmartConditionMap& conditions ) +int QgsStyle::addSmartgroup( const QString& name, const QString& op, const QgsSmartConditionMap& conditions ) { QDomDocument doc( "dummy" ); QDomElement smartEl = doc.createElement( "smartgroup" ); @@ -1122,7 +1122,7 @@ int QgsStyleV2::addSmartgroup( const QString& name, const QString& op, const Qgs } } -QgsSymbolGroupMap QgsStyleV2::smartgroupsListMap() +QgsSymbolGroupMap QgsStyle::smartgroupsListMap() { if ( !mCurrentDB ) { @@ -1148,7 +1148,7 @@ QgsSymbolGroupMap QgsStyleV2::smartgroupsListMap() return groupNames; } -QStringList QgsStyleV2::smartgroupNames() +QStringList QgsStyle::smartgroupNames() { if ( !mCurrentDB ) { @@ -1173,7 +1173,7 @@ QStringList QgsStyleV2::smartgroupNames() return groups; } -QStringList QgsStyleV2::symbolsOfSmartgroup( StyleEntity type, int id ) +QStringList QgsStyle::symbolsOfSmartgroup( StyleEntity type, int id ) { QStringList symbols; @@ -1287,7 +1287,7 @@ QStringList QgsStyleV2::symbolsOfSmartgroup( StyleEntity type, int id ) return symbols; } -QgsSmartConditionMap QgsStyleV2::smartgroup( int id ) +QgsSmartConditionMap QgsStyle::smartgroup( int id ) { if ( !mCurrentDB ) { @@ -1328,7 +1328,7 @@ QgsSmartConditionMap QgsStyleV2::smartgroup( int id ) return condition; } -QString QgsStyleV2::smartgroupOperator( int id ) +QString QgsStyle::smartgroupOperator( int id ) { if ( !mCurrentDB ) { @@ -1359,7 +1359,7 @@ QString QgsStyleV2::smartgroupOperator( int id ) return op; } -bool QgsStyleV2::exportXml( const QString& filename ) +bool QgsStyle::exportXml( const QString& filename ) { if ( filename.isEmpty() ) { @@ -1377,7 +1377,7 @@ bool QgsStyleV2::exportXml( const QString& filename ) QDomElement rampsElem = doc.createElement( "colorramps" ); // save color ramps - for ( QMap::const_iterator itr = mColorRamps.constBegin(); itr != mColorRamps.constEnd(); ++itr ) + for ( QMap::const_iterator itr = mColorRamps.constBegin(); itr != mColorRamps.constEnd(); ++itr ) { QDomElement rampEl = QgsSymbolLayerUtils::saveColorRamp( itr.key(), itr.value(), doc ); rampsElem.appendChild( rampEl ); @@ -1403,7 +1403,7 @@ bool QgsStyleV2::exportXml( const QString& filename ) return true; } -bool QgsStyleV2::importXml( const QString& filename ) +bool QgsStyle::importXml( const QString& filename ) { mErrorString = QString(); QDomDocument doc( "style" ); @@ -1482,7 +1482,7 @@ bool QgsStyleV2::importXml( const QString& filename ) { if ( e.tagName() == "colorramp" ) { - QgsVectorColorRampV2* ramp = QgsSymbolLayerUtils::loadColorRamp( e ); + QgsVectorColorRamp* ramp = QgsSymbolLayerUtils::loadColorRamp( e ); if ( ramp ) { addColorRamp( e.attribute( "name" ), ramp ); @@ -1499,7 +1499,7 @@ bool QgsStyleV2::importXml( const QString& filename ) return true; } -bool QgsStyleV2::updateSymbol( StyleEntity type, const QString& name ) +bool QgsStyle::updateSymbol( StyleEntity type, const QString& name ) { QDomDocument doc( "dummy" ); QDomElement symEl; diff --git a/src/core/symbology-ng/qgsstylev2.h b/src/core/symbology-ng/qgsstyle.h similarity index 95% rename from src/core/symbology-ng/qgsstylev2.h rename to src/core/symbology-ng/qgsstyle.h index 0b5e0dc5bc6..eabba6069be 100644 --- a/src/core/symbology-ng/qgsstylev2.h +++ b/src/core/symbology-ng/qgsstyle.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsstylev2.h + qgsstyle.h --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -26,12 +26,12 @@ class QgsSymbol; class QgsSymbolLayer; -class QgsVectorColorRampV2; +class QgsVectorColorRamp; class QDomDocument; class QDomElement; -typedef QMap QgsVectorColorRampV2Map; +typedef QMap QgsVectorColorRampMap; typedef QMap QgsSymbolGroupMap; /** \ingroup core @@ -64,15 +64,15 @@ enum ColorrampTable { ColorrampId, ColorrampName, ColorrampXML, ColorrampGroupId enum SmartgroupTable { SmartgroupId, SmartgroupName, SmartgroupXML }; /** \ingroup core - * \class QgsStyleV2 + * \class QgsStyle */ -class CORE_EXPORT QgsStyleV2 : public QObject +class CORE_EXPORT QgsStyle : public QObject { Q_OBJECT public: - QgsStyleV2(); - ~QgsStyleV2(); + QgsStyle(); + ~QgsStyle(); //! Enum for Entities involved in a style /*! @@ -90,7 +90,7 @@ class CORE_EXPORT QgsStyleV2 : public 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, bool update = false ); + bool addColorRamp( const QString& name, QgsVectorColorRamp* colorRamp, bool update = false ); //! adds a new group and returns the group's id /*! @@ -138,7 +138,7 @@ class CORE_EXPORT QgsStyleV2 : public QObject void clear(); //! return a NEW copy of color ramp - QgsVectorColorRampV2* colorRamp( const QString& name ); + QgsVectorColorRamp* colorRamp( const QString& name ); //! return count of color ramps int colorRampCount(); @@ -147,14 +147,14 @@ class CORE_EXPORT QgsStyleV2 : public 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 /*! @@ -265,12 +265,12 @@ class CORE_EXPORT QgsStyleV2 : public 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 ); @@ -334,14 +334,14 @@ class CORE_EXPORT QgsStyleV2 : public QObject protected: QgsSymbolMap mSymbols; - QgsVectorColorRampV2Map mColorRamps; + QgsVectorColorRampMap mColorRamps; QString mErrorString; QString mFileName; sqlite3* mCurrentDB; - static QgsStyleV2* mDefaultStyle; + static QgsStyle* mDefaultStyle; //! convenience function to open the DB and return a sqlite3 object bool openDB( const QString& filename ); @@ -371,7 +371,7 @@ class CORE_EXPORT QgsStyleV2 : public QObject bool updateSymbol( StyleEntity type, const QString& name ); private: - Q_DISABLE_COPY( QgsStyleV2 ) + Q_DISABLE_COPY( QgsStyle ) }; diff --git a/src/core/symbology-ng/qgssymbol.cpp b/src/core/symbology-ng/qgssymbol.cpp index c14b3ec68b0..301bd876fcc 100644 --- a/src/core/symbology-ng/qgssymbol.cpp +++ b/src/core/symbology-ng/qgssymbol.cpp @@ -16,16 +16,16 @@ #include "qgssymbol.h" #include "qgssymbollayer.h" -#include "qgslinesymbollayerv2.h" -#include "qgsmarkersymbollayerv2.h" -#include "qgsfillsymbollayerv2.h" -#include "qgsgeometrygeneratorsymbollayerv2.h" +#include "qgslinesymbollayer.h" +#include "qgsmarkersymbollayer.h" +#include "qgsfillsymbollayer.h" +#include "qgsgeometrygeneratorsymbollayer.h" #include "qgslogger.h" #include "qgsrendercontext.h" // for bigSymbolPreview #include "qgsproject.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgspainteffect.h" #include "qgseffectstack.h" @@ -33,10 +33,10 @@ #include "qgsvectorlayer.h" #include "qgsgeometry.h" -#include "qgsmultipointv2.h" +#include "qgsmultipoint.h" #include "qgswkbptr.h" #include "qgswkbsimplifierptr.h" -#include "qgsgeometrycollectionv2.h" +#include "qgsgeometrycollection.h" #include "qgsclipper.h" #include @@ -333,7 +333,7 @@ QgsSymbol* QgsSymbol::defaultSymbol( QgsWkbTypes::GeometryType geomType ) break; } if ( defaultSymbol != "" ) - s = QgsStyleV2::defaultStyle()->symbol( defaultSymbol ); + s = QgsStyle::defaultStyle()->symbol( defaultSymbol ); // if no default found for this type, get global default (as previously) if ( ! s ) @@ -341,13 +341,13 @@ QgsSymbol* QgsSymbol::defaultSymbol( QgsWkbTypes::GeometryType geomType ) switch ( geomType ) { case QgsWkbTypes::PointGeometry: - s = new QgsMarkerSymbolV2(); + s = new QgsMarkerSymbol(); break; case QgsWkbTypes::LineGeometry: - s = new QgsLineSymbolV2(); + s = new QgsLineSymbol(); break; case QgsWkbTypes::PolygonGeometry: - s = new QgsFillSymbolV2(); + s = new QgsFillSymbol(); break; default: QgsDebugMsg( "unknown layer's geometry type" ); @@ -505,11 +505,11 @@ void QgsSymbol::drawPreviewIcon( QPainter* painter, QSize size, QgsRenderContext { // line symbol layer would normally draw just a line // so we override this case to force it to draw a polygon outline - QgsLineSymbolLayerV2* lsl = dynamic_cast( layer ); + QgsLineSymbolLayer* lsl = dynamic_cast( layer ); if ( lsl ) { - // from QgsFillSymbolLayerV2::drawPreviewIcon() + // from QgsFillSymbolLayer::drawPreviewIcon() QPolygonF poly = QRectF( QPointF( 0, 0 ), QPointF( size.width() - 1, size.height() - 1 ) ); lsl->startRender( symbolContext ); lsl->renderPolygonOutline( poly, nullptr, symbolContext ); @@ -581,17 +581,17 @@ QImage QgsSymbol::bigSymbolPreviewImage( QgsExpressionContext* expressionContext { QPolygonF poly; poly << QPointF( 0, 50 ) << QPointF( 99, 50 ); - static_cast( this )->renderPolyline( poly, nullptr, context ); + static_cast( this )->renderPolyline( poly, nullptr, context ); } else if ( mType == QgsSymbol::Fill ) { QPolygonF polygon; polygon << QPointF( 20, 20 ) << QPointF( 80, 20 ) << QPointF( 80, 80 ) << QPointF( 20, 80 ) << QPointF( 20, 20 ); - static_cast( this )->renderPolygon( polygon, nullptr, nullptr, context ); + static_cast( this )->renderPolygon( polygon, nullptr, nullptr, context ); } else // marker { - static_cast( this )->renderPoint( QPointF( 50, 50 ), nullptr, context ); + static_cast( this )->renderPoint( QPointF( 50, 50 ), nullptr, context ); } stopRender( context ); @@ -655,7 +655,7 @@ void QgsSymbol::renderUsingLayer( QgsSymbolLayer* layer, QgsSymbolRenderContext& { Q_ASSERT( layer->type() == Hybrid ); - QgsGeometryGeneratorSymbolLayerV2* generatorLayer = static_cast( layer ); + QgsGeometryGeneratorSymbolLayer* generatorLayer = static_cast( layer ); QgsPaintEffect* effect = generatorLayer->paintEffect(); if ( effect && effect->enabled() ) @@ -716,7 +716,7 @@ void QgsSymbol::renderFeature( const QgsFeature& feature, QgsRenderContext& cont //convert curve types to normal point/line/polygon ones if ( QgsWkbTypes::isCurvedType( geom.geometry()->wkbType() ) ) { - QgsAbstractGeometryV2 *g = geom.geometry()->segmentize( context.segmentationTolerance(), context.segmentationToleranceType() ); + QgsAbstractGeometry *g = geom.geometry()->segmentize( context.segmentationTolerance(), context.segmentationToleranceType() ); if ( !g ) { return; @@ -752,14 +752,14 @@ void QgsSymbol::renderFeature( const QgsFeature& feature, QgsRenderContext& cont const QgsPointV2* point = static_cast< const QgsPointV2* >( segmentizedGeometry.geometry() ); _getPoint( pt, context, point ); - static_cast( this )->renderPoint( pt, &feature, context, layer, selected ); + static_cast( this )->renderPoint( pt, &feature, context, layer, selected ); if ( context.testFlag( QgsRenderContext::DrawSymbolBounds ) ) { //draw debugging rect context.painter()->setPen( Qt::red ); context.painter()->setBrush( QColor( 255, 0, 0, 100 ) ); - context.painter()->drawRect( static_cast( this )->bounds( pt, context, feature ) ); + context.painter()->drawRect( static_cast( this )->bounds( pt, context, feature ) ); } if ( drawVertexMarker && !usingSegmentizedGeometry ) @@ -778,7 +778,7 @@ void QgsSymbol::renderFeature( const QgsFeature& feature, QgsRenderContext& cont } QgsConstWkbSimplifierPtr wkbPtr( segmentizedGeometry.asWkb(), segmentizedGeometry.wkbSize(), context.vectorSimplifyMethod() ); _getLineString( pts, context, wkbPtr, !tileMapRendering && clipFeaturesToExtent() ); - static_cast( this )->renderPolyline( pts, &feature, context, layer, selected ); + static_cast( this )->renderPolyline( pts, &feature, context, layer, selected ); if ( drawVertexMarker && !usingSegmentizedGeometry ) { @@ -797,7 +797,7 @@ void QgsSymbol::renderFeature( const QgsFeature& feature, QgsRenderContext& cont } QgsConstWkbSimplifierPtr wkbPtr( segmentizedGeometry.asWkb(), segmentizedGeometry.wkbSize(), context.vectorSimplifyMethod() ); _getPolygon( pts, holes, context, wkbPtr, !tileMapRendering && clipFeaturesToExtent() ); - static_cast( this )->renderPolygon( pts, ( !holes.isEmpty() ? &holes : nullptr ), &feature, context, layer, selected ); + static_cast( this )->renderPolygon( pts, ( !holes.isEmpty() ? &holes : nullptr ), &feature, context, layer, selected ); if ( drawVertexMarker && !usingSegmentizedGeometry ) { @@ -835,7 +835,7 @@ void QgsSymbol::renderFeature( const QgsFeature& feature, QgsRenderContext& cont const QgsPointV2* point = static_cast< const QgsPointV2* >( mp->geometryN( i ) ); _getPoint( pt, context, point ); - static_cast( this )->renderPoint( pt, &feature, context, layer, selected ); + static_cast( this )->renderPoint( pt, &feature, context, layer, selected ); if ( drawVertexMarker && !usingSegmentizedGeometry ) { @@ -862,7 +862,7 @@ void QgsSymbol::renderFeature( const QgsFeature& feature, QgsRenderContext& cont unsigned int num; wkbPtr >> num; - const QgsGeometryCollectionV2* geomCollection = dynamic_cast( geom.geometry() ); + const QgsGeometryCollection* geomCollection = dynamic_cast( geom.geometry() ); for ( unsigned int i = 0; i < num && wkbPtr; ++i ) { @@ -877,7 +877,7 @@ void QgsSymbol::renderFeature( const QgsFeature& feature, QgsRenderContext& cont { break; } - static_cast( this )->renderPolyline( pts, &feature, context, layer, selected ); + static_cast( this )->renderPolyline( pts, &feature, context, layer, selected ); if ( drawVertexMarker && !usingSegmentizedGeometry ) { @@ -912,7 +912,7 @@ void QgsSymbol::renderFeature( const QgsFeature& feature, QgsRenderContext& cont QPolygonF pts; QList holes; - const QgsGeometryCollectionV2* geomCollection = dynamic_cast( geom.geometry() ); + const QgsGeometryCollection* geomCollection = dynamic_cast( geom.geometry() ); for ( unsigned int i = 0; i < num && wkbPtr; ++i ) { @@ -927,7 +927,7 @@ void QgsSymbol::renderFeature( const QgsFeature& feature, QgsRenderContext& cont { break; } - static_cast( this )->renderPolygon( pts, ( !holes.isEmpty() ? &holes : nullptr ), &feature, context, layer, selected ); + static_cast( this )->renderPolygon( pts, ( !holes.isEmpty() ? &holes : nullptr ), &feature, context, layer, selected ); if ( drawVertexMarker && !usingSegmentizedGeometry ) { @@ -1081,84 +1081,84 @@ void QgsSymbolRenderContext::setExpressionContextScope( QgsExpressionContextScop /////////////////// -QgsMarkerSymbolV2* QgsMarkerSymbolV2::createSimple( const QgsStringMap& properties ) +QgsMarkerSymbol* QgsMarkerSymbol::createSimple( const QgsStringMap& properties ) { - QgsSymbolLayer* sl = QgsSimpleMarkerSymbolLayerV2::create( properties ); + QgsSymbolLayer* sl = QgsSimpleMarkerSymbolLayer::create( properties ); if ( !sl ) return nullptr; QgsSymbolLayerList layers; layers.append( sl ); - return new QgsMarkerSymbolV2( layers ); + return new QgsMarkerSymbol( layers ); } -QgsLineSymbolV2* QgsLineSymbolV2::createSimple( const QgsStringMap& properties ) +QgsLineSymbol* QgsLineSymbol::createSimple( const QgsStringMap& properties ) { - QgsSymbolLayer* sl = QgsSimpleLineSymbolLayerV2::create( properties ); + QgsSymbolLayer* sl = QgsSimpleLineSymbolLayer::create( properties ); if ( !sl ) return nullptr; QgsSymbolLayerList layers; layers.append( sl ); - return new QgsLineSymbolV2( layers ); + return new QgsLineSymbol( layers ); } -QgsFillSymbolV2* QgsFillSymbolV2::createSimple( const QgsStringMap& properties ) +QgsFillSymbol* QgsFillSymbol::createSimple( const QgsStringMap& properties ) { - QgsSymbolLayer* sl = QgsSimpleFillSymbolLayerV2::create( properties ); + QgsSymbolLayer* sl = QgsSimpleFillSymbolLayer::create( properties ); if ( !sl ) return nullptr; QgsSymbolLayerList layers; layers.append( sl ); - return new QgsFillSymbolV2( layers ); + return new QgsFillSymbol( layers ); } /////////////////// -QgsMarkerSymbolV2::QgsMarkerSymbolV2( const QgsSymbolLayerList& layers ) +QgsMarkerSymbol::QgsMarkerSymbol( const QgsSymbolLayerList& layers ) : QgsSymbol( Marker, layers ) { if ( mLayers.isEmpty() ) - mLayers.append( new QgsSimpleMarkerSymbolLayerV2() ); + mLayers.append( new QgsSimpleMarkerSymbolLayer() ); } -void QgsMarkerSymbolV2::setAngle( double ang ) +void QgsMarkerSymbol::setAngle( double ang ) { double origAngle = angle(); double angleDiff = ang - origAngle; Q_FOREACH ( QgsSymbolLayer* layer, mLayers ) { - QgsMarkerSymbolLayerV2* markerLayer = dynamic_cast( layer ); + QgsMarkerSymbolLayer* markerLayer = dynamic_cast( layer ); if ( markerLayer ) markerLayer->setAngle( markerLayer->angle() + angleDiff ); } } -double QgsMarkerSymbolV2::angle() const +double QgsMarkerSymbol::angle() const { Q_FOREACH ( QgsSymbolLayer* layer, mLayers ) { if ( layer->type() != QgsSymbol::Marker ) continue; - const QgsMarkerSymbolLayerV2* markerLayer = static_cast( layer ); + const QgsMarkerSymbolLayer* markerLayer = static_cast( layer ); return markerLayer->angle(); } return 0; } -void QgsMarkerSymbolV2::setLineAngle( double lineAng ) +void QgsMarkerSymbol::setLineAngle( double lineAng ) { Q_FOREACH ( QgsSymbolLayer* layer, mLayers ) { if ( layer->type() != QgsSymbol::Marker ) continue; - QgsMarkerSymbolLayerV2* markerLayer = static_cast( layer ); + QgsMarkerSymbolLayer* markerLayer = static_cast( layer ); markerLayer->setLineAngle( lineAng ); } } -void QgsMarkerSymbolV2::setDataDefinedAngle( const QgsDataDefined& dd ) +void QgsMarkerSymbol::setDataDefinedAngle( const QgsDataDefined& dd ) { const double symbolRotation = angle(); @@ -1166,7 +1166,7 @@ void QgsMarkerSymbolV2::setDataDefinedAngle( const QgsDataDefined& dd ) { if ( layer->type() != QgsSymbol::Marker ) continue; - const QgsMarkerSymbolLayerV2* markerLayer = static_cast( layer ); + const QgsMarkerSymbolLayer* markerLayer = static_cast( layer ); if ( dd.hasDefaultValues() ) { layer->removeDataDefinedProperty( "angle" ); @@ -1186,7 +1186,7 @@ void QgsMarkerSymbolV2::setDataDefinedAngle( const QgsDataDefined& dd ) } } -QgsDataDefined QgsMarkerSymbolV2::dataDefinedAngle() const +QgsDataDefined QgsMarkerSymbol::dataDefinedAngle() const { const double symbolRotation = angle(); QgsDataDefined* symbolDD = nullptr; @@ -1196,7 +1196,7 @@ QgsDataDefined QgsMarkerSymbolV2::dataDefinedAngle() const { if ( layer->type() != QgsSymbol::Marker ) continue; - const QgsMarkerSymbolLayerV2* markerLayer = static_cast( layer ); + const QgsMarkerSymbolLayer* markerLayer = static_cast( layer ); if ( qgsDoubleNear( markerLayer->angle(), symbolRotation ) && markerLayer->getDataDefinedProperty( "angle" ) ) { symbolDD = markerLayer->getDataDefinedProperty( "angle" ); @@ -1212,7 +1212,7 @@ QgsDataDefined QgsMarkerSymbolV2::dataDefinedAngle() const { if ( layer->type() != QgsSymbol::Marker ) continue; - const QgsMarkerSymbolLayerV2* markerLayer = static_cast( layer ); + const QgsMarkerSymbolLayer* markerLayer = static_cast( layer ); QgsDataDefined* layerAngleDD = markerLayer->getDataDefinedProperty( "angle" ); if ( qgsDoubleNear( markerLayer->angle(), symbolRotation ) ) @@ -1231,7 +1231,7 @@ QgsDataDefined QgsMarkerSymbolV2::dataDefinedAngle() const } -void QgsMarkerSymbolV2::setSize( double s ) +void QgsMarkerSymbol::setSize( double s ) { double origSize = size(); @@ -1239,7 +1239,7 @@ void QgsMarkerSymbolV2::setSize( double s ) { if ( layer->type() != QgsSymbol::Marker ) continue; - QgsMarkerSymbolLayerV2* markerLayer = static_cast( layer ); + QgsMarkerSymbolLayer* markerLayer = static_cast( layer ); if ( qgsDoubleNear( markerLayer->size(), origSize ) ) markerLayer->setSize( s ); else if ( !qgsDoubleNear( origSize, 0.0 ) ) @@ -1254,7 +1254,7 @@ void QgsMarkerSymbolV2::setSize( double s ) } } -double QgsMarkerSymbolV2::size() const +double QgsMarkerSymbol::size() const { // return size of the largest symbol double maxSize = 0; @@ -1262,7 +1262,7 @@ double QgsMarkerSymbolV2::size() const { if ( layer->type() != QgsSymbol::Marker ) continue; - const QgsMarkerSymbolLayerV2* markerLayer = static_cast( layer ); + const QgsMarkerSymbolLayer* markerLayer = static_cast( layer ); double lsize = markerLayer->size(); if ( lsize > maxSize ) maxSize = lsize; @@ -1270,19 +1270,19 @@ double QgsMarkerSymbolV2::size() const return maxSize; } -void QgsMarkerSymbolV2::setSizeUnit( QgsUnitTypes::RenderUnit unit ) +void QgsMarkerSymbol::setSizeUnit( QgsUnitTypes::RenderUnit unit ) { Q_FOREACH ( QgsSymbolLayer* layer, mLayers ) { if ( layer->type() != QgsSymbol::Marker ) continue; - QgsMarkerSymbolLayerV2* markerLayer = static_cast( layer ); + QgsMarkerSymbolLayer* markerLayer = static_cast( layer ); markerLayer->setSizeUnit( unit ); } } -QgsUnitTypes::RenderUnit QgsMarkerSymbolV2::sizeUnit() const +QgsUnitTypes::RenderUnit QgsMarkerSymbol::sizeUnit() const { bool first = true; QgsUnitTypes::RenderUnit unit = QgsUnitTypes::RenderUnknownUnit; @@ -1291,7 +1291,7 @@ QgsUnitTypes::RenderUnit QgsMarkerSymbolV2::sizeUnit() const { if ( layer->type() != QgsSymbol::Marker ) continue; - const QgsMarkerSymbolLayerV2* markerLayer = static_cast( layer ); + const QgsMarkerSymbolLayer* markerLayer = static_cast( layer ); if ( first ) unit = markerLayer->sizeUnit(); @@ -1306,32 +1306,32 @@ QgsUnitTypes::RenderUnit QgsMarkerSymbolV2::sizeUnit() const return unit; } -void QgsMarkerSymbolV2::setSizeMapUnitScale( const QgsMapUnitScale &scale ) +void QgsMarkerSymbol::setSizeMapUnitScale( const QgsMapUnitScale &scale ) { Q_FOREACH ( QgsSymbolLayer* layer, mLayers ) { if ( layer->type() != QgsSymbol::Marker ) continue; - QgsMarkerSymbolLayerV2* markerLayer = static_cast( layer ); + QgsMarkerSymbolLayer* markerLayer = static_cast( layer ); markerLayer->setSizeMapUnitScale( scale ); } } -QgsMapUnitScale QgsMarkerSymbolV2::sizeMapUnitScale() const +QgsMapUnitScale QgsMarkerSymbol::sizeMapUnitScale() const { Q_FOREACH ( QgsSymbolLayer* layer, mLayers ) { if ( layer->type() != QgsSymbol::Marker ) continue; - QgsMarkerSymbolLayerV2* markerLayer = static_cast( layer ); + QgsMarkerSymbolLayer* markerLayer = static_cast( layer ); return markerLayer->sizeMapUnitScale(); } return QgsMapUnitScale(); } -void QgsMarkerSymbolV2::setDataDefinedSize( const QgsDataDefined &dd ) +void QgsMarkerSymbol::setDataDefinedSize( const QgsDataDefined &dd ) { const double symbolSize = size(); @@ -1339,7 +1339,7 @@ void QgsMarkerSymbolV2::setDataDefinedSize( const QgsDataDefined &dd ) { if ( layer->type() != QgsSymbol::Marker ) continue; - QgsMarkerSymbolLayerV2* markerLayer = static_cast( layer ); + QgsMarkerSymbolLayer* markerLayer = static_cast( layer ); if ( dd.hasDefaultValues() ) { @@ -1367,7 +1367,7 @@ void QgsMarkerSymbolV2::setDataDefinedSize( const QgsDataDefined &dd ) } } -QgsDataDefined QgsMarkerSymbolV2::dataDefinedSize() const +QgsDataDefined QgsMarkerSymbol::dataDefinedSize() const { const double symbolSize = size(); @@ -1378,7 +1378,7 @@ QgsDataDefined QgsMarkerSymbolV2::dataDefinedSize() const { if ( layer->type() != QgsSymbol::Marker ) continue; - const QgsMarkerSymbolLayerV2* markerLayer = static_cast( layer ); + const QgsMarkerSymbolLayer* markerLayer = static_cast( layer ); if ( qgsDoubleNear( markerLayer->size(), symbolSize ) && markerLayer->getDataDefinedProperty( "size" ) ) { symbolDD = markerLayer->getDataDefinedProperty( "size" ); @@ -1394,7 +1394,7 @@ QgsDataDefined QgsMarkerSymbolV2::dataDefinedSize() const { if ( layer->type() != QgsSymbol::Marker ) continue; - const QgsMarkerSymbolLayerV2* markerLayer = static_cast( layer ); + const QgsMarkerSymbolLayer* markerLayer = static_cast( layer ); QgsDataDefined* layerSizeDD = markerLayer->getDataDefinedProperty( "size" ); QgsDataDefined* layerOffsetDD = markerLayer->getDataDefinedProperty( "offset" ); @@ -1422,24 +1422,24 @@ QgsDataDefined QgsMarkerSymbolV2::dataDefinedSize() const return QgsDataDefined( *symbolDD ); } -void QgsMarkerSymbolV2::setScaleMethod( QgsSymbol::ScaleMethod scaleMethod ) +void QgsMarkerSymbol::setScaleMethod( QgsSymbol::ScaleMethod scaleMethod ) { Q_FOREACH ( QgsSymbolLayer* layer, mLayers ) { if ( layer->type() != QgsSymbol::Marker ) continue; - QgsMarkerSymbolLayerV2* markerLayer = static_cast( layer ); + QgsMarkerSymbolLayer* markerLayer = static_cast( layer ); markerLayer->setScaleMethod( scaleMethod ); } } -QgsSymbol::ScaleMethod QgsMarkerSymbolV2::scaleMethod() +QgsSymbol::ScaleMethod QgsMarkerSymbol::scaleMethod() { Q_FOREACH ( QgsSymbolLayer* layer, mLayers ) { if ( layer->type() != QgsSymbol::Marker ) continue; - const QgsMarkerSymbolLayerV2* markerLayer = static_cast( layer ); + const QgsMarkerSymbolLayer* markerLayer = static_cast( layer ); // return scale method of the first symbol layer return markerLayer->scaleMethod(); } @@ -1447,7 +1447,7 @@ QgsSymbol::ScaleMethod QgsMarkerSymbolV2::scaleMethod() return DEFAULT_SCALE_METHOD; } -void QgsMarkerSymbolV2::renderPointUsingLayer( QgsMarkerSymbolLayerV2* layer, QPointF point, QgsSymbolRenderContext& context ) +void QgsMarkerSymbol::renderPointUsingLayer( QgsMarkerSymbolLayer* layer, QPointF point, QgsSymbolRenderContext& context ) { static QPointF nullPoint( 0, 0 ); @@ -1470,7 +1470,7 @@ void QgsMarkerSymbolV2::renderPointUsingLayer( QgsMarkerSymbolLayerV2* layer, QP } } -void QgsMarkerSymbolV2::renderPoint( QPointF point, const QgsFeature* f, QgsRenderContext& context, int layerIdx, bool selected ) +void QgsMarkerSymbol::renderPoint( QPointF point, const QgsFeature* f, QgsRenderContext& context, int layerIdx, bool selected ) { QgsSymbolRenderContext symbolContext( context, outputUnit(), mAlpha, selected, mRenderHints, f, QgsFields(), mapUnitScale() ); symbolContext.setGeometryPartCount( symbolRenderContext()->geometryPartCount() ); @@ -1483,7 +1483,7 @@ void QgsMarkerSymbolV2::renderPoint( QPointF point, const QgsFeature* f, QgsRend { if ( symbolLayer->type() == QgsSymbol::Marker ) { - QgsMarkerSymbolLayerV2* markerLayer = static_cast( symbolLayer ); + QgsMarkerSymbolLayer* markerLayer = static_cast( symbolLayer ); renderPointUsingLayer( markerLayer, point, symbolContext ); } else @@ -1496,7 +1496,7 @@ void QgsMarkerSymbolV2::renderPoint( QPointF point, const QgsFeature* f, QgsRend { if ( symbolLayer->type() == QgsSymbol::Marker ) { - QgsMarkerSymbolLayerV2* markerLayer = static_cast( symbolLayer ); + QgsMarkerSymbolLayer* markerLayer = static_cast( symbolLayer ); renderPointUsingLayer( markerLayer, point, symbolContext ); } else @@ -1504,7 +1504,7 @@ void QgsMarkerSymbolV2::renderPoint( QPointF point, const QgsFeature* f, QgsRend } } -QRectF QgsMarkerSymbolV2::bounds( QPointF point, QgsRenderContext& context, const QgsFeature& feature ) const +QRectF QgsMarkerSymbol::bounds( QPointF point, QgsRenderContext& context, const QgsFeature& feature ) const { QgsSymbolRenderContext symbolContext( context, outputUnit(), mAlpha, false, mRenderHints, &feature, feature.fields(), mapUnitScale() ); @@ -1513,7 +1513,7 @@ QRectF QgsMarkerSymbolV2::bounds( QPointF point, QgsRenderContext& context, cons { if ( layer->type() == QgsSymbol::Marker ) { - QgsMarkerSymbolLayerV2* symbolLayer = static_cast< QgsMarkerSymbolLayerV2* >( layer ); + QgsMarkerSymbolLayer* symbolLayer = static_cast< QgsMarkerSymbolLayer* >( layer ); if ( bound.isNull() ) bound = symbolLayer->bounds( point, symbolContext ); else @@ -1523,9 +1523,9 @@ QRectF QgsMarkerSymbolV2::bounds( QPointF point, QgsRenderContext& context, cons return bound; } -QgsMarkerSymbolV2* QgsMarkerSymbolV2::clone() const +QgsMarkerSymbol* QgsMarkerSymbol::clone() const { - QgsMarkerSymbolV2* cloneSymbol = new QgsMarkerSymbolV2( cloneLayers() ); + QgsMarkerSymbol* cloneSymbol = new QgsMarkerSymbol( cloneLayers() ); cloneSymbol->setAlpha( mAlpha ); cloneSymbol->setLayer( mLayer ); cloneSymbol->setClipFeaturesToExtent( mClipFeaturesToExtent ); @@ -1536,20 +1536,20 @@ QgsMarkerSymbolV2* QgsMarkerSymbolV2::clone() const /////////////////// // LINE -QgsLineSymbolV2::QgsLineSymbolV2( const QgsSymbolLayerList& layers ) +QgsLineSymbol::QgsLineSymbol( const QgsSymbolLayerList& layers ) : QgsSymbol( Line, layers ) { if ( mLayers.isEmpty() ) - mLayers.append( new QgsSimpleLineSymbolLayerV2() ); + mLayers.append( new QgsSimpleLineSymbolLayer() ); } -void QgsLineSymbolV2::setWidth( double w ) +void QgsLineSymbol::setWidth( double w ) { double origWidth = width(); Q_FOREACH ( QgsSymbolLayer* layer, mLayers ) { - QgsLineSymbolLayerV2* lineLayer = dynamic_cast( layer ); + QgsLineSymbolLayer* lineLayer = dynamic_cast( layer ); if ( lineLayer ) { @@ -1569,7 +1569,7 @@ void QgsLineSymbolV2::setWidth( double w ) } } -double QgsLineSymbolV2::width() const +double QgsLineSymbol::width() const { double maxWidth = 0; if ( mLayers.isEmpty() ) @@ -1577,7 +1577,7 @@ double QgsLineSymbolV2::width() const Q_FOREACH ( QgsSymbolLayer* symbolLayer, mLayers ) { - const QgsLineSymbolLayerV2* lineLayer = dynamic_cast( symbolLayer ); + const QgsLineSymbolLayer* lineLayer = dynamic_cast( symbolLayer ); if ( lineLayer ) { double width = lineLayer->width(); @@ -1588,13 +1588,13 @@ double QgsLineSymbolV2::width() const return maxWidth; } -void QgsLineSymbolV2::setDataDefinedWidth( const QgsDataDefined& dd ) +void QgsLineSymbol::setDataDefinedWidth( const QgsDataDefined& dd ) { const double symbolWidth = width(); Q_FOREACH ( QgsSymbolLayer* layer, mLayers ) { - QgsLineSymbolLayerV2* lineLayer = dynamic_cast( layer ); + QgsLineSymbolLayer* lineLayer = dynamic_cast( layer ); if ( lineLayer ) { @@ -1623,7 +1623,7 @@ void QgsLineSymbolV2::setDataDefinedWidth( const QgsDataDefined& dd ) } } -QgsDataDefined QgsLineSymbolV2::dataDefinedWidth() const +QgsDataDefined QgsLineSymbol::dataDefinedWidth() const { const double symbolWidth = width(); @@ -1632,7 +1632,7 @@ QgsDataDefined QgsLineSymbolV2::dataDefinedWidth() const // find the base of the "en masse" pattern for ( QgsSymbolLayerList::const_iterator it = mLayers.begin(); it != mLayers.end(); ++it ) { - const QgsLineSymbolLayerV2* layer = dynamic_cast( *it ); + const QgsLineSymbolLayer* layer = dynamic_cast( *it ); if ( layer && qgsDoubleNear( layer->width(), symbolWidth ) && layer->getDataDefinedProperty( "width" ) ) { symbolDD = layer->getDataDefinedProperty( "width" ); @@ -1648,7 +1648,7 @@ QgsDataDefined QgsLineSymbolV2::dataDefinedWidth() const { if ( layer->type() != QgsSymbol::Line ) continue; - const QgsLineSymbolLayerV2* lineLayer = static_cast( layer ); + const QgsLineSymbolLayer* lineLayer = static_cast( layer ); QgsDataDefined* layerWidthDD = lineLayer->getDataDefinedProperty( "width" ); QgsDataDefined* layerOffsetDD = lineLayer->getDataDefinedProperty( "offset" ); @@ -1676,7 +1676,7 @@ QgsDataDefined QgsLineSymbolV2::dataDefinedWidth() const return QgsDataDefined( *symbolDD ); } -void QgsLineSymbolV2::renderPolyline( const QPolygonF& points, const QgsFeature* f, QgsRenderContext& context, int layerIdx, bool selected ) +void QgsLineSymbol::renderPolyline( const QPolygonF& points, const QgsFeature* f, QgsRenderContext& context, int layerIdx, bool selected ) { //save old painter QPainter* renderPainter = context.painter(); @@ -1691,7 +1691,7 @@ void QgsLineSymbolV2::renderPolyline( const QPolygonF& points, const QgsFeature* { if ( symbolLayer->type() == QgsSymbol::Line ) { - QgsLineSymbolLayerV2* lineLayer = static_cast( symbolLayer ); + QgsLineSymbolLayer* lineLayer = static_cast( symbolLayer ); renderPolylineUsingLayer( lineLayer, points, symbolContext ); } else @@ -1704,7 +1704,7 @@ void QgsLineSymbolV2::renderPolyline( const QPolygonF& points, const QgsFeature* { if ( symbolLayer->type() == QgsSymbol::Line ) { - QgsLineSymbolLayerV2* lineLayer = static_cast( symbolLayer ); + QgsLineSymbolLayer* lineLayer = static_cast( symbolLayer ); renderPolylineUsingLayer( lineLayer, points, symbolContext ); } else @@ -1716,7 +1716,7 @@ void QgsLineSymbolV2::renderPolyline( const QPolygonF& points, const QgsFeature* context.setPainter( renderPainter ); } -void QgsLineSymbolV2::renderPolylineUsingLayer( QgsLineSymbolLayerV2 *layer, const QPolygonF &points, QgsSymbolRenderContext &context ) +void QgsLineSymbol::renderPolylineUsingLayer( QgsLineSymbolLayer *layer, const QPolygonF &points, QgsSymbolRenderContext &context ) { QgsPaintEffect* effect = layer->paintEffect(); if ( effect && effect->enabled() ) @@ -1738,9 +1738,9 @@ void QgsLineSymbolV2::renderPolylineUsingLayer( QgsLineSymbolLayerV2 *layer, con } -QgsLineSymbolV2* QgsLineSymbolV2::clone() const +QgsLineSymbol* QgsLineSymbol::clone() const { - QgsLineSymbolV2* cloneSymbol = new QgsLineSymbolV2( cloneLayers() ); + QgsLineSymbol* cloneSymbol = new QgsLineSymbol( cloneLayers() ); cloneSymbol->setAlpha( mAlpha ); cloneSymbol->setLayer( mLayer ); cloneSymbol->setClipFeaturesToExtent( mClipFeaturesToExtent ); @@ -1750,14 +1750,14 @@ QgsLineSymbolV2* QgsLineSymbolV2::clone() const /////////////////// // FILL -QgsFillSymbolV2::QgsFillSymbolV2( const QgsSymbolLayerList& layers ) +QgsFillSymbol::QgsFillSymbol( const QgsSymbolLayerList& layers ) : QgsSymbol( Fill, layers ) { if ( mLayers.isEmpty() ) - mLayers.append( new QgsSimpleFillSymbolLayerV2() ); + mLayers.append( new QgsSimpleFillSymbolLayer() ); } -void QgsFillSymbolV2::renderPolygon( const QPolygonF& points, QList* rings, const QgsFeature* f, QgsRenderContext& context, int layerIdx, bool selected ) +void QgsFillSymbol::renderPolygon( const QPolygonF& points, QList* rings, const QgsFeature* f, QgsRenderContext& context, int layerIdx, bool selected ) { QgsSymbolRenderContext symbolContext( context, outputUnit(), mAlpha, selected, mRenderHints, f, QgsFields(), mapUnitScale() ); symbolContext.setGeometryPartCount( symbolRenderContext()->geometryPartCount() ); @@ -1785,7 +1785,7 @@ void QgsFillSymbolV2::renderPolygon( const QPolygonF& points, QList* } } -void QgsFillSymbolV2::renderPolygonUsingLayer( QgsSymbolLayer* layer, const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) +void QgsFillSymbol::renderPolygonUsingLayer( QgsSymbolLayer* layer, const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) { QgsSymbol::SymbolType layertype = layer->type(); @@ -1802,11 +1802,11 @@ void QgsFillSymbolV2::renderPolygonUsingLayer( QgsSymbolLayer* layer, const QPol effect->begin( context.renderContext() ); if ( layertype == QgsSymbol::Fill ) { - ( static_cast( layer ) )->renderPolygon( points.translated( -bounds.topLeft() ), translatedRings, context ); + ( static_cast( layer ) )->renderPolygon( points.translated( -bounds.topLeft() ), translatedRings, context ); } else if ( layertype == QgsSymbol::Line ) { - ( static_cast( layer ) )->renderPolygonOutline( points.translated( -bounds.topLeft() ), translatedRings, context ); + ( static_cast( layer ) )->renderPolygonOutline( points.translated( -bounds.topLeft() ), translatedRings, context ); } delete translatedRings; @@ -1817,16 +1817,16 @@ void QgsFillSymbolV2::renderPolygonUsingLayer( QgsSymbolLayer* layer, const QPol { if ( layertype == QgsSymbol::Fill ) { - ( static_cast( layer ) )->renderPolygon( points, rings, context ); + ( static_cast( layer ) )->renderPolygon( points, rings, context ); } else if ( layertype == QgsSymbol::Line ) { - ( static_cast( layer ) )->renderPolygonOutline( points, rings, context ); + ( static_cast( layer ) )->renderPolygonOutline( points, rings, context ); } } } -QRectF QgsFillSymbolV2::polygonBounds( const QPolygonF& points, const QList* rings ) const +QRectF QgsFillSymbol::polygonBounds( const QPolygonF& points, const QList* rings ) const { QRectF bounds = points.boundingRect(); if ( rings ) @@ -1840,7 +1840,7 @@ QRectF QgsFillSymbolV2::polygonBounds( const QPolygonF& points, const QList* QgsFillSymbolV2::translateRings( const QList* rings, double dx, double dy ) const +QList* QgsFillSymbol::translateRings( const QList* rings, double dx, double dy ) const { if ( !rings ) return nullptr; @@ -1854,23 +1854,23 @@ QList* QgsFillSymbolV2::translateRings( const QList* rings return translatedRings; } -QgsFillSymbolV2* QgsFillSymbolV2::clone() const +QgsFillSymbol* QgsFillSymbol::clone() const { - QgsFillSymbolV2* cloneSymbol = new QgsFillSymbolV2( cloneLayers() ); + QgsFillSymbol* cloneSymbol = new QgsFillSymbol( cloneLayers() ); cloneSymbol->setAlpha( mAlpha ); cloneSymbol->setLayer( mLayer ); cloneSymbol->setClipFeaturesToExtent( mClipFeaturesToExtent ); return cloneSymbol; } -void QgsFillSymbolV2::setAngle( double angle ) +void QgsFillSymbol::setAngle( double angle ) { Q_FOREACH ( QgsSymbolLayer* layer, mLayers ) { if ( layer->type() != QgsSymbol::Fill ) continue; - QgsFillSymbolLayerV2* fillLayer = static_cast( layer ); + QgsFillSymbolLayer* fillLayer = static_cast( layer ); if ( fillLayer ) fillLayer->setAngle( angle ); diff --git a/src/core/symbology-ng/qgssymbol.h b/src/core/symbology-ng/qgssymbol.h index d750f4a0aa2..1519d064bdc 100644 --- a/src/core/symbology-ng/qgssymbol.h +++ b/src/core/symbology-ng/qgssymbol.h @@ -40,12 +40,12 @@ class QgsSymbolLayer; class QgsRenderContext; class QgsVectorLayer; class QgsPaintEffect; -class QgsMarkerSymbolLayerV2; -class QgsLineSymbolLayerV2; -class QgsFillSymbolLayerV2; +class QgsMarkerSymbolLayer; +class QgsLineSymbolLayer; +class QgsFillSymbolLayer; class QgsDataDefined; class QgsSymbolRenderContext; -class QgsFeatureRendererV2; +class QgsFeatureRenderer; typedef QList QgsSymbolLayerList; @@ -54,7 +54,7 @@ typedef QList QgsSymbolLayerList; */ class CORE_EXPORT QgsSymbol { - friend class QgsFeatureRendererV2; + friend class QgsFeatureRenderer; public: @@ -480,18 +480,18 @@ class CORE_EXPORT QgsSymbolRenderContext /** \ingroup core - * \class QgsMarkerSymbolV2 + * \class QgsMarkerSymbol */ -class CORE_EXPORT QgsMarkerSymbolV2 : public QgsSymbol +class CORE_EXPORT QgsMarkerSymbol : public QgsSymbol { public: /** 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 ); + static QgsMarkerSymbol* createSimple( const QgsStringMap& properties ); - QgsMarkerSymbolV2( const QgsSymbolLayerList& layers = QgsSymbolLayerList() ); + QgsMarkerSymbol( const QgsSymbolLayerList& layers = 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. @@ -617,27 +617,27 @@ class CORE_EXPORT QgsMarkerSymbolV2 : public QgsSymbol */ QRectF bounds( QPointF point, QgsRenderContext& context, const QgsFeature &feature = QgsFeature() ) const; - virtual QgsMarkerSymbolV2* clone() const override; + virtual QgsMarkerSymbol* clone() const override; private: - void renderPointUsingLayer( QgsMarkerSymbolLayerV2* layer, QPointF point, QgsSymbolRenderContext& context ); + void renderPointUsingLayer( QgsMarkerSymbolLayer* layer, QPointF point, QgsSymbolRenderContext& context ); }; /** \ingroup core - * \class QgsLineSymbolV2 + * \class QgsLineSymbol */ -class CORE_EXPORT QgsLineSymbolV2 : public QgsSymbol +class CORE_EXPORT QgsLineSymbol : public QgsSymbol { public: /** 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 ); + static QgsLineSymbol* createSimple( const QgsStringMap& properties ); - QgsLineSymbolV2( const QgsSymbolLayerList& layers = QgsSymbolLayerList() ); + QgsLineSymbol( const QgsSymbolLayerList& layers = QgsSymbolLayerList() ); void setWidth( double width ); double width() const; @@ -659,31 +659,31 @@ class CORE_EXPORT QgsLineSymbolV2 : public QgsSymbol void renderPolyline( const QPolygonF& points, const QgsFeature* f, QgsRenderContext& context, int layer = -1, bool selected = false ); - virtual QgsLineSymbolV2* clone() const override; + virtual QgsLineSymbol* clone() const override; private: - void renderPolylineUsingLayer( QgsLineSymbolLayerV2* layer, const QPolygonF& points, QgsSymbolRenderContext& context ); + void renderPolylineUsingLayer( QgsLineSymbolLayer* layer, const QPolygonF& points, QgsSymbolRenderContext& context ); }; /** \ingroup core - * \class QgsFillSymbolV2 + * \class QgsFillSymbol */ -class CORE_EXPORT QgsFillSymbolV2 : public QgsSymbol +class CORE_EXPORT QgsFillSymbol : public QgsSymbol { public: /** 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 ); + static QgsFillSymbol* createSimple( const QgsStringMap& properties ); - QgsFillSymbolV2( const QgsSymbolLayerList& layers = QgsSymbolLayerList() ); + QgsFillSymbol( const QgsSymbolLayerList& layers = QgsSymbolLayerList() ); void setAngle( double angle ); void renderPolygon( const QPolygonF& points, QList* rings, const QgsFeature* f, QgsRenderContext& context, int layer = -1, bool selected = false ); - virtual QgsFillSymbolV2* clone() const override; + virtual QgsFillSymbol* clone() const override; private: diff --git a/src/core/symbology-ng/qgssymbollayer.cpp b/src/core/symbology-ng/qgssymbollayer.cpp index 01ba27856df..d6f520996fc 100644 --- a/src/core/symbology-ng/qgssymbollayer.cpp +++ b/src/core/symbology-ng/qgssymbollayer.cpp @@ -448,7 +448,7 @@ void QgsSymbolLayer::copyPaintEffect( QgsSymbolLayer *destLayer ) const destLayer->setPaintEffect( mPaintEffect->clone() ); } -QgsMarkerSymbolLayerV2::QgsMarkerSymbolLayerV2( bool locked ) +QgsMarkerSymbolLayer::QgsMarkerSymbolLayer( bool locked ) : QgsSymbolLayer( QgsSymbol::Marker, locked ) , mAngle( 0 ) , mLineAngle( 0 ) @@ -462,7 +462,7 @@ QgsMarkerSymbolLayerV2::QgsMarkerSymbolLayerV2( bool locked ) } -QgsLineSymbolLayerV2::QgsLineSymbolLayerV2( bool locked ) +QgsLineSymbolLayer::QgsLineSymbolLayer( bool locked ) : QgsSymbolLayer( QgsSymbol::Line, locked ) , mWidth( 0 ) , mWidthUnit( QgsUnitTypes::RenderMillimeters ) @@ -471,35 +471,35 @@ QgsLineSymbolLayerV2::QgsLineSymbolLayerV2( bool locked ) { } -QgsFillSymbolLayerV2::QgsFillSymbolLayerV2( bool locked ) +QgsFillSymbolLayer::QgsFillSymbolLayer( bool locked ) : QgsSymbolLayer( QgsSymbol::Fill, locked ) , mAngle( 0.0 ) { } -void QgsMarkerSymbolLayerV2::startRender( QgsSymbolRenderContext& context ) +void QgsMarkerSymbolLayer::startRender( QgsSymbolRenderContext& context ) { Q_UNUSED( context ); } -void QgsMarkerSymbolLayerV2::drawPreviewIcon( QgsSymbolRenderContext& context, QSize size ) +void QgsMarkerSymbolLayer::drawPreviewIcon( QgsSymbolRenderContext& context, QSize size ) { startRender( context ); renderPoint( QPointF( size.width() / 2, size.height() / 2 ), context ); stopRender( context ); } -void QgsMarkerSymbolLayerV2::markerOffset( QgsSymbolRenderContext& context, double& offsetX, double& offsetY ) const +void QgsMarkerSymbolLayer::markerOffset( QgsSymbolRenderContext& context, double& offsetX, double& offsetY ) const { markerOffset( context, mSize, mSize, mSizeUnit, mSizeUnit, offsetX, offsetY, mSizeMapUnitScale, mSizeMapUnitScale ); } -void QgsMarkerSymbolLayerV2::markerOffset( QgsSymbolRenderContext& context, double width, double height, double& offsetX, double& offsetY ) const +void QgsMarkerSymbolLayer::markerOffset( QgsSymbolRenderContext& context, double width, double height, double& offsetX, double& offsetY ) const { markerOffset( context, width, height, mSizeUnit, mSizeUnit, offsetX, offsetY, mSizeMapUnitScale, mSizeMapUnitScale ); } -void QgsMarkerSymbolLayerV2::markerOffset( QgsSymbolRenderContext& context, double width, double height, +void QgsMarkerSymbolLayer::markerOffset( QgsSymbolRenderContext& context, double width, double height, QgsUnitTypes::RenderUnit widthUnit, QgsUnitTypes::RenderUnit heightUnit, double& offsetX, double& offsetY, const QgsMapUnitScale& widthMapUnitScale, const QgsMapUnitScale& heightMapUnitScale ) const { @@ -556,52 +556,52 @@ void QgsMarkerSymbolLayerV2::markerOffset( QgsSymbolRenderContext& context, doub } } -QPointF QgsMarkerSymbolLayerV2::_rotatedOffset( QPointF offset, double angle ) +QPointF QgsMarkerSymbolLayer::_rotatedOffset( QPointF offset, double angle ) { angle = DEG2RAD( angle ); double c = cos( angle ), s = sin( angle ); return QPointF( offset.x() * c - offset.y() * s, offset.x() * s + offset.y() * c ); } -QgsMarkerSymbolLayerV2::HorizontalAnchorPoint QgsMarkerSymbolLayerV2::decodeHorizontalAnchorPoint( const QString& str ) +QgsMarkerSymbolLayer::HorizontalAnchorPoint QgsMarkerSymbolLayer::decodeHorizontalAnchorPoint( const QString& str ) { if ( str.compare( "left", Qt::CaseInsensitive ) == 0 ) { - return QgsMarkerSymbolLayerV2::Left; + return QgsMarkerSymbolLayer::Left; } else if ( str.compare( "right", Qt::CaseInsensitive ) == 0 ) { - return QgsMarkerSymbolLayerV2::Right; + return QgsMarkerSymbolLayer::Right; } else { - return QgsMarkerSymbolLayerV2::HCenter; + return QgsMarkerSymbolLayer::HCenter; } } -QgsMarkerSymbolLayerV2::VerticalAnchorPoint QgsMarkerSymbolLayerV2::decodeVerticalAnchorPoint( const QString& str ) +QgsMarkerSymbolLayer::VerticalAnchorPoint QgsMarkerSymbolLayer::decodeVerticalAnchorPoint( const QString& str ) { if ( str.compare( "top", Qt::CaseInsensitive ) == 0 ) { - return QgsMarkerSymbolLayerV2::Top; + return QgsMarkerSymbolLayer::Top; } else if ( str.compare( "bottom", Qt::CaseInsensitive ) == 0 ) { - return QgsMarkerSymbolLayerV2::Bottom; + return QgsMarkerSymbolLayer::Bottom; } else { - return QgsMarkerSymbolLayerV2::VCenter; + return QgsMarkerSymbolLayer::VCenter; } } -void QgsMarkerSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit ) +void QgsMarkerSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit ) { mSizeUnit = unit; mOffsetUnit = unit; } -QgsUnitTypes::RenderUnit QgsMarkerSymbolLayerV2::outputUnit() const +QgsUnitTypes::RenderUnit QgsMarkerSymbolLayer::outputUnit() const { if ( mOffsetUnit != mSizeUnit ) { @@ -610,13 +610,13 @@ QgsUnitTypes::RenderUnit QgsMarkerSymbolLayerV2::outputUnit() const return mOffsetUnit; } -void QgsMarkerSymbolLayerV2::setMapUnitScale( const QgsMapUnitScale &scale ) +void QgsMarkerSymbolLayer::setMapUnitScale( const QgsMapUnitScale &scale ) { mSizeMapUnitScale = scale; mOffsetMapUnitScale = scale; } -QgsMapUnitScale QgsMarkerSymbolLayerV2::mapUnitScale() const +QgsMapUnitScale QgsMarkerSymbolLayer::mapUnitScale() const { if ( mSizeMapUnitScale == mOffsetMapUnitScale ) { @@ -625,28 +625,28 @@ QgsMapUnitScale QgsMarkerSymbolLayerV2::mapUnitScale() const return QgsMapUnitScale(); } -void QgsLineSymbolLayerV2::setOutputUnit( QgsUnitTypes::RenderUnit unit ) +void QgsLineSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit ) { mWidthUnit = unit; } -QgsUnitTypes::RenderUnit QgsLineSymbolLayerV2::outputUnit() const +QgsUnitTypes::RenderUnit QgsLineSymbolLayer::outputUnit() const { return mWidthUnit; } -void QgsLineSymbolLayerV2::setMapUnitScale( const QgsMapUnitScale& scale ) +void QgsLineSymbolLayer::setMapUnitScale( const QgsMapUnitScale& scale ) { mWidthMapUnitScale = scale; } -QgsMapUnitScale QgsLineSymbolLayerV2::mapUnitScale() const +QgsMapUnitScale QgsLineSymbolLayer::mapUnitScale() const { return mWidthMapUnitScale; } -void QgsLineSymbolLayerV2::drawPreviewIcon( QgsSymbolRenderContext& context, QSize size ) +void QgsLineSymbolLayer::drawPreviewIcon( QgsSymbolRenderContext& context, QSize size ) { QPolygonF points; // we're adding 0.5 to get rid of blurred preview: @@ -658,7 +658,7 @@ void QgsLineSymbolLayerV2::drawPreviewIcon( QgsSymbolRenderContext& context, QSi stopRender( context ); } -void QgsLineSymbolLayerV2::renderPolygonOutline( const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) +void QgsLineSymbolLayer::renderPolygonOutline( const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) { renderPolyline( points, context ); if ( rings ) @@ -668,14 +668,14 @@ void QgsLineSymbolLayerV2::renderPolygonOutline( const QPolygonF& points, QList< } } -double QgsLineSymbolLayerV2::dxfWidth( const QgsDxfExport& e, QgsSymbolRenderContext &context ) const +double QgsLineSymbolLayer::dxfWidth( const QgsDxfExport& e, QgsSymbolRenderContext &context ) const { Q_UNUSED( context ); return width() * e.mapUnitScaleFactor( e.symbologyScaleDenominator(), widthUnit(), e.mapUnits() ); } -void QgsFillSymbolLayerV2::drawPreviewIcon( QgsSymbolRenderContext& context, QSize size ) +void QgsFillSymbolLayer::drawPreviewIcon( QgsSymbolRenderContext& context, QSize size ) { QPolygonF poly = QRectF( QPointF( 0, 0 ), QPointF( size.width(), size.height() ) ); startRender( context ); @@ -683,7 +683,7 @@ void QgsFillSymbolLayerV2::drawPreviewIcon( QgsSymbolRenderContext& context, QSi stopRender( context ); } -void QgsFillSymbolLayerV2::_renderPolygon( QPainter* p, const QPolygonF& points, const QList* rings, QgsSymbolRenderContext& context ) +void QgsFillSymbolLayer::_renderPolygon( QPainter* p, const QPolygonF& points, const QList* rings, QgsSymbolRenderContext& context ) { if ( !p ) { @@ -730,7 +730,7 @@ void QgsFillSymbolLayerV2::_renderPolygon( QPainter* p, const QPolygonF& points, } } -void QgsMarkerSymbolLayerV2::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const +void QgsMarkerSymbolLayer::toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const { QDomElement symbolizerElem = doc.createElement( "se:PointSymbolizer" ); if ( !props.value( "uom", "" ).isEmpty() ) diff --git a/src/core/symbology-ng/qgssymbollayer.h b/src/core/symbology-ng/qgssymbollayer.h index da626d4f725..d49d378cab9 100644 --- a/src/core/symbology-ng/qgssymbollayer.h +++ b/src/core/symbology-ng/qgssymbollayer.h @@ -410,10 +410,10 @@ class CORE_EXPORT QgsSymbolLayer ////////////////////// /** \ingroup core - * \class QgsMarkerSymbolLayerV2 + * \class QgsMarkerSymbolLayer * \brief Abstract base class for marker symbol layers. */ -class CORE_EXPORT QgsMarkerSymbolLayerV2 : public QgsSymbolLayer +class CORE_EXPORT QgsMarkerSymbolLayer : public QgsSymbolLayer { public: @@ -607,7 +607,7 @@ class CORE_EXPORT QgsMarkerSymbolLayerV2 : public QgsSymbolLayer * @param props symbol layer definition (see properties()) */ virtual void writeSldMarker( QDomDocument &doc, QDomElement &element, const QgsStringMap& props ) const - { Q_UNUSED( props ); element.appendChild( doc.createComment( QString( "QgsMarkerSymbolLayerV2 %1 not implemented yet" ).arg( layerType() ) ) ); } + { Q_UNUSED( props ); element.appendChild( doc.createComment( QString( "QgsMarkerSymbolLayer %1 not implemented yet" ).arg( layerType() ) ) ); } void setOutputUnit( QgsUnitTypes::RenderUnit unit ) override; QgsUnitTypes::RenderUnit outputUnit() const override; @@ -625,10 +625,10 @@ class CORE_EXPORT QgsMarkerSymbolLayerV2 : public 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. @@ -686,14 +686,14 @@ class CORE_EXPORT QgsMarkerSymbolLayerV2 : public QgsSymbolLayer VerticalAnchorPoint mVerticalAnchorPoint; private: - static QgsMarkerSymbolLayerV2::HorizontalAnchorPoint decodeHorizontalAnchorPoint( const QString& str ); - static QgsMarkerSymbolLayerV2::VerticalAnchorPoint decodeVerticalAnchorPoint( const QString& str ); + static QgsMarkerSymbolLayer::HorizontalAnchorPoint decodeHorizontalAnchorPoint( const QString& str ); + static QgsMarkerSymbolLayer::VerticalAnchorPoint decodeVerticalAnchorPoint( const QString& str ); }; /** \ingroup core - * \class QgsLineSymbolLayerV2 + * \class QgsLineSymbolLayer */ -class CORE_EXPORT QgsLineSymbolLayerV2 : public QgsSymbolLayer +class CORE_EXPORT QgsLineSymbolLayer : public QgsSymbolLayer { public: virtual void renderPolyline( const QPolygonF& points, QgsSymbolRenderContext& context ) = 0; @@ -745,7 +745,7 @@ class CORE_EXPORT QgsLineSymbolLayerV2 : public QgsSymbolLayer virtual double dxfWidth( const QgsDxfExport& e, QgsSymbolRenderContext& context ) const override; protected: - QgsLineSymbolLayerV2( bool locked = false ); + QgsLineSymbolLayer( bool locked = false ); double mWidth; QgsUnitTypes::RenderUnit mWidthUnit; @@ -756,9 +756,9 @@ class CORE_EXPORT QgsLineSymbolLayerV2 : public QgsSymbolLayer }; /** \ingroup core - * \class QgsFillSymbolLayerV2 + * \class QgsFillSymbolLayer */ -class CORE_EXPORT QgsFillSymbolLayerV2 : public QgsSymbolLayer +class CORE_EXPORT QgsFillSymbolLayer : public QgsSymbolLayer { public: virtual void renderPolygon( const QPolygonF& points, QList* rings, QgsSymbolRenderContext& context ) = 0; @@ -769,7 +769,7 @@ class CORE_EXPORT QgsFillSymbolLayerV2 : public QgsSymbolLayer double angle() const { return mAngle; } protected: - QgsFillSymbolLayerV2( bool locked = false ); + QgsFillSymbolLayer( bool locked = false ); /** Default method to render polygon*/ void _renderPolygon( QPainter* p, const QPolygonF& points, const QList* rings, QgsSymbolRenderContext& context ); diff --git a/src/core/symbology-ng/qgssymbollayerregistry.cpp b/src/core/symbology-ng/qgssymbollayerregistry.cpp index b78a0cb5c91..2704130075e 100644 --- a/src/core/symbology-ng/qgssymbollayerregistry.cpp +++ b/src/core/symbology-ng/qgssymbollayerregistry.cpp @@ -16,54 +16,54 @@ #include "qgssymbollayerregistry.h" #include "qgsarrowsymbollayer.h" -#include "qgsellipsesymbollayerv2.h" -#include "qgsmarkersymbollayerv2.h" -#include "qgslinesymbollayerv2.h" -#include "qgsfillsymbollayerv2.h" +#include "qgsellipsesymbollayer.h" +#include "qgsmarkersymbollayer.h" +#include "qgslinesymbollayer.h" +#include "qgsfillsymbollayer.h" #include "qgsvectorfieldsymbollayer.h" -#include "qgsgeometrygeneratorsymbollayerv2.h" +#include "qgsgeometrygeneratorsymbollayer.h" QgsSymbolLayerRegistry::QgsSymbolLayerRegistry() { // init registry with known symbol layers addSymbolLayerType( new QgsSymbolLayerMetadata( "SimpleLine", QObject::tr( "Simple line" ), QgsSymbol::Line, - QgsSimpleLineSymbolLayerV2::create, QgsSimpleLineSymbolLayerV2::createFromSld ) ); + QgsSimpleLineSymbolLayer::create, QgsSimpleLineSymbolLayer::createFromSld ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "MarkerLine", QObject::tr( "Marker line" ), QgsSymbol::Line, - QgsMarkerLineSymbolLayerV2::create, QgsMarkerLineSymbolLayerV2::createFromSld ) ); + QgsMarkerLineSymbolLayer::create, QgsMarkerLineSymbolLayer::createFromSld ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "ArrowLine", QObject::tr( "Arrow" ), QgsSymbol::Line, QgsArrowSymbolLayer::create ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "SimpleMarker", QObject::tr( "Simple marker" ), QgsSymbol::Marker, - QgsSimpleMarkerSymbolLayerV2::create, QgsSimpleMarkerSymbolLayerV2::createFromSld ) ); + QgsSimpleMarkerSymbolLayer::create, QgsSimpleMarkerSymbolLayer::createFromSld ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "FilledMarker", QObject::tr( "Filled marker" ), QgsSymbol::Marker, QgsFilledMarkerSymbolLayer::create ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "SvgMarker", QObject::tr( "SVG marker" ), QgsSymbol::Marker, - QgsSvgMarkerSymbolLayerV2::create, QgsSvgMarkerSymbolLayerV2::createFromSld ) ); + QgsSvgMarkerSymbolLayer::create, QgsSvgMarkerSymbolLayer::createFromSld ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "FontMarker", QObject::tr( "Font marker" ), QgsSymbol::Marker, - QgsFontMarkerSymbolLayerV2::create, QgsFontMarkerSymbolLayerV2::createFromSld ) ); + QgsFontMarkerSymbolLayer::create, QgsFontMarkerSymbolLayer::createFromSld ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "EllipseMarker", QObject::tr( "Ellipse marker" ), QgsSymbol::Marker, - QgsEllipseSymbolLayerV2::create, QgsEllipseSymbolLayerV2::createFromSld ) ); + QgsEllipseSymbolLayer::create, QgsEllipseSymbolLayer::createFromSld ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "VectorField", QObject::tr( "Vector field marker" ), QgsSymbol::Marker, QgsVectorFieldSymbolLayer::create ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "SimpleFill", QObject::tr( "Simple fill" ), QgsSymbol::Fill, - QgsSimpleFillSymbolLayerV2::create, QgsSimpleFillSymbolLayerV2::createFromSld ) ); + QgsSimpleFillSymbolLayer::create, QgsSimpleFillSymbolLayer::createFromSld ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "GradientFill", QObject::tr( "Gradient fill" ), QgsSymbol::Fill, - QgsGradientFillSymbolLayerV2::create ) ); + QgsGradientFillSymbolLayer::create ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "ShapeburstFill", QObject::tr( "Shapeburst fill" ), QgsSymbol::Fill, - QgsShapeburstFillSymbolLayerV2::create ) ); + QgsShapeburstFillSymbolLayer::create ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "RasterFill", QObject::tr( "Raster image fill" ), QgsSymbol::Fill, QgsRasterFillSymbolLayer::create ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "SVGFill", QObject::tr( "SVG fill" ), QgsSymbol::Fill, QgsSVGFillSymbolLayer::create, QgsSVGFillSymbolLayer::createFromSld ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "CentroidFill", QObject::tr( "Centroid fill" ), QgsSymbol::Fill, - QgsCentroidFillSymbolLayerV2::create, QgsCentroidFillSymbolLayerV2::createFromSld ) ); + QgsCentroidFillSymbolLayer::create, QgsCentroidFillSymbolLayer::createFromSld ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "LinePatternFill", QObject::tr( "Line pattern fill" ), QgsSymbol::Fill, QgsLinePatternFillSymbolLayer::create, QgsLinePatternFillSymbolLayer::createFromSld ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "PointPatternFill", QObject::tr( "Point pattern fill" ), QgsSymbol::Fill, QgsPointPatternFillSymbolLayer::create, QgsPointPatternFillSymbolLayer::createFromSld ) ); addSymbolLayerType( new QgsSymbolLayerMetadata( "GeometryGenerator", QObject::tr( "Geometry generator" ), QgsSymbol::Hybrid, - QgsGeometryGeneratorSymbolLayerV2::create ) ); + QgsGeometryGeneratorSymbolLayer::create ) ); } QgsSymbolLayerRegistry::~QgsSymbolLayerRegistry() @@ -97,13 +97,13 @@ QgsSymbolLayer* QgsSymbolLayerRegistry::defaultSymbolLayer( QgsSymbol::SymbolTyp switch ( type ) { case QgsSymbol::Marker: - return QgsSimpleMarkerSymbolLayerV2::create(); + return QgsSimpleMarkerSymbolLayer::create(); case QgsSymbol::Line: - return QgsSimpleLineSymbolLayerV2::create(); + return QgsSimpleLineSymbolLayer::create(); case QgsSymbol::Fill: - return QgsSimpleFillSymbolLayerV2::create(); + return QgsSimpleFillSymbolLayer::create(); case QgsSymbol::Hybrid: return nullptr; diff --git a/src/core/symbology-ng/qgssymbollayerregistry.h b/src/core/symbology-ng/qgssymbollayerregistry.h index 33ffafe15f4..3d11884da32 100644 --- a/src/core/symbology-ng/qgssymbollayerregistry.h +++ b/src/core/symbology-ng/qgssymbollayerregistry.h @@ -68,9 +68,9 @@ class CORE_EXPORT QgsSymbolLayerMetadata : public QgsSymbolLayerAbstractMetadata public: //! @note not available in python bindings QgsSymbolLayerMetadata( const QString& name, const QString& visibleName, - QgsSymbol::SymbolType type, - QgsSymbolLayerCreateFunc pfCreate, - QgsSymbolLayerWidgetFunc pfWidget = nullptr ) + QgsSymbol::SymbolType type, + QgsSymbolLayerCreateFunc pfCreate, + QgsSymbolLayerWidgetFunc pfWidget = nullptr ) : QgsSymbolLayerAbstractMetadata( name, visibleName, type ) , mCreateFunc( pfCreate ) , mWidgetFunc( pfWidget ) @@ -79,10 +79,10 @@ class CORE_EXPORT QgsSymbolLayerMetadata : public QgsSymbolLayerAbstractMetadata //! @note not available in python bindings QgsSymbolLayerMetadata( const QString& name, const QString& visibleName, - QgsSymbol::SymbolType type, - QgsSymbolLayerCreateFunc pfCreate, - QgsSymbolLayerCreateFromSldFunc pfCreateFromSld, - QgsSymbolLayerWidgetFunc pfWidget = nullptr ) + QgsSymbol::SymbolType type, + QgsSymbolLayerCreateFunc pfCreate, + QgsSymbolLayerCreateFromSldFunc pfCreateFromSld, + QgsSymbolLayerWidgetFunc pfWidget = nullptr ) : QgsSymbolLayerAbstractMetadata( name, visibleName, type ) , mCreateFunc( pfCreate ) , mWidgetFunc( pfWidget ) diff --git a/src/core/symbology-ng/qgssymbollayerutils.cpp b/src/core/symbology-ng/qgssymbollayerutils.cpp index c58f56b2bc3..6ff6de8ca5e 100644 --- a/src/core/symbology-ng/qgssymbollayerutils.cpp +++ b/src/core/symbology-ng/qgssymbollayerutils.cpp @@ -18,7 +18,7 @@ #include "qgssymbollayer.h" #include "qgssymbollayerregistry.h" #include "qgssymbol.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgsexpression.h" #include "qgspainteffect.h" #include "qgspainteffectregistry.h" @@ -619,12 +619,12 @@ QIcon QgsSymbolLayerUtils::symbolLayerPreviewIcon( QgsSymbolLayer* layer, QgsUni return QIcon( pixmap ); } -QIcon QgsSymbolLayerUtils::colorRampPreviewIcon( QgsVectorColorRampV2* ramp, QSize size ) +QIcon QgsSymbolLayerUtils::colorRampPreviewIcon( QgsVectorColorRamp* ramp, QSize size ) { return QIcon( colorRampPreviewPixmap( ramp, size ) ); } -QPixmap QgsSymbolLayerUtils::colorRampPreviewPixmap( QgsVectorColorRampV2* ramp, QSize size ) +QPixmap QgsSymbolLayerUtils::colorRampPreviewPixmap( QgsVectorColorRamp* ramp, QSize size ) { QPixmap pixmap( size ); pixmap.fill( Qt::transparent ); @@ -951,11 +951,11 @@ QgsSymbol* QgsSymbolLayerUtils::loadSymbol( const QDomElement &element ) QgsSymbol* symbol = nullptr; if ( symbolType == "line" ) - symbol = new QgsLineSymbolV2( layers ); + symbol = new QgsLineSymbol( layers ); else if ( symbolType == "fill" ) - symbol = new QgsFillSymbolV2( layers ); + symbol = new QgsFillSymbol( layers ); else if ( symbolType == "marker" ) - symbol = new QgsMarkerSymbolV2( layers ); + symbol = new QgsMarkerSymbol( layers ); else { QgsDebugMsg( "unknown symbol type " + symbolType ); @@ -1069,7 +1069,7 @@ QString QgsSymbolLayerUtils::symbolProperties( QgsSymbol* symbol ) return props; } -bool QgsSymbolLayerUtils::createSymbolLayerV2ListFromSld( QDomElement& element, +bool QgsSymbolLayerUtils::createSymbolLayerListFromSld( QDomElement& element, QgsWkbTypes::GeometryType geomType, QgsSymbolLayerList &layers ) { @@ -1839,9 +1839,9 @@ bool QgsSymbolLayerUtils::fillFromSld( QDomElement &element, Qt::BrushStyle &bru } void QgsSymbolLayerUtils::lineToSld( QDomDocument &doc, QDomElement &element, - Qt::PenStyle penStyle, const QColor& color, double width, - const Qt::PenJoinStyle *penJoinStyle, const Qt::PenCapStyle *penCapStyle, - const QVector *customDashPattern, double dashOffset ) + Qt::PenStyle penStyle, const QColor& color, double width, + const Qt::PenJoinStyle *penJoinStyle, const Qt::PenCapStyle *penCapStyle, + const QVector *customDashPattern, double dashOffset ) { QVector dashPattern; const QVector *pattern = &dashPattern; @@ -1916,9 +1916,9 @@ void QgsSymbolLayerUtils::lineToSld( QDomDocument &doc, QDomElement &element, bool QgsSymbolLayerUtils::lineFromSld( QDomElement &element, - Qt::PenStyle &penStyle, QColor &color, double &width, - Qt::PenJoinStyle *penJoinStyle, Qt::PenCapStyle *penCapStyle, - QVector *customDashPattern, double *dashOffset ) + Qt::PenStyle &penStyle, QColor &color, double &width, + Qt::PenJoinStyle *penJoinStyle, Qt::PenCapStyle *penCapStyle, + QVector *customDashPattern, double *dashOffset ) { QgsDebugMsg( "Entered." ); @@ -2780,7 +2780,7 @@ void QgsSymbolLayerUtils::clearSymbolMap( QgsSymbolMap& symbols ) } -QgsVectorColorRampV2* QgsSymbolLayerUtils::loadColorRamp( QDomElement& element ) +QgsVectorColorRamp* QgsSymbolLayerUtils::loadColorRamp( QDomElement& element ) { QString rampType = element.attribute( "type" ); @@ -2788,13 +2788,13 @@ QgsVectorColorRampV2* QgsSymbolLayerUtils::loadColorRamp( QDomElement& element ) QgsStringMap props = QgsSymbolLayerUtils::parseProperties( element ); if ( rampType == "gradient" ) - return QgsVectorGradientColorRampV2::create( props ); + return QgsVectorGradientColorRamp::create( props ); else if ( rampType == "random" ) - return QgsVectorRandomColorRampV2::create( props ); + return QgsVectorRandomColorRamp::create( props ); else if ( rampType == "colorbrewer" ) - return QgsVectorColorBrewerColorRampV2::create( props ); + return QgsVectorColorBrewerColorRamp::create( props ); else if ( rampType == "cpt-city" ) - return QgsCptCityColorRampV2::create( props ); + return QgsCptCityColorRamp::create( props ); else { QgsDebugMsg( "unknown colorramp type " + rampType ); @@ -2803,7 +2803,7 @@ QgsVectorColorRampV2* QgsSymbolLayerUtils::loadColorRamp( QDomElement& element ) } -QDomElement QgsSymbolLayerUtils::saveColorRamp( const QString& name, QgsVectorColorRampV2* ramp, QDomDocument& doc ) +QDomElement QgsSymbolLayerUtils::saveColorRamp( const QString& name, QgsVectorColorRamp* ramp, QDomDocument& doc ) { QDomElement rampEl = doc.createElement( "colorramp" ); rampEl.setAttribute( "type", ramp->type() ); diff --git a/src/core/symbology-ng/qgssymbollayerutils.h b/src/core/symbology-ng/qgssymbollayerutils.h index 4c4bf2ec920..bcf804e63cf 100644 --- a/src/core/symbology-ng/qgssymbollayerutils.h +++ b/src/core/symbology-ng/qgssymbollayerutils.h @@ -29,7 +29,7 @@ class QgsExpression; class QgsSymbolLayer; -class QgsVectorColorRampV2; +class QgsVectorColorRamp; typedef QMap QgsStringMap; typedef QMap QgsSymbolMap; @@ -138,13 +138,13 @@ class CORE_EXPORT 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 = nullptr ); - 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 ); @@ -187,7 +187,7 @@ class CORE_EXPORT 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 ); @@ -297,8 +297,8 @@ class CORE_EXPORT QgsSymbolLayerUtils static void clearSymbolMap( QgsSymbolMap& symbols ); - static QgsVectorColorRampV2* loadColorRamp( QDomElement& element ); - static QDomElement saveColorRamp( const QString& name, QgsVectorColorRampV2* ramp, QDomDocument& doc ); + static QgsVectorColorRamp* loadColorRamp( QDomElement& element ); + static QDomElement saveColorRamp( const QString& name, QgsVectorColorRamp* ramp, QDomDocument& doc ); /** * Returns a friendly display name for a color diff --git a/src/core/symbology-ng/qgssymbologyconversion.cpp b/src/core/symbology-ng/qgssymbologyconversion.cpp index e2edfdb488e..8e248cbae09 100644 --- a/src/core/symbology-ng/qgssymbologyconversion.cpp +++ b/src/core/symbology-ng/qgssymbologyconversion.cpp @@ -16,12 +16,12 @@ #include "qgslogger.h" -#include "qgsmarkersymbollayerv2.h" -#include "qgslinesymbollayerv2.h" -#include "qgsfillsymbollayerv2.h" -#include "qgssinglesymbolrendererv2.h" -#include "qgsgraduatedsymbolrendererv2.h" -#include "qgscategorizedsymbolrendererv2.h" +#include "qgsmarkersymbollayer.h" +#include "qgslinesymbollayer.h" +#include "qgsfillsymbollayer.h" +#include "qgssinglesymbolrenderer.h" +#include "qgsgraduatedsymbolrenderer.h" +#include "qgscategorizedsymbolrenderer.h" @@ -131,7 +131,7 @@ static QgsSymbol* readOldSymbol( const QDomNode& synode, QgsWkbTypes::GeometryTy { case QgsWkbTypes::PointGeometry: { - QgsMarkerSymbolLayerV2* sl = nullptr; + QgsMarkerSymbolLayer* sl = nullptr; double size = readMarkerSymbolSize( synode ); double angle = 0; // rotation only from classification field QString symbolName = readMarkerSymbolName( synode ); @@ -141,7 +141,7 @@ static QgsSymbol* readOldSymbol( const QDomNode& synode, QgsWkbTypes::GeometryTy QColor color = readSymbolColor( synode, true ); QColor borderColor = readSymbolColor( synode, false ); QgsSimpleMarkerSymbolLayerBase::Shape shape = QgsSimpleMarkerSymbolLayerBase::decodeShape( symbolName.mid( 5 ) ); - sl = new QgsSimpleMarkerSymbolLayerV2( shape, size, angle ); + sl = new QgsSimpleMarkerSymbolLayer( shape, size, angle ); sl->setColor( color ); sl->setOutlineColor( borderColor ); } @@ -149,11 +149,11 @@ static QgsSymbol* readOldSymbol( const QDomNode& synode, QgsWkbTypes::GeometryTy { // svg symbol marker QString name = symbolName.mid( 4 ); - sl = new QgsSvgMarkerSymbolLayerV2( name, size, angle ); + sl = new QgsSvgMarkerSymbolLayer( name, size, angle ); } QgsSymbolLayerList layers; layers.append( sl ); - return new QgsMarkerSymbolV2( layers ); + return new QgsMarkerSymbol( layers ); } case QgsWkbTypes::LineGeometry: @@ -161,11 +161,11 @@ static QgsSymbol* readOldSymbol( const QDomNode& synode, QgsWkbTypes::GeometryTy QColor color = readSymbolColor( synode, false ); double width = readOutlineWidth( synode ); Qt::PenStyle penStyle = readOutlineStyle( synode ); - QgsLineSymbolLayerV2* sl = new QgsSimpleLineSymbolLayerV2( color, width, penStyle ); + QgsLineSymbolLayer* sl = new QgsSimpleLineSymbolLayer( color, width, penStyle ); QgsSymbolLayerList layers; layers.append( sl ); - return new QgsLineSymbolV2( layers ); + return new QgsLineSymbol( layers ); } case QgsWkbTypes::PolygonGeometry: @@ -175,11 +175,11 @@ static QgsSymbol* readOldSymbol( const QDomNode& synode, QgsWkbTypes::GeometryTy Qt::BrushStyle brushStyle = readBrushStyle( synode ); Qt::PenStyle borderStyle = readOutlineStyle( synode ); double borderWidth = readOutlineWidth( synode ); - QgsFillSymbolLayerV2* sl = new QgsSimpleFillSymbolLayerV2( color, brushStyle, borderColor, borderStyle, borderWidth ); + QgsFillSymbolLayer* sl = new QgsSimpleFillSymbolLayer( color, brushStyle, borderColor, borderStyle, borderWidth ); QgsSymbolLayerList layers; layers.append( sl ); - return new QgsFillSymbolV2( layers ); + return new QgsFillSymbol( layers ); } default: @@ -189,37 +189,37 @@ static QgsSymbol* readOldSymbol( const QDomNode& synode, QgsWkbTypes::GeometryTy -static QgsFeatureRendererV2* readOldSingleSymbolRenderer( const QDomNode& rnode, QgsWkbTypes::GeometryType geomType ) +static QgsFeatureRenderer* readOldSingleSymbolRenderer( const QDomNode& rnode, QgsWkbTypes::GeometryType geomType ) { QDomNode synode = rnode.namedItem( "symbol" ); if ( synode.isNull() ) return nullptr; QgsSymbol* sy2 = readOldSymbol( synode, geomType ); - QgsSingleSymbolRendererV2* r = new QgsSingleSymbolRendererV2( sy2 ); + QgsSingleSymbolRenderer* r = new QgsSingleSymbolRenderer( sy2 ); return r; } -static QgsFeatureRendererV2* readOldGraduatedSymbolRenderer( const QDomNode& rnode, QgsWkbTypes::GeometryType geomType ) +static QgsFeatureRenderer* readOldGraduatedSymbolRenderer( const QDomNode& rnode, QgsWkbTypes::GeometryType geomType ) { QDomNode modeNode = rnode.namedItem( "mode" ); QString modeValue = modeNode.toElement().text(); QDomNode classnode = rnode.namedItem( "classificationfield" ); QString classificationField = classnode.toElement().text(); - QgsGraduatedSymbolRendererV2::Mode m = QgsGraduatedSymbolRendererV2::Custom; + QgsGraduatedSymbolRenderer::Mode m = QgsGraduatedSymbolRenderer::Custom; if ( modeValue == "Empty" ) { - m = QgsGraduatedSymbolRendererV2::Custom; + m = QgsGraduatedSymbolRenderer::Custom; } else if ( modeValue == "Quantile" ) { - m = QgsGraduatedSymbolRendererV2::Quantile; + m = QgsGraduatedSymbolRenderer::Quantile; } else //default { - m = QgsGraduatedSymbolRendererV2::EqualInterval; + m = QgsGraduatedSymbolRenderer::EqualInterval; } // load ranges and symbols @@ -227,8 +227,8 @@ static QgsFeatureRendererV2* readOldGraduatedSymbolRenderer( const QDomNode& rno QDomNode symbolnode = rnode.namedItem( "symbol" ); while ( !symbolnode.isNull() ) { - QgsSymbol* symbolv2 = readOldSymbol( symbolnode, geomType ); - if ( symbolv2 ) + QgsSymbol* symbol = readOldSymbol( symbolnode, geomType ); + if ( symbol ) { QgsOldSymbolMeta meta = readSymbolMeta( symbolnode ); double lowerValue = meta.lowerValue.toDouble(); @@ -236,21 +236,21 @@ static QgsFeatureRendererV2* readOldGraduatedSymbolRenderer( const QDomNode& rno QString label = meta.label; if ( label.isEmpty() ) label = QString( "%1 - %2" ).arg( lowerValue, -1, 'f', 3 ).arg( upperValue, -1, 'f', 3 ); - ranges.append( QgsRendererRangeV2( lowerValue, upperValue, symbolv2, label ) ); + ranges.append( QgsRendererRange( lowerValue, upperValue, symbol, label ) ); } symbolnode = symbolnode.nextSibling(); } // create renderer - QgsGraduatedSymbolRendererV2* r = new QgsGraduatedSymbolRendererV2( classificationField, ranges ); + QgsGraduatedSymbolRenderer* r = new QgsGraduatedSymbolRenderer( classificationField, ranges ); r->setMode( m ); return r; } -static QgsFeatureRendererV2* readOldUniqueValueRenderer( const QDomNode& rnode, QgsWkbTypes::GeometryType geomType ) +static QgsFeatureRenderer* readOldUniqueValueRenderer( const QDomNode& rnode, QgsWkbTypes::GeometryType geomType ) { QDomNode classnode = rnode.namedItem( "classificationfield" ); QString classificationField = classnode.toElement().text(); @@ -260,21 +260,21 @@ static QgsFeatureRendererV2* readOldUniqueValueRenderer( const QDomNode& rnode, QDomNode symbolnode = rnode.namedItem( "symbol" ); while ( !symbolnode.isNull() ) { - QgsSymbol* symbolv2 = readOldSymbol( symbolnode, geomType ); - if ( symbolv2 ) + QgsSymbol* symbol = readOldSymbol( symbolnode, geomType ); + if ( symbol ) { QgsOldSymbolMeta meta = readSymbolMeta( symbolnode ); QVariant value = QVariant( meta.lowerValue ); QString label = meta.label; if ( label.isEmpty() ) label = value.toString(); - cats.append( QgsRendererCategoryV2( value, symbolv2, label, true ) ); + cats.append( QgsRendererCategory( value, symbol, label, true ) ); } symbolnode = symbolnode.nextSibling(); } - QgsCategorizedSymbolRendererV2* r = new QgsCategorizedSymbolRendererV2( classificationField, cats ); + QgsCategorizedSymbolRenderer* r = new QgsCategorizedSymbolRenderer( classificationField, cats ); // source symbol and color ramp are not set (unknown) return r; } @@ -282,7 +282,7 @@ static QgsFeatureRendererV2* readOldUniqueValueRenderer( const QDomNode& rnode, -QgsFeatureRendererV2* QgsSymbologyConversion::readOldRenderer( const QDomNode& layerNode, QgsWkbTypes::GeometryType geomType ) +QgsFeatureRenderer* QgsSymbologyConversion::readOldRenderer( const QDomNode& layerNode, QgsWkbTypes::GeometryType geomType ) { QDomNode singlenode = layerNode.namedItem( "singlesymbol" ); QDomNode graduatednode = layerNode.namedItem( "graduatedsymbol" ); diff --git a/src/core/symbology-ng/qgssymbologyconversion.h b/src/core/symbology-ng/qgssymbologyconversion.h index 7c32cb0480c..7831b66be9d 100644 --- a/src/core/symbology-ng/qgssymbologyconversion.h +++ b/src/core/symbology-ng/qgssymbologyconversion.h @@ -17,7 +17,7 @@ class QDomNode; -class QgsFeatureRendererV2; +class QgsFeatureRenderer; #include "qgis.h" @@ -30,7 +30,7 @@ class CORE_EXPORT 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 ); diff --git a/src/core/symbology-ng/qgsvectorcolorrampv2.cpp b/src/core/symbology-ng/qgsvectorcolorramp.cpp similarity index 80% rename from src/core/symbology-ng/qgsvectorcolorrampv2.cpp rename to src/core/symbology-ng/qgsvectorcolorramp.cpp index 2edb3b39ad1..d2b2e3ae6eb 100644 --- a/src/core/symbology-ng/qgsvectorcolorrampv2.cpp +++ b/src/core/symbology-ng/qgsvectorcolorramp.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsvectorcolorrampv2.cpp + qgsvectorcolorramp.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -13,7 +13,7 @@ * * ***************************************************************************/ -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgscolorbrewerpalette.h" #include "qgscptcityarchive.h" @@ -42,7 +42,7 @@ static QColor _interpolate( const QColor& c1, const QColor& c2, const double val ////////////// -QgsVectorGradientColorRampV2::QgsVectorGradientColorRampV2( const QColor& color1, const QColor& color2, +QgsVectorGradientColorRamp::QgsVectorGradientColorRamp( const QColor& color1, const QColor& color2, bool discrete, const QgsGradientStopsList& stops ) : mColor1( color1 ) , mColor2( color2 ) @@ -51,7 +51,7 @@ QgsVectorGradientColorRampV2::QgsVectorGradientColorRampV2( const QColor& color1 { } -QgsVectorColorRampV2* QgsVectorGradientColorRampV2::create( const QgsStringMap& props ) +QgsVectorColorRamp* QgsVectorGradientColorRamp::create( const QgsStringMap& props ) { // color1 and color2 QColor color1 = DEFAULT_GRADIENT_COLOR1; @@ -93,12 +93,12 @@ QgsVectorColorRampV2* QgsVectorGradientColorRampV2::create( const QgsStringMap& info[ it.key().mid( 5 )] = it.value(); } - QgsVectorGradientColorRampV2* r = new QgsVectorGradientColorRampV2( color1, color2, discrete, stops ); + QgsVectorGradientColorRamp* r = new QgsVectorGradientColorRamp( color1, color2, discrete, stops ); r->setInfo( info ); return r; } -double QgsVectorGradientColorRampV2::value( int index ) const +double QgsVectorGradientColorRamp::value( int index ) const { if ( index <= 0 ) { @@ -114,7 +114,7 @@ double QgsVectorGradientColorRampV2::value( int index ) const } } -QColor QgsVectorGradientColorRampV2::color( double value ) const +QColor QgsVectorGradientColorRamp::color( double value ) const { if ( qgsDoubleNear( value, 0.0 ) || value < 0.0 ) { @@ -160,15 +160,15 @@ QColor QgsVectorGradientColorRampV2::color( double value ) const } } -QgsVectorGradientColorRampV2* QgsVectorGradientColorRampV2::clone() const +QgsVectorGradientColorRamp* QgsVectorGradientColorRamp::clone() const { - QgsVectorGradientColorRampV2* r = new QgsVectorGradientColorRampV2( mColor1, mColor2, + QgsVectorGradientColorRamp* r = new QgsVectorGradientColorRamp( mColor1, mColor2, mDiscrete, mStops ); r->setInfo( mInfo ); return r; } -QgsStringMap QgsVectorGradientColorRampV2::properties() const +QgsStringMap QgsVectorGradientColorRamp::properties() const { QgsStringMap map; map["color1"] = QgsSymbolLayerUtils::encodeColor( mColor1 ); @@ -193,7 +193,7 @@ QgsStringMap QgsVectorGradientColorRampV2::properties() const return map; } -void QgsVectorGradientColorRampV2::convertToDiscrete( bool discrete ) +void QgsVectorGradientColorRamp::convertToDiscrete( bool discrete ) { if ( discrete == mDiscrete ) return; @@ -240,7 +240,7 @@ bool stopLessThan( const QgsGradientStop &s1, const QgsGradientStop &s2 ) return s1.offset < s2.offset; } -void QgsVectorGradientColorRampV2::setStops( const QgsGradientStopsList &stops ) +void QgsVectorGradientColorRamp::setStops( const QgsGradientStopsList &stops ) { mStops = stops; @@ -248,7 +248,7 @@ void QgsVectorGradientColorRampV2::setStops( const QgsGradientStopsList &stops ) qSort( mStops.begin(), mStops.end(), stopLessThan ); } -void QgsVectorGradientColorRampV2::addStopsToGradient( QGradient* gradient, double alpha ) +void QgsVectorGradientColorRamp::addStopsToGradient( QGradient* gradient, double alpha ) { //copy color ramp stops to a QGradient QColor color1 = mColor1; @@ -277,7 +277,7 @@ void QgsVectorGradientColorRampV2::addStopsToGradient( QGradient* gradient, doub ////////////// -QgsVectorRandomColorRampV2::QgsVectorRandomColorRampV2( int count, int hueMin, int hueMax, +QgsVectorRandomColorRamp::QgsVectorRandomColorRamp( int count, int hueMin, int hueMax, int satMin, int satMax, int valMin, int valMax ) : mCount( count ) , mHueMin( hueMin ), mHueMax( hueMax ) @@ -287,7 +287,7 @@ QgsVectorRandomColorRampV2::QgsVectorRandomColorRampV2( int count, int hueMin, i updateColors(); } -QgsVectorColorRampV2* QgsVectorRandomColorRampV2::create( const QgsStringMap& props ) +QgsVectorColorRamp* QgsVectorRandomColorRamp::create( const QgsStringMap& props ) { int count = DEFAULT_RANDOM_COUNT; int hueMin = DEFAULT_RANDOM_HUE_MIN, hueMax = DEFAULT_RANDOM_HUE_MAX; @@ -302,16 +302,16 @@ QgsVectorColorRampV2* QgsVectorRandomColorRampV2::create( const QgsStringMap& pr if ( props.contains( "valMin" ) ) valMin = props["valMin"].toInt(); if ( props.contains( "valMax" ) ) valMax = props["valMax"].toInt(); - return new QgsVectorRandomColorRampV2( count, hueMin, hueMax, satMin, satMax, valMin, valMax ); + return new QgsVectorRandomColorRamp( count, hueMin, hueMax, satMin, satMax, valMin, valMax ); } -double QgsVectorRandomColorRampV2::value( int index ) const +double QgsVectorRandomColorRamp::value( int index ) const { if ( mColors.size() < 1 ) return 0; return static_cast< double >( index ) / ( mColors.size() - 1 ); } -QColor QgsVectorRandomColorRampV2::color( double value ) const +QColor QgsVectorRandomColorRamp::color( double value ) const { int colorCnt = mColors.count(); int colorIdx = static_cast< int >( value * ( colorCnt - 1 ) ); @@ -322,12 +322,12 @@ QColor QgsVectorRandomColorRampV2::color( double value ) const return QColor(); } -QgsVectorRandomColorRampV2* QgsVectorRandomColorRampV2::clone() const +QgsVectorRandomColorRamp* QgsVectorRandomColorRamp::clone() const { - return new QgsVectorRandomColorRampV2( mCount, mHueMin, mHueMax, mSatMin, mSatMax, mValMin, mValMax ); + return new QgsVectorRandomColorRamp( mCount, mHueMin, mHueMax, mSatMin, mSatMax, mValMin, mValMax ); } -QgsStringMap QgsVectorRandomColorRampV2::properties() const +QgsStringMap QgsVectorRandomColorRamp::properties() const { QgsStringMap map; map["count"] = QString::number( mCount ); @@ -340,7 +340,7 @@ QgsStringMap QgsVectorRandomColorRampV2::properties() const return map; } -QList QgsVectorRandomColorRampV2::randomColors( int count, +QList QgsVectorRandomColorRamp::randomColors( int count, int hueMax, int hueMin, int satMax, int satMin, int valMax, int valMin ) { int h, s, v; @@ -373,35 +373,35 @@ QList QgsVectorRandomColorRampV2::randomColors( int count, return colors; } -void QgsVectorRandomColorRampV2::updateColors() +void QgsVectorRandomColorRamp::updateColors() { - mColors = QgsVectorRandomColorRampV2::randomColors( mCount, mHueMax, mHueMin, mSatMax, mSatMin, mValMax, mValMin ); + mColors = QgsVectorRandomColorRamp::randomColors( mCount, mHueMax, mHueMin, mSatMax, mSatMin, mValMax, mValMin ); } ///////////// -QgsRandomColorsV2::QgsRandomColorsV2() +QgsRandomColors::QgsRandomColors() : mTotalColorCount( 0 ) { } -QgsRandomColorsV2::~QgsRandomColorsV2() +QgsRandomColors::~QgsRandomColors() { } -int QgsRandomColorsV2::count() const +int QgsRandomColors::count() const { return -1; } -double QgsRandomColorsV2::value( int index ) const +double QgsRandomColors::value( int index ) const { Q_UNUSED( index ); return 0.0; } -QColor QgsRandomColorsV2::color( double value ) const +QColor QgsRandomColors::color( double value ) const { int minVal = 130; int maxVal = 255; @@ -421,7 +421,7 @@ QColor QgsRandomColorsV2::color( double value ) const return QColor::fromHsv( h, s, v ); } -void QgsRandomColorsV2::setTotalColorCount( const int colorCount ) +void QgsRandomColors::setTotalColorCount( const int colorCount ) { //calculate colors in advance, so that we can ensure they are more visually distinct than pure random colors mPrecalculatedColors.clear(); @@ -453,31 +453,31 @@ void QgsRandomColorsV2::setTotalColorCount( const int colorCount ) std::random_shuffle( mPrecalculatedColors.begin(), mPrecalculatedColors.end() ); } -QString QgsRandomColorsV2::type() const +QString QgsRandomColors::type() const { return "randomcolors"; } -QgsRandomColorsV2* QgsRandomColorsV2::clone() const +QgsRandomColors* QgsRandomColors::clone() const { - return new QgsRandomColorsV2(); + return new QgsRandomColors(); } -QgsStringMap QgsRandomColorsV2::properties() const +QgsStringMap QgsRandomColors::properties() const { return QgsStringMap(); } //////////// -QgsVectorColorBrewerColorRampV2::QgsVectorColorBrewerColorRampV2( const QString& schemeName, int colors ) +QgsVectorColorBrewerColorRamp::QgsVectorColorBrewerColorRamp( const QString& schemeName, int colors ) : mSchemeName( schemeName ) , mColors( colors ) { loadPalette(); } -QgsVectorColorRampV2* QgsVectorColorBrewerColorRampV2::create( const QgsStringMap& props ) +QgsVectorColorRamp* QgsVectorColorBrewerColorRamp::create( const QgsStringMap& props ) { QString schemeName = DEFAULT_COLORBREWER_SCHEMENAME; int colors = DEFAULT_COLORBREWER_COLORS; @@ -487,31 +487,31 @@ QgsVectorColorRampV2* QgsVectorColorBrewerColorRampV2::create( const QgsStringMa if ( props.contains( "colors" ) ) colors = props["colors"].toInt(); - return new QgsVectorColorBrewerColorRampV2( schemeName, colors ); + return new QgsVectorColorBrewerColorRamp( schemeName, colors ); } -void QgsVectorColorBrewerColorRampV2::loadPalette() +void QgsVectorColorBrewerColorRamp::loadPalette() { mPalette = QgsColorBrewerPalette::listSchemeColors( mSchemeName, mColors ); } -QStringList QgsVectorColorBrewerColorRampV2::listSchemeNames() +QStringList QgsVectorColorBrewerColorRamp::listSchemeNames() { return QgsColorBrewerPalette::listSchemes(); } -QList QgsVectorColorBrewerColorRampV2::listSchemeVariants( const QString& schemeName ) +QList QgsVectorColorBrewerColorRamp::listSchemeVariants( const QString& schemeName ) { return QgsColorBrewerPalette::listSchemeVariants( schemeName ); } -double QgsVectorColorBrewerColorRampV2::value( int index ) const +double QgsVectorColorBrewerColorRamp::value( int index ) const { if ( mPalette.size() < 1 ) return 0; return static_cast< double >( index ) / ( mPalette.size() - 1 ); } -QColor QgsVectorColorBrewerColorRampV2::color( double value ) const +QColor QgsVectorColorBrewerColorRamp::color( double value ) const { if ( mPalette.isEmpty() || value < 0 || value > 1 ) return QColor(); @@ -522,12 +522,12 @@ QColor QgsVectorColorBrewerColorRampV2::color( double value ) const return mPalette.at( paletteEntry ); } -QgsVectorColorBrewerColorRampV2* QgsVectorColorBrewerColorRampV2::clone() const +QgsVectorColorBrewerColorRamp* QgsVectorColorBrewerColorRamp::clone() const { - return new QgsVectorColorBrewerColorRampV2( mSchemeName, mColors ); + return new QgsVectorColorBrewerColorRamp( mSchemeName, mColors ); } -QgsStringMap QgsVectorColorBrewerColorRampV2::properties() const +QgsStringMap QgsVectorColorBrewerColorRamp::properties() const { QgsStringMap map; map["schemeName"] = mSchemeName; @@ -539,9 +539,9 @@ QgsStringMap QgsVectorColorBrewerColorRampV2::properties() const //////////// -QgsCptCityColorRampV2::QgsCptCityColorRampV2( const QString& schemeName, const QString& variantName, +QgsCptCityColorRamp::QgsCptCityColorRamp( const QString& schemeName, const QString& variantName, bool doLoadFile ) - : QgsVectorGradientColorRampV2() + : QgsVectorGradientColorRamp() , mSchemeName( schemeName ), mVariantName( variantName ) , mVariantList( QStringList() ), mFileLoaded( false ), mMultiStops( false ) { @@ -551,9 +551,9 @@ QgsCptCityColorRampV2::QgsCptCityColorRampV2( const QString& schemeName, const Q loadFile(); } -QgsCptCityColorRampV2::QgsCptCityColorRampV2( const QString& schemeName, const QStringList& variantList, +QgsCptCityColorRamp::QgsCptCityColorRamp( const QString& schemeName, const QStringList& variantList, const QString& variantName, bool doLoadFile ) - : QgsVectorGradientColorRampV2() + : QgsVectorGradientColorRamp() , mSchemeName( schemeName ), mVariantName( variantName ) , mVariantList( variantList ), mFileLoaded( false ), mMultiStops( false ) { @@ -565,7 +565,7 @@ QgsCptCityColorRampV2::QgsCptCityColorRampV2( const QString& schemeName, const Q loadFile(); } -QgsVectorColorRampV2* QgsCptCityColorRampV2::create( const QgsStringMap& props ) +QgsVectorColorRamp* QgsCptCityColorRamp::create( const QgsStringMap& props ) { QString schemeName = DEFAULT_CPTCITY_SCHEMENAME; QString variantName = DEFAULT_CPTCITY_VARIANTNAME; @@ -575,17 +575,17 @@ QgsVectorColorRampV2* QgsCptCityColorRampV2::create( const QgsStringMap& props ) if ( props.contains( "variantName" ) ) variantName = props["variantName"]; - return new QgsCptCityColorRampV2( schemeName, variantName ); + return new QgsCptCityColorRamp( schemeName, variantName ); } -QgsCptCityColorRampV2* QgsCptCityColorRampV2::clone() const +QgsCptCityColorRamp* QgsCptCityColorRamp::clone() const { - QgsCptCityColorRampV2* ramp = new QgsCptCityColorRampV2( "", "", false ); + QgsCptCityColorRamp* ramp = new QgsCptCityColorRamp( "", "", false ); ramp->copy( this ); return ramp; } -void QgsCptCityColorRampV2::copy( const QgsCptCityColorRampV2* other ) +void QgsCptCityColorRamp::copy( const QgsCptCityColorRamp* other ) { if ( ! other ) return; @@ -599,10 +599,10 @@ void QgsCptCityColorRampV2::copy( const QgsCptCityColorRampV2* other ) mFileLoaded = other->mFileLoaded; } -QgsVectorGradientColorRampV2* QgsCptCityColorRampV2::cloneGradientRamp() const +QgsVectorGradientColorRamp* QgsCptCityColorRamp::cloneGradientRamp() const { - QgsVectorGradientColorRampV2* ramp = - new QgsVectorGradientColorRampV2( mColor1, mColor2, mDiscrete, mStops ); + QgsVectorGradientColorRamp* ramp = + new QgsVectorGradientColorRamp( mColor1, mColor2, mDiscrete, mStops ); // add author and copyright information // TODO also add COPYING.xml file/link? QgsStringMap info = copyingInfo(); @@ -615,7 +615,7 @@ QgsVectorGradientColorRampV2* QgsCptCityColorRampV2::cloneGradientRamp() const } -QgsStringMap QgsCptCityColorRampV2::properties() const +QgsStringMap QgsCptCityColorRamp::properties() const { QgsStringMap map; map["schemeName"] = mSchemeName; @@ -624,7 +624,7 @@ QgsStringMap QgsCptCityColorRampV2::properties() const } -QString QgsCptCityColorRampV2::fileName() const +QString QgsCptCityColorRamp::fileName() const { if ( mSchemeName == "" ) return QString(); @@ -634,24 +634,24 @@ QString QgsCptCityColorRampV2::fileName() const } } -QString QgsCptCityColorRampV2::copyingFileName() const +QString QgsCptCityColorRamp::copyingFileName() const { return QgsCptCityArchive::findFileName( "COPYING.xml", QFileInfo( fileName() ).dir().path(), QgsCptCityArchive::defaultBaseDir() ); } -QString QgsCptCityColorRampV2::descFileName() const +QString QgsCptCityColorRamp::descFileName() const { return QgsCptCityArchive::findFileName( "DESC.xml", QFileInfo( fileName() ).dir().path(), QgsCptCityArchive::defaultBaseDir() ); } -QgsStringMap QgsCptCityColorRampV2::copyingInfo() const +QgsStringMap QgsCptCityColorRamp::copyingInfo() const { return QgsCptCityArchive::copyingInfo( copyingFileName() ); } -bool QgsCptCityColorRampV2::loadFile() +bool QgsCptCityColorRamp::loadFile() { if ( mFileLoaded ) { diff --git a/src/core/symbology-ng/qgsvectorcolorrampv2.h b/src/core/symbology-ng/qgsvectorcolorramp.h similarity index 79% rename from src/core/symbology-ng/qgsvectorcolorrampv2.h rename to src/core/symbology-ng/qgsvectorcolorramp.h index 6be1e04167f..b9a21b03119 100644 --- a/src/core/symbology-ng/qgsvectorcolorrampv2.h +++ b/src/core/symbology-ng/qgsvectorcolorramp.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsvectorcolorrampv2.h + qgsvectorcolorramp.h --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -21,15 +21,15 @@ #include "qgis.h" /** \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 CORE_EXPORT QgsVectorColorRampV2 +class CORE_EXPORT QgsVectorColorRamp { public: - virtual ~QgsVectorColorRampV2() {} + virtual ~QgsVectorColorRamp() {} /** Returns number of defined colors, or -1 if undefined */ @@ -51,7 +51,7 @@ class CORE_EXPORT QgsVectorColorRampV2 /** Creates a clone of the color ramp. */ - virtual QgsVectorColorRampV2* clone() const = 0; + virtual QgsVectorColorRamp* clone() const = 0; /** Returns a string map containing all the color ramp's properties. */ @@ -93,35 +93,35 @@ typedef QList QgsGradientStopsList; #define DEFAULT_GRADIENT_COLOR2 QColor(0,255,0) /** \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 CORE_EXPORT QgsVectorGradientColorRampV2 : public QgsVectorColorRampV2 +class CORE_EXPORT QgsVectorGradientColorRamp : public QgsVectorColorRamp { 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, - const QColor& color2 = DEFAULT_GRADIENT_COLOR2, - bool discrete = false, - const QgsGradientStopsList& stops = QgsGradientStopsList() ); + QgsVectorGradientColorRamp( const QColor& color1 = DEFAULT_GRADIENT_COLOR1, + const QColor& color2 = DEFAULT_GRADIENT_COLOR2, + bool discrete = false, + const QgsGradientStopsList& stops = QgsGradientStopsList() ); - //! Creates a new QgsVectorColorRampV2 from a map of properties - static QgsVectorColorRampV2* create( const QgsStringMap& properties = QgsStringMap() ); + //! Creates a new QgsVectorColorRamp from a map of properties + static QgsVectorColorRamp* create( const QgsStringMap& properties = QgsStringMap() ); virtual int count() const override { return mStops.count() + 2; } virtual double value( int index ) const override; virtual QColor color( double value ) const override; virtual QString type() const override { return "gradient"; } - virtual QgsVectorGradientColorRampV2* clone() const override; + virtual QgsVectorGradientColorRamp* clone() const override; virtual QgsStringMap properties() const override; /** Returns the gradient start color. @@ -221,19 +221,19 @@ class CORE_EXPORT QgsVectorGradientColorRampV2 : public QgsVectorColorRampV2 #define DEFAULT_RANDOM_SAT_MAX 240 /** \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 CORE_EXPORT QgsVectorRandomColorRampV2 : public QgsVectorColorRampV2 +class CORE_EXPORT QgsVectorRandomColorRamp : public QgsVectorColorRamp { public: - QgsVectorRandomColorRampV2( 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 ); + 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() ); + static QgsVectorColorRamp* create( const QgsStringMap& properties = QgsStringMap() ); virtual double value( int index ) const override; @@ -241,7 +241,7 @@ class CORE_EXPORT QgsVectorRandomColorRampV2 : public QgsVectorColorRampV2 virtual QString type() const override { return "random"; } - virtual QgsVectorRandomColorRampV2* clone() const override; + virtual QgsVectorRandomColorRamp* clone() const override; virtual QgsStringMap properties() const override; @@ -278,13 +278,13 @@ class CORE_EXPORT QgsVectorRandomColorRampV2 : public QgsVectorColorRampV2 }; /** \ingroup core - * \class QgsRandomColorsV2 + * \class QgsRandomColors */ -class CORE_EXPORT QgsRandomColorsV2: public QgsVectorColorRampV2 +class CORE_EXPORT QgsRandomColors: public QgsVectorColorRamp { public: - QgsRandomColorsV2(); - ~QgsRandomColorsV2(); + QgsRandomColors(); + ~QgsRandomColors(); int count() const override; @@ -302,7 +302,7 @@ class CORE_EXPORT QgsRandomColorsV2: public QgsVectorColorRampV2 QString type() const override; - QgsRandomColorsV2* clone() const override; + QgsRandomColors* clone() const override; QgsStringMap properties() const override; @@ -318,15 +318,15 @@ class CORE_EXPORT QgsRandomColorsV2: public QgsVectorColorRampV2 #define DEFAULT_COLORBREWER_COLORS 5 /** \ingroup core - * \class QgsVectorColorBrewerColorRampV2 + * \class QgsVectorColorBrewerColorRamp */ -class CORE_EXPORT QgsVectorColorBrewerColorRampV2 : public QgsVectorColorRampV2 +class CORE_EXPORT QgsVectorColorBrewerColorRamp : public QgsVectorColorRamp { public: - QgsVectorColorBrewerColorRampV2( const QString& schemeName = DEFAULT_COLORBREWER_SCHEMENAME, - int colors = DEFAULT_COLORBREWER_COLORS ); + QgsVectorColorBrewerColorRamp( const QString& schemeName = DEFAULT_COLORBREWER_SCHEMENAME, + int colors = DEFAULT_COLORBREWER_COLORS ); - static QgsVectorColorRampV2* create( const QgsStringMap& properties = QgsStringMap() ); + static QgsVectorColorRamp* create( const QgsStringMap& properties = QgsStringMap() ); virtual double value( int index ) const override; @@ -334,7 +334,7 @@ class CORE_EXPORT QgsVectorColorBrewerColorRampV2 : public QgsVectorColorRampV2 virtual QString type() const override { return "colorbrewer"; } - virtual QgsVectorColorBrewerColorRampV2* clone() const override; + virtual QgsVectorColorBrewerColorRamp* clone() const override; virtual QgsStringMap properties() const override; @@ -362,24 +362,24 @@ class CORE_EXPORT QgsVectorColorBrewerColorRampV2 : public QgsVectorColorRampV2 #define DEFAULT_CPTCITY_VARIANTNAME "05" /** \ingroup core - * \class QgsCptCityColorRampV2 + * \class QgsCptCityColorRamp */ -class CORE_EXPORT QgsCptCityColorRampV2 : public QgsVectorGradientColorRampV2 +class CORE_EXPORT QgsCptCityColorRamp : public QgsVectorGradientColorRamp { public: - QgsCptCityColorRampV2( const QString& schemeName = DEFAULT_CPTCITY_SCHEMENAME, - const QString& variantName = DEFAULT_CPTCITY_VARIANTNAME, - bool doLoadFile = true ); - QgsCptCityColorRampV2( const QString& schemeName, const QStringList& variantList, - const QString& variantName = QString(), bool doLoadFile = true ); + QgsCptCityColorRamp( const QString& schemeName = DEFAULT_CPTCITY_SCHEMENAME, + const QString& variantName = DEFAULT_CPTCITY_VARIANTNAME, + bool doLoadFile = true ); + QgsCptCityColorRamp( const QString& schemeName, const QStringList& variantList, + const QString& variantName = QString(), bool doLoadFile = true ); - static QgsVectorColorRampV2* create( const QgsStringMap& properties = QgsStringMap() ); + static QgsVectorColorRamp* create( const QgsStringMap& properties = QgsStringMap() ); virtual QString type() const override { return "cpt-city"; } - virtual QgsCptCityColorRampV2* clone() const override; - void copy( const QgsCptCityColorRampV2* other ); - QgsVectorGradientColorRampV2* cloneGradientRamp() const; + virtual QgsCptCityColorRamp* clone() const override; + void copy( const QgsCptCityColorRamp* other ); + QgsVectorGradientColorRamp* cloneGradientRamp() const; virtual QgsStringMap properties() const override; diff --git a/src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp b/src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp index 80850c2d775..3477a15fbfa 100644 --- a/src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp +++ b/src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp @@ -31,7 +31,7 @@ QgsVectorFieldSymbolLayer::QgsVectorFieldSymbolLayer() , mXIndex( -1 ) , mYIndex( -1 ) { - setSubSymbol( new QgsLineSymbolV2() ); + setSubSymbol( new QgsLineSymbol() ); } QgsVectorFieldSymbolLayer::~QgsVectorFieldSymbolLayer() @@ -41,13 +41,13 @@ QgsVectorFieldSymbolLayer::~QgsVectorFieldSymbolLayer() void QgsVectorFieldSymbolLayer::setOutputUnit( QgsUnitTypes::RenderUnit unit ) { - QgsMarkerSymbolLayerV2::setOutputUnit( unit ); + QgsMarkerSymbolLayer::setOutputUnit( unit ); mDistanceUnit = unit; } QgsUnitTypes::RenderUnit QgsVectorFieldSymbolLayer::outputUnit() const { - if ( QgsMarkerSymbolLayerV2::outputUnit() == mDistanceUnit ) + if ( QgsMarkerSymbolLayer::outputUnit() == mDistanceUnit ) { return mDistanceUnit; } @@ -56,13 +56,13 @@ QgsUnitTypes::RenderUnit QgsVectorFieldSymbolLayer::outputUnit() const void QgsVectorFieldSymbolLayer::setMapUnitScale( const QgsMapUnitScale &scale ) { - QgsMarkerSymbolLayerV2::setMapUnitScale( scale ); + QgsMarkerSymbolLayer::setMapUnitScale( scale ); mDistanceMapUnitScale = scale; } QgsMapUnitScale QgsVectorFieldSymbolLayer::mapUnitScale() const { - if ( QgsMarkerSymbolLayerV2::mapUnitScale() == mDistanceMapUnitScale ) + if ( QgsMarkerSymbolLayer::mapUnitScale() == mDistanceMapUnitScale ) { return mDistanceMapUnitScale; } @@ -136,7 +136,7 @@ bool QgsVectorFieldSymbolLayer::setSubSymbol( QgsSymbol* symbol ) if ( symbol->type() == QgsSymbol::Line ) { delete mLineSymbol; - mLineSymbol = static_cast( symbol ); + mLineSymbol = static_cast( symbol ); return true; } return false; @@ -283,7 +283,7 @@ void QgsVectorFieldSymbolLayer::drawPreviewIcon( QgsSymbolRenderContext& context QSet QgsVectorFieldSymbolLayer::usedAttributes() const { - QSet attributes = QgsMarkerSymbolLayerV2::usedAttributes(); + QSet attributes = QgsMarkerSymbolLayer::usedAttributes(); if ( !mXAttribute.isEmpty() ) { attributes.insert( mXAttribute ); diff --git a/src/core/symbology-ng/qgsvectorfieldsymbollayer.h b/src/core/symbology-ng/qgsvectorfieldsymbollayer.h index 7cb52232f48..7c3c8879c16 100644 --- a/src/core/symbology-ng/qgsvectorfieldsymbollayer.h +++ b/src/core/symbology-ng/qgsvectorfieldsymbollayer.h @@ -22,7 +22,7 @@ /** \ingroup core * A symbol layer class for displaying displacement arrows based on point layer attributes*/ -class CORE_EXPORT QgsVectorFieldSymbolLayer: public QgsMarkerSymbolLayerV2 +class CORE_EXPORT QgsVectorFieldSymbolLayer: public QgsMarkerSymbolLayer { public: enum VectorFieldType @@ -115,7 +115,7 @@ class CORE_EXPORT QgsVectorFieldSymbolLayer: public QgsMarkerSymbolLayerV2 AngleOrientation mAngleOrientation; AngleUnits mAngleUnits; - QgsLineSymbolV2* mLineSymbol; + QgsLineSymbol* mLineSymbol; //Attribute indices are resolved in startRender method int mXIndex; diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 4a4c95dbf82..95e237f9658 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -15,37 +15,37 @@ SET(QGIS_GUI_SRCS symbology-ng/characterwidget.cpp symbology-ng/qgsarrowsymbollayerwidget.cpp symbology-ng/qgsbrushstylecombobox.cpp - symbology-ng/qgscategorizedsymbolrendererv2widget.cpp + symbology-ng/qgscategorizedsymbolrendererwidget.cpp symbology-ng/qgscolorrampcombobox.cpp - symbology-ng/qgscptcitycolorrampv2dialog.cpp + symbology-ng/qgscptcitycolorrampdialog.cpp symbology-ng/qgsdashspacedialog.cpp - symbology-ng/qgsellipsesymbollayerv2widget.cpp + symbology-ng/qgsellipsesymbollayerwidget.cpp symbology-ng/qgsgraduatedhistogramwidget.cpp - symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp + symbology-ng/qgsgraduatedsymbolrendererwidget.cpp symbology-ng/qgsheatmaprendererwidget.cpp symbology-ng/qgsinvertedpolygonrendererwidget.cpp symbology-ng/qgslayerpropertieswidget.cpp symbology-ng/qgsnullsymbolrendererwidget.cpp symbology-ng/qgspenstylecombobox.cpp symbology-ng/qgspointdisplacementrendererwidget.cpp - symbology-ng/qgsrendererv2propertiesdialog.cpp - symbology-ng/qgsrendererv2widget.cpp - symbology-ng/qgsrulebasedrendererv2widget.cpp - symbology-ng/qgssinglesymbolrendererv2widget.cpp + symbology-ng/qgsrendererpropertiesdialog.cpp + symbology-ng/qgsrendererwidget.cpp + symbology-ng/qgsrulebasedrendererwidget.cpp + symbology-ng/qgssinglesymbolrendererwidget.cpp symbology-ng/qgssizescalewidget.cpp symbology-ng/qgssmartgroupeditordialog.cpp - symbology-ng/qgsstylev2exportimportdialog.cpp - symbology-ng/qgsstylev2groupselectiondialog.cpp - symbology-ng/qgsstylev2managerdialog.cpp + symbology-ng/qgsstyleexportimportdialog.cpp + symbology-ng/qgsstylegroupselectiondialog.cpp + symbology-ng/qgsstylemanagerdialog.cpp symbology-ng/qgssvgselectorwidget.cpp symbology-ng/qgssymbollayerwidget.cpp symbology-ng/qgssymbollevelsdialog.cpp symbology-ng/qgssymbolslistwidget.cpp symbology-ng/qgssymbolselectordialog.cpp - symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp + symbology-ng/qgsvectorcolorbrewercolorrampdialog.cpp symbology-ng/qgsvectorfieldsymbollayerwidget.cpp - symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp - symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp + symbology-ng/qgsvectorgradientcolorrampdialog.cpp + symbology-ng/qgsvectorrandomcolorrampdialog.cpp effects/qgseffectdrawmodecombobox.cpp effects/qgseffectstackpropertieswidget.cpp @@ -465,37 +465,37 @@ SET(QGIS_GUI_MOC_HDRS symbology-ng/characterwidget.h symbology-ng/qgsarrowsymbollayerwidget.h symbology-ng/qgsbrushstylecombobox.h - symbology-ng/qgscategorizedsymbolrendererv2widget.h + symbology-ng/qgscategorizedsymbolrendererwidget.h symbology-ng/qgscolorrampcombobox.h - symbology-ng/qgscptcitycolorrampv2dialog.h + symbology-ng/qgscptcitycolorrampdialog.h symbology-ng/qgsdashspacedialog.h - symbology-ng/qgsellipsesymbollayerv2widget.h + symbology-ng/qgsellipsesymbollayerwidget.h symbology-ng/qgsgraduatedhistogramwidget.h - symbology-ng/qgsgraduatedsymbolrendererv2widget.h + symbology-ng/qgsgraduatedsymbolrendererwidget.h symbology-ng/qgsheatmaprendererwidget.h symbology-ng/qgsinvertedpolygonrendererwidget.h symbology-ng/qgslayerpropertieswidget.h symbology-ng/qgsnullsymbolrendererwidget.h symbology-ng/qgspenstylecombobox.h symbology-ng/qgspointdisplacementrendererwidget.h - symbology-ng/qgsrendererv2propertiesdialog.h - symbology-ng/qgsrendererv2widget.h - symbology-ng/qgsrulebasedrendererv2widget.h - symbology-ng/qgssinglesymbolrendererv2widget.h + symbology-ng/qgsrendererpropertiesdialog.h + symbology-ng/qgsrendererwidget.h + symbology-ng/qgsrulebasedrendererwidget.h + symbology-ng/qgssinglesymbolrendererwidget.h symbology-ng/qgssizescalewidget.h symbology-ng/qgssmartgroupeditordialog.h - symbology-ng/qgsstylev2exportimportdialog.h - symbology-ng/qgsstylev2groupselectiondialog.h - symbology-ng/qgsstylev2managerdialog.h + symbology-ng/qgsstyleexportimportdialog.h + symbology-ng/qgsstylegroupselectiondialog.h + symbology-ng/qgsstylemanagerdialog.h symbology-ng/qgssvgselectorwidget.h symbology-ng/qgssymbollayerwidget.h symbology-ng/qgssymbollevelsdialog.h symbology-ng/qgssymbolslistwidget.h symbology-ng/qgssymbolselectordialog.h - symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.h + symbology-ng/qgsvectorcolorbrewercolorrampdialog.h symbology-ng/qgsvectorfieldsymbollayerwidget.h - symbology-ng/qgsvectorgradientcolorrampv2dialog.h - symbology-ng/qgsvectorrandomcolorrampv2dialog.h + symbology-ng/qgsvectorgradientcolorrampdialog.h + symbology-ng/qgsvectorrandomcolorrampdialog.h attributetable/qgsattributetabledelegate.h attributetable/qgsattributetablefiltermodel.h diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp index bc977101c02..0842c76d293 100644 --- a/src/gui/attributetable/qgsattributetablefiltermodel.cpp +++ b/src/gui/attributetable/qgsattributetablefiltermodel.cpp @@ -23,7 +23,7 @@ #include "qgsfeature.h" #include "qgsmapcanvas.h" #include "qgslogger.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgsvectorlayereditbuffer.h" ////////////////// // Filter Model // @@ -394,7 +394,7 @@ void QgsAttributeTableFilterModel::generateListOfVisibleFeatures() renderContext.expressionContext() << QgsExpressionContextUtils::globalScope() << QgsExpressionContextUtils::projectScope() << QgsExpressionContextUtils::layerScope( layer() ); - QgsFeatureRendererV2* renderer = layer()->rendererV2(); + QgsFeatureRenderer* renderer = layer()->renderer(); mFilteredFeatures.clear(); @@ -411,7 +411,7 @@ void QgsAttributeTableFilterModel::generateListOfVisibleFeatures() } else { - if ( renderer && renderer->capabilities() & QgsFeatureRendererV2::ScaleDependent ) + if ( renderer && renderer->capabilities() & QgsFeatureRenderer::ScaleDependent ) { // setup scale // mapRenderer()->renderContext()->scale is not automaticaly updated when @@ -422,7 +422,7 @@ void QgsAttributeTableFilterModel::generateListOfVisibleFeatures() renderContext.setRendererScale( ms.scale() ); } - filter = renderer && renderer->capabilities() & QgsFeatureRendererV2::Filter; + filter = renderer && renderer->capabilities() & QgsFeatureRenderer::Filter; } renderer->startRender( renderContext, layer()->fields() ); @@ -462,7 +462,7 @@ void QgsAttributeTableFilterModel::generateListOfVisibleFeatures() features.close(); - if ( renderer && renderer->capabilities() & QgsFeatureRendererV2::ScaleDependent ) + if ( renderer && renderer->capabilities() & QgsFeatureRenderer::ScaleDependent ) { renderer->stopRender( renderContext ); } diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp index 22b5810dca3..0f09ead5453 100644 --- a/src/gui/attributetable/qgsattributetablemodel.cpp +++ b/src/gui/attributetable/qgsattributetablemodel.cpp @@ -28,7 +28,7 @@ #include "qgsmapcanvas.h" #include "qgsmaplayeractionregistry.h" #include "qgsmaplayerregistry.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgsvectorlayer.h" #include "qgsvectordataprovider.h" #include "qgssymbollayerutils.h" diff --git a/src/gui/attributetable/qgsfieldconditionalformatwidget.cpp b/src/gui/attributetable/qgsfieldconditionalformatwidget.cpp index 6ee2e244a4e..7370087b3c6 100644 --- a/src/gui/attributetable/qgsfieldconditionalformatwidget.cpp +++ b/src/gui/attributetable/qgsfieldconditionalformatwidget.cpp @@ -18,7 +18,7 @@ #include "qgssymbol.h" #include "qgssymbolselectordialog.h" #include "qgssymbollayerutils.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgsvectorlayer.h" QgsFieldConditionalFormatWidget::QgsFieldConditionalFormatWidget( QWidget *parent ) @@ -62,7 +62,7 @@ void QgsFieldConditionalFormatWidget::updateIcon() { mSymbol = QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ); - QgsSymbolSelectorDialog dlg( mSymbol, QgsStyleV2::defaultStyle(), nullptr, this ); + QgsSymbolSelectorDialog dlg( mSymbol, QgsStyle::defaultStyle(), nullptr, this ); if ( !dlg.exec() ) { return; diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp index c3651cb18a1..e4adcd70c63 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp +++ b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp @@ -16,7 +16,6 @@ #include "qgseditorwidgetregistry.h" #include "qgsattributeeditorcontext.h" -#include "qgslegacyhelpers.h" #include "qgsmessagelog.h" #include "qgsproject.h" #include "qgsvectorlayer.h" @@ -226,22 +225,9 @@ void QgsEditorWidgetRegistry::readMapLayer( QgsMapLayer* mapLayer, const QDomEle if ( idx == -1 ) continue; - bool hasLegacyType; - QgsVectorLayer::EditType editType = - ( QgsVectorLayer::EditType ) editTypeElement.attribute( "type" ).toInt( &hasLegacyType ); - - QString ewv2Type; + QString ewv2Type = editTypeElement.attribute( "widgetv2type" ); QgsEditorWidgetConfig cfg; - if ( hasLegacyType && editType != QgsVectorLayer::EditorWidgetV2 ) - { - Q_NOWARN_DEPRECATED_PUSH - ewv2Type = readLegacyConfig( vectorLayer, editTypeElement, cfg ); - Q_NOWARN_DEPRECATED_POP - } - else - ewv2Type = editTypeElement.attribute( "widgetv2type" ); - if ( mWidgetFactories.contains( ewv2Type ) ) { vectorLayer->editFormConfig()->setWidgetType( idx, ewv2Type ); @@ -267,17 +253,6 @@ void QgsEditorWidgetRegistry::readMapLayer( QgsMapLayer* mapLayer, const QDomEle } } -const QString QgsEditorWidgetRegistry::readLegacyConfig( QgsVectorLayer* vl, const QDomElement& editTypeElement, QgsEditorWidgetConfig& cfg ) -{ - QString name = editTypeElement.attribute( "name" ); - - QgsVectorLayer::EditType editType = ( QgsVectorLayer::EditType ) editTypeElement.attribute( "type" ).toInt(); - - Q_NOWARN_DEPRECATED_PUSH - return QgsLegacyHelpers::convertEditType( editType, cfg, vl, name, editTypeElement ); - Q_NOWARN_DEPRECATED_POP -} - void QgsEditorWidgetRegistry::writeMapLayer( QgsMapLayer* mapLayer, QDomElement& layerElem, QDomDocument& doc ) const { if ( mapLayer->type() != QgsMapLayer::VectorLayer ) diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h index b05406d7605..bf22d8c117e 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h +++ b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h @@ -152,17 +152,6 @@ class GUI_EXPORT QgsEditorWidgetRegistry : public QObject */ void readMapLayer( QgsMapLayer* mapLayer, const QDomElement& layerElem ); - /** - * Read all old-style editor widget configuration from a map node. Will update - * a project file to the new version on next save - * @param vl The layer in question - * @param layerElem The layer element from the project file - * @param cfg Writable config element - * - * @deprecated - */ - Q_DECL_DEPRECATED const QString readLegacyConfig( QgsVectorLayer* vl, const QDomElement& layerElem, QgsEditorWidgetConfig& cfg ); - /** * Write all the widget config to a layer XML node * diff --git a/src/gui/editorwidgets/qgsclassificationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsclassificationwidgetwrapper.cpp index c5952d291ee..95a1c2ff85f 100644 --- a/src/gui/editorwidgets/qgsclassificationwidgetwrapper.cpp +++ b/src/gui/editorwidgets/qgsclassificationwidgetwrapper.cpp @@ -15,7 +15,7 @@ #include "qgsclassificationwidgetwrapper.h" -#include "qgscategorizedsymbolrendererv2.h" +#include "qgscategorizedsymbolrenderer.h" #include "qgsvectorlayer.h" QgsClassificationWidgetWrapper::QgsClassificationWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) @@ -45,7 +45,7 @@ void QgsClassificationWidgetWrapper::initWidget( QWidget* editor ) if ( mComboBox ) { - const QgsCategorizedSymbolRendererV2 *csr = dynamic_cast( layer()->rendererV2() ); + const QgsCategorizedSymbolRenderer *csr = dynamic_cast( layer()->renderer() ); if ( csr ) { const QgsCategoryList categories = csr->categories(); diff --git a/src/gui/effects/qgspainteffectwidget.cpp b/src/gui/effects/qgspainteffectwidget.cpp index 38c8ce32471..66bb575b22a 100644 --- a/src/gui/effects/qgspainteffectwidget.cpp +++ b/src/gui/effects/qgspainteffectwidget.cpp @@ -22,8 +22,8 @@ #include "qgsgloweffect.h" #include "qgstransformeffect.h" #include "qgscoloreffect.h" -#include "qgsstylev2.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsstyle.h" +#include "qgsvectorcolorramp.h" // // draw source @@ -421,7 +421,7 @@ QgsGlowWidget::QgsGlowWidget( QWidget *parent ) mSpreadUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderPixels << QgsUnitTypes::RenderMapUnits ); - mRampComboBox->populate( QgsStyleV2::defaultStyle() ); + mRampComboBox->populate( QgsStyle::defaultStyle() ); mRampComboBox->setShowGradientOnly( true ); connect( mRampComboBox, SIGNAL( currentIndexChanged( int ) ), this, SLOT( applyColorRamp() ) ); connect( mRampComboBox, SIGNAL( sourceRampEdited() ), this, SLOT( applyColorRamp() ) ); @@ -594,7 +594,7 @@ void QgsGlowWidget::applyColorRamp() return; } - QgsVectorColorRampV2* ramp = mRampComboBox->currentColorRamp(); + QgsVectorColorRamp* ramp = mRampComboBox->currentColorRamp(); if ( !ramp ) return; diff --git a/src/gui/qgsadvanceddigitizingdockwidget.cpp b/src/gui/qgsadvanceddigitizingdockwidget.cpp index 35c05a55278..5b74aec3e96 100644 --- a/src/gui/qgsadvanceddigitizingdockwidget.cpp +++ b/src/gui/qgsadvanceddigitizingdockwidget.cpp @@ -28,7 +28,7 @@ #include "qgsmaptooladvanceddigitizing.h" #include "qgsmessagebaritem.h" #include "qgspoint.h" -#include "qgslinestringv2.h" +#include "qgslinestring.h" #include "qgsfocuswatcher.h" struct EdgesOnlyFilter : public QgsPointLocator::MatchFilter diff --git a/src/gui/qgsannotationitem.cpp b/src/gui/qgsannotationitem.cpp index f703673b3bf..637aa516b72 100644 --- a/src/gui/qgsannotationitem.cpp +++ b/src/gui/qgsannotationitem.cpp @@ -31,7 +31,7 @@ QgsAnnotationItem::QgsAnnotationItem( QgsMapCanvas* mapCanvas ) , mBalloonSegment( -1 ) { setFlag( QGraphicsItem::ItemIsSelectable, true ); - mMarkerSymbol = new QgsMarkerSymbolV2(); + mMarkerSymbol = new QgsMarkerSymbol(); mFrameBorderWidth = 1.0; mFrameColor = QColor( 0, 0, 0 ); mFrameBackgroundColor = QColor( 255, 255, 255 ); @@ -43,7 +43,7 @@ QgsAnnotationItem::~QgsAnnotationItem() delete mMarkerSymbol; } -void QgsAnnotationItem::setMarkerSymbol( QgsMarkerSymbolV2* symbol ) +void QgsAnnotationItem::setMarkerSymbol( QgsMarkerSymbol* symbol ) { delete mMarkerSymbol; mMarkerSymbol = symbol; @@ -479,7 +479,7 @@ void QgsAnnotationItem::_readXml( const QDomDocument& doc, const QDomElement& an QDomElement symbolElem = annotationElem.firstChildElement( "symbol" ); if ( !symbolElem.isNull() ) { - QgsMarkerSymbolV2* symbol = QgsSymbolLayerUtils::loadSymbol( symbolElem ); + QgsMarkerSymbol* symbol = QgsSymbolLayerUtils::loadSymbol( symbolElem ); if ( symbol ) { delete mMarkerSymbol; diff --git a/src/gui/qgsannotationitem.h b/src/gui/qgsannotationitem.h index 149ec89733e..d5daa251d71 100644 --- a/src/gui/qgsannotationitem.h +++ b/src/gui/qgsannotationitem.h @@ -26,7 +26,7 @@ class QDomDocument; class QDomElement; class QDialog; class QgsVectorLayer; -class QgsMarkerSymbolV2; +class QgsMarkerSymbol; /** \ingroup gui * An annotation item can be either placed either on screen corrdinates or on map coordinates. @@ -91,8 +91,8 @@ class GUI_EXPORT QgsAnnotationItem: public QgsMapCanvasItem, public QgsAnnotatio QPointF offsetFromReferencePoint() const { return mOffsetFromReferencePoint; } /** Set symbol that is drawn on map position. Takes ownership*/ - void setMarkerSymbol( QgsMarkerSymbolV2* symbol ); - const QgsMarkerSymbolV2* markerSymbol() const {return mMarkerSymbol;} + void setMarkerSymbol( QgsMarkerSymbol* symbol ); + const QgsMarkerSymbol* markerSymbol() const {return mMarkerSymbol;} void setFrameBorderWidth( double w ) { mFrameBorderWidth = w; } double frameBorderWidth() const { return mFrameBorderWidth; } @@ -132,7 +132,7 @@ class GUI_EXPORT QgsAnnotationItem: public QgsMapCanvasItem, public QgsAnnotatio QRectF mBoundingRect; /** Point symbol that is to be drawn at the map reference location*/ - QgsMarkerSymbolV2* mMarkerSymbol; + QgsMarkerSymbol* mMarkerSymbol; /** Width of the frame*/ double mFrameBorderWidth; /** Frame / balloon color*/ diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp index e9c68076846..5ae68afccd3 100644 --- a/src/gui/qgsattributedialog.cpp +++ b/src/gui/qgsattributedialog.cpp @@ -117,7 +117,7 @@ void QgsAttributeDialog::init( QgsVectorLayer* layer, QgsFeature* feature, const QDialogButtonBox* buttonBox = mAttributeForm->findChild(); connect( buttonBox, SIGNAL( rejected() ), this, SLOT( reject() ) ); connect( buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) ); - connect( layer, SIGNAL( layerDeleted() ), this, SLOT( close() ) ); + connect( layer, SIGNAL( destroyed() ), this, SLOT( close() ) ); QgsActionMenu* menu = new QgsActionMenu( layer, &mAttributeForm->feature(), this ); if ( !menu->actions().isEmpty() ) diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp index 2548761010c..7e3b34f0c5f 100644 --- a/src/gui/qgscomposerview.cpp +++ b/src/gui/qgscomposerview.cpp @@ -555,7 +555,7 @@ void QgsComposerView::addShape( Tool currentTool ) QgsComposerShape* composerShape = new QgsComposerShape( mRubberBandItem->transform().dx(), mRubberBandItem->transform().dy(), mRubberBandItem->rect().width(), mRubberBandItem->rect().height(), composition() ); composerShape->setShapeType( shape ); //new shapes use symbol v2 by default - composerShape->setUseSymbolV2( true ); + composerShape->setUseSymbol( true ); composition()->addComposerShape( composerShape ); removeRubberBand(); diff --git a/src/gui/qgsfieldmodel.cpp b/src/gui/qgsfieldmodel.cpp index 13362245771..6623689de06 100644 --- a/src/gui/qgsfieldmodel.cpp +++ b/src/gui/qgsfieldmodel.cpp @@ -74,7 +74,7 @@ void QgsFieldModel::setLayer( QgsVectorLayer *layer ) if ( mLayer ) { disconnect( mLayer, SIGNAL( updatedFields() ), this, SLOT( updateModel() ) ); - disconnect( mLayer, SIGNAL( layerDeleted() ), this, SLOT( layerDeleted() ) ); + disconnect( mLayer, SIGNAL( destroyed() ), this, SLOT( layerDeleted() ) ); } mLayer = layer; @@ -82,7 +82,7 @@ void QgsFieldModel::setLayer( QgsVectorLayer *layer ) if ( mLayer ) { connect( mLayer, SIGNAL( updatedFields() ), this, SLOT( updateModel() ) ); - connect( mLayer, SIGNAL( layerDeleted() ), this, SLOT( layerDeleted() ) ); + connect( mLayer, SIGNAL( destroyed() ), this, SLOT( layerDeleted() ) ); } updateModel(); diff --git a/src/gui/qgsgeometryrubberband.cpp b/src/gui/qgsgeometryrubberband.cpp index fe4ff256d9b..6e84d264418 100644 --- a/src/gui/qgsgeometryrubberband.cpp +++ b/src/gui/qgsgeometryrubberband.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include "qgsgeometryrubberband.h" -#include "qgsabstractgeometryv2.h" +#include "qgsabstractgeometry.h" #include "qgsmapcanvas.h" #include "qgspointv2.h" #include @@ -54,7 +54,7 @@ void QgsGeometryRubberBand::paint( QPainter* painter ) painter->setPen( mPen ); - QgsAbstractGeometryV2* paintGeom = mGeometry->clone(); + QgsAbstractGeometry* paintGeom = mGeometry->clone(); paintGeom->transform( mMapCanvas->getCoordinateTransform()->transform() ); paintGeom->draw( *painter ); @@ -107,7 +107,7 @@ void QgsGeometryRubberBand::drawVertex( QPainter* p, double x, double y ) } } -void QgsGeometryRubberBand::setGeometry( QgsAbstractGeometryV2* geom ) +void QgsGeometryRubberBand::setGeometry( QgsAbstractGeometry* geom ) { delete mGeometry; mGeometry = geom; diff --git a/src/gui/qgsgeometryrubberband.h b/src/gui/qgsgeometryrubberband.h index 5500734ec7c..f09e6a501ca 100644 --- a/src/gui/qgsgeometryrubberband.h +++ b/src/gui/qgsgeometryrubberband.h @@ -23,12 +23,12 @@ #include -class QgsAbstractGeometryV2; +class QgsAbstractGeometry; class QgsPointV2; struct QgsVertexId; /** \ingroup gui - * A rubberband class for QgsAbstractGeometryV2 (considering curved geometries)*/ + * A rubberband class for QgsAbstractGeometry (considering curved geometries)*/ class GUI_EXPORT QgsGeometryRubberBand: public QgsMapCanvasItem { public: @@ -64,9 +64,9 @@ class GUI_EXPORT QgsGeometryRubberBand: public 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() { return mGeometry; } + const QgsAbstractGeometry* geometry() { return mGeometry; } /** Moves vertex to new position (in map coordinates)*/ void moveVertex( QgsVertexId id, const QgsPointV2& newPos ); /** Sets fill color for vertex markers*/ @@ -86,7 +86,7 @@ class GUI_EXPORT QgsGeometryRubberBand: public QgsMapCanvasItem virtual void paint( QPainter* painter ) override; private: - QgsAbstractGeometryV2* mGeometry; + QgsAbstractGeometry* mGeometry; QBrush mBrush; QPen mPen; int mIconSize; diff --git a/src/gui/qgsgradientstopeditor.cpp b/src/gui/qgsgradientstopeditor.cpp index d4ce8268f31..7fdedad887f 100644 --- a/src/gui/qgsgradientstopeditor.cpp +++ b/src/gui/qgsgradientstopeditor.cpp @@ -29,7 +29,7 @@ #define FRAME_MARGIN 2 #define CLICK_THRESHOLD ( MARKER_WIDTH / 2 + 3 ) -QgsGradientStopEditor::QgsGradientStopEditor( QWidget *parent, QgsVectorGradientColorRampV2 *ramp ) +QgsGradientStopEditor::QgsGradientStopEditor( QWidget *parent, QgsVectorGradientColorRamp *ramp ) : QWidget( parent ) , mSelectedStop( 0 ) { @@ -58,7 +58,7 @@ QgsGradientStopEditor::QgsGradientStopEditor( QWidget *parent, QgsVectorGradient setAcceptDrops( true ); } -void QgsGradientStopEditor::setGradientRamp( const QgsVectorGradientColorRampV2 &ramp ) +void QgsGradientStopEditor::setGradientRamp( const QgsVectorGradientColorRamp &ramp ) { mGradient = ramp; mStops = mGradient.stops(); diff --git a/src/gui/qgsgradientstopeditor.h b/src/gui/qgsgradientstopeditor.h index d5c79f575c1..baeccd5b825 100644 --- a/src/gui/qgsgradientstopeditor.h +++ b/src/gui/qgsgradientstopeditor.h @@ -16,7 +16,7 @@ #ifndef QGSGRADIENTSTOPEDITOR_H #define QGSGRADIENTSTOPEDITOR_H -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include @@ -37,18 +37,18 @@ class GUI_EXPORT QgsGradientStopEditor : public QWidget * @param parent parent widget * @param ramp optional initial gradient ramp */ - QgsGradientStopEditor( QWidget* parent = nullptr, QgsVectorGradientColorRampV2* ramp = nullptr ); + QgsGradientStopEditor( QWidget* parent = 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 { return mGradient; } + QgsVectorGradientColorRamp gradientRamp() const { return mGradient; } /** Sets the currently selected stop. * @param index index of stop, where 0 corresponds to the first stop @@ -160,7 +160,7 @@ class GUI_EXPORT QgsGradientStopEditor : public QWidget //! Returns the closest stop to a mouse x position, or -1 if no stops within tolerance int findClosestStop( int x, int threshold = -1 ) const; - QgsVectorGradientColorRampV2 mGradient; + QgsVectorGradientColorRamp mGradient; //! We keep a separate, unordered copy of the gradient stops so that the selected stop is not changed. QgsGradientStopsList mStops; diff --git a/src/gui/qgshighlight.cpp b/src/gui/qgshighlight.cpp index 1f8680b2f8a..467882b1cbc 100644 --- a/src/gui/qgshighlight.cpp +++ b/src/gui/qgshighlight.cpp @@ -15,11 +15,11 @@ #include -#include "qgsmarkersymbollayerv2.h" -#include "qgslinesymbollayerv2.h" +#include "qgsmarkersymbollayer.h" +#include "qgslinesymbollayer.h" #include "qgscoordinatetransform.h" -#include "qgsfillsymbollayerv2.h" +#include "qgsfillsymbollayer.h" #include "qgsgeometry.h" #include "qgshighlight.h" #include "qgsmapcanvas.h" @@ -28,7 +28,7 @@ #include "qgssymbollayer.h" #include "qgssymbol.h" #include "qgsvectorlayer.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" /* Few notes about highlighting (RB): - The highlight fill must always be partially transparent because above highlighted layer @@ -127,13 +127,13 @@ void QgsHighlight::setFillColor( const QColor & fillColor ) mBrush.setStyle( Qt::SolidPattern ); } -QgsFeatureRendererV2 * QgsHighlight::getRenderer( QgsRenderContext & context, const QColor & color, const QColor & fillColor ) +QgsFeatureRenderer * QgsHighlight::getRenderer( QgsRenderContext & context, const QColor & color, const QColor & fillColor ) { - QgsFeatureRendererV2 *renderer = nullptr; + QgsFeatureRenderer *renderer = nullptr; QgsVectorLayer *layer = qobject_cast( mLayer ); - if ( layer && layer->rendererV2() ) + if ( layer && layer->renderer() ) { - renderer = layer->rendererV2()->clone(); + renderer = layer->renderer()->clone(); } if ( renderer ) { @@ -167,17 +167,17 @@ void QgsHighlight::setSymbol( QgsSymbol* symbol, const QgsRenderContext & contex symbolLayer->setFillColor( fillColor ); // marker and fill symbology layers // Data defined widths overwrite what we set here (widths do not work with data defined) - QgsSimpleMarkerSymbolLayerV2 * simpleMarker = dynamic_cast( symbolLayer ); + QgsSimpleMarkerSymbolLayer * simpleMarker = dynamic_cast( symbolLayer ); if ( simpleMarker ) { simpleMarker->setOutlineWidth( getSymbolWidth( context, simpleMarker->outlineWidth(), simpleMarker->outlineWidthUnit() ) ); } - QgsSimpleLineSymbolLayerV2 * simpleLine = dynamic_cast( symbolLayer ); + QgsSimpleLineSymbolLayer * simpleLine = dynamic_cast( symbolLayer ); if ( simpleLine ) { simpleLine->setWidth( getSymbolWidth( context, simpleLine->width(), simpleLine->widthUnit() ) ); } - QgsSimpleFillSymbolLayerV2 * simpleFill = dynamic_cast( symbolLayer ); + QgsSimpleFillSymbolLayer * simpleFill = dynamic_cast( symbolLayer ); if ( simpleFill ) { simpleFill->setBorderWidth( getSymbolWidth( context, simpleFill->borderWidth(), simpleFill->outputUnit() ) ); @@ -358,7 +358,7 @@ void QgsHighlight::paint( QPainter* p ) QColor tmpColor( 255, 0, 0, 255 ); QColor tmpFillColor( 0, 255, 0, 255 ); - QgsFeatureRendererV2 *renderer = getRenderer( context, tmpColor, tmpFillColor ); + QgsFeatureRenderer *renderer = getRenderer( context, tmpColor, tmpFillColor ); if ( layer && renderer ) { @@ -424,7 +424,7 @@ void QgsHighlight::updateRect() else if ( mFeature.hasGeometry() ) { // We are currently using full map canvas extent for two reasons: - // 1) currently there is no method in QgsFeatureRendererV2 to get rendered feature + // 1) currently there is no method in QgsFeatureRenderer to get rendered feature // bounding box // 2) using different extent would result in shifted fill patterns diff --git a/src/gui/qgshighlight.h b/src/gui/qgshighlight.h index 34a3c51140c..a19846a7f35 100644 --- a/src/gui/qgshighlight.h +++ b/src/gui/qgshighlight.h @@ -93,7 +93,7 @@ class GUI_EXPORT QgsHighlight: public QgsMapCanvasItem void setSymbol( QgsSymbol* symbol, const QgsRenderContext & context, const QColor & color, const QColor & fillColor ); double getSymbolWidth( const QgsRenderContext & context, double width, QgsUnitTypes::RenderUnit unit ); /** Get renderer for current color mode and colors. The renderer should be freed by caller. */ - QgsFeatureRendererV2 * getRenderer( QgsRenderContext &context, const QColor & color, const QColor & fillColor ); + QgsFeatureRenderer * getRenderer( QgsRenderContext &context, const QColor & color, const QColor & fillColor ); void paintPoint( QPainter *p, const QgsPoint& point ); void paintLine( QPainter *p, QgsPolyline line ); void paintPolygon( QPainter *p, QgsPolygon polygon ); diff --git a/src/gui/qgshistogramwidget.cpp b/src/gui/qgshistogramwidget.cpp index 34361352b0b..b125b22a0a9 100644 --- a/src/gui/qgshistogramwidget.cpp +++ b/src/gui/qgshistogramwidget.cpp @@ -90,7 +90,7 @@ QgsHistogramWidget::~QgsHistogramWidget() settings.setValue( "/HistogramWidget/showStdev", mStdevCheckBox->isChecked() ); } -static bool _rangesByLower( const QgsRendererRangeV2& a, const QgsRendererRangeV2& b ) +static bool _rangesByLower( const QgsRendererRange& a, const QgsRendererRange& b ) { return a.lowerValue() < b.lowerValue() ? -1 : 0; } @@ -208,7 +208,7 @@ void QgsHistogramWidget::drawHistogram() // make colors list mHistoColors.clear(); - Q_FOREACH ( const QgsRendererRangeV2& range, mRanges ) + Q_FOREACH ( const QgsRendererRange& range, mRanges ) { mHistoColors << ( range.symbol() ? range.symbol()->color() : Qt::black ); } @@ -285,7 +285,7 @@ void QgsHistogramWidget::drawHistogram() #endif mRangeMarkers.clear(); - Q_FOREACH ( const QgsRendererRangeV2& range, mRanges ) + Q_FOREACH ( const QgsRendererRange& range, mRanges ) { QwtPlotMarker* rangeMarker = new QwtPlotMarker(); rangeMarker->attach( mpPlot ); diff --git a/src/gui/qgshistogramwidget.h b/src/gui/qgshistogramwidget.h index 6906d28a08a..40471e7b8a4 100644 --- a/src/gui/qgshistogramwidget.h +++ b/src/gui/qgshistogramwidget.h @@ -21,12 +21,12 @@ #include "qgshistogram.h" #include "qgsstatisticalsummary.h" -#include "qgsgraduatedsymbolrendererv2.h" +#include "qgsgraduatedsymbolrenderer.h" #include #include class QgsVectorLayer; -class QgsGraduatedSymbolRendererV2; +class QgsGraduatedSymbolRenderer; class QwtPlotPicker; class QwtPlotMarker; class QwtPlot; diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp index 32db9a804f3..747670bbc98 100644 --- a/src/gui/qgsmapcanvas.cpp +++ b/src/gui/qgsmapcanvas.cpp @@ -147,7 +147,7 @@ QgsMapCanvas::QgsMapCanvas( QWidget * parent ) //segmentation parameters QSettings settings; double segmentationTolerance = settings.value( "/qgis/segmentationTolerance", "0.01745" ).toDouble(); - QgsAbstractGeometryV2::SegmentationToleranceType toleranceType = QgsAbstractGeometryV2::SegmentationToleranceType( settings.value( "/qgis/segmentationToleranceType", 0 ).toInt() ); + QgsAbstractGeometry::SegmentationToleranceType toleranceType = QgsAbstractGeometry::SegmentationToleranceType( settings.value( "/qgis/segmentationToleranceType", 0 ).toInt() ); mSettings.setSegmentationTolerance( segmentationTolerance ); mSettings.setSegmentationToleranceType( toleranceType ); @@ -2051,7 +2051,7 @@ void QgsMapCanvas::setSegmentationTolerance( double tolerance ) mSettings.setSegmentationTolerance( tolerance ); } -void QgsMapCanvas::setSegmentationToleranceType( QgsAbstractGeometryV2::SegmentationToleranceType type ) +void QgsMapCanvas::setSegmentationToleranceType( QgsAbstractGeometry::SegmentationToleranceType type ) { mSettings.setSegmentationToleranceType( type ); } diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h index 5055fd265dd..54ae4af82f0 100644 --- a/src/gui/qgsmapcanvas.h +++ b/src/gui/qgsmapcanvas.h @@ -427,7 +427,7 @@ class GUI_EXPORT QgsMapCanvas : public 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: diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp index 4c3d9af0350..abc6bef0391 100644 --- a/src/gui/qgsmaptoolcapture.cpp +++ b/src/gui/qgsmaptoolcapture.cpp @@ -20,12 +20,12 @@ #include "qgsfeatureiterator.h" #include "qgsgeometryvalidator.h" #include "qgslayertreeview.h" -#include "qgslinestringv2.h" +#include "qgslinestring.h" #include "qgslogger.h" #include "qgsmapcanvas.h" #include "qgsmapcanvastracer.h" #include "qgsmapmouseevent.h" -#include "qgspolygonv2.h" +#include "qgspolygon.h" #include "qgsrubberband.h" #include "qgsvectorlayer.h" #include "qgsvertexmarker.h" @@ -235,7 +235,7 @@ bool QgsMapToolCapture::tracingAddVertex( const QgsPoint& point ) return false; // ignore the vertex - can't find path to the end point! // transform points - QgsPointSequenceV2 layerPoints; + QgsPointSequence layerPoints; QgsPointV2 lp; // in layer coords for ( int i = 1; i < points.count(); ++i ) { @@ -468,7 +468,7 @@ int QgsMapToolCapture::addVertex( const QgsPoint& point, QgsPointLocator::Match return 0; } -int QgsMapToolCapture::addCurve( QgsCurveV2* c ) +int QgsMapToolCapture::addCurve( QgsCurve* c ) { if ( !c ) { @@ -480,11 +480,11 @@ int QgsMapToolCapture::addCurve( QgsCurveV2* c ) mRubberBand = createRubberBand( mCaptureMode == CapturePolygon ? QgsWkbTypes::PolygonGeometry : QgsWkbTypes::LineGeometry ); } - QgsLineStringV2* lineString = c->curveToLine(); - QgsPointSequenceV2 linePoints; + QgsLineString* lineString = c->curveToLine(); + QgsPointSequence linePoints; lineString->points( linePoints ); delete lineString; - QgsPointSequenceV2::const_iterator ptIt = linePoints.constBegin(); + QgsPointSequence::const_iterator ptIt = linePoints.constBegin(); for ( ; ptIt != linePoints.constEnd(); ++ptIt ) { mRubberBand->addPoint( QgsPoint( ptIt->x(), ptIt->y() ) ); @@ -667,7 +667,7 @@ void QgsMapToolCapture::validateGeometry() case CapturePolygon: if ( size() < 3 ) return; - QgsLineStringV2* exteriorRing = mCaptureCurve.curveToLine(); + QgsLineString* exteriorRing = mCaptureCurve.curveToLine(); exteriorRing->close(); QgsPolygonV2* polygon = new QgsPolygonV2(); polygon->setExteriorRing( exteriorRing ); @@ -717,7 +717,7 @@ int QgsMapToolCapture::size() QList QgsMapToolCapture::points() { - QgsPointSequenceV2 pts; + QgsPointSequence pts; QList points; mCaptureCurve.points( pts ); QgsGeometry::convertPointList( pts, points ); @@ -726,10 +726,10 @@ QList QgsMapToolCapture::points() void QgsMapToolCapture::setPoints( const QList& pointList ) { - QgsPointSequenceV2 pts; + QgsPointSequence pts; QgsGeometry::convertPointList( pointList, pts ); - QgsLineStringV2* line = new QgsLineStringV2(); + QgsLineString* line = new QgsLineString(); line->setPoints( pts ); mCaptureCurve.clear(); diff --git a/src/gui/qgsmaptoolcapture.h b/src/gui/qgsmaptoolcapture.h index baa17e57e33..ee8c3a92316 100644 --- a/src/gui/qgsmaptoolcapture.h +++ b/src/gui/qgsmaptoolcapture.h @@ -18,7 +18,7 @@ #include "qgsmaptooladvanceddigitizing.h" -#include "qgscompoundcurvev2.h" +#include "qgscompoundcurve.h" #include "qgsgeometry.h" #include @@ -50,14 +50,14 @@ class GUI_EXPORT QgsMapToolCapture : public QgsMapToolAdvancedDigitizing virtual void deactivate() override; /** 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 { return &mCaptureCurve; } + const QgsCompoundCurve* captureCurve() const { return &mCaptureCurve; } /** @@ -224,7 +224,7 @@ class GUI_EXPORT QgsMapToolCapture : public QgsMapToolAdvancedDigitizing QgsRubberBand* mTempRubberBand; /** List to store the points of digitised lines and polygons (in layer coordinates)*/ - QgsCompoundCurveV2 mCaptureCurve; + QgsCompoundCurve mCaptureCurve; void validateGeometry(); QStringList mValidationWarnings; diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp index 2682f856358..1fc68648930 100644 --- a/src/gui/qgsmaptoolidentify.cpp +++ b/src/gui/qgsmaptoolidentify.cpp @@ -36,10 +36,10 @@ #include "qgsvectorlayer.h" #include "qgsproject.h" #include "qgsmaplayerregistry.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgsgeometryutils.h" -#include "qgsgeometrycollectionv2.h" -#include "qgscurvev2.h" +#include "qgsgeometrycollection.h" +#include "qgscurve.h" #include "qgscoordinateutils.h" #include "qgscsexception.h" @@ -254,12 +254,12 @@ bool QgsMapToolIdentify::identifyVectorLayer( QList *results, Qg QgsRenderContext context( QgsRenderContext::fromMapSettings( mCanvas->mapSettings() ) ); context.expressionContext() << QgsExpressionContextUtils::layerScope( layer ); - QgsFeatureRendererV2* renderer = layer->rendererV2(); - if ( renderer && renderer->capabilities() & QgsFeatureRendererV2::ScaleDependent ) + QgsFeatureRenderer* renderer = layer->renderer(); + if ( renderer && renderer->capabilities() & QgsFeatureRenderer::ScaleDependent ) { // setup scale for scale dependent visibility (rule based) renderer->startRender( context, layer->fields() ); - filter = renderer->capabilities() & QgsFeatureRendererV2::Filter; + filter = renderer->capabilities() & QgsFeatureRenderer::Filter; } for ( ; f_it != featureList.end(); ++f_it ) @@ -281,7 +281,7 @@ bool QgsMapToolIdentify::identifyVectorLayer( QList *results, Qg results->append( IdentifyResult( qobject_cast( layer ), *f_it, derivedAttributes ) ); } - if ( renderer && renderer->capabilities() & QgsFeatureRendererV2::ScaleDependent ) + if ( renderer && renderer->capabilities() & QgsFeatureRenderer::ScaleDependent ) { renderer->stopRender( context ); } @@ -292,7 +292,7 @@ bool QgsMapToolIdentify::identifyVectorLayer( QList *results, Qg return featureCount > 0; } -void QgsMapToolIdentify::closestVertexAttributes( const QgsAbstractGeometryV2& geometry, QgsVertexId vId, QgsMapLayer *layer, QMap< QString, QString >& derivedAttributes ) +void QgsMapToolIdentify::closestVertexAttributes( const QgsAbstractGeometry& geometry, QgsVertexId vId, QgsMapLayer *layer, QMap< QString, QString >& derivedAttributes ) { QString str = QLocale::system().toString( vId.vertex + 1 ); derivedAttributes.insert( tr( "Closest vertex number" ), str ); @@ -373,7 +373,7 @@ QMap< QString, QString > QgsMapToolIdentify::featureDerivedAttributes( QgsFeatur if ( QgsWkbTypes::isMultiType( wkbType ) ) { - QString str = QLocale::system().toString( static_cast( feature->geometry().geometry() )->numGeometries() ); + QString str = QLocale::system().toString( static_cast( feature->geometry().geometry() )->numGeometries() ); derivedAttributes.insert( tr( "Parts" ), str ); str = QLocale::system().toString( vId.part + 1 ); derivedAttributes.insert( tr( "Part number" ), str ); @@ -386,7 +386,7 @@ QMap< QString, QString > QgsMapToolIdentify::featureDerivedAttributes( QgsFeatur QString str = formatDistance( dist ); derivedAttributes.insert( tr( "Length" ), str ); - const QgsCurveV2* curve = dynamic_cast< const QgsCurveV2* >( feature->geometry().geometry() ); + const QgsCurve* curve = dynamic_cast< const QgsCurve* >( feature->geometry().geometry() ); if ( curve ) { str = QLocale::system().toString( curve->nCoordinates() ); diff --git a/src/gui/qgsmaptoolidentify.h b/src/gui/qgsmaptoolidentify.h index aad40cbe92e..e8ff57ecc36 100644 --- a/src/gui/qgsmaptoolidentify.h +++ b/src/gui/qgsmaptoolidentify.h @@ -187,7 +187,7 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool /** Adds details of the closest vertex to derived attributes */ - void closestVertexAttributes( const QgsAbstractGeometryV2& geometry, QgsVertexId vId, QgsMapLayer *layer, QMap< QString, QString >& derivedAttributes ); + void closestVertexAttributes( const QgsAbstractGeometry& geometry, QgsVertexId vId, QgsMapLayer *layer, QMap< QString, QString >& derivedAttributes ); QString formatCoordinate( const QgsPoint& canvasPoint ) const; QString formatXCoordinate( const QgsPoint& canvasPoint ) const; diff --git a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp index c35f8f5ea1e..39694c2fde4 100644 --- a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp +++ b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp @@ -24,8 +24,8 @@ #include "qgstreewidgetitem.h" // for color ramps - todo add rasterStyle and refactor raster vs. vector ramps -#include "qgsstylev2.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsstyle.h" +#include "qgsvectorcolorramp.h" #include "qgscolordialog.h" #include @@ -46,7 +46,7 @@ QgsSingleBandPseudoColorRendererWidget::QgsSingleBandPseudoColorRendererWidget( QString defaultPalette = settings.value( "/Raster/defaultPalette", "Spectral" ).toString(); - mColorRampComboBox->populate( QgsStyleV2::defaultStyle() ); + mColorRampComboBox->populate( QgsStyle::defaultStyle() ); QgsDebugMsg( "defaultPalette = " + defaultPalette ); mColorRampComboBox->setCurrentIndex( mColorRampComboBox->findText( defaultPalette ) ); @@ -331,7 +331,7 @@ void QgsSingleBandPseudoColorRendererWidget::on_mClassifyButton_clicked() double min = lineEditValue( mMinLineEdit ); double max = lineEditValue( mMaxLineEdit ); - QScopedPointer< QgsVectorColorRampV2 > colorRamp( mColorRampComboBox->currentColorRamp() ); + QScopedPointer< QgsVectorColorRamp > colorRamp( mColorRampComboBox->currentColorRamp() ); if ( mClassificationModeComboBox->itemData( mClassificationModeComboBox->currentIndex() ).toInt() == Continuous ) { @@ -344,7 +344,7 @@ void QgsSingleBandPseudoColorRendererWidget::on_mClassifyButton_clicked() double intervalDiff = max - min; // remove last class when ColorRamp is gradient and discrete, as they are implemented with an extra stop - QgsVectorGradientColorRampV2* colorGradientRamp = dynamic_cast( colorRamp.data() ); + QgsVectorGradientColorRamp* colorGradientRamp = dynamic_cast( colorRamp.data() ); if ( colorGradientRamp != NULL && colorGradientRamp->isDiscrete() ) { numberOfEntries--; @@ -514,7 +514,7 @@ void QgsSingleBandPseudoColorRendererWidget::on_mColorRampComboBox_currentIndexC QSettings settings; settings.setValue( "/Raster/defaultPalette", mColorRampComboBox->currentText() ); - QgsVectorColorRampV2* ramp = mColorRampComboBox->currentColorRamp(); + QgsVectorColorRamp* ramp = mColorRampComboBox->currentColorRamp(); if ( !ramp ) return; diff --git a/src/gui/symbology-ng/qgs25drendererwidget.cpp b/src/gui/symbology-ng/qgs25drendererwidget.cpp index 5a3b223bcc9..defbe821740 100644 --- a/src/gui/symbology-ng/qgs25drendererwidget.cpp +++ b/src/gui/symbology-ng/qgs25drendererwidget.cpp @@ -18,8 +18,8 @@ #include "qgsvectorlayer.h" #include "qgsmaplayerstylemanager.h" -Qgs25DRendererWidget::Qgs25DRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) - : QgsRendererV2Widget( layer, style ) +Qgs25DRendererWidget::Qgs25DRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) + : QgsRendererWidget( layer, style ) , mRenderer( nullptr ) { if ( !layer ) @@ -80,7 +80,7 @@ Qgs25DRendererWidget::Qgs25DRendererWidget( QgsVectorLayer* layer, QgsStyleV2* s connect( mWallExpositionShading, SIGNAL( toggled( bool ) ), this, SLOT( updateRenderer() ) ); } -QgsFeatureRendererV2* Qgs25DRendererWidget::renderer() +QgsFeatureRenderer* Qgs25DRendererWidget::renderer() { return mRenderer; } @@ -107,7 +107,7 @@ void Qgs25DRendererWidget::apply() } } -QgsRendererV2Widget* Qgs25DRendererWidget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) +QgsRendererWidget* Qgs25DRendererWidget::create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) { return new Qgs25DRendererWidget( layer, style, renderer ); } diff --git a/src/gui/symbology-ng/qgs25drendererwidget.h b/src/gui/symbology-ng/qgs25drendererwidget.h index 9d00235774b..f6b34799455 100644 --- a/src/gui/symbology-ng/qgs25drendererwidget.h +++ b/src/gui/symbology-ng/qgs25drendererwidget.h @@ -17,14 +17,14 @@ #define QGS25DRENDERERWIDGET_H #include "ui_qgs25drendererwidgetbase.h" -#include "qgsrendererv2widget.h" +#include "qgsrendererwidget.h" class Qgs25DRenderer; /** \ingroup gui * \class Qgs25DRendererWidget */ -class GUI_EXPORT Qgs25DRendererWidget : public QgsRendererV2Widget, Ui::Qgs25DRendererWidgetBase +class GUI_EXPORT Qgs25DRendererWidget : public QgsRendererWidget, Ui::Qgs25DRendererWidgetBase { Q_OBJECT @@ -34,16 +34,16 @@ class GUI_EXPORT Qgs25DRendererWidget : public QgsRendererV2Widget, Ui::Qgs25DRe * @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() override; + QgsFeatureRenderer* renderer() override; private slots: void updateRenderer(); diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp similarity index 80% rename from src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp rename to src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp index 23c7d6cd073..4480bbbed26 100644 --- a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp +++ b/src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgscategorizedsymbolrendererv2widget.cpp + qgscategorizedsymbolrendererwidget.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -13,15 +13,15 @@ * * ***************************************************************************/ -#include "qgscategorizedsymbolrendererv2widget.h" +#include "qgscategorizedsymbolrendererwidget.h" #include "qgspanelwidget.h" -#include "qgscategorizedsymbolrendererv2.h" +#include "qgscategorizedsymbolrenderer.h" #include "qgssymbol.h" #include "qgssymbollayerutils.h" -#include "qgsvectorcolorrampv2.h" -#include "qgsstylev2.h" +#include "qgsvectorcolorramp.h" +#include "qgsstyle.h" #include "qgssymbolselectordialog.h" #include "qgsexpressionbuilderdialog.h" @@ -44,13 +44,13 @@ ///@cond PRIVATE -QgsCategorizedSymbolRendererV2Model::QgsCategorizedSymbolRendererV2Model( QObject * parent ) : QAbstractItemModel( parent ) +QgsCategorizedSymbolRendererModel::QgsCategorizedSymbolRendererModel( QObject * parent ) : QAbstractItemModel( parent ) , mRenderer( nullptr ) , mMimeFormat( "application/x-qgscategorizedsymbolrendererv2model" ) { } -void QgsCategorizedSymbolRendererV2Model::setRenderer( QgsCategorizedSymbolRendererV2* renderer ) +void QgsCategorizedSymbolRendererModel::setRenderer( QgsCategorizedSymbolRenderer* renderer ) { if ( mRenderer ) { @@ -66,7 +66,7 @@ void QgsCategorizedSymbolRendererV2Model::setRenderer( QgsCategorizedSymbolRende } } -void QgsCategorizedSymbolRendererV2Model::addCategory( const QgsRendererCategoryV2 &cat ) +void QgsCategorizedSymbolRendererModel::addCategory( const QgsRendererCategory &cat ) { if ( !mRenderer ) return; int idx = mRenderer->categories().size(); @@ -75,23 +75,23 @@ void QgsCategorizedSymbolRendererV2Model::addCategory( const QgsRendererCategory endInsertRows(); } -QgsRendererCategoryV2 QgsCategorizedSymbolRendererV2Model::category( const QModelIndex &index ) +QgsRendererCategory QgsCategorizedSymbolRendererModel::category( const QModelIndex &index ) { if ( !mRenderer ) { - return QgsRendererCategoryV2(); + return QgsRendererCategory(); } const QgsCategoryList& catList = mRenderer->categories(); int row = index.row(); if ( row >= catList.size() ) { - return QgsRendererCategoryV2(); + return QgsRendererCategory(); } return catList.at( row ); } -Qt::ItemFlags QgsCategorizedSymbolRendererV2Model::flags( const QModelIndex & index ) const +Qt::ItemFlags QgsCategorizedSymbolRendererModel::flags( const QModelIndex & index ) const { if ( !index.isValid() ) { @@ -106,17 +106,17 @@ Qt::ItemFlags QgsCategorizedSymbolRendererV2Model::flags( const QModelIndex & in return flags; } -Qt::DropActions QgsCategorizedSymbolRendererV2Model::supportedDropActions() const +Qt::DropActions QgsCategorizedSymbolRendererModel::supportedDropActions() const { return Qt::MoveAction; } -QVariant QgsCategorizedSymbolRendererV2Model::data( const QModelIndex &index, int role ) const +QVariant QgsCategorizedSymbolRendererModel::data( const QModelIndex &index, int role ) const { if ( !index.isValid() || !mRenderer ) return QVariant(); - const QgsRendererCategoryV2 category = mRenderer->categories().value( index.row() ); + const QgsRendererCategory category = mRenderer->categories().value( index.row() ); if ( role == Qt::CheckStateRole && index.column() == 0 ) { @@ -158,7 +158,7 @@ QVariant QgsCategorizedSymbolRendererV2Model::data( const QModelIndex &index, in return QVariant(); } -bool QgsCategorizedSymbolRendererV2Model::setData( const QModelIndex & index, const QVariant & value, int role ) +bool QgsCategorizedSymbolRendererModel::setData( const QModelIndex & index, const QVariant & value, int role ) { if ( !index.isValid() ) return false; @@ -205,7 +205,7 @@ bool QgsCategorizedSymbolRendererV2Model::setData( const QModelIndex & index, co return true; } -QVariant QgsCategorizedSymbolRendererV2Model::headerData( int section, Qt::Orientation orientation, int role ) const +QVariant QgsCategorizedSymbolRendererModel::headerData( int section, Qt::Orientation orientation, int role ) const { if ( orientation == Qt::Horizontal && role == Qt::DisplayRole && section >= 0 && section < 3 ) { @@ -216,7 +216,7 @@ QVariant QgsCategorizedSymbolRendererV2Model::headerData( int section, Qt::Orien return QVariant(); } -int QgsCategorizedSymbolRendererV2Model::rowCount( const QModelIndex &parent ) const +int QgsCategorizedSymbolRendererModel::rowCount( const QModelIndex &parent ) const { if ( parent.isValid() || !mRenderer ) { @@ -225,13 +225,13 @@ int QgsCategorizedSymbolRendererV2Model::rowCount( const QModelIndex &parent ) c return mRenderer->categories().size(); } -int QgsCategorizedSymbolRendererV2Model::columnCount( const QModelIndex & index ) const +int QgsCategorizedSymbolRendererModel::columnCount( const QModelIndex & index ) const { Q_UNUSED( index ); return 3; } -QModelIndex QgsCategorizedSymbolRendererV2Model::index( int row, int column, const QModelIndex &parent ) const +QModelIndex QgsCategorizedSymbolRendererModel::index( int row, int column, const QModelIndex &parent ) const { if ( hasIndex( row, column, parent ) ) { @@ -240,20 +240,20 @@ QModelIndex QgsCategorizedSymbolRendererV2Model::index( int row, int column, con return QModelIndex(); } -QModelIndex QgsCategorizedSymbolRendererV2Model::parent( const QModelIndex &index ) const +QModelIndex QgsCategorizedSymbolRendererModel::parent( const QModelIndex &index ) const { Q_UNUSED( index ); return QModelIndex(); } -QStringList QgsCategorizedSymbolRendererV2Model::mimeTypes() const +QStringList QgsCategorizedSymbolRendererModel::mimeTypes() const { QStringList types; types << mMimeFormat; return types; } -QMimeData *QgsCategorizedSymbolRendererV2Model::mimeData( const QModelIndexList &indexes ) const +QMimeData *QgsCategorizedSymbolRendererModel::mimeData( const QModelIndexList &indexes ) const { QMimeData *mimeData = new QMimeData(); QByteArray encodedData; @@ -272,7 +272,7 @@ QMimeData *QgsCategorizedSymbolRendererV2Model::mimeData( const QModelIndexList return mimeData; } -bool QgsCategorizedSymbolRendererV2Model::dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent ) +bool QgsCategorizedSymbolRendererModel::dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent ) { Q_UNUSED( row ); Q_UNUSED( column ); @@ -315,7 +315,7 @@ bool QgsCategorizedSymbolRendererV2Model::dropMimeData( const QMimeData *data, Q return false; } -void QgsCategorizedSymbolRendererV2Model::deleteRows( QList rows ) +void QgsCategorizedSymbolRendererModel::deleteRows( QList rows ) { qSort( rows ); // list might be unsorted, depending on how the user selected the rows for ( int i = rows.size() - 1; i >= 0; i-- ) @@ -326,14 +326,14 @@ void QgsCategorizedSymbolRendererV2Model::deleteRows( QList rows ) } } -void QgsCategorizedSymbolRendererV2Model::removeAllRows() +void QgsCategorizedSymbolRendererModel::removeAllRows() { beginRemoveRows( QModelIndex(), 0, mRenderer->categories().size() - 1 ); mRenderer->deleteAllCategories(); endRemoveRows(); } -void QgsCategorizedSymbolRendererV2Model::sort( int column, Qt::SortOrder order ) +void QgsCategorizedSymbolRendererModel::sort( int column, Qt::SortOrder order ) { if ( column == 0 ) { @@ -351,17 +351,17 @@ void QgsCategorizedSymbolRendererV2Model::sort( int column, Qt::SortOrder order QgsDebugMsg( "Done" ); } -void QgsCategorizedSymbolRendererV2Model::updateSymbology() +void QgsCategorizedSymbolRendererModel::updateSymbology() { emit dataChanged( createIndex( 0, 0 ), createIndex( mRenderer->categories().size(), 0 ) ); } // ------------------------------ View style -------------------------------- -QgsCategorizedSymbolRendererV2ViewStyle::QgsCategorizedSymbolRendererV2ViewStyle( QStyle* style ) +QgsCategorizedSymbolRendererViewStyle::QgsCategorizedSymbolRendererViewStyle( QStyle* style ) : QProxyStyle( style ) {} -void QgsCategorizedSymbolRendererV2ViewStyle::drawPrimitive( PrimitiveElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget ) const +void QgsCategorizedSymbolRendererViewStyle::drawPrimitive( PrimitiveElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget ) const { if ( element == QStyle::PE_IndicatorItemViewItemDrop && !option->rect.isNull() ) { @@ -379,14 +379,14 @@ void QgsCategorizedSymbolRendererV2ViewStyle::drawPrimitive( PrimitiveElement el ///@endcond // ------------------------------ Widget ------------------------------------ -QgsRendererV2Widget* QgsCategorizedSymbolRendererV2Widget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) +QgsRendererWidget* QgsCategorizedSymbolRendererWidget::create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) { - return new QgsCategorizedSymbolRendererV2Widget( layer, style, renderer ); + return new QgsCategorizedSymbolRendererWidget( layer, style, renderer ); } static QgsExpressionContext _getExpressionContext( const void* context ) { - const QgsCategorizedSymbolRendererV2Widget* widget = ( const QgsCategorizedSymbolRendererV2Widget* ) context; + const QgsCategorizedSymbolRendererWidget* widget = ( const QgsCategorizedSymbolRendererWidget* ) context; QgsExpressionContext expContext; expContext << QgsExpressionContextUtils::globalScope() @@ -409,8 +409,8 @@ static QgsExpressionContext _getExpressionContext( const void* context ) return expContext; } -QgsCategorizedSymbolRendererV2Widget::QgsCategorizedSymbolRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) - : QgsRendererV2Widget( layer, style ) +QgsCategorizedSymbolRendererWidget::QgsCategorizedSymbolRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) + : QgsRendererWidget( layer, style ) , mRenderer( nullptr ) , mModel( nullptr ) { @@ -419,11 +419,11 @@ QgsCategorizedSymbolRendererV2Widget::QgsCategorizedSymbolRendererV2Widget( QgsV // (null renderer means "no previous renderer") if ( renderer ) { - mRenderer = QgsCategorizedSymbolRendererV2::convertFromRenderer( renderer ); + mRenderer = QgsCategorizedSymbolRenderer::convertFromRenderer( renderer ); } if ( !mRenderer ) { - mRenderer = new QgsCategorizedSymbolRendererV2( "", QgsCategoryList() ); + mRenderer = new QgsCategorizedSymbolRenderer( "", QgsCategoryList() ); } QString attrName = mRenderer->classAttribute(); @@ -453,7 +453,7 @@ QgsCategorizedSymbolRendererV2Widget::QgsCategorizedSymbolRendererV2Widget( QgsV mCategorizedSymbol = QgsSymbol::defaultSymbol( mLayer->geometryType() ); - mModel = new QgsCategorizedSymbolRendererV2Model( this ); + mModel = new QgsCategorizedSymbolRendererModel( this ); mModel->setRenderer( mRenderer ); // update GUI from renderer @@ -464,7 +464,7 @@ QgsCategorizedSymbolRendererV2Widget::QgsCategorizedSymbolRendererV2Widget( QgsV viewCategories->resizeColumnToContents( 1 ); viewCategories->resizeColumnToContents( 2 ); - viewCategories->setStyle( new QgsCategorizedSymbolRendererV2ViewStyle( viewCategories->style() ) ); + viewCategories->setStyle( new QgsCategorizedSymbolRendererViewStyle( viewCategories->style() ) ); connect( mModel, SIGNAL( rowsMoved() ), this, SLOT( rowsMoved() ) ); connect( mModel, SIGNAL( dataChanged( QModelIndex, QModelIndex ) ), this, SIGNAL( widgetChanged() ) ); @@ -496,14 +496,14 @@ QgsCategorizedSymbolRendererV2Widget::QgsCategorizedSymbolRendererV2Widget( QgsV mExpressionWidget->registerGetExpressionContextCallback( &_getExpressionContext, this ); } -QgsCategorizedSymbolRendererV2Widget::~QgsCategorizedSymbolRendererV2Widget() +QgsCategorizedSymbolRendererWidget::~QgsCategorizedSymbolRendererWidget() { delete mRenderer; delete mModel; delete mCategorizedSymbol; } -void QgsCategorizedSymbolRendererV2Widget::updateUiFromRenderer() +void QgsCategorizedSymbolRendererWidget::updateUiFromRenderer() { // Note: This assumes that the signals for UI element changes have not // yet been connected, so that the updates to color ramp, symbol, etc @@ -538,12 +538,12 @@ void QgsCategorizedSymbolRendererV2Widget::updateUiFromRenderer() mButtonEditRamp->setEnabled( true ); } -QgsFeatureRendererV2* QgsCategorizedSymbolRendererV2Widget::renderer() +QgsFeatureRenderer* QgsCategorizedSymbolRendererWidget::renderer() { return mRenderer; } -void QgsCategorizedSymbolRendererV2Widget::changeSelectedSymbols() +void QgsCategorizedSymbolRendererWidget::changeSelectedSymbols() { QList selectedCats = selectedCategories(); @@ -560,7 +560,7 @@ void QgsCategorizedSymbolRendererV2Widget::changeSelectedSymbols() Q_FOREACH ( int idx, selectedCats ) { - QgsRendererCategoryV2 category = mRenderer->categories().value( idx ); + QgsRendererCategory category = mRenderer->categories().value( idx ); QgsSymbol* newCatSymbol = newSymbol->clone(); newCatSymbol->setColor( mRenderer->categories()[idx].symbol()->color() ); @@ -569,7 +569,7 @@ void QgsCategorizedSymbolRendererV2Widget::changeSelectedSymbols() } } -void QgsCategorizedSymbolRendererV2Widget::changeCategorizedSymbol() +void QgsCategorizedSymbolRendererWidget::changeCategorizedSymbol() { QgsSymbol* newSymbol = mCategorizedSymbol->clone(); QgsSymbolSelectorWidget* dlg = new QgsSymbolSelectorWidget( newSymbol, mStyle, mLayer, nullptr ); @@ -581,31 +581,31 @@ void QgsCategorizedSymbolRendererV2Widget::changeCategorizedSymbol() openPanel( dlg ); } -void QgsCategorizedSymbolRendererV2Widget::updateCategorizedSymbolIcon() +void QgsCategorizedSymbolRendererWidget::updateCategorizedSymbolIcon() { QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( mCategorizedSymbol, btnChangeCategorizedSymbol->iconSize() ); btnChangeCategorizedSymbol->setIcon( icon ); } -void QgsCategorizedSymbolRendererV2Widget::populateCategories() +void QgsCategorizedSymbolRendererWidget::populateCategories() { } -void QgsCategorizedSymbolRendererV2Widget::categoryColumnChanged( const QString& field ) +void QgsCategorizedSymbolRendererWidget::categoryColumnChanged( const QString& field ) { mRenderer->setClassAttribute( field ); emit widgetChanged(); } -void QgsCategorizedSymbolRendererV2Widget::categoriesDoubleClicked( const QModelIndex & idx ) +void QgsCategorizedSymbolRendererWidget::categoriesDoubleClicked( const QModelIndex & idx ) { if ( idx.isValid() && idx.column() == 0 ) changeCategorySymbol(); } -void QgsCategorizedSymbolRendererV2Widget::changeCategorySymbol() +void QgsCategorizedSymbolRendererWidget::changeCategorySymbol() { - QgsRendererCategoryV2 category = mRenderer->categories().value( currentCategoryRow() ); + QgsRendererCategory category = mRenderer->categories().value( currentCategoryRow() ); QgsSymbol *symbol = category.symbol(); if ( symbol ) @@ -643,20 +643,20 @@ static void _createCategories( QgsCategoryList& cats, QList& values, Q } QgsSymbol* newSymbol = symbol->clone(); - cats.append( QgsRendererCategoryV2( value, newSymbol, value.toString(), true ) ); + cats.append( QgsRendererCategory( value, newSymbol, value.toString(), true ) ); } // add null (default) value if not exists if ( !hasNull ) { QgsSymbol* newSymbol = symbol->clone(); - cats.append( QgsRendererCategoryV2( QVariant( "" ), newSymbol, QString(), true ) ); + cats.append( QgsRendererCategory( QVariant( "" ), newSymbol, QString(), true ) ); } } -QgsVectorColorRampV2* QgsCategorizedSymbolRendererV2Widget::getColorRamp() +QgsVectorColorRamp* QgsCategorizedSymbolRendererWidget::getColorRamp() { - QgsVectorColorRampV2* ramp = cboCategorizedColorRamp->currentColorRamp(); + QgsVectorColorRamp* ramp = cboCategorizedColorRamp->currentColorRamp(); if ( !ramp ) { if ( cboCategorizedColorRamp->count() == 0 ) @@ -668,7 +668,7 @@ QgsVectorColorRampV2* QgsCategorizedSymbolRendererV2Widget::getColorRamp() } -void QgsCategorizedSymbolRendererV2Widget::addCategories() +void QgsCategorizedSymbolRendererWidget::addCategories() { QString attrName = mExpressionWidget->currentField(); int idx = mLayer->fieldNameIndex( attrName ); @@ -783,12 +783,12 @@ void QgsCategorizedSymbolRendererV2Widget::addCategories() */ // recreate renderer - QgsCategorizedSymbolRendererV2 *r = new QgsCategorizedSymbolRendererV2( attrName, cats ); + QgsCategorizedSymbolRenderer *r = new QgsCategorizedSymbolRenderer( attrName, cats ); r->setSourceSymbol( mCategorizedSymbol->clone() ); r->setScaleMethod( mRenderer->scaleMethod() ); r->setSizeScaleField( mRenderer->sizeScaleField() ); r->setInvertedColorRamp( cbxInvertedColorRamp->isChecked() ); - QgsVectorColorRampV2* ramp = getColorRamp(); + QgsVectorColorRamp* ramp = getColorRamp(); if ( ramp ) r->setSourceColorRamp( ramp->clone() ); if ( mModel ) @@ -802,14 +802,14 @@ void QgsCategorizedSymbolRendererV2Widget::addCategories() emit widgetChanged(); } -void QgsCategorizedSymbolRendererV2Widget::applyColorRamp() +void QgsCategorizedSymbolRendererWidget::applyColorRamp() { if ( cboCategorizedColorRamp->currentText() == tr( "Random colors" ) ) mButtonEditRamp->setEnabled( false ); else mButtonEditRamp->setEnabled( true ); - QgsVectorColorRampV2* ramp = getColorRamp(); + QgsVectorColorRamp* ramp = getColorRamp(); if ( ramp ) { mRenderer->updateColorRamp( ramp, cbxInvertedColorRamp->isChecked() ); @@ -817,7 +817,7 @@ void QgsCategorizedSymbolRendererV2Widget::applyColorRamp() mModel->updateSymbology(); } -int QgsCategorizedSymbolRendererV2Widget::currentCategoryRow() +int QgsCategorizedSymbolRendererWidget::currentCategoryRow() { QModelIndex idx = viewCategories->selectionModel()->currentIndex(); if ( !idx.isValid() ) @@ -825,7 +825,7 @@ int QgsCategorizedSymbolRendererV2Widget::currentCategoryRow() return idx.row(); } -QList QgsCategorizedSymbolRendererV2Widget::selectedCategories() +QList QgsCategorizedSymbolRendererWidget::selectedCategories() { QList rows; QModelIndexList selectedRows = viewCategories->selectionModel()->selectedRows(); @@ -840,41 +840,41 @@ QList QgsCategorizedSymbolRendererV2Widget::selectedCategories() return rows; } -void QgsCategorizedSymbolRendererV2Widget::deleteCategories() +void QgsCategorizedSymbolRendererWidget::deleteCategories() { QList categoryIndexes = selectedCategories(); mModel->deleteRows( categoryIndexes ); emit widgetChanged(); } -void QgsCategorizedSymbolRendererV2Widget::deleteAllCategories() +void QgsCategorizedSymbolRendererWidget::deleteAllCategories() { mModel->removeAllRows(); emit widgetChanged(); } -void QgsCategorizedSymbolRendererV2Widget::addCategory() +void QgsCategorizedSymbolRendererWidget::addCategory() { if ( !mModel ) return; QgsSymbol *symbol = QgsSymbol::defaultSymbol( mLayer->geometryType() ); - QgsRendererCategoryV2 cat( QString(), symbol, QString(), true ); + QgsRendererCategory cat( QString(), symbol, QString(), true ); mModel->addCategory( cat ); emit widgetChanged(); } -void QgsCategorizedSymbolRendererV2Widget::sizeScaleFieldChanged( const QString& fldName ) +void QgsCategorizedSymbolRendererWidget::sizeScaleFieldChanged( const QString& fldName ) { mRenderer->setSizeScaleField( fldName ); emit widgetChanged(); } -void QgsCategorizedSymbolRendererV2Widget::scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod ) +void QgsCategorizedSymbolRendererWidget::scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod ) { mRenderer->setScaleMethod( scaleMethod ); emit widgetChanged(); } -QList QgsCategorizedSymbolRendererV2Widget::selectedSymbols() +QList QgsCategorizedSymbolRendererWidget::selectedSymbols() { QList selectedSymbols; @@ -898,7 +898,7 @@ QList QgsCategorizedSymbolRendererV2Widget::selectedSymbols() return selectedSymbols; } -QgsCategoryList QgsCategorizedSymbolRendererV2Widget::selectedCategoryList() +QgsCategoryList QgsCategorizedSymbolRendererWidget::selectedCategoryList() { QgsCategoryList cl; @@ -916,25 +916,25 @@ QgsCategoryList QgsCategorizedSymbolRendererV2Widget::selectedCategoryList() return cl; } -void QgsCategorizedSymbolRendererV2Widget::refreshSymbolView() +void QgsCategorizedSymbolRendererWidget::refreshSymbolView() { populateCategories(); emit widgetChanged(); } -void QgsCategorizedSymbolRendererV2Widget::showSymbolLevels() +void QgsCategorizedSymbolRendererWidget::showSymbolLevels() { showSymbolLevelsDialog( mRenderer ); } -void QgsCategorizedSymbolRendererV2Widget::rowsMoved() +void QgsCategorizedSymbolRendererWidget::rowsMoved() { viewCategories->selectionModel()->clear(); } -void QgsCategorizedSymbolRendererV2Widget::matchToSymbolsFromLibrary() +void QgsCategorizedSymbolRendererWidget::matchToSymbolsFromLibrary() { - int matched = matchToSymbols( QgsStyleV2::defaultStyle() ); + int matched = matchToSymbols( QgsStyle::defaultStyle() ); if ( matched > 0 ) { QMessageBox::information( this, tr( "Matched symbols" ), @@ -947,7 +947,7 @@ void QgsCategorizedSymbolRendererV2Widget::matchToSymbolsFromLibrary() } } -int QgsCategorizedSymbolRendererV2Widget::matchToSymbols( QgsStyleV2* style ) +int QgsCategorizedSymbolRendererWidget::matchToSymbols( QgsStyle* style ) { if ( !mLayer || !style ) return 0; @@ -970,7 +970,7 @@ int QgsCategorizedSymbolRendererV2Widget::matchToSymbols( QgsStyleV2* style ) return matched; } -void QgsCategorizedSymbolRendererV2Widget::matchToSymbolsFromXml() +void QgsCategorizedSymbolRendererWidget::matchToSymbolsFromXml() { QSettings settings; QString openFileDir = settings.value( "UI/lastMatchToSymbolsDir", QDir::homePath() ).toString(); @@ -985,7 +985,7 @@ void QgsCategorizedSymbolRendererV2Widget::matchToSymbolsFromXml() QFileInfo openFileInfo( fileName ); settings.setValue( "UI/lastMatchToSymbolsDir", openFileInfo.absolutePath() ); - QgsStyleV2 importedStyle; + QgsStyle importedStyle; if ( !importedStyle.importXml( fileName ) ) { QMessageBox::warning( this, tr( "Matching error" ), @@ -1006,7 +1006,7 @@ void QgsCategorizedSymbolRendererV2Widget::matchToSymbolsFromXml() } } -void QgsCategorizedSymbolRendererV2Widget::cleanUpSymbolSelector( QgsPanelWidget *container ) +void QgsCategorizedSymbolRendererWidget::cleanUpSymbolSelector( QgsPanelWidget *container ) { if ( container ) { @@ -1015,7 +1015,7 @@ void QgsCategorizedSymbolRendererV2Widget::cleanUpSymbolSelector( QgsPanelWidget } } -void QgsCategorizedSymbolRendererV2Widget::updateSymbolsFromWidget() +void QgsCategorizedSymbolRendererWidget::updateSymbolsFromWidget() { QgsSymbolSelectorWidget* dlg = qobject_cast( sender() ); delete mCategorizedSymbol; @@ -1052,7 +1052,7 @@ void QgsCategorizedSymbolRendererV2Widget::updateSymbolsFromWidget() emit widgetChanged(); } -void QgsCategorizedSymbolRendererV2Widget::keyPressEvent( QKeyEvent* event ) +void QgsCategorizedSymbolRendererWidget::keyPressEvent( QKeyEvent* event ) { if ( !event ) { diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h b/src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.h similarity index 77% rename from src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h rename to src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.h index 38fe3ca6427..95dd3ef2f37 100644 --- a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h +++ b/src/gui/symbology-ng/qgscategorizedsymbolrendererwidget.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgscategorizedsymbolrendererv2widget.h + qgscategorizedsymbolrendererwidget.h --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -15,23 +15,23 @@ #ifndef QGSCATEGORIZEDSYMBOLRENDERERV2WIDGET_H #define QGSCATEGORIZEDSYMBOLRENDERERV2WIDGET_H -#include "qgscategorizedsymbolrendererv2.h" -#include "qgsrendererv2widget.h" +#include "qgscategorizedsymbolrenderer.h" +#include "qgsrendererwidget.h" #include #include -class QgsCategorizedSymbolRendererV2; -class QgsRendererCategoryV2; +class QgsCategorizedSymbolRenderer; +class QgsRendererCategory; #include "ui_qgscategorizedsymbolrendererv2widget.h" ///@cond PRIVATE -class GUI_EXPORT QgsCategorizedSymbolRendererV2Model : public QAbstractItemModel +class GUI_EXPORT QgsCategorizedSymbolRendererModel : public QAbstractItemModel { Q_OBJECT public: - QgsCategorizedSymbolRendererV2Model( QObject * parent = nullptr ); + QgsCategorizedSymbolRendererModel( QObject * parent = nullptr ); Qt::ItemFlags flags( const QModelIndex & index ) const override; Qt::DropActions supportedDropActions() const override; QVariant data( const QModelIndex &index, int role ) const override; @@ -45,10 +45,10 @@ class GUI_EXPORT QgsCategorizedSymbolRendererV2Model : public QAbstractItemModel QMimeData *mimeData( const QModelIndexList &indexes ) const override; bool dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent ) override; - void setRenderer( QgsCategorizedSymbolRendererV2* renderer ); + void setRenderer( QgsCategorizedSymbolRenderer* renderer ); - void addCategory( const QgsRendererCategoryV2 &cat ); - QgsRendererCategoryV2 category( const QModelIndex &index ); + void addCategory( const QgsRendererCategory &cat ); + QgsRendererCategory category( const QModelIndex &index ); void deleteRows( QList rows ); void removeAllRows(); void sort( int column, Qt::SortOrder order = Qt::AscendingOrder ) override; @@ -58,19 +58,19 @@ class GUI_EXPORT QgsCategorizedSymbolRendererV2Model : public QAbstractItemModel void rowsMoved(); private: - QgsCategorizedSymbolRendererV2* mRenderer; + QgsCategorizedSymbolRenderer* mRenderer; QString mMimeFormat; }; /** \ingroup gui * View style which shows drop indicator line between items */ -class QgsCategorizedSymbolRendererV2ViewStyle: public QProxyStyle +class QgsCategorizedSymbolRendererViewStyle: public QProxyStyle { Q_OBJECT public: - explicit QgsCategorizedSymbolRendererV2ViewStyle( QStyle* style = nullptr ); + explicit QgsCategorizedSymbolRendererViewStyle( QStyle* style = nullptr ); void drawPrimitive( PrimitiveElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget = nullptr ) const override; }; @@ -78,18 +78,18 @@ class QgsCategorizedSymbolRendererV2ViewStyle: public QProxyStyle ///@endcond /** \ingroup gui - * \class QgsCategorizedSymbolRendererV2Widget + * \class QgsCategorizedSymbolRendererWidget */ -class GUI_EXPORT QgsCategorizedSymbolRendererV2Widget : public QgsRendererV2Widget, private Ui::QgsCategorizedSymbolRendererV2Widget +class GUI_EXPORT QgsCategorizedSymbolRendererWidget : public QgsRendererWidget, private Ui::QgsCategorizedSymbolRendererWidget { Q_OBJECT public: - static QgsRendererV2Widget* create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); + static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); - QgsCategorizedSymbolRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); - ~QgsCategorizedSymbolRendererV2Widget(); + QgsCategorizedSymbolRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); + ~QgsCategorizedSymbolRendererWidget(); - virtual QgsFeatureRendererV2* renderer() override; + virtual QgsFeatureRenderer* renderer() override; /** Replaces category symbols with the symbols from a style that have a matching * name. @@ -99,7 +99,7 @@ class GUI_EXPORT QgsCategorizedSymbolRendererV2Widget : public QgsRendererV2Widg * @see matchToSymbolsFromXml * @note added in QGIS 2.9 */ - int matchToSymbols( QgsStyleV2* style ); + int matchToSymbols( QgsStyle* style ); public slots: void changeCategorizedSymbol(); @@ -159,7 +159,7 @@ class GUI_EXPORT QgsCategorizedSymbolRendererV2Widget : public QgsRendererV2Widg void changeCategorySymbol(); - QgsVectorColorRampV2* getColorRamp(); + QgsVectorColorRamp* getColorRamp(); QList selectedSymbols() override; QgsCategoryList selectedCategoryList(); @@ -167,11 +167,11 @@ class GUI_EXPORT QgsCategorizedSymbolRendererV2Widget : public QgsRendererV2Widg void keyPressEvent( QKeyEvent* event ) override; protected: - QgsCategorizedSymbolRendererV2* mRenderer; + QgsCategorizedSymbolRenderer* mRenderer; QgsSymbol* mCategorizedSymbol; - QgsCategorizedSymbolRendererV2Model* mModel; + QgsCategorizedSymbolRendererModel* mModel; private: QString mOldClassificationAttribute; diff --git a/src/gui/symbology-ng/qgscolorrampcombobox.cpp b/src/gui/symbology-ng/qgscolorrampcombobox.cpp index e4b4a8b88ec..5e989c9749f 100644 --- a/src/gui/symbology-ng/qgscolorrampcombobox.cpp +++ b/src/gui/symbology-ng/qgscolorrampcombobox.cpp @@ -15,14 +15,14 @@ #include "qgscolorrampcombobox.h" #include "qgssymbollayerutils.h" -#include "qgsvectorcolorrampv2.h" -#include "qgsstylev2.h" -#include "qgsstylev2managerdialog.h" +#include "qgsvectorcolorramp.h" +#include "qgsstyle.h" +#include "qgsstylemanagerdialog.h" -#include "qgsvectorgradientcolorrampv2dialog.h" -#include "qgsvectorrandomcolorrampv2dialog.h" -#include "qgsvectorcolorbrewercolorrampv2dialog.h" -#include "qgscptcitycolorrampv2dialog.h" +#include "qgsvectorgradientcolorrampdialog.h" +#include "qgsvectorrandomcolorrampdialog.h" +#include "qgsvectorcolorbrewercolorrampdialog.h" +#include "qgscptcitycolorrampdialog.h" QSize QgsColorRampComboBox::rampIconSize( 50, 16 ); @@ -39,7 +39,7 @@ QgsColorRampComboBox::~QgsColorRampComboBox() delete mSourceColorRamp; } -void QgsColorRampComboBox::populate( QgsStyleV2* style ) +void QgsColorRampComboBox::populate( QgsStyle* style ) { if ( count() != 0 ) return; // already populated! @@ -51,7 +51,7 @@ void QgsColorRampComboBox::populate( QgsStyleV2* style ) QStringList rampNames = mStyle->colorRampNames(); for ( QStringList::iterator it = rampNames.begin(); it != rampNames.end(); ++it ) { - QgsVectorColorRampV2* ramp = style->colorRamp( *it ); + QgsVectorColorRamp* ramp = style->colorRamp( *it ); if ( !mShowGradientOnly || ramp->type() == "gradient" ) { @@ -68,13 +68,13 @@ void QgsColorRampComboBox::populate( QgsStyleV2* style ) connect( this, SIGNAL( activated( int ) ), SLOT( colorRampChanged( int ) ) ); } -QgsVectorColorRampV2* QgsColorRampComboBox::currentColorRamp() +QgsVectorColorRamp* QgsColorRampComboBox::currentColorRamp() { QString rampName = currentText(); if ( rampName == tr( "Random colors" ) ) { - return new QgsRandomColorsV2(); + return new QgsRandomColors(); } else if ( rampName == "[source]" && mSourceColorRamp ) return mSourceColorRamp->clone(); @@ -88,7 +88,7 @@ bool QgsColorRampComboBox::createNewColorRampSelected() const return index == count() - 1; //create new ramp is last item in combobox } -void QgsColorRampComboBox::setSourceColorRamp( QgsVectorColorRampV2* sourceRamp ) +void QgsColorRampComboBox::setSourceColorRamp( QgsVectorColorRamp* sourceRamp ) { delete mSourceColorRamp; mSourceColorRamp = sourceRamp->clone(); @@ -110,17 +110,17 @@ void QgsColorRampComboBox::colorRampChanged( int index ) QString rampName; if ( !mShowGradientOnly ) { - rampName = QgsStyleV2ManagerDialog::addColorRampStatic( this, mStyle ); + rampName = QgsStyleManagerDialog::addColorRampStatic( this, mStyle ); } else { - rampName = QgsStyleV2ManagerDialog::addColorRampStatic( this, mStyle, "Gradient" ); + rampName = QgsStyleManagerDialog::addColorRampStatic( this, mStyle, "Gradient" ); } if ( rampName.isEmpty() ) return; // put newly added ramp into the combo - QgsVectorColorRampV2* ramp = mStyle->colorRamp( rampName ); + QgsVectorColorRamp* ramp = mStyle->colorRamp( rampName ); QIcon icon = QgsSymbolLayerUtils::colorRampPreviewIcon( ramp, rampIconSize ); blockSignals( true ); // avoid calling this method again! @@ -138,16 +138,16 @@ void QgsColorRampComboBox::colorRampChanged( int index ) void QgsColorRampComboBox::editSourceRamp() { - QgsVectorColorRampV2* currentRamp = currentColorRamp(); + QgsVectorColorRamp* currentRamp = currentColorRamp(); if ( !currentRamp ) return; - QScopedPointer newRamp( currentRamp->clone() ); + QScopedPointer newRamp( currentRamp->clone() ); if ( newRamp->type() == "gradient" ) { - QgsVectorGradientColorRampV2* gradRamp = static_cast( newRamp.data() ); - QgsVectorGradientColorRampV2Dialog dlg( gradRamp, this ); + QgsVectorGradientColorRamp* gradRamp = static_cast( newRamp.data() ); + QgsVectorGradientColorRampDialog dlg( gradRamp, this ); if ( dlg.exec() && gradRamp ) { setSourceColorRamp( gradRamp ); @@ -156,8 +156,8 @@ void QgsColorRampComboBox::editSourceRamp() } else if ( newRamp->type() == "random" ) { - QgsVectorRandomColorRampV2* randRamp = static_cast( newRamp.data() ); - QgsVectorRandomColorRampV2Dialog dlg( randRamp, this ); + QgsVectorRandomColorRamp* randRamp = static_cast( newRamp.data() ); + QgsVectorRandomColorRampDialog dlg( randRamp, this ); if ( dlg.exec() ) { setSourceColorRamp( randRamp ); @@ -166,8 +166,8 @@ void QgsColorRampComboBox::editSourceRamp() } else if ( newRamp->type() == "colorbrewer" ) { - QgsVectorColorBrewerColorRampV2* brewerRamp = static_cast( newRamp.data() ); - QgsVectorColorBrewerColorRampV2Dialog dlg( brewerRamp, this ); + QgsVectorColorBrewerColorRamp* brewerRamp = static_cast( newRamp.data() ); + QgsVectorColorBrewerColorRampDialog dlg( brewerRamp, this ); if ( dlg.exec() ) { setSourceColorRamp( brewerRamp ); @@ -176,8 +176,8 @@ void QgsColorRampComboBox::editSourceRamp() } else if ( newRamp->type() == "cpt-city" ) { - QgsCptCityColorRampV2* cptCityRamp = static_cast( newRamp.data() ); - QgsCptCityColorRampV2Dialog dlg( cptCityRamp, this ); + QgsCptCityColorRamp* cptCityRamp = static_cast( newRamp.data() ); + QgsCptCityColorRampDialog dlg( cptCityRamp, this ); if ( dlg.exec() && cptCityRamp ) { setSourceColorRamp( cptCityRamp ); diff --git a/src/gui/symbology-ng/qgscolorrampcombobox.h b/src/gui/symbology-ng/qgscolorrampcombobox.h index d7d47f38a85..c8747b09663 100644 --- a/src/gui/symbology-ng/qgscolorrampcombobox.h +++ b/src/gui/symbology-ng/qgscolorrampcombobox.h @@ -17,8 +17,8 @@ #include -class QgsStyleV2; -class QgsVectorColorRampV2; +class QgsStyle; +class QgsVectorColorRamp; /** \ingroup gui * \class QgsColorRampComboBox @@ -32,13 +32,13 @@ class GUI_EXPORT QgsColorRampComboBox : public 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 @@ -73,8 +73,8 @@ class GUI_EXPORT QgsColorRampComboBox : public QComboBox void sourceRampEdited(); protected: - QgsStyleV2* mStyle; - QgsVectorColorRampV2* mSourceColorRamp; // owns the copy + QgsStyle* mStyle; + QgsVectorColorRamp* mSourceColorRamp; // owns the copy private: bool mShowGradientOnly; diff --git a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp b/src/gui/symbology-ng/qgscptcitycolorrampdialog.cpp similarity index 91% rename from src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp rename to src/gui/symbology-ng/qgscptcitycolorrampdialog.cpp index 3d87d7a5248..13bfdc6c900 100644 --- a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp +++ b/src/gui/symbology-ng/qgscptcitycolorrampdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgscptcitycolorrampv2dialog.cpp + qgscptcitycolorrampdialog.cpp --------------------- begin : July 2012 copyright : (C) 2012 by Etienne Tourigny @@ -13,10 +13,10 @@ * * ***************************************************************************/ -#include "qgscptcitycolorrampv2dialog.h" +#include "qgscptcitycolorrampdialog.h" #include "qgscptcityarchive.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgslogger.h" #include "qgsapplication.h" #include "qgsdialog.h" @@ -36,7 +36,7 @@ // - fix crash on Diverging? -QgsCptCityColorRampV2Dialog::QgsCptCityColorRampV2Dialog( QgsCptCityColorRampV2* ramp, QWidget* parent ) +QgsCptCityColorRampDialog::QgsCptCityColorRampDialog( QgsCptCityColorRamp* ramp, QWidget* parent ) : QDialog( parent ) , mRamp( nullptr ) , mArchiveViewType( QgsCptCityBrowserModel::Selections ) @@ -96,7 +96,7 @@ QgsCptCityColorRampV2Dialog::QgsCptCityColorRampV2Dialog( QgsCptCityColorRampV2* } else { - mRamp = new QgsCptCityColorRampV2( "", "", false ); + mRamp = new QgsCptCityColorRamp( "", "", false ); ramp = mRamp; } QgsDebugMsg( QString( "ramp name= %1 variant= %2 - %3 variants" ).arg( ramp->schemeName(), ramp->variantName() ).arg( ramp->variantList().count() ) ); @@ -153,11 +153,11 @@ QgsCptCityColorRampV2Dialog::QgsCptCityColorRampV2Dialog( QgsCptCityColorRampV2* } -QgsCptCityColorRampV2Dialog::~QgsCptCityColorRampV2Dialog() +QgsCptCityColorRampDialog::~QgsCptCityColorRampDialog() { } -void QgsCptCityColorRampV2Dialog::populateVariants() +void QgsCptCityColorRampDialog::populateVariants() { QStringList variantList = mRamp->variantList(); @@ -176,7 +176,7 @@ void QgsCptCityColorRampV2Dialog::populateVariants() { // populate variant combobox QString oldVariant = cboVariantName->currentText(); - QgsCptCityColorRampV2 ramp( mRamp->schemeName(), mRamp->variantList(), QString() ); + QgsCptCityColorRamp ramp( mRamp->schemeName(), mRamp->variantList(), QString() ); QPixmap blankPixmap( cboVariantName->iconSize() ); blankPixmap.fill( Qt::white ); QIcon blankIcon( blankPixmap ); @@ -230,7 +230,7 @@ void QgsCptCityColorRampV2Dialog::populateVariants() } -void QgsCptCityColorRampV2Dialog::on_mTreeView_clicked( const QModelIndex &index ) +void QgsCptCityColorRampDialog::on_mTreeView_clicked( const QModelIndex &index ) { const QModelIndex &sourceIndex = mTreeFilter->mapToSource( index ); QgsCptCityDataItem *item = mModel->dataItem( sourceIndex ); @@ -241,7 +241,7 @@ void QgsCptCityColorRampV2Dialog::on_mTreeView_clicked( const QModelIndex &index updateTreeView( item ); } -void QgsCptCityColorRampV2Dialog::updateTreeView( QgsCptCityDataItem *item, bool resetRamp ) +void QgsCptCityColorRampDialog::updateTreeView( QgsCptCityDataItem *item, bool resetRamp ) { if ( ! item ) { @@ -282,7 +282,7 @@ void QgsCptCityColorRampV2Dialog::updateTreeView( QgsCptCityDataItem *item, bool } } -void QgsCptCityColorRampV2Dialog::on_mListWidget_itemClicked( QListWidgetItem * item ) +void QgsCptCityColorRampDialog::on_mListWidget_itemClicked( QListWidgetItem * item ) { QgsCptCityColorRampItem *rampItem = mListRamps.at( item->data( Qt::UserRole ).toInt() ); if ( rampItem ) @@ -299,7 +299,7 @@ void QgsCptCityColorRampV2Dialog::on_mListWidget_itemClicked( QListWidgetItem * } } -void QgsCptCityColorRampV2Dialog::on_mListWidget_itemSelectionChanged() +void QgsCptCityColorRampDialog::on_mListWidget_itemSelectionChanged() { if ( mListWidget->selectedItems().isEmpty() ) { @@ -307,7 +307,7 @@ void QgsCptCityColorRampV2Dialog::on_mListWidget_itemSelectionChanged() } } -void QgsCptCityColorRampV2Dialog::on_tabBar_currentChanged( int index ) +void QgsCptCityColorRampDialog::on_tabBar_currentChanged( int index ) { if ( index == 0 ) { @@ -332,7 +332,7 @@ void QgsCptCityColorRampV2Dialog::on_tabBar_currentChanged( int index ) } -void QgsCptCityColorRampV2Dialog::on_pbtnLicenseDetails_pressed() +void QgsCptCityColorRampDialog::on_pbtnLicenseDetails_pressed() { QString path, title, copyFile, descFile; @@ -402,7 +402,7 @@ void QgsCptCityColorRampV2Dialog::on_pbtnLicenseDetails_pressed() dlg.exec(); } -void QgsCptCityColorRampV2Dialog::updatePreview( bool clear ) +void QgsCptCityColorRampDialog::updatePreview( bool clear ) { QSize size = lblPreview->size(); @@ -431,12 +431,12 @@ void QgsCptCityColorRampV2Dialog::updatePreview( bool clear ) updateCopyingInfo( mRamp->copyingInfo() ); } -void QgsCptCityColorRampV2Dialog::clearCopyingInfo() +void QgsCptCityColorRampDialog::clearCopyingInfo() { updateCopyingInfo( QMap< QString, QString >() ); } -void QgsCptCityColorRampV2Dialog::updateCopyingInfo( const QMap< QString, QString >& copyingMap ) +void QgsCptCityColorRampDialog::updateCopyingInfo( const QMap< QString, QString >& copyingMap ) { QString authorStr = copyingMap.value( "authors" ); if ( authorStr.length() > 80 ) @@ -461,7 +461,7 @@ void QgsCptCityColorRampV2Dialog::updateCopyingInfo( const QMap< QString, QStrin lblSrcLink->setText( "" ); } -void QgsCptCityColorRampV2Dialog::on_cboVariantName_currentIndexChanged( int index ) +void QgsCptCityColorRampDialog::on_cboVariantName_currentIndexChanged( int index ) { Q_UNUSED( index ); if ( cboVariantName->currentIndex() != -1 ) @@ -470,7 +470,7 @@ void QgsCptCityColorRampV2Dialog::on_cboVariantName_currentIndexChanged( int ind updatePreview(); } -void QgsCptCityColorRampV2Dialog::onFinished() +void QgsCptCityColorRampDialog::onFinished() { // save settings QSettings settings; @@ -478,7 +478,7 @@ void QgsCptCityColorRampV2Dialog::onFinished() settings.setValue( "/Windows/CptCityColorRampV2Dialog/splitter", mSplitter->saveState() ); } -void QgsCptCityColorRampV2Dialog::on_buttonBox_helpRequested() +void QgsCptCityColorRampDialog::on_buttonBox_helpRequested() { // show error message to use color ramp manager to get more gradients QString helpText = tr( "You can download a more complete set of cpt-city gradients " @@ -490,14 +490,14 @@ void QgsCptCityColorRampV2Dialog::on_buttonBox_helpRequested() msg->exec(); } -bool QgsCptCityColorRampV2Dialog::saveAsGradientRamp() const +bool QgsCptCityColorRampDialog::saveAsGradientRamp() const { QgsDebugMsg( QString( "result: %1 checked: %2" ).arg( result() ).arg( cboConvertStandard->isChecked() ) ); - // if "save as standard gradient" is checked, convert to QgsVectorGradientColorRampV2 + // if "save as standard gradient" is checked, convert to QgsVectorGradientColorRamp return ( result() == Accepted && cboConvertStandard->isChecked() ); } -void QgsCptCityColorRampV2Dialog::updateListWidget( QgsCptCityDataItem *item ) +void QgsCptCityColorRampDialog::updateListWidget( QgsCptCityDataItem *item ) { mListWidget->blockSignals( true ); mListWidget->clear(); @@ -535,7 +535,7 @@ void QgsCptCityColorRampV2Dialog::updateListWidget( QgsCptCityDataItem *item ) // this function is for a svg preview, available if the svg files have been processed with svgx // e.g. for f in `ls */*/*/*/*.svg`; do echo $f ; svgx -p -t svg $f > tmp1.svg; mv tmp1.svg $f; done // perhaps a future version of the cpt-city svg gradients will have them by default -bool QgsCptCityColorRampV2Dialog::eventFilter( QObject *obj, QEvent *event ) +bool QgsCptCityColorRampDialog::eventFilter( QObject *obj, QEvent *event ) { QSize size = lblPreview->size(); @@ -561,7 +561,7 @@ bool QgsCptCityColorRampV2Dialog::eventFilter( QObject *obj, QEvent *event ) } } -bool QgsCptCityColorRampV2Dialog::updateRamp() +bool QgsCptCityColorRampDialog::updateRamp() { mListWidget->clear(); mListRamps.clear(); @@ -628,7 +628,7 @@ bool QgsCptCityColorRampV2Dialog::updateRamp() return false; } -void QgsCptCityColorRampV2Dialog::showAll() +void QgsCptCityColorRampDialog::showAll() { QModelIndex modelIndex = mModel->findPath( "" ); if ( modelIndex != QModelIndex() ) @@ -641,7 +641,7 @@ void QgsCptCityColorRampV2Dialog::showAll() } } -void QgsCptCityColorRampV2Dialog::setTreeModel( QgsCptCityBrowserModel* model ) +void QgsCptCityColorRampDialog::setTreeModel( QgsCptCityBrowserModel* model ) { mModel = model; @@ -652,14 +652,14 @@ void QgsCptCityColorRampV2Dialog::setTreeModel( QgsCptCityBrowserModel* model ) } #if 0 -void QgsCptCityColorRampV2Dialog::refresh() +void QgsCptCityColorRampDialog::refresh() { QApplication::setOverrideCursor( Qt::WaitCursor ); refreshModel( QModelIndex() ); QApplication::restoreOverrideCursor(); } -void QgsCptCityColorRampV2Dialog::refreshModel( const QModelIndex& index ) +void QgsCptCityColorRampDialog::refreshModel( const QModelIndex& index ) { if ( index.isValid() ) { diff --git a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.h b/src/gui/symbology-ng/qgscptcitycolorrampdialog.h similarity index 89% rename from src/gui/symbology-ng/qgscptcitycolorrampv2dialog.h rename to src/gui/symbology-ng/qgscptcitycolorrampdialog.h index 084129cd637..4debc9633f2 100644 --- a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.h +++ b/src/gui/symbology-ng/qgscptcitycolorrampdialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgscptcitycolorrampv2dialog.h + qgscptcitycolorrampdialog.h --------------------- begin : July 2012 copyright : (C) 2012 by Etienne Tourigny @@ -26,21 +26,21 @@ #include #include -class QgsCptCityColorRampV2; +class QgsCptCityColorRamp; class TreeFilterProxyModel; class ListFilterProxyModel; class UngroupProxyModel; /** \ingroup gui - * \class QgsCptCityColorRampV2Dialog + * \class QgsCptCityColorRampDialog */ -class GUI_EXPORT QgsCptCityColorRampV2Dialog : public QDialog, private Ui::QgsCptCityColorRampV2DialogBase +class GUI_EXPORT QgsCptCityColorRampDialog : public QDialog, private Ui::QgsCptCityColorRampDialogBase { Q_OBJECT public: - QgsCptCityColorRampV2Dialog( QgsCptCityColorRampV2* ramp, QWidget* parent = nullptr ); - ~QgsCptCityColorRampV2Dialog(); + QgsCptCityColorRampDialog( QgsCptCityColorRamp* ramp, QWidget* parent = nullptr ); + ~QgsCptCityColorRampDialog(); QString selectedName() const { return mRamp ? QFileInfo( mRamp->schemeName() ).baseName() + mRamp->variantName() : QString(); } @@ -69,7 +69,7 @@ class GUI_EXPORT QgsCptCityColorRampV2Dialog : public QDialog, private Ui::QgsCp void updateListWidget( QgsCptCityDataItem *item ); bool eventFilter( QObject *obj, QEvent *event ) override; - QgsCptCityColorRampV2* mRamp; + QgsCptCityColorRamp* mRamp; QgsCptCityArchive* mArchive; QgsCptCityBrowserModel::ViewType mArchiveViewType; diff --git a/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp b/src/gui/symbology-ng/qgsellipsesymbollayerwidget.cpp similarity index 82% rename from src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp rename to src/gui/symbology-ng/qgsellipsesymbollayerwidget.cpp index fa2bbc3f2dc..d8029d6d8f8 100644 --- a/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp +++ b/src/gui/symbology-ng/qgsellipsesymbollayerwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsellipsesymbollayerv2widget.cpp + qgsellipsesymbollayerwidget.cpp --------------------- begin : June 2011 copyright : (C) 2011 by Marco Hugentobler @@ -12,13 +12,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsellipsesymbollayerv2widget.h" -#include "qgsellipsesymbollayerv2.h" +#include "qgsellipsesymbollayerwidget.h" +#include "qgsellipsesymbollayer.h" #include "qgsmaplayerregistry.h" #include "qgsvectorlayer.h" #include -QgsEllipseSymbolLayerV2Widget::QgsEllipseSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent ) +QgsEllipseSymbolLayerWidget::QgsEllipseSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent ) : QgsSymbolLayerWidget( parent, vl ) , mLayer( nullptr ) { @@ -50,7 +50,7 @@ QgsEllipseSymbolLayerV2Widget::QgsEllipseSymbolLayerV2Widget( const QgsVectorLay Q_FOREACH ( const QString& name, names ) { - QgsEllipseSymbolLayerV2* lyr = new QgsEllipseSymbolLayerV2(); + QgsEllipseSymbolLayer* lyr = new QgsEllipseSymbolLayer(); lyr->setSymbolName( name ); lyr->setOutlineColor( QColor( 0, 0, 0 ) ); lyr->setFillColor( QColor( 200, 200, 200 ) ); @@ -68,14 +68,14 @@ QgsEllipseSymbolLayerV2Widget::QgsEllipseSymbolLayerV2Widget( const QgsVectorLay connect( cboJoinStyle, SIGNAL( currentIndexChanged( int ) ), this, SLOT( penJoinStyleChanged() ) ); } -void QgsEllipseSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) +void QgsEllipseSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer* layer ) { if ( !layer || layer->layerType() != "EllipseMarker" ) { return; } - mLayer = static_cast( layer ); + mLayer = static_cast( layer ); mWidthSpinBox->setValue( mLayer->symbolWidth() ); mHeightSpinBox->setValue( mLayer->symbolHeight() ); mRotationSpinBox->setValue( mLayer->angle() ); @@ -123,12 +123,12 @@ void QgsEllipseSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) } -QgsSymbolLayer* QgsEllipseSymbolLayerV2Widget::symbolLayer() +QgsSymbolLayer* QgsEllipseSymbolLayerWidget::symbolLayer() { return mLayer; } -void QgsEllipseSymbolLayerV2Widget::on_mShapeListWidget_itemSelectionChanged() +void QgsEllipseSymbolLayerWidget::on_mShapeListWidget_itemSelectionChanged() { if ( mLayer ) { @@ -141,7 +141,7 @@ void QgsEllipseSymbolLayerV2Widget::on_mShapeListWidget_itemSelectionChanged() } } -void QgsEllipseSymbolLayerV2Widget::on_mWidthSpinBox_valueChanged( double d ) +void QgsEllipseSymbolLayerWidget::on_mWidthSpinBox_valueChanged( double d ) { if ( mLayer ) { @@ -150,7 +150,7 @@ void QgsEllipseSymbolLayerV2Widget::on_mWidthSpinBox_valueChanged( double d ) } } -void QgsEllipseSymbolLayerV2Widget::on_mHeightSpinBox_valueChanged( double d ) +void QgsEllipseSymbolLayerWidget::on_mHeightSpinBox_valueChanged( double d ) { if ( mLayer ) { @@ -159,7 +159,7 @@ void QgsEllipseSymbolLayerV2Widget::on_mHeightSpinBox_valueChanged( double d ) } } -void QgsEllipseSymbolLayerV2Widget::on_mRotationSpinBox_valueChanged( double d ) +void QgsEllipseSymbolLayerWidget::on_mRotationSpinBox_valueChanged( double d ) { if ( mLayer ) { @@ -168,7 +168,7 @@ void QgsEllipseSymbolLayerV2Widget::on_mRotationSpinBox_valueChanged( double d ) } } -void QgsEllipseSymbolLayerV2Widget::on_mOutlineStyleComboBox_currentIndexChanged( int index ) +void QgsEllipseSymbolLayerWidget::on_mOutlineStyleComboBox_currentIndexChanged( int index ) { Q_UNUSED( index ); @@ -179,7 +179,7 @@ void QgsEllipseSymbolLayerV2Widget::on_mOutlineStyleComboBox_currentIndexChanged } } -void QgsEllipseSymbolLayerV2Widget::on_mOutlineWidthSpinBox_valueChanged( double d ) +void QgsEllipseSymbolLayerWidget::on_mOutlineWidthSpinBox_valueChanged( double d ) { if ( mLayer ) { @@ -188,7 +188,7 @@ void QgsEllipseSymbolLayerV2Widget::on_mOutlineWidthSpinBox_valueChanged( double } } -void QgsEllipseSymbolLayerV2Widget::on_btnChangeColorBorder_colorChanged( const QColor& newColor ) +void QgsEllipseSymbolLayerWidget::on_btnChangeColorBorder_colorChanged( const QColor& newColor ) { if ( !mLayer ) { @@ -199,7 +199,7 @@ void QgsEllipseSymbolLayerV2Widget::on_btnChangeColorBorder_colorChanged( const emit changed(); } -void QgsEllipseSymbolLayerV2Widget::on_btnChangeColorFill_colorChanged( const QColor& newColor ) +void QgsEllipseSymbolLayerWidget::on_btnChangeColorFill_colorChanged( const QColor& newColor ) { if ( !mLayer ) { @@ -210,7 +210,7 @@ void QgsEllipseSymbolLayerV2Widget::on_btnChangeColorFill_colorChanged( const QC emit changed(); } -void QgsEllipseSymbolLayerV2Widget::on_mSymbolWidthUnitWidget_changed() +void QgsEllipseSymbolLayerWidget::on_mSymbolWidthUnitWidget_changed() { if ( mLayer ) { @@ -220,7 +220,7 @@ void QgsEllipseSymbolLayerV2Widget::on_mSymbolWidthUnitWidget_changed() } } -void QgsEllipseSymbolLayerV2Widget::on_mOutlineWidthUnitWidget_changed() +void QgsEllipseSymbolLayerWidget::on_mOutlineWidthUnitWidget_changed() { if ( mLayer ) { @@ -230,7 +230,7 @@ void QgsEllipseSymbolLayerV2Widget::on_mOutlineWidthUnitWidget_changed() } } -void QgsEllipseSymbolLayerV2Widget::on_mSymbolHeightUnitWidget_changed() +void QgsEllipseSymbolLayerWidget::on_mSymbolHeightUnitWidget_changed() { if ( mLayer ) { @@ -240,7 +240,7 @@ void QgsEllipseSymbolLayerV2Widget::on_mSymbolHeightUnitWidget_changed() } } -void QgsEllipseSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() +void QgsEllipseSymbolLayerWidget::on_mOffsetUnitWidget_changed() { if ( mLayer ) { @@ -250,13 +250,13 @@ void QgsEllipseSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() } } -void QgsEllipseSymbolLayerV2Widget::penJoinStyleChanged() +void QgsEllipseSymbolLayerWidget::penJoinStyleChanged() { mLayer->setPenJoinStyle( cboJoinStyle->penJoinStyle() ); emit changed(); } -void QgsEllipseSymbolLayerV2Widget::blockComboSignals( bool block ) +void QgsEllipseSymbolLayerWidget::blockComboSignals( bool block ) { mSymbolWidthUnitWidget->blockSignals( block ); mOutlineWidthUnitWidget->blockSignals( block ); @@ -270,25 +270,25 @@ void QgsEllipseSymbolLayerV2Widget::blockComboSignals( bool block ) cboJoinStyle->blockSignals( block ); } -void QgsEllipseSymbolLayerV2Widget::on_mHorizontalAnchorComboBox_currentIndexChanged( int index ) +void QgsEllipseSymbolLayerWidget::on_mHorizontalAnchorComboBox_currentIndexChanged( int index ) { if ( mLayer ) { - mLayer->setHorizontalAnchorPoint(( QgsMarkerSymbolLayerV2::HorizontalAnchorPoint ) index ); + mLayer->setHorizontalAnchorPoint(( QgsMarkerSymbolLayer::HorizontalAnchorPoint ) index ); emit changed(); } } -void QgsEllipseSymbolLayerV2Widget::on_mVerticalAnchorComboBox_currentIndexChanged( int index ) +void QgsEllipseSymbolLayerWidget::on_mVerticalAnchorComboBox_currentIndexChanged( int index ) { if ( mLayer ) { - mLayer->setVerticalAnchorPoint(( QgsMarkerSymbolLayerV2::VerticalAnchorPoint ) index ); + mLayer->setVerticalAnchorPoint(( QgsMarkerSymbolLayer::VerticalAnchorPoint ) index ); emit changed(); } } -void QgsEllipseSymbolLayerV2Widget::setOffset() +void QgsEllipseSymbolLayerWidget::setOffset() { mLayer->setOffset( QPointF( spinOffsetX->value(), spinOffsetY->value() ) ); emit changed(); diff --git a/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h b/src/gui/symbology-ng/qgsellipsesymbollayerwidget.h similarity index 85% rename from src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h rename to src/gui/symbology-ng/qgsellipsesymbollayerwidget.h index c87a0747a82..e5e66d3da1c 100644 --- a/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h +++ b/src/gui/symbology-ng/qgsellipsesymbollayerwidget.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsellipsesymbollayerv2widget.h + qgsellipsesymbollayerwidget.h --------------------- begin : June 2011 copyright : (C) 2011 by Marco Hugentobler @@ -18,26 +18,26 @@ #include "ui_widget_ellipse.h" #include "qgssymbollayerwidget.h" -class QgsEllipseSymbolLayerV2; +class QgsEllipseSymbolLayer; /** \ingroup gui - * \class QgsEllipseSymbolLayerV2Widget + * \class QgsEllipseSymbolLayerWidget */ -class GUI_EXPORT QgsEllipseSymbolLayerV2Widget: public QgsSymbolLayerWidget, private Ui::WidgetEllipseBase +class GUI_EXPORT QgsEllipseSymbolLayerWidget: public QgsSymbolLayerWidget, private Ui::WidgetEllipseBase { Q_OBJECT public: - QgsEllipseSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); + QgsEllipseSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); - static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsEllipseSymbolLayerV2Widget( vl ); } + static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsEllipseSymbolLayerWidget( vl ); } // from base class virtual void setSymbolLayer( QgsSymbolLayer* layer ) override; virtual QgsSymbolLayer* symbolLayer() override; protected: - QgsEllipseSymbolLayerV2* mLayer; + QgsEllipseSymbolLayer* mLayer; private: void blockComboSignals( bool block ); diff --git a/src/gui/symbology-ng/qgsgraduatedhistogramwidget.cpp b/src/gui/symbology-ng/qgsgraduatedhistogramwidget.cpp index b97687b8766..9e4e2ea0846 100644 --- a/src/gui/symbology-ng/qgsgraduatedhistogramwidget.cpp +++ b/src/gui/symbology-ng/qgsgraduatedhistogramwidget.cpp @@ -16,8 +16,8 @@ ***************************************************************************/ #include "qgsgraduatedhistogramwidget.h" -#include "qgsgraduatedsymbolrendererv2.h" -#include "qgsgraduatedsymbolrendererv2widget.h" +#include "qgsgraduatedsymbolrenderer.h" +#include "qgsgraduatedsymbolrendererwidget.h" #include "qgsapplication.h" #include "qgsvectorlayer.h" #include "qgsstatisticalsummary.h" @@ -73,7 +73,7 @@ QgsGraduatedHistogramWidget::~QgsGraduatedHistogramWidget() { } -void QgsGraduatedHistogramWidget::setRenderer( QgsGraduatedSymbolRendererV2 *renderer ) +void QgsGraduatedHistogramWidget::setRenderer( QgsGraduatedSymbolRenderer *renderer ) { mRenderer = renderer; } diff --git a/src/gui/symbology-ng/qgsgraduatedhistogramwidget.h b/src/gui/symbology-ng/qgsgraduatedhistogramwidget.h index 45a70cc2eec..7faa163ebff 100644 --- a/src/gui/symbology-ng/qgsgraduatedhistogramwidget.h +++ b/src/gui/symbology-ng/qgsgraduatedhistogramwidget.h @@ -25,7 +25,7 @@ class QgsGraduatedHistogramEventFilter; /** \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 */ @@ -42,11 +42,11 @@ class GUI_EXPORT QgsGraduatedHistogramWidget : public QgsHistogramWidget QgsGraduatedHistogramWidget( QWidget *parent = nullptr ); ~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: @@ -67,7 +67,7 @@ class GUI_EXPORT QgsGraduatedHistogramWidget : public QgsHistogramWidget private: - QgsGraduatedSymbolRendererV2* mRenderer; + QgsGraduatedSymbolRenderer* mRenderer; QwtPlotPicker* mHistoPicker; QgsGraduatedHistogramEventFilter* mFilter; double mPressedValue; diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp similarity index 80% rename from src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp rename to src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp index d3face77f4d..7b5d0fbb324 100644 --- a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp +++ b/src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsgraduatedsymbolrendererv2widget.cpp + qgsgraduatedsymbolrendererwidget.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -12,13 +12,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsgraduatedsymbolrendererv2widget.h" +#include "qgsgraduatedsymbolrendererwidget.h" #include "qgspanelwidget.h" #include "qgssymbol.h" #include "qgssymbollayerutils.h" -#include "qgsvectorcolorrampv2.h" -#include "qgsstylev2.h" +#include "qgsvectorcolorramp.h" +#include "qgsstyle.h" #include "qgsvectorlayer.h" @@ -42,13 +42,13 @@ ///@cond PRIVATE -QgsGraduatedSymbolRendererV2Model::QgsGraduatedSymbolRendererV2Model( QObject * parent ) : QAbstractItemModel( parent ) +QgsGraduatedSymbolRendererModel::QgsGraduatedSymbolRendererModel( QObject * parent ) : QAbstractItemModel( parent ) , mRenderer( nullptr ) , mMimeFormat( "application/x-qgsgraduatedsymbolrendererv2model" ) { } -void QgsGraduatedSymbolRendererV2Model::setRenderer( QgsGraduatedSymbolRendererV2* renderer ) +void QgsGraduatedSymbolRendererModel::setRenderer( QgsGraduatedSymbolRenderer* renderer ) { if ( mRenderer ) { @@ -64,7 +64,7 @@ void QgsGraduatedSymbolRendererV2Model::setRenderer( QgsGraduatedSymbolRendererV } } -void QgsGraduatedSymbolRendererV2Model::addClass( QgsSymbol* symbol ) +void QgsGraduatedSymbolRendererModel::addClass( QgsSymbol* symbol ) { if ( !mRenderer ) return; int idx = mRenderer->ranges().size(); @@ -73,7 +73,7 @@ void QgsGraduatedSymbolRendererV2Model::addClass( QgsSymbol* symbol ) endInsertRows(); } -void QgsGraduatedSymbolRendererV2Model::addClass( const QgsRendererRangeV2& range ) +void QgsGraduatedSymbolRendererModel::addClass( const QgsRendererRange& range ) { if ( !mRenderer ) { @@ -85,17 +85,17 @@ void QgsGraduatedSymbolRendererV2Model::addClass( const QgsRendererRangeV2& rang endInsertRows(); } -QgsRendererRangeV2 QgsGraduatedSymbolRendererV2Model::rendererRange( const QModelIndex &index ) +QgsRendererRange QgsGraduatedSymbolRendererModel::rendererRange( const QModelIndex &index ) { if ( !index.isValid() || !mRenderer || mRenderer->ranges().size() <= index.row() ) { - return QgsRendererRangeV2(); + return QgsRendererRange(); } return mRenderer->ranges().value( index.row() ); } -Qt::ItemFlags QgsGraduatedSymbolRendererV2Model::flags( const QModelIndex & index ) const +Qt::ItemFlags QgsGraduatedSymbolRendererModel::flags( const QModelIndex & index ) const { if ( !index.isValid() ) { @@ -112,16 +112,16 @@ Qt::ItemFlags QgsGraduatedSymbolRendererV2Model::flags( const QModelIndex & inde return flags; } -Qt::DropActions QgsGraduatedSymbolRendererV2Model::supportedDropActions() const +Qt::DropActions QgsGraduatedSymbolRendererModel::supportedDropActions() const { return Qt::MoveAction; } -QVariant QgsGraduatedSymbolRendererV2Model::data( const QModelIndex &index, int role ) const +QVariant QgsGraduatedSymbolRendererModel::data( const QModelIndex &index, int role ) const { if ( !index.isValid() || !mRenderer ) return QVariant(); - const QgsRendererRangeV2 range = mRenderer->ranges().value( index.row() ); + const QgsRendererRange range = mRenderer->ranges().value( index.row() ); if ( role == Qt::CheckStateRole && index.column() == 0 ) { @@ -166,7 +166,7 @@ QVariant QgsGraduatedSymbolRendererV2Model::data( const QModelIndex &index, int return QVariant(); } -bool QgsGraduatedSymbolRendererV2Model::setData( const QModelIndex & index, const QVariant & value, int role ) +bool QgsGraduatedSymbolRendererModel::setData( const QModelIndex & index, const QVariant & value, int role ) { if ( !index.isValid() ) return false; @@ -196,7 +196,7 @@ bool QgsGraduatedSymbolRendererV2Model::setData( const QModelIndex & index, cons return true; } -QVariant QgsGraduatedSymbolRendererV2Model::headerData( int section, Qt::Orientation orientation, int role ) const +QVariant QgsGraduatedSymbolRendererModel::headerData( int section, Qt::Orientation orientation, int role ) const { if ( orientation == Qt::Horizontal && role == Qt::DisplayRole && section >= 0 && section < 3 ) { @@ -207,7 +207,7 @@ QVariant QgsGraduatedSymbolRendererV2Model::headerData( int section, Qt::Orienta return QVariant(); } -int QgsGraduatedSymbolRendererV2Model::rowCount( const QModelIndex &parent ) const +int QgsGraduatedSymbolRendererModel::rowCount( const QModelIndex &parent ) const { if ( parent.isValid() || !mRenderer ) { @@ -216,13 +216,13 @@ int QgsGraduatedSymbolRendererV2Model::rowCount( const QModelIndex &parent ) con return mRenderer->ranges().size(); } -int QgsGraduatedSymbolRendererV2Model::columnCount( const QModelIndex & index ) const +int QgsGraduatedSymbolRendererModel::columnCount( const QModelIndex & index ) const { Q_UNUSED( index ); return 3; } -QModelIndex QgsGraduatedSymbolRendererV2Model::index( int row, int column, const QModelIndex &parent ) const +QModelIndex QgsGraduatedSymbolRendererModel::index( int row, int column, const QModelIndex &parent ) const { if ( hasIndex( row, column, parent ) ) { @@ -231,20 +231,20 @@ QModelIndex QgsGraduatedSymbolRendererV2Model::index( int row, int column, const return QModelIndex(); } -QModelIndex QgsGraduatedSymbolRendererV2Model::parent( const QModelIndex &index ) const +QModelIndex QgsGraduatedSymbolRendererModel::parent( const QModelIndex &index ) const { Q_UNUSED( index ); return QModelIndex(); } -QStringList QgsGraduatedSymbolRendererV2Model::mimeTypes() const +QStringList QgsGraduatedSymbolRendererModel::mimeTypes() const { QStringList types; types << mMimeFormat; return types; } -QMimeData *QgsGraduatedSymbolRendererV2Model::mimeData( const QModelIndexList &indexes ) const +QMimeData *QgsGraduatedSymbolRendererModel::mimeData( const QModelIndexList &indexes ) const { QMimeData *mimeData = new QMimeData(); QByteArray encodedData; @@ -263,7 +263,7 @@ QMimeData *QgsGraduatedSymbolRendererV2Model::mimeData( const QModelIndexList &i return mimeData; } -bool QgsGraduatedSymbolRendererV2Model::dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent ) +bool QgsGraduatedSymbolRendererModel::dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent ) { Q_UNUSED( row ); Q_UNUSED( column ); @@ -306,7 +306,7 @@ bool QgsGraduatedSymbolRendererV2Model::dropMimeData( const QMimeData *data, Qt: return false; } -void QgsGraduatedSymbolRendererV2Model::deleteRows( QList rows ) +void QgsGraduatedSymbolRendererModel::deleteRows( QList rows ) { for ( int i = rows.size() - 1; i >= 0; i-- ) { @@ -316,14 +316,14 @@ void QgsGraduatedSymbolRendererV2Model::deleteRows( QList rows ) } } -void QgsGraduatedSymbolRendererV2Model::removeAllRows() +void QgsGraduatedSymbolRendererModel::removeAllRows() { beginRemoveRows( QModelIndex(), 0, mRenderer->ranges().size() - 1 ); mRenderer->deleteAllClasses(); endRemoveRows(); } -void QgsGraduatedSymbolRendererV2Model::sort( int column, Qt::SortOrder order ) +void QgsGraduatedSymbolRendererModel::sort( int column, Qt::SortOrder order ) { if ( column == 0 ) { @@ -342,7 +342,7 @@ void QgsGraduatedSymbolRendererV2Model::sort( int column, Qt::SortOrder order ) QgsDebugMsg( "Done" ); } -void QgsGraduatedSymbolRendererV2Model::updateSymbology( bool resetModel ) +void QgsGraduatedSymbolRendererModel::updateSymbology( bool resetModel ) { if ( resetModel ) { @@ -354,17 +354,17 @@ void QgsGraduatedSymbolRendererV2Model::updateSymbology( bool resetModel ) } } -void QgsGraduatedSymbolRendererV2Model::updateLabels() +void QgsGraduatedSymbolRendererModel::updateLabels() { emit dataChanged( createIndex( 0, 2 ), createIndex( mRenderer->ranges().size(), 2 ) ); } // ------------------------------ View style -------------------------------- -QgsGraduatedSymbolRendererV2ViewStyle::QgsGraduatedSymbolRendererV2ViewStyle( QStyle* style ) +QgsGraduatedSymbolRendererViewStyle::QgsGraduatedSymbolRendererViewStyle( QStyle* style ) : QProxyStyle( style ) {} -void QgsGraduatedSymbolRendererV2ViewStyle::drawPrimitive( PrimitiveElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget ) const +void QgsGraduatedSymbolRendererViewStyle::drawPrimitive( PrimitiveElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget ) const { if ( element == QStyle::PE_IndicatorItemViewItemDrop && !option->rect.isNull() ) { @@ -383,14 +383,14 @@ void QgsGraduatedSymbolRendererV2ViewStyle::drawPrimitive( PrimitiveElement elem // ------------------------------ Widget ------------------------------------ -QgsRendererV2Widget* QgsGraduatedSymbolRendererV2Widget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) +QgsRendererWidget* QgsGraduatedSymbolRendererWidget::create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) { - return new QgsGraduatedSymbolRendererV2Widget( layer, style, renderer ); + return new QgsGraduatedSymbolRendererWidget( layer, style, renderer ); } static QgsExpressionContext _getExpressionContext( const void* context ) { - const QgsGraduatedSymbolRendererV2Widget* widget = ( const QgsGraduatedSymbolRendererV2Widget* ) context; + const QgsGraduatedSymbolRendererWidget* widget = ( const QgsGraduatedSymbolRendererWidget* ) context; QgsExpressionContext expContext; expContext << QgsExpressionContextUtils::globalScope() @@ -413,8 +413,8 @@ static QgsExpressionContext _getExpressionContext( const void* context ) return expContext; } -QgsGraduatedSymbolRendererV2Widget::QgsGraduatedSymbolRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) - : QgsRendererV2Widget( layer, style ) +QgsGraduatedSymbolRendererWidget::QgsGraduatedSymbolRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) + : QgsRendererWidget( layer, style ) , mRenderer( nullptr ) , mModel( nullptr ) { @@ -424,17 +424,17 @@ QgsGraduatedSymbolRendererV2Widget::QgsGraduatedSymbolRendererV2Widget( QgsVecto // (null renderer means "no previous renderer") if ( renderer ) { - mRenderer = QgsGraduatedSymbolRendererV2::convertFromRenderer( renderer ); + mRenderer = QgsGraduatedSymbolRenderer::convertFromRenderer( renderer ); } if ( !mRenderer ) { - mRenderer = new QgsGraduatedSymbolRendererV2( "", QgsRangeList() ); + mRenderer = new QgsGraduatedSymbolRenderer( "", QgsRangeList() ); } // setup user interface setupUi( this ); - mModel = new QgsGraduatedSymbolRendererV2Model( this ); + mModel = new QgsGraduatedSymbolRendererModel( this ); mExpressionWidget->setFilters( QgsFieldProxyModel::Numeric | QgsFieldProxyModel::Date ); mExpressionWidget->setLayer( mLayer ); @@ -443,8 +443,8 @@ QgsGraduatedSymbolRendererV2Widget::QgsGraduatedSymbolRendererV2Widget( QgsVecto cboGraduatedColorRamp->populate( mStyle ); - spinPrecision->setMinimum( QgsRendererRangeV2LabelFormat::MinPrecision ); - spinPrecision->setMaximum( QgsRendererRangeV2LabelFormat::MaxPrecision ); + spinPrecision->setMinimum( QgsRendererRangeLabelFormat::MinPrecision ); + spinPrecision->setMaximum( QgsRendererRangeLabelFormat::MaxPrecision ); // set project default color ramp QString defaultColorRamp = QgsProject::instance()->readEntry( "DefaultStyles", "/ColorRamp", "" ); @@ -456,7 +456,7 @@ QgsGraduatedSymbolRendererV2Widget::QgsGraduatedSymbolRendererV2Widget( QgsVecto } - viewGraduated->setStyle( new QgsGraduatedSymbolRendererV2ViewStyle( viewGraduated->style() ) ); + viewGraduated->setStyle( new QgsGraduatedSymbolRendererViewStyle( viewGraduated->style() ) ); mGraduatedSymbol = QgsSymbol::defaultSymbol( mLayer->geometryType() ); @@ -510,7 +510,7 @@ QgsGraduatedSymbolRendererV2Widget::QgsGraduatedSymbolRendererV2Widget( QgsVecto mExpressionWidget->registerGetExpressionContextCallback( &_getExpressionContext, this ); } -void QgsGraduatedSymbolRendererV2Widget::on_mSizeUnitWidget_changed() +void QgsGraduatedSymbolRendererWidget::on_mSizeUnitWidget_changed() { if ( !mGraduatedSymbol ) return; mGraduatedSymbol->setOutputUnit( mSizeUnitWidget->unit() ); @@ -520,21 +520,21 @@ void QgsGraduatedSymbolRendererV2Widget::on_mSizeUnitWidget_changed() refreshSymbolView(); } -QgsGraduatedSymbolRendererV2Widget::~QgsGraduatedSymbolRendererV2Widget() +QgsGraduatedSymbolRendererWidget::~QgsGraduatedSymbolRendererWidget() { delete mRenderer; delete mModel; delete mGraduatedSymbol; } -QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2Widget::renderer() +QgsFeatureRenderer* QgsGraduatedSymbolRendererWidget::renderer() { return mRenderer; } // Connect/disconnect event handlers which trigger updating renderer -void QgsGraduatedSymbolRendererV2Widget::connectUpdateHandlers() +void QgsGraduatedSymbolRendererWidget::connectUpdateHandlers() { connect( spinGraduatedClasses, SIGNAL( valueChanged( int ) ), this, SLOT( classifyGraduated() ) ); connect( cboGraduatedMode, SIGNAL( currentIndexChanged( int ) ), this, SLOT( classifyGraduated() ) ); @@ -554,7 +554,7 @@ void QgsGraduatedSymbolRendererV2Widget::connectUpdateHandlers() // Connect/disconnect event handlers which trigger updating renderer -void QgsGraduatedSymbolRendererV2Widget::disconnectUpdateHandlers() +void QgsGraduatedSymbolRendererWidget::disconnectUpdateHandlers() { disconnect( spinGraduatedClasses, SIGNAL( valueChanged( int ) ), this, SLOT( classifyGraduated() ) ); disconnect( cboGraduatedMode, SIGNAL( currentIndexChanged( int ) ), this, SLOT( classifyGraduated() ) ); @@ -572,7 +572,7 @@ void QgsGraduatedSymbolRendererV2Widget::disconnectUpdateHandlers() disconnect( mModel, SIGNAL( dataChanged( QModelIndex, QModelIndex ) ), this, SLOT( modelDataChanged() ) ); } -void QgsGraduatedSymbolRendererV2Widget::updateUiFromRenderer( bool updateCount ) +void QgsGraduatedSymbolRendererWidget::updateUiFromRenderer( bool updateCount ) { disconnectUpdateHandlers(); @@ -613,7 +613,7 @@ void QgsGraduatedSymbolRendererV2Widget::updateUiFromRenderer( bool updateCount // set source color ramp methodComboBox->blockSignals( true ); - if ( mRenderer->graduatedMethod() == QgsGraduatedSymbolRendererV2::GraduatedColor ) + if ( mRenderer->graduatedMethod() == QgsGraduatedSymbolRenderer::GraduatedColor ) { methodComboBox->setCurrentIndex( 0 ); if ( mRenderer->sourceColorRamp() ) @@ -632,7 +632,7 @@ void QgsGraduatedSymbolRendererV2Widget::updateUiFromRenderer( bool updateCount mMethodStackedWidget->setCurrentIndex( methodComboBox->currentIndex() ); methodComboBox->blockSignals( false ); - QgsRendererRangeV2LabelFormat labelFormat = mRenderer->labelFormat(); + QgsRendererRangeLabelFormat labelFormat = mRenderer->labelFormat(); txtLegendFormat->setText( labelFormat.format() ); spinPrecision->setValue( labelFormat.precision() ); cbxTrimTrailingZeroes->setChecked( labelFormat.trimTrailingZeroes() ); @@ -647,18 +647,18 @@ void QgsGraduatedSymbolRendererV2Widget::updateUiFromRenderer( bool updateCount emit widgetChanged(); } -void QgsGraduatedSymbolRendererV2Widget::graduatedColumnChanged( const QString& field ) +void QgsGraduatedSymbolRendererWidget::graduatedColumnChanged( const QString& field ) { mRenderer->setClassAttribute( field ); } -void QgsGraduatedSymbolRendererV2Widget::on_methodComboBox_currentIndexChanged( int idx ) +void QgsGraduatedSymbolRendererWidget::on_methodComboBox_currentIndexChanged( int idx ) { mMethodStackedWidget->setCurrentIndex( idx ); if ( idx == 0 ) { - mRenderer->setGraduatedMethod( QgsGraduatedSymbolRendererV2::GraduatedColor ); - QgsVectorColorRampV2* ramp = cboGraduatedColorRamp->currentColorRamp(); + mRenderer->setGraduatedMethod( QgsGraduatedSymbolRenderer::GraduatedColor ); + QgsVectorColorRamp* ramp = cboGraduatedColorRamp->currentColorRamp(); if ( !ramp ) { @@ -673,12 +673,12 @@ void QgsGraduatedSymbolRendererV2Widget::on_methodComboBox_currentIndexChanged( } else { - mRenderer->setGraduatedMethod( QgsGraduatedSymbolRendererV2::GraduatedSize ); + mRenderer->setGraduatedMethod( QgsGraduatedSymbolRenderer::GraduatedSize ); reapplySizes(); } } -void QgsGraduatedSymbolRendererV2Widget::refreshRanges( bool reset ) +void QgsGraduatedSymbolRendererWidget::refreshRanges( bool reset ) { if ( !mModel ) return; @@ -687,7 +687,7 @@ void QgsGraduatedSymbolRendererV2Widget::refreshRanges( bool reset ) emit widgetChanged(); } -void QgsGraduatedSymbolRendererV2Widget::cleanUpSymbolSelector( QgsPanelWidget *container ) +void QgsGraduatedSymbolRendererWidget::cleanUpSymbolSelector( QgsPanelWidget *container ) { if ( container ) { @@ -696,7 +696,7 @@ void QgsGraduatedSymbolRendererV2Widget::cleanUpSymbolSelector( QgsPanelWidget * } } -void QgsGraduatedSymbolRendererV2Widget::updateSymbolsFromWidget() +void QgsGraduatedSymbolRendererWidget::updateSymbolsFromWidget() { QgsSymbolSelectorWidget* dlg = qobject_cast( sender() ); delete mGraduatedSymbol; @@ -737,13 +737,13 @@ void QgsGraduatedSymbolRendererV2Widget::updateSymbolsFromWidget() } -void QgsGraduatedSymbolRendererV2Widget::classifyGraduated() +void QgsGraduatedSymbolRendererWidget::classifyGraduated() { QString attrName = mExpressionWidget->currentField(); int nclasses = spinGraduatedClasses->value(); - QSharedPointer ramp( cboGraduatedColorRamp->currentColorRamp() ); + QSharedPointer ramp( cboGraduatedColorRamp->currentColorRamp() ); if ( !ramp ) { if ( cboGraduatedColorRamp->count() == 0 ) @@ -753,21 +753,21 @@ void QgsGraduatedSymbolRendererV2Widget::classifyGraduated() return; } - QgsGraduatedSymbolRendererV2::Mode mode; + QgsGraduatedSymbolRenderer::Mode mode; if ( cboGraduatedMode->currentIndex() == 0 ) - mode = QgsGraduatedSymbolRendererV2::EqualInterval; + mode = QgsGraduatedSymbolRenderer::EqualInterval; else if ( cboGraduatedMode->currentIndex() == 2 ) - mode = QgsGraduatedSymbolRendererV2::Jenks; + mode = QgsGraduatedSymbolRenderer::Jenks; else if ( cboGraduatedMode->currentIndex() == 3 ) - mode = QgsGraduatedSymbolRendererV2::StdDev; + mode = QgsGraduatedSymbolRenderer::StdDev; else if ( cboGraduatedMode->currentIndex() == 4 ) - mode = QgsGraduatedSymbolRendererV2::Pretty; + mode = QgsGraduatedSymbolRenderer::Pretty; else // default should be quantile for now - mode = QgsGraduatedSymbolRendererV2::Quantile; + mode = QgsGraduatedSymbolRenderer::Quantile; // Jenks is n^2 complexity, warn for big dataset (more than 50k records) // and give the user the chance to cancel - if ( QgsGraduatedSymbolRendererV2::Jenks == mode && mLayer->featureCount() > 50000 ) + if ( QgsGraduatedSymbolRenderer::Jenks == mode && mLayer->featureCount() > 50000 ) { if ( QMessageBox::Cancel == QMessageBox::question( this, tr( "Warning" ), tr( "Natural break classification (Jenks) is O(n2) complexity, your classification may take a long time.\nPress cancel to abort breaks calculation or OK to continue." ), QMessageBox::Cancel, QMessageBox::Ok ) ) return; @@ -780,7 +780,7 @@ void QgsGraduatedSymbolRendererV2Widget::classifyGraduated() if ( methodComboBox->currentIndex() == 0 ) { - QgsVectorColorRampV2* ramp = cboGraduatedColorRamp->currentColorRamp(); + QgsVectorColorRamp* ramp = cboGraduatedColorRamp->currentColorRamp(); if ( !ramp ) { @@ -810,9 +810,9 @@ void QgsGraduatedSymbolRendererV2Widget::classifyGraduated() updateUiFromRenderer( false ); } -void QgsGraduatedSymbolRendererV2Widget::reapplyColorRamp() +void QgsGraduatedSymbolRendererWidget::reapplyColorRamp() { - QgsVectorColorRampV2* ramp = cboGraduatedColorRamp->currentColorRamp(); + QgsVectorColorRamp* ramp = cboGraduatedColorRamp->currentColorRamp(); if ( !ramp ) return; @@ -821,14 +821,14 @@ void QgsGraduatedSymbolRendererV2Widget::reapplyColorRamp() refreshSymbolView(); } -void QgsGraduatedSymbolRendererV2Widget::reapplySizes() +void QgsGraduatedSymbolRendererWidget::reapplySizes() { mRenderer->setSymbolSizes( minSizeSpinBox->value(), maxSizeSpinBox->value() ); mRenderer->updateSymbols( mGraduatedSymbol ); refreshSymbolView(); } -void QgsGraduatedSymbolRendererV2Widget::changeGraduatedSymbol() +void QgsGraduatedSymbolRendererWidget::changeGraduatedSymbol() { QgsSymbol* newSymbol = mGraduatedSymbol->clone(); QgsSymbolSelectorWidget* dlg = new QgsSymbolSelectorWidget( newSymbol, mStyle, mLayer, nullptr ); @@ -839,7 +839,7 @@ void QgsGraduatedSymbolRendererV2Widget::changeGraduatedSymbol() openPanel( dlg ); } -void QgsGraduatedSymbolRendererV2Widget::updateGraduatedSymbolIcon() +void QgsGraduatedSymbolRendererWidget::updateGraduatedSymbolIcon() { if ( !mGraduatedSymbol ) return; @@ -849,7 +849,7 @@ void QgsGraduatedSymbolRendererV2Widget::updateGraduatedSymbolIcon() } #if 0 -int QgsRendererV2PropertiesDialog::currentRangeRow() +int QgsRendererPropertiesDialog::currentRangeRow() { QModelIndex idx = viewGraduated->selectionModel()->currentIndex(); if ( !idx.isValid() ) @@ -858,7 +858,7 @@ int QgsRendererV2PropertiesDialog::currentRangeRow() } #endif -QList QgsGraduatedSymbolRendererV2Widget::selectedClasses() +QList QgsGraduatedSymbolRendererWidget::selectedClasses() { QList rows; QModelIndexList selectedRows = viewGraduated->selectionModel()->selectedRows(); @@ -873,7 +873,7 @@ QList QgsGraduatedSymbolRendererV2Widget::selectedClasses() return rows; } -QgsRangeList QgsGraduatedSymbolRendererV2Widget::selectedRanges() +QgsRangeList QgsGraduatedSymbolRendererWidget::selectedRanges() { QgsRangeList selectedRanges; QModelIndexList selectedRows = viewGraduated->selectionModel()->selectedRows(); @@ -886,7 +886,7 @@ QgsRangeList QgsGraduatedSymbolRendererV2Widget::selectedRanges() return selectedRanges; } -void QgsGraduatedSymbolRendererV2Widget::rangesDoubleClicked( const QModelIndex & idx ) +void QgsGraduatedSymbolRendererWidget::rangesDoubleClicked( const QModelIndex & idx ) { if ( idx.isValid() && idx.column() == 0 ) changeRangeSymbol( idx.row() ); @@ -894,7 +894,7 @@ void QgsGraduatedSymbolRendererV2Widget::rangesDoubleClicked( const QModelIndex changeRange( idx.row() ); } -void QgsGraduatedSymbolRendererV2Widget::rangesClicked( const QModelIndex & idx ) +void QgsGraduatedSymbolRendererWidget::rangesClicked( const QModelIndex & idx ) { if ( !idx.isValid() ) mRowSelected = -1; @@ -902,11 +902,11 @@ void QgsGraduatedSymbolRendererV2Widget::rangesClicked( const QModelIndex & idx mRowSelected = idx.row(); } -void QgsGraduatedSymbolRendererV2Widget::changeSelectedSymbols() +void QgsGraduatedSymbolRendererWidget::changeSelectedSymbols() { } -void QgsGraduatedSymbolRendererV2Widget::changeRangeSymbol( int rangeIdx ) +void QgsGraduatedSymbolRendererWidget::changeRangeSymbol( int rangeIdx ) { QgsSymbol* newSymbol = mRenderer->ranges()[rangeIdx].symbol()->clone(); QgsSymbolSelectorWidget* dlg = new QgsSymbolSelectorWidget( newSymbol, mStyle, mLayer, nullptr ); @@ -918,11 +918,11 @@ void QgsGraduatedSymbolRendererV2Widget::changeRangeSymbol( int rangeIdx ) openPanel( dlg ); } -void QgsGraduatedSymbolRendererV2Widget::changeRange( int rangeIdx ) +void QgsGraduatedSymbolRendererWidget::changeRange( int rangeIdx ) { QgsLUDialog dialog( this ); - const QgsRendererRangeV2& range = mRenderer->ranges()[rangeIdx]; + const QgsRendererRange& range = mRenderer->ranges()[rangeIdx]; // Add arbitrary 2 to number of decimal places to retain a bit extra. // Ensures users can see if legend is not completely honest! int decimalPlaces = mRenderer->labelFormat().precision() + 2; @@ -955,26 +955,26 @@ void QgsGraduatedSymbolRendererV2Widget::changeRange( int rangeIdx ) emit widgetChanged(); } -void QgsGraduatedSymbolRendererV2Widget::addClass() +void QgsGraduatedSymbolRendererWidget::addClass() { mModel->addClass( mGraduatedSymbol ); mHistogramWidget->refresh(); } -void QgsGraduatedSymbolRendererV2Widget::deleteClasses() +void QgsGraduatedSymbolRendererWidget::deleteClasses() { QList classIndexes = selectedClasses(); mModel->deleteRows( classIndexes ); mHistogramWidget->refresh(); } -void QgsGraduatedSymbolRendererV2Widget::deleteAllClasses() +void QgsGraduatedSymbolRendererWidget::deleteAllClasses() { mModel->removeAllRows(); mHistogramWidget->refresh(); } -bool QgsGraduatedSymbolRendererV2Widget::rowsOrdered() +bool QgsGraduatedSymbolRendererWidget::rowsOrdered() { const QgsRangeList &ranges = mRenderer->ranges(); bool ordered = true; @@ -989,7 +989,7 @@ bool QgsGraduatedSymbolRendererV2Widget::rowsOrdered() return ordered; } -void QgsGraduatedSymbolRendererV2Widget::toggleBoundariesLink( bool linked ) +void QgsGraduatedSymbolRendererWidget::toggleBoundariesLink( bool linked ) { //If the checkbox controlling the link between boundaries was unchecked and we check it, we have to link the boundaries //This is done by updating all lower ranges to the upper value of the range above @@ -1019,7 +1019,7 @@ void QgsGraduatedSymbolRendererV2Widget::toggleBoundariesLink( bool linked ) } } -void QgsGraduatedSymbolRendererV2Widget::changeCurrentValue( QStandardItem * item ) +void QgsGraduatedSymbolRendererWidget::changeCurrentValue( QStandardItem * item ) { if ( item->column() == 2 ) { @@ -1029,19 +1029,19 @@ void QgsGraduatedSymbolRendererV2Widget::changeCurrentValue( QStandardItem * ite } } -void QgsGraduatedSymbolRendererV2Widget::sizeScaleFieldChanged( const QString& fldName ) +void QgsGraduatedSymbolRendererWidget::sizeScaleFieldChanged( const QString& fldName ) { mRenderer->setSizeScaleField( fldName ); } -void QgsGraduatedSymbolRendererV2Widget::scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod ) +void QgsGraduatedSymbolRendererWidget::scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod ) { mRenderer->setScaleMethod( scaleMethod ); } -void QgsGraduatedSymbolRendererV2Widget::labelFormatChanged() +void QgsGraduatedSymbolRendererWidget::labelFormatChanged() { - QgsRendererRangeV2LabelFormat labelFormat = QgsRendererRangeV2LabelFormat( + QgsRendererRangeLabelFormat labelFormat = QgsRendererRangeLabelFormat( txtLegendFormat->text(), spinPrecision->value(), cbxTrimTrailingZeroes->isChecked() ); @@ -1050,7 +1050,7 @@ void QgsGraduatedSymbolRendererV2Widget::labelFormatChanged() } -QList QgsGraduatedSymbolRendererV2Widget::selectedSymbols() +QList QgsGraduatedSymbolRendererWidget::selectedSymbols() { QList selectedSymbols; @@ -1080,7 +1080,7 @@ QList QgsGraduatedSymbolRendererV2Widget::selectedSymbols() return selectedSymbols; } -QgsSymbol* QgsGraduatedSymbolRendererV2Widget::findSymbolForRange( double lowerBound, double upperBound, const QgsRangeList& ranges ) const +QgsSymbol* QgsGraduatedSymbolRendererWidget::findSymbolForRange( double lowerBound, double upperBound, const QgsRangeList& ranges ) const { int decimalPlaces = mRenderer->labelFormat().precision() + 2; if ( decimalPlaces < 0 ) @@ -1097,7 +1097,7 @@ QgsSymbol* QgsGraduatedSymbolRendererV2Widget::findSymbolForRange( double lowerB return nullptr; } -void QgsGraduatedSymbolRendererV2Widget::refreshSymbolView() +void QgsGraduatedSymbolRendererWidget::refreshSymbolView() { if ( mModel ) { @@ -1107,12 +1107,12 @@ void QgsGraduatedSymbolRendererV2Widget::refreshSymbolView() emit widgetChanged(); } -void QgsGraduatedSymbolRendererV2Widget::showSymbolLevels() +void QgsGraduatedSymbolRendererWidget::showSymbolLevels() { showSymbolLevelsDialog( mRenderer ); } -void QgsGraduatedSymbolRendererV2Widget::rowsMoved() +void QgsGraduatedSymbolRendererWidget::rowsMoved() { viewGraduated->selectionModel()->clear(); if ( ! rowsOrdered() ) @@ -1122,12 +1122,12 @@ void QgsGraduatedSymbolRendererV2Widget::rowsMoved() emit widgetChanged(); } -void QgsGraduatedSymbolRendererV2Widget::modelDataChanged() +void QgsGraduatedSymbolRendererWidget::modelDataChanged() { emit widgetChanged(); } -void QgsGraduatedSymbolRendererV2Widget::keyPressEvent( QKeyEvent* event ) +void QgsGraduatedSymbolRendererWidget::keyPressEvent( QKeyEvent* event ) { if ( !event ) { diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h b/src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.h similarity index 79% rename from src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h rename to src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.h index 6f776e28474..795008b8e5f 100644 --- a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h +++ b/src/gui/symbology-ng/qgsgraduatedsymbolrendererwidget.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsgraduatedsymbolrendererv2widget.h + qgsgraduatedsymbolrendererwidget.h --------------------- begin : December 2009 copyright : (C) 2009 by Martin Dobias @@ -16,8 +16,8 @@ #ifndef QGSGRADUATEDSYMBOLRENDERERV2WIDGET_H #define QGSGRADUATEDSYMBOLRENDERERV2WIDGET_H -#include "qgsgraduatedsymbolrendererv2.h" -#include "qgsrendererv2widget.h" +#include "qgsgraduatedsymbolrenderer.h" +#include "qgsrendererwidget.h" #include #include @@ -25,11 +25,11 @@ /// @cond PRIVATE -class GUI_EXPORT QgsGraduatedSymbolRendererV2Model : public QAbstractItemModel +class GUI_EXPORT QgsGraduatedSymbolRendererModel : public QAbstractItemModel { Q_OBJECT public: - QgsGraduatedSymbolRendererV2Model( QObject * parent = nullptr ); + QgsGraduatedSymbolRendererModel( QObject * parent = nullptr ); Qt::ItemFlags flags( const QModelIndex & index ) const override; Qt::DropActions supportedDropActions() const override; QVariant data( const QModelIndex &index, int role ) const override; @@ -43,11 +43,11 @@ class GUI_EXPORT QgsGraduatedSymbolRendererV2Model : public QAbstractItemModel QMimeData *mimeData( const QModelIndexList &indexes ) const override; bool dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent ) override; - void setRenderer( QgsGraduatedSymbolRendererV2* renderer ); + void setRenderer( QgsGraduatedSymbolRenderer* renderer ); - QgsRendererRangeV2 rendererRange( const QModelIndex &index ); + QgsRendererRange rendererRange( const QModelIndex &index ); void addClass( QgsSymbol* symbol ); - void addClass( const QgsRendererRangeV2& range ); + void addClass( const QgsRendererRange& range ); void deleteRows( QList rows ); void removeAllRows(); void sort( int column, Qt::SortOrder order = Qt::AscendingOrder ) override; @@ -58,17 +58,17 @@ class GUI_EXPORT QgsGraduatedSymbolRendererV2Model : public QAbstractItemModel void rowsMoved(); private: - QgsGraduatedSymbolRendererV2* mRenderer; + QgsGraduatedSymbolRenderer* mRenderer; QString mMimeFormat; }; // View style which shows drop indicator line between items -class QgsGraduatedSymbolRendererV2ViewStyle: public QProxyStyle +class QgsGraduatedSymbolRendererViewStyle: public QProxyStyle { Q_OBJECT public: - explicit QgsGraduatedSymbolRendererV2ViewStyle( QStyle* style = nullptr ); + explicit QgsGraduatedSymbolRendererViewStyle( QStyle* style = nullptr ); void drawPrimitive( PrimitiveElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget = nullptr ) const override; }; @@ -76,19 +76,19 @@ class QgsGraduatedSymbolRendererV2ViewStyle: public QProxyStyle ///@endcond /** \ingroup gui - * \class QgsGraduatedSymbolRendererV2Widget + * \class QgsGraduatedSymbolRendererWidget */ -class GUI_EXPORT QgsGraduatedSymbolRendererV2Widget : public QgsRendererV2Widget, private Ui::QgsGraduatedSymbolRendererV2Widget +class GUI_EXPORT QgsGraduatedSymbolRendererWidget : public QgsRendererWidget, private Ui::QgsGraduatedSymbolRendererWidget { Q_OBJECT public: - static QgsRendererV2Widget* create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); + static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); - QgsGraduatedSymbolRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); - ~QgsGraduatedSymbolRendererV2Widget(); + QgsGraduatedSymbolRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); + ~QgsGraduatedSymbolRendererWidget(); - virtual QgsFeatureRendererV2* renderer() override; + virtual QgsFeatureRenderer* renderer() override; public slots: void changeGraduatedSymbol(); @@ -149,13 +149,13 @@ class GUI_EXPORT QgsGraduatedSymbolRendererV2Widget : public QgsRendererV2Widget void keyPressEvent( QKeyEvent* event ) override; protected: - QgsGraduatedSymbolRendererV2* mRenderer; + QgsGraduatedSymbolRenderer* mRenderer; QgsSymbol* mGraduatedSymbol; int mRowSelected; - QgsGraduatedSymbolRendererV2Model* mModel; + QgsGraduatedSymbolRendererModel* mModel; QgsRangeList mCopyBuffer; }; diff --git a/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp b/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp index 955d1b7df2e..4f376ea7df3 100644 --- a/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp +++ b/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp @@ -14,20 +14,20 @@ ***************************************************************************/ #include "qgsheatmaprendererwidget.h" #include "qgsheatmaprenderer.h" -#include "qgsrendererv2registry.h" +#include "qgsrendererregistry.h" #include "qgssymbol.h" #include "qgslogger.h" #include "qgsvectorlayer.h" -#include "qgsvectorcolorrampv2.h" -#include "qgsstylev2.h" +#include "qgsvectorcolorramp.h" +#include "qgsstyle.h" #include "qgsproject.h" #include "qgsmapcanvas.h" #include #include -QgsRendererV2Widget* QgsHeatmapRendererWidget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) +QgsRendererWidget* QgsHeatmapRendererWidget::create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) { return new QgsHeatmapRendererWidget( layer, style, renderer ); } @@ -57,8 +57,8 @@ static QgsExpressionContext _getExpressionContext( const void* context ) return expContext; } -QgsHeatmapRendererWidget::QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) - : QgsRendererV2Widget( layer, style ) +QgsHeatmapRendererWidget::QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) + : QgsRendererWidget( layer, style ) , mRenderer( nullptr ) { if ( !layer ) @@ -92,7 +92,7 @@ QgsHeatmapRendererWidget::QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsSt } mRampComboBox->setShowGradientOnly( true ); - mRampComboBox->populate( QgsStyleV2::defaultStyle() ); + mRampComboBox->populate( QgsStyle::defaultStyle() ); connect( mRampComboBox, SIGNAL( currentIndexChanged( int ) ), this, SLOT( applyColorRamp() ) ); connect( mRampComboBox, SIGNAL( sourceRampEdited() ), this, SLOT( applyColorRamp() ) ); connect( mButtonEditRamp, SIGNAL( clicked() ), mRampComboBox, SLOT( editSourceRamp() ) ); @@ -125,14 +125,14 @@ QgsHeatmapRendererWidget::QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsSt connect( mWeightExpressionWidget, SIGNAL( fieldChanged( QString ) ), this, SLOT( weightExpressionChanged( QString ) ) ); } -QgsFeatureRendererV2* QgsHeatmapRendererWidget::renderer() +QgsFeatureRenderer* QgsHeatmapRendererWidget::renderer() { return mRenderer; } void QgsHeatmapRendererWidget::setMapCanvas( QgsMapCanvas* canvas ) { - QgsRendererV2Widget::setMapCanvas( canvas ); + QgsRendererWidget::setMapCanvas( canvas ); if ( mRadiusUnitWidget ) mRadiusUnitWidget->setMapCanvas( canvas ); } @@ -144,7 +144,7 @@ void QgsHeatmapRendererWidget::applyColorRamp() return; } - QgsVectorColorRampV2* ramp = mRampComboBox->currentColorRamp(); + QgsVectorColorRamp* ramp = mRampComboBox->currentColorRamp(); if ( !ramp ) return; diff --git a/src/gui/symbology-ng/qgsheatmaprendererwidget.h b/src/gui/symbology-ng/qgsheatmaprendererwidget.h index 6c69deb8a01..9946bc13da1 100644 --- a/src/gui/symbology-ng/qgsheatmaprendererwidget.h +++ b/src/gui/symbology-ng/qgsheatmaprendererwidget.h @@ -16,7 +16,7 @@ #define QGSHEATMAPRENDERERWIDGET_H #include "ui_qgsheatmaprendererwidgetbase.h" -#include "qgsrendererv2widget.h" +#include "qgsrendererwidget.h" class QMenu; class QgsHeatmapRenderer; @@ -24,7 +24,7 @@ class QgsHeatmapRenderer; /** \ingroup gui * \class QgsHeatmapRendererWidget */ -class GUI_EXPORT QgsHeatmapRendererWidget : public QgsRendererV2Widget, private Ui::QgsHeatmapRendererWidgetBase +class GUI_EXPORT QgsHeatmapRendererWidget : public QgsRendererWidget, private Ui::QgsHeatmapRendererWidgetBase { Q_OBJECT @@ -34,17 +34,17 @@ class GUI_EXPORT QgsHeatmapRendererWidget : public QgsRendererV2Widget, private * @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) */ - QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); + QgsHeatmapRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); /** @returns the current feature renderer */ - virtual QgsFeatureRendererV2* renderer() override; + virtual QgsFeatureRenderer* renderer() override; void setMapCanvas( QgsMapCanvas* canvas ) override; diff --git a/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp b/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp index c794665d01f..8ed510d88f8 100644 --- a/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp +++ b/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp @@ -14,20 +14,20 @@ ***************************************************************************/ #include "qgsinvertedpolygonrendererwidget.h" #include "qgsinvertedpolygonrenderer.h" -#include "qgsrendererv2registry.h" +#include "qgsrendererregistry.h" #include "qgssymbol.h" #include "qgslogger.h" #include "qgsvectorlayer.h" -QgsRendererV2Widget* QgsInvertedPolygonRendererWidget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) +QgsRendererWidget* QgsInvertedPolygonRendererWidget::create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) { return new QgsInvertedPolygonRendererWidget( layer, style, renderer ); } -QgsInvertedPolygonRendererWidget::QgsInvertedPolygonRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) - : QgsRendererV2Widget( layer, style ) +QgsInvertedPolygonRendererWidget::QgsInvertedPolygonRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) + : QgsRendererWidget( layer, style ) { if ( !layer ) { @@ -68,7 +68,7 @@ QgsInvertedPolygonRendererWidget::QgsInvertedPolygonRendererWidget( QgsVectorLay int currentEmbeddedIdx = 0; //insert possible renderer types - QStringList rendererList = QgsRendererV2Registry::instance()->renderersList( QgsRendererV2AbstractMetadata::PolygonLayer ); + QStringList rendererList = QgsRendererRegistry::instance()->renderersList( QgsRendererAbstractMetadata::PolygonLayer ); QStringList::const_iterator it = rendererList.constBegin(); int idx = 0; mRendererComboBox->blockSignals( true ); @@ -76,9 +76,9 @@ QgsInvertedPolygonRendererWidget::QgsInvertedPolygonRendererWidget( QgsVectorLay { if ( *it != "invertedPolygonRenderer" ) //< an inverted renderer cannot contain another inverted renderer { - QgsRendererV2AbstractMetadata* m = QgsRendererV2Registry::instance()->rendererMetadata( *it ); + QgsRendererAbstractMetadata* m = QgsRendererRegistry::instance()->rendererMetadata( *it ); mRendererComboBox->addItem( m->icon(), m->visibleName(), /* data */ *it ); - const QgsFeatureRendererV2* embeddedRenderer = mRenderer->embeddedRenderer(); + const QgsFeatureRenderer* embeddedRenderer = mRenderer->embeddedRenderer(); if ( embeddedRenderer && embeddedRenderer->type() == m->name() ) { // store the combo box index of the current renderer @@ -97,11 +97,11 @@ QgsInvertedPolygonRendererWidget::QgsInvertedPolygonRendererWidget( QgsVectorLay } } -QgsFeatureRendererV2* QgsInvertedPolygonRendererWidget::renderer() +QgsFeatureRenderer* QgsInvertedPolygonRendererWidget::renderer() { if ( mRenderer && mEmbeddedRendererWidget ) { - QgsFeatureRendererV2* embeddedRenderer = mEmbeddedRendererWidget->renderer(); + QgsFeatureRenderer* embeddedRenderer = mEmbeddedRendererWidget->renderer(); if ( embeddedRenderer ) { mRenderer->setEmbeddedRenderer( embeddedRenderer->clone() ); @@ -112,7 +112,7 @@ QgsFeatureRendererV2* QgsInvertedPolygonRendererWidget::renderer() void QgsInvertedPolygonRendererWidget::setMapCanvas( QgsMapCanvas* canvas ) { - QgsRendererV2Widget::setMapCanvas( canvas ); + QgsRendererWidget::setMapCanvas( canvas ); if ( mEmbeddedRendererWidget ) mEmbeddedRendererWidget->setMapCanvas( canvas ); } @@ -120,10 +120,10 @@ void QgsInvertedPolygonRendererWidget::setMapCanvas( QgsMapCanvas* canvas ) void QgsInvertedPolygonRendererWidget::on_mRendererComboBox_currentIndexChanged( int index ) { QString rendererId = mRendererComboBox->itemData( index ).toString(); - QgsRendererV2AbstractMetadata* m = QgsRendererV2Registry::instance()->rendererMetadata( rendererId ); + QgsRendererAbstractMetadata* m = QgsRendererRegistry::instance()->rendererMetadata( rendererId ); if ( m ) { - mEmbeddedRendererWidget.reset( m->createRendererWidget( mLayer, mStyle, const_cast( mRenderer->embeddedRenderer() )->clone() ) ); + mEmbeddedRendererWidget.reset( m->createRendererWidget( mLayer, mStyle, const_cast( mRenderer->embeddedRenderer() )->clone() ) ); connect( mEmbeddedRendererWidget.data(), SIGNAL( widgetChanged() ), this, SIGNAL( widgetChanged() ) ); mEmbeddedRendererWidget->setMapCanvas( mMapCanvas ); diff --git a/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.h b/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.h index df4b1d46985..fa8dbbf871b 100644 --- a/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.h +++ b/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.h @@ -17,7 +17,7 @@ #include "ui_qgsinvertedpolygonrendererwidgetbase.h" #include "qgsinvertedpolygonrenderer.h" -#include "qgsrendererv2widget.h" +#include "qgsrendererwidget.h" class QMenu; @@ -26,7 +26,7 @@ class QMenu; * * @note added in 2.4 */ -class GUI_EXPORT QgsInvertedPolygonRendererWidget : public QgsRendererV2Widget, private Ui::QgsInvertedPolygonRendererWidgetBase +class GUI_EXPORT QgsInvertedPolygonRendererWidget : public QgsRendererWidget, private Ui::QgsInvertedPolygonRendererWidgetBase { Q_OBJECT @@ -36,24 +36,24 @@ class GUI_EXPORT QgsInvertedPolygonRendererWidget : public 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) */ - QgsInvertedPolygonRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); + QgsInvertedPolygonRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); /** @returns the current feature renderer */ - virtual QgsFeatureRendererV2* renderer() override; + virtual QgsFeatureRenderer* renderer() override; void setMapCanvas( QgsMapCanvas* canvas ) override; protected: /** The mask renderer */ QScopedPointer mRenderer; /** The widget used to represent the mask's embedded renderer */ - QScopedPointer mEmbeddedRendererWidget; + QScopedPointer mEmbeddedRendererWidget; private slots: void on_mRendererComboBox_currentIndexChanged( int index ); diff --git a/src/gui/symbology-ng/qgslayerpropertieswidget.cpp b/src/gui/symbology-ng/qgslayerpropertieswidget.cpp index 3e2b6032d13..60229979fb1 100644 --- a/src/gui/symbology-ng/qgslayerpropertieswidget.cpp +++ b/src/gui/symbology-ng/qgslayerpropertieswidget.cpp @@ -29,7 +29,7 @@ #include "qgssymbollayerwidget.h" #include "qgsarrowsymbollayerwidget.h" -#include "qgsellipsesymbollayerv2widget.h" +#include "qgsellipsesymbollayerwidget.h" #include "qgsvectorfieldsymbollayerwidget.h" #include "qgssymbol.h" //for the unit #include "qgspanelwidget.h" @@ -60,23 +60,23 @@ static void _initWidgetFunctions() if ( initialized ) return; - _initWidgetFunction( "SimpleLine", QgsSimpleLineSymbolLayerV2Widget::create ); - _initWidgetFunction( "MarkerLine", QgsMarkerLineSymbolLayerV2Widget::create ); + _initWidgetFunction( "SimpleLine", QgsSimpleLineSymbolLayerWidget::create ); + _initWidgetFunction( "MarkerLine", QgsMarkerLineSymbolLayerWidget::create ); _initWidgetFunction( "ArrowLine", QgsArrowSymbolLayerWidget::create ); - _initWidgetFunction( "SimpleMarker", QgsSimpleMarkerSymbolLayerV2Widget::create ); + _initWidgetFunction( "SimpleMarker", QgsSimpleMarkerSymbolLayerWidget::create ); _initWidgetFunction( "FilledMarker", QgsFilledMarkerSymbolLayerWidget::create ); - _initWidgetFunction( "SvgMarker", QgsSvgMarkerSymbolLayerV2Widget::create ); - _initWidgetFunction( "FontMarker", QgsFontMarkerSymbolLayerV2Widget::create ); - _initWidgetFunction( "EllipseMarker", QgsEllipseSymbolLayerV2Widget::create ); + _initWidgetFunction( "SvgMarker", QgsSvgMarkerSymbolLayerWidget::create ); + _initWidgetFunction( "FontMarker", QgsFontMarkerSymbolLayerWidget::create ); + _initWidgetFunction( "EllipseMarker", QgsEllipseSymbolLayerWidget::create ); _initWidgetFunction( "VectorField", QgsVectorFieldSymbolLayerWidget::create ); - _initWidgetFunction( "SimpleFill", QgsSimpleFillSymbolLayerV2Widget::create ); - _initWidgetFunction( "GradientFill", QgsGradientFillSymbolLayerV2Widget::create ); - _initWidgetFunction( "ShapeburstFill", QgsShapeburstFillSymbolLayerV2Widget::create ); + _initWidgetFunction( "SimpleFill", QgsSimpleFillSymbolLayerWidget::create ); + _initWidgetFunction( "GradientFill", QgsGradientFillSymbolLayerWidget::create ); + _initWidgetFunction( "ShapeburstFill", QgsShapeburstFillSymbolLayerWidget::create ); _initWidgetFunction( "RasterFill", QgsRasterFillSymbolLayerWidget::create ); _initWidgetFunction( "SVGFill", QgsSVGFillSymbolLayerWidget::create ); - _initWidgetFunction( "CentroidFill", QgsCentroidFillSymbolLayerV2Widget::create ); + _initWidgetFunction( "CentroidFill", QgsCentroidFillSymbolLayerWidget::create ); _initWidgetFunction( "LinePatternFill", QgsLinePatternFillSymbolLayerWidget::create ); _initWidgetFunction( "PointPatternFill", QgsPointPatternFillSymbolLayerWidget::create ); diff --git a/src/gui/symbology-ng/qgsnullsymbolrendererwidget.cpp b/src/gui/symbology-ng/qgsnullsymbolrendererwidget.cpp index 415025548dc..3112848c667 100644 --- a/src/gui/symbology-ng/qgsnullsymbolrendererwidget.cpp +++ b/src/gui/symbology-ng/qgsnullsymbolrendererwidget.cpp @@ -19,13 +19,13 @@ #include #include -QgsRendererV2Widget* QgsNullSymbolRendererWidget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) +QgsRendererWidget* QgsNullSymbolRendererWidget::create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) { return new QgsNullSymbolRendererWidget( layer, style, renderer ); } -QgsNullSymbolRendererWidget::QgsNullSymbolRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) - : QgsRendererV2Widget( layer, style ) +QgsNullSymbolRendererWidget::QgsNullSymbolRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) + : QgsRendererWidget( layer, style ) , mRenderer( nullptr ) { if ( renderer ) @@ -47,7 +47,7 @@ QgsNullSymbolRendererWidget::~QgsNullSymbolRendererWidget() delete mRenderer; } -QgsFeatureRendererV2* QgsNullSymbolRendererWidget::renderer() +QgsFeatureRenderer* QgsNullSymbolRendererWidget::renderer() { return mRenderer; } diff --git a/src/gui/symbology-ng/qgsnullsymbolrendererwidget.h b/src/gui/symbology-ng/qgsnullsymbolrendererwidget.h index 5ec7cd9e7c9..6fab073bf8c 100644 --- a/src/gui/symbology-ng/qgsnullsymbolrendererwidget.h +++ b/src/gui/symbology-ng/qgsnullsymbolrendererwidget.h @@ -15,7 +15,7 @@ #ifndef QGSNULLSYMBOLRENDERERWIDGET_H #define QGSNULLSYMBOLRENDERERWIDGET_H -#include "qgsrendererv2widget.h" +#include "qgsrendererwidget.h" class QgsNullSymbolRenderer; class QgsSymbolSelectorDialog; @@ -28,21 +28,21 @@ class QMenu; * \note Added in version 2.16 */ -class GUI_EXPORT QgsNullSymbolRendererWidget : public QgsRendererV2Widget +class GUI_EXPORT QgsNullSymbolRendererWidget : public QgsRendererWidget { Q_OBJECT public: //! Creates a new QgsNullSymbolRendererWidget object - static QgsRendererV2Widget* create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); + static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); //! 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(); protected: diff --git a/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp index f5affc74d0b..86de9fa65ec 100644 --- a/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp +++ b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp @@ -17,21 +17,21 @@ #include "qgspointdisplacementrendererwidget.h" #include "qgspointdisplacementrenderer.h" -#include "qgsrendererv2registry.h" +#include "qgsrendererregistry.h" #include "qgsfield.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgssymbolselectordialog.h" #include "qgssymbollayerutils.h" #include "qgsvectorlayer.h" #include "qgisgui.h" -QgsRendererV2Widget* QgsPointDisplacementRendererWidget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) +QgsRendererWidget* QgsPointDisplacementRendererWidget::create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) { return new QgsPointDisplacementRendererWidget( layer, style, renderer ); } -QgsPointDisplacementRendererWidget::QgsPointDisplacementRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) - : QgsRendererV2Widget( layer, style ) +QgsPointDisplacementRendererWidget::QgsPointDisplacementRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) + : QgsRendererWidget( layer, style ) , mRenderer( nullptr ) , mEmbeddedRendererWidget( nullptr ) { @@ -87,13 +87,13 @@ QgsPointDisplacementRendererWidget::QgsPointDisplacementRendererWidget( QgsVecto } //insert possible renderer types - QStringList rendererList = QgsRendererV2Registry::instance()->renderersList( QgsRendererV2AbstractMetadata::PointLayer ); + QStringList rendererList = QgsRendererRegistry::instance()->renderersList( QgsRendererAbstractMetadata::PointLayer ); QStringList::const_iterator it = rendererList.constBegin(); for ( ; it != rendererList.constEnd(); ++it ) { if ( *it != "pointDisplacement" ) { - QgsRendererV2AbstractMetadata* m = QgsRendererV2Registry::instance()->rendererMetadata( *it ); + QgsRendererAbstractMetadata* m = QgsRendererRegistry::instance()->rendererMetadata( *it ); mRendererComboBox->addItem( m->icon(), m->visibleName(), *it ); } } @@ -155,11 +155,11 @@ QgsPointDisplacementRendererWidget::~QgsPointDisplacementRendererWidget() delete mEmbeddedRendererWidget; } -QgsFeatureRendererV2* QgsPointDisplacementRendererWidget::renderer() +QgsFeatureRenderer* QgsPointDisplacementRendererWidget::renderer() { if ( mRenderer && mEmbeddedRendererWidget ) { - QgsFeatureRendererV2* embeddedRenderer = mEmbeddedRendererWidget->renderer(); + QgsFeatureRenderer* embeddedRenderer = mEmbeddedRendererWidget->renderer(); if ( embeddedRenderer ) { mRenderer->setEmbeddedRenderer( embeddedRenderer->clone() ); @@ -170,7 +170,7 @@ QgsFeatureRendererV2* QgsPointDisplacementRendererWidget::renderer() void QgsPointDisplacementRendererWidget::setMapCanvas( QgsMapCanvas* canvas ) { - QgsRendererV2Widget::setMapCanvas( canvas ); + QgsRendererWidget::setMapCanvas( canvas ); if ( mDistanceUnitWidget ) mDistanceUnitWidget->setMapCanvas( canvas ); if ( mEmbeddedRendererWidget ) @@ -196,7 +196,7 @@ void QgsPointDisplacementRendererWidget::on_mLabelFieldComboBox_currentIndexChan void QgsPointDisplacementRendererWidget::on_mRendererComboBox_currentIndexChanged( int index ) { QString rendererId = mRendererComboBox->itemData( index ).toString(); - QgsRendererV2AbstractMetadata* m = QgsRendererV2Registry::instance()->rendererMetadata( rendererId ); + QgsRendererAbstractMetadata* m = QgsRendererRegistry::instance()->rendererMetadata( rendererId ); if ( m ) { delete mEmbeddedRendererWidget; @@ -369,8 +369,8 @@ void QgsPointDisplacementRendererWidget::on_mCenterSymbolPushButton_clicked() { return; } - QgsMarkerSymbolV2* markerSymbol = mRenderer->centerSymbol()->clone(); - QgsSymbolSelectorDialog dlg( markerSymbol, QgsStyleV2::defaultStyle(), mLayer, this ); + QgsMarkerSymbol* markerSymbol = mRenderer->centerSymbol()->clone(); + QgsSymbolSelectorDialog dlg( markerSymbol, QgsStyle::defaultStyle(), mLayer, this ); dlg.setMapCanvas( mMapCanvas ); if ( dlg.exec() == QDialog::Rejected ) { @@ -384,7 +384,7 @@ void QgsPointDisplacementRendererWidget::on_mCenterSymbolPushButton_clicked() void QgsPointDisplacementRendererWidget::updateCenterIcon() { - QgsMarkerSymbolV2* symbol = mRenderer->centerSymbol(); + QgsMarkerSymbol* symbol = mRenderer->centerSymbol(); if ( !symbol ) { return; diff --git a/src/gui/symbology-ng/qgspointdisplacementrendererwidget.h b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.h index 1473a49680f..b98aca00f3b 100644 --- a/src/gui/symbology-ng/qgspointdisplacementrendererwidget.h +++ b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.h @@ -19,27 +19,27 @@ #define QGSPOINTDISPLACEMENTRENDERERWIDGET_H #include "ui_qgspointdisplacementrendererwidgetbase.h" -#include "qgsrendererv2widget.h" +#include "qgsrendererwidget.h" class QgsPointDisplacementRenderer; /** \ingroup gui * \class QgsPointDisplacementRendererWidget */ -class GUI_EXPORT QgsPointDisplacementRendererWidget: public QgsRendererV2Widget, private Ui::QgsPointDisplacementRendererWidgetBase +class GUI_EXPORT QgsPointDisplacementRendererWidget: public QgsRendererWidget, private Ui::QgsPointDisplacementRendererWidgetBase { Q_OBJECT public: - static QgsRendererV2Widget* create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); - QgsPointDisplacementRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); + static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); + QgsPointDisplacementRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); ~QgsPointDisplacementRendererWidget(); - QgsFeatureRendererV2* renderer() override; + QgsFeatureRenderer* renderer() override; void setMapCanvas( QgsMapCanvas* canvas ) override; private: QgsPointDisplacementRenderer* mRenderer; - QgsRendererV2Widget* mEmbeddedRendererWidget; + QgsRendererWidget* mEmbeddedRendererWidget; void blockAllSignals( bool block ); void updateCenterIcon(); diff --git a/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp b/src/gui/symbology-ng/qgsrendererpropertiesdialog.cpp similarity index 78% rename from src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp rename to src/gui/symbology-ng/qgsrendererpropertiesdialog.cpp index e1bd07d332e..5ee09665c2d 100644 --- a/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp +++ b/src/gui/symbology-ng/qgsrendererpropertiesdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsrendererv2propertiesdialog.cpp + qgsrendererpropertiesdialog.cpp --------------------- begin : December 2009 copyright : (C) 2009 by Martin Dobias @@ -12,16 +12,16 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsrendererv2propertiesdialog.h" +#include "qgsrendererpropertiesdialog.h" -#include "qgsrendererv2.h" -#include "qgsrendererv2registry.h" +#include "qgsrenderer.h" +#include "qgsrendererregistry.h" -#include "qgsrendererv2widget.h" -#include "qgssinglesymbolrendererv2widget.h" -#include "qgscategorizedsymbolrendererv2widget.h" -#include "qgsgraduatedsymbolrendererv2widget.h" -#include "qgsrulebasedrendererv2widget.h" +#include "qgsrendererwidget.h" +#include "qgssinglesymbolrendererwidget.h" +#include "qgscategorizedsymbolrendererwidget.h" +#include "qgsgraduatedsymbolrendererwidget.h" +#include "qgsrulebasedrendererwidget.h" #include "qgspointdisplacementrendererwidget.h" #include "qgsinvertedpolygonrendererwidget.h" #include "qgsheatmaprendererwidget.h" @@ -38,13 +38,13 @@ #include #include -static bool _initRenderer( const QString& name, QgsRendererV2WidgetFunc f, const QString& iconName = QString() ) +static bool _initRenderer( const QString& name, QgsRendererWidgetFunc f, const QString& iconName = QString() ) { - QgsRendererV2Registry* reg = QgsRendererV2Registry::instance(); - QgsRendererV2AbstractMetadata* am = reg->rendererMetadata( name ); + QgsRendererRegistry* reg = QgsRendererRegistry::instance(); + QgsRendererAbstractMetadata* am = reg->rendererMetadata( name ); if ( !am ) return false; - QgsRendererV2Metadata* m = dynamic_cast( am ); + QgsRendererMetadata* m = dynamic_cast( am ); if ( !m ) return false; @@ -68,10 +68,10 @@ static void _initRendererWidgetFunctions() if ( initialized ) return; - _initRenderer( "singleSymbol", QgsSingleSymbolRendererV2Widget::create, "rendererSingleSymbol.svg" ); - _initRenderer( "categorizedSymbol", QgsCategorizedSymbolRendererV2Widget::create, "rendererCategorizedSymbol.svg" ); - _initRenderer( "graduatedSymbol", QgsGraduatedSymbolRendererV2Widget::create, "rendererGraduatedSymbol.svg" ); - _initRenderer( "RuleRenderer", QgsRuleBasedRendererV2Widget::create, "rendererRuleBasedSymbol.svg" ); + _initRenderer( "singleSymbol", QgsSingleSymbolRendererWidget::create, "rendererSingleSymbol.svg" ); + _initRenderer( "categorizedSymbol", QgsCategorizedSymbolRendererWidget::create, "rendererCategorizedSymbol.svg" ); + _initRenderer( "graduatedSymbol", QgsGraduatedSymbolRendererWidget::create, "rendererGraduatedSymbol.svg" ); + _initRenderer( "RuleRenderer", QgsRuleBasedRendererWidget::create, "rendererRuleBasedSymbol.svg" ); _initRenderer( "pointDisplacement", QgsPointDisplacementRendererWidget::create, "rendererPointDisplacementSymbol.svg" ); _initRenderer( "invertedPolygonRenderer", QgsInvertedPolygonRendererWidget::create, "rendererInvertedSymbol.svg" ); _initRenderer( "heatmapRenderer", QgsHeatmapRendererWidget::create, "rendererHeatmapSymbol.svg" ); @@ -80,7 +80,7 @@ static void _initRendererWidgetFunctions() initialized = true; } -QgsRendererV2PropertiesDialog::QgsRendererV2PropertiesDialog( QgsVectorLayer* layer, QgsStyleV2* style, bool embedded, QWidget* parent ) +QgsRendererPropertiesDialog::QgsRendererPropertiesDialog( QgsVectorLayer* layer, QgsStyle* style, bool embedded, QWidget* parent ) : QDialog( parent ) , mLayer( layer ) , mStyle( style ) @@ -101,11 +101,11 @@ QgsRendererV2PropertiesDialog::QgsRendererV2PropertiesDialog( QgsVectorLayer* la // initialize registry's widget functions _initRendererWidgetFunctions(); - QgsRendererV2Registry* reg = QgsRendererV2Registry::instance(); + QgsRendererRegistry* reg = QgsRendererRegistry::instance(); QStringList renderers = reg->renderersList( mLayer ); Q_FOREACH ( const QString& name, renderers ) { - QgsRendererV2AbstractMetadata* m = reg->rendererMetadata( name ); + QgsRendererAbstractMetadata* m = reg->rendererMetadata( name ); cboRenderers->addItem( m->icon(), m->visibleName(), name ); } @@ -135,7 +135,7 @@ QgsRendererV2PropertiesDialog::QgsRendererV2PropertiesDialog( QgsVectorLayer* la connect( mEffectWidget, SIGNAL( showPanel( QgsPanelWidget* ) ), this, SLOT( openPanel( QgsPanelWidget* ) ) ); } -void QgsRendererV2PropertiesDialog::connectValueChanged( QList widgets, const char *slot ) +void QgsRendererPropertiesDialog::connectValueChanged( QList widgets, const char *slot ) { Q_FOREACH ( QWidget* widget, widgets ) { @@ -180,19 +180,19 @@ void QgsRendererV2PropertiesDialog::connectValueChanged( QList widget } } -QgsRendererV2PropertiesDialog::~QgsRendererV2PropertiesDialog() +QgsRendererPropertiesDialog::~QgsRendererPropertiesDialog() { delete mPaintEffect; } -void QgsRendererV2PropertiesDialog::setMapCanvas( QgsMapCanvas* canvas ) +void QgsRendererPropertiesDialog::setMapCanvas( QgsMapCanvas* canvas ) { mMapCanvas = canvas; if ( mActiveWidget ) mActiveWidget->setMapCanvas( mMapCanvas ); } -void QgsRendererV2PropertiesDialog::setDockMode( bool dockMode ) +void QgsRendererPropertiesDialog::setDockMode( bool dockMode ) { mDockMode = dockMode; mEffectWidget->setDockMode( dockMode ); @@ -201,7 +201,7 @@ void QgsRendererV2PropertiesDialog::setDockMode( bool dockMode ) } -void QgsRendererV2PropertiesDialog::rendererChanged() +void QgsRendererPropertiesDialog::rendererChanged() { if ( cboRenderers->currentIndex() == -1 ) { @@ -212,14 +212,14 @@ void QgsRendererV2PropertiesDialog::rendererChanged() QString rendererName = cboRenderers->itemData( cboRenderers->currentIndex() ).toString(); //Retrieve the previous renderer: from the old active widget if possible, otherwise from the layer - QgsFeatureRendererV2* oldRenderer; + QgsFeatureRenderer* oldRenderer; if ( mActiveWidget && mActiveWidget->renderer() ) { oldRenderer = mActiveWidget->renderer()->clone(); } else { - oldRenderer = mLayer->rendererV2()->clone(); + oldRenderer = mLayer->renderer()->clone(); } // get rid of old active widget (if any) @@ -231,8 +231,8 @@ void QgsRendererV2PropertiesDialog::rendererChanged() mActiveWidget = nullptr; } - QgsRendererV2Widget* w = nullptr; - QgsRendererV2AbstractMetadata* m = QgsRendererV2Registry::instance()->rendererMetadata( rendererName ); + QgsRendererWidget* w = nullptr; + QgsRendererAbstractMetadata* m = QgsRendererRegistry::instance()->rendererMetadata( rendererName ); if ( m ) w = m->createRendererWidget( mLayer, mStyle, oldRenderer ); delete oldRenderer; @@ -261,7 +261,7 @@ void QgsRendererV2PropertiesDialog::rendererChanged() } } -void QgsRendererV2PropertiesDialog::apply() +void QgsRendererPropertiesDialog::apply() { if ( !mActiveWidget || !mLayer ) { @@ -270,7 +270,7 @@ void QgsRendererV2PropertiesDialog::apply() mActiveWidget->applyChanges(); - QgsFeatureRendererV2* renderer = mActiveWidget->renderer(); + QgsFeatureRenderer* renderer = mActiveWidget->renderer(); if ( renderer ) { renderer->setPaintEffect( mPaintEffect->clone() ); @@ -278,7 +278,7 @@ void QgsRendererV2PropertiesDialog::apply() renderer->setOrderBy( mOrderBy ); renderer->setOrderByEnabled( checkboxEnableOrderBy->isChecked() ); - mLayer->setRendererV2( renderer->clone() ); + mLayer->setRenderer( renderer->clone() ); } // set the blend modes for the layer @@ -289,13 +289,13 @@ void QgsRendererV2PropertiesDialog::apply() mLayer->setLayerTransparency( mLayerTransparencySlider->value() ); } -void QgsRendererV2PropertiesDialog::onOK() +void QgsRendererPropertiesDialog::onOK() { apply(); accept(); } -void QgsRendererV2PropertiesDialog::openPanel( QgsPanelWidget *panel ) +void QgsRendererPropertiesDialog::openPanel( QgsPanelWidget *panel ) { QgsDebugMsg( "Open panel!!!" ); if ( mDockMode ) @@ -323,7 +323,7 @@ void QgsRendererV2PropertiesDialog::openPanel( QgsPanelWidget *panel ) } } -void QgsRendererV2PropertiesDialog::syncToLayer() +void QgsRendererPropertiesDialog::syncToLayer() { // Blend mode mBlendModeComboBox->setBlendMode( mLayer->blendMode() ); @@ -336,21 +336,21 @@ void QgsRendererV2PropertiesDialog::syncToLayer() mLayerTransparencySpnBx->setValue( mLayer->layerTransparency() ); //paint effect widget - if ( mLayer->rendererV2() ) + if ( mLayer->renderer() ) { - if ( mLayer->rendererV2()->paintEffect() ) + if ( mLayer->renderer()->paintEffect() ) { - mPaintEffect = mLayer->rendererV2()->paintEffect()->clone(); + mPaintEffect = mLayer->renderer()->paintEffect()->clone(); mEffectWidget->setPaintEffect( mPaintEffect ); } - mOrderBy = mLayer->rendererV2()->orderBy(); + mOrderBy = mLayer->renderer()->orderBy(); } // setup slot rendererChanged() //setup order by - if ( mLayer->rendererV2() && - mLayer->rendererV2()->orderByEnabled() ) + if ( mLayer->renderer() && + mLayer->renderer()->orderByEnabled() ) { checkboxEnableOrderBy->setChecked( true ); } @@ -360,10 +360,10 @@ void QgsRendererV2PropertiesDialog::syncToLayer() checkboxEnableOrderBy->setChecked( false ); } - if ( mLayer->rendererV2() ) + if ( mLayer->renderer() ) { // set current renderer from layer - QString rendererName = mLayer->rendererV2()->type(); + QString rendererName = mLayer->renderer()->type(); int rendererIdx = cboRenderers->findData( rendererName ); cboRenderers->setCurrentIndex( rendererIdx ); @@ -374,7 +374,7 @@ void QgsRendererV2PropertiesDialog::syncToLayer() } -void QgsRendererV2PropertiesDialog::showOrderByDialog() +void QgsRendererPropertiesDialog::showOrderByDialog() { QgsOrderByDialog dlg( mLayer, this ); @@ -386,20 +386,20 @@ void QgsRendererV2PropertiesDialog::showOrderByDialog() } } -void QgsRendererV2PropertiesDialog::changeOrderBy( const QgsFeatureRequest::OrderBy& orderBy, bool orderByEnabled ) +void QgsRendererPropertiesDialog::changeOrderBy( const QgsFeatureRequest::OrderBy& orderBy, bool orderByEnabled ) { mOrderBy = orderBy; checkboxEnableOrderBy->setChecked( orderByEnabled ); } -void QgsRendererV2PropertiesDialog::updateUIState( bool hidden ) +void QgsRendererPropertiesDialog::updateUIState( bool hidden ) { mLayerRenderingGroupBox->setHidden( hidden ); cboRenderers->setHidden( hidden ); } -void QgsRendererV2PropertiesDialog::keyPressEvent( QKeyEvent * e ) +void QgsRendererPropertiesDialog::keyPressEvent( QKeyEvent * e ) { // Ignore the ESC key to avoid close the dialog without the properties window if ( !isWindow() && e->key() == Qt::Key_Escape ) diff --git a/src/gui/symbology-ng/qgsrendererv2propertiesdialog.h b/src/gui/symbology-ng/qgsrendererpropertiesdialog.h similarity index 89% rename from src/gui/symbology-ng/qgsrendererv2propertiesdialog.h rename to src/gui/symbology-ng/qgsrendererpropertiesdialog.h index 30320bc5960..c0e19804968 100644 --- a/src/gui/symbology-ng/qgsrendererv2propertiesdialog.h +++ b/src/gui/symbology-ng/qgsrendererpropertiesdialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsrendererv2propertiesdialog.h + qgsrendererpropertiesdialog.h --------------------- begin : December 2009 @@ -26,30 +26,30 @@ class QKeyEvent; class QgsVectorLayer; -class QgsStyleV2; +class QgsStyle; class QgsSymbol; class QgsPaintEffect; -class QgsRendererV2Widget; +class QgsRendererWidget; class QgsMapCanvas; /** \ingroup gui - * \class QgsRendererV2PropertiesDialog + * \class QgsRendererPropertiesDialog */ -class GUI_EXPORT QgsRendererV2PropertiesDialog : public QDialog, private Ui::QgsRendererV2PropsDialogBase +class GUI_EXPORT QgsRendererPropertiesDialog : public QDialog, private Ui::QgsRendererPropsDialogBase { Q_OBJECT 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 = nullptr ); - ~QgsRendererV2PropertiesDialog(); + QgsRendererPropertiesDialog( QgsVectorLayer* layer, QgsStyle* style, bool embedded = false, QWidget* parent = nullptr ); + ~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. @@ -134,9 +134,9 @@ class GUI_EXPORT QgsRendererV2PropertiesDialog : public QDialog, private Ui::Qgs void keyPressEvent( QKeyEvent * event ) override; QgsVectorLayer* mLayer; - QgsStyleV2* mStyle; + QgsStyle* mStyle; - QgsRendererV2Widget* mActiveWidget; + QgsRendererWidget* mActiveWidget; QgsPaintEffect* mPaintEffect; diff --git a/src/gui/symbology-ng/qgsrendererv2widget.cpp b/src/gui/symbology-ng/qgsrendererwidget.cpp similarity index 86% rename from src/gui/symbology-ng/qgsrendererv2widget.cpp rename to src/gui/symbology-ng/qgsrendererwidget.cpp index 8f1bdf5ac92..b86294ad682 100644 --- a/src/gui/symbology-ng/qgsrendererv2widget.cpp +++ b/src/gui/symbology-ng/qgsrendererwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsrendererv2widget.cpp + qgsrendererwidget.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -12,7 +12,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsrendererv2widget.h" +#include "qgsrendererwidget.h" #include "qgssymbol.h" #include "qgsvectorlayer.h" #include "qgscolordialog.h" @@ -26,7 +26,7 @@ #include #include -QgsRendererV2Widget::QgsRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style ) +QgsRendererWidget::QgsRendererWidget( QgsVectorLayer* layer, QgsStyle* style ) : QgsPanelWidget() , mLayer( layer ) , mStyle( style ) @@ -55,12 +55,12 @@ QgsRendererV2Widget::QgsRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* sty } } -void QgsRendererV2Widget::contextMenuViewCategories( QPoint ) +void QgsRendererWidget::contextMenuViewCategories( QPoint ) { contextMenu->exec( QCursor::pos() ); } -void QgsRendererV2Widget::changeSymbolColor() +void QgsRendererWidget::changeSymbolColor() { QList symbolList = selectedSymbols(); if ( symbolList.isEmpty() ) @@ -92,7 +92,7 @@ void QgsRendererV2Widget::changeSymbolColor() } } -void QgsRendererV2Widget::changeSymbolTransparency() +void QgsRendererWidget::changeSymbolTransparency() { QList symbolList = selectedSymbols(); if ( symbolList.isEmpty() ) @@ -126,7 +126,7 @@ void QgsRendererV2Widget::changeSymbolTransparency() } } -void QgsRendererV2Widget::changeSymbolUnit() +void QgsRendererWidget::changeSymbolUnit() { QList symbolList = selectedSymbols(); if ( symbolList.isEmpty() ) @@ -162,7 +162,7 @@ void QgsRendererV2Widget::changeSymbolUnit() } } -void QgsRendererV2Widget::changeSymbolWidth() +void QgsRendererWidget::changeSymbolWidth() { QList symbolList = selectedSymbols(); if ( symbolList.isEmpty() ) @@ -183,14 +183,14 @@ void QgsRendererV2Widget::changeSymbolWidth() continue; if ( symbol->type() == QgsSymbol::Line ) - static_cast( symbol )->setWidth( dlg.mSpinBox->value() ); + static_cast( symbol )->setWidth( dlg.mSpinBox->value() ); } } refreshSymbolView(); } } -void QgsRendererV2Widget::changeSymbolSize() +void QgsRendererWidget::changeSymbolSize() { QList symbolList = selectedSymbols(); if ( symbolList.isEmpty() ) @@ -211,14 +211,14 @@ void QgsRendererV2Widget::changeSymbolSize() continue; if ( symbol->type() == QgsSymbol::Marker ) - static_cast( symbol )->setSize( dlg.mSpinBox->value() ); + static_cast( symbol )->setSize( dlg.mSpinBox->value() ); } } refreshSymbolView(); } } -void QgsRendererV2Widget::changeSymbolAngle() +void QgsRendererWidget::changeSymbolAngle() { QList symbolList = selectedSymbols(); if ( symbolList.isEmpty() ) @@ -239,14 +239,14 @@ void QgsRendererV2Widget::changeSymbolAngle() continue; if ( symbol->type() == QgsSymbol::Marker ) - static_cast( symbol )->setAngle( dlg.mSpinBox->value() ); + static_cast( symbol )->setAngle( dlg.mSpinBox->value() ); } } refreshSymbolView(); } } -void QgsRendererV2Widget::showSymbolLevelsDialog( QgsFeatureRendererV2* r ) +void QgsRendererWidget::showSymbolLevelsDialog( QgsFeatureRenderer* r ) { QgsLegendSymbolList symbols = r->legendSymbolItems(); @@ -259,17 +259,17 @@ void QgsRendererV2Widget::showSymbolLevelsDialog( QgsFeatureRendererV2* r ) } } -void QgsRendererV2Widget::setMapCanvas( QgsMapCanvas *canvas ) +void QgsRendererWidget::setMapCanvas( QgsMapCanvas *canvas ) { mMapCanvas = canvas; } -const QgsMapCanvas* QgsRendererV2Widget::mapCanvas() const +const QgsMapCanvas* QgsRendererWidget::mapCanvas() const { return mMapCanvas; } -void QgsRendererV2Widget::applyChanges() +void QgsRendererWidget::applyChanges() { apply(); } @@ -380,41 +380,41 @@ void QgsDataDefinedValueDialog::dataDefinedChanged() QgsDataDefined QgsDataDefinedSizeDialog::symbolDataDefined( const QgsSymbol *symbol ) const { - const QgsMarkerSymbolV2* marker = static_cast( symbol ); + const QgsMarkerSymbol* marker = static_cast( symbol ); return marker->dataDefinedSize(); } void QgsDataDefinedSizeDialog::setDataDefined( QgsSymbol* symbol, const QgsDataDefined& dd ) { - static_cast( symbol )->setDataDefinedSize( dd ); - static_cast( symbol )->setScaleMethod( QgsSymbol::ScaleDiameter ); + static_cast( symbol )->setDataDefinedSize( dd ); + static_cast( symbol )->setScaleMethod( QgsSymbol::ScaleDiameter ); } QgsDataDefined QgsDataDefinedRotationDialog::symbolDataDefined( const QgsSymbol *symbol ) const { - const QgsMarkerSymbolV2* marker = static_cast( symbol ); + const QgsMarkerSymbol* marker = static_cast( symbol ); return marker->dataDefinedAngle(); } void QgsDataDefinedRotationDialog::setDataDefined( QgsSymbol *symbol, const QgsDataDefined &dd ) { - static_cast( symbol )->setDataDefinedAngle( dd ); + static_cast( symbol )->setDataDefinedAngle( dd ); } QgsDataDefined QgsDataDefinedWidthDialog::symbolDataDefined( const QgsSymbol *symbol ) const { - const QgsLineSymbolV2* line = static_cast( symbol ); + const QgsLineSymbol* line = static_cast( symbol ); return line->dataDefinedWidth(); } void QgsDataDefinedWidthDialog::setDataDefined( QgsSymbol *symbol, const QgsDataDefined &dd ) { - static_cast( symbol )->setDataDefinedWidth( dd ); + static_cast( symbol )->setDataDefinedWidth( dd ); } -void QgsRendererV2Widget::apply() +void QgsRendererWidget::apply() { } diff --git a/src/gui/symbology-ng/qgsrendererv2widget.h b/src/gui/symbology-ng/qgsrendererwidget.h similarity index 92% rename from src/gui/symbology-ng/qgsrendererv2widget.h rename to src/gui/symbology-ng/qgsrendererwidget.h index 4407845989d..fd672d6298c 100644 --- a/src/gui/symbology-ng/qgsrendererv2widget.h +++ b/src/gui/symbology-ng/qgsrendererwidget.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsrendererv2widget.h + qgsrendererwidget.h --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -22,8 +22,8 @@ #include "qgspanelwidget.h" class QgsVectorLayer; -class QgsStyleV2; -class QgsFeatureRendererV2; +class QgsStyle; +class QgsFeatureRenderer; class QgsSymbolSelectorDialog; class QgsMapCanvas; @@ -37,19 +37,19 @@ WORKFLOW: - on any change of renderer type, create some default (dummy?) version and change the stacked widget - when clicked ok/apply, get the renderer from active widget and clone it for the layer */ -class GUI_EXPORT QgsRendererV2Widget : public QgsPanelWidget +class GUI_EXPORT QgsRendererWidget : public QgsPanelWidget { Q_OBJECT 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. @@ -85,7 +85,7 @@ class GUI_EXPORT QgsRendererV2Widget : public QgsPanelWidget protected: QgsVectorLayer* mLayer; - QgsStyleV2* mStyle; + QgsStyle* mStyle; QMenu* contextMenu; QAction* mCopyAction; QAction* mPasteAction; @@ -198,13 +198,13 @@ class GUI_EXPORT QgsDataDefinedSizeDialog : public QgsDataDefinedValueDialog { init( tr( "Symbol size" ) ); if ( !symbolList.isEmpty() && symbolList.at( 0 ) && mLayer ) - mDDBtn->setAssistant( tr( "Size Assistant..." ), new QgsSizeScaleWidget( mLayer, static_cast( symbolList.at( 0 ) ) ) ); + mDDBtn->setAssistant( tr( "Size Assistant..." ), new QgsSizeScaleWidget( mLayer, static_cast( symbolList.at( 0 ) ) ) ); } protected: QgsDataDefined symbolDataDefined( const QgsSymbol * symbol ) const override; - double value( const QgsSymbol * symbol ) const override { return static_cast( symbol )->size(); } + double value( const QgsSymbol * symbol ) const override { return static_cast( symbol )->size(); } void setDataDefined( QgsSymbol* symbol, const QgsDataDefined& dd ) override; }; @@ -225,7 +225,7 @@ class GUI_EXPORT QgsDataDefinedRotationDialog : public QgsDataDefinedValueDialog protected: QgsDataDefined symbolDataDefined( const QgsSymbol * symbol ) const override; - double value( const QgsSymbol * symbol ) const override { return static_cast( symbol )->angle(); } + double value( const QgsSymbol * symbol ) const override { return static_cast( symbol )->angle(); } void setDataDefined( QgsSymbol* symbol, const QgsDataDefined& dd ) override; }; @@ -246,7 +246,7 @@ class GUI_EXPORT QgsDataDefinedWidthDialog : public QgsDataDefinedValueDialog protected: QgsDataDefined symbolDataDefined( const QgsSymbol * symbol ) const override; - double value( const QgsSymbol * symbol ) const override { return static_cast( symbol )->width(); } + double value( const QgsSymbol * symbol ) const override { return static_cast( symbol )->width(); } void setDataDefined( QgsSymbol* symbol, const QgsDataDefined& dd ) override; }; diff --git a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp b/src/gui/symbology-ng/qgsrulebasedrendererwidget.cpp similarity index 78% rename from src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp rename to src/gui/symbology-ng/qgsrulebasedrendererwidget.cpp index 52201a7ce0d..9d347614692 100644 --- a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp +++ b/src/gui/symbology-ng/qgsrulebasedrendererwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsrulebasedrendererv2widget.cpp - Settings widget for rule-based renderer + qgsrulebasedrendererwidget.cpp - Settings widget for rule-based renderer --------------------- begin : May 2010 copyright : (C) 2010 by Martin Dobias @@ -13,9 +13,9 @@ * * ***************************************************************************/ -#include "qgsrulebasedrendererv2widget.h" +#include "qgsrulebasedrendererwidget.h" -#include "qgsrulebasedrendererv2.h" +#include "qgsrulebasedrenderer.h" #include "qgsfeatureiterator.h" #include "qgssymbollayerutils.h" #include "qgssymbol.h" @@ -25,7 +25,7 @@ #include "qgssymbolselectordialog.h" #include "qgslogger.h" #include "qstring.h" -#include "qgssinglesymbolrendererv2.h" +#include "qgssinglesymbolrenderer.h" #include "qgspanelwidget.h" #include "qgsmapcanvas.h" @@ -41,13 +41,13 @@ #include "modeltest.h" #endif -QgsRendererV2Widget* QgsRuleBasedRendererV2Widget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) +QgsRendererWidget* QgsRuleBasedRendererWidget::create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) { - return new QgsRuleBasedRendererV2Widget( layer, style, renderer ); + return new QgsRuleBasedRendererWidget( layer, style, renderer ); } -QgsRuleBasedRendererV2Widget::QgsRuleBasedRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) - : QgsRendererV2Widget( layer, style ) +QgsRuleBasedRendererWidget::QgsRuleBasedRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) + : QgsRendererWidget( layer, style ) { mRenderer = nullptr; // try to recognize the previous renderer @@ -56,19 +56,19 @@ QgsRuleBasedRendererV2Widget::QgsRuleBasedRendererV2Widget( QgsVectorLayer* laye if ( renderer ) { - mRenderer = QgsRuleBasedRendererV2::convertFromRenderer( renderer ); + mRenderer = QgsRuleBasedRenderer::convertFromRenderer( renderer ); } if ( !mRenderer ) { // some default options QgsSymbol* symbol = QgsSymbol::defaultSymbol( mLayer->geometryType() ); - mRenderer = new QgsRuleBasedRendererV2( symbol ); + mRenderer = new QgsRuleBasedRenderer( symbol ); } setupUi( this ); - mModel = new QgsRuleBasedRendererV2Model( mRenderer ); + mModel = new QgsRuleBasedRendererModel( mRenderer ); #ifdef ENABLE_MODELTEST new ModelTest( mModel, this ); // for model validity checking #endif @@ -122,23 +122,23 @@ QgsRuleBasedRendererV2Widget::QgsRuleBasedRendererV2Widget( QgsVectorLayer* laye } -QgsRuleBasedRendererV2Widget::~QgsRuleBasedRendererV2Widget() +QgsRuleBasedRendererWidget::~QgsRuleBasedRendererWidget() { qDeleteAll( mCopyBuffer ); delete mRenderer; } -QgsFeatureRendererV2* QgsRuleBasedRendererV2Widget::renderer() +QgsFeatureRenderer* QgsRuleBasedRendererWidget::renderer() { return mRenderer; } -void QgsRuleBasedRendererV2Widget::addRule() +void QgsRuleBasedRendererWidget::addRule() { QgsSymbol* s = QgsSymbol::defaultSymbol( mLayer->geometryType() ); - QgsRuleBasedRendererV2::Rule* newrule = new QgsRuleBasedRendererV2::Rule( s ); + QgsRuleBasedRenderer::Rule* newrule = new QgsRuleBasedRenderer::Rule( s ); - QgsRuleBasedRendererV2::Rule* current = currentRule(); + QgsRuleBasedRenderer::Rule* current = currentRule(); if ( current ) { // add after this rule @@ -158,7 +158,7 @@ void QgsRuleBasedRendererV2Widget::addRule() editRule(); } -QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2Widget::currentRule() +QgsRuleBasedRenderer::Rule* QgsRuleBasedRendererWidget::currentRule() { QItemSelectionModel* sel = viewRules->selectionModel(); QModelIndex idx = sel->currentIndex(); @@ -167,17 +167,17 @@ QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2Widget::currentRule() return mModel->ruleForIndex( idx ); } -void QgsRuleBasedRendererV2Widget::editRule() +void QgsRuleBasedRendererWidget::editRule() { editRule( viewRules->selectionModel()->currentIndex() ); } -void QgsRuleBasedRendererV2Widget::editRule( const QModelIndex& index ) +void QgsRuleBasedRendererWidget::editRule( const QModelIndex& index ) { if ( !index.isValid() ) return; - QgsRuleBasedRendererV2::Rule* rule = mModel->ruleForIndex( index ); + QgsRuleBasedRenderer::Rule* rule = mModel->ruleForIndex( index ); QgsRendererRulePropsWidget* widget = new QgsRendererRulePropsWidget( rule, mLayer, mStyle, this, mMapCanvas ); widget->setDockMode( true ); @@ -187,7 +187,7 @@ void QgsRuleBasedRendererV2Widget::editRule( const QModelIndex& index ) openPanel( widget ); } -void QgsRuleBasedRendererV2Widget::removeRule() +void QgsRuleBasedRendererWidget::removeRule() { QItemSelection sel = viewRules->selectionModel()->selection(); QgsDebugMsg( QString( "REMOVE RULES!!! ranges: %1" ).arg( sel.count() ) ); @@ -202,23 +202,23 @@ void QgsRuleBasedRendererV2Widget::removeRule() mModel->clearFeatureCounts(); } -void QgsRuleBasedRendererV2Widget::currentRuleChanged( const QModelIndex& current, const QModelIndex& previous ) +void QgsRuleBasedRendererWidget::currentRuleChanged( const QModelIndex& current, const QModelIndex& previous ) { Q_UNUSED( previous ); btnEditRule->setEnabled( current.isValid() ); } -#include "qgscategorizedsymbolrendererv2.h" -#include "qgscategorizedsymbolrendererv2widget.h" -#include "qgsgraduatedsymbolrendererv2.h" -#include "qgsgraduatedsymbolrendererv2widget.h" +#include "qgscategorizedsymbolrenderer.h" +#include "qgscategorizedsymbolrendererwidget.h" +#include "qgsgraduatedsymbolrenderer.h" +#include "qgsgraduatedsymbolrendererwidget.h" #include "qgsexpressionbuilderdialog.h" #include #include #include -void QgsRuleBasedRendererV2Widget::refineRule( int type ) +void QgsRuleBasedRendererWidget::refineRule( int type ) { QModelIndexList indexlist = viewRules->selectionModel()->selectedRows(); @@ -240,24 +240,24 @@ void QgsRuleBasedRendererV2Widget::refineRule( int type ) viewRules->expand( index ); } -void QgsRuleBasedRendererV2Widget::refineRuleCategories() +void QgsRuleBasedRendererWidget::refineRuleCategories() { refineRule( 0 ); } -void QgsRuleBasedRendererV2Widget::refineRuleRanges() +void QgsRuleBasedRendererWidget::refineRuleRanges() { refineRule( 1 ); } -void QgsRuleBasedRendererV2Widget::refineRuleScales() +void QgsRuleBasedRendererWidget::refineRuleScales() { refineRule( 2 ); } -void QgsRuleBasedRendererV2Widget::refineRuleCategoriesGui( const QModelIndexList& ) +void QgsRuleBasedRendererWidget::refineRuleCategoriesGui( const QModelIndexList& ) { - QgsCategorizedSymbolRendererV2Widget* w = new QgsCategorizedSymbolRendererV2Widget( mLayer, mStyle, nullptr ); + QgsCategorizedSymbolRendererWidget* w = new QgsCategorizedSymbolRendererWidget( mLayer, mStyle, nullptr ); w->setPanelTitle( tr( "Add categories to rules" ) ); connect( w, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( refineRuleCategoriesAccepted( QgsPanelWidget* ) ) ); w->setDockMode( this->dockMode() ); @@ -265,9 +265,9 @@ void QgsRuleBasedRendererV2Widget::refineRuleCategoriesGui( const QModelIndexLis openPanel( w ); } -void QgsRuleBasedRendererV2Widget::refineRuleRangesGui( const QModelIndexList& ) +void QgsRuleBasedRendererWidget::refineRuleRangesGui( const QModelIndexList& ) { - QgsGraduatedSymbolRendererV2Widget* w = new QgsGraduatedSymbolRendererV2Widget( mLayer, mStyle, nullptr ); + QgsGraduatedSymbolRendererWidget* w = new QgsGraduatedSymbolRendererWidget( mLayer, mStyle, nullptr ); w->setPanelTitle( tr( "Add ranges to rules" ) ); connect( w, SIGNAL( panelAccepted( QgsPanelWidget* ) ), this, SLOT( refineRuleRangesAccepted( QgsPanelWidget* ) ) ); w->setMapCanvas( mMapCanvas ); @@ -275,11 +275,11 @@ void QgsRuleBasedRendererV2Widget::refineRuleRangesGui( const QModelIndexList& ) openPanel( w ); } -void QgsRuleBasedRendererV2Widget::refineRuleScalesGui( const QModelIndexList& indexList ) +void QgsRuleBasedRendererWidget::refineRuleScalesGui( const QModelIndexList& indexList ) { Q_FOREACH ( const QModelIndex& index, indexList ) { - QgsRuleBasedRendererV2::Rule* initialRule = mModel->ruleForIndex( index ); + QgsRuleBasedRenderer::Rule* initialRule = mModel->ruleForIndex( index ); // If any of the rules don't have a symbol let the user know and exit. if ( !initialRule->symbol() ) @@ -308,14 +308,14 @@ void QgsRuleBasedRendererV2Widget::refineRuleScalesGui( const QModelIndexList& i Q_FOREACH ( const QModelIndex& index, indexList ) { - QgsRuleBasedRendererV2::Rule* initialRule = mModel->ruleForIndex( index ); + QgsRuleBasedRenderer::Rule* initialRule = mModel->ruleForIndex( index ); mModel->willAddRules( index, scales.count() + 1 ); - QgsRuleBasedRendererV2::refineRuleScales( initialRule, scales ); + QgsRuleBasedRenderer::refineRuleScales( initialRule, scales ); } mModel->finishedAddingRules(); } -QList QgsRuleBasedRendererV2Widget::selectedSymbols() +QList QgsRuleBasedRendererWidget::selectedSymbols() { QList symbolList; @@ -328,8 +328,8 @@ QList QgsRuleBasedRendererV2Widget::selectedSymbols() Q_FOREACH ( const QItemSelectionRange& range, sel ) { QModelIndex parent = range.parent(); - QgsRuleBasedRendererV2::Rule* parentRule = mModel->ruleForIndex( parent ); - QgsRuleBasedRendererV2::RuleList& children = parentRule->children(); + QgsRuleBasedRenderer::Rule* parentRule = mModel->ruleForIndex( parent ); + QgsRuleBasedRenderer::RuleList& children = parentRule->children(); for ( int row = range.top(); row <= range.bottom(); row++ ) { symbolList.append( children[row]->symbol() ); @@ -339,15 +339,15 @@ QList QgsRuleBasedRendererV2Widget::selectedSymbols() return symbolList; } -QgsRuleBasedRendererV2::RuleList QgsRuleBasedRendererV2Widget::selectedRules() +QgsRuleBasedRenderer::RuleList QgsRuleBasedRendererWidget::selectedRules() { - QgsRuleBasedRendererV2::RuleList rl; + QgsRuleBasedRenderer::RuleList rl; QItemSelection sel = viewRules->selectionModel()->selection(); Q_FOREACH ( const QItemSelectionRange& range, sel ) { QModelIndex parent = range.parent(); - QgsRuleBasedRendererV2::Rule* parentRule = mModel->ruleForIndex( parent ); - QgsRuleBasedRendererV2::RuleList& children = parentRule->children(); + QgsRuleBasedRenderer::Rule* parentRule = mModel->ruleForIndex( parent ); + QgsRuleBasedRenderer::RuleList& children = parentRule->children(); for ( int row = range.top(); row <= range.bottom(); row++ ) { rl.append( children[row]->clone() ); @@ -356,7 +356,7 @@ QgsRuleBasedRendererV2::RuleList QgsRuleBasedRendererV2Widget::selectedRules() return rl; } -void QgsRuleBasedRendererV2Widget::refreshSymbolView() +void QgsRuleBasedRendererWidget::refreshSymbolView() { // TODO: model/view /* @@ -368,7 +368,7 @@ void QgsRuleBasedRendererV2Widget::refreshSymbolView() emit widgetChanged(); } -void QgsRuleBasedRendererV2Widget::keyPressEvent( QKeyEvent* event ) +void QgsRuleBasedRendererWidget::keyPressEvent( QKeyEvent* event ) { if ( !event ) { @@ -383,7 +383,7 @@ void QgsRuleBasedRendererV2Widget::keyPressEvent( QKeyEvent* event ) } else if ( event->key() == Qt::Key_V && event->modifiers() == Qt::ControlModifier ) { - QgsRuleBasedRendererV2::RuleList::const_iterator rIt = mCopyBuffer.constBegin(); + QgsRuleBasedRenderer::RuleList::const_iterator rIt = mCopyBuffer.constBegin(); for ( ; rIt != mCopyBuffer.constEnd(); ++rIt ) { int rows = mModel->rowCount(); @@ -394,7 +394,7 @@ void QgsRuleBasedRendererV2Widget::keyPressEvent( QKeyEvent* event ) #include "qgssymbollevelsdialog.h" -void QgsRuleBasedRendererV2Widget::setRenderingOrder() +void QgsRuleBasedRendererWidget::setRenderingOrder() { QgsLegendSymbolList lst = mRenderer->legendSymbolItems(); @@ -404,7 +404,7 @@ void QgsRuleBasedRendererV2Widget::setRenderingOrder() dlg.exec(); } -void QgsRuleBasedRendererV2Widget::saveSectionWidth( int section, int oldSize, int newSize ) +void QgsRuleBasedRendererWidget::saveSectionWidth( int section, int oldSize, int newSize ) { Q_UNUSED( oldSize ); // skip last section, as it stretches @@ -415,7 +415,7 @@ void QgsRuleBasedRendererV2Widget::saveSectionWidth( int section, int oldSize, i settings.setValue( path, newSize ); } -void QgsRuleBasedRendererV2Widget::restoreSectionWidths() +void QgsRuleBasedRendererWidget::restoreSectionWidths() { QSettings settings; QString path = "/Windows/RuleBasedTree/sectionWidth/"; @@ -428,7 +428,7 @@ void QgsRuleBasedRendererV2Widget::restoreSectionWidths() head->resizeSection( 5, settings.value( path + QString::number( 5 ), 50 ).toInt() ); } -void QgsRuleBasedRendererV2Widget::copy() +void QgsRuleBasedRendererWidget::copy() { QModelIndexList indexlist = viewRules->selectionModel()->selectedRows(); QgsDebugMsg( QString( "%1" ).arg( indexlist.count() ) ); @@ -440,7 +440,7 @@ void QgsRuleBasedRendererV2Widget::copy() QApplication::clipboard()->setMimeData( mime ); } -void QgsRuleBasedRendererV2Widget::paste() +void QgsRuleBasedRendererWidget::paste() { const QMimeData* mime = QApplication::clipboard()->mimeData(); QModelIndexList indexlist = viewRules->selectionModel()->selectedRows(); @@ -452,38 +452,38 @@ void QgsRuleBasedRendererV2Widget::paste() mModel->dropMimeData( mime, Qt::CopyAction, index.row(), index.column(), index.parent() ); } -void QgsRuleBasedRendererV2Widget::refineRuleCategoriesAccepted( QgsPanelWidget *panel ) +void QgsRuleBasedRendererWidget::refineRuleCategoriesAccepted( QgsPanelWidget *panel ) { - QgsCategorizedSymbolRendererV2Widget* w = qobject_cast( panel ); + QgsCategorizedSymbolRendererWidget* w = qobject_cast( panel ); // create new rules - QgsCategorizedSymbolRendererV2* r = static_cast( w->renderer() ); + QgsCategorizedSymbolRenderer* r = static_cast( w->renderer() ); QModelIndexList indexList = viewRules->selectionModel()->selectedRows(); Q_FOREACH ( const QModelIndex& index, indexList ) { - QgsRuleBasedRendererV2::Rule* initialRule = mModel->ruleForIndex( index ); + QgsRuleBasedRenderer::Rule* initialRule = mModel->ruleForIndex( index ); mModel->willAddRules( index, r->categories().count() ); - QgsRuleBasedRendererV2::refineRuleCategories( initialRule, r ); + QgsRuleBasedRenderer::refineRuleCategories( initialRule, r ); } mModel->finishedAddingRules(); } -void QgsRuleBasedRendererV2Widget::refineRuleRangesAccepted( QgsPanelWidget *panel ) +void QgsRuleBasedRendererWidget::refineRuleRangesAccepted( QgsPanelWidget *panel ) { - QgsGraduatedSymbolRendererV2Widget* w = qobject_cast( panel ); + QgsGraduatedSymbolRendererWidget* w = qobject_cast( panel ); // create new rules - QgsGraduatedSymbolRendererV2* r = static_cast( w->renderer() ); + QgsGraduatedSymbolRenderer* r = static_cast( w->renderer() ); QModelIndexList indexList = viewRules->selectionModel()->selectedRows(); Q_FOREACH ( const QModelIndex& index, indexList ) { - QgsRuleBasedRendererV2::Rule* initialRule = mModel->ruleForIndex( index ); + QgsRuleBasedRenderer::Rule* initialRule = mModel->ruleForIndex( index ); mModel->willAddRules( index, r->ranges().count() ); - QgsRuleBasedRendererV2::refineRuleRanges( initialRule, r ); + QgsRuleBasedRenderer::refineRuleRanges( initialRule, r ); } mModel->finishedAddingRules(); } -void QgsRuleBasedRendererV2Widget::ruleWidgetPanelAccepted( QgsPanelWidget *panel ) +void QgsRuleBasedRendererWidget::ruleWidgetPanelAccepted( QgsPanelWidget *panel ) { QgsRendererRulePropsWidget* widget = qobject_cast( panel ); widget->apply(); @@ -494,23 +494,23 @@ void QgsRuleBasedRendererV2Widget::ruleWidgetPanelAccepted( QgsPanelWidget *pane mModel->clearFeatureCounts(); } -void QgsRuleBasedRendererV2Widget::liveUpdateRuleFromPanel() +void QgsRuleBasedRendererWidget::liveUpdateRuleFromPanel() { ruleWidgetPanelAccepted( qobject_cast( sender() ) ); } -void QgsRuleBasedRendererV2Widget::countFeatures() +void QgsRuleBasedRendererWidget::countFeatures() { if ( !mLayer || !mRenderer || !mRenderer->rootRule() ) { return; } - QMap countMap; + QMap countMap; - QgsRuleBasedRendererV2::RuleList ruleList = mRenderer->rootRule()->descendants(); + QgsRuleBasedRenderer::RuleList ruleList = mRenderer->rootRule()->descendants(); // insert all so that we have counts 0 - Q_FOREACH ( QgsRuleBasedRendererV2::Rule* rule, ruleList ) + Q_FOREACH ( QgsRuleBasedRenderer::Rule* rule, ruleList ) { countMap[rule].count = 0; countMap[rule].duplicateCount = 0; @@ -549,16 +549,16 @@ void QgsRuleBasedRendererV2Widget::countFeatures() while ( fit.nextFeature( f ) ) { renderContext.expressionContext().setFeature( f ); - QgsRuleBasedRendererV2::RuleList featureRuleList = mRenderer->rootRule()->rulesForFeature( f, &renderContext ); + QgsRuleBasedRenderer::RuleList featureRuleList = mRenderer->rootRule()->rulesForFeature( f, &renderContext ); - Q_FOREACH ( QgsRuleBasedRendererV2::Rule* rule, featureRuleList ) + Q_FOREACH ( QgsRuleBasedRenderer::Rule* rule, featureRuleList ) { countMap[rule].count++; if ( featureRuleList.size() > 1 ) { countMap[rule].duplicateCount++; } - Q_FOREACH ( QgsRuleBasedRendererV2::Rule* duplicateRule, featureRuleList ) + Q_FOREACH ( QgsRuleBasedRenderer::Rule* duplicateRule, featureRuleList ) { if ( duplicateRule == rule ) continue; countMap[rule].duplicateCountMap[duplicateRule] += 1; @@ -583,7 +583,7 @@ void QgsRuleBasedRendererV2Widget::countFeatures() mRenderer->stopRender( renderContext ); #ifdef QGISDEBUG - Q_FOREACH ( QgsRuleBasedRendererV2::Rule *rule, countMap.keys() ) + Q_FOREACH ( QgsRuleBasedRenderer::Rule *rule, countMap.keys() ) { QgsDebugMsg( QString( "rule: %1 count %2" ).arg( rule->label() ).arg( countMap[rule].count ) ); } @@ -592,7 +592,7 @@ void QgsRuleBasedRendererV2Widget::countFeatures() mModel->setFeatureCounts( countMap ); } -void QgsRuleBasedRendererV2Widget::selectedRulesChanged() +void QgsRuleBasedRendererWidget::selectedRulesChanged() { bool enabled = !viewRules->selectionModel()->selectedIndexes().isEmpty(); btnRefineRule->setEnabled( enabled ); @@ -601,7 +601,7 @@ void QgsRuleBasedRendererV2Widget::selectedRulesChanged() /////////// -QgsRendererRulePropsWidget::QgsRendererRulePropsWidget( QgsRuleBasedRendererV2::Rule* rule, QgsVectorLayer* layer, QgsStyleV2* style, QWidget* parent , QgsMapCanvas* mapCanvas ) +QgsRendererRulePropsWidget::QgsRendererRulePropsWidget( QgsRuleBasedRenderer::Rule* rule, QgsVectorLayer* layer, QgsStyle* style, QWidget* parent , QgsMapCanvas* mapCanvas ) : QgsPanelWidget( parent ) , mRule( rule ) , mLayer( layer ) @@ -663,7 +663,7 @@ QgsRendererRulePropsWidget::~QgsRendererRulePropsWidget() } -QgsRendererRulePropsDialog::QgsRendererRulePropsDialog( QgsRuleBasedRendererV2::Rule *rule, QgsVectorLayer *layer, QgsStyleV2 *style, QWidget *parent, QgsMapCanvas *mapCanvas ) +QgsRendererRulePropsDialog::QgsRendererRulePropsDialog( QgsRuleBasedRenderer::Rule *rule, QgsVectorLayer *layer, QgsStyle *style, QWidget *parent, QgsMapCanvas *mapCanvas ) : QDialog( parent ) { @@ -821,12 +821,12 @@ static QString _formatScale( int denom ) ///// -QgsRuleBasedRendererV2Model::QgsRuleBasedRendererV2Model( QgsRuleBasedRendererV2* r ) +QgsRuleBasedRendererModel::QgsRuleBasedRendererModel( QgsRuleBasedRenderer* r ) : mR( r ) { } -Qt::ItemFlags QgsRuleBasedRendererV2Model::flags( const QModelIndex &index ) const +Qt::ItemFlags QgsRuleBasedRendererModel::flags( const QModelIndex &index ) const { if ( !index.isValid() ) return Qt::ItemIsDropEnabled; @@ -841,12 +841,12 @@ Qt::ItemFlags QgsRuleBasedRendererV2Model::flags( const QModelIndex &index ) con Qt::ItemIsDragEnabled | drop; } -QVariant QgsRuleBasedRendererV2Model::data( const QModelIndex &index, int role ) const +QVariant QgsRuleBasedRendererModel::data( const QModelIndex &index, int role ) const { if ( !index.isValid() ) return QVariant(); - QgsRuleBasedRendererV2::Rule* rule = ruleForIndex( index ); + QgsRuleBasedRenderer::Rule* rule = ruleForIndex( index ); if ( role == Qt::DisplayRole || role == Qt::ToolTipRole ) { @@ -885,7 +885,7 @@ QVariant QgsRuleBasedRendererV2Model::data( const QModelIndex &index, int role ) if ( mFeatureCountMap[rule].duplicateCount > 0 ) { QString tip = "

      "; - Q_FOREACH ( QgsRuleBasedRendererV2::Rule* duplicateRule, mFeatureCountMap[rule].duplicateCountMap.keys() ) + Q_FOREACH ( QgsRuleBasedRenderer::Rule* duplicateRule, mFeatureCountMap[rule].duplicateCountMap.keys() ) { QString label = duplicateRule->label().replace( '&', "&" ).replace( '>', ">" ).replace( '<', "<" ); tip += tr( "
    • %1 features also in rule %2
      • " ).arg( mFeatureCountMap[rule].duplicateCountMap[duplicateRule] ).arg( label ); @@ -948,7 +948,7 @@ QVariant QgsRuleBasedRendererV2Model::data( const QModelIndex &index, int role ) return QVariant(); } -QVariant QgsRuleBasedRendererV2Model::headerData( int section, Qt::Orientation orientation, int role ) const +QVariant QgsRuleBasedRendererModel::headerData( int section, Qt::Orientation orientation, int role ) const { if ( orientation == Qt::Horizontal && role == Qt::DisplayRole && section >= 0 && section < 7 ) { @@ -971,39 +971,39 @@ QVariant QgsRuleBasedRendererV2Model::headerData( int section, Qt::Orientation o return QVariant(); } -int QgsRuleBasedRendererV2Model::rowCount( const QModelIndex &parent ) const +int QgsRuleBasedRendererModel::rowCount( const QModelIndex &parent ) const { if ( parent.column() > 0 ) return 0; - QgsRuleBasedRendererV2::Rule* parentRule = ruleForIndex( parent ); + QgsRuleBasedRenderer::Rule* parentRule = ruleForIndex( parent ); return parentRule->children().count(); } -int QgsRuleBasedRendererV2Model::columnCount( const QModelIndex & ) const +int QgsRuleBasedRendererModel::columnCount( const QModelIndex & ) const { return 6; } -QModelIndex QgsRuleBasedRendererV2Model::index( int row, int column, const QModelIndex &parent ) const +QModelIndex QgsRuleBasedRendererModel::index( int row, int column, const QModelIndex &parent ) const { if ( hasIndex( row, column, parent ) ) { - QgsRuleBasedRendererV2::Rule* parentRule = ruleForIndex( parent ); - QgsRuleBasedRendererV2::Rule* childRule = parentRule->children()[row]; + QgsRuleBasedRenderer::Rule* parentRule = ruleForIndex( parent ); + QgsRuleBasedRenderer::Rule* childRule = parentRule->children()[row]; return createIndex( row, column, childRule ); } return QModelIndex(); } -QModelIndex QgsRuleBasedRendererV2Model::parent( const QModelIndex &index ) const +QModelIndex QgsRuleBasedRendererModel::parent( const QModelIndex &index ) const { if ( !index.isValid() ) return QModelIndex(); - QgsRuleBasedRendererV2::Rule* childRule = ruleForIndex( index ); - QgsRuleBasedRendererV2::Rule* parentRule = childRule->parent(); + QgsRuleBasedRenderer::Rule* childRule = ruleForIndex( index ); + QgsRuleBasedRenderer::Rule* parentRule = childRule->parent(); if ( parentRule == mR->rootRule() ) return QModelIndex(); @@ -1014,12 +1014,12 @@ QModelIndex QgsRuleBasedRendererV2Model::parent( const QModelIndex &index ) cons return createIndex( row, 0, parentRule ); } -bool QgsRuleBasedRendererV2Model::setData( const QModelIndex & index, const QVariant & value, int role ) +bool QgsRuleBasedRendererModel::setData( const QModelIndex & index, const QVariant & value, int role ) { if ( !index.isValid() ) return false; - QgsRuleBasedRendererV2::Rule* rule = ruleForIndex( index ); + QgsRuleBasedRenderer::Rule* rule = ruleForIndex( index ); if ( role == Qt::CheckStateRole ) { @@ -1053,19 +1053,19 @@ bool QgsRuleBasedRendererV2Model::setData( const QModelIndex & index, const QVar return true; } -Qt::DropActions QgsRuleBasedRendererV2Model::supportedDropActions() const +Qt::DropActions QgsRuleBasedRendererModel::supportedDropActions() const { return Qt::MoveAction; // | Qt::CopyAction } -QStringList QgsRuleBasedRendererV2Model::mimeTypes() const +QStringList QgsRuleBasedRendererModel::mimeTypes() const { QStringList types; types << "application/vnd.text.list"; return types; } -QMimeData *QgsRuleBasedRendererV2Model::mimeData( const QModelIndexList &indexes ) const +QMimeData *QgsRuleBasedRendererModel::mimeData( const QModelIndexList &indexes ) const { QMimeData *mimeData = new QMimeData(); QByteArray encodedData; @@ -1080,7 +1080,7 @@ QMimeData *QgsRuleBasedRendererV2Model::mimeData( const QModelIndexList &indexes // we use a clone of the existing rule because it has a new unique rule key // non-unique rule keys would confuse other components using them (e.g. legend) - QgsRuleBasedRendererV2::Rule* rule = ruleForIndex( index )->clone(); + QgsRuleBasedRenderer::Rule* rule = ruleForIndex( index )->clone(); QDomDocument doc; QgsSymbolMap symbols; @@ -1119,7 +1119,7 @@ void _labeling2rendererRules( QDomElement& ruleElem ) } -bool QgsRuleBasedRendererV2Model::dropMimeData( const QMimeData *data, +bool QgsRuleBasedRendererModel::dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent ) { Q_UNUSED( column ); @@ -1163,7 +1163,7 @@ bool QgsRuleBasedRendererV2Model::dropMimeData( const QMimeData *data, QDomElement ruleElem = rootElem.firstChildElement( "rule" ); if ( rootElem.attribute( "type" ) == "labeling" ) _labeling2rendererRules( ruleElem ); - QgsRuleBasedRendererV2::Rule* rule = QgsRuleBasedRendererV2::Rule::create( ruleElem, symbolMap ); + QgsRuleBasedRenderer::Rule* rule = QgsRuleBasedRenderer::Rule::create( ruleElem, symbolMap ); insertRule( parent, row + rows, rule ); @@ -1172,16 +1172,16 @@ bool QgsRuleBasedRendererV2Model::dropMimeData( const QMimeData *data, return true; } -QgsRuleBasedRendererV2::Rule* QgsRuleBasedRendererV2Model::ruleForIndex( const QModelIndex& index ) const +QgsRuleBasedRenderer::Rule* QgsRuleBasedRendererModel::ruleForIndex( const QModelIndex& index ) const { if ( index.isValid() ) - return static_cast( index.internalPointer() ); + return static_cast( index.internalPointer() ); return mR->rootRule(); } -bool QgsRuleBasedRendererV2Model::removeRows( int row, int count, const QModelIndex & parent ) +bool QgsRuleBasedRendererModel::removeRows( int row, int count, const QModelIndex & parent ) { - QgsRuleBasedRendererV2::Rule* parentRule = ruleForIndex( parent ); + QgsRuleBasedRenderer::Rule* parentRule = ruleForIndex( parent ); if ( row < 0 || row >= parentRule->children().count() ) return false; @@ -1194,7 +1194,7 @@ bool QgsRuleBasedRendererV2Model::removeRows( int row, int count, const QModelIn { if ( row < parentRule->children().count() ) { - //QgsRuleBasedRendererV2::Rule* r = parentRule->children()[row]; + //QgsRuleBasedRenderer::Rule* r = parentRule->children()[row]; parentRule->removeChildAt( row ); //parentRule->takeChildAt( row ); } @@ -1210,25 +1210,25 @@ bool QgsRuleBasedRendererV2Model::removeRows( int row, int count, const QModelIn } -void QgsRuleBasedRendererV2Model::insertRule( const QModelIndex& parent, int before, QgsRuleBasedRendererV2::Rule* newrule ) +void QgsRuleBasedRendererModel::insertRule( const QModelIndex& parent, int before, QgsRuleBasedRenderer::Rule* newrule ) { beginInsertRows( parent, before, before ); QgsDebugMsg( QString( "insert before %1 rule: %2" ).arg( before ).arg( newrule->dump() ) ); - QgsRuleBasedRendererV2::Rule* parentRule = ruleForIndex( parent ); + QgsRuleBasedRenderer::Rule* parentRule = ruleForIndex( parent ); parentRule->insertChild( before, newrule ); endInsertRows(); } -void QgsRuleBasedRendererV2Model::updateRule( const QModelIndex& parent, int row ) +void QgsRuleBasedRendererModel::updateRule( const QModelIndex& parent, int row ) { emit dataChanged( index( row, 0, parent ), index( row, columnCount( parent ), parent ) ); } -void QgsRuleBasedRendererV2Model::updateRule( const QModelIndex& idx ) +void QgsRuleBasedRendererModel::updateRule( const QModelIndex& idx ) { emit dataChanged( index( 0, 0, idx ), index( rowCount( idx ) - 1, columnCount( idx ) - 1, idx ) ); @@ -1240,37 +1240,37 @@ void QgsRuleBasedRendererV2Model::updateRule( const QModelIndex& idx ) } -void QgsRuleBasedRendererV2Model::removeRule( const QModelIndex& index ) +void QgsRuleBasedRendererModel::removeRule( const QModelIndex& index ) { if ( !index.isValid() ) return; beginRemoveRows( index.parent(), index.row(), index.row() ); - QgsRuleBasedRendererV2::Rule* rule = ruleForIndex( index ); + QgsRuleBasedRenderer::Rule* rule = ruleForIndex( index ); rule->parent()->removeChild( rule ); endRemoveRows(); } -void QgsRuleBasedRendererV2Model::willAddRules( const QModelIndex& parent, int count ) +void QgsRuleBasedRendererModel::willAddRules( const QModelIndex& parent, int count ) { int row = rowCount( parent ); // only consider appending beginInsertRows( parent, row, row + count - 1 ); } -void QgsRuleBasedRendererV2Model::finishedAddingRules() +void QgsRuleBasedRendererModel::finishedAddingRules() { emit endInsertRows(); } -void QgsRuleBasedRendererV2Model::setFeatureCounts( const QMap& theCountMap ) +void QgsRuleBasedRendererModel::setFeatureCounts( const QMap& theCountMap ) { mFeatureCountMap = theCountMap; updateRule( QModelIndex() ); } -void QgsRuleBasedRendererV2Model::clearFeatureCounts() +void QgsRuleBasedRendererModel::clearFeatureCounts() { mFeatureCountMap.clear(); updateRule( QModelIndex() ); diff --git a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.h b/src/gui/symbology-ng/qgsrulebasedrendererwidget.h similarity index 76% rename from src/gui/symbology-ng/qgsrulebasedrendererv2widget.h rename to src/gui/symbology-ng/qgsrulebasedrendererwidget.h index 0120c34da8b..69c8c06708f 100644 --- a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.h +++ b/src/gui/symbology-ng/qgsrulebasedrendererwidget.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsrulebasedrendererv2widget.h - Settings widget for rule-based renderer + qgsrulebasedrendererwidget.h - Settings widget for rule-based renderer --------------------- begin : May 2010 copyright : (C) 2010 by Martin Dobias @@ -16,9 +16,9 @@ #ifndef QGSRULEBASEDRENDERERV2WIDGET_H #define QGSRULEBASEDRENDERERV2WIDGET_H -#include "qgsrendererv2widget.h" +#include "qgsrendererwidget.h" -#include "qgsrulebasedrendererv2.h" +#include "qgsrulebasedrenderer.h" class QMenu; class QgsSymbolSelectorWidget; @@ -27,12 +27,12 @@ class QgsSymbolSelectorWidget; #include /* Features count fro rule */ -struct QgsRuleBasedRendererV2Count +struct QgsRuleBasedRendererCount { int count; // number of features int duplicateCount; // number of features present also in other rule(s) // map of feature counts in other rules - QMap duplicateCountMap; + QMap duplicateCountMap; }; /** \ingroup gui @@ -42,12 +42,12 @@ Tree model for the rules: +--- top level rule +--- top level rule */ -class GUI_EXPORT QgsRuleBasedRendererV2Model : public QAbstractItemModel +class GUI_EXPORT QgsRuleBasedRendererModel : public QAbstractItemModel { Q_OBJECT public: - QgsRuleBasedRendererV2Model( QgsRuleBasedRendererV2* r ); + QgsRuleBasedRendererModel( QgsRuleBasedRenderer* r ); virtual Qt::ItemFlags flags( const QModelIndex &index ) const override; virtual QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const override; @@ -73,9 +73,9 @@ class GUI_EXPORT QgsRuleBasedRendererV2Model : public 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 ); @@ -85,12 +85,12 @@ class GUI_EXPORT QgsRuleBasedRendererV2Model : public QAbstractItemModel void finishedAddingRules(); // call endInsertRows //! @note not available in python bindungs - void setFeatureCounts( const QMap& theCountMap ); + void setFeatureCounts( const QMap& theCountMap ); void clearFeatureCounts(); protected: - QgsRuleBasedRendererV2* mR; - QMap mFeatureCountMap; + QgsRuleBasedRenderer* mR; + QMap mFeatureCountMap; }; @@ -99,20 +99,20 @@ class GUI_EXPORT QgsRuleBasedRendererV2Model : public QAbstractItemModel #include "ui_qgsrulebasedrendererv2widget.h" /** \ingroup gui - * \class QgsRuleBasedRendererV2Widget + * \class QgsRuleBasedRendererWidget */ -class GUI_EXPORT QgsRuleBasedRendererV2Widget : public QgsRendererV2Widget, private Ui::QgsRuleBasedRendererV2Widget +class GUI_EXPORT QgsRuleBasedRendererWidget : public QgsRendererWidget, private Ui::QgsRuleBasedRendererWidget { Q_OBJECT public: - static QgsRendererV2Widget* create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); + static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); - QgsRuleBasedRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); - ~QgsRuleBasedRendererV2Widget(); + QgsRuleBasedRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); + ~QgsRuleBasedRendererWidget(); - virtual QgsFeatureRendererV2* renderer() override; + virtual QgsFeatureRenderer* renderer() override; public slots: @@ -143,20 +143,20 @@ class GUI_EXPORT QgsRuleBasedRendererV2Widget : public QgsRendererV2Widget, priv void refineRuleRangesGui( const QModelIndexList& index ); void refineRuleScalesGui( const QModelIndexList& index ); - QgsRuleBasedRendererV2::Rule* currentRule(); + QgsRuleBasedRenderer::Rule* currentRule(); QList selectedSymbols() override; - QgsRuleBasedRendererV2::RuleList selectedRules(); + QgsRuleBasedRenderer::RuleList selectedRules(); void refreshSymbolView() override; void keyPressEvent( QKeyEvent* event ) override; - QgsRuleBasedRendererV2* mRenderer; - QgsRuleBasedRendererV2Model* mModel; + QgsRuleBasedRenderer* mRenderer; + QgsRuleBasedRendererModel* mModel; QMenu* mRefineMenu; QAction* mDeleteAction; - QgsRuleBasedRendererV2::RuleList mCopyBuffer; + QgsRuleBasedRenderer::RuleList mCopyBuffer; protected slots: void copy() override; @@ -191,14 +191,14 @@ class GUI_EXPORT QgsRendererRulePropsWidget : public QgsPanelWidget, private Ui: * @param parent The parent widget. * @param mapCanvas The map canvas object. */ - QgsRendererRulePropsWidget( QgsRuleBasedRendererV2::Rule* rule, QgsVectorLayer* layer, QgsStyleV2* style, QWidget* parent = nullptr, QgsMapCanvas* mapCanvas = nullptr ); + QgsRendererRulePropsWidget( QgsRuleBasedRenderer::Rule* rule, QgsVectorLayer* layer, QgsStyle* style, QWidget* parent = nullptr, QgsMapCanvas* mapCanvas = nullptr ); ~QgsRendererRulePropsWidget(); /** * Return the current set rule. * @return The current rule. */ - QgsRuleBasedRendererV2::Rule* rule() { return mRule; } + QgsRuleBasedRenderer::Rule* rule() { return mRule; } public slots: @@ -223,7 +223,7 @@ class GUI_EXPORT QgsRendererRulePropsWidget : public QgsPanelWidget, private Ui: virtual void setDockMode( bool dockMode ); protected: - QgsRuleBasedRendererV2::Rule* mRule; // borrowed + QgsRuleBasedRenderer::Rule* mRule; // borrowed QgsVectorLayer* mLayer; QgsSymbolSelectorWidget* mSymbolSelector; @@ -240,10 +240,10 @@ class GUI_EXPORT QgsRendererRulePropsDialog : public QDialog Q_OBJECT public: - QgsRendererRulePropsDialog( QgsRuleBasedRendererV2::Rule* rule, QgsVectorLayer* layer, QgsStyleV2* style, QWidget* parent = nullptr, QgsMapCanvas* mapCanvas = nullptr ); + QgsRendererRulePropsDialog( QgsRuleBasedRenderer::Rule* rule, QgsVectorLayer* layer, QgsStyle* style, QWidget* parent = nullptr, QgsMapCanvas* mapCanvas = nullptr ); ~QgsRendererRulePropsDialog(); - QgsRuleBasedRendererV2::Rule* rule() { return mPropsWidget->rule(); } + QgsRuleBasedRenderer::Rule* rule() { return mPropsWidget->rule(); } public slots: void testFilter(); diff --git a/src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgssinglesymbolrendererwidget.cpp similarity index 64% rename from src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp rename to src/gui/symbology-ng/qgssinglesymbolrendererwidget.cpp index 908ecbccf3d..6e18971a0c0 100644 --- a/src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp +++ b/src/gui/symbology-ng/qgssinglesymbolrendererwidget.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgssinglesymbolrendererv2widget.cpp + qgssinglesymbolrendererwidget.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -12,9 +12,9 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgssinglesymbolrendererv2widget.h" +#include "qgssinglesymbolrendererwidget.h" -#include "qgssinglesymbolrendererv2.h" +#include "qgssinglesymbolrenderer.h" #include "qgssymbol.h" #include "qgslogger.h" @@ -24,13 +24,13 @@ #include -QgsRendererV2Widget* QgsSingleSymbolRendererV2Widget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) +QgsRendererWidget* QgsSingleSymbolRendererWidget::create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) { - return new QgsSingleSymbolRendererV2Widget( layer, style, renderer ); + return new QgsSingleSymbolRendererWidget( layer, style, renderer ); } -QgsSingleSymbolRendererV2Widget::QgsSingleSymbolRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) - : QgsRendererV2Widget( layer, style ) +QgsSingleSymbolRendererWidget::QgsSingleSymbolRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) + : QgsRendererWidget( layer, style ) , mRenderer( nullptr ) { // try to recognize the previous renderer @@ -38,13 +38,13 @@ QgsSingleSymbolRendererV2Widget::QgsSingleSymbolRendererV2Widget( QgsVectorLayer if ( renderer ) { - mRenderer = QgsSingleSymbolRendererV2::convertFromRenderer( renderer ); + mRenderer = QgsSingleSymbolRenderer::convertFromRenderer( renderer ); } if ( !mRenderer ) { QgsSymbol* symbol = QgsSymbol::defaultSymbol( mLayer->geometryType() ); - mRenderer = new QgsSingleSymbolRendererV2( symbol ); + mRenderer = new QgsSingleSymbolRenderer( symbol ); } // load symbol from it @@ -65,7 +65,7 @@ QgsSingleSymbolRendererV2Widget::QgsSingleSymbolRendererV2Widget( QgsVectorLayer advMenu->addAction( tr( "Symbol levels..." ), this, SLOT( showSymbolLevels() ) ); } -QgsSingleSymbolRendererV2Widget::~QgsSingleSymbolRendererV2Widget() +QgsSingleSymbolRendererWidget::~QgsSingleSymbolRendererWidget() { delete mSingleSymbol; @@ -75,49 +75,49 @@ QgsSingleSymbolRendererV2Widget::~QgsSingleSymbolRendererV2Widget() } -QgsFeatureRendererV2* QgsSingleSymbolRendererV2Widget::renderer() +QgsFeatureRenderer* QgsSingleSymbolRendererWidget::renderer() { return mRenderer; } -void QgsSingleSymbolRendererV2Widget::setMapCanvas( QgsMapCanvas* canvas ) +void QgsSingleSymbolRendererWidget::setMapCanvas( QgsMapCanvas* canvas ) { - QgsRendererV2Widget::setMapCanvas( canvas ); + QgsRendererWidget::setMapCanvas( canvas ); if ( mSelector ) mSelector->setMapCanvas( canvas ); } -void QgsSingleSymbolRendererV2Widget::setDockMode( bool dockMode ) +void QgsSingleSymbolRendererWidget::setDockMode( bool dockMode ) { - QgsRendererV2Widget::setDockMode( dockMode ); + QgsRendererWidget::setDockMode( dockMode ); if ( mSelector ) mSelector->setDockMode( dockMode ); } -void QgsSingleSymbolRendererV2Widget::changeSingleSymbol() +void QgsSingleSymbolRendererWidget::changeSingleSymbol() { // update symbol from the GUI mRenderer->setSymbol( mSingleSymbol->clone() ); emit widgetChanged(); } -void QgsSingleSymbolRendererV2Widget::sizeScaleFieldChanged( const QString& fldName ) +void QgsSingleSymbolRendererWidget::sizeScaleFieldChanged( const QString& fldName ) { mRenderer->setSizeScaleField( fldName ); } -void QgsSingleSymbolRendererV2Widget::scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod ) +void QgsSingleSymbolRendererWidget::scaleMethodChanged( QgsSymbol::ScaleMethod scaleMethod ) { mRenderer->setScaleMethod( scaleMethod ); // Set also on the symbol clone - QgsMarkerSymbolV2 *markerSymbol = dynamic_cast( mSingleSymbol ); + QgsMarkerSymbol *markerSymbol = dynamic_cast( mSingleSymbol ); if ( markerSymbol ) { markerSymbol->setScaleMethod( scaleMethod ); } } -void QgsSingleSymbolRendererV2Widget::showSymbolLevels() +void QgsSingleSymbolRendererWidget::showSymbolLevels() { showSymbolLevelsDialog( mRenderer ); } diff --git a/src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h b/src/gui/symbology-ng/qgssinglesymbolrendererwidget.h similarity index 74% rename from src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h rename to src/gui/symbology-ng/qgssinglesymbolrendererwidget.h index f7f7b9a3e80..3053c5e5064 100644 --- a/src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h +++ b/src/gui/symbology-ng/qgssinglesymbolrendererwidget.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgssinglesymbolrendererv2widget.h + qgssinglesymbolrendererwidget.h --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -15,27 +15,27 @@ #ifndef QGSSINGLESYMBOLRENDERERV2WIDGET_H #define QGSSINGLESYMBOLRENDERERV2WIDGET_H -#include "qgsrendererv2widget.h" +#include "qgsrendererwidget.h" -class QgsSingleSymbolRendererV2; +class QgsSingleSymbolRenderer; class QgsSymbolSelectorWidget; class QMenu; /** \ingroup gui - * \class QgsSingleSymbolRendererV2Widget + * \class QgsSingleSymbolRendererWidget */ -class GUI_EXPORT QgsSingleSymbolRendererV2Widget : public QgsRendererV2Widget +class GUI_EXPORT QgsSingleSymbolRendererWidget : public QgsRendererWidget { Q_OBJECT public: - static QgsRendererV2Widget* create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); + static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); - QgsSingleSymbolRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); - ~QgsSingleSymbolRendererV2Widget(); + QgsSingleSymbolRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); + ~QgsSingleSymbolRendererWidget(); - virtual QgsFeatureRendererV2* renderer() override; + virtual QgsFeatureRenderer* renderer() override; virtual void setMapCanvas( QgsMapCanvas* canvas ) override; @@ -56,7 +56,7 @@ class GUI_EXPORT QgsSingleSymbolRendererV2Widget : public QgsRendererV2Widget protected: - QgsSingleSymbolRendererV2* mRenderer; + QgsSingleSymbolRenderer* mRenderer; QgsSymbolSelectorWidget* mSelector; QgsSymbol* mSingleSymbol; }; diff --git a/src/gui/symbology-ng/qgssizescalewidget.cpp b/src/gui/symbology-ng/qgssizescalewidget.cpp index d12a407ec58..5392c68eb16 100644 --- a/src/gui/symbology-ng/qgssizescalewidget.cpp +++ b/src/gui/symbology-ng/qgssizescalewidget.cpp @@ -41,13 +41,13 @@ void QgsSizeScaleWidget::setFromSymbol() } QgsDataDefined ddSize; - if ( dynamic_cast< const QgsMarkerSymbolV2*>( mSymbol ) ) + if ( dynamic_cast< const QgsMarkerSymbol*>( mSymbol ) ) { - ddSize = static_cast< const QgsMarkerSymbolV2*>( mSymbol )->dataDefinedSize(); + ddSize = static_cast< const QgsMarkerSymbol*>( mSymbol )->dataDefinedSize(); } - else if ( dynamic_cast< const QgsLineSymbolV2*>( mSymbol ) ) + else if ( dynamic_cast< const QgsLineSymbol*>( mSymbol ) ) { - ddSize = dynamic_cast< const QgsLineSymbolV2*>( mSymbol )->dataDefinedWidth(); + ddSize = dynamic_cast< const QgsLineSymbol*>( mSymbol )->dataDefinedWidth(); } QgsScaleExpression expr( ddSize.expressionString() ); @@ -144,13 +144,13 @@ QgsSizeScaleWidget::QgsSizeScaleWidget( const QgsVectorLayer * layer, const QgsS mExpressionWidget->setLayer( mLayer ); } - if ( dynamic_cast( mSymbol ) ) + if ( dynamic_cast( mSymbol ) ) { scaleMethodComboBox->addItem( tr( "Flannery" ), int( QgsScaleExpression::Flannery ) ); scaleMethodComboBox->addItem( tr( "Surface" ), int( QgsScaleExpression::Area ) ); scaleMethodComboBox->addItem( tr( "Radius" ), int( QgsScaleExpression::Linear ) ); } - else if ( dynamic_cast( mSymbol ) ) + else if ( dynamic_cast( mSymbol ) ) { scaleMethodComboBox->addItem( tr( "Exponential" ), int( QgsScaleExpression::Exponential ) ); scaleMethodComboBox->addItem( tr( "Linear" ), int( QgsScaleExpression::Linear ) ); @@ -224,20 +224,20 @@ void QgsSizeScaleWidget::updatePreview() for ( int i = 0; i < breaks.length(); i++ ) { QScopedPointer< QgsSymbolLegendNode > node; - if ( dynamic_cast( mSymbol ) ) + if ( dynamic_cast( mSymbol ) ) { - QScopedPointer< QgsMarkerSymbolV2 > symbol( static_cast( mSymbol->clone() ) ); + QScopedPointer< QgsMarkerSymbol > symbol( static_cast( mSymbol->clone() ) ); symbol->setDataDefinedSize( QgsDataDefined() ); symbol->setDataDefinedAngle( QgsDataDefined() ); // to avoid symbol not beeing drawn symbol->setSize( expr->size( breaks[i] ) ); - node.reset( new QgsSymbolLegendNode( mLayerTreeLayer, QgsLegendSymbolItemV2( symbol.data(), QString::number( i ), QString() ) ) ); + node.reset( new QgsSymbolLegendNode( mLayerTreeLayer, QgsLegendSymbolItem( symbol.data(), QString::number( i ), QString() ) ) ); } - else if ( dynamic_cast( mSymbol ) ) + else if ( dynamic_cast( mSymbol ) ) { - QScopedPointer< QgsLineSymbolV2 > symbol( static_cast( mSymbol->clone() ) ); + QScopedPointer< QgsLineSymbol > symbol( static_cast( mSymbol->clone() ) ); symbol->setDataDefinedWidth( QgsDataDefined() ); symbol->setWidth( expr->size( breaks[i] ) ); - node.reset( new QgsSymbolLegendNode( mLayerTreeLayer, QgsLegendSymbolItemV2( symbol.data(), QString::number( i ), QString() ) ) ); + node.reset( new QgsSymbolLegendNode( mLayerTreeLayer, QgsLegendSymbolItem( symbol.data(), QString::number( i ), QString() ) ) ); } diff --git a/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp b/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp index 513162c5538..49842c76079 100644 --- a/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp +++ b/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp @@ -15,7 +15,7 @@ #include "qgssmartgroupeditordialog.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgsapplication.h" #include @@ -76,7 +76,7 @@ void QgsSmartGroupCondition::hideRemoveButton( bool hide ) // ------------------------ // // Editor Dialog Functions // // ------------------------ // -QgsSmartGroupEditorDialog::QgsSmartGroupEditorDialog( QgsStyleV2* style, QWidget* parent ) +QgsSmartGroupEditorDialog::QgsSmartGroupEditorDialog( QgsStyle* style, QWidget* parent ) : QDialog( parent ) , mStyle( style ) { diff --git a/src/gui/symbology-ng/qgssmartgroupeditordialog.h b/src/gui/symbology-ng/qgssmartgroupeditordialog.h index f27c3bf553f..0a6d09b3e86 100644 --- a/src/gui/symbology-ng/qgssmartgroupeditordialog.h +++ b/src/gui/symbology-ng/qgssmartgroupeditordialog.h @@ -60,7 +60,7 @@ class GUI_EXPORT QgsSmartGroupCondition : public QWidget, private Ui::QgsSmartGr #include "ui_qgssmartgroupeditordialogbase.h" //#include "qgscontexthelp.h" -#include "qgsstylev2.h" //for QgsSmartConditionMap +#include "qgsstyle.h" //for QgsSmartConditionMap /** \ingroup gui * \class QgsSmartGroupEditorDialog @@ -70,7 +70,7 @@ class GUI_EXPORT QgsSmartGroupEditorDialog : public QDialog, private Ui::QgsSmar Q_OBJECT public: - QgsSmartGroupEditorDialog( QgsStyleV2* style, QWidget* parent = nullptr ); + QgsSmartGroupEditorDialog( QgsStyle* style, QWidget* parent = nullptr ); ~QgsSmartGroupEditorDialog(); //! returns the value from mNameLineEdit @@ -104,7 +104,7 @@ class GUI_EXPORT QgsSmartGroupEditorDialog : public QDialog, private Ui::QgsSmar void on_buttonBox_accepted(); protected: - QgsStyleV2* mStyle; + QgsStyle* mStyle; // layout of the mConditionsBox QGridLayout *mLayout; // counter for the number of conditions diff --git a/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp b/src/gui/symbology-ng/qgsstyleexportimportdialog.cpp similarity index 85% rename from src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp rename to src/gui/symbology-ng/qgsstyleexportimportdialog.cpp index 04abc335250..ce4b40c735f 100644 --- a/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp +++ b/src/gui/symbology-ng/qgsstyleexportimportdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsstylev2exportimportdialog.cpp + qgsstyleexportimportdialog.cpp --------------------- begin : Jan 2011 copyright : (C) 2011 by Alexander Bruy @@ -14,15 +14,15 @@ * * ***************************************************************************/ -#include "qgsstylev2exportimportdialog.h" -#include "ui_qgsstylev2exportimportdialogbase.h" +#include "qgsstyleexportimportdialog.h" +#include "ui_qgsstyleexportimportdialogbase.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgssymbol.h" #include "qgssymbollayerutils.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgslogger.h" -#include "qgsstylev2groupselectiondialog.h" +#include "qgsstylegroupselectiondialog.h" #include #include @@ -32,7 +32,7 @@ #include -QgsStyleV2ExportImportDialog::QgsStyleV2ExportImportDialog( QgsStyleV2* style, QWidget *parent, Mode mode ) +QgsStyleExportImportDialog::QgsStyleExportImportDialog( QgsStyle* style, QWidget *parent, Mode mode ) : QDialog( parent ) , mDialogMode( mode ) , mQgisStyle( style ) @@ -55,7 +55,7 @@ QgsStyleV2ExportImportDialog::QgsStyleV2ExportImportDialog( QgsStyleV2* style, Q connect( listItems->selectionModel(), SIGNAL( selectionChanged( const QItemSelection&, const QItemSelection& ) ), this, SLOT( selectionChanged( const QItemSelection&, const QItemSelection& ) ) ); - mTempStyle = new QgsStyleV2(); + mTempStyle = new QgsStyle(); // TODO validate mFileName = ""; mProgressDlg = nullptr; @@ -115,7 +115,7 @@ QgsStyleV2ExportImportDialog::QgsStyleV2ExportImportDialog( QgsStyleV2* style, Q buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false ); } -void QgsStyleV2ExportImportDialog::doExportImport() +void QgsStyleExportImportDialog::doExportImport() { QModelIndexList selection = listItems->selectionModel()->selectedIndexes(); if ( selection.isEmpty() ) @@ -165,7 +165,7 @@ void QgsStyleV2ExportImportDialog::doExportImport() mTempStyle->clear(); } -bool QgsStyleV2ExportImportDialog::populateStyles( QgsStyleV2* style ) +bool QgsStyleExportImportDialog::populateStyles( QgsStyle* style ) { // load symbols and color ramps from file if ( mDialogMode == Import ) @@ -203,7 +203,7 @@ bool QgsStyleV2ExportImportDialog::populateStyles( QgsStyleV2* style ) for ( int i = 0; i < styleNames.count(); ++i ) { name = styleNames[i]; - QgsVectorColorRampV2* ramp = style->colorRamp( name ); + QgsVectorColorRamp* ramp = style->colorRamp( name ); QStandardItem* item = new QStandardItem( name ); QIcon icon = QgsSymbolLayerUtils::colorRampPreviewIcon( ramp, listItems->iconSize() ); @@ -214,11 +214,11 @@ bool QgsStyleV2ExportImportDialog::populateStyles( QgsStyleV2* style ) return true; } -void QgsStyleV2ExportImportDialog::moveStyles( QModelIndexList* selection, QgsStyleV2* src, QgsStyleV2* dst ) +void QgsStyleExportImportDialog::moveStyles( QModelIndexList* selection, QgsStyle* src, QgsStyle* dst ) { QString symbolName; QgsSymbol* symbol; - QgsVectorColorRampV2 *ramp = nullptr; + QgsVectorColorRamp *ramp = nullptr; QModelIndex index; bool isSymbol = true; bool prompt = true; @@ -353,24 +353,24 @@ void QgsStyleV2ExportImportDialog::moveStyles( QModelIndexList* selection, QgsSt } } -QgsStyleV2ExportImportDialog::~QgsStyleV2ExportImportDialog() +QgsStyleExportImportDialog::~QgsStyleExportImportDialog() { delete mTempFile; delete mTempStyle; delete mGroupSelectionDlg; } -void QgsStyleV2ExportImportDialog::selectAll() +void QgsStyleExportImportDialog::selectAll() { listItems->selectAll(); } -void QgsStyleV2ExportImportDialog::clearSelection() +void QgsStyleExportImportDialog::clearSelection() { listItems->clearSelection(); } -void QgsStyleV2ExportImportDialog::selectSymbols( const QStringList& symbolNames ) +void QgsStyleExportImportDialog::selectSymbols( const QStringList& symbolNames ) { Q_FOREACH ( const QString &symbolName, symbolNames ) { @@ -382,7 +382,7 @@ void QgsStyleV2ExportImportDialog::selectSymbols( const QStringList& symbolNames } } -void QgsStyleV2ExportImportDialog::deselectSymbols( const QStringList& symbolNames ) +void QgsStyleExportImportDialog::deselectSymbols( const QStringList& symbolNames ) { Q_FOREACH ( const QString &symbolName, symbolNames ) { @@ -395,44 +395,44 @@ void QgsStyleV2ExportImportDialog::deselectSymbols( const QStringList& symbolNam } } -void QgsStyleV2ExportImportDialog::selectGroup( const QString& groupName ) +void QgsStyleExportImportDialog::selectGroup( const QString& groupName ) { - QStringList symbolNames = mQgisStyle->symbolsOfGroup( QgsStyleV2::SymbolEntity, mQgisStyle->groupId( groupName ) ); + QStringList symbolNames = mQgisStyle->symbolsOfGroup( QgsStyle::SymbolEntity, mQgisStyle->groupId( groupName ) ); selectSymbols( symbolNames ); - symbolNames = mQgisStyle->symbolsOfGroup( QgsStyleV2::ColorrampEntity, mQgisStyle->groupId( groupName ) ); + symbolNames = mQgisStyle->symbolsOfGroup( QgsStyle::ColorrampEntity, mQgisStyle->groupId( groupName ) ); selectSymbols( symbolNames ); } -void QgsStyleV2ExportImportDialog::deselectGroup( const QString& groupName ) +void QgsStyleExportImportDialog::deselectGroup( const QString& groupName ) { - QStringList symbolNames = mQgisStyle->symbolsOfGroup( QgsStyleV2::SymbolEntity, mQgisStyle->groupId( groupName ) ); + QStringList symbolNames = mQgisStyle->symbolsOfGroup( QgsStyle::SymbolEntity, mQgisStyle->groupId( groupName ) ); deselectSymbols( symbolNames ); - symbolNames = mQgisStyle->symbolsOfGroup( QgsStyleV2::ColorrampEntity, mQgisStyle->groupId( groupName ) ); + symbolNames = mQgisStyle->symbolsOfGroup( QgsStyle::ColorrampEntity, mQgisStyle->groupId( groupName ) ); deselectSymbols( symbolNames ); } -void QgsStyleV2ExportImportDialog::selectSmartgroup( const QString& groupName ) +void QgsStyleExportImportDialog::selectSmartgroup( const QString& groupName ) { - QStringList symbolNames = mQgisStyle->symbolsOfSmartgroup( QgsStyleV2::SymbolEntity, mQgisStyle->smartgroupId( groupName ) ); + QStringList symbolNames = mQgisStyle->symbolsOfSmartgroup( QgsStyle::SymbolEntity, mQgisStyle->smartgroupId( groupName ) ); selectSymbols( symbolNames ); - symbolNames = mQgisStyle->symbolsOfSmartgroup( QgsStyleV2::ColorrampEntity, mQgisStyle->smartgroupId( groupName ) ); + symbolNames = mQgisStyle->symbolsOfSmartgroup( QgsStyle::ColorrampEntity, mQgisStyle->smartgroupId( groupName ) ); selectSymbols( symbolNames ); } -void QgsStyleV2ExportImportDialog::deselectSmartgroup( const QString& groupName ) +void QgsStyleExportImportDialog::deselectSmartgroup( const QString& groupName ) { - QStringList symbolNames = mQgisStyle->symbolsOfSmartgroup( QgsStyleV2::SymbolEntity, mQgisStyle->smartgroupId( groupName ) ); + QStringList symbolNames = mQgisStyle->symbolsOfSmartgroup( QgsStyle::SymbolEntity, mQgisStyle->smartgroupId( groupName ) ); deselectSymbols( symbolNames ); - symbolNames = mQgisStyle->symbolsOfSmartgroup( QgsStyleV2::ColorrampEntity, mQgisStyle->smartgroupId( groupName ) ); + symbolNames = mQgisStyle->symbolsOfSmartgroup( QgsStyle::ColorrampEntity, mQgisStyle->smartgroupId( groupName ) ); deselectSymbols( symbolNames ); } -void QgsStyleV2ExportImportDialog::selectByGroup() +void QgsStyleExportImportDialog::selectByGroup() { if ( ! mGroupSelectionDlg ) { - mGroupSelectionDlg = new QgsStyleV2GroupSelectionDialog( mQgisStyle, this ); + mGroupSelectionDlg = new QgsStyleGroupSelectionDialog( mQgisStyle, this ); mGroupSelectionDlg->setWindowTitle( tr( "Select symbols by group" ) ); connect( mGroupSelectionDlg, SIGNAL( groupSelected( const QString ) ), this, SLOT( selectGroup( const QString ) ) ); connect( mGroupSelectionDlg, SIGNAL( groupDeselected( const QString ) ), this, SLOT( deselectGroup( const QString ) ) ); @@ -446,7 +446,7 @@ void QgsStyleV2ExportImportDialog::selectByGroup() mGroupSelectionDlg->activateWindow(); } -void QgsStyleV2ExportImportDialog::importTypeChanged( int index ) +void QgsStyleExportImportDialog::importTypeChanged( int index ) { QString type = importTypeCombo->itemData( index ).toString(); @@ -469,7 +469,7 @@ void QgsStyleV2ExportImportDialog::importTypeChanged( int index ) } } -void QgsStyleV2ExportImportDialog::browse() +void QgsStyleExportImportDialog::browse() { QString type = importTypeCombo->itemData( importTypeCombo->currentIndex() ).toString(); @@ -498,7 +498,7 @@ void QgsStyleV2ExportImportDialog::browse() } } -void QgsStyleV2ExportImportDialog::downloadStyleXml( const QUrl& url ) +void QgsStyleExportImportDialog::downloadStyleXml( const QUrl& url ) { // XXX Try to move this code to some core Network interface, // HTTP downloading is a generic functionality that might be used elsewhere @@ -535,7 +535,7 @@ void QgsStyleV2ExportImportDialog::downloadStyleXml( const QUrl& url ) } } -void QgsStyleV2ExportImportDialog::httpFinished() +void QgsStyleExportImportDialog::httpFinished() { if ( mNetReply->error() ) { @@ -554,25 +554,25 @@ void QgsStyleV2ExportImportDialog::httpFinished() } } -void QgsStyleV2ExportImportDialog::fileReadyRead() +void QgsStyleExportImportDialog::fileReadyRead() { mTempFile->write( mNetReply->readAll() ); } -void QgsStyleV2ExportImportDialog::updateProgress( qint64 bytesRead, qint64 bytesTotal ) +void QgsStyleExportImportDialog::updateProgress( qint64 bytesRead, qint64 bytesTotal ) { mProgressDlg->setMaximum( bytesTotal ); mProgressDlg->setValue( bytesRead ); } -void QgsStyleV2ExportImportDialog::downloadCanceled() +void QgsStyleExportImportDialog::downloadCanceled() { mNetReply->abort(); mTempFile->remove(); mFileName = ""; } -void QgsStyleV2ExportImportDialog::selectionChanged( const QItemSelection & selected, const QItemSelection & deselected ) +void QgsStyleExportImportDialog::selectionChanged( const QItemSelection & selected, const QItemSelection & deselected ) { Q_UNUSED( selected ); Q_UNUSED( deselected ); diff --git a/src/gui/symbology-ng/qgsstylev2exportimportdialog.h b/src/gui/symbology-ng/qgsstyleexportimportdialog.h similarity index 82% rename from src/gui/symbology-ng/qgsstylev2exportimportdialog.h rename to src/gui/symbology-ng/qgsstyleexportimportdialog.h index d66d032c785..a9c760ddcd3 100644 --- a/src/gui/symbology-ng/qgsstylev2exportimportdialog.h +++ b/src/gui/symbology-ng/qgsstyleexportimportdialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsstylev2exportimportdialog.h + qgsstyleexportimportdialog.h --------------------- begin : Jan 2011 copyright : (C) 2011 by Alexander Bruy @@ -25,15 +25,15 @@ #include #include -#include "ui_qgsstylev2exportimportdialogbase.h" +#include "ui_qgsstyleexportimportdialogbase.h" -class QgsStyleV2; -class QgsStyleV2GroupSelectionDialog; +class QgsStyle; +class QgsStyleGroupSelectionDialog; /** \ingroup gui - * \class QgsStyleV2ExportImportDialog + * \class QgsStyleExportImportDialog */ -class GUI_EXPORT QgsStyleV2ExportImportDialog : public QDialog, private Ui::QgsStyleV2ExportImportDialogBase +class GUI_EXPORT QgsStyleExportImportDialog : public QDialog, private Ui::QgsStyleExportImportDialogBase { Q_OBJECT @@ -46,8 +46,8 @@ class GUI_EXPORT QgsStyleV2ExportImportDialog : public QDialog, private Ui::QgsS // constructor // mode argument must be 0 for saving and 1 for loading - QgsStyleV2ExportImportDialog( QgsStyleV2* style, QWidget *parent = nullptr, Mode mode = Export ); - ~QgsStyleV2ExportImportDialog(); + QgsStyleExportImportDialog( QgsStyle* style, QWidget *parent = nullptr, Mode mode = Export ); + ~QgsStyleExportImportDialog(); /** * @brief selectSymbols select symbols by name @@ -107,11 +107,11 @@ class GUI_EXPORT QgsStyleV2ExportImportDialog : public QDialog, private Ui::QgsS private: void downloadStyleXml( const QUrl& url ); - bool populateStyles( QgsStyleV2* style ); - void moveStyles( QModelIndexList* selection, QgsStyleV2* src, QgsStyleV2* dst ); + bool populateStyles( QgsStyle* style ); + void moveStyles( QModelIndexList* selection, QgsStyle* src, QgsStyle* dst ); QProgressDialog *mProgressDlg; - QgsStyleV2GroupSelectionDialog *mGroupSelectionDlg; + QgsStyleGroupSelectionDialog *mGroupSelectionDlg; QTemporaryFile *mTempFile; QNetworkAccessManager *mNetManager; QNetworkReply *mNetReply; @@ -119,8 +119,8 @@ class GUI_EXPORT QgsStyleV2ExportImportDialog : public QDialog, private Ui::QgsS QString mFileName; Mode mDialogMode; - QgsStyleV2* mQgisStyle; - QgsStyleV2* mTempStyle; + QgsStyle* mQgisStyle; + QgsStyle* mTempStyle; }; #endif // QGSSTYLEV2EXPORTIMPORTDIALOG_H diff --git a/src/gui/symbology-ng/qgsstylev2groupselectiondialog.cpp b/src/gui/symbology-ng/qgsstylegroupselectiondialog.cpp similarity index 90% rename from src/gui/symbology-ng/qgsstylev2groupselectiondialog.cpp rename to src/gui/symbology-ng/qgsstylegroupselectiondialog.cpp index 2874a9ff44d..94cff794d41 100644 --- a/src/gui/symbology-ng/qgsstylev2groupselectiondialog.cpp +++ b/src/gui/symbology-ng/qgsstylegroupselectiondialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsstylev2groupselectiondialog.h + qgsstylegroupselectiondialog.h --------------------- begin : Oct 2015 copyright : (C) 2015 by Alessandro Pasotti @@ -15,14 +15,14 @@ ***************************************************************************/ -#include "qgsstylev2groupselectiondialog.h" -#include "qgsstylev2.h" +#include "qgsstylegroupselectiondialog.h" +#include "qgsstyle.h" #include #include -QgsStyleV2GroupSelectionDialog::QgsStyleV2GroupSelectionDialog( QgsStyleV2 *style, QWidget *parent ) +QgsStyleGroupSelectionDialog::QgsStyleGroupSelectionDialog( QgsStyle *style, QWidget *parent ) : QDialog( parent ) , mStyle( style ) { @@ -79,12 +79,12 @@ QgsStyleV2GroupSelectionDialog::QgsStyleV2GroupSelectionDialog( QgsStyleV2 *styl } -QgsStyleV2GroupSelectionDialog::~QgsStyleV2GroupSelectionDialog() +QgsStyleGroupSelectionDialog::~QgsStyleGroupSelectionDialog() { } -void QgsStyleV2GroupSelectionDialog::setBold( QStandardItem* item ) +void QgsStyleGroupSelectionDialog::setBold( QStandardItem* item ) { QFont font = item->font(); font.setBold( true ); @@ -92,7 +92,7 @@ void QgsStyleV2GroupSelectionDialog::setBold( QStandardItem* item ) } -void QgsStyleV2GroupSelectionDialog::groupTreeSelectionChanged( const QItemSelection &selected, const QItemSelection &deselected ) +void QgsStyleGroupSelectionDialog::groupTreeSelectionChanged( const QItemSelection &selected, const QItemSelection &deselected ) { QModelIndex index; QModelIndexList selectedItems = selected.indexes(); @@ -147,7 +147,7 @@ void QgsStyleV2GroupSelectionDialog::groupTreeSelectionChanged( const QItemSelec } -void QgsStyleV2GroupSelectionDialog::buildGroupTree( QStandardItem* &parent ) +void QgsStyleGroupSelectionDialog::buildGroupTree( QStandardItem* &parent ) { QgsSymbolGroupMap groups = mStyle->childGroupNames( parent->text() ); QgsSymbolGroupMap::const_iterator i = groups.constBegin(); diff --git a/src/gui/symbology-ng/qgsstylev2groupselectiondialog.h b/src/gui/symbology-ng/qgsstylegroupselectiondialog.h similarity index 82% rename from src/gui/symbology-ng/qgsstylev2groupselectiondialog.h rename to src/gui/symbology-ng/qgsstylegroupselectiondialog.h index 9c978d2c54a..13350b1a796 100644 --- a/src/gui/symbology-ng/qgsstylev2groupselectiondialog.h +++ b/src/gui/symbology-ng/qgsstylegroupselectiondialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsstylev2groupselectiondialog.h + qgsstylegroupselectiondialog.h --------------------- begin : Oct 2015 copyright : (C) 2015 by Alessandro Pasotti @@ -19,21 +19,21 @@ #include #include -#include "ui_qgsstylev2groupselectiondialogbase.h" +#include "ui_qgsstylegroupselectiondialogbase.h" -class QgsStyleV2; +class QgsStyle; /** \ingroup gui - * \class QgsStyleV2GroupSelectionDialog + * \class QgsStyleGroupSelectionDialog */ -class GUI_EXPORT QgsStyleV2GroupSelectionDialog : public QDialog, private Ui::SymbolsV2GroupSelectionDialogBase +class GUI_EXPORT QgsStyleGroupSelectionDialog : public QDialog, private Ui::SymbolsGroupSelectionDialogBase { Q_OBJECT public: - QgsStyleV2GroupSelectionDialog( QgsStyleV2* style, QWidget *parent = nullptr ); - ~QgsStyleV2GroupSelectionDialog(); + QgsStyleGroupSelectionDialog( QgsStyle* style, QWidget *parent = nullptr ); + ~QgsStyleGroupSelectionDialog(); //! Set bold font for item void setBold( QStandardItem *item ); @@ -60,7 +60,7 @@ class GUI_EXPORT QgsStyleV2GroupSelectionDialog : public QDialog, private Ui::Sy * @param parent */ void buildGroupTree( QStandardItem *&parent ); - QgsStyleV2* mStyle; + QgsStyle* mStyle; }; diff --git a/src/gui/symbology-ng/qgsstylev2managerdialog.cpp b/src/gui/symbology-ng/qgsstylemanagerdialog.cpp similarity index 87% rename from src/gui/symbology-ng/qgsstylev2managerdialog.cpp rename to src/gui/symbology-ng/qgsstylemanagerdialog.cpp index e426354d0d4..8557c214353 100644 --- a/src/gui/symbology-ng/qgsstylev2managerdialog.cpp +++ b/src/gui/symbology-ng/qgsstylemanagerdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsstylev2managerdialog.cpp + qgsstylemanagerdialog.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -13,19 +13,19 @@ * * ***************************************************************************/ -#include "qgsstylev2managerdialog.h" +#include "qgsstylemanagerdialog.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgssymbol.h" #include "qgssymbollayerutils.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgssymbolselectordialog.h" -#include "qgsvectorgradientcolorrampv2dialog.h" -#include "qgsvectorrandomcolorrampv2dialog.h" -#include "qgsvectorcolorbrewercolorrampv2dialog.h" -#include "qgscptcitycolorrampv2dialog.h" -#include "qgsstylev2exportimportdialog.h" +#include "qgsvectorgradientcolorrampdialog.h" +#include "qgsvectorrandomcolorrampdialog.h" +#include "qgsvectorcolorbrewercolorrampdialog.h" +#include "qgscptcitycolorrampdialog.h" +#include "qgsstyleexportimportdialog.h" #include "qgssmartgroupeditordialog.h" #include @@ -40,7 +40,7 @@ #include "qgsapplication.h" #include "qgslogger.h" -QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* parent ) +QgsStyleManagerDialog::QgsStyleManagerDialog( QgsStyle* style, QWidget* parent ) : QDialog( parent ) , mStyle( style ) , mModified( false ) @@ -169,7 +169,7 @@ QgsStyleV2ManagerDialog::QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* pa on_tabItemType_currentChanged( 0 ); } -void QgsStyleV2ManagerDialog::onFinished() +void QgsStyleManagerDialog::onFinished() { if ( mModified ) { @@ -181,7 +181,7 @@ void QgsStyleV2ManagerDialog::onFinished() settings.setValue( "/Windows/StyleV2Manager/splitter", mSplitter->saveState() ); } -void QgsStyleV2ManagerDialog::populateTypes() +void QgsStyleManagerDialog::populateTypes() { #if 0 // save current selection index in types combo @@ -222,7 +222,7 @@ void QgsStyleV2ManagerDialog::populateTypes() #endif } -void QgsStyleV2ManagerDialog::on_tabItemType_currentChanged( int ) +void QgsStyleManagerDialog::on_tabItemType_currentChanged( int ) { // when in Color Ramp tab, add menu to add item button and hide "Export symbols as PNG/SVG" bool flag = currentItemType() != 3; @@ -245,7 +245,7 @@ void QgsStyleV2ManagerDialog::on_tabItemType_currentChanged( int ) populateList(); } -void QgsStyleV2ManagerDialog::populateList() +void QgsStyleManagerDialog::populateList() { if ( currentItemType() > 3 ) { @@ -255,7 +255,7 @@ void QgsStyleV2ManagerDialog::populateList() groupChanged( groupTree->selectionModel()->currentIndex() ); } -void QgsStyleV2ManagerDialog::populateSymbols( const QStringList& symbolNames, bool check ) +void QgsStyleManagerDialog::populateSymbols( const QStringList& symbolNames, bool check ) { QStandardItemModel* model = qobject_cast( listItems->model() ); model->clear(); @@ -284,7 +284,7 @@ void QgsStyleV2ManagerDialog::populateSymbols( const QStringList& symbolNames, b } -void QgsStyleV2ManagerDialog::populateColorRamps( const QStringList& colorRamps, bool check ) +void QgsStyleManagerDialog::populateColorRamps( const QStringList& colorRamps, bool check ) { QStandardItemModel* model = qobject_cast( listItems->model() ); model->clear(); @@ -292,7 +292,7 @@ void QgsStyleV2ManagerDialog::populateColorRamps( const QStringList& colorRamps, for ( int i = 0; i < colorRamps.count(); ++i ) { QString name = colorRamps[i]; - QgsVectorColorRampV2* ramp = mStyle->colorRamp( name ); + QgsVectorColorRamp* ramp = mStyle->colorRamp( name ); QStandardItem* item = new QStandardItem( name ); QIcon icon = QgsSymbolLayerUtils::colorRampPreviewIcon( ramp, listItems->iconSize() ); @@ -307,7 +307,7 @@ void QgsStyleV2ManagerDialog::populateColorRamps( const QStringList& colorRamps, symbolSelected( listItems->currentIndex() ); } -int QgsStyleV2ManagerDialog::currentItemType() +int QgsStyleManagerDialog::currentItemType() { switch ( tabItemType->currentIndex() ) { @@ -324,7 +324,7 @@ int QgsStyleV2ManagerDialog::currentItemType() } } -QString QgsStyleV2ManagerDialog::currentItemName() +QString QgsStyleManagerDialog::currentItemName() { QModelIndex index = listItems->selectionModel()->currentIndex(); if ( !index.isValid() ) @@ -332,7 +332,7 @@ QString QgsStyleV2ManagerDialog::currentItemName() return index.model()->data( index, 0 ).toString(); } -void QgsStyleV2ManagerDialog::addItem() +void QgsStyleManagerDialog::addItem() { bool changed = false; if ( currentItemType() < 3 ) @@ -355,7 +355,7 @@ void QgsStyleV2ManagerDialog::addItem() } } -bool QgsStyleV2ManagerDialog::addSymbol() +bool QgsStyleManagerDialog::addSymbol() { // create new symbol with current type QgsSymbol* symbol; @@ -363,15 +363,15 @@ bool QgsStyleV2ManagerDialog::addSymbol() switch ( currentItemType() ) { case QgsSymbol::Marker: - symbol = new QgsMarkerSymbolV2(); + symbol = new QgsMarkerSymbol(); name = tr( "new marker" ); break; case QgsSymbol::Line: - symbol = new QgsLineSymbolV2(); + symbol = new QgsLineSymbol(); name = tr( "new line" ); break; case QgsSymbol::Fill: - symbol = new QgsFillSymbolV2(); + symbol = new QgsFillSymbol(); name = tr( "new fill symbol" ); break; default: @@ -437,7 +437,7 @@ bool QgsStyleV2ManagerDialog::addSymbol() } -QString QgsStyleV2ManagerDialog::addColorRampStatic( QWidget* parent, QgsStyleV2* style, QString rampType ) +QString QgsStyleManagerDialog::addColorRampStatic( QWidget* parent, QgsStyle* style, QString rampType ) { // let the user choose the color ramp type if rampType is not given bool ok = true; @@ -454,11 +454,11 @@ QString QgsStyleV2ManagerDialog::addColorRampStatic( QWidget* parent, QgsStyleV2 QString name = tr( "new ramp" ); - QgsVectorColorRampV2 *ramp = nullptr; + QgsVectorColorRamp *ramp = nullptr; if ( rampType == tr( "Gradient" ) ) { - QgsVectorGradientColorRampV2* gradRamp = new QgsVectorGradientColorRampV2(); - QgsVectorGradientColorRampV2Dialog dlg( gradRamp, parent ); + QgsVectorGradientColorRamp* gradRamp = new QgsVectorGradientColorRamp(); + QgsVectorGradientColorRampDialog dlg( gradRamp, parent ); if ( !dlg.exec() ) { delete gradRamp; @@ -469,8 +469,8 @@ QString QgsStyleV2ManagerDialog::addColorRampStatic( QWidget* parent, QgsStyleV2 } else if ( rampType == tr( "Random" ) ) { - QgsVectorRandomColorRampV2* randRamp = new QgsVectorRandomColorRampV2(); - QgsVectorRandomColorRampV2Dialog dlg( randRamp, parent ); + QgsVectorRandomColorRamp* randRamp = new QgsVectorRandomColorRamp(); + QgsVectorRandomColorRampDialog dlg( randRamp, parent ); if ( !dlg.exec() ) { delete randRamp; @@ -481,8 +481,8 @@ QString QgsStyleV2ManagerDialog::addColorRampStatic( QWidget* parent, QgsStyleV2 } else if ( rampType == tr( "ColorBrewer" ) ) { - QgsVectorColorBrewerColorRampV2* brewerRamp = new QgsVectorColorBrewerColorRampV2(); - QgsVectorColorBrewerColorRampV2Dialog dlg( brewerRamp, parent ); + QgsVectorColorBrewerColorRamp* brewerRamp = new QgsVectorColorBrewerColorRamp(); + QgsVectorColorBrewerColorRampDialog dlg( brewerRamp, parent ); if ( !dlg.exec() ) { delete brewerRamp; @@ -493,8 +493,8 @@ QString QgsStyleV2ManagerDialog::addColorRampStatic( QWidget* parent, QgsStyleV2 } else if ( rampType == tr( "cpt-city" ) ) { - QgsCptCityColorRampV2* cptCityRamp = new QgsCptCityColorRampV2( "", "" ); - QgsCptCityColorRampV2Dialog dlg( cptCityRamp, parent ); + QgsCptCityColorRamp* cptCityRamp = new QgsCptCityColorRamp( "", "" ); + QgsCptCityColorRampDialog dlg( cptCityRamp, parent ); if ( !dlg.exec() ) { delete cptCityRamp; @@ -565,12 +565,12 @@ QString QgsStyleV2ManagerDialog::addColorRampStatic( QWidget* parent, QgsStyleV2 } -bool QgsStyleV2ManagerDialog::addColorRamp() +bool QgsStyleManagerDialog::addColorRamp() { return addColorRamp( nullptr ); } -bool QgsStyleV2ManagerDialog::addColorRamp( QAction* action ) +bool QgsStyleManagerDialog::addColorRamp( QAction* action ) { // pass the action text, which is the color ramp type QString rampName = addColorRampStatic( this, mStyle, @@ -585,7 +585,7 @@ bool QgsStyleV2ManagerDialog::addColorRamp( QAction* action ) return false; } -void QgsStyleV2ManagerDialog::editItem() +void QgsStyleManagerDialog::editItem() { bool changed = false; if ( currentItemType() < 3 ) @@ -605,7 +605,7 @@ void QgsStyleV2ManagerDialog::editItem() populateList(); } -bool QgsStyleV2ManagerDialog::editSymbol() +bool QgsStyleManagerDialog::editSymbol() { QString symbolName = currentItemName(); if ( symbolName.isEmpty() ) @@ -627,18 +627,18 @@ bool QgsStyleV2ManagerDialog::editSymbol() return true; } -bool QgsStyleV2ManagerDialog::editColorRamp() +bool QgsStyleManagerDialog::editColorRamp() { QString name = currentItemName(); if ( name.isEmpty() ) return false; - QgsVectorColorRampV2* ramp = mStyle->colorRamp( name ); + QgsVectorColorRamp* ramp = mStyle->colorRamp( name ); if ( ramp->type() == "gradient" ) { - QgsVectorGradientColorRampV2* gradRamp = static_cast( ramp ); - QgsVectorGradientColorRampV2Dialog dlg( gradRamp, this ); + QgsVectorGradientColorRamp* gradRamp = static_cast( ramp ); + QgsVectorGradientColorRampDialog dlg( gradRamp, this ); if ( !dlg.exec() ) { delete ramp; @@ -647,8 +647,8 @@ bool QgsStyleV2ManagerDialog::editColorRamp() } else if ( ramp->type() == "random" ) { - QgsVectorRandomColorRampV2* randRamp = static_cast( ramp ); - QgsVectorRandomColorRampV2Dialog dlg( randRamp, this ); + QgsVectorRandomColorRamp* randRamp = static_cast( ramp ); + QgsVectorRandomColorRampDialog dlg( randRamp, this ); if ( !dlg.exec() ) { delete ramp; @@ -657,8 +657,8 @@ bool QgsStyleV2ManagerDialog::editColorRamp() } else if ( ramp->type() == "colorbrewer" ) { - QgsVectorColorBrewerColorRampV2* brewerRamp = static_cast( ramp ); - QgsVectorColorBrewerColorRampV2Dialog dlg( brewerRamp, this ); + QgsVectorColorBrewerColorRamp* brewerRamp = static_cast( ramp ); + QgsVectorColorBrewerColorRampDialog dlg( brewerRamp, this ); if ( !dlg.exec() ) { delete ramp; @@ -667,8 +667,8 @@ bool QgsStyleV2ManagerDialog::editColorRamp() } else if ( ramp->type() == "cpt-city" ) { - QgsCptCityColorRampV2* cptCityRamp = static_cast( ramp ); - QgsCptCityColorRampV2Dialog dlg( cptCityRamp, this ); + QgsCptCityColorRamp* cptCityRamp = static_cast( ramp ); + QgsCptCityColorRampDialog dlg( cptCityRamp, this ); if ( !dlg.exec() ) { delete ramp; @@ -691,7 +691,7 @@ bool QgsStyleV2ManagerDialog::editColorRamp() } -void QgsStyleV2ManagerDialog::removeItem() +void QgsStyleManagerDialog::removeItem() { bool changed = false; if ( currentItemType() < 3 ) @@ -714,7 +714,7 @@ void QgsStyleV2ManagerDialog::removeItem() } } -bool QgsStyleV2ManagerDialog::removeSymbol() +bool QgsStyleManagerDialog::removeSymbol() { QModelIndexList indexes = listItems->selectionModel()->selectedIndexes(); if ( QMessageBox::Yes != QMessageBox::question( this, tr( "Confirm removal" ), @@ -734,7 +734,7 @@ bool QgsStyleV2ManagerDialog::removeSymbol() return true; } -bool QgsStyleV2ManagerDialog::removeColorRamp() +bool QgsStyleManagerDialog::removeColorRamp() { QModelIndexList indexes = listItems->selectionModel()->selectedIndexes(); if ( QMessageBox::Yes != QMessageBox::question( this, tr( "Confirm removal" ), @@ -754,7 +754,7 @@ bool QgsStyleV2ManagerDialog::removeColorRamp() return true; } -void QgsStyleV2ManagerDialog::itemChanged( QStandardItem* item ) +void QgsStyleManagerDialog::itemChanged( QStandardItem* item ) { // an item has been edited QString oldName = item->data().toString(); @@ -782,7 +782,7 @@ void QgsStyleV2ManagerDialog::itemChanged( QStandardItem* item ) } } -void QgsStyleV2ManagerDialog::exportItemsPNG() +void QgsStyleManagerDialog::exportItemsPNG() { QString dir = QFileDialog::getExistingDirectory( this, tr( "Exported selected symbols as PNG" ), QDir::home().absolutePath(), @@ -791,7 +791,7 @@ void QgsStyleV2ManagerDialog::exportItemsPNG() exportSelectedItemsImages( dir, "png", QSize( 32, 32 ) ); } -void QgsStyleV2ManagerDialog::exportItemsSVG() +void QgsStyleManagerDialog::exportItemsSVG() { QString dir = QFileDialog::getExistingDirectory( this, tr( "Exported selected symbols as SVG" ), QDir::home().absolutePath(), @@ -801,7 +801,7 @@ void QgsStyleV2ManagerDialog::exportItemsSVG() } -void QgsStyleV2ManagerDialog::exportSelectedItemsImages( const QString& dir, const QString& format, QSize size ) +void QgsStyleManagerDialog::exportSelectedItemsImages( const QString& dir, const QString& format, QSize size ) { if ( dir.isEmpty() ) return; @@ -816,28 +816,28 @@ void QgsStyleV2ManagerDialog::exportSelectedItemsImages( const QString& dir, con } } -void QgsStyleV2ManagerDialog::exportItems() +void QgsStyleManagerDialog::exportItems() { - QgsStyleV2ExportImportDialog dlg( mStyle, this, QgsStyleV2ExportImportDialog::Export ); + QgsStyleExportImportDialog dlg( mStyle, this, QgsStyleExportImportDialog::Export ); dlg.exec(); } -void QgsStyleV2ManagerDialog::importItems() +void QgsStyleManagerDialog::importItems() { - QgsStyleV2ExportImportDialog dlg( mStyle, this, QgsStyleV2ExportImportDialog::Import ); + QgsStyleExportImportDialog dlg( mStyle, this, QgsStyleExportImportDialog::Import ); dlg.exec(); populateList(); populateGroups(); } -void QgsStyleV2ManagerDialog::setBold( QStandardItem* item ) +void QgsStyleManagerDialog::setBold( QStandardItem* item ) { QFont font = item->font(); font.setBold( true ); item->setFont( font ); } -void QgsStyleV2ManagerDialog::populateGroups() +void QgsStyleManagerDialog::populateGroups() { QStandardItemModel *model = qobject_cast( groupTree->model() ); model->clear(); @@ -883,7 +883,7 @@ void QgsStyleV2ManagerDialog::populateGroups() } } -void QgsStyleV2ManagerDialog::buildGroupTree( QStandardItem* &parent ) +void QgsStyleManagerDialog::buildGroupTree( QStandardItem* &parent ) { QgsSymbolGroupMap groups = mStyle->childGroupNames( parent->text() ); QgsSymbolGroupMap::const_iterator i = groups.constBegin(); @@ -897,12 +897,12 @@ void QgsStyleV2ManagerDialog::buildGroupTree( QStandardItem* &parent ) } } -void QgsStyleV2ManagerDialog::groupChanged( const QModelIndex& index ) +void QgsStyleManagerDialog::groupChanged( const QModelIndex& index ) { QStringList symbolNames; QStringList groupSymbols; - QgsStyleV2::StyleEntity type = currentItemType() < 3 ? QgsStyleV2::SymbolEntity : QgsStyleV2::ColorrampEntity; + QgsStyle::StyleEntity type = currentItemType() < 3 ? QgsStyle::SymbolEntity : QgsStyle::ColorrampEntity; if ( currentItemType() > 3 ) { QgsDebugMsg( "Entity not implemented" ); @@ -986,7 +986,7 @@ void QgsStyleV2ManagerDialog::groupChanged( const QModelIndex& index ) } } -void QgsStyleV2ManagerDialog::addGroup() +void QgsStyleManagerDialog::addGroup() { QStandardItemModel *model = qobject_cast( groupTree->model() ); QModelIndex parentIndex = groupTree->currentIndex(); @@ -1057,7 +1057,7 @@ void QgsStyleV2ManagerDialog::addGroup() } } -void QgsStyleV2ManagerDialog::removeGroup() +void QgsStyleManagerDialog::removeGroup() { QStandardItemModel *model = qobject_cast( groupTree->model() ); QModelIndex index = groupTree->currentIndex(); @@ -1076,11 +1076,11 @@ void QgsStyleV2ManagerDialog::removeGroup() QStandardItem *parentItem = model->itemFromIndex( index.parent() ); if ( parentItem->data( Qt::UserRole + 1 ).toString() == "smartgroups" ) { - mStyle->remove( QgsStyleV2::SmartgroupEntity, index.data( Qt::UserRole + 1 ).toInt() ); + mStyle->remove( QgsStyle::SmartgroupEntity, index.data( Qt::UserRole + 1 ).toInt() ); } else { - mStyle->remove( QgsStyleV2::GroupEntity, index.data( Qt::UserRole + 1 ).toInt() ); + mStyle->remove( QgsStyle::GroupEntity, index.data( Qt::UserRole + 1 ).toInt() ); QStandardItem *item = model->itemFromIndex( index ); if ( item->hasChildren() ) { @@ -1094,22 +1094,22 @@ void QgsStyleV2ManagerDialog::removeGroup() parentItem->removeRow( index.row() ); } -void QgsStyleV2ManagerDialog::groupRenamed( QStandardItem * item ) +void QgsStyleManagerDialog::groupRenamed( QStandardItem * item ) { QgsDebugMsg( "Symbol group edited: data=" + item->data( Qt::UserRole + 1 ).toString() + " text=" + item->text() ); int id = item->data( Qt::UserRole + 1 ).toInt(); QString name = item->text(); if ( item->parent()->data( Qt::UserRole + 1 ) == "smartgroups" ) { - mStyle->rename( QgsStyleV2::SmartgroupEntity, id, name ); + mStyle->rename( QgsStyle::SmartgroupEntity, id, name ); } else { - mStyle->rename( QgsStyleV2::GroupEntity, id, name ); + mStyle->rename( QgsStyle::GroupEntity, id, name ); } } -void QgsStyleV2ManagerDialog::groupSymbolsAction() +void QgsStyleManagerDialog::groupSymbolsAction() { QStandardItemModel *treeModel = qobject_cast( groupTree->model() ); @@ -1179,9 +1179,9 @@ void QgsStyleV2ManagerDialog::groupSymbolsAction() } } -void QgsStyleV2ManagerDialog::regrouped( QStandardItem *item ) +void QgsStyleManagerDialog::regrouped( QStandardItem *item ) { - QgsStyleV2::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyleV2::SymbolEntity : QgsStyleV2::ColorrampEntity; + QgsStyle::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyle::SymbolEntity : QgsStyle::ColorrampEntity; if ( currentItemType() > 3 ) { QgsDebugMsg( "Unknown style entity" ); @@ -1204,7 +1204,7 @@ void QgsStyleV2ManagerDialog::regrouped( QStandardItem *item ) } } -void QgsStyleV2ManagerDialog::setSymbolsChecked( const QStringList& symbols ) +void QgsStyleManagerDialog::setSymbolsChecked( const QStringList& symbols ) { QStandardItemModel *model = qobject_cast( listItems->model() ); Q_FOREACH ( const QString& symbol, symbols ) @@ -1215,22 +1215,22 @@ void QgsStyleV2ManagerDialog::setSymbolsChecked( const QStringList& symbols ) } } -void QgsStyleV2ManagerDialog::filterSymbols( const QString& qword ) +void QgsStyleManagerDialog::filterSymbols( const QString& qword ) { QStringList items; if ( currentItemType() == 3 ) { - items = mStyle->findSymbols( QgsStyleV2::ColorrampEntity, qword ); + items = mStyle->findSymbols( QgsStyle::ColorrampEntity, qword ); populateColorRamps( items ); } else { - items = mStyle->findSymbols( QgsStyleV2::SymbolEntity, qword ); + items = mStyle->findSymbols( QgsStyle::SymbolEntity, qword ); populateSymbols( items ); } } -void QgsStyleV2ManagerDialog::tagsChanged() +void QgsStyleManagerDialog::tagsChanged() { QModelIndexList indexes = listItems->selectionModel()->selection().indexes(); QStringList addtags; @@ -1239,14 +1239,14 @@ void QgsStyleV2ManagerDialog::tagsChanged() QStringList oldtags = mTagList; QStringList newtags = tagsLineEdit->text().split( ',', QString::SkipEmptyParts ); - QgsStyleV2::StyleEntity type; + QgsStyle::StyleEntity type; if ( currentItemType() < 3 ) { - type = QgsStyleV2::SymbolEntity; + type = QgsStyle::SymbolEntity; } else if ( currentItemType() == 3 ) { - type = QgsStyleV2::ColorrampEntity; + type = QgsStyle::ColorrampEntity; } else { @@ -1281,14 +1281,14 @@ void QgsStyleV2ManagerDialog::tagsChanged() } } -void QgsStyleV2ManagerDialog::symbolSelected( const QModelIndex& index ) +void QgsStyleManagerDialog::symbolSelected( const QModelIndex& index ) { // Populate the tags for the symbol tagsLineEdit->clear(); if ( index.isValid() ) { QStandardItem *item = static_cast( listItems->model() )->itemFromIndex( index ); - QgsStyleV2::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyleV2::SymbolEntity : QgsStyleV2::ColorrampEntity; + QgsStyle::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyle::SymbolEntity : QgsStyle::ColorrampEntity; mTagList = mStyle->tagsOfSymbol( type, item->data().toString() ); tagsLineEdit->setText( mTagList.join( "," ) ); } @@ -1296,7 +1296,7 @@ void QgsStyleV2ManagerDialog::symbolSelected( const QModelIndex& index ) actnEditItem->setEnabled( index.isValid() && !mGrouppingMode ); } -void QgsStyleV2ManagerDialog::selectedSymbolsChanged( const QItemSelection& selected, const QItemSelection& deselected ) +void QgsStyleManagerDialog::selectedSymbolsChanged( const QItemSelection& selected, const QItemSelection& deselected ) { Q_UNUSED( selected ); Q_UNUSED( deselected ); @@ -1309,7 +1309,7 @@ void QgsStyleV2ManagerDialog::selectedSymbolsChanged( const QItemSelection& sele actnEditItem->setDisabled( nothingSelected ); } -void QgsStyleV2ManagerDialog::enableSymbolInputs( bool enable ) +void QgsStyleManagerDialog::enableSymbolInputs( bool enable ) { groupTree->setEnabled( enable ); btnAddGroup->setEnabled( enable ); @@ -1321,7 +1321,7 @@ void QgsStyleV2ManagerDialog::enableSymbolInputs( bool enable ) tagsLineEdit->setEnabled( enable ); } -void QgsStyleV2ManagerDialog::enableGroupInputs( bool enable ) +void QgsStyleManagerDialog::enableGroupInputs( bool enable ) { btnAddGroup->setEnabled( enable ); btnRemoveGroup->setEnabled( enable ); @@ -1329,7 +1329,7 @@ void QgsStyleV2ManagerDialog::enableGroupInputs( bool enable ) btnManageGroups->setEnabled( enable || mGrouppingMode ); // always enabled in grouping mode, as it is the only way to leave grouping mode } -void QgsStyleV2ManagerDialog::enableItemsForGroupingMode( bool enable ) +void QgsStyleManagerDialog::enableItemsForGroupingMode( bool enable ) { QStandardItemModel *treeModel = qobject_cast( groupTree->model() ); for ( int i = 0; i < treeModel->rowCount(); i++ ) @@ -1370,7 +1370,7 @@ void QgsStyleV2ManagerDialog::enableItemsForGroupingMode( bool enable ) actnEditItem->setEnabled( enable ); } -void QgsStyleV2ManagerDialog::grouptreeContextMenu( QPoint point ) +void QgsStyleManagerDialog::grouptreeContextMenu( QPoint point ) { QPoint globalPos = groupTree->viewport()->mapToGlobal( point ); @@ -1381,7 +1381,7 @@ void QgsStyleV2ManagerDialog::grouptreeContextMenu( QPoint point ) mGroupTreeContextMenu->popup( globalPos ); } -void QgsStyleV2ManagerDialog::listitemsContextMenu( QPoint point ) +void QgsStyleManagerDialog::listitemsContextMenu( QPoint point ) { QPoint globalPos = listItems->viewport()->mapToGlobal( point ); @@ -1401,13 +1401,13 @@ void QgsStyleV2ManagerDialog::listitemsContextMenu( QPoint point ) mGroupMenu->popup( globalPos ); } -void QgsStyleV2ManagerDialog::groupSelectedSymbols() +void QgsStyleManagerDialog::groupSelectedSymbols() { QAction* selectedItem = qobject_cast( sender() ); if ( selectedItem ) { - QgsStyleV2::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyleV2::SymbolEntity : QgsStyleV2::ColorrampEntity; + QgsStyle::StyleEntity type = ( currentItemType() < 3 ) ? QgsStyle::SymbolEntity : QgsStyle::ColorrampEntity; if ( currentItemType() > 3 ) { QgsDebugMsg( "unknown entity type" ); @@ -1425,7 +1425,7 @@ void QgsStyleV2ManagerDialog::groupSelectedSymbols() } } -void QgsStyleV2ManagerDialog::editSmartgroupAction() +void QgsStyleManagerDialog::editSmartgroupAction() { QStandardItemModel *treeModel = qobject_cast( groupTree->model() ); @@ -1448,7 +1448,7 @@ void QgsStyleV2ManagerDialog::editSmartgroupAction() if ( dlg.exec() == QDialog::Rejected ) return; - mStyle->remove( QgsStyleV2::SmartgroupEntity, item->data().toInt() ); + mStyle->remove( QgsStyle::SmartgroupEntity, item->data().toInt() ); int id = mStyle->addSmartgroup( dlg.smartgroupName(), dlg.conditionOperator(), dlg.conditionMap() ); if ( !id ) { @@ -1462,7 +1462,7 @@ void QgsStyleV2ManagerDialog::editSmartgroupAction() groupChanged( present ); } -bool QgsStyleV2ManagerDialog::eventFilter( QObject *obj, QEvent *event ) +bool QgsStyleManagerDialog::eventFilter( QObject *obj, QEvent *event ) { if (( obj == tagsLineEdit ) && ( event->type() == QEvent::FocusOut ) ) diff --git a/src/gui/symbology-ng/qgsstylev2managerdialog.h b/src/gui/symbology-ng/qgsstylemanagerdialog.h similarity index 93% rename from src/gui/symbology-ng/qgsstylev2managerdialog.h rename to src/gui/symbology-ng/qgsstylemanagerdialog.h index fd052acda65..3582112b6a3 100644 --- a/src/gui/symbology-ng/qgsstylev2managerdialog.h +++ b/src/gui/symbology-ng/qgsstylemanagerdialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsstylev2managerdialog.h + qgsstylemanagerdialog.h --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -21,23 +21,23 @@ #include #include -#include "ui_qgsstylev2managerdialogbase.h" +#include "ui_qgsstylemanagerdialogbase.h" #include "qgscontexthelp.h" -class QgsStyleV2; +class QgsStyle; /** \ingroup gui - * \class QgsStyleV2ManagerDialog + * \class QgsStyleManagerDialog */ -class GUI_EXPORT QgsStyleV2ManagerDialog : public QDialog, private Ui::QgsStyleV2ManagerDialogBase +class GUI_EXPORT QgsStyleManagerDialog : public QDialog, private Ui::QgsStyleManagerDialogBase { Q_OBJECT public: - QgsStyleV2ManagerDialog( QgsStyleV2* style, QWidget* parent = nullptr ); + QgsStyleManagerDialog( QgsStyle* style, QWidget* parent = nullptr ); //! 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: @@ -142,7 +142,7 @@ class GUI_EXPORT QgsStyleV2ManagerDialog : public QDialog, private Ui::QgsStyleV //! sets the text of the item with bold font void setBold( QStandardItem* ); - QgsStyleV2* mStyle; + QgsStyle* mStyle; QString mStyleFilename; diff --git a/src/gui/symbology-ng/qgssymbollayerwidget.cpp b/src/gui/symbology-ng/qgssymbollayerwidget.cpp index 0d9b5af3aaf..b8fc3ab8906 100644 --- a/src/gui/symbology-ng/qgssymbollayerwidget.cpp +++ b/src/gui/symbology-ng/qgssymbollayerwidget.cpp @@ -16,10 +16,10 @@ #include "qgssymbollayerwidget.h" -#include "qgslinesymbollayerv2.h" -#include "qgsmarkersymbollayerv2.h" -#include "qgsfillsymbollayerv2.h" -#include "qgsgeometrygeneratorsymbollayerv2.h" +#include "qgslinesymbollayer.h" +#include "qgsmarkersymbollayer.h" +#include "qgsfillsymbollayer.h" +#include "qgsgeometrygeneratorsymbollayer.h" #include "qgssymbolslistwidget.h" #include "characterwidget.h" @@ -27,10 +27,10 @@ #include "qgssymbolselectordialog.h" #include "qgssvgcache.h" #include "qgssymbollayerutils.h" -#include "qgsvectorcolorrampv2.h" -#include "qgsvectorgradientcolorrampv2dialog.h" +#include "qgsvectorcolorramp.h" +#include "qgsvectorgradientcolorrampdialog.h" #include "qgsdatadefined.h" -#include "qgsstylev2.h" //for symbol selector dialog +#include "qgsstyle.h" //for symbol selector dialog #include "qgsmapcanvas.h" #include "qgsapplication.h" #include "qgsvectorlayer.h" @@ -149,7 +149,7 @@ QString QgsSymbolLayerWidget::dataDefinedPropertyLabel( const QString &entryName if ( entryName == "size" ) { label = tr( "Size" ); - QgsMarkerSymbolLayerV2 * layer = dynamic_cast( symbolLayer() ); + QgsMarkerSymbolLayer * layer = dynamic_cast( symbolLayer() ); if ( layer ) { switch ( layer->scaleMethod() ) @@ -166,7 +166,7 @@ QString QgsSymbolLayerWidget::dataDefinedPropertyLabel( const QString &entryName return label; } -QgsSimpleLineSymbolLayerV2Widget::QgsSimpleLineSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent ) +QgsSimpleLineSymbolLayerWidget::QgsSimpleLineSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent ) : QgsSymbolLayerWidget( parent, vl ) { mLayer = nullptr; @@ -189,7 +189,7 @@ QgsSimpleLineSymbolLayerV2Widget::QgsSimpleLineSymbolLayerV2Widget( const QgsVec } //make a temporary symbol for the size assistant preview - mAssistantPreviewSymbol = new QgsLineSymbolV2(); + mAssistantPreviewSymbol = new QgsLineSymbol(); if ( mVectorLayer ) mPenWidthDDBtn->setAssistant( tr( "Width Assistant..." ), new QgsSizeScaleWidget( mVectorLayer, mAssistantPreviewSymbol ) ); @@ -207,12 +207,12 @@ QgsSimpleLineSymbolLayerV2Widget::QgsSimpleLineSymbolLayerV2Widget( const QgsVec connect( this, SIGNAL( changed() ), this, SLOT( updateAssistantSymbol() ) ); } -QgsSimpleLineSymbolLayerV2Widget::~QgsSimpleLineSymbolLayerV2Widget() +QgsSimpleLineSymbolLayerWidget::~QgsSimpleLineSymbolLayerWidget() { delete mAssistantPreviewSymbol; } -void QgsSimpleLineSymbolLayerV2Widget::updateAssistantSymbol() +void QgsSimpleLineSymbolLayerWidget::updateAssistantSymbol() { for ( int i = mAssistantPreviewSymbol->symbolLayerCount() - 1 ; i >= 0; --i ) { @@ -225,13 +225,13 @@ void QgsSimpleLineSymbolLayerV2Widget::updateAssistantSymbol() } -void QgsSimpleLineSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) +void QgsSimpleLineSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer* layer ) { if ( !layer || layer->layerType() != "SimpleLine" ) return; // layer type is correct, we can do the cast - mLayer = static_cast( layer ); + mLayer = static_cast( layer ); // set units mPenWidthUnitWidget->blockSignals( true ); @@ -296,26 +296,26 @@ void QgsSimpleLineSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) updateAssistantSymbol(); } -QgsSymbolLayer* QgsSimpleLineSymbolLayerV2Widget::symbolLayer() +QgsSymbolLayer* QgsSimpleLineSymbolLayerWidget::symbolLayer() { return mLayer; } -void QgsSimpleLineSymbolLayerV2Widget::penWidthChanged() +void QgsSimpleLineSymbolLayerWidget::penWidthChanged() { mLayer->setWidth( spinWidth->value() ); updatePatternIcon(); emit changed(); } -void QgsSimpleLineSymbolLayerV2Widget::colorChanged( const QColor& color ) +void QgsSimpleLineSymbolLayerWidget::colorChanged( const QColor& color ) { mLayer->setColor( color ); updatePatternIcon(); emit changed(); } -void QgsSimpleLineSymbolLayerV2Widget::penStyleChanged() +void QgsSimpleLineSymbolLayerWidget::penStyleChanged() { mLayer->setPenStyle( cboPenStyle->penStyle() ); mLayer->setPenJoinStyle( cboJoinStyle->penJoinStyle() ); @@ -323,14 +323,14 @@ void QgsSimpleLineSymbolLayerV2Widget::penStyleChanged() emit changed(); } -void QgsSimpleLineSymbolLayerV2Widget::offsetChanged() +void QgsSimpleLineSymbolLayerWidget::offsetChanged() { mLayer->setOffset( spinOffset->value() ); updatePatternIcon(); emit changed(); } -void QgsSimpleLineSymbolLayerV2Widget::on_mCustomCheckBox_stateChanged( int state ) +void QgsSimpleLineSymbolLayerWidget::on_mCustomCheckBox_stateChanged( int state ) { bool checked = ( state == Qt::Checked ); mChangePatternButton->setEnabled( checked ); @@ -341,7 +341,7 @@ void QgsSimpleLineSymbolLayerV2Widget::on_mCustomCheckBox_stateChanged( int stat emit changed(); } -void QgsSimpleLineSymbolLayerV2Widget::on_mChangePatternButton_clicked() +void QgsSimpleLineSymbolLayerWidget::on_mChangePatternButton_clicked() { QgsDashSpaceDialog d( mLayer->customDashVector() ); if ( d.exec() == QDialog::Accepted ) @@ -352,7 +352,7 @@ void QgsSimpleLineSymbolLayerV2Widget::on_mChangePatternButton_clicked() } } -void QgsSimpleLineSymbolLayerV2Widget::on_mPenWidthUnitWidget_changed() +void QgsSimpleLineSymbolLayerWidget::on_mPenWidthUnitWidget_changed() { if ( mLayer ) { @@ -362,7 +362,7 @@ void QgsSimpleLineSymbolLayerV2Widget::on_mPenWidthUnitWidget_changed() } } -void QgsSimpleLineSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() +void QgsSimpleLineSymbolLayerWidget::on_mOffsetUnitWidget_changed() { if ( mLayer ) { @@ -372,7 +372,7 @@ void QgsSimpleLineSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() } } -void QgsSimpleLineSymbolLayerV2Widget::on_mDashPatternUnitWidget_changed() +void QgsSimpleLineSymbolLayerWidget::on_mDashPatternUnitWidget_changed() { if ( mLayer ) { @@ -382,7 +382,7 @@ void QgsSimpleLineSymbolLayerV2Widget::on_mDashPatternUnitWidget_changed() } } -void QgsSimpleLineSymbolLayerV2Widget::on_mDrawInsideCheckBox_stateChanged( int state ) +void QgsSimpleLineSymbolLayerWidget::on_mDrawInsideCheckBox_stateChanged( int state ) { bool checked = ( state == Qt::Checked ); mLayer->setDrawInsidePolygon( checked ); @@ -390,13 +390,13 @@ void QgsSimpleLineSymbolLayerV2Widget::on_mDrawInsideCheckBox_stateChanged( int } -void QgsSimpleLineSymbolLayerV2Widget::updatePatternIcon() +void QgsSimpleLineSymbolLayerWidget::updatePatternIcon() { if ( !mLayer ) { return; } - QgsSimpleLineSymbolLayerV2* layerCopy = mLayer->clone(); + QgsSimpleLineSymbolLayer* layerCopy = mLayer->clone(); if ( !layerCopy ) { return; @@ -411,7 +411,7 @@ void QgsSimpleLineSymbolLayerV2Widget::updatePatternIcon() /////////// -QgsSimpleMarkerSymbolLayerV2Widget::QgsSimpleMarkerSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent ) +QgsSimpleMarkerSymbolLayerWidget::QgsSimpleMarkerSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent ) : QgsSymbolLayerWidget( parent, vl ) { mLayer = nullptr; @@ -436,7 +436,7 @@ QgsSimpleMarkerSymbolLayerV2Widget::QgsSimpleMarkerSymbolLayerV2Widget( const Qg spinOffsetY->setClearValue( 0.0 ); //make a temporary symbol for the size assistant preview - mAssistantPreviewSymbol = new QgsMarkerSymbolV2(); + mAssistantPreviewSymbol = new QgsMarkerSymbol(); if ( mVectorLayer ) mSizeDDBtn->setAssistant( tr( "Size Assistant..." ), new QgsSizeScaleWidget( mVectorLayer, mAssistantPreviewSymbol ) ); @@ -445,7 +445,7 @@ QgsSimpleMarkerSymbolLayerV2Widget::QgsSimpleMarkerSymbolLayerV2Widget( const Qg double markerSize = DEFAULT_POINT_SIZE * 2; Q_FOREACH ( QgsSimpleMarkerSymbolLayerBase::Shape shape, QgsSimpleMarkerSymbolLayerBase::availableShapes() ) { - QgsSimpleMarkerSymbolLayerV2* lyr = new QgsSimpleMarkerSymbolLayerV2( shape, markerSize ); + QgsSimpleMarkerSymbolLayer* lyr = new QgsSimpleMarkerSymbolLayer( shape, markerSize ); lyr->setColor( QColor( 200, 200, 200 ) ); lyr->setOutlineColor( QColor( 0, 0, 0 ) ); QIcon icon = QgsSymbolLayerUtils::symbolLayerPreviewIcon( lyr, QgsUnitTypes::RenderMillimeters, size ); @@ -466,18 +466,18 @@ QgsSimpleMarkerSymbolLayerV2Widget::QgsSimpleMarkerSymbolLayerV2Widget( const Qg connect( this, SIGNAL( changed() ), this, SLOT( updateAssistantSymbol() ) ); } -QgsSimpleMarkerSymbolLayerV2Widget::~QgsSimpleMarkerSymbolLayerV2Widget() +QgsSimpleMarkerSymbolLayerWidget::~QgsSimpleMarkerSymbolLayerWidget() { delete mAssistantPreviewSymbol; } -void QgsSimpleMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) +void QgsSimpleMarkerSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer* layer ) { if ( layer->layerType() != "SimpleMarker" ) return; // layer type is correct, we can do the cast - mLayer = static_cast( layer ); + mLayer = static_cast( layer ); // set values QgsSimpleMarkerSymbolLayerBase::Shape shape = mLayer->shape(); @@ -561,55 +561,55 @@ void QgsSimpleMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) updateAssistantSymbol(); } -QgsSymbolLayer* QgsSimpleMarkerSymbolLayerV2Widget::symbolLayer() +QgsSymbolLayer* QgsSimpleMarkerSymbolLayerWidget::symbolLayer() { return mLayer; } -void QgsSimpleMarkerSymbolLayerV2Widget::setName() +void QgsSimpleMarkerSymbolLayerWidget::setName() { mLayer->setShape( static_cast< QgsSimpleMarkerSymbolLayerBase::Shape>( lstNames->currentItem()->data( Qt::UserRole ).toInt() ) ); btnChangeColorFill->setEnabled( QgsSimpleMarkerSymbolLayerBase::shapeIsFilled( mLayer->shape() ) ); emit changed(); } -void QgsSimpleMarkerSymbolLayerV2Widget::setColorBorder( const QColor& color ) +void QgsSimpleMarkerSymbolLayerWidget::setColorBorder( const QColor& color ) { mLayer->setBorderColor( color ); emit changed(); } -void QgsSimpleMarkerSymbolLayerV2Widget::setColorFill( const QColor& color ) +void QgsSimpleMarkerSymbolLayerWidget::setColorFill( const QColor& color ) { mLayer->setColor( color ); emit changed(); } -void QgsSimpleMarkerSymbolLayerV2Widget::penJoinStyleChanged() +void QgsSimpleMarkerSymbolLayerWidget::penJoinStyleChanged() { mLayer->setPenJoinStyle( cboJoinStyle->penJoinStyle() ); emit changed(); } -void QgsSimpleMarkerSymbolLayerV2Widget::setSize() +void QgsSimpleMarkerSymbolLayerWidget::setSize() { mLayer->setSize( spinSize->value() ); emit changed(); } -void QgsSimpleMarkerSymbolLayerV2Widget::setAngle() +void QgsSimpleMarkerSymbolLayerWidget::setAngle() { mLayer->setAngle( spinAngle->value() ); emit changed(); } -void QgsSimpleMarkerSymbolLayerV2Widget::setOffset() +void QgsSimpleMarkerSymbolLayerWidget::setOffset() { mLayer->setOffset( QPointF( spinOffsetX->value(), spinOffsetY->value() ) ); emit changed(); } -void QgsSimpleMarkerSymbolLayerV2Widget::on_mOutlineStyleComboBox_currentIndexChanged( int index ) +void QgsSimpleMarkerSymbolLayerWidget::on_mOutlineStyleComboBox_currentIndexChanged( int index ) { Q_UNUSED( index ); @@ -620,7 +620,7 @@ void QgsSimpleMarkerSymbolLayerV2Widget::on_mOutlineStyleComboBox_currentIndexCh } } -void QgsSimpleMarkerSymbolLayerV2Widget::on_mOutlineWidthSpinBox_valueChanged( double d ) +void QgsSimpleMarkerSymbolLayerWidget::on_mOutlineWidthSpinBox_valueChanged( double d ) { if ( mLayer ) { @@ -629,7 +629,7 @@ void QgsSimpleMarkerSymbolLayerV2Widget::on_mOutlineWidthSpinBox_valueChanged( d } } -void QgsSimpleMarkerSymbolLayerV2Widget::on_mSizeUnitWidget_changed() +void QgsSimpleMarkerSymbolLayerWidget::on_mSizeUnitWidget_changed() { if ( mLayer ) { @@ -639,7 +639,7 @@ void QgsSimpleMarkerSymbolLayerV2Widget::on_mSizeUnitWidget_changed() } } -void QgsSimpleMarkerSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() +void QgsSimpleMarkerSymbolLayerWidget::on_mOffsetUnitWidget_changed() { if ( mLayer ) { @@ -649,7 +649,7 @@ void QgsSimpleMarkerSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() } } -void QgsSimpleMarkerSymbolLayerV2Widget::on_mOutlineWidthUnitWidget_changed() +void QgsSimpleMarkerSymbolLayerWidget::on_mOutlineWidthUnitWidget_changed() { if ( mLayer ) { @@ -659,25 +659,25 @@ void QgsSimpleMarkerSymbolLayerV2Widget::on_mOutlineWidthUnitWidget_changed() } } -void QgsSimpleMarkerSymbolLayerV2Widget::on_mHorizontalAnchorComboBox_currentIndexChanged( int index ) +void QgsSimpleMarkerSymbolLayerWidget::on_mHorizontalAnchorComboBox_currentIndexChanged( int index ) { if ( mLayer ) { - mLayer->setHorizontalAnchorPoint(( QgsMarkerSymbolLayerV2::HorizontalAnchorPoint ) index ); + mLayer->setHorizontalAnchorPoint(( QgsMarkerSymbolLayer::HorizontalAnchorPoint ) index ); emit changed(); } } -void QgsSimpleMarkerSymbolLayerV2Widget::on_mVerticalAnchorComboBox_currentIndexChanged( int index ) +void QgsSimpleMarkerSymbolLayerWidget::on_mVerticalAnchorComboBox_currentIndexChanged( int index ) { if ( mLayer ) { - mLayer->setVerticalAnchorPoint(( QgsMarkerSymbolLayerV2::VerticalAnchorPoint ) index ); + mLayer->setVerticalAnchorPoint(( QgsMarkerSymbolLayer::VerticalAnchorPoint ) index ); emit changed(); } } -void QgsSimpleMarkerSymbolLayerV2Widget::updateAssistantSymbol() +void QgsSimpleMarkerSymbolLayerWidget::updateAssistantSymbol() { for ( int i = mAssistantPreviewSymbol->symbolLayerCount() - 1 ; i >= 0; --i ) { @@ -692,7 +692,7 @@ void QgsSimpleMarkerSymbolLayerV2Widget::updateAssistantSymbol() /////////// -QgsSimpleFillSymbolLayerV2Widget::QgsSimpleFillSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent ) +QgsSimpleFillSymbolLayerWidget::QgsSimpleFillSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent ) : QgsSymbolLayerWidget( parent, vl ) { mLayer = nullptr; @@ -725,13 +725,13 @@ QgsSimpleFillSymbolLayerV2Widget::QgsSimpleFillSymbolLayerV2Widget( const QgsVec connect( spinOffsetY, SIGNAL( valueChanged( double ) ), this, SLOT( offsetChanged() ) ); } -void QgsSimpleFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) +void QgsSimpleFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer* layer ) { if ( layer->layerType() != "SimpleFill" ) return; // layer type is correct, we can do the cast - mLayer = static_cast( layer ); + mLayer = static_cast( layer ); // set values btnChangeColor->blockSignals( true ); @@ -777,49 +777,49 @@ void QgsSimpleFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) } -QgsSymbolLayer* QgsSimpleFillSymbolLayerV2Widget::symbolLayer() +QgsSymbolLayer* QgsSimpleFillSymbolLayerWidget::symbolLayer() { return mLayer; } -void QgsSimpleFillSymbolLayerV2Widget::setColor( const QColor& color ) +void QgsSimpleFillSymbolLayerWidget::setColor( const QColor& color ) { mLayer->setColor( color ); emit changed(); } -void QgsSimpleFillSymbolLayerV2Widget::setBorderColor( const QColor& color ) +void QgsSimpleFillSymbolLayerWidget::setBorderColor( const QColor& color ) { mLayer->setBorderColor( color ); emit changed(); } -void QgsSimpleFillSymbolLayerV2Widget::setBrushStyle() +void QgsSimpleFillSymbolLayerWidget::setBrushStyle() { mLayer->setBrushStyle( cboFillStyle->brushStyle() ); emit changed(); } -void QgsSimpleFillSymbolLayerV2Widget::borderWidthChanged() +void QgsSimpleFillSymbolLayerWidget::borderWidthChanged() { mLayer->setBorderWidth( spinBorderWidth->value() ); emit changed(); } -void QgsSimpleFillSymbolLayerV2Widget::borderStyleChanged() +void QgsSimpleFillSymbolLayerWidget::borderStyleChanged() { mLayer->setBorderStyle( cboBorderStyle->penStyle() ); mLayer->setPenJoinStyle( cboJoinStyle->penJoinStyle() ); emit changed(); } -void QgsSimpleFillSymbolLayerV2Widget::offsetChanged() +void QgsSimpleFillSymbolLayerWidget::offsetChanged() { mLayer->setOffset( QPointF( spinOffsetX->value(), spinOffsetY->value() ) ); emit changed(); } -void QgsSimpleFillSymbolLayerV2Widget::on_mBorderWidthUnitWidget_changed() +void QgsSimpleFillSymbolLayerWidget::on_mBorderWidthUnitWidget_changed() { if ( mLayer ) { @@ -829,7 +829,7 @@ void QgsSimpleFillSymbolLayerV2Widget::on_mBorderWidthUnitWidget_changed() } } -void QgsSimpleFillSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() +void QgsSimpleFillSymbolLayerWidget::on_mOffsetUnitWidget_changed() { if ( mLayer ) { @@ -854,7 +854,7 @@ QgsFilledMarkerSymbolLayerWidget::QgsFilledMarkerSymbolLayerWidget( const QgsVec spinOffsetY->setClearValue( 0.0 ); //make a temporary symbol for the size assistant preview - mAssistantPreviewSymbol = new QgsMarkerSymbolV2(); + mAssistantPreviewSymbol = new QgsMarkerSymbol(); if ( mVectorLayer ) mSizeDDBtn->setAssistant( tr( "Size Assistant..." ), new QgsSizeScaleWidget( mVectorLayer, mAssistantPreviewSymbol ) ); @@ -866,7 +866,7 @@ QgsFilledMarkerSymbolLayerWidget::QgsFilledMarkerSymbolLayerWidget( const QgsVec if ( !QgsSimpleMarkerSymbolLayerBase::shapeIsFilled( shape ) ) continue; - QgsSimpleMarkerSymbolLayerV2* lyr = new QgsSimpleMarkerSymbolLayerV2( shape, markerSize ); + QgsSimpleMarkerSymbolLayer* lyr = new QgsSimpleMarkerSymbolLayer( shape, markerSize ); lyr->setColor( QColor( 200, 200, 200 ) ); lyr->setOutlineColor( QColor( 0, 0, 0 ) ); QIcon icon = QgsSymbolLayerUtils::symbolLayerPreviewIcon( lyr, QgsUnitTypes::RenderMillimeters, size ); @@ -993,7 +993,7 @@ void QgsFilledMarkerSymbolLayerWidget::on_mHorizontalAnchorComboBox_currentIndex { if ( mLayer ) { - mLayer->setHorizontalAnchorPoint(( QgsMarkerSymbolLayerV2::HorizontalAnchorPoint ) index ); + mLayer->setHorizontalAnchorPoint(( QgsMarkerSymbolLayer::HorizontalAnchorPoint ) index ); emit changed(); } } @@ -1002,7 +1002,7 @@ void QgsFilledMarkerSymbolLayerWidget::on_mVerticalAnchorComboBox_currentIndexCh { if ( mLayer ) { - mLayer->setVerticalAnchorPoint(( QgsMarkerSymbolLayerV2::VerticalAnchorPoint ) index ); + mLayer->setVerticalAnchorPoint(( QgsMarkerSymbolLayer::VerticalAnchorPoint ) index ); emit changed(); } } @@ -1022,7 +1022,7 @@ void QgsFilledMarkerSymbolLayerWidget::updateAssistantSymbol() /////////// -QgsGradientFillSymbolLayerV2Widget::QgsGradientFillSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent ) +QgsGradientFillSymbolLayerWidget::QgsGradientFillSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent ) : QgsSymbolLayerWidget( parent, vl ) { mLayer = nullptr; @@ -1031,7 +1031,7 @@ QgsGradientFillSymbolLayerV2Widget::QgsGradientFillSymbolLayerV2Widget( const Qg mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels ); cboGradientColorRamp->setShowGradientOnly( true ); - cboGradientColorRamp->populate( QgsStyleV2::defaultStyle() ); + cboGradientColorRamp->populate( QgsStyle::defaultStyle() ); btnChangeColor->setAllowAlpha( true ); btnChangeColor->setColorDialogTitle( tr( "Select gradient color" ) ); @@ -1066,13 +1066,13 @@ QgsGradientFillSymbolLayerV2Widget::QgsGradientFillSymbolLayerV2Widget( const Qg connect( checkRefPoint2Centroid, SIGNAL( toggled( bool ) ), this, SLOT( referencePointChanged() ) ); } -void QgsGradientFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) +void QgsGradientFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer* layer ) { if ( layer->layerType() != "GradientFill" ) return; // layer type is correct, we can do the cast - mLayer = static_cast( layer ); + mLayer = static_cast( layer ); // set values btnChangeColor->blockSignals( true ); @@ -1082,7 +1082,7 @@ void QgsGradientFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) btnChangeColor2->setColor( mLayer->color2() ); btnChangeColor2->blockSignals( false ); - if ( mLayer->gradientColorType() == QgsGradientFillSymbolLayerV2::SimpleTwoColor ) + if ( mLayer->gradientColorType() == QgsGradientFillSymbolLayer::SimpleTwoColor ) { radioTwoColor->setChecked( true ); cboGradientColorRamp->setEnabled( false ); @@ -1105,13 +1105,13 @@ void QgsGradientFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) cboGradientType->blockSignals( true ); switch ( mLayer->gradientType() ) { - case QgsGradientFillSymbolLayerV2::Linear: + case QgsGradientFillSymbolLayer::Linear: cboGradientType->setCurrentIndex( 0 ); break; - case QgsGradientFillSymbolLayerV2::Radial: + case QgsGradientFillSymbolLayer::Radial: cboGradientType->setCurrentIndex( 1 ); break; - case QgsGradientFillSymbolLayerV2::Conical: + case QgsGradientFillSymbolLayer::Conical: cboGradientType->setCurrentIndex( 2 ); break; } @@ -1120,12 +1120,12 @@ void QgsGradientFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) cboCoordinateMode->blockSignals( true ); switch ( mLayer->coordinateMode() ) { - case QgsGradientFillSymbolLayerV2::Viewport: + case QgsGradientFillSymbolLayer::Viewport: cboCoordinateMode->setCurrentIndex( 1 ); checkRefPoint1Centroid->setEnabled( false ); checkRefPoint2Centroid->setEnabled( false ); break; - case QgsGradientFillSymbolLayerV2::Feature: + case QgsGradientFillSymbolLayer::Feature: default: cboCoordinateMode->setCurrentIndex( 0 ); break; @@ -1135,13 +1135,13 @@ void QgsGradientFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) cboGradientSpread->blockSignals( true ); switch ( mLayer->gradientSpread() ) { - case QgsGradientFillSymbolLayerV2::Pad: + case QgsGradientFillSymbolLayer::Pad: cboGradientSpread->setCurrentIndex( 0 ); break; - case QgsGradientFillSymbolLayerV2::Repeat: + case QgsGradientFillSymbolLayer::Repeat: cboGradientSpread->setCurrentIndex( 1 ); break; - case QgsGradientFillSymbolLayerV2::Reflect: + case QgsGradientFillSymbolLayer::Reflect: cboGradientSpread->setCurrentIndex( 2 ); break; } @@ -1205,39 +1205,39 @@ void QgsGradientFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) registerDataDefinedButton( mRefPoint2CentroidDDBtn, "reference2_iscentroid", QgsDataDefinedButton::Int, QgsDataDefinedButton::boolDesc() ); } -QgsSymbolLayer* QgsGradientFillSymbolLayerV2Widget::symbolLayer() +QgsSymbolLayer* QgsGradientFillSymbolLayerWidget::symbolLayer() { return mLayer; } -void QgsGradientFillSymbolLayerV2Widget::setColor( const QColor& color ) +void QgsGradientFillSymbolLayerWidget::setColor( const QColor& color ) { mLayer->setColor( color ); emit changed(); } -void QgsGradientFillSymbolLayerV2Widget::setColor2( const QColor& color ) +void QgsGradientFillSymbolLayerWidget::setColor2( const QColor& color ) { mLayer->setColor2( color ); emit changed(); } -void QgsGradientFillSymbolLayerV2Widget::colorModeChanged() +void QgsGradientFillSymbolLayerWidget::colorModeChanged() { if ( radioTwoColor->isChecked() ) { - mLayer->setGradientColorType( QgsGradientFillSymbolLayerV2::SimpleTwoColor ); + mLayer->setGradientColorType( QgsGradientFillSymbolLayer::SimpleTwoColor ); } else { - mLayer->setGradientColorType( QgsGradientFillSymbolLayerV2::ColorRamp ); + mLayer->setGradientColorType( QgsGradientFillSymbolLayer::ColorRamp ); } emit changed(); } -void QgsGradientFillSymbolLayerV2Widget::applyColorRamp() +void QgsGradientFillSymbolLayerWidget::applyColorRamp() { - QgsVectorColorRampV2* ramp = cboGradientColorRamp->currentColorRamp(); + QgsVectorColorRamp* ramp = cboGradientColorRamp->currentColorRamp(); if ( !ramp ) return; @@ -1245,12 +1245,12 @@ void QgsGradientFillSymbolLayerV2Widget::applyColorRamp() emit changed(); } -void QgsGradientFillSymbolLayerV2Widget::setGradientType( int index ) +void QgsGradientFillSymbolLayerWidget::setGradientType( int index ) { switch ( index ) { case 0: - mLayer->setGradientType( QgsGradientFillSymbolLayerV2::Linear ); + mLayer->setGradientType( QgsGradientFillSymbolLayer::Linear ); //set sensible default reference points spinRefPoint1X->setValue( 0.5 ); spinRefPoint1Y->setValue( 0 ); @@ -1258,7 +1258,7 @@ void QgsGradientFillSymbolLayerV2Widget::setGradientType( int index ) spinRefPoint2Y->setValue( 1 ); break; case 1: - mLayer->setGradientType( QgsGradientFillSymbolLayerV2::Radial ); + mLayer->setGradientType( QgsGradientFillSymbolLayer::Radial ); //set sensible default reference points spinRefPoint1X->setValue( 0 ); spinRefPoint1Y->setValue( 0 ); @@ -1266,7 +1266,7 @@ void QgsGradientFillSymbolLayerV2Widget::setGradientType( int index ) spinRefPoint2Y->setValue( 1 ); break; case 2: - mLayer->setGradientType( QgsGradientFillSymbolLayerV2::Conical ); + mLayer->setGradientType( QgsGradientFillSymbolLayer::Conical ); spinRefPoint1X->setValue( 0.5 ); spinRefPoint1Y->setValue( 0.5 ); spinRefPoint2X->setValue( 1 ); @@ -1276,21 +1276,21 @@ void QgsGradientFillSymbolLayerV2Widget::setGradientType( int index ) emit changed(); } -void QgsGradientFillSymbolLayerV2Widget::setCoordinateMode( int index ) +void QgsGradientFillSymbolLayerWidget::setCoordinateMode( int index ) { switch ( index ) { case 0: //feature coordinate mode - mLayer->setCoordinateMode( QgsGradientFillSymbolLayerV2::Feature ); + mLayer->setCoordinateMode( QgsGradientFillSymbolLayer::Feature ); //allow choice of centroid reference positions checkRefPoint1Centroid->setEnabled( true ); checkRefPoint2Centroid->setEnabled( true ); break; case 1: //viewport coordinate mode - mLayer->setCoordinateMode( QgsGradientFillSymbolLayerV2::Viewport ); + mLayer->setCoordinateMode( QgsGradientFillSymbolLayer::Viewport ); //disable choice of centroid reference positions checkRefPoint1Centroid->setChecked( Qt::Unchecked ); checkRefPoint1Centroid->setEnabled( false ); @@ -1302,31 +1302,31 @@ void QgsGradientFillSymbolLayerV2Widget::setCoordinateMode( int index ) emit changed(); } -void QgsGradientFillSymbolLayerV2Widget::setGradientSpread( int index ) +void QgsGradientFillSymbolLayerWidget::setGradientSpread( int index ) { switch ( index ) { case 0: - mLayer->setGradientSpread( QgsGradientFillSymbolLayerV2::Pad ); + mLayer->setGradientSpread( QgsGradientFillSymbolLayer::Pad ); break; case 1: - mLayer->setGradientSpread( QgsGradientFillSymbolLayerV2::Repeat ); + mLayer->setGradientSpread( QgsGradientFillSymbolLayer::Repeat ); break; case 2: - mLayer->setGradientSpread( QgsGradientFillSymbolLayerV2::Reflect ); + mLayer->setGradientSpread( QgsGradientFillSymbolLayer::Reflect ); break; } emit changed(); } -void QgsGradientFillSymbolLayerV2Widget::offsetChanged() +void QgsGradientFillSymbolLayerWidget::offsetChanged() { mLayer->setOffset( QPointF( spinOffsetX->value(), spinOffsetY->value() ) ); emit changed(); } -void QgsGradientFillSymbolLayerV2Widget::referencePointChanged() +void QgsGradientFillSymbolLayerWidget::referencePointChanged() { mLayer->setReferencePoint1( QPointF( spinRefPoint1X->value(), spinRefPoint1Y->value() ) ); mLayer->setReferencePoint1IsCentroid( checkRefPoint1Centroid->isChecked() ); @@ -1335,13 +1335,13 @@ void QgsGradientFillSymbolLayerV2Widget::referencePointChanged() emit changed(); } -void QgsGradientFillSymbolLayerV2Widget::on_mSpinAngle_valueChanged( double value ) +void QgsGradientFillSymbolLayerWidget::on_mSpinAngle_valueChanged( double value ) { mLayer->setAngle( value ); emit changed(); } -void QgsGradientFillSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() +void QgsGradientFillSymbolLayerWidget::on_mOffsetUnitWidget_changed() { if ( mLayer ) { @@ -1353,7 +1353,7 @@ void QgsGradientFillSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() /////////// -QgsShapeburstFillSymbolLayerV2Widget::QgsShapeburstFillSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent ) +QgsShapeburstFillSymbolLayerWidget::QgsShapeburstFillSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent ) : QgsSymbolLayerWidget( parent, vl ) { mLayer = nullptr; @@ -1382,7 +1382,7 @@ QgsShapeburstFillSymbolLayerV2Widget::QgsShapeburstFillSymbolLayerV2Widget( cons spinOffsetX->setClearValue( 0.0 ); spinOffsetY->setClearValue( 0.0 ); - cboGradientColorRamp->populate( QgsStyleV2::defaultStyle() ); + cboGradientColorRamp->populate( QgsStyle::defaultStyle() ); connect( cboGradientColorRamp, SIGNAL( currentIndexChanged( int ) ), this, SLOT( applyColorRamp() ) ); connect( cboGradientColorRamp, SIGNAL( sourceRampEdited() ), this, SLOT( applyColorRamp() ) ); @@ -1398,13 +1398,13 @@ QgsShapeburstFillSymbolLayerV2Widget::QgsShapeburstFillSymbolLayerV2Widget( cons connect( mSpinBlurRadius, SIGNAL( valueChanged( int ) ), mBlurSlider, SLOT( setValue( int ) ) ); } -void QgsShapeburstFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) +void QgsShapeburstFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer* layer ) { if ( layer->layerType() != "ShapeburstFill" ) return; // layer type is correct, we can do the cast - mLayer = static_cast( layer ); + mLayer = static_cast( layer ); // set values btnChangeColor->blockSignals( true ); @@ -1414,7 +1414,7 @@ void QgsShapeburstFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer btnChangeColor2->setColor( mLayer->color2() ); btnChangeColor2->blockSignals( false ); - if ( mLayer->colorType() == QgsShapeburstFillSymbolLayerV2::SimpleTwoColor ) + if ( mLayer->colorType() == QgsShapeburstFillSymbolLayer::SimpleTwoColor ) { radioTwoColor->setChecked( true ); cboGradientColorRamp->setEnabled( false ); @@ -1490,12 +1490,12 @@ void QgsShapeburstFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer registerDataDefinedButton( mIgnoreRingsDDBtn, "ignore_rings", QgsDataDefinedButton::Int, QgsDataDefinedButton::boolDesc() ); } -QgsSymbolLayer* QgsShapeburstFillSymbolLayerV2Widget::symbolLayer() +QgsSymbolLayer* QgsShapeburstFillSymbolLayerWidget::symbolLayer() { return mLayer; } -void QgsShapeburstFillSymbolLayerV2Widget::setColor( const QColor& color ) +void QgsShapeburstFillSymbolLayerWidget::setColor( const QColor& color ) { if ( mLayer ) { @@ -1504,7 +1504,7 @@ void QgsShapeburstFillSymbolLayerV2Widget::setColor( const QColor& color ) } } -void QgsShapeburstFillSymbolLayerV2Widget::setColor2( const QColor& color ) +void QgsShapeburstFillSymbolLayerWidget::setColor2( const QColor& color ) { if ( mLayer ) { @@ -1513,7 +1513,7 @@ void QgsShapeburstFillSymbolLayerV2Widget::setColor2( const QColor& color ) } } -void QgsShapeburstFillSymbolLayerV2Widget::colorModeChanged() +void QgsShapeburstFillSymbolLayerWidget::colorModeChanged() { if ( !mLayer ) { @@ -1522,16 +1522,16 @@ void QgsShapeburstFillSymbolLayerV2Widget::colorModeChanged() if ( radioTwoColor->isChecked() ) { - mLayer->setColorType( QgsShapeburstFillSymbolLayerV2::SimpleTwoColor ); + mLayer->setColorType( QgsShapeburstFillSymbolLayer::SimpleTwoColor ); } else { - mLayer->setColorType( QgsShapeburstFillSymbolLayerV2::ColorRamp ); + mLayer->setColorType( QgsShapeburstFillSymbolLayer::ColorRamp ); } emit changed(); } -void QgsShapeburstFillSymbolLayerV2Widget::on_mSpinBlurRadius_valueChanged( int value ) +void QgsShapeburstFillSymbolLayerWidget::on_mSpinBlurRadius_valueChanged( int value ) { if ( mLayer ) { @@ -1540,7 +1540,7 @@ void QgsShapeburstFillSymbolLayerV2Widget::on_mSpinBlurRadius_valueChanged( int } } -void QgsShapeburstFillSymbolLayerV2Widget::on_mSpinMaxDistance_valueChanged( double value ) +void QgsShapeburstFillSymbolLayerWidget::on_mSpinMaxDistance_valueChanged( double value ) { if ( mLayer ) { @@ -1549,7 +1549,7 @@ void QgsShapeburstFillSymbolLayerV2Widget::on_mSpinMaxDistance_valueChanged( dou } } -void QgsShapeburstFillSymbolLayerV2Widget::on_mDistanceUnitWidget_changed() +void QgsShapeburstFillSymbolLayerWidget::on_mDistanceUnitWidget_changed() { if ( mLayer ) { @@ -1559,7 +1559,7 @@ void QgsShapeburstFillSymbolLayerV2Widget::on_mDistanceUnitWidget_changed() } } -void QgsShapeburstFillSymbolLayerV2Widget::on_mRadioUseWholeShape_toggled( bool value ) +void QgsShapeburstFillSymbolLayerWidget::on_mRadioUseWholeShape_toggled( bool value ) { if ( mLayer ) { @@ -1569,9 +1569,9 @@ void QgsShapeburstFillSymbolLayerV2Widget::on_mRadioUseWholeShape_toggled( bool } } -void QgsShapeburstFillSymbolLayerV2Widget::applyColorRamp() +void QgsShapeburstFillSymbolLayerWidget::applyColorRamp() { - QgsVectorColorRampV2* ramp = cboGradientColorRamp->currentColorRamp(); + QgsVectorColorRamp* ramp = cboGradientColorRamp->currentColorRamp(); if ( !ramp ) return; @@ -1579,7 +1579,7 @@ void QgsShapeburstFillSymbolLayerV2Widget::applyColorRamp() emit changed(); } -void QgsShapeburstFillSymbolLayerV2Widget::offsetChanged() +void QgsShapeburstFillSymbolLayerWidget::offsetChanged() { if ( mLayer ) { @@ -1588,7 +1588,7 @@ void QgsShapeburstFillSymbolLayerV2Widget::offsetChanged() } } -void QgsShapeburstFillSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() +void QgsShapeburstFillSymbolLayerWidget::on_mOffsetUnitWidget_changed() { if ( mLayer ) { @@ -1599,7 +1599,7 @@ void QgsShapeburstFillSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() } -void QgsShapeburstFillSymbolLayerV2Widget::on_mIgnoreRingsCheckBox_stateChanged( int state ) +void QgsShapeburstFillSymbolLayerWidget::on_mIgnoreRingsCheckBox_stateChanged( int state ) { bool checked = ( state == Qt::Checked ); mLayer->setIgnoreRings( checked ); @@ -1608,7 +1608,7 @@ void QgsShapeburstFillSymbolLayerV2Widget::on_mIgnoreRingsCheckBox_stateChanged( /////////// -QgsMarkerLineSymbolLayerV2Widget::QgsMarkerLineSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent ) +QgsMarkerLineSymbolLayerWidget::QgsMarkerLineSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent ) : QgsSymbolLayerWidget( parent, vl ) { mLayer = nullptr; @@ -1632,13 +1632,13 @@ QgsMarkerLineSymbolLayerV2Widget::QgsMarkerLineSymbolLayerV2Widget( const QgsVec connect( radCurvePoint, SIGNAL( clicked() ), this, SLOT( setPlacement() ) ); } -void QgsMarkerLineSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) +void QgsMarkerLineSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer* layer ) { if ( layer->layerType() != "MarkerLine" ) return; // layer type is correct, we can do the cast - mLayer = static_cast( layer ); + mLayer = static_cast( layer ); // set values spinInterval->blockSignals( true ); @@ -1653,15 +1653,15 @@ void QgsMarkerLineSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) spinOffset->blockSignals( true ); spinOffset->setValue( mLayer->offset() ); spinOffset->blockSignals( false ); - if ( mLayer->placement() == QgsMarkerLineSymbolLayerV2::Interval ) + if ( mLayer->placement() == QgsMarkerLineSymbolLayer::Interval ) radInterval->setChecked( true ); - else if ( mLayer->placement() == QgsMarkerLineSymbolLayerV2::Vertex ) + else if ( mLayer->placement() == QgsMarkerLineSymbolLayer::Vertex ) radVertex->setChecked( true ); - else if ( mLayer->placement() == QgsMarkerLineSymbolLayerV2::LastVertex ) + else if ( mLayer->placement() == QgsMarkerLineSymbolLayer::LastVertex ) radVertexLast->setChecked( true ); - else if ( mLayer->placement() == QgsMarkerLineSymbolLayerV2::CentralPoint ) + else if ( mLayer->placement() == QgsMarkerLineSymbolLayer::CentralPoint ) radCentralPoint->setChecked( true ); - else if ( mLayer->placement() == QgsMarkerLineSymbolLayerV2::CurvePoint ) + else if ( mLayer->placement() == QgsMarkerLineSymbolLayer::CurvePoint ) radCurvePoint->setChecked( true ); else radVertexFirst->setChecked( true ); @@ -1688,58 +1688,58 @@ void QgsMarkerLineSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) registerDataDefinedButton( mOffsetAlongLineDDBtn, "offset_along_line", QgsDataDefinedButton::Double, QgsDataDefinedButton::doublePosDesc() ); } -QgsSymbolLayer* QgsMarkerLineSymbolLayerV2Widget::symbolLayer() +QgsSymbolLayer* QgsMarkerLineSymbolLayerWidget::symbolLayer() { return mLayer; } -void QgsMarkerLineSymbolLayerV2Widget::setInterval( double val ) +void QgsMarkerLineSymbolLayerWidget::setInterval( double val ) { mLayer->setInterval( val ); emit changed(); } -void QgsMarkerLineSymbolLayerV2Widget::setOffsetAlongLine( double val ) +void QgsMarkerLineSymbolLayerWidget::setOffsetAlongLine( double val ) { mLayer->setOffsetAlongLine( val ); emit changed(); } -void QgsMarkerLineSymbolLayerV2Widget::setRotate() +void QgsMarkerLineSymbolLayerWidget::setRotate() { mLayer->setRotateMarker( chkRotateMarker->isChecked() ); emit changed(); } -void QgsMarkerLineSymbolLayerV2Widget::setOffset() +void QgsMarkerLineSymbolLayerWidget::setOffset() { mLayer->setOffset( spinOffset->value() ); emit changed(); } -void QgsMarkerLineSymbolLayerV2Widget::setPlacement() +void QgsMarkerLineSymbolLayerWidget::setPlacement() { bool interval = radInterval->isChecked(); spinInterval->setEnabled( interval ); mSpinOffsetAlongLine->setEnabled( radInterval->isChecked() || radVertexLast->isChecked() || radVertexFirst->isChecked() ); - //mLayer->setPlacement( interval ? QgsMarkerLineSymbolLayerV2::Interval : QgsMarkerLineSymbolLayerV2::Vertex ); + //mLayer->setPlacement( interval ? QgsMarkerLineSymbolLayer::Interval : QgsMarkerLineSymbolLayer::Vertex ); if ( radInterval->isChecked() ) - mLayer->setPlacement( QgsMarkerLineSymbolLayerV2::Interval ); + mLayer->setPlacement( QgsMarkerLineSymbolLayer::Interval ); else if ( radVertex->isChecked() ) - mLayer->setPlacement( QgsMarkerLineSymbolLayerV2::Vertex ); + mLayer->setPlacement( QgsMarkerLineSymbolLayer::Vertex ); else if ( radVertexLast->isChecked() ) - mLayer->setPlacement( QgsMarkerLineSymbolLayerV2::LastVertex ); + mLayer->setPlacement( QgsMarkerLineSymbolLayer::LastVertex ); else if ( radVertexFirst->isChecked() ) - mLayer->setPlacement( QgsMarkerLineSymbolLayerV2::FirstVertex ); + mLayer->setPlacement( QgsMarkerLineSymbolLayer::FirstVertex ); else if ( radCurvePoint->isChecked() ) - mLayer->setPlacement( QgsMarkerLineSymbolLayerV2::CurvePoint ); + mLayer->setPlacement( QgsMarkerLineSymbolLayer::CurvePoint ); else - mLayer->setPlacement( QgsMarkerLineSymbolLayerV2::CentralPoint ); + mLayer->setPlacement( QgsMarkerLineSymbolLayer::CentralPoint ); emit changed(); } -void QgsMarkerLineSymbolLayerV2Widget::on_mIntervalUnitWidget_changed() +void QgsMarkerLineSymbolLayerWidget::on_mIntervalUnitWidget_changed() { if ( mLayer ) { @@ -1749,7 +1749,7 @@ void QgsMarkerLineSymbolLayerV2Widget::on_mIntervalUnitWidget_changed() } } -void QgsMarkerLineSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() +void QgsMarkerLineSymbolLayerWidget::on_mOffsetUnitWidget_changed() { if ( mLayer ) { @@ -1759,7 +1759,7 @@ void QgsMarkerLineSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() } } -void QgsMarkerLineSymbolLayerV2Widget::on_mOffsetAlongLineUnitWidget_changed() +void QgsMarkerLineSymbolLayerWidget::on_mOffsetAlongLineUnitWidget_changed() { if ( mLayer ) { @@ -1772,7 +1772,7 @@ void QgsMarkerLineSymbolLayerV2Widget::on_mOffsetAlongLineUnitWidget_changed() /////////// -QgsSvgMarkerSymbolLayerV2Widget::QgsSvgMarkerSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent ) +QgsSvgMarkerSymbolLayerWidget::QgsSvgMarkerSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent ) : QgsSymbolLayerWidget( parent, vl ) { mLayer = nullptr; @@ -1803,12 +1803,12 @@ QgsSvgMarkerSymbolLayerV2Widget::QgsSvgMarkerSymbolLayerV2Widget( const QgsVecto connect( this, SIGNAL( changed() ), this, SLOT( updateAssistantSymbol() ) ); //make a temporary symbol for the size assistant preview - mAssistantPreviewSymbol = new QgsMarkerSymbolV2(); + mAssistantPreviewSymbol = new QgsMarkerSymbol(); if ( mVectorLayer ) mSizeDDBtn->setAssistant( tr( "Size Assistant..." ), new QgsSizeScaleWidget( mVectorLayer, mAssistantPreviewSymbol ) ); } -QgsSvgMarkerSymbolLayerV2Widget::~QgsSvgMarkerSymbolLayerV2Widget() +QgsSvgMarkerSymbolLayerWidget::~QgsSvgMarkerSymbolLayerWidget() { delete mAssistantPreviewSymbol; } @@ -1819,7 +1819,7 @@ QgsSvgMarkerSymbolLayerV2Widget::~QgsSvgMarkerSymbolLayerV2Widget() #include -void QgsSvgMarkerSymbolLayerV2Widget::populateList() +void QgsSvgMarkerSymbolLayerWidget::populateList() { QgsSvgGroupsModel* g = new QgsSvgGroupsModel( viewGroups ); viewGroups->setModel( g ); @@ -1835,7 +1835,7 @@ void QgsSvgMarkerSymbolLayerV2Widget::populateList() viewImages->setModel( m ); } -void QgsSvgMarkerSymbolLayerV2Widget::populateIcons( const QModelIndex& idx ) +void QgsSvgMarkerSymbolLayerWidget::populateIcons( const QModelIndex& idx ) { QString path = idx.data( Qt::UserRole + 1 ).toString(); @@ -1846,7 +1846,7 @@ void QgsSvgMarkerSymbolLayerV2Widget::populateIcons( const QModelIndex& idx ) emit changed(); } -void QgsSvgMarkerSymbolLayerV2Widget::setGuiForSvg( const QgsSvgMarkerSymbolLayerV2* layer ) +void QgsSvgMarkerSymbolLayerWidget::setGuiForSvg( const QgsSvgMarkerSymbolLayer* layer ) { if ( !layer ) { @@ -1901,7 +1901,7 @@ void QgsSvgMarkerSymbolLayerV2Widget::setGuiForSvg( const QgsSvgMarkerSymbolLaye mBorderWidthSpinBox->blockSignals( false ); } -void QgsSvgMarkerSymbolLayerV2Widget::updateAssistantSymbol() +void QgsSvgMarkerSymbolLayerWidget::updateAssistantSymbol() { for ( int i = mAssistantPreviewSymbol->symbolLayerCount() - 1 ; i >= 0; --i ) { @@ -1914,7 +1914,7 @@ void QgsSvgMarkerSymbolLayerV2Widget::updateAssistantSymbol() } -void QgsSvgMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) +void QgsSvgMarkerSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer* layer ) { if ( !layer ) { @@ -1925,7 +1925,7 @@ void QgsSvgMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) return; // layer type is correct, we can do the cast - mLayer = static_cast( layer ); + mLayer = static_cast( layer ); // set values @@ -1994,12 +1994,12 @@ void QgsSvgMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) updateAssistantSymbol(); } -QgsSymbolLayer* QgsSvgMarkerSymbolLayerV2Widget::symbolLayer() +QgsSymbolLayer* QgsSvgMarkerSymbolLayerWidget::symbolLayer() { return mLayer; } -void QgsSvgMarkerSymbolLayerV2Widget::setName( const QModelIndex& idx ) +void QgsSvgMarkerSymbolLayerWidget::setName( const QModelIndex& idx ) { QString name = idx.data( Qt::UserRole ).toString(); mLayer->setPath( name ); @@ -2009,25 +2009,25 @@ void QgsSvgMarkerSymbolLayerV2Widget::setName( const QModelIndex& idx ) emit changed(); } -void QgsSvgMarkerSymbolLayerV2Widget::setSize() +void QgsSvgMarkerSymbolLayerWidget::setSize() { mLayer->setSize( spinSize->value() ); emit changed(); } -void QgsSvgMarkerSymbolLayerV2Widget::setAngle() +void QgsSvgMarkerSymbolLayerWidget::setAngle() { mLayer->setAngle( spinAngle->value() ); emit changed(); } -void QgsSvgMarkerSymbolLayerV2Widget::setOffset() +void QgsSvgMarkerSymbolLayerWidget::setOffset() { mLayer->setOffset( QPointF( spinOffsetX->value(), spinOffsetY->value() ) ); emit changed(); } -void QgsSvgMarkerSymbolLayerV2Widget::on_mFileToolButton_clicked() +void QgsSvgMarkerSymbolLayerWidget::on_mFileToolButton_clicked() { QSettings s; QString file = QFileDialog::getOpenFileName( nullptr, @@ -2046,7 +2046,7 @@ void QgsSvgMarkerSymbolLayerV2Widget::on_mFileToolButton_clicked() emit changed(); } -void QgsSvgMarkerSymbolLayerV2Widget::on_mFileLineEdit_textEdited( const QString& text ) +void QgsSvgMarkerSymbolLayerWidget::on_mFileLineEdit_textEdited( const QString& text ) { if ( !QFileInfo( text ).exists() ) { @@ -2057,7 +2057,7 @@ void QgsSvgMarkerSymbolLayerV2Widget::on_mFileLineEdit_textEdited( const QString emit changed(); } -void QgsSvgMarkerSymbolLayerV2Widget::on_mFileLineEdit_editingFinished() +void QgsSvgMarkerSymbolLayerWidget::on_mFileLineEdit_editingFinished() { if ( !QFileInfo( mFileLineEdit->text() ).exists() ) { @@ -2076,7 +2076,7 @@ void QgsSvgMarkerSymbolLayerV2Widget::on_mFileLineEdit_editingFinished() emit changed(); } -void QgsSvgMarkerSymbolLayerV2Widget::on_mChangeColorButton_colorChanged( const QColor& color ) +void QgsSvgMarkerSymbolLayerWidget::on_mChangeColorButton_colorChanged( const QColor& color ) { if ( !mLayer ) { @@ -2087,7 +2087,7 @@ void QgsSvgMarkerSymbolLayerV2Widget::on_mChangeColorButton_colorChanged( const emit changed(); } -void QgsSvgMarkerSymbolLayerV2Widget::on_mChangeBorderColorButton_colorChanged( const QColor& color ) +void QgsSvgMarkerSymbolLayerWidget::on_mChangeBorderColorButton_colorChanged( const QColor& color ) { if ( !mLayer ) { @@ -2098,7 +2098,7 @@ void QgsSvgMarkerSymbolLayerV2Widget::on_mChangeBorderColorButton_colorChanged( emit changed(); } -void QgsSvgMarkerSymbolLayerV2Widget::on_mBorderWidthSpinBox_valueChanged( double d ) +void QgsSvgMarkerSymbolLayerWidget::on_mBorderWidthSpinBox_valueChanged( double d ) { if ( mLayer ) { @@ -2107,7 +2107,7 @@ void QgsSvgMarkerSymbolLayerV2Widget::on_mBorderWidthSpinBox_valueChanged( doubl } } -void QgsSvgMarkerSymbolLayerV2Widget::on_mSizeUnitWidget_changed() +void QgsSvgMarkerSymbolLayerWidget::on_mSizeUnitWidget_changed() { if ( mLayer ) { @@ -2117,7 +2117,7 @@ void QgsSvgMarkerSymbolLayerV2Widget::on_mSizeUnitWidget_changed() } } -void QgsSvgMarkerSymbolLayerV2Widget::on_mBorderWidthUnitWidget_changed() +void QgsSvgMarkerSymbolLayerWidget::on_mBorderWidthUnitWidget_changed() { if ( mLayer ) { @@ -2127,7 +2127,7 @@ void QgsSvgMarkerSymbolLayerV2Widget::on_mBorderWidthUnitWidget_changed() } } -void QgsSvgMarkerSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() +void QgsSvgMarkerSymbolLayerWidget::on_mOffsetUnitWidget_changed() { if ( mLayer ) { @@ -2137,20 +2137,20 @@ void QgsSvgMarkerSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() } } -void QgsSvgMarkerSymbolLayerV2Widget::on_mHorizontalAnchorComboBox_currentIndexChanged( int index ) +void QgsSvgMarkerSymbolLayerWidget::on_mHorizontalAnchorComboBox_currentIndexChanged( int index ) { if ( mLayer ) { - mLayer->setHorizontalAnchorPoint( QgsMarkerSymbolLayerV2::HorizontalAnchorPoint( index ) ); + mLayer->setHorizontalAnchorPoint( QgsMarkerSymbolLayer::HorizontalAnchorPoint( index ) ); emit changed(); } } -void QgsSvgMarkerSymbolLayerV2Widget::on_mVerticalAnchorComboBox_currentIndexChanged( int index ) +void QgsSvgMarkerSymbolLayerWidget::on_mVerticalAnchorComboBox_currentIndexChanged( int index ) { if ( mLayer ) { - mLayer->setVerticalAnchorPoint( QgsMarkerSymbolLayerV2::VerticalAnchorPoint( index ) ); + mLayer->setVerticalAnchorPoint( QgsMarkerSymbolLayer::VerticalAnchorPoint( index ) ); emit changed(); } } @@ -2673,7 +2673,7 @@ void QgsPointPatternFillSymbolLayerWidget::on_mVerticalDisplacementUnitWidget_ch ///////////// -QgsFontMarkerSymbolLayerV2Widget::QgsFontMarkerSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent ) +QgsFontMarkerSymbolLayerWidget::QgsFontMarkerSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent ) : QgsSymbolLayerWidget( parent, vl ) { mLayer = nullptr; @@ -2696,7 +2696,7 @@ QgsFontMarkerSymbolLayerV2Widget::QgsFontMarkerSymbolLayerV2Widget( const QgsVec spinOffsetY->setClearValue( 0.0 ); //make a temporary symbol for the size assistant preview - mAssistantPreviewSymbol = new QgsMarkerSymbolV2(); + mAssistantPreviewSymbol = new QgsMarkerSymbol(); if ( mVectorLayer ) mSizeDDBtn->setAssistant( tr( "Size Assistant..." ), new QgsSizeScaleWidget( mVectorLayer, mAssistantPreviewSymbol ) ); @@ -2714,18 +2714,18 @@ QgsFontMarkerSymbolLayerV2Widget::QgsFontMarkerSymbolLayerV2Widget( const QgsVec connect( this, SIGNAL( changed() ), this, SLOT( updateAssistantSymbol() ) ); } -QgsFontMarkerSymbolLayerV2Widget::~QgsFontMarkerSymbolLayerV2Widget() +QgsFontMarkerSymbolLayerWidget::~QgsFontMarkerSymbolLayerWidget() { delete mAssistantPreviewSymbol; } -void QgsFontMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) +void QgsFontMarkerSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer* layer ) { if ( layer->layerType() != "FontMarker" ) return; // layer type is correct, we can do the cast - mLayer = static_cast( layer ); + mLayer = static_cast( layer ); QFont layerFont( mLayer->fontFamily() ); // set values @@ -2780,62 +2780,62 @@ void QgsFontMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) updateAssistantSymbol(); } -QgsSymbolLayer* QgsFontMarkerSymbolLayerV2Widget::symbolLayer() +QgsSymbolLayer* QgsFontMarkerSymbolLayerWidget::symbolLayer() { return mLayer; } -void QgsFontMarkerSymbolLayerV2Widget::setFontFamily( const QFont& font ) +void QgsFontMarkerSymbolLayerWidget::setFontFamily( const QFont& font ) { mLayer->setFontFamily( font.family() ); widgetChar->updateFont( font ); emit changed(); } -void QgsFontMarkerSymbolLayerV2Widget::setColor( const QColor& color ) +void QgsFontMarkerSymbolLayerWidget::setColor( const QColor& color ) { mLayer->setColor( color ); emit changed(); } -void QgsFontMarkerSymbolLayerV2Widget::setColorBorder( const QColor& color ) +void QgsFontMarkerSymbolLayerWidget::setColorBorder( const QColor& color ) { mLayer->setOutlineColor( color ); emit changed(); } -void QgsFontMarkerSymbolLayerV2Widget::setSize( double size ) +void QgsFontMarkerSymbolLayerWidget::setSize( double size ) { mLayer->setSize( size ); //widgetChar->updateSize(size); emit changed(); } -void QgsFontMarkerSymbolLayerV2Widget::setAngle( double angle ) +void QgsFontMarkerSymbolLayerWidget::setAngle( double angle ) { mLayer->setAngle( angle ); emit changed(); } -void QgsFontMarkerSymbolLayerV2Widget::setCharacter( QChar chr ) +void QgsFontMarkerSymbolLayerWidget::setCharacter( QChar chr ) { mLayer->setCharacter( chr ); emit changed(); } -void QgsFontMarkerSymbolLayerV2Widget::setOffset() +void QgsFontMarkerSymbolLayerWidget::setOffset() { mLayer->setOffset( QPointF( spinOffsetX->value(), spinOffsetY->value() ) ); emit changed(); } -void QgsFontMarkerSymbolLayerV2Widget::penJoinStyleChanged() +void QgsFontMarkerSymbolLayerWidget::penJoinStyleChanged() { mLayer->setPenJoinStyle( cboJoinStyle->penJoinStyle() ); emit changed(); } -void QgsFontMarkerSymbolLayerV2Widget::on_mSizeUnitWidget_changed() +void QgsFontMarkerSymbolLayerWidget::on_mSizeUnitWidget_changed() { if ( mLayer ) { @@ -2845,7 +2845,7 @@ void QgsFontMarkerSymbolLayerV2Widget::on_mSizeUnitWidget_changed() } } -void QgsFontMarkerSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() +void QgsFontMarkerSymbolLayerWidget::on_mOffsetUnitWidget_changed() { if ( mLayer ) { @@ -2855,7 +2855,7 @@ void QgsFontMarkerSymbolLayerV2Widget::on_mOffsetUnitWidget_changed() } } -void QgsFontMarkerSymbolLayerV2Widget::on_mBorderWidthUnitWidget_changed() +void QgsFontMarkerSymbolLayerWidget::on_mBorderWidthUnitWidget_changed() { if ( mLayer ) { @@ -2865,25 +2865,25 @@ void QgsFontMarkerSymbolLayerV2Widget::on_mBorderWidthUnitWidget_changed() } } -void QgsFontMarkerSymbolLayerV2Widget::on_mHorizontalAnchorComboBox_currentIndexChanged( int index ) +void QgsFontMarkerSymbolLayerWidget::on_mHorizontalAnchorComboBox_currentIndexChanged( int index ) { if ( mLayer ) { - mLayer->setHorizontalAnchorPoint( QgsMarkerSymbolLayerV2::HorizontalAnchorPoint( index ) ); + mLayer->setHorizontalAnchorPoint( QgsMarkerSymbolLayer::HorizontalAnchorPoint( index ) ); emit changed(); } } -void QgsFontMarkerSymbolLayerV2Widget::on_mVerticalAnchorComboBox_currentIndexChanged( int index ) +void QgsFontMarkerSymbolLayerWidget::on_mVerticalAnchorComboBox_currentIndexChanged( int index ) { if ( mLayer ) { - mLayer->setVerticalAnchorPoint( QgsMarkerSymbolLayerV2::VerticalAnchorPoint( index ) ); + mLayer->setVerticalAnchorPoint( QgsMarkerSymbolLayer::VerticalAnchorPoint( index ) ); emit changed(); } } -void QgsFontMarkerSymbolLayerV2Widget::on_mBorderWidthSpinBox_valueChanged( double d ) +void QgsFontMarkerSymbolLayerWidget::on_mBorderWidthSpinBox_valueChanged( double d ) { if ( mLayer ) { @@ -2892,7 +2892,7 @@ void QgsFontMarkerSymbolLayerV2Widget::on_mBorderWidthSpinBox_valueChanged( doub } } -void QgsFontMarkerSymbolLayerV2Widget::updateAssistantSymbol() +void QgsFontMarkerSymbolLayerWidget::updateAssistantSymbol() { for ( int i = mAssistantPreviewSymbol->symbolLayerCount() - 1 ; i >= 0; --i ) { @@ -2907,7 +2907,7 @@ void QgsFontMarkerSymbolLayerV2Widget::updateAssistantSymbol() /////////////// -QgsCentroidFillSymbolLayerV2Widget::QgsCentroidFillSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent ) +QgsCentroidFillSymbolLayerWidget::QgsCentroidFillSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent ) : QgsSymbolLayerWidget( parent, vl ) { mLayer = nullptr; @@ -2915,31 +2915,31 @@ QgsCentroidFillSymbolLayerV2Widget::QgsCentroidFillSymbolLayerV2Widget( const Qg setupUi( this ); } -void QgsCentroidFillSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayer* layer ) +void QgsCentroidFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer* layer ) { if ( layer->layerType() != "CentroidFill" ) return; // layer type is correct, we can do the cast - mLayer = static_cast( layer ); + mLayer = static_cast( layer ); // set values whileBlocking( mDrawInsideCheckBox )->setChecked( mLayer->pointOnSurface() ); whileBlocking( mDrawAllPartsCheckBox )->setChecked( mLayer->pointOnAllParts() ); } -QgsSymbolLayer* QgsCentroidFillSymbolLayerV2Widget::symbolLayer() +QgsSymbolLayer* QgsCentroidFillSymbolLayerWidget::symbolLayer() { return mLayer; } -void QgsCentroidFillSymbolLayerV2Widget::on_mDrawInsideCheckBox_stateChanged( int state ) +void QgsCentroidFillSymbolLayerWidget::on_mDrawInsideCheckBox_stateChanged( int state ) { mLayer->setPointOnSurface( state == Qt::Checked ); emit changed(); } -void QgsCentroidFillSymbolLayerV2Widget::on_mDrawAllPartsCheckBox_stateChanged( int state ) +void QgsCentroidFillSymbolLayerWidget::on_mDrawAllPartsCheckBox_stateChanged( int state ) { mLayer->setPointOnAllParts( state == Qt::Checked ); emit changed(); @@ -3362,7 +3362,7 @@ QgsGeometryGeneratorSymbolLayerWidget::QgsGeometryGeneratorSymbolLayerWidget( co void QgsGeometryGeneratorSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer* l ) { - mLayer = static_cast( l ); + mLayer = static_cast( l ); if ( mPresetExpressionContext ) modificationExpressionSelector->setExpressionContext( *mPresetExpressionContext ); diff --git a/src/gui/symbology-ng/qgssymbollayerwidget.h b/src/gui/symbology-ng/qgssymbollayerwidget.h index 4270268bfd2..06217a221a3 100644 --- a/src/gui/symbology-ng/qgssymbollayerwidget.h +++ b/src/gui/symbology-ng/qgssymbollayerwidget.h @@ -123,21 +123,21 @@ class GUI_EXPORT QgsSymbolLayerWidget : public QWidget #include "ui_widget_simpleline.h" -class QgsSimpleLineSymbolLayerV2; +class QgsSimpleLineSymbolLayer; /** \ingroup gui - * \class QgsSimpleLineSymbolLayerV2Widget + * \class QgsSimpleLineSymbolLayerWidget */ -class GUI_EXPORT QgsSimpleLineSymbolLayerV2Widget : public QgsSymbolLayerWidget, private Ui::WidgetSimpleLine +class GUI_EXPORT QgsSimpleLineSymbolLayerWidget : public QgsSymbolLayerWidget, private Ui::WidgetSimpleLine { Q_OBJECT public: - QgsSimpleLineSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); + QgsSimpleLineSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); - ~QgsSimpleLineSymbolLayerV2Widget(); + ~QgsSimpleLineSymbolLayerWidget(); - static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsSimpleLineSymbolLayerV2Widget( vl ); } + static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsSimpleLineSymbolLayerWidget( vl ); } // from base class virtual void setSymbolLayer( QgsSymbolLayer* layer ) override; @@ -156,7 +156,7 @@ class GUI_EXPORT QgsSimpleLineSymbolLayerV2Widget : public QgsSymbolLayerWidget, void on_mDrawInsideCheckBox_stateChanged( int state ); protected: - QgsSimpleLineSymbolLayerV2* mLayer; + QgsSimpleLineSymbolLayer* mLayer; //creates a new icon for the 'change pattern' button void updatePatternIcon(); @@ -167,7 +167,7 @@ class GUI_EXPORT QgsSimpleLineSymbolLayerV2Widget : public QgsSymbolLayerWidget, private: - QgsLineSymbolV2* mAssistantPreviewSymbol; + QgsLineSymbol* mAssistantPreviewSymbol; }; @@ -175,20 +175,20 @@ class GUI_EXPORT QgsSimpleLineSymbolLayerV2Widget : public QgsSymbolLayerWidget, #include "ui_widget_simplemarker.h" -class QgsSimpleMarkerSymbolLayerV2; +class QgsSimpleMarkerSymbolLayer; /** \ingroup gui - * \class QgsSimpleMarkerSymbolLayerV2Widget + * \class QgsSimpleMarkerSymbolLayerWidget */ -class GUI_EXPORT QgsSimpleMarkerSymbolLayerV2Widget : public QgsSymbolLayerWidget, private Ui::WidgetSimpleMarker +class GUI_EXPORT QgsSimpleMarkerSymbolLayerWidget : public QgsSymbolLayerWidget, private Ui::WidgetSimpleMarker { Q_OBJECT public: - QgsSimpleMarkerSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); - ~QgsSimpleMarkerSymbolLayerV2Widget(); + QgsSimpleMarkerSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); + ~QgsSimpleMarkerSymbolLayerWidget(); - static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsSimpleMarkerSymbolLayerV2Widget( vl ); } + static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsSimpleMarkerSymbolLayerWidget( vl ); } // from base class virtual void setSymbolLayer( QgsSymbolLayer* layer ) override; @@ -211,7 +211,7 @@ class GUI_EXPORT QgsSimpleMarkerSymbolLayerV2Widget : public QgsSymbolLayerWidge void on_mVerticalAnchorComboBox_currentIndexChanged( int index ); protected: - QgsSimpleMarkerSymbolLayerV2* mLayer; + QgsSimpleMarkerSymbolLayer* mLayer; private slots: @@ -220,26 +220,26 @@ class GUI_EXPORT QgsSimpleMarkerSymbolLayerV2Widget : public QgsSymbolLayerWidge private: - QgsMarkerSymbolV2* mAssistantPreviewSymbol; + QgsMarkerSymbol* mAssistantPreviewSymbol; }; /////////// #include "ui_widget_simplefill.h" -class QgsSimpleFillSymbolLayerV2; +class QgsSimpleFillSymbolLayer; /** \ingroup gui - * \class QgsSimpleFillSymbolLayerV2Widget + * \class QgsSimpleFillSymbolLayerWidget */ -class GUI_EXPORT QgsSimpleFillSymbolLayerV2Widget : public QgsSymbolLayerWidget, private Ui::WidgetSimpleFill +class GUI_EXPORT QgsSimpleFillSymbolLayerWidget : public QgsSymbolLayerWidget, private Ui::WidgetSimpleFill { Q_OBJECT public: - QgsSimpleFillSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); + QgsSimpleFillSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); - static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsSimpleFillSymbolLayerV2Widget( vl ); } + static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsSimpleFillSymbolLayerWidget( vl ); } // from base class virtual void setSymbolLayer( QgsSymbolLayer* layer ) override; @@ -256,7 +256,7 @@ class GUI_EXPORT QgsSimpleFillSymbolLayerV2Widget : public QgsSymbolLayerWidget, void on_mOffsetUnitWidget_changed(); protected: - QgsSimpleFillSymbolLayerV2* mLayer; + QgsSimpleFillSymbolLayer* mLayer; }; @@ -311,26 +311,26 @@ class GUI_EXPORT QgsFilledMarkerSymbolLayerWidget : public QgsSymbolLayerWidget, private: - QgsMarkerSymbolV2* mAssistantPreviewSymbol; + QgsMarkerSymbol* mAssistantPreviewSymbol; }; /////////// #include "ui_widget_gradientfill.h" -class QgsGradientFillSymbolLayerV2; +class QgsGradientFillSymbolLayer; /** \ingroup gui - * \class QgsGradientFillSymbolLayerV2Widget + * \class QgsGradientFillSymbolLayerWidget */ -class GUI_EXPORT QgsGradientFillSymbolLayerV2Widget : public QgsSymbolLayerWidget, private Ui::WidgetGradientFill +class GUI_EXPORT QgsGradientFillSymbolLayerWidget : public QgsSymbolLayerWidget, private Ui::WidgetGradientFill { Q_OBJECT public: - QgsGradientFillSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); + QgsGradientFillSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); - static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsGradientFillSymbolLayerV2Widget( vl ); } + static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsGradientFillSymbolLayerWidget( vl ); } // from base class virtual void setSymbolLayer( QgsSymbolLayer* layer ) override; @@ -350,26 +350,26 @@ class GUI_EXPORT QgsGradientFillSymbolLayerV2Widget : public QgsSymbolLayerWidge void on_mSpinAngle_valueChanged( double value ); protected: - QgsGradientFillSymbolLayerV2* mLayer; + QgsGradientFillSymbolLayer* mLayer; }; /////////// #include "ui_widget_shapeburstfill.h" -class QgsShapeburstFillSymbolLayerV2; +class QgsShapeburstFillSymbolLayer; /** \ingroup gui - * \class QgsShapeburstFillSymbolLayerV2Widget + * \class QgsShapeburstFillSymbolLayerWidget */ -class GUI_EXPORT QgsShapeburstFillSymbolLayerV2Widget : public QgsSymbolLayerWidget, private Ui::WidgetShapeburstFill +class GUI_EXPORT QgsShapeburstFillSymbolLayerWidget : public QgsSymbolLayerWidget, private Ui::WidgetShapeburstFill { Q_OBJECT public: - QgsShapeburstFillSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); + QgsShapeburstFillSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); - static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsShapeburstFillSymbolLayerV2Widget( vl ); } + static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsShapeburstFillSymbolLayerWidget( vl ); } // from base class virtual void setSymbolLayer( QgsSymbolLayer* layer ) override; @@ -389,26 +389,26 @@ class GUI_EXPORT QgsShapeburstFillSymbolLayerV2Widget : public QgsSymbolLayerWid void on_mIgnoreRingsCheckBox_stateChanged( int state ); protected: - QgsShapeburstFillSymbolLayerV2* mLayer; + QgsShapeburstFillSymbolLayer* mLayer; }; /////////// #include "ui_widget_markerline.h" -class QgsMarkerLineSymbolLayerV2; +class QgsMarkerLineSymbolLayer; /** \ingroup gui - * \class QgsMarkerLineSymbolLayerV2Widget + * \class QgsMarkerLineSymbolLayerWidget */ -class GUI_EXPORT QgsMarkerLineSymbolLayerV2Widget : public QgsSymbolLayerWidget, private Ui::WidgetMarkerLine +class GUI_EXPORT QgsMarkerLineSymbolLayerWidget : public QgsSymbolLayerWidget, private Ui::WidgetMarkerLine { Q_OBJECT public: - QgsMarkerLineSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); + QgsMarkerLineSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); - static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsMarkerLineSymbolLayerV2Widget( vl ); } + static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsMarkerLineSymbolLayerWidget( vl ); } // from base class virtual void setSymbolLayer( QgsSymbolLayer* layer ) override; @@ -427,7 +427,7 @@ class GUI_EXPORT QgsMarkerLineSymbolLayerV2Widget : public QgsSymbolLayerWidget, protected: - QgsMarkerLineSymbolLayerV2* mLayer; + QgsMarkerLineSymbolLayer* mLayer; }; @@ -435,20 +435,20 @@ class GUI_EXPORT QgsMarkerLineSymbolLayerV2Widget : public QgsSymbolLayerWidget, #include "ui_widget_svgmarker.h" -class QgsSvgMarkerSymbolLayerV2; +class QgsSvgMarkerSymbolLayer; /** \ingroup gui - * \class QgsSvgMarkerSymbolLayerV2Widget + * \class QgsSvgMarkerSymbolLayerWidget */ -class GUI_EXPORT QgsSvgMarkerSymbolLayerV2Widget : public QgsSymbolLayerWidget, private Ui::WidgetSvgMarker +class GUI_EXPORT QgsSvgMarkerSymbolLayerWidget : public QgsSymbolLayerWidget, private Ui::WidgetSvgMarker { Q_OBJECT public: - QgsSvgMarkerSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); - ~QgsSvgMarkerSymbolLayerV2Widget(); + QgsSvgMarkerSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); + ~QgsSvgMarkerSymbolLayerWidget(); - static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsSvgMarkerSymbolLayerV2Widget( vl ); } + static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsSvgMarkerSymbolLayerWidget( vl ); } // from base class virtual void setSymbolLayer( QgsSymbolLayer* layer ) override; @@ -476,9 +476,9 @@ class GUI_EXPORT QgsSvgMarkerSymbolLayerV2Widget : public 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 ); - QgsSvgMarkerSymbolLayerV2* mLayer; + QgsSvgMarkerSymbolLayer* mLayer; private slots: @@ -486,7 +486,7 @@ class GUI_EXPORT QgsSvgMarkerSymbolLayerV2Widget : public QgsSymbolLayerWidget, private: - QgsMarkerSymbolV2* mAssistantPreviewSymbol; + QgsMarkerSymbol* mAssistantPreviewSymbol; }; @@ -647,22 +647,22 @@ class GUI_EXPORT QgsPointPatternFillSymbolLayerWidget: public QgsSymbolLayerWidg #include "ui_widget_fontmarker.h" -class QgsFontMarkerSymbolLayerV2; +class QgsFontMarkerSymbolLayer; class CharacterWidget; /** \ingroup gui - * \class QgsFontMarkerSymbolLayerV2Widget + * \class QgsFontMarkerSymbolLayerWidget */ -class GUI_EXPORT QgsFontMarkerSymbolLayerV2Widget : public QgsSymbolLayerWidget, private Ui::WidgetFontMarker +class GUI_EXPORT QgsFontMarkerSymbolLayerWidget : public QgsSymbolLayerWidget, private Ui::WidgetFontMarker { Q_OBJECT public: - QgsFontMarkerSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); + QgsFontMarkerSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); - ~QgsFontMarkerSymbolLayerV2Widget(); + ~QgsFontMarkerSymbolLayerWidget(); - static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsFontMarkerSymbolLayerV2Widget( vl ); } + static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsFontMarkerSymbolLayerWidget( vl ); } // from base class virtual void setSymbolLayer( QgsSymbolLayer* layer ) override; @@ -687,7 +687,7 @@ class GUI_EXPORT QgsFontMarkerSymbolLayerV2Widget : public QgsSymbolLayerWidget, void on_mVerticalAnchorComboBox_currentIndexChanged( int index ); protected: - QgsFontMarkerSymbolLayerV2* mLayer; + QgsFontMarkerSymbolLayer* mLayer; CharacterWidget* widgetChar; private slots: @@ -697,7 +697,7 @@ class GUI_EXPORT QgsFontMarkerSymbolLayerV2Widget : public QgsSymbolLayerWidget, private: - QgsMarkerSymbolV2* mAssistantPreviewSymbol; + QgsMarkerSymbol* mAssistantPreviewSymbol; }; @@ -706,26 +706,26 @@ class GUI_EXPORT QgsFontMarkerSymbolLayerV2Widget : public QgsSymbolLayerWidget, #include "ui_widget_centroidfill.h" -class QgsCentroidFillSymbolLayerV2; +class QgsCentroidFillSymbolLayer; /** \ingroup gui - * \class QgsCentroidFillSymbolLayerV2Widget + * \class QgsCentroidFillSymbolLayerWidget */ -class GUI_EXPORT QgsCentroidFillSymbolLayerV2Widget : public QgsSymbolLayerWidget, private Ui::WidgetCentroidFill +class GUI_EXPORT QgsCentroidFillSymbolLayerWidget : public QgsSymbolLayerWidget, private Ui::WidgetCentroidFill { Q_OBJECT public: - QgsCentroidFillSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); + QgsCentroidFillSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent = nullptr ); - static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsCentroidFillSymbolLayerV2Widget( vl ); } + static QgsSymbolLayerWidget* create( const QgsVectorLayer* vl ) { return new QgsCentroidFillSymbolLayerWidget( vl ); } // from base class virtual void setSymbolLayer( QgsSymbolLayer* layer ) override; virtual QgsSymbolLayer* symbolLayer() override; protected: - QgsCentroidFillSymbolLayerV2* mLayer; + QgsCentroidFillSymbolLayer* mLayer; private slots: void on_mDrawInsideCheckBox_stateChanged( int state ); @@ -769,7 +769,7 @@ class QgsSvgGroupsModel : public QStandardItemModel #include "ui_qgsgeometrygeneratorwidgetbase.h" -class QgsGeometryGeneratorSymbolLayerV2; +class QgsGeometryGeneratorSymbolLayer; /** \ingroup gui * \class QgsGeometryGeneratorSymbolLayerWidget @@ -791,7 +791,7 @@ class GUI_EXPORT QgsGeometryGeneratorSymbolLayerWidget : public QgsSymbolLayerWi virtual QgsSymbolLayer* symbolLayer() override; private: - QgsGeometryGeneratorSymbolLayerV2* mLayer; + QgsGeometryGeneratorSymbolLayer* mLayer; private slots: void updateExpression(); diff --git a/src/gui/symbology-ng/qgssymbollevelsdialog.h b/src/gui/symbology-ng/qgssymbollevelsdialog.h index ad425f81dd9..d4282a74a2f 100644 --- a/src/gui/symbology-ng/qgssymbollevelsdialog.h +++ b/src/gui/symbology-ng/qgssymbollevelsdialog.h @@ -19,7 +19,7 @@ #include #include -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "ui_qgssymbollevelsdialogbase.h" diff --git a/src/gui/symbology-ng/qgssymbolselectordialog.cpp b/src/gui/symbology-ng/qgssymbolselectordialog.cpp index b179fa80b72..6bb47cb6b38 100644 --- a/src/gui/symbology-ng/qgssymbolselectordialog.cpp +++ b/src/gui/symbology-ng/qgssymbolselectordialog.cpp @@ -15,7 +15,7 @@ #include "qgssymbolselectordialog.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgssymbol.h" #include "qgssymbollayer.h" #include "qgssymbollayerutils.h" @@ -26,7 +26,7 @@ #include "qgssymbolslistwidget.h" #include "qgslayerpropertieswidget.h" #include "qgssymbollayerwidget.h" -#include "qgsellipsesymbollayerv2widget.h" +#include "qgsellipsesymbollayerwidget.h" #include "qgsvectorfieldsymbollayerwidget.h" #include "qgslogger.h" @@ -57,8 +57,8 @@ DataDefinedRestorer::DataDefinedRestorer( QgsSymbol* symbol, const QgsSymbolLaye if ( symbolLayer->type() == QgsSymbol::Marker && symbol->type() == QgsSymbol::Marker ) { Q_ASSERT( symbol->type() == QgsSymbol::Marker ); - mMarker = static_cast( symbol ); - mMarkerSymbolLayer = static_cast( symbolLayer ); + mMarker = static_cast( symbol ); + mMarkerSymbolLayer = static_cast( symbolLayer ); mDDSize = mMarker->dataDefinedSize(); mDDAngle = mMarker->dataDefinedAngle(); // check if restore is actually needed @@ -67,8 +67,8 @@ DataDefinedRestorer::DataDefinedRestorer( QgsSymbol* symbol, const QgsSymbolLaye } else if ( symbolLayer->type() == QgsSymbol::Line && symbol->type() == QgsSymbol::Line ) { - mLine = static_cast( symbol ); - mLineSymbolLayer = static_cast( symbolLayer ); + mLine = static_cast( symbol ); + mLineSymbolLayer = static_cast( symbolLayer ); mDDWidth = mLine->dataDefinedWidth(); // check if restore is actually needed if ( mDDWidth == QgsDataDefined() ) @@ -208,7 +208,7 @@ class SymbolLayerItem : public QStandardItem ////////// -QgsSymbolSelectorWidget::QgsSymbolSelectorWidget( QgsSymbol* symbol, QgsStyleV2* style, const QgsVectorLayer* vl, QWidget* parent ) +QgsSymbolSelectorWidget::QgsSymbolSelectorWidget( QgsSymbol* symbol, QgsStyle* style, const QgsVectorLayer* vl, QWidget* parent ) : QgsPanelWidget( parent ) , mAdvancedMenu( nullptr ) , mVectorLayer( vl ) @@ -505,13 +505,13 @@ void QgsSymbolSelectorWidget::addLayer() // save data-defined values at marker level QgsDataDefined ddSize = parentSymbol->type() == QgsSymbol::Marker - ? static_cast( parentSymbol )->dataDefinedSize() + ? static_cast( parentSymbol )->dataDefinedSize() : QgsDataDefined(); QgsDataDefined ddAngle = parentSymbol->type() == QgsSymbol::Marker - ? static_cast( parentSymbol )->dataDefinedAngle() + ? static_cast( parentSymbol )->dataDefinedAngle() : QgsDataDefined(); QgsDataDefined ddWidth = parentSymbol->type() == QgsSymbol::Line - ? static_cast( parentSymbol )->dataDefinedWidth() + ? static_cast( parentSymbol )->dataDefinedWidth() : QgsDataDefined() ; QgsSymbolLayer* newLayer = QgsSymbolLayerRegistry::instance()->defaultSymbolLayer( parentSymbol->type() ); @@ -522,11 +522,11 @@ void QgsSymbolSelectorWidget::addLayer() // restore data-defined values at marker level if ( ddSize != QgsDataDefined() ) - static_cast( parentSymbol )->setDataDefinedSize( ddSize ); + static_cast( parentSymbol )->setDataDefinedSize( ddSize ); if ( ddAngle != QgsDataDefined() ) - static_cast( parentSymbol )->setDataDefinedAngle( ddAngle ); + static_cast( parentSymbol )->setDataDefinedAngle( ddAngle ); if ( ddWidth != QgsDataDefined() ) - static_cast( parentSymbol )->setDataDefinedWidth( ddWidth ); + static_cast( parentSymbol )->setDataDefinedWidth( ddWidth ); SymbolLayerItem *newLayerItem = new SymbolLayerItem( newLayer ); item->insertRow( insertIdx == -1 ? 0 : insertIdx, newLayerItem ); @@ -698,7 +698,7 @@ void QgsSymbolSelectorWidget::changeLayer( QgsSymbolLayer* newLayer ) layerChanged(); } -QgsSymbolSelectorDialog::QgsSymbolSelectorDialog( QgsSymbol *symbol, QgsStyleV2 *style, const QgsVectorLayer *vl, QWidget *parent, bool embedded ) +QgsSymbolSelectorDialog::QgsSymbolSelectorDialog( QgsSymbol *symbol, QgsStyle *style, const QgsVectorLayer *vl, QWidget *parent, bool embedded ) : QDialog( parent ) { setLayout( new QVBoxLayout() ); diff --git a/src/gui/symbology-ng/qgssymbolselectordialog.h b/src/gui/symbology-ng/qgssymbolselectordialog.h index 4b79852c322..bb78bd546a6 100644 --- a/src/gui/symbology-ng/qgssymbolselectordialog.h +++ b/src/gui/symbology-ng/qgssymbolselectordialog.h @@ -27,7 +27,7 @@ #include #include -class QgsStyleV2; +class QgsStyle; class QgsSymbol; class QgsSymbolLayer; class QgsVectorLayer; @@ -36,10 +36,10 @@ class QMenu; class QWidget; class SymbolLayerItem; -class QgsMarkerSymbolV2; -class QgsLineSymbolV2; -class QgsMarkerSymbolLayerV2; -class QgsLineSymbolLayerV2; +class QgsMarkerSymbol; +class QgsLineSymbol; +class QgsMarkerSymbolLayer; +class QgsLineSymbolLayer; class QgsMapCanvas; @@ -55,16 +55,16 @@ class DataDefinedRestorer: public QObject void restore(); private: - QgsMarkerSymbolV2* mMarker; - const QgsMarkerSymbolLayerV2* mMarkerSymbolLayer; + QgsMarkerSymbol* mMarker; + const QgsMarkerSymbolLayer* mMarkerSymbolLayer; double mSize; double mAngle; QPointF mMarkerOffset; QgsDataDefined mDDSize; QgsDataDefined mDDAngle; - QgsLineSymbolV2* mLine; - const QgsLineSymbolLayerV2* mLineSymbolLayer; + QgsLineSymbol* mLine; + const QgsLineSymbolLayer* mLineSymbolLayer; double mWidth; double mLineOffset; QgsDataDefined mDDWidth; @@ -92,7 +92,7 @@ class GUI_EXPORT QgsSymbolSelectorWidget: public QgsPanelWidget, private Ui::Qgs * @param vl The vector layer for the symbol. * @param parent */ - QgsSymbolSelectorWidget( QgsSymbol* symbol, QgsStyleV2* style, const QgsVectorLayer* vl, QWidget* parent = nullptr ); + QgsSymbolSelectorWidget( QgsSymbol* symbol, QgsStyle* style, const QgsVectorLayer* vl, QWidget* parent = nullptr ); ~QgsSymbolSelectorWidget(); //! return menu for "advanced" button - create it if doesn't exist and show the advanced button @@ -239,7 +239,7 @@ class GUI_EXPORT QgsSymbolSelectorWidget: public QgsPanelWidget, private Ui::Qgs protected: // data - QgsStyleV2* mStyle; + QgsStyle* mStyle; QgsSymbol* mSymbol; QMenu* mAdvancedMenu; const QgsVectorLayer* mVectorLayer; @@ -262,7 +262,7 @@ class GUI_EXPORT QgsSymbolSelectorDialog : public QDialog Q_OBJECT public: - QgsSymbolSelectorDialog( QgsSymbol* symbol, QgsStyleV2* style, const QgsVectorLayer* vl, QWidget* parent = nullptr, bool embedded = false ); + QgsSymbolSelectorDialog( QgsSymbol* symbol, QgsStyle* style, const QgsVectorLayer* vl, QWidget* parent = nullptr, bool embedded = false ); ~QgsSymbolSelectorDialog(); //! return menu for "advanced" button - create it if doesn't exist and show the advanced button diff --git a/src/gui/symbology-ng/qgssymbolslistwidget.cpp b/src/gui/symbology-ng/qgssymbolslistwidget.cpp index fcda659f3de..59615129f70 100644 --- a/src/gui/symbology-ng/qgssymbolslistwidget.cpp +++ b/src/gui/symbology-ng/qgssymbolslistwidget.cpp @@ -18,13 +18,13 @@ #include "qgssizescalewidget.h" -#include "qgsstylev2managerdialog.h" +#include "qgsstylemanagerdialog.h" #include "qgsdatadefined.h" #include "qgssymbol.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" #include "qgssymbollayerutils.h" -#include "qgsmarkersymbollayerv2.h" +#include "qgsmarkersymbollayer.h" #include "qgsmapcanvas.h" #include "qgsapplication.h" #include "qgsvectorlayer.h" @@ -41,7 +41,7 @@ #include -QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbol* symbol, QgsStyleV2* style, QMenu* menu, QWidget* parent, const QgsVectorLayer * layer ) +QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbol* symbol, QgsStyle* style, QMenu* menu, QWidget* parent, const QgsVectorLayer * layer ) : QWidget( parent ) , mSymbol( symbol ) , mStyle( style ) @@ -219,7 +219,7 @@ void QgsSymbolsListWidget::populateSymbols( const QStringList& names ) void QgsSymbolsListWidget::openStyleManager() { - QgsStyleV2ManagerDialog dlg( mStyle, this ); + QgsStyleManagerDialog dlg( mStyle, this ); dlg.exec(); populateSymbolView(); @@ -242,7 +242,7 @@ void QgsSymbolsListWidget::setSymbolColor( const QColor& color ) void QgsSymbolsListWidget::setMarkerAngle( double angle ) { - QgsMarkerSymbolV2* markerSymbol = static_cast( mSymbol ); + QgsMarkerSymbol* markerSymbol = static_cast( mSymbol ); if ( markerSymbol->angle() == angle ) return; markerSymbol->setAngle( angle ); @@ -251,7 +251,7 @@ void QgsSymbolsListWidget::setMarkerAngle( double angle ) void QgsSymbolsListWidget::updateDataDefinedMarkerAngle() { - QgsMarkerSymbolV2* markerSymbol = static_cast( mSymbol ); + QgsMarkerSymbol* markerSymbol = static_cast( mSymbol ); QgsDataDefined dd = mRotationDDBtn->currentDataDefined(); spinAngle->setEnabled( !mRotationDDBtn->isActive() ); @@ -270,7 +270,7 @@ void QgsSymbolsListWidget::updateDataDefinedMarkerAngle() void QgsSymbolsListWidget::setMarkerSize( double size ) { - QgsMarkerSymbolV2* markerSymbol = static_cast( mSymbol ); + QgsMarkerSymbol* markerSymbol = static_cast( mSymbol ); if ( markerSymbol->size() == size ) return; markerSymbol->setSize( size ); @@ -279,7 +279,7 @@ void QgsSymbolsListWidget::setMarkerSize( double size ) void QgsSymbolsListWidget::updateDataDefinedMarkerSize() { - QgsMarkerSymbolV2* markerSymbol = static_cast( mSymbol ); + QgsMarkerSymbol* markerSymbol = static_cast( mSymbol ); QgsDataDefined dd = mSizeDDBtn->currentDataDefined(); spinSize->setEnabled( !mSizeDDBtn->isActive() ); @@ -299,7 +299,7 @@ void QgsSymbolsListWidget::updateDataDefinedMarkerSize() void QgsSymbolsListWidget::setLineWidth( double width ) { - QgsLineSymbolV2* lineSymbol = static_cast( mSymbol ); + QgsLineSymbol* lineSymbol = static_cast( mSymbol ); if ( lineSymbol->width() == width ) return; lineSymbol->setWidth( width ); @@ -308,7 +308,7 @@ void QgsSymbolsListWidget::setLineWidth( double width ) void QgsSymbolsListWidget::updateDataDefinedLineWidth() { - QgsLineSymbolV2* lineSymbol = static_cast( mSymbol ); + QgsLineSymbol* lineSymbol = static_cast( mSymbol ); QgsDataDefined dd = mWidthDDBtn->currentDataDefined(); spinWidth->setEnabled( !mWidthDDBtn->isActive() ); @@ -466,7 +466,7 @@ void QgsSymbolsListWidget::updateSymbolInfo() if ( mSymbol->type() == QgsSymbol::Marker ) { - QgsMarkerSymbolV2* markerSymbol = static_cast( mSymbol ); + QgsMarkerSymbol* markerSymbol = static_cast( mSymbol ); spinSize->setValue( markerSymbol->size() ); spinAngle->setValue( markerSymbol->angle() ); @@ -487,7 +487,7 @@ void QgsSymbolsListWidget::updateSymbolInfo() } else if ( mSymbol->type() == QgsSymbol::Line ) { - QgsLineSymbolV2* lineSymbol = static_cast( mSymbol ); + QgsLineSymbol* lineSymbol = static_cast( mSymbol ); spinWidth->setValue( lineSymbol->width() ); if ( mLayer ) @@ -569,12 +569,12 @@ void QgsSymbolsListWidget::on_groupsCombo_currentIndexChanged( int index ) if ( groupsCombo->itemData( index ).toString() == "smart" ) { groupid = mStyle->smartgroupId( text ); - symbols = mStyle->symbolsOfSmartgroup( QgsStyleV2::SymbolEntity, groupid ); + symbols = mStyle->symbolsOfSmartgroup( QgsStyle::SymbolEntity, groupid ); } else { groupid = groupsCombo->itemData( index ).toInt(); - symbols = mStyle->symbolsOfGroup( QgsStyleV2::SymbolEntity, groupid ); + symbols = mStyle->symbolsOfGroup( QgsStyle::SymbolEntity, groupid ); } } populateSymbols( symbols ); @@ -582,6 +582,6 @@ void QgsSymbolsListWidget::on_groupsCombo_currentIndexChanged( int index ) void QgsSymbolsListWidget::on_groupsCombo_editTextChanged( const QString &text ) { - QStringList symbols = mStyle->findSymbols( QgsStyleV2::SymbolEntity, text ); + QStringList symbols = mStyle->findSymbols( QgsStyle::SymbolEntity, text ); populateSymbols( symbols ); } diff --git a/src/gui/symbology-ng/qgssymbolslistwidget.h b/src/gui/symbology-ng/qgssymbolslistwidget.h index 1661b17dffd..f8ac59973bb 100644 --- a/src/gui/symbology-ng/qgssymbolslistwidget.h +++ b/src/gui/symbology-ng/qgssymbolslistwidget.h @@ -21,7 +21,7 @@ #include class QgsSymbol; -class QgsStyleV2; +class QgsStyle; class QMenu; @@ -33,7 +33,7 @@ class GUI_EXPORT QgsSymbolsListWidget : public QWidget, private Ui::SymbolsListW Q_OBJECT public: - QgsSymbolsListWidget( QgsSymbol* symbol, QgsStyleV2* style, QMenu* menu, QWidget* parent, const QgsVectorLayer * layer = nullptr ); + QgsSymbolsListWidget( QgsSymbol* symbol, QgsStyle* style, QMenu* menu, QWidget* parent, const QgsVectorLayer * layer = nullptr ); //! Destructor virtual ~QgsSymbolsListWidget(); @@ -103,7 +103,7 @@ class GUI_EXPORT QgsSymbolsListWidget : public QWidget, private Ui::SymbolsListW protected: QgsSymbol* mSymbol; - QgsStyleV2* mStyle; + QgsStyle* mStyle; QMenu* mAdvancedMenu; QAction* mClipFeaturesAction; const QgsVectorLayer* mLayer; diff --git a/src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp b/src/gui/symbology-ng/qgsvectorcolorbrewercolorrampdialog.cpp similarity index 78% rename from src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp rename to src/gui/symbology-ng/qgsvectorcolorbrewercolorrampdialog.cpp index 634a53422c2..8be5fcafb45 100644 --- a/src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp +++ b/src/gui/symbology-ng/qgsvectorcolorbrewercolorrampdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsvectorcolorbrewercolorrampv2dialog.cpp + qgsvectorcolorbrewercolorrampdialog.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -13,9 +13,9 @@ * * ***************************************************************************/ -#include "qgsvectorcolorbrewercolorrampv2dialog.h" +#include "qgsvectorcolorbrewercolorrampdialog.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgssymbollayerutils.h" #include @@ -31,7 +31,7 @@ static void updateColorButton( QAbstractButton* button, QColor color ) ///////// -QgsVectorColorBrewerColorRampV2Dialog::QgsVectorColorBrewerColorRampV2Dialog( QgsVectorColorBrewerColorRampV2* ramp, QWidget* parent ) +QgsVectorColorBrewerColorRampDialog::QgsVectorColorBrewerColorRampDialog( QgsVectorColorBrewerColorRamp* ramp, QWidget* parent ) : QDialog( parent ) , mRamp( ramp ) { @@ -41,11 +41,11 @@ QgsVectorColorBrewerColorRampV2Dialog::QgsVectorColorBrewerColorRampV2Dialog( Qg QSize iconSize( 50, 16 ); cboSchemeName->setIconSize( iconSize ); - QStringList schemes = QgsVectorColorBrewerColorRampV2::listSchemeNames(); + QStringList schemes = QgsVectorColorBrewerColorRamp::listSchemeNames(); Q_FOREACH ( const QString& schemeName, schemes ) { // create a preview icon using five color variant - QgsVectorColorBrewerColorRampV2* r = new QgsVectorColorBrewerColorRampV2( schemeName, 5 ); + QgsVectorColorBrewerColorRamp* r = new QgsVectorColorBrewerColorRamp( schemeName, 5 ); QIcon icon = QgsSymbolLayerUtils::colorRampPreviewIcon( r, iconSize ); delete r; cboSchemeName->addItem( icon, schemeName ); @@ -61,13 +61,13 @@ QgsVectorColorBrewerColorRampV2Dialog::QgsVectorColorBrewerColorRampV2Dialog( Qg updatePreview(); } -void QgsVectorColorBrewerColorRampV2Dialog::populateVariants() +void QgsVectorColorBrewerColorRampDialog::populateVariants() { QString oldVariant = cboColors->currentText(); cboColors->clear(); QString schemeName = cboSchemeName->currentText(); - QList variants = QgsVectorColorBrewerColorRampV2::listSchemeVariants( schemeName ); + QList variants = QgsVectorColorBrewerColorRamp::listSchemeVariants( schemeName ); Q_FOREACH ( int variant, variants ) { cboColors->addItem( QString::number( variant ) ); @@ -83,13 +83,13 @@ void QgsVectorColorBrewerColorRampV2Dialog::populateVariants() cboColors->setCurrentIndex( idx ); } -void QgsVectorColorBrewerColorRampV2Dialog::updatePreview() +void QgsVectorColorBrewerColorRampDialog::updatePreview() { QSize size( 300, 40 ); lblPreview->setPixmap( QgsSymbolLayerUtils::colorRampPreviewPixmap( mRamp, size ) ); } -void QgsVectorColorBrewerColorRampV2Dialog::setSchemeName() +void QgsVectorColorBrewerColorRampDialog::setSchemeName() { // populate list of variants populateVariants(); @@ -98,7 +98,7 @@ void QgsVectorColorBrewerColorRampV2Dialog::setSchemeName() updatePreview(); } -void QgsVectorColorBrewerColorRampV2Dialog::setColors() +void QgsVectorColorBrewerColorRampDialog::setColors() { int num = cboColors->currentText().toInt(); mRamp->setColors( num ); diff --git a/src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.h b/src/gui/symbology-ng/qgsvectorcolorbrewercolorrampdialog.h similarity index 75% rename from src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.h rename to src/gui/symbology-ng/qgsvectorcolorbrewercolorrampdialog.h index 36a73aad6ea..943cd1fdda3 100644 --- a/src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.h +++ b/src/gui/symbology-ng/qgsvectorcolorbrewercolorrampdialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsvectorcolorbrewercolorrampv2dialog.h + qgsvectorcolorbrewercolorrampdialog.h --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -20,17 +20,17 @@ #include "ui_qgsvectorcolorbrewercolorrampv2dialogbase.h" -class QgsVectorColorBrewerColorRampV2; +class QgsVectorColorBrewerColorRamp; /** \ingroup gui - * \class QgsVectorColorBrewerColorRampV2Dialog + * \class QgsVectorColorBrewerColorRampDialog */ -class GUI_EXPORT QgsVectorColorBrewerColorRampV2Dialog : public QDialog, private Ui::QgsVectorColorBrewerColorRampV2DialogBase +class GUI_EXPORT QgsVectorColorBrewerColorRampDialog : public QDialog, private Ui::QgsVectorColorBrewerColorRampDialogBase { Q_OBJECT public: - QgsVectorColorBrewerColorRampV2Dialog( QgsVectorColorBrewerColorRampV2* ramp, QWidget* parent = nullptr ); + QgsVectorColorBrewerColorRampDialog( QgsVectorColorBrewerColorRamp* ramp, QWidget* parent = nullptr ); public slots: void setSchemeName(); @@ -42,7 +42,7 @@ class GUI_EXPORT QgsVectorColorBrewerColorRampV2Dialog : public QDialog, private void updatePreview(); - QgsVectorColorBrewerColorRampV2* mRamp; + QgsVectorColorBrewerColorRamp* mRamp; }; #endif diff --git a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp b/src/gui/symbology-ng/qgsvectorgradientcolorrampdialog.cpp similarity index 91% rename from src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp rename to src/gui/symbology-ng/qgsvectorgradientcolorrampdialog.cpp index b70926d2bdd..f5b075b89df 100644 --- a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp +++ b/src/gui/symbology-ng/qgsvectorgradientcolorrampdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsvectorgradientcolorrampv2dialog.cpp + qgsvectorgradientcolorrampdialog.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -13,9 +13,9 @@ * * ***************************************************************************/ -#include "qgsvectorgradientcolorrampv2dialog.h" +#include "qgsvectorgradientcolorrampdialog.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgsdialog.h" #include "qgscolordialog.h" #include "qgscptcityarchive.h" @@ -40,7 +40,7 @@ #include #include -QgsVectorGradientColorRampV2Dialog::QgsVectorGradientColorRampV2Dialog( QgsVectorGradientColorRampV2* ramp, QWidget* parent ) +QgsVectorGradientColorRampDialog::QgsVectorGradientColorRampDialog( QgsVectorGradientColorRamp* ramp, QWidget* parent ) : QDialog( parent ) , mRamp( ramp ) , mCurrentPlotColorComponent( -1 ) @@ -144,7 +144,7 @@ QgsVectorGradientColorRampV2Dialog::QgsVectorGradientColorRampV2Dialog( QgsVecto mStopEditor->selectStop( 0 ); } -QgsVectorGradientColorRampV2Dialog::~QgsVectorGradientColorRampV2Dialog() +QgsVectorGradientColorRampDialog::~QgsVectorGradientColorRampDialog() { QSettings settings; settings.setValue( "/Windows/GradientEditor/geometry", saveGeometry() ); @@ -155,7 +155,7 @@ QgsVectorGradientColorRampV2Dialog::~QgsVectorGradientColorRampV2Dialog() } -void QgsVectorGradientColorRampV2Dialog::on_cboType_currentIndexChanged( int index ) +void QgsVectorGradientColorRampDialog::on_cboType_currentIndexChanged( int index ) { if (( index == 0 && mRamp->isDiscrete() ) || ( index == 1 && !mRamp->isDiscrete() ) ) @@ -166,7 +166,7 @@ void QgsVectorGradientColorRampV2Dialog::on_cboType_currentIndexChanged( int ind updatePlot(); } -void QgsVectorGradientColorRampV2Dialog::on_btnInformation_pressed() +void QgsVectorGradientColorRampDialog::on_btnInformation_pressed() { if ( mRamp->info().isEmpty() ) return; @@ -252,7 +252,7 @@ void QgsVectorGradientColorRampV2Dialog::on_btnInformation_pressed() dlg->show(); //non modal } -void QgsVectorGradientColorRampV2Dialog::updateColorButtons() +void QgsVectorGradientColorRampDialog::updateColorButtons() { btnColor1->blockSignals( true ); btnColor1->setColor( mRamp->color1() ); @@ -262,14 +262,14 @@ void QgsVectorGradientColorRampV2Dialog::updateColorButtons() btnColor2->blockSignals( false ); } -void QgsVectorGradientColorRampV2Dialog::updateStopEditor() +void QgsVectorGradientColorRampDialog::updateStopEditor() { mStopEditor->blockSignals( true ); mStopEditor->setGradientRamp( *mRamp ); mStopEditor->blockSignals( false ); } -void QgsVectorGradientColorRampV2Dialog::selectedStopChanged( const QgsGradientStop& stop ) +void QgsVectorGradientColorRampDialog::selectedStopChanged( const QgsGradientStop& stop ) { mColorWidget->blockSignals( true ); mColorWidget->setColor( stop.color ); @@ -293,41 +293,41 @@ void QgsVectorGradientColorRampV2Dialog::selectedStopChanged( const QgsGradientS updatePlot(); } -void QgsVectorGradientColorRampV2Dialog::colorWidgetChanged( const QColor &color ) +void QgsVectorGradientColorRampDialog::colorWidgetChanged( const QColor &color ) { mStopEditor->setSelectedStopColor( color ); } -void QgsVectorGradientColorRampV2Dialog::on_mPositionSpinBox_valueChanged( double val ) +void QgsVectorGradientColorRampDialog::on_mPositionSpinBox_valueChanged( double val ) { mStopEditor->setSelectedStopOffset( val / 100.0 ); } -void QgsVectorGradientColorRampV2Dialog::on_mPlotHueCheckbox_toggled( bool checked ) +void QgsVectorGradientColorRampDialog::on_mPlotHueCheckbox_toggled( bool checked ) { mHueCurve->setVisible( checked ); updatePlot(); } -void QgsVectorGradientColorRampV2Dialog::on_mPlotLightnessCheckbox_toggled( bool checked ) +void QgsVectorGradientColorRampDialog::on_mPlotLightnessCheckbox_toggled( bool checked ) { mLightnessCurve->setVisible( checked ); updatePlot(); } -void QgsVectorGradientColorRampV2Dialog::on_mPlotSaturationCheckbox_toggled( bool checked ) +void QgsVectorGradientColorRampDialog::on_mPlotSaturationCheckbox_toggled( bool checked ) { mSaturationCurve->setVisible( checked ); updatePlot(); } -void QgsVectorGradientColorRampV2Dialog::on_mPlotAlphaCheckbox_toggled( bool checked ) +void QgsVectorGradientColorRampDialog::on_mPlotAlphaCheckbox_toggled( bool checked ) { mAlphaCurve->setVisible( checked ); updatePlot(); } -void QgsVectorGradientColorRampV2Dialog::plotMousePress( QPointF point ) +void QgsVectorGradientColorRampDialog::plotMousePress( QPointF point ) { //find closest part @@ -404,12 +404,12 @@ void QgsVectorGradientColorRampV2Dialog::plotMousePress( QPointF point ) mStopEditor->selectStop( mCurrentPlotMarkerIndex ); } -void QgsVectorGradientColorRampV2Dialog::plotMouseRelease( QPointF ) +void QgsVectorGradientColorRampDialog::plotMouseRelease( QPointF ) { mCurrentPlotColorComponent = -1; } -void QgsVectorGradientColorRampV2Dialog::plotMouseMove( QPointF point ) +void QgsVectorGradientColorRampDialog::plotMouseMove( QPointF point ) { QColor newColor = mStopEditor->selectedStop().color; @@ -430,7 +430,7 @@ bool byX( QPointF p1, QPointF p2 ) return p1.x() < p2.x(); } -void QgsVectorGradientColorRampV2Dialog::addPlotMarker( double x, double y, const QColor& color, bool isSelected ) +void QgsVectorGradientColorRampDialog::addPlotMarker( double x, double y, const QColor& color, bool isSelected ) { QColor borderColor = color.darker( 200 ); borderColor.setAlpha( 255 ); @@ -450,7 +450,7 @@ void QgsVectorGradientColorRampV2Dialog::addPlotMarker( double x, double y, cons mMarkers << marker; } -void QgsVectorGradientColorRampV2Dialog::addMarkersForColor( double x, const QColor& color, bool isSelected ) +void QgsVectorGradientColorRampDialog::addMarkersForColor( double x, const QColor& color, bool isSelected ) { if ( mPlotHueCheckbox->isChecked() ) addPlotMarker( x, color.hslHueF(), color, isSelected && mCurrentPlotColorComponent == 0 ); @@ -462,7 +462,7 @@ void QgsVectorGradientColorRampV2Dialog::addMarkersForColor( double x, const QCo addPlotMarker( x, color.alphaF(), color, isSelected && mCurrentPlotColorComponent == 3 ); } -void QgsVectorGradientColorRampV2Dialog::updatePlot() +void QgsVectorGradientColorRampDialog::updatePlot() { // remove existing markers Q_FOREACH ( QwtPlotMarker* marker, mMarkers ) @@ -529,7 +529,7 @@ void QgsVectorGradientColorRampV2Dialog::updatePlot() mPlot->replot(); } -void QgsVectorGradientColorRampV2Dialog::updateRampFromStopEditor() +void QgsVectorGradientColorRampDialog::updateRampFromStopEditor() { *mRamp = mStopEditor->gradientRamp(); mPositionSpinBox->blockSignals( true ); @@ -543,13 +543,13 @@ void QgsVectorGradientColorRampV2Dialog::updateRampFromStopEditor() updatePlot(); } -void QgsVectorGradientColorRampV2Dialog::setColor1( const QColor& color ) +void QgsVectorGradientColorRampDialog::setColor1( const QColor& color ) { mStopEditor->setColor1( color ); updateColorButtons(); } -void QgsVectorGradientColorRampV2Dialog::setColor2( const QColor& color ) +void QgsVectorGradientColorRampDialog::setColor2( const QColor& color ) { mStopEditor->setColor2( color ); updateColorButtons(); diff --git a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.h b/src/gui/symbology-ng/qgsvectorgradientcolorrampdialog.h similarity index 87% rename from src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.h rename to src/gui/symbology-ng/qgsvectorgradientcolorrampdialog.h index ecb0c74bc59..168139a7705 100644 --- a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.h +++ b/src/gui/symbology-ng/qgsvectorgradientcolorrampdialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsvectorgradientcolorrampv2dialog.h + qgsvectorgradientcolorrampdialog.h --------------------- begin : December 2009 copyright : (C) 2009 by Martin Dobias @@ -20,22 +20,22 @@ #include "ui_qgsvectorgradientcolorrampv2dialogbase.h" -class QgsVectorGradientColorRampV2; +class QgsVectorGradientColorRamp; class QwtPlot; class QwtPlotCurve; class QwtPlotMarker; class QgsGradientPlotEventFilter; /** \ingroup gui - * \class QgsVectorGradientColorRampV2Dialog + * \class QgsVectorGradientColorRampDialog */ -class GUI_EXPORT QgsVectorGradientColorRampV2Dialog : public QDialog, private Ui::QgsVectorGradientColorRampV2DialogBase +class GUI_EXPORT QgsVectorGradientColorRampDialog : public QDialog, private Ui::QgsVectorGradientColorRampDialogBase { Q_OBJECT public: - QgsVectorGradientColorRampV2Dialog( QgsVectorGradientColorRampV2* ramp, QWidget* parent = nullptr ); - ~QgsVectorGradientColorRampV2Dialog(); + QgsVectorGradientColorRampDialog( QgsVectorGradientColorRamp* ramp, QWidget* parent = nullptr ); + ~QgsVectorGradientColorRampDialog(); public slots: void setColor1( const QColor& color ); @@ -46,7 +46,7 @@ class GUI_EXPORT QgsVectorGradientColorRampV2Dialog : public QDialog, private Ui void on_btnInformation_pressed(); protected: - QgsVectorGradientColorRampV2* mRamp; + QgsVectorGradientColorRamp* mRamp; private slots: diff --git a/src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp b/src/gui/symbology-ng/qgsvectorrandomcolorrampdialog.cpp similarity index 77% rename from src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp rename to src/gui/symbology-ng/qgsvectorrandomcolorrampdialog.cpp index 5cb3fa9632d..1e2aa7b52db 100644 --- a/src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.cpp +++ b/src/gui/symbology-ng/qgsvectorrandomcolorrampdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsvectorrandomcolorrampv2dialog.cpp + qgsvectorrandomcolorrampdialog.cpp --------------------- begin : November 2009 copyright : (C) 2009 by Martin Dobias @@ -13,15 +13,15 @@ * * ***************************************************************************/ -#include "qgsvectorrandomcolorrampv2dialog.h" +#include "qgsvectorrandomcolorrampdialog.h" #include "qgssymbollayerutils.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include -QgsVectorRandomColorRampV2Dialog::QgsVectorRandomColorRampV2Dialog( QgsVectorRandomColorRampV2* ramp, QWidget* parent ) +QgsVectorRandomColorRampDialog::QgsVectorRandomColorRampDialog( QgsVectorRandomColorRamp* ramp, QWidget* parent ) : QDialog( parent ) , mRamp( ramp ) { @@ -46,7 +46,7 @@ QgsVectorRandomColorRampV2Dialog::QgsVectorRandomColorRampV2Dialog( QgsVectorRan updatePreview(); } -void QgsVectorRandomColorRampV2Dialog::updatePreview() +void QgsVectorRandomColorRampDialog::updatePreview() { mRamp->updateColors(); @@ -54,43 +54,43 @@ void QgsVectorRandomColorRampV2Dialog::updatePreview() lblPreview->setPixmap( QgsSymbolLayerUtils::colorRampPreviewPixmap( mRamp, size ) ); } -void QgsVectorRandomColorRampV2Dialog::setCount( int val ) +void QgsVectorRandomColorRampDialog::setCount( int val ) { mRamp->setCount( val ); updatePreview(); } -void QgsVectorRandomColorRampV2Dialog::setHue1( int val ) +void QgsVectorRandomColorRampDialog::setHue1( int val ) { mRamp->setHueMin( val ); updatePreview(); } -void QgsVectorRandomColorRampV2Dialog::setHue2( int val ) +void QgsVectorRandomColorRampDialog::setHue2( int val ) { mRamp->setHueMax( val ); updatePreview(); } -void QgsVectorRandomColorRampV2Dialog::setSat1( int val ) +void QgsVectorRandomColorRampDialog::setSat1( int val ) { mRamp->setSatMin( val ); updatePreview(); } -void QgsVectorRandomColorRampV2Dialog::setSat2( int val ) +void QgsVectorRandomColorRampDialog::setSat2( int val ) { mRamp->setSatMax( val ); updatePreview(); } -void QgsVectorRandomColorRampV2Dialog::setVal1( int val ) +void QgsVectorRandomColorRampDialog::setVal1( int val ) { mRamp->setValMin( val ); updatePreview(); } -void QgsVectorRandomColorRampV2Dialog::setVal2( int val ) +void QgsVectorRandomColorRampDialog::setVal2( int val ) { mRamp->setValMax( val ); updatePreview(); diff --git a/src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.h b/src/gui/symbology-ng/qgsvectorrandomcolorrampdialog.h similarity index 78% rename from src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.h rename to src/gui/symbology-ng/qgsvectorrandomcolorrampdialog.h index 30ce1bda4b1..3f1c00e07af 100644 --- a/src/gui/symbology-ng/qgsvectorrandomcolorrampv2dialog.h +++ b/src/gui/symbology-ng/qgsvectorrandomcolorrampdialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsvectorrandomcolorrampv2dialog.h + qgsvectorrandomcolorrampdialog.h --------------------- begin : December 2009 copyright : (C) 2009 by Martin Dobias @@ -20,17 +20,17 @@ #include "ui_qgsvectorrandomcolorrampv2dialogbase.h" -class QgsVectorRandomColorRampV2; +class QgsVectorRandomColorRamp; /** \ingroup gui - * \class QgsVectorRandomColorRampV2Dialog + * \class QgsVectorRandomColorRampDialog */ -class GUI_EXPORT QgsVectorRandomColorRampV2Dialog : public QDialog, private Ui::QgsVectorRandomColorRampV2DialogBase +class GUI_EXPORT QgsVectorRandomColorRampDialog : public QDialog, private Ui::QgsVectorRandomColorRampDialogBase { Q_OBJECT public: - QgsVectorRandomColorRampV2Dialog( QgsVectorRandomColorRampV2* ramp, QWidget* parent = nullptr ); + QgsVectorRandomColorRampDialog( QgsVectorRandomColorRamp* ramp, QWidget* parent = nullptr ); public slots: void setCount( int val ); @@ -45,7 +45,7 @@ class GUI_EXPORT QgsVectorRandomColorRampV2Dialog : public QDialog, private Ui:: void updatePreview(); - QgsVectorRandomColorRampV2* mRamp; + QgsVectorRandomColorRamp* mRamp; }; #endif diff --git a/src/plugins/geometry_checker/checks/qgsgeometryanglecheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometryanglecheck.cpp index c7247ede669..0adb4a41283 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometryanglecheck.cpp +++ b/src/plugins/geometry_checker/checks/qgsgeometryanglecheck.cpp @@ -29,7 +29,7 @@ void QgsGeometryAngleCheck::collectErrors( QList& errors continue; } QgsGeometry g = feature.geometry(); - const QgsAbstractGeometryV2* geom = g.geometry(); + const QgsAbstractGeometry* geom = g.geometry(); for ( int iPart = 0, nParts = geom->partCount(); iPart < nParts; ++iPart ) { for ( int iRing = 0, nRings = geom->ringCount( iPart ); iRing < nRings; ++iRing ) @@ -77,7 +77,7 @@ void QgsGeometryAngleCheck::fixError( QgsGeometryCheckError* error, int method, return; } QgsGeometry g = feature.geometry(); - QgsAbstractGeometryV2* geometry = g.geometry(); + QgsAbstractGeometry* geometry = g.geometry(); QgsVertexId vidx = error->vidx(); // Check if point still exists diff --git a/src/plugins/geometry_checker/checks/qgsgeometryareacheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometryareacheck.cpp index 01ea0b91bf5..6675a4313dc 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometryareacheck.cpp +++ b/src/plugins/geometry_checker/checks/qgsgeometryareacheck.cpp @@ -14,7 +14,7 @@ ***************************************************************************/ #include "qgsgeometryengine.h" -#include "qgsgeometrycollectionv2.h" +#include "qgsgeometrycollection.h" #include "qgsgeometryareacheck.h" #include "../utils/qgsfeaturepool.h" @@ -31,10 +31,10 @@ void QgsGeometryAreaCheck::collectErrors( QList& errors, } QgsGeometry g = feature.geometry(); - QgsAbstractGeometryV2* geom = g.geometry(); - if ( dynamic_cast( geom ) ) + QgsAbstractGeometry* geom = g.geometry(); + if ( dynamic_cast( geom ) ) { - QgsGeometryCollectionV2* multiGeom = static_cast( geom ); + QgsGeometryCollection* multiGeom = static_cast( geom ); for ( int i = 0, n = multiGeom->numGeometries(); i < n; ++i ) { double value; @@ -64,7 +64,7 @@ void QgsGeometryAreaCheck::fixError( QgsGeometryCheckError* error, int method, i return; } QgsGeometry g = feature.geometry(); - QgsAbstractGeometryV2* geom = g.geometry(); + QgsAbstractGeometry* geom = g.geometry(); QgsVertexId vidx = error->vidx(); // Check if polygon still exists @@ -75,10 +75,10 @@ void QgsGeometryAreaCheck::fixError( QgsGeometryCheckError* error, int method, i } // Check if error still applies - if ( dynamic_cast( geom ) ) + if ( dynamic_cast( geom ) ) { double value; - if ( !checkThreshold( static_cast( geom )->geometryN( vidx.part ), value ) ) + if ( !checkThreshold( static_cast( geom )->geometryN( vidx.part ), value ) ) { error->setObsolete(); return; @@ -129,7 +129,7 @@ bool QgsGeometryAreaCheck::mergeWithNeighbor( QgsFeature& feature, int partIdx, int mergePartIdx = -1; bool matchFound = false; QgsGeometry g = feature.geometry();; - QgsAbstractGeometryV2* geom = g.geometry(); + QgsAbstractGeometry* geom = g.geometry(); // Search for touching neighboring geometries Q_FOREACH ( QgsFeatureId testId, mFeaturePool->getIntersects( g.boundingBox() ) ) @@ -140,7 +140,7 @@ bool QgsGeometryAreaCheck::mergeWithNeighbor( QgsFeature& feature, int partIdx, continue; } QgsGeometry testFeatureGeom = testFeature.geometry(); - QgsAbstractGeometryV2* testGeom = testFeatureGeom.geometry(); + QgsAbstractGeometry* testGeom = testFeatureGeom.geometry(); for ( int testPartIdx = 0, nTestParts = testGeom->partCount(); testPartIdx < nTestParts; ++testPartIdx ) { if ( testId == feature.id() && testPartIdx == partIdx ) @@ -159,8 +159,8 @@ bool QgsGeometryAreaCheck::mergeWithNeighbor( QgsFeature& feature, int partIdx, } else { - if ( dynamic_cast( testGeom ) ) - val = static_cast( testGeom )->geometryN( testPartIdx )->area(); + if ( dynamic_cast( testGeom ) ) + val = static_cast( testGeom )->geometryN( testPartIdx )->area(); else val = testGeom->area(); } @@ -196,9 +196,9 @@ bool QgsGeometryAreaCheck::mergeWithNeighbor( QgsFeature& feature, int partIdx, // Merge geometries QgsGeometry mergeFeatureGeom = mergeFeature.geometry(); - QgsAbstractGeometryV2* mergeGeom = mergeFeatureGeom.geometry(); + QgsAbstractGeometry* mergeGeom = mergeFeatureGeom.geometry(); QgsGeometryEngine* geomEngine = QgsGeometryCheckerUtils::createGeomEngine( QgsGeometryCheckerUtils::getGeomPart( mergeGeom, mergePartIdx ), QgsGeometryCheckPrecision::tolerance() ); - QgsAbstractGeometryV2* combinedGeom = geomEngine->combine( *QgsGeometryCheckerUtils::getGeomPart( geom, partIdx ), &errMsg ); + QgsAbstractGeometry* combinedGeom = geomEngine->combine( *QgsGeometryCheckerUtils::getGeomPart( geom, partIdx ), &errMsg ); delete geomEngine; if ( !combinedGeom || combinedGeom->isEmpty() ) { diff --git a/src/plugins/geometry_checker/checks/qgsgeometryareacheck.h b/src/plugins/geometry_checker/checks/qgsgeometryareacheck.h index 91e8b0ba47e..cfde2fb77d4 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometryareacheck.h +++ b/src/plugins/geometry_checker/checks/qgsgeometryareacheck.h @@ -18,7 +18,7 @@ #include "qgsgeometrycheck.h" -class QgsSurfaceV2; +class QgsSurface; class QgsGeometryAreaCheck : public QgsGeometryCheck { @@ -38,7 +38,7 @@ class QgsGeometryAreaCheck : public QgsGeometryCheck enum ResolutionMethod { MergeLongestEdge, MergeLargestArea, MergeIdenticalAttribute, Delete, NoChange }; bool mergeWithNeighbor( QgsFeature &feature, int partIdx, int method, int mergeAttributeIndex, Changes &changes , QString &errMsg ) const; - virtual bool checkThreshold( const QgsAbstractGeometryV2* geom, double& value ) const { value = geom->area(); return value < mThreshold; } + virtual bool checkThreshold( const QgsAbstractGeometry* geom, double& value ) const { value = geom->area(); return value < mThreshold; } protected: double mThreshold; diff --git a/src/plugins/geometry_checker/checks/qgsgeometrycheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometrycheck.cpp index a5bda0d124c..10961faae69 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometrycheck.cpp +++ b/src/plugins/geometry_checker/checks/qgsgeometrycheck.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include "qgsgeometrycollectionv2.h" -#include "qgscurvepolygonv2.h" +#include "qgsgeometrycollection.h" +#include "qgscurvepolygon.h" #include "qgsgeometrycheck.h" #include "../utils/qgsfeaturepool.h" @@ -74,13 +74,13 @@ QgsGeometryCheckError::~QgsGeometryCheckError() { } -QgsAbstractGeometryV2 *QgsGeometryCheckError::geometry() +QgsAbstractGeometry *QgsGeometryCheckError::geometry() { QgsFeature f; if ( mCheck->getFeaturePool()->get( featureId(), f ) && f.hasGeometry() ) { QgsGeometry featureGeom = f.geometry(); - QgsAbstractGeometryV2* geom = featureGeom.geometry(); + QgsAbstractGeometry* geom = featureGeom.geometry(); return mVidx.part >= 0 ? QgsGeometryCheckerUtils::getGeomPart( geom, mVidx.part )->clone() : geom->clone(); } return nullptr; @@ -152,13 +152,13 @@ bool QgsGeometryCheckError::handleChanges( const QgsGeometryCheck::Changes& chan return true; } -void QgsGeometryCheck::replaceFeatureGeometryPart( QgsFeature& feature, int partIdx, QgsAbstractGeometryV2* newPartGeom, Changes& changes ) const +void QgsGeometryCheck::replaceFeatureGeometryPart( QgsFeature& feature, int partIdx, QgsAbstractGeometry* newPartGeom, Changes& changes ) const { QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* geom = featureGeom.geometry(); - if ( dynamic_cast( geom ) ) + QgsAbstractGeometry* geom = featureGeom.geometry(); + if ( dynamic_cast( geom ) ) { - QgsGeometryCollectionV2* GeomCollection = static_cast( geom ); + QgsGeometryCollection* GeomCollection = static_cast( geom ); GeomCollection->removeGeometry( partIdx ); GeomCollection->addGeometry( newPartGeom ); changes[feature.id()].append( Change( ChangeFeature, ChangeRemoved, QgsVertexId( partIdx ) ) ); @@ -176,11 +176,11 @@ void QgsGeometryCheck::replaceFeatureGeometryPart( QgsFeature& feature, int part void QgsGeometryCheck::deleteFeatureGeometryPart( QgsFeature &feature, int partIdx, Changes &changes ) const { QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* geom = featureGeom.geometry(); - if ( dynamic_cast( geom ) ) + QgsAbstractGeometry* geom = featureGeom.geometry(); + if ( dynamic_cast( geom ) ) { - static_cast( geom )->removeGeometry( partIdx ); - if ( static_cast( geom )->numGeometries() == 0 ) + static_cast( geom )->removeGeometry( partIdx ); + if ( static_cast( geom )->numGeometries() == 0 ) { mFeaturePool->deleteFeature( feature ); changes[feature.id()].append( Change( ChangeFeature, ChangeRemoved ) ); @@ -202,8 +202,8 @@ void QgsGeometryCheck::deleteFeatureGeometryPart( QgsFeature &feature, int partI void QgsGeometryCheck::deleteFeatureGeometryRing( QgsFeature &feature, int partIdx, int ringIdx, Changes &changes ) const { QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* partGeom = QgsGeometryCheckerUtils::getGeomPart( featureGeom.geometry(), partIdx ); - if ( dynamic_cast( partGeom ) ) + QgsAbstractGeometry* partGeom = QgsGeometryCheckerUtils::getGeomPart( featureGeom.geometry(), partIdx ); + if ( dynamic_cast( partGeom ) ) { // If we delete the exterior ring of a polygon, it makes no sense to keep the interiors if ( ringIdx == 0 ) @@ -212,7 +212,7 @@ void QgsGeometryCheck::deleteFeatureGeometryRing( QgsFeature &feature, int partI } else { - static_cast( partGeom )->removeInteriorRing( ringIdx - 1 ); + static_cast( partGeom )->removeInteriorRing( ringIdx - 1 ); feature.setGeometry( featureGeom ); mFeaturePool->updateFeature( feature ); changes[feature.id()].append( Change( ChangeRing, ChangeRemoved, QgsVertexId( partIdx, ringIdx ) ) ); diff --git a/src/plugins/geometry_checker/checks/qgsgeometrycheck.h b/src/plugins/geometry_checker/checks/qgsgeometrycheck.h index 261ce01f04c..404fbd88459 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometrycheck.h +++ b/src/plugins/geometry_checker/checks/qgsgeometrycheck.h @@ -88,7 +88,7 @@ class QgsGeometryCheck : public QObject const CheckType mCheckType; QgsFeaturePool* mFeaturePool; - void replaceFeatureGeometryPart( QgsFeature& feature, int partIdx, QgsAbstractGeometryV2* newPartGeom, Changes& changes ) const; + void replaceFeatureGeometryPart( QgsFeature& feature, int partIdx, QgsAbstractGeometry* newPartGeom, Changes& changes ) const; void deleteFeatureGeometryPart( QgsFeature& feature, int partIdx, Changes& changes ) const; void deleteFeatureGeometryRing( QgsFeature& feature, int partIdx, int ringIdx, Changes& changes ) const; }; @@ -109,7 +109,7 @@ class QgsGeometryCheckError virtual ~QgsGeometryCheckError(); const QgsGeometryCheck* check() const { return mCheck; } QgsFeatureId featureId() const { return mFeatureId; } - virtual QgsAbstractGeometryV2* geometry(); + virtual QgsAbstractGeometry* geometry(); virtual QgsRectangle affectedAreaBBox() { return geometry() ? geometry()->boundingBox() : QgsRectangle(); } virtual QString description() const { return mCheck->errorDescription(); } const QgsPointV2& location() const { return mErrorLocation; } diff --git a/src/plugins/geometry_checker/checks/qgsgeometrydegeneratepolygoncheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometrydegeneratepolygoncheck.cpp index 44f6b815dfc..05ed20558ce 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometrydegeneratepolygoncheck.cpp +++ b/src/plugins/geometry_checker/checks/qgsgeometrydegeneratepolygoncheck.cpp @@ -28,7 +28,7 @@ void QgsGeometryDegeneratePolygonCheck::collectErrors( QListpartCount(); iPart < nParts; ++iPart ) { for ( int iRing = 0, nRings = geom->ringCount( iPart ); iRing < nRings; ++iRing ) @@ -51,7 +51,7 @@ void QgsGeometryDegeneratePolygonCheck::fixError( QgsGeometryCheckError* error, return; } QgsGeometry featureGeometry = feature.geometry(); - QgsAbstractGeometryV2* geom = featureGeometry.geometry(); + QgsAbstractGeometry* geom = featureGeometry.geometry(); QgsVertexId vidx = error->vidx(); // Check if ring still exists diff --git a/src/plugins/geometry_checker/checks/qgsgeometryduplicatecheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometryduplicatecheck.cpp index 88fb848d2e4..bfc7a87d8af 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometryduplicatecheck.cpp +++ b/src/plugins/geometry_checker/checks/qgsgeometryduplicatecheck.cpp @@ -48,7 +48,7 @@ void QgsGeometryDuplicateCheck::collectErrors( QList& er continue; } QString errMsg; - QgsAbstractGeometryV2* diffGeom = geomEngine->symDifference( *testFeature.geometry().geometry(), &errMsg ); + QgsAbstractGeometry* diffGeom = geomEngine->symDifference( *testFeature.geometry().geometry(), &errMsg ); if ( diffGeom && diffGeom->area() < QgsGeometryCheckPrecision::tolerance() ) { duplicates.append( id ); @@ -94,7 +94,7 @@ void QgsGeometryDuplicateCheck::fixError( QgsGeometryCheckError* error, int meth { continue; } - QgsAbstractGeometryV2* diffGeom = geomEngine->symDifference( *testFeature.geometry().geometry() ); + QgsAbstractGeometry* diffGeom = geomEngine->symDifference( *testFeature.geometry().geometry() ); if ( diffGeom && diffGeom->area() < QgsGeometryCheckPrecision::tolerance() ) { mFeaturePool->deleteFeature( testFeature ); diff --git a/src/plugins/geometry_checker/checks/qgsgeometryduplicatenodescheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometryduplicatenodescheck.cpp index 1e8228fc846..2d5f1031470 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometryduplicatenodescheck.cpp +++ b/src/plugins/geometry_checker/checks/qgsgeometryduplicatenodescheck.cpp @@ -30,7 +30,7 @@ void QgsGeometryDuplicateNodesCheck::collectErrors( QListpartCount(); iPart < nParts; ++iPart ) { for ( int iRing = 0, nRings = geom->ringCount( iPart ); iRing < nRings; ++iRing ) @@ -61,7 +61,7 @@ void QgsGeometryDuplicateNodesCheck::fixError( QgsGeometryCheckError* error, int return; } QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* geom = featureGeom.geometry(); + QgsAbstractGeometry* geom = featureGeom.geometry(); QgsVertexId vidx = error->vidx(); // Check if point still exists diff --git a/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.cpp index ab6d0985841..79a31d140c0 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.cpp +++ b/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.cpp @@ -15,7 +15,7 @@ #include "qgsgeometryengine.h" #include "qgsgeometrygapcheck.h" -#include "qgsgeometrycollectionv2.h" +#include "qgsgeometrycollection.h" #include "../utils/qgsfeaturepool.h" @@ -25,7 +25,7 @@ void QgsGeometryGapCheck::collectErrors( QList& errors, if ( progressCounter ) progressCounter->fetchAndAddRelaxed( 1 ); // Collect geometries, build spatial index - QList geomList; + QList geomList; const QgsFeatureIds& featureIds = ids.isEmpty() ? mFeaturePool->getFeatureIds() : ids; Q_FOREACH ( QgsFeatureId id, featureIds ) { @@ -45,7 +45,7 @@ void QgsGeometryGapCheck::collectErrors( QList& errors, // Create union of geometry QString errMsg; - QgsAbstractGeometryV2* unionGeom = geomEngine->combine( geomList, &errMsg ); + QgsAbstractGeometry* unionGeom = geomEngine->combine( geomList, &errMsg ); qDeleteAll( geomList ); delete geomEngine; if ( !unionGeom ) @@ -56,7 +56,7 @@ void QgsGeometryGapCheck::collectErrors( QList& errors, // Get envelope of union geomEngine = QgsGeometryCheckerUtils::createGeomEngine( unionGeom, QgsGeometryCheckPrecision::tolerance() ); - QgsAbstractGeometryV2* envelope = geomEngine->envelope( &errMsg ); + QgsAbstractGeometry* envelope = geomEngine->envelope( &errMsg ); delete geomEngine; if ( !envelope ) { @@ -67,14 +67,14 @@ void QgsGeometryGapCheck::collectErrors( QList& errors, // Buffer envelope geomEngine = QgsGeometryCheckerUtils::createGeomEngine( envelope, QgsGeometryCheckPrecision::tolerance() ); - QgsAbstractGeometryV2* bufEnvelope = geomEngine->buffer( 2, 0, GEOSBUF_CAP_SQUARE, GEOSBUF_JOIN_MITRE, 4. ); + QgsAbstractGeometry* bufEnvelope = geomEngine->buffer( 2, 0, GEOSBUF_CAP_SQUARE, GEOSBUF_JOIN_MITRE, 4. ); delete geomEngine; delete envelope; envelope = bufEnvelope; // Compute difference between envelope and union to obtain gap polygons geomEngine = QgsGeometryCheckerUtils::createGeomEngine( envelope, QgsGeometryCheckPrecision::tolerance() ); - QgsAbstractGeometryV2* diffGeom = geomEngine->difference( *unionGeom, &errMsg ); + QgsAbstractGeometry* diffGeom = geomEngine->difference( *unionGeom, &errMsg ); delete geomEngine; if ( !diffGeom ) { @@ -87,7 +87,7 @@ void QgsGeometryGapCheck::collectErrors( QList& errors, // For each gap polygon which does not lie on the boundary, get neighboring polygons and add error for ( int iPart = 0, nParts = diffGeom->partCount(); iPart < nParts; ++iPart ) { - QgsAbstractGeometryV2* geom = QgsGeometryCheckerUtils::getGeomPart( diffGeom, iPart ); + QgsAbstractGeometry* geom = QgsGeometryCheckerUtils::getGeomPart( diffGeom, iPart ); // Skip the gap between features and boundingbox if ( geom->boundingBox() == envelope->boundingBox() ) { @@ -113,7 +113,7 @@ void QgsGeometryGapCheck::collectErrors( QList& errors, continue; } QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* geom2 = featureGeom.geometry(); + QgsAbstractGeometry* geom2 = featureGeom.geometry(); if ( QgsGeometryCheckerUtils::sharedEdgeLength( geom, geom2, QgsGeometryCheckPrecision::reducedTolerance() ) > 0 ) { neighboringIds.insert( feature.id() ); @@ -165,7 +165,7 @@ bool QgsGeometryGapCheck::mergeWithNeighbor( QgsGeometryGapCheckError* err, Chan QgsFeature mergeFeature; int mergePartIdx = -1; - QgsAbstractGeometryV2* errGeometry = QgsGeometryCheckerUtils::getGeomPart( err->geometry(), 0 ); + QgsAbstractGeometry* errGeometry = QgsGeometryCheckerUtils::getGeomPart( err->geometry(), 0 ); // Search for touching neighboring geometries Q_FOREACH ( QgsFeatureId testId, err->neighbors() ) @@ -176,7 +176,7 @@ bool QgsGeometryGapCheck::mergeWithNeighbor( QgsGeometryGapCheckError* err, Chan continue; } QgsGeometry featureGeom = testFeature.geometry(); - QgsAbstractGeometryV2* testGeom = featureGeom.geometry(); + QgsAbstractGeometry* testGeom = featureGeom.geometry(); for ( int iPart = 0, nParts = testGeom->partCount(); iPart < nParts; ++iPart ) { double len = QgsGeometryCheckerUtils::sharedEdgeLength( errGeometry, QgsGeometryCheckerUtils::getGeomPart( testGeom, iPart ), QgsGeometryCheckPrecision::reducedTolerance() ); @@ -196,9 +196,9 @@ bool QgsGeometryGapCheck::mergeWithNeighbor( QgsGeometryGapCheckError* err, Chan // Merge geometries QgsGeometry mergeFeatureGeom = mergeFeature.geometry(); - QgsAbstractGeometryV2* mergeGeom = mergeFeatureGeom.geometry(); + QgsAbstractGeometry* mergeGeom = mergeFeatureGeom.geometry(); QgsGeometryEngine* geomEngine = QgsGeometryCheckerUtils::createGeomEngine( errGeometry, QgsGeometryCheckPrecision::tolerance() ); - QgsAbstractGeometryV2* combinedGeom = geomEngine->combine( *QgsGeometryCheckerUtils::getGeomPart( mergeGeom, mergePartIdx ), &errMsg ); + QgsAbstractGeometry* combinedGeom = geomEngine->combine( *QgsGeometryCheckerUtils::getGeomPart( mergeGeom, mergePartIdx ), &errMsg ); delete geomEngine; if ( !combinedGeom || combinedGeom->isEmpty() ) { diff --git a/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.h b/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.h index ba4bfc0cfef..50cbb10a6ee 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.h +++ b/src/plugins/geometry_checker/checks/qgsgeometrygapcheck.h @@ -23,7 +23,7 @@ class QgsGeometryGapCheckError : public QgsGeometryCheckError { public: QgsGeometryGapCheckError( const QgsGeometryCheck* check, - QgsAbstractGeometryV2* geometry, + QgsAbstractGeometry* geometry, const QgsFeatureIds& neighbors, double area, const QgsRectangle& gapAreaBBox ) @@ -38,7 +38,7 @@ class QgsGeometryGapCheckError : public QgsGeometryCheckError delete mGeometry; } - QgsAbstractGeometryV2* geometry() override { return mGeometry->clone(); } + QgsAbstractGeometry* geometry() override { return mGeometry->clone(); } const QgsFeatureIds& neighbors() const { return mNeighbors; } bool isEqual( QgsGeometryCheckError* other ) const override @@ -77,7 +77,7 @@ class QgsGeometryGapCheckError : public QgsGeometryCheckError private: QgsFeatureIds mNeighbors; QgsRectangle mGapAreaBBox; - QgsAbstractGeometryV2* mGeometry; + QgsAbstractGeometry* mGeometry; }; class QgsGeometryGapCheck : public QgsGeometryCheck diff --git a/src/plugins/geometry_checker/checks/qgsgeometryholecheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometryholecheck.cpp index 17f18b869c1..a5b8813ada2 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometryholecheck.cpp +++ b/src/plugins/geometry_checker/checks/qgsgeometryholecheck.cpp @@ -29,7 +29,7 @@ void QgsGeometryHoleCheck::collectErrors( QList& errors, } QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* geom = featureGeom.geometry(); + QgsAbstractGeometry* geom = featureGeom.geometry(); for ( int iPart = 0, nParts = geom->partCount(); iPart < nParts; ++iPart ) { // Rings after the first one are interiors @@ -50,7 +50,7 @@ void QgsGeometryHoleCheck::fixError( QgsGeometryCheckError* error, int method, i return; } QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* geom = featureGeom.geometry(); + QgsAbstractGeometry* geom = featureGeom.geometry(); QgsVertexId vidx = error->vidx(); // Check if ring still exists diff --git a/src/plugins/geometry_checker/checks/qgsgeometrymultipartcheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometrymultipartcheck.cpp index b0c39f025b2..1cdc4d4c698 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometrymultipartcheck.cpp +++ b/src/plugins/geometry_checker/checks/qgsgeometrymultipartcheck.cpp @@ -28,7 +28,7 @@ void QgsGeometryMultipartCheck::collectErrors( QList& er continue; } QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* geom = featureGeom.geometry(); + QgsAbstractGeometry* geom = featureGeom.geometry(); QgsWkbTypes::Type type = geom->wkbType(); if ( geom->partCount() == 1 && QgsWkbTypes::isMultiType( type ) ) @@ -47,7 +47,7 @@ void QgsGeometryMultipartCheck::fixError( QgsGeometryCheckError* error, int meth return; } QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* geom = featureGeom.geometry(); + QgsAbstractGeometry* geom = featureGeom.geometry(); // Check if error still applies if ( geom->partCount() > 1 || !QgsWkbTypes::isMultiType( geom->wkbType() ) ) diff --git a/src/plugins/geometry_checker/checks/qgsgeometryoverlapcheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometryoverlapcheck.cpp index 57887db78f0..09813549b65 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometryoverlapcheck.cpp +++ b/src/plugins/geometry_checker/checks/qgsgeometryoverlapcheck.cpp @@ -29,7 +29,7 @@ void QgsGeometryOverlapCheck::collectErrors( QList& erro continue; } QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* geom = featureGeom.geometry(); + QgsAbstractGeometry* geom = featureGeom.geometry(); QgsGeometryEngine* geomEngine = QgsGeometryCheckerUtils::createGeomEngine( geom, QgsGeometryCheckPrecision::tolerance() ); QgsFeatureIds ids = mFeaturePool->getIntersects( feature.geometry().boundingBox() ); @@ -50,7 +50,7 @@ void QgsGeometryOverlapCheck::collectErrors( QList& erro QString errMsg; if ( geomEngine->overlaps( *otherFeature.geometry().geometry(), &errMsg ) ) { - QgsAbstractGeometryV2* interGeom = geomEngine->intersection( *otherFeature.geometry().geometry() ); + QgsAbstractGeometry* interGeom = geomEngine->intersection( *otherFeature.geometry().geometry() ); if ( interGeom && !interGeom->isEmpty() ) { QgsGeometryCheckerUtils::filter1DTypes( interGeom ); @@ -88,7 +88,7 @@ void QgsGeometryOverlapCheck::fixError( QgsGeometryCheckError* error, int method return; } QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* geom = featureGeom.geometry(); + QgsAbstractGeometry* geom = featureGeom.geometry(); QgsGeometryEngine* geomEngine = QgsGeometryCheckerUtils::createGeomEngine( geom, QgsGeometryCheckPrecision::tolerance() ); // Check if error still applies @@ -98,7 +98,7 @@ void QgsGeometryOverlapCheck::fixError( QgsGeometryCheckError* error, int method error->setObsolete(); return; } - QgsAbstractGeometryV2* interGeom = geomEngine->intersection( *otherFeature.geometry().geometry(), &errMsg ); + QgsAbstractGeometry* interGeom = geomEngine->intersection( *otherFeature.geometry().geometry(), &errMsg ); delete geomEngine; if ( !interGeom ) { @@ -107,10 +107,10 @@ void QgsGeometryOverlapCheck::fixError( QgsGeometryCheckError* error, int method } // Search which overlap part this error parametrizes (using fuzzy-matching of the area and centroid...) - QgsAbstractGeometryV2* interPart = nullptr; + QgsAbstractGeometry* interPart = nullptr; for ( int iPart = 0, nParts = interGeom->partCount(); iPart < nParts; ++iPart ) { - QgsAbstractGeometryV2* part = QgsGeometryCheckerUtils::getGeomPart( interGeom, iPart ); + QgsAbstractGeometry* part = QgsGeometryCheckerUtils::getGeomPart( interGeom, iPart ); if ( qAbs( part->area() - overlapError->value().toDouble() ) < QgsGeometryCheckPrecision::reducedTolerance() && QgsGeometryCheckerUtils::pointsFuzzyEqual( part->centroid(), overlapError->location(), QgsGeometryCheckPrecision::reducedTolerance() ) ) { @@ -133,7 +133,7 @@ void QgsGeometryOverlapCheck::fixError( QgsGeometryCheckError* error, int method else if ( method == Subtract ) { geomEngine = QgsGeometryCheckerUtils::createGeomEngine( geom, QgsGeometryCheckPrecision::reducedTolerance() ); - QgsAbstractGeometryV2* diff1 = geomEngine->difference( *interPart, &errMsg ); + QgsAbstractGeometry* diff1 = geomEngine->difference( *interPart, &errMsg ); delete geomEngine; if ( !diff1 || diff1->isEmpty() ) { @@ -146,7 +146,7 @@ void QgsGeometryOverlapCheck::fixError( QgsGeometryCheckError* error, int method } QgsGeometry otherFeatureGeom = otherFeature.geometry(); QgsGeometryEngine* otherGeomEngine = QgsGeometryCheckerUtils::createGeomEngine( otherFeatureGeom.geometry(), QgsGeometryCheckPrecision::reducedTolerance() ); - QgsAbstractGeometryV2* diff2 = otherGeomEngine->difference( *interPart, &errMsg ); + QgsAbstractGeometry* diff2 = otherGeomEngine->difference( *interPart, &errMsg ); delete otherGeomEngine; if ( !diff2 || diff2->isEmpty() ) { diff --git a/src/plugins/geometry_checker/checks/qgsgeometrysegmentlengthcheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometrysegmentlengthcheck.cpp index 3f00ac87e95..b1a1ab94416 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometrysegmentlengthcheck.cpp +++ b/src/plugins/geometry_checker/checks/qgsgeometrysegmentlengthcheck.cpp @@ -31,7 +31,7 @@ void QgsGeometrySegmentLengthCheck::collectErrors( QList continue; } QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* geom = featureGeom.geometry(); + QgsAbstractGeometry* geom = featureGeom.geometry(); for ( int iPart = 0, nParts = geom->partCount(); iPart < nParts; ++iPart ) { @@ -67,7 +67,7 @@ void QgsGeometrySegmentLengthCheck::fixError( QgsGeometryCheckError* error, int } QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* geom = featureGeom.geometry(); + QgsAbstractGeometry* geom = featureGeom.geometry(); QgsVertexId vidx = error->vidx(); // Check if point still exists diff --git a/src/plugins/geometry_checker/checks/qgsgeometryselfintersectioncheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometryselfintersectioncheck.cpp index 5826a25b5af..b7f4a0dbc75 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometryselfintersectioncheck.cpp +++ b/src/plugins/geometry_checker/checks/qgsgeometryselfintersectioncheck.cpp @@ -14,11 +14,11 @@ ***************************************************************************/ #include "qgsgeometryselfintersectioncheck.h" -#include "qgspolygonv2.h" -#include "qgslinestringv2.h" +#include "qgspolygon.h" +#include "qgslinestring.h" #include "qgsgeometryengine.h" -#include "qgsmultipolygonv2.h" -#include "qgsmultilinestringv2.h" +#include "qgsmultipolygon.h" +#include "qgsmultilinestring.h" #include "qgsgeometryutils.h" #include "../utils/qgsfeaturepool.h" @@ -74,7 +74,7 @@ void QgsGeometrySelfIntersectionCheck::collectErrors( QListpartCount(); iPart < nParts; ++iPart ) { @@ -98,7 +98,7 @@ void QgsGeometrySelfIntersectionCheck::fixError( QgsGeometryCheckError* error, i return; } QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* geom = featureGeom.geometry(); + QgsAbstractGeometry* geom = featureGeom.geometry(); QgsVertexId vidx = error->vidx(); // Check if ring still exists @@ -136,7 +136,7 @@ void QgsGeometrySelfIntersectionCheck::fixError( QgsGeometryCheckError* error, i else if ( method == ToMultiObject || method == ToSingleObjects ) { // Extract rings - QgsPointSequenceV2 ring1, ring2; + QgsPointSequence ring1, ring2; bool ring1EndsWithS = false; bool ring2EndsWithS = false; for ( int i = 0; i < nVerts; ++i ) @@ -177,16 +177,16 @@ void QgsGeometrySelfIntersectionCheck::fixError( QgsGeometryCheckError* error, i error->setFixFailed( tr( "Resulting geometry is degenerate" ) ); return; } - QgsLineStringV2* ringGeom1 = new QgsLineStringV2(); + QgsLineString* ringGeom1 = new QgsLineString(); ringGeom1->setPoints( ring1 ); - QgsLineStringV2* ringGeom2 = new QgsLineStringV2(); + QgsLineString* ringGeom2 = new QgsLineString(); ringGeom2->setPoints( ring2 ); - QgsAbstractGeometryV2* part = QgsGeometryCheckerUtils::getGeomPart( geom, vidx.part ); + QgsAbstractGeometry* part = QgsGeometryCheckerUtils::getGeomPart( geom, vidx.part ); // If is a polygon... - if ( dynamic_cast( part ) ) + if ( dynamic_cast( part ) ) { - QgsCurvePolygonV2* poly = static_cast( part ); + QgsCurvePolygon* poly = static_cast( part ); // If ring is interior ring, create separate holes if ( vidx.ring > 0 ) { @@ -205,7 +205,7 @@ void QgsGeometrySelfIntersectionCheck::fixError( QgsGeometryCheckError* error, i poly->setExteriorRing( ringGeom1 ); // If original feature was a linear polygon, also create the new part as a linear polygon - QgsCurvePolygonV2* poly2 = dynamic_cast( part ) ? new QgsPolygonV2() : new QgsCurvePolygonV2(); + QgsCurvePolygon* poly2 = dynamic_cast( part ) ? new QgsPolygonV2() : new QgsCurvePolygon(); poly2->setExteriorRing( ringGeom2 ); // Reassing interiors as necessary @@ -217,7 +217,7 @@ void QgsGeometrySelfIntersectionCheck::fixError( QgsGeometryCheckError* error, i { if ( geomEnginePoly2->contains( *poly->interiorRing( i ) ) ) { - poly2->addInteriorRing( static_cast( poly->interiorRing( i )->clone() ) ); + poly2->addInteriorRing( static_cast( poly->interiorRing( i )->clone() ) ); // No point in adding ChangeAdded changes, since the entire poly2 is added anyways later on } poly->removeInteriorRing( i ); @@ -230,9 +230,9 @@ void QgsGeometrySelfIntersectionCheck::fixError( QgsGeometryCheckError* error, i if ( method == ToMultiObject ) { // If is alreay a geometry collection, just add the new polygon. - if ( dynamic_cast( geom ) ) + if ( dynamic_cast( geom ) ) { - static_cast( geom )->addGeometry( poly2 ); + static_cast( geom )->addGeometry( poly2 ); changes[feature.id()].append( Change( ChangeRing, ChangeChanged, QgsVertexId( vidx.part, vidx.ring ) ) ); changes[feature.id()].append( Change( ChangePart, ChangeAdded, QgsVertexId( geom->partCount() - 1 ) ) ); feature.setGeometry( featureGeom ); @@ -261,13 +261,13 @@ void QgsGeometrySelfIntersectionCheck::fixError( QgsGeometryCheckError* error, i } } } - else if ( dynamic_cast( part ) ) + else if ( dynamic_cast( part ) ) { if ( method == ToMultiObject ) { - if ( dynamic_cast( geom ) ) + if ( dynamic_cast( geom ) ) { - QgsGeometryCollectionV2* geomCollection = static_cast( geom ); + QgsGeometryCollection* geomCollection = static_cast( geom ); geomCollection->removeGeometry( vidx.part ); geomCollection->addGeometry( ringGeom1 ); geomCollection->addGeometry( ringGeom2 ); @@ -278,7 +278,7 @@ void QgsGeometrySelfIntersectionCheck::fixError( QgsGeometryCheckError* error, i } else { - QgsMultiCurveV2* geomCollection = new QgsMultiLineStringV2(); + QgsMultiCurve* geomCollection = new QgsMultiLineString(); geomCollection->addGeometry( ringGeom1 ); geomCollection->addGeometry( ringGeom2 ); feature.setGeometry( QgsGeometry( geomCollection ) ); @@ -288,9 +288,9 @@ void QgsGeometrySelfIntersectionCheck::fixError( QgsGeometryCheckError* error, i } else // if(method == ToSingleObjects) { - if ( dynamic_cast( geom ) ) + if ( dynamic_cast( geom ) ) { - QgsGeometryCollectionV2* geomCollection = static_cast( geom ); + QgsGeometryCollection* geomCollection = static_cast( geom ); geomCollection->removeGeometry( vidx.part ); geomCollection->addGeometry( ringGeom1 ); feature.setGeometry( featureGeom ); diff --git a/src/plugins/geometry_checker/checks/qgsgeometrysliverpolygoncheck.h b/src/plugins/geometry_checker/checks/qgsgeometrysliverpolygoncheck.h index f446ebeb228..60e43e2460c 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometrysliverpolygoncheck.h +++ b/src/plugins/geometry_checker/checks/qgsgeometrysliverpolygoncheck.h @@ -32,7 +32,7 @@ class QgsGeometrySliverPolygonCheck : public QgsGeometryAreaCheck private: double mMaxArea; - bool checkThreshold( const QgsAbstractGeometryV2 *geom, double &value ) const override + bool checkThreshold( const QgsAbstractGeometry *geom, double &value ) const override { QgsRectangle bb = geom->boundingBox(); double maxDim = qMax( bb.width(), bb.height() ); diff --git a/src/plugins/geometry_checker/checks/qgsgeometrytypecheck.cpp b/src/plugins/geometry_checker/checks/qgsgeometrytypecheck.cpp index 0c547050610..81f8c091da2 100644 --- a/src/plugins/geometry_checker/checks/qgsgeometrytypecheck.cpp +++ b/src/plugins/geometry_checker/checks/qgsgeometrytypecheck.cpp @@ -14,11 +14,11 @@ ***************************************************************************/ #include "qgsgeometrytypecheck.h" -#include "qgsgeometrycollectionv2.h" -#include "qgsmulticurvev2.h" -#include "qgsmultilinestringv2.h" -#include "qgsmultipointv2.h" -#include "qgsmultipolygonv2.h" +#include "qgsgeometrycollection.h" +#include "qgsmulticurve.h" +#include "qgsmultilinestring.h" +#include "qgsmultipoint.h" +#include "qgsmultipolygon.h" #include "qgsmultirenderchecker.h" #include "../utils/qgsfeaturepool.h" @@ -35,7 +35,7 @@ void QgsGeometryTypeCheck::collectErrors( QList& errors, continue; } QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* geom = featureGeom.geometry(); + QgsAbstractGeometry* geom = featureGeom.geometry(); QgsWkbTypes::Type type = QgsWkbTypes::flatType( geom->wkbType() ); if (( mAllowedTypes & ( 1 << type ) ) == 0 ) @@ -54,7 +54,7 @@ void QgsGeometryTypeCheck::fixError( QgsGeometryCheckError* error, int method, i return; } QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* geom = featureGeom.geometry(); + QgsAbstractGeometry* geom = featureGeom.geometry(); // Check if error still applies QgsWkbTypes::Type type = QgsWkbTypes::flatType( geom->wkbType() ); @@ -91,7 +91,7 @@ void QgsGeometryTypeCheck::fixError( QgsGeometryCheckError* error, int method, i // Check if corresponding multi type is allowed else if ( QgsWkbTypes::isSingleType( type ) && (( 1 << QgsWkbTypes::multiType( type ) ) & mAllowedTypes ) != 0 ) { - QgsGeometryCollectionV2* geomCollection = nullptr; + QgsGeometryCollection* geomCollection = nullptr; switch ( QgsWkbTypes::multiType( type ) ) { case QgsWkbTypes::MultiPoint: @@ -101,7 +101,7 @@ void QgsGeometryTypeCheck::fixError( QgsGeometryCheckError* error, int method, i } case QgsWkbTypes::MultiLineString: { - geomCollection = new QgsMultiLineStringV2(); + geomCollection = new QgsMultiLineString(); break; } case QgsWkbTypes::MultiPolygon: @@ -111,12 +111,12 @@ void QgsGeometryTypeCheck::fixError( QgsGeometryCheckError* error, int method, i } case QgsWkbTypes::MultiCurve: { - geomCollection = new QgsMultiCurveV2(); + geomCollection = new QgsMultiCurve(); break; } case QgsWkbTypes::MultiSurface: { - geomCollection = new QgsMultiSurfaceV2(); + geomCollection = new QgsMultiSurface(); break; } default: diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp b/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp index 21e3ed8a4d3..c33a3bfc903 100644 --- a/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp +++ b/src/plugins/geometry_checker/ui/qgsgeometrycheckerresulttab.cpp @@ -326,7 +326,7 @@ void QgsGeometryCheckerResultTab::highlightErrors( bool current ) { QgsGeometryCheckError* error = ui.tableWidgetErrors->item( item->row(), 0 )->data( Qt::UserRole ).value(); - QgsAbstractGeometryV2* geometry = error->geometry(); + QgsAbstractGeometry* geometry = error->geometry(); if ( ui.checkBoxHighlight->isChecked() && geometry ) { QgsRubberBand* featureRubberBand = new QgsRubberBand( mIface->mapCanvas() ); diff --git a/src/plugins/geometry_checker/utils/qgsgeometrycheckerutils.cpp b/src/plugins/geometry_checker/utils/qgsgeometrycheckerutils.cpp index a7cc7c7acf0..bca2fe4f90f 100644 --- a/src/plugins/geometry_checker/utils/qgsgeometrycheckerutils.cpp +++ b/src/plugins/geometry_checker/utils/qgsgeometrycheckerutils.cpp @@ -17,34 +17,34 @@ #include "qgsgeometryutils.h" #include #include "qgsgeos.h" -#include "qgsgeometrycollectionv2.h" -#include "qgssurfacev2.h" +#include "qgsgeometrycollection.h" +#include "qgssurface.h" namespace QgsGeometryCheckerUtils { - QgsGeometryEngine* createGeomEngine( QgsAbstractGeometryV2* geometry, double tolerance ) + QgsGeometryEngine* createGeomEngine( QgsAbstractGeometry* geometry, double tolerance ) { return new QgsGeos( geometry, tolerance ); } - QgsAbstractGeometryV2* getGeomPart( QgsAbstractGeometryV2* geom, int partIdx ) + QgsAbstractGeometry* getGeomPart( QgsAbstractGeometry* geom, int partIdx ) { - if ( dynamic_cast( geom ) ) + if ( dynamic_cast( geom ) ) { - return static_cast( geom )->geometryN( partIdx ); + return static_cast( geom )->geometryN( partIdx ); } return geom; } - void filter1DTypes( QgsAbstractGeometryV2* geom ) + void filter1DTypes( QgsAbstractGeometry* geom ) { - if ( dynamic_cast( geom ) ) + if ( dynamic_cast( geom ) ) { - QgsGeometryCollectionV2* geomCollection = static_cast( geom ); + QgsGeometryCollection* geomCollection = static_cast( geom ); for ( int nParts = geom->partCount(), iPart = nParts - 1; iPart >= 0; --iPart ) { - if ( !dynamic_cast( geomCollection->geometryN( iPart ) ) ) + if ( !dynamic_cast( geomCollection->geometryN( iPart ) ) ) { geomCollection->removeGeometry( iPart ); } @@ -60,7 +60,7 @@ namespace QgsGeometryCheckerUtils return nom / qSqrt( dx * dx + dy * dy ); } - double sharedEdgeLength( const QgsAbstractGeometryV2* geom1, const QgsAbstractGeometryV2* geom2, double tol ) + double sharedEdgeLength( const QgsAbstractGeometry* geom1, const QgsAbstractGeometry* geom2, double tol ) { double len = 0; diff --git a/src/plugins/geometry_checker/utils/qgsgeometrycheckerutils.h b/src/plugins/geometry_checker/utils/qgsgeometrycheckerutils.h index abd4ccd970e..c280a32ff43 100644 --- a/src/plugins/geometry_checker/utils/qgsgeometrycheckerutils.h +++ b/src/plugins/geometry_checker/utils/qgsgeometrycheckerutils.h @@ -17,7 +17,7 @@ #ifndef QGS_GEOMETRYCHECKERUTILS_H #define QGS_GEOMETRYCHECKERUTILS_H -#include "geometry/qgsabstractgeometryv2.h" +#include "geometry/qgsabstractgeometry.h" #include "geometry/qgspointv2.h" #include @@ -26,18 +26,18 @@ class QgsGeometryEngine; namespace QgsGeometryCheckerUtils { - QgsGeometryEngine *createGeomEngine( QgsAbstractGeometryV2* geometry, double tolerance ); + QgsGeometryEngine *createGeomEngine( QgsAbstractGeometry* geometry, double tolerance ); - QgsAbstractGeometryV2* getGeomPart( QgsAbstractGeometryV2* geom, int partIdx ); + QgsAbstractGeometry* getGeomPart( QgsAbstractGeometry* geom, int partIdx ); - void filter1DTypes( QgsAbstractGeometryV2* geom ); + void filter1DTypes( QgsAbstractGeometry* geom ); /** * @brief Return the number of points in a polyline, accounting for duplicate start and end point if the polyline is closed * @param polyLine The polyline * @return The number of distinct points of the polyline */ - inline int polyLineSize( const QgsAbstractGeometryV2* geom, int iPart, int iRing, bool* isClosed = nullptr ) + inline int polyLineSize( const QgsAbstractGeometry* geom, int iPart, int iRing, bool* isClosed = nullptr ) { if ( !geom->isEmpty() ) { @@ -57,7 +57,7 @@ namespace QgsGeometryCheckerUtils } } - double sharedEdgeLength( const QgsAbstractGeometryV2* geom1, const QgsAbstractGeometryV2* geom2, double tol ); + double sharedEdgeLength( const QgsAbstractGeometry* geom1, const QgsAbstractGeometry* geom2, double tol ); /** * @brief Determine whether two points are equal up to the specified tolerance @@ -72,7 +72,7 @@ namespace QgsGeometryCheckerUtils return ( dx * dx + dy * dy ) < tol * tol; } - inline bool canDeleteVertex( const QgsAbstractGeometryV2* geom, int iPart, int iRing ) + inline bool canDeleteVertex( const QgsAbstractGeometry* geom, int iPart, int iRing ) { int nVerts = geom->vertexCount( iPart, iRing ); QgsPointV2 front = geom->vertexAt( QgsVertexId( iPart, iRing, 0 ) ); diff --git a/src/plugins/geometry_snapper/qgsgeometrysnapper.cpp b/src/plugins/geometry_snapper/qgsgeometrysnapper.cpp index a04497a5d82..1231504c239 100644 --- a/src/plugins/geometry_snapper/qgsgeometrysnapper.cpp +++ b/src/plugins/geometry_snapper/qgsgeometrysnapper.cpp @@ -78,7 +78,7 @@ void QgsGeometrySnapper::processFeature( QgsFeatureId id ) // Get potential reference features and construct snap index - QList refGeometries; + QList refGeometries; mIndexMutex.lock(); QList refFeatureIds = mIndex.intersects( feature.geometry().boundingBox() ); mIndexMutex.unlock(); @@ -97,14 +97,14 @@ void QgsGeometrySnapper::processFeature( QgsFeatureId id ) } } QgsSnapIndex refSnapIndex( center, 10 * snapTolerance ); - Q_FOREACH ( const QgsAbstractGeometryV2* geom, refGeometries ) + Q_FOREACH ( const QgsAbstractGeometry* geom, refGeometries ) { refSnapIndex.addGeometry( geom ); } // Snap geometries QgsGeometry featureGeom = feature.geometry(); - QgsAbstractGeometryV2* subjGeom = featureGeom.geometry(); + QgsAbstractGeometry* subjGeom = featureGeom.geometry(); QList < QList< QList > > subjPointFlags; // Pass 1: snap vertices of subject geometry to reference vertices @@ -149,12 +149,12 @@ void QgsGeometrySnapper::processFeature( QgsFeatureId id ) QgsSnapIndex* subjSnapIndex = new QgsSnapIndex( center, 10 * snapTolerance ); subjSnapIndex->addGeometry( subjGeom ); - QgsAbstractGeometryV2* origSubjGeom = subjGeom->clone(); + QgsAbstractGeometry* origSubjGeom = subjGeom->clone(); QgsSnapIndex* origSubjSnapIndex = new QgsSnapIndex( center, 10 * snapTolerance ); origSubjSnapIndex->addGeometry( origSubjGeom ); // Pass 2: add missing vertices to subject geometry - Q_FOREACH ( const QgsAbstractGeometryV2* refGeom, refGeometries ) + Q_FOREACH ( const QgsAbstractGeometry* refGeom, refGeometries ) { for ( int iPart = 0, nParts = refGeom->partCount(); iPart < nParts; ++iPart ) { @@ -258,7 +258,7 @@ bool QgsGeometrySnapper::getFeature( QgsVectorLayer *layer, QMutex &mutex, QgsFe } -int QgsGeometrySnapper::polyLineSize( const QgsAbstractGeometryV2* geom, int iPart, int iRing ) const +int QgsGeometrySnapper::polyLineSize( const QgsAbstractGeometry* geom, int iPart, int iRing ) const { int nVerts = geom->vertexCount( iPart, iRing ); QgsPointV2 front = geom->vertexAt( QgsVertexId( iPart, iRing, 0 ) ); diff --git a/src/plugins/geometry_snapper/qgsgeometrysnapper.h b/src/plugins/geometry_snapper/qgsgeometrysnapper.h index a28c61f124b..7b11882694b 100644 --- a/src/plugins/geometry_snapper/qgsgeometrysnapper.h +++ b/src/plugins/geometry_snapper/qgsgeometrysnapper.h @@ -24,7 +24,7 @@ class QgsMapSettings; class QgsVectorLayer; -class QgsAbstractGeometryV2; +class QgsAbstractGeometry; class QgsGeometrySnapper : public QObject { @@ -63,7 +63,7 @@ class QgsGeometrySnapper : public QObject void processFeature( QgsFeatureId id ); bool getFeature( QgsVectorLayer* layer, QMutex& mutex, QgsFeatureId id, QgsFeature& feature ); - int polyLineSize( const QgsAbstractGeometryV2* geom, int iPart, int iRing ) const; + int polyLineSize( const QgsAbstractGeometry* geom, int iPart, int iRing ) const; }; #endif // QGS_GEOMETRY_SNAPPER_H diff --git a/src/plugins/geometry_snapper/qgssnapindex.cpp b/src/plugins/geometry_snapper/qgssnapindex.cpp index 6cfe5cafd2f..c0519bcff1b 100644 --- a/src/plugins/geometry_snapper/qgssnapindex.cpp +++ b/src/plugins/geometry_snapper/qgssnapindex.cpp @@ -316,7 +316,7 @@ void QgsSnapIndex::addSegment( const CoordIdx* idxFrom, const CoordIdx* idxTo ) } } -void QgsSnapIndex::addGeometry( const QgsAbstractGeometryV2* geom ) +void QgsSnapIndex::addGeometry( const QgsAbstractGeometry* geom ) { for ( int iPart = 0, nParts = geom->partCount(); iPart < nParts; ++iPart ) { diff --git a/src/plugins/geometry_snapper/qgssnapindex.h b/src/plugins/geometry_snapper/qgssnapindex.h index 765d86439ae..3dd800c99cd 100644 --- a/src/plugins/geometry_snapper/qgssnapindex.h +++ b/src/plugins/geometry_snapper/qgssnapindex.h @@ -18,20 +18,20 @@ #define QGSSNAPINDEX_H #include "qgspointv2.h" -#include "qgsabstractgeometryv2.h" +#include "qgsabstractgeometry.h" class QgsSnapIndex { public: struct CoordIdx { - CoordIdx( const QgsAbstractGeometryV2* _geom, QgsVertexId _vidx ) + CoordIdx( const QgsAbstractGeometry* _geom, QgsVertexId _vidx ) : geom( _geom ) , vidx( _vidx ) {} QgsPointV2 point() const { return geom->vertexAt( vidx ); } - const QgsAbstractGeometryV2* geom; + const QgsAbstractGeometry* geom; QgsVertexId vidx; }; @@ -69,7 +69,7 @@ class QgsSnapIndex QgsSnapIndex( const QgsPointV2& origin, double cellSize ); ~QgsSnapIndex(); - void addGeometry( const QgsAbstractGeometryV2 *geom ); + void addGeometry( const QgsAbstractGeometry *geom ); QgsPointV2 getClosestSnapToPoint( const QgsPointV2& p, const QgsPointV2& q ); SnapItem *getSnapItem( const QgsPointV2& pos, double tol, PointSnapItem **pSnapPoint = nullptr, SegmentSnapItem **pSnapSegment = nullptr ) const; diff --git a/src/plugins/globe/featuresource/qgsglobefeatureutils.h b/src/plugins/globe/featuresource/qgsglobefeatureutils.h index 3c7af412cb4..246d16c1436 100644 --- a/src/plugins/globe/featuresource/qgsglobefeatureutils.h +++ b/src/plugins/globe/featuresource/qgsglobefeatureutils.h @@ -21,11 +21,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include class QgsGlobeFeatureUtils @@ -41,9 +41,9 @@ class QgsGlobeFeatureUtils return osg::Vec3d( pt.x(), pt.y(), pt.z() ); } - static inline osgEarth::Features::LineString* lineStringFromQgsLineString( const QgsLineStringV2* lineString ) + static inline osgEarth::Features::LineString* lineStringFromQgsLineString( const QgsLineString* lineString ) { - QgsLineStringV2* linearString = lineString->curveToLine(); + QgsLineString* linearString = lineString->curveToLine(); osgEarth::Features::LineString* retLineString = new osgEarth::Features::LineString(); for ( int iVtx = 0, nVtx = linearString->vertexCount(); iVtx < nVtx; ++iVtx ) { @@ -116,16 +116,16 @@ class QgsGlobeFeatureUtils case QgsWkbTypes::CircularString: case QgsWkbTypes::CompoundCurve: { - return lineStringFromQgsLineString( static_cast( geom.geometry() ) ); + return lineStringFromQgsLineString( static_cast( geom.geometry() ) ); } case QgsWkbTypes::MultiLineString: { osgEarth::Features::MultiGeometry* multiGeometry = new osgEarth::Features::MultiGeometry(); - QgsMultiLineStringV2* multiLineString = static_cast( geom.geometry() ); + QgsMultiLineString* multiLineString = static_cast( geom.geometry() ); for ( int i = 0, n = multiLineString->numGeometries(); i < n; ++i ) { - multiGeometry->getComponents().push_back( lineStringFromQgsLineString( static_cast( multiLineString->geometryN( i ) ) ) ); + multiGeometry->getComponents().push_back( lineStringFromQgsLineString( static_cast( multiLineString->geometryN( i ) ) ) ); } return multiGeometry; } diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp index 1a9ec615fe2..97b99ab3e90 100644 --- a/src/plugins/globe/globe_plugin.cpp +++ b/src/plugins/globe/globe_plugin.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include @@ -777,9 +777,9 @@ void GlobePlugin::addModelLayer( QgsVectorLayer* vLayer, QgsGlobeVectorLayerConf featureOpt.setLayer( vLayer ); osgEarth::Style style; - if ( !vLayer->rendererV2()->symbols().isEmpty() ) + if ( !vLayer->renderer()->symbols().isEmpty() ) { - Q_FOREACH ( QgsSymbol* sym, vLayer->rendererV2()->symbols() ) + Q_FOREACH ( QgsSymbol* sym, vLayer->renderer()->symbols() ) { if ( sym->type() == QgsSymbol::Line ) { diff --git a/src/plugins/grass/modules/i.group.qgm b/src/plugins/grass/modules/i.group.qgm index 8754072759c..3eb39c0ea42 100644 --- a/src/plugins/grass/modules/i.group.qgm +++ b/src/plugins/grass/modules/i.group.qgm @@ -1,4 +1,4 @@ - + diff --git a/src/plugins/grass/modules/i.segment.qgm b/src/plugins/grass/modules/i.segment.qgm index 971e52563b1..22b1915e495 100644 --- a/src/plugins/grass/modules/i.segment.qgm +++ b/src/plugins/grass/modules/i.segment.qgm @@ -1,4 +1,4 @@ - + diff --git a/src/plugins/grass/modules/r.in.lidar.qgm b/src/plugins/grass/modules/r.in.lidar.qgm index 8bded6aa8c1..96da74a7624 100644 --- a/src/plugins/grass/modules/r.in.lidar.qgm +++ b/src/plugins/grass/modules/r.in.lidar.qgm @@ -1,4 +1,4 @@ - + diff --git a/src/plugins/grass/modules/r.pack.qgm b/src/plugins/grass/modules/r.pack.qgm index 4e3716305e2..d2c3b228c86 100644 --- a/src/plugins/grass/modules/r.pack.qgm +++ b/src/plugins/grass/modules/r.pack.qgm @@ -1,4 +1,4 @@ - + diff --git a/src/plugins/grass/modules/r.stats.quantile.qgm b/src/plugins/grass/modules/r.stats.quantile.qgm index 05f74334314..07782270927 100644 --- a/src/plugins/grass/modules/r.stats.quantile.qgm +++ b/src/plugins/grass/modules/r.stats.quantile.qgm @@ -1,4 +1,4 @@ - + diff --git a/src/plugins/grass/modules/r.stats.zonal.qgm b/src/plugins/grass/modules/r.stats.zonal.qgm index 75ee944c954..576f6a5b6fd 100644 --- a/src/plugins/grass/modules/r.stats.zonal.qgm +++ b/src/plugins/grass/modules/r.stats.zonal.qgm @@ -1,4 +1,4 @@ - + diff --git a/src/plugins/grass/modules/r.unpack.qgm b/src/plugins/grass/modules/r.unpack.qgm index eb94e3774fc..0f90dfebb30 100644 --- a/src/plugins/grass/modules/r.unpack.qgm +++ b/src/plugins/grass/modules/r.unpack.qgm @@ -1,4 +1,4 @@ - + diff --git a/src/plugins/grass/modules/v.in.lidar.qgm b/src/plugins/grass/modules/v.in.lidar.qgm index 3d48fc74431..93d0b77a475 100644 --- a/src/plugins/grass/modules/v.in.lidar.qgm +++ b/src/plugins/grass/modules/v.in.lidar.qgm @@ -1,4 +1,4 @@ - + diff --git a/src/plugins/grass/modules/v.pack.qgm b/src/plugins/grass/modules/v.pack.qgm index 5ce4d0cd0ab..d2643bc738f 100644 --- a/src/plugins/grass/modules/v.pack.qgm +++ b/src/plugins/grass/modules/v.pack.qgm @@ -1,4 +1,4 @@ - + diff --git a/src/plugins/grass/modules/v.unpack.qgm b/src/plugins/grass/modules/v.unpack.qgm index 4ed75b770d6..70f69075a72 100644 --- a/src/plugins/grass/modules/v.unpack.qgm +++ b/src/plugins/grass/modules/v.unpack.qgm @@ -1,4 +1,4 @@ - + diff --git a/src/plugins/grass/qgsgrasseditrenderer.cpp b/src/plugins/grass/qgsgrasseditrenderer.cpp index a0047a2b23f..132fdcf1b6a 100644 --- a/src/plugins/grass/qgsgrasseditrenderer.cpp +++ b/src/plugins/grass/qgsgrasseditrenderer.cpp @@ -16,13 +16,13 @@ #include -#include "qgscategorizedsymbolrendererv2.h" -#include "qgscategorizedsymbolrendererv2widget.h" +#include "qgscategorizedsymbolrenderer.h" +#include "qgscategorizedsymbolrendererwidget.h" #include "qgsfeature.h" -#include "qgslinesymbollayerv2.h" +#include "qgslinesymbollayer.h" #include "qgslogger.h" -#include "qgsmarkersymbollayerv2.h" -#include "qgsrendererv2registry.h" +#include "qgsmarkersymbollayer.h" +#include "qgsrendererregistry.h" #include "qgssymbollayer.h" #include "qgssymbollayerutils.h" #include "qgssymbol.h" @@ -31,7 +31,7 @@ #include "qgsgrassprovider.h" QgsGrassEditRenderer::QgsGrassEditRenderer() - : QgsFeatureRendererV2( "grassEdit" ) + : QgsFeatureRenderer( "grassEdit" ) , mLineRenderer( 0 ) , mMarkerRenderer( 0 ) { @@ -54,29 +54,29 @@ QgsGrassEditRenderer::QgsGrassEditRenderer() QgsCategoryList categoryList; // first/last vertex marker to distinguish vertices from nodes - QgsMarkerLineSymbolLayerV2 * firstVertexMarkerLine = new QgsMarkerLineSymbolLayerV2( false ); - QgsSimpleMarkerSymbolLayerV2 *markerSymbolLayer = new QgsSimpleMarkerSymbolLayerV2( QgsSimpleMarkerSymbolLayerBase::Cross2, 2 ); + QgsMarkerLineSymbolLayer * firstVertexMarkerLine = new QgsMarkerLineSymbolLayer( false ); + QgsSimpleMarkerSymbolLayer *markerSymbolLayer = new QgsSimpleMarkerSymbolLayer( QgsSimpleMarkerSymbolLayerBase::Cross2, 2 ); markerSymbolLayer->setColor( QColor( 255, 0, 0 ) ); markerSymbolLayer->setBorderColor( QColor( 255, 0, 0 ) ); markerSymbolLayer->setOutlineWidth( 0.5 ); QgsSymbolLayerList markerLayers; markerLayers << markerSymbolLayer; - QgsMarkerSymbolV2 * markerSymbol = new QgsMarkerSymbolV2( markerLayers ); + QgsMarkerSymbol * markerSymbol = new QgsMarkerSymbol( markerLayers ); firstVertexMarkerLine->setSubSymbol( markerSymbol ); - firstVertexMarkerLine->setPlacement( QgsMarkerLineSymbolLayerV2::FirstVertex ); - QgsMarkerLineSymbolLayerV2 * lastVertexMarkerLine = static_cast( firstVertexMarkerLine->clone() ); - lastVertexMarkerLine->setPlacement( QgsMarkerLineSymbolLayerV2::LastVertex ); + firstVertexMarkerLine->setPlacement( QgsMarkerLineSymbolLayer::FirstVertex ); + QgsMarkerLineSymbolLayer * lastVertexMarkerLine = static_cast( firstVertexMarkerLine->clone() ); + lastVertexMarkerLine->setPlacement( QgsMarkerLineSymbolLayer::LastVertex ); Q_FOREACH ( int value, colors.keys() ) { QgsSymbol * symbol = QgsSymbol::defaultSymbol( QgsWkbTypes::LineGeometry ); symbol->setColor( colors.value( value ) ); symbol->appendSymbolLayer( firstVertexMarkerLine->clone() ); symbol->appendSymbolLayer( lastVertexMarkerLine->clone() ); - categoryList << QgsRendererCategoryV2( QVariant( value ), symbol, labels.value( value ) ); + categoryList << QgsRendererCategory( QVariant( value ), symbol, labels.value( value ) ); } delete firstVertexMarkerLine; delete lastVertexMarkerLine; - mLineRenderer = new QgsCategorizedSymbolRendererV2( "topo_symbol", categoryList ); + mLineRenderer = new QgsCategorizedSymbolRenderer( "topo_symbol", categoryList ); colors.clear(); labels.clear(); @@ -97,10 +97,10 @@ QgsGrassEditRenderer::QgsGrassEditRenderer() { QgsSymbol * symbol = QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ); symbol->setColor( colors.value( value ) ); - categoryList << QgsRendererCategoryV2( QVariant( value ), symbol, labels.value( value ) ); + categoryList << QgsRendererCategory( QVariant( value ), symbol, labels.value( value ) ); } - mMarkerRenderer = new QgsCategorizedSymbolRendererV2( "topo_symbol", categoryList ); + mMarkerRenderer = new QgsCategorizedSymbolRenderer( "topo_symbol", categoryList ); } QgsGrassEditRenderer::~QgsGrassEditRenderer() @@ -109,12 +109,12 @@ QgsGrassEditRenderer::~QgsGrassEditRenderer() delete mLineRenderer; } -void QgsGrassEditRenderer::setLineRenderer( QgsFeatureRendererV2 *renderer ) +void QgsGrassEditRenderer::setLineRenderer( QgsFeatureRenderer *renderer ) { delete mLineRenderer; mLineRenderer = renderer; } -void QgsGrassEditRenderer::setMarkerRenderer( QgsFeatureRendererV2 *renderer ) +void QgsGrassEditRenderer::setMarkerRenderer( QgsFeatureRenderer *renderer ) { delete mMarkerRenderer; mMarkerRenderer = renderer; @@ -178,7 +178,7 @@ QList QgsGrassEditRenderer::usedAttributes() return mLineRenderer->usedAttributes(); } -QgsFeatureRendererV2* QgsGrassEditRenderer::clone() const +QgsFeatureRenderer* QgsGrassEditRenderer::clone() const { QgsGrassEditRenderer* r = new QgsGrassEditRenderer(); if ( mLineRenderer ) @@ -219,7 +219,7 @@ QDomElement QgsGrassEditRenderer::save( QDomDocument& doc ) } -QgsFeatureRendererV2* QgsGrassEditRenderer::create( QDomElement& element ) +QgsFeatureRenderer* QgsGrassEditRenderer::create( QDomElement& element ) { QgsGrassEditRenderer *renderer = new QgsGrassEditRenderer(); @@ -231,10 +231,10 @@ QgsFeatureRendererV2* QgsGrassEditRenderer::create( QDomElement& element ) { QString rendererType = elem.attribute( "type" ); QgsDebugMsg( "childElem.tagName() = " + childElem.tagName() + " rendererType = " + rendererType ); - QgsRendererV2AbstractMetadata* meta = QgsRendererV2Registry::instance()->rendererMetadata( rendererType ); + QgsRendererAbstractMetadata* meta = QgsRendererRegistry::instance()->rendererMetadata( rendererType ); if ( meta ) { - QgsFeatureRendererV2* subRenderer = meta->createRenderer( elem ); + QgsFeatureRenderer* subRenderer = meta->createRenderer( elem ); if ( subRenderer ) { QgsDebugMsg( "renderer created : " + renderer->type() ); @@ -256,13 +256,13 @@ QgsFeatureRendererV2* QgsGrassEditRenderer::create( QDomElement& element ) //--------------------------------------- QgsGrassEditRendererWidget -------------------------------------------- -QgsRendererV2Widget* QgsGrassEditRendererWidget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) +QgsRendererWidget* QgsGrassEditRendererWidget::create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) { return new QgsGrassEditRendererWidget( layer, style, renderer ); } -QgsGrassEditRendererWidget::QgsGrassEditRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) - : QgsRendererV2Widget( layer, style ) +QgsGrassEditRendererWidget::QgsGrassEditRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ) + : QgsRendererWidget( layer, style ) , mRenderer( 0 ) , mLineRendererWidget( 0 ) , mPointRendererWidget( 0 ) @@ -275,10 +275,10 @@ QgsGrassEditRendererWidget::QgsGrassEditRendererWidget( QgsVectorLayer* layer, Q QVBoxLayout* layout = new QVBoxLayout( this ); - mLineRendererWidget = QgsCategorizedSymbolRendererV2Widget::create( layer, style, mRenderer->lineRenderer()->clone() ); + mLineRendererWidget = QgsCategorizedSymbolRendererWidget::create( layer, style, mRenderer->lineRenderer()->clone() ); layout->addWidget( mLineRendererWidget ); - mPointRendererWidget = QgsCategorizedSymbolRendererV2Widget::create( layer, style, mRenderer->pointRenderer()->clone() ); + mPointRendererWidget = QgsCategorizedSymbolRendererWidget::create( layer, style, mRenderer->pointRenderer()->clone() ); layout->addWidget( mPointRendererWidget ); } @@ -287,7 +287,7 @@ QgsGrassEditRendererWidget::~QgsGrassEditRendererWidget() delete mRenderer; } -QgsFeatureRendererV2* QgsGrassEditRendererWidget::renderer() +QgsFeatureRenderer* QgsGrassEditRendererWidget::renderer() { mRenderer->setLineRenderer( mLineRendererWidget->renderer()->clone() ); mRenderer->setMarkerRenderer( mPointRendererWidget->renderer()->clone() ); diff --git a/src/plugins/grass/qgsgrasseditrenderer.h b/src/plugins/grass/qgsgrasseditrenderer.h index d1d00577b2d..f60b0e330d0 100644 --- a/src/plugins/grass/qgsgrasseditrenderer.h +++ b/src/plugins/grass/qgsgrasseditrenderer.h @@ -17,14 +17,14 @@ #define QGSGRASSEDITRENDERER_H #include "qgis.h" -#include "qgscategorizedsymbolrendererv2.h" -#include "qgsrendererv2.h" +#include "qgscategorizedsymbolrenderer.h" +#include "qgsrenderer.h" #include "qgssymbol.h" -#include "qgscategorizedsymbolrendererv2.h" -#include "qgsrendererv2widget.h" +#include "qgscategorizedsymbolrenderer.h" +#include "qgsrendererwidget.h" -class QgsGrassEditRenderer : public QgsFeatureRendererV2 +class QgsGrassEditRenderer : public QgsFeatureRenderer { public: @@ -40,43 +40,43 @@ class QgsGrassEditRenderer : public QgsFeatureRendererV2 virtual QList usedAttributes() override; - virtual QgsFeatureRendererV2* clone() const override; + virtual QgsFeatureRenderer* clone() const override; virtual QgsSymbolList symbols( QgsRenderContext& context ) override; virtual QString dump() const override; - QgsFeatureRendererV2 *lineRenderer() const { return mLineRenderer; } - QgsFeatureRendererV2 *pointRenderer() const { return mMarkerRenderer; } + QgsFeatureRenderer *lineRenderer() const { return mLineRenderer; } + QgsFeatureRenderer *pointRenderer() const { return mMarkerRenderer; } - void setLineRenderer( QgsFeatureRendererV2 *renderer ); - void setMarkerRenderer( QgsFeatureRendererV2 *renderer ); + void setLineRenderer( QgsFeatureRenderer *renderer ); + void setMarkerRenderer( QgsFeatureRenderer *renderer ); virtual QDomElement save( QDomDocument& doc ) override; - static QgsFeatureRendererV2* create( QDomElement& element ); + static QgsFeatureRenderer* create( QDomElement& element ); protected: - QgsFeatureRendererV2 *mLineRenderer; - QgsFeatureRendererV2 *mMarkerRenderer; + QgsFeatureRenderer *mLineRenderer; + QgsFeatureRenderer *mMarkerRenderer; }; -class QgsGrassEditRendererWidget : public QgsRendererV2Widget +class QgsGrassEditRendererWidget : public QgsRendererWidget { Q_OBJECT public: - static QgsRendererV2Widget* create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); + static QgsRendererWidget* create( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); - QgsGrassEditRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ); + QgsGrassEditRendererWidget( QgsVectorLayer* layer, QgsStyle* style, QgsFeatureRenderer* renderer ); ~QgsGrassEditRendererWidget(); - virtual QgsFeatureRendererV2* renderer() override; + virtual QgsFeatureRenderer* renderer() override; protected: QgsGrassEditRenderer* mRenderer; - QgsRendererV2Widget* mLineRendererWidget; - QgsRendererV2Widget* mPointRendererWidget; + QgsRendererWidget* mLineRendererWidget; + QgsRendererWidget* mPointRendererWidget; }; #endif // QGSGRASSEDITRENDERER_H diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp index cf9d57571f8..df76a4866bd 100644 --- a/src/plugins/grass/qgsgrassplugin.cpp +++ b/src/plugins/grass/qgsgrassplugin.cpp @@ -37,7 +37,7 @@ #include "qgsrubberband.h" #include "qgsproject.h" #include "qgsproviderregistry.h" -#include "qgsrendererv2registry.h" +#include "qgsrendererregistry.h" #include "qgsvectorlayer.h" #include "qgsmaplayerregistry.h" @@ -290,9 +290,9 @@ void QgsGrassPlugin::initGui() qGisInterface->addDockWidget( Qt::RightDockWidgetArea, mTools ); // add edit renderer immediately so that if project was saved during editing, the layer can be loaded - if ( !QgsRendererV2Registry::instance()->renderersList().contains( "grassEdit" ) ) + if ( !QgsRendererRegistry::instance()->renderersList().contains( "grassEdit" ) ) { - QgsRendererV2Registry::instance()->addRenderer( new QgsRendererV2Metadata( "grassEdit", + QgsRendererRegistry::instance()->addRenderer( new QgsRendererMetadata( "grassEdit", QObject::tr( "GRASS edit" ), QgsGrassEditRenderer::create, QIcon( QgsApplication::defaultThemePath() + "rendererGrassSymbol.svg" ), @@ -419,7 +419,7 @@ void QgsGrassPlugin::onEditingStarted() QgsGrassEditRenderer *renderer = new QgsGrassEditRenderer(); - vectorLayer->setRendererV2( renderer ); + vectorLayer->setRenderer( renderer ); } grassProvider->startEditing( vectorLayer ); diff --git a/src/plugins/grass/scripts/t.rast.what.qgis.py b/src/plugins/grass/scripts/t.rast.what.qgis.py index b2dbba37689..205e1257b59 100644 --- a/src/plugins/grass/scripts/t.rast.what.qgis.py +++ b/src/plugins/grass/scripts/t.rast.what.qgis.py @@ -446,7 +446,7 @@ def one_point_per_timerow_output(separator, output_files, output_time_list, start, end = map.get_temporal_extent_as_tuple() time_string = "%(sep)s%(start)s;%(end)s"\ % ({"start": str(start), "end": str(end), - "sep": separator}) + "sep": separator}) header += time_string lines = in_file.readlines() diff --git a/src/plugins/spatialquery/qgsspatialquery.cpp b/src/plugins/spatialquery/qgsspatialquery.cpp index fe21c91a563..51fe57b0fae 100644 --- a/src/plugins/spatialquery/qgsspatialquery.cpp +++ b/src/plugins/spatialquery/qgsspatialquery.cpp @@ -208,7 +208,7 @@ void QgsSpatialQuery::setSpatialIndexReference( QgsFeatureIds &qsetIndexInvalidR void QgsSpatialQuery::execQuery( QgsFeatureIds &qsetIndexResult, QgsFeatureIds &qsetIndexInvalidTarget, int relation ) { - bool ( QgsGeometryEngine::* operation )( const QgsAbstractGeometryV2&, QString* ) const; + bool ( QgsGeometryEngine::* operation )( const QgsAbstractGeometry&, QString* ) const; switch ( relation ) { case Disjoint: @@ -245,7 +245,7 @@ void QgsSpatialQuery::execQuery( QgsFeatureIds &qsetIndexResult, QgsFeatureIds & coordinateTransform->setCoordinateTransform( mLayerTarget, mLayerReference ); // Set function for populate result - void ( QgsSpatialQuery::* funcPopulateIndexResult )( QgsFeatureIds&, QgsFeatureId, const QgsGeometry&, bool ( QgsGeometryEngine::* )( const QgsAbstractGeometryV2&, QString* ) const ); + void ( QgsSpatialQuery::* funcPopulateIndexResult )( QgsFeatureIds&, QgsFeatureId, const QgsGeometry&, bool ( QgsGeometryEngine::* )( const QgsAbstractGeometry&, QString* ) const ); funcPopulateIndexResult = ( relation == Disjoint ) ? &QgsSpatialQuery::populateIndexResultDisjoint : &QgsSpatialQuery::populateIndexResult; @@ -273,7 +273,7 @@ void QgsSpatialQuery::execQuery( QgsFeatureIds &qsetIndexResult, QgsFeatureIds & void QgsSpatialQuery::populateIndexResult( QgsFeatureIds &qsetIndexResult, QgsFeatureId idTarget, const QgsGeometry& geomTarget, - bool ( QgsGeometryEngine::* op )( const QgsAbstractGeometryV2&, QString* ) const ) + bool ( QgsGeometryEngine::* op )( const QgsAbstractGeometry&, QString* ) const ) { QgsFeatureIds listIdReference = mIndexReference.intersects( geomTarget.boundingBox() ).toSet(); if ( listIdReference.isEmpty() ) @@ -305,7 +305,7 @@ void QgsSpatialQuery::populateIndexResult( void QgsSpatialQuery::populateIndexResultDisjoint( QgsFeatureIds &qsetIndexResult, QgsFeatureId idTarget, const QgsGeometry& geomTarget, - bool ( QgsGeometryEngine::* op )( const QgsAbstractGeometryV2&, QString* ) const ) + bool ( QgsGeometryEngine::* op )( const QgsAbstractGeometry&, QString* ) const ) { QgsFeatureIds listIdReference = mIndexReference.intersects( geomTarget.boundingBox() ).toSet(); if ( listIdReference.isEmpty() ) diff --git a/src/plugins/spatialquery/qgsspatialquery.h b/src/plugins/spatialquery/qgsspatialquery.h index b3b1399d527..c70db538374 100644 --- a/src/plugins/spatialquery/qgsspatialquery.h +++ b/src/plugins/spatialquery/qgsspatialquery.h @@ -137,7 +137,7 @@ class QgsSpatialQuery * \param operation Pointer to function of GEOS operation */ void populateIndexResult( QgsFeatureIds &qsetIndexResult, QgsFeatureId idTarget, const QgsGeometry& geomTarget, - bool ( QgsGeometryEngine::* operation )( const QgsAbstractGeometryV2&, QString* ) const ); + bool ( QgsGeometryEngine::* operation )( const QgsAbstractGeometry&, QString* ) const ); /** * \brief Populate index Result Disjoint * \param qsetIndexResult Reference to QSet contains the result query @@ -146,7 +146,7 @@ class QgsSpatialQuery * \param operation Pointer to function of GEOS operation */ void populateIndexResultDisjoint( QgsFeatureIds &qsetIndexResult, QgsFeatureId idTarget, const QgsGeometry& geomTarget, - bool ( QgsGeometryEngine::*operation )( const QgsAbstractGeometryV2&, QString* ) const ); + bool ( QgsGeometryEngine::*operation )( const QgsAbstractGeometry&, QString* ) const ); MngProgressBar *mPb; bool mUseReferenceSelection; diff --git a/src/providers/arcgisrest/qgsafsprovider.cpp b/src/providers/arcgisrest/qgsafsprovider.cpp index 9d8a1d37e00..32853aaf543 100644 --- a/src/providers/arcgisrest/qgsafsprovider.cpp +++ b/src/providers/arcgisrest/qgsafsprovider.cpp @@ -234,8 +234,8 @@ bool QgsAfsProvider::getFeature( const QgsFeatureId &id, QgsFeature &f, bool fet if ( fetchGeometry ) { QVariantMap geometryData = featureData["geometry"].toMap(); - QgsAbstractGeometryV2* geometry = QgsArcGisRestUtils::parseEsriGeoJSON( geometryData, queryData["geometryType"].toString(), - QgsWkbTypes::hasM( mGeometryType ), QgsWkbTypes::hasZ( mGeometryType ) ); + QgsAbstractGeometry* geometry = QgsArcGisRestUtils::parseEsriGeoJSON( geometryData, queryData["geometryType"].toString(), + QgsWkbTypes::hasM( mGeometryType ), QgsWkbTypes::hasZ( mGeometryType ) ); // Above might return 0, which is ok since in theory empty geometries are allowed feature.setGeometry( QgsGeometry( geometry ) ); } diff --git a/src/providers/arcgisrest/qgsamsprovider.cpp b/src/providers/arcgisrest/qgsamsprovider.cpp index 5861eea5409..122225bff82 100644 --- a/src/providers/arcgisrest/qgsamsprovider.cpp +++ b/src/providers/arcgisrest/qgsamsprovider.cpp @@ -419,7 +419,7 @@ QgsRasterIdentifyResult QgsAmsProvider::identify( const QgsPoint & thePoint, Qgs featureAttributes.append( attributesMap[attribute].toString() ); } QgsCoordinateReferenceSystem crs; - QgsAbstractGeometryV2* geometry = QgsArcGisRestUtils::parseEsriGeoJSON( resultMap["geometry"].toMap(), resultMap["geometryType"].toString(), false, false, &crs ); + QgsAbstractGeometry* geometry = QgsArcGisRestUtils::parseEsriGeoJSON( resultMap["geometry"].toMap(), resultMap["geometryType"].toString(), false, false, &crs ); QgsFeature feature( fields ); feature.setGeometry( QgsGeometry( geometry ) ); feature.setAttributes( featureAttributes ); diff --git a/src/providers/arcgisrest/qgsarcgisrestutils.cpp b/src/providers/arcgisrest/qgsarcgisrestutils.cpp index a7874994a5d..6b8807b53fc 100644 --- a/src/providers/arcgisrest/qgsarcgisrestutils.cpp +++ b/src/providers/arcgisrest/qgsarcgisrestutils.cpp @@ -18,14 +18,14 @@ #include "qgslogger.h" #include "qgsnetworkaccessmanager.h" #include "qgsrectangle.h" -#include "geometry/qgsabstractgeometryv2.h" -#include "geometry/qgscircularstringv2.h" -#include "geometry/qgscompoundcurvev2.h" -#include "geometry/qgscurvepolygonv2.h" -#include "geometry/qgslinestringv2.h" -#include "geometry/qgsmultipointv2.h" -#include "geometry/qgsmulticurvev2.h" -#include "geometry/qgspolygonv2.h" +#include "geometry/qgsabstractgeometry.h" +#include "geometry/qgscircularstring.h" +#include "geometry/qgscompoundcurve.h" +#include "geometry/qgscurvepolygon.h" +#include "geometry/qgslinestring.h" +#include "geometry/qgsmultipoint.h" +#include "geometry/qgsmulticurve.h" +#include "geometry/qgspolygon.h" #include "geometry/qgspointv2.h" #include @@ -114,7 +114,7 @@ static QgsPointV2* parsePoint( const QVariantList& coordList, QgsWkbTypes::Type return new QgsPointV2( pointType, x, y, z, m ); } -static QgsCircularStringV2* parseCircularString( const QVariantMap& curveData, QgsWkbTypes::Type pointType, const QgsPointV2& startPoint ) +static QgsCircularString* parseCircularString( const QVariantMap& curveData, QgsWkbTypes::Type pointType, const QgsPointV2& startPoint ) { QVariantList coordsList = curveData["c"].toList(); if ( coordsList.isEmpty() ) @@ -131,16 +131,16 @@ static QgsCircularStringV2* parseCircularString( const QVariantMap& curveData, Q points.append( *point ); delete point; } - QgsCircularStringV2* curve = new QgsCircularStringV2(); + QgsCircularString* curve = new QgsCircularString(); curve->setPoints( points ); return curve; } -static QgsCompoundCurveV2* parseCompoundCurve( const QVariantList& curvesList, QgsWkbTypes::Type pointType ) +static QgsCompoundCurve* parseCompoundCurve( const QVariantList& curvesList, QgsWkbTypes::Type pointType ) { // [[6,3],[5,3],{"b":[[3,2],[6,1],[2,4]]},[1,2],{"c": [[3,3],[1,4]]}] - QgsCompoundCurveV2* compoundCurve = new QgsCompoundCurveV2(); - QgsLineStringV2* lineString = new QgsLineStringV2(); + QgsCompoundCurve* compoundCurve = new QgsCompoundCurve(); + QgsLineString* lineString = new QgsLineString(); compoundCurve->addCurve( lineString ); foreach ( const QVariant& curveData, curvesList ) { @@ -158,7 +158,7 @@ static QgsCompoundCurveV2* parseCompoundCurve( const QVariantList& curvesList, Q else if ( curveData.type() == QVariant::Map ) { // The last point of the linestring is the start point of this circular string - QgsCircularStringV2* circularString = parseCircularString( curveData.toMap(), pointType, lineString->endPoint() ); + QgsCircularString* circularString = parseCircularString( curveData.toMap(), pointType, lineString->endPoint() ); if ( !circularString ) { delete compoundCurve; @@ -172,7 +172,7 @@ static QgsCompoundCurveV2* parseCompoundCurve( const QVariantList& curvesList, Q compoundCurve->addCurve( circularString ); // Prepare a new line string - lineString = new QgsLineStringV2; + lineString = new QgsLineString; compoundCurve->addCurve( lineString ); lineString->addVertex( circularString->endPoint() ); } @@ -180,7 +180,7 @@ static QgsCompoundCurveV2* parseCompoundCurve( const QVariantList& curvesList, Q return compoundCurve; } -static QgsAbstractGeometryV2* parseEsriGeometryPoint( const QVariantMap& geometryData, QgsWkbTypes::Type pointType ) +static QgsAbstractGeometry* parseEsriGeometryPoint( const QVariantMap& geometryData, QgsWkbTypes::Type pointType ) { // {"x" : , "y" : , "z" : , "m" : } bool xok = false, yok = false; @@ -193,7 +193,7 @@ static QgsAbstractGeometryV2* parseEsriGeometryPoint( const QVariantMap& geometr return new QgsPointV2( pointType, x, y, z, m ); } -static QgsAbstractGeometryV2* parseEsriGeometryMultiPoint( const QVariantMap& geometryData, QgsWkbTypes::Type pointType ) +static QgsAbstractGeometry* parseEsriGeometryMultiPoint( const QVariantMap& geometryData, QgsWkbTypes::Type pointType ) { // {"points" : [[ , , , ] , [ , , , ], ... ]} QVariantList coordsList = geometryData["points"].toList(); @@ -215,7 +215,7 @@ static QgsAbstractGeometryV2* parseEsriGeometryMultiPoint( const QVariantMap& ge return multiPoint; } -static QgsAbstractGeometryV2* parseEsriGeometryPolyline( const QVariantMap& geometryData, QgsWkbTypes::Type pointType ) +static QgsAbstractGeometry* parseEsriGeometryPolyline( const QVariantMap& geometryData, QgsWkbTypes::Type pointType ) { // {"curvePaths": [[[0,0], {"c": [[3,3],[1,4]]} ]]} QVariantList pathsList; @@ -225,10 +225,10 @@ static QgsAbstractGeometryV2* parseEsriGeometryPolyline( const QVariantMap& geom pathsList = geometryData["curvePaths"].toList(); if ( pathsList.isEmpty() ) return nullptr; - QgsMultiCurveV2* multiCurve = new QgsMultiCurveV2(); + QgsMultiCurve* multiCurve = new QgsMultiCurve(); foreach ( const QVariant& pathData, pathsList ) { - QgsCompoundCurveV2* curve = parseCompoundCurve( pathData.toList(), pointType ); + QgsCompoundCurve* curve = parseCompoundCurve( pathData.toList(), pointType ); if ( !curve ) { delete multiCurve; @@ -239,7 +239,7 @@ static QgsAbstractGeometryV2* parseEsriGeometryPolyline( const QVariantMap& geom return multiCurve; } -static QgsAbstractGeometryV2* parseEsriGeometryPolygon( const QVariantMap& geometryData, QgsWkbTypes::Type pointType ) +static QgsAbstractGeometry* parseEsriGeometryPolygon( const QVariantMap& geometryData, QgsWkbTypes::Type pointType ) { // {"curveRings": [[[0,0], {"c": [[3,3],[1,4]]} ]]} QVariantList ringsList; @@ -249,8 +249,8 @@ static QgsAbstractGeometryV2* parseEsriGeometryPolygon( const QVariantMap& geome ringsList = geometryData["ringPaths"].toList(); if ( ringsList.isEmpty() ) return nullptr; - QgsCurvePolygonV2* polygon = new QgsCurvePolygonV2(); - QgsCompoundCurveV2* ext = parseCompoundCurve( ringsList.front().toList(), pointType ); + QgsCurvePolygon* polygon = new QgsCurvePolygon(); + QgsCompoundCurve* ext = parseCompoundCurve( ringsList.front().toList(), pointType ); if ( !ext ) { delete polygon; @@ -259,7 +259,7 @@ static QgsAbstractGeometryV2* parseEsriGeometryPolygon( const QVariantMap& geome polygon->setExteriorRing( ext ); for ( int i = 1, n = ringsList.size(); i < n; ++i ) { - QgsCompoundCurveV2* curve = parseCompoundCurve( ringsList[i].toList(), pointType ); + QgsCompoundCurve* curve = parseCompoundCurve( ringsList[i].toList(), pointType ); if ( !curve ) { delete polygon; @@ -270,7 +270,7 @@ static QgsAbstractGeometryV2* parseEsriGeometryPolygon( const QVariantMap& geome return polygon; } -static QgsAbstractGeometryV2* parseEsriEnvelope( const QVariantMap& geometryData ) +static QgsAbstractGeometry* parseEsriEnvelope( const QVariantMap& geometryData ) { // {"xmin" : -109.55, "ymin" : 25.76, "xmax" : -86.39, "ymax" : 49.94} bool xminOk = false, yminOk = false, xmaxOk = false, ymaxOk = false; @@ -280,7 +280,7 @@ static QgsAbstractGeometryV2* parseEsriEnvelope( const QVariantMap& geometryData double ymax = geometryData["ymax"].toDouble( &ymaxOk ); if ( !xminOk || !yminOk || !xmaxOk || !ymaxOk ) return nullptr; - QgsLineStringV2* ext = new QgsLineStringV2(); + QgsLineString* ext = new QgsLineString(); ext->addVertex( QgsPointV2( xmin, ymin ) ); ext->addVertex( QgsPointV2( xmax, ymin ) ); ext->addVertex( QgsPointV2( xmax, ymax ) ); @@ -291,7 +291,7 @@ static QgsAbstractGeometryV2* parseEsriEnvelope( const QVariantMap& geometryData return poly; } -QgsAbstractGeometryV2* QgsArcGisRestUtils::parseEsriGeoJSON( const QVariantMap& geometryData, const QString& esriGeometryType, bool readM, bool readZ, QgsCoordinateReferenceSystem *crs ) +QgsAbstractGeometry* QgsArcGisRestUtils::parseEsriGeoJSON( const QVariantMap& geometryData, const QString& esriGeometryType, bool readM, bool readZ, QgsCoordinateReferenceSystem *crs ) { QgsWkbTypes::Type pointType = QgsWkbTypes::zmType( QgsWkbTypes::Point, readZ, readM ); if ( crs ) diff --git a/src/providers/arcgisrest/qgsarcgisrestutils.h b/src/providers/arcgisrest/qgsarcgisrestutils.h index 27875ccf92a..4d2b91c12c6 100644 --- a/src/providers/arcgisrest/qgsarcgisrestutils.h +++ b/src/providers/arcgisrest/qgsarcgisrestutils.h @@ -23,7 +23,7 @@ class QNetworkReply; class QgsNetworkAccessManager; class QgsFields; class QgsRectangle; -class QgsAbstractGeometryV2; +class QgsAbstractGeometry; class QgsCoordinateReferenceSystem; class QgsArcGisRestUtils @@ -31,7 +31,7 @@ class QgsArcGisRestUtils public: static QVariant::Type mapEsriFieldType( const QString& esriFieldType ); static QgsWkbTypes::Type mapEsriGeometryType( const QString& esriGeometryType ); - static QgsAbstractGeometryV2* parseEsriGeoJSON( const QVariantMap& geometryData, const QString& esriGeometryType, bool readM, bool readZ, QgsCoordinateReferenceSystem *crs = 0 ); + static QgsAbstractGeometry* parseEsriGeoJSON( const QVariantMap& geometryData, const QString& esriGeometryType, bool readM, bool readZ, QgsCoordinateReferenceSystem *crs = 0 ); static QgsCoordinateReferenceSystem parseSpatialReference( const QVariantMap& spatialReferenceMap ); static QVariantMap getServiceInfo( const QString& baseurl, QString &errorTitle, QString &errorText ); diff --git a/src/providers/grass/qgsgrassfeatureiterator.cpp b/src/providers/grass/qgsgrassfeatureiterator.cpp index 5d18386b789..3353f3a85d1 100644 --- a/src/providers/grass/qgsgrassfeatureiterator.cpp +++ b/src/providers/grass/qgsgrassfeatureiterator.cpp @@ -250,7 +250,7 @@ bool QgsGrassFeatureIterator::fetchFeature( QgsFeature& feature ) int type = 0; int lid = 0; QgsFeatureId featureId = 0; - QgsAbstractGeometryV2 *oldGeometry = 0; + QgsAbstractGeometry *oldGeometry = 0; int cidxFieldIndex = mSource->mLayer->cidxFieldIndex(); #ifdef QGISDEBUG @@ -601,7 +601,7 @@ void QgsGrassFeatureIterator::setFeatureGeometry( QgsFeature& feature, int id, i { QgsDebugMsgLevel( QString( "id = %1 type = %2" ).arg( id ).arg( type ), 3 ); - QgsAbstractGeometryV2 *geometry = 0; + QgsAbstractGeometry *geometry = 0; if ( type & ( GV_POINTS | GV_LINES | GV_FACE ) ) { geometry = mSource->mLayer->map()->lineGeometry( id ); diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp index 99d7b12256a..6a37a369d16 100644 --- a/src/providers/grass/qgsgrassprovider.cpp +++ b/src/providers/grass/qgsgrassprovider.cpp @@ -25,9 +25,9 @@ #include "qgsdataprovider.h" #include "qgsfeature.h" #include "qgsfield.h" -#include "qgslinestringv2.h" +#include "qgslinestring.h" #include "qgspointv2.h" -#include "qgspolygonv2.h" +#include "qgspolygon.h" #include "qgsrectangle.h" #include "qgsvectorlayer.h" #include "qgsvectorlayereditbuffer.h" @@ -1136,7 +1136,7 @@ void QgsGrassProvider::startEditing( QgsVectorLayer *vectorLayer ) QgsDebugMsg( "edit started" ); } -void QgsGrassProvider::setPoints( struct line_pnts *points, const QgsAbstractGeometryV2 * geometry ) +void QgsGrassProvider::setPoints( struct line_pnts *points, const QgsAbstractGeometry * geometry ) { if ( !points ) { @@ -1158,7 +1158,7 @@ void QgsGrassProvider::setPoints( struct line_pnts *points, const QgsAbstractGeo } else if ( geometry->wkbType() == QgsWkbTypes::LineString || geometry->wkbType() == QgsWkbTypes::LineStringZ ) { - const QgsLineStringV2* lineString = dynamic_cast( geometry ); + const QgsLineString* lineString = dynamic_cast( geometry ); if ( lineString ) { for ( int i = 0; i < lineString->numPoints(); i++ ) @@ -1173,7 +1173,7 @@ void QgsGrassProvider::setPoints( struct line_pnts *points, const QgsAbstractGeo const QgsPolygonV2* polygon = dynamic_cast( geometry ); if ( polygon && polygon->exteriorRing() ) { - QgsLineStringV2* lineString = polygon->exteriorRing()->curveToLine(); + QgsLineString* lineString = polygon->exteriorRing()->curveToLine(); if ( lineString ) { for ( int i = 0; i < lineString->numPoints(); i++ ) @@ -1218,7 +1218,7 @@ void QgsGrassProvider::onFeatureAdded( QgsFeatureId fid ) type = mNewFeatureType == GV_AREA ? GV_BOUNDARY : mNewFeatureType; } // geometry - const QgsAbstractGeometryV2 *geometry = 0; + const QgsAbstractGeometry *geometry = 0; if ( !mEditBuffer->isFeatureAdded( fid ) ) { #ifdef QGISDEBUG @@ -1252,7 +1252,7 @@ void QgsGrassProvider::onFeatureAdded( QgsFeatureId fid ) const QgsPolygonV2* polygon = dynamic_cast( addedFeatureGeom.geometry() ); if ( polygon ) { - QgsLineStringV2* lineString = polygon->exteriorRing()->curveToLine(); + QgsLineString* lineString = polygon->exteriorRing()->curveToLine(); addedFeatures[fid].setGeometry( QgsGeometry( lineString ) ); } // TODO: create also centroid and add it to undo @@ -1434,7 +1434,7 @@ void QgsGrassProvider::onFeatureAdded( QgsFeatureId fid ) else { QgsDebugMsg( QString( "the line does not exist -> restore old geometry" ) ); - const QgsAbstractGeometryV2 *geometry = 0; + const QgsAbstractGeometry *geometry = 0; // If it is not new feature, we should have the geometry in oldGeometries if ( mLayer->map()->oldGeometries().contains( lid ) ) @@ -1568,7 +1568,7 @@ void QgsGrassProvider::onFeatureDeleted( QgsFeatureId fid ) // store only the first original geometry if it is not new feature, changed geometries are stored in the buffer if ( oldLid > 0 && !mLayer->map()->oldGeometries().contains( oldLid ) ) { - QgsAbstractGeometryV2 *geometry = mLayer->map()->lineGeometry( oldLid ); + QgsAbstractGeometry *geometry = mLayer->map()->lineGeometry( oldLid ); if ( geometry ) { QgsDebugMsg( QString( "save old geometry of oldLid = %1" ).arg( oldLid ) ); @@ -1676,7 +1676,7 @@ void QgsGrassProvider::onGeometryChanged( QgsFeatureId fid, const QgsGeometry &g // store only the first original geometry if it is not new feature, changed geometries are stored in the buffer if ( oldLid > 0 && !mLayer->map()->oldGeometries().contains( oldLid ) ) { - QgsAbstractGeometryV2 *geometry = mLayer->map()->lineGeometry( oldLid ); + QgsAbstractGeometry *geometry = mLayer->map()->lineGeometry( oldLid ); if ( geometry ) { QgsDebugMsg( QString( "save old geometry of oldLid = %1" ).arg( oldLid ) ); diff --git a/src/providers/grass/qgsgrassprovider.h b/src/providers/grass/qgsgrassprovider.h index 9d0751db32b..f78c2bfb7d6 100644 --- a/src/providers/grass/qgsgrassprovider.h +++ b/src/providers/grass/qgsgrassprovider.h @@ -442,7 +442,7 @@ class GRASS_LIB_EXPORT QgsGrassProvider : public QgsVectorDataProvider void setTopoFields(); - void setPoints( struct line_pnts *points, const QgsAbstractGeometryV2 * geometry ); + void setPoints( struct line_pnts *points, const QgsAbstractGeometry * geometry ); // Get other edited layer, returns 0 if layer does not exist QgsGrassVectorMapLayer * otherEditLayer( int layerField ); diff --git a/src/providers/grass/qgsgrassvectormap.cpp b/src/providers/grass/qgsgrassvectormap.cpp index 178bdd96b48..94cbe0ca26c 100644 --- a/src/providers/grass/qgsgrassvectormap.cpp +++ b/src/providers/grass/qgsgrassvectormap.cpp @@ -17,8 +17,8 @@ #include #include -#include "qgslinestringv2.h" -#include "qgspolygonv2.h" +#include "qgslinestring.h" +#include "qgspolygon.h" #include "qgspointv2.h" #include "qgslogger.h" @@ -617,7 +617,7 @@ void QgsGrassVectorMap::unlockReadWrite() } } -QgsAbstractGeometryV2 * QgsGrassVectorMap::lineGeometry( int id ) +QgsAbstractGeometry * QgsGrassVectorMap::lineGeometry( int id ) { QgsDebugMsgLevel( QString( "id = %1" ).arg( id ), 3 ); if ( !Vect_line_alive( mMap, id ) ) // should not happen (update mode!)? @@ -636,7 +636,7 @@ QgsAbstractGeometryV2 * QgsGrassVectorMap::lineGeometry( int id ) return 0; } - QgsPointSequenceV2 pointList; + QgsPointSequence pointList; pointList.reserve( points->n_points ); for ( int i = 0; i < points->n_points; i++ ) { @@ -651,14 +651,14 @@ QgsAbstractGeometryV2 * QgsGrassVectorMap::lineGeometry( int id ) } else if ( type & GV_LINES ) { - QgsLineStringV2 * line = new QgsLineStringV2(); + QgsLineString * line = new QgsLineString(); line->setPoints( pointList ); return line; } else if ( type & GV_FACE ) { QgsPolygonV2 * polygon = new QgsPolygonV2(); - QgsLineStringV2 * ring = new QgsLineStringV2(); + QgsLineString * ring = new QgsLineString(); ring->setPoints( pointList ); polygon->setExteriorRing( ring ); return polygon; @@ -668,7 +668,7 @@ QgsAbstractGeometryV2 * QgsGrassVectorMap::lineGeometry( int id ) return 0; } -QgsAbstractGeometryV2 * QgsGrassVectorMap::nodeGeometry( int id ) +QgsAbstractGeometry * QgsGrassVectorMap::nodeGeometry( int id ) { QgsDebugMsgLevel( QString( "id = %1" ).arg( id ), 3 ); double x, y, z; @@ -676,7 +676,7 @@ QgsAbstractGeometryV2 * QgsGrassVectorMap::nodeGeometry( int id ) return new QgsPointV2( is3d() ? QgsWkbTypes::PointZ : QgsWkbTypes::Point, x, y, z ); } -QgsAbstractGeometryV2 * QgsGrassVectorMap::areaGeometry( int id ) +QgsAbstractGeometry * QgsGrassVectorMap::areaGeometry( int id ) { QgsDebugMsgLevel( QString( "id = %1" ).arg( id ), 3 ); QgsPolygonV2 * polygon = new QgsPolygonV2(); @@ -688,14 +688,14 @@ QgsAbstractGeometryV2 * QgsGrassVectorMap::areaGeometry( int id ) QgsGrass::lock(); Vect_get_area_points( mMap, id, points ); - QgsPointSequenceV2 pointList; + QgsPointSequence pointList; pointList.reserve( points->n_points ); for ( int i = 0; i < points->n_points; i++ ) { pointList << QgsPointV2( is3d() ? QgsWkbTypes::PointZ : QgsWkbTypes::Point, points->x[i], points->y[i], points->z[i] ); } - QgsLineStringV2 * ring = new QgsLineStringV2(); + QgsLineString * ring = new QgsLineString(); ring->setPoints( pointList ); polygon->setExteriorRing( ring ); @@ -711,7 +711,7 @@ QgsAbstractGeometryV2 * QgsGrassVectorMap::areaGeometry( int id ) { pointList << QgsPointV2( is3d() ? QgsWkbTypes::PointZ : QgsWkbTypes::Point, points->x[i], points->y[i], points->z[i] ); } - ring = new QgsLineStringV2(); + ring = new QgsLineString(); ring->setPoints( pointList ); polygon->addInteriorRing( ring ); } diff --git a/src/providers/grass/qgsgrassvectormap.h b/src/providers/grass/qgsgrassvectormap.h index 6deeb2e292f..e545e1eabe8 100644 --- a/src/providers/grass/qgsgrassvectormap.h +++ b/src/providers/grass/qgsgrassvectormap.h @@ -20,7 +20,7 @@ #include #include -#include "qgsabstractgeometryv2.h" +#include "qgsabstractgeometry.h" #include "qgsgrass.h" #include "qgsgrassvectormaplayer.h" @@ -82,16 +82,16 @@ class GRASS_LIB_EXPORT QgsGrassVectorMap : public QObject QHash & oldLids() { return mOldLids; } QHash & newLids() { return mNewLids; } - QHash & oldGeometries() { return mOldGeometries; } + QHash & oldGeometries() { return mOldGeometries; } QHash & oldTypes() { return mOldTypes; } QHash & newCats() { return mNewCats; } QMap > & undoCommands() { return mUndoCommands; } /** Get geometry of line. * @return geometry (point,line or polygon(GV_FACE)) or 0 */ - QgsAbstractGeometryV2 * lineGeometry( int id ); - QgsAbstractGeometryV2 * nodeGeometry( int id ); - QgsAbstractGeometryV2 * areaGeometry( int id ); + QgsAbstractGeometry * lineGeometry( int id ); + QgsAbstractGeometry * nodeGeometry( int id ); + QgsAbstractGeometry * areaGeometry( int id ); /** Open map if not yet open. Open/close lock */ bool open(); @@ -193,7 +193,7 @@ class GRASS_LIB_EXPORT QgsGrassVectorMap : public QObject // Current line ids for old line ids (old lid -> new lid) QHash mNewLids; // Hash of original lines' geometries of lines which were changed, keys are GRASS lid - QHash mOldGeometries; + QHash mOldGeometries; // Hash of original lines' geometries GRASS types of lines which were changed, keys are GRASS lid QHash mOldTypes; // New categories attached to new features or old features without category diff --git a/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp b/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp index 0b5dd5dc0f9..4e421cdbfc4 100644 --- a/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp +++ b/src/providers/virtual/qgsvirtuallayersqlitemodule.cpp @@ -101,7 +101,7 @@ struct VTable { if ( mLayer ) { - QObject::connect( layer, SIGNAL( layerDeleted() ), &mSlotToFunction, SLOT( onSignal() ) ); + QObject::connect( layer, SIGNAL( destroyed() ), &mSlotToFunction, SLOT( onSignal() ) ); init_(); } } diff --git a/src/server/qgssldconfigparser.cpp b/src/server/qgssldconfigparser.cpp index 853df4a0b1e..93964f299e9 100644 --- a/src/server/qgssldconfigparser.cpp +++ b/src/server/qgssldconfigparser.cpp @@ -21,8 +21,8 @@ #include "qgslogger.h" #include "qgsmapserviceexception.h" #include "qgsrasterlayer.h" -#include "qgsrendererv2.h" -#include "qgssinglesymbolrendererv2.h" +#include "qgsrenderer.h" +#include "qgssinglesymbolrenderer.h" #include "qgssymbol.h" #include "qgsvectorlayer.h" #include "qgsvectordataprovider.h" @@ -228,8 +228,8 @@ QList QgsSLDConfigParser::mapLayerFromStyle( const QString& lName, QgsVectorLayer* v = dynamic_cast( fallbackLayerList.at( 0 ) ); if ( v ) { - QgsFeatureRendererV2* r = rendererFromUserStyle( userStyleElement, v ); - v->setRendererV2( r ); + QgsFeatureRenderer* r = rendererFromUserStyle( userStyleElement, v ); + v->setRenderer( r ); labelSettingsFromUserStyle( userStyleElement, v ); resultList.push_back( v ); @@ -290,7 +290,7 @@ QList QgsSLDConfigParser::mapLayerFromStyle( const QString& lName, return resultList; } - QgsFeatureRendererV2* theRenderer = nullptr; + QgsFeatureRenderer* theRenderer = nullptr; QgsRasterLayer* theRasterLayer = dynamic_cast( theMapLayer ); if ( theRasterLayer ) @@ -319,7 +319,7 @@ QList QgsSLDConfigParser::mapLayerFromStyle( const QString& lName, if ( userStyleElement.isNull() )//apply a default style { QgsSymbol* symbol = QgsSymbol::defaultSymbol( theVectorLayer->geometryType() ); - theRenderer = new QgsSingleSymbolRendererV2( symbol ); + theRenderer = new QgsSingleSymbolRenderer( symbol ); } else { @@ -335,7 +335,7 @@ QList QgsSLDConfigParser::mapLayerFromStyle( const QString& lName, delete theVectorLayer; return resultList; } - theVectorLayer->setRendererV2( theRenderer ); + theVectorLayer->setRenderer( theRenderer ); QgsDebugMsg( "Returning the vectorlayer" ); resultList.push_back( theVectorLayer ); return resultList; @@ -856,7 +856,7 @@ QDomElement QgsSLDConfigParser::findNamedStyleElement( const QDomElement& layerE return defaultResult; } -QgsFeatureRendererV2* QgsSLDConfigParser::rendererFromUserStyle( const QDomElement& userStyleElement, QgsVectorLayer* vec ) const +QgsFeatureRenderer* QgsSLDConfigParser::rendererFromUserStyle( const QDomElement& userStyleElement, QgsVectorLayer* vec ) const { if ( !vec || userStyleElement.isNull() ) { @@ -866,7 +866,7 @@ QgsFeatureRendererV2* QgsSLDConfigParser::rendererFromUserStyle( const QDomEleme QgsDebugMsg( "Entering" ); QString errorMessage; - QgsFeatureRendererV2* renderer = QgsFeatureRendererV2::loadSld( userStyleElement.parentNode(), vec->geometryType(), errorMessage ); + QgsFeatureRenderer* renderer = QgsFeatureRenderer::loadSld( userStyleElement.parentNode(), vec->geometryType(), errorMessage ); if ( !renderer ) { throw QgsMapServiceException( "SLD error", errorMessage ); @@ -1158,8 +1158,8 @@ QgsVectorLayer* QgsSLDConfigParser::contourLayerFromRaster( const QDomElement& u QgsVectorLayer* contourLayer = new QgsVectorLayer( tmpFileName, "layer", "ogr" ); //create renderer - QgsFeatureRendererV2* theRenderer = rendererFromUserStyle( userStyleElem, contourLayer ); - contourLayer->setRendererV2( theRenderer ); + QgsFeatureRenderer* theRenderer = rendererFromUserStyle( userStyleElem, contourLayer ); + contourLayer->setRenderer( theRenderer ); //add labelling if requested labelSettingsFromUserStyle( userStyleElem, contourLayer ); diff --git a/src/server/qgssldconfigparser.h b/src/server/qgssldconfigparser.h index 3e6f058a4df..17161f14d0a 100644 --- a/src/server/qgssldconfigparser.h +++ b/src/server/qgssldconfigparser.h @@ -20,7 +20,7 @@ #include "qgswmsconfigparser.h" -class QgsFeatureRendererV2; +class QgsFeatureRenderer; class QgsVectorLayer; class QgsRasterLayer; class QTemporaryFile; @@ -171,7 +171,7 @@ class QgsSLDConfigParser : public QgsWmsConfigParser QDomElement findNamedStyleElement( const QDomElement& layerElement, const QString& styleName ) const; /** Creates a Renderer from a UserStyle SLD node. Returns 0 in case of error*/ - QgsFeatureRendererV2* rendererFromUserStyle( const QDomElement& userStyleElement, QgsVectorLayer* vec ) const; + QgsFeatureRenderer* rendererFromUserStyle( const QDomElement& userStyleElement, QgsVectorLayer* vec ) const; /** Searches for a element and applies the settings to the vector layer @return true if settings have been applied, false in case of element not present or error*/ diff --git a/src/server/qgswmsconfigparser.cpp b/src/server/qgswmsconfigparser.cpp index 38e57a70fae..8cf99e92de1 100644 --- a/src/server/qgswmsconfigparser.cpp +++ b/src/server/qgswmsconfigparser.cpp @@ -31,7 +31,7 @@ #include "qgslayertreegroup.h" #include "qgslayertreelayer.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" @@ -321,7 +321,7 @@ QStringList QgsWmsConfigParser::addHighlightLayers( const QMap } QString errorMsg; - QScopedPointer renderer( QgsFeatureRendererV2::loadSld( sldDoc.documentElement(), geom.type(), errorMsg ) ); + QScopedPointer renderer( QgsFeatureRenderer::loadSld( sldDoc.documentElement(), geom.type(), errorMsg ) ); if ( !renderer.data() ) { continue; @@ -341,7 +341,7 @@ QStringList QgsWmsConfigParser::addHighlightLayers( const QMap continue; } - layer->setRendererV2( renderer.take() ); + layer->setRenderer( renderer.take() ); layerSet.prepend( layer.data()->id() ); highlightLayers.append( layer.data()->id() ); QgsMapLayerRegistry::instance()->addMapLayers( QList() << layer.take() ); diff --git a/src/server/qgswmsprojectparser.cpp b/src/server/qgswmsprojectparser.cpp index 5b925d0deba..81a7e64b01a 100644 --- a/src/server/qgswmsprojectparser.cpp +++ b/src/server/qgswmsprojectparser.cpp @@ -24,7 +24,7 @@ #include "qgsmaplayerstylemanager.h" #include "qgsmapserviceexception.h" #include "qgspallabeling.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgsvectorlayer.h" #include "qgscomposition.h" @@ -1863,7 +1863,7 @@ QDomDocument QgsWmsProjectParser::getStyles( QStringList& layerList ) const layer->styleManager()->setCurrentStyle( styleName ); if ( styleName.isEmpty() ) styleName = EMPTY_STYLE_NAME; - QDomElement styleElem = layer->rendererV2()->writeSld( myDocument, styleName ); + QDomElement styleElem = layer->renderer()->writeSld( myDocument, styleName ); namedLayerNode.appendChild( styleElem ); } } diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp index 484fa668359..bcf5965f47c 100644 --- a/src/server/qgswmsserver.cpp +++ b/src/server/qgswmsserver.cpp @@ -44,7 +44,7 @@ #include "qgsmapserviceexception.h" #include "qgssldconfigparser.h" #include "qgssymbol.h" -#include "qgsrendererv2.h" +#include "qgsrenderer.h" #include "qgspaintenginehack.h" #include "qgsogcutils.h" #include "qgsfeature.h" @@ -841,13 +841,13 @@ QImage* QgsWmsServer::getLegendGraphics() QgsLayerTreeLayer* nodeLayer = QgsLayerTree::toLayer( node ); QgsVectorLayer* vl = qobject_cast( nodeLayer->layer() ); - if ( !vl || !vl->rendererV2() ) + if ( !vl || !vl->renderer() ) continue; - const SymbolV2Set& usedSymbols = hitTest[vl]; + const SymbolSet& usedSymbols = hitTest[vl]; QList order; int i = 0; - Q_FOREACH ( const QgsLegendSymbolItemV2& legendItem, vl->rendererV2()->legendSymbolItemsV2() ) + Q_FOREACH ( const QgsLegendSymbolItem& legendItem, vl->renderer()->legendSymbolItemsV2() ) { if ( usedSymbols.contains( legendItem.legacyRuleKey() ) ) order.append( i ); @@ -988,12 +988,12 @@ void QgsWmsServer::runHitTest( QPainter* painter, HitTest& hitTest ) Q_FOREACH ( const QString& layerID, mMapRenderer->layerSet() ) { QgsVectorLayer* vl = qobject_cast( QgsMapLayerRegistry::instance()->mapLayer( layerID ) ); - if ( !vl || !vl->rendererV2() ) + if ( !vl || !vl->renderer() ) continue; if ( vl->hasScaleBasedVisibility() && ( mMapRenderer->scale() < vl->minimumScale() || mMapRenderer->scale() > vl->maximumScale() ) ) { - hitTest[vl] = SymbolV2Set(); // no symbols -> will not be shown + hitTest[vl] = SymbolSet(); // no symbols -> will not be shown continue; } @@ -1007,15 +1007,15 @@ void QgsWmsServer::runHitTest( QPainter* painter, HitTest& hitTest ) context.setExtent( r1 ); } - SymbolV2Set& usedSymbols = hitTest[vl]; + SymbolSet& usedSymbols = hitTest[vl]; runHitTestLayer( vl, usedSymbols, context ); } } -void QgsWmsServer::runHitTestLayer( QgsVectorLayer* vl, SymbolV2Set& usedSymbols, QgsRenderContext& context ) +void QgsWmsServer::runHitTestLayer( QgsVectorLayer* vl, SymbolSet& usedSymbols, QgsRenderContext& context ) { - QgsFeatureRendererV2* r = vl->rendererV2(); - bool moreSymbolsPerFeature = r->capabilities() & QgsFeatureRendererV2::MoreSymbolsPerFeature; + QgsFeatureRenderer* r = vl->renderer(); + bool moreSymbolsPerFeature = r->capabilities() & QgsFeatureRenderer::MoreSymbolsPerFeature; r->startRender( context, vl->pendingFields() ); QgsFeature f; QgsFeatureRequest request( context.extent() ); @@ -1278,7 +1278,7 @@ QByteArray* QgsWmsServer::getPrint( const QString& formatString ) throw QgsMapServiceException( "ParameterMissing", "The TEMPLATE parameter is required for the GetPrint request" ); } - QList< QPair< QgsVectorLayer*, QgsFeatureRendererV2*> > bkVectorRenderers; + QList< QPair< QgsVectorLayer*, QgsFeatureRenderer*> > bkVectorRenderers; QList< QPair< QgsRasterLayer*, QgsRasterRenderer* > > bkRasterRenderers; QList< QPair< QgsVectorLayer*, double > > labelTransparencies; QList< QPair< QgsVectorLayer*, double > > labelBufferTransparencies; @@ -1419,7 +1419,7 @@ QImage* QgsWmsServer::getMap( HitTest* hitTest ) QStringList selectedLayerIdList = applyFeatureSelections( layersList ); - QList< QPair< QgsVectorLayer*, QgsFeatureRendererV2*> > bkVectorRenderers; + QList< QPair< QgsVectorLayer*, QgsFeatureRenderer*> > bkVectorRenderers; QList< QPair< QgsRasterLayer*, QgsRasterRenderer* > > bkRasterRenderers; QList< QPair< QgsVectorLayer*, double > > labelTransparencies; QList< QPair< QgsVectorLayer*, double > > labelBufferTransparencies; @@ -2233,7 +2233,7 @@ int QgsWmsServer::featureInfoFromVectorLayer( QgsVectorLayer* layer, break; } - QgsFeatureRendererV2* r2 = layer->rendererV2(); + QgsFeatureRenderer* r2 = layer->renderer(); if ( !r2 ) { continue; @@ -2243,9 +2243,9 @@ int QgsWmsServer::featureInfoFromVectorLayer( QgsVectorLayer* layer, //check if feature is rendered at all r2->startRender( renderContext, layer->pendingFields() ); - bool renderV2 = r2->willRenderFeature( feature, renderContext ); + bool render = r2->willRenderFeature( feature, renderContext ); r2->stopRender( renderContext ); - if ( !renderV2 ) + if ( !render ) { continue; } @@ -2829,7 +2829,7 @@ void QgsWmsServer::clearFeatureSelections( const QStringList& layerIds ) const return; } -void QgsWmsServer::applyOpacities( const QStringList& layerList, QList< QPair< QgsVectorLayer*, QgsFeatureRendererV2*> >& vectorRenderers, +void QgsWmsServer::applyOpacities( const QStringList& layerList, QList< QPair< QgsVectorLayer*, QgsFeatureRenderer*> >& vectorRenderers, QList< QPair< QgsRasterLayer*, QgsRasterRenderer* > >& rasterRenderers, QList< QPair< QgsVectorLayer*, double > >& labelTransparencies, QList< QPair< QgsVectorLayer*, double > >& labelBufferTransparencies ) @@ -2879,16 +2879,16 @@ void QgsWmsServer::applyOpacities( const QStringList& layerList, QList< QPair< Q { QgsVectorLayer* vl = qobject_cast( ml ); - QgsFeatureRendererV2* rendererV2 = vl->rendererV2(); + QgsFeatureRenderer* renderer = vl->renderer(); //backup old renderer - vectorRenderers.push_back( qMakePair( vl, rendererV2->clone() ) ); + vectorRenderers.push_back( qMakePair( vl, renderer->clone() ) ); //modify symbols of current renderer QgsRenderContext context; context.expressionContext() << QgsExpressionContextUtils::globalScope() << QgsExpressionContextUtils::projectScope() << QgsExpressionContextUtils::layerScope( vl ); - QgsSymbolList symbolList = rendererV2->symbols( context ); + QgsSymbolList symbolList = renderer->symbols( context ); QgsSymbolList::iterator symbolIt = symbolList.begin(); for ( ; symbolIt != symbolList.end(); ++symbolIt ) { @@ -2922,7 +2922,7 @@ void QgsWmsServer::applyOpacities( const QStringList& layerList, QList< QPair< Q } } -void QgsWmsServer::restoreOpacities( QList< QPair< QgsVectorLayer*, QgsFeatureRendererV2*> >& vectorRenderers, +void QgsWmsServer::restoreOpacities( QList< QPair< QgsVectorLayer*, QgsFeatureRenderer*> >& vectorRenderers, QList < QPair< QgsRasterLayer*, QgsRasterRenderer* > >& rasterRenderers, QList< QPair< QgsVectorLayer*, double > >& labelOpacities, QList< QPair< QgsVectorLayer*, double > >& labelBufferOpacities ) @@ -2932,10 +2932,10 @@ void QgsWmsServer::restoreOpacities( QList< QPair< QgsVectorLayer*, QgsFeatureRe return; } - QList< QPair< QgsVectorLayer*, QgsFeatureRendererV2*> >::iterator vIt = vectorRenderers.begin(); + QList< QPair< QgsVectorLayer*, QgsFeatureRenderer*> >::iterator vIt = vectorRenderers.begin(); for ( ; vIt != vectorRenderers.end(); ++vIt ) { - ( *vIt ).first->setRendererV2(( *vIt ).second ); + ( *vIt ).first->setRenderer(( *vIt ).second ); } QList< QPair< QgsRasterLayer*, QgsRasterRenderer* > >::iterator rIt = rasterRenderers.begin(); diff --git a/src/server/qgswmsserver.h b/src/server/qgswmsserver.h index fbc2c9f5ee1..4fb1bdd4127 100644 --- a/src/server/qgswmsserver.h +++ b/src/server/qgswmsserver.h @@ -33,7 +33,7 @@ class QgsComposerLegendItem; class QgsComposition; class QgsConfigParser; class QgsFeature; -class QgsFeatureRendererV2; +class QgsFeatureRenderer; class QgsMapLayer; class QgsMapRenderer; class QgsPoint; @@ -88,8 +88,8 @@ class QgsWmsServer: public QgsOWSServer of the image object*/ QImage* getLegendGraphics(); - typedef QSet SymbolV2Set; - typedef QMap HitTest; + typedef QSet SymbolSet; + typedef QMap HitTest; /** Returns the map as an image (or a null pointer in case of error). The caller takes ownership of the image object). If an instance to existing hit test structure is passed, instead of rendering @@ -176,7 +176,7 @@ class QgsWmsServer: public QgsOWSServer /** Record which symbols would be used if the map was in the current configuration of mMapRenderer. This is useful for content-based legend*/ void runHitTest( QPainter* painter, HitTest& hitTest ); /** Record which symbols within one layer would be rendered with the given renderer context*/ - void runHitTestLayer( QgsVectorLayer* vl, SymbolV2Set& usedSymbols, QgsRenderContext& context ); + void runHitTestLayer( QgsVectorLayer* vl, SymbolSet& usedSymbols, QgsRenderContext& context ); /** Read legend parameter from the request or from the first print composer in the project*/ void legendParameters( double& boxSpace, double& layerSpace, double& layerTitleSpace, @@ -216,14 +216,14 @@ class QgsWmsServer: public QgsOWSServer void clearFeatureSelections( const QStringList& layerIds ) const; /** Applies opacity on layer/group level*/ - void applyOpacities( const QStringList& layerList, QList< QPair< QgsVectorLayer*, QgsFeatureRendererV2*> >& vectorRenderers, + void applyOpacities( const QStringList& layerList, QList< QPair< QgsVectorLayer*, QgsFeatureRenderer*> >& vectorRenderers, QList< QPair< QgsRasterLayer*, QgsRasterRenderer* > >& rasterRenderers, QList< QPair< QgsVectorLayer*, double > >& labelTransparencies, QList< QPair< QgsVectorLayer*, double > >& labelBufferTransparencies ); /** Restore original opacities*/ - void restoreOpacities( QList< QPair >& vectorRenderers, + void restoreOpacities( QList< QPair >& vectorRenderers, QList< QPair < QgsRasterLayer*, QgsRasterRenderer* > >& rasterRenderers, QList< QPair< QgsVectorLayer*, double > >& labelTransparencies, QList< QPair< QgsVectorLayer*, double > >& labelBufferTransparencies ); diff --git a/src/ui/qgscategorizedsymbolrendererv2widget.ui b/src/ui/qgscategorizedsymbolrendererv2widget.ui index a3151cb31cc..ee02f7a7121 100644 --- a/src/ui/qgscategorizedsymbolrendererv2widget.ui +++ b/src/ui/qgscategorizedsymbolrendererv2widget.ui @@ -1,7 +1,7 @@ - QgsCategorizedSymbolRendererV2Widget - + QgsCategorizedSymbolRendererWidget + 0 diff --git a/src/ui/qgscptcitycolorrampv2dialogbase.ui b/src/ui/qgscptcitycolorrampv2dialogbase.ui index 19167a81c4b..0cef2d282c1 100644 --- a/src/ui/qgscptcitycolorrampv2dialogbase.ui +++ b/src/ui/qgscptcitycolorrampv2dialogbase.ui @@ -1,7 +1,7 @@ - QgsCptCityColorRampV2DialogBase - + QgsCptCityColorRampDialogBase + 0 @@ -547,7 +547,7 @@ buttonBox accepted() - QgsCptCityColorRampV2DialogBase + QgsCptCityColorRampDialogBase accept() @@ -563,7 +563,7 @@ buttonBox rejected() - QgsCptCityColorRampV2DialogBase + QgsCptCityColorRampDialogBase reject() diff --git a/src/ui/qgsgraduatedsymbolrendererv2widget.ui b/src/ui/qgsgraduatedsymbolrendererv2widget.ui index 54cbb95493e..c7f02b6fb52 100644 --- a/src/ui/qgsgraduatedsymbolrendererv2widget.ui +++ b/src/ui/qgsgraduatedsymbolrendererv2widget.ui @@ -1,7 +1,7 @@ - QgsGraduatedSymbolRendererV2Widget - + QgsGraduatedSymbolRendererWidget + 0 diff --git a/src/ui/qgsrendererv2propsdialogbase.ui b/src/ui/qgsrendererv2propsdialogbase.ui index a1959ee9e2d..0a6797554e3 100644 --- a/src/ui/qgsrendererv2propsdialogbase.ui +++ b/src/ui/qgsrendererv2propsdialogbase.ui @@ -1,7 +1,7 @@ - QgsRendererV2PropsDialogBase - + QgsRendererPropsDialogBase + 0 diff --git a/src/ui/qgsrulebasedrendererv2widget.ui b/src/ui/qgsrulebasedrendererv2widget.ui index 32b9547e2fb..a02a8f6d5f2 100644 --- a/src/ui/qgsrulebasedrendererv2widget.ui +++ b/src/ui/qgsrulebasedrendererv2widget.ui @@ -1,7 +1,7 @@ - QgsRuleBasedRendererV2Widget - + QgsRuleBasedRendererWidget + 0 diff --git a/src/ui/qgsstylev2exportimportdialogbase.ui b/src/ui/qgsstyleexportimportdialogbase.ui similarity index 94% rename from src/ui/qgsstylev2exportimportdialogbase.ui rename to src/ui/qgsstyleexportimportdialogbase.ui index 064a375a973..71ff90f74b8 100644 --- a/src/ui/qgsstylev2exportimportdialogbase.ui +++ b/src/ui/qgsstyleexportimportdialogbase.ui @@ -1,7 +1,7 @@ - QgsStyleV2ExportImportDialogBase - + QgsStyleExportImportDialogBase + 0 @@ -125,7 +125,7 @@ buttonBox accepted() - QgsStyleV2ExportImportDialogBase + QgsStyleExportImportDialogBase accept() @@ -141,7 +141,7 @@ buttonBox rejected() - QgsStyleV2ExportImportDialogBase + QgsStyleExportImportDialogBase reject() diff --git a/src/ui/qgsstylev2groupselectiondialogbase.ui b/src/ui/qgsstylegroupselectiondialogbase.ui similarity index 86% rename from src/ui/qgsstylev2groupselectiondialogbase.ui rename to src/ui/qgsstylegroupselectiondialogbase.ui index 97dce71ffca..194e9103586 100644 --- a/src/ui/qgsstylev2groupselectiondialogbase.ui +++ b/src/ui/qgsstylegroupselectiondialogbase.ui @@ -1,7 +1,7 @@ - SymbolsV2GroupSelectionDialogBase - + SymbolsGroupSelectionDialogBase + 0 @@ -55,7 +55,7 @@ okButton clicked() - SymbolsV2GroupSelectionDialogBase + SymbolsGroupSelectionDialogBase accept() @@ -69,9 +69,9 @@ - SymbolsV2GroupSelectionDialogBase + SymbolsGroupSelectionDialogBase destroyed() - SymbolsV2GroupSelectionDialogBase + SymbolsGroupSelectionDialogBase accept() diff --git a/src/ui/qgsstylev2managerdialogbase.ui b/src/ui/qgsstylemanagerdialogbase.ui similarity index 99% rename from src/ui/qgsstylev2managerdialogbase.ui rename to src/ui/qgsstylemanagerdialogbase.ui index 39a5dd1fa7c..6ea768f1cde 100644 --- a/src/ui/qgsstylev2managerdialogbase.ui +++ b/src/ui/qgsstylemanagerdialogbase.ui @@ -1,7 +1,7 @@ - QgsStyleV2ManagerDialogBase - + QgsStyleManagerDialogBase + 0 @@ -559,7 +559,7 @@ QMenu::item:selected { background-color: gray; } */ buttonBox rejected() - QgsStyleV2ManagerDialogBase + QgsStyleManagerDialogBase reject() diff --git a/src/ui/qgsvectorcolorbrewercolorrampv2dialogbase.ui b/src/ui/qgsvectorcolorbrewercolorrampv2dialogbase.ui index 3de75a429a0..6d5ad3a232f 100644 --- a/src/ui/qgsvectorcolorbrewercolorrampv2dialogbase.ui +++ b/src/ui/qgsvectorcolorbrewercolorrampv2dialogbase.ui @@ -1,7 +1,7 @@ - QgsVectorColorBrewerColorRampV2DialogBase - + QgsVectorColorBrewerColorRampDialogBase + 0 @@ -120,7 +120,7 @@ buttonBox accepted() - QgsVectorColorBrewerColorRampV2DialogBase + QgsVectorColorBrewerColorRampDialogBase accept() @@ -136,7 +136,7 @@ buttonBox rejected() - QgsVectorColorBrewerColorRampV2DialogBase + QgsVectorColorBrewerColorRampDialogBase reject() diff --git a/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui b/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui index 364b7392433..9badbf958fa 100644 --- a/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui +++ b/src/ui/qgsvectorgradientcolorrampv2dialogbase.ui @@ -1,7 +1,7 @@ - QgsVectorGradientColorRampV2DialogBase - + QgsVectorGradientColorRampDialogBase + 0 @@ -381,7 +381,7 @@ buttonBox accepted() - QgsVectorGradientColorRampV2DialogBase + QgsVectorGradientColorRampDialogBase accept() @@ -397,7 +397,7 @@ buttonBox rejected() - QgsVectorGradientColorRampV2DialogBase + QgsVectorGradientColorRampDialogBase reject() diff --git a/src/ui/qgsvectorrandomcolorrampv2dialogbase.ui b/src/ui/qgsvectorrandomcolorrampv2dialogbase.ui index 15e1a5e8ff5..2fa85a6608c 100644 --- a/src/ui/qgsvectorrandomcolorrampv2dialogbase.ui +++ b/src/ui/qgsvectorrandomcolorrampv2dialogbase.ui @@ -1,7 +1,7 @@ - QgsVectorRandomColorRampV2DialogBase - + QgsVectorRandomColorRampDialogBase + 0 @@ -224,7 +224,7 @@ buttonBox accepted() - QgsVectorRandomColorRampV2DialogBase + QgsVectorRandomColorRampDialogBase accept() @@ -240,7 +240,7 @@ buttonBox rejected() - QgsVectorRandomColorRampV2DialogBase + QgsVectorRandomColorRampDialogBase reject() diff --git a/tests/src/core/CMakeLists.txt b/tests/src/core/CMakeLists.txt index 9b3cf4fc8ca..368bdfbb555 100644 --- a/tests/src/core/CMakeLists.txt +++ b/tests/src/core/CMakeLists.txt @@ -145,7 +145,7 @@ ADD_QGIS_TEST(graduatedsymbolrenderertest testqgsgraduatedsymbolrenderer.cpp) ADD_QGIS_TEST(histogramtest testqgshistogram.cpp) ADD_QGIS_TEST(imageoperationtest testqgsimageoperation.cpp) ADD_QGIS_TEST(invertedpolygontest testqgsinvertedpolygonrenderer.cpp ) -ADD_QGIS_TEST(labelingenginev2 testqgslabelingenginev2.cpp) +ADD_QGIS_TEST(labelingengine testqgslabelingengine.cpp) ADD_QGIS_TEST(layertree testqgslayertree.cpp) ADD_QGIS_TEST(legendrenderertest testqgslegendrenderer.cpp ) ADD_QGIS_TEST(centroidfillsymboltest testqgscentroidfillsymbol.cpp ) @@ -183,9 +183,9 @@ ADD_QGIS_TEST(snappingutilstest testqgssnappingutils.cpp ) ADD_QGIS_TEST(spatialindextest testqgsspatialindex.cpp) ADD_QGIS_TEST(statisticalsummarytest testqgsstatisticalsummary.cpp) ADD_QGIS_TEST(stringutilstest testqgsstringutils.cpp) -ADD_QGIS_TEST(stylev2test testqgsstylev2.cpp) +ADD_QGIS_TEST(styletest testqgsstyle.cpp) ADD_QGIS_TEST(svgmarkertest testqgssvgmarker.cpp) -ADD_QGIS_TEST(symbolv2test testqgssymbol.cpp) +ADD_QGIS_TEST(symboltest testqgssymbol.cpp) ADD_QGIS_TEST(tracertest testqgstracer.cpp) #for some obscure reason calling this test "fontutils" kills the build on Ubuntu 15.10 ADD_QGIS_TEST(typographicstylingutils testqgsfontutils.cpp) diff --git a/tests/src/core/testmaprendererjob.cpp b/tests/src/core/testmaprendererjob.cpp index 8e3dc035661..8da62a8fbf6 100644 --- a/tests/src/core/testmaprendererjob.cpp +++ b/tests/src/core/testmaprendererjob.cpp @@ -228,7 +228,7 @@ void TestQgsMapRendererJob::testErrors() QgsMapLayerRegistry::instance()->addMapLayer( l ); QgsMapSettings settings( _mapSettings( QStringList( l->id() ) ) ); - l->setRendererV2( 0 ); // this has to produce an error + l->setRenderer( nullptr ); // this has to produce an error QgsMapRendererSequentialJob job( settings ); job.start(); diff --git a/tests/src/core/testqgs25drenderer.cpp b/tests/src/core/testqgs25drenderer.cpp index c711299d3c4..03203f087ff 100644 --- a/tests/src/core/testqgs25drenderer.cpp +++ b/tests/src/core/testqgs25drenderer.cpp @@ -121,7 +121,7 @@ void TestQgs25DRenderer::render() renderer->setShadowEnabled( false ); renderer->setWallShadingEnabled( false ); renderer->setRoofColor( QColor( "#fdbf6f" ) ); - mpPolysLayer->setRendererV2( renderer ); + mpPolysLayer->setRenderer( renderer ); QVERIFY( imageCheck( "25d_render" ) ); } diff --git a/tests/src/core/testqgsatlascomposition.cpp b/tests/src/core/testqgsatlascomposition.cpp index 69b973b266a..65834b3751b 100644 --- a/tests/src/core/testqgsatlascomposition.cpp +++ b/tests/src/core/testqgsatlascomposition.cpp @@ -26,7 +26,7 @@ #include "qgsvectorlayer.h" #include "qgsvectordataprovider.h" #include "qgssymbol.h" -#include "qgssinglesymbolrendererv2.h" +#include "qgssinglesymbolrenderer.h" #include "qgsfontutils.h" #include #include @@ -158,9 +158,9 @@ void TestQgsAtlasComposition::init() // fix the renderer, fill with green QgsStringMap props; props.insert( "color", "0,127,0" ); - QgsFillSymbolV2* fillSymbol = QgsFillSymbolV2::createSimple( props ); - QgsSingleSymbolRendererV2* renderer = new QgsSingleSymbolRendererV2( fillSymbol ); - mVectorLayer->setRendererV2( renderer ); + QgsFillSymbol* fillSymbol = QgsFillSymbol::createSimple( props ); + QgsSingleSymbolRenderer* renderer = new QgsSingleSymbolRenderer( fillSymbol ); + mVectorLayer->setRenderer( renderer ); // the atlas map mAtlasMap = new QgsComposerMap( mComposition, 20, 20, 130, 130 ); @@ -185,7 +185,7 @@ void TestQgsAtlasComposition::init() // set the fill symbol of the overview map QgsStringMap props2; props2.insert( "color", "127,0,0,127" ); - QgsFillSymbolV2* fillSymbol2 = QgsFillSymbolV2::createSimple( props2 ); + QgsFillSymbol* fillSymbol2 = QgsFillSymbol::createSimple( props2 ); mOverview->overview()->setFrameSymbol( fillSymbol2 ); // header label diff --git a/tests/src/core/testqgscentroidfillsymbol.cpp b/tests/src/core/testqgscentroidfillsymbol.cpp index 31883522181..d2c4c10ca57 100644 --- a/tests/src/core/testqgscentroidfillsymbol.cpp +++ b/tests/src/core/testqgscentroidfillsymbol.cpp @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include //qgis test includes #include "qgsrenderchecker.h" @@ -65,9 +65,9 @@ class TestQgsCentroidFillSymbol : public QObject bool imageCheck( const QString& theType ); QgsMapSettings mMapSettings; QgsVectorLayer * mpPolysLayer; - QgsCentroidFillSymbolLayerV2* mCentroidFill; - QgsFillSymbolV2* mFillSymbol; - QgsSingleSymbolRendererV2* mSymbolRenderer; + QgsCentroidFillSymbolLayer* mCentroidFill; + QgsFillSymbol* mFillSymbol; + QgsSingleSymbolRenderer* mSymbolRenderer; QString mTestDataDir; QString mReport; }; @@ -102,11 +102,11 @@ void TestQgsCentroidFillSymbol::initTestCase() QList() << mpPolysLayer ); //setup gradient fill - mCentroidFill = new QgsCentroidFillSymbolLayerV2(); - mFillSymbol = new QgsFillSymbolV2(); + mCentroidFill = new QgsCentroidFillSymbolLayer(); + mFillSymbol = new QgsFillSymbol(); mFillSymbol->changeSymbolLayer( 0, mCentroidFill ); - mSymbolRenderer = new QgsSingleSymbolRendererV2( mFillSymbol ); - mpPolysLayer->setRendererV2( mSymbolRenderer ); + mSymbolRenderer = new QgsSingleSymbolRenderer( mFillSymbol ); + mpPolysLayer->setRenderer( mSymbolRenderer ); // We only need maprender instead of mapcanvas // since maprender does not require a qui diff --git a/tests/src/core/testqgscomposerdd.cpp b/tests/src/core/testqgscomposerdd.cpp index 06e9a95b992..3a504e1bac8 100644 --- a/tests/src/core/testqgscomposerdd.cpp +++ b/tests/src/core/testqgscomposerdd.cpp @@ -26,7 +26,7 @@ #include "qgsvectordataprovider.h" #include "qgsfeature.h" #include "qgssymbol.h" -#include "qgssinglesymbolrendererv2.h" +#include "qgssinglesymbolrenderer.h" #include "qgsdatadefined.h" #include @@ -96,9 +96,9 @@ void TestQgsComposerDD::initTestCase() // fix the renderer, fill with green QgsStringMap props; props.insert( "color", "0,127,0" ); - QgsFillSymbolV2* fillSymbol = QgsFillSymbolV2::createSimple( props ); - QgsSingleSymbolRendererV2* renderer = new QgsSingleSymbolRendererV2( fillSymbol ); - mVectorLayer->setRendererV2( renderer ); + QgsFillSymbol* fillSymbol = QgsFillSymbol::createSimple( props ); + QgsSingleSymbolRenderer* renderer = new QgsSingleSymbolRenderer( fillSymbol ); + mVectorLayer->setRenderer( renderer ); // the atlas map mAtlasMap = new QgsComposerMap( mComposition, 20, 20, 130, 130 ); diff --git a/tests/src/core/testqgscomposerpaper.cpp b/tests/src/core/testqgscomposerpaper.cpp index 02199d55f04..ecb32ad0cd5 100644 --- a/tests/src/core/testqgscomposerpaper.cpp +++ b/tests/src/core/testqgscomposerpaper.cpp @@ -20,9 +20,9 @@ #include "qgsmultirenderchecker.h" #include "qgscomposershape.h" #include "qgssymbol.h" -#include "qgssinglesymbolrendererv2.h" -#include "qgsfillsymbollayerv2.h" -#include "qgslinesymbollayerv2.h" +#include "qgssinglesymbolrenderer.h" +#include "qgsfillsymbollayer.h" +#include "qgslinesymbollayer.h" #include #include @@ -54,7 +54,7 @@ class TestQgsComposerPaper : public QObject QgsComposition* mComposition; QString mReport; QgsMapSettings *mMapSettings; - // QgsSingleSymbolRendererV2* mSymbolRenderer; + // QgsSingleSymbolRenderer* mSymbolRenderer; }; @@ -106,8 +106,8 @@ void TestQgsComposerPaper::defaultPaper() void TestQgsComposerPaper::transparentPaper() { - QgsSimpleFillSymbolLayerV2* simpleFill = new QgsSimpleFillSymbolLayerV2(); - QgsFillSymbolV2* fillSymbol = new QgsFillSymbolV2(); + QgsSimpleFillSymbolLayer* simpleFill = new QgsSimpleFillSymbolLayer(); + QgsFillSymbol* fillSymbol = new QgsFillSymbol(); fillSymbol->changeSymbolLayer( 0, simpleFill ); simpleFill->setColor( Qt::transparent ); simpleFill->setBorderColor( Qt::transparent ); @@ -121,8 +121,8 @@ void TestQgsComposerPaper::transparentPaper() void TestQgsComposerPaper::borderedPaper() { - QgsSimpleFillSymbolLayerV2* simpleFill = new QgsSimpleFillSymbolLayerV2(); - QgsFillSymbolV2* fillSymbol = new QgsFillSymbolV2(); + QgsSimpleFillSymbolLayer* simpleFill = new QgsSimpleFillSymbolLayer(); + QgsFillSymbol* fillSymbol = new QgsFillSymbol(); fillSymbol->changeSymbolLayer( 0, simpleFill ); simpleFill->setColor( Qt::white ); simpleFill->setBorderColor( Qt::black ); @@ -137,8 +137,8 @@ void TestQgsComposerPaper::borderedPaper() void TestQgsComposerPaper::markerLinePaper() { - QgsMarkerLineSymbolLayerV2* markerLine = new QgsMarkerLineSymbolLayerV2(); - QgsFillSymbolV2* markerLineSymbol = new QgsFillSymbolV2(); + QgsMarkerLineSymbolLayer* markerLine = new QgsMarkerLineSymbolLayer(); + QgsFillSymbol* markerLineSymbol = new QgsFillSymbol(); markerLineSymbol->changeSymbolLayer( 0, markerLine ); mComposition->setPageStyleSymbol( markerLineSymbol ); delete markerLineSymbol; @@ -150,8 +150,8 @@ void TestQgsComposerPaper::markerLinePaper() void TestQgsComposerPaper::hiddenPages() { - QgsSimpleFillSymbolLayerV2* simpleFill = new QgsSimpleFillSymbolLayerV2(); - QgsFillSymbolV2* fillSymbol = new QgsFillSymbolV2(); + QgsSimpleFillSymbolLayer* simpleFill = new QgsSimpleFillSymbolLayer(); + QgsFillSymbol* fillSymbol = new QgsFillSymbol(); fillSymbol->changeSymbolLayer( 0, simpleFill ); simpleFill->setColor( Qt::blue ); simpleFill->setBorderColor( Qt::transparent ); diff --git a/tests/src/core/testqgscomposershapes.cpp b/tests/src/core/testqgscomposershapes.cpp index f247a8ddf3d..eef9e20cee5 100644 --- a/tests/src/core/testqgscomposershapes.cpp +++ b/tests/src/core/testqgscomposershapes.cpp @@ -21,8 +21,8 @@ #include "qgscomposershape.h" #include "qgsmapsettings.h" #include "qgssymbol.h" -#include "qgssinglesymbolrendererv2.h" -#include "qgsfillsymbollayerv2.h" +#include "qgssinglesymbolrenderer.h" +#include "qgsfillsymbollayer.h" #include #include #include @@ -48,7 +48,7 @@ class TestQgsComposerShapes : public QObject void triangle(); //test if triange shape is functioning void ellipse(); //test if ellipse shape is functioning void roundedRectangle(); //test if rounded rectangle shape is functioning - void symbolV2(); //test is styling shapes via symbolv2 is working + void symbol(); //test is styling shapes via symbol is working private: QgsComposition* mComposition; @@ -138,23 +138,23 @@ void TestQgsComposerShapes::roundedRectangle() mComposerShape->setCornerRadius( 0 ); } -void TestQgsComposerShapes::symbolV2() +void TestQgsComposerShapes::symbol() { mComposerShape->setShapeType( QgsComposerShape::Rectangle ); //setup simple fill - QgsSimpleFillSymbolLayerV2* simpleFill = new QgsSimpleFillSymbolLayerV2(); - QgsFillSymbolV2* fillSymbol = new QgsFillSymbolV2(); + QgsSimpleFillSymbolLayer* simpleFill = new QgsSimpleFillSymbolLayer(); + QgsFillSymbol* fillSymbol = new QgsFillSymbol(); fillSymbol->changeSymbolLayer( 0, simpleFill ); simpleFill->setColor( Qt::green ); simpleFill->setBorderColor( Qt::yellow ); simpleFill->setBorderWidth( 6 ); mComposerShape->setShapeStyleSymbol( fillSymbol ); - mComposerShape->setUseSymbolV2( true ); + mComposerShape->setUseSymbol( true ); delete fillSymbol; - QgsCompositionChecker checker( "composershapes_symbolv2", mComposition ); + QgsCompositionChecker checker( "composershapes_symbol", mComposition ); checker.setControlPathPrefix( "composer_shapes" ); QVERIFY( checker.testComposition( mReport ) ); } diff --git a/tests/src/core/testqgscomposition.cpp b/tests/src/core/testqgscomposition.cpp index 7cf6701f7c8..bb72ce520df 100644 --- a/tests/src/core/testqgscomposition.cpp +++ b/tests/src/core/testqgscomposition.cpp @@ -25,7 +25,7 @@ #include "qgscomposermap.h" #include "qgsmapsettings.h" #include "qgsmultirenderchecker.h" -#include "qgsfillsymbollayerv2.h" +#include "qgsfillsymbollayer.h" #include #include @@ -392,8 +392,8 @@ void TestQgsComposition::resizeToContents() { //add some items to a composition QgsComposition* composition = new QgsComposition( *mMapSettings ); - QgsSimpleFillSymbolLayerV2* simpleFill = new QgsSimpleFillSymbolLayerV2(); - QgsFillSymbolV2* fillSymbol = new QgsFillSymbolV2(); + QgsSimpleFillSymbolLayer* simpleFill = new QgsSimpleFillSymbolLayer(); + QgsFillSymbol* fillSymbol = new QgsFillSymbol(); fillSymbol->changeSymbolLayer( 0, simpleFill ); simpleFill->setColor( Qt::yellow ); simpleFill->setBorderColor( Qt::transparent ); @@ -433,8 +433,8 @@ void TestQgsComposition::resizeToContentsMargin() //resize to contents, with margin QgsComposition* composition = new QgsComposition( *mMapSettings ); - QgsSimpleFillSymbolLayerV2* simpleFill = new QgsSimpleFillSymbolLayerV2(); - QgsFillSymbolV2* fillSymbol = new QgsFillSymbolV2(); + QgsSimpleFillSymbolLayer* simpleFill = new QgsSimpleFillSymbolLayer(); + QgsFillSymbol* fillSymbol = new QgsFillSymbol(); fillSymbol->changeSymbolLayer( 0, simpleFill ); simpleFill->setColor( Qt::yellow ); simpleFill->setBorderColor( Qt::transparent ); @@ -474,8 +474,8 @@ void TestQgsComposition::resizeToContentsMultiPage() //resize to contents with multi-page composition, should result in a single page QgsComposition* composition = new QgsComposition( *mMapSettings ); - QgsSimpleFillSymbolLayerV2* simpleFill = new QgsSimpleFillSymbolLayerV2(); - QgsFillSymbolV2* fillSymbol = new QgsFillSymbolV2(); + QgsSimpleFillSymbolLayer* simpleFill = new QgsSimpleFillSymbolLayer(); + QgsFillSymbol* fillSymbol = new QgsFillSymbol(); fillSymbol->changeSymbolLayer( 0, simpleFill ); simpleFill->setColor( Qt::yellow ); simpleFill->setBorderColor( Qt::transparent ); diff --git a/tests/src/core/testqgsconnectionpool.cpp b/tests/src/core/testqgsconnectionpool.cpp index ee83eb895d8..23121994691 100644 --- a/tests/src/core/testqgsconnectionpool.cpp +++ b/tests/src/core/testqgsconnectionpool.cpp @@ -18,7 +18,7 @@ #include "qgsfeatureiterator.h" #include "qgsgeometry.h" #include "qgspointv2.h" -#include "qgslinestringv2.h" +#include "qgslinestring.h" #include "qgsvectorlayer.h" #include #include @@ -124,7 +124,7 @@ void TestQgsConnectionPool::layersFromSameDatasetGPX() for ( int i = 0, n = layer2Features.count(); i < n; ++i ) { QgsGeometry featureGeom = layer2Features[i].geometry(); - const QgsLineStringV2* geom = dynamic_cast( featureGeom.geometry() ); + const QgsLineString* geom = dynamic_cast( featureGeom.geometry() ); QVERIFY( geom != nullptr ); int nVtx = geom->vertexCount(); QVERIFY( nVtx == nRoutePts ); diff --git a/tests/src/core/testqgsdiagram.cpp b/tests/src/core/testqgsdiagram.cpp index a3f15b9c6b0..2332c69f50b 100644 --- a/tests/src/core/testqgsdiagram.cpp +++ b/tests/src/core/testqgsdiagram.cpp @@ -25,14 +25,14 @@ //qgis includes... // #include #include -#include +#include #include #include #include #include #include #include -#include +#include //qgis test includes #include "qgsmultirenderchecker.h" #include "qgspallabeling.h" diff --git a/tests/src/core/testqgsellipsemarker.cpp b/tests/src/core/testqgsellipsemarker.cpp index 15e7f1570b3..d66ee388a33 100644 --- a/tests/src/core/testqgsellipsemarker.cpp +++ b/tests/src/core/testqgsellipsemarker.cpp @@ -28,9 +28,9 @@ #include #include #include -#include -#include "qgsmarkersymbollayerv2.h" -#include "qgsellipsesymbollayerv2.h" +#include +#include "qgsmarkersymbollayer.h" +#include "qgsellipsesymbollayer.h" #include "qgsdatadefined.h" //qgis test includes @@ -70,9 +70,9 @@ class TestQgsEllipseMarkerSymbol : public QObject bool imageCheck( const QString& theType ); QgsMapSettings mMapSettings; QgsVectorLayer * mpPointsLayer; - QgsEllipseSymbolLayerV2* mEllipseMarkerLayer; - QgsMarkerSymbolV2* mMarkerSymbol; - QgsSingleSymbolRendererV2* mSymbolRenderer; + QgsEllipseSymbolLayer* mEllipseMarkerLayer; + QgsMarkerSymbol* mMarkerSymbol; + QgsSingleSymbolRenderer* mSymbolRenderer; QString mTestDataDir; QString mReport; }; @@ -103,11 +103,11 @@ void TestQgsEllipseMarkerSymbol::initTestCase() QList() << mpPointsLayer ); //setup symbol - mEllipseMarkerLayer = new QgsEllipseSymbolLayerV2(); - mMarkerSymbol = new QgsMarkerSymbolV2(); + mEllipseMarkerLayer = new QgsEllipseSymbolLayer(); + mMarkerSymbol = new QgsMarkerSymbol(); mMarkerSymbol->changeSymbolLayer( 0, mEllipseMarkerLayer ); - mSymbolRenderer = new QgsSingleSymbolRendererV2( mMarkerSymbol ); - mpPointsLayer->setRendererV2( mSymbolRenderer ); + mSymbolRenderer = new QgsSingleSymbolRenderer( mMarkerSymbol ); + mpPointsLayer->setRenderer( mSymbolRenderer ); // We only need maprender instead of mapcanvas // since maprender does not require a qui diff --git a/tests/src/core/testqgsfilledmarker.cpp b/tests/src/core/testqgsfilledmarker.cpp index 5e0c6eff9cd..8bbf9b74273 100644 --- a/tests/src/core/testqgsfilledmarker.cpp +++ b/tests/src/core/testqgsfilledmarker.cpp @@ -28,9 +28,9 @@ #include #include #include -#include -#include "qgsmarkersymbollayerv2.h" -#include "qgsfillsymbollayerv2.h" +#include +#include "qgsmarkersymbollayer.h" +#include "qgsfillsymbollayer.h" #include "qgsdatadefined.h" //qgis test includes @@ -69,8 +69,8 @@ class TestQgsFilledMarkerSymbol : public QObject QgsMapSettings mMapSettings; QgsVectorLayer * mpPointsLayer; QgsFilledMarkerSymbolLayer* mFilledMarkerLayer; - QgsMarkerSymbolV2* mMarkerSymbol; - QgsSingleSymbolRendererV2* mSymbolRenderer; + QgsMarkerSymbol* mMarkerSymbol; + QgsSingleSymbolRenderer* mSymbolRenderer; QString mTestDataDir; QString mReport; }; @@ -101,24 +101,24 @@ void TestQgsFilledMarkerSymbol::initTestCase() QList() << mpPointsLayer ); //setup symbol - QgsGradientFillSymbolLayerV2* gradientFill = new QgsGradientFillSymbolLayerV2(); + QgsGradientFillSymbolLayer* gradientFill = new QgsGradientFillSymbolLayer(); gradientFill->setColor( QColor( "red" ) ); gradientFill->setColor2( QColor( "blue" ) ); - gradientFill->setGradientType( QgsGradientFillSymbolLayerV2::Linear ); - gradientFill->setGradientColorType( QgsGradientFillSymbolLayerV2::SimpleTwoColor ); - gradientFill->setCoordinateMode( QgsGradientFillSymbolLayerV2::Feature ); - gradientFill->setGradientSpread( QgsGradientFillSymbolLayerV2::Pad ); + gradientFill->setGradientType( QgsGradientFillSymbolLayer::Linear ); + gradientFill->setGradientColorType( QgsGradientFillSymbolLayer::SimpleTwoColor ); + gradientFill->setCoordinateMode( QgsGradientFillSymbolLayer::Feature ); + gradientFill->setGradientSpread( QgsGradientFillSymbolLayer::Pad ); gradientFill->setReferencePoint1( QPointF( 0, 0 ) ); gradientFill->setReferencePoint2( QPointF( 1, 1 ) ); - QgsFillSymbolV2* fillSymbol = new QgsFillSymbolV2(); + QgsFillSymbol* fillSymbol = new QgsFillSymbol(); fillSymbol->changeSymbolLayer( 0, gradientFill ); mFilledMarkerLayer = new QgsFilledMarkerSymbolLayer(); mFilledMarkerLayer->setSubSymbol( fillSymbol ); - mMarkerSymbol = new QgsMarkerSymbolV2(); + mMarkerSymbol = new QgsMarkerSymbol(); mMarkerSymbol->changeSymbolLayer( 0, mFilledMarkerLayer ); - mSymbolRenderer = new QgsSingleSymbolRendererV2( mMarkerSymbol ); - mpPointsLayer->setRendererV2( mSymbolRenderer ); + mSymbolRenderer = new QgsSingleSymbolRenderer( mMarkerSymbol ); + mpPointsLayer->setRenderer( mSymbolRenderer ); // We only need maprender instead of mapcanvas // since maprender does not require a qui diff --git a/tests/src/core/testqgsfontmarker.cpp b/tests/src/core/testqgsfontmarker.cpp index 4113c068b31..6af38ffcf08 100644 --- a/tests/src/core/testqgsfontmarker.cpp +++ b/tests/src/core/testqgsfontmarker.cpp @@ -28,8 +28,8 @@ #include #include #include -#include -#include "qgsmarkersymbollayerv2.h" +#include +#include "qgsmarkersymbollayer.h" #include "qgsdatadefined.h" #include "qgsfontutils.h" @@ -68,9 +68,9 @@ class TestQgsFontMarkerSymbol : public QObject bool imageCheck( const QString& theType ); QgsMapSettings mMapSettings; QgsVectorLayer * mpPointsLayer; - QgsFontMarkerSymbolLayerV2* mFontMarkerLayer; - QgsMarkerSymbolV2* mMarkerSymbol; - QgsSingleSymbolRendererV2* mSymbolRenderer; + QgsFontMarkerSymbolLayer* mFontMarkerLayer; + QgsMarkerSymbol* mMarkerSymbol; + QgsSingleSymbolRenderer* mSymbolRenderer; QString mTestDataDir; QString mReport; }; @@ -101,11 +101,11 @@ void TestQgsFontMarkerSymbol::initTestCase() QList() << mpPointsLayer ); //setup symbol - mFontMarkerLayer = new QgsFontMarkerSymbolLayerV2(); - mMarkerSymbol = new QgsMarkerSymbolV2(); + mFontMarkerLayer = new QgsFontMarkerSymbolLayer(); + mMarkerSymbol = new QgsMarkerSymbol(); mMarkerSymbol->changeSymbolLayer( 0, mFontMarkerLayer ); - mSymbolRenderer = new QgsSingleSymbolRendererV2( mMarkerSymbol ); - mpPointsLayer->setRendererV2( mSymbolRenderer ); + mSymbolRenderer = new QgsSingleSymbolRenderer( mMarkerSymbol ); + mpPointsLayer->setRenderer( mSymbolRenderer ); // We only need maprender instead of mapcanvas // since maprender does not require a qui diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp index f4fd4e6c5c5..cb77195d752 100644 --- a/tests/src/core/testqgsgeometry.cpp +++ b/tests/src/core/testqgsgeometry.cpp @@ -31,13 +31,13 @@ #include "qgsgeometryutils.h" #include #include "qgspointv2.h" -#include "qgslinestringv2.h" -#include "qgspolygonv2.h" -#include "qgsmultipointv2.h" -#include "qgsmultilinestringv2.h" -#include "qgsmultipolygonv2.h" -#include "qgscircularstringv2.h" -#include "qgsgeometrycollectionv2.h" +#include "qgslinestring.h" +#include "qgspolygon.h" +#include "qgsmultipoint.h" +#include "qgsmultilinestring.h" +#include "qgsmultipolygon.h" +#include "qgscircularstring.h" +#include "qgsgeometrycollection.h" #include "qgsgeometryfactory.h" #include "qgstestutils.h" @@ -66,9 +66,9 @@ class TestQgsGeometry : public QObject void operatorBool(); // geometry types - void pointV2(); //test QgsPointV2 - void lineStringV2(); //test QgsLineStringV2 - void polygonV2(); //test QgsPolygonV2 + void point(); //test QgsPointV2 + void lineString(); //test QgsLineString + void polygon(); //test QgsPolygonV2 void multiPoint(); void multiLineString(); void multiPolygon(); @@ -374,7 +374,7 @@ void TestQgsGeometry::isEmpty() geom.setGeometry( 0 ); QVERIFY( geom.isEmpty() ); - QgsGeometryCollectionV2 collection; + QgsGeometryCollection collection; QVERIFY( collection.isEmpty() ); } @@ -390,7 +390,7 @@ void TestQgsGeometry::operatorBool() QVERIFY( !geom ); } -void TestQgsGeometry::pointV2() +void TestQgsGeometry::point() { //test QgsPointV2 @@ -560,7 +560,7 @@ void TestQgsGeometry::pointV2() p13 = QgsPointV2( 1, 2 ); QVERIFY( !p13.fromWkb( QgsConstWkbPtr( nullptr, 0 ) ) ); QCOMPARE( p13.wkbType(), QgsWkbTypes::Point ); - QgsLineStringV2 line; + QgsLineString line; p13 = QgsPointV2( 1, 2 ); wkb = line.asWkb( size ); QVERIFY( !p13.fromWkb( QgsConstWkbPtr( wkb, size ) ) ); @@ -648,7 +648,7 @@ void TestQgsGeometry::pointV2() //coordinateSequence QgsPointV2 p18( QgsWkbTypes::PointZM, 1.0, 2.0, 3.0, 4.0 ); - QgsCoordinateSequenceV2 coord = p18.coordinateSequence(); + QgsCoordinateSequence coord = p18.coordinateSequence(); QCOMPARE( coord.count(), 1 ); QCOMPARE( coord.at( 0 ).count(), 1 ); QCOMPARE( coord.at( 0 ).at( 0 ).count(), 1 ); @@ -795,10 +795,10 @@ void TestQgsGeometry::pointV2() QVERIFY( !p30.boundary() ); } -void TestQgsGeometry::lineStringV2() +void TestQgsGeometry::lineString() { //test constructors - QgsLineStringV2 l1; + QgsLineString l1; QVERIFY( l1.isEmpty() ); QCOMPARE( l1.numPoints(), 0 ); QCOMPARE( l1.vertexCount(), 0 ); @@ -816,7 +816,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l1.perimeter(), 0.0 ); //addVertex - QgsLineStringV2 l2; + QgsLineString l2; l2.addVertex( QgsPointV2( 1.0, 2.0 ) ); QVERIFY( !l2.isEmpty() ); QCOMPARE( l2.numPoints(), 1 ); @@ -832,7 +832,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l2.perimeter(), 0.0 ); //adding first vertex should set linestring z/m type - QgsLineStringV2 l3; + QgsLineString l3; l3.addVertex( QgsPointV2( QgsWkbTypes::PointZ, 1.0, 2.0, 3.0 ) ); QVERIFY( !l3.isEmpty() ); QVERIFY( l3.is3D() ); @@ -840,7 +840,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l3.wkbType(), QgsWkbTypes::LineStringZ ); QCOMPARE( l3.wktTypeStr(), QString( "LineStringZ" ) ); - QgsLineStringV2 l4; + QgsLineString l4; l4.addVertex( QgsPointV2( QgsWkbTypes::PointM, 1.0, 2.0, 0.0, 3.0 ) ); QVERIFY( !l4.isEmpty() ); QVERIFY( !l4.is3D() ); @@ -848,7 +848,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l4.wkbType(), QgsWkbTypes::LineStringM ); QCOMPARE( l4.wktTypeStr(), QString( "LineStringM" ) ); - QgsLineStringV2 l5; + QgsLineString l5; l5.addVertex( QgsPointV2( QgsWkbTypes::PointZM, 1.0, 2.0, 3.0, 4.0 ) ); QVERIFY( !l5.isEmpty() ); QVERIFY( l5.is3D() ); @@ -856,7 +856,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l5.wkbType(), QgsWkbTypes::LineStringZM ); QCOMPARE( l5.wktTypeStr(), QString( "LineStringZM" ) ); - QgsLineStringV2 l25d; + QgsLineString l25d; l25d.addVertex( QgsPointV2( QgsWkbTypes::Point25D, 1.0, 2.0, 3.0 ) ); QVERIFY( !l25d.isEmpty() ); QVERIFY( l25d.is3D() ); @@ -865,7 +865,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l25d.wktTypeStr(), QString( "LineStringZ" ) ); //adding subsequent vertices should not alter z/m type, regardless of points type - QgsLineStringV2 l6; + QgsLineString l6; l6.addVertex( QgsPointV2( QgsWkbTypes::Point, 1.0, 2.0 ) ); //2d type QCOMPARE( l6.wkbType(), QgsWkbTypes::LineString ); l6.addVertex( QgsPointV2( QgsWkbTypes::PointZ, 11.0, 12.0, 13.0 ) ); // add 3d point @@ -879,7 +879,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l6.area(), 0.0 ); QCOMPARE( l6.perimeter(), 0.0 ); - QgsLineStringV2 l7; + QgsLineString l7; l7.addVertex( QgsPointV2( QgsWkbTypes::PointZ, 1.0, 2.0, 3.0 ) ); //3d type QCOMPARE( l7.wkbType(), QgsWkbTypes::LineStringZ ); l7.addVertex( QgsPointV2( QgsWkbTypes::Point, 11.0, 12.0 ) ); //add 2d point @@ -905,8 +905,8 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l7.wkbType(), QgsWkbTypes::LineString ); //setPoints - QgsLineStringV2 l8; - l8.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) << QgsPointV2( 2, 3 ) << QgsPointV2( 3, 4 ) ); + QgsLineString l8; + l8.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 2, 3 ) << QgsPointV2( 3, 4 ) ); QVERIFY( !l8.isEmpty() ); QCOMPARE( l8.numPoints(), 3 ); QCOMPARE( l8.vertexCount(), 3 ); @@ -919,7 +919,7 @@ void TestQgsGeometry::lineStringV2() QVERIFY( !l8.hasCurvedSegments() ); //setPoints with empty list, should clear linestring - l8.setPoints( QgsPointSequenceV2() ); + l8.setPoints( QgsPointSequence() ); QVERIFY( l8.isEmpty() ); QCOMPARE( l8.numPoints(), 0 ); QCOMPARE( l8.vertexCount(), 0 ); @@ -929,14 +929,14 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l8.wkbType(), QgsWkbTypes::LineString ); //setPoints with z - l8.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 2, 3, 4 ) ); + l8.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 2, 3, 4 ) ); QCOMPARE( l8.numPoints(), 2 ); QVERIFY( l8.is3D() ); QVERIFY( !l8.isMeasure() ); QCOMPARE( l8.wkbType(), QgsWkbTypes::LineStringZ ); //setPoints with 25d - l8.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point25D, 1, 2, 4 ) << QgsPointV2( QgsWkbTypes::Point25D, 2, 3, 4 ) ); + l8.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point25D, 1, 2, 4 ) << QgsPointV2( QgsWkbTypes::Point25D, 2, 3, 4 ) ); QCOMPARE( l8.numPoints(), 2 ); QVERIFY( l8.is3D() ); QVERIFY( !l8.isMeasure() ); @@ -944,21 +944,21 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l8.pointN( 0 ), QgsPointV2( QgsWkbTypes::Point25D, 1, 2, 4 ) ); //setPoints with m - l8.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 3 ) << QgsPointV2( QgsWkbTypes::PointM, 2, 3, 0, 4 ) ); + l8.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 3 ) << QgsPointV2( QgsWkbTypes::PointM, 2, 3, 0, 4 ) ); QCOMPARE( l8.numPoints(), 2 ); QVERIFY( !l8.is3D() ); QVERIFY( l8.isMeasure() ); QCOMPARE( l8.wkbType(), QgsWkbTypes::LineStringM ); //setPoints with zm - l8.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 4, 5 ) << QgsPointV2( QgsWkbTypes::PointZM, 2, 3, 4, 5 ) ); + l8.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 4, 5 ) << QgsPointV2( QgsWkbTypes::PointZM, 2, 3, 4, 5 ) ); QCOMPARE( l8.numPoints(), 2 ); QVERIFY( l8.is3D() ); QVERIFY( l8.isMeasure() ); QCOMPARE( l8.wkbType(), QgsWkbTypes::LineStringZM ); //setPoints with MIXED dimensionality of points - l8.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 4, 5 ) << QgsPointV2( QgsWkbTypes::PointM, 2, 3, 0, 5 ) ); + l8.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 4, 5 ) << QgsPointV2( QgsWkbTypes::PointM, 2, 3, 0, 5 ) ); QCOMPARE( l8.numPoints(), 2 ); QVERIFY( l8.is3D() ); QVERIFY( l8.isMeasure() ); @@ -973,8 +973,8 @@ void TestQgsGeometry::lineStringV2() bad = l8.pointN( 100 ); //test getters/setters - QgsLineStringV2 l9; - l9.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) + QgsLineString l9; + l9.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 13, 14 ) << QgsPointV2( QgsWkbTypes::PointZM, 21, 22, 23, 24 ) ); QCOMPARE( l9.xAt( 0 ), 1.0 ); @@ -1030,7 +1030,7 @@ void TestQgsGeometry::lineStringV2() l9.setMAt( 11, 54.0 ); //out of range //check zAt/setZAt with non-3d linestring - l9.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 4 ) + l9.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointM, 11, 12, 0, 14 ) << QgsPointV2( QgsWkbTypes::PointM, 21, 22, 0, 24 ) ); @@ -1041,7 +1041,7 @@ void TestQgsGeometry::lineStringV2() l9.setZAt( 1, 63.0 ); //check mAt/setMAt with non-measure linestring - l9.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) + l9.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) << QgsPointV2( 21, 22 ) ); @@ -1054,13 +1054,13 @@ void TestQgsGeometry::lineStringV2() //append linestring //append to empty - QgsLineStringV2 l10; + QgsLineString l10; l10.append( 0 ); QVERIFY( l10.isEmpty() ); QCOMPARE( l10.numPoints(), 0 ); - QScopedPointer toAppend( new QgsLineStringV2() ); - toAppend->setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) + QScopedPointer toAppend( new QgsLineString() ); + toAppend->setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) << QgsPointV2( 21, 22 ) ); l10.append( toAppend.data() ); @@ -1077,8 +1077,8 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l10.pointN( 2 ), toAppend->pointN( 2 ) ); //add more points - toAppend.reset( new QgsLineStringV2() ); - toAppend->setPoints( QgsPointSequenceV2() << QgsPointV2( 31, 32 ) + toAppend.reset( new QgsLineString() ); + toAppend->setPoints( QgsPointSequence() << QgsPointV2( 31, 32 ) << QgsPointV2( 41, 42 ) << QgsPointV2( 51, 52 ) ); l10.append( toAppend.data() ); @@ -1093,8 +1093,8 @@ void TestQgsGeometry::lineStringV2() //check dimensionality is inherited from append line if initially empty l10.clear(); - toAppend.reset( new QgsLineStringV2() ); - toAppend->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 31, 32, 33, 34 ) + toAppend.reset( new QgsLineString() ); + toAppend->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 31, 32, 33, 34 ) << QgsPointV2( QgsWkbTypes::PointZM, 41, 42, 43 , 44 ) << QgsPointV2( QgsWkbTypes::PointZM, 51, 52, 53, 54 ) ); l10.append( toAppend.data() ); @@ -1113,8 +1113,8 @@ void TestQgsGeometry::lineStringV2() l10.addVertex( QgsPointV2( 1.0, 2.0 ) ); QVERIFY( !l10.is3D() ); QCOMPARE( l10.wkbType(), QgsWkbTypes::LineString ); - toAppend.reset( new QgsLineStringV2() ); - toAppend->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 31, 32, 33, 34 ) + toAppend.reset( new QgsLineString() ); + toAppend->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 31, 32, 33, 34 ) << QgsPointV2( QgsWkbTypes::PointZM, 41, 42, 43 , 44 ) << QgsPointV2( QgsWkbTypes::PointZM, 51, 52, 53, 54 ) ); l10.append( toAppend.data() ); @@ -1130,8 +1130,8 @@ void TestQgsGeometry::lineStringV2() QVERIFY( l10.is3D() ); QVERIFY( l10.isMeasure() ); QCOMPARE( l10.wkbType(), QgsWkbTypes::LineStringZM ); - toAppend.reset( new QgsLineStringV2() ); - toAppend->setPoints( QgsPointSequenceV2() << QgsPointV2( 31, 32 ) + toAppend.reset( new QgsLineString() ); + toAppend->setPoints( QgsPointSequence() << QgsPointV2( 31, 32 ) << QgsPointV2( 41, 42 ) << QgsPointV2( 51, 52 ) ); l10.append( toAppend.data() ); @@ -1143,8 +1143,8 @@ void TestQgsGeometry::lineStringV2() //25d append l10.clear(); - toAppend.reset( new QgsLineStringV2() ); - toAppend->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point25D, 31, 32, 33 ) + toAppend.reset( new QgsLineString() ); + toAppend->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point25D, 31, 32, 33 ) << QgsPointV2( QgsWkbTypes::Point25D, 41, 42, 43 ) ); l10.append( toAppend.data() ); QVERIFY( l10.is3D() ); @@ -1153,7 +1153,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l10.pointN( 0 ), QgsPointV2( QgsWkbTypes::Point25D, 31, 32, 33 ) ); QCOMPARE( l10.pointN( 1 ), QgsPointV2( QgsWkbTypes::Point25D, 41, 42, 43 ) ); l10.clear(); - l10.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point25D, 11, 12, 33 ) ); + l10.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point25D, 11, 12, 33 ) ); QCOMPARE( l10.wkbType(), QgsWkbTypes::LineString25D ); l10.append( toAppend.data() ); QVERIFY( l10.is3D() ); @@ -1166,16 +1166,16 @@ void TestQgsGeometry::lineStringV2() //append another line the closes the original geometry. //Make sure there are not duplicit points except start and end point l10.clear(); - toAppend.reset( new QgsLineStringV2() ); - toAppend->setPoints( QgsPointSequenceV2() + toAppend.reset( new QgsLineString() ); + toAppend->setPoints( QgsPointSequence() << QgsPointV2( 1, 1 ) << QgsPointV2( 5, 5 ) << QgsPointV2( 10, 1 ) ); l10.append( toAppend.data() ); QCOMPARE( l10.numPoints(), 3 ); QCOMPARE( l10.vertexCount(), 3 ); - toAppend.reset( new QgsLineStringV2() ); - toAppend->setPoints( QgsPointSequenceV2() + toAppend.reset( new QgsLineString() ); + toAppend->setPoints( QgsPointSequence() << QgsPointV2( 10, 1 ) << QgsPointV2( 1, 1 ) ); l10.append( toAppend.data() ); @@ -1185,8 +1185,8 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l10.vertexCount(), 4 ); //equality - QgsLineStringV2 e1; - QgsLineStringV2 e2; + QgsLineString e1; + QgsLineString e2; QVERIFY( e1 == e2 ); QVERIFY( !( e1 != e2 ) ); e1.addVertex( QgsPointV2( 1, 2 ) ); @@ -1203,33 +1203,33 @@ void TestQgsGeometry::lineStringV2() e2.addVertex( QgsPointV2( 6, 9 ) ); QVERIFY( !( e1 == e2 ) ); //different coordinates QVERIFY( e1 != e2 ); - QgsLineStringV2 e3; - e3.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 1, 2, 0 ) + QgsLineString e3; + e3.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 1, 2, 0 ) << QgsPointV2( QgsWkbTypes::PointZ, 1 / 3.0, 4 / 3.0, 0 ) << QgsPointV2( QgsWkbTypes::PointZ, 7, 8, 0 ) ); QVERIFY( !( e1 == e3 ) ); //different dimension QVERIFY( e1 != e3 ); - QgsLineStringV2 e4; - e4.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 1, 2, 2 ) + QgsLineString e4; + e4.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 1, 2, 2 ) << QgsPointV2( QgsWkbTypes::PointZ, 1 / 3.0, 4 / 3.0, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 7, 8, 4 ) ); QVERIFY( !( e3 == e4 ) ); //different z coordinates QVERIFY( e3 != e4 ); - QgsLineStringV2 e5; - e5.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 1 ) + QgsLineString e5; + e5.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 1 ) << QgsPointV2( QgsWkbTypes::PointM, 1 / 3.0, 4 / 3.0, 0, 2 ) << QgsPointV2( QgsWkbTypes::PointM, 7, 8, 0, 3 ) ); - QgsLineStringV2 e6; - e6.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 11 ) + QgsLineString e6; + e6.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 11 ) << QgsPointV2( QgsWkbTypes::PointM, 1 / 3.0, 4 / 3.0, 0, 12 ) << QgsPointV2( QgsWkbTypes::PointM, 7, 8, 0, 13 ) ); QVERIFY( !( e5 == e6 ) ); //different m values QVERIFY( e5 != e6 ); //close/isClosed - QgsLineStringV2 l11; + QgsLineString l11; QVERIFY( !l11.isClosed() ); - l11.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) + l11.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 2 ) << QgsPointV2( 11, 22 ) << QgsPointV2( 1, 22 ) ); @@ -1253,15 +1253,15 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l11.numPoints(), 5 ); QCOMPARE( l11.pointN( 4 ), QgsPointV2( 1, 2 ) ); //test that m values aren't considered when testing for closedness - l11.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 3 ) + l11.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 3 ) << QgsPointV2( QgsWkbTypes::PointM, 11, 2, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointM, 11, 22, 0, 5 ) << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 6 ) ); QVERIFY( l11.isClosed() ); //close with z and m - QgsLineStringV2 l12; - l12.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) + QgsLineString l12; + l12.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 2, 11, 14 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 22, 21, 24 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 22, 31, 34 ) ); @@ -1270,8 +1270,8 @@ void TestQgsGeometry::lineStringV2() //polygonf - QgsLineStringV2 l13; - l13.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) + QgsLineString l13; + l13.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 2, 11, 14 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 22, 21, 24 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 22, 31, 34 ) ); @@ -1289,12 +1289,12 @@ void TestQgsGeometry::lineStringV2() // clone tests. At the same time, check segmentize as the result should // be equal to a clone for LineStrings - QgsLineStringV2 l14; - l14.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) + QgsLineString l14; + l14.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 2 ) << QgsPointV2( 11, 22 ) << QgsPointV2( 1, 22 ) ); - QScopedPointer cloned( l14.clone() ); + QScopedPointer cloned( l14.clone() ); QCOMPARE( cloned->numPoints(), 4 ); QCOMPARE( cloned->vertexCount(), 4 ); QCOMPARE( cloned->ringCount(), 1 ); @@ -1306,7 +1306,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( cloned->pointN( 1 ), l14.pointN( 1 ) ); QCOMPARE( cloned->pointN( 2 ), l14.pointN( 2 ) ); QCOMPARE( cloned->pointN( 3 ), l14.pointN( 3 ) ); - QScopedPointer< QgsLineStringV2 > segmentized( static_cast< QgsLineStringV2* >( l14.segmentize() ) ); + QScopedPointer< QgsLineString > segmentized( static_cast< QgsLineString* >( l14.segmentize() ) ); QCOMPARE( segmentized->numPoints(), 4 ); QCOMPARE( segmentized->wkbType(), QgsWkbTypes::LineString ); QVERIFY( !segmentized->is3D() ); @@ -1317,7 +1317,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( segmentized->pointN( 3 ), l14.pointN( 3 ) ); //clone with Z/M - l14.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) + l14.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 2, 11, 14 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 22, 21, 24 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 22, 31, 34 ) ); @@ -1330,7 +1330,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( cloned->pointN( 1 ), l14.pointN( 1 ) ); QCOMPARE( cloned->pointN( 2 ), l14.pointN( 2 ) ); QCOMPARE( cloned->pointN( 3 ), l14.pointN( 3 ) ); - segmentized.reset( static_cast< QgsLineStringV2* >( l14.segmentize() ) ); + segmentized.reset( static_cast< QgsLineString* >( l14.segmentize() ) ); QCOMPARE( segmentized->numPoints(), 4 ); QCOMPARE( segmentized->wkbType(), QgsWkbTypes::LineStringZM ); QVERIFY( segmentized->is3D() ); @@ -1348,7 +1348,7 @@ void TestQgsGeometry::lineStringV2() QVERIFY( !cloned->is3D() ); QVERIFY( !cloned->isMeasure() ); QCOMPARE( cloned->wkbType(), QgsWkbTypes::LineString ); - segmentized.reset( static_cast< QgsLineStringV2* >( l14.segmentize() ) ); + segmentized.reset( static_cast< QgsLineString* >( l14.segmentize() ) ); QVERIFY( segmentized->isEmpty() ); QCOMPARE( segmentized->numPoints(), 0 ); QVERIFY( !segmentized->is3D() ); @@ -1356,15 +1356,15 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( segmentized->wkbType(), QgsWkbTypes::LineString ); //to/from WKB - QgsLineStringV2 l15; - l15.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) + QgsLineString l15; + l15.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 2, 11, 14 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 22, 21, 24 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 22, 31, 34 ) ); int size = 0; unsigned char* wkb = l15.asWkb( size ); QCOMPARE( size, l15.wkbSize() ); - QgsLineStringV2 l16; + QgsLineString l16; l16.fromWkb( QgsConstWkbPtr( wkb, size ) ); delete[] wkb; wkb = 0; @@ -1393,15 +1393,15 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l16.wkbType(), QgsWkbTypes::LineString ); //to/from WKT - QgsLineStringV2 l17; - l17.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) + QgsLineString l17; + l17.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 2, 11, 14 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 22, 21, 24 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 22, 31, 34 ) ); QString wkt = l17.asWkt(); QVERIFY( !wkt.isEmpty() ); - QgsLineStringV2 l18; + QgsLineString l18; QVERIFY( l18.fromWkt( wkt ) ); QCOMPARE( l18.numPoints(), 4 ); QCOMPARE( l18.wkbType(), QgsWkbTypes::LineStringZM ); @@ -1421,12 +1421,12 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l18.wkbType(), QgsWkbTypes::LineString ); //asGML2 - QgsLineStringV2 exportLine; - exportLine.setPoints( QgsPointSequenceV2() << QgsPointV2( 31, 32 ) + QgsLineString exportLine; + exportLine.setPoints( QgsPointSequence() << QgsPointV2( 31, 32 ) << QgsPointV2( 41, 42 ) << QgsPointV2( 51, 52 ) ); - QgsLineStringV2 exportLineFloat; - exportLineFloat.setPoints( QgsPointSequenceV2() << QgsPointV2( 1 / 3.0, 2 / 3.0 ) + QgsLineString exportLineFloat; + exportLineFloat.setPoints( QgsPointSequence() << QgsPointV2( 1 / 3.0, 2 / 3.0 ) << QgsPointV2( 1 + 1 / 3.0, 1 + 2 / 3.0 ) << QgsPointV2( 2 + 1 / 3.0, 2 + 2 / 3.0 ) ); QDomDocument doc( "gml" ); @@ -1448,9 +1448,9 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( exportLineFloat.asJSON( 3 ), expectedJsonPrec3 ); //length - QgsLineStringV2 l19; + QgsLineString l19; QCOMPARE( l19.length(), 0.0 ); - l19.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 2, 3 ) + l19.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 10, 4, 5 ) << QgsPointV2( QgsWkbTypes::PointZM, 15, 10, 6, 7 ) ); QCOMPARE( l19.length(), 23.0 ); @@ -1467,7 +1467,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l19.endPoint(), QgsPointV2() ); //curveToLine - no segmentation required, so should return a clone - l19.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 2, 3 ) + l19.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 10, 4, 5 ) << QgsPointV2( QgsWkbTypes::PointZM, 15, 10, 6, 7 ) ); segmentized.reset( l19.curveToLine() ); @@ -1480,11 +1480,11 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( segmentized->pointN( 2 ), l19.pointN( 2 ) ); // points - QgsLineStringV2 l20; - QgsPointSequenceV2 points; + QgsLineString l20; + QgsPointSequence points; l20.points( points ); QVERIFY( l20.isEmpty() ); - l20.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 2, 3 ) + l20.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 10, 4, 5 ) << QgsPointV2( QgsWkbTypes::PointZM, 15, 10, 6, 7 ) ); l20.points( points ); @@ -1501,8 +1501,8 @@ void TestQgsGeometry::lineStringV2() QgsCoordinateTransform tr( sourceSrs, destSrs ); // 2d CRS transform - QgsLineStringV2 l21; - l21.setPoints( QgsPointSequenceV2() << QgsPointV2( 6374985, -3626584 ) + QgsLineString l21; + l21.setPoints( QgsPointSequence() << QgsPointV2( 6374985, -3626584 ) << QgsPointV2( 6474985, -3526584 ) ); l21.transform( tr, QgsCoordinateTransform::ForwardTransform ); QGSCOMPARENEAR( l21.pointN( 0 ).x(), 175.771, 0.001 ); @@ -1515,8 +1515,8 @@ void TestQgsGeometry::lineStringV2() QGSCOMPARENEAR( l21.boundingBox().yMaximum(), -38.7999, 0.001 ); //3d CRS transform - QgsLineStringV2 l22; - l22.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 6374985, -3626584, 1, 2 ) + QgsLineString l22; + l22.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 6374985, -3626584, 1, 2 ) << QgsPointV2( QgsWkbTypes::PointZM, 6474985, -3526584, 3, 4 ) ); l22.transform( tr, QgsCoordinateTransform::ForwardTransform ); QGSCOMPARENEAR( l22.pointN( 0 ).x(), 175.771, 0.001 ); @@ -1549,8 +1549,8 @@ void TestQgsGeometry::lineStringV2() //QTransform transform QTransform qtr = QTransform::fromScale( 2, 3 ); - QgsLineStringV2 l23; - l23.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) + QgsLineString l23; + l23.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 13, 14 ) ); l23.transform( qtr ); QCOMPARE( l23.pointN( 0 ), QgsPointV2( QgsWkbTypes::PointZM, 2, 6, 3, 4 ) ); @@ -1560,7 +1560,7 @@ void TestQgsGeometry::lineStringV2() //insert vertex //insert vertex in empty line - QgsLineStringV2 l24; + QgsLineString l24; QVERIFY( l24.insertVertex( QgsVertexId( 0, 0, 0 ), QgsPointV2( 6.0, 7.0 ) ) ); QCOMPARE( l24.numPoints(), 1 ); QVERIFY( !l24.is3D() ); @@ -1578,7 +1578,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l24.pointN( 0 ), QgsPointV2( QgsWkbTypes::PointZM, 6.0, 7.0, 1.0, 2.0 ) ); //2d line - l24.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) + l24.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) << QgsPointV2( 21, 22 ) ); QVERIFY( l24.insertVertex( QgsVertexId( 0, 0, 0 ), QgsPointV2( 6.0, 7.0 ) ) ); QCOMPARE( l24.numPoints(), 4 ); @@ -1607,7 +1607,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l24.numPoints(), 7 ); //insert 4d vertex in 4d line - l24.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 2, 3 ) + l24.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 10, 4, 5 ) << QgsPointV2( QgsWkbTypes::PointZM, 15, 10, 6, 7 ) ); QVERIFY( l24.insertVertex( QgsVertexId( 0, 0, 0 ), QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 13, 14 ) ) ); @@ -1621,7 +1621,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l24.pointN( 1 ), QgsPointV2( QgsWkbTypes::PointZM, 101, 102, 0, 0 ) ); //insert 4d vertex in 2d line - l24.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) + l24.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) << QgsPointV2( 21, 22 ) ); QVERIFY( l24.insertVertex( QgsVertexId( 0, 0, 0 ), QgsPointV2( QgsWkbTypes::PointZM, 101, 102, 103, 104 ) ) ); QCOMPARE( l24.numPoints(), 4 ); @@ -1637,12 +1637,12 @@ void TestQgsGeometry::lineStringV2() //move vertex //empty line - QgsLineStringV2 l25; + QgsLineString l25; QVERIFY( !l25.moveVertex( QgsVertexId( 0, 0, 0 ), QgsPointV2( 6.0, 7.0 ) ) ); QVERIFY( l25.isEmpty() ); //valid line - l25.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) + l25.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) << QgsPointV2( 21, 22 ) ); QVERIFY( l25.moveVertex( QgsVertexId( 0, 0, 0 ), QgsPointV2( 6.0, 7.0 ) ) ); QVERIFY( l25.moveVertex( QgsVertexId( 0, 0, 1 ), QgsPointV2( 16.0, 17.0 ) ) ); @@ -1659,7 +1659,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l25.pointN( 2 ), QgsPointV2( 26.0, 27.0 ) ); //move 4d point in 4d line - l25.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 2, 3 ) + l25.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 10, 4, 5 ) << QgsPointV2( QgsWkbTypes::PointZM, 15, 10, 6, 7 ) ); QVERIFY( l25.moveVertex( QgsVertexId( 0, 0, 1 ), QgsPointV2( QgsWkbTypes::PointZM, 6, 7, 12, 13 ) ) ); @@ -1670,7 +1670,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l25.pointN( 1 ), QgsPointV2( QgsWkbTypes::PointZM, 34, 35, 12, 13 ) ); //move 4d point in 2d line - l25.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) + l25.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) << QgsPointV2( 21, 22 ) ); QVERIFY( l25.moveVertex( QgsVertexId( 0, 0, 0 ), QgsPointV2( QgsWkbTypes::PointZM, 3, 4, 2, 3 ) ) ); QCOMPARE( l25.pointN( 0 ), QgsPointV2( 3, 4 ) ); @@ -1679,12 +1679,12 @@ void TestQgsGeometry::lineStringV2() //delete vertex //empty line - QgsLineStringV2 l26; + QgsLineString l26; QVERIFY( !l26.deleteVertex( QgsVertexId( 0, 0, 0 ) ) ); QVERIFY( l26.isEmpty() ); //valid line - l26.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 2, 3 ) + l26.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 4, 5 ) << QgsPointV2( QgsWkbTypes::PointZM, 21, 22, 6, 7 ) ); //out of range vertices @@ -1703,10 +1703,10 @@ void TestQgsGeometry::lineStringV2() QVERIFY( l26.isEmpty() ); //reversed - QgsLineStringV2 l27; - QScopedPointer< QgsLineStringV2 > reversed( l27.reversed() ); + QgsLineString l27; + QScopedPointer< QgsLineString > reversed( l27.reversed() ); QVERIFY( reversed->isEmpty() ); - l27.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 2, 3 ) + l27.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 4, 5 ) << QgsPointV2( QgsWkbTypes::PointZM, 21, 22, 6, 7 ) ); reversed.reset( l27.reversed() ); @@ -1720,7 +1720,7 @@ void TestQgsGeometry::lineStringV2() //addZValue - QgsLineStringV2 l28; + QgsLineString l28; QCOMPARE( l28.wkbType(), QgsWkbTypes::LineString ); QVERIFY( l28.addZValue() ); QCOMPARE( l28.wkbType(), QgsWkbTypes::LineStringZ ); @@ -1728,7 +1728,7 @@ void TestQgsGeometry::lineStringV2() QVERIFY( l28.addZValue() ); QCOMPARE( l28.wkbType(), QgsWkbTypes::LineStringZ ); //2d line - l28.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) ); + l28.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) ); QVERIFY( l28.addZValue( 2 ) ); QVERIFY( l28.is3D() ); QCOMPARE( l28.wkbType(), QgsWkbTypes::LineStringZ ); @@ -1738,7 +1738,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l28.pointN( 0 ), QgsPointV2( QgsWkbTypes::PointZ, 1, 2, 2 ) ); QCOMPARE( l28.pointN( 1 ), QgsPointV2( QgsWkbTypes::PointZ, 11, 12, 2 ) ); //linestring with m - l28.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 3 ) << QgsPointV2( QgsWkbTypes::PointM, 11, 12, 0, 4 ) ); + l28.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 3 ) << QgsPointV2( QgsWkbTypes::PointM, 11, 12, 0, 4 ) ); QVERIFY( l28.addZValue( 5 ) ); QVERIFY( l28.is3D() ); QVERIFY( l28.isMeasure() ); @@ -1746,7 +1746,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l28.pointN( 0 ), QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 5, 3 ) ); QCOMPARE( l28.pointN( 1 ), QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 5, 4 ) ); //linestring25d - l28.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point25D, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::Point25D, 11, 12, 4 ) ); + l28.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point25D, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::Point25D, 11, 12, 4 ) ); QCOMPARE( l28.wkbType(), QgsWkbTypes::LineString25D ); QVERIFY( !l28.addZValue( 5 ) ); QCOMPARE( l28.wkbType(), QgsWkbTypes::LineString25D ); @@ -1755,7 +1755,7 @@ void TestQgsGeometry::lineStringV2() //addMValue - QgsLineStringV2 l29; + QgsLineString l29; QCOMPARE( l29.wkbType(), QgsWkbTypes::LineString ); QVERIFY( l29.addMValue() ); QCOMPARE( l29.wkbType(), QgsWkbTypes::LineStringM ); @@ -1763,7 +1763,7 @@ void TestQgsGeometry::lineStringV2() QVERIFY( l29.addMValue() ); QCOMPARE( l29.wkbType(), QgsWkbTypes::LineStringM ); //2d line - l29.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) ); + l29.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) ); QVERIFY( l29.addMValue( 2 ) ); QVERIFY( !l29.is3D() ); QVERIFY( l29.isMeasure() ); @@ -1774,7 +1774,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l29.pointN( 0 ), QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 2 ) ); QCOMPARE( l29.pointN( 1 ), QgsPointV2( QgsWkbTypes::PointM, 11, 12, 0, 2 ) ); //linestring with z - l29.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 11, 12, 4 ) ); + l29.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 11, 12, 4 ) ); QVERIFY( l29.addMValue( 5 ) ); QVERIFY( l29.is3D() ); QVERIFY( l29.isMeasure() ); @@ -1782,7 +1782,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l29.pointN( 0 ), QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 5 ) ); QCOMPARE( l29.pointN( 1 ), QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 4, 5 ) ); //linestring25d, should become LineStringZM - l29.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point25D, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::Point25D, 11, 12, 4 ) ); + l29.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point25D, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::Point25D, 11, 12, 4 ) ); QCOMPARE( l29.wkbType(), QgsWkbTypes::LineString25D ); QVERIFY( l29.addMValue( 5 ) ); QVERIFY( l29.is3D() ); @@ -1793,9 +1793,9 @@ void TestQgsGeometry::lineStringV2() //dropZValue - QgsLineStringV2 l28d; + QgsLineString l28d; QVERIFY( !l28d.dropZValue() ); - l28d.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) ); + l28d.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) ); QVERIFY( !l28d.dropZValue() ); l28d.addZValue( 1.0 ); QCOMPARE( l28d.wkbType(), QgsWkbTypes::LineStringZ ); @@ -1807,7 +1807,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l28d.pointN( 1 ), QgsPointV2( QgsWkbTypes::Point, 11, 12 ) ); QVERIFY( !l28d.dropZValue() ); //already dropped //linestring with m - l28d.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 3, 4 ) ); + l28d.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 3, 4 ) ); QVERIFY( l28d.dropZValue() ); QVERIFY( !l28d.is3D() ); QVERIFY( l28d.isMeasure() ); @@ -1815,7 +1815,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l28d.pointN( 0 ), QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 4 ) ); QCOMPARE( l28d.pointN( 1 ), QgsPointV2( QgsWkbTypes::PointM, 11, 12, 0, 4 ) ); //linestring25d - l28d.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point25D, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::Point25D, 11, 12, 4 ) ); + l28d.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point25D, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::Point25D, 11, 12, 4 ) ); QCOMPARE( l28d.wkbType(), QgsWkbTypes::LineString25D ); QVERIFY( l28d.dropZValue() ); QCOMPARE( l28d.wkbType(), QgsWkbTypes::LineString ); @@ -1823,7 +1823,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l28d.pointN( 1 ), QgsPointV2( QgsWkbTypes::Point, 11, 12 ) ); //dropMValue - l28d.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) ); + l28d.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) ); QVERIFY( !l28d.dropMValue() ); l28d.addMValue( 1.0 ); QCOMPARE( l28d.wkbType(), QgsWkbTypes::LineStringM ); @@ -1835,7 +1835,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l28d.pointN( 1 ), QgsPointV2( QgsWkbTypes::Point, 11, 12 ) ); QVERIFY( !l28d.dropMValue() ); //already dropped //linestring with z - l28d.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 3, 4 ) ); + l28d.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 3, 4 ) ); QVERIFY( l28d.dropMValue() ); QVERIFY( !l28d.isMeasure() ); QVERIFY( l28d.is3D() ); @@ -1844,7 +1844,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l28d.pointN( 1 ), QgsPointV2( QgsWkbTypes::PointZ, 11, 12, 3, 0 ) ); //convertTo - l28d.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) ); + l28d.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) ); QVERIFY( l28d.convertTo( QgsWkbTypes::LineString ) ); QCOMPARE( l28d.wkbType(), QgsWkbTypes::LineString ); QVERIFY( l28d.convertTo( QgsWkbTypes::LineStringZ ) ); @@ -1867,22 +1867,22 @@ void TestQgsGeometry::lineStringV2() QVERIFY( !l28d.convertTo( QgsWkbTypes::Polygon ) ); //isRing - QgsLineStringV2 l30; + QgsLineString l30; QVERIFY( !l30.isRing() ); - l30.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) << QgsPointV2( 1, 2 ) ); + l30.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) << QgsPointV2( 1, 2 ) ); QVERIFY( !l30.isRing() ); //<4 points - l30.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) << QgsPointV2( 21, 22 ) << QgsPointV2( 31, 32 ) ); + l30.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) << QgsPointV2( 21, 22 ) << QgsPointV2( 31, 32 ) ); QVERIFY( !l30.isRing() ); //not closed - l30.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) << QgsPointV2( 21, 22 ) << QgsPointV2( 1, 2 ) ); + l30.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) << QgsPointV2( 21, 22 ) << QgsPointV2( 1, 2 ) ); QVERIFY( l30.isRing() ); //coordinateSequence - QgsLineStringV2 l31; - QgsCoordinateSequenceV2 coords = l31.coordinateSequence(); + QgsLineString l31; + QgsCoordinateSequence coords = l31.coordinateSequence(); QCOMPARE( coords.count(), 1 ); QCOMPARE( coords.at( 0 ).count(), 1 ); QVERIFY( coords.at( 0 ).at( 0 ).isEmpty() ); - l31.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 2, 3 ) + l31.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 4, 5 ) << QgsPointV2( QgsWkbTypes::PointZM, 21, 22, 6, 7 ) ); coords = l31.coordinateSequence(); @@ -1895,7 +1895,7 @@ void TestQgsGeometry::lineStringV2() //nextVertex - QgsLineStringV2 l32; + QgsLineString l32; QgsVertexId v; QgsPointV2 p; QVERIFY( !l32.nextVertex( v, p ) ); @@ -1904,7 +1904,7 @@ void TestQgsGeometry::lineStringV2() v = QgsVertexId( 0, 0, 10 ); QVERIFY( !l32.nextVertex( v, p ) ); //LineString - l32.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) ); + l32.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) ); v = QgsVertexId( 0, 0, 2 ); //out of range QVERIFY( !l32.nextVertex( v, p ) ); v = QgsVertexId( 0, 0, -5 ); @@ -1927,7 +1927,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( p, QgsPointV2( 11, 12 ) ); //LineStringZ - l32.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 11, 12, 13 ) ); + l32.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 11, 12, 13 ) ); v = QgsVertexId( 0, 0, -1 ); QVERIFY( l32.nextVertex( v, p ) ); QCOMPARE( v, QgsVertexId( 0, 0, 0 ) ); @@ -1937,7 +1937,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( p, QgsPointV2( QgsWkbTypes::PointZ, 11, 12, 13 ) ); QVERIFY( !l32.nextVertex( v, p ) ); //LineStringM - l32.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointM, 11, 12, 0, 14 ) ); + l32.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointM, 11, 12, 0, 14 ) ); v = QgsVertexId( 0, 0, -1 ); QVERIFY( l32.nextVertex( v, p ) ); QCOMPARE( v, QgsVertexId( 0, 0, 0 ) ); @@ -1947,7 +1947,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( p, QgsPointV2( QgsWkbTypes::PointM, 11, 12, 0, 14 ) ); QVERIFY( !l32.nextVertex( v, p ) ); //LineStringZM - l32.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 13, 14 ) ); + l32.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 13, 14 ) ); v = QgsVertexId( 0, 0, -1 ); QVERIFY( l32.nextVertex( v, p ) ); QCOMPARE( v, QgsVertexId( 0, 0, 0 ) ); @@ -1957,7 +1957,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( p, QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 13, 14 ) ); QVERIFY( !l32.nextVertex( v, p ) ); //LineString25D - l32.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point25D, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::Point25D, 11, 12, 13 ) ); + l32.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point25D, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::Point25D, 11, 12, 13 ) ); v = QgsVertexId( 0, 0, -1 ); QVERIFY( l32.nextVertex( v, p ) ); QCOMPARE( v, QgsVertexId( 0, 0, 0 ) ); @@ -1968,14 +1968,14 @@ void TestQgsGeometry::lineStringV2() QVERIFY( !l32.nextVertex( v, p ) ); //vertexAt and pointAt - QgsLineStringV2 l33; + QgsLineString l33; l33.vertexAt( QgsVertexId( 0, 0, -10 ) ); //out of bounds, check for no crash l33.vertexAt( QgsVertexId( 0, 0, 10 ) ); //out of bounds, check for no crash QgsVertexId::VertexType type; QVERIFY( !l33.pointAt( -10, p, type ) ); QVERIFY( !l33.pointAt( 10, p, type ) ); //LineString - l33.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) ); + l33.setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 11, 12 ) ); l33.vertexAt( QgsVertexId( 0, 0, -10 ) ); l33.vertexAt( QgsVertexId( 0, 0, 10 ) ); //out of bounds, check for no crash QCOMPARE( l33.vertexAt( QgsVertexId( 0, 0, 0 ) ), QgsPointV2( 1, 2 ) ); @@ -1989,7 +1989,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( p, QgsPointV2( 11, 12 ) ); QCOMPARE( type, QgsVertexId::SegmentVertex ); //LineStringZ - l33.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 11, 12, 13 ) ); + l33.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 11, 12, 13 ) ); QCOMPARE( l33.vertexAt( QgsVertexId( 0, 0, 0 ) ), QgsPointV2( QgsWkbTypes::PointZ, 1, 2, 3 ) ); QCOMPARE( l33.vertexAt( QgsVertexId( 0, 0, 1 ) ), QgsPointV2( QgsWkbTypes::PointZ, 11, 12, 13 ) ); QVERIFY( l33.pointAt( 0, p, type ) ); @@ -1999,7 +1999,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( p, QgsPointV2( QgsWkbTypes::PointZ, 11, 12, 13 ) ); QCOMPARE( type, QgsVertexId::SegmentVertex ); //LineStringM - l33.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointM, 11, 12, 0, 14 ) ); + l33.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointM, 11, 12, 0, 14 ) ); QCOMPARE( l33.vertexAt( QgsVertexId( 0, 0, 0 ) ), QgsPointV2( QgsWkbTypes::PointM, 1, 2, 0, 4 ) ); QCOMPARE( l33.vertexAt( QgsVertexId( 0, 0, 1 ) ), QgsPointV2( QgsWkbTypes::PointM, 11, 12, 0, 14 ) ); QVERIFY( l33.pointAt( 0, p, type ) ); @@ -2009,7 +2009,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( p, QgsPointV2( QgsWkbTypes::PointM, 11, 12, 0, 14 ) ); QCOMPARE( type, QgsVertexId::SegmentVertex ); //LineStringZM - l33.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 13, 14 ) ); + l33.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 13, 14 ) ); QCOMPARE( l33.vertexAt( QgsVertexId( 0, 0, 0 ) ), QgsPointV2( QgsWkbTypes::PointZM, 1, 2, 3, 4 ) ); QCOMPARE( l33.vertexAt( QgsVertexId( 0, 0, 1 ) ), QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 13, 14 ) ); QVERIFY( l33.pointAt( 0, p, type ) ); @@ -2019,7 +2019,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( p, QgsPointV2( QgsWkbTypes::PointZM, 11, 12, 13, 14 ) ); QCOMPARE( type, QgsVertexId::SegmentVertex ); //LineString25D - l33.setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point25D, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::Point25D, 11, 12, 13 ) ); + l33.setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point25D, 1, 2, 3 ) << QgsPointV2( QgsWkbTypes::Point25D, 11, 12, 13 ) ); QCOMPARE( l33.vertexAt( QgsVertexId( 0, 0, 0 ) ), QgsPointV2( QgsWkbTypes::Point25D, 1, 2, 3 ) ); QCOMPARE( l33.vertexAt( QgsVertexId( 0, 0, 1 ) ), QgsPointV2( QgsWkbTypes::Point25D, 11, 12, 13 ) ); QVERIFY( l33.pointAt( 0, p, type ) ); @@ -2030,30 +2030,30 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( type, QgsVertexId::SegmentVertex ); //centroid - QgsLineStringV2 l34; + QgsLineString l34; QCOMPARE( l34.centroid(), QgsPointV2() ); - l34.setPoints( QgsPointSequenceV2() << QgsPointV2( 5, 10 ) ); + l34.setPoints( QgsPointSequence() << QgsPointV2( 5, 10 ) ); QCOMPARE( l34.centroid(), QgsPointV2( 5, 10 ) ); - l34.setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 20, 10 ) ); + l34.setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 20, 10 ) ); QCOMPARE( l34.centroid(), QgsPointV2( 10, 5 ) ); - l34.setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 9 ) << QgsPointV2( 2, 9 ) << QgsPointV2( 2, 0 ) ); + l34.setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 9 ) << QgsPointV2( 2, 9 ) << QgsPointV2( 2, 0 ) ); QCOMPARE( l34.centroid(), QgsPointV2( 1, 4.95 ) ); //linestring with 0 length segment - l34.setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 9 ) << QgsPointV2( 2, 9 ) << QgsPointV2( 2, 9 ) << QgsPointV2( 2, 0 ) ); + l34.setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 9 ) << QgsPointV2( 2, 9 ) << QgsPointV2( 2, 9 ) << QgsPointV2( 2, 0 ) ); QCOMPARE( l34.centroid(), QgsPointV2( 1, 4.95 ) ); //linestring with 0 total length segment - l34.setPoints( QgsPointSequenceV2() << QgsPointV2( 5, 4 ) << QgsPointV2( 5, 4 ) << QgsPointV2( 5, 4 ) ); + l34.setPoints( QgsPointSequence() << QgsPointV2( 5, 4 ) << QgsPointV2( 5, 4 ) << QgsPointV2( 5, 4 ) ); QCOMPARE( l34.centroid(), QgsPointV2( 5, 4 ) ); //closest segment - QgsLineStringV2 l35; + QgsLineString l35; bool leftOf = false; ( void )l35.closestSegment( QgsPointV2( 1, 2 ), p, v, 0, 0 ); //empty line, just want no crash - l35.setPoints( QgsPointSequenceV2() << QgsPointV2( 5, 10 ) ); + l35.setPoints( QgsPointSequence() << QgsPointV2( 5, 10 ) ); QVERIFY( qgsDoubleNear( l35.closestSegment( QgsPointV2( 5, 10 ), p, v, 0, 0 ), 0 ) ); QCOMPARE( p, QgsPointV2( 5, 10 ) ); QCOMPARE( v, QgsVertexId( 0, 0, 1 ) ); - l35.setPoints( QgsPointSequenceV2() << QgsPointV2( 5, 10 ) << QgsPointV2( 10, 10 ) ); + l35.setPoints( QgsPointSequence() << QgsPointV2( 5, 10 ) << QgsPointV2( 10, 10 ) ); QVERIFY( qgsDoubleNear( l35.closestSegment( QgsPointV2( 4, 11 ), p, v, &leftOf, 0 ), 2.0 ) ); QCOMPARE( p, QgsPointV2( 5, 10 ) ); QCOMPARE( v, QgsVertexId( 0, 0, 1 ) ); @@ -2070,7 +2070,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( p, QgsPointV2( 10, 10 ) ); QCOMPARE( v, QgsVertexId( 0, 0, 1 ) ); QCOMPARE( leftOf, false ); - l35.setPoints( QgsPointSequenceV2() << QgsPointV2( 5, 10 ) + l35.setPoints( QgsPointSequence() << QgsPointV2( 5, 10 ) << QgsPointV2( 10, 10 ) << QgsPointV2( 10, 15 ) ); QVERIFY( qgsDoubleNear( l35.closestSegment( QgsPointV2( 11, 12 ), p, v, &leftOf, 0 ), 1.0 ) ); @@ -2079,29 +2079,29 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( leftOf, false ); //sumUpArea - QgsLineStringV2 l36; + QgsLineString l36; double area = 1.0; //sumUpArea adds to area, so start with non-zero value l36.sumUpArea( area ); QCOMPARE( area, 1.0 ); - l36.setPoints( QgsPointSequenceV2() << QgsPointV2( 5, 10 ) ); + l36.setPoints( QgsPointSequence() << QgsPointV2( 5, 10 ) ); l36.sumUpArea( area ); QCOMPARE( area, 1.0 ); - l36.setPoints( QgsPointSequenceV2() << QgsPointV2( 5, 10 ) << QgsPointV2( 10, 10 ) ); + l36.setPoints( QgsPointSequence() << QgsPointV2( 5, 10 ) << QgsPointV2( 10, 10 ) ); l36.sumUpArea( area ); QCOMPARE( area, 1.0 ); - l36.setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 2, 0 ) << QgsPointV2( 2, 2 ) ); + l36.setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 2, 0 ) << QgsPointV2( 2, 2 ) ); l36.sumUpArea( area ); QVERIFY( qgsDoubleNear( area, 3.0 ) ); - l36.setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 2, 0 ) << QgsPointV2( 2, 2 ) << QgsPointV2( 0, 2 ) ); + l36.setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 2, 0 ) << QgsPointV2( 2, 2 ) << QgsPointV2( 0, 2 ) ); l36.sumUpArea( area ); QVERIFY( qgsDoubleNear( area, 7.0 ) ); //boundingBox - test that bounding box is updated after every modification to the line string - QgsLineStringV2 l37; + QgsLineString l37; QVERIFY( l37.boundingBox().isNull() ); - l37.setPoints( QgsPointSequenceV2() << QgsPointV2( 5, 10 ) << QgsPointV2( 10, 15 ) ); + l37.setPoints( QgsPointSequence() << QgsPointV2( 5, 10 ) << QgsPointV2( 10, 15 ) ); QCOMPARE( l37.boundingBox(), QgsRectangle( 5, 10, 10, 15 ) ); - l37.setPoints( QgsPointSequenceV2() << QgsPointV2( -5, -10 ) << QgsPointV2( -6, -10 ) << QgsPointV2( -5.5, -9 ) ); + l37.setPoints( QgsPointSequence() << QgsPointV2( -5, -10 ) << QgsPointV2( -6, -10 ) << QgsPointV2( -5.5, -9 ) ); QCOMPARE( l37.boundingBox(), QgsRectangle( -6, -10, -5, -9 ) ); //setXAt l37.setXAt( 2, -4 ); @@ -2110,15 +2110,15 @@ void TestQgsGeometry::lineStringV2() l37.setYAt( 1, -15 ); QCOMPARE( l37.boundingBox(), QgsRectangle( -6, -15, -4, -9 ) ); //append - toAppend.reset( new QgsLineStringV2() ); - toAppend->setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 2 ) << QgsPointV2( 4, 0 ) ); + toAppend.reset( new QgsLineString() ); + toAppend->setPoints( QgsPointSequence() << QgsPointV2( 1, 2 ) << QgsPointV2( 4, 0 ) ); l37.append( toAppend.data() ); QCOMPARE( l37.boundingBox(), QgsRectangle( -6, -15, 4, 2 ) ); l37.addVertex( QgsPointV2( 6, 3 ) ); QCOMPARE( l37.boundingBox(), QgsRectangle( -6, -15, 6, 3 ) ); l37.clear(); QVERIFY( l37.boundingBox().isNull() ); - l37.setPoints( QgsPointSequenceV2() << QgsPointV2( 5, 10 ) << QgsPointV2( 10, 15 ) ); + l37.setPoints( QgsPointSequence() << QgsPointV2( 5, 10 ) << QgsPointV2( 10, 15 ) ); wkb = toAppend->asWkb( size ); l37.fromWkb( QgsConstWkbPtr( wkb, size ) ); delete[] wkb; @@ -2134,29 +2134,29 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( l37.boundingBox(), QgsRectangle( 1, 3, 6, 5 ) ); //angle - QgsLineStringV2 l38; + QgsLineString l38; ( void )l38.vertexAngle( QgsVertexId() ); //just want no crash ( void )l38.vertexAngle( QgsVertexId( 0, 0, 0 ) ); //just want no crash - l38.setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) ); + l38.setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) ); ( void )l38.vertexAngle( QgsVertexId( 0, 0, 0 ) ); //just want no crash, any answer is meaningless - l38.setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 1, 0 ) ); + l38.setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 1, 0 ) ); QVERIFY( qgsDoubleNear( l38.vertexAngle( QgsVertexId( 0, 0, 0 ) ), 1.5708, 0.0001 ) ); QVERIFY( qgsDoubleNear( l38.vertexAngle( QgsVertexId( 0, 0, 1 ) ), 1.5708, 0.0001 ) ); ( void )l38.vertexAngle( QgsVertexId( 0, 0, 2 ) ); //no crash - l38.setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 1 ) ); + l38.setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 1 ) ); QVERIFY( qgsDoubleNear( l38.vertexAngle( QgsVertexId( 0, 0, 0 ) ), 0.0 ) ); QVERIFY( qgsDoubleNear( l38.vertexAngle( QgsVertexId( 0, 0, 1 ) ), 0.0 ) ); - l38.setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 0 ) << QgsPointV2( 0, 0 ) ); + l38.setPoints( QgsPointSequence() << QgsPointV2( 1, 0 ) << QgsPointV2( 0, 0 ) ); QVERIFY( qgsDoubleNear( l38.vertexAngle( QgsVertexId( 0, 0, 0 ) ), 4.71239, 0.0001 ) ); QVERIFY( qgsDoubleNear( l38.vertexAngle( QgsVertexId( 0, 0, 1 ) ), 4.71239, 0.0001 ) ); - l38.setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 1 ) << QgsPointV2( 0, 0 ) ); + l38.setPoints( QgsPointSequence() << QgsPointV2( 0, 1 ) << QgsPointV2( 0, 0 ) ); QVERIFY( qgsDoubleNear( l38.vertexAngle( QgsVertexId( 0, 0, 0 ) ), 3.1416, 0.0001 ) ); QVERIFY( qgsDoubleNear( l38.vertexAngle( QgsVertexId( 0, 0, 1 ) ), 3.1416, 0.0001 ) ); - l38.setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 1, 0 ) << QgsPointV2( 1, 1 ) ); + l38.setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 1, 0 ) << QgsPointV2( 1, 1 ) ); QVERIFY( qgsDoubleNear( l38.vertexAngle( QgsVertexId( 0, 0, 0 ) ), 1.5708, 0.0001 ) ); QVERIFY( qgsDoubleNear( l38.vertexAngle( QgsVertexId( 0, 0, 1 ) ), 0.7854, 0.0001 ) ); QVERIFY( qgsDoubleNear( l38.vertexAngle( QgsVertexId( 0, 0, 2 ) ), 0.0, 0.0001 ) ); - l38.setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 0.5, 0 ) << QgsPointV2( 1, 0 ) + l38.setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 0.5, 0 ) << QgsPointV2( 1, 0 ) << QgsPointV2( 2, 1 ) << QgsPointV2( 1, 2 ) << QgsPointV2( 0, 2 ) ); ( void )l38.vertexAngle( QgsVertexId( 0, 0, 20 ) ); QVERIFY( qgsDoubleNear( l38.vertexAngle( QgsVertexId( 0, 0, 0 ) ), 1.5708, 0.0001 ) ); @@ -2172,17 +2172,17 @@ void TestQgsGeometry::lineStringV2() QVERIFY( qgsDoubleNear( l38.vertexAngle( QgsVertexId( 0, 0, 6 ) ), 2.35619, 0.00001 ) ); //removing the second to last vertex should remove the whole line - QgsLineStringV2 l39; + QgsLineString l39; l39.setPoints( QList() << QgsPointV2( 0, 0 ) << QgsPointV2( 1, 1 ) ); QVERIFY( l39.numPoints() == 2 ); l39.deleteVertex( QgsVertexId( 0, 0, 1 ) ); QVERIFY( l39.numPoints() == 0 ); //boundary - QgsLineStringV2 boundary1; + QgsLineString boundary1; QVERIFY( !boundary1.boundary() ); boundary1.setPoints( QList() << QgsPointV2( 0, 0 ) << QgsPointV2( 1, 0 ) << QgsPointV2( 1, 1 ) ); - QgsAbstractGeometryV2* boundary = boundary1.boundary(); + QgsAbstractGeometry* boundary = boundary1.boundary(); QgsMultiPointV2* mpBoundary = dynamic_cast< QgsMultiPointV2* >( boundary ); QVERIFY( mpBoundary ); QCOMPARE( static_cast< QgsPointV2*>( mpBoundary->geometryN( 0 ) )->x(), 0.0 ); @@ -2211,7 +2211,7 @@ void TestQgsGeometry::lineStringV2() QCOMPARE( static_cast< QgsPointV2*>( mpBoundary->geometryN( 1 ) )->z(), 20.0 ); } -void TestQgsGeometry::polygonV2() +void TestQgsGeometry::polygon() { //test constructor QgsPolygonV2 p1; @@ -2235,7 +2235,7 @@ void TestQgsGeometry::polygonV2() //set exterior ring //try with no ring - QgsLineStringV2* ext = 0; + QgsLineString* ext = 0; p1.setExteriorRing( ext ); QVERIFY( p1.isEmpty() ); QCOMPARE( p1.numInteriorRings(), 0 ); @@ -2247,8 +2247,8 @@ void TestQgsGeometry::polygonV2() QCOMPARE( p1.wkbType(), QgsWkbTypes::Polygon ); //valid exterior ring - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) << QgsPointV2( 10, 0 ) << QgsPointV2( 0, 0 ) ); p1.setExteriorRing( ext ); QVERIFY( !p1.isEmpty() ); @@ -2269,11 +2269,11 @@ void TestQgsGeometry::polygonV2() QVERIFY( !p1.interiorRing( 0 ) ); //retrieve exterior ring and check - QCOMPARE( *( static_cast< const QgsLineStringV2* >( p1.exteriorRing() ) ), *ext ); + QCOMPARE( *( static_cast< const QgsLineString* >( p1.exteriorRing() ) ), *ext ); //test that a non closed exterior ring will be automatically closed - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) << QgsPointV2( 10, 0 ) ); QVERIFY( !ext->isClosed() ); p1.setExteriorRing( ext ); @@ -2283,8 +2283,8 @@ void TestQgsGeometry::polygonV2() //initial setting of exterior ring should set z/m type QgsPolygonV2 p2; - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 1 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 1 ) << QgsPointV2( QgsWkbTypes::PointZ, 0, 10, 2 ) << QgsPointV2( QgsWkbTypes::PointZ, 10, 10, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 10, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 1 ) ); p2.setExteriorRing( ext ); @@ -2293,10 +2293,10 @@ void TestQgsGeometry::polygonV2() QCOMPARE( p2.wkbType(), QgsWkbTypes::PolygonZ ); QCOMPARE( p2.wktTypeStr(), QString( "PolygonZ" ) ); QCOMPARE( p2.geometryType(), QString( "Polygon" ) ); - QCOMPARE( *( static_cast< const QgsLineStringV2* >( p2.exteriorRing() ) ), *ext ); + QCOMPARE( *( static_cast< const QgsLineString* >( p2.exteriorRing() ) ), *ext ); QgsPolygonV2 p3; - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointM, 0, 0, 0, 1 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointM, 0, 0, 0, 1 ) << QgsPointV2( QgsWkbTypes::PointM, 0, 10, 0, 2 ) << QgsPointV2( QgsWkbTypes::PointM, 10, 10, 0, 3 ) << QgsPointV2( QgsWkbTypes::PointM, 10, 0, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointM, 0, 0, 0, 1 ) ); p3.setExteriorRing( ext ); @@ -2304,10 +2304,10 @@ void TestQgsGeometry::polygonV2() QVERIFY( p3.isMeasure() ); QCOMPARE( p3.wkbType(), QgsWkbTypes::PolygonM ); QCOMPARE( p3.wktTypeStr(), QString( "PolygonM" ) ); - QCOMPARE( *( static_cast< const QgsLineStringV2* >( p3.exteriorRing() ) ), *ext ); + QCOMPARE( *( static_cast< const QgsLineString* >( p3.exteriorRing() ) ), *ext ); QgsPolygonV2 p4; - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 2, 1 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 2, 1 ) << QgsPointV2( QgsWkbTypes::PointZM, 0, 10, 3, 2 ) << QgsPointV2( QgsWkbTypes::PointZM, 10, 10, 5, 3 ) << QgsPointV2( QgsWkbTypes::PointZM, 10, 0, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 2, 1 ) ); p4.setExteriorRing( ext ); @@ -2315,10 +2315,10 @@ void TestQgsGeometry::polygonV2() QVERIFY( p4.isMeasure() ); QCOMPARE( p4.wkbType(), QgsWkbTypes::PolygonZM ); QCOMPARE( p4.wktTypeStr(), QString( "PolygonZM" ) ); - QCOMPARE( *( static_cast< const QgsLineStringV2* >( p4.exteriorRing() ) ), *ext ); + QCOMPARE( *( static_cast< const QgsLineString* >( p4.exteriorRing() ) ), *ext ); QgsPolygonV2 p5; - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point25D, 0, 0, 1 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point25D, 0, 0, 1 ) << QgsPointV2( QgsWkbTypes::Point25D, 0, 10, 2 ) << QgsPointV2( QgsWkbTypes::Point25D, 10, 10, 3 ) << QgsPointV2( QgsWkbTypes::Point25D, 10, 0, 4 ) << QgsPointV2( QgsWkbTypes::Point25D, 0, 0, 1 ) ); p5.setExteriorRing( ext ); @@ -2326,11 +2326,11 @@ void TestQgsGeometry::polygonV2() QVERIFY( !p5.isMeasure() ); QCOMPARE( p5.wkbType(), QgsWkbTypes::Polygon25D ); QCOMPARE( p5.wktTypeStr(), QString( "PolygonZ" ) ); - QCOMPARE( *( static_cast< const QgsLineStringV2* >( p5.exteriorRing() ) ), *ext ); + QCOMPARE( *( static_cast< const QgsLineString* >( p5.exteriorRing() ) ), *ext ); //setting curved exterior ring should be segmentized - QgsCircularStringV2* circularRing = new QgsCircularStringV2(); - circularRing->setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) + QgsCircularString* circularRing = new QgsCircularString(); + circularRing->setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) << QgsPointV2( 10, 0 ) << QgsPointV2( 0, 0 ) ); QVERIFY( circularRing->hasCurvedSegments() ); p5.setExteriorRing( circularRing ); @@ -2339,8 +2339,8 @@ void TestQgsGeometry::polygonV2() //addInteriorRing QgsPolygonV2 p6; - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) << QgsPointV2( 10, 0 ) << QgsPointV2( 0, 0 ) ); p6.setExteriorRing( ext ); //empty ring @@ -2349,8 +2349,8 @@ void TestQgsGeometry::polygonV2() QVERIFY( !p6.interiorRing( 0 ) ); p6.addInteriorRing( 0 ); QCOMPARE( p6.numInteriorRings(), 0 ); - QgsLineStringV2* ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 1 ) << QgsPointV2( 1, 9 ) << QgsPointV2( 9, 9 ) + QgsLineString* ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( 1, 1 ) << QgsPointV2( 1, 9 ) << QgsPointV2( 9, 9 ) << QgsPointV2( 9, 1 ) << QgsPointV2( 1, 1 ) ); p6.addInteriorRing( ring ); QCOMPARE( p6.numInteriorRings(), 1 ); @@ -2358,8 +2358,8 @@ void TestQgsGeometry::polygonV2() QVERIFY( !p6.interiorRing( 1 ) ); //add non-closed interior ring, should be closed automatically - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( 0.1, 0.1 ) << QgsPointV2( 0.1, 0.9 ) << QgsPointV2( 0.9, 0.9 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( 0.1, 0.1 ) << QgsPointV2( 0.1, 0.9 ) << QgsPointV2( 0.9, 0.9 ) << QgsPointV2( 0.9, 0.1 ) ); QVERIFY( !ring->isClosed() ); p6.addInteriorRing( ring ); @@ -2367,8 +2367,8 @@ void TestQgsGeometry::polygonV2() QVERIFY( p6.interiorRing( 1 )->isClosed() ); //try adding an interior ring with z to a 2d polygon, z should be dropped - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.1, 1 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.1, 1 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.2, 2 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.2, 0.2, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.2, 0.1, 4 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.1, 1 ) ); p6.addInteriorRing( ring ); @@ -2382,8 +2382,8 @@ void TestQgsGeometry::polygonV2() QCOMPARE( p6.interiorRing( 2 )->wkbType(), QgsWkbTypes::LineString ); //try adding an interior ring with m to a 2d polygon, m should be dropped - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointM, 0.1, 0.1, 0, 1 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointM, 0.1, 0.1, 0, 1 ) << QgsPointV2( QgsWkbTypes::PointM, 0.1, 0.2, 0, 2 ) << QgsPointV2( QgsWkbTypes::PointM, 0.2, 0.2, 0, 3 ) << QgsPointV2( QgsWkbTypes::PointM, 0.2, 0.1, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointM, 0.1, 0.1, 0, 1 ) ); p6.addInteriorRing( ring ); @@ -2398,8 +2398,8 @@ void TestQgsGeometry::polygonV2() //addInteriorRing without z/m to PolygonZM QgsPolygonV2 p6b; - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 1 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 1 ) << QgsPointV2( QgsWkbTypes::PointZM, 0, 10, 2 ) << QgsPointV2( QgsWkbTypes::PointZM, 10, 10, 3 ) << QgsPointV2( QgsWkbTypes::PointZM, 10, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 1 ) ); p6b.setExteriorRing( ext ); @@ -2407,8 +2407,8 @@ void TestQgsGeometry::polygonV2() QVERIFY( p6b.isMeasure() ); QCOMPARE( p6b.wkbType(), QgsWkbTypes::PolygonZM ); //ring has no z - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointM, 1, 1, 0, 2 ) << QgsPointV2( QgsWkbTypes::PointM, 1, 9 ) << QgsPointV2( QgsWkbTypes::PointM, 9, 9 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointM, 1, 1, 0, 2 ) << QgsPointV2( QgsWkbTypes::PointM, 1, 9 ) << QgsPointV2( QgsWkbTypes::PointM, 9, 9 ) << QgsPointV2( QgsWkbTypes::PointM, 9, 1 ) << QgsPointV2( QgsWkbTypes::PointM, 1, 1 ) ); p6b.addInteriorRing( ring ); QVERIFY( p6b.interiorRing( 0 ) ); @@ -2417,8 +2417,8 @@ void TestQgsGeometry::polygonV2() QCOMPARE( p6b.interiorRing( 0 )->wkbType(), QgsWkbTypes::LineStringZM ); QCOMPARE( p6b.interiorRing( 0 )->vertexAt( QgsVertexId( 0, 0, 0 ) ), QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 0, 2 ) ); //ring has no m - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.1, 1 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.1, 1 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.2, 2 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.2, 0.2, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.2, 0.1, 4 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.1, 1 ) ); p6b.addInteriorRing( ring ); @@ -2429,8 +2429,8 @@ void TestQgsGeometry::polygonV2() QCOMPARE( p6b.interiorRing( 1 )->vertexAt( QgsVertexId( 0, 0, 0 ) ), QgsPointV2( QgsWkbTypes::PointZM, 0.1, 0.1, 1, 0 ) ); //test handling of 25D rings/polygons QgsPolygonV2 p6c; - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point25D, 0, 0, 1 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point25D, 0, 0, 1 ) << QgsPointV2( QgsWkbTypes::Point25D, 0, 10, 2 ) << QgsPointV2( QgsWkbTypes::Point25D, 10, 10, 3 ) << QgsPointV2( QgsWkbTypes::Point25D, 10, 0, 4 ) << QgsPointV2( QgsWkbTypes::Point25D, 0, 0, 1 ) ); p6c.setExteriorRing( ext ); @@ -2438,8 +2438,8 @@ void TestQgsGeometry::polygonV2() QVERIFY( !p6c.isMeasure() ); QCOMPARE( p6c.wkbType(), QgsWkbTypes::Polygon25D ); //adding a LineStringZ, should become LineString25D - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.1, 1 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.1, 1 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.2, 2 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.2, 0.2, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.2, 0.1, 4 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.1, 1 ) ); QCOMPARE( ring->wkbType(), QgsWkbTypes::LineStringZ ); @@ -2450,8 +2450,8 @@ void TestQgsGeometry::polygonV2() QCOMPARE( p6c.interiorRing( 0 )->wkbType(), QgsWkbTypes::LineString25D ); QCOMPARE( p6c.interiorRing( 0 )->vertexAt( QgsVertexId( 0, 0, 0 ) ), QgsPointV2( QgsWkbTypes::Point25D, 0.1, 0.1, 1 ) ); //add a LineStringM, should become LineString25D - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointM, 0.1, 0.1, 0, 1 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointM, 0.1, 0.1, 0, 1 ) << QgsPointV2( QgsWkbTypes::PointM, 0.1, 0.2, 0, 2 ) << QgsPointV2( QgsWkbTypes::PointM, 0.2, 0.2, 0, 3 ) << QgsPointV2( QgsWkbTypes::PointM, 0.2, 0.1, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointM, 0.1, 0.1, 0, 1 ) ); QCOMPARE( ring->wkbType(), QgsWkbTypes::LineStringM ); @@ -2463,8 +2463,8 @@ void TestQgsGeometry::polygonV2() QCOMPARE( p6c.interiorRing( 1 )->vertexAt( QgsVertexId( 0, 0, 0 ) ), QgsPointV2( QgsWkbTypes::Point25D, 0.1, 0.1, 0, 0 ) ); //add curved ring to polygon - circularRing = new QgsCircularStringV2(); - circularRing->setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) + circularRing = new QgsCircularString(); + circularRing->setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) << QgsPointV2( 10, 0 ) << QgsPointV2( 0, 0 ) ); QVERIFY( circularRing->hasCurvedSegments() ); p6c.addInteriorRing( circularRing ); @@ -2476,24 +2476,24 @@ void TestQgsGeometry::polygonV2() //set interior rings QgsPolygonV2 p7; - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) << QgsPointV2( 10, 0 ) << QgsPointV2( 0, 0 ) ); p7.setExteriorRing( ext ); //add a list of rings with mixed types - QList< QgsCurveV2* > rings; - rings << new QgsLineStringV2(); - static_cast< QgsLineStringV2*>( rings[0] )->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.1, 1 ) + QList< QgsCurve* > rings; + rings << new QgsLineString(); + static_cast< QgsLineString*>( rings[0] )->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.1, 1 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.2, 2 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.2, 0.2, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.2, 0.1, 4 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.1, 1 ) ); - rings << new QgsLineStringV2(); - static_cast< QgsLineStringV2*>( rings[1] )->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointM, 0.3, 0.3, 0, 1 ) + rings << new QgsLineString(); + static_cast< QgsLineString*>( rings[1] )->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointM, 0.3, 0.3, 0, 1 ) << QgsPointV2( QgsWkbTypes::PointM, 0.3, 0.4, 0, 2 ) << QgsPointV2( QgsWkbTypes::PointM, 0.4, 0.4, 0, 3 ) << QgsPointV2( QgsWkbTypes::PointM, 0.4, 0.3, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointM, 0.3, 0.3, 0, 1 ) ); //throw an empty ring in too rings << 0; - rings << new QgsCircularStringV2(); - static_cast< QgsCircularStringV2*>( rings[3] )->setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) + rings << new QgsCircularString(); + static_cast< QgsCircularString*>( rings[3] )->setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) << QgsPointV2( 10, 0 ) << QgsPointV2( 0, 0 ) ); p7.setInteriorRings( rings ); QCOMPARE( p7.numInteriorRings(), 3 ); @@ -2514,8 +2514,8 @@ void TestQgsGeometry::polygonV2() //set rings with existing rings.clear(); - rings << new QgsLineStringV2(); - static_cast< QgsLineStringV2*>( rings[0] )->setPoints( QgsPointSequenceV2() << QgsPointV2( 0.8, 0.8 ) + rings << new QgsLineString(); + static_cast< QgsLineString*>( rings[0] )->setPoints( QgsPointSequence() << QgsPointV2( 0.8, 0.8 ) << QgsPointV2( 0.8, 0.9 ) << QgsPointV2( 0.9, 0.9 ) << QgsPointV2( 0.9, 0.8 ) << QgsPointV2( 0.8, 0.8 ) ); p7.setInteriorRings( rings ); @@ -2531,17 +2531,17 @@ void TestQgsGeometry::polygonV2() //change dimensionality of interior rings using setExteriorRing QgsPolygonV2 p7a; - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 1 ) << QgsPointV2( QgsWkbTypes::PointZ, 0, 10, 2 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 1 ) << QgsPointV2( QgsWkbTypes::PointZ, 0, 10, 2 ) << QgsPointV2( QgsWkbTypes::PointZ, 10, 10, 1 ) << QgsPointV2( QgsWkbTypes::PointZ, 10, 0, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 1 ) ); p7a.setExteriorRing( ext ); rings.clear(); - rings << new QgsLineStringV2(); - static_cast< QgsLineStringV2*>( rings[0] )->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.1, 1 ) + rings << new QgsLineString(); + static_cast< QgsLineString*>( rings[0] )->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.1, 1 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.2, 2 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.2, 0.2, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.2, 0.1, 4 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.1, 0.1, 1 ) ); - rings << new QgsLineStringV2(); - static_cast< QgsLineStringV2*>( rings[1] )->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 0.3, 0.3, 1 ) + rings << new QgsLineString(); + static_cast< QgsLineString*>( rings[1] )->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 0.3, 0.3, 1 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.3, 0.4, 2 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.4, 0.4, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.4, 0.3, 4 ) << QgsPointV2( QgsWkbTypes::PointZ, 0.3, 0.3, 1 ) ); p7a.setInteriorRings( rings ); @@ -2552,24 +2552,24 @@ void TestQgsGeometry::polygonV2() QVERIFY( p7a.interiorRing( 1 )->is3D() ); QVERIFY( !p7a.interiorRing( 1 )->isMeasure() ); //reset exterior ring to 2d - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) << QgsPointV2( 10, 0 ) << QgsPointV2( 0, 0 ) ); p7a.setExteriorRing( ext ); QVERIFY( !p7a.is3D() ); QVERIFY( !p7a.interiorRing( 0 )->is3D() ); //rings should also be made 2D QVERIFY( !p7a.interiorRing( 1 )->is3D() ); //reset exterior ring to LineStringM - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointM, 0, 0 ) << QgsPointV2( QgsWkbTypes::PointM, 0, 10 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointM, 0, 0 ) << QgsPointV2( QgsWkbTypes::PointM, 0, 10 ) << QgsPointV2( QgsWkbTypes::PointM, 10, 10 ) << QgsPointV2( QgsWkbTypes::PointM, 10, 0 ) << QgsPointV2( QgsWkbTypes::PointM, 0, 0 ) ); p7a.setExteriorRing( ext ); QVERIFY( p7a.isMeasure() ); QVERIFY( p7a.interiorRing( 0 )->isMeasure() ); //rings should also gain measure QVERIFY( p7a.interiorRing( 1 )->isMeasure() ); //25D exterior ring - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point25D, 0, 0 ) << QgsPointV2( QgsWkbTypes::Point25D, 0, 10 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point25D, 0, 0 ) << QgsPointV2( QgsWkbTypes::Point25D, 0, 10 ) << QgsPointV2( QgsWkbTypes::Point25D, 10, 10 ) << QgsPointV2( QgsWkbTypes::Point25D, 10, 0 ) << QgsPointV2( QgsWkbTypes::Point25D, 0, 0 ) ); p7a.setExteriorRing( ext ); QVERIFY( p7a.is3D() ); @@ -2584,23 +2584,23 @@ void TestQgsGeometry::polygonV2() //removeInteriorRing QgsPolygonV2 p8; - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) << QgsPointV2( 10, 0 ) << QgsPointV2( 0, 0 ) ); p8.setExteriorRing( ext ); QVERIFY( !p8.removeInteriorRing( -1 ) ); QVERIFY( !p8.removeInteriorRing( 0 ) ); rings.clear(); - rings << new QgsLineStringV2(); - static_cast< QgsLineStringV2*>( rings[0] )->setPoints( QgsPointSequenceV2() << QgsPointV2( 0.1, 0.1 ) + rings << new QgsLineString(); + static_cast< QgsLineString*>( rings[0] )->setPoints( QgsPointSequence() << QgsPointV2( 0.1, 0.1 ) << QgsPointV2( 0.1, 0.2 ) << QgsPointV2( 0.2, 0.2 ) << QgsPointV2( 0.2, 0.1 ) << QgsPointV2( 0.1, 0.1 ) ); - rings << new QgsLineStringV2(); - static_cast< QgsLineStringV2*>( rings[1] )->setPoints( QgsPointSequenceV2() << QgsPointV2( 0.3, 0.3 ) + rings << new QgsLineString(); + static_cast< QgsLineString*>( rings[1] )->setPoints( QgsPointSequence() << QgsPointV2( 0.3, 0.3 ) << QgsPointV2( 0.3, 0.4 ) << QgsPointV2( 0.4, 0.4 ) << QgsPointV2( 0.4, 0.3 ) << QgsPointV2( 0.3, 0.3 ) ); - rings << new QgsLineStringV2(); - static_cast< QgsLineStringV2*>( rings[2] )->setPoints( QgsPointSequenceV2() << QgsPointV2( 0.8, 0.8 ) + rings << new QgsLineString(); + static_cast< QgsLineString*>( rings[2] )->setPoints( QgsPointSequence() << QgsPointV2( 0.8, 0.8 ) << QgsPointV2( 0.8, 0.9 ) << QgsPointV2( 0.9, 0.9 ) << QgsPointV2( 0.9, 0.8 ) << QgsPointV2( 0.8, 0.8 ) ); p8.setInteriorRings( rings ); @@ -2618,13 +2618,13 @@ void TestQgsGeometry::polygonV2() //clear QgsPolygonV2 p9; - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 1 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 1 ) << QgsPointV2( QgsWkbTypes::PointZ, 0, 10, 2 ) << QgsPointV2( QgsWkbTypes::PointZ, 10, 10, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 10, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 1 ) ); p9.setExteriorRing( ext ); - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 1, 1, 1 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 1, 1, 1 ) << QgsPointV2( QgsWkbTypes::PointZ, 1, 9, 2 ) << QgsPointV2( QgsWkbTypes::PointZ, 9, 9, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 9, 1, 4 ) << QgsPointV2( QgsWkbTypes::PointZ, 1, 1, 1 ) ); p9.addInteriorRing( ring ); @@ -2644,26 +2644,26 @@ void TestQgsGeometry::polygonV2() QgsPolygonV2 p10b; QVERIFY( p10 == p10b ); QVERIFY( !( p10 != p10b ) ); - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) << QgsPointV2( 10, 0 ) << QgsPointV2( 0, 0 ) ); p10.setExteriorRing( ext ); QVERIFY( !( p10 == p10b ) ); QVERIFY( p10 != p10b ); - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 10 ) << QgsPointV2( 10, 10 ) << QgsPointV2( 10, 0 ) << QgsPointV2( 0, 0 ) ); p10b.setExteriorRing( ext ); QVERIFY( p10 == p10b ); QVERIFY( !( p10 != p10b ) ); - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 9 ) << QgsPointV2( 9, 9 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( 0, 0 ) << QgsPointV2( 0, 9 ) << QgsPointV2( 9, 9 ) << QgsPointV2( 9, 0 ) << QgsPointV2( 0, 0 ) ); p10b.setExteriorRing( ext ); QVERIFY( !( p10 == p10b ) ); QVERIFY( p10 != p10b ); - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 1 ) << QgsPointV2( QgsWkbTypes::PointZ, 0, 10, 2 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 1 ) << QgsPointV2( QgsWkbTypes::PointZ, 0, 10, 2 ) << QgsPointV2( QgsWkbTypes::PointZ, 10, 10, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 10, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 1 ) ); p10b.setExteriorRing( ext ); QVERIFY( !( p10 == p10b ) ); @@ -2671,15 +2671,15 @@ void TestQgsGeometry::polygonV2() p10b.setExteriorRing( p10.exteriorRing()->clone() ); QVERIFY( p10 == p10b ); QVERIFY( !( p10 != p10b ) ); - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( 1, 1 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( 1, 1 ) << QgsPointV2( 1, 9 ) << QgsPointV2( 9, 9 ) << QgsPointV2( 9, 1 ) << QgsPointV2( 1, 1 ) ); p10.addInteriorRing( ring ); QVERIFY( !( p10 == p10b ) ); QVERIFY( p10 != p10b ); - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( 2, 1 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( 2, 1 ) << QgsPointV2( 2, 9 ) << QgsPointV2( 9, 9 ) << QgsPointV2( 9, 1 ) << QgsPointV2( 2, 1 ) ); p10b.addInteriorRing( ring ); @@ -2695,13 +2695,13 @@ void TestQgsGeometry::polygonV2() QgsPolygonV2 p11; QScopedPointer< QgsPolygonV2 >cloned( p11.clone() ); QCOMPARE( p11, *cloned ); - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 1, 5 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 1, 5 ) << QgsPointV2( QgsWkbTypes::PointZM, 0, 10, 2, 6 ) << QgsPointV2( QgsWkbTypes::PointZM, 10, 10, 3, 7 ) << QgsPointV2( QgsWkbTypes::PointZM, 10, 0, 4, 8 ) << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 1, 9 ) ); p11.setExteriorRing( ext ); - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 1, 2 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 1, 2 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 9, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZM, 9, 9, 3, 6 ) << QgsPointV2( QgsWkbTypes::PointZM, 9, 1, 4, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 1, 7 ) ); p11.addInteriorRing( ring ); @@ -2712,13 +2712,13 @@ void TestQgsGeometry::polygonV2() QgsPolygonV2 p12; QgsPolygonV2 p13( p12 ); QCOMPARE( p12, p13 ); - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 1, 5 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 1, 5 ) << QgsPointV2( QgsWkbTypes::PointZM, 0, 10, 2, 6 ) << QgsPointV2( QgsWkbTypes::PointZM, 10, 10, 3, 7 ) << QgsPointV2( QgsWkbTypes::PointZM, 10, 0, 4, 8 ) << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 1, 9 ) ); p12.setExteriorRing( ext ); - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 1, 2 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 1, 2 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 9, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZM, 9, 9, 3, 6 ) << QgsPointV2( QgsWkbTypes::PointZM, 9, 1, 4, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 1, 7 ) ); p12.addInteriorRing( ring ); @@ -2738,13 +2738,13 @@ void TestQgsGeometry::polygonV2() //to/fromWKB QgsPolygonV2 p16; - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point, 0, 0 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point, 0, 0 ) << QgsPointV2( QgsWkbTypes::Point, 0, 10 ) << QgsPointV2( QgsWkbTypes::Point, 10, 10 ) << QgsPointV2( QgsWkbTypes::Point, 10, 0 ) << QgsPointV2( QgsWkbTypes::Point, 0, 0 ) ); p16.setExteriorRing( ext ); - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point, 1, 1 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point, 1, 1 ) << QgsPointV2( QgsWkbTypes::Point, 1, 9 ) << QgsPointV2( QgsWkbTypes::Point, 9, 9 ) << QgsPointV2( QgsWkbTypes::Point, 9, 1 ) << QgsPointV2( QgsWkbTypes::Point, 1, 1 ) ); p16.addInteriorRing( ring ); @@ -2759,13 +2759,13 @@ void TestQgsGeometry::polygonV2() //PolygonZ p16.clear(); p17.clear(); - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 1 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 1 ) << QgsPointV2( QgsWkbTypes::PointZ, 0, 10, 2 ) << QgsPointV2( QgsWkbTypes::PointZ, 10, 10, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 10, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 1 ) ); p16.setExteriorRing( ext ); - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZ, 1, 1, 1 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZ, 1, 1, 1 ) << QgsPointV2( QgsWkbTypes::PointZ, 1, 9, 2 ) << QgsPointV2( QgsWkbTypes::PointZ, 9, 9, 3 ) << QgsPointV2( QgsWkbTypes::PointZ, 9, 1, 4 ) << QgsPointV2( QgsWkbTypes::PointZ, 1, 1, 1 ) ); p16.addInteriorRing( ring ); @@ -2779,13 +2779,13 @@ void TestQgsGeometry::polygonV2() //PolygonM p16.clear(); p17.clear(); - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointM, 0, 0, 0, 1 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointM, 0, 0, 0, 1 ) << QgsPointV2( QgsWkbTypes::PointM, 0, 10, 0, 2 ) << QgsPointV2( QgsWkbTypes::PointM, 10, 10, 0, 3 ) << QgsPointV2( QgsWkbTypes::PointM, 10, 0, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointM, 0, 0, 0, 1 ) ); p16.setExteriorRing( ext ); - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointM, 1, 1, 0, 1 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointM, 1, 1, 0, 1 ) << QgsPointV2( QgsWkbTypes::PointM, 1, 9, 0, 2 ) << QgsPointV2( QgsWkbTypes::PointM, 9, 9, 0, 3 ) << QgsPointV2( QgsWkbTypes::PointM, 9, 1, 0, 4 ) << QgsPointV2( QgsWkbTypes::PointM, 1, 1, 0, 1 ) ); p16.addInteriorRing( ring ); @@ -2799,13 +2799,13 @@ void TestQgsGeometry::polygonV2() //PolygonZM p16.clear(); p17.clear(); - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 1, 5 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 1, 5 ) << QgsPointV2( QgsWkbTypes::PointZM, 0, 10, 2, 6 ) << QgsPointV2( QgsWkbTypes::PointZM, 10, 10, 3, 7 ) << QgsPointV2( QgsWkbTypes::PointZM, 10, 0, 4, 8 ) << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 1, 9 ) ); p16.setExteriorRing( ext ); - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 1, 2 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 1, 2 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 9, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZM, 9, 9, 3, 6 ) << QgsPointV2( QgsWkbTypes::PointZM, 9, 1, 4, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 1, 7 ) ); p16.addInteriorRing( ring ); @@ -2819,13 +2819,13 @@ void TestQgsGeometry::polygonV2() //Polygon25D p16.clear(); p17.clear(); - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point25D, 0, 0, 1 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point25D, 0, 0, 1 ) << QgsPointV2( QgsWkbTypes::Point25D, 0, 10, 2 ) << QgsPointV2( QgsWkbTypes::Point25D, 10, 10, 3 ) << QgsPointV2( QgsWkbTypes::Point25D, 10, 0, 4 ) << QgsPointV2( QgsWkbTypes::Point25D, 0, 0, 1 ) ); p16.setExteriorRing( ext ); - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point25D, 1, 1, 1 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point25D, 1, 1, 1 ) << QgsPointV2( QgsWkbTypes::Point25D, 1, 9, 2 ) << QgsPointV2( QgsWkbTypes::Point25D, 9, 9, 3 ) << QgsPointV2( QgsWkbTypes::Point25D, 9, 1, 4 ) << QgsPointV2( QgsWkbTypes::Point25D, 1, 1, 1 ) ); p16.addInteriorRing( ring ); @@ -2851,13 +2851,13 @@ void TestQgsGeometry::polygonV2() //to/from WKT QgsPolygonV2 p18; - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 1, 5 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 1, 5 ) << QgsPointV2( QgsWkbTypes::PointZM, 0, 10, 2, 6 ) << QgsPointV2( QgsWkbTypes::PointZM, 10, 10, 3, 7 ) << QgsPointV2( QgsWkbTypes::PointZM, 10, 0, 4, 8 ) << QgsPointV2( QgsWkbTypes::PointZM, 0, 0, 1, 9 ) ); p18.setExteriorRing( ext ); - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 1, 2 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 1, 2 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 9, 2, 3 ) << QgsPointV2( QgsWkbTypes::PointZM, 9, 9, 3, 6 ) << QgsPointV2( QgsWkbTypes::PointZM, 9, 1, 4, 4 ) << QgsPointV2( QgsWkbTypes::PointZM, 1, 1, 1, 7 ) ); p18.addInteriorRing( ring ); @@ -2879,13 +2879,13 @@ void TestQgsGeometry::polygonV2() //as JSON QgsPolygonV2 exportPolygon; - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point, 0, 0 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point, 0, 0 ) << QgsPointV2( QgsWkbTypes::Point, 0, 10 ) << QgsPointV2( QgsWkbTypes::Point, 10, 10 ) << QgsPointV2( QgsWkbTypes::Point, 10, 0 ) << QgsPointV2( QgsWkbTypes::Point, 0, 0 ) ); exportPolygon.setExteriorRing( ext ); - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point, 1, 1 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point, 1, 1 ) << QgsPointV2( QgsWkbTypes::Point, 1, 9 ) << QgsPointV2( QgsWkbTypes::Point, 9, 9 ) << QgsPointV2( QgsWkbTypes::Point, 9, 1 ) << QgsPointV2( QgsWkbTypes::Point, 1, 1 ) ); exportPolygon.addInteriorRing( ring ); @@ -2894,13 +2894,13 @@ void TestQgsGeometry::polygonV2() QCOMPARE( exportPolygon.asJSON(), expectedJson ); QgsPolygonV2 exportPolygonFloat; - ext = new QgsLineStringV2(); - ext->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point, 10 / 9.0, 10 / 9.0 ) + ext = new QgsLineString(); + ext->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point, 10 / 9.0, 10 / 9.0 ) << QgsPointV2( QgsWkbTypes::Point, 10 / 9.0, 100 / 9.0 ) << QgsPointV2( QgsWkbTypes::Point, 100 / 9.0, 100 / 9.0 ) << QgsPointV2( QgsWkbTypes::Point, 100 / 9.0, 10 / 9.0 ) << QgsPointV2( QgsWkbTypes::Point, 10 / 9.0, 10 / 9.0 ) ); exportPolygonFloat.setExteriorRing( ext ); - ring = new QgsLineStringV2(); - ring->setPoints( QgsPointSequenceV2() << QgsPointV2( QgsWkbTypes::Point, 2 / 3.0, 2 / 3.0 ) + ring = new QgsLineString(); + ring->setPoints( QgsPointSequence() << QgsPointV2( QgsWkbTypes::Point, 2 / 3.0, 2 / 3.0 ) << QgsPointV2( QgsWkbTypes::Point, 2 / 3.0, 4 / 3.0 ) << QgsPointV2( QgsWkbTypes::Point, 4 / 3.0, 4 / 3.0 ) << QgsPointV2( QgsWkbTypes::Point, 4 / 3.0, 2 / 3.0 ) << QgsPointV2( QgsWkbTypes::Point, 2 / 3.0, 2 / 3.0 ) ); exportPolygonFloat.addInteriorRing( ring ); @@ -2927,7 +2927,7 @@ void TestQgsGeometry::polygonV2() //removing the fourth to last vertex removes the whole ring QgsPolygonV2 p20; - QgsLineStringV2* p20ExteriorRing = new QgsLineStringV2(); + QgsLineString* p20ExteriorRing = new QgsLineString(); p20ExteriorRing->setPoints( QList() << QgsPointV2( 0, 0 ) << QgsPointV2( 1, 0 ) << QgsPointV2( 1, 1 ) << QgsPointV2( 0, 0 ) ); p20.setExteriorRing( p20ExteriorRing ); QVERIFY( p20.exteriorRing() ); @@ -2935,14 +2935,14 @@ void TestQgsGeometry::polygonV2() QVERIFY( !p20.exteriorRing() ); //boundary - QgsLineStringV2 boundary1; + QgsLineString boundary1; boundary1.setPoints( QList() << QgsPointV2( 0, 0 ) << QgsPointV2( 1, 0 ) << QgsPointV2( 1, 1 ) << QgsPointV2( 0, 0 ) ); QgsPolygonV2 boundaryPolygon; QVERIFY( !boundaryPolygon.boundary() ); boundaryPolygon.setExteriorRing( boundary1.clone() ); - QgsAbstractGeometryV2* boundary = boundaryPolygon.boundary(); - QgsLineStringV2* lineBoundary = dynamic_cast< QgsLineStringV2* >( boundary ); + QgsAbstractGeometry* boundary = boundaryPolygon.boundary(); + QgsLineString* lineBoundary = dynamic_cast< QgsLineString* >( boundary ); QVERIFY( lineBoundary ); QCOMPARE( lineBoundary->numPoints(), 4 ); QCOMPARE( lineBoundary->xAt( 0 ), 0.0 ); @@ -2956,43 +2956,43 @@ void TestQgsGeometry::polygonV2() delete boundary; // add interior rings - QgsLineStringV2 boundaryRing1; + QgsLineString boundaryRing1; boundaryRing1.setPoints( QList() << QgsPointV2( 0.1, 0.1 ) << QgsPointV2( 0.2, 0.1 ) << QgsPointV2( 0.2, 0.2 ) << QgsPointV2( 0.1, 0.1 ) ); - QgsLineStringV2 boundaryRing2; + QgsLineString boundaryRing2; boundaryRing2.setPoints( QList() << QgsPointV2( 0.8, 0.8 ) << QgsPointV2( 0.9, 0.8 ) << QgsPointV2( 0.9, 0.9 ) << QgsPointV2( 0.8, 0.8 ) ); - boundaryPolygon.setInteriorRings( QList< QgsCurveV2* >() << boundaryRing1.clone() << boundaryRing2.clone() ); + boundaryPolygon.setInteriorRings( QList< QgsCurve* >() << boundaryRing1.clone() << boundaryRing2.clone() ); boundary = boundaryPolygon.boundary(); - QgsMultiLineStringV2* multiLineBoundary = dynamic_cast< QgsMultiLineStringV2* >( boundary ); + QgsMultiLineString* multiLineBoundary = dynamic_cast< QgsMultiLineString* >( boundary ); QVERIFY( multiLineBoundary ); QCOMPARE( multiLineBoundary->numGeometries(), 3 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->numPoints(), 4 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->xAt( 0 ), 0.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->xAt( 1 ), 1.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->xAt( 2 ), 1.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->xAt( 3 ), 0.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->yAt( 0 ), 0.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->yAt( 1 ), 0.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->yAt( 2 ), 1.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->yAt( 3 ), 0.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->numPoints(), 4 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->xAt( 0 ), 0.1 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->xAt( 1 ), 0.2 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->xAt( 2 ), 0.2 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->xAt( 3 ), 0.1 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->yAt( 0 ), 0.1 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->yAt( 1 ), 0.1 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->yAt( 2 ), 0.2 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->yAt( 3 ), 0.1 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->numPoints(), 4 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->xAt( 0 ), 0.8 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->xAt( 1 ), 0.9 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->xAt( 2 ), 0.9 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->xAt( 3 ), 0.8 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->yAt( 0 ), 0.8 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->yAt( 1 ), 0.8 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->yAt( 2 ), 0.9 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->yAt( 3 ), 0.8 ); - boundaryPolygon.setInteriorRings( QList< QgsCurveV2* >() ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->numPoints(), 4 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->xAt( 0 ), 0.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->xAt( 1 ), 1.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->xAt( 2 ), 1.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->xAt( 3 ), 0.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->yAt( 0 ), 0.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->yAt( 1 ), 0.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->yAt( 2 ), 1.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->yAt( 3 ), 0.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->numPoints(), 4 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->xAt( 0 ), 0.1 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->xAt( 1 ), 0.2 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->xAt( 2 ), 0.2 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->xAt( 3 ), 0.1 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->yAt( 0 ), 0.1 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->yAt( 1 ), 0.1 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->yAt( 2 ), 0.2 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->yAt( 3 ), 0.1 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->numPoints(), 4 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->xAt( 0 ), 0.8 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->xAt( 1 ), 0.9 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->xAt( 2 ), 0.9 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->xAt( 3 ), 0.8 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->yAt( 0 ), 0.8 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->yAt( 1 ), 0.8 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->yAt( 2 ), 0.9 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->yAt( 3 ), 0.8 ); + boundaryPolygon.setInteriorRings( QList< QgsCurve* >() ); delete boundary; //test boundary with z @@ -3000,7 +3000,7 @@ void TestQgsGeometry::polygonV2() << QgsPointV2( QgsWkbTypes::PointZ, 1, 1, 20 ) << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 10 ) ); boundaryPolygon.setExteriorRing( boundary1.clone() ); boundary = boundaryPolygon.boundary(); - lineBoundary = dynamic_cast< QgsLineStringV2* >( boundary ); + lineBoundary = dynamic_cast< QgsLineString* >( boundary ); QVERIFY( lineBoundary ); QCOMPARE( lineBoundary->numPoints(), 4 ); QCOMPARE( lineBoundary->wkbType(), QgsWkbTypes::LineStringZ ); @@ -3028,12 +3028,12 @@ void TestQgsGeometry::multiPoint() void TestQgsGeometry::multiLineString() { //boundary - QgsMultiLineStringV2 multiLine1; + QgsMultiLineString multiLine1; QVERIFY( !multiLine1.boundary() ); - QgsLineStringV2 boundaryLine1; + QgsLineString boundaryLine1; boundaryLine1.setPoints( QList() << QgsPointV2( 0, 0 ) << QgsPointV2( 1, 0 ) << QgsPointV2( 1, 1 ) ); multiLine1.addGeometry( boundaryLine1.clone() ); - QgsAbstractGeometryV2* boundary = multiLine1.boundary(); + QgsAbstractGeometry* boundary = multiLine1.boundary(); QgsMultiPointV2* mpBoundary = dynamic_cast< QgsMultiPointV2* >( boundary ); QVERIFY( mpBoundary ); QCOMPARE( mpBoundary->numGeometries(), 2 ); @@ -3043,7 +3043,7 @@ void TestQgsGeometry::multiLineString() QCOMPARE( static_cast< QgsPointV2*>( mpBoundary->geometryN( 1 ) )->y(), 1.0 ); delete boundary; // add another linestring - QgsLineStringV2 boundaryLine2; + QgsLineString boundaryLine2; boundaryLine2.setPoints( QList() << QgsPointV2( 10, 10 ) << QgsPointV2( 11, 10 ) << QgsPointV2( 11, 11 ) ); multiLine1.addGeometry( boundaryLine2.clone() ); boundary = multiLine1.boundary(); @@ -3061,7 +3061,7 @@ void TestQgsGeometry::multiLineString() delete boundary; // add a closed string = no boundary - QgsLineStringV2 boundaryLine3; + QgsLineString boundaryLine3; boundaryLine3.setPoints( QList() << QgsPointV2( 20, 20 ) << QgsPointV2( 21, 20 ) << QgsPointV2( 21, 21 ) << QgsPointV2( 20, 20 ) ); multiLine1.addGeometry( boundaryLine3.clone() ); boundary = multiLine1.boundary(); @@ -3079,11 +3079,11 @@ void TestQgsGeometry::multiLineString() delete boundary; //boundary with z - QgsLineStringV2 boundaryLine4; + QgsLineString boundaryLine4; boundaryLine4.setPoints( QList() << QgsPointV2( QgsWkbTypes::PointZ, 0, 0, 10 ) << QgsPointV2( QgsWkbTypes::PointZ, 1, 0, 15 ) << QgsPointV2( QgsWkbTypes::PointZ, 1, 1, 20 ) ); - QgsLineStringV2 boundaryLine5; + QgsLineString boundaryLine5; boundaryLine5.setPoints( QList() << QgsPointV2( QgsWkbTypes::PointZ, 10, 10, 100 ) << QgsPointV2( QgsWkbTypes::PointZ, 10, 20, 150 ) << QgsPointV2( QgsWkbTypes::PointZ, 20, 20, 200 ) ); - QgsMultiLineStringV2 multiLine2; + QgsMultiLineString multiLine2; multiLine2.addGeometry( boundaryLine4.clone() ); multiLine2.addGeometry( boundaryLine5.clone() ); @@ -3115,79 +3115,79 @@ void TestQgsGeometry::multiPolygon() QgsMultiPolygonV2 multiPolygon1; QVERIFY( !multiPolygon1.boundary() ); - QgsLineStringV2 ring1; + QgsLineString ring1; ring1.setPoints( QList() << QgsPointV2( 0, 0 ) << QgsPointV2( 1, 0 ) << QgsPointV2( 1, 1 ) << QgsPointV2( 0, 0 ) ); QgsPolygonV2 polygon1; polygon1.setExteriorRing( ring1.clone() ); multiPolygon1.addGeometry( polygon1.clone() ); - QgsAbstractGeometryV2* boundary = multiPolygon1.boundary(); - QgsMultiLineStringV2* lineBoundary = dynamic_cast< QgsMultiLineStringV2* >( boundary ); + QgsAbstractGeometry* boundary = multiPolygon1.boundary(); + QgsMultiLineString* lineBoundary = dynamic_cast< QgsMultiLineString* >( boundary ); QVERIFY( lineBoundary ); QCOMPARE( lineBoundary->numGeometries(), 1 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( lineBoundary->geometryN( 0 ) )->numPoints(), 4 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( lineBoundary->geometryN( 0 ) )->xAt( 0 ), 0.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( lineBoundary->geometryN( 0 ) )->xAt( 1 ), 1.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( lineBoundary->geometryN( 0 ) )->xAt( 2 ), 1.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( lineBoundary->geometryN( 0 ) )->xAt( 3 ), 0.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( lineBoundary->geometryN( 0 ) )->yAt( 0 ), 0.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( lineBoundary->geometryN( 0 ) )->yAt( 1 ), 0.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( lineBoundary->geometryN( 0 ) )->yAt( 2 ), 1.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( lineBoundary->geometryN( 0 ) )->yAt( 3 ), 0.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( lineBoundary->geometryN( 0 ) )->numPoints(), 4 ); + QCOMPARE( dynamic_cast< QgsLineString* >( lineBoundary->geometryN( 0 ) )->xAt( 0 ), 0.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( lineBoundary->geometryN( 0 ) )->xAt( 1 ), 1.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( lineBoundary->geometryN( 0 ) )->xAt( 2 ), 1.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( lineBoundary->geometryN( 0 ) )->xAt( 3 ), 0.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( lineBoundary->geometryN( 0 ) )->yAt( 0 ), 0.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( lineBoundary->geometryN( 0 ) )->yAt( 1 ), 0.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( lineBoundary->geometryN( 0 ) )->yAt( 2 ), 1.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( lineBoundary->geometryN( 0 ) )->yAt( 3 ), 0.0 ); delete boundary; // add polygon with interior rings - QgsLineStringV2 ring2; + QgsLineString ring2; ring2.setPoints( QList() << QgsPointV2( 10, 10 ) << QgsPointV2( 11, 10 ) << QgsPointV2( 11, 11 ) << QgsPointV2( 10, 10 ) ); QgsPolygonV2 polygon2; polygon2.setExteriorRing( ring2.clone() ); - QgsLineStringV2 boundaryRing1; + QgsLineString boundaryRing1; boundaryRing1.setPoints( QList() << QgsPointV2( 10.1, 10.1 ) << QgsPointV2( 10.2, 10.1 ) << QgsPointV2( 10.2, 10.2 ) << QgsPointV2( 10.1, 10.1 ) ); - QgsLineStringV2 boundaryRing2; + QgsLineString boundaryRing2; boundaryRing2.setPoints( QList() << QgsPointV2( 10.8, 10.8 ) << QgsPointV2( 10.9, 10.8 ) << QgsPointV2( 10.9, 10.9 ) << QgsPointV2( 10.8, 10.8 ) ); - polygon2.setInteriorRings( QList< QgsCurveV2* >() << boundaryRing1.clone() << boundaryRing2.clone() ); + polygon2.setInteriorRings( QList< QgsCurve* >() << boundaryRing1.clone() << boundaryRing2.clone() ); multiPolygon1.addGeometry( polygon2.clone() ); boundary = multiPolygon1.boundary(); - QgsMultiLineStringV2* multiLineBoundary = dynamic_cast< QgsMultiLineStringV2* >( boundary ); + QgsMultiLineString* multiLineBoundary = dynamic_cast< QgsMultiLineString* >( boundary ); QVERIFY( multiLineBoundary ); QCOMPARE( multiLineBoundary->numGeometries(), 4 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->numPoints(), 4 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->xAt( 0 ), 0.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->xAt( 1 ), 1.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->xAt( 2 ), 1.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->xAt( 3 ), 0.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->yAt( 0 ), 0.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->yAt( 1 ), 0.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->yAt( 2 ), 1.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 0 ) )->yAt( 3 ), 0.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->numPoints(), 4 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->xAt( 0 ), 10.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->xAt( 1 ), 11.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->xAt( 2 ), 11.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->xAt( 3 ), 10.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->yAt( 0 ), 10.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->yAt( 1 ), 10.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->yAt( 2 ), 11.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 1 ) )->yAt( 3 ), 10.0 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->numPoints(), 4 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->xAt( 0 ), 10.1 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->xAt( 1 ), 10.2 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->xAt( 2 ), 10.2 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->xAt( 3 ), 10.1 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->yAt( 0 ), 10.1 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->yAt( 1 ), 10.1 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->yAt( 2 ), 10.2 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 2 ) )->yAt( 3 ), 10.1 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 3 ) )->numPoints(), 4 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 3 ) )->xAt( 0 ), 10.8 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 3 ) )->xAt( 1 ), 10.9 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 3 ) )->xAt( 2 ), 10.9 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 3 ) )->xAt( 3 ), 10.8 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 3 ) )->yAt( 0 ), 10.8 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 3 ) )->yAt( 1 ), 10.8 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 3 ) )->yAt( 2 ), 10.9 ); - QCOMPARE( dynamic_cast< QgsLineStringV2* >( multiLineBoundary->geometryN( 3 ) )->yAt( 3 ), 10.8 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->numPoints(), 4 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->xAt( 0 ), 0.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->xAt( 1 ), 1.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->xAt( 2 ), 1.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->xAt( 3 ), 0.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->yAt( 0 ), 0.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->yAt( 1 ), 0.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->yAt( 2 ), 1.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 0 ) )->yAt( 3 ), 0.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->numPoints(), 4 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->xAt( 0 ), 10.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->xAt( 1 ), 11.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->xAt( 2 ), 11.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->xAt( 3 ), 10.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->yAt( 0 ), 10.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->yAt( 1 ), 10.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->yAt( 2 ), 11.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 1 ) )->yAt( 3 ), 10.0 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->numPoints(), 4 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->xAt( 0 ), 10.1 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->xAt( 1 ), 10.2 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->xAt( 2 ), 10.2 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->xAt( 3 ), 10.1 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->yAt( 0 ), 10.1 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->yAt( 1 ), 10.1 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->yAt( 2 ), 10.2 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 2 ) )->yAt( 3 ), 10.1 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 3 ) )->numPoints(), 4 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 3 ) )->xAt( 0 ), 10.8 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 3 ) )->xAt( 1 ), 10.9 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 3 ) )->xAt( 2 ), 10.9 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 3 ) )->xAt( 3 ), 10.8 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 3 ) )->yAt( 0 ), 10.8 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 3 ) )->yAt( 1 ), 10.8 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 3 ) )->yAt( 2 ), 10.9 ); + QCOMPARE( dynamic_cast< QgsLineString* >( multiLineBoundary->geometryN( 3 ) )->yAt( 3 ), 10.8 ); delete boundary; } @@ -3197,10 +3197,10 @@ void TestQgsGeometry::geometryCollection() //boundary // collections have no boundary defined - QgsGeometryCollectionV2 boundaryCollection; + QgsGeometryCollection boundaryCollection; QVERIFY( !boundaryCollection.boundary() ); // add a geometry and retest, should still be undefined - QgsLineStringV2* lineBoundary = new QgsLineStringV2(); + QgsLineString* lineBoundary = new QgsLineString(); lineBoundary->setPoints( QList() << QgsPointV2( 0, 0 ) << QgsPointV2( 1, 0 ) ); boundaryCollection.addGeometry( lineBoundary ); QVERIFY( !boundaryCollection.boundary() ); @@ -3772,11 +3772,11 @@ void TestQgsGeometry::wkbInOut() void TestQgsGeometry::segmentizeCircularString() { QString wkt( "CIRCULARSTRING( 0 0, 0.5 0.5, 2 0 )" ); - QgsCircularStringV2* circularString = dynamic_cast( QgsGeometryFactory::geomFromWkt( wkt ) ); + QgsCircularString* circularString = dynamic_cast( QgsGeometryFactory::geomFromWkt( wkt ) ); QVERIFY( circularString ); - QgsLineStringV2* lineString = circularString->curveToLine(); + QgsLineString* lineString = circularString->curveToLine(); QVERIFY( lineString ); - QgsPointSequenceV2 points; + QgsPointSequence points; lineString->points( points ); delete circularString; diff --git a/tests/src/core/testqgsgeometryutils.cpp b/tests/src/core/testqgsgeometryutils.cpp index 0b597a8f819..352c31bcd48 100644 --- a/tests/src/core/testqgsgeometryutils.cpp +++ b/tests/src/core/testqgsgeometryutils.cpp @@ -16,9 +16,9 @@ #include #include #include "qgsgeometryutils.h" -#include "qgslinestringv2.h" -#include "qgspolygonv2.h" -#include "qgsmultipolygonv2.h" +#include "qgslinestring.h" +#include "qgspolygon.h" +#include "qgsmultipolygon.h" #include "qgstestutils.h" class TestQgsGeometryUtils: public QObject @@ -53,25 +53,25 @@ class TestQgsGeometryUtils: public QObject void TestQgsGeometryUtils::testExtractLinestrings() { - QgsLineStringV2* outerRing1 = new QgsLineStringV2(); + QgsLineString* outerRing1 = new QgsLineString(); outerRing1->setPoints( QList() << QgsPointV2( 1, 1 ) << QgsPointV2( 1, 2 ) << QgsPointV2( 2, 2 ) << QgsPointV2( 2, 1 ) << QgsPointV2( 1, 1 ) ); QgsPolygonV2* polygon1 = new QgsPolygonV2(); polygon1->setExteriorRing( outerRing1 ); - QgsLineStringV2* outerRing2 = new QgsLineStringV2(); + QgsLineString* outerRing2 = new QgsLineString(); outerRing2->setPoints( QList() << QgsPointV2( 10, 10 ) << QgsPointV2( 10, 20 ) << QgsPointV2( 20, 20 ) << QgsPointV2( 20, 10 ) << QgsPointV2( 10, 10 ) ); QgsPolygonV2* polygon2 = new QgsPolygonV2(); polygon2->setExteriorRing( outerRing2 ); - QgsLineStringV2* innerRing2 = new QgsLineStringV2(); + QgsLineString* innerRing2 = new QgsLineString(); innerRing2->setPoints( QList() << QgsPointV2( 14, 14 ) << QgsPointV2( 14, 16 ) << QgsPointV2( 16, 16 ) << QgsPointV2( 16, 14 ) << QgsPointV2( 14, 14 ) ); - polygon2->setInteriorRings( QList() << innerRing2 ); + polygon2->setInteriorRings( QList() << innerRing2 ); QgsMultiPolygonV2 mpg; mpg.addGeometry( polygon1 ); mpg.addGeometry( polygon2 ); - QList linestrings = QgsGeometryUtils::extractLineStrings( &mpg ); + QList linestrings = QgsGeometryUtils::extractLineStrings( &mpg ); QCOMPARE( linestrings.count(), 3 ); qDeleteAll( linestrings ); } @@ -338,7 +338,7 @@ void TestQgsGeometryUtils::testAverageAngle() void TestQgsGeometryUtils::testDistanceToVertex() { //test with linestring - QgsLineStringV2* outerRing1 = new QgsLineStringV2(); + QgsLineString* outerRing1 = new QgsLineString(); outerRing1->setPoints( QList() << QgsPointV2( 1, 1 ) << QgsPointV2( 1, 2 ) << QgsPointV2( 2, 2 ) << QgsPointV2( 2, 1 ) << QgsPointV2( 1, 1 ) ); QCOMPARE( QgsGeometryUtils::distanceToVertex( *outerRing1, QgsVertexId( 0, 0, 0 ) ), 0.0 ); QCOMPARE( QgsGeometryUtils::distanceToVertex( *outerRing1, QgsVertexId( 0, 0, 1 ) ), 1.0 ); diff --git a/tests/src/core/testqgsgradients.cpp b/tests/src/core/testqgsgradients.cpp index ef8c365b51b..30e94e5284d 100644 --- a/tests/src/core/testqgsgradients.cpp +++ b/tests/src/core/testqgsgradients.cpp @@ -28,9 +28,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include //qgis test includes #include "qgsrenderchecker.h" @@ -74,9 +74,9 @@ class TestQgsGradients : public QObject bool imageCheck( const QString& theType ); QgsMapSettings mMapSettings; QgsVectorLayer * mpPolysLayer; - QgsGradientFillSymbolLayerV2* mGradientFill; - QgsFillSymbolV2* mFillSymbol; - QgsSingleSymbolRendererV2* mSymbolRenderer; + QgsGradientFillSymbolLayer* mGradientFill; + QgsFillSymbol* mFillSymbol; + QgsSingleSymbolRenderer* mSymbolRenderer; QString mTestDataDir; QString mReport; }; @@ -111,11 +111,11 @@ void TestQgsGradients::initTestCase() QList() << mpPolysLayer ); //setup gradient fill - mGradientFill = new QgsGradientFillSymbolLayerV2(); - mFillSymbol = new QgsFillSymbolV2(); + mGradientFill = new QgsGradientFillSymbolLayer(); + mFillSymbol = new QgsFillSymbol(); mFillSymbol->changeSymbolLayer( 0, mGradientFill ); - mSymbolRenderer = new QgsSingleSymbolRendererV2( mFillSymbol ); - mpPolysLayer->setRendererV2( mSymbolRenderer ); + mSymbolRenderer = new QgsSingleSymbolRenderer( mFillSymbol ); + mpPolysLayer->setRenderer( mSymbolRenderer ); // We only need maprender instead of mapcanvas // since maprender does not require a qui @@ -144,10 +144,10 @@ void TestQgsGradients::gradientSymbol() mReport += "

      Gradient symbol renderer test

      \n"; mGradientFill->setColor( QColor( "red" ) ); mGradientFill->setColor2( QColor( "blue" ) ); - mGradientFill->setGradientType( QgsGradientFillSymbolLayerV2::Linear ); - mGradientFill->setGradientColorType( QgsGradientFillSymbolLayerV2::SimpleTwoColor ); - mGradientFill->setCoordinateMode( QgsGradientFillSymbolLayerV2::Feature ); - mGradientFill->setGradientSpread( QgsGradientFillSymbolLayerV2::Pad ); + mGradientFill->setGradientType( QgsGradientFillSymbolLayer::Linear ); + mGradientFill->setGradientColorType( QgsGradientFillSymbolLayer::SimpleTwoColor ); + mGradientFill->setCoordinateMode( QgsGradientFillSymbolLayer::Feature ); + mGradientFill->setGradientSpread( QgsGradientFillSymbolLayer::Pad ); mGradientFill->setReferencePoint1( QPointF( 0, 0 ) ); mGradientFill->setReferencePoint2( QPointF( 1, 1 ) ); QVERIFY( imageCheck( "gradient" ) ); @@ -165,41 +165,41 @@ void TestQgsGradients::gradientSymbolColors() void TestQgsGradients::gradientSymbolRamp() { - QgsVectorGradientColorRampV2* gradientRamp = new QgsVectorGradientColorRampV2( QColor( Qt::red ), QColor( Qt::blue ) ); + QgsVectorGradientColorRamp* gradientRamp = new QgsVectorGradientColorRamp( QColor( Qt::red ), QColor( Qt::blue ) ); QgsGradientStopsList stops; stops.append( QgsGradientStop( 0.5, QColor( Qt::white ) ) ); gradientRamp->setStops( stops ); mGradientFill->setColorRamp( gradientRamp ); - mGradientFill->setGradientColorType( QgsGradientFillSymbolLayerV2::ColorRamp ); + mGradientFill->setGradientColorType( QgsGradientFillSymbolLayer::ColorRamp ); QVERIFY( imageCheck( "gradient_ramp" ) ); - mGradientFill->setGradientColorType( QgsGradientFillSymbolLayerV2::SimpleTwoColor ); + mGradientFill->setGradientColorType( QgsGradientFillSymbolLayer::SimpleTwoColor ); } void TestQgsGradients::gradientSymbolRadial() { mReport += "

      Gradient symbol renderer radial test

      \n"; - mGradientFill->setGradientType( QgsGradientFillSymbolLayerV2::Radial ); + mGradientFill->setGradientType( QgsGradientFillSymbolLayer::Radial ); QVERIFY( imageCheck( "gradient_radial" ) ); - mGradientFill->setGradientType( QgsGradientFillSymbolLayerV2::Linear ); + mGradientFill->setGradientType( QgsGradientFillSymbolLayer::Linear ); } void TestQgsGradients::gradientSymbolConical() { mReport += "

      Gradient symbol renderer conical test

      \n"; - mGradientFill->setGradientType( QgsGradientFillSymbolLayerV2::Conical ); + mGradientFill->setGradientType( QgsGradientFillSymbolLayer::Conical ); mGradientFill->setReferencePoint1( QPointF( 0.5, 0.5 ) ); QVERIFY( imageCheck( "gradient_conical" ) ); mGradientFill->setReferencePoint1( QPointF( 0, 0 ) ); - mGradientFill->setGradientType( QgsGradientFillSymbolLayerV2::Linear ); + mGradientFill->setGradientType( QgsGradientFillSymbolLayer::Linear ); } void TestQgsGradients::gradientSymbolViewport() { mReport += "

      Gradient symbol renderer viewport test

      \n"; - mGradientFill->setCoordinateMode( QgsGradientFillSymbolLayerV2::Viewport ); + mGradientFill->setCoordinateMode( QgsGradientFillSymbolLayer::Viewport ); QVERIFY( imageCheck( "gradient_viewport" ) ); - mGradientFill->setCoordinateMode( QgsGradientFillSymbolLayerV2::Feature ); + mGradientFill->setCoordinateMode( QgsGradientFillSymbolLayer::Feature ); } void TestQgsGradients::gradientSymbolReferencePoints() @@ -227,9 +227,9 @@ void TestQgsGradients::gradientSymbolReflectSpread() { mReport += "

      Gradient symbol renderer reflect spread test

      \n"; mGradientFill->setReferencePoint2( QPointF( 0.5, 0.5 ) ); - mGradientFill->setGradientSpread( QgsGradientFillSymbolLayerV2::Reflect ); + mGradientFill->setGradientSpread( QgsGradientFillSymbolLayer::Reflect ); QVERIFY( imageCheck( "gradient_reflect" ) ); - mGradientFill->setGradientSpread( QgsGradientFillSymbolLayerV2::Pad ); + mGradientFill->setGradientSpread( QgsGradientFillSymbolLayer::Pad ); mGradientFill->setReferencePoint2( QPointF( 1, 1 ) ); } @@ -237,9 +237,9 @@ void TestQgsGradients::gradientSymbolRepeatSpread() { mReport += "

      Gradient symbol renderer repeat spread test

      \n"; mGradientFill->setReferencePoint2( QPointF( 0.5, 0.5 ) ); - mGradientFill->setGradientSpread( QgsGradientFillSymbolLayerV2::Repeat ); + mGradientFill->setGradientSpread( QgsGradientFillSymbolLayer::Repeat ); QVERIFY( imageCheck( "gradient_repeat" ) ); - mGradientFill->setGradientSpread( QgsGradientFillSymbolLayerV2::Pad ); + mGradientFill->setGradientSpread( QgsGradientFillSymbolLayer::Pad ); mGradientFill->setReferencePoint2( QPointF( 1, 1 ) ); } diff --git a/tests/src/core/testqgsgraduatedsymbolrenderer.cpp b/tests/src/core/testqgsgraduatedsymbolrenderer.cpp index 1a3f76c6087..123d1c9fdc7 100644 --- a/tests/src/core/testqgsgraduatedsymbolrenderer.cpp +++ b/tests/src/core/testqgsgraduatedsymbolrenderer.cpp @@ -19,7 +19,7 @@ #include #include -#include "qgsgraduatedsymbolrendererv2.h" +#include "qgsgraduatedsymbolrenderer.h" class TestQgsGraduatedSymbolRenderer: public QObject { @@ -59,12 +59,12 @@ void TestQgsGraduatedSymbolRenderer::cleanup() void TestQgsGraduatedSymbolRenderer::rangesOverlap() { - QgsGraduatedSymbolRendererV2 renderer; + QgsGraduatedSymbolRenderer renderer; //test with no ranges QVERIFY( !renderer.rangesOverlap() ); //test with inverted range - QgsRendererRangeV2 inverted; + QgsRendererRange inverted; inverted.setLowerValue( 3.1 ); inverted.setUpperValue( 1.2 ); renderer.addClass( inverted ); @@ -72,13 +72,13 @@ void TestQgsGraduatedSymbolRenderer::rangesOverlap() renderer.deleteAllClasses(); //test non-overlapping ranges - QgsRendererRangeV2 range1; + QgsRendererRange range1; range1.setLowerValue( 1.1 ); range1.setUpperValue( 3.2 ); - QgsRendererRangeV2 range2; + QgsRendererRange range2; range2.setLowerValue( 6.4 ); range2.setUpperValue( 7.2 ); - QgsRendererRangeV2 range3; + QgsRendererRange range3; range3.setLowerValue( 3.2 ); range3.setUpperValue( 6.4 ); @@ -89,7 +89,7 @@ void TestQgsGraduatedSymbolRenderer::rangesOverlap() QVERIFY( !renderer.rangesOverlap() ); //add overlapping class - QgsRendererRangeV2 range4; + QgsRendererRange range4; range4.setLowerValue( 7.0 ); range4.setUpperValue( 8.4 ); renderer.addClass( range4 ); @@ -99,12 +99,12 @@ void TestQgsGraduatedSymbolRenderer::rangesOverlap() void TestQgsGraduatedSymbolRenderer::rangesHaveGaps() { - QgsGraduatedSymbolRendererV2 renderer; + QgsGraduatedSymbolRenderer renderer; //test with no ranges QVERIFY( !renderer.rangesHaveGaps() ); //test with inverted range - QgsRendererRangeV2 inverted; + QgsRendererRange inverted; inverted.setLowerValue( 3.1 ); inverted.setUpperValue( 1.2 ); renderer.addClass( inverted ); @@ -112,13 +112,13 @@ void TestQgsGraduatedSymbolRenderer::rangesHaveGaps() renderer.deleteAllClasses(); //test ranges without gaps ranges - QgsRendererRangeV2 range1; + QgsRendererRange range1; range1.setLowerValue( 1.1 ); range1.setUpperValue( 3.2 ); - QgsRendererRangeV2 range2; + QgsRendererRange range2; range2.setLowerValue( 6.4 ); range2.setUpperValue( 7.2 ); - QgsRendererRangeV2 range3; + QgsRendererRange range3; range3.setLowerValue( 3.2 ); range3.setUpperValue( 6.4 ); @@ -129,7 +129,7 @@ void TestQgsGraduatedSymbolRenderer::rangesHaveGaps() QVERIFY( !renderer.rangesHaveGaps() ); //add gaps in ranges - QgsRendererRangeV2 range4; + QgsRendererRange range4; range4.setLowerValue( 8.0 ); range4.setUpperValue( 8.4 ); renderer.addClass( range4 ); diff --git a/tests/src/core/testqgsimageoperation.cpp b/tests/src/core/testqgsimageoperation.cpp index a38c35ff6e4..86aeb31fe44 100644 --- a/tests/src/core/testqgsimageoperation.cpp +++ b/tests/src/core/testqgsimageoperation.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include "qgsimageoperation.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include #include #include "qgsrenderchecker.h" @@ -286,7 +286,7 @@ void TestQgsImageOperation::overlayColor() void TestQgsImageOperation::distanceTransformMaxDist() { QImage image( mTransparentSampleImage ); - QgsVectorGradientColorRampV2 ramp; + QgsVectorGradientColorRamp ramp; QgsImageOperation::DistanceTransformProperties props; props.useMaxDistance = true; props.ramp = &ramp; @@ -301,7 +301,7 @@ void TestQgsImageOperation::distanceTransformMaxDist() void TestQgsImageOperation::distanceTransformSetSpread() { QImage image( mTransparentSampleImage ); - QgsVectorGradientColorRampV2 ramp; + QgsVectorGradientColorRamp ramp; QgsImageOperation::DistanceTransformProperties props; props.useMaxDistance = false; props.spread = 10; @@ -317,7 +317,7 @@ void TestQgsImageOperation::distanceTransformSetSpread() void TestQgsImageOperation::distanceTransformInterior() { QImage image( mTransparentSampleImage ); - QgsVectorGradientColorRampV2 ramp; + QgsVectorGradientColorRamp ramp; QgsImageOperation::DistanceTransformProperties props; props.useMaxDistance = true; props.ramp = &ramp; @@ -344,7 +344,7 @@ void TestQgsImageOperation::distanceTransformMisc() //zero spread QImage image2( mSampleImage ); QgsImageOperation::DistanceTransformProperties props2; - QgsVectorGradientColorRampV2 ramp; + QgsVectorGradientColorRamp ramp; props2.useMaxDistance = false; props2.spread = 0; props2.ramp = &ramp; diff --git a/tests/src/core/testqgslabelingenginev2.cpp b/tests/src/core/testqgslabelingengine.cpp similarity index 91% rename from tests/src/core/testqgslabelingenginev2.cpp rename to tests/src/core/testqgslabelingengine.cpp index 6966ef0e7db..8a833c31188 100644 --- a/tests/src/core/testqgslabelingenginev2.cpp +++ b/tests/src/core/testqgslabelingengine.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - testqgslabelingenginev2.cpp + testqgslabelingengine.cpp -------------------------------------- Date : September 2015 Copyright : (C) 2015 by Martin Dobias @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include @@ -27,11 +27,11 @@ #include "qgsrenderchecker.h" #include "qgsfontutils.h" -class TestQgsLabelingEngineV2 : public QObject +class TestQgsLabelingEngine : public QObject { Q_OBJECT public: - TestQgsLabelingEngineV2() : vl( 0 ) {} + TestQgsLabelingEngine() : vl( 0 ) {} private slots: void initTestCase(); @@ -53,9 +53,9 @@ class TestQgsLabelingEngineV2 : public QObject bool imageCheck( const QString& testName, QImage &image, int mismatchCount ); }; -void TestQgsLabelingEngineV2::initTestCase() +void TestQgsLabelingEngine::initTestCase() { - mReport += "

      Labeling Engine V2 Tests

      \n"; + mReport += "

      Labeling Engine Tests

      \n"; QgsApplication::init(); QgsApplication::initQgis(); @@ -63,7 +63,7 @@ void TestQgsLabelingEngineV2::initTestCase() QgsFontUtils::loadStandardTestFonts( QStringList() << "Bold" ); } -void TestQgsLabelingEngineV2::cleanupTestCase() +void TestQgsLabelingEngine::cleanupTestCase() { QgsApplication::exitQgis(); QString myReportFile = QDir::tempPath() + "/qgistest.html"; @@ -76,7 +76,7 @@ void TestQgsLabelingEngineV2::cleanupTestCase() } } -void TestQgsLabelingEngineV2::init() +void TestQgsLabelingEngine::init() { QString filename = QString( TEST_DATA_DIR ) + "/points.shp"; vl = new QgsVectorLayer( filename, "points", "ogr" ); @@ -84,13 +84,13 @@ void TestQgsLabelingEngineV2::init() QgsMapLayerRegistry::instance()->addMapLayer( vl ); } -void TestQgsLabelingEngineV2::cleanup() +void TestQgsLabelingEngine::cleanup() { QgsMapLayerRegistry::instance()->removeMapLayer( vl->id() ); vl = 0; } -void TestQgsLabelingEngineV2::setDefaultLabelParams( QgsVectorLayer* layer ) +void TestQgsLabelingEngine::setDefaultLabelParams( QgsVectorLayer* layer ) { layer->setCustomProperty( "labeling/fontFamily", QgsFontUtils::getStandardTestFont( "Bold" ).family() ); layer->setCustomProperty( "labeling/namedStyle", "Bold" ); @@ -99,7 +99,7 @@ void TestQgsLabelingEngineV2::setDefaultLabelParams( QgsVectorLayer* layer ) layer->setCustomProperty( "labeling/textColorB", "200" ); } -void TestQgsLabelingEngineV2::testBasic() +void TestQgsLabelingEngine::testBasic() { QSize size( 640, 480 ); QgsMapSettings mapSettings; @@ -125,10 +125,10 @@ void TestQgsLabelingEngineV2::testBasic() vl->setCustomProperty( "labeling/fieldName", "Class" ); setDefaultLabelParams( vl ); - QgsLabelingEngineV2 engine; + QgsLabelingEngine engine; engine.setMapSettings( mapSettings ); engine.addProvider( new QgsVectorLayerLabelProvider( vl, QString() ) ); - //engine.setFlags( QgsLabelingEngineV2::RenderOutlineLabels | QgsLabelingEngineV2::DrawLabelRectOnly ); + //engine.setFlags( QgsLabelingEngine::RenderOutlineLabels | QgsLabelingEngine::DrawLabelRectOnly ); engine.run( context ); p.end(); @@ -148,7 +148,7 @@ void TestQgsLabelingEngineV2::testBasic() } -void TestQgsLabelingEngineV2::testDiagrams() +void TestQgsLabelingEngine::testDiagrams() { QSize size( 640, 480 ); QgsMapSettings mapSettings; @@ -173,7 +173,7 @@ void TestQgsLabelingEngineV2::testDiagrams() vl->loadNamedStyle( QString( TEST_DATA_DIR ) + "/points_diagrams.qml", res ); Q_ASSERT( res ); - QgsLabelingEngineV2 engine; + QgsLabelingEngine engine; engine.setMapSettings( mapSettings ); engine.addProvider( new QgsVectorLayerDiagramProvider( vl ) ); engine.run( context ); @@ -192,7 +192,7 @@ void TestQgsLabelingEngineV2::testDiagrams() } -void TestQgsLabelingEngineV2::testRuleBased() +void TestQgsLabelingEngine::testRuleBased() { QSize size( 640, 480 ); QgsMapSettings mapSettings; @@ -264,14 +264,14 @@ void TestQgsLabelingEngineV2::testRuleBased() QgsRenderContext context = QgsRenderContext::fromMapSettings( mapSettings ); context.setPainter( &p ); - QgsLabelingEngineV2 engine; + QgsLabelingEngine engine; engine.setMapSettings( mapSettings ); engine.addProvider( new QgsRuleBasedLabelProvider( , vl ) ); engine.run( context ); #endif } -void TestQgsLabelingEngineV2::zOrder() +void TestQgsLabelingEngine::zOrder() { QSize size( 640, 480 ); QgsMapSettings mapSettings; @@ -303,10 +303,10 @@ void TestQgsLabelingEngineV2::zOrder() pls1.setDataDefinedProperty( QgsPalLayerSettings::Size, true, true, "case when \"Class\"='Jet' then 100 when \"Class\"='B52' then 30 else 50 end", QString() ); QgsVectorLayerLabelProvider* provider1 = new QgsVectorLayerLabelProvider( vl, QString(), true, &pls1 ); - QgsLabelingEngineV2 engine; + QgsLabelingEngine engine; engine.setMapSettings( mapSettings ); engine.addProvider( provider1 ); - //engine.setFlags( QgsLabelingEngineV2::RenderOutlineLabels | QgsLabelingEngineV2::DrawLabelRectOnly ); + //engine.setFlags( QgsLabelingEngine::RenderOutlineLabels | QgsLabelingEngine::DrawLabelRectOnly ); engine.run( context ); p.end(); engine.removeProvider( provider1 ); @@ -386,7 +386,7 @@ void TestQgsLabelingEngineV2::zOrder() QgsMapLayerRegistry::instance()->removeMapLayer( vl2 ); } -void TestQgsLabelingEngineV2::testEncodeDecodePositionOrder() +void TestQgsLabelingEngine::testEncodeDecodePositionOrder() { //create an ordered position list QVector< QgsPalLayerSettings::PredefinedPointPosition > original; @@ -413,7 +413,7 @@ void TestQgsLabelingEngineV2::testEncodeDecodePositionOrder() QCOMPARE( decoded, expected ); } -bool TestQgsLabelingEngineV2::imageCheck( const QString& testName, QImage &image, int mismatchCount ) +bool TestQgsLabelingEngine::imageCheck( const QString& testName, QImage &image, int mismatchCount ) { //draw background QImage imageWithBackground( image.width(), image.height(), QImage::Format_RGB32 ); @@ -427,7 +427,7 @@ bool TestQgsLabelingEngineV2::imageCheck( const QString& testName, QImage &image QString fileName = tempDir + testName + ".png"; imageWithBackground.save( fileName, "PNG" ); QgsRenderChecker checker; - checker.setControlPathPrefix( "labelingenginev2" ); + checker.setControlPathPrefix( "labelingengine" ); checker.setControlName( "expected_" + testName ); checker.setRenderedImage( fileName ); checker.setColorTolerance( 2 ); @@ -436,5 +436,5 @@ bool TestQgsLabelingEngineV2::imageCheck( const QString& testName, QImage &image return resultFlag; } -QTEST_MAIN( TestQgsLabelingEngineV2 ) -#include "testqgslabelingenginev2.moc" +QTEST_MAIN( TestQgsLabelingEngine ) +#include "testqgslabelingengine.moc" diff --git a/tests/src/core/testqgslayertree.cpp b/tests/src/core/testqgslayertree.cpp index bedfa78c027..bf72d93e23b 100644 --- a/tests/src/core/testqgslayertree.cpp +++ b/tests/src/core/testqgslayertree.cpp @@ -21,9 +21,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -49,7 +49,7 @@ class TestQgsLayerTree : public QObject QgsLayerTreeGroup* mRoot; - void testRendererLegend( QgsFeatureRendererV2* renderer ); + void testRendererLegend( QgsFeatureRenderer* renderer ); Qt::CheckState childState( int childIndex ) { @@ -235,13 +235,13 @@ void TestQgsLayerTree::testShowHideAllSymbolNodes() QgsMapLayerRegistry::instance()->addMapLayers( QList() << vl ); //create a categorized renderer for layer - QgsCategorizedSymbolRendererV2* renderer = new QgsCategorizedSymbolRendererV2(); + QgsCategorizedSymbolRenderer* renderer = new QgsCategorizedSymbolRenderer(); renderer->setClassAttribute( "col1" ); renderer->setSourceSymbol( QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ) ); - renderer->addCategory( QgsRendererCategoryV2( "a", QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ), "a" ) ); - renderer->addCategory( QgsRendererCategoryV2( "b", QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ), "b" ) ); - renderer->addCategory( QgsRendererCategoryV2( "c", QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ), "c" ) ); - vl->setRendererV2( renderer ); + renderer->addCategory( QgsRendererCategory( "a", QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ), "a" ) ); + renderer->addCategory( QgsRendererCategory( "b", QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ), "b" ) ); + renderer->addCategory( QgsRendererCategory( "c", QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ), "c" ) ); + vl->setRenderer( renderer ); //create legend with symbology nodes for categorized renderer QgsLayerTreeGroup* root = new QgsLayerTreeGroup(); @@ -285,13 +285,13 @@ void TestQgsLayerTree::testFindLegendNode() QgsMapLayerRegistry::instance()->addMapLayers( QList() << vl ); //create a categorized renderer for layer - QgsCategorizedSymbolRendererV2* renderer = new QgsCategorizedSymbolRendererV2(); + QgsCategorizedSymbolRenderer* renderer = new QgsCategorizedSymbolRenderer(); renderer->setClassAttribute( "col1" ); renderer->setSourceSymbol( QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ) ); - renderer->addCategory( QgsRendererCategoryV2( "a", QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ), "a" ) ); - renderer->addCategory( QgsRendererCategoryV2( "b", QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ), "b" ) ); - renderer->addCategory( QgsRendererCategoryV2( "c", QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ), "c" ) ); - vl->setRendererV2( renderer ); + renderer->addCategory( QgsRendererCategory( "a", QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ), "a" ) ); + renderer->addCategory( QgsRendererCategory( "b", QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ), "b" ) ); + renderer->addCategory( QgsRendererCategory( "c", QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ), "c" ) ); + vl->setRenderer( renderer ); //create legend with symbology nodes for categorized renderer QgsLayerTreeGroup* root = new QgsLayerTreeGroup(); @@ -304,7 +304,7 @@ void TestQgsLayerTree::testFindLegendNode() QVERIFY( !m->findLegendNode( QString( "vl" ), QString( "rule" ) ) ); QgsLegendSymbolListV2 symbolList = renderer->legendSymbolItemsV2(); - Q_FOREACH ( const QgsLegendSymbolItemV2& symbol, symbolList ) + Q_FOREACH ( const QgsLegendSymbolItem& symbol, symbolList ) { QgsLayerTreeModelLegendNode* found = m->findLegendNode( vl->id(), symbol.ruleKey() ); QVERIFY( found ); @@ -321,51 +321,51 @@ void TestQgsLayerTree::testFindLegendNode() void TestQgsLayerTree::testLegendSymbolCategorized() { //test retrieving/setting a categorized renderer's symbol through the legend node - QgsCategorizedSymbolRendererV2* renderer = new QgsCategorizedSymbolRendererV2(); + QgsCategorizedSymbolRenderer* renderer = new QgsCategorizedSymbolRenderer(); renderer->setClassAttribute( "col1" ); renderer->setSourceSymbol( QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ) ); QgsStringMap props; props.insert( "color", "#ff0000" ); - renderer->addCategory( QgsRendererCategoryV2( "a", QgsMarkerSymbolV2::createSimple( props ), "a" ) ); + renderer->addCategory( QgsRendererCategory( "a", QgsMarkerSymbol::createSimple( props ), "a" ) ); props.insert( "color", "#00ff00" ); - renderer->addCategory( QgsRendererCategoryV2( "b", QgsMarkerSymbolV2::createSimple( props ), "b" ) ); + renderer->addCategory( QgsRendererCategory( "b", QgsMarkerSymbol::createSimple( props ), "b" ) ); props.insert( "color", "#0000ff" ); - renderer->addCategory( QgsRendererCategoryV2( "c", QgsMarkerSymbolV2::createSimple( props ), "c" ) ); + renderer->addCategory( QgsRendererCategory( "c", QgsMarkerSymbol::createSimple( props ), "c" ) ); testRendererLegend( renderer ); } void TestQgsLayerTree::testLegendSymbolGraduated() { //test retrieving/setting a graduated renderer's symbol through the legend node - QgsGraduatedSymbolRendererV2* renderer = new QgsGraduatedSymbolRendererV2(); + QgsGraduatedSymbolRenderer* renderer = new QgsGraduatedSymbolRenderer(); renderer->setClassAttribute( "col1" ); renderer->setSourceSymbol( QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ) ); QgsStringMap props; props.insert( "color", "#ff0000" ); - renderer->addClass( QgsRendererRangeV2( 1, 2, QgsMarkerSymbolV2::createSimple( props ), "a" ) ); + renderer->addClass( QgsRendererRange( 1, 2, QgsMarkerSymbol::createSimple( props ), "a" ) ); props.insert( "color", "#00ff00" ); - renderer->addClass( QgsRendererRangeV2( 2, 3, QgsMarkerSymbolV2::createSimple( props ), "b" ) ); + renderer->addClass( QgsRendererRange( 2, 3, QgsMarkerSymbol::createSimple( props ), "b" ) ); props.insert( "color", "#0000ff" ); - renderer->addClass( QgsRendererRangeV2( 3, 4, QgsMarkerSymbolV2::createSimple( props ), "c" ) ); + renderer->addClass( QgsRendererRange( 3, 4, QgsMarkerSymbol::createSimple( props ), "c" ) ); testRendererLegend( renderer ); } void TestQgsLayerTree::testLegendSymbolRuleBased() { //test retrieving/setting a rule based renderer's symbol through the legend node - QgsRuleBasedRendererV2::Rule* root = new QgsRuleBasedRendererV2::Rule( 0 ); + QgsRuleBasedRenderer::Rule* root = new QgsRuleBasedRenderer::Rule( 0 ); QgsStringMap props; props.insert( "color", "#ff0000" ); - root->appendChild( new QgsRuleBasedRendererV2::Rule( QgsMarkerSymbolV2::createSimple( props ), 0, 0, "\"col1\"=1" ) ); + root->appendChild( new QgsRuleBasedRenderer::Rule( QgsMarkerSymbol::createSimple( props ), 0, 0, "\"col1\"=1" ) ); props.insert( "color", "#00ff00" ); - root->appendChild( new QgsRuleBasedRendererV2::Rule( QgsMarkerSymbolV2::createSimple( props ), 0, 0, "\"col1\"=2" ) ); + root->appendChild( new QgsRuleBasedRenderer::Rule( QgsMarkerSymbol::createSimple( props ), 0, 0, "\"col1\"=2" ) ); props.insert( "color", "#0000ff" ); - root->appendChild( new QgsRuleBasedRendererV2::Rule( QgsMarkerSymbolV2::createSimple( props ), 0, 0, "ELSE" ) ); - QgsRuleBasedRendererV2* renderer = new QgsRuleBasedRendererV2( root ); + root->appendChild( new QgsRuleBasedRenderer::Rule( QgsMarkerSymbol::createSimple( props ), 0, 0, "ELSE" ) ); + QgsRuleBasedRenderer* renderer = new QgsRuleBasedRenderer( root ); testRendererLegend( renderer ); } -void TestQgsLayerTree::testRendererLegend( QgsFeatureRendererV2* renderer ) +void TestQgsLayerTree::testRendererLegend( QgsFeatureRenderer* renderer ) { // runs renderer legend through a bunch of legend symbol tests @@ -377,7 +377,7 @@ void TestQgsLayerTree::testRendererLegend( QgsFeatureRendererV2* renderer ) QVERIFY( vl->isValid() ); QgsMapLayerRegistry::instance()->addMapLayers( QList() << vl ); - vl->setRendererV2( renderer ); + vl->setRenderer( renderer ); //create legend with symbology nodes for renderer QgsLayerTreeGroup* root = new QgsLayerTreeGroup(); @@ -388,7 +388,7 @@ void TestQgsLayerTree::testRendererLegend( QgsFeatureRendererV2* renderer ) //test initial symbol QgsLegendSymbolListV2 symbolList = renderer->legendSymbolItemsV2(); - Q_FOREACH ( const QgsLegendSymbolItemV2& symbol, symbolList ) + Q_FOREACH ( const QgsLegendSymbolItem& symbol, symbolList ) { QgsSymbolLegendNode* symbolNode = dynamic_cast< QgsSymbolLegendNode* >( m->findLegendNode( vl->id(), symbol.ruleKey() ) ); QVERIFY( symbolNode ); @@ -408,7 +408,7 @@ void TestQgsLayerTree::testRendererLegend( QgsFeatureRendererV2* renderer ) //another test - check directly setting symbol at renderer QgsStringMap props; props.insert( "color", "#00ffff" ); - renderer->setLegendSymbolItem( symbolList.at( 2 ).ruleKey(), QgsMarkerSymbolV2::createSimple( props ) ); + renderer->setLegendSymbolItem( symbolList.at( 2 ).ruleKey(), QgsMarkerSymbol::createSimple( props ) ); m->refreshLayerLegend( n ); symbolNode = dynamic_cast< QgsSymbolLegendNode* >( m->findLegendNode( vl->id(), symbolList.at( 2 ).ruleKey() ) ); QVERIFY( symbolNode ); diff --git a/tests/src/core/testqgslegendrenderer.cpp b/tests/src/core/testqgslegendrenderer.cpp index 20dfd142ead..d968fdef17f 100644 --- a/tests/src/core/testqgslegendrenderer.cpp +++ b/tests/src/core/testqgslegendrenderer.cpp @@ -17,7 +17,7 @@ #include #include "qgsapplication.h" -#include "qgscategorizedsymbolrendererv2.h" +#include "qgscategorizedsymbolrenderer.h" #include "qgscomposerlegenditem.h" #include "qgsfontutils.h" #include "qgslayertree.h" @@ -29,11 +29,11 @@ #include "qgslegendrenderer.h" #include "qgsrasterlayer.h" #include "qgsrenderchecker.h" -#include "qgssinglesymbolrendererv2.h" +#include "qgssinglesymbolrenderer.h" #include "qgsvectorlayer.h" #include "qgsvectordataprovider.h" #include "qgsgeometry.h" -#include "qgsdiagramrendererv2.h" +#include "qgsdiagramrenderer.h" #include "diagram/qgspiediagram.h" static QString _fileNameForTest( const QString& testName ) @@ -161,16 +161,16 @@ void TestQgsLegendRenderer::init() mVL1 = new QgsVectorLayer( "LineString", "Line Layer", "memory" ); QgsMapLayerRegistry::instance()->addMapLayer( mVL1 ); - QgsLineSymbolV2* sym1 = new QgsLineSymbolV2(); + QgsLineSymbol* sym1 = new QgsLineSymbol(); sym1->setColor( Qt::magenta ); - mVL1->setRendererV2( new QgsSingleSymbolRendererV2( sym1 ) ); + mVL1->setRenderer( new QgsSingleSymbolRenderer( sym1 ) ); mVL2 = new QgsVectorLayer( "Polygon", "Polygon Layer", "memory" ); QgsMapLayerRegistry::instance()->addMapLayer( mVL2 ); - QgsFillSymbolV2* sym2 = new QgsFillSymbolV2(); + QgsFillSymbol* sym2 = new QgsFillSymbol(); sym2->setColor( Qt::cyan ); - mVL2->setRendererV2( new QgsSingleSymbolRendererV2( sym2 ) ); + mVL2->setRenderer( new QgsSingleSymbolRenderer( sym2 ) ); mVL3 = new QgsVectorLayer( "Point", "Point Layer", "memory" ); { @@ -207,17 +207,17 @@ void TestQgsLegendRenderer::init() QgsMapLayerRegistry::instance()->addMapLayer( mRL ); QgsCategoryList cats; - QgsMarkerSymbolV2* sym3_1 = new QgsMarkerSymbolV2(); + QgsMarkerSymbol* sym3_1 = new QgsMarkerSymbol(); sym3_1->setColor( Qt::red ); - cats << QgsRendererCategoryV2( 1, sym3_1, "Red" ); - QgsMarkerSymbolV2* sym3_2 = new QgsMarkerSymbolV2(); + cats << QgsRendererCategory( 1, sym3_1, "Red" ); + QgsMarkerSymbol* sym3_2 = new QgsMarkerSymbol(); sym3_2->setColor( Qt::green ); - cats << QgsRendererCategoryV2( 2, sym3_2, "Green" ); - QgsMarkerSymbolV2* sym3_3 = new QgsMarkerSymbolV2(); + cats << QgsRendererCategory( 2, sym3_2, "Green" ); + QgsMarkerSymbol* sym3_3 = new QgsMarkerSymbol(); sym3_3->setColor( Qt::blue ); - cats << QgsRendererCategoryV2( 3, sym3_3, "Blue" ); - QgsCategorizedSymbolRendererV2* r3 = new QgsCategorizedSymbolRendererV2( "test_attr", cats ); - mVL3->setRendererV2( r3 ); + cats << QgsRendererCategory( 3, sym3_3, "Blue" ); + QgsCategorizedSymbolRenderer* r3 = new QgsCategorizedSymbolRenderer( "test_attr", cats ); + mVL3->setRenderer( r3 ); mRoot = new QgsLayerTreeGroup(); QgsLayerTreeGroup* grp1 = mRoot->addGroup( "Line + Polygon" ); @@ -282,14 +282,14 @@ void TestQgsLegendRenderer::testBigMarker() { QString testName = "legend_big_marker"; - QgsMarkerSymbolV2* sym = new QgsMarkerSymbolV2(); + QgsMarkerSymbol* sym = new QgsMarkerSymbol(); sym->setColor( Qt::red ); sym->setSize( sym->size() * 6 ); - QgsCategorizedSymbolRendererV2* catRenderer = dynamic_cast( mVL3->rendererV2() ); + QgsCategorizedSymbolRenderer* catRenderer = dynamic_cast( mVL3->renderer() ); QVERIFY( catRenderer ); catRenderer->updateCategorySymbol( 0, sym ); - //dynamic_cast( mVL3->rendererV2() )->updateCategoryLabel( 2, "This is a long symbol label" ); + //dynamic_cast( mVL3->renderer() )->updateCategoryLabel( 2, "This is a long symbol label" ); QgsLayerTreeModel legendModel( mRoot ); @@ -303,21 +303,21 @@ void TestQgsLegendRenderer::testMapUnits() { QString testName = "legend_mapunits"; - QgsMarkerSymbolV2* sym = new QgsMarkerSymbolV2(); + QgsMarkerSymbol* sym = new QgsMarkerSymbol(); sym->setColor( Qt::red ); sym->setSize( 100 ); sym->setSizeUnit( QgsUnitTypes::RenderMapUnits ); - QgsCategorizedSymbolRendererV2* catRenderer = dynamic_cast( mVL3->rendererV2() ); + QgsCategorizedSymbolRenderer* catRenderer = dynamic_cast( mVL3->renderer() ); QVERIFY( catRenderer ); catRenderer->updateCategorySymbol( 0, sym ); - sym = new QgsMarkerSymbolV2(); + sym = new QgsMarkerSymbol(); sym->setColor( Qt::green ); sym->setSize( 300 ); sym->setSizeUnit( QgsUnitTypes::RenderMapUnits ); catRenderer->updateCategorySymbol( 1, sym ); - sym = new QgsMarkerSymbolV2(); + sym = new QgsMarkerSymbol(); sym->setColor( Qt::blue ); sym->setSize( 5 ); sym->setSizeUnit( QgsUnitTypes::RenderMillimeters ); @@ -339,7 +339,7 @@ void TestQgsLegendRenderer::testLongSymbolText() { QString testName = "legend_long_symbol_text"; - QgsCategorizedSymbolRendererV2* catRenderer = dynamic_cast( mVL3->rendererV2() ); + QgsCategorizedSymbolRenderer* catRenderer = dynamic_cast( mVL3->renderer() ); QVERIFY( catRenderer ); catRenderer->updateCategoryLabel( 1, "This is\nthree lines\nlong label" ); @@ -424,17 +424,17 @@ void TestQgsLegendRenderer::testFilterByMapSameSymbol() //setup categorized renderer with duplicate symbols QgsCategoryList cats; - QgsMarkerSymbolV2* sym4_1 = new QgsMarkerSymbolV2(); + QgsMarkerSymbol* sym4_1 = new QgsMarkerSymbol(); sym4_1->setColor( Qt::red ); - cats << QgsRendererCategoryV2( 1, sym4_1, "Red1" ); - QgsMarkerSymbolV2* sym4_2 = new QgsMarkerSymbolV2(); + cats << QgsRendererCategory( 1, sym4_1, "Red1" ); + QgsMarkerSymbol* sym4_2 = new QgsMarkerSymbol(); sym4_2->setColor( Qt::red ); - cats << QgsRendererCategoryV2( 2, sym4_2, "Red2" ); - QgsMarkerSymbolV2* sym4_3 = new QgsMarkerSymbolV2(); + cats << QgsRendererCategory( 2, sym4_2, "Red2" ); + QgsMarkerSymbol* sym4_3 = new QgsMarkerSymbol(); sym4_3->setColor( Qt::red ); - cats << QgsRendererCategoryV2( 3, sym4_3, "Red3" ); - QgsCategorizedSymbolRendererV2* r4 = new QgsCategorizedSymbolRendererV2( "test_attr", cats ); - vl4->setRendererV2( r4 ); + cats << QgsRendererCategory( 3, sym4_3, "Red3" ); + QgsCategorizedSymbolRenderer* r4 = new QgsCategorizedSymbolRenderer( "test_attr", cats ); + vl4->setRenderer( r4 ); QString testName = "legend_filter_by_map_dupe"; diff --git a/tests/src/core/testqgslinefillsymbol.cpp b/tests/src/core/testqgslinefillsymbol.cpp index 76bc663032e..58ce6d5298e 100644 --- a/tests/src/core/testqgslinefillsymbol.cpp +++ b/tests/src/core/testqgslinefillsymbol.cpp @@ -28,9 +28,9 @@ #include #include #include -#include -#include -#include "qgslinesymbollayerv2.h" +#include +#include +#include "qgslinesymbollayer.h" #include "qgsdatadefined.h" //qgis test includes @@ -68,8 +68,8 @@ class TestQgsLineFillSymbol : public QObject QgsMapSettings mMapSettings; QgsVectorLayer * mpPolysLayer; QgsLinePatternFillSymbolLayer* mLineFill; - QgsFillSymbolV2* mFillSymbol; - QgsSingleSymbolRendererV2* mSymbolRenderer; + QgsFillSymbol* mFillSymbol; + QgsSingleSymbolRenderer* mSymbolRenderer; QString mTestDataDir; QString mReport; }; @@ -105,10 +105,10 @@ void TestQgsLineFillSymbol::initTestCase() //setup gradient fill mLineFill = new QgsLinePatternFillSymbolLayer(); - mFillSymbol = new QgsFillSymbolV2(); + mFillSymbol = new QgsFillSymbol(); mFillSymbol->changeSymbolLayer( 0, mLineFill ); - mSymbolRenderer = new QgsSingleSymbolRendererV2( mFillSymbol ); - mpPolysLayer->setRendererV2( mSymbolRenderer ); + mSymbolRenderer = new QgsSingleSymbolRenderer( mFillSymbol ); + mpPolysLayer->setRenderer( mSymbolRenderer ); // We only need maprender instead of mapcanvas // since maprender does not require a qui @@ -140,7 +140,7 @@ void TestQgsLineFillSymbol::lineFillSymbol() properties.insert( "color", "0,0,0,255" ); properties.insert( "width", "1" ); properties.insert( "capstyle", "flat" ); - QgsLineSymbolV2* lineSymbol = QgsLineSymbolV2::createSimple( properties ); + QgsLineSymbol* lineSymbol = QgsLineSymbol::createSimple( properties ); mLineFill->setSubSymbol( lineSymbol ); QVERIFY( imageCheck( "symbol_linefill" ) ); @@ -154,7 +154,7 @@ void TestQgsLineFillSymbol::dataDefinedSubSymbol() properties.insert( "color", "0,0,0,255" ); properties.insert( "width", "1" ); properties.insert( "capstyle", "flat" ); - QgsLineSymbolV2* lineSymbol = QgsLineSymbolV2::createSimple( properties ); + QgsLineSymbol* lineSymbol = QgsLineSymbol::createSimple( properties ); lineSymbol->symbolLayer( 0 )->setDataDefinedProperty( "color", new QgsDataDefined( QString( "if(\"Name\" ='Lake','#ff0000','#ff00ff')" ) ) ); mLineFill->setSubSymbol( lineSymbol ); QVERIFY( imageCheck( "datadefined_subsymbol" ) ); diff --git a/tests/src/core/testqgsmaplayerstylemanager.cpp b/tests/src/core/testqgsmaplayerstylemanager.cpp index 8089fd46801..8e8a311523b 100644 --- a/tests/src/core/testqgsmaplayerstylemanager.cpp +++ b/tests/src/core/testqgsmaplayerstylemanager.cpp @@ -19,7 +19,7 @@ #include "qgsapplication.h" #include "qgsmaplayerregistry.h" #include "qgsmaplayerstylemanager.h" -#include "qgssinglesymbolrendererv2.h" +#include "qgssinglesymbolrenderer.h" #include "qgsvectorlayer.h" @@ -82,9 +82,9 @@ void TestQgsMapLayerStyleManager::testStyle() QgsMapLayerStyle st; QCOMPARE( st.isValid(), false ); - QgsLineSymbolV2* sym1 = new QgsLineSymbolV2(); + QgsLineSymbol* sym1 = new QgsLineSymbol(); sym1->setColor( Qt::magenta ); - mVL->setRendererV2( new QgsSingleSymbolRendererV2( sym1 ) ); + mVL->setRenderer( new QgsSingleSymbolRenderer( sym1 ) ); QgsMapLayerStyle st1; st1.readFromLayer( mVL ); @@ -92,9 +92,9 @@ void TestQgsMapLayerStyleManager::testStyle() qDebug( "CNT-1: %s", st1.xmlData().toAscii().data() ); - QgsLineSymbolV2* sym2 = new QgsLineSymbolV2(); + QgsLineSymbol* sym2 = new QgsLineSymbol(); sym2->setColor( Qt::red ); - mVL->setRendererV2( new QgsSingleSymbolRendererV2( sym2 ) ); + mVL->setRenderer( new QgsSingleSymbolRenderer( sym2 ) ); QgsMapLayerStyle st2; st2.readFromLayer( mVL ); @@ -103,13 +103,13 @@ void TestQgsMapLayerStyleManager::testStyle() st1.writeToLayer( mVL ); - QgsSingleSymbolRendererV2* r1 = dynamic_cast( mVL->rendererV2() ); + QgsSingleSymbolRenderer* r1 = dynamic_cast( mVL->renderer() ); QVERIFY( r1 ); QCOMPARE( r1->symbol()->color(), QColor( Qt::magenta ) ); st2.writeToLayer( mVL ); - QgsSingleSymbolRendererV2* r2 = dynamic_cast( mVL->rendererV2() ); + QgsSingleSymbolRenderer* r2 = dynamic_cast( mVL->renderer() ); QVERIFY( r2 ); QCOMPARE( r2->symbol()->color(), QColor( Qt::red ) ); } @@ -117,7 +117,7 @@ void TestQgsMapLayerStyleManager::testStyle() void TestQgsMapLayerStyleManager::testReadWrite() { - QgsSingleSymbolRendererV2* r0 = dynamic_cast( mVL->rendererV2() ); + QgsSingleSymbolRenderer* r0 = dynamic_cast( mVL->renderer() ); QVERIFY( r0 ); r0->symbol()->setColor( Qt::red ); @@ -127,7 +127,7 @@ void TestQgsMapLayerStyleManager::testReadWrite() sm0.addStyleFromLayer( "blue" ); sm0.setCurrentStyle( "blue" ); - QgsSingleSymbolRendererV2* r1 = dynamic_cast( mVL->rendererV2() ); + QgsSingleSymbolRenderer* r1 = dynamic_cast( mVL->renderer() ); QVERIFY( r1 ); r1->symbol()->setColor( Qt::blue ); @@ -154,21 +154,21 @@ void TestQgsMapLayerStyleManager::testReadWrite() // now use the default style - the symbol should get red color sm1.setCurrentStyle( QString() ); - QgsSingleSymbolRendererV2* r2 = dynamic_cast( mVL->rendererV2() ); + QgsSingleSymbolRenderer* r2 = dynamic_cast( mVL->renderer() ); QVERIFY( r2 ); QCOMPARE( r2->symbol()->color(), QColor( Qt::red ) ); } static void _setVLColor( QgsVectorLayer* vl, const QColor& c ) { - QgsSingleSymbolRendererV2* renderer = dynamic_cast( vl->rendererV2() ); + QgsSingleSymbolRenderer* renderer = dynamic_cast( vl->renderer() ); if ( renderer ) renderer->symbol()->setColor( c ); } static QColor _getVLColor( QgsVectorLayer* vl ) { - QgsSingleSymbolRendererV2* renderer = dynamic_cast( vl->rendererV2() ); + QgsSingleSymbolRenderer* renderer = dynamic_cast( vl->renderer() ); if ( renderer ) return renderer->symbol()->color(); else diff --git a/tests/src/core/testqgsmaptopixelgeometrysimplifier.cpp b/tests/src/core/testqgsmaptopixelgeometrysimplifier.cpp index 615f5dd37ed..36394301b58 100644 --- a/tests/src/core/testqgsmaptopixelgeometrysimplifier.cpp +++ b/tests/src/core/testqgsmaptopixelgeometrysimplifier.cpp @@ -33,9 +33,9 @@ #include #include "qgsgeometryutils.h" #include "qgspointv2.h" -#include "qgslinestringv2.h" -#include "qgspolygonv2.h" -#include "qgscircularstringv2.h" +#include "qgslinestring.h" +#include "qgspolygon.h" +#include "qgscircularstring.h" #endif //qgs unit test utility class diff --git a/tests/src/core/testqgspainteffect.cpp b/tests/src/core/testqgspainteffect.cpp index c7839c955d5..f1f14678f48 100644 --- a/tests/src/core/testqgspainteffect.cpp +++ b/tests/src/core/testqgspainteffect.cpp @@ -27,17 +27,17 @@ #include "qgseffectstack.h" #include "qgsgloweffect.h" #include "qgspainteffectregistry.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgssymbollayerutils.h" #include "qgsmapsettings.h" #include "qgsvectorlayer.h" #include "qgsapplication.h" #include "qgsmaplayerregistry.h" #include "qgssymbol.h" -#include "qgssinglesymbolrendererv2.h" -#include "qgsfillsymbollayerv2.h" -#include "qgslinesymbollayerv2.h" -#include "qgsmarkersymbollayerv2.h" +#include "qgssinglesymbolrenderer.h" +#include "qgsfillsymbollayer.h" +#include "qgslinesymbollayer.h" +#include "qgsmarkersymbollayer.h" #include "qgscomposition.h" #include "qgscomposermap.h" @@ -540,7 +540,7 @@ void TestQgsPaintEffect::glow() effect->setSpreadMapUnitScale( QgsMapUnitScale( 1.0, 2.0 ) ); QCOMPARE( effect->spreadMapUnitScale().minScale, 1.0 ); QCOMPARE( effect->spreadMapUnitScale().maxScale, 2.0 ); - effect->setRamp( new QgsVectorGradientColorRampV2( QColor( 255, 0, 0 ), QColor( 0, 255, 0 ) ) ); + effect->setRamp( new QgsVectorGradientColorRamp( QColor( 255, 0, 0 ), QColor( 0, 255, 0 ) ) ); QCOMPARE( effect->ramp()->color( 0 ), QColor( 255, 0, 0 ) ); QCOMPARE( effect->ramp()->color( 1.0 ), QColor( 0, 255, 0 ) ); effect->setColorType( QgsGlowEffect::ColorRamp ); @@ -705,16 +705,16 @@ void TestQgsPaintEffect::layerEffectPolygon() QgsMapLayerRegistry::instance()->addMapLayers( QList() << polysLayer ); QgsMapSettings ms; - QgsSimpleFillSymbolLayerV2* fill = new QgsSimpleFillSymbolLayerV2; + QgsSimpleFillSymbolLayer* fill = new QgsSimpleFillSymbolLayer; fill->setColor( QColor( 255, 0, 0 ) ); QgsDropShadowEffect* effect = new QgsDropShadowEffect(); fill->setPaintEffect( effect ); - QgsFillSymbolV2* fillSymbol = new QgsFillSymbolV2(); + QgsFillSymbol* fillSymbol = new QgsFillSymbol(); fillSymbol->changeSymbolLayer( 0, fill ); - QgsSingleSymbolRendererV2* renderer = new QgsSingleSymbolRendererV2( fillSymbol ); + QgsSingleSymbolRenderer* renderer = new QgsSingleSymbolRenderer( fillSymbol ); - polysLayer->setRendererV2( renderer ); + polysLayer->setRenderer( renderer ); ms.setLayers( QStringList() << polysLayer->id() ); ms.setExtent( polysLayer->extent() ); @@ -736,17 +736,17 @@ void TestQgsPaintEffect::layerEffectLine() QgsMapLayerRegistry::instance()->addMapLayers( QList() << lineLayer ); QgsMapSettings ms; - QgsSimpleLineSymbolLayerV2* line = new QgsSimpleLineSymbolLayerV2; + QgsSimpleLineSymbolLayer* line = new QgsSimpleLineSymbolLayer; line->setColor( QColor( 255, 0, 0 ) ); line->setWidth( 1.0 ); QgsDropShadowEffect* effect = new QgsDropShadowEffect(); line->setPaintEffect( effect ); - QgsLineSymbolV2* lineSymbol = new QgsLineSymbolV2(); + QgsLineSymbol* lineSymbol = new QgsLineSymbol(); lineSymbol->changeSymbolLayer( 0, line ); - QgsSingleSymbolRendererV2* renderer = new QgsSingleSymbolRendererV2( lineSymbol ); + QgsSingleSymbolRenderer* renderer = new QgsSingleSymbolRenderer( lineSymbol ); - lineLayer->setRendererV2( renderer ); + lineLayer->setRenderer( renderer ); ms.setLayers( QStringList() << lineLayer->id() ); ms.setExtent( lineLayer->extent() ); @@ -765,16 +765,16 @@ void TestQgsPaintEffect::layerEffectMarker() QgsMapLayerRegistry::instance()->addMapLayers( QList() << pointLayer ); QgsMapSettings ms; - QgsSimpleMarkerSymbolLayerV2* marker = new QgsSimpleMarkerSymbolLayerV2; + QgsSimpleMarkerSymbolLayer* marker = new QgsSimpleMarkerSymbolLayer; marker->setColor( QColor( 255, 0, 0 ) ); QgsDropShadowEffect* effect = new QgsDropShadowEffect(); marker->setPaintEffect( effect ); - QgsMarkerSymbolV2* markerSymbol = new QgsMarkerSymbolV2(); + QgsMarkerSymbol* markerSymbol = new QgsMarkerSymbol(); markerSymbol->changeSymbolLayer( 0, marker ); - QgsSingleSymbolRendererV2* renderer = new QgsSingleSymbolRendererV2( markerSymbol ); + QgsSingleSymbolRenderer* renderer = new QgsSingleSymbolRenderer( markerSymbol ); - pointLayer->setRendererV2( renderer ); + pointLayer->setRenderer( renderer ); ms.setLayers( QStringList() << pointLayer->id() ); ms.setExtent( pointLayer->extent() ); @@ -796,19 +796,19 @@ void TestQgsPaintEffect::vectorLayerEffect() QgsMapLayerRegistry::instance()->addMapLayers( QList() << polysLayer ); QgsMapSettings ms; - QgsSimpleFillSymbolLayerV2* fill = new QgsSimpleFillSymbolLayerV2; + QgsSimpleFillSymbolLayer* fill = new QgsSimpleFillSymbolLayer; fill->setColor( QColor( 255, 0, 0 ) ); - QgsFillSymbolV2* fillSymbol = new QgsFillSymbolV2(); + QgsFillSymbol* fillSymbol = new QgsFillSymbol(); fillSymbol->changeSymbolLayer( 0, fill ); - QgsSingleSymbolRendererV2* renderer = new QgsSingleSymbolRendererV2( fillSymbol ); + QgsSingleSymbolRenderer* renderer = new QgsSingleSymbolRenderer( fillSymbol ); QgsOuterGlowEffect* effect = new QgsOuterGlowEffect(); effect->setSpread( 30.0 ); effect->setColor( QColor( 255, 0, 0 ) ); renderer->setPaintEffect( effect ); - polysLayer->setRendererV2( renderer ); + polysLayer->setRenderer( renderer ); ms.setLayers( QStringList() << polysLayer->id() ); ms.setExtent( polysLayer->extent() ); @@ -831,20 +831,20 @@ void TestQgsPaintEffect::mapUnits() QgsMapLayerRegistry::instance()->addMapLayers( QList() << lineLayer ); QgsMapSettings ms; - QgsSimpleLineSymbolLayerV2* line = new QgsSimpleLineSymbolLayerV2; + QgsSimpleLineSymbolLayer* line = new QgsSimpleLineSymbolLayer; line->setColor( QColor( 255, 0, 0 ) ); line->setWidth( 1.0 ); - QgsLineSymbolV2* lineSymbol = new QgsLineSymbolV2(); + QgsLineSymbol* lineSymbol = new QgsLineSymbol(); lineSymbol->changeSymbolLayer( 0, line ); - QgsSingleSymbolRendererV2* renderer = new QgsSingleSymbolRendererV2( lineSymbol ); + QgsSingleSymbolRenderer* renderer = new QgsSingleSymbolRenderer( lineSymbol ); QgsOuterGlowEffect* effect = new QgsOuterGlowEffect(); effect->setColor( QColor( 255, 0, 0 ) ); effect->setSpread( 3 ); effect->setSpreadUnit( QgsUnitTypes::RenderMapUnits ); renderer->setPaintEffect( effect ); - lineLayer->setRendererV2( renderer ); + lineLayer->setRenderer( renderer ); ms.setLayers( QStringList() << lineLayer->id() ); ms.setExtent( lineLayer->extent() ); @@ -867,19 +867,19 @@ void TestQgsPaintEffect::composer() QgsMapLayerRegistry::instance()->addMapLayers( QList() << lineLayer ); QgsMapSettings ms; - QgsSimpleLineSymbolLayerV2* line = new QgsSimpleLineSymbolLayerV2; + QgsSimpleLineSymbolLayer* line = new QgsSimpleLineSymbolLayer; line->setColor( QColor( 255, 0, 0 ) ); line->setWidth( 1.0 ); - QgsLineSymbolV2* lineSymbol = new QgsLineSymbolV2(); + QgsLineSymbol* lineSymbol = new QgsLineSymbol(); lineSymbol->changeSymbolLayer( 0, line ); - QgsSingleSymbolRendererV2* renderer = new QgsSingleSymbolRendererV2( lineSymbol ); + QgsSingleSymbolRenderer* renderer = new QgsSingleSymbolRenderer( lineSymbol ); QgsEffectStack* effect = new QgsEffectStack(); effect->appendEffect( new QgsDropShadowEffect() ); effect->appendEffect( new QgsDrawSourceEffect() ); renderer->setPaintEffect( effect ); - lineLayer->setRendererV2( renderer ); + lineLayer->setRenderer( renderer ); ms.setLayers( QStringList() << lineLayer->id() ); ms.setCrsTransformEnabled( false ); diff --git a/tests/src/core/testqgspointpatternfillsymbol.cpp b/tests/src/core/testqgspointpatternfillsymbol.cpp index 0d4baa34876..24c250a2c49 100644 --- a/tests/src/core/testqgspointpatternfillsymbol.cpp +++ b/tests/src/core/testqgspointpatternfillsymbol.cpp @@ -28,9 +28,9 @@ #include #include #include -#include -#include -#include "qgslinesymbollayerv2.h" +#include +#include +#include "qgslinesymbollayer.h" #include "qgsdatadefined.h" //qgis test includes @@ -68,8 +68,8 @@ class TestQgsPointPatternFillSymbol : public QObject QgsMapSettings mMapSettings; QgsVectorLayer * mpPolysLayer; QgsPointPatternFillSymbolLayer* mPointPatternFill; - QgsFillSymbolV2* mFillSymbol; - QgsSingleSymbolRendererV2* mSymbolRenderer; + QgsFillSymbol* mFillSymbol; + QgsSingleSymbolRenderer* mSymbolRenderer; QString mTestDataDir; QString mReport; }; @@ -105,10 +105,10 @@ void TestQgsPointPatternFillSymbol::initTestCase() //setup symbol mPointPatternFill = new QgsPointPatternFillSymbolLayer(); - mFillSymbol = new QgsFillSymbolV2(); + mFillSymbol = new QgsFillSymbol(); mFillSymbol->changeSymbolLayer( 0, mPointPatternFill ); - mSymbolRenderer = new QgsSingleSymbolRendererV2( mFillSymbol ); - mpPolysLayer->setRendererV2( mSymbolRenderer ); + mSymbolRenderer = new QgsSingleSymbolRenderer( mFillSymbol ); + mpPolysLayer->setRenderer( mSymbolRenderer ); // We only need maprender instead of mapcanvas // since maprender does not require a qui @@ -140,7 +140,7 @@ void TestQgsPointPatternFillSymbol::pointPatternFillSymbol() properties.insert( "color", "0,0,0,255" ); properties.insert( "name", "circle" ); properties.insert( "size", "5.0" ); - QgsMarkerSymbolV2* pointSymbol = QgsMarkerSymbolV2::createSimple( properties ); + QgsMarkerSymbol* pointSymbol = QgsMarkerSymbol::createSimple( properties ); mPointPatternFill->setSubSymbol( pointSymbol ); QVERIFY( imageCheck( "symbol_pointfill" ) ); @@ -154,7 +154,7 @@ void TestQgsPointPatternFillSymbol::dataDefinedSubSymbol() properties.insert( "color", "0,0,0,255" ); properties.insert( "name", "circle" ); properties.insert( "size", "5.0" ); - QgsMarkerSymbolV2* pointSymbol = QgsMarkerSymbolV2::createSimple( properties ); + QgsMarkerSymbol* pointSymbol = QgsMarkerSymbol::createSimple( properties ); pointSymbol->symbolLayer( 0 )->setDataDefinedProperty( "color", new QgsDataDefined( QString( "if(\"Name\" ='Lake','#ff0000','#ff00ff')" ) ) ); mPointPatternFill->setSubSymbol( pointSymbol ); QVERIFY( imageCheck( "datadefined_subsymbol" ) ); diff --git a/tests/src/core/testqgsrasterfill.cpp b/tests/src/core/testqgsrasterfill.cpp index 57b879759d9..76a5d9703be 100644 --- a/tests/src/core/testqgsrasterfill.cpp +++ b/tests/src/core/testqgsrasterfill.cpp @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include //qgis test includes #include "qgsmultirenderchecker.h" @@ -69,8 +69,8 @@ class TestQgsRasterFill : public QObject QgsMapSettings mMapSettings; QgsVectorLayer * mpPolysLayer; QgsRasterFillSymbolLayer* mRasterFill; - QgsFillSymbolV2* mFillSymbol; - QgsSingleSymbolRendererV2* mSymbolRenderer; + QgsFillSymbol* mFillSymbol; + QgsSingleSymbolRenderer* mSymbolRenderer; QString mTestDataDir; QString mReport; }; @@ -106,10 +106,10 @@ void TestQgsRasterFill::initTestCase() //setup raster fill mRasterFill = new QgsRasterFillSymbolLayer(); - mFillSymbol = new QgsFillSymbolV2(); + mFillSymbol = new QgsFillSymbol(); mFillSymbol->changeSymbolLayer( 0, mRasterFill ); - mSymbolRenderer = new QgsSingleSymbolRendererV2( mFillSymbol ); - mpPolysLayer->setRendererV2( mSymbolRenderer ); + mSymbolRenderer = new QgsSingleSymbolRenderer( mFillSymbol ); + mpPolysLayer->setRenderer( mSymbolRenderer ); // We only need maprender instead of mapcanvas // since maprender does not require a qui diff --git a/tests/src/core/testqgsrasterlayer.cpp b/tests/src/core/testqgsrasterlayer.cpp index 8dee8e2979f..6fed981225b 100644 --- a/tests/src/core/testqgsrasterlayer.cpp +++ b/tests/src/core/testqgsrasterlayer.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include "qgscolorrampshader.h" #include "qgsrasterdataprovider.h" @@ -96,9 +96,9 @@ class TestQgsRasterLayer : public QObject bool render( const QString& theFileName, int mismatchCount = 0 ); bool setQml( const QString& theType, QString& msg ); void populateColorRampShader( QgsColorRampShader* colorRampShader, - QgsVectorColorRampV2* colorRamp, + QgsVectorColorRamp* colorRamp, int numberOfEntries ); - bool testColorRamp( const QString& name, QgsVectorColorRampV2* colorRamp, + bool testColorRamp( const QString& name, QgsVectorColorRamp* colorRamp, QgsColorRampShader::ColorRamp_TYPE type, int numberOfEntries ); QString mTestDataDir; QgsRasterLayer * mpRasterLayer; @@ -250,7 +250,7 @@ void TestQgsRasterLayer::pseudoColor() } void TestQgsRasterLayer::populateColorRampShader( QgsColorRampShader* colorRampShader, - QgsVectorColorRampV2* colorRamp, + QgsVectorColorRamp* colorRamp, int numberOfEntries ) { @@ -294,7 +294,7 @@ void TestQgsRasterLayer::populateColorRampShader( QgsColorRampShader* colorRampS colorRampShader->setColorRampItemList( colorRampItems ); } -bool TestQgsRasterLayer::testColorRamp( const QString& name, QgsVectorColorRampV2* colorRamp, +bool TestQgsRasterLayer::testColorRamp( const QString& name, QgsVectorColorRamp* colorRamp, QgsColorRampShader::ColorRamp_TYPE type, int numberOfEntries ) { QgsRasterShader* rasterShader = new QgsRasterShader(); @@ -313,7 +313,7 @@ bool TestQgsRasterLayer::testColorRamp( const QString& name, QgsVectorColorRampV void TestQgsRasterLayer::colorRamp1() { // gradient ramp - QgsVectorGradientColorRampV2* colorRamp = new QgsVectorGradientColorRampV2( QColor( Qt::red ), QColor( Qt::black ) ); + QgsVectorGradientColorRamp* colorRamp = new QgsVectorGradientColorRamp( QColor( Qt::red ), QColor( Qt::black ) ); QgsGradientStopsList stops; stops.append( QgsGradientStop( 0.5, QColor( Qt::white ) ) ); colorRamp->setStops( stops ); @@ -325,7 +325,7 @@ void TestQgsRasterLayer::colorRamp1() void TestQgsRasterLayer::colorRamp2() { - QgsVectorColorBrewerColorRampV2 ramp( "BrBG", 10 ); + QgsVectorColorBrewerColorRamp ramp( "BrBG", 10 ); // ColorBrewer ramp QVERIFY( testColorRamp( "raster_colorRamp2", &ramp, @@ -336,7 +336,7 @@ void TestQgsRasterLayer::colorRamp3() { // cpt-city ramp, discrete QgsCptCityArchive::initArchives(); - QgsCptCityColorRampV2 ramp( "cb/div/BrBG", "_10" ); + QgsCptCityColorRamp ramp( "cb/div/BrBG", "_10" ); QVERIFY( testColorRamp( "raster_colorRamp3", &ramp, QgsColorRampShader::DISCRETE, 10 ) ); @@ -346,7 +346,7 @@ void TestQgsRasterLayer::colorRamp3() void TestQgsRasterLayer::colorRamp4() { // cpt-city ramp, continuous - QgsCptCityColorRampV2 ramp( "grass/elevation", "" ); + QgsCptCityColorRamp ramp( "grass/elevation", "" ); QVERIFY( testColorRamp( "raster_colorRamp4", &ramp, QgsColorRampShader::DISCRETE, 10 ) ); diff --git a/tests/src/core/testqgsrastersublayer.cpp b/tests/src/core/testqgsrastersublayer.cpp index 15481d6d0a6..8f1f02271de 100644 --- a/tests/src/core/testqgsrastersublayer.cpp +++ b/tests/src/core/testqgsrastersublayer.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include //qgis unit test includes diff --git a/tests/src/core/testqgsrulebasedrenderer.cpp b/tests/src/core/testqgsrulebasedrenderer.cpp index 2bef2b9d715..c8b4267d585 100644 --- a/tests/src/core/testqgsrulebasedrenderer.cpp +++ b/tests/src/core/testqgsrulebasedrenderer.cpp @@ -16,13 +16,13 @@ #include #include //header for class being tested -#include +#include #include #include #include -typedef QgsRuleBasedRendererV2::Rule RRule; +typedef QgsRuleBasedRenderer::Rule RRule; class TestQgsRuleBasedRenderer: public QObject { @@ -47,7 +47,7 @@ class TestQgsRuleBasedRenderer: public QObject xml2domElement( "rulebasedrenderer_simple.xml", doc ); QDomElement elem = doc.documentElement(); - QgsRuleBasedRendererV2* r = static_cast( QgsRuleBasedRendererV2::create( elem ) ); + QgsRuleBasedRenderer* r = static_cast( QgsRuleBasedRenderer::create( elem ) ); QVERIFY( r ); check_tree_valid( r->rootRule() ); delete r; @@ -59,7 +59,7 @@ class TestQgsRuleBasedRenderer: public QObject xml2domElement( "rulebasedrenderer_invalid.xml", doc ); QDomElement elem = doc.documentElement(); - QSharedPointer r( static_cast( QgsRuleBasedRendererV2::create( elem ) ) ); + QSharedPointer r( static_cast( QgsRuleBasedRenderer::create( elem ) ) ); QVERIFY( !r ); } @@ -85,9 +85,9 @@ class TestQgsRuleBasedRenderer: public QObject RRule* rootRule = new RRule( nullptr ); rootRule->appendChild( new RRule( s1, 0, 0, "fld >= 5 and fld <= 20" ) ); rootRule->appendChild( new RRule( s2, 0, 0, "fld <= 10" ) ); - QgsRuleBasedRendererV2 r( rootRule ); + QgsRuleBasedRenderer r( rootRule ); - QVERIFY( r.capabilities() & QgsFeatureRendererV2::MoreSymbolsPerFeature ); + QVERIFY( r.capabilities() & QgsFeatureRenderer::MoreSymbolsPerFeature ); QgsRenderContext ctx; // dummy render context ctx.expressionContext().setFields( layer->fields() ); @@ -126,9 +126,9 @@ class TestQgsRuleBasedRenderer: public QObject rootRule->appendChild( sub1Rule ); sub1Rule->appendChild( sub2Rule ); sub2Rule->appendChild( sub3Rule ); - QgsRuleBasedRendererV2 r( rootRule ); + QgsRuleBasedRenderer r( rootRule ); - QgsRuleBasedRendererV2* clone = static_cast( r.clone() ); + QgsRuleBasedRenderer* clone = static_cast( r.clone() ); RRule* cloneRootRule = clone->rootRule(); RRule* cloneSub1Rule = cloneRootRule->children()[0]; RRule* cloneSub2Rule = cloneSub1Rule->children()[0]; @@ -156,18 +156,18 @@ class TestQgsRuleBasedRenderer: public QObject QVERIFY( parse ); } - void check_tree_valid( QgsRuleBasedRendererV2::Rule* root ) + void check_tree_valid( QgsRuleBasedRenderer::Rule* root ) { // root must always exist (although it does not have children) QVERIFY( root ); // and does not have a parent QVERIFY( !root->parent() ); - Q_FOREACH ( QgsRuleBasedRendererV2::Rule* node, root->children() ) + Q_FOREACH ( QgsRuleBasedRenderer::Rule* node, root->children() ) check_non_root_rule( node ); } - void check_non_root_rule( QgsRuleBasedRendererV2::Rule* node ) + void check_non_root_rule( QgsRuleBasedRenderer::Rule* node ) { qDebug() << node->dump(); // children must not be nullptr @@ -175,7 +175,7 @@ class TestQgsRuleBasedRenderer: public QObject // and must have a parent QVERIFY( node->parent() ); // check that all children are okay - Q_FOREACH ( QgsRuleBasedRendererV2::Rule* child, node->children() ) + Q_FOREACH ( QgsRuleBasedRenderer::Rule* child, node->children() ) check_non_root_rule( child ); } diff --git a/tests/src/core/testqgsshapeburst.cpp b/tests/src/core/testqgsshapeburst.cpp index 3b916ba5310..496594aebff 100644 --- a/tests/src/core/testqgsshapeburst.cpp +++ b/tests/src/core/testqgsshapeburst.cpp @@ -29,9 +29,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include //qgis test includes #include "qgsmultirenderchecker.h" @@ -71,9 +71,9 @@ class TestQgsShapeburst : public QObject bool imageCheck( const QString& theType ); QgsMapSettings mMapSettings; QgsVectorLayer * mpPolysLayer; - QgsShapeburstFillSymbolLayerV2* mShapeburstFill; - QgsFillSymbolV2* mFillSymbol; - QgsSingleSymbolRendererV2* mSymbolRenderer; + QgsShapeburstFillSymbolLayer* mShapeburstFill; + QgsFillSymbol* mFillSymbol; + QgsSingleSymbolRenderer* mSymbolRenderer; QString mTestDataDir; QString mReport; }; @@ -108,11 +108,11 @@ void TestQgsShapeburst::initTestCase() QList() << mpPolysLayer ); //setup shapeburst fill - mShapeburstFill = new QgsShapeburstFillSymbolLayerV2(); - mFillSymbol = new QgsFillSymbolV2(); + mShapeburstFill = new QgsShapeburstFillSymbolLayer(); + mFillSymbol = new QgsFillSymbol(); mFillSymbol->changeSymbolLayer( 0, mShapeburstFill ); - mSymbolRenderer = new QgsSingleSymbolRendererV2( mFillSymbol ); - mpPolysLayer->setRendererV2( mSymbolRenderer ); + mSymbolRenderer = new QgsSingleSymbolRenderer( mFillSymbol ); + mpPolysLayer->setRenderer( mSymbolRenderer ); // We only need maprender instead of mapcanvas // since maprender does not require a qui @@ -160,15 +160,15 @@ void TestQgsShapeburst::shapeburstSymbolRamp() { mReport += "

      Shapeburst symbol renderer ramp test

      \n"; - QgsVectorGradientColorRampV2* gradientRamp = new QgsVectorGradientColorRampV2( QColor( Qt::yellow ), QColor( 255, 105, 180 ) ); + QgsVectorGradientColorRamp* gradientRamp = new QgsVectorGradientColorRamp( QColor( Qt::yellow ), QColor( 255, 105, 180 ) ); QgsGradientStopsList stops; stops.append( QgsGradientStop( 0.5, QColor( 255, 255, 255, 0 ) ) ); gradientRamp->setStops( stops ); mShapeburstFill->setColorRamp( gradientRamp ); - mShapeburstFill->setColorType( QgsShapeburstFillSymbolLayerV2::ColorRamp ); + mShapeburstFill->setColorType( QgsShapeburstFillSymbolLayer::ColorRamp ); QVERIFY( imageCheck( "shapeburst_ramp" ) ); - mShapeburstFill->setColorType( QgsShapeburstFillSymbolLayerV2::SimpleTwoColor ); + mShapeburstFill->setColorType( QgsShapeburstFillSymbolLayer::SimpleTwoColor ); } void TestQgsShapeburst::shapeburstBlur() diff --git a/tests/src/core/testqgssimplemarker.cpp b/tests/src/core/testqgssimplemarker.cpp index 85d8691f172..69d1aa76e6e 100644 --- a/tests/src/core/testqgssimplemarker.cpp +++ b/tests/src/core/testqgssimplemarker.cpp @@ -28,8 +28,8 @@ #include #include #include -#include -#include "qgsmarkersymbollayerv2.h" +#include +#include "qgsmarkersymbollayer.h" #include "qgsdatadefined.h" //qgis test includes @@ -73,9 +73,9 @@ class TestQgsSimpleMarkerSymbol : public QObject bool imageCheck( const QString& theType ); QgsMapSettings mMapSettings; QgsVectorLayer * mpPointsLayer; - QgsSimpleMarkerSymbolLayerV2* mSimpleMarkerLayer; - QgsMarkerSymbolV2* mMarkerSymbol; - QgsSingleSymbolRendererV2* mSymbolRenderer; + QgsSimpleMarkerSymbolLayer* mSimpleMarkerLayer; + QgsMarkerSymbol* mMarkerSymbol; + QgsSingleSymbolRenderer* mSymbolRenderer; QString mTestDataDir; QString mReport; }; @@ -106,11 +106,11 @@ void TestQgsSimpleMarkerSymbol::initTestCase() QList() << mpPointsLayer ); //setup symbol - mSimpleMarkerLayer = new QgsSimpleMarkerSymbolLayerV2(); - mMarkerSymbol = new QgsMarkerSymbolV2(); + mSimpleMarkerLayer = new QgsSimpleMarkerSymbolLayer(); + mMarkerSymbol = new QgsMarkerSymbol(); mMarkerSymbol->changeSymbolLayer( 0, mSimpleMarkerLayer ); - mSymbolRenderer = new QgsSingleSymbolRendererV2( mMarkerSymbol ); - mpPointsLayer->setRendererV2( mSymbolRenderer ); + mSymbolRenderer = new QgsSingleSymbolRenderer( mMarkerSymbol ); + mpPointsLayer->setRenderer( mSymbolRenderer ); // We only need maprender instead of mapcanvas // since maprender does not require a qui @@ -255,7 +255,7 @@ void TestQgsSimpleMarkerSymbol::colors() { //test logic for setting/retrieving symbol color - QgsSimpleMarkerSymbolLayerV2 marker; + QgsSimpleMarkerSymbolLayer marker; marker.setOutlineColor( QColor( 200, 200, 200 ) ); marker.setFillColor( QColor( 100, 100, 100 ) ); diff --git a/tests/src/core/testqgsstylev2.cpp b/tests/src/core/testqgsstyle.cpp similarity index 71% rename from tests/src/core/testqgsstylev2.cpp rename to tests/src/core/testqgsstyle.cpp index 2cb087bd3da..6c95189fb86 100644 --- a/tests/src/core/testqgsstylev2.cpp +++ b/tests/src/core/testqgsstyle.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - testqgsstylev2.cpp + testqgsstyle.cpp -------------------------------------- Date : Wed Aug 1 12:13:24 BRT 2012 Copyright : (C) 2012 Etienne Tourigny and Tim Sutton @@ -23,34 +23,34 @@ #include #include "qgsconfig.h" #include "qgslogger.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgscptcityarchive.h" #include "qgsvectorlayer.h" #include "qgsmaplayerregistry.h" -#include "qgslinesymbollayerv2.h" -#include "qgsfillsymbollayerv2.h" -#include "qgssinglesymbolrendererv2.h" +#include "qgslinesymbollayer.h" +#include "qgsfillsymbollayer.h" +#include "qgssinglesymbolrenderer.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" /** \ingroup UnitTests * This is a unit test to verify that styles are working correctly */ -class TestStyleV2 : public QObject +class TestStyle : public QObject { Q_OBJECT public: - TestStyleV2(); + TestStyle(); private: QString mReport; - QgsStyleV2 *mStyle; + QgsStyle *mStyle; QString mTestDataDir; - bool testValidColor( QgsVectorColorRampV2 *ramp, double value, const QColor& expected ); + bool testValidColor( QgsVectorColorRamp *ramp, double value, const QColor& expected ); bool imageCheck( QgsMapSettings &ms, const QString &testName ); private slots: @@ -69,14 +69,14 @@ class TestStyleV2 : public QObject }; -TestStyleV2::TestStyleV2() +TestStyle::TestStyle() : mStyle( nullptr ) { } // slots -void TestStyleV2::initTestCase() +void TestStyle::initTestCase() { // initialize with test settings directory so we don't mess with user's stuff QgsApplication::init( QDir::tempPath() + "/dot-qgis" ); @@ -93,22 +93,22 @@ void TestStyleV2::initTestCase() QCoreApplication::setApplicationName( "QGIS-TEST" ); // initialize with a clean style - QFile styleFile( QgsApplication::userStyleV2Path() ); + QFile styleFile( QgsApplication::userStylePath() ); if ( styleFile.exists() ) { styleFile.remove(); QgsDebugMsg( "removed user style file " + styleFile.fileName() ); } - mStyle = QgsStyleV2::defaultStyle(); + mStyle = QgsStyle::defaultStyle(); // mStyle->clear(); // cpt-city ramp, small selection available in /cpt-city QgsCptCityArchive::initArchives(); - mReport += "

      StyleV2 Tests

      \n"; + mReport += "

      Style Tests

      \n"; } -void TestStyleV2::cleanupTestCase() +void TestStyle::cleanupTestCase() { // don't save // mStyle->save(); @@ -127,7 +127,7 @@ void TestStyleV2::cleanupTestCase() } } -bool TestStyleV2::imageCheck( QgsMapSettings& ms, const QString& testName ) +bool TestStyle::imageCheck( QgsMapSettings& ms, const QString& testName ) { QgsMultiRenderChecker checker; ms.setOutputDpi( 96 ); @@ -138,7 +138,7 @@ bool TestStyleV2::imageCheck( QgsMapSettings& ms, const QString& testName ) return result; } -bool TestStyleV2::testValidColor( QgsVectorColorRampV2 *ramp, double value, const QColor& expected ) +bool TestStyle::testValidColor( QgsVectorColorRamp *ramp, double value, const QColor& expected ) { QColor result = ramp->color( value ); //use int color components when testing (builds some fuzziness into test) @@ -152,37 +152,37 @@ bool TestStyleV2::testValidColor( QgsVectorColorRampV2 *ramp, double value, cons return true; } -void TestStyleV2::testCreateColorRamps() +void TestStyle::testCreateColorRamps() { // gradient ramp - QgsVectorGradientColorRampV2* gradientRamp = new QgsVectorGradientColorRampV2( QColor( Qt::red ), QColor( Qt::blue ) ); + QgsVectorGradientColorRamp* gradientRamp = new QgsVectorGradientColorRamp( QColor( Qt::red ), QColor( Qt::blue ) ); QgsGradientStopsList stops; stops.append( QgsGradientStop( 0.5, QColor( Qt::white ) ) ); gradientRamp->setStops( stops ); QVERIFY( mStyle->addColorRamp( "test_gradient", gradientRamp, true ) ); // random ramp - QgsVectorRandomColorRampV2* randomRamp = new QgsVectorRandomColorRampV2(); + QgsVectorRandomColorRamp* randomRamp = new QgsVectorRandomColorRamp(); QVERIFY( mStyle->addColorRamp( "test_random", randomRamp, true ) ); // color brewer ramp - QgsVectorColorBrewerColorRampV2* cb1Ramp = new QgsVectorColorBrewerColorRampV2(); + QgsVectorColorBrewerColorRamp* cb1Ramp = new QgsVectorColorBrewerColorRamp(); QVERIFY( mStyle->addColorRamp( "test_cb1", cb1Ramp, true ) ); - QgsVectorColorBrewerColorRampV2* cb2Ramp = new QgsVectorColorBrewerColorRampV2( "RdYlGn", 6 ); + QgsVectorColorBrewerColorRamp* cb2Ramp = new QgsVectorColorBrewerColorRamp( "RdYlGn", 6 ); QVERIFY( mStyle->addColorRamp( "test_cb2", cb2Ramp, true ) ); // discrete ramp with no variant - QgsCptCityColorRampV2* cc1Ramp = new QgsCptCityColorRampV2( "cb/seq/PuBuGn_06", "" ); + QgsCptCityColorRamp* cc1Ramp = new QgsCptCityColorRamp( "cb/seq/PuBuGn_06", "" ); QVERIFY( mStyle->addColorRamp( "test_cc1", cc1Ramp, true ) ); // discrete ramp with variant - QgsCptCityColorRampV2* cc2Ramp = new QgsCptCityColorRampV2( "cb/div/PiYG", "_10" ); + QgsCptCityColorRamp* cc2Ramp = new QgsCptCityColorRamp( "cb/div/PiYG", "_10" ); QVERIFY( mStyle->addColorRamp( "test_cc2", cc2Ramp, true ) ); // continuous ramp - QgsCptCityColorRampV2* cc3Ramp = new QgsCptCityColorRampV2( "grass/byr", "" ); + QgsCptCityColorRamp* cc3Ramp = new QgsCptCityColorRamp( "grass/byr", "" ); QVERIFY( mStyle->addColorRamp( "test_cc3", cc3Ramp, true ) ); } -void TestStyleV2::testLoadColorRamps() +void TestStyle::testLoadColorRamps() { QStringList colorRamps = mStyle->colorRampNames(); QStringList colorRampsTest = QStringList() << "BrBG" << "Spectral" @@ -216,7 +216,7 @@ void TestStyleV2::testLoadColorRamps() { QgsDebugMsg( "colorRamp " + name ); QVERIFY( colorRamps.contains( name ) ); - QgsVectorColorRampV2* ramp = mStyle->colorRamp( name ); + QgsVectorColorRamp* ramp = mStyle->colorRamp( name ); QVERIFY( ramp != 0 ); // test colors if ( colorTests.contains( name ) ) @@ -232,12 +232,12 @@ void TestStyleV2::testLoadColorRamps() } } -void TestStyleV2::testSaveLoad() +void TestStyle::testSaveLoad() { // save not needed anymore, because used update=true in addColorRamp() // mStyle->save(); mStyle->clear(); - mStyle->load( QgsApplication::userStyleV2Path() ); + mStyle->load( QgsApplication::userStylePath() ); // basic test to see that ramp is present QStringList colorRamps = mStyle->colorRampNames(); @@ -249,7 +249,7 @@ void TestStyleV2::testSaveLoad() { QgsDebugMsg( "colorRamp " + name ); QVERIFY( colorRamps.contains( name ) ); - QgsVectorColorRampV2* ramp = mStyle->colorRamp( name ); + QgsVectorColorRamp* ramp = mStyle->colorRamp( name ); QVERIFY( ramp != 0 ); if ( ramp ) delete ramp; @@ -258,7 +258,7 @@ void TestStyleV2::testSaveLoad() testLoadColorRamps(); } -void TestStyleV2::testTags() +void TestStyle::testTags() { mStyle->clear(); //add some tags @@ -282,90 +282,90 @@ void TestStyleV2::testTags() QVERIFY( tags.contains( "purple" ) ); //remove tag - mStyle->remove( QgsStyleV2::TagEntity, mStyle->tagId( "purple" ) ); - mStyle->remove( QgsStyleV2::TagEntity, -999 ); //bad id + mStyle->remove( QgsStyle::TagEntity, mStyle->tagId( "purple" ) ); + mStyle->remove( QgsStyle::TagEntity, -999 ); //bad id tags = mStyle->tags(); QCOMPARE( tags.count(), 4 ); QVERIFY( !tags.contains( "purple" ) ); //add some symbols - QVERIFY( mStyle->saveSymbol( "symbol1", QgsMarkerSymbolV2::createSimple( QgsStringMap() ), 0, QStringList() << "red" << "starry" ) ); - mStyle->addSymbol( "blue starry", QgsMarkerSymbolV2::createSimple( QgsStringMap() ), true ); - mStyle->addSymbol( "red circle", QgsMarkerSymbolV2::createSimple( QgsStringMap() ), true ); + QVERIFY( mStyle->saveSymbol( "symbol1", QgsMarkerSymbol::createSimple( QgsStringMap() ), 0, QStringList() << "red" << "starry" ) ); + mStyle->addSymbol( "blue starry", QgsMarkerSymbol::createSimple( QgsStringMap() ), true ); + mStyle->addSymbol( "red circle", QgsMarkerSymbol::createSimple( QgsStringMap() ), true ); //tag them - QVERIFY( mStyle->tagSymbol( QgsStyleV2::SymbolEntity, "blue starry", QStringList() << "blue" << "starry" ) ); - QVERIFY( mStyle->tagSymbol( QgsStyleV2::SymbolEntity, "red circle", QStringList() << "red" << "circle" ) ); + QVERIFY( mStyle->tagSymbol( QgsStyle::SymbolEntity, "blue starry", QStringList() << "blue" << "starry" ) ); + QVERIFY( mStyle->tagSymbol( QgsStyle::SymbolEntity, "red circle", QStringList() << "red" << "circle" ) ); //bad symbol name - QVERIFY( !mStyle->tagSymbol( QgsStyleV2::SymbolEntity, "no symbol", QStringList() << "red" << "circle" ) ); + QVERIFY( !mStyle->tagSymbol( QgsStyle::SymbolEntity, "no symbol", QStringList() << "red" << "circle" ) ); //tag which hasn't been added yet - QVERIFY( mStyle->tagSymbol( QgsStyleV2::SymbolEntity, "red circle", QStringList() << "round" ) ); + QVERIFY( mStyle->tagSymbol( QgsStyle::SymbolEntity, "red circle", QStringList() << "round" ) ); tags = mStyle->tags(); QVERIFY( tags.contains( "round" ) ); //check that tags have been applied - tags = mStyle->tagsOfSymbol( QgsStyleV2::SymbolEntity, "blue starry" ); + tags = mStyle->tagsOfSymbol( QgsStyle::SymbolEntity, "blue starry" ); QCOMPARE( tags.count(), 2 ); QVERIFY( tags.contains( "blue" ) ); QVERIFY( tags.contains( "starry" ) ); - tags = mStyle->tagsOfSymbol( QgsStyleV2::SymbolEntity, "red circle" ); + tags = mStyle->tagsOfSymbol( QgsStyle::SymbolEntity, "red circle" ); QCOMPARE( tags.count(), 3 ); QVERIFY( tags.contains( "red" ) ); QVERIFY( tags.contains( "circle" ) ); QVERIFY( tags.contains( "round" ) ); - tags = mStyle->tagsOfSymbol( QgsStyleV2::SymbolEntity, "symbol1" ); + tags = mStyle->tagsOfSymbol( QgsStyle::SymbolEntity, "symbol1" ); QCOMPARE( tags.count(), 2 ); QVERIFY( tags.contains( "red" ) ); QVERIFY( tags.contains( "starry" ) ); //remove a tag, including a non-present tag - QVERIFY( mStyle->detagSymbol( QgsStyleV2::SymbolEntity, "blue starry", QStringList() << "bad" << "blue" ) ); - tags = mStyle->tagsOfSymbol( QgsStyleV2::SymbolEntity, "blue starry" ); + QVERIFY( mStyle->detagSymbol( QgsStyle::SymbolEntity, "blue starry", QStringList() << "bad" << "blue" ) ); + tags = mStyle->tagsOfSymbol( QgsStyle::SymbolEntity, "blue starry" ); QCOMPARE( tags.count(), 1 ); QVERIFY( tags.contains( "starry" ) ); //try to remove tag from non-existing symbol - QVERIFY( !mStyle->detagSymbol( QgsStyleV2::SymbolEntity, "no symbol!", QStringList() << "bad" << "blue" ) ); + QVERIFY( !mStyle->detagSymbol( QgsStyle::SymbolEntity, "no symbol!", QStringList() << "bad" << "blue" ) ); //check symbols with tag - QStringList symbols = mStyle->symbolsWithTag( QgsStyleV2::SymbolEntity, mStyle->tagId( "red" ) ); + QStringList symbols = mStyle->symbolsWithTag( QgsStyle::SymbolEntity, mStyle->tagId( "red" ) ); QCOMPARE( symbols.count(), 2 ); QVERIFY( symbols.contains( "symbol1" ) ); QVERIFY( symbols.contains( "red circle" ) ); - symbols = mStyle->symbolsWithTag( QgsStyleV2::SymbolEntity, mStyle->tagId( "starry" ) ); + symbols = mStyle->symbolsWithTag( QgsStyle::SymbolEntity, mStyle->tagId( "starry" ) ); QCOMPARE( symbols.count(), 2 ); QVERIFY( symbols.contains( "symbol1" ) ); QVERIFY( symbols.contains( "blue starry" ) ); - symbols = mStyle->symbolsWithTag( QgsStyleV2::SymbolEntity, mStyle->tagId( "circle" ) ); + symbols = mStyle->symbolsWithTag( QgsStyle::SymbolEntity, mStyle->tagId( "circle" ) ); QCOMPARE( symbols.count(), 1 ); QVERIFY( symbols.contains( "red circle" ) ); - symbols = mStyle->symbolsWithTag( QgsStyleV2::SymbolEntity, mStyle->tagId( "round" ) ); + symbols = mStyle->symbolsWithTag( QgsStyle::SymbolEntity, mStyle->tagId( "round" ) ); QCOMPARE( symbols.count(), 1 ); QVERIFY( symbols.contains( "red circle" ) ); - symbols = mStyle->symbolsWithTag( QgsStyleV2::SymbolEntity, mStyle->tagId( "blue" ) ); + symbols = mStyle->symbolsWithTag( QgsStyle::SymbolEntity, mStyle->tagId( "blue" ) ); QVERIFY( symbols.isEmpty() ); - symbols = mStyle->symbolsWithTag( QgsStyleV2::SymbolEntity, mStyle->tagId( "no tag" ) ); + symbols = mStyle->symbolsWithTag( QgsStyle::SymbolEntity, mStyle->tagId( "no tag" ) ); QVERIFY( symbols.isEmpty() ); //searching returns symbols with matching tags - symbols = mStyle->findSymbols( QgsStyleV2::SymbolEntity, "red" ); + symbols = mStyle->findSymbols( QgsStyle::SymbolEntity, "red" ); QCOMPARE( symbols.count(), 2 ); QVERIFY( symbols.contains( "symbol1" ) ); QVERIFY( symbols.contains( "red circle" ) ); - symbols = mStyle->findSymbols( QgsStyleV2::SymbolEntity, "symbol1" ); + symbols = mStyle->findSymbols( QgsStyle::SymbolEntity, "symbol1" ); QCOMPARE( symbols.count(), 1 ); QVERIFY( symbols.contains( "symbol1" ) ); - symbols = mStyle->findSymbols( QgsStyleV2::SymbolEntity, "starry" ); + symbols = mStyle->findSymbols( QgsStyle::SymbolEntity, "starry" ); QCOMPARE( symbols.count(), 2 ); QVERIFY( symbols.contains( "symbol1" ) ); QVERIFY( symbols.contains( "blue starry" ) ); - symbols = mStyle->findSymbols( QgsStyleV2::SymbolEntity, "blue" ); + symbols = mStyle->findSymbols( QgsStyle::SymbolEntity, "blue" ); QCOMPARE( symbols.count(), 1 ); QVERIFY( symbols.contains( "blue starry" ) ); - symbols = mStyle->findSymbols( QgsStyleV2::SymbolEntity, "round" ); + symbols = mStyle->findSymbols( QgsStyle::SymbolEntity, "round" ); QCOMPARE( symbols.count(), 1 ); QVERIFY( symbols.contains( "red circle" ) ); } -QTEST_MAIN( TestStyleV2 ) -#include "testqgsstylev2.moc" +QTEST_MAIN( TestStyle ) +#include "testqgsstyle.moc" diff --git a/tests/src/core/testqgssvgmarker.cpp b/tests/src/core/testqgssvgmarker.cpp index c072853463a..6bd1ecbbeb7 100644 --- a/tests/src/core/testqgssvgmarker.cpp +++ b/tests/src/core/testqgssvgmarker.cpp @@ -28,8 +28,8 @@ #include #include #include -#include -#include "qgsmarkersymbollayerv2.h" +#include +#include "qgsmarkersymbollayer.h" #include "qgsdatadefined.h" //qgis test includes @@ -66,9 +66,9 @@ class TestQgsSvgMarkerSymbol : public QObject bool imageCheck( const QString& theType ); QgsMapSettings mMapSettings; QgsVectorLayer * mpPointsLayer; - QgsSvgMarkerSymbolLayerV2* mSvgMarkerLayer; - QgsMarkerSymbolV2* mMarkerSymbol; - QgsSingleSymbolRendererV2* mSymbolRenderer; + QgsSvgMarkerSymbolLayer* mSvgMarkerLayer; + QgsMarkerSymbol* mMarkerSymbol; + QgsSingleSymbolRenderer* mSymbolRenderer; QString mTestDataDir; QString mReport; }; @@ -99,11 +99,11 @@ void TestQgsSvgMarkerSymbol::initTestCase() QList() << mpPointsLayer ); //setup symbol - mSvgMarkerLayer = new QgsSvgMarkerSymbolLayerV2(); - mMarkerSymbol = new QgsMarkerSymbolV2(); + mSvgMarkerLayer = new QgsSvgMarkerSymbolLayer(); + mMarkerSymbol = new QgsMarkerSymbol(); mMarkerSymbol->changeSymbolLayer( 0, mSvgMarkerLayer ); - mSymbolRenderer = new QgsSingleSymbolRendererV2( mMarkerSymbol ); - mpPointsLayer->setRendererV2( mSymbolRenderer ); + mSymbolRenderer = new QgsSingleSymbolRenderer( mMarkerSymbol ); + mpPointsLayer->setRenderer( mSymbolRenderer ); // We only need maprender instead of mapcanvas // since maprender does not require a qui diff --git a/tests/src/core/testqgssymbol.cpp b/tests/src/core/testqgssymbol.cpp index 641b8afd228..7290ad8bade 100644 --- a/tests/src/core/testqgssymbol.cpp +++ b/tests/src/core/testqgssymbol.cpp @@ -23,15 +23,15 @@ #include #include "qgsconfig.h" #include "qgslogger.h" -#include "qgsvectorcolorrampv2.h" +#include "qgsvectorcolorramp.h" #include "qgscptcityarchive.h" #include "qgsvectorlayer.h" #include "qgsmaplayerregistry.h" -#include "qgslinesymbollayerv2.h" -#include "qgsfillsymbollayerv2.h" -#include "qgssinglesymbolrendererv2.h" +#include "qgslinesymbollayer.h" +#include "qgsfillsymbollayer.h" +#include "qgssinglesymbolrenderer.h" -#include "qgsstylev2.h" +#include "qgsstyle.h" /** \ingroup UnitTests * This is a unit test to verify that symbols are working correctly @@ -96,7 +96,7 @@ void TestQgsSymbol::initTestCase() QCoreApplication::setApplicationName( "QGIS-TEST" ); // initialize with a clean style - QFile styleFile( QgsApplication::userStyleV2Path() ); + QFile styleFile( QgsApplication::userStylePath() ); if ( styleFile.exists() ) { styleFile.remove(); @@ -180,41 +180,41 @@ void TestQgsSymbol::testCanvasClip() mReport += "

      Line canvas clip

      \n"; ms.setLayers( QStringList() << mpLinesLayer->id() ); - QgsMarkerLineSymbolLayerV2* markerLine = new QgsMarkerLineSymbolLayerV2(); - markerLine->setPlacement( QgsMarkerLineSymbolLayerV2:: CentralPoint ); - QgsLineSymbolV2* lineSymbol = new QgsLineSymbolV2(); + QgsMarkerLineSymbolLayer* markerLine = new QgsMarkerLineSymbolLayer(); + markerLine->setPlacement( QgsMarkerLineSymbolLayer:: CentralPoint ); + QgsLineSymbol* lineSymbol = new QgsLineSymbol(); lineSymbol->changeSymbolLayer( 0, markerLine ); - QgsSingleSymbolRendererV2* renderer = new QgsSingleSymbolRendererV2( lineSymbol ); - mpLinesLayer->setRendererV2( renderer ); + QgsSingleSymbolRenderer* renderer = new QgsSingleSymbolRenderer( lineSymbol ); + mpLinesLayer->setRenderer( renderer ); bool result; lineSymbol->setClipFeaturesToExtent( true ); - result = imageCheck( ms, "stylev2_linecanvasclip" ); + result = imageCheck( ms, "style_linecanvasclip" ); QVERIFY( result ); lineSymbol->setClipFeaturesToExtent( false ); - result = imageCheck( ms, "stylev2_linecanvasclip_off" ); + result = imageCheck( ms, "style_linecanvasclip_off" ); QVERIFY( result ); //poly mReport += "

      Polygon canvas clip

      \n"; ms.setLayers( QStringList() << mpPolysLayer->id() ); - QgsCentroidFillSymbolLayerV2* centroidFill = new QgsCentroidFillSymbolLayerV2(); - QgsFillSymbolV2* fillSymbol = new QgsFillSymbolV2(); + QgsCentroidFillSymbolLayer* centroidFill = new QgsCentroidFillSymbolLayer(); + QgsFillSymbol* fillSymbol = new QgsFillSymbol(); fillSymbol->changeSymbolLayer( 0, centroidFill ); - renderer = new QgsSingleSymbolRendererV2( fillSymbol ); - mpPolysLayer->setRendererV2( renderer ); + renderer = new QgsSingleSymbolRenderer( fillSymbol ); + mpPolysLayer->setRenderer( renderer ); extent = QgsRectangle( -106.0, 29.0, -94, 36.0 ); ms.setExtent( extent ); fillSymbol->setClipFeaturesToExtent( true ); - result = imageCheck( ms, "stylev2_polycanvasclip" ); + result = imageCheck( ms, "style_polycanvasclip" ); QVERIFY( result ); fillSymbol->setClipFeaturesToExtent( false ); - result = imageCheck( ms, "stylev2_polycanvasclip_off" ); + result = imageCheck( ms, "style_polycanvasclip_off" ); QVERIFY( result ); } @@ -435,12 +435,12 @@ void TestQgsSymbol::symbolProperties() //test QgsSymbolLayerUtils::symbolProperties //make a symbol - QgsSimpleFillSymbolLayerV2* fill = new QgsSimpleFillSymbolLayerV2(); + QgsSimpleFillSymbolLayer* fill = new QgsSimpleFillSymbolLayer(); fill->setColor( QColor( 25, 125, 225 ) ); - QgsFillSymbolV2* fillSymbol = new QgsFillSymbolV2(); + QgsFillSymbol* fillSymbol = new QgsFillSymbol(); fillSymbol->changeSymbolLayer( 0, fill ); - QgsFillSymbolV2* fillSymbol2 = static_cast< QgsFillSymbolV2* >( fillSymbol->clone() ); + QgsFillSymbol* fillSymbol2 = static_cast< QgsFillSymbol* >( fillSymbol->clone() ); //test that two different symbol pointers return same properties QCOMPARE( QgsSymbolLayerUtils::symbolProperties( fillSymbol ), diff --git a/tests/src/core/testqgsvectorlayer.cpp b/tests/src/core/testqgsvectorlayer.cpp index 8afc6c3802f..2209cac88fe 100644 --- a/tests/src/core/testqgsvectorlayer.cpp +++ b/tests/src/core/testqgsvectorlayer.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include //qgis test includes #include "qgsrenderchecker.h" @@ -96,7 +96,7 @@ class TestQgsVectorLayer : public QObject void QgsVectorLayerNonSpatialIterator(); void QgsVectorLayerGetValues(); - void QgsVectorLayersetRendererV2(); + void QgsVectorLayersetRenderer(); void QgsVectorLayersetFeatureBlendMode(); void QgsVectorLayersetLayerTransparency(); void uniqueValues(); @@ -263,18 +263,18 @@ void TestQgsVectorLayer::QgsVectorLayerGetValues() delete layer; } -void TestQgsVectorLayer::QgsVectorLayersetRendererV2() +void TestQgsVectorLayer::QgsVectorLayersetRenderer() { QgsVectorLayer* vLayer = static_cast< QgsVectorLayer * >( mpPointsLayer ); TestSignalReceiver receiver; QObject::connect( vLayer, SIGNAL( rendererChanged() ), &receiver, SLOT( onRendererChanged() ) ); - QgsSingleSymbolRendererV2* symbolRenderer = new QgsSingleSymbolRendererV2( QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ) ); + QgsSingleSymbolRenderer* symbolRenderer = new QgsSingleSymbolRenderer( QgsSymbol::defaultSymbol( QgsWkbTypes::PointGeometry ) ); QCOMPARE( receiver.rendererChanged, false ); - vLayer->setRendererV2( symbolRenderer ); + vLayer->setRenderer( symbolRenderer ); QCOMPARE( receiver.rendererChanged, true ); - QCOMPARE( vLayer->rendererV2(), symbolRenderer ); + QCOMPARE( vLayer->renderer(), symbolRenderer ); } void TestQgsVectorLayer::QgsVectorLayersetFeatureBlendMode() diff --git a/tests/src/gui/CMakeLists.txt b/tests/src/gui/CMakeLists.txt index 32e3af9bf0b..7f7c92f356c 100644 --- a/tests/src/gui/CMakeLists.txt +++ b/tests/src/gui/CMakeLists.txt @@ -120,8 +120,8 @@ ADD_QGIS_TEST(zoomtest testqgsmaptoolzoom.cpp) # a simple app for testing GUI of renderers # These tests are old and are never run so removed for now. -#SET(rendererv2gui_SRCS testrendererv2gui.cpp) -#SET(rendererv2gui_HDRS testrendererv2gui.h) +#SET(rendererv2gui_SRCS testrenderergui.cpp) +#SET(rendererv2gui_HDRS testrenderergui.h) #QT4_WRAP_CPP(rendererv2gui_MOC_SRCS ${rendererv2gui_HDRS}) #ADD_EXECUTABLE(qgis_rendererv2gui ${rendererv2gui_SRCS} ${rendererv2gui_MOC_SRCS}) diff --git a/tests/src/gui/testrendererv2gui.cpp b/tests/src/gui/testrenderergui.cpp similarity index 87% rename from tests/src/gui/testrendererv2gui.cpp rename to tests/src/gui/testrenderergui.cpp index 79fb79bee17..88697386f60 100644 --- a/tests/src/gui/testrendererv2gui.cpp +++ b/tests/src/gui/testrenderergui.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - testrendererv2gui.cpp + testrenderergui.cpp --------------------- begin : January 2012 copyright : (C) 2012 by Martin Dobias @@ -12,20 +12,20 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "testrendererv2gui.h" +#include "testrenderergui.h" #include #include #include #include #include -#include -#include +#include +#include #include #include -TestRendererV2GUI::TestRendererV2GUI( QWidget *parent ) : +TestRendererGUI::TestRendererGUI( QWidget *parent ) : QMainWindow( parent ) { resize( 640, 480 ); @@ -40,7 +40,7 @@ TestRendererV2GUI::TestRendererV2GUI( QWidget *parent ) : connect( QgsProject::instance(), SIGNAL( readProject( QDomDocument ) ), mMapCanvas, SLOT( readProject( QDomDocument ) ) ); } -void TestRendererV2GUI::loadLayers() +void TestRendererGUI::loadLayers() { // load just first vector layer QList canvasLayers; @@ -53,14 +53,14 @@ void TestRendererV2GUI::loadLayers() mMapCanvas->setLayerSet( canvasLayers ); } -void TestRendererV2GUI::setRenderer() +void TestRendererGUI::setRenderer() { QgsMapLayer* layer = mMapCanvas->layer( 0 ); Q_ASSERT( layer ); Q_ASSERT( layer->type() == QgsMapLayer::VectorLayer ); QgsVectorLayer* vlayer = static_cast( layer ); - QgsRendererV2PropertiesDialog dlg( vlayer, QgsStyleV2::defaultStyle() ); + QgsRendererPropertiesDialog dlg( vlayer, QgsStyle::defaultStyle() ); dlg.exec(); mMapCanvas->refresh(); @@ -79,7 +79,7 @@ int main( int argc, char* argv[] ) QgsApplication::init(); QgsApplication::initQgis(); - TestRendererV2GUI gui; + TestRendererGUI gui; QString projectFileName( argv[1] ); QgsProject::instance()->setFileName( projectFileName ); diff --git a/tests/src/gui/testrendererv2gui.h b/tests/src/gui/testrenderergui.h similarity index 90% rename from tests/src/gui/testrendererv2gui.h rename to tests/src/gui/testrenderergui.h index 08c2c6f4c88..2cfbbc328bf 100644 --- a/tests/src/gui/testrendererv2gui.h +++ b/tests/src/gui/testrenderergui.h @@ -1,5 +1,5 @@ /*************************************************************************** - testrendererv2gui.h + testrenderergui.h --------------------- begin : January 2012 copyright : (C) 2012 by Martin Dobias @@ -19,11 +19,11 @@ class QgsMapCanvas; -class TestRendererV2GUI : public QMainWindow +class TestRendererGUI : public QMainWindow { Q_OBJECT public: - explicit TestRendererV2GUI( QWidget *parent = 0 ); + explicit TestRendererGUI( QWidget *parent = 0 ); void loadLayers(); signals: diff --git a/tests/src/providers/grass/testqgsgrassprovider.cpp b/tests/src/providers/grass/testqgsgrassprovider.cpp index d189b6dc3f1..637427c6e78 100644 --- a/tests/src/providers/grass/testqgsgrassprovider.cpp +++ b/tests/src/providers/grass/testqgsgrassprovider.cpp @@ -26,9 +26,9 @@ #include #include "qgsfeatureiterator.h" #include -#include +#include #include -#include +#include #include #include #include "qgsrasterdataprovider.h" @@ -915,7 +915,7 @@ QList< TestQgsGrassCommandGroup > TestQgsGrassProvider::createCommands() TestQgsGrassCommandGroup commandGroup; TestQgsGrassCommand command; TestQgsGrassFeature grassFeature; - QgsLineStringV2 * line; + QgsLineString * line; QgsGeometry *geometry; QList pointList; @@ -1019,7 +1019,7 @@ QList< TestQgsGrassCommandGroup > TestQgsGrassProvider::createCommands() command = TestQgsGrassCommand( TestQgsGrassCommand::AddFeature ); grassFeature = TestQgsGrassFeature( GV_LINE ); grassFeature.setFeatureId( 1 ); - line = new QgsLineStringV2(); + line = new QgsLineString(); pointList.clear(); pointList << QgsPointV2( QgsWkbTypes::Point, 0, 0, 0 ); pointList << QgsPointV2( QgsWkbTypes::Point, 20, 10, 0 ); @@ -1060,7 +1060,7 @@ QList< TestQgsGrassCommandGroup > TestQgsGrassProvider::createCommands() command.verify = false; grassFeature = TestQgsGrassFeature( GV_BOUNDARY ); grassFeature.setFeatureId( 1 ); - line = new QgsLineStringV2(); + line = new QgsLineString(); pointList.clear(); pointList << QgsPointV2( QgsWkbTypes::Point, 0, 0, 0 ); pointList << QgsPointV2( QgsWkbTypes::Point, 20, 10, 0 ); diff --git a/tests/src/python/CMakeLists.txt b/tests/src/python/CMakeLists.txt index 5403e866757..a8818e7cc7a 100644 --- a/tests/src/python/CMakeLists.txt +++ b/tests/src/python/CMakeLists.txt @@ -18,7 +18,7 @@ ADD_PYTHON_TEST(PyQgsAttributeTableConfig test_qgsattributetableconfig.py) ADD_PYTHON_TEST(PyQgsAttributeTableModel test_qgsattributetablemodel.py) #ADD_PYTHON_TEST(PyQgsAuthenticationSystem test_qgsauthsystem.py) ADD_PYTHON_TEST(PyQgsBlendModes test_qgsblendmodes.py) -ADD_PYTHON_TEST(PyQgsCategorizedSymbolRendererV2 test_qgscategorizedsymbolrendererv2.py) +ADD_PYTHON_TEST(PyQgsCategorizedSymbolRenderer test_qgscategorizedsymbolrenderer.py) ADD_PYTHON_TEST(PyQgsColorButton test_qgscolorbutton.py) ADD_PYTHON_TEST(PyQgsColorScheme test_qgscolorscheme.py) ADD_PYTHON_TEST(PyQgsColorSchemeRegistry test_qgscolorschemeregistry.py) @@ -47,9 +47,9 @@ ADD_PYTHON_TEST(PyQgsFeatureIterator test_qgsfeatureiterator.py) ADD_PYTHON_TEST(PyQgsField test_qgsfield.py) ADD_PYTHON_TEST(PyQgsFontUtils test_qgsfontutils.py) ADD_PYTHON_TEST(PyQgsGeometryAvoidIntersections test_qgsgeometry_avoid_intersections.py) -ADD_PYTHON_TEST(PyQgsGeometryGeneratorSymbolLayerV2 test_qgsgeometrygeneratorsymbollayerv2.py) +ADD_PYTHON_TEST(PyQgsGeometryGeneratorSymbolLayer test_qgsgeometrygeneratorsymbollayer.py) ADD_PYTHON_TEST(PyQgsGeometryTest test_qgsgeometry.py) -ADD_PYTHON_TEST(PyQgsGraduatedSymbolRendererV2 test_qgsgraduatedsymbolrendererv2.py) +ADD_PYTHON_TEST(PyQgsGraduatedSymbolRenderer test_qgsgraduatedsymbolrenderer.py) ADD_PYTHON_TEST(PyQgsInterval test_qgsinterval.py) ADD_PYTHON_TEST(PyQgsJSONUtils test_qgsjsonutils.py) ADD_PYTHON_TEST(PyQgsMapUnitScale test_qgsmapunitscale.py) @@ -71,7 +71,7 @@ ADD_PYTHON_TEST(PyQgsRasterLayer test_qgsrasterlayer.py) ADD_PYTHON_TEST(PyQgsRectangle test_qgsrectangle.py) ADD_PYTHON_TEST(PyQgsRelation test_qgsrelation.py) ADD_PYTHON_TEST(PyQgsRelationManager test_qgsrelationmanager.py) -ADD_PYTHON_TEST(PyQgsRendererV2 test_qgsrendererv2.py) +ADD_PYTHON_TEST(PyQgsRenderer test_qgsrenderer.py) ADD_PYTHON_TEST(PyQgsRulebasedRenderer test_qgsrulebasedrenderer.py) ADD_PYTHON_TEST(PyQgsSingleSymbolRenderer test_qgssinglesymbolrenderer.py) ADD_PYTHON_TEST(PyQgsShapefileProvider test_provider_shapefile.py) diff --git a/tests/src/python/acceptable_missing_doc.py b/tests/src/python/acceptable_missing_doc.py index d9f6bad7bae..7d953760b1f 100644 --- a/tests/src/python/acceptable_missing_doc.py +++ b/tests/src/python/acceptable_missing_doc.py @@ -35,7 +35,7 @@ __revision__ = '$Format:%H$' ACCEPTABLE_MISSING_DOCS = { "QgsNineCellFilter": ["zFactor() const ", "setZFactor(double factor)", "setCellSizeX(double size)", "setInputNodataValue(double value)", "cellSizeX() const ", "cellSizeY() const ", "inputNodataValue() const ", "outputNodataValue() const ", "setCellSizeY(double size)", "setOutputNodataValue(double value)"], - "QgsVectorRandomColorRampV2": ["setValMin(int val)", "setCount(int val)", "hueMin() const ", "valMax() const ", "setSatMin(int val)", "setValMax(int val)", "valMin() const ", "hueMax() const ", "QgsVectorRandomColorRampV2(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)", "satMax() const ", "satMin() const ", "updateColors()", "setHueMax(int val)", "create(const QgsStringMap &properties=QgsStringMap())", "setSatMax(int val)", "setHueMin(int val)"], + "QgsVectorRandomColorRamp": ["setValMin(int val)", "setCount(int val)", "hueMin() const ", "valMax() const ", "setSatMin(int val)", "setValMax(int val)", "valMin() const ", "hueMax() const ", "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)", "satMax() const ", "satMin() const ", "updateColors()", "setHueMax(int val)", "create(const QgsStringMap &properties=QgsStringMap())", "setSatMax(int val)", "setHueMin(int val)"], "QgsGPSConnectionRegistry": ["instance()", "connectionList() const "], "QgsOSMDownload": ["setServiceUrl(const QString &serviceUrl)", "serviceUrl() const ", "setOutputFileName(const QString &outputFileName)", "outputFileName() const ", "errorString() const ", "setQuery(const QString &query)", "query() const ", "hasError() const "], "QgsExpression::WhenThen": ["WhenThen(Node *whenExp, Node *thenExp)"], @@ -43,24 +43,24 @@ ACCEPTABLE_MISSING_DOCS = { "QgsMapLayerRenderer": ["QgsMapLayerRenderer(const QString &layerID)"], "QgsSvgSelectorDialog": ["QgsSvgSelectorDialog(QWidget *parent=nullptr, Qt::WindowFlags fl=QgisGui::ModalDialogFlags, const QDialogButtonBox::StandardButtons &buttons=QDialogButtonBox::Close|QDialogButtonBox::Ok, Qt::Orientation orientation=Qt::Horizontal)"], "QgsRasterBlock": ["typeSize(int dataType)", "dataTypeSize() const ", "applyNoDataValues(const QgsRasterRangeList &rangeList)", "toString() const "], - "QgsVectorRandomColorRampV2Dialog": ["setSat1(int val)", "QgsVectorRandomColorRampV2Dialog(QgsVectorRandomColorRampV2 *ramp, QWidget *parent=nullptr)", "setVal1(int val)", "setCount(int val)", "setSat2(int val)", "setVal2(int val)", "setHue2(int val)", "setHue1(int val)", "updatePreview()"], + "QgsVectorRandomColorRampDialog": ["setSat1(int val)", "QgsVectorRandomColorRampDialog(QgsVectorRandomColorRamp *ramp, QWidget *parent=nullptr)", "setVal1(int val)", "setCount(int val)", "setSat2(int val)", "setVal2(int val)", "setHue2(int val)", "setHue1(int val)", "updatePreview()"], "QgsAbstractFeatureSource": ["iteratorOpened(QgsAbstractFeatureIterator *it)", "iteratorClosed(QgsAbstractFeatureIterator *it)"], - "QgsRuleBasedRendererV2Model": ["removeRule(const QModelIndex &index)", "ruleForIndex(const QModelIndex &index) const ", "updateRule(const QModelIndex &parent, int row)", "finishedAddingRules()", "insertRule(const QModelIndex &parent, int before, QgsRuleBasedRendererV2::Rule *newrule)", "QgsRuleBasedRendererV2Model(QgsRuleBasedRendererV2 *r)", "updateRule(const QModelIndex &index)", "willAddRules(const QModelIndex &parent, int count)", "clearFeatureCounts()"], + "QgsRuleBasedRendererModel": ["removeRule(const QModelIndex &index)", "ruleForIndex(const QModelIndex &index) const ", "updateRule(const QModelIndex &parent, int row)", "finishedAddingRules()", "insertRule(const QModelIndex &parent, int before, QgsRuleBasedRenderer::Rule *newrule)", "QgsRuleBasedRendererModel(QgsRuleBasedRenderer *r)", "updateRule(const QModelIndex &index)", "willAddRules(const QModelIndex &parent, int count)", "clearFeatureCounts()"], "QgsPointSample": ["QgsPointSample(QgsVectorLayer *inputLayer, const QString &outputLayer, const QString &nPointsAttribute, const QString &minDistAttribute=QString())"], "pal::LabelPosition": ["getNextPart() const ", "getQuadrant() const ", "polygonObstacleCallback(pal::FeaturePart *obstacle, void *ctx)", "countOverlapCallback(LabelPosition *lp, void *ctx)", "countFullOverlapCallback(LabelPosition *lp, void *ctx)", "getProblemFeatureId() const ", "isInConflictMultiPart(LabelPosition *lp)", "getPartId() const ", "isInConflictSinglePart(LabelPosition *lp)", "insertIntoIndex(RTree< LabelPosition *, double, 2, double > *index)", "getWidth() const ", "getNumOverlaps() const ", "setPartId(int id)", "getReversed() const ", "resetNumOverlaps()", "removeFromIndex(RTree< LabelPosition *, double, 2, double > *index)", "getUpsideDown() const ", "getHeight() const ", "removeOverlapCallback(LabelPosition *lp, void *ctx)", "setNextPart(LabelPosition *next)"], - "QgsShapeburstFillSymbolLayerV2Widget": ["applyColorRamp()", "create(const QgsVectorLayer *vl)", "offsetChanged()", "setColor(const QColor &color)", "setColor2(const QColor &color)", "QgsShapeburstFillSymbolLayerV2Widget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "colorModeChanged()"], + "QgsShapeburstFillSymbolLayerWidget": ["applyColorRamp()", "create(const QgsVectorLayer *vl)", "offsetChanged()", "setColor(const QColor &color)", "setColor2(const QColor &color)", "QgsShapeburstFillSymbolLayerWidget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "colorModeChanged()"], "QgsSymbolLayerAbstractMetadata": ["QgsSymbolLayerAbstractMetadata(const QString &name, const QString &visibleName, QgsSymbol::SymbolType type)", "type() const ", "name() const ", "visibleName() const "], "QgsGroupBoxCollapseButton": ["QgsGroupBoxCollapseButton(QWidget *parent=nullptr)", "shiftDown() const ", "setAltDown(bool updown)", "setShiftDown(bool shiftdown)", "altDown() const "], - "QgsGeometryGeneratorSymbolLayerV2": ["create(const QgsStringMap &properties)"], - "QgsVectorLayerEditUtils": ["cache()", "QgsVectorLayerEditUtils(QgsVectorLayer *layer)", "addPart(QgsCurveV2 *ring, QgsFeatureId featureId)"], + "QgsGeometryGeneratorSymbolLayer": ["create(const QgsStringMap &properties)"], + "QgsVectorLayerEditUtils": ["cache()", "QgsVectorLayerEditUtils(QgsVectorLayer *layer)", "addPart(QgsCurve *ring, QgsFeatureId featureId)"], "QgsMapLayerComboBox": ["indexChanged(int i)", "rowsChanged()"], "QgsHiddenWidgetWrapper": ["QgsHiddenWidgetWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor=nullptr, QWidget *parent=nullptr)"], "QgsDxfExport": ["QgsDxfExport(const QgsDxfExport &dxfExport)", "SymbologyExport", "mapUnitScaleFactor(double scaleDenominator, QgsSymbol::OutputUnit symbolUnits, Qgis::UnitType mapUnits)"], "QgsCheckBoxConfigDlg": ["QgsCheckBoxConfigDlg(QgsVectorLayer *vl, int fieldIdx, QWidget *parent=nullptr)"], "QgsMessageLog": ["MessageLevel", "instance()", "messageReceived(bool received)", "messageReceived(const QString &message, const QString &tag, QgsMessageLog::MessageLevel level)"], - "QgsFontMarkerSymbolLayerV2Widget": ["setAngle(double angle)", "create(const QgsVectorLayer *vl)", "setFontFamily(const QFont &font)", "QgsFontMarkerSymbolLayerV2Widget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "setColor(const QColor &color)", "setOffset()", "setCharacter(QChar chr)", "setSize(double size)"], - "QgsStyleV2ManagerDialog": ["removeItem()", "importItems()", "removeSymbol()", "addColorRamp(QAction *action)", "exportItemsSVG()", "editItem()", "exportSelectedItemsImages(const QString &dir, const QString &format, QSize size)", "editSymbol()", "editColorRamp()", "currentItemType()", "addGroup()", "groupSelectedSymbols()", "groupChanged(const QModelIndex &)", "addItem()", "itemChanged(QStandardItem *item)", "removeGroup()", "QgsStyleV2ManagerDialog(QgsStyleV2 *style, QWidget *parent=nullptr)", "groupRenamed(QStandardItem *)", "removeColorRamp()", "exportItemsPNG()", "exportItems()", "currentItemName()"], - "QgsVectorColorBrewerColorRampV2Dialog": ["setSchemeName()", "populateVariants()", "QgsVectorColorBrewerColorRampV2Dialog(QgsVectorColorBrewerColorRampV2 *ramp, QWidget *parent=nullptr)", "setColors()", "updatePreview()"], + "QgsFontMarkerSymbolLayerWidget": ["setAngle(double angle)", "create(const QgsVectorLayer *vl)", "setFontFamily(const QFont &font)", "QgsFontMarkerSymbolLayerWidget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "setColor(const QColor &color)", "setOffset()", "setCharacter(QChar chr)", "setSize(double size)"], + "QgsStyleManagerDialog": ["removeItem()", "importItems()", "removeSymbol()", "addColorRamp(QAction *action)", "exportItemsSVG()", "editItem()", "exportSelectedItemsImages(const QString &dir, const QString &format, QSize size)", "editSymbol()", "editColorRamp()", "currentItemType()", "addGroup()", "groupSelectedSymbols()", "groupChanged(const QModelIndex &)", "addItem()", "itemChanged(QStandardItem *item)", "removeGroup()", "QgsStyleManagerDialog(QgsStyle *style, QWidget *parent=nullptr)", "groupRenamed(QStandardItem *)", "removeColorRamp()", "exportItemsPNG()", "exportItems()", "currentItemName()"], + "QgsVectorColorBrewerColorRampDialog": ["setSchemeName()", "populateVariants()", "QgsVectorColorBrewerColorRampDialog(QgsVectorColorBrewerColorRamp *ramp, QWidget *parent=nullptr)", "setColors()", "updatePreview()"], "QgsFeatureListModel": ["fidToIndexList(QgsFeatureId fid)", "onBeginInsertRows(const QModelIndex &parent, int first, int last)", "onBeginRemoveRows(const QModelIndex &parent, int first, int last)", "featureByIndex(const QModelIndex &index, QgsFeature &feat)", "mapToMaster(const QModelIndex &proxyIndex) const ", "onEndRemoveRows(const QModelIndex &parent, int first, int last)", "setSourceModel(QgsAttributeTableFilterModel *sourceModel)", "onEndInsertRows(const QModelIndex &parent, int first, int last)", "fidToIdx(const QgsFeatureId fid) const ", "idxToFid(const QModelIndex &index) const ", "layerCache()", "mapSelectionFromMaster(const QItemSelection &selection) const ", "Role", "masterModel()", "displayExpression() const ", "mapFromMaster(const QModelIndex &sourceIndex) const ", "QgsFeatureListModel(QgsAttributeTableFilterModel *sourceModel, QObject *parent=nullptr)", "mapSelectionToMaster(const QItemSelection &selection) const "], "QgsCptCityArchive": ["copyingInfo(const QString &fileName)", "QgsCptCityArchive(const QString &archiveName=DEFAULT_CPTCITY_ARCHIVE, const QString &baseDir=QString())", "baseDir(QString archiveName)", "defaultBaseDir()", "initArchive(const QString &archiveName, const QString &archiveBaseDir)", "archiveRegistry()", "descFileName(const QString &dirName) const ", "initArchives(bool loadAll=false)", "findFileName(const QString &target, const QString &startDir, const QString &baseDir)", "rootItems() const ", "copyingFileName(const QString &dirName) const ", "clearArchives()", "setBaseDir(const QString &dirName)", "isEmpty()", "baseDir() const ", "selectionItems() const ", "defaultArchive()", "initDefaultArchive()", "archiveName() const ", "description(const QString &fileName)"], "QgsLinearMinMaxEnhancement": ["QgsLinearMinMaxEnhancement(Qgis::DataType, double, double)"], @@ -84,8 +84,8 @@ ACCEPTABLE_MISSING_DOCS = { "QgsRelationReferenceFactory": ["QgsRelationReferenceFactory(const QString &name, QgsMapCanvas *canvas, QgsMessageBar *messageBar)"], "QgsDxfPaintDevice": ["setDrawingSize(QSizeF size)", "setLayer(const QString &layer)", "setOutputSize(const QRectF &r)", "QgsDxfPaintDevice(QgsDxfExport *dxf)", "setShift(QPointF shift)"], "QgsPoint": ["operator-(const QgsPoint &p) const ", "operator-(QgsVector v) const ", "operator+=(QgsVector v)", "operator-=(QgsVector v)", "operator+(QgsVector v) const "], - "QgsVectorGradientColorRampV2Dialog": ["setItemStopColor(const QColor &newColor)", "setColor1(const QColor &color)", "stopDoubleClicked(QTreeWidgetItem *item, int column)", "setStopColor(QTreeWidgetItem *item, const QColor &color)", "QgsVectorGradientColorRampV2Dialog(QgsVectorGradientColorRampV2 *ramp, QWidget *parent=nullptr)", "setColor2(const QColor &color)", "addStop()", "toggledStops(bool on)", "removeStop()", "updateStops()", "updatePreview()"], - "QgsCptCityColorRampV2Dialog": ["clearCopyingInfo()", "showAll()", "saveAsGradientRamp() const ", "updatePreview(bool clear=false)", "setTreeModel(QgsCptCityBrowserModel *model)", "updateCopyingInfo(const QMap< QString, QString > ©ingMap)", "QgsCptCityColorRampV2Dialog(QgsCptCityColorRampV2 *ramp, QWidget *parent=nullptr)", "updateTreeView(QgsCptCityDataItem *item, bool resetRamp=true)", "onFinished()", "updateRamp()", "populateVariants()", "updateListWidget(QgsCptCityDataItem *item)", "selectedName() const "], + "QgsVectorGradientColorRampDialog": ["setItemStopColor(const QColor &newColor)", "setColor1(const QColor &color)", "stopDoubleClicked(QTreeWidgetItem *item, int column)", "setStopColor(QTreeWidgetItem *item, const QColor &color)", "QgsVectorGradientColorRampDialog(QgsVectorGradientColorRamp *ramp, QWidget *parent=nullptr)", "setColor2(const QColor &color)", "addStop()", "toggledStops(bool on)", "removeStop()", "updateStops()", "updatePreview()"], + "QgsCptCityColorRampDialog": ["clearCopyingInfo()", "showAll()", "saveAsGradientRamp() const ", "updatePreview(bool clear=false)", "setTreeModel(QgsCptCityBrowserModel *model)", "updateCopyingInfo(const QMap< QString, QString > ©ingMap)", "QgsCptCityColorRampDialog(QgsCptCityColorRamp *ramp, QWidget *parent=nullptr)", "updateTreeView(QgsCptCityDataItem *item, bool resetRamp=true)", "onFinished()", "updateRamp()", "populateVariants()", "updateListWidget(QgsCptCityDataItem *item)", "selectedName() const "], "QgsComposerMouseHandles": ["SnapGuideMode", "composition()", "QgsComposerMouseHandles(QgsComposition *composition)", "setComposition(QgsComposition *c)", "ItemPositionMode"], "QgsExpressionBuilderDialog": ["QgsExpressionBuilderDialog(QgsVectorLayer *layer, const QString &startText=QString(), QWidget *parent=nullptr, const QString &key=\"generic\", const QgsExpressionContext &context=QgsExpressionContext())", "expressionText()", "setExpressionText(const QString &text)"], "QgsProviderMetadata": ["QgsProviderMetadata(const QString &_key, const QString &_description, const QString &_library)"], @@ -104,12 +104,12 @@ ACCEPTABLE_MISSING_DOCS = { "QgsMapLayerLegendUtils": ["hasLegendNodeUserLabel(QgsLayerTreeLayer *nodeLayer, int originalIndex)", "hasLegendNodeOrder(QgsLayerTreeLayer *nodeLayer)", "setLegendNodeUserLabel(QgsLayerTreeLayer *nodeLayer, int originalIndex, const QString &newLabel)", "legendNodeOrder(QgsLayerTreeLayer *nodeLayer)", "legendNodeUserLabel(QgsLayerTreeLayer *nodeLayer, int originalIndex)", "setLegendNodeOrder(QgsLayerTreeLayer *nodeLayer, const QList< int > &order)"], "QgsMultiRenderChecker": ["setControlPathPrefix(const QString &prefix)"], "QgsLabelAttributes": ["setAngle(double angle)", "setBufferStyle(Qt::BrushStyle style)", "colorIsSet() const ", "setBorderColor(const QColor &color)", "italicIsSet() const ", "multilineEnabled() const ", "italic() const ", "setStrikeOut(bool enable)", "boldIsSet() const ", "angleIsAuto() const ", "bufferEnabled() const ", "setBorderStyle(Qt::PenStyle style)", "setBufferSize(double size, int type)", "familyIsSet() const ", "setMultilineEnabled(bool useMultiline)", "bold() const ", "bufferSize() const ", "offsetIsSet() const ", "bufferStyle() const ", "selectedOnly() const ", "sizeIsSet() const ", "sizeType() const ", "setOffset(double x, double y, int type)", "textIsSet() const ", "setFamily(const QString &family)", "underline() const ", "unitsName(int units)", "offsetType() const ", "setBold(bool enable)", "borderStyleIsSet() const ", "family() const ", "Units", "setBufferColor(const QColor &color)", "strikeOut() const ", "borderWidthIsSet() const ", "bufferStyleIsSet() const ", "size() const ", "color() const ", "text() const ", "alignmentIsSet() const ", "setSize(double size, int type)", "setItalic(bool enable)", "setSelectedOnly(bool selectedonly)", "unitsCode(const QString &name)", "setAlignment(int alignment)", "bufferSizeIsSet() const ", "bufferColorIsSet() const ", "setColor(const QColor &color)", "borderColorIsSet() const ", "setBorderWidth(int width)", "yOffset() const ", "setUnderline(bool enable)", "alignmentName(int alignment)", "setText(const QString &text)", "underlineIsSet() const ", "borderColor() const ", "angleIsSet() const ", "xOffset() const ", "alignmentCode(const QString &name)", "bufferSizeType() const ", "angle() const ", "borderWidth() const ", "alignment() const ", "bufferColor() const ", "setBufferEnabled(bool useBufferFlag)", "strikeOutIsSet() const ", "setAutoAngle(bool state)", "borderStyle() const "], - "QgsLineSymbolV2": ["setWidth(double width)", "QgsLineSymbolV2(const QgsSymbolLayerList &layers=QgsSymbolLayerList())", "width() const ", "renderPolyline(const QPolygonF &points, const QgsFeature *f, QgsRenderContext &context, int layer=-1, bool selected=false)"], + "QgsLineSymbol": ["setWidth(double width)", "QgsLineSymbol(const QgsSymbolLayerList &layers=QgsSymbolLayerList())", "width() const ", "renderPolyline(const QPolygonF &points, const QgsFeature *f, QgsRenderContext &context, int layer=-1, bool selected=false)"], "QgsTextEditWidgetFactory": ["QgsTextEditWidgetFactory(const QString &name)"], - "QgsRendererRangeV2": ["label() const ", "QgsRendererRangeV2(const QgsRendererRangeV2 &range)", "QgsRendererRangeV2(double lowerValue, double upperValue, QgsSymbol *symbol, const QString &label, bool render=true)", "upperValue() const ", "lowerValue() const ", "symbol() const ", "setUpperValue(double upperValue)", "operator<(const QgsRendererRangeV2 &other) const ", "swap(QgsRendererRangeV2 &other)", "renderState() const ", "toSld(QDomDocument &doc, QDomElement &element, QgsStringMap props) const ", "setRenderState(bool render)", "setLowerValue(double lowerValue)", "setSymbol(QgsSymbol *s)", "dump() const ", "setLabel(const QString &label)"], + "QgsRendererRange": ["label() const ", "QgsRendererRange(const QgsRendererRange &range)", "QgsRendererRange(double lowerValue, double upperValue, QgsSymbol *symbol, const QString &label, bool render=true)", "upperValue() const ", "lowerValue() const ", "symbol() const ", "setUpperValue(double upperValue)", "operator<(const QgsRendererRange &other) const ", "swap(QgsRendererRange &other)", "renderState() const ", "toSld(QDomDocument &doc, QDomElement &element, QgsStringMap props) const ", "setRenderState(bool render)", "setLowerValue(double lowerValue)", "setSymbol(QgsSymbol *s)", "dump() const ", "setLabel(const QString &label)"], "QgsTextAnnotationItem": ["QgsTextAnnotationItem(QgsMapCanvas *canvas)"], - "QgsStyleV2": ["symbolSaved(const QString &name, QgsSymbol *symbol)"], - "QgsMarkerLineSymbolLayerV2": ["markerAngle(const QPolygonF &points, bool isRing, int vertex)", "renderPolylineInterval(const QPolygonF &points, QgsSymbolRenderContext &context)", "setIntervalMapUnitScale(const QgsMapUnitScale &scale)", "renderPolylineVertex(const QPolygonF &points, QgsSymbolRenderContext &context, Placement placement=Vertex)", "QgsMarkerLineSymbolLayerV2(bool rotateMarker=DEFAULT_MARKERLINE_ROTATE, double interval=DEFAULT_MARKERLINE_INTERVAL)", "intervalUnit() const ", "setIntervalUnit(QgsSymbol::OutputUnit unit)", "intervalMapUnitScale() const ", "renderPolylineCentral(const QPolygonF &points, QgsSymbolRenderContext &context)"], + "QgsStyle": ["symbolSaved(const QString &name, QgsSymbol *symbol)"], + "QgsMarkerLineSymbolLayer": ["markerAngle(const QPolygonF &points, bool isRing, int vertex)", "renderPolylineInterval(const QPolygonF &points, QgsSymbolRenderContext &context)", "setIntervalMapUnitScale(const QgsMapUnitScale &scale)", "renderPolylineVertex(const QPolygonF &points, QgsSymbolRenderContext &context, Placement placement=Vertex)", "QgsMarkerLineSymbolLayer(bool rotateMarker=DEFAULT_MARKERLINE_ROTATE, double interval=DEFAULT_MARKERLINE_INTERVAL)", "intervalUnit() const ", "setIntervalUnit(QgsSymbol::OutputUnit unit)", "intervalMapUnitScale() const ", "renderPolylineCentral(const QPolygonF &points, QgsSymbolRenderContext &context)"], "QgsEffectDrawModeComboBox": ["QgsEffectDrawModeComboBox(QWidget *parent=nullptr)"], "CharacterWidget": ["updateFontMerging(bool enable)", "characterSelected(QChar character)", "updateColumns(int cols)", "setCharacter(QChar character)", "getColumns() const ", "getSquareSize() const "], "QgsVector": ["rotateBy(double rot) const ", "perpVector() const ", "x() const ", "operator*(QgsVector v) const ", "angle(QgsVector v) const ", "operator*(double scalar) const ", "length() const ", "normal() const ", "operator/(double scalar) const ", "y() const ", "QgsVector(double x, double y)"], @@ -120,8 +120,8 @@ ACCEPTABLE_MISSING_DOCS = { "QgsMapToPixelSimplifier": ["QgsMapToPixelSimplifier(int simplifyFlags, double tolerance)", "simplifyFlags() const ", "setSimplifyFlags(int simplifyFlags)"], "QgsHtmlAnnotationItem": ["QgsHtmlAnnotationItem(QgsMapCanvas *canvas, QgsVectorLayer *vlayer=nullptr, bool hasFeature=false, int feature=0)", "htmlPage() const ", "vectorLayer() const ", "setHTMLPage(const QString &htmlFile)"], "QgsWkbException": ["QgsWkbException(QString const &what)"], - "QgsSmartGroupEditorDialog": ["QgsSmartGroupEditorDialog(QgsStyleV2 *style, QWidget *parent=nullptr)"], - "QgsRendererV2AbstractMetadata": ["icon() const ", "createRendererFromSld(QDomElement &elem, QgsWkbTypes::GeometryType geomType)", "setIcon(const QIcon &icon)", "QgsRendererV2AbstractMetadata(const QString &name, const QString &visibleName, const QIcon &icon=QIcon())", "visibleName() const ", "name() const "], + "QgsSmartGroupEditorDialog": ["QgsSmartGroupEditorDialog(QgsStyle *style, QWidget *parent=nullptr)"], + "QgsRendererAbstractMetadata": ["icon() const ", "createRendererFromSld(QDomElement &elem, QgsWkbTypes::GeometryType geomType)", "setIcon(const QIcon &icon)", "QgsRendererAbstractMetadata(const QString &name, const QString &visibleName, const QIcon &icon=QIcon())", "visibleName() const ", "name() const "], "QgsBrushStyleComboBox": ["setBrushStyle(Qt::BrushStyle style)", "QgsBrushStyleComboBox(QWidget *parent=nullptr)", "iconForBrush(Qt::BrushStyle style)", "brushStyle() const "], "QgsAttributeTableAction": ["featureForm()", "execute()", "QgsAttributeTableAction(const QString &name, QgsDualView *dualView, int action, const QModelIndex &fieldIdx)"], "QgsColorSwatchDelegate": ["QgsColorSwatchDelegate(QWidget *parent=nullptr)"], @@ -131,8 +131,8 @@ ACCEPTABLE_MISSING_DOCS = { "QgsRangeWidgetFactory": ["QgsRangeWidgetFactory(const QString &name)"], "QgsVectorLayer": ["saveLayerToProject()", "diagramRenderer() const ", "invalidateSymbolCountedFlag()", "committedAttributeValuesChanges(const QString &layerId, const QgsChangedAttributesMap &changedAttributesValues)", "committedFeaturesRemoved(const QString &layerId, const QgsFeatureIds &deletedFeatureIds)", "None", "committedFeaturesAdded(const QString &layerId, const QgsFeatureList &addedFeatures)", "excludeAttributesWFS() const ", "setExcludeAttributesWMS(const QSet< QString > &att)", "writeSld(QDomNode &node, QDomDocument &doc, QString &errorMessage) const ", "actions()", "geometryChanged(QgsFeatureId fid, QgsGeometry &geom)", "committedGeometriesChanges(const QString &layerId, const QgsGeometryMap &changedGeometries)", "commitErrors()", "attributeAliases() const ", "vectorJoins() const ", "diagramLayerSettings() const ", "committedAttributesAdded(const QString &layerId, const QList< QgsField > &addedAttributes)", "attributeValueChanged(QgsFeatureId fid, int idx, const QVariant &)", "EditorLayout", "setDiagramLayerSettings(const QgsDiagramLayerSettings &s)", "setExcludeAttributesWFS(const QSet< QString > &att)", "excludeAttributesWMS() const "], "QgsSymbolLayerUtils": [ - "encodeSldBrushStyle(Qt::BrushStyle style)", "colorRampPreviewIcon(QgsVectorColorRampV2 *ramp, QSize size)", "decodeSldFontWeight(const QString &str)", "decodePenJoinStyle(const QString &str)", "wellKnownMarkerToSld(QDomDocument &doc, QDomElement &element, const QString &name, const QColor &color, const QColor &borderColor, Qt::PenStyle borderStyle, double borderWidth=-1, double size=-1)", "createRotationElement(QDomDocument &doc, QDomElement &element, const QString &rotationFunc)", "clearSymbolMap(QgsSymbolMap &symbols)", "labelTextToSld(QDomDocument &doc, QDomElement &element, const QString &label, const QFont &font, const QColor &color=QColor(), double size=-1)", "saveSymbol(const QString &symbolName, QgsSymbol *symbol, QDomDocument &doc)", "encodePenCapStyle(Qt::PenCapStyle style)", "drawStippledBackground(QPainter *painter, QRect rect)", "needSvgFill(QDomElement &element)", "decodePoint(const QString &str)", "decodeSldLineJoinStyle(const QString &str)", "encodeSldFontWeight(int weight)", "decodeSldFontStyle(const QString &str)", "decodeSldRealVector(const QString &s)", "encodeRealVector(const QVector< qreal > &v)", "encodeSldFontStyle(QFont::Style style)", "decodeScaleMethod(const QString &str)", "externalGraphicFromSld(QDomElement &element, QString &path, QString &mime, QColor &color, double &size)", "needFontMarker(QDomElement &element)", "decodeSldAlpha(const QString &str)", "saveColorRamp(const QString &name, QgsVectorColorRampV2 *ramp, QDomDocument &doc)", "createVendorOptionElement(QDomDocument &doc, const QString &name, const QString &value)", "createLineLayerFromSld(QDomElement &element)", "createMarkerLayerFromSld(QDomElement &element)", "loadSymbols(QDomElement &element)", "encodeColor(const QColor &color)", "saveSymbols(QgsSymbolMap &symbols, const QString &tagName, QDomDocument &doc)", "createDisplacementElement(QDomDocument &doc, QDomElement &element, QPointF offset)", "createFillLayerFromSld(QDomElement &element)", "decodeBrushStyle(const QString &str)", "encodeBrushStyle(Qt::BrushStyle style)", "createSvgParameterElement(QDomDocument &doc, const QString &name, const QString &value)", "loadSymbolLayer(QDomElement &element)", "decodeOutputUnit(const QString &str)", "encodeSldLineJoinStyle(Qt::PenJoinStyle style)", "encodePenStyle(Qt::PenStyle style)", "decodeSldBrushStyle(const QString &str)", "createOnlineResourceElement(QDomDocument &doc, QDomElement &element, const QString &path, const QString &format)", "encodePoint(QPointF point)", "needMarkerLine(QDomElement &element)", "onlineResourceFromSldElement(QDomElement &element, QString &path, QString &format)", "decodePenCapStyle(const QString &str)", "displacementFromSldElement(QDomElement &element, QPointF &offset)", "createGeometryElement(QDomDocument &doc, QDomElement &element, const QString &geomFunc)", "hasExternalGraphic(QDomElement &element)", - "externalGraphicToSld(QDomDocument &doc, QDomElement &element, const QString &path, const QString &mime, const QColor &color, double size=-1)", "opacityFromSldElement(QDomElement &element, QString &alphaFunc)", "getVendorOptionList(QDomElement &element)", "decodeRealVector(const QString &s)", "convertPolygonSymbolizerToPointMarker(QDomElement &element, QgsSymbolLayerList &layerList)", "decodeBlendMode(const QString &s)", "fillFromSld(QDomElement &element, Qt::BrushStyle &brushStyle, QColor &color)", "decodeSldLineCapStyle(const QString &str)", "externalMarkerFromSld(QDomElement &element, QString &path, QString &format, int &markIndex, QColor &color, double &size)", "decodeMapUnitScale(const QString &str)", "externalMarkerToSld(QDomDocument &doc, QDomElement &element, const QString &path, const QString &format, int *markIndex=nullptr, const QColor &color=QColor(), double size=-1)", "encodeScaleMethod(QgsSymbol::ScaleMethod scaleMethod)", "encodeMapUnitScale(const QgsMapUnitScale &mapUnitScale)", "hasWellKnownMark(QDomElement &element)", "rotationFromSldElement(QDomElement &element, QString &rotationFunc)", "decodeColor(const QString &str)", "needLinePatternFill(QDomElement &element)", "decodePenStyle(const QString &str)", "encodeSldUom(QgsSymbol::OutputUnit unit, double *scaleFactor)", "saveProperties(QgsStringMap props, QDomDocument &doc, QDomElement &element)", "createFunctionElement(QDomDocument &doc, QDomElement &element, const QString &function)", "createOpacityElement(QDomDocument &doc, QDomElement &element, const QString &alphaFunc)", "createSymbolLayerV2ListFromSld(QDomElement &element, QgsWkbTypes::GeometryType geomType, QgsSymbolLayerList &layers)", "functionFromSldElement(QDomElement &element, QString &function)", "symbolLayerPreviewIcon(QgsSymbolLayer *layer, QgsSymbol::OutputUnit u, QSize size, const QgsMapUnitScale &scale=QgsMapUnitScale())", "geometryFromSldElement(QDomElement &element, QString &geomFunc)", "needEllipseMarker(QDomElement &element)", "loadColorRamp(QDomElement &element)", "parseProperties(QDomElement &element)", "colorRampPreviewPixmap(QgsVectorColorRampV2 *ramp, QSize size)", "needPointPatternFill(QDomElement &element)", "encodeSldRealVector(const QVector< qreal > &v)", "encodeSldLineCapStyle(Qt::PenCapStyle style)", "symbolPreviewIcon(QgsSymbol *symbol, QSize size)", "getSvgParameterList(QDomElement &element)", "encodeSldAlpha(int alpha)", "needSvgMarker(QDomElement &element)", "fillToSld(QDomDocument &doc, QDomElement &element, Qt::BrushStyle brushStyle, const QColor &color=QColor())", "lineFromSld(QDomElement &element, Qt::PenStyle &penStyle, QColor &color, double &width, Qt::PenJoinStyle *penJoinStyle=nullptr, Qt::PenCapStyle *penCapStyle=nullptr, QVector< qreal > *customDashPattern=nullptr, double *dashOffset=nullptr)", "encodeOutputUnit(QgsSymbol::OutputUnit unit)", "decodeSldUom(const QString &str, double *scaleFactor)", "encodePenJoinStyle(Qt::PenJoinStyle style)"], + "encodeSldBrushStyle(Qt::BrushStyle style)", "colorRampPreviewIcon(QgsVectorColorRamp *ramp, QSize size)", "decodeSldFontWeight(const QString &str)", "decodePenJoinStyle(const QString &str)", "wellKnownMarkerToSld(QDomDocument &doc, QDomElement &element, const QString &name, const QColor &color, const QColor &borderColor, Qt::PenStyle borderStyle, double borderWidth=-1, double size=-1)", "createRotationElement(QDomDocument &doc, QDomElement &element, const QString &rotationFunc)", "clearSymbolMap(QgsSymbolMap &symbols)", "labelTextToSld(QDomDocument &doc, QDomElement &element, const QString &label, const QFont &font, const QColor &color=QColor(), double size=-1)", "saveSymbol(const QString &symbolName, QgsSymbol *symbol, QDomDocument &doc)", "encodePenCapStyle(Qt::PenCapStyle style)", "drawStippledBackground(QPainter *painter, QRect rect)", "needSvgFill(QDomElement &element)", "decodePoint(const QString &str)", "decodeSldLineJoinStyle(const QString &str)", "encodeSldFontWeight(int weight)", "decodeSldFontStyle(const QString &str)", "decodeSldRealVector(const QString &s)", "encodeRealVector(const QVector< qreal > &v)", "encodeSldFontStyle(QFont::Style style)", "decodeScaleMethod(const QString &str)", "externalGraphicFromSld(QDomElement &element, QString &path, QString &mime, QColor &color, double &size)", "needFontMarker(QDomElement &element)", "decodeSldAlpha(const QString &str)", "saveColorRamp(const QString &name, QgsVectorColorRamp *ramp, QDomDocument &doc)", "createVendorOptionElement(QDomDocument &doc, const QString &name, const QString &value)", "createLineLayerFromSld(QDomElement &element)", "createMarkerLayerFromSld(QDomElement &element)", "loadSymbols(QDomElement &element)", "encodeColor(const QColor &color)", "saveSymbols(QgsSymbolMap &symbols, const QString &tagName, QDomDocument &doc)", "createDisplacementElement(QDomDocument &doc, QDomElement &element, QPointF offset)", "createFillLayerFromSld(QDomElement &element)", "decodeBrushStyle(const QString &str)", "encodeBrushStyle(Qt::BrushStyle style)", "createSvgParameterElement(QDomDocument &doc, const QString &name, const QString &value)", "loadSymbolLayer(QDomElement &element)", "decodeOutputUnit(const QString &str)", "encodeSldLineJoinStyle(Qt::PenJoinStyle style)", "encodePenStyle(Qt::PenStyle style)", "decodeSldBrushStyle(const QString &str)", "createOnlineResourceElement(QDomDocument &doc, QDomElement &element, const QString &path, const QString &format)", "encodePoint(QPointF point)", "needMarkerLine(QDomElement &element)", "onlineResourceFromSldElement(QDomElement &element, QString &path, QString &format)", "decodePenCapStyle(const QString &str)", "displacementFromSldElement(QDomElement &element, QPointF &offset)", "createGeometryElement(QDomDocument &doc, QDomElement &element, const QString &geomFunc)", "hasExternalGraphic(QDomElement &element)", + "externalGraphicToSld(QDomDocument &doc, QDomElement &element, const QString &path, const QString &mime, const QColor &color, double size=-1)", "opacityFromSldElement(QDomElement &element, QString &alphaFunc)", "getVendorOptionList(QDomElement &element)", "decodeRealVector(const QString &s)", "convertPolygonSymbolizerToPointMarker(QDomElement &element, QgsSymbolLayerList &layerList)", "decodeBlendMode(const QString &s)", "fillFromSld(QDomElement &element, Qt::BrushStyle &brushStyle, QColor &color)", "decodeSldLineCapStyle(const QString &str)", "externalMarkerFromSld(QDomElement &element, QString &path, QString &format, int &markIndex, QColor &color, double &size)", "decodeMapUnitScale(const QString &str)", "externalMarkerToSld(QDomDocument &doc, QDomElement &element, const QString &path, const QString &format, int *markIndex=nullptr, const QColor &color=QColor(), double size=-1)", "encodeScaleMethod(QgsSymbol::ScaleMethod scaleMethod)", "encodeMapUnitScale(const QgsMapUnitScale &mapUnitScale)", "hasWellKnownMark(QDomElement &element)", "rotationFromSldElement(QDomElement &element, QString &rotationFunc)", "decodeColor(const QString &str)", "needLinePatternFill(QDomElement &element)", "decodePenStyle(const QString &str)", "encodeSldUom(QgsSymbol::OutputUnit unit, double *scaleFactor)", "saveProperties(QgsStringMap props, QDomDocument &doc, QDomElement &element)", "createFunctionElement(QDomDocument &doc, QDomElement &element, const QString &function)", "createOpacityElement(QDomDocument &doc, QDomElement &element, const QString &alphaFunc)", "createSymbolLayerListFromSld(QDomElement &element, QgsWkbTypes::GeometryType geomType, QgsSymbolLayerList &layers)", "functionFromSldElement(QDomElement &element, QString &function)", "symbolLayerPreviewIcon(QgsSymbolLayer *layer, QgsSymbol::OutputUnit u, QSize size, const QgsMapUnitScale &scale=QgsMapUnitScale())", "geometryFromSldElement(QDomElement &element, QString &geomFunc)", "needEllipseMarker(QDomElement &element)", "loadColorRamp(QDomElement &element)", "parseProperties(QDomElement &element)", "colorRampPreviewPixmap(QgsVectorColorRamp *ramp, QSize size)", "needPointPatternFill(QDomElement &element)", "encodeSldRealVector(const QVector< qreal > &v)", "encodeSldLineCapStyle(Qt::PenCapStyle style)", "symbolPreviewIcon(QgsSymbol *symbol, QSize size)", "getSvgParameterList(QDomElement &element)", "encodeSldAlpha(int alpha)", "needSvgMarker(QDomElement &element)", "fillToSld(QDomDocument &doc, QDomElement &element, Qt::BrushStyle brushStyle, const QColor &color=QColor())", "lineFromSld(QDomElement &element, Qt::PenStyle &penStyle, QColor &color, double &width, Qt::PenJoinStyle *penJoinStyle=nullptr, Qt::PenCapStyle *penCapStyle=nullptr, QVector< qreal > *customDashPattern=nullptr, double *dashOffset=nullptr)", "encodeOutputUnit(QgsSymbol::OutputUnit unit)", "decodeSldUom(const QString &str, double *scaleFactor)", "encodePenJoinStyle(Qt::PenJoinStyle style)"], "QgsVectorFileWriter::SetOption": ["SetOption(const QString &docString, const QStringList &values, const QString &defaultValue, bool allowNone=false)"], "QgsDataItem": ["populate(const QVector< QgsDataItem * > &children)", "icon()", "emitDataChanged(QgsDataItem *item)", "setIcon(const QIcon &icon)", "emitEndRemoveItems()", "emitBeginRemoveItems(QgsDataItem *parent, int first, int last)", "State", "beginInsertItems(QgsDataItem *parent, int first, int last)", "refresh()", "Type", "setCapabilities(const Capabilities &capabilities)", "toolTip() const ", "hasChildren()", "dataChanged(QgsDataItem *item)", "refresh(QVector< QgsDataItem * > children)", "setCrs(QgsCoordinateReferenceSystem crs)", "deleteLater(QVector< QgsDataItem * > &items)", "name() const ", "emitDataChanged()", "setToolTip(const QString &msg)", "setName(const QString &name)", "endRemoveItems()", "endInsertItems()", "paramWidget()", "setPath(const QString &path)", "children() const ", "populate(bool foreground=false)", "Capability", "rowCount()", "stateChanged(QgsDataItem *item, QgsDataItem::State oldState)", "childrenCreated()", "emitStateChanged(QgsDataItem *item, QgsDataItem::State oldState)", "emitEndInsertItems()", "findItem(QVector< QgsDataItem * > items, QgsDataItem *item)", "capabilities2() const ", "type() const ", "emitBeginInsertItems(QgsDataItem *parent, int first, int last)", "path() const ", "beginRemoveItems(QgsDataItem *parent, int first, int last)", "setIconName(const QString &iconName)"], "QgsBrightnessContrastFilter": ["contrast() const ", "setContrast(int contrast)", "brightness() const ", "setBrightness(int brightness)", "QgsBrightnessContrastFilter(QgsRasterInterface *input=nullptr)"], @@ -140,7 +140,7 @@ ACCEPTABLE_MISSING_DOCS = { "QgsTextDiagram": ["Shape", "Orientation"], "QgsClipToMinMaxEnhancement": ["QgsClipToMinMaxEnhancement(Qgis::DataType, double, double)"], "QgsPaperItem": ["QgsPaperItem(QgsComposition *c)", "QgsPaperItem(qreal x, qreal y, qreal width, qreal height, QgsComposition *composition)"], - "QgsRendererRulePropsDialog": ["QgsRendererRulePropsDialog(QgsRuleBasedRendererV2::Rule *rule, QgsVectorLayer *layer, QgsStyleV2 *style, QWidget *parent=nullptr, QgsMapCanvas *mapCanvas=nullptr)", "rule()", "buildExpression()", "testFilter()"], + "QgsRendererRulePropsDialog": ["QgsRendererRulePropsDialog(QgsRuleBasedRenderer::Rule *rule, QgsVectorLayer *layer, QgsStyle *style, QWidget *parent=nullptr, QgsMapCanvas *mapCanvas=nullptr)", "rule()", "buildExpression()", "testFilter()"], "QgsLayerTreeNode": ["QgsLayerTreeNode(const QgsLayerTreeNode &other)", "readCommonXML(QDomElement &element)", "writeCommonXML(QDomElement &element)", "QgsLayerTreeNode(NodeType t)"], "QgsVectorFileWriter::HiddenOption": ["HiddenOption(const QString &value)"], "QgsCptCitySelectionItem": ["selectionsList() const ", "QgsCptCitySelectionItem(QgsCptCityDataItem *parent, const QString &name, const QString &path)", "parseXML()"], @@ -154,17 +154,17 @@ ACCEPTABLE_MISSING_DOCS = { "QgsWMSLegendNode": ["QgsWMSLegendNode(QgsLayerTreeLayer *nodeLayer, QObject *parent=nullptr)"], "QgsRelationReferenceWidgetWrapper": ["QgsRelationReferenceWidgetWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor, QgsMapCanvas *canvas, QgsMessageBar *messageBar, QWidget *parent=nullptr)"], "QgsColorRampShader": ["QgsColorRampShader(double theMinimumValue=0.0, double theMaximumValue=255.0)", "clip() const ", "ColorRamp_TYPE", "setClip(bool clip)"], - "QgsSingleSymbolRendererV2Widget": ["changeSingleSymbol()", "scaleMethodChanged(QgsSymbol::ScaleMethod scaleMethod)", "QgsSingleSymbolRendererV2Widget(QgsVectorLayer *layer, QgsStyleV2 *style, QgsFeatureRendererV2 *renderer)", "create(QgsVectorLayer *layer, QgsStyleV2 *style, QgsFeatureRendererV2 *renderer)", "sizeScaleFieldChanged(const QString &fldName)", "showSymbolLevels()"], + "QgsSingleSymbolRendererWidget": ["changeSingleSymbol()", "scaleMethodChanged(QgsSymbol::ScaleMethod scaleMethod)", "QgsSingleSymbolRendererWidget(QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer)", "create(QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer)", "sizeScaleFieldChanged(const QString &fldName)", "showSymbolLevels()"], "QgsRequestHandler": ["setDefaultHeaders()"], "QgsEditorWidgetRegistry": ["createSearchWidget(const QString &widgetId, QgsVectorLayer *vl, int fieldIdx, const QgsEditorWidgetConfig &config, QWidget *parent, const QgsAttributeEditorContext &context=QgsAttributeEditorContext())"], "QgsPropertyKey": ["QgsPropertyKey(const QString &name=\"\")", "name()", "find(QString &propertyName)"], - "QgsFontMarkerSymbolLayerV2": ["character() const ", "setCharacter(QChar ch)", "QgsFontMarkerSymbolLayerV2(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)", "setFontFamily(const QString &family)", "fontFamily() const ", "create(const QgsStringMap &properties=QgsStringMap())", "createFromSld(QDomElement &element)"], + "QgsFontMarkerSymbolLayer": ["character() const ", "setCharacter(QChar ch)", "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)", "setFontFamily(const QString &family)", "fontFamily() const ", "create(const QgsStringMap &properties=QgsStringMap())", "createFromSld(QDomElement &element)"], "QgsScaleRangeWidget": ["setScaleRange(double min, double max)", "setMinimumScale(double scale)", "QgsScaleRangeWidget(QWidget *parent=nullptr)", "setMaximumScale(double scale)"], - "QgsFeatureRendererV2": ["usingSymbolLevels() const ", "_getLineString(QPolygonF &pts, QgsRenderContext &context, QgsConstWkbPtr wkb, bool clipToExtent=true)", "renderFeatureWithSymbol(QgsFeature &feature, QgsSymbol *symbol, QgsRenderContext &context, int layer, bool selected, bool drawVertexMarker)", "type() const ", "clone() const =0", "setScaleMethodToSymbol(QgsSymbol *symbol, int scaleMethod)", "Capabilities", "setUsingSymbolLevels(bool usingSymbolLevels)", "QgsFeatureRendererV2(const QString &type)", "_getPoint(QPointF &pt, QgsRenderContext &context, QgsConstWkbPtr wkb)", "_getPolygon(QPolygonF &pts, QList< QPolygonF > &holes, QgsRenderContext &context, QgsConstWkbPtr wkb, bool clipToExtent=true)"], - "QgsRendererV2Registry": ["instance()"], + "QgsFeatureRenderer": ["usingSymbolLevels() const ", "_getLineString(QPolygonF &pts, QgsRenderContext &context, QgsConstWkbPtr wkb, bool clipToExtent=true)", "renderFeatureWithSymbol(QgsFeature &feature, QgsSymbol *symbol, QgsRenderContext &context, int layer, bool selected, bool drawVertexMarker)", "type() const ", "clone() const =0", "setScaleMethodToSymbol(QgsSymbol *symbol, int scaleMethod)", "Capabilities", "setUsingSymbolLevels(bool usingSymbolLevels)", "QgsFeatureRenderer(const QString &type)", "_getPoint(QPointF &pt, QgsRenderContext &context, QgsConstWkbPtr wkb)", "_getPolygon(QPolygonF &pts, QList< QPolygonF > &holes, QgsRenderContext &context, QgsConstWkbPtr wkb, bool clipToExtent=true)"], + "QgsRendererRegistry": ["instance()"], "QgsClassificationWidgetWrapper": ["QgsClassificationWidgetWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor=nullptr, QWidget *parent=nullptr)"], "QgsCsException": ["QgsCsException(QString const &what)"], - "QgsDiagramRendererV2": ["rendererName() const =0", "setDiagram(QgsDiagram *d)", "writeXML(QDomElement &layerElem, QDomDocument &doc, const QgsVectorLayer *layer) const =0", "readXML(const QDomElement &elem, const QgsVectorLayer *layer)=0", "_readXML(const QDomElement &elem, const QgsVectorLayer *layer)", "diagram() const ", "renderDiagram(const QgsFeature &feature, QgsRenderContext &c, QPointF pos) const ", "QgsDiagramRendererV2(const QgsDiagramRendererV2 &other)", "_writeXML(QDomElement &rendererElem, QDomDocument &doc, const QgsVectorLayer *layer) const "], + "QgsDiagramRenderer": ["rendererName() const =0", "setDiagram(QgsDiagram *d)", "writeXML(QDomElement &layerElem, QDomDocument &doc, const QgsVectorLayer *layer) const =0", "readXML(const QDomElement &elem, const QgsVectorLayer *layer)=0", "_readXML(const QDomElement &elem, const QgsVectorLayer *layer)", "diagram() const ", "renderDiagram(const QgsFeature &feature, QgsRenderContext &c, QPointF pos) const ", "QgsDiagramRenderer(const QgsDiagramRenderer &other)", "_writeXML(QDomElement &rendererElem, QDomDocument &doc, const QgsVectorLayer *layer) const "], "QgsMapCanvas": ["WheelAction", "setLayerSet(QList< QgsMapCanvasLayer > &layers)", "clearExtentHistory()", "setCurrentLayer(QgsMapLayer *layer)", "updateOverview()", "enableOverviewMode(QgsMapOverviewCanvas *overview)"], "QgsMapToolEdit": ["QgsMapToolEdit(QgsMapCanvas *canvas)", "createGeometryRubberBand(QgsWkbTypes::GeometryType geometryType=QgsWkbTypes::LineGeometry, bool alternativeBand=false) const "], "QgsLayerTreeViewDefaultActions": ["actionShowFeatureCount(QObject *parent=nullptr)", "actionShowInOverview(QObject *parent=nullptr)", "showFeatureCount()", "uniqueGroupName(QgsLayerTreeGroup *parentGroup)", "actionZoomToLayer(QgsMapCanvas *canvas, QObject *parent=nullptr)", "zoomToGroup()", "zoomToLayers(QgsMapCanvas *canvas, const QList< QgsMapLayer * > &layers)", "zoomToLayer(QgsMapCanvas *canvas)", "zoomToLayer()", "makeTopLevel()", "renameGroupOrLayer()", "actionAddGroup(QObject *parent=nullptr)", "addGroup()", "actionGroupSelected(QObject *parent=nullptr)", "groupSelected()", "actionRemoveGroupOrLayer(QObject *parent=nullptr)", "zoomToGroup(QgsMapCanvas *canvas)", "actionZoomToGroup(QgsMapCanvas *canvas, QObject *parent=nullptr)", "QgsLayerTreeViewDefaultActions(QgsLayerTreeView *view)", "removeGroupOrLayer()", "actionRenameGroupOrLayer(QObject *parent=nullptr)", "actionMakeTopLevel(QObject *parent=nullptr)", "showInOverview()"], @@ -176,15 +176,15 @@ ACCEPTABLE_MISSING_DOCS = { "QgsMapOverviewCanvas": ["destinationSrsChanged()", "QgsMapOverviewCanvas(QWidget *parent=nullptr, QgsMapCanvas *mapCanvas=nullptr)", "layerRepaintRequested()", "hasCrsTransformEnabled(bool flag)", "enableAntiAliasing(bool flag)", "layerSet() const ", "updateFullExtent()", "mapRenderingFinished()"], "QgsMapCanvasSnappingUtils": ["QgsMapCanvasSnappingUtils(QgsMapCanvas *canvas, QObject *parent=nullptr)"], "QgsVectorLayerEditPassthrough": ["QgsVectorLayerEditPassthrough(QgsVectorLayer *layer)"], - "QgsLineSymbolLayerV2": ["offset() const ", "setOffsetMapUnitScale(const QgsMapUnitScale &scale)", "renderPolygonOutline(const QPolygonF &points, QList< QPolygonF > *rings, QgsSymbolRenderContext &context)", "setWidthUnit(QgsSymbol::OutputUnit unit)", "renderPolyline(const QPolygonF &points, QgsSymbolRenderContext &context)=0", "setWidthMapUnitScale(const QgsMapUnitScale &scale)", "width() const ", "widthMapUnitScale() const ", "offsetMapUnitScale() const ", "widthUnit() const ", "setWidth(double width)", "offsetUnit() const ", "QgsLineSymbolLayerV2(bool locked=false)", "setOffset(double offset)", "setOffsetUnit(QgsSymbol::OutputUnit unit)"], - "QgsStyleV2GroupSelectionDialog": ["QgsStyleV2GroupSelectionDialog(QgsStyleV2 *style, QWidget *parent=nullptr)"], + "QgsLineSymbolLayer": ["offset() const ", "setOffsetMapUnitScale(const QgsMapUnitScale &scale)", "renderPolygonOutline(const QPolygonF &points, QList< QPolygonF > *rings, QgsSymbolRenderContext &context)", "setWidthUnit(QgsSymbol::OutputUnit unit)", "renderPolyline(const QPolygonF &points, QgsSymbolRenderContext &context)=0", "setWidthMapUnitScale(const QgsMapUnitScale &scale)", "width() const ", "widthMapUnitScale() const ", "offsetMapUnitScale() const ", "widthUnit() const ", "setWidth(double width)", "offsetUnit() const ", "QgsLineSymbolLayer(bool locked=false)", "setOffset(double offset)", "setOffsetUnit(QgsSymbol::OutputUnit unit)"], + "QgsStyleGroupSelectionDialog": ["QgsStyleGroupSelectionDialog(QgsStyle *style, QWidget *parent=nullptr)"], "QgsCheckboxWidgetWrapper": ["QgsCheckboxWidgetWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor=nullptr, QWidget *parent=nullptr)"], - "QgsShapeburstFillSymbolLayerV2": ["setOffsetMapUnitScale(const QgsMapUnitScale &scale)", "ShapeburstColorType", "distanceMapUnitScale() const ", "setDistanceMapUnitScale(const QgsMapUnitScale &scale)", "QgsShapeburstFillSymbolLayerV2(const QColor &color=DEFAULT_SIMPLEFILL_COLOR, const QColor &color2=Qt::white, ShapeburstColorType colorType=SimpleTwoColor, int blurRadius=0, bool useWholeShape=true, double maxDistance=5)", "offsetMapUnitScale() const ", "create(const QgsStringMap &properties=QgsStringMap())"], + "QgsShapeburstFillSymbolLayer": ["setOffsetMapUnitScale(const QgsMapUnitScale &scale)", "ShapeburstColorType", "distanceMapUnitScale() const ", "setDistanceMapUnitScale(const QgsMapUnitScale &scale)", "QgsShapeburstFillSymbolLayer(const QColor &color=DEFAULT_SIMPLEFILL_COLOR, const QColor &color2=Qt::white, ShapeburstColorType colorType=SimpleTwoColor, int blurRadius=0, bool useWholeShape=true, double maxDistance=5)", "offsetMapUnitScale() const ", "create(const QgsStringMap &properties=QgsStringMap())"], "QgsRangeConfigDlg": ["QgsRangeConfigDlg(QgsVectorLayer *vl, int fieldIdx, QWidget *parent)", "rangeWidgetChanged(int index)"], "QgsMapMouseEvent": ["SnappingMode"], "QgsDataDefined": ["insertExpressionParam(const QString &key, const QVariant ¶m)", "expression()", "isActive() const ", "setActive(bool active)"], "QgsScaleExpression": ["Type", "operator bool() const "], - "QgsSvgMarkerSymbolLayerV2": ["outlineWidthMapUnitScale() const ", "path() const ", "setOutlineWidthMapUnitScale(const QgsMapUnitScale &scale)", "setOutlineWidth(double w)", "outlineWidthUnit() const ", "QgsSvgMarkerSymbolLayerV2(const QString &name=DEFAULT_SVGMARKER_NAME, double size=DEFAULT_SVGMARKER_SIZE, double angle=DEFAULT_SVGMARKER_ANGLE, QgsSymbol::ScaleMethod scaleMethod=DEFAULT_SCALE_METHOD)", "create(const QgsStringMap &properties=QgsStringMap())", "setOutlineWidthUnit(QgsSymbol::OutputUnit unit)", "setPath(const QString &path)", "createFromSld(QDomElement &element)", "outlineWidth() const "], + "QgsSvgMarkerSymbolLayer": ["outlineWidthMapUnitScale() const ", "path() const ", "setOutlineWidthMapUnitScale(const QgsMapUnitScale &scale)", "setOutlineWidth(double w)", "outlineWidthUnit() const ", "QgsSvgMarkerSymbolLayer(const QString &name=DEFAULT_SVGMARKER_NAME, double size=DEFAULT_SVGMARKER_SIZE, double angle=DEFAULT_SVGMARKER_ANGLE, QgsSymbol::ScaleMethod scaleMethod=DEFAULT_SCALE_METHOD)", "create(const QgsStringMap &properties=QgsStringMap())", "setOutlineWidthUnit(QgsSymbol::OutputUnit unit)", "setPath(const QString &path)", "createFromSld(QDomElement &element)", "outlineWidth() const "], "QgsDateTimeEditWrapper": ["QgsDateTimeEditWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor, QWidget *parent=nullptr)"], "QgsMultiBandColorRendererWidget": ["QgsMultiBandColorRendererWidget(QgsRasterLayer *layer, const QgsRectangle &extent=QgsRectangle())", "create(QgsRasterLayer *layer, const QgsRectangle &theExtent)", "setFromRenderer(const QgsRasterRenderer *r)", "loadMinMax(int theBandNo, double theMin, double theMax, int theOrigin)"], "QgsAnimatedIcon": ["setIconPath(const QString &iconPath)", "iconPath() const ", "icon() const ", "onFrameChanged()"], @@ -192,11 +192,11 @@ ACCEPTABLE_MISSING_DOCS = { "QgsComposerGroupItem": ["QgsComposerGroupItem(const QString &text)"], "QgsGraphDirector": ["buildProgress(int, int) const ", "buildMessage(const QString &) const ", "addProperter(QgsArcProperter *prop)"], "QgsScaleComboBox": ["QgsScaleComboBox(QWidget *parent=nullptr)", "updateScales(const QStringList &scales=QStringList())"], - "QgsLabelingEngineV2": ["processProvider(QgsAbstractLabelProvider *provider, QgsRenderContext &context, pal::Pal &p)", "Flag"], - "QgsSymbolSelectorDialog": ["moveLayerByOffset(int offset)", "QgsSymbolSelectorDialog(QgsSymbol *symbol, QgsStyleV2 *style, const QgsVectorLayer *vl, QWidget *parent=nullptr, bool embedded=false)", "lockLayer()", "moveLayerUp()", "updateUi()", "addLayer()", "moveLayerDown()", "layerChanged()", "loadSymbol()", "setWidget(QWidget *widget)", "updateLayerPreview()", "symbolModified()", "updateLockButton()", "removeLayer()", "currentLayer()", "updatePreview()"], + "QgsLabelingEngine": ["processProvider(QgsAbstractLabelProvider *provider, QgsRenderContext &context, pal::Pal &p)", "Flag"], + "QgsSymbolSelectorDialog": ["moveLayerByOffset(int offset)", "QgsSymbolSelectorDialog(QgsSymbol *symbol, QgsStyle *style, const QgsVectorLayer *vl, QWidget *parent=nullptr, bool embedded=false)", "lockLayer()", "moveLayerUp()", "updateUi()", "addLayer()", "moveLayerDown()", "layerChanged()", "loadSymbol()", "setWidget(QWidget *widget)", "updateLayerPreview()", "symbolModified()", "updateLockButton()", "removeLayer()", "currentLayer()", "updatePreview()"], "QgsCacheIndexFeatureId": ["QgsCacheIndexFeatureId(QgsVectorLayerCache *)"], "QgsSymbolLayerWidget": ["registerDataDefinedButton(QgsDataDefinedButton *button, const QString &propertyName, QgsDataDefinedButton::DataType type, const QString &description)", "setSymbolLayer(QgsSymbolLayer *layer)=0", "updateDataDefinedProperty()", "QgsSymbolLayerWidget(QWidget *parent, const QgsVectorLayer *vl=nullptr)", "symbolLayer()=0"], - "QgsRendererV2PropertiesDialog": ["apply()", "onOK()", "QgsRendererV2PropertiesDialog(QgsVectorLayer *layer, QgsStyleV2 *style, bool embedded=false)"], + "QgsRendererPropertiesDialog": ["apply()", "onOK()", "QgsRendererPropertiesDialog(QgsVectorLayer *layer, QgsStyle *style, bool embedded=false)"], "QgsAttributeTableFilterModel": ["fidToIndexList(QgsFeatureId fid)", "FilterMode", "mapFromMaster(const QModelIndex &sourceIndex) const ", "mapToMaster(const QModelIndex &proxyIndex) const "], "QgsRasterRendererWidget": ["min(int index=0)", "rasterLayer() const ", "selectedBand(int index=0)", "stdDev()", "setMax(const QString &value, int index=0)", "LoadMinMaxAlgo", "setMin(const QString &value, int index=0)", "setRasterLayer(QgsRasterLayer *layer)", "max(int index=0)", "QgsRasterRendererWidget(QgsRasterLayer *layer, const QgsRectangle &extent)", "setStdDev(const QString &value)", "renderer()=0"], "QgsLabelCandidate": ["QgsLabelCandidate(const QRectF &r, double c)"], @@ -208,15 +208,15 @@ ACCEPTABLE_MISSING_DOCS = { "QgsRunProcess": ["dialogGone()", "processError(QProcess::ProcessError)", "create(const QString &action, bool capture)", "stdoutAvailable()", "processExit(int, QProcess::ExitStatus)", "stderrAvailable()"], "QgsFieldModel": ["isField(const QString &expression)", "FieldRoles", "updateModel()", "allowExpression()"], "QgsPaintEffect": ["QgsPaintEffect(const QgsPaintEffect &other)"], - "QgsGeos": ["asGeos(const QgsAbstractGeometryV2 *geom, double precision=0)", "getGEOSHandler()", "coordSeqPoint(const GEOSCoordSequence *cs, int i, bool hasZ, bool hasM)", "reshapeGeometry(const QgsLineStringV2 &reshapeWithLine, int *errorCode, QString *errorMsg=nullptr) const ", "fromGeosPolygon(const GEOSGeometry *geos)"], + "QgsGeos": ["asGeos(const QgsAbstractGeometry *geom, double precision=0)", "getGEOSHandler()", "coordSeqPoint(const GEOSCoordSequence *cs, int i, bool hasZ, bool hasM)", "reshapeGeometry(const QgsLineString &reshapeWithLine, int *errorCode, QString *errorMsg=nullptr) const ", "fromGeosPolygon(const GEOSGeometry *geos)"], "QgsColorBrewerPalette": ["listSchemes()", "listSchemeVariants(const QString &schemeName)", "listSchemeColors(const QString &schemeName, int colors)"], - "QgsGraduatedSymbolRendererV2Widget": ["updateGraduatedSymbolIcon()", "classifyGraduated()", "selectedRanges()", "sizeScaleFieldChanged(const QString &fldName)", "rowsMoved()", "rangesClicked(const QModelIndex &idx)", "labelFormatChanged()", "disconnectUpdateHandlers()", "refreshRanges(bool reset=false)", "create(QgsVectorLayer *layer, QgsStyleV2 *style, QgsFeatureRendererV2 *renderer)", "reapplyColorRamp()", "scaleMethodChanged(QgsSymbol::ScaleMethod scaleMethod)", "changeRange(int rangeIdx)", "findSymbolForRange(double lowerBound, double upperBound, const QgsRangeList &ranges) const ", "changeCurrentValue(QStandardItem *item)", "changeRangeSymbol(int rangeIdx)", "connectUpdateHandlers()", "modelDataChanged()", "changeSelectedSymbols()", "showSymbolLevels()", "rowsOrdered()", "graduatedColumnChanged(const QString &field)", "reapplySizes()", "QgsGraduatedSymbolRendererV2Widget(QgsVectorLayer *layer, QgsStyleV2 *style, QgsFeatureRendererV2 *renderer)", "changeGraduatedSymbol()", "rangesDoubleClicked(const QModelIndex &idx)", "updateUiFromRenderer(bool updateCount=true)"], + "QgsGraduatedSymbolRendererWidget": ["updateGraduatedSymbolIcon()", "classifyGraduated()", "selectedRanges()", "sizeScaleFieldChanged(const QString &fldName)", "rowsMoved()", "rangesClicked(const QModelIndex &idx)", "labelFormatChanged()", "disconnectUpdateHandlers()", "refreshRanges(bool reset=false)", "create(QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer)", "reapplyColorRamp()", "scaleMethodChanged(QgsSymbol::ScaleMethod scaleMethod)", "changeRange(int rangeIdx)", "findSymbolForRange(double lowerBound, double upperBound, const QgsRangeList &ranges) const ", "changeCurrentValue(QStandardItem *item)", "changeRangeSymbol(int rangeIdx)", "connectUpdateHandlers()", "modelDataChanged()", "changeSelectedSymbols()", "showSymbolLevels()", "rowsOrdered()", "graduatedColumnChanged(const QString &field)", "reapplySizes()", "QgsGraduatedSymbolRendererWidget(QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer)", "changeGraduatedSymbol()", "rangesDoubleClicked(const QModelIndex &idx)", "updateUiFromRenderer(bool updateCount=true)"], "QgsGpsdConnection": ["QgsGpsdConnection(const QString &host, qint16 port, const QString &device)"], "Point3D": ["Point3D(const Point3D &p)"], "QgsVectorLayerUndoCommand": ["cache()", "QgsVectorLayerUndoCommand(QgsVectorLayerEditBuffer *buffer)", "layer()"], "QgsDataDefinedRotationDialog": ["QgsDataDefinedRotationDialog(const QList< QgsSymbol * > &symbolList, QgsVectorLayer *layer)"], "QgsException": ["QgsException(QString const &what)"], - "QgsEllipseSymbolLayerV2Widget": ["QgsEllipseSymbolLayerV2Widget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "create(const QgsVectorLayer *vl)"], + "QgsEllipseSymbolLayerWidget": ["QgsEllipseSymbolLayerWidget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "create(const QgsVectorLayer *vl)"], "QgsSingleBandPseudoColorRendererWidget": ["create(QgsRasterLayer *layer, const QgsRectangle &theExtent)", "setFromRenderer(const QgsRasterRenderer *r)", "QgsSingleBandPseudoColorRendererWidget(QgsRasterLayer *layer, const QgsRectangle &extent=QgsRectangle())", "Mode", "loadMinMax(int theBandNo, double theMin, double theMax, int theOrigin)"], "QgsSvgCache": ["instance()", "replaceParamsAndCacheSvg(QgsSvgCacheEntry *entry)", "cachePicture(QgsSvgCacheEntry *entry, bool forceVectorOutput=false)", "cacheImage(QgsSvgCacheEntry *entry)", "takeEntryFromList(QgsSvgCacheEntry *entry)"], "QgsMessageViewer": ["setCheckBoxText(const QString &text)", "setMessageAsPlainText(const QString &msg)", "checkBoxState()", "setCheckBoxState(Qt::CheckState state)", "setCheckBoxVisible(bool visible)", "setCheckBoxQSettingsLabel(const QString &label)", "setMessageAsHtml(const QString &msg)", "QgsMessageViewer(QWidget *parent=nullptr, Qt::WindowFlags fl=QgisGui::ModalDialogFlags, bool deleteOnClose=true)"], @@ -228,15 +228,15 @@ ACCEPTABLE_MISSING_DOCS = { "QgsPreviewEffect": ["QgsPreviewEffect(QObject *parent)", "PreviewMode"], "QgsGeometryGeneratorSymbolLayerWidget": ["QgsGeometryGeneratorSymbolLayerWidget(const QgsVectorLayer *vl, QWidget *parent=nullptr)"], "QgsProjectFileTransform": ["updateRevision(const QgsProjectVersion &version)", "convertRasterProperties(QDomDocument &doc, QDomNode &parentNode, QDomElement &rasterPropertiesElem, QgsRasterLayer *rlayer)"], - "QgsCentroidFillSymbolLayerV2": ["create(const QgsStringMap &properties=QgsStringMap())", "pointOnSurface() const ", "createFromSld(QDomElement &element)", "setPointOnSurface(bool pointOnSurface)"], + "QgsCentroidFillSymbolLayer": ["create(const QgsStringMap &properties=QgsStringMap())", "pointOnSurface() const ", "createFromSld(QDomElement &element)", "setPointOnSurface(bool pointOnSurface)"], "QgsAdvancedDigitizingCanvasItem": ["QgsAdvancedDigitizingCanvasItem(QgsMapCanvas *canvas, QgsAdvancedDigitizingDockWidget *cadDockWidget)"], - "QgsCategorizedSymbolRendererV2Widget": ["applyColorRamp()", "categoryColumnChanged(const QString &field)", "addCategories()", "sizeScaleFieldChanged(const QString &fldName)", "deleteCategories()", "QgsCategorizedSymbolRendererV2Widget(QgsVectorLayer *layer, QgsStyleV2 *style, QgsFeatureRendererV2 *renderer)", "updateCategorizedSymbolIcon()", "scaleMethodChanged(QgsSymbol::ScaleMethod scaleMethod)", "getColorRamp()", "changeCategorizedSymbol()", "create(QgsVectorLayer *layer, QgsStyleV2 *style, QgsFeatureRendererV2 *renderer)", "populateCategories()", "selectedCategoryList()", "addCategory()", "rowsMoved()", "changeCategorySymbol()", "categoriesDoubleClicked(const QModelIndex &idx)", "updateUiFromRenderer()", "deleteAllCategories()", "showSymbolLevels()"], + "QgsCategorizedSymbolRendererWidget": ["applyColorRamp()", "categoryColumnChanged(const QString &field)", "addCategories()", "sizeScaleFieldChanged(const QString &fldName)", "deleteCategories()", "QgsCategorizedSymbolRendererWidget(QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer)", "updateCategorizedSymbolIcon()", "scaleMethodChanged(QgsSymbol::ScaleMethod scaleMethod)", "getColorRamp()", "changeCategorizedSymbol()", "create(QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer)", "populateCategories()", "selectedCategoryList()", "addCategory()", "rowsMoved()", "changeCategorySymbol()", "categoriesDoubleClicked(const QModelIndex &idx)", "updateUiFromRenderer()", "deleteAllCategories()", "showSymbolLevels()"], "QgsAttributeTypeLoadDialog": ["QgsAttributeTypeLoadDialog(QgsVectorLayer *vl)"], "QgsRangeWidgetWrapper": ["QgsRangeWidgetWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor, QWidget *parent=nullptr)", "valueChanged(const QVariant &)"], "QgsNetworkReplyParser": ["None"], "QgsSingleBoxScaleBarStyle": ["QgsSingleBoxScaleBarStyle(const QgsComposerScaleBar *bar)"], "QgsMapLayerAction": ["Target"], - "QgsSingleSymbolRendererV2": ["createFromSld(QDomElement &element, QgsWkbTypes::GeometryType geomType)", "scaleMethod() const ", "setSizeScaleField(const QString &fieldOrExpression)", "QgsSingleSymbolRendererV2(QgsSymbol *symbol)", "symbol() const ", "sizeScaleField() const ", "setSymbol(QgsSymbol *s)", "setScaleMethod(QgsSymbol::ScaleMethod scaleMethod)"], + "QgsSingleSymbolRenderer": ["createFromSld(QDomElement &element, QgsWkbTypes::GeometryType geomType)", "scaleMethod() const ", "setSizeScaleField(const QString &fieldOrExpression)", "QgsSingleSymbolRenderer(QgsSymbol *symbol)", "symbol() const ", "sizeScaleField() const ", "setSymbol(QgsSymbol *s)", "setScaleMethod(QgsSymbol::ScaleMethod scaleMethod)"], "QgsDetailedItemData": ["category() const ", "icon() const ", "setTitle(const QString &theTitle)", "setChecked(const bool theFlag)", "detail() const ", "setCategory(const QString &theCategory)", "setCheckable(const bool theFlag)", "isEnabled() const ", "isCheckable() const ", "setIcon(const QPixmap &theIcon)", "title() const ", "isRenderedAsWidget() const ", "isChecked() const ", "setDetail(const QString &theDetail)", "setEnabled(bool theFlag)"], "QgsPluginLayerType": ["QgsPluginLayerType(const QString &name)", "name()"], "QgsRenderContext": ["coordinateTransform() const ", "drawEditingInformation() const ", "QgsRenderContext(const QgsRenderContext &rh)", "setPainter(QPainter *p)", "setUseRenderingOptimization(bool enabled)", "setMapToPixel(const QgsMapToPixel &mtp)", "selectionColor() const ", "setVectorSimplifyMethod(const QgsVectorSimplifyMethod &simplifyMethod)", "extent() const ", "setDrawEditingInformation(bool b)", "constPainter() const ", "scaleFactor() const ", "labelingEngine() const ", "renderingStopped() const ", "mapToPixel() const ", "rendererScale() const ", "painter()", "setScaleFactor(double factor)", "setExtent(const QgsRectangle &extent)", "forceVectorOutput() const ", "setForceVectorOutput(bool force)", "setRasterScaleFactor(double factor)", "setLabelingEngine(QgsLabelingEngineInterface *iface)", "setRendererScale(double scale)", "rasterScaleFactor() const ", "setRenderingStopped(bool stopped)", "setSelectionColor(const QColor &color)"], @@ -278,12 +278,12 @@ ACCEPTABLE_MISSING_DOCS = { "QgsDashSpaceDialog": ["QgsDashSpaceDialog(const QVector< qreal > &v, QWidget *parent=nullptr, Qt::WindowFlags f=0)", "dashDotVector() const "], "QgsAuthMethodConfig": ["setMethod(const QString &method)", "setUri(const QString &uri)"], "QgsXmlUtils": ["readRectangle(const QDomElement &element)", "readMapUnits(const QDomElement &element)", "writeMapUnits(Qgis::UnitType units, QDomDocument &doc)", "writeRectangle(const QgsRectangle &rect, QDomDocument &doc)"], - "QgsSurfaceV2": ["surfaceToPolygon() const =0"], + "QgsSurface": ["surfaceToPolygon() const =0"], "QgsDrawSourceWidget": ["create()", "QgsDrawSourceWidget(QWidget *parent=nullptr)"], "QgsRelationWidgetWrapper": ["QgsRelationWidgetWrapper(QgsVectorLayer *vl, const QgsRelation &relation, QWidget *editor=nullptr, QWidget *parent=nullptr)"], "QgsLayerTreeGroup": ["QgsLayerTreeGroup(const QString &name=QString(), Qt::CheckState checked=Qt::Checked)", "nodeVisibilityChanged(QgsLayerTreeNode *node)", "QgsLayerTreeGroup(const QgsLayerTreeGroup &other)", "layerDestroyed()"], "QgsSLConnect": ["sqlite3_close_v2(sqlite3 *)", "sqlite3_close(sqlite3 *)", "sqlite3_open(const char *filename, sqlite3 **ppDb)", "sqlite3_open_v2(const char *filename, sqlite3 **ppDb, int flags, const char *zVfs)"], - "QgsVectorColorBrewerColorRampV2": ["listSchemeNames()", "QgsVectorColorBrewerColorRampV2(const QString &schemeName=DEFAULT_COLORBREWER_SCHEMENAME, int colors=DEFAULT_COLORBREWER_COLORS)", "setColors(int colors)", "loadPalette()", "colors() const ", "schemeName() const ", "create(const QgsStringMap &properties=QgsStringMap())", "setSchemeName(const QString &schemeName)", "listSchemeVariants(const QString &schemeName)"], + "QgsVectorColorBrewerColorRamp": ["listSchemeNames()", "QgsVectorColorBrewerColorRamp(const QString &schemeName=DEFAULT_COLORBREWER_SCHEMENAME, int colors=DEFAULT_COLORBREWER_COLORS)", "setColors(int colors)", "loadPalette()", "colors() const ", "schemeName() const ", "create(const QgsStringMap &properties=QgsStringMap())", "setSchemeName(const QString &schemeName)", "listSchemeVariants(const QString &schemeName)"], "QgsPointCompare": ["operator()(const QgsPoint &p1, const QgsPoint &p2) const ", "QgsPointCompare(double tolerance)"], "QgsRasterShaderFunction": ["minimumValue() const ", "QgsRasterShaderFunction(double theMinimumValue=0.0, double theMaximumValue=255.0)", "maximumValue() const ", "minimumMaximumRange() const ", "legendSymbologyItems(QList< QPair< QString, QColor > > &symbolItems) const "], "QgsRasterPyramidsOptionsWidget": ["pyramidsFormat() const ", "overviewList() const ", "overviewListChanged()", "QgsRasterPyramidsOptionsWidget(QWidget *parent=nullptr, const QString &provider=\"gdal\")", "setRasterLayer(QgsRasterLayer *rasterLayer)", "checkAllLevels(bool checked)", "setRasterFileName(const QString &file)", "resamplingMethod() const ", "configOptions() const ", "someValueChanged()", "apply()", "createOptionsWidget()"], @@ -293,17 +293,17 @@ ACCEPTABLE_MISSING_DOCS = { "QgsDefaultPluginLayerLegend": ["QgsDefaultPluginLayerLegend(QgsPluginLayer *pl)"], "QgsLayerTreeRegistryBridge": ["groupWillRemoveChildren(QgsLayerTreeNode *node, int indexFrom, int indexTo)", "QgsLayerTreeRegistryBridge(QgsLayerTreeGroup *root, QObject *parent=nullptr)", "removeLayersFromRegistry(const QStringList &layerIds)", "isEnabled() const ", "layersAdded(const QList< QgsMapLayer * > &layers)", "newLayersVisible() const ", "setEnabled(bool enabled)", "layersWillBeRemoved(const QStringList &layerIds)", "setNewLayersVisible(bool enabled)", "groupRemovedChildren()"], "QgsLabelComponent": ["setUseCenter(const bool use)", "setPictureBuffer(const double buffer)", "offset() const ", "dpiRatio() const ", "setSize(const QgsPoint &point)", "setRotation(const double rotation)", "picture() const ", "rotationOffset() const ", "setRotationOffset(const double rotation)", "setCenter(const QgsPoint &point)", "pictureBuffer() const ", "setDpiRatio(const double ratio)", "size() const ", "setUseRotation(const bool use)", "setPicture(QPicture *picture)", "text() const ", "center() const ", "setOrigin(const QgsPoint &point)", "setUseOrigin(const bool use)", "setText(const QString &text)", "useOrigin() const ", "useCenter() const ", "origin() const ", "setOffset(const QgsPoint &point)", "rotation() const ", "useRotation() const "], - "QgsMarkerSymbolLayerV2": ["setAngle(double angle)", "sizeMapUnitScale() const ", "scaleMethod() const ", "VerticalAnchorPoint", "offsetMapUnitScale() const ", "renderPoint(QPointF point, QgsSymbolRenderContext &context)=0", "setOffsetUnit(QgsSymbol::OutputUnit unit)", "setSizeUnit(QgsSymbol::OutputUnit unit)", "setVerticalAnchorPoint(VerticalAnchorPoint v)", "setHorizontalAnchorPoint(HorizontalAnchorPoint h)", "_rotatedOffset(QPointF offset, double angle)", "writeSldMarker(QDomDocument &doc, QDomElement &element, const QgsStringMap &props) const ", "offsetUnit() const ", "offset() const ", "sizeUnit() const ", "QgsMarkerSymbolLayerV2(bool locked=false)", "setSize(double size)", "setSizeMapUnitScale(const QgsMapUnitScale &scale)", "size() const ", "horizontalAnchorPoint() const ", "setScaleMethod(QgsSymbol::ScaleMethod scaleMethod)", "setOffset(QPointF offset)", "markerOffset(QgsSymbolRenderContext &context, double &offsetX, double &offsetY) const ", "verticalAnchorPoint() const ", "HorizontalAnchorPoint", "setOffsetMapUnitScale(const QgsMapUnitScale &scale)", "angle() const "], + "QgsMarkerSymbolLayer": ["setAngle(double angle)", "sizeMapUnitScale() const ", "scaleMethod() const ", "VerticalAnchorPoint", "offsetMapUnitScale() const ", "renderPoint(QPointF point, QgsSymbolRenderContext &context)=0", "setOffsetUnit(QgsSymbol::OutputUnit unit)", "setSizeUnit(QgsSymbol::OutputUnit unit)", "setVerticalAnchorPoint(VerticalAnchorPoint v)", "setHorizontalAnchorPoint(HorizontalAnchorPoint h)", "_rotatedOffset(QPointF offset, double angle)", "writeSldMarker(QDomDocument &doc, QDomElement &element, const QgsStringMap &props) const ", "offsetUnit() const ", "offset() const ", "sizeUnit() const ", "QgsMarkerSymbolLayer(bool locked=false)", "setSize(double size)", "setSizeMapUnitScale(const QgsMapUnitScale &scale)", "size() const ", "horizontalAnchorPoint() const ", "setScaleMethod(QgsSymbol::ScaleMethod scaleMethod)", "setOffset(QPointF offset)", "markerOffset(QgsSymbolRenderContext &context, double &offsetX, double &offsetY) const ", "verticalAnchorPoint() const ", "HorizontalAnchorPoint", "setOffsetMapUnitScale(const QgsMapUnitScale &scale)", "angle() const "], "QgsApplication": ["QgsApplication(int &argc, char **argv, bool GUIenabled, const QString &customConfigPath=QString(), const QString &platformName=\"desktop\")"], "QgsExpression::Visitor": ["visit(const NodeLiteral &n)=0", "visit(const NodeFunction &n)=0", "visit(const NodeCondition &n)=0", "visit(const NodeUnaryOperator &n)=0", "visit(const NodeInOperator &n)=0", "visit(const NodeBinaryOperator &n)=0", "visit(const NodeColumnRef &n)=0"], "QgsComposerTable": ["QgsComposerTable(QgsComposition *composition)"], - "QgsFillSymbolV2": ["setAngle(double angle)", "QgsFillSymbolV2(const QgsSymbolLayerList &layers=QgsSymbolLayerList())", "renderPolygon(const QPolygonF &points, QList< QPolygonF > *rings, const QgsFeature *f, QgsRenderContext &context, int layer=-1, bool selected=false)"], - "QgsCentroidFillSymbolLayerV2Widget": ["create(const QgsVectorLayer *vl)", "QgsCentroidFillSymbolLayerV2Widget(const QgsVectorLayer *vl, QWidget *parent=nullptr)"], + "QgsFillSymbol": ["setAngle(double angle)", "QgsFillSymbol(const QgsSymbolLayerList &layers=QgsSymbolLayerList())", "renderPolygon(const QPolygonF &points, QList< QPolygonF > *rings, const QgsFeature *f, QgsRenderContext &context, int layer=-1, bool selected=false)"], + "QgsCentroidFillSymbolLayerWidget": ["create(const QgsVectorLayer *vl)", "QgsCentroidFillSymbolLayerWidget(const QgsVectorLayer *vl, QWidget *parent=nullptr)"], "QgsLinePatternFillSymbolLayerWidget": ["create(const QgsVectorLayer *vl)", "QgsLinePatternFillSymbolLayerWidget(const QgsVectorLayer *vl, QWidget *parent=nullptr)"], "QgsAttributeTableMapLayerAction": ["QgsAttributeTableMapLayerAction(const QString &name, QgsDualView *dualView, QgsMapLayerAction *action, const QModelIndex &fieldIdx)", "execute()"], "QgsScaleBarStyle": ["drawLabels(QPainter *p) const ", "QgsScaleBarStyle(const QgsComposerScaleBar *bar)", "name() const =0", "calculateBoxSize() const "], "QgsScaleVisibilityDialog": ["QgsScaleVisibilityDialog(QWidget *parent=nullptr, const QString &title=QString(), QgsMapCanvas *mapCanvas=nullptr)"], - "QgsGraduatedSymbolRendererV2": ["scaleMethod() const ", "QgsGraduatedSymbolRendererV2(const QString &attrName=QString(), const QgsRangeList &ranges=QgsRangeList())", "updateRangeUpperValue(int rangeIndex, double value)", "sortByValue(Qt::SortOrder order=Qt::AscendingOrder)", "createRenderer(QgsVectorLayer *vlayer, const QString &attrName, int classes, Mode mode, QgsSymbol *symbol, QgsVectorColorRampV2 *ramp, bool inverted=false, const QgsRendererRangeV2LabelFormat &legendFormat=QgsRendererRangeV2LabelFormat())", "addClass(QgsSymbol *symbol)", "setInvertedColorRamp(bool inverted)", "setMode(Mode mode)", "updateRangeSymbol(int rangeIndex, QgsSymbol *symbol)", "setSizeScaleField(const QString &fieldOrExpression)", "updateRangeLowerValue(int rangeIndex, double value)", "GraduatedMethod", "deleteClass(int idx)", "deleteAllClasses()", "Mode", "setClassAttribute(const QString &attr)", "sortByLabel(Qt::SortOrder order=Qt::AscendingOrder)", "symbolForValue(double value)", "setScaleMethod(QgsSymbol::ScaleMethod scaleMethod)", "updateRangeLabel(int rangeIndex, const QString &label)", "ranges() const ", "mode() const ", "sizeScaleField() const ", "classAttribute() const "], + "QgsGraduatedSymbolRenderer": ["scaleMethod() const ", "QgsGraduatedSymbolRenderer(const QString &attrName=QString(), const QgsRangeList &ranges=QgsRangeList())", "updateRangeUpperValue(int rangeIndex, double value)", "sortByValue(Qt::SortOrder order=Qt::AscendingOrder)", "createRenderer(QgsVectorLayer *vlayer, const QString &attrName, int classes, Mode mode, QgsSymbol *symbol, QgsVectorColorRamp *ramp, bool inverted=false, const QgsRendererRangeLabelFormat &legendFormat=QgsRendererRangeLabelFormat())", "addClass(QgsSymbol *symbol)", "setInvertedColorRamp(bool inverted)", "setMode(Mode mode)", "updateRangeSymbol(int rangeIndex, QgsSymbol *symbol)", "setSizeScaleField(const QString &fieldOrExpression)", "updateRangeLowerValue(int rangeIndex, double value)", "GraduatedMethod", "deleteClass(int idx)", "deleteAllClasses()", "Mode", "setClassAttribute(const QString &attr)", "sortByLabel(Qt::SortOrder order=Qt::AscendingOrder)", "symbolForValue(double value)", "setScaleMethod(QgsSymbol::ScaleMethod scaleMethod)", "updateRangeLabel(int rangeIndex, const QString &label)", "ranges() const ", "mode() const ", "sizeScaleField() const ", "classAttribute() const "], "QgsPaintEffectWidget": ["QgsPaintEffectWidget(QWidget *parent=nullptr)"], "QgsDetailedItemDelegate": ["QgsDetailedItemDelegate(QObject *parent=nullptr)", "horizontalSpacing() const ", "setHorizontalSpacing(int theValue)", "setVerticalSpacing(int theValue)", "verticalSpacing() const "], "FieldSorter": ["FieldSorter(QgsAtlasComposition::SorterKeys &keys, bool ascending=true)", "operator()(const QPair< QgsFeatureId, QString > &id1, const QPair< QgsFeatureId, QString > &id2)"], @@ -311,11 +311,11 @@ ACCEPTABLE_MISSING_DOCS = { "QgsEncodingFileDialog": ["saveUsedEncoding()", "QgsEncodingFileDialog(QWidget *parent=nullptr, const QString &caption=QString(), const QString &directory=QString(), const QString &filter=QString(), const QString &encoding=QString())", "pbnCancelAll_clicked()"], "QgsConnectionPoolGroup": ["onConnectionExpired()", "acquire()", "invalidateConnections()", "release(T conn)", "initTimer(QObject *parent)", "QgsConnectionPoolGroup(const QString &ci)"], "QgsValueMapWidgetWrapper": ["QgsValueMapWidgetWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor=nullptr, QWidget *parent=nullptr)"], - "QgsRuleBasedRendererV2::Rule": ["label() const ", "createFromSld(QDomElement &element, QgsWkbTypes::GeometryType geomType)", "scaleMaxDenom() const ", "scaleMinDenom() const ", "initFilter()", "dependsOnScale() const ", "toSld(QDomDocument &doc, QDomElement &element, QgsStringMap props) const ", "save(QDomDocument &doc, QgsSymbolMap &symbolMap) const ", "setLabel(const QString &label)", "symbol()"], + "QgsRuleBasedRenderer::Rule": ["label() const ", "createFromSld(QDomElement &element, QgsWkbTypes::GeometryType geomType)", "scaleMaxDenom() const ", "scaleMinDenom() const ", "initFilter()", "dependsOnScale() const ", "toSld(QDomDocument &doc, QDomElement &element, QgsStringMap props) const ", "save(QDomDocument &doc, QgsSymbolMap &symbolMap) const ", "setLabel(const QString &label)", "symbol()"], "QgsExpression::NodeUnaryOperator": ["op() const ", "NodeUnaryOperator(UnaryOperator op, Node *operand)", "operand() const "], "QgsLegendModelV2": ["QgsLegendModelV2(QgsLayerTreeGroup *rootNode, QObject *parent=nullptr)"], "QgsAction": ["QgsAction(ActionType type, const QString &name, const QString &action, const QString &icon, bool capture)", "ActionType", "QgsAction(ActionType type, const QString &name, const QString &action, bool capture)"], - "QgsSimpleFillSymbolLayerV2Widget": ["setBrushStyle()", "create(const QgsVectorLayer *vl)", "offsetChanged()", "QgsSimpleFillSymbolLayerV2Widget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "borderWidthChanged()", "setBorderColor(const QColor &color)", "setColor(const QColor &color)", "borderStyleChanged()"], + "QgsSimpleFillSymbolLayerWidget": ["setBrushStyle()", "create(const QgsVectorLayer *vl)", "offsetChanged()", "QgsSimpleFillSymbolLayerWidget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "borderWidthChanged()", "setBorderColor(const QColor &color)", "setColor(const QColor &color)", "borderStyleChanged()"], "QgsValueRelationWidgetWrapper": ["orderByKeyLessThan(const QgsValueRelationWidgetWrapper::ValueRelationItem &p1, const QgsValueRelationWidgetWrapper::ValueRelationItem &p2)", "orderByValueLessThan(const QgsValueRelationWidgetWrapper::ValueRelationItem &p1, const QgsValueRelationWidgetWrapper::ValueRelationItem &p2)", "QgsValueRelationWidgetWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor=nullptr, QWidget *parent=nullptr)", "createCache(const QgsEditorWidgetConfig &config)", "None"], "QgsCptCityColorRampItem": ["init()", "QgsCptCityColorRampItem(QgsCptCityDataItem *parent, const QString &name, const QString &path, const QStringList &variantList, bool initialize=false)", "QgsCptCityColorRampItem(QgsCptCityDataItem *parent, const QString &name, const QString &path, const QString &variantName=QString(), bool initialize=false)", "ramp() const "], "QgsMasterPasswordResetDialog": ["QgsMasterPasswordResetDialog(QWidget *parent=nullptr)", "requestMasterPasswordReset(QString *newpass, QString *oldpass, bool *keepbackup)"], @@ -356,10 +356,10 @@ ACCEPTABLE_MISSING_DOCS = { "QgsRasterRendererRegistry": ["rendererData(const QString &rendererName, QgsRasterRendererRegistryEntry &data) const ", "instance()", "insert(const QgsRasterRendererRegistryEntry &entry)", "renderersList() const ", "insertWidgetFunction(const QString &rendererName, QgsRasterRendererWidgetCreateFunc func)", "entries() const "], "QgsDummyConfigDlg": ["QgsDummyConfigDlg(QgsVectorLayer *vl, int fieldIdx, QWidget *parent, const QString &description)"], "QgsZonalStatistics": ["QgsZonalStatistics(QgsVectorLayer *polygonLayer, const QString &rasterFile, const QString &attributePrefix=\"\", int rasterBand=1, const Statistics &stats=Statistics(Count|Sum|Mean))"], - "QgsRuleBasedRendererV2": ["createFromSld(QDomElement &element, QgsWkbTypes::GeometryType geomType)", "FeatureFlags", "None", "create(QDomElement &element)", "rootRule()"], + "QgsRuleBasedRenderer": ["createFromSld(QDomElement &element, QgsWkbTypes::GeometryType geomType)", "FeatureFlags", "None", "create(QDomElement &element)", "rootRule()"], "QgsRasterDrawer": ["draw(QPainter *p, QgsRasterViewPort *viewPort, const QgsMapToPixel *theQgsMapToPixel)", "QgsRasterDrawer(QgsRasterIterator *iterator)"], "QgsOfflineEditing": ["ProgressMode"], - "QgsRendererRangeV2LabelFormat": ["saveToDomElement(QDomElement &element)", "setPrecision(int precision)", "setFromDomElement(QDomElement &element)", "setFormat(const QString &format)", "QgsRendererRangeV2LabelFormat(const QString &format, int precision=4, bool trimTrailingZeroes=false)", "formatNumber(double value) const ", "format() const ", "setTrimTrailingZeroes(bool trimTrailingZeroes)", "labelForRange(const QgsRendererRangeV2 &range) const ", "trimTrailingZeroes() const ", "precision() const "], + "QgsRendererRangeLabelFormat": ["saveToDomElement(QDomElement &element)", "setPrecision(int precision)", "setFromDomElement(QDomElement &element)", "setFormat(const QString &format)", "QgsRendererRangeLabelFormat(const QString &format, int precision=4, bool trimTrailingZeroes=false)", "formatNumber(double value) const ", "format() const ", "setTrimTrailingZeroes(bool trimTrailingZeroes)", "labelForRange(const QgsRendererRange &range) const ", "trimTrailingZeroes() const ", "precision() const "], "QgsCharacterSelectorDialog": ["QgsCharacterSelectorDialog(QWidget *parent=nullptr, Qt::WindowFlags fl=QgisGui::ModalDialogFlags)", "selectCharacter(bool *gotChar, const QFont &font, const QString &style)"], "QgsComposerLegend": ["boxSpace() const ", "symbolHeight() const ", "setBoxSpace(double s)", "setSymbolWidth(double w)", "splitLayer() const ", "setWmsLegendHeight(double h)", "setFontColor(const QColor &c)", "composerMap() const ", "setColumnCount(int c)", "setComposerMap(const QgsComposerMap *map)", "setTitle(const QString &t)", "QgsComposerLegend(QgsComposition *composition)", "setSymbolHeight(double h)", "setColumnSpace(double s)", "columnCount() const ", "setStyle(QgsComposerLegendStyle::Style s, const QgsComposerLegendStyle &style)", "setWrapChar(const QString &t)", "setSplitLayer(bool s)", "title() const ", "styleFont(QgsComposerLegendStyle::Style s) const ", "wmsLegendWidth() const ", "columnSpace() const ", "equalColumnWidth() const ", "wrapChar() const ", "setStyleMargin(QgsComposerLegendStyle::Style s, QgsComposerLegendStyle::Side side, double margin)", "setWmsLegendWidth(double w)", "setEqualColumnWidth(bool s)", "fontColor() const ", "wmsLegendHeight() const ", "symbolWidth() const "], "QgsGeometryRubberBand": ["QgsGeometryRubberBand(QgsMapCanvas *mapCanvas, QgsWkbTypes::GeometryType geomType=QgsWkbTypes::LineGeometry)", "IconType"], @@ -372,7 +372,7 @@ ACCEPTABLE_MISSING_DOCS = { "QgsPointLocator_Stream": ["QgsPointLocator_Stream(const QLinkedList< RTree::Data * > &dataList)"], "QgsProviderRegistry": ["registerGuis(QWidget *widget)", "selectWidget(const QString &providerKey, QWidget *parent=nullptr, Qt::WindowFlags fl=nullptr)", "providerLibrary(const QString &providerKey) const "], "QgsCoordinateTransform": ["destinationDatumTransform() const ", "clone() const ", "setSourceDatumTransform(int dt)", "transformInPlace(double &x, double &y, double &z, TransformDirection direction=ForwardTransform) const ", "transformInPlace(QVector< float > &x, QVector< float > &y, QVector< float > &z, TransformDirection direction=ForwardTransform) const ", "sourceDatumTransform() const ", "setDestinationDatumTransform(int dt)", "transformPolygon(QPolygonF &poly, TransformDirection direction=ForwardTransform) const ", "transformInPlace(float &x, float &y, float &z, TransformDirection direction=ForwardTransform) const ", "transformInPlace(float &x, float &y, double &z, TransformDirection direction=ForwardTransform) const ", "datumTransformString(int datumTransform)"], - "QgsHeatmapRenderer": ["convertFromRenderer(const QgsFeatureRendererV2 *renderer)", "create(QDomElement &element)"], + "QgsHeatmapRenderer": ["convertFromRenderer(const QgsFeatureRenderer *renderer)", "create(QDomElement &element)"], "QgsConnectionPool": ["None"], "QgsVectorLayerFeatureSource": ["QgsVectorLayerFeatureSource(QgsVectorLayer *layer)"], "QgsLabel": ["QgsLabel(const QgsFields &fields)", "LabelField", "maxScale() const ", "scaleBasedVisibility() const ", "minScale() const "], @@ -381,7 +381,7 @@ ACCEPTABLE_MISSING_DOCS = { "QgsVectorLayerCache": ["QgsVectorLayerCache(QgsVectorLayer *layer, int cacheSize, QObject *parent=nullptr)"], "QgsRasterPipe": ["QgsRasterPipe(const QgsRasterPipe &thePipe)", "size() const ", "renderer() const ", "at(int idx) const ", "resampleFilter() const ", "provider() const ", "brightnessFilter() const ", "nuller() const ", "hueSaturationFilter() const ", "last() const ", "projector() const ", "Role"], "QgsDbFilterProxyModel": ["QgsDbFilterProxyModel(QObject *parent=nullptr)"], - "QgsMarkerLineSymbolLayerV2Widget": ["create(const QgsVectorLayer *vl)", "setOffsetAlongLine(double val)", "setPlacement()", "setInterval(double val)", "setOffset()", "setRotate()", "QgsMarkerLineSymbolLayerV2Widget(const QgsVectorLayer *vl, QWidget *parent=nullptr)"], + "QgsMarkerLineSymbolLayerWidget": ["create(const QgsVectorLayer *vl)", "setOffsetAlongLine(double val)", "setPlacement()", "setInterval(double val)", "setOffset()", "setRotate()", "QgsMarkerLineSymbolLayerWidget(const QgsVectorLayer *vl, QWidget *parent=nullptr)"], "QgsDataDefinedAssistant": ["dataDefined() const =0"], "QgsTransaction": ["QgsTransaction(const QString &connString)"], "QgsBrowserTreeView": ["hasExpandedDescendant(const QModelIndex &index) const ", "setSettingsSection(const QString §ion)", "QgsBrowserTreeView(QWidget *parent=nullptr)"], @@ -390,15 +390,15 @@ ACCEPTABLE_MISSING_DOCS = { "QgsExpression::Interval": ["Interval(double seconds=0)"], "QgsManageConnectionsDialog": ["doExportImport()", "selectionChanged()", "Mode", "clearSelection()", "QgsManageConnectionsDialog(QWidget *parent=nullptr, Mode mode=Export, Type type=WMS, const QString &fileName=\"\")", "selectAll()", "Type"], "QgsAttributeTableView": ["repaintRequested()", "_q_selectRow(int row)", "setModel(QgsAttributeTableFilterModel *filterModel)", "finished()", "selectRow(int row)", "repaintRequested(const QModelIndexList &indexes)", "QgsAttributeTableView(QWidget *parent=nullptr)"], - "QgsSimpleMarkerSymbolLayerV2": ["outlineWidthMapUnitScale() const ", "setName(const QString &name)", "setBorderColor(const QColor &color)", "outlineStyle() const ", "setOutlineWidthUnit(QgsSymbol::OutputUnit u)", "setOutlineWidthMapUnitScale(const QgsMapUnitScale &scale)", "setOutlineWidth(double w)", "borderColor() const ", "preparePath(QString name=QString())", "prepareShape(const QString &name=QString())", "name() const ", "prepareShape(const QString &name, QPolygonF &polygon) const ", "QgsSimpleMarkerSymbolLayerV2(const QString &name=DEFAULT_SIMPLEMARKER_NAME, const QColor &color=DEFAULT_SIMPLEMARKER_COLOR, const QColor &borderColor=DEFAULT_SIMPLEMARKER_BORDERCOLOR, double size=DEFAULT_SIMPLEMARKER_SIZE, double angle=DEFAULT_SIMPLEMARKER_ANGLE, QgsSymbol::ScaleMethod scaleMethod=DEFAULT_SCALE_METHOD)", "drawMarker(QPainter *p, QgsSymbolRenderContext &context)", "create(const QgsStringMap &properties=QgsStringMap())", "setOutlineStyle(Qt::PenStyle outlineStyle)", "outlineWidthUnit() const ", "createFromSld(QDomElement &element)", "outlineWidth() const "], - "QgsStyleV2ExportImportDialog": ["QgsStyleV2ExportImportDialog(QgsStyleV2 *style, QWidget *parent=nullptr, Mode mode=Export)", "Mode", "doExportImport()", "importTypeChanged(int)", "browse()"], + "QgsSimpleMarkerSymbolLayer": ["outlineWidthMapUnitScale() const ", "setName(const QString &name)", "setBorderColor(const QColor &color)", "outlineStyle() const ", "setOutlineWidthUnit(QgsSymbol::OutputUnit u)", "setOutlineWidthMapUnitScale(const QgsMapUnitScale &scale)", "setOutlineWidth(double w)", "borderColor() const ", "preparePath(QString name=QString())", "prepareShape(const QString &name=QString())", "name() const ", "prepareShape(const QString &name, QPolygonF &polygon) const ", "QgsSimpleMarkerSymbolLayer(const QString &name=DEFAULT_SIMPLEMARKER_NAME, const QColor &color=DEFAULT_SIMPLEMARKER_COLOR, const QColor &borderColor=DEFAULT_SIMPLEMARKER_BORDERCOLOR, double size=DEFAULT_SIMPLEMARKER_SIZE, double angle=DEFAULT_SIMPLEMARKER_ANGLE, QgsSymbol::ScaleMethod scaleMethod=DEFAULT_SCALE_METHOD)", "drawMarker(QPainter *p, QgsSymbolRenderContext &context)", "create(const QgsStringMap &properties=QgsStringMap())", "setOutlineStyle(Qt::PenStyle outlineStyle)", "outlineWidthUnit() const ", "createFromSld(QDomElement &element)", "outlineWidth() const "], + "QgsStyleExportImportDialog": ["QgsStyleExportImportDialog(QgsStyle *style, QWidget *parent=nullptr, Mode mode=Export)", "Mode", "doExportImport()", "importTypeChanged(int)", "browse()"], "QgsMapSettings": ["readXML(QDomNode &theNode)", "updateDerived()", "mapToPixel() const ", "writeXML(QDomNode &theNode, QDomDocument &theDoc)", "datumTransformStore()"], "QgsAttributeForm": ["QgsAttributeForm(QgsVectorLayer *vl, const QgsFeature &feature=QgsFeature(), const QgsAttributeEditorContext &context=QgsAttributeEditorContext(), QWidget *parent=nullptr)", "feature()"], "QgsWkbPtr": ["operator unsigned char *() const ", "operator+=(int n)", "size() const ", "QgsWkbPtr(unsigned char *p, int size)", "operator>>(QgsWkbTypes::Type &v) const ", "operator<<(const double &v)", "operator<<(const char &v)", "operator>>(int &v) const ", "operator>>(char &v) const ", "operator>>(double &v) const ", "writtenSize() const ", "operator<<(const float &r)", "remaining() const ", "operator<<(const QgsWkbTypes::Type &v)", "operator<<(const int &v)", "operator>>(Qgis::WkbType &v) const ", "operator>>(unsigned int &v) const ", "operator<<(const unsigned int &v)", "operator<<(const Qgis::WkbType &v)", "operator>>(float &r) const "], "QgsMapThemeCollection": ["None"], "QgsDirectoryItem": ["Column", "dirPath() const ", "directoryChanged()", "QgsDirectoryItem(QgsDataItem *parent, const QString &name, const QString &path)", "init()"], "QgsExpression::NodeLiteral": ["NodeLiteral(const QVariant &value)"], - "QgsEllipseSymbolLayerV2": ["symbolHeight() const ", "setOutlineWidthMapUnitScale(const QgsMapUnitScale &scale)", "setSymbolWidth(double w)", "setOutlineWidth(double w)", "symbolHeightUnit() const ", "outlineWidthUnit() const ", "setSymbolWidthUnit(QgsSymbol::OutputUnit unit)", "setSymbolHeightUnit(QgsSymbol::OutputUnit unit)", "symbolHeightMapUnitScale() const ", "symbolWidthMapUnitScale() const ", "setOutlineStyle(Qt::PenStyle outlineStyle)", "outlineStyle() const ", "setSymbolHeight(double h)", "setSymbolName(const QString &name)", "createFromSld(QDomElement &element)", "outlineWidthMapUnitScale() const ", "setOutlineWidthUnit(QgsSymbol::OutputUnit unit)", "symbolName() const ", "setSymbolWidthMapUnitScale(const QgsMapUnitScale &scale)", "setSymbolHeightMapUnitScale(const QgsMapUnitScale &scale)", "symbolWidthUnit() const ", "create(const QgsStringMap &properties=QgsStringMap())", "symbolWidth() const ", "outlineWidth() const "], + "QgsEllipseSymbolLayer": ["symbolHeight() const ", "setOutlineWidthMapUnitScale(const QgsMapUnitScale &scale)", "setSymbolWidth(double w)", "setOutlineWidth(double w)", "symbolHeightUnit() const ", "outlineWidthUnit() const ", "setSymbolWidthUnit(QgsSymbol::OutputUnit unit)", "setSymbolHeightUnit(QgsSymbol::OutputUnit unit)", "symbolHeightMapUnitScale() const ", "symbolWidthMapUnitScale() const ", "setOutlineStyle(Qt::PenStyle outlineStyle)", "outlineStyle() const ", "setSymbolHeight(double h)", "setSymbolName(const QString &name)", "createFromSld(QDomElement &element)", "outlineWidthMapUnitScale() const ", "setOutlineWidthUnit(QgsSymbol::OutputUnit unit)", "symbolName() const ", "setSymbolWidthMapUnitScale(const QgsMapUnitScale &scale)", "setSymbolHeightMapUnitScale(const QgsMapUnitScale &scale)", "symbolWidthUnit() const ", "create(const QgsStringMap &properties=QgsStringMap())", "symbolWidth() const ", "outlineWidth() const "], "QgsComposerHtml": ["QgsComposerHtml(QgsComposition *c, bool createUndoCommands)", "refreshExpressionContext()"], "QgsRasterMatrix": ["setNodataValue(double d)", "greaterThan(const QgsRasterMatrix &other)", "changeSign()", "nodataValue() const ", "cosinus()", "lesserEqual(const QgsRasterMatrix &other)", "logicalAnd(const QgsRasterMatrix &other)", "TwoArgOperator", "log()", "divide(const QgsRasterMatrix &other)", "log10()", "QgsRasterMatrix(const QgsRasterMatrix &m)", "setData(int cols, int rows, double *data, double nodataValue)", "greaterEqual(const QgsRasterMatrix &other)", "equal(const QgsRasterMatrix &other)", "sinus()", "asinus()", "logicalOr(const QgsRasterMatrix &other)", "squareRoot()", "nColumns() const ", "OneArgOperator", "atangens()", "number() const ", "lesserThan(const QgsRasterMatrix &other)", "tangens()", "acosinus()", "power(const QgsRasterMatrix &other)", "multiply(const QgsRasterMatrix &other)", "nRows() const ", "notEqual(const QgsRasterMatrix &other)"], "QgsLayerTreeView": ["layerForIndex(const QModelIndex &index) const ", "updateExpandedStateToNode(const QModelIndex &index)", "QgsLayerTreeView(QWidget *parent=nullptr)", "modelRowsRemoved()", "onExpandedChanged(QgsLayerTreeNode *node, bool expanded)", "updateExpandedStateFromNode(QgsLayerTreeNode *node)", "modelRowsInserted(const QModelIndex &index, int start, int end)", "onModelReset()", "onCurrentChanged()"], @@ -415,7 +415,7 @@ ACCEPTABLE_MISSING_DOCS = { "QgsLongLongValidator": ["QgsLongLongValidator(qint64 bottom, qint64 top, QObject *parent)", "setTop(qint64 top)", "setRange(qint64 bottom, qint64 top)", "bottom() const ", "setBottom(qint64 bottom)", "QgsLongLongValidator(QObject *parent)", "top() const "], "QgsPalLayerSettings": ["DataDefinedProperties", "ShapeType", "DirectionSymbols", "UpsideDownLabels", "QuadrantPosition", "MultiLineAlign", "writeToLayer(QgsVectorLayer *layer)", "RotationType", "ShadowType", "calculateLabelSize(const QFontMetricsF *fm, QString text, double &labelX, double &labelY, QgsFeature *f=nullptr, QgsRenderContext *context=nullptr)", "QgsPalLayerSettings(const QgsPalLayerSettings &s)", "SizeType", "readFromLayer(QgsVectorLayer *layer)"], "QgsRasterLayerRenderer": ["QgsRasterLayerRenderer(QgsRasterLayer *layer, QgsRenderContext &rendererContext)"], - "QgsCptCityColorRampV2": ["descFileName() const ", "copyingInfo() const ", "fileName() const ", "copyingFileName() const ", "setVariantName(const QString &variantName)", "schemeName() const ", "variantList() const ", "setSchemeName(const QString &schemeName)", "loadPalette()", "QgsCptCityColorRampV2(const QString &schemeName=DEFAULT_CPTCITY_SCHEMENAME, const QString &variantName=DEFAULT_CPTCITY_VARIANTNAME, bool doLoadFile=true)", "copy(const QgsCptCityColorRampV2 *other)", "setName(const QString &schemeName, const QString &variantName=\"\", const QStringList &variantList=QStringList())", "cloneGradientRamp() const ", "setVariantList(const QStringList &variantList)", "loadFile()", "variantName() const ", "fileLoaded() const ", "hasMultiStops() const ", "create(const QgsStringMap &properties=QgsStringMap())", "QgsCptCityColorRampV2(const QString &schemeName, const QStringList &variantList, const QString &variantName=QString(), bool doLoadFile=true)"], + "QgsCptCityColorRamp": ["descFileName() const ", "copyingInfo() const ", "fileName() const ", "copyingFileName() const ", "setVariantName(const QString &variantName)", "schemeName() const ", "variantList() const ", "setSchemeName(const QString &schemeName)", "loadPalette()", "QgsCptCityColorRamp(const QString &schemeName=DEFAULT_CPTCITY_SCHEMENAME, const QString &variantName=DEFAULT_CPTCITY_VARIANTNAME, bool doLoadFile=true)", "copy(const QgsCptCityColorRamp *other)", "setName(const QString &schemeName, const QString &variantName=\"\", const QStringList &variantList=QStringList())", "cloneGradientRamp() const ", "setVariantList(const QStringList &variantList)", "loadFile()", "variantName() const ", "fileLoaded() const ", "hasMultiStops() const ", "create(const QgsStringMap &properties=QgsStringMap())", "QgsCptCityColorRamp(const QString &schemeName, const QStringList &variantList, const QString &variantName=QString(), bool doLoadFile=true)"], "QgsRenderChecker": ["matchTarget()", "setRenderedImage(const QString &theImageFileName)", "matchPercent()", "setElapsedTimeTarget(int theTarget)", "mismatchCount()", "elapsedTime()", "report()", "controlImagePath() const ", "setControlPathSuffix(const QString &theName)"], "QgsPaperGrid": ["QgsPaperGrid(double x, double y, double width, double height, QgsComposition *composition)"], "QgsExternalResourceWidget": ["DocumentViewerContent", "setDocumentPath(const QVariant &documentPath)"], @@ -444,13 +444,13 @@ ACCEPTABLE_MISSING_DOCS = { "QgsExpression::NodeList": ["dump() const ", "count()", "list()"], "QgsComposerAttributeTableV2": ["QgsComposerAttributeTableV2(QgsComposition *composition, bool createUndoCommands)"], "QgsMapLayerLegend": ["QgsMapLayerLegend(QObject *parent=nullptr)"], - "QgsGeometryEngine": ["buffer(double distance, int segments, QString *errorMsg=nullptr) const =0", "contains(const QgsAbstractGeometryV2 &geom, QString *errorMsg=nullptr) const =0", "prepareGeometry()=0", "length(QString *errorMsg=nullptr) const =0", "splitGeometry(const QgsLineStringV2 &splitLine, QList< QgsAbstractGeometryV2 * > &newGeometries, bool topological, QgsPointSequenceV2 &topologyTestPoints, QString *errorMsg=nullptr) const ", "within(const QgsAbstractGeometryV2 &geom, QString *errorMsg=nullptr) const =0", "geometryChanged()=0", "overlaps(const QgsAbstractGeometryV2 &geom, QString *errorMsg=nullptr) const =0", "interpolate(double distance, QString *errorMsg=nullptr) const =0", "intersection(const QgsAbstractGeometryV2 &geom, QString *errorMsg=nullptr) const =0", "centroid(QgsPointV2 &pt, QString *errorMsg=nullptr) const =0", "simplify(double tolerance, QString *errorMsg=nullptr) const =0", "QgsGeometryEngine(const QgsAbstractGeometryV2 *geometry)", "isValid(QString *errorMsg=nullptr) const =0", "area(QString *errorMsg=nullptr) const =0", "combine(const QgsAbstractGeometryV2 &geom, QString *errorMsg=nullptr) const =0", "combine(const QList< QgsAbstractGeometryV2 * > &, QString *errorMsg=nullptr) const =0", "isEmpty(QString *errorMsg) const =0", "envelope(QString *errorMsg=nullptr) const =0", "touches(const QgsAbstractGeometryV2 &geom, QString *errorMsg=nullptr) const =0", "distance(const QgsAbstractGeometryV2 &geom, QString *errorMsg=nullptr) const =0", "disjoint(const QgsAbstractGeometryV2 &geom, QString *errorMsg=nullptr) const =0", "convexHull(QString *errorMsg=nullptr) const =0", "offsetCurve(double distance, int segments, int joinStyle, double mitreLimit, QString *errorMsg=nullptr) const =0", "buffer(double distance, int segments, int endCapStyle, int joinStyle, double mitreLimit, QString *errorMsg=nullptr) const =0", "pointOnSurface(QgsPointV2 &pt, QString *errorMsg=nullptr) const =0", "intersects(const QgsAbstractGeometryV2 &geom, QString *errorMsg=nullptr) const =0", "difference(const QgsAbstractGeometryV2 &geom, QString *errorMsg=nullptr) const =0", "symDifference(const QgsAbstractGeometryV2 &geom, QString *errorMsg=nullptr) const =0", "isEqual(const QgsAbstractGeometryV2 &geom, QString *errorMsg=nullptr) const =0", "crosses(const QgsAbstractGeometryV2 &geom, QString *errorMsg=nullptr) const =0"], + "QgsGeometryEngine": ["buffer(double distance, int segments, QString *errorMsg=nullptr) const =0", "contains(const QgsAbstractGeometry &geom, QString *errorMsg=nullptr) const =0", "prepareGeometry()=0", "length(QString *errorMsg=nullptr) const =0", "splitGeometry(const QgsLineString &splitLine, QList< QgsAbstractGeometry * > &newGeometries, bool topological, QgsPointSequence &topologyTestPoints, QString *errorMsg=nullptr) const ", "within(const QgsAbstractGeometry &geom, QString *errorMsg=nullptr) const =0", "geometryChanged()=0", "overlaps(const QgsAbstractGeometry &geom, QString *errorMsg=nullptr) const =0", "interpolate(double distance, QString *errorMsg=nullptr) const =0", "intersection(const QgsAbstractGeometry &geom, QString *errorMsg=nullptr) const =0", "centroid(QgsPointV2 &pt, QString *errorMsg=nullptr) const =0", "simplify(double tolerance, QString *errorMsg=nullptr) const =0", "QgsGeometryEngine(const QgsAbstractGeometry *geometry)", "isValid(QString *errorMsg=nullptr) const =0", "area(QString *errorMsg=nullptr) const =0", "combine(const QgsAbstractGeometry &geom, QString *errorMsg=nullptr) const =0", "combine(const QList< QgsAbstractGeometry * > &, QString *errorMsg=nullptr) const =0", "isEmpty(QString *errorMsg) const =0", "envelope(QString *errorMsg=nullptr) const =0", "touches(const QgsAbstractGeometry &geom, QString *errorMsg=nullptr) const =0", "distance(const QgsAbstractGeometry &geom, QString *errorMsg=nullptr) const =0", "disjoint(const QgsAbstractGeometry &geom, QString *errorMsg=nullptr) const =0", "convexHull(QString *errorMsg=nullptr) const =0", "offsetCurve(double distance, int segments, int joinStyle, double mitreLimit, QString *errorMsg=nullptr) const =0", "buffer(double distance, int segments, int endCapStyle, int joinStyle, double mitreLimit, QString *errorMsg=nullptr) const =0", "pointOnSurface(QgsPointV2 &pt, QString *errorMsg=nullptr) const =0", "intersects(const QgsAbstractGeometry &geom, QString *errorMsg=nullptr) const =0", "difference(const QgsAbstractGeometry &geom, QString *errorMsg=nullptr) const =0", "symDifference(const QgsAbstractGeometry &geom, QString *errorMsg=nullptr) const =0", "isEqual(const QgsAbstractGeometry &geom, QString *errorMsg=nullptr) const =0", "crosses(const QgsAbstractGeometry &geom, QString *errorMsg=nullptr) const =0"], "QgsMapToolAdvancedDigitizing": ["cadDockWidget() const "], "QgsCptCityBrowserModel": ["findItem(QgsCptCityDataItem *item, QgsCptCityDataItem *parent=nullptr) const ", "QgsCptCityBrowserModel(QObject *parent=nullptr, QgsCptCityArchive *archive=QgsCptCityArchive::defaultArchive(), ViewType Type=Authors)", "endInsertItems()", "reload()", "beginInsertItems(QgsCptCityDataItem *parent, int first, int last)", "addRootItems()", "connectItem(QgsCptCityDataItem *item)", "refresh(const QString &path)", "beginRemoveItems(QgsCptCityDataItem *parent, int first, int last)", "endRemoveItems()", "refresh(const QModelIndex &index=QModelIndex())", "ViewType", "removeRootItems()"], "QgsComposerPicture": ["QgsComposerPicture(QgsComposition *composition)"], "QgsSingleCategoryDiagramRenderer": ["setDiagramSettings(const QgsDiagramSettings &s)"], "QgsFilterLineEdit": ["nullValue() const ", "QgsFilterLineEdit(QWidget *parent=nullptr, const QString &nullValue=QString::null)", "cleared()", "setNullValue(const QString &nullValue)"], - "QgsFillSymbolLayerV2": ["setAngle(double angle)", "renderPolygon(const QPolygonF &points, QList< QPolygonF > *rings, QgsSymbolRenderContext &context)=0", "QgsFillSymbolLayerV2(bool locked=false)", "angle() const "], + "QgsFillSymbolLayer": ["setAngle(double angle)", "renderPolygon(const QPolygonF &points, QList< QPolygonF > *rings, QgsSymbolRenderContext &context)=0", "QgsFillSymbolLayer(bool locked=false)", "angle() const "], "QgsClassificationWidgetWrapperFactory": ["QgsClassificationWidgetWrapperFactory(const QString &name)"], "QgsLegendInterface": ["itemAdded(const QModelIndex &index)", "groupRelationsChanged()", "itemRemoved()"], "QgsGlowWidget": ["QgsGlowWidget(QWidget *parent=nullptr)", "create()"], @@ -473,7 +473,7 @@ ACCEPTABLE_MISSING_DOCS = { "QgsSlopeFilter": ["QgsSlopeFilter(const QString &inputFile, const QString &outputFile, const QString &outputFormat)"], "QgsDatumTransformDialog": ["QgsDatumTransformDialog(const QString &layerName, const QList< QList< int > > &dt, QWidget *parent=nullptr, Qt::WindowFlags f=0)"], "QgsMapRendererSequentialJob": ["QgsMapRendererSequentialJob(const QgsMapSettings &settings)", "internalFinished()"], - "QgsPointDisplacementRendererWidget": ["create(QgsVectorLayer *layer, QgsStyleV2 *style, QgsFeatureRendererV2 *renderer)", "QgsPointDisplacementRendererWidget(QgsVectorLayer *layer, QgsStyleV2 *style, QgsFeatureRendererV2 *renderer)"], + "QgsPointDisplacementRendererWidget": ["create(QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer)", "QgsPointDisplacementRendererWidget(QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer)"], "QgsPointLocator": ["Type", "destroyIndex()", "None", "rebuildIndex(int maxFeaturesToIndex=-1)"], "QgsUserInputDockWidget": ["QgsUserInputDockWidget(QWidget *parent=nullptr)"], "QgsLayerTreeModelLegendNode": ["setUserLabel(const QString &userLabel)", "isScaleOK(double scale) const ", "userLabel() const ", "setEmbeddedInParent(bool embedded)", "LegendNodeRoles", "isEmbeddedInParent() const "], @@ -494,7 +494,7 @@ ACCEPTABLE_MISSING_DOCS = { "QgsComposerMergeCommand": ["QgsComposerMergeCommand(Context c, QgsComposerItem *item, const QString &text)", "Context"], "QgsVectorFileWriter": ["OptionType", "SymbologyExport", "driverMetadata(const QString &driverName, MetaData &driverMetadata)", "setSymbologyExport(SymbologyExport symExport)", "symbologyScaleDenominator() const ", "setSymbologyScaleDenominator(double d)", "WriterError", "symbologyExport() const "], "QgsVectorLayerSelectionManager": ["QgsVectorLayerSelectionManager(QgsVectorLayer *layer, QObject *parent=nullptr)"], - "QgsVertexId": ["VertexType", "ringEqual(QgsVertexId o) const ", "partEqual(QgsVertexId o) const ", "QgsVertexId(int _part=-1, int _ring=-1, int _vertex=-1, VertexType _type=SegmentVertex)", "isValid(const QgsAbstractGeometryV2 *geom) const ", "vertexEqual(QgsVertexId o) const "], + "QgsVertexId": ["VertexType", "ringEqual(QgsVertexId o) const ", "partEqual(QgsVertexId o) const ", "QgsVertexId(int _part=-1, int _ring=-1, int _vertex=-1, VertexType _type=SegmentVertex)", "isValid(const QgsAbstractGeometry *geom) const ", "vertexEqual(QgsVertexId o) const "], "CloughTocherInterpolator": ["setTriangulation(NormVecDecorator *tin)"], "QgsExpressionHighlighter": ["addFields(const QStringList &fieldList)", "QgsExpressionHighlighter(QTextDocument *parent=nullptr)"], "QgsWebViewWidgetFactory": ["QgsWebViewWidgetFactory(const QString &name)"], @@ -507,8 +507,8 @@ ACCEPTABLE_MISSING_DOCS = { "QgsWebViewWidgetConfigDlg": ["QgsWebViewWidgetConfigDlg(QgsVectorLayer *vl, int fieldIdx, QWidget *parent)"], "QgsFileNameWidgetFactory": ["QgsFileNameWidgetFactory(const QString &name)"], "QgsSvgAnnotationItem": ["QgsSvgAnnotationItem(QgsMapCanvas *canvas)", "filePath() const ", "setFilePath(const QString &file)"], - "QgsSymbolsListWidget": ["updateDataDefinedMarkerAngle()", "updateDataDefinedMarkerSize()", "changed()", "setSymbolColor(const QColor &color)", "setLineWidth(double width)", "setSymbolFromStyle(const QModelIndex &index)", "updateSymbolColor()", "updateSymbolInfo()", "setMarkerAngle(double angle)", "openStyleManager()", "QgsSymbolsListWidget(QgsSymbol *symbol, QgsStyleV2 *style, QMenu *menu, QWidget *parent, const QgsVectorLayer *layer=nullptr)", "symbolAddedToStyle(const QString &name, QgsSymbol *symbol)", "saveSymbol()", "clipFeaturesToggled(bool checked)", "populateSymbols(const QStringList &symbols)", "populateSymbolView()", "addSymbolToStyle()", "setMarkerSize(double size)", "updateDataDefinedLineWidth()"], - "QgsGradientFillSymbolLayerV2": ["referencePoint2() const ", "GradientSpread", "GradientColorType", "setOffsetMapUnitScale(const QgsMapUnitScale &scale)", "QgsGradientFillSymbolLayerV2(const QColor &color=DEFAULT_SIMPLEFILL_COLOR, const QColor &color2=Qt::white, GradientColorType gradientColorType=SimpleTwoColor, GradientType gradientType=Linear, GradientCoordinateMode coordinateMode=Feature, GradientSpread gradientSpread=Pad)", "GradientCoordinateMode", "setCoordinateMode(GradientCoordinateMode coordinateMode)", "setColor2(const QColor &color2)", "setGradientColorType(GradientColorType gradientColorType)", "referencePoint1() const ", "offsetUnit() const ", "referencePoint2IsCentroid() const ", "GradientType", "referencePoint1IsCentroid() const ", "offset() const ", "setGradientType(GradientType gradientType)", "setColorRamp(QgsVectorColorRampV2 *ramp)", "setGradientSpread(GradientSpread gradientSpread)", "create(const QgsStringMap &properties=QgsStringMap())", "offsetMapUnitScale() const "], + "QgsSymbolsListWidget": ["updateDataDefinedMarkerAngle()", "updateDataDefinedMarkerSize()", "changed()", "setSymbolColor(const QColor &color)", "setLineWidth(double width)", "setSymbolFromStyle(const QModelIndex &index)", "updateSymbolColor()", "updateSymbolInfo()", "setMarkerAngle(double angle)", "openStyleManager()", "QgsSymbolsListWidget(QgsSymbol *symbol, QgsStyle *style, QMenu *menu, QWidget *parent, const QgsVectorLayer *layer=nullptr)", "symbolAddedToStyle(const QString &name, QgsSymbol *symbol)", "saveSymbol()", "clipFeaturesToggled(bool checked)", "populateSymbols(const QStringList &symbols)", "populateSymbolView()", "addSymbolToStyle()", "setMarkerSize(double size)", "updateDataDefinedLineWidth()"], + "QgsGradientFillSymbolLayer": ["referencePoint2() const ", "GradientSpread", "GradientColorType", "setOffsetMapUnitScale(const QgsMapUnitScale &scale)", "QgsGradientFillSymbolLayer(const QColor &color=DEFAULT_SIMPLEFILL_COLOR, const QColor &color2=Qt::white, GradientColorType gradientColorType=SimpleTwoColor, GradientType gradientType=Linear, GradientCoordinateMode coordinateMode=Feature, GradientSpread gradientSpread=Pad)", "GradientCoordinateMode", "setCoordinateMode(GradientCoordinateMode coordinateMode)", "setColor2(const QColor &color2)", "setGradientColorType(GradientColorType gradientColorType)", "referencePoint1() const ", "offsetUnit() const ", "referencePoint2IsCentroid() const ", "GradientType", "referencePoint1IsCentroid() const ", "offset() const ", "setGradientType(GradientType gradientType)", "setColorRamp(QgsVectorColorRamp *ramp)", "setGradientSpread(GradientSpread gradientSpread)", "create(const QgsStringMap &properties=QgsStringMap())", "offsetMapUnitScale() const "], "QgsOSMNodeIterator": ["close()", "next()"], "QgsPalettedRendererWidget": ["create(QgsRasterLayer *layer, const QgsRectangle &theExtent)", "QgsPalettedRendererWidget(QgsRasterLayer *layer, const QgsRectangle &extent=QgsRectangle())", "setFromRenderer(const QgsRasterRenderer *r)"], "QgsDataProvider": ["QgsDataProvider(QString const &uri=\"\")", "DataCapability"], @@ -543,7 +543,7 @@ ACCEPTABLE_MISSING_DOCS = { "QgsLegendModel": ["ItemType", "addLayer(QgsMapLayer *theMapLayer, double scaleDenominator=-1, const QString &rule=\"\", QStandardItem *parentItem=nullptr)", "setLayerSet(const QStringList &layerIds, double scaleDenominator=-1, const QString &rule=\"\")", "updateRasterClassificationItem(QStandardItem *classificationItem)", "readXML(const QDomElement &legendModelElem, const QDomDocument &doc)", "removeLayer(const QString &layerId)", "writeXML(QDomElement &composerLegendElem, QDomDocument &doc) const ", "setAutoUpdate(bool autoUpdate)", "layersChanged()", "autoUpdate()"], "QgsRasterFormatSaveOptionsWidget": ["validateOptions(bool gui=true, bool reportOk=true)", "setFormat(const QString &format)", "setRasterLayer(QgsRasterLayer *rasterLayer)", "setPyramidsFormat(QgsRaster::RasterPyramidsFormat format)", "QgsRasterFormatSaveOptionsWidget(QWidget *parent=nullptr, const QString &format=\"GTiff\", QgsRasterFormatSaveOptionsWidget::Type type=Default, const QString &provider=\"gdal\")", "options() const ", "setProvider(const QString &provider)", "setRasterFileName(const QString &file)", "updateProfiles()", "helpOptions()", "apply()", "Type", "setType(QgsRasterFormatSaveOptionsWidget::Type type=Default)", "optionsChanged()"], "QgsSpatialIndexCopyVisitor": ["QgsSpatialIndexCopyVisitor(SpatialIndex::ISpatialIndex *newIndex)"], - "QgsCurvePolygonV2": ["numInteriorRings() const ", "QgsCurvePolygonV2(const QgsCurvePolygonV2 &p)", "exteriorRing() const ", "interiorRing(int i) const ", "toPolygon() const "], + "QgsCurvePolygon": ["numInteriorRings() const ", "QgsCurvePolygon(const QgsCurvePolygon &p)", "exteriorRing() const ", "interiorRing(int i) const ", "toPolygon() const "], "QgsPointPatternFillSymbolLayerWidget": ["QgsPointPatternFillSymbolLayerWidget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "create(const QgsVectorLayer *vl)"], "QgsLayerTreeMapCanvasBridge": ["nodeAddedChildren(QgsLayerTreeNode *node, int indexFrom, int indexTo)", "clear()", "defaultLayerOrder() const ", "customLayerOrder() const ", "nodeRemovedChildren()", "hasCustomLayerOrder() const ", "setCanvasLayers(QgsLayerTreeNode *node, QList< QgsMapCanvasLayer > &layers)", "nodeVisibilityChanged()", "setCustomLayerOrder(const QStringList &order)", "writeProject(QDomDocument &doc)", "mapCanvas() const ", "rootGroup() const ", "setHasCustomLayerOrder(bool state)", "readProject(const QDomDocument &doc)", "autoEnableCrsTransform() const ", "autoSetupOnFirstLayer() const ", "defaultLayerOrder(QgsLayerTreeNode *node, QStringList &order) const ", "hasCustomLayerOrderChanged(bool)", "customLayerOrderChanged(const QStringList &order)", "nodeCustomPropertyChanged(QgsLayerTreeNode *node, const QString &key)", "deferredSetCanvasLayers()"], "QgsCptCityAllRampsItem": ["QgsCptCityAllRampsItem(QgsCptCityDataItem *parent, const QString &name, const QVector< QgsCptCityDataItem * > &items)"], @@ -560,7 +560,7 @@ ACCEPTABLE_MISSING_DOCS = { "QgsExpressionItem": ["QgsExpressionItem(const QString &label, const QString &expressionText, const QString &helpText, QgsExpressionItem::ItemType itemType=ExpressionNode)", "QgsExpressionItem(const QString &label, const QString &expressionText, QgsExpressionItem::ItemType itemType=ExpressionNode)", "ItemType", "getExpressionText() const "], "QgsRasterChecker": ["report()"], "QgsPluginLayer": ["QgsPluginLayer(const QString &layerType, const QString &layerName=QString())"], - "QgsSimpleMarkerSymbolLayerV2Widget": ["setName()", "setAngle()", "create(const QgsVectorLayer *vl)", "setColorBorder(const QColor &color)", "setColorFill(const QColor &color)", "QgsSimpleMarkerSymbolLayerV2Widget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "setSize()", "setOffset()"], + "QgsSimpleMarkerSymbolLayerWidget": ["setName()", "setAngle()", "create(const QgsVectorLayer *vl)", "setColorBorder(const QColor &color)", "setColorFill(const QColor &color)", "QgsSimpleMarkerSymbolLayerWidget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "setSize()", "setOffset()"], "QgsProjectVersion": ["text()", "QgsProjectVersion(int major, int minor, int sub, const QString &name=\"\")", "majorVersion()", "subVersion()", "QgsProjectVersion(const QString &string)", "minorVersion()"], "QgsMessageBarItem": ["setLevel(QgsMessageBar::MessageLevel level)", "setIcon(const QIcon &icon)", "setText(const QString &text)", "setDuration(int duration)", "setTitle(const QString &title)", "setWidget(QWidget *widget)"], "QgsDataItemProviderRegistry": ["instance()"], @@ -579,7 +579,7 @@ ACCEPTABLE_MISSING_DOCS = { "QgsDiagram": ["clearCache()", "diagramName() const =0", "QgsDiagram(const QgsDiagram &other)"], "QgsPixmapLabel": ["QgsPixmapLabel(QWidget *parent=nullptr)", "setPixmap(const QPixmap &)"], "QgsTransectSample": ["createSample(QProgressDialog *pd)", "DistanceUnits", "QgsTransectSample(QgsVectorLayer *strataLayer, const QString &strataIdAttribute, const QString &minDistanceAttribute, const QString &nPointsAttribute, DistanceUnits minDistUnits, QgsVectorLayer *baselineLayer, bool shareBaseline, const QString &baselineStrataId, const QString &outputPointLayer, const QString &outputLineLayer, const QString &usedBaselineLayer, double minTransectLength=0.0, double baselineBufferDistance=-1.0, double baselineSimplificationTolerance=-1.0)"], - "QgsRendererCategoryV2": ["label() const ", "swap(QgsRendererCategoryV2 &other)", "symbol() const ", "setValue(const QVariant &value)", "renderState() const ", "toSld(QDomDocument &doc, QDomElement &element, QgsStringMap props) const ", "setRenderState(bool render)", "value() const ", "setSymbol(QgsSymbol *s)", "dump() const ", "setLabel(const QString &label)"], + "QgsRendererCategory": ["label() const ", "swap(QgsRendererCategory &other)", "symbol() const ", "setValue(const QVariant &value)", "renderState() const ", "toSld(QDomDocument &doc, QDomElement &element, QgsStringMap props) const ", "setRenderState(bool render)", "value() const ", "setSymbol(QgsSymbol *s)", "dump() const ", "setLabel(const QString &label)"], "QgsOSMTags": ["count() const ", "insert(const QString &k, const QString &v)", "value(const QString &k) const ", "contains(const QString &k) const ", "keys() const "], "QgsCodeEditorCSS": ["QgsCodeEditorCSS(QWidget *parent=nullptr)"], "QgsRasterMinMaxWidget": ["QgsRasterMinMaxWidget(QgsRasterLayer *theLayer, QWidget *parent=nullptr)", "load()", "setExtent(const QgsRectangle &theExtent)", "setBands(const QList< int > &theBands)", "load(int theBandNo, double theMin, double theMax, int origin)"], @@ -588,11 +588,11 @@ ACCEPTABLE_MISSING_DOCS = { "QgsMapCanvasRendererSync": ["onDestCrsR2C()", "onLayersC2R()", "onCrsTransformR2C()", "onExtentR2C()", "QgsMapCanvasRendererSync(QgsMapCanvas *canvas, QgsMapRenderer *renderer)", "onExtentC2R()", "onMapUnitsC2R()", "onMapUnitsR2C()", "onCrsTransformC2R()", "onDestCrsC2R()"], "QgsMapUnitScaleDialog": ["QgsMapUnitScaleDialog(QWidget *parent=nullptr)"], "QgsFieldExpressionWidget": ["currentFieldChanged()", "setLeftHandButtonStyle(bool isLeft)", "isExpressionValid(const QString &expressionStr)"], - "QgsRuleBasedRendererV2Widget": ["editRule(const QModelIndex &index)", "editRule()", "refineRuleScalesGui(const QModelIndexList &index)", "restoreSectionWidths()", "QgsRuleBasedRendererV2Widget(QgsVectorLayer *layer, QgsStyleV2 *style, QgsFeatureRendererV2 *renderer)", "currentRuleChanged(const QModelIndex ¤t=QModelIndex(), const QModelIndex &previous=QModelIndex())", "clearFeatureCounts()", "refineRuleRanges()", "setRenderingOrder()", "addRule()", "create(QgsVectorLayer *layer, QgsStyleV2 *style, QgsFeatureRendererV2 *renderer)", "refineRuleCategories()", "refineRuleRangesGui(const QModelIndexList &index)", "currentRule()", "selectedRulesChanged()", "refineRuleCategoriesGui(const QModelIndexList &index)", "saveSectionWidth(int section, int oldSize, int newSize)", "refineRule(int type)", "removeRule()", "selectedRules()", "countFeatures()", "refineRuleScales()"], + "QgsRuleBasedRendererWidget": ["editRule(const QModelIndex &index)", "editRule()", "refineRuleScalesGui(const QModelIndexList &index)", "restoreSectionWidths()", "QgsRuleBasedRendererWidget(QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer)", "currentRuleChanged(const QModelIndex ¤t=QModelIndex(), const QModelIndex &previous=QModelIndex())", "clearFeatureCounts()", "refineRuleRanges()", "setRenderingOrder()", "addRule()", "create(QgsVectorLayer *layer, QgsStyle *style, QgsFeatureRenderer *renderer)", "refineRuleCategories()", "refineRuleRangesGui(const QModelIndexList &index)", "currentRule()", "selectedRulesChanged()", "refineRuleCategoriesGui(const QModelIndexList &index)", "saveSectionWidth(int section, int oldSize, int newSize)", "refineRule(int type)", "removeRule()", "selectedRules()", "countFeatures()", "refineRuleScales()"], "QgsSymbolLevelsDialog": ["renderingPassChanged(int row, int column)", "setForceOrderingEnabled(bool enabled)", "updateUi()", "usingLevels() const "], - "QgsAbstractGeometryV2": ["QgsAbstractGeometryV2(const QgsAbstractGeometryV2 &geom)", "ringCount(int part=0) const =0", "vertexCount(int part=0, int ring=0) const =0"], + "QgsAbstractGeometry": ["QgsAbstractGeometry(const QgsAbstractGeometry &geom)", "ringCount(int part=0) const =0", "vertexCount(int part=0, int ring=0) const =0"], "QgsUuidWidgetWrapper": ["QgsUuidWidgetWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor=nullptr, QWidget *parent=nullptr)"], - "QgsSimpleLineSymbolLayerV2Widget": ["penStyleChanged()", "penWidthChanged()", "create(const QgsVectorLayer *vl)", "offsetChanged()", "updatePatternIcon()", "colorChanged(const QColor &color)", "QgsSimpleLineSymbolLayerV2Widget(const QgsVectorLayer *vl, QWidget *parent=nullptr)"], + "QgsSimpleLineSymbolLayerWidget": ["penStyleChanged()", "penWidthChanged()", "create(const QgsVectorLayer *vl)", "offsetChanged()", "updatePatternIcon()", "colorChanged(const QColor &color)", "QgsSimpleLineSymbolLayerWidget(const QgsVectorLayer *vl, QWidget *parent=nullptr)"], "QgsRasterNuller": ["noData(int bandNo) const ", "setNoData(int bandNo, const QgsRasterRangeList &noData)", "QgsRasterNuller(QgsRasterInterface *input=nullptr)"], "QgsRasterLayer": ["renderer() const ", "showStatusMessage(const QString &theMessage)", "rasterUnitsPerPixelY()", "brightnessFilter() const ", "hueSaturationFilter() const ", "isValidRasterFileName(const QString &theFileNameQString)"], "QgsMimeDataUtils": ["isUriList(const QMimeData *data)", "encodeUriList(const UriList &layers)", "None", "decodeUriList(const QMimeData *data)"], @@ -609,8 +609,8 @@ ACCEPTABLE_MISSING_DOCS = { "QgisVisitor": ["QgisVisitor(QList< QgsFeatureId > &list)"], "QgsShadowEffectWidget": ["create()", "QgsShadowEffectWidget(QWidget *parent=nullptr)"], "QgsFavouritesItem": ["QgsFavouritesItem(QgsDataItem *parent, const QString &name, const QString &path=QString())", "iconFavourites()", "addDirectory(const QString &favIcon)", "removeDirectory(QgsDirectoryItem *item)"], - "QgsRendererV2Widget": ["refreshSymbolView()", "QgsRendererV2Widget(QgsVectorLayer *layer, QgsStyleV2 *style)", "copy()", "contextMenuViewCategories(QPoint p)", "paste()"], - "QgsComposerSymbolV2Item": ["QgsComposerSymbolV2Item(const QIcon &icon, const QString &text)", "QgsComposerSymbolV2Item(const QString &text)", "symbolV2()"], + "QgsRendererWidget": ["refreshSymbolView()", "QgsRendererWidget(QgsVectorLayer *layer, QgsStyle *style)", "copy()", "contextMenuViewCategories(QPoint p)", "paste()"], + "QgsComposerSymbolItem": ["QgsComposerSymbolItem(const QIcon &icon, const QString &text)", "QgsComposerSymbolItem(const QString &text)", "symbol()"], "QgsAspectFilter": ["QgsAspectFilter(const QString &inputFile, const QString &outputFile, const QString &outputFormat)"], "QgsDefaultVectorLayerLegend": ["QgsDefaultVectorLayerLegend(QgsVectorLayer *vl)"], "QgsDateTimeEdit": ["QgsDateTimeEdit(QWidget *parent=nullptr)", "allowNull() const "], @@ -643,14 +643,14 @@ ACCEPTABLE_MISSING_DOCS = { "QgsDefaultRasterLayerLegend": ["QgsDefaultRasterLayerLegend(QgsRasterLayer *rl)"], "QgsGridFileWriter": ["QgsGridFileWriter(QgsInterpolator *i, const QString &outputPath, const QgsRectangle &extent, int nCols, int nRows, double cellSizeX, double cellSizeY)"], "QgsVectorLayerUndoCommandAddFeature": ["QgsVectorLayerUndoCommandAddFeature(QgsVectorLayerEditBuffer *buffer, QgsFeature &f)"], - "QgsCategorizedSymbolRendererV2": ["symbolForValue(const QVariant &value)", "addCategory(const QgsRendererCategoryV2 &category)", "setSizeScaleField(const QString &fieldOrExpression)", "setInvertedColorRamp(bool inverted)", "rebuildHash()", "scaleMethod() const ", "QgsCategorizedSymbolRendererV2(const QString &attrName=QString(), const QgsCategoryList &categories=QgsCategoryList())", "updateCategoryValue(int catIndex, const QVariant &value)", "categories() const ", "sizeScaleField() const ", "sortByLabel(Qt::SortOrder order=Qt::AscendingOrder)", "setClassAttribute(const QString &attr)", "classAttribute() const ", "sortByValue(Qt::SortOrder order=Qt::AscendingOrder)", "updateCategorySymbol(int catIndex, QgsSymbol *symbol)", "setScaleMethod(QgsSymbol::ScaleMethod scaleMethod)", "skipRender()", "deleteCategory(int catIndex)", "deleteAllCategories()", "updateCategoryLabel(int catIndex, const QString &label)"], + "QgsCategorizedSymbolRenderer": ["symbolForValue(const QVariant &value)", "addCategory(const QgsRendererCategory &category)", "setSizeScaleField(const QString &fieldOrExpression)", "setInvertedColorRamp(bool inverted)", "rebuildHash()", "scaleMethod() const ", "QgsCategorizedSymbolRenderer(const QString &attrName=QString(), const QgsCategoryList &categories=QgsCategoryList())", "updateCategoryValue(int catIndex, const QVariant &value)", "categories() const ", "sizeScaleField() const ", "sortByLabel(Qt::SortOrder order=Qt::AscendingOrder)", "setClassAttribute(const QString &attr)", "classAttribute() const ", "sortByValue(Qt::SortOrder order=Qt::AscendingOrder)", "updateCategorySymbol(int catIndex, QgsSymbol *symbol)", "setScaleMethod(QgsSymbol::ScaleMethod scaleMethod)", "skipRender()", "deleteCategory(int catIndex)", "deleteAllCategories()", "updateCategoryLabel(int catIndex, const QString &label)"], "QgsExpression::NodeFunction": ["args() const ", "fnIndex() const ", "NodeFunction(int fnIndex, NodeList *args)"], "QgsDualView": ["setFeatureSelectionManager(QgsIFeatureSelectionManager *featureSelectionManager)", "openConditionalStyles()", "setRequest(const QgsFeatureRequest &request)", "filterMode()", "filteredFeatures()"], "QgsContextHelp": ["run(const QString &context)"], "QgsCodeEditorSQL": ["QgsCodeEditorSQL(QWidget *parent=nullptr)"], "QgsVectorFileWriter::IntOption": ["IntOption(const QString &docString, int defaultValue)"], "QgsExternalResourceWidgetWrapper": ["QgsExternalResourceWidgetWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor=nullptr, QWidget *parent=nullptr)"], - "QgsMarkerSymbolV2": ["setAngle(double angle)", "scaleMethod()", "size() const ", "angle() const ", "setSize(double size)", "renderPoint(QPointF point, const QgsFeature *f, QgsRenderContext &context, int layer=-1, bool selected=false)", "setScaleMethod(QgsSymbol::ScaleMethod scaleMethod)", "QgsMarkerSymbolV2(const QgsSymbolLayerList &layers=QgsSymbolLayerList())"], + "QgsMarkerSymbol": ["setAngle(double angle)", "scaleMethod()", "size() const ", "angle() const ", "setSize(double size)", "renderPoint(QPointF point, const QgsFeature *f, QgsRenderContext &context, int layer=-1, bool selected=false)", "setScaleMethod(QgsSymbol::ScaleMethod scaleMethod)", "QgsMarkerSymbol(const QgsSymbolLayerList &layers=QgsSymbolLayerList())"], "QgsTextEditWrapper": ["QgsTextEditWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor=nullptr, QWidget *parent=nullptr)"], "QgsHillshadeFilter": ["lightAzimuth() const ", "setLightAngle(float angle)", "lightAngle() const ", "setLightAzimuth(float azimuth)", "QgsHillshadeFilter(const QString &inputFile, const QString &outputFile, const QString &outputFormat, double lightAzimuth=300, double lightAngle=40)"], "TriDecorator": ["TriDecorator(Triangulation *t)"], @@ -661,23 +661,23 @@ ACCEPTABLE_MISSING_DOCS = { "QgsRuleBasedLabelProvider": ["QgsRuleBasedLabelProvider(const QgsRuleBasedLabeling &rules, QgsVectorLayer *layer, bool withFeatureLoop=true)"], "QgsBlendModeComboBox": ["updateModes()", "QgsBlendModeComboBox(QWidget *parent=nullptr)"], "QgsComposerRasterSymbolItem": ["setColor(const QColor &c)", "color() const ", "QgsComposerRasterSymbolItem(const QString &text)", "setLayerID(const QString &id)", "layerID() const ", "QgsComposerRasterSymbolItem(const QIcon &icon, const QString &text)"], - "QgsSimpleFillSymbolLayerV2": ["setOffsetUnit(QgsSymbol::OutputUnit unit)", "setBorderWidthUnit(QgsSymbol::OutputUnit unit)", "offsetMapUnitScale() const ", "setBrushStyle(Qt::BrushStyle style)", "penJoinStyle() const ", "setOffsetMapUnitScale(const QgsMapUnitScale &scale)", "QgsSimpleFillSymbolLayerV2(const QColor &color=DEFAULT_SIMPLEFILL_COLOR, Qt::BrushStyle style=DEFAULT_SIMPLEFILL_STYLE, const QColor &borderColor=DEFAULT_SIMPLEFILL_BORDERCOLOR, Qt::PenStyle borderStyle=DEFAULT_SIMPLEFILL_BORDERSTYLE, double borderWidth=DEFAULT_SIMPLEFILL_BORDERWIDTH, Qt::PenJoinStyle penJoinStyle=DEFAULT_SIMPLEFILL_JOINSTYLE)", "offset()", "setBorderWidthMapUnitScale(const QgsMapUnitScale &scale)", "offsetUnit() const ", "setPenJoinStyle(Qt::PenJoinStyle style)", "borderWidthUnit() const ", "borderWidth() const ", "setBorderWidth(double borderWidth)", "borderWidthMapUnitScale() const ", "createFromSld(QDomElement &element)", "setOffset(QPointF offset)", "borderColor() const ", "brushStyle() const ", "create(const QgsStringMap &properties=QgsStringMap())", "setBorderColor(const QColor &borderColor)", "setBorderStyle(Qt::PenStyle borderStyle)", "borderStyle() const "], - "QgsLegendSymbolItemV2": ["QgsLegendSymbolItemV2(const QgsLegendSymbolItemV2 &other)"], - "QgsGeometryCollectionV2": ["QgsGeometryCollectionV2(const QgsGeometryCollectionV2 &c)"], + "QgsSimpleFillSymbolLayer": ["setOffsetUnit(QgsSymbol::OutputUnit unit)", "setBorderWidthUnit(QgsSymbol::OutputUnit unit)", "offsetMapUnitScale() const ", "setBrushStyle(Qt::BrushStyle style)", "penJoinStyle() const ", "setOffsetMapUnitScale(const QgsMapUnitScale &scale)", "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, double borderWidth=DEFAULT_SIMPLEFILL_BORDERWIDTH, Qt::PenJoinStyle penJoinStyle=DEFAULT_SIMPLEFILL_JOINSTYLE)", "offset()", "setBorderWidthMapUnitScale(const QgsMapUnitScale &scale)", "offsetUnit() const ", "setPenJoinStyle(Qt::PenJoinStyle style)", "borderWidthUnit() const ", "borderWidth() const ", "setBorderWidth(double borderWidth)", "borderWidthMapUnitScale() const ", "createFromSld(QDomElement &element)", "setOffset(QPointF offset)", "borderColor() const ", "brushStyle() const ", "create(const QgsStringMap &properties=QgsStringMap())", "setBorderColor(const QColor &borderColor)", "setBorderStyle(Qt::PenStyle borderStyle)", "borderStyle() const "], + "QgsLegendSymbolItem": ["QgsLegendSymbolItem(const QgsLegendSymbolItem &other)"], + "QgsGeometryCollection": ["QgsGeometryCollection(const QgsGeometryCollection &c)"], "QgsDateTimeEditFactory": ["QgsDateTimeEditFactory(const QString &name)"], "QgsSvgSelectorGroupsModel": ["QgsSvgSelectorGroupsModel(QObject *parent)"], "QgsDataDefinedWidthDialog": ["QgsDataDefinedWidthDialog(const QList< QgsSymbol * > &symbolList, QgsVectorLayer *layer)"], "QgsDoubleBoxScaleBarStyle": ["QgsDoubleBoxScaleBarStyle(const QgsComposerScaleBar *bar)"], "QgsAddRemoveItemCommand": ["QgsAddRemoveItemCommand(State s, QgsComposerItem *item, QgsComposition *c, const QString &text, QUndoCommand *parent=nullptr)", "State", "itemRemoved(QgsComposerItem *item)", "itemAdded(QgsComposerItem *item)"], - "QgsSymbolLegendNode": ["QgsSymbolLegendNode(QgsLayerTreeLayer *nodeLayer, const QgsLegendSymbolItemV2 &item, QObject *parent=nullptr)"], + "QgsSymbolLegendNode": ["QgsSymbolLegendNode(QgsLayerTreeLayer *nodeLayer, const QgsLegendSymbolItem &item, QObject *parent=nullptr)"], "QgsFeatureIteratorDataStream": ["readNextEntry()"], "QgsWkbTypes": ["GeometryType", "Type"], "QgsExpression::NodeBinaryOperator": ["computeDouble(double x, double y)", "computeInt(int x, int y)", "op() const ", "opLeft() const ", "compare(double diff)", "NodeBinaryOperator(BinaryOperator op, Node *opLeft, Node *opRight)", "opRight() const ", "precedence() const ", "computeDateTimeFromInterval(const QDateTime &d, QgsExpression::Interval *i)", "leftAssociative() const "], "QgsPointDisplacementRenderer": ["QgsPointDisplacementRenderer(const QString &labelAttributeName=\"\")", "setMaxLabelScaleDenominator(double d)", "circleRadiusAddition() const ", "embeddedRenderer() const ", "setCircleColor(const QColor &c)", "circleWidth() const ", "labelAttributeName() const ", "setLabelFont(const QFont &f)", "circleColor() const ", "setLabelColor(const QColor &c)", "setCircleWidth(double w)", "labelColor() const ", "maxLabelScaleDenominator() const ", "labelFont() const ", "setLabelAttributeName(const QString &name)", "setCircleRadiusAddition(double d)"], - "QgsSimpleLineSymbolLayerV2": ["penJoinStyle() const ", "setPenJoinStyle(Qt::PenJoinStyle style)", "setCustomDashVector(const QVector< qreal > &vector)", "penCapStyle() const ", "drawInsidePolygon() const ", "customDashPatternUnit() const ", "customDashVector() const ", "setUseCustomDashPattern(bool b)", "setDrawInsidePolygon(bool drawInsidePolygon)", "useCustomDashPattern() const ", "setCustomDashPatternMapUnitScale(const QgsMapUnitScale &scale)", "setPenCapStyle(Qt::PenCapStyle style)", "QgsSimpleLineSymbolLayerV2(const QColor &color=DEFAULT_SIMPLELINE_COLOR, double width=DEFAULT_SIMPLELINE_WIDTH, Qt::PenStyle penStyle=DEFAULT_SIMPLELINE_PENSTYLE)", "setCustomDashPatternUnit(QgsSymbol::OutputUnit unit)", "create(const QgsStringMap &properties=QgsStringMap())", "customDashPatternMapUnitScale() const ", "setPenStyle(Qt::PenStyle style)", "createFromSld(QDomElement &element)", "penStyle() const "], + "QgsSimpleLineSymbolLayer": ["penJoinStyle() const ", "setPenJoinStyle(Qt::PenJoinStyle style)", "setCustomDashVector(const QVector< qreal > &vector)", "penCapStyle() const ", "drawInsidePolygon() const ", "customDashPatternUnit() const ", "customDashVector() const ", "setUseCustomDashPattern(bool b)", "setDrawInsidePolygon(bool drawInsidePolygon)", "useCustomDashPattern() const ", "setCustomDashPatternMapUnitScale(const QgsMapUnitScale &scale)", "setPenCapStyle(Qt::PenCapStyle style)", "QgsSimpleLineSymbolLayer(const QColor &color=DEFAULT_SIMPLELINE_COLOR, double width=DEFAULT_SIMPLELINE_WIDTH, Qt::PenStyle penStyle=DEFAULT_SIMPLELINE_PENSTYLE)", "setCustomDashPatternUnit(QgsSymbol::OutputUnit unit)", "create(const QgsStringMap &properties=QgsStringMap())", "customDashPatternMapUnitScale() const ", "setPenStyle(Qt::PenStyle style)", "createFromSld(QDomElement &element)", "penStyle() const "], "QgsVectorLayerFeatureIterator": ["QgsVectorLayerFeatureIterator(QgsVectorLayerFeatureSource *source, bool ownSource, const QgsFeatureRequest &request)"], - "QgsGradientFillSymbolLayerV2Widget": ["applyColorRamp()", "create(const QgsVectorLayer *vl)", "offsetChanged()", "QgsGradientFillSymbolLayerV2Widget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "setCoordinateMode(int index)", "setGradientType(int index)", "setGradientSpread(int index)", "setColor(const QColor &color)", "referencePointChanged()", "setColor2(const QColor &color)", "colorModeChanged()"], - "QgsSvgMarkerSymbolLayerV2Widget": ["setAngle()", "create(const QgsVectorLayer *vl)", "setGuiForSvg(const QgsSvgMarkerSymbolLayerV2 *layer)", "setSize()", "populateIcons(const QModelIndex &idx)", "setOffset()", "QgsSvgMarkerSymbolLayerV2Widget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "populateList()", "setName(const QModelIndex &idx)"], + "QgsGradientFillSymbolLayerWidget": ["applyColorRamp()", "create(const QgsVectorLayer *vl)", "offsetChanged()", "QgsGradientFillSymbolLayerWidget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "setCoordinateMode(int index)", "setGradientType(int index)", "setGradientSpread(int index)", "setColor(const QColor &color)", "referencePointChanged()", "setColor2(const QColor &color)", "colorModeChanged()"], + "QgsSvgMarkerSymbolLayerWidget": ["setAngle()", "create(const QgsVectorLayer *vl)", "setGuiForSvg(const QgsSvgMarkerSymbolLayer *layer)", "setSize()", "populateIcons(const QModelIndex &idx)", "setOffset()", "QgsSvgMarkerSymbolLayerWidget(const QgsVectorLayer *vl, QWidget *parent=nullptr)", "populateList()", "setName(const QModelIndex &idx)"], "QgsPhotoWidgetWrapper": ["QgsPhotoWidgetWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor=nullptr, QWidget *parent=nullptr)"], "QgsFeatureModel": ["fidToIndex(QgsFeatureId fid)=0"], "QgsLinearMinMaxEnhancementWithClip": ["QgsLinearMinMaxEnhancementWithClip(Qgis::DataType, double, double)"], @@ -686,7 +686,7 @@ ACCEPTABLE_MISSING_DOCS = { "QgsExpressionBuilderWidget": ["loadRecent(const QString &key)", "QgsExpressionBuilderWidget(QWidget *parent)", "isExpressionValid()", "saveToRecent(const QString &key)", "loadFieldNames(const QgsFields &fields)", "showEvent(QShowEvent *e)"], "QgsTINInterpolator": ["setExportTriangulationToFile(bool e)", "TIN_INTERPOLATION", "setTriangulationFilePath(const QString &filepath)", "QgsTINInterpolator(const QList< LayerData > &inputData, TIN_INTERPOLATION interpolation=Linear, bool showProgressDialog=false)"], "QgsMapLayerProxyModel": ["Filter", "exceptedLayerList()", "filters() const "], - "QgsCompoundCurveV2": ["QgsCompoundCurveV2(const QgsCompoundCurveV2 &curve)"], + "QgsCompoundCurve": ["QgsCompoundCurve(const QgsCompoundCurve &curve)"], "QgisPlugin": ["QgisPlugin(QString const &name=\"\", QString const &description=\"\", QString const &category=\"\", QString const &version=\"\", PLUGINTYPE const &type=MAPLAYER)", "name()"], "QgsFields": ["FieldOrigin", "None"], "QgsGlowEffect": ["QgsGlowEffect(const QgsGlowEffect &other)"], @@ -716,7 +716,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "pal::InternalException::Full", "QgsPluginLayer", "QgsGeometryValidator", - "QgsLineSymbolV2", + "QgsLineSymbol", "QgsFeatureListViewDelegate", "QgsHighlight", "pal::Sol", @@ -751,13 +751,13 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsCoordinateTransformCache", "QgsRangeWidgetWrapper", "QgsFeatureIteratorDataStream", - "QgsSimpleLineSymbolLayerV2Widget", + "QgsSimpleLineSymbolLayerWidget", "QgsContrastEnhancement", "QgsHillshadeFilter", "QgsCachedFeatureIterator", "QgsAuthCrypto", "QgsAuthSslErrorsDialog", - "QgsRendererV2Registry", + "QgsRendererRegistry", "QgsExpression", "Node", "QgsFeatureListModel", @@ -773,7 +773,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsSLConnect", "QgsConditionalStyle", "QgsExpression::NodeList", - "QgsSingleSymbolRendererV2Widget", + "QgsSingleSymbolRendererWidget", "QgsDbFilterProxyModel", "QgsRasterShaderFunction", "QgsContextHelp", @@ -784,11 +784,11 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsMapLayerActionRegistry", "QgsMapToolIdentify", "QgsTableWidgetItem", - "QgsFontMarkerSymbolLayerV2Widget", + "QgsFontMarkerSymbolLayerWidget", "QgsLabel", "QgsColorSwatchGridAction", "QgsRelation", - "QgsVectorGradientColorRampV2Dialog", + "QgsVectorGradientColorRampDialog", "QgsSQLStatement::NodeBetweenOperator", "QgsScaleBarStyle", "QgsMapToolIdentifyFeature", @@ -809,19 +809,19 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsDataDefinedSizeDialog", "QgsDxfExport", "QgsIdentifyMenu", - "QgsRendererRangeV2", + "QgsRendererRange", "QgsDiagramSettings", "QgsDataItemProviderRegistry", "QgsSymbolSelectorDialog", "QgsComposerFrame", - "QgsFontMarkerSymbolLayerV2", + "QgsFontMarkerSymbolLayer", "QgsSpinBox", "QgsAction", "QgsSQLComposerDialog::SQLValidatorCallback", "QgsGPSDetector", "QgsExpressionHighlighter", "QgsMapToPixelSimplifier", - "QgsVectorColorBrewerColorRampV2Dialog", + "QgsVectorColorBrewerColorRampDialog", "QgsCptCityAllRampsItem", "QgsOSMWay", "QgsLabelingEngineInterface", @@ -871,11 +871,11 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsMapRendererJob", "QgsQueryBuilder", "QgsSQLStatement::Visitor", - "QgsCentroidFillSymbolLayerV2", + "QgsCentroidFillSymbolLayer", "QgsTreeWidgetItem", - "QgsSvgMarkerSymbolLayerV2Widget", + "QgsSvgMarkerSymbolLayerWidget", "QgsSingleCategoryDiagramRenderer", - "QgsSurfaceV2", + "QgsSurface", "QgsOgcUtilsSQLStatementToFilter", "QgsPalettedRendererWidget", "QgsLabelSearchTree", @@ -893,7 +893,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsFeatureListView", "QgsOSMDownload", "QgsAdvancedDigitizingDockWidget::CadConstraint", - "QgsSimpleMarkerSymbolLayerV2Widget", + "QgsSimpleMarkerSymbolLayerWidget", "QgsTolerance", "QgsRasterLayer", "QgsComposerObject", @@ -904,7 +904,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsRangeWidgetFactory", "QgsPointCompare", "QgsComposerAttributeTableCompareV2", - "QgsCptCityColorRampV2", + "QgsCptCityColorRamp", "QgsAttributeEditorContext", "QgsSymbologyConversion", "QgsAttributeEditorRelation", @@ -937,7 +937,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsSpatialIndex", "QgsAbstractFeatureIterator", "QgsMapCanvasMap", - "QgsShapeburstFillSymbolLayerV2", + "QgsShapeburstFillSymbolLayer", "QgsVectorLayerJoinBuffer", "QgsTextLabelFeature", "QgsPkiConfigBundle", @@ -956,13 +956,13 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsAbstractLabelProvider", "QgsSQLStatement::NodeInOperator", "QgsComposerGroupItem", - "QgsLineSymbolLayerV2", + "QgsLineSymbolLayer", "QgsSublayersDialog", "QgsMapOverviewCanvas", "QgsRasterRenderer", "QgsRelationReferenceFactory", "QgsContrastEnhancementFunction", - "QgsMarkerSymbolLayerV2", + "QgsMarkerSymbolLayer", "QgsGroupWmsDataDialog", "QgsVectorLayerInterruptionCheckerDuringCountSymbolFeatures", "QgsSymbolRenderContext", @@ -971,7 +971,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsRasterFileWriter", "QgsGraphDirector", "QgsTransectSample", - "QgsFeatureRendererV2", + "QgsFeatureRenderer", "QgsExpressionBuilderDialog", "QgsMapLayer", "QgsOptionsDialogBase", @@ -983,12 +983,12 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "pal::LabelInfo", "QgsStatisticalSummary", "pal::PalException::ValueNotInRange", - "QgsRendererV2AbstractMetadata", + "QgsRendererAbstractMetadata", "QgsLegendModel", "QgsSQLStatement::NodeLiteral", "QgsEnumerationWidgetWrapper", "pal::PalStat", - "QgsRuleBasedRendererV2Widget", + "QgsRuleBasedRendererWidget", "QgsOfflineEditing", "QgsSnapper", "GEOSGeomScopedPtr", @@ -1006,9 +1006,9 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsScaleUtils", "QgsDataCollectionItem", "QgsFeatureSelectionModel", - "QgsSimpleMarkerSymbolLayerV2", + "QgsSimpleMarkerSymbolLayer", "QgsRasterProjector", - "QgsGradientFillSymbolLayerV2", + "QgsGradientFillSymbolLayer", "QgsAuthSslConfigDialog", "QgsEditorWidgetWrapper", "QgsDrawSourceWidget", @@ -1019,9 +1019,9 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsVectorLayerUndoCommandAddAttribute", "QgsDialog", "QgsAuthSslImportDialog", - "QgsVectorColorRampV2", + "QgsVectorColorRamp", "QgsCustomLayerOrderWidget", - "QgsStyleV2GroupSelectionDialog", + "QgsStyleGroupSelectionDialog", "QgsAdvancedDigitizingCanvasItem", "QgsComposerItemGroup", "pal::CostCalculator", @@ -1038,7 +1038,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsSymbolLayerUtils", "QgsConstWkbPtr", "QgsLongLongValidator", - "QgsSimpleFillSymbolLayerV2Widget", + "QgsSimpleFillSymbolLayerWidget", "QgsCptCityArchive", "QgsComposerArrow", "QgsAttributeFormLegacyInterface", @@ -1059,12 +1059,12 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsUnitSelectionWidget", "QgsMapTip", "QgsGraphBuilder", - "QgsMarkerSymbolV2", - "QgsDiagramRendererV2", + "QgsMarkerSymbol", + "QgsDiagramRenderer", "QgsExpression::NodeLiteral", "QgsNewGeoPackageLayerDialog", "pal::InternalException::UnknownGeometry", - "QgsVectorColorBrewerColorRampV2", + "QgsVectorColorBrewerColorRamp", "QgsProperty", "QgsDoubleBoxScaleBarStyle", "QgsPanelWidgetWrapper", @@ -1082,9 +1082,9 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsPointLocator_VisitorNearestVertex", "QgsCheckboxWidgetWrapper", "QgsAuthServersEditor", - "QgsGradientFillSymbolLayerV2Widget", + "QgsGradientFillSymbolLayerWidget", "QgsNetworkDiskCache", - "QgsFillSymbolLayerV2", + "QgsFillSymbolLayer", "QgsRendererRulePropsDialog", "QgsSymbolLevelsDialog", "QWebPage", @@ -1111,8 +1111,8 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsMapToolPan", "QgsVectorLayerFeatureIterator", "QgsDxfPaintEngine", - "QgsSvgMarkerSymbolLayerV2", - "QgsCategorizedSymbolRendererV2Widget", + "QgsSvgMarkerSymbolLayer", + "QgsCategorizedSymbolRendererWidget", "QgsAuthConfigSslServer", "QgsBrightnessContrastFilter", "QgsMultiRenderChecker", @@ -1122,20 +1122,20 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsAuthCertEditors", "QgsMapRendererParallelJob", "QgsRasterCalculator", - "QgsStyleV2", + "QgsStyle", "QgsLegacyHelpers", - "QgsRuleBasedRendererV2", + "QgsRuleBasedRenderer", "QgsDrawSourceEffect", "QgsLayerTreeLayer", "pal::PalException::NotImplemented", "QgsDxfLabelProvider", "QgsCptCitySelectionItem", - "QgsRendererCategoryV2", + "QgsRendererCategory", "QgsDataItem", "QgsComposerAttributeTableColumnModelV2", "QgsSQLStatement::NodeSelect", "QgsSymbolsListWidget", - "QgsGraduatedSymbolRendererV2", + "QgsGraduatedSymbolRenderer", "QgsRasterPyramid", "QgsAnimatedIcon", "QgsDataItemProvider", @@ -1154,7 +1154,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsRelationEditorWidget", "QgsColorBrewerPalette", "QgsTextDiagram", - "QgsRuleBasedRendererV2Model", + "QgsRuleBasedRendererModel", "QgsExpression::NodeFunction", "QgsAuthCertInfoDialog", "QgsColorWidgetWrapper", @@ -1190,7 +1190,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsSlider", "QgsColorSchemeList", "QgsLayerTreeModel", - "QgsCategorizedSymbolRendererV2", + "QgsCategorizedSymbolRenderer", "QgsLinearlyInterpolatedDiagramRenderer", "QgsOwsConnection", "QgsGenericProjectionSelector", @@ -1218,14 +1218,14 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsSvgSelectorGroupsModel", "QgsSingleBandGrayRenderer", "QgsCubicRasterResampler", - "QgsEllipseSymbolLayerV2Widget", + "QgsEllipseSymbolLayerWidget", "QgsField", "QgsCheckBoxConfigDlg", "ParametricLine", "QgsDiagram", "QgsCredentialsConsole", "QgsLogger", - "QgsEllipseSymbolLayerV2", + "QgsEllipseSymbolLayer", "QgsMapServiceException", "pal::Feats", "QgsArrowSymbolLayerWidget", @@ -1241,7 +1241,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsTransaction", "QgsPhotoWidgetWrapper", "QgsComposerTableColumn", - "QgsMarkerLineSymbolLayerV2Widget", + "QgsMarkerLineSymbolLayerWidget", "QgsHttpTransaction", "QgsImageFillSymbolLayer", "QgsBilinearRasterResampler", @@ -1256,7 +1256,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsLabelPosition", "QgsDiagramLayerSettings", "QgsAnnotationItem", - "QgsStyleV2ExportImportDialog", + "QgsStyleExportImportDialog", "QgsHeatmapRendererWidget", "QgsLabelCandidate", "QgsLegendSettings", @@ -1280,7 +1280,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsGraphAnalyzer", "QgsMessageLog", "QgsExpressionContext", - "QgsSingleSymbolRendererV2", + "QgsSingleSymbolRenderer", "QgsMapRenderer", "QgsPointLocator_Stream", "QgsGroupBoxCollapseButton", @@ -1299,7 +1299,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsRelationReferenceWidgetWrapper", "QgsMapToolAdvancedDigitizing", "QgsValueRelationWidgetFactory", - "QgsGraduatedSymbolRendererV2Widget", + "QgsGraduatedSymbolRendererWidget", "QgsComposerItemCommand", "QgsBrowserWatcher", "pal::PalException", @@ -1317,7 +1317,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsFeatureModel", "QgsExpressionItemSearchProxy", "QgsRuleBasedLabeling", - "QgsRendererV2Metadata", + "QgsRendererMetadata", "QgsExpressionBuilderWidget", "pal::Layer", "QgsSingleBandColorDataRenderer", @@ -1338,7 +1338,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsGradientStop", "QgsDualView", "QgsSpatialIndexCopyVisitor", - "QgsVectorGradientColorRampV2", + "QgsVectorGradientColorRamp", "QgsNMEAConnection", "QgsAttributeDialog", "QgsProjectBadLayerGuiHandler", @@ -1386,29 +1386,29 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsComposerRuler", "QgsPointPatternFillSymbolLayerWidget", "QgsCptCityDataItem", - "QgsRandomColorsV2", + "QgsRandomColors", "QgsGeometryAnalyzer", - "QgsVectorRandomColorRampV2", + "QgsVectorRandomColorRamp", "QgsComposerMultiFrame", "QgsValueMapWidgetFactory", "QgsXmlUtils", "QgsAlignRaster", "QgsVectorFileWriter::BoolOption", "QgsPalLabeling", - "QgsRendererV2PropertiesDialog", + "QgsRendererPropertiesDialog", "QgsMessageBarItem", "QgsRasterMinMaxWidget", "QgsServerFilter", - "QgsVectorRandomColorRampV2Dialog", + "QgsVectorRandomColorRampDialog", "QgsAttributeTableAction", - "QgsMarkerLineSymbolLayerV2", + "QgsMarkerLineSymbolLayer", "QgsHtmlAnnotationItem", "QgsVectorLayerFeatureSource", "QgsAtlasComposition", "QgsSQLComposerDialog::TableSelectedCallback", "QgsConnectionPoolGroup", "QgisInterface", - "QgsFillSymbolV2", + "QgsFillSymbol", "QgsPointPatternFillSymbolLayer", "QgsComposerMap", "QgsSourceSelectItemDelegate", @@ -1416,7 +1416,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsDefaultSearchWidgetWrapper", "QgsAttributes", "QgsSQLStatementCollectTableNames", - "QgsComposerSymbolV2Item", + "QgsComposerSymbolItem", "QgsLayerDefinition::DependencySorter", "QWebFrame", "QgsRaster", @@ -1424,12 +1424,12 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsRubberBand", "QgsConditionalLayerStyles", "QgsCacheIndexFeatureId", - "QgsCptCityColorRampV2Dialog", + "QgsCptCityColorRampDialog", "QgsFilterLineEdit", "QgsNetworkContentFetcher", "QgsComposerPicture", "QgsExpression::WhenThen", - "QgsSimpleLineSymbolLayerV2", + "QgsSimpleLineSymbolLayer", "QgsClipToMinMaxEnhancement", "QgsAddRemoveMultiFrameCommand", "QgsFields", @@ -1484,7 +1484,7 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsSourceSelectDialog", "QgsMapToPixel", "Vector3D", - "QgsGeometryGeneratorSymbolLayerV2", + "QgsGeometryGeneratorSymbolLayer", "QgsAttributeEditorContainer", "pal::PriorityQueue", "QgsComposerLegendStyle", @@ -1520,17 +1520,17 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsRuleBasedLabelProvider", "QgsPoint", "QgsRangeConfigDlg", - "QgsShapeburstFillSymbolLayerV2Widget", - "QgsSimpleFillSymbolLayerV2", + "QgsShapeburstFillSymbolLayerWidget", + "QgsSimpleFillSymbolLayer", "QgsVectorFieldSymbolLayerWidget", "QgsClassificationWidgetWrapper", "CloughTocherInterpolator", "QgsUniqueValuesConfigDlg", - "QgsLabelingEngineV2", + "QgsLabelingEngine", "QgsMimeDataUtils", "QgsTransformWidget", "QgsExpression::NodeUnaryOperator", - "QgsStyleV2ManagerDialog", + "QgsStyleManagerDialog", "QgsAttributeTableView", "QgsAttributeFormInterface", "QgsFeatureStore", @@ -1544,10 +1544,10 @@ ACCEPTABLE_MISSING_ADDED_NOTE = [ "QgsExpression::Visitor", "QgsGeometryRubberBand", "QgsComposerAttributeTableV2", - "QgsCentroidFillSymbolLayerV2Widget", - "QgsRendererV2Widget", + "QgsCentroidFillSymbolLayerWidget", + "QgsRendererWidget", "QgsComposerLabel", - "QgsRuleBasedRendererV2::Rule", + "QgsRuleBasedRenderer::Rule", "QgsMapLayerRegistry", "QgsMapRendererCache", "QgsDataSourceUri", @@ -1582,10 +1582,10 @@ ACCEPTABLE_MISSING_BRIEF = ['QgsBrushStyleComboBox', 'QgsFieldValidator', 'QgsPointCompare', 'QgsSvgSelectorWidget', - 'QgsGeometryGeneratorSymbolLayerV2', - 'QgsSurfaceV2', + 'QgsGeometryGeneratorSymbolLayer', + 'QgsSurface', 'QgsSvgAnnotationItem', - 'QgsCptCityColorRampV2Dialog', + 'QgsCptCityColorRampDialog', 'QgsRangeConfigDlg', 'QgsAttributeFormInterface', 'QgsExpression::NodeUnaryOperator', @@ -1593,20 +1593,20 @@ ACCEPTABLE_MISSING_BRIEF = ['QgsBrushStyleComboBox', 'pal::PriorityQueue', 'QgsVectorLayerEditUtils', 'QgsArcProperter', - 'QgsSimpleMarkerSymbolLayerV2Widget', + 'QgsSimpleMarkerSymbolLayerWidget', 'QgsBrowserWatcher', - 'QgsRandomColorsV2', + 'QgsRandomColors', 'QgsVectorLayerEditPassthrough', 'QgsDial', - 'QgsVectorColorBrewerColorRampV2Dialog', - 'QgsFontMarkerSymbolLayerV2Widget', + 'QgsVectorColorBrewerColorRampDialog', + 'QgsFontMarkerSymbolLayerWidget', 'QgsSymbolLevelItem', 'QgsGroupBoxCollapseButton', 'QgsVectorFieldSymbolLayerWidget', - 'QgsCentroidFillSymbolLayerV2Widget', + 'QgsCentroidFillSymbolLayerWidget', 'QgsEnumerationWidgetWrapper', 'QgsError', - 'QgsRendererRangeV2LabelFormat', + 'QgsRendererRangeLabelFormat', 'QgsMimeDataUtils', 'QgsRangeWidgetFactory', 'QgsCptCityArchive', @@ -1616,22 +1616,22 @@ ACCEPTABLE_MISSING_BRIEF = ['QgsBrushStyleComboBox', 'QgsDateTimeEditFactory', 'QgsVectorFileWriter::BoolOption', 'QgsRasterFillSymbolLayerWidget', - 'QgsVectorRandomColorRampV2Dialog', + 'QgsVectorRandomColorRampDialog', 'QgsSymbolRenderContext', 'QgsErrorDialog', 'QgsExpressionHighlighter', 'QgsFileNameWidgetFactory', 'QgsExpression::NodeLiteral', 'pal::CostCalculator', - 'QgsFillSymbolLayerV2', + 'QgsFillSymbolLayer', 'QgsMultiBandColorRendererWidget', 'QgsRuleBasedLabeling::Rule', 'QgsSpatialIndexCopyVisitor', 'QgsSVGFillSymbolLayerWidget', 'QgsDataDefinedWidthDialog', - 'QgsShapeburstFillSymbolLayerV2', + 'QgsShapeburstFillSymbolLayer', 'QgsLegacyHelpers', - 'QgsLineSymbolLayerV2', + 'QgsLineSymbolLayer', 'QgsWkbPtr', 'QgsSymbolLayer', 'QgsVectorFileWriter::StringOption', @@ -1644,13 +1644,13 @@ ACCEPTABLE_MISSING_BRIEF = ['QgsBrushStyleComboBox', 'QgsSvgSelectorGroupsModel', 'QgsAttributeTypeLoadDialog', 'QgsDirectoryParamWidget', - 'QgsCategorizedSymbolRendererV2', + 'QgsCategorizedSymbolRenderer', 'QgsQtLocationConnection', 'QgsPropertyKey', 'QgsRuntimeProfiler', 'QgsVectorFileWriter::Option', 'QgsSymbol', - 'QgsRendererRangeV2', + 'QgsRendererRange', 'QgsRasterCalcNode', 'QgsMessageBarItem', 'QgsVectorFileWriter::SetOption', @@ -1658,10 +1658,10 @@ ACCEPTABLE_MISSING_BRIEF = ['QgsBrushStyleComboBox', 'QgsRasterProjector', 'QgsPropertyValue', 'QgsAttributeTableFilterModel', - 'QgsSingleSymbolRendererV2Widget', + 'QgsSingleSymbolRendererWidget', 'QgsValueMapConfigDlg', 'QgsSmartGroupCondition', - 'QgsMarkerLineSymbolLayerV2Widget', + 'QgsMarkerLineSymbolLayerWidget', 'QgsExpression::NodeList', 'QgsSymbolSelectorDialog', 'QgsPalLayerSettings', @@ -1672,10 +1672,10 @@ ACCEPTABLE_MISSING_BRIEF = ['QgsBrushStyleComboBox', 'QgsDxfExport', 'pal::GeomFunction', 'QgsRasterLayerSaveAsDialog', - 'QgsStyleV2', + 'QgsStyle', 'QgsSizeScaleWidget', 'QgsSymbolsListWidget', - 'QgsFontMarkerSymbolLayerV2', + 'QgsFontMarkerSymbolLayer', 'QgsLUDialog', 'QgsLegendInterface', 'QgsSublayersDialog', @@ -1684,7 +1684,7 @@ ACCEPTABLE_MISSING_BRIEF = ['QgsBrushStyleComboBox', 'QgsRelationEditorWidget', 'QgsFeatureSelectionDlg', 'QgsDataDefinedRotationDialog', - 'QgsRendererV2PropertiesDialog', + 'QgsRendererPropertiesDialog', 'QgsDistanceArcProperter', 'QgsComposerLayerItem', 'QgsRelationReferenceFactory', @@ -1714,21 +1714,21 @@ ACCEPTABLE_MISSING_BRIEF = ['QgsBrushStyleComboBox', 'QgsColorRampComboBox', 'QgsGeometryValidator', 'QgsValueRelationConfigDlg', - 'QgsComposerSymbolV2Item', + 'QgsComposerSymbolItem', 'QgsScaleRangeWidget', 'QgsPieDiagram', - 'QgsVectorGradientColorRampV2Dialog', + 'QgsVectorGradientColorRampDialog', 'QgsPluginManagerInterface', 'QgsAttributeTableMapLayerAction', 'QgsConstWkbPtr', - 'QgsStyleV2ExportImportDialog', + 'QgsStyleExportImportDialog', 'QgsBrowserModel', 'QgsUniqueValuesConfigDlg', - 'QgsStyleV2GroupSelectionDialog', + 'QgsStyleGroupSelectionDialog', 'QgsScaleVisibilityDialog', 'QgsSpatialIndex', 'QgsFeatureModel', - 'QgsSvgMarkerSymbolLayerV2Widget', + 'QgsSvgMarkerSymbolLayerWidget', 'QgsFeatureListModel', 'QgsDataDefinedSizeDialog', 'QgsColorEffectWidget', @@ -1736,24 +1736,24 @@ ACCEPTABLE_MISSING_BRIEF = ['QgsBrushStyleComboBox', 'QgsWebPage', 'QgsRelationReferenceConfigDlg', 'QgsVectorLayerEditBuffer', - 'QgsGraduatedSymbolRendererV2Widget', - 'QgsSimpleLineSymbolLayerV2', - 'QgsSingleSymbolRendererV2', + 'QgsGraduatedSymbolRendererWidget', + 'QgsSimpleLineSymbolLayer', + 'QgsSingleSymbolRenderer', 'QgsComposerHtml', 'QgisInterface', 'QgsRuleBasedLabelProvider', 'QgsPointPatternFillSymbolLayer', - 'QgsGradientFillSymbolLayerV2', + 'QgsGradientFillSymbolLayer', 'QgsLinearlyInterpolatedDiagramRenderer', 'QgsWebViewWidgetConfigDlg', - 'QgsGradientFillSymbolLayerV2Widget', + 'QgsGradientFillSymbolLayerWidget', 'QgsSlider', 'QgsPointPatternFillSymbolLayerWidget', 'QgsAttributeForm', 'pal::Sol', - 'QgsCptCityColorRampV2', + 'QgsCptCityColorRamp', 'QgsComposerMultiFrameCommand', - 'QgsSimpleLineSymbolLayerV2Widget', + 'QgsSimpleLineSymbolLayerWidget', 'QgsValueMapWidgetFactory', 'QgsRelation', 'QgsInvertedPolygonRenderer', @@ -1767,7 +1767,7 @@ ACCEPTABLE_MISSING_BRIEF = ['QgsBrushStyleComboBox', 'QgsDxfPaintEngine', 'QgsPenStyleComboBox', 'QgsRendererRulePropsWidget', - 'QgsSimpleFillSymbolLayerV2', + 'QgsSimpleFillSymbolLayer', 'QgsExpression::NodeCondition', 'QgsClassificationWidgetWrapperFactory', 'QgsClassificationWidgetWrapper', @@ -1781,15 +1781,15 @@ ACCEPTABLE_MISSING_BRIEF = ['QgsBrushStyleComboBox', 'Point3D', 'QgsGeometryGeneratorSymbolLayerWidget', 'QgsVectorLayerFeatureIterator', - 'QgsFeatureRendererV2', + 'QgsFeatureRenderer', 'QgsRasterMinMaxWidget', 'QgsDateTimeEditConfig', 'QgsSvgCacheEntry', - 'QgsShapeburstFillSymbolLayerV2Widget', + 'QgsShapeburstFillSymbolLayerWidget', 'QgsMapLayerConfigWidgetFactory', 'QgsManageConnectionsDialog', 'QgsSvgSelectorListModel', - 'QgsMarkerLineSymbolLayerV2', + 'QgsMarkerLineSymbolLayer', 'QgsScopeLogger', 'QgsExpression::NodeColumnRef', 'QgsCheckBoxConfigDlg', @@ -1802,9 +1802,9 @@ ACCEPTABLE_MISSING_BRIEF = ['QgsBrushStyleComboBox', 'QgsLinePatternFillSymbolLayerWidget', 'QgsSvgSelectorDialog', 'QgsGeometryCache', - 'QgsRuleBasedRendererV2Widget', + 'QgsRuleBasedRendererWidget', 'QgsScaleUtils', - 'QgsMarkerSymbolV2', + 'QgsMarkerSymbol', 'QgsPalettedRendererWidget', 'QgsPenCapStyleComboBox', 'QgsVectorFileWriter::HiddenOption', @@ -1812,13 +1812,13 @@ ACCEPTABLE_MISSING_BRIEF = ['QgsBrushStyleComboBox', 'QgsComposerGroupItem', 'QgsAttributeTableAction', 'QgsEditFormConfig', - 'QgsCategorizedSymbolRendererV2Widget', + 'QgsCategorizedSymbolRendererWidget', 'QgsNewMemoryLayerDialog', - 'QgsEllipseSymbolLayerV2Widget', + 'QgsEllipseSymbolLayerWidget', 'QgsExpression::NodeBinaryOperator', - 'QgsCentroidFillSymbolLayerV2', + 'QgsCentroidFillSymbolLayer', 'DualEdgeTriangulation', - 'QgsLineSymbolV2', + 'QgsLineSymbol', 'QgsHillshadeFilter', 'QgsServerInterface', 'QgsLayerPropertiesWidget', @@ -1830,26 +1830,26 @@ ACCEPTABLE_MISSING_BRIEF = ['QgsBrushStyleComboBox', 'QgsPhotoWidgetFactory', 'QgsComposerEffect', 'QgsArrowSymbolLayerWidget', - 'QgsFillSymbolV2', + 'QgsFillSymbol', 'QgsVectorLayerSelectionManager', 'pal::PointSet', - 'QgsSimpleFillSymbolLayerV2Widget', + 'QgsSimpleFillSymbolLayerWidget', 'ParametricLine', - 'QgsGraduatedSymbolRendererV2', + 'QgsGraduatedSymbolRenderer', 'QgsExternalResourceConfigDlg', 'QgsHistogramDiagram', 'QgsBlurWidget', 'QgsShadowEffectWidget', 'QgsRendererRasterPropertiesWidget', - 'QgsVectorColorBrewerColorRampV2', + 'QgsVectorColorBrewerColorRamp', 'QgsTransactionGroup', 'pal::Util', 'QgsDartMeasurement', - 'QgsSvgMarkerSymbolLayerV2', + 'QgsSvgMarkerSymbolLayer', 'QgsAlignRaster', 'QgsCheckboxWidgetFactory', 'QgsAddRemoveMultiFrameCommand', 'QgsCptCityBrowserModel', 'QgsSmartGroupEditorDialog', 'QgsHeatmapRendererWidget', - 'QgsStyleV2ManagerDialog'] + 'QgsStyleManagerDialog'] diff --git a/tests/src/python/test_provider_shapefile.py b/tests/src/python/test_provider_shapefile.py index ec43c2a4058..0e0ae89078c 100644 --- a/tests/src/python/test_provider_shapefile.py +++ b/tests/src/python/test_provider_shapefile.py @@ -123,7 +123,7 @@ class TestPyQgsShapefileProvider(unittest.TestCase, ProviderTestCase): vl = QgsVectorLayer(u'{}|layerid=0'.format(self.repackfile), u'test', u'ogr') ids = [f.id() for f in vl.getFeatures(QgsFeatureRequest().setFilterExpression('pk=1'))] - vl.setSelectedFeatures(ids) + vl.selectByIds(ids) self.assertEqual(vl.selectedFeaturesIds(), ids) self.assertEqual(vl.pendingFeatureCount(), 5) self.assertTrue(vl.startEditing()) diff --git a/tests/src/python/test_qgsarrowsymbollayer.py b/tests/src/python/test_qgsarrowsymbollayer.py index 4ba6e5bf44e..723c3a170fb 100644 --- a/tests/src/python/test_qgsarrowsymbollayer.py +++ b/tests/src/python/test_qgsarrowsymbollayer.py @@ -32,9 +32,9 @@ from qgis.PyQt.QtGui import QColor from qgis.core import ( QgsVectorLayer, - QgsSingleSymbolRendererV2, - QgsLineSymbolV2, - QgsFillSymbolV2, + QgsSingleSymbolRenderer, + QgsLineSymbol, + QgsFillSymbol, QgsMapLayerRegistry, QgsRectangle, QgsArrowSymbolLayer, @@ -63,8 +63,8 @@ class TestQgsArrowSymbolLayer(unittest.TestCase): QgsMapLayerRegistry.instance().addMapLayer(self.lines_layer) # Create style - sym2 = QgsLineSymbolV2.createSimple({'color': '#fdbf6f'}) - self.lines_layer.setRendererV2(QgsSingleSymbolRendererV2(sym2)) + sym2 = QgsLineSymbol.createSimple({'color': '#fdbf6f'}) + self.lines_layer.setRenderer(QgsSingleSymbolRenderer(sym2)) self.mapsettings = self.iface.mapCanvas().mapSettings() self.mapsettings.setOutputSize(QSize(400, 400)) @@ -76,7 +76,7 @@ class TestQgsArrowSymbolLayer(unittest.TestCase): QgsMapLayerRegistry.instance().removeAllMapLayers() def test_1(self): - sym = self.lines_layer.rendererV2().symbol() + sym = self.lines_layer.renderer().symbol() sym_layer = QgsArrowSymbolLayer.create({'head_length': '6.5', 'head_thickness': '6.5'}) dd = QgsDataDefined("(@geometry_point_num % 4) * 2") sym_layer.setDataDefinedProperty("arrow_width", dd) @@ -84,7 +84,7 @@ class TestQgsArrowSymbolLayer(unittest.TestCase): sym_layer.setDataDefinedProperty("head_length", dd2) dd3 = QgsDataDefined("(@geometry_point_num % 4) * 2") sym_layer.setDataDefinedProperty("head_thickness", dd3) - fill_sym = QgsFillSymbolV2.createSimple({'color': '#8bcfff', 'outline_color': '#000000', 'outline_style': 'solid', 'outline_width': '1'}) + fill_sym = QgsFillSymbol.createSimple({'color': '#8bcfff', 'outline_color': '#000000', 'outline_style': 'solid', 'outline_width': '1'}) sym_layer.setSubSymbol(fill_sym) sym.changeSymbolLayer(0, sym_layer) @@ -97,10 +97,10 @@ class TestQgsArrowSymbolLayer(unittest.TestCase): self.assertTrue(renderchecker.runTest('arrowsymbollayer_1')) def test_2(self): - sym = self.lines_layer.rendererV2().symbol() + sym = self.lines_layer.renderer().symbol() # double headed sym_layer = QgsArrowSymbolLayer.create({'arrow_width': '5', 'head_length': '4', 'head_thickness': '6', 'head_type': '2'}) - fill_sym = QgsFillSymbolV2.createSimple({'color': '#8bcfff', 'outline_color': '#000000', 'outline_style': 'solid', 'outline_width': '1'}) + fill_sym = QgsFillSymbol.createSimple({'color': '#8bcfff', 'outline_color': '#000000', 'outline_style': 'solid', 'outline_width': '1'}) sym_layer.setSubSymbol(fill_sym) sym.changeSymbolLayer(0, sym_layer) @@ -113,10 +113,10 @@ class TestQgsArrowSymbolLayer(unittest.TestCase): self.assertTrue(renderchecker.runTest('arrowsymbollayer_2')) def test_3(self): - sym = self.lines_layer.rendererV2().symbol() + sym = self.lines_layer.renderer().symbol() # double headed sym_layer = QgsArrowSymbolLayer.create({'arrow_width': '7', 'head_length': '6', 'head_thickness': '8', 'head_type': '0', 'arrow_type': '1', 'is_curved': '0'}) - fill_sym = QgsFillSymbolV2.createSimple({'color': '#8bcfff', 'outline_color': '#000000', 'outline_style': 'solid', 'outline_width': '1'}) + fill_sym = QgsFillSymbol.createSimple({'color': '#8bcfff', 'outline_color': '#000000', 'outline_style': 'solid', 'outline_width': '1'}) sym_layer.setSubSymbol(fill_sym) sym.changeSymbolLayer(0, sym_layer) @@ -131,12 +131,12 @@ class TestQgsArrowSymbolLayer(unittest.TestCase): self.assertTrue(renderchecker.runTest('arrowsymbollayer_3')) def test_unrepeated(self): - sym = self.lines_layer.rendererV2().symbol() + sym = self.lines_layer.renderer().symbol() # double headed sym_layer = QgsArrowSymbolLayer.create({'arrow_width': '7', 'head_length': '6', 'head_thickness': '8', 'head_type': '0', 'arrow_type': '0'}) # no repetition sym_layer.setIsRepeated(False) - fill_sym = QgsFillSymbolV2.createSimple({'color': '#8bcfff', 'outline_color': '#000000', 'outline_style': 'solid', 'outline_width': '1'}) + fill_sym = QgsFillSymbol.createSimple({'color': '#8bcfff', 'outline_color': '#000000', 'outline_style': 'solid', 'outline_width': '1'}) sym_layer.setSubSymbol(fill_sym) sym.changeSymbolLayer(0, sym_layer) diff --git a/tests/src/python/test_qgsatlascomposition.py b/tests/src/python/test_qgsatlascomposition.py index aef4e241af9..71b40e652ab 100644 --- a/tests/src/python/test_qgsatlascomposition.py +++ b/tests/src/python/test_qgsatlascomposition.py @@ -23,8 +23,8 @@ from qgis.testing import start_app, unittest from utilities import unitTestDataPath from qgis.PyQt.QtCore import QFileInfo, QRectF, qWarning from qgis.core import QgsUnitTypes, QgsVectorLayer, QgsMapLayerRegistry, QgsMapSettings, QgsCoordinateReferenceSystem, \ - QgsComposition, QgsFillSymbolV2, QgsSingleSymbolRendererV2, QgsComposerLabel, QgsComposerMap, QgsFontUtils, \ - QgsRectangle, QgsComposerLegend, QgsFeature, QgsGeometry, QgsPoint, QgsRendererCategoryV2, QgsCategorizedSymbolRendererV2, QgsMarkerSymbolV2 + QgsComposition, QgsFillSymbol, QgsSingleSymbolRenderer, QgsComposerLabel, QgsComposerMap, QgsFontUtils, \ + QgsRectangle, QgsComposerLegend, QgsFeature, QgsGeometry, QgsPoint, QgsRendererCategory, QgsCategorizedSymbolRenderer, QgsMarkerSymbol from qgscompositionchecker import QgsCompositionChecker start_app() @@ -60,9 +60,9 @@ class TestQgsAtlasComposition(unittest.TestCase): # fix the renderer, fill with green props = {"color": "0,127,0"} - fillSymbol = QgsFillSymbolV2.createSimple(props) - renderer = QgsSingleSymbolRendererV2(fillSymbol) - mVectorLayer.setRendererV2(renderer) + fillSymbol = QgsFillSymbol.createSimple(props) + renderer = QgsSingleSymbolRenderer(fillSymbol) + mVectorLayer.setRenderer(renderer) # the atlas map self.mAtlasMap = QgsComposerMap(self.mComposition, 20, 20, 130, 130) @@ -85,7 +85,7 @@ class TestQgsAtlasComposition(unittest.TestCase): # set the fill symbol of the overview map props2 = {"color": "127,0,0,127"} - fillSymbol2 = QgsFillSymbolV2.createSimple(props2) + fillSymbol2 = QgsFillSymbol.createSimple(props2) mOverview.setOverviewFrameMapSymbol(fillSymbol2) # header label @@ -302,9 +302,9 @@ class TestQgsAtlasComposition(unittest.TestCase): pr.addFeatures([f1, f2]) # categorized symbology - r = QgsCategorizedSymbolRendererV2("attr", [QgsRendererCategoryV2(1, QgsMarkerSymbolV2.createSimple({"color": "255,0,0"}), "red"), - QgsRendererCategoryV2(2, QgsMarkerSymbolV2.createSimple({"color": "0,0,255"}), "blue")]) - ptLayer.setRendererV2(r) + r = QgsCategorizedSymbolRenderer("attr", [QgsRendererCategory(1, QgsMarkerSymbol.createSimple({"color": "255,0,0"}), "red"), + QgsRendererCategory(2, QgsMarkerSymbol.createSimple({"color": "0,0,255"}), "blue")]) + ptLayer.setRenderer(r) QgsMapLayerRegistry.instance().addMapLayer(ptLayer) diff --git a/tests/src/python/test_qgsattributetablemodel.py b/tests/src/python/test_qgsattributetablemodel.py index 9fabaec0c34..901454746a3 100644 --- a/tests/src/python/test_qgsattributetablemodel.py +++ b/tests/src/python/test_qgsattributetablemodel.py @@ -71,7 +71,7 @@ class TestQgsAttributeTableModel(unittest.TestCase): self.layer.startEditing() self.layer.deleteFeature(5) self.assertEquals(self.am.rowCount(), 9) - self.layer.setSelectedFeatures([1, 3, 6, 7]) + self.layer.selectByIds([1, 3, 6, 7]) self.layer.deleteSelectedFeatures() self.assertEquals(self.am.rowCount(), 5) diff --git a/tests/src/python/test_qgscategorizedsymbolrendererv2.py b/tests/src/python/test_qgscategorizedsymbolrenderer.py similarity index 75% rename from tests/src/python/test_qgscategorizedsymbolrendererv2.py rename to tests/src/python/test_qgscategorizedsymbolrenderer.py index fcab7868b6a..7a4410f07c0 100644 --- a/tests/src/python/test_qgscategorizedsymbolrendererv2.py +++ b/tests/src/python/test_qgscategorizedsymbolrenderer.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -"""QGIS Unit tests for QgsCategorizedSymbolRendererV2 +"""QGIS Unit tests for QgsCategorizedSymbolRenderer .. note:: This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,9 +15,9 @@ __revision__ = '$Format:%H$' import qgis # NOQA from qgis.testing import unittest, start_app -from qgis.core import (QgsCategorizedSymbolRendererV2, - QgsRendererCategoryV2, - QgsMarkerSymbolV2, +from qgis.core import (QgsCategorizedSymbolRenderer, + QgsRendererCategory, + QgsMarkerSymbol, QgsField, QgsFields ) @@ -27,7 +27,7 @@ start_app() def createMarkerSymbol(): - symbol = QgsMarkerSymbolV2.createSimple({ + symbol = QgsMarkerSymbol.createSimple({ "color": "100,150,50", "name": "square", "size": "3.0" @@ -35,18 +35,18 @@ def createMarkerSymbol(): return symbol -class TestQgsCategorizedSymbolRendererV2(unittest.TestCase): +class TestQgsCategorizedSymbolRenderer(unittest.TestCase): def testFilter(self): """Test filter creation""" - renderer = QgsCategorizedSymbolRendererV2() + renderer = QgsCategorizedSymbolRenderer() renderer.setClassAttribute('field') - renderer.addCategory(QgsRendererCategoryV2('a', createMarkerSymbol(), 'a')) - renderer.addCategory(QgsRendererCategoryV2('b', createMarkerSymbol(), 'b')) - renderer.addCategory(QgsRendererCategoryV2('c', createMarkerSymbol(), 'c')) + renderer.addCategory(QgsRendererCategory('a', createMarkerSymbol(), 'a')) + renderer.addCategory(QgsRendererCategory('b', createMarkerSymbol(), 'b')) + renderer.addCategory(QgsRendererCategory('c', createMarkerSymbol(), 'c')) # add default category - renderer.addCategory(QgsRendererCategoryV2('', createMarkerSymbol(), 'default')) + renderer.addCategory(QgsRendererCategory('', createMarkerSymbol(), 'default')) fields = QgsFields() fields.append(QgsField('field', QVariant.String)) @@ -73,16 +73,16 @@ class TestQgsCategorizedSymbolRendererV2(unittest.TestCase): renderer.deleteAllCategories() # just default category - renderer.addCategory(QgsRendererCategoryV2('', createMarkerSymbol(), 'default')) + renderer.addCategory(QgsRendererCategory('', createMarkerSymbol(), 'default')) self.assertEqual(renderer.filter(fields), '') assert renderer.updateCategoryRenderState(0, False) self.assertEqual(renderer.filter(fields), 'FALSE') renderer.deleteAllCategories() # no default category - renderer.addCategory(QgsRendererCategoryV2('a', createMarkerSymbol(), 'a')) - renderer.addCategory(QgsRendererCategoryV2('b', createMarkerSymbol(), 'b')) - renderer.addCategory(QgsRendererCategoryV2('c', createMarkerSymbol(), 'c')) + renderer.addCategory(QgsRendererCategory('a', createMarkerSymbol(), 'a')) + renderer.addCategory(QgsRendererCategory('b', createMarkerSymbol(), 'b')) + renderer.addCategory(QgsRendererCategory('c', createMarkerSymbol(), 'c')) self.assertEqual(renderer.filter(fields), "(\"field\") IN ('a','b','c')") assert renderer.updateCategoryRenderState(0, False) self.assertEqual(renderer.filter(fields), "(\"field\") IN ('b','c')") @@ -94,9 +94,9 @@ class TestQgsCategorizedSymbolRendererV2(unittest.TestCase): renderer.deleteAllCategories() renderer.setClassAttribute('num') # numeric categories - renderer.addCategory(QgsRendererCategoryV2(1, createMarkerSymbol(), 'a')) - renderer.addCategory(QgsRendererCategoryV2(2, createMarkerSymbol(), 'b')) - renderer.addCategory(QgsRendererCategoryV2(3, createMarkerSymbol(), 'c')) + renderer.addCategory(QgsRendererCategory(1, createMarkerSymbol(), 'a')) + renderer.addCategory(QgsRendererCategory(2, createMarkerSymbol(), 'b')) + renderer.addCategory(QgsRendererCategory(3, createMarkerSymbol(), 'c')) self.assertEqual(renderer.filter(fields), '(\"num\") IN (1,2,3)') assert renderer.updateCategoryRenderState(0, False) self.assertEqual(renderer.filter(fields), "(\"num\") IN (2,3)") @@ -107,14 +107,14 @@ class TestQgsCategorizedSymbolRendererV2(unittest.TestCase): def testFilterExpression(self): """Test filter creation with expression""" - renderer = QgsCategorizedSymbolRendererV2() + renderer = QgsCategorizedSymbolRenderer() renderer.setClassAttribute('field + field2') - renderer.addCategory(QgsRendererCategoryV2('a', createMarkerSymbol(), 'a')) - renderer.addCategory(QgsRendererCategoryV2('b', createMarkerSymbol(), 'b')) - renderer.addCategory(QgsRendererCategoryV2('c', createMarkerSymbol(), 'c')) + renderer.addCategory(QgsRendererCategory('a', createMarkerSymbol(), 'a')) + renderer.addCategory(QgsRendererCategory('b', createMarkerSymbol(), 'b')) + renderer.addCategory(QgsRendererCategory('c', createMarkerSymbol(), 'c')) # add default category - renderer.addCategory(QgsRendererCategoryV2('', createMarkerSymbol(), 'default')) + renderer.addCategory(QgsRendererCategory('', createMarkerSymbol(), 'default')) fields = QgsFields() fields.append(QgsField('field', QVariant.String)) @@ -140,16 +140,16 @@ class TestQgsCategorizedSymbolRendererV2(unittest.TestCase): renderer.deleteAllCategories() # just default category - renderer.addCategory(QgsRendererCategoryV2('', createMarkerSymbol(), 'default')) + renderer.addCategory(QgsRendererCategory('', createMarkerSymbol(), 'default')) self.assertEqual(renderer.filter(fields), '') assert renderer.updateCategoryRenderState(0, False) self.assertEqual(renderer.filter(fields), 'FALSE') renderer.deleteAllCategories() # no default category - renderer.addCategory(QgsRendererCategoryV2('a', createMarkerSymbol(), 'a')) - renderer.addCategory(QgsRendererCategoryV2('b', createMarkerSymbol(), 'b')) - renderer.addCategory(QgsRendererCategoryV2('c', createMarkerSymbol(), 'c')) + renderer.addCategory(QgsRendererCategory('a', createMarkerSymbol(), 'a')) + renderer.addCategory(QgsRendererCategory('b', createMarkerSymbol(), 'b')) + renderer.addCategory(QgsRendererCategory('c', createMarkerSymbol(), 'c')) self.assertEqual(renderer.filter(fields), "(field + field2) IN ('a','b','c')") assert renderer.updateCategoryRenderState(0, False) self.assertEqual(renderer.filter(fields), "(field + field2) IN ('b','c')") @@ -160,9 +160,9 @@ class TestQgsCategorizedSymbolRendererV2(unittest.TestCase): renderer.deleteAllCategories() # numeric categories - renderer.addCategory(QgsRendererCategoryV2(1, createMarkerSymbol(), 'a')) - renderer.addCategory(QgsRendererCategoryV2(2, createMarkerSymbol(), 'b')) - renderer.addCategory(QgsRendererCategoryV2(3, createMarkerSymbol(), 'c')) + renderer.addCategory(QgsRendererCategory(1, createMarkerSymbol(), 'a')) + renderer.addCategory(QgsRendererCategory(2, createMarkerSymbol(), 'b')) + renderer.addCategory(QgsRendererCategory(3, createMarkerSymbol(), 'c')) self.assertEqual(renderer.filter(fields), '(field + field2) IN (1,2,3)') assert renderer.updateCategoryRenderState(0, False) self.assertEqual(renderer.filter(fields), "(field + field2) IN (2,3)") diff --git a/tests/src/python/test_qgscomposerlegend.py b/tests/src/python/test_qgscomposerlegend.py index 040c6e345eb..327a5f0d865 100644 --- a/tests/src/python/test_qgscomposerlegend.py +++ b/tests/src/python/test_qgscomposerlegend.py @@ -21,8 +21,8 @@ from qgis.core import (QgsComposerLegend, QgsMapSettings, QgsVectorLayer, QgsMapLayerRegistry, - QgsMarkerSymbolV2, - QgsSingleSymbolRendererV2, + QgsMarkerSymbol, + QgsSingleSymbolRenderer, QgsRectangle ) from qgis.testing import (start_app, @@ -45,9 +45,9 @@ class TestQgsComposerLegend(unittest.TestCase): point_layer = QgsVectorLayer(point_path, 'points', 'ogr') QgsMapLayerRegistry.instance().addMapLayers([point_layer]) - marker_symbol = QgsMarkerSymbolV2.createSimple({'color': '#ff0000', 'outline_style': 'no', 'size': '5', 'size_unit': 'MapUnit'}) + marker_symbol = QgsMarkerSymbol.createSimple({'color': '#ff0000', 'outline_style': 'no', 'size': '5', 'size_unit': 'MapUnit'}) - point_layer.setRendererV2(QgsSingleSymbolRendererV2(marker_symbol)) + point_layer.setRenderer(QgsSingleSymbolRenderer(marker_symbol)) s = QgsMapSettings() s.setLayers([point_layer.id()]) diff --git a/tests/src/python/test_qgscomposerpolygon.py b/tests/src/python/test_qgscomposerpolygon.py index 22c47c491a9..720c819aa2c 100644 --- a/tests/src/python/test_qgscomposerpolygon.py +++ b/tests/src/python/test_qgscomposerpolygon.py @@ -22,7 +22,7 @@ from qgis.core import (QgsComposerPolygon, QgsComposerItem, QgsComposition, QgsMapSettings, - QgsFillSymbolV2 + QgsFillSymbol ) from qgis.testing import (start_app, unittest @@ -65,7 +65,7 @@ class TestQgsComposerPolygon(unittest.TestCase): props["width_border"] = "10.0" props["joinstyle"] = "miter" - style = QgsFillSymbolV2.createSimple(props) + style = QgsFillSymbol.createSimple(props) self.mComposerPolygon.setPolygonStyleSymbol(style) def testDisplayName(self): diff --git a/tests/src/python/test_qgscomposerpolyline.py b/tests/src/python/test_qgscomposerpolyline.py index 783200c2e01..7bda5e81c77 100644 --- a/tests/src/python/test_qgscomposerpolyline.py +++ b/tests/src/python/test_qgscomposerpolyline.py @@ -22,7 +22,7 @@ from qgis.core import (QgsComposerPolyline, QgsComposerItem, QgsComposition, QgsMapSettings, - QgsLineSymbolV2 + QgsLineSymbol ) from qgis.testing import (start_app, unittest @@ -63,7 +63,7 @@ class TestQgsComposerPolyline(unittest.TestCase): props["width"] = "10.0" props["capstyle"] = "square" - style = QgsLineSymbolV2.createSimple(props) + style = QgsLineSymbol.createSimple(props) self.mComposerPolyline.setPolylineStyleSymbol(style) def testDisplayName(self): diff --git a/tests/src/python/test_qgsgeometry.py b/tests/src/python/test_qgsgeometry.py index 019d9e43b2f..a91d598ec9f 100644 --- a/tests/src/python/test_qgsgeometry.py +++ b/tests/src/python/test_qgsgeometry.py @@ -21,16 +21,16 @@ from qgis.core import ( QgsFeature, QgsPoint, QgsPointV2, - QgsCircularStringV2, - QgsCompoundCurveV2, - QgsCurvePolygonV2, - QgsGeometryCollectionV2, - QgsLineStringV2, - QgsMultiCurveV2, - QgsMultiLineStringV2, + QgsCircularString, + QgsCompoundCurve, + QgsCurvePolygon, + QgsGeometryCollection, + QgsLineString, + QgsMultiCurve, + QgsMultiLineString, QgsMultiPointV2, QgsMultiPolygonV2, - QgsMultiSurfaceV2, + QgsMultiSurface, QgsPolygonV2, QgsCoordinateTransform, QgsRectangle, @@ -1877,16 +1877,16 @@ class TestQgsGeometry(unittest.TestCase): def testTypeInformation(self): """ Test type information """ types = [ - (QgsCircularStringV2, "CircularString", QgsWkbTypes.CircularString), - (QgsCompoundCurveV2, "CompoundCurve", QgsWkbTypes.CompoundCurve), - (QgsCurvePolygonV2, "CurvePolygon", QgsWkbTypes.CurvePolygon), - (QgsGeometryCollectionV2, "GeometryCollection", QgsWkbTypes.GeometryCollection), - (QgsLineStringV2, "LineString", QgsWkbTypes.LineString), - (QgsMultiCurveV2, "MultiCurve", QgsWkbTypes.MultiCurve), - (QgsMultiLineStringV2, "MultiLineString", QgsWkbTypes.MultiLineString), + (QgsCircularString, "CircularString", QgsWkbTypes.CircularString), + (QgsCompoundCurve, "CompoundCurve", QgsWkbTypes.CompoundCurve), + (QgsCurvePolygon, "CurvePolygon", QgsWkbTypes.CurvePolygon), + (QgsGeometryCollection, "GeometryCollection", QgsWkbTypes.GeometryCollection), + (QgsLineString, "LineString", QgsWkbTypes.LineString), + (QgsMultiCurve, "MultiCurve", QgsWkbTypes.MultiCurve), + (QgsMultiLineString, "MultiLineString", QgsWkbTypes.MultiLineString), (QgsMultiPointV2, "MultiPoint", QgsWkbTypes.MultiPoint), (QgsMultiPolygonV2, "MultiPolygon", QgsWkbTypes.MultiPolygon), - (QgsMultiSurfaceV2, "MultiSurface", QgsWkbTypes.MultiSurface), + (QgsMultiSurface, "MultiSurface", QgsWkbTypes.MultiSurface), (QgsPointV2, "Point", QgsWkbTypes.Point), (QgsPolygonV2, "Polygon", QgsWkbTypes.Polygon), ] @@ -3161,7 +3161,7 @@ class TestQgsGeometry(unittest.TestCase): wkt = "CircularString ((0 0,1 1,2 0))" geom = QgsGeometry.fromWkt(wkt) assert geom.deleteVertex(0) - self.assertEqual(geom.exportToWkt(), QgsCircularStringV2().asWkt()) + self.assertEqual(geom.exportToWkt(), QgsCircularString().asWkt()) wkt = "CircularString ((0 0,1 1,2 0,3 -1,4 0))" geom = QgsGeometry.fromWkt(wkt) @@ -3205,12 +3205,12 @@ class TestQgsGeometry(unittest.TestCase): assert not geom.deleteVertex(-1) assert not geom.deleteVertex(2) assert geom.deleteVertex(0) - self.assertEqual(geom.exportToWkt(), QgsCompoundCurveV2().asWkt()) + self.assertEqual(geom.exportToWkt(), QgsCompoundCurve().asWkt()) wkt = "CompoundCurve ((0 0,1 1))" geom = QgsGeometry.fromWkt(wkt) assert geom.deleteVertex(1) - self.assertEqual(geom.exportToWkt(), QgsCompoundCurveV2().asWkt()) + self.assertEqual(geom.exportToWkt(), QgsCompoundCurve().asWkt()) wkt = "CompoundCurve ((0 0,1 1),(1 1,2 2))" geom = QgsGeometry.fromWkt(wkt) @@ -3267,22 +3267,22 @@ class TestQgsGeometry(unittest.TestCase): assert not geom.deleteVertex(-1) assert not geom.deleteVertex(4) assert geom.deleteVertex(0) - self.assertEqual(geom.exportToWkt(), QgsCurvePolygonV2().asWkt()) + self.assertEqual(geom.exportToWkt(), QgsCurvePolygon().asWkt()) wkt = "CurvePolygon (CompoundCurve (CircularString(0 0,1 1,2 0),(2 0,0 0)))" geom = QgsGeometry.fromWkt(wkt) assert geom.deleteVertex(1) - self.assertEqual(geom.exportToWkt(), QgsCurvePolygonV2().asWkt()) + self.assertEqual(geom.exportToWkt(), QgsCurvePolygon().asWkt()) wkt = "CurvePolygon (CompoundCurve (CircularString(0 0,1 1,2 0),(2 0,0 0)))" geom = QgsGeometry.fromWkt(wkt) assert geom.deleteVertex(2) - self.assertEqual(geom.exportToWkt(), QgsCurvePolygonV2().asWkt()) + self.assertEqual(geom.exportToWkt(), QgsCurvePolygon().asWkt()) wkt = "CurvePolygon (CompoundCurve (CircularString(0 0,1 1,2 0),(2 0,0 0)))" geom = QgsGeometry.fromWkt(wkt) assert geom.deleteVertex(3) - self.assertEqual(geom.exportToWkt(), QgsCurvePolygonV2().asWkt()) + self.assertEqual(geom.exportToWkt(), QgsCurvePolygon().asWkt()) wkt = "CurvePolygon (CompoundCurve (CircularString(0 0,1 1,2 0,1.5 -0.5,1 -1),(1 -1,0 0)))" geom = QgsGeometry.fromWkt(wkt) @@ -3318,7 +3318,7 @@ class TestQgsGeometry(unittest.TestCase): # Test that we cannot add a CurvePolygon in a MultiPolygon multipolygon = QgsMultiPolygonV2() - cp = QgsCurvePolygonV2() + cp = QgsCurvePolygon() cp.fromWkt("CurvePolygon ((0 0,0 1,1 1,0 0))") assert not multipolygon.addGeometry(cp) diff --git a/tests/src/python/test_qgsgeometrygeneratorsymbollayerv2.py b/tests/src/python/test_qgsgeometrygeneratorsymbollayer.py similarity index 77% rename from tests/src/python/test_qgsgeometrygeneratorsymbollayerv2.py rename to tests/src/python/test_qgsgeometrygeneratorsymbollayer.py index 69bc153d2da..16c76fa7499 100644 --- a/tests/src/python/test_qgsgeometrygeneratorsymbollayerv2.py +++ b/tests/src/python/test_qgsgeometrygeneratorsymbollayer.py @@ -2,7 +2,7 @@ """ *************************************************************************** - test_qgsgeometrygeneratorsymbollayerv2.py + test_qgsgeometrygeneratorsymbollayer.py --------------------- Date : December 2015 Copyright : (C) 2015 by Matthias Kuhn @@ -31,13 +31,13 @@ from qgis.PyQt.QtCore import QSize from qgis.core import ( QgsVectorLayer, - QgsSingleSymbolRendererV2, - QgsFillSymbolV2, - QgsLineSymbolV2, - QgsMarkerSymbolV2, + QgsSingleSymbolRenderer, + QgsFillSymbol, + QgsLineSymbol, + QgsMarkerSymbol, QgsMapLayerRegistry, QgsRectangle, - QgsGeometryGeneratorSymbolLayerV2, + QgsGeometryGeneratorSymbolLayer, QgsSymbol, QgsMultiRenderChecker ) @@ -68,13 +68,13 @@ class TestQgsGeometryGeneratorSymbolLayerV2(unittest.TestCase): QgsMapLayerRegistry.instance().addMapLayer(self.points_layer) # Create style - sym1 = QgsFillSymbolV2.createSimple({'color': '#fdbf6f'}) - sym2 = QgsLineSymbolV2.createSimple({'color': '#fdbf6f'}) - sym3 = QgsMarkerSymbolV2.createSimple({'color': '#fdbf6f'}) + sym1 = QgsFillSymbol.createSimple({'color': '#fdbf6f'}) + sym2 = QgsLineSymbol.createSimple({'color': '#fdbf6f'}) + sym3 = QgsMarkerSymbol.createSimple({'color': '#fdbf6f'}) - self.polys_layer.setRendererV2(QgsSingleSymbolRendererV2(sym1)) - self.lines_layer.setRendererV2(QgsSingleSymbolRendererV2(sym2)) - self.points_layer.setRendererV2(QgsSingleSymbolRendererV2(sym3)) + self.polys_layer.setRenderer(QgsSingleSymbolRenderer(sym1)) + self.lines_layer.setRenderer(QgsSingleSymbolRenderer(sym2)) + self.points_layer.setRenderer(QgsSingleSymbolRenderer(sym3)) self.mapsettings = self.iface.mapCanvas().mapSettings() self.mapsettings.setOutputSize(QSize(400, 400)) @@ -85,8 +85,8 @@ class TestQgsGeometryGeneratorSymbolLayerV2(unittest.TestCase): QgsMapLayerRegistry.instance().removeAllMapLayers() def test_marker(self): - sym = self.polys_layer.rendererV2().symbol() - sym_layer = QgsGeometryGeneratorSymbolLayerV2.create({'geometryModifier': 'centroid($geometry)'}) + sym = self.polys_layer.renderer().symbol() + sym_layer = QgsGeometryGeneratorSymbolLayer.create({'geometryModifier': 'centroid($geometry)'}) sym_layer.setSymbolType(QgsSymbol.Marker) sym.changeSymbolLayer(0, sym_layer) @@ -99,13 +99,13 @@ class TestQgsGeometryGeneratorSymbolLayerV2(unittest.TestCase): self.assertTrue(renderchecker.runTest('geometrygenerator_marker')) def test_mixed(self): - sym = self.polys_layer.rendererV2().symbol() + sym = self.polys_layer.renderer().symbol() - buffer_layer = QgsGeometryGeneratorSymbolLayerV2.create({'geometryModifier': 'buffer($geometry, "value"/15)'}) + buffer_layer = QgsGeometryGeneratorSymbolLayer.create({'geometryModifier': 'buffer($geometry, "value"/15)'}) buffer_layer.setSymbolType(QgsSymbol.Fill) self.assertIsNotNone(buffer_layer.subSymbol()) sym.appendSymbolLayer(buffer_layer) - marker_layer = QgsGeometryGeneratorSymbolLayerV2.create({'geometryModifier': 'centroid($geometry)'}) + marker_layer = QgsGeometryGeneratorSymbolLayer.create({'geometryModifier': 'centroid($geometry)'}) marker_layer.setSymbolType(QgsSymbol.Marker) sym.appendSymbolLayer(marker_layer) @@ -118,9 +118,9 @@ class TestQgsGeometryGeneratorSymbolLayerV2(unittest.TestCase): self.assertTrue(renderchecker.runTest('geometrygenerator_mixed')) def test_buffer_lines(self): - sym = self.lines_layer.rendererV2().symbol() + sym = self.lines_layer.renderer().symbol() - buffer_layer = QgsGeometryGeneratorSymbolLayerV2.create({'geometryModifier': 'buffer($geometry, "value"/15)'}) + buffer_layer = QgsGeometryGeneratorSymbolLayer.create({'geometryModifier': 'buffer($geometry, "value"/15)'}) buffer_layer.setSymbolType(QgsSymbol.Fill) self.assertIsNotNone(buffer_layer.subSymbol()) sym.appendSymbolLayer(buffer_layer) @@ -134,9 +134,9 @@ class TestQgsGeometryGeneratorSymbolLayerV2(unittest.TestCase): self.assertTrue(renderchecker.runTest('geometrygenerator_buffer_lines')) def test_buffer_points(self): - sym = self.points_layer.rendererV2().symbol() + sym = self.points_layer.renderer().symbol() - buffer_layer = QgsGeometryGeneratorSymbolLayerV2.create({'geometryModifier': 'buffer($geometry, "staff"/15)'}) + buffer_layer = QgsGeometryGeneratorSymbolLayer.create({'geometryModifier': 'buffer($geometry, "staff"/15)'}) buffer_layer.setSymbolType(QgsSymbol.Fill) self.assertIsNotNone(buffer_layer.subSymbol()) sym.appendSymbolLayer(buffer_layer) diff --git a/tests/src/python/test_qgsgraduatedsymbolrendererv2.py b/tests/src/python/test_qgsgraduatedsymbolrenderer.py similarity index 86% rename from tests/src/python/test_qgsgraduatedsymbolrendererv2.py rename to tests/src/python/test_qgsgraduatedsymbolrenderer.py index eaef46e81e7..0d84d0925de 100644 --- a/tests/src/python/test_qgsgraduatedsymbolrendererv2.py +++ b/tests/src/python/test_qgsgraduatedsymbolrenderer.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -"""QGIS Unit tests for QgsGraduatedSymbolRendererV2 +"""QGIS Unit tests for QgsGraduatedSymbolRenderer .. note:: This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,11 +15,11 @@ __revision__ = '$Format:%H$' import qgis # NOQA from qgis.testing import unittest, start_app -from qgis.core import (QgsGraduatedSymbolRendererV2, - QgsRendererRangeV2, - QgsRendererRangeV2LabelFormat, - QgsMarkerSymbolV2, - QgsVectorGradientColorRampV2, +from qgis.core import (QgsGraduatedSymbolRenderer, + QgsRendererRange, + QgsRendererRangeLabelFormat, + QgsMarkerSymbol, + QgsVectorGradientColorRamp, QgsVectorLayer, QgsFeature, QgsGeometry, @@ -39,7 +39,7 @@ start_app() def createMarkerSymbol(): - symbol = QgsMarkerSymbolV2.createSimple({ + symbol = QgsMarkerSymbol.createSimple({ "color": "100,150,50", "name": "square", "size": "3.0" @@ -67,14 +67,14 @@ def createMemoryLayer(values): def createColorRamp(): - return QgsVectorGradientColorRampV2( + return QgsVectorGradientColorRamp( QColor(255, 0, 0), QColor(0, 0, 255) ) def createLabelFormat(): - format = QgsRendererRangeV2LabelFormat() + format = QgsRendererRangeLabelFormat() template = "%1 - %2 meters" precision = 5 format.setFormat(template) @@ -153,11 +153,11 @@ def dumpGraduatedRenderer(r): # Tests -class TestQgsGraduatedSymbolRendererV2(unittest.TestCase): +class TestQgsGraduatedSymbolRenderer(unittest.TestCase): - def testQgsRendererRangeV2_1(self): - """Test QgsRendererRangeV2 getter/setter functions""" - range = QgsRendererRangeV2() + def testQgsRendererRange_1(self): + """Test QgsRendererRange getter/setter functions""" + range = QgsRendererRange() self.assertTrue(range) lower = 123.45 upper = 234.56 @@ -175,17 +175,17 @@ class TestQgsGraduatedSymbolRendererV2(unittest.TestCase): self.assertFalse(range.renderState(), "Render state getter/setter failed") range.setSymbol(symbol.clone()) self.assertEqual(symbol.dump(), range.symbol().dump(), "Symbol getter/setter failed") - range2 = QgsRendererRangeV2(lower, upper, symbol.clone(), label, False) + range2 = QgsRendererRange(lower, upper, symbol.clone(), label, False) self.assertEqual(range2.lowerValue(), lower, "Lower value from constructor failed") self.assertEqual(range2.upperValue(), upper, "Upper value from constructor failed") self.assertEqual(range2.label(), label, "Label from constructor failed") self.assertEqual(range2.symbol().dump(), symbol.dump(), "Symbol from constructor failed") self.assertFalse(range2.renderState(), "Render state getter/setter failed") - def testQgsRendererRangeV2LabelFormat_1(self): - """Test QgsRendererRangeV2LabelFormat getter/setter functions""" - format = QgsRendererRangeV2LabelFormat() - self.assertTrue(format, "QgsRendererRangeV2LabelFomat construction failed") + def testQgsRendererRangeLabelFormat_1(self): + """Test QgsRendererRangeLabelFormat getter/setter functions""" + format = QgsRendererRangeLabelFormat() + self.assertTrue(format, "QgsRendererRangeLabelFomat construction failed") template = "%1 - %2 meters" precision = 5 format.setFormat(template) @@ -198,16 +198,16 @@ class TestQgsGraduatedSymbolRendererV2(unittest.TestCase): self.assertFalse(format.trimTrailingZeroes(), "TrimTrailingZeroes getter/setter failed") minprecision = -6 maxprecision = 15 - self.assertEqual(QgsRendererRangeV2LabelFormat.MinPrecision, minprecision, "Minimum precision != -6") - self.assertEqual(QgsRendererRangeV2LabelFormat.MaxPrecision, maxprecision, "Maximum precision != 15") + self.assertEqual(QgsRendererRangeLabelFormat.MinPrecision, minprecision, "Minimum precision != -6") + self.assertEqual(QgsRendererRangeLabelFormat.MaxPrecision, maxprecision, "Maximum precision != 15") format.setPrecision(-10) self.assertEqual(format.precision(), minprecision, "Minimum precision not enforced") format.setPrecision(20) self.assertEqual(format.precision(), maxprecision, "Maximum precision not enforced") - def testQgsRendererRangeV2LabelFormat_2(self): - """Test QgsRendererRangeV2LabelFormat number format""" - format = QgsRendererRangeV2LabelFormat() + def testQgsRendererRangeLabelFormat_2(self): + """Test QgsRendererRangeLabelFormat number format""" + format = QgsRendererRangeLabelFormat() # Tests have precision, trim, value, expected # (Note: Not sure what impact of locale is on these tests) tests = ( @@ -260,7 +260,7 @@ class TestQgsGraduatedSymbolRendererV2(unittest.TestCase): self.assertEqual(result, expected, "Label format error {0} => {1}".format( label, result)) - range = QgsRendererRangeV2() + range = QgsRendererRange() range.setLowerValue(lower) range.setUpperValue(upper) label = ltests[0][0] @@ -269,11 +269,11 @@ class TestQgsGraduatedSymbolRendererV2(unittest.TestCase): self.assertEqual(result, ltests[0][1], "Label for range error {0} => {1}".format( label, result)) - def testQgsGraduatedSymbolRendererV2_1(self): - """Test QgsGraduatedSymbolRendererV2: Basic get/set functions """ + def testQgsGraduatedSymbolRenderer_1(self): + """Test QgsGraduatedSymbolRenderer: Basic get/set functions """ # Create a renderer - renderer = QgsGraduatedSymbolRendererV2() + renderer = QgsGraduatedSymbolRenderer() symbol = createMarkerSymbol() renderer.setSourceSymbol(symbol.clone()) @@ -284,12 +284,12 @@ class TestQgsGraduatedSymbolRendererV2(unittest.TestCase): self.assertEqual(attr, renderer.classAttribute(), "Get/set renderer class attribute") for m in ( - QgsGraduatedSymbolRendererV2.Custom, - QgsGraduatedSymbolRendererV2.EqualInterval, - QgsGraduatedSymbolRendererV2.Quantile, - QgsGraduatedSymbolRendererV2.Jenks, - QgsGraduatedSymbolRendererV2.Pretty, - QgsGraduatedSymbolRendererV2.StdDev, + QgsGraduatedSymbolRenderer.Custom, + QgsGraduatedSymbolRenderer.EqualInterval, + QgsGraduatedSymbolRenderer.Quantile, + QgsGraduatedSymbolRenderer.Jenks, + QgsGraduatedSymbolRenderer.Pretty, + QgsGraduatedSymbolRenderer.StdDev, ): renderer.setMode(m) self.assertEqual(m, renderer.mode(), "Get/set renderer mode") @@ -343,7 +343,7 @@ class TestQgsGraduatedSymbolRendererV2(unittest.TestCase): self.assertEqual(str(sm), str(renderer.scaleMethod()), "Get/set renderer scale method") # test for classificatio with varying size - renderer.setGraduatedMethod(QgsGraduatedSymbolRendererV2.GraduatedSize) + renderer.setGraduatedMethod(QgsGraduatedSymbolRenderer.GraduatedSize) renderer.setSourceColorRamp(None) renderer.addClassLowerUpper(0, 2) renderer.addClassLowerUpper(2, 4) @@ -356,10 +356,10 @@ class TestQgsGraduatedSymbolRendererV2(unittest.TestCase): for idx, symbol in enumerate(renderer.symbols2(ctx)): self.assertEqual(symbol.size(), refSizes[idx]) - def testQgsGraduatedSymbolRendererV2_2(self): - """Test QgsGraduatedSymbolRendererV2: Adding /removing/editing classes """ + def testQgsGraduatedSymbolRenderer_2(self): + """Test QgsGraduatedSymbolRenderer: Adding /removing/editing classes """ # Create a renderer - renderer = QgsGraduatedSymbolRendererV2() + renderer = QgsGraduatedSymbolRenderer() symbol = createMarkerSymbol() renderer.setSourceSymbol(symbol.clone()) symbol.setColor(QColor(255, 0, 0)) @@ -377,7 +377,7 @@ class TestQgsGraduatedSymbolRendererV2(unittest.TestCase): # Add as a rangeobject symbol.setColor(QColor(0, 255, 0)) - range = QgsRendererRangeV2(20.0, 25.5, symbol.clone(), 'Third range', False) + range = QgsRendererRange(20.0, 25.5, symbol.clone(), 'Third range', False) renderer.addClassRange(range) # Add class by lower and upper @@ -407,7 +407,7 @@ class TestQgsGraduatedSymbolRendererV2(unittest.TestCase): doc = QDomDocument() element = renderer.save(doc) - renderer2 = QgsGraduatedSymbolRendererV2.create(element) + renderer2 = QgsGraduatedSymbolRenderer.create(element) self.assertEqual( dumpGraduatedRenderer(renderer), dumpGraduatedRenderer(renderer2), @@ -446,17 +446,17 @@ class TestQgsGraduatedSymbolRendererV2(unittest.TestCase): # void addClass( QgsSymbol* symbol ); # //! @note available in python bindings as addClassRange -# void addClass( QgsRendererRangeV2 range ) /PyName=addClassRange/; +# void addClass( QgsRendererRange range ) /PyName=addClassRange/; # //! @note available in python bindings as addClassLowerUpper # void addClass( double lower, double upper ) /PyName=addClassLowerUpper/; # void deleteClass( int idx ); # void deleteAllClasses(); - def testQgsGraduatedSymbolRendererV2_3(self): - """Test QgsGraduatedSymbolRendererV2: Reading attribute data, calculating classes """ + def testQgsGraduatedSymbolRenderer_3(self): + """Test QgsGraduatedSymbolRenderer: Reading attribute data, calculating classes """ # Create a renderer - renderer = QgsGraduatedSymbolRendererV2() + renderer = QgsGraduatedSymbolRenderer() symbol = createMarkerSymbol() renderer.setSourceSymbol(symbol.clone()) diff --git a/tests/src/python/test_qgsjsonutils.py b/tests/src/python/test_qgsjsonutils.py index d5722a69aa1..cbff8291c6d 100644 --- a/tests/src/python/test_qgsjsonutils.py +++ b/tests/src/python/test_qgsjsonutils.py @@ -26,7 +26,7 @@ from qgis.core import (QgsJSONUtils, QgsWkbTypes, QgsGeometry, QgsPointV2, - QgsLineStringV2, + QgsLineString, NULL, QgsVectorLayer, QgsRelation @@ -170,9 +170,9 @@ class TestQgsJSONUtils(unittest.TestCase): self.assertEqual(exporter.exportFeature(feature), expected) # test with linestring for bbox inclusion - l = QgsLineStringV2() + l = QgsLineString() l.setPoints([QgsPointV2(5, 6), QgsPointV2(15, 16)]) - feature.setGeometry(QgsGeometry(QgsLineStringV2(l))) + feature.setGeometry(QgsGeometry(QgsLineString(l))) expected = """{ "type":"Feature", @@ -297,7 +297,7 @@ class TestQgsJSONUtils(unittest.TestCase): # test excluding geometry exporter.setIncludeGeometry(False) self.assertEqual(exporter.includeGeometry(), False) - feature.setGeometry(QgsGeometry(QgsLineStringV2(l))) + feature.setGeometry(QgsGeometry(QgsLineString(l))) expected = """{ "type":"Feature", diff --git a/tests/src/python/test_qgsnullsymbolrenderer.py b/tests/src/python/test_qgsnullsymbolrenderer.py index a1688d7c9cd..1644a47603e 100644 --- a/tests/src/python/test_qgsnullsymbolrenderer.py +++ b/tests/src/python/test_qgsnullsymbolrenderer.py @@ -55,7 +55,7 @@ class TestQgsNullSymbolRenderer(unittest.TestCase): QgsMapLayerRegistry.instance().addMapLayer(self.layer) self.renderer = QgsNullSymbolRenderer() - self.layer.setRendererV2(self.renderer) + self.layer.setRenderer(self.renderer) rendered_layers = [self.layer.id()] self.mapsettings = self.iface.mapCanvas().mapSettings() diff --git a/tests/src/python/test_qgspallabeling_placement.py b/tests/src/python/test_qgspallabeling_placement.py index caa51036e4d..24bcf0816e7 100644 --- a/tests/src/python/test_qgspallabeling_placement.py +++ b/tests/src/python/test_qgspallabeling_placement.py @@ -23,7 +23,7 @@ import sys from qgis.PyQt.QtCore import QThreadPool, qDebug -from qgis.core import QgsPalLayerSettings, QgsSingleSymbolRendererV2, QgsMarkerSymbolV2 +from qgis.core import QgsPalLayerSettings, QgsSingleSymbolRenderer, QgsMarkerSymbol from utilities import getTempfilePath, renderMapToImage, mapSettingsString from test_qgspallabeling_base import TestQgsPalLabeling, runSuite @@ -256,14 +256,14 @@ class TestPointPlacement(TestPlacementBase): # Test ordered placements for point using symbol bounds offset self.layer = TestQgsPalLabeling.loadFeatureLayer('point_ordered_placement') # Make a big symbol - symbol = QgsMarkerSymbolV2.createSimple({u'color': u'31,120,180,255', - u'outline_color': u'0,0,0,0', - u'outline_style': u'solid', - u'size': u'10', - u'name': u'rectangle', - u'size_unit': u'MM'}) - renderer = QgsSingleSymbolRendererV2(symbol) - self.layer.setRendererV2(renderer) + symbol = QgsMarkerSymbol.createSimple({u'color': u'31,120,180,255', + u'outline_color': u'0,0,0,0', + u'outline_style': u'solid', + u'size': u'10', + u'name': u'rectangle', + u'size_unit': u'MM'}) + renderer = QgsSingleSymbolRenderer(symbol) + self.layer.setRenderer(renderer) self._TestMapSettings = self.cloneMapSettings(self._MapSettings) self.lyr.placement = QgsPalLayerSettings.OrderedPositionsAroundPoint self.lyr.dist = 2 diff --git a/tests/src/python/test_qgsrenderer.py b/tests/src/python/test_qgsrenderer.py new file mode 100644 index 00000000000..23f65f6b527 --- /dev/null +++ b/tests/src/python/test_qgsrenderer.py @@ -0,0 +1,176 @@ +# -*- coding: utf-8 -*- +"""QGIS Unit tests for QgsFeatureRenderer. + +.. note:: This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. +""" +__author__ = 'Nyall Dawson' +__date__ = '07/06/2016' +__copyright__ = 'Copyright 2016, The QGIS Project' +# This will get replaced with a git SHA1 when you do a git archive +__revision__ = '$Format:%H$' + +import qgis # NOQA + +from qgis.core import (QgsFeatureRenderer, + QgsRendererAbstractMetadata, + QgsRendererRegistry, + QgsVectorLayer + ) +from qgis.testing import start_app, unittest + +start_app() + + +def createReferencingLayer(): + layer = QgsVectorLayer("Point?field=fldtxt:string&field=foreignkey:integer", + "referencinglayer", "memory") + pr = layer.dataProvider() + f1 = QgsFeature() + f1.setFields(layer.pendingFields()) + f1.setAttributes(["test1", 123]) + f1.setGeometry(QgsGeometry.fromPoint(QgsPoint(100, 200))) + f2 = QgsFeature() + f2.setFields(layer.pendingFields()) + f2.setAttributes(["test2", 123]) + f2.setGeometry(QgsGeometry.fromPoint(QgsPoint(101, 201))) + assert pr.addFeatures([f1, f2]) + return layer + + +class TestRenderer(QgsRendererAbstractMetadata): + + def __init__(self, name, layerTypes=QgsRendererAbstractMetadata.All): + QgsRendererAbstractMetadata.__init__(self, name, "Test Renderer") + self.types = layerTypes + + def compatibleLayerTypes(self): + return self.types + + def createRenderer(self, elem): + return None + + +def clearRegistry(): + # clear registry to start with + for r in QgsRendererRegistry.instance().renderersList(): + if r == 'singleSymbol': + continue + QgsRendererRegistry.instance().removeRenderer(r) + + +class TestQgsRendererV2Registry(unittest.TestCase): + + def testInstance(self): + """ test retrieving global instance """ + self.assertTrue(QgsRendererRegistry.instance()) + + # instance should be initially populated with some default renderers + self.assertTrue('singleSymbol' in QgsRendererRegistry.instance().renderersList()) + + # register a renderer to the singleton, to test that the same instance is always returned + self.assertFalse('test' in QgsRendererRegistry.instance().renderersList()) + self.assertTrue(QgsRendererRegistry.instance().addRenderer(TestRenderer('test'))) + self.assertTrue('test' in QgsRendererRegistry.instance().renderersList()) + + def testAddRenderer(self): + """ test adding renderers to registry """ + clearRegistry() + + # add a renderer + self.assertTrue(QgsRendererRegistry.instance().addRenderer(TestRenderer('test2'))) + self.assertTrue('test2' in QgsRendererRegistry.instance().renderersList()) + + # try adding it again - should be rejected due to duplicate name + self.assertFalse(QgsRendererRegistry.instance().addRenderer(TestRenderer('test2'))) + self.assertTrue('test2' in QgsRendererRegistry.instance().renderersList()) + + def testRemoveRenderer(self): + """ test removing renderers from registry """ + clearRegistry() + + # try removing non-existant renderer + self.assertFalse(QgsRendererRegistry.instance().removeRenderer('test3')) + + # now add it + self.assertTrue(QgsRendererRegistry.instance().addRenderer(TestRenderer('test3'))) + self.assertTrue('test3' in QgsRendererRegistry.instance().renderersList()) + + # try removing it again - should be ok this time + self.assertTrue(QgsRendererRegistry.instance().removeRenderer('test3')) + self.assertFalse('test3' in QgsRendererRegistry.instance().renderersList()) + + # try removing it again - should be false since already removed + self.assertFalse(QgsRendererRegistry.instance().removeRenderer('test3')) + + def testRetrieveRenderer(self): + """ test retrieving renderer by name """ + clearRegistry() + + # try non-existant renderer + self.assertFalse(QgsRendererRegistry.instance().rendererMetadata('test4')) + + # now add it + r = TestRenderer('test4') + self.assertTrue(QgsRendererRegistry.instance().addRenderer(r)) + + # try retrieving it + result = QgsRendererRegistry.instance().rendererMetadata('test4') + self.assertTrue(result) + self.assertEqual(result.name(), 'test4') + + def testRenderersList(self): + """ test getting list of renderers from registry """ + clearRegistry() + + self.assertEqual(QgsRendererRegistry.instance().renderersList(), ['singleSymbol']) + + # add some renderers + r1 = TestRenderer('test1', QgsRendererAbstractMetadata.PointLayer) + self.assertTrue(QgsRendererRegistry.instance().addRenderer(r1)) + r2 = TestRenderer('test2', QgsRendererAbstractMetadata.LineLayer) + self.assertTrue(QgsRendererRegistry.instance().addRenderer(r2)) + r3 = TestRenderer('test3', QgsRendererAbstractMetadata.PolygonLayer) + self.assertTrue(QgsRendererRegistry.instance().addRenderer(r3)) + r4 = TestRenderer('test4', QgsRendererAbstractMetadata.PointLayer | QgsRendererAbstractMetadata.LineLayer) + self.assertTrue(QgsRendererRegistry.instance().addRenderer(r4)) + + self.assertEqual(QgsRendererRegistry.instance().renderersList(), ['singleSymbol', 'test1', 'test2', 'test3', 'test4']) + + # test subsets + self.assertEqual(QgsRendererRegistry.instance().renderersList(QgsRendererAbstractMetadata.PointLayer), ['singleSymbol', 'test1', 'test4']) + self.assertEqual(QgsRendererRegistry.instance().renderersList(QgsRendererAbstractMetadata.LineLayer), ['singleSymbol', 'test2', 'test4']) + self.assertEqual(QgsRendererRegistry.instance().renderersList(QgsRendererAbstractMetadata.PolygonLayer), ['singleSymbol', 'test3']) + self.assertEqual(QgsRendererRegistry.instance().renderersList(QgsRendererAbstractMetadata.LineLayer | QgsRendererAbstractMetadata.PolygonLayer), ['singleSymbol', 'test2', 'test3', 'test4']) + + def testRenderersByLayerType(self): + """ test retrieving compatible renderers by layer type """ + clearRegistry() + + # add some renderers + r1 = TestRenderer('test1', QgsRendererAbstractMetadata.PointLayer) + self.assertTrue(QgsRendererRegistry.instance().addRenderer(r1)) + r2 = TestRenderer('test2', QgsRendererAbstractMetadata.LineLayer) + self.assertTrue(QgsRendererRegistry.instance().addRenderer(r2)) + r3 = TestRenderer('test3', QgsRendererAbstractMetadata.PolygonLayer) + self.assertTrue(QgsRendererRegistry.instance().addRenderer(r3)) + r4 = TestRenderer('test4', QgsRendererAbstractMetadata.PointLayer | QgsRendererAbstractMetadata.LineLayer) + self.assertTrue(QgsRendererRegistry.instance().addRenderer(r4)) + + # make some layers + point_layer = QgsVectorLayer("Point?field=fldtxt:string", + "pointlayer", "memory") + line_layer = QgsVectorLayer("LineString?field=fldtxt:string", + "linelayer", "memory") + polygon_layer = QgsVectorLayer("Polygon?field=fldtxt:string", + "polylayer", "memory") + + # test subsets + self.assertEqual(QgsRendererRegistry.instance().renderersList(point_layer), ['singleSymbol', 'test1', 'test4']) + self.assertEqual(QgsRendererRegistry.instance().renderersList(line_layer), ['singleSymbol', 'test2', 'test4']) + self.assertEqual(QgsRendererRegistry.instance().renderersList(polygon_layer), ['singleSymbol', 'test3']) + +if __name__ == '__main__': + unittest.main() diff --git a/tests/src/python/test_qgsrendererv2.py b/tests/src/python/test_qgsrendererv2.py deleted file mode 100644 index f86791cfff8..00000000000 --- a/tests/src/python/test_qgsrendererv2.py +++ /dev/null @@ -1,176 +0,0 @@ -# -*- coding: utf-8 -*- -"""QGIS Unit tests for QgsFeatureRendererV2. - -.. note:: This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. -""" -__author__ = 'Nyall Dawson' -__date__ = '07/06/2016' -__copyright__ = 'Copyright 2016, The QGIS Project' -# This will get replaced with a git SHA1 when you do a git archive -__revision__ = '$Format:%H$' - -import qgis # NOQA - -from qgis.core import (QgsFeatureRendererV2, - QgsRendererV2AbstractMetadata, - QgsRendererV2Registry, - QgsVectorLayer - ) -from qgis.testing import start_app, unittest - -start_app() - - -def createReferencingLayer(): - layer = QgsVectorLayer("Point?field=fldtxt:string&field=foreignkey:integer", - "referencinglayer", "memory") - pr = layer.dataProvider() - f1 = QgsFeature() - f1.setFields(layer.pendingFields()) - f1.setAttributes(["test1", 123]) - f1.setGeometry(QgsGeometry.fromPoint(QgsPoint(100, 200))) - f2 = QgsFeature() - f2.setFields(layer.pendingFields()) - f2.setAttributes(["test2", 123]) - f2.setGeometry(QgsGeometry.fromPoint(QgsPoint(101, 201))) - assert pr.addFeatures([f1, f2]) - return layer - - -class TestRenderer(QgsRendererV2AbstractMetadata): - - def __init__(self, name, layerTypes=QgsRendererV2AbstractMetadata.All): - QgsRendererV2AbstractMetadata.__init__(self, name, "Test Renderer") - self.types = layerTypes - - def compatibleLayerTypes(self): - return self.types - - def createRenderer(self, elem): - return None - - -def clearRegistry(): - # clear registry to start with - for r in QgsRendererV2Registry.instance().renderersList(): - if r == 'singleSymbol': - continue - QgsRendererV2Registry.instance().removeRenderer(r) - - -class TestQgsRendererV2Registry(unittest.TestCase): - - def testInstance(self): - """ test retrieving global instance """ - self.assertTrue(QgsRendererV2Registry.instance()) - - # instance should be initially populated with some default renderers - self.assertTrue('singleSymbol' in QgsRendererV2Registry.instance().renderersList()) - - # register a renderer to the singleton, to test that the same instance is always returned - self.assertFalse('test' in QgsRendererV2Registry.instance().renderersList()) - self.assertTrue(QgsRendererV2Registry.instance().addRenderer(TestRenderer('test'))) - self.assertTrue('test' in QgsRendererV2Registry.instance().renderersList()) - - def testAddRenderer(self): - """ test adding renderers to registry """ - clearRegistry() - - # add a renderer - self.assertTrue(QgsRendererV2Registry.instance().addRenderer(TestRenderer('test2'))) - self.assertTrue('test2' in QgsRendererV2Registry.instance().renderersList()) - - # try adding it again - should be rejected due to duplicate name - self.assertFalse(QgsRendererV2Registry.instance().addRenderer(TestRenderer('test2'))) - self.assertTrue('test2' in QgsRendererV2Registry.instance().renderersList()) - - def testRemoveRenderer(self): - """ test removing renderers from registry """ - clearRegistry() - - # try removing non-existant renderer - self.assertFalse(QgsRendererV2Registry.instance().removeRenderer('test3')) - - # now add it - self.assertTrue(QgsRendererV2Registry.instance().addRenderer(TestRenderer('test3'))) - self.assertTrue('test3' in QgsRendererV2Registry.instance().renderersList()) - - # try removing it again - should be ok this time - self.assertTrue(QgsRendererV2Registry.instance().removeRenderer('test3')) - self.assertFalse('test3' in QgsRendererV2Registry.instance().renderersList()) - - # try removing it again - should be false since already removed - self.assertFalse(QgsRendererV2Registry.instance().removeRenderer('test3')) - - def testRetrieveRenderer(self): - """ test retrieving renderer by name """ - clearRegistry() - - # try non-existant renderer - self.assertFalse(QgsRendererV2Registry.instance().rendererMetadata('test4')) - - # now add it - r = TestRenderer('test4') - self.assertTrue(QgsRendererV2Registry.instance().addRenderer(r)) - - # try retrieving it - result = QgsRendererV2Registry.instance().rendererMetadata('test4') - self.assertTrue(result) - self.assertEqual(result.name(), 'test4') - - def testRenderersList(self): - """ test getting list of renderers from registry """ - clearRegistry() - - self.assertEqual(QgsRendererV2Registry.instance().renderersList(), ['singleSymbol']) - - # add some renderers - r1 = TestRenderer('test1', QgsRendererV2AbstractMetadata.PointLayer) - self.assertTrue(QgsRendererV2Registry.instance().addRenderer(r1)) - r2 = TestRenderer('test2', QgsRendererV2AbstractMetadata.LineLayer) - self.assertTrue(QgsRendererV2Registry.instance().addRenderer(r2)) - r3 = TestRenderer('test3', QgsRendererV2AbstractMetadata.PolygonLayer) - self.assertTrue(QgsRendererV2Registry.instance().addRenderer(r3)) - r4 = TestRenderer('test4', QgsRendererV2AbstractMetadata.PointLayer | QgsRendererV2AbstractMetadata.LineLayer) - self.assertTrue(QgsRendererV2Registry.instance().addRenderer(r4)) - - self.assertEqual(QgsRendererV2Registry.instance().renderersList(), ['singleSymbol', 'test1', 'test2', 'test3', 'test4']) - - # test subsets - self.assertEqual(QgsRendererV2Registry.instance().renderersList(QgsRendererV2AbstractMetadata.PointLayer), ['singleSymbol', 'test1', 'test4']) - self.assertEqual(QgsRendererV2Registry.instance().renderersList(QgsRendererV2AbstractMetadata.LineLayer), ['singleSymbol', 'test2', 'test4']) - self.assertEqual(QgsRendererV2Registry.instance().renderersList(QgsRendererV2AbstractMetadata.PolygonLayer), ['singleSymbol', 'test3']) - self.assertEqual(QgsRendererV2Registry.instance().renderersList(QgsRendererV2AbstractMetadata.LineLayer | QgsRendererV2AbstractMetadata.PolygonLayer), ['singleSymbol', 'test2', 'test3', 'test4']) - - def testRenderersByLayerType(self): - """ test retrieving compatible renderers by layer type """ - clearRegistry() - - # add some renderers - r1 = TestRenderer('test1', QgsRendererV2AbstractMetadata.PointLayer) - self.assertTrue(QgsRendererV2Registry.instance().addRenderer(r1)) - r2 = TestRenderer('test2', QgsRendererV2AbstractMetadata.LineLayer) - self.assertTrue(QgsRendererV2Registry.instance().addRenderer(r2)) - r3 = TestRenderer('test3', QgsRendererV2AbstractMetadata.PolygonLayer) - self.assertTrue(QgsRendererV2Registry.instance().addRenderer(r3)) - r4 = TestRenderer('test4', QgsRendererV2AbstractMetadata.PointLayer | QgsRendererV2AbstractMetadata.LineLayer) - self.assertTrue(QgsRendererV2Registry.instance().addRenderer(r4)) - - # make some layers - point_layer = QgsVectorLayer("Point?field=fldtxt:string", - "pointlayer", "memory") - line_layer = QgsVectorLayer("LineString?field=fldtxt:string", - "linelayer", "memory") - polygon_layer = QgsVectorLayer("Polygon?field=fldtxt:string", - "polylayer", "memory") - - # test subsets - self.assertEqual(QgsRendererV2Registry.instance().renderersList(point_layer), ['singleSymbol', 'test1', 'test4']) - self.assertEqual(QgsRendererV2Registry.instance().renderersList(line_layer), ['singleSymbol', 'test2', 'test4']) - self.assertEqual(QgsRendererV2Registry.instance().renderersList(polygon_layer), ['singleSymbol', 'test3']) - -if __name__ == '__main__': - unittest.main() diff --git a/tests/src/python/test_qgsrulebasedrenderer.py b/tests/src/python/test_qgsrulebasedrenderer.py index 81bb1f4080f..bfb12bc2d67 100644 --- a/tests/src/python/test_qgsrulebasedrenderer.py +++ b/tests/src/python/test_qgsrulebasedrenderer.py @@ -33,13 +33,13 @@ from qgis.core import (QgsVectorLayer, QgsMapLayerRegistry, QgsRectangle, QgsMultiRenderChecker, - QgsRuleBasedRendererV2, - QgsFillSymbolV2, - QgsMarkerSymbolV2, - QgsRendererCategoryV2, - QgsCategorizedSymbolRendererV2, - QgsGraduatedSymbolRendererV2, - QgsRendererRangeV2 + QgsRuleBasedRenderer, + QgsFillSymbol, + QgsMarkerSymbol, + QgsRendererCategory, + QgsCategorizedSymbolRenderer, + QgsGraduatedSymbolRenderer, + QgsRendererRange ) from qgis.testing import start_app, unittest from qgis.testing.mocked import get_iface @@ -60,21 +60,21 @@ class TestQgsRulebasedRenderer(unittest.TestCase): QgsMapLayerRegistry.instance().addMapLayer(layer) # Create rulebased style - sym1 = QgsFillSymbolV2.createSimple({'color': '#fdbf6f'}) - sym2 = QgsFillSymbolV2.createSimple({'color': '#71bd6c'}) - sym3 = QgsFillSymbolV2.createSimple({'color': '#1f78b4'}) + sym1 = QgsFillSymbol.createSimple({'color': '#fdbf6f'}) + sym2 = QgsFillSymbol.createSimple({'color': '#71bd6c'}) + sym3 = QgsFillSymbol.createSimple({'color': '#1f78b4'}) - self.r1 = QgsRuleBasedRendererV2.Rule(sym1, 0, 0, '"id" = 1') - self.r2 = QgsRuleBasedRendererV2.Rule(sym2, 0, 0, '"id" = 2') - self.r3 = QgsRuleBasedRendererV2.Rule(sym3, 0, 0, 'ELSE') + self.r1 = QgsRuleBasedRenderer.Rule(sym1, 0, 0, '"id" = 1') + self.r2 = QgsRuleBasedRenderer.Rule(sym2, 0, 0, '"id" = 2') + self.r3 = QgsRuleBasedRenderer.Rule(sym3, 0, 0, 'ELSE') - self.rootrule = QgsRuleBasedRendererV2.Rule(None) + self.rootrule = QgsRuleBasedRenderer.Rule(None) self.rootrule.appendChild(self.r1) self.rootrule.appendChild(self.r2) self.rootrule.appendChild(self.r3) - self.renderer = QgsRuleBasedRendererV2(self.rootrule) - layer.setRendererV2(self.renderer) + self.renderer = QgsRuleBasedRenderer(self.rootrule) + layer.setRenderer(self.renderer) self.mapsettings = self.iface.mapCanvas().mapSettings() self.mapsettings.setOutputSize(QSize(400, 400)) self.mapsettings.setOutputDpi(96) @@ -111,31 +111,31 @@ class TestQgsRulebasedRenderer(unittest.TestCase): # First, try with a field based category (id) cats = [] - cats.append(QgsRendererCategoryV2(1, QgsMarkerSymbolV2(), "id 1")) - cats.append(QgsRendererCategoryV2(2, QgsMarkerSymbolV2(), "id 2")) - c = QgsCategorizedSymbolRendererV2("id", cats) + cats.append(QgsRendererCategory(1, QgsMarkerSymbol(), "id 1")) + cats.append(QgsRendererCategory(2, QgsMarkerSymbol(), "id 2")) + c = QgsCategorizedSymbolRenderer("id", cats) - QgsRuleBasedRendererV2.refineRuleCategories(self.r2, c) + QgsRuleBasedRenderer.refineRuleCategories(self.r2, c) assert self.r2.children()[0].filterExpression() == '"id" = 1' assert self.r2.children()[1].filterExpression() == '"id" = 2' # Next try with an expression based category cats = [] - cats.append(QgsRendererCategoryV2(1, QgsMarkerSymbolV2(), "result 1")) - cats.append(QgsRendererCategoryV2(2, QgsMarkerSymbolV2(), "result 2")) - c = QgsCategorizedSymbolRendererV2("id + 1", cats) + cats.append(QgsRendererCategory(1, QgsMarkerSymbol(), "result 1")) + cats.append(QgsRendererCategory(2, QgsMarkerSymbol(), "result 2")) + c = QgsCategorizedSymbolRenderer("id + 1", cats) - QgsRuleBasedRendererV2.refineRuleCategories(self.r1, c) + QgsRuleBasedRenderer.refineRuleCategories(self.r1, c) assert self.r1.children()[0].filterExpression() == 'id + 1 = 1' assert self.r1.children()[1].filterExpression() == 'id + 1 = 2' # Last try with an expression which is just a quoted field name cats = [] - cats.append(QgsRendererCategoryV2(1, QgsMarkerSymbolV2(), "result 1")) - cats.append(QgsRendererCategoryV2(2, QgsMarkerSymbolV2(), "result 2")) - c = QgsCategorizedSymbolRendererV2('"id"', cats) + cats.append(QgsRendererCategory(1, QgsMarkerSymbol(), "result 1")) + cats.append(QgsRendererCategory(2, QgsMarkerSymbol(), "result 2")) + c = QgsCategorizedSymbolRenderer('"id"', cats) - QgsRuleBasedRendererV2.refineRuleCategories(self.r3, c) + QgsRuleBasedRenderer.refineRuleCategories(self.r3, c) assert self.r3.children()[0].filterExpression() == '"id" = 1' assert self.r3.children()[1].filterExpression() == '"id" = 2' @@ -144,31 +144,31 @@ class TestQgsRulebasedRenderer(unittest.TestCase): # First, try with a field based category (id) ranges = [] - ranges.append(QgsRendererRangeV2(0, 1, QgsMarkerSymbolV2(), "0-1")) - ranges.append(QgsRendererRangeV2(1, 2, QgsMarkerSymbolV2(), "1-2")) - g = QgsGraduatedSymbolRendererV2("id", ranges) + ranges.append(QgsRendererRange(0, 1, QgsMarkerSymbol(), "0-1")) + ranges.append(QgsRendererRange(1, 2, QgsMarkerSymbol(), "1-2")) + g = QgsGraduatedSymbolRenderer("id", ranges) - QgsRuleBasedRendererV2.refineRuleRanges(self.r2, g) + QgsRuleBasedRenderer.refineRuleRanges(self.r2, g) assert self.r2.children()[0].filterExpression() == '"id" >= 0.0000 AND "id" <= 1.0000' assert self.r2.children()[1].filterExpression() == '"id" > 1.0000 AND "id" <= 2.0000' # Next try with an expression based range ranges = [] - ranges.append(QgsRendererRangeV2(0, 1, QgsMarkerSymbolV2(), "0-1")) - ranges.append(QgsRendererRangeV2(1, 2, QgsMarkerSymbolV2(), "1-2")) - g = QgsGraduatedSymbolRendererV2("id / 2", ranges) + ranges.append(QgsRendererRange(0, 1, QgsMarkerSymbol(), "0-1")) + ranges.append(QgsRendererRange(1, 2, QgsMarkerSymbol(), "1-2")) + g = QgsGraduatedSymbolRenderer("id / 2", ranges) - QgsRuleBasedRendererV2.refineRuleRanges(self.r1, g) + QgsRuleBasedRenderer.refineRuleRanges(self.r1, g) assert self.r1.children()[0].filterExpression() == '(id / 2) >= 0.0000 AND (id / 2) <= 1.0000' assert self.r1.children()[1].filterExpression() == '(id / 2) > 1.0000 AND (id / 2) <= 2.0000' # Last try with an expression which is just a quoted field name ranges = [] - ranges.append(QgsRendererRangeV2(0, 1, QgsMarkerSymbolV2(), "0-1")) - ranges.append(QgsRendererRangeV2(1, 2, QgsMarkerSymbolV2(), "1-2")) - g = QgsGraduatedSymbolRendererV2('"id"', ranges) + ranges.append(QgsRendererRange(0, 1, QgsMarkerSymbol(), "0-1")) + ranges.append(QgsRendererRange(1, 2, QgsMarkerSymbol(), "1-2")) + g = QgsGraduatedSymbolRenderer('"id"', ranges) - QgsRuleBasedRendererV2.refineRuleRanges(self.r3, g) + QgsRuleBasedRenderer.refineRuleRanges(self.r3, g) assert self.r3.children()[0].filterExpression() == '"id" >= 0.0000 AND "id" <= 1.0000' assert self.r3.children()[1].filterExpression() == '"id" > 1.0000 AND "id" <= 2.0000' @@ -177,15 +177,15 @@ class TestQgsRulebasedRenderer(unittest.TestCase): # First, try with a field based category (id) cats = [] - cats.append(QgsRendererCategoryV2(1, QgsMarkerSymbolV2(), "id 1")) - cats.append(QgsRendererCategoryV2(2, QgsMarkerSymbolV2(), "id 2")) - cats.append(QgsRendererCategoryV2('a\'b', QgsMarkerSymbolV2(), "id a'b")) - cats.append(QgsRendererCategoryV2('a\nb', QgsMarkerSymbolV2(), "id a\\nb")) - cats.append(QgsRendererCategoryV2('a\\b', QgsMarkerSymbolV2(), "id a\\\\b")) - cats.append(QgsRendererCategoryV2('a\tb', QgsMarkerSymbolV2(), "id a\\tb")) - c = QgsCategorizedSymbolRendererV2("id", cats) + cats.append(QgsRendererCategory(1, QgsMarkerSymbol(), "id 1")) + cats.append(QgsRendererCategory(2, QgsMarkerSymbol(), "id 2")) + cats.append(QgsRendererCategory('a\'b', QgsMarkerSymbol(), "id a'b")) + cats.append(QgsRendererCategory('a\nb', QgsMarkerSymbol(), "id a\\nb")) + cats.append(QgsRendererCategory('a\\b', QgsMarkerSymbol(), "id a\\\\b")) + cats.append(QgsRendererCategory('a\tb', QgsMarkerSymbol(), "id a\\tb")) + c = QgsCategorizedSymbolRenderer("id", cats) - r = QgsRuleBasedRendererV2.convertFromRenderer(c) + r = QgsRuleBasedRenderer.convertFromRenderer(c) self.assertEqual(r.rootRule().children()[0].filterExpression(), '"id" = 1') self.assertEqual(r.rootRule().children()[1].filterExpression(), '"id" = 2') self.assertEqual(r.rootRule().children()[2].filterExpression(), '"id" = \'a\'\'b\'') @@ -195,21 +195,21 @@ class TestQgsRulebasedRenderer(unittest.TestCase): # Next try with an expression based category cats = [] - cats.append(QgsRendererCategoryV2(1, QgsMarkerSymbolV2(), "result 1")) - cats.append(QgsRendererCategoryV2(2, QgsMarkerSymbolV2(), "result 2")) - c = QgsCategorizedSymbolRendererV2("id + 1", cats) + cats.append(QgsRendererCategory(1, QgsMarkerSymbol(), "result 1")) + cats.append(QgsRendererCategory(2, QgsMarkerSymbol(), "result 2")) + c = QgsCategorizedSymbolRenderer("id + 1", cats) - r = QgsRuleBasedRendererV2.convertFromRenderer(c) + r = QgsRuleBasedRenderer.convertFromRenderer(c) self.assertEqual(r.rootRule().children()[0].filterExpression(), 'id + 1 = 1') self.assertEqual(r.rootRule().children()[1].filterExpression(), 'id + 1 = 2') # Last try with an expression which is just a quoted field name cats = [] - cats.append(QgsRendererCategoryV2(1, QgsMarkerSymbolV2(), "result 1")) - cats.append(QgsRendererCategoryV2(2, QgsMarkerSymbolV2(), "result 2")) - c = QgsCategorizedSymbolRendererV2('"id"', cats) + cats.append(QgsRendererCategory(1, QgsMarkerSymbol(), "result 1")) + cats.append(QgsRendererCategory(2, QgsMarkerSymbol(), "result 2")) + c = QgsCategorizedSymbolRenderer('"id"', cats) - r = QgsRuleBasedRendererV2.convertFromRenderer(c) + r = QgsRuleBasedRenderer.convertFromRenderer(c) self.assertEqual(r.rootRule().children()[0].filterExpression(), '"id" = 1') self.assertEqual(r.rootRule().children()[1].filterExpression(), '"id" = 2') @@ -218,31 +218,31 @@ class TestQgsRulebasedRenderer(unittest.TestCase): # First, try with a field based category (id) ranges = [] - ranges.append(QgsRendererRangeV2(0, 1, QgsMarkerSymbolV2(), "0-1")) - ranges.append(QgsRendererRangeV2(1, 2, QgsMarkerSymbolV2(), "1-2")) - g = QgsGraduatedSymbolRendererV2("id", ranges) + ranges.append(QgsRendererRange(0, 1, QgsMarkerSymbol(), "0-1")) + ranges.append(QgsRendererRange(1, 2, QgsMarkerSymbol(), "1-2")) + g = QgsGraduatedSymbolRenderer("id", ranges) - r = QgsRuleBasedRendererV2.convertFromRenderer(g) + r = QgsRuleBasedRenderer.convertFromRenderer(g) self.assertEqual(r.rootRule().children()[0].filterExpression(), '"id" >= 0.000000 AND "id" <= 1.000000') self.assertEqual(r.rootRule().children()[1].filterExpression(), '"id" > 1.000000 AND "id" <= 2.000000') # Next try with an expression based range ranges = [] - ranges.append(QgsRendererRangeV2(0, 1, QgsMarkerSymbolV2(), "0-1")) - ranges.append(QgsRendererRangeV2(1, 2, QgsMarkerSymbolV2(), "1-2")) - g = QgsGraduatedSymbolRendererV2("id / 2", ranges) + ranges.append(QgsRendererRange(0, 1, QgsMarkerSymbol(), "0-1")) + ranges.append(QgsRendererRange(1, 2, QgsMarkerSymbol(), "1-2")) + g = QgsGraduatedSymbolRenderer("id / 2", ranges) - r = QgsRuleBasedRendererV2.convertFromRenderer(g) + r = QgsRuleBasedRenderer.convertFromRenderer(g) self.assertEqual(r.rootRule().children()[0].filterExpression(), '(id / 2) >= 0.000000 AND (id / 2) <= 1.000000') self.assertEqual(r.rootRule().children()[1].filterExpression(), '(id / 2) > 1.000000 AND (id / 2) <= 2.000000') # Last try with an expression which is just a quoted field name ranges = [] - ranges.append(QgsRendererRangeV2(0, 1, QgsMarkerSymbolV2(), "0-1")) - ranges.append(QgsRendererRangeV2(1, 2, QgsMarkerSymbolV2(), "1-2")) - g = QgsGraduatedSymbolRendererV2('"id"', ranges) + ranges.append(QgsRendererRange(0, 1, QgsMarkerSymbol(), "0-1")) + ranges.append(QgsRendererRange(1, 2, QgsMarkerSymbol(), "1-2")) + g = QgsGraduatedSymbolRenderer('"id"', ranges) - r = QgsRuleBasedRendererV2.convertFromRenderer(g) + r = QgsRuleBasedRenderer.convertFromRenderer(g) self.assertEqual(r.rootRule().children()[0].filterExpression(), '"id" >= 0.000000 AND "id" <= 1.000000') self.assertEqual(r.rootRule().children()[1].filterExpression(), '"id" > 1.000000 AND "id" <= 2.000000') diff --git a/tests/src/python/test_qgssinglesymbolrenderer.py b/tests/src/python/test_qgssinglesymbolrenderer.py index a6bf145aa2f..880e2611f08 100644 --- a/tests/src/python/test_qgssinglesymbolrenderer.py +++ b/tests/src/python/test_qgssinglesymbolrenderer.py @@ -33,8 +33,8 @@ from qgis.core import (QgsVectorLayer, QgsMapLayerRegistry, QgsRectangle, QgsMultiRenderChecker, - QgsSingleSymbolRendererV2, - QgsFillSymbolV2, + QgsSingleSymbolRenderer, + QgsFillSymbol, QgsFeatureRequest ) from qgis.testing import unittest @@ -53,10 +53,10 @@ class TestQgsSingleSymbolRenderer(unittest.TestCase): QgsMapLayerRegistry.instance().addMapLayer(layer) # Create rulebased style - sym1 = QgsFillSymbolV2.createSimple({'color': '#fdbf6f'}) + sym1 = QgsFillSymbol.createSimple({'color': '#fdbf6f'}) - self.renderer = QgsSingleSymbolRendererV2(sym1) - layer.setRendererV2(self.renderer) + self.renderer = QgsSingleSymbolRenderer(sym1) + layer.setRenderer(self.renderer) rendered_layers = [layer.id()] self.mapsettings = self.iface.mapCanvas().mapSettings() diff --git a/tests/src/python/test_qgssymbol.py b/tests/src/python/test_qgssymbol.py index ef746d66be2..718862d6e71 100644 --- a/tests/src/python/test_qgssymbol.py +++ b/tests/src/python/test_qgssymbol.py @@ -33,15 +33,15 @@ from qgis.PyQt.QtGui import QImage, QColor, QPainter from qgis.core import (QgsGeometry, QgsSymbol, QgsMapUnitScale, - QgsMarkerSymbolV2, - QgsFillSymbolV2, - QgsLineSymbolV2, + QgsMarkerSymbol, + QgsFillSymbol, + QgsLineSymbol, QgsRenderContext, QgsFeature, Qgis, QgsMapSettings, QgsRenderChecker, - QgsSimpleMarkerSymbolLayerV2, + QgsSimpleMarkerSymbolLayer, QgsUnitTypes, QgsWkbTypes ) @@ -57,9 +57,9 @@ class TestQgsSymbol(unittest.TestCase): def setUp(self): #Create some simple symbols - self.fill_symbol = QgsFillSymbolV2.createSimple({'color': '#ffffff'}) - self.line_symbol = QgsLineSymbolV2.createSimple({'color': '#ffffff', 'line_width': '3'}) - self.marker_symbol = QgsMarkerSymbolV2.createSimple({'color': '#ffffff', 'size': '3'}) + self.fill_symbol = QgsFillSymbol.createSimple({'color': '#ffffff'}) + self.line_symbol = QgsLineSymbol.createSimple({'color': '#ffffff', 'line_width': '3'}) + self.marker_symbol = QgsMarkerSymbol.createSimple({'color': '#ffffff', 'size': '3'}) self.report = "

      Python QgsSymbol Tests

      \n" def tearDown(self): @@ -178,7 +178,7 @@ class TestQgsSymbol(unittest.TestCase): file_name = temp_dir + 'symbol_' + name + ".png" image.save(file_name, "PNG") checker = QgsRenderChecker() - checker.setControlPathPrefix("symbolv2") + checker.setControlPathPrefix("symbol") checker.setControlName("expected_" + reference_image) checker.setRenderedImage(file_name) checker.setColorTolerance(2) @@ -188,10 +188,10 @@ class TestQgsSymbol(unittest.TestCase): return result -class TestQgsMarkerSymbolV2(unittest.TestCase): +class TestQgsMarkerSymbol(unittest.TestCase): def setUp(self): - self.report = "

      Python QgsMarkerSymbolV2 Tests

      \n" + self.report = "

      Python QgsMarkerSymbol Tests

      \n" def tearDown(self): report_file_path = "%s/qgistest.html" % QDir.tempPath() @@ -202,17 +202,17 @@ class TestQgsMarkerSymbolV2(unittest.TestCase): # test size and setSize # create a marker symbol with a single layer - markerSymbol = QgsMarkerSymbolV2() + markerSymbol = QgsMarkerSymbol() markerSymbol.deleteSymbolLayer(0) - markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayerV2('star', QColor(255, 0, 0), QColor(0, 255, 0), 10)) + markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayer('star', QColor(255, 0, 0), QColor(0, 255, 0), 10)) self.assertEqual(markerSymbol.size(), 10) markerSymbol.setSize(20) self.assertEqual(markerSymbol.size(), 20) self.assertEqual(markerSymbol.symbolLayer(0).size(), 20) # add additional layers - markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayerV2('star', QColor(255, 0, 0), QColor(0, 255, 0), 10)) - markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayerV2('star', QColor(255, 0, 0), QColor(0, 255, 0), 30)) + markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayer('star', QColor(255, 0, 0), QColor(0, 255, 0), 10)) + markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayer('star', QColor(255, 0, 0), QColor(0, 255, 0), 30)) self.assertEqual(markerSymbol.size(), 30) markerSymbol.setSize(3) self.assertEqual(markerSymbol.size(), 3) @@ -225,17 +225,17 @@ class TestQgsMarkerSymbolV2(unittest.TestCase): # test angle and setAngle # create a marker symbol with a single layer - markerSymbol = QgsMarkerSymbolV2() + markerSymbol = QgsMarkerSymbol() markerSymbol.deleteSymbolLayer(0) - markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayerV2('star', QColor(255, 0, 0), QColor(0, 255, 0), 10, 90)) + markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayer('star', QColor(255, 0, 0), QColor(0, 255, 0), 10, 90)) self.assertEqual(markerSymbol.angle(), 90) markerSymbol.setAngle(100) self.assertEqual(markerSymbol.angle(), 100) self.assertEqual(markerSymbol.symbolLayer(0).angle(), 100) # add additional layers - markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayerV2('star', QColor(255, 0, 0), QColor(0, 255, 0), 10, 130)) - markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayerV2('star', QColor(255, 0, 0), QColor(0, 255, 0), 10, 150)) + markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayer('star', QColor(255, 0, 0), QColor(0, 255, 0), 10, 130)) + markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayer('star', QColor(255, 0, 0), QColor(0, 255, 0), 10, 150)) # should take first layer's angle self.assertEqual(markerSymbol.angle(), 100) markerSymbol.setAngle(10) @@ -249,17 +249,17 @@ class TestQgsMarkerSymbolV2(unittest.TestCase): # test sizeUnit and setSizeUnit # create a marker symbol with a single layer - markerSymbol = QgsMarkerSymbolV2() + markerSymbol = QgsMarkerSymbol() markerSymbol.deleteSymbolLayer(0) - markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayerV2('star', QColor(255, 0, 0), QColor(0, 255, 0), 10)) + markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayer('star', QColor(255, 0, 0), QColor(0, 255, 0), 10)) self.assertEqual(markerSymbol.sizeUnit(), QgsUnitTypes.RenderMillimeters) markerSymbol.setSizeUnit(QgsUnitTypes.RenderMapUnits) self.assertEqual(markerSymbol.sizeUnit(), QgsUnitTypes.RenderMapUnits) self.assertEqual(markerSymbol.symbolLayer(0).sizeUnit(), QgsUnitTypes.RenderMapUnits) # add additional layers - markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayerV2('star', QColor(255, 0, 0), QColor(0, 255, 0), 10)) - markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayerV2('star', QColor(255, 0, 0), QColor(0, 255, 0), 30)) + markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayer('star', QColor(255, 0, 0), QColor(0, 255, 0), 10)) + markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayer('star', QColor(255, 0, 0), QColor(0, 255, 0), 30)) # should now be mixed size units self.assertEqual(markerSymbol.sizeUnit(), QgsUnitTypes.RenderUnknownUnit) markerSymbol.setSizeUnit(QgsUnitTypes.RenderPixels) @@ -273,9 +273,9 @@ class TestQgsMarkerSymbolV2(unittest.TestCase): # test sizeMapUnitScale and setSizeMapUnitScale # create a marker symbol with a single layer - markerSymbol = QgsMarkerSymbolV2() + markerSymbol = QgsMarkerSymbol() markerSymbol.deleteSymbolLayer(0) - markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayerV2('star', QColor(255, 0, 0), QColor(0, 255, 0), 10)) + markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayer('star', QColor(255, 0, 0), QColor(0, 255, 0), 10)) markerSymbol.symbolLayer(0).setSizeMapUnitScale(QgsMapUnitScale(10000, 20000)) self.assertEqual(markerSymbol.sizeMapUnitScale(), QgsMapUnitScale(10000, 20000)) markerSymbol.setSizeMapUnitScale(QgsMapUnitScale(1000, 2000)) @@ -283,8 +283,8 @@ class TestQgsMarkerSymbolV2(unittest.TestCase): self.assertEqual(markerSymbol.symbolLayer(0).sizeMapUnitScale(), QgsMapUnitScale(1000, 2000)) # add additional layers - markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayerV2('star', QColor(255, 0, 0), QColor(0, 255, 0), 10)) - markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayerV2('star', QColor(255, 0, 0), QColor(0, 255, 0), 30)) + markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayer('star', QColor(255, 0, 0), QColor(0, 255, 0), 10)) + markerSymbol.appendSymbolLayer(QgsSimpleMarkerSymbolLayer('star', QColor(255, 0, 0), QColor(0, 255, 0), 30)) # should take first layer's map unit scale self.assertEqual(markerSymbol.sizeMapUnitScale(), QgsMapUnitScale(1000, 2000)) markerSymbol.setSizeMapUnitScale(QgsMapUnitScale(3000, 4000)) diff --git a/tests/src/python/test_qgssymbolexpressionvariables.py b/tests/src/python/test_qgssymbolexpressionvariables.py index f4e56fabe26..0c2344f0d07 100644 --- a/tests/src/python/test_qgssymbolexpressionvariables.py +++ b/tests/src/python/test_qgssymbolexpressionvariables.py @@ -34,8 +34,8 @@ from qgis.core import ( QgsMapLayerRegistry, QgsRectangle, QgsMultiRenderChecker, - QgsSingleSymbolRendererV2, - QgsFillSymbolV2, + QgsSingleSymbolRenderer, + QgsFillSymbol, ) from qgis.testing import unittest, start_app @@ -66,11 +66,11 @@ class TestQgsSymbolExpressionVariables(unittest.TestCase): def testPartNum(self): # Create rulebased style - sym1 = QgsFillSymbolV2.createSimple({'color': '#fdbf6f'}) + sym1 = QgsFillSymbol.createSimple({'color': '#fdbf6f'}) - renderer = QgsSingleSymbolRendererV2(sym1) + renderer = QgsSingleSymbolRenderer(sym1) renderer.symbols()[0].symbolLayers()[0].setDataDefinedProperty('color', 'color_rgb( (@geometry_part_num - 1) * 200, 0, 0 )') - self.layer.setRendererV2(renderer) + self.layer.setRenderer(renderer) # Setup rendering check renderchecker = QgsMultiRenderChecker() @@ -82,11 +82,11 @@ class TestQgsSymbolExpressionVariables(unittest.TestCase): def testPartCount(self): # Create rulebased style - sym1 = QgsFillSymbolV2.createSimple({'color': '#fdbf6f'}) + sym1 = QgsFillSymbol.createSimple({'color': '#fdbf6f'}) - renderer = QgsSingleSymbolRendererV2(sym1) + renderer = QgsSingleSymbolRenderer(sym1) renderer.symbols()[0].symbolLayers()[0].setDataDefinedProperty('color', 'color_rgb( (@geometry_part_count - 1) * 200, 0, 0 )') - self.layer.setRendererV2(renderer) + self.layer.setRenderer(renderer) # Setup rendering check renderchecker = QgsMultiRenderChecker() @@ -98,11 +98,11 @@ class TestQgsSymbolExpressionVariables(unittest.TestCase): def testSymbolColor(self): # Create rulebased style - sym1 = QgsFillSymbolV2.createSimple({'color': '#ff0000'}) + sym1 = QgsFillSymbol.createSimple({'color': '#ff0000'}) - renderer = QgsSingleSymbolRendererV2(sym1) + renderer = QgsSingleSymbolRenderer(sym1) renderer.symbols()[0].symbolLayers()[0].setDataDefinedProperty('color', 'set_color_part( @symbol_color, \'value\', "Value" * 4)') - self.layer.setRendererV2(renderer) + self.layer.setRenderer(renderer) # Setup rendering check renderchecker = QgsMultiRenderChecker() diff --git a/tests/src/python/test_qgssymbollayer.py b/tests/src/python/test_qgssymbollayer.py index 0e7d44fea07..8bfc8efb0ee 100644 --- a/tests/src/python/test_qgssymbollayer.py +++ b/tests/src/python/test_qgssymbollayer.py @@ -31,27 +31,27 @@ from qgis.PyQt.QtCore import pyqtWrapperType, Qt, QDir, QFile, QIODevice, QPoint from qgis.PyQt.QtXml import QDomDocument from qgis.PyQt.QtGui import QColor -from qgis.core import (QgsCentroidFillSymbolLayerV2, - QgsEllipseSymbolLayerV2, - QgsFillSymbolLayerV2, - QgsFontMarkerSymbolLayerV2, +from qgis.core import (QgsCentroidFillSymbolLayer, + QgsEllipseSymbolLayer, + QgsFillSymbolLayer, + QgsFontMarkerSymbolLayer, QgsFilledMarkerSymbolLayer, - QgsGradientFillSymbolLayerV2, + QgsGradientFillSymbolLayer, QgsImageFillSymbolLayer, QgsLinePatternFillSymbolLayer, - QgsLineSymbolLayerV2, - QgsMarkerLineSymbolLayerV2, - QgsMarkerSymbolLayerV2, + QgsLineSymbolLayer, + QgsMarkerLineSymbolLayer, + QgsMarkerSymbolLayer, QgsPointPatternFillSymbolLayer, - QgsSimpleFillSymbolLayerV2, - QgsSimpleLineSymbolLayerV2, - QgsSimpleMarkerSymbolLayerV2, + QgsSimpleFillSymbolLayer, + QgsSimpleLineSymbolLayer, + QgsSimpleMarkerSymbolLayer, QgsSVGFillSymbolLayer, - QgsSvgMarkerSymbolLayerV2, + QgsSvgMarkerSymbolLayer, QgsSymbolLayer, QgsVectorFieldSymbolLayer, QgsRasterFillSymbolLayer, - QgsShapeburstFillSymbolLayerV2, + QgsShapeburstFillSymbolLayer, QgsArrowSymbolLayer, QgsSymbol, QgsUnitTypes @@ -86,7 +86,7 @@ class TestQgsSymbolLayer(unittest.TestCase): assert mExpectedType == mType, mMessage try: - mType = type(QgsFillSymbolLayerV2) + mType = type(QgsFillSymbolLayer) except: mType = None mExpectedType = pyqtWrapperType @@ -94,7 +94,7 @@ class TestQgsSymbolLayer(unittest.TestCase): assert mExpectedType == mType, mMessage try: - mType = type(QgsGradientFillSymbolLayerV2) + mType = type(QgsGradientFillSymbolLayer) except: mType = None mExpectedType = pyqtWrapperType @@ -134,7 +134,7 @@ class TestQgsSymbolLayer(unittest.TestCase): assert mExpectedType == mType, mMessage try: - mType = type(QgsGradientFillSymbolLayerV2) + mType = type(QgsGradientFillSymbolLayer) except: mType = None mExpectedType = pyqtWrapperType @@ -142,7 +142,7 @@ class TestQgsSymbolLayer(unittest.TestCase): assert mExpectedType == mType, mMessage try: - mType = type(QgsShapeburstFillSymbolLayerV2) + mType = type(QgsShapeburstFillSymbolLayer) except: mType = None mExpectedType = pyqtWrapperType @@ -158,7 +158,7 @@ class TestQgsSymbolLayer(unittest.TestCase): assert mExpectedType == mType, mMessage try: - mType = type(QgsCentroidFillSymbolLayerV2) + mType = type(QgsCentroidFillSymbolLayer) except: mType = None mExpectedType = pyqtWrapperType @@ -174,7 +174,7 @@ class TestQgsSymbolLayer(unittest.TestCase): assert mExpectedType == mType, mMessage try: - mType = type(QgsSimpleFillSymbolLayerV2) + mType = type(QgsSimpleFillSymbolLayer) except: mType = None mExpectedType = pyqtWrapperType @@ -182,7 +182,7 @@ class TestQgsSymbolLayer(unittest.TestCase): assert mExpectedType == mType, mMessage try: - mType = type(QgsLineSymbolLayerV2) + mType = type(QgsLineSymbolLayer) except: mType = None mExpectedType = pyqtWrapperType @@ -190,7 +190,7 @@ class TestQgsSymbolLayer(unittest.TestCase): assert mExpectedType == mType, mMessage try: - mType = type(QgsMarkerLineSymbolLayerV2) + mType = type(QgsMarkerLineSymbolLayer) except: mType = None mExpectedType = pyqtWrapperType @@ -206,7 +206,7 @@ class TestQgsSymbolLayer(unittest.TestCase): assert mExpectedType == mType, mMessage try: - mType = type(QgsSimpleLineSymbolLayerV2) + mType = type(QgsSimpleLineSymbolLayer) except: mType = None mExpectedType = pyqtWrapperType @@ -214,7 +214,7 @@ class TestQgsSymbolLayer(unittest.TestCase): assert mExpectedType == mType, mMessage try: - mType = type(QgsMarkerSymbolLayerV2) + mType = type(QgsMarkerSymbolLayer) except: mType = None mExpectedType = pyqtWrapperType @@ -222,7 +222,7 @@ class TestQgsSymbolLayer(unittest.TestCase): assert mExpectedType == mType, mMessage try: - mType = type(QgsEllipseSymbolLayerV2) + mType = type(QgsEllipseSymbolLayer) except: mType = None mExpectedType = pyqtWrapperType @@ -230,7 +230,7 @@ class TestQgsSymbolLayer(unittest.TestCase): assert mExpectedType == mType, mMessage try: - mType = type(QgsFontMarkerSymbolLayerV2) + mType = type(QgsFontMarkerSymbolLayer) except: mType = None mExpectedType = pyqtWrapperType @@ -238,7 +238,7 @@ class TestQgsSymbolLayer(unittest.TestCase): assert mExpectedType == mType, mMessage try: - mType = type(QgsSimpleMarkerSymbolLayerV2) + mType = type(QgsSimpleMarkerSymbolLayer) except: mType = None mExpectedType = pyqtWrapperType @@ -254,7 +254,7 @@ class TestQgsSymbolLayer(unittest.TestCase): assert mExpectedType == mType, mMessage try: - mType = type(QgsSvgMarkerSymbolLayerV2) + mType = type(QgsSvgMarkerSymbolLayer) except: mType = None mExpectedType = pyqtWrapperType @@ -269,10 +269,10 @@ class TestQgsSymbolLayer(unittest.TestCase): mMessage = 'Expected "%s" got "%s"' % (mExpectedType, mType) assert mExpectedType == mType, mMessage - def testQgsSimpleFillSymbolLayerV2(self): + def testQgsSimpleFillSymbolLayer(self): """Create a new style from a .sld file and match test. """ - mTestName = 'QgsSimpleFillSymbolLayerV2' + mTestName = 'QgsSimpleFillSymbolLayer' mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName)) mDoc = QDomDocument(mTestName) @@ -280,10 +280,10 @@ class TestQgsSymbolLayer(unittest.TestCase): mFile.open(QIODevice.ReadOnly) mDoc.setContent(mFile, True) mFile.close() - mSymbolLayer = QgsSimpleFillSymbolLayerV2.createFromSld( + mSymbolLayer = QgsSimpleFillSymbolLayer.createFromSld( mDoc.elementsByTagName('PolygonSymbolizer').item(0).toElement()) - mExpectedValue = type(QgsSimpleFillSymbolLayerV2()) + mExpectedValue = type(QgsSimpleFillSymbolLayer()) mValue = type(mSymbolLayer) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage @@ -308,23 +308,23 @@ class TestQgsSymbolLayer(unittest.TestCase): mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage - def testQgsGradientFillSymbolLayerV2(self): - """Test setting and getting QgsGradientFillSymbolLayerV2 properties. + def testQgsGradientFillSymbolLayer(self): + """Test setting and getting QgsGradientFillSymbolLayer properties. """ - mGradientLayer = QgsGradientFillSymbolLayerV2() + mGradientLayer = QgsGradientFillSymbolLayer() - mExpectedValue = type(QgsGradientFillSymbolLayerV2()) + mExpectedValue = type(QgsGradientFillSymbolLayer()) mValue = type(mGradientLayer) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage - mExpectedValue = QgsGradientFillSymbolLayerV2.Radial + mExpectedValue = QgsGradientFillSymbolLayer.Radial mGradientLayer.setGradientType(mExpectedValue) mValue = mGradientLayer.gradientType() mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage - mExpectedValue = QgsGradientFillSymbolLayerV2.ColorRamp + mExpectedValue = QgsGradientFillSymbolLayer.ColorRamp mGradientLayer.setGradientColorType(mExpectedValue) mValue = mGradientLayer.gradientColorType() mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) @@ -336,13 +336,13 @@ class TestQgsSymbolLayer(unittest.TestCase): mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage - mExpectedValue = QgsGradientFillSymbolLayerV2.Viewport + mExpectedValue = QgsGradientFillSymbolLayer.Viewport mGradientLayer.setCoordinateMode(mExpectedValue) mValue = mGradientLayer.coordinateMode() mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage - mExpectedValue = QgsGradientFillSymbolLayerV2.Reflect + mExpectedValue = QgsGradientFillSymbolLayer.Reflect mGradientLayer.setGradientSpread(mExpectedValue) mValue = mGradientLayer.gradientSpread() mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) @@ -390,11 +390,11 @@ class TestQgsSymbolLayer(unittest.TestCase): mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage - def testQgsCentroidFillSymbolLayerV2(self): + def testQgsCentroidFillSymbolLayer(self): """ Create a new style from a .sld file and match test """ - mTestName = 'QgsCentroidFillSymbolLayerV2' + mTestName = 'QgsCentroidFillSymbolLayer' mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName)) mDoc = QDomDocument(mTestName) @@ -402,10 +402,10 @@ class TestQgsSymbolLayer(unittest.TestCase): mFile.open(QIODevice.ReadOnly) mDoc.setContent(mFile, True) mFile.close() - mSymbolLayer = QgsCentroidFillSymbolLayerV2.createFromSld( + mSymbolLayer = QgsCentroidFillSymbolLayer.createFromSld( mDoc.elementsByTagName('PointSymbolizer').item(0).toElement()) - mExpectedValue = type(QgsCentroidFillSymbolLayerV2()) + mExpectedValue = type(QgsCentroidFillSymbolLayer()) mValue = type(mSymbolLayer) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage @@ -573,11 +573,11 @@ class TestQgsSymbolLayer(unittest.TestCase): mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage - def testQgsMarkerLineSymbolLayerV2(self): + def testQgsMarkerLineSymbolLayer(self): """ Create a new style from a .sld file and match test """ - mTestName = 'QgsMarkerLineSymbolLayerV2' + mTestName = 'QgsMarkerLineSymbolLayer' mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName)) mDoc = QDomDocument(mTestName) @@ -585,15 +585,15 @@ class TestQgsSymbolLayer(unittest.TestCase): mFile.open(QIODevice.ReadOnly) mDoc.setContent(mFile, True) mFile.close() - mSymbolLayer = QgsMarkerLineSymbolLayerV2.createFromSld( + mSymbolLayer = QgsMarkerLineSymbolLayer.createFromSld( mDoc.elementsByTagName('LineSymbolizer').item(0).toElement()) - mExpectedValue = type(QgsMarkerLineSymbolLayerV2()) + mExpectedValue = type(QgsMarkerLineSymbolLayer()) mValue = type(mSymbolLayer) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage - mExpectedValue = QgsMarkerLineSymbolLayerV2.CentralPoint + mExpectedValue = QgsMarkerLineSymbolLayer.CentralPoint mValue = mSymbolLayer.placement() mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage @@ -621,11 +621,11 @@ class TestQgsSymbolLayer(unittest.TestCase): self.assertEqual(mSymbolLayer.subSymbol().color(), QColor(250, 150, 200)) self.assertEqual(mSymbolLayer.color(), QColor(250, 150, 200)) - def testQgsSimpleLineSymbolLayerV2(self): + def testQgsSimpleLineSymbolLayer(self): """ Create a new style from a .sld file and match test """ - mTestName = 'QgsSimpleLineSymbolLayerV2' + mTestName = 'QgsSimpleLineSymbolLayer' mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName)) mDoc = QDomDocument(mTestName) @@ -633,10 +633,10 @@ class TestQgsSymbolLayer(unittest.TestCase): mFile.open(QIODevice.ReadOnly) mDoc.setContent(mFile, True) mFile.close() - mSymbolLayer = QgsSimpleLineSymbolLayerV2.createFromSld( + mSymbolLayer = QgsSimpleLineSymbolLayer.createFromSld( mDoc.elementsByTagName('LineSymbolizer').item(0).toElement()) - mExpectedValue = type(QgsSimpleLineSymbolLayerV2()) + mExpectedValue = type(QgsSimpleLineSymbolLayer()) mValue = type(mSymbolLayer) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage @@ -671,11 +671,11 @@ class TestQgsSymbolLayer(unittest.TestCase): mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage - def testQgsEllipseSymbolLayerV2(self): + def testQgsEllipseSymbolLayer(self): """ Create a new style from a .sld file and match test """ - mTestName = 'QgsEllipseSymbolLayerV2' + mTestName = 'QgsEllipseSymbolLayer' mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName)) mDoc = QDomDocument(mTestName) @@ -683,10 +683,10 @@ class TestQgsSymbolLayer(unittest.TestCase): mFile.open(QIODevice.ReadOnly) mDoc.setContent(mFile, True) mFile.close() - mSymbolLayer = QgsEllipseSymbolLayerV2.createFromSld( + mSymbolLayer = QgsEllipseSymbolLayer.createFromSld( mDoc.elementsByTagName('PointSymbolizer').item(0).toElement()) - mExpectedValue = type(QgsEllipseSymbolLayerV2()) + mExpectedValue = type(QgsEllipseSymbolLayer()) mValue = type(mSymbolLayer) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage @@ -716,11 +716,11 @@ class TestQgsSymbolLayer(unittest.TestCase): mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage - def testQgsFontMarkerSymbolLayerV2(self): + def testQgsFontMarkerSymbolLayer(self): """ Create a new style from a .sld file and match test """ - mTestName = 'QgsFontMarkerSymbolLayerV2' + mTestName = 'QgsFontMarkerSymbolLayer' mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName)) mDoc = QDomDocument(mTestName) @@ -728,10 +728,10 @@ class TestQgsSymbolLayer(unittest.TestCase): mFile.open(QIODevice.ReadOnly) mDoc.setContent(mFile, True) mFile.close() - mSymbolLayer = QgsFontMarkerSymbolLayerV2.createFromSld( + mSymbolLayer = QgsFontMarkerSymbolLayer.createFromSld( mDoc.elementsByTagName('PointSymbolizer').item(0).toElement()) - mExpectedValue = type(QgsFontMarkerSymbolLayerV2()) + mExpectedValue = type(QgsFontMarkerSymbolLayer()) mValue = type(mSymbolLayer) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage @@ -756,11 +756,11 @@ class TestQgsSymbolLayer(unittest.TestCase): mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage - def testQgsSvgMarkerSymbolLayerV2(self): + def testQgsSvgMarkerSymbolLayer(self): """ Create a new style from a .sld file and match test """ - mTestName = 'QgsSvgMarkerSymbolLayerV2' + mTestName = 'QgsSvgMarkerSymbolLayer' mFilePath = QDir.toNativeSeparators('%s/symbol_layer/%s.sld' % (unitTestDataPath(), mTestName)) mDoc = QDomDocument(mTestName) @@ -768,9 +768,9 @@ class TestQgsSymbolLayer(unittest.TestCase): mFile.open(QIODevice.ReadOnly) mDoc.setContent(mFile, True) mFile.close() - mSymbolLayer = QgsSvgMarkerSymbolLayerV2.createFromSld(mDoc.elementsByTagName('PointSymbolizer').item(0).toElement()) + mSymbolLayer = QgsSvgMarkerSymbolLayer.createFromSld(mDoc.elementsByTagName('PointSymbolizer').item(0).toElement()) - mExpectedValue = type(QgsSvgMarkerSymbolLayerV2()) + mExpectedValue = type(QgsSvgMarkerSymbolLayer()) mValue = type(mSymbolLayer) mMessage = 'Expected "%s" got "%s"' % (mExpectedValue, mValue) assert mExpectedValue == mValue, mMessage diff --git a/tests/src/python/test_qgsvectorcolorramp.py b/tests/src/python/test_qgsvectorcolorramp.py index d63654dc770..139b2269ec8 100644 --- a/tests/src/python/test_qgsvectorcolorramp.py +++ b/tests/src/python/test_qgsvectorcolorramp.py @@ -14,11 +14,11 @@ __revision__ = '$Format:%H$' import qgis # NOQA -from qgis.core import (QgsVectorGradientColorRampV2, +from qgis.core import (QgsVectorGradientColorRamp, QgsGradientStop, - QgsVectorRandomColorRampV2, - QgsRandomColorsV2, - QgsVectorColorBrewerColorRampV2) + QgsVectorRandomColorRamp, + QgsRandomColors, + QgsVectorColorBrewerColorRamp) from qgis.PyQt.QtGui import QColor, QGradient from qgis.testing import unittest @@ -35,7 +35,7 @@ class PyQgsVectorColorRamp(unittest.TestCase): self.assertNotEqual(QgsGradientStop(0.1, QColor(180, 20, 30)), QgsGradientStop(0.1, QColor(180, 40, 30))) # test gradient with only start/end color - r = QgsVectorGradientColorRampV2(QColor(200, 0, 0, 100), QColor(0, 200, 0, 200)) + r = QgsVectorGradientColorRamp(QColor(200, 0, 0, 100), QColor(0, 200, 0, 200)) self.assertEqual(r.type(), 'gradient') self.assertEqual(r.color1(), QColor(200, 0, 0, 100)) self.assertEqual(r.color2(), QColor(0, 200, 0, 200)) @@ -49,8 +49,8 @@ class PyQgsVectorColorRamp(unittest.TestCase): self.assertEqual(r.color(0.5), QColor(100, 100, 0, 150)) # test gradient with stops - r = QgsVectorGradientColorRampV2(QColor(200, 0, 0), QColor(0, 200, 0), False, [QgsGradientStop(0.1, QColor(180, 20, 40)), - QgsGradientStop(0.9, QColor(40, 60, 100))]) + r = QgsVectorGradientColorRamp(QColor(200, 0, 0), QColor(0, 200, 0), False, [QgsGradientStop(0.1, QColor(180, 20, 40)), + QgsGradientStop(0.9, QColor(40, 60, 100))]) self.assertEqual(r.color1(), QColor(200, 0, 0)) self.assertEqual(r.color2(), QColor(0, 200, 0)) self.assertEqual(r.isDiscrete(), False) @@ -88,7 +88,7 @@ class PyQgsVectorColorRamp(unittest.TestCase): # test creating from properties props = r.properties() - fromProps = QgsVectorGradientColorRampV2.create(props) + fromProps = QgsVectorGradientColorRamp.create(props) self.assertEqual(fromProps.color1(), QColor(0, 0, 200)) self.assertEqual(fromProps.color2(), QColor(0, 0, 100)) s = fromProps.stops() @@ -115,14 +115,14 @@ class PyQgsVectorColorRamp(unittest.TestCase): # test discrete ramps # first with no stops - d = QgsVectorGradientColorRampV2(QColor(200, 0, 0), QColor(0, 200, 0), True) + d = QgsVectorGradientColorRamp(QColor(200, 0, 0), QColor(0, 200, 0), True) self.assertEqual(d.isDiscrete(), True) self.assertEqual(d.color(0), QColor(200, 0, 0)) self.assertEqual(d.color(0.5), QColor(200, 0, 0)) self.assertEqual(d.color(1), QColor(0, 200, 0)) # then with stops - d = QgsVectorGradientColorRampV2(QColor(200, 0, 0), QColor(0, 200, 0), True, [QgsGradientStop(0.1, QColor(180, 20, 40)), - QgsGradientStop(0.9, QColor(40, 60, 100))]) + d = QgsVectorGradientColorRamp(QColor(200, 0, 0), QColor(0, 200, 0), True, [QgsGradientStop(0.1, QColor(180, 20, 40)), + QgsGradientStop(0.9, QColor(40, 60, 100))]) self.assertEqual(d.isDiscrete(), True) self.assertEqual(d.color(0), QColor(200, 0, 0)) self.assertEqual(d.color(0.05), QColor(200, 0, 0)) @@ -134,8 +134,8 @@ class PyQgsVectorColorRamp(unittest.TestCase): # to gradient g = QGradient() - r = QgsVectorGradientColorRampV2(QColor(200, 0, 0), QColor(0, 200, 0), False, [QgsGradientStop(0.1, QColor(180, 20, 40)), - QgsGradientStop(0.9, QColor(40, 60, 100))]) + r = QgsVectorGradientColorRamp(QColor(200, 0, 0), QColor(0, 200, 0), False, [QgsGradientStop(0.1, QColor(180, 20, 40)), + QgsGradientStop(0.9, QColor(40, 60, 100))]) r.addStopsToGradient(g, 0.5) self.assertEqual(len(g.stops()), 4) self.assertEqual(g.stops()[0], (0.0, QColor(200, 0, 0, 127))) @@ -162,7 +162,7 @@ class PyQgsVectorColorRamp(unittest.TestCase): def testQgsVectorRandomColorRampV2(self): # test random color ramp - r = QgsVectorRandomColorRampV2(5) + r = QgsVectorRandomColorRamp(5) self.assertEqual(r.type(), 'random') self.assertEqual(r.count(), 5) self.assertEqual(r.value(0), 0) @@ -208,7 +208,7 @@ class PyQgsVectorColorRamp(unittest.TestCase): # test creating from properties props = r.properties() - fromProps = QgsVectorRandomColorRampV2.create(props) + fromProps = QgsVectorRandomColorRamp.create(props) self.assertEqual(fromProps.count(), 5) self.assertEqual(fromProps.hueMin(), 10) self.assertEqual(fromProps.hueMax(), 60) @@ -242,7 +242,7 @@ class PyQgsVectorColorRamp(unittest.TestCase): def testQgsRandomColorsV2(self): # test random colors - r = QgsRandomColorsV2() + r = QgsRandomColors() self.assertEqual(r.type(), 'randomcolors') self.assertEqual(r.count(), -1) # no color count self.assertEqual(r.value(0), 0) # all values should be 0 @@ -254,7 +254,7 @@ class PyQgsVectorColorRamp(unittest.TestCase): self.assertTrue(c.isValid()) # test creating from properties - # QgsRandomColorsV2 has no properties for now, but test to ensure no crash + # QgsRandomColors has no properties for now, but test to ensure no crash props = r.properties() # NOQA # test cloning ramp @@ -270,7 +270,7 @@ class PyQgsVectorColorRamp(unittest.TestCase): def testQgsVectorColorBrewerColorRampV2(self): # test color brewer color ramps - r = QgsVectorColorBrewerColorRampV2('OrRd', 6) + r = QgsVectorColorBrewerColorRamp('OrRd', 6) self.assertEqual(r.type(), 'colorbrewer') self.assertEqual(r.schemeName(), 'OrRd') self.assertEqual(r.count(), 6) @@ -291,13 +291,13 @@ class PyQgsVectorColorRamp(unittest.TestCase): self.assertEqual(r.color(1.0), QColor(179, 0, 0)) # try using an invalid scheme name - bad = QgsVectorColorBrewerColorRampV2('badscheme', 6) + bad = QgsVectorColorBrewerColorRamp('badscheme', 6) self.assertFalse(bad.color(0).isValid()) self.assertEqual(bad.value(1), 0) # test creating from properties props = r.properties() - fromProps = QgsVectorColorBrewerColorRampV2.create(props) + fromProps = QgsVectorColorBrewerColorRamp.create(props) self.assertEqual(fromProps.type(), 'colorbrewer') self.assertEqual(fromProps.schemeName(), 'OrRd') self.assertEqual(fromProps.count(), 6) @@ -340,10 +340,10 @@ class PyQgsVectorColorRamp(unittest.TestCase): self.assertEqual(r.color(1.0), QColor(222, 45, 38)) # test static members - names = QgsVectorColorBrewerColorRampV2.listSchemeNames() + names = QgsVectorColorBrewerColorRamp.listSchemeNames() self.assertTrue('Reds' in names and 'OrRd' in names) - self.assertEqual(len(QgsVectorColorBrewerColorRampV2.listSchemeVariants('bad scheme')), 0) - variants = QgsVectorColorBrewerColorRampV2.listSchemeVariants('Reds') + self.assertEqual(len(QgsVectorColorBrewerColorRamp.listSchemeVariants('bad scheme')), 0) + variants = QgsVectorColorBrewerColorRamp.listSchemeVariants('Reds') self.assertEqual(variants, [3, 4, 5, 6, 7, 8, 9]) if __name__ == '__main__': diff --git a/tests/src/python/test_qgsvectorlayer.py b/tests/src/python/test_qgsvectorlayer.py index 4a6da28cc5b..57bb11d9245 100644 --- a/tests/src/python/test_qgsvectorlayer.py +++ b/tests/src/python/test_qgsvectorlayer.py @@ -32,7 +32,7 @@ from qgis.core import (Qgis, QgsMapLayerRegistry, QgsVectorJoinInfo, QgsSymbol, - QgsSingleSymbolRendererV2, + QgsSingleSymbolRenderer, QgsCoordinateReferenceSystem, QgsProject, QgsUnitTypes, @@ -1494,16 +1494,16 @@ class TestQgsVectorLayer(unittest.TestCase): def onRendererChanged(self): self.rendererChanged = True - def test_setRendererV2(self): + def test_setRenderer(self): layer = createLayerWithOnePoint() self.rendererChanged = False layer.rendererChanged.connect(self.onRendererChanged) - r = QgsSingleSymbolRendererV2(QgsSymbol.defaultSymbol(QgsWkbTypes.PointGeometry)) - layer.setRendererV2(r) + r = QgsSingleSymbolRenderer(QgsSymbol.defaultSymbol(QgsWkbTypes.PointGeometry)) + layer.setRenderer(r) self.assertTrue(self.rendererChanged) - self.assertEqual(layer.rendererV2(), r) + self.assertEqual(layer.renderer(), r) # TODO: # - fetch rect: feat with changed geometry: 1. in rect, 2. out of rect diff --git a/tests/src/python/test_qgsvectorlayereditbuffer.py b/tests/src/python/test_qgsvectorlayereditbuffer.py index a403003df01..40ecc1076fb 100644 --- a/tests/src/python/test_qgsvectorlayereditbuffer.py +++ b/tests/src/python/test_qgsvectorlayereditbuffer.py @@ -32,7 +32,7 @@ from qgis.core import (Qgis, QgsMapLayerRegistry, QgsVectorJoinInfo, QgsSymbol, - QgsSingleSymbolRendererV2, + QgsSingleSymbolRenderer, QgsCoordinateReferenceSystem, QgsProject, QgsUnitTypes, diff --git a/tests/testdata/control_images/composer_shapes/expected_composershapes_symbolv2/expected_composershapes_symbolv2.png b/tests/testdata/control_images/composer_shapes/expected_composershapes_symbol/expected_composershapes_symbol.png similarity index 100% rename from tests/testdata/control_images/composer_shapes/expected_composershapes_symbolv2/expected_composershapes_symbolv2.png rename to tests/testdata/control_images/composer_shapes/expected_composershapes_symbol/expected_composershapes_symbol.png diff --git a/tests/testdata/control_images/composer_shapes/expected_composershapes_symbolv2/expected_composershapes_symbolv2_mask.png b/tests/testdata/control_images/composer_shapes/expected_composershapes_symbol/expected_composershapes_symbol_mask.png similarity index 100% rename from tests/testdata/control_images/composer_shapes/expected_composershapes_symbolv2/expected_composershapes_symbolv2_mask.png rename to tests/testdata/control_images/composer_shapes/expected_composershapes_symbol/expected_composershapes_symbol_mask.png diff --git a/tests/testdata/control_images/expected_stylev2_linecanvasclip/expected_stylev2_linecanvasclip.png b/tests/testdata/control_images/expected_style_linecanvasclip/expected_style_linecanvasclip.png similarity index 100% rename from tests/testdata/control_images/expected_stylev2_linecanvasclip/expected_stylev2_linecanvasclip.png rename to tests/testdata/control_images/expected_style_linecanvasclip/expected_style_linecanvasclip.png diff --git a/tests/testdata/control_images/expected_stylev2_linecanvasclip/expected_stylev2_linecanvasclip_mask.png b/tests/testdata/control_images/expected_style_linecanvasclip/expected_style_linecanvasclip_mask.png similarity index 100% rename from tests/testdata/control_images/expected_stylev2_linecanvasclip/expected_stylev2_linecanvasclip_mask.png rename to tests/testdata/control_images/expected_style_linecanvasclip/expected_style_linecanvasclip_mask.png diff --git a/tests/testdata/control_images/expected_stylev2_linecanvasclip_off/expected_stylev2_linecanvasclip_off.png b/tests/testdata/control_images/expected_style_linecanvasclip_off/expected_style_linecanvasclip_off.png similarity index 100% rename from tests/testdata/control_images/expected_stylev2_linecanvasclip_off/expected_stylev2_linecanvasclip_off.png rename to tests/testdata/control_images/expected_style_linecanvasclip_off/expected_style_linecanvasclip_off.png diff --git a/tests/testdata/control_images/expected_stylev2_linecanvasclip_off/expected_stylev2_linecanvasclip_off_mask.png b/tests/testdata/control_images/expected_style_linecanvasclip_off/expected_style_linecanvasclip_off_mask.png similarity index 100% rename from tests/testdata/control_images/expected_stylev2_linecanvasclip_off/expected_stylev2_linecanvasclip_off_mask.png rename to tests/testdata/control_images/expected_style_linecanvasclip_off/expected_style_linecanvasclip_off_mask.png diff --git a/tests/testdata/control_images/expected_stylev2_polycanvasclip/expected_stylev2_polycanvasclip.png b/tests/testdata/control_images/expected_style_polycanvasclip/expected_style_polycanvasclip.png similarity index 100% rename from tests/testdata/control_images/expected_stylev2_polycanvasclip/expected_stylev2_polycanvasclip.png rename to tests/testdata/control_images/expected_style_polycanvasclip/expected_style_polycanvasclip.png diff --git a/tests/testdata/control_images/expected_stylev2_polycanvasclip/expected_stylev2_polycanvasclip_mask.png b/tests/testdata/control_images/expected_style_polycanvasclip/expected_style_polycanvasclip_mask.png similarity index 100% rename from tests/testdata/control_images/expected_stylev2_polycanvasclip/expected_stylev2_polycanvasclip_mask.png rename to tests/testdata/control_images/expected_style_polycanvasclip/expected_style_polycanvasclip_mask.png diff --git a/tests/testdata/control_images/expected_stylev2_polycanvasclip_off/expected_stylev2_polycanvasclip_off.png b/tests/testdata/control_images/expected_style_polycanvasclip_off/expected_style_polycanvasclip_off.png similarity index 100% rename from tests/testdata/control_images/expected_stylev2_polycanvasclip_off/expected_stylev2_polycanvasclip_off.png rename to tests/testdata/control_images/expected_style_polycanvasclip_off/expected_style_polycanvasclip_off.png diff --git a/tests/testdata/control_images/expected_stylev2_polycanvasclip_off/expected_stylev2_polycanvasclip_off_mask.png b/tests/testdata/control_images/expected_style_polycanvasclip_off/expected_style_polycanvasclip_off_mask.png similarity index 100% rename from tests/testdata/control_images/expected_stylev2_polycanvasclip_off/expected_stylev2_polycanvasclip_off_mask.png rename to tests/testdata/control_images/expected_style_polycanvasclip_off/expected_style_polycanvasclip_off_mask.png diff --git a/tests/testdata/control_images/labelingenginev2/expected_label_order_layer1/expected_label_order_layer1.png b/tests/testdata/control_images/labelingengine/expected_label_order_layer1/expected_label_order_layer1.png similarity index 100% rename from tests/testdata/control_images/labelingenginev2/expected_label_order_layer1/expected_label_order_layer1.png rename to tests/testdata/control_images/labelingengine/expected_label_order_layer1/expected_label_order_layer1.png diff --git a/tests/testdata/control_images/labelingenginev2/expected_label_order_layer1/expected_label_order_layer1_mask.png b/tests/testdata/control_images/labelingengine/expected_label_order_layer1/expected_label_order_layer1_mask.png similarity index 100% rename from tests/testdata/control_images/labelingenginev2/expected_label_order_layer1/expected_label_order_layer1_mask.png rename to tests/testdata/control_images/labelingengine/expected_label_order_layer1/expected_label_order_layer1_mask.png diff --git a/tests/testdata/control_images/labelingenginev2/expected_label_order_layer2/expected_label_order_layer2.png b/tests/testdata/control_images/labelingengine/expected_label_order_layer2/expected_label_order_layer2.png similarity index 100% rename from tests/testdata/control_images/labelingenginev2/expected_label_order_layer2/expected_label_order_layer2.png rename to tests/testdata/control_images/labelingengine/expected_label_order_layer2/expected_label_order_layer2.png diff --git a/tests/testdata/control_images/labelingenginev2/expected_label_order_layer2/expected_label_order_layer2_mask.png b/tests/testdata/control_images/labelingengine/expected_label_order_layer2/expected_label_order_layer2_mask.png similarity index 100% rename from tests/testdata/control_images/labelingenginev2/expected_label_order_layer2/expected_label_order_layer2_mask.png rename to tests/testdata/control_images/labelingengine/expected_label_order_layer2/expected_label_order_layer2_mask.png diff --git a/tests/testdata/control_images/labelingenginev2/expected_label_order_mixed/expected_label_order_mixed.png b/tests/testdata/control_images/labelingengine/expected_label_order_mixed/expected_label_order_mixed.png similarity index 100% rename from tests/testdata/control_images/labelingenginev2/expected_label_order_mixed/expected_label_order_mixed.png rename to tests/testdata/control_images/labelingengine/expected_label_order_mixed/expected_label_order_mixed.png diff --git a/tests/testdata/control_images/labelingenginev2/expected_label_order_mixed/expected_label_order_mixed_mask.png b/tests/testdata/control_images/labelingengine/expected_label_order_mixed/expected_label_order_mixed_mask.png similarity index 100% rename from tests/testdata/control_images/labelingenginev2/expected_label_order_mixed/expected_label_order_mixed_mask.png rename to tests/testdata/control_images/labelingengine/expected_label_order_mixed/expected_label_order_mixed_mask.png diff --git a/tests/testdata/control_images/labelingenginev2/expected_label_order_size/expected_label_order_size.png b/tests/testdata/control_images/labelingengine/expected_label_order_size/expected_label_order_size.png similarity index 100% rename from tests/testdata/control_images/labelingenginev2/expected_label_order_size/expected_label_order_size.png rename to tests/testdata/control_images/labelingengine/expected_label_order_size/expected_label_order_size.png diff --git a/tests/testdata/control_images/labelingenginev2/expected_label_order_size/expected_label_order_size_mask.png b/tests/testdata/control_images/labelingengine/expected_label_order_size/expected_label_order_size_mask.png similarity index 100% rename from tests/testdata/control_images/labelingenginev2/expected_label_order_size/expected_label_order_size_mask.png rename to tests/testdata/control_images/labelingengine/expected_label_order_size/expected_label_order_size_mask.png diff --git a/tests/testdata/control_images/labelingenginev2/expected_label_order_zindex/expected_label_order_zindex.png b/tests/testdata/control_images/labelingengine/expected_label_order_zindex/expected_label_order_zindex.png similarity index 100% rename from tests/testdata/control_images/labelingenginev2/expected_label_order_zindex/expected_label_order_zindex.png rename to tests/testdata/control_images/labelingengine/expected_label_order_zindex/expected_label_order_zindex.png diff --git a/tests/testdata/control_images/labelingenginev2/expected_label_order_zindex/expected_label_order_zindex_mask.png b/tests/testdata/control_images/labelingengine/expected_label_order_zindex/expected_label_order_zindex_mask.png similarity index 100% rename from tests/testdata/control_images/labelingenginev2/expected_label_order_zindex/expected_label_order_zindex_mask.png rename to tests/testdata/control_images/labelingengine/expected_label_order_zindex/expected_label_order_zindex_mask.png diff --git a/tests/testdata/control_images/labelingenginev2/expected_labeling_basic/expected_labeling_basic.png b/tests/testdata/control_images/labelingengine/expected_labeling_basic/expected_labeling_basic.png similarity index 100% rename from tests/testdata/control_images/labelingenginev2/expected_labeling_basic/expected_labeling_basic.png rename to tests/testdata/control_images/labelingengine/expected_labeling_basic/expected_labeling_basic.png diff --git a/tests/testdata/control_images/labelingenginev2/expected_labeling_basic/expected_labeling_basic_mask.png b/tests/testdata/control_images/labelingengine/expected_labeling_basic/expected_labeling_basic_mask.png similarity index 100% rename from tests/testdata/control_images/labelingenginev2/expected_labeling_basic/expected_labeling_basic_mask.png rename to tests/testdata/control_images/labelingengine/expected_labeling_basic/expected_labeling_basic_mask.png diff --git a/tests/testdata/control_images/labelingenginev2/expected_labeling_point_diagrams/expected_labeling_point_diagrams.png b/tests/testdata/control_images/labelingengine/expected_labeling_point_diagrams/expected_labeling_point_diagrams.png similarity index 100% rename from tests/testdata/control_images/labelingenginev2/expected_labeling_point_diagrams/expected_labeling_point_diagrams.png rename to tests/testdata/control_images/labelingengine/expected_labeling_point_diagrams/expected_labeling_point_diagrams.png diff --git a/tests/testdata/control_images/labelingenginev2/expected_labeling_point_diagrams/expected_labeling_point_diagrams_mask.png b/tests/testdata/control_images/labelingengine/expected_labeling_point_diagrams/expected_labeling_point_diagrams_mask.png similarity index 100% rename from tests/testdata/control_images/labelingenginev2/expected_labeling_point_diagrams/expected_labeling_point_diagrams_mask.png rename to tests/testdata/control_images/labelingengine/expected_labeling_point_diagrams/expected_labeling_point_diagrams_mask.png diff --git a/tests/testdata/control_images/labelingenginev2/expected_labeling_rulebased/expected_labeling_rulebased.png b/tests/testdata/control_images/labelingengine/expected_labeling_rulebased/expected_labeling_rulebased.png similarity index 100% rename from tests/testdata/control_images/labelingenginev2/expected_labeling_rulebased/expected_labeling_rulebased.png rename to tests/testdata/control_images/labelingengine/expected_labeling_rulebased/expected_labeling_rulebased.png diff --git a/tests/testdata/control_images/labelingenginev2/expected_labeling_rulebased/expected_labeling_rulebased_mask.png b/tests/testdata/control_images/labelingengine/expected_labeling_rulebased/expected_labeling_rulebased_mask.png similarity index 100% rename from tests/testdata/control_images/labelingenginev2/expected_labeling_rulebased/expected_labeling_rulebased_mask.png rename to tests/testdata/control_images/labelingengine/expected_labeling_rulebased/expected_labeling_rulebased_mask.png diff --git a/tests/testdata/control_images/symbolv2/expected_circular_string/expected_circular_string.png b/tests/testdata/control_images/symbol/expected_circular_string/expected_circular_string.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_circular_string/expected_circular_string.png rename to tests/testdata/control_images/symbol/expected_circular_string/expected_circular_string.png diff --git a/tests/testdata/control_images/symbolv2/expected_circular_string/expected_circular_string_mask.png b/tests/testdata/control_images/symbol/expected_circular_string/expected_circular_string_mask.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_circular_string/expected_circular_string_mask.png rename to tests/testdata/control_images/symbol/expected_circular_string/expected_circular_string_mask.png diff --git a/tests/testdata/control_images/symbolv2/expected_compound_curve/expected_compound_curve.png b/tests/testdata/control_images/symbol/expected_compound_curve/expected_compound_curve.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_compound_curve/expected_compound_curve.png rename to tests/testdata/control_images/symbol/expected_compound_curve/expected_compound_curve.png diff --git a/tests/testdata/control_images/symbolv2/expected_compound_curve/expected_compound_curve_mask.png b/tests/testdata/control_images/symbol/expected_compound_curve/expected_compound_curve_mask.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_compound_curve/expected_compound_curve_mask.png rename to tests/testdata/control_images/symbol/expected_compound_curve/expected_compound_curve_mask.png diff --git a/tests/testdata/control_images/symbolv2/expected_curve_polygon/expected_curve_polygon.png b/tests/testdata/control_images/symbol/expected_curve_polygon/expected_curve_polygon.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_curve_polygon/expected_curve_polygon.png rename to tests/testdata/control_images/symbol/expected_curve_polygon/expected_curve_polygon.png diff --git a/tests/testdata/control_images/symbolv2/expected_curve_polygon/expected_curve_polygon_mask.png b/tests/testdata/control_images/symbol/expected_curve_polygon/expected_curve_polygon_mask.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_curve_polygon/expected_curve_polygon_mask.png rename to tests/testdata/control_images/symbol/expected_curve_polygon/expected_curve_polygon_mask.png diff --git a/tests/testdata/control_images/symbolv2/expected_curve_polygon_no_arc/expected_curve_polygon_no_arc.png b/tests/testdata/control_images/symbol/expected_curve_polygon_no_arc/expected_curve_polygon_no_arc.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_curve_polygon_no_arc/expected_curve_polygon_no_arc.png rename to tests/testdata/control_images/symbol/expected_curve_polygon_no_arc/expected_curve_polygon_no_arc.png diff --git a/tests/testdata/control_images/symbolv2/expected_curve_polygon_no_arc/expected_curve_polygon_no_arc_mask.png b/tests/testdata/control_images/symbol/expected_curve_polygon_no_arc/expected_curve_polygon_no_arc_mask.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_curve_polygon_no_arc/expected_curve_polygon_no_arc_mask.png rename to tests/testdata/control_images/symbol/expected_curve_polygon_no_arc/expected_curve_polygon_no_arc_mask.png diff --git a/tests/testdata/control_images/symbolv2/expected_linestring/expected_linestring.png b/tests/testdata/control_images/symbol/expected_linestring/expected_linestring.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_linestring/expected_linestring.png rename to tests/testdata/control_images/symbol/expected_linestring/expected_linestring.png diff --git a/tests/testdata/control_images/symbolv2/expected_linestring/expected_linestring_mask.png b/tests/testdata/control_images/symbol/expected_linestring/expected_linestring_mask.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_linestring/expected_linestring_mask.png rename to tests/testdata/control_images/symbol/expected_linestring/expected_linestring_mask.png diff --git a/tests/testdata/control_images/symbolv2/expected_multicurve/expected_multicurve.png b/tests/testdata/control_images/symbol/expected_multicurve/expected_multicurve.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_multicurve/expected_multicurve.png rename to tests/testdata/control_images/symbol/expected_multicurve/expected_multicurve.png diff --git a/tests/testdata/control_images/symbolv2/expected_multicurve/expected_multicurve_mask.png b/tests/testdata/control_images/symbol/expected_multicurve/expected_multicurve_mask.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_multicurve/expected_multicurve_mask.png rename to tests/testdata/control_images/symbol/expected_multicurve/expected_multicurve_mask.png diff --git a/tests/testdata/control_images/symbolv2/expected_multilinestring/expected_multilinestring.png b/tests/testdata/control_images/symbol/expected_multilinestring/expected_multilinestring.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_multilinestring/expected_multilinestring.png rename to tests/testdata/control_images/symbol/expected_multilinestring/expected_multilinestring.png diff --git a/tests/testdata/control_images/symbolv2/expected_multilinestring/expected_multilinestring_mask.png b/tests/testdata/control_images/symbol/expected_multilinestring/expected_multilinestring_mask.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_multilinestring/expected_multilinestring_mask.png rename to tests/testdata/control_images/symbol/expected_multilinestring/expected_multilinestring_mask.png diff --git a/tests/testdata/control_images/symbolv2/expected_multipoint/expected_multipoint.png b/tests/testdata/control_images/symbol/expected_multipoint/expected_multipoint.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_multipoint/expected_multipoint.png rename to tests/testdata/control_images/symbol/expected_multipoint/expected_multipoint.png diff --git a/tests/testdata/control_images/symbolv2/expected_multipoint/expected_multipoint_mask.png b/tests/testdata/control_images/symbol/expected_multipoint/expected_multipoint_mask.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_multipoint/expected_multipoint_mask.png rename to tests/testdata/control_images/symbol/expected_multipoint/expected_multipoint_mask.png diff --git a/tests/testdata/control_images/symbolv2/expected_multipolygon/expected_multipolygon.png b/tests/testdata/control_images/symbol/expected_multipolygon/expected_multipolygon.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_multipolygon/expected_multipolygon.png rename to tests/testdata/control_images/symbol/expected_multipolygon/expected_multipolygon.png diff --git a/tests/testdata/control_images/symbolv2/expected_multipolygon/expected_multipolygon_mask.png b/tests/testdata/control_images/symbol/expected_multipolygon/expected_multipolygon_mask.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_multipolygon/expected_multipolygon_mask.png rename to tests/testdata/control_images/symbol/expected_multipolygon/expected_multipolygon_mask.png diff --git a/tests/testdata/control_images/symbolv2/expected_point/expected_point.png b/tests/testdata/control_images/symbol/expected_point/expected_point.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_point/expected_point.png rename to tests/testdata/control_images/symbol/expected_point/expected_point.png diff --git a/tests/testdata/control_images/symbolv2/expected_point/expected_point_mask.png b/tests/testdata/control_images/symbol/expected_point/expected_point_mask.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_point/expected_point_mask.png rename to tests/testdata/control_images/symbol/expected_point/expected_point_mask.png diff --git a/tests/testdata/control_images/symbolv2/expected_polygon/expected_polygon.png b/tests/testdata/control_images/symbol/expected_polygon/expected_polygon.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_polygon/expected_polygon.png rename to tests/testdata/control_images/symbol/expected_polygon/expected_polygon.png diff --git a/tests/testdata/control_images/symbolv2/expected_polygon/expected_polygon_mask.png b/tests/testdata/control_images/symbol/expected_polygon/expected_polygon_mask.png similarity index 100% rename from tests/testdata/control_images/symbolv2/expected_polygon/expected_polygon_mask.png rename to tests/testdata/control_images/symbol/expected_polygon/expected_polygon_mask.png diff --git a/tests/testdata/symbol_layer/QgsCentroidFillSymbolLayerV2.sld b/tests/testdata/symbol_layer/QgsCentroidFillSymbolLayer.sld similarity index 100% rename from tests/testdata/symbol_layer/QgsCentroidFillSymbolLayerV2.sld rename to tests/testdata/symbol_layer/QgsCentroidFillSymbolLayer.sld diff --git a/tests/testdata/symbol_layer/QgsEllipseSymbolLayerV2.sld b/tests/testdata/symbol_layer/QgsEllipseSymbolLayer.sld similarity index 100% rename from tests/testdata/symbol_layer/QgsEllipseSymbolLayerV2.sld rename to tests/testdata/symbol_layer/QgsEllipseSymbolLayer.sld diff --git a/tests/testdata/symbol_layer/QgsFontMarkerSymbolLayerV2.sld b/tests/testdata/symbol_layer/QgsFontMarkerSymbolLayer.sld similarity index 100% rename from tests/testdata/symbol_layer/QgsFontMarkerSymbolLayerV2.sld rename to tests/testdata/symbol_layer/QgsFontMarkerSymbolLayer.sld diff --git a/tests/testdata/symbol_layer/QgsLineDecorationSymbolLayerV2.sld b/tests/testdata/symbol_layer/QgsLineDecorationSymbolLayer.sld similarity index 100% rename from tests/testdata/symbol_layer/QgsLineDecorationSymbolLayerV2.sld rename to tests/testdata/symbol_layer/QgsLineDecorationSymbolLayer.sld diff --git a/tests/testdata/symbol_layer/QgsMarkerLineSymbolLayerV2.sld b/tests/testdata/symbol_layer/QgsMarkerLineSymbolLayer.sld similarity index 100% rename from tests/testdata/symbol_layer/QgsMarkerLineSymbolLayerV2.sld rename to tests/testdata/symbol_layer/QgsMarkerLineSymbolLayer.sld diff --git a/tests/testdata/symbol_layer/QgsSimpleFillSymbolLayerV2.sld b/tests/testdata/symbol_layer/QgsSimpleFillSymbolLayer.sld similarity index 100% rename from tests/testdata/symbol_layer/QgsSimpleFillSymbolLayerV2.sld rename to tests/testdata/symbol_layer/QgsSimpleFillSymbolLayer.sld diff --git a/tests/testdata/symbol_layer/QgsSimpleLineSymbolLayerV2.sld b/tests/testdata/symbol_layer/QgsSimpleLineSymbolLayer.sld similarity index 100% rename from tests/testdata/symbol_layer/QgsSimpleLineSymbolLayerV2.sld rename to tests/testdata/symbol_layer/QgsSimpleLineSymbolLayer.sld diff --git a/tests/testdata/symbol_layer/QgsSimpleMarkerSymbolLayerV2.sld b/tests/testdata/symbol_layer/QgsSimpleMarkerSymbolLayer.sld similarity index 100% rename from tests/testdata/symbol_layer/QgsSimpleMarkerSymbolLayerV2.sld rename to tests/testdata/symbol_layer/QgsSimpleMarkerSymbolLayer.sld diff --git a/tests/testdata/symbol_layer/QgsSvgMarkerSymbolLayerV2.sld b/tests/testdata/symbol_layer/QgsSvgMarkerSymbolLayer.sld similarity index 100% rename from tests/testdata/symbol_layer/QgsSvgMarkerSymbolLayerV2.sld rename to tests/testdata/symbol_layer/QgsSvgMarkerSymbolLayer.sld