Skip to content

Commit

Permalink
Code shuffle: move all labeling related code into src/core/labeling
Browse files Browse the repository at this point in the history 
So that these files are all grouped together, making it easier to locate
all the components of the labeling engine and hopefully making things
easier to navigate
  • Loading branch information
@nyalldawson
nyalldawson committed Dec 11, 2019
1 parent c5766dc commit a8adb2d
Show file tree
Hide file tree
Showing 60 changed files with 76 additions and 38 deletions.
1 change: 1 addition & 0 deletions doc/CMakeLists.txt
View file
Expand Up @@ -84,6 +84,7 @@ IF(WITH_APIDOC)
${CMAKE_SOURCE_DIR}/src/core/geocms
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
${CMAKE_SOURCE_DIR}/src/core/gps
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/layout
${CMAKE_SOURCE_DIR}/src/core/locator
Expand Down
1 change: 1 addition & 0 deletions python/CMakeLists.txt
View file
Expand Up @@ -106,6 +106,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/geocms
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
${CMAKE_SOURCE_DIR}/src/core/gps
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/layout
${CMAKE_SOURCE_DIR}/src/core/locator
Expand Down
4 changes: 2 additions & 2 deletions ...enerated/qgslabelingenginesettings.sip.in → ...labeling/qgslabelingenginesettings.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgslabelingenginesettings.h *
* src/core/labeling/qgslabelingenginesettings.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -170,7 +170,7 @@ QFlags<QgsLabelingEngineSettings::Flag> operator|(QgsLabelingEngineSettings::Fla
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgslabelingenginesettings.h *
* src/core/labeling/qgslabelingenginesettings.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...generated/qgslabelobstaclesettings.sip.in → .../labeling/qgslabelobstaclesettings.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgslabelobstaclesettings.h *
* src/core/labeling/qgslabelobstaclesettings.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -126,7 +126,7 @@ set within the specified ``properties`` collection.
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgslabelobstaclesettings.h *
* src/core/labeling/qgslabelobstaclesettings.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions .../auto_generated/qgslabelsearchtree.sip.in → ...erated/labeling/qgslabelsearchtree.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgslabelsearchtree.h *
* src/core/labeling/qgslabelsearchtree.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -58,7 +58,7 @@ Sets the map ``settings`` associated with the labeling run.
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgslabelsearchtree.h *
* src/core/labeling/qgslabelsearchtree.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...core/auto_generated/qgspallabeling.sip.in → ..._generated/labeling/qgspallabeling.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgspallabeling.h *
* src/core/labeling/qgspallabeling.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -767,7 +767,7 @@ allowed to be split apart (e.g., Arabic and Indic based scripts)
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgspallabeling.h *
* src/core/labeling/qgspallabeling.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...uto_generated/qgsrulebasedlabeling.sip.in → ...ated/labeling/qgsrulebasedlabeling.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsrulebasedlabeling.h *
* src/core/labeling/qgsrulebasedlabeling.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -322,7 +322,7 @@ Set pal settings for a specific provider (takes ownership).
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsrulebasedlabeling.h *
* src/core/labeling/qgsrulebasedlabeling.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
4 changes: 2 additions & 2 deletions ...o_generated/qgsvectorlayerlabeling.sip.in → ...ed/labeling/qgsvectorlayerlabeling.sip.in
View file
@@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsvectorlayerlabeling.h *
* src/core/labeling/qgsvectorlayerlabeling.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Expand Down Expand Up @@ -176,7 +176,7 @@ Create the instance from a DOM element with saved configuration
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/qgsvectorlayerlabeling.h *
* src/core/labeling/qgsvectorlayerlabeling.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
12 changes: 6 additions & 6 deletions python/core/core_auto.sip
View file
Expand Up @@ -87,9 +87,6 @@
%Include auto_generated/qgsimagecache.sip
%Include auto_generated/qgsinterval.sip
%Include auto_generated/qgsjsonutils.sip
%Include auto_generated/qgslabelingenginesettings.sip
%Include auto_generated/qgslabelobstaclesettings.sip
%Include auto_generated/qgslabelsearchtree.sip
%Include auto_generated/qgslayerdefinition.sip
%Include auto_generated/qgslegendrenderer.sip
%Include auto_generated/qgslegendsettings.sip
Expand Down Expand Up @@ -139,7 +136,6 @@
%Include auto_generated/qgsowsconnection.sip
%Include auto_generated/qgspaintenginehack.sip
%Include auto_generated/qgspainting.sip
%Include auto_generated/qgspallabeling.sip
%Include auto_generated/qgspathresolver.sip
%Include auto_generated/qgspluginlayer.sip
%Include auto_generated/qgspluginlayerregistry.sip
Expand Down Expand Up @@ -171,7 +167,6 @@
%Include auto_generated/qgsrenderchecker.sip
%Include auto_generated/qgsrendercontext.sip
%Include auto_generated/qgsrenderedfeaturehandlerinterface.sip
%Include auto_generated/qgsrulebasedlabeling.sip
%Include auto_generated/qgsrunprocess.sip
%Include auto_generated/qgsruntimeprofiler.sip
%Include auto_generated/qgsscalecalculator.sip
Expand Down Expand Up @@ -216,7 +211,6 @@
%Include auto_generated/qgsvectorlayerfeatureiterator.sip
%Include auto_generated/qgsvectorlayerjoinbuffer.sip
%Include auto_generated/qgsvectorlayerjoininfo.sip
%Include auto_generated/qgsvectorlayerlabeling.sip
%Include auto_generated/qgsvectorlayerserverproperties.sip
%Include auto_generated/qgsvectorlayertools.sip
%Include auto_generated/qgsvectorlayerundocommand.sip
Expand Down Expand Up @@ -314,6 +308,12 @@
%Include auto_generated/gps/qgsgpsdconnection.sip
%Include auto_generated/gps/qgsgpsdetector.sip
%Include auto_generated/gps/qgsnmeaconnection.sip
%Include auto_generated/labeling/qgslabelingenginesettings.sip
%Include auto_generated/labeling/qgslabelobstaclesettings.sip
%Include auto_generated/labeling/qgslabelsearchtree.sip
%Include auto_generated/labeling/qgspallabeling.sip
%Include auto_generated/labeling/qgsrulebasedlabeling.sip
%Include auto_generated/labeling/qgsvectorlayerlabeling.sip
%Include auto_generated/layertree/qgslayertree.sip
%Include auto_generated/layertree/qgslayertreegroup.sip
%Include auto_generated/layertree/qgslayertreelayer.sip
Expand Down
1 change: 1 addition & 0 deletions src/3d/CMakeLists.txt
View file
Expand Up @@ -129,6 +129,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/terrain
${CMAKE_SOURCE_DIR}/src/core/
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/raster
${CMAKE_SOURCE_DIR}/src/core/mesh
${CMAKE_SOURCE_DIR}/src/core/symbology
Expand Down
1 change: 1 addition & 0 deletions src/analysis/CMakeLists.txt
View file
Expand Up @@ -362,6 +362,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src/core/
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/processing
${CMAKE_SOURCE_DIR}/src/core/raster
${CMAKE_SOURCE_DIR}/src/core/mesh
Expand Down
1 change: 1 addition & 0 deletions src/app/CMakeLists.txt
View file
Expand Up @@ -438,6 +438,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/core/mesh
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/locator
${CMAKE_SOURCE_DIR}/src/core/pal
Expand Down
43 changes: 23 additions & 20 deletions src/core/CMakeLists.txt
View file
Expand Up @@ -263,11 +263,6 @@ SET(QGIS_CORE_SRCS
qgsimagecache.cpp
qgsinterval.cpp
qgsjsonutils.cpp
qgslabelfeature.cpp
qgslabelingengine.cpp
qgslabelingenginesettings.cpp
qgslabelobstaclesettings.cpp
qgslabelsearchtree.cpp
qgslayerdefinition.cpp
qgslegendrenderer.cpp
qgslegendsettings.cpp
Expand Down Expand Up @@ -318,7 +313,6 @@ SET(QGIS_CORE_SRCS
qgsowsconnection.cpp
qgspaintenginehack.cpp
qgspainting.cpp
qgspallabeling.cpp
qgspathresolver.cpp
qgspluginlayer.cpp
qgspluginlayerregistry.cpp
Expand Down Expand Up @@ -348,7 +342,6 @@ SET(QGIS_CORE_SRCS
qgsrelationmanager.cpp
qgsrenderchecker.cpp
qgsrendercontext.cpp
qgsrulebasedlabeling.cpp
qgsrunprocess.cpp
qgsruntimeprofiler.cpp
qgsscalecalculator.cpp
Expand All @@ -369,7 +362,6 @@ SET(QGIS_CORE_SRCS
qgsstringutils.cpp
qgstaskmanager.cpp
qgstessellator.cpp
qgstextlabelfeature.cpp
qgstextrenderer.cpp
qgstilecache.cpp
qgstolerance.cpp
Expand All @@ -396,8 +388,6 @@ SET(QGIS_CORE_SRCS
qgsvectorlayerexporter.cpp
qgsvectorlayerjoinbuffer.cpp
qgsvectorlayerjoininfo.cpp
qgsvectorlayerlabeling.cpp
qgsvectorlayerlabelprovider.cpp
qgsvectorlayerrenderer.cpp
qgsvectorlayertools.cpp
qgsvectorlayerundocommand.cpp
Expand Down Expand Up @@ -543,6 +533,17 @@ SET(QGIS_CORE_SRCS
mesh/qgsmeshtimesettings.cpp
mesh/qgsmeshtracerenderer.cpp

labeling/qgslabelfeature.cpp
labeling/qgslabelingengine.cpp
labeling/qgslabelingenginesettings.cpp
labeling/qgslabelobstaclesettings.cpp
labeling/qgslabelsearchtree.cpp
labeling/qgspallabeling.cpp
labeling/qgsrulebasedlabeling.cpp
labeling/qgstextlabelfeature.cpp
labeling/qgsvectorlayerlabeling.cpp
labeling/qgsvectorlayerlabelprovider.cpp

geometry/qgsabstractgeometry.cpp
geometry/qgsbox3d.cpp
geometry/qgscircle.cpp
Expand Down Expand Up @@ -755,11 +756,6 @@ SET(QGIS_CORE_HDRS
qgsindexedfeature.h
qgsinterval.h
qgsjsonutils.h
qgslabelfeature.h
qgslabelingengine.h
qgslabelingenginesettings.h
qgslabelobstaclesettings.h
qgslabelsearchtree.h
qgslayerdefinition.h
qgslegendrenderer.h
qgslegendsettings.h
Expand Down Expand Up @@ -815,7 +811,6 @@ SET(QGIS_CORE_HDRS
qgsowsconnection.h
qgspaintenginehack.h
qgspainting.h
qgspallabeling.h
qgspathresolver.h
qgspluginlayer.h
qgspluginlayerregistry.h
Expand Down Expand Up @@ -848,7 +843,6 @@ SET(QGIS_CORE_HDRS
qgsrenderchecker.h
qgsrendercontext.h
qgsrenderedfeaturehandlerinterface.h
qgsrulebasedlabeling.h
qgsrunprocess.h
qgsruntimeprofiler.h
qgsscalecalculator.h
Expand All @@ -872,7 +866,6 @@ SET(QGIS_CORE_HDRS
qgstaskmanager.h
qgstessellator.h
qgstestutils.h
qgstextlabelfeature.h
qgstextrenderer.h
qgsthreadingutils.h
qgstilecache.h
Expand Down Expand Up @@ -900,8 +893,6 @@ SET(QGIS_CORE_HDRS
qgsvectorlayerfeatureiterator.h
qgsvectorlayerjoinbuffer.h
qgsvectorlayerjoininfo.h
qgsvectorlayerlabeling.h
qgsvectorlayerlabelprovider.h
qgsvectorlayerrenderer.h
qgsvectorlayerserverproperties.h
qgsvectorlayertools.h
Expand Down Expand Up @@ -1025,6 +1016,17 @@ SET(QGIS_CORE_HDRS
gps/qgsgpsdetector.h
gps/qgsnmeaconnection.h

labeling/qgslabelfeature.h
labeling/qgslabelingengine.h
labeling/qgslabelingenginesettings.h
labeling/qgslabelobstaclesettings.h
labeling/qgslabelsearchtree.h
labeling/qgspallabeling.h
labeling/qgsrulebasedlabeling.h
labeling/qgstextlabelfeature.h
labeling/qgsvectorlayerlabeling.h
labeling/qgsvectorlayerlabelprovider.h

layertree/qgslayertree.h
layertree/qgslayertreegroup.h
layertree/qgslayertreelayer.h
Expand Down Expand Up @@ -1308,6 +1310,7 @@ INCLUDE_DIRECTORIES(
geometry
geocms
geocms/geonode
labeling
layertree
layout
locator
Expand Down
0 src/core/qgslabelfeature.cpp → src/core/labeling/qgslabelfeature.cpp
View file
File renamed without changes.
0 src/core/qgslabelfeature.h → src/core/labeling/qgslabelfeature.h
View file
File renamed without changes.
0 src/core/qgslabelingengine.cpp → src/core/labeling/qgslabelingengine.cpp
View file
File renamed without changes.
0 src/core/qgslabelingengine.h → src/core/labeling/qgslabelingengine.h
View file
File renamed without changes.
0 src/core/qgslabelingenginesettings.cpp → ...re/labeling/qgslabelingenginesettings.cpp
View file
File renamed without changes.
0 src/core/qgslabelingenginesettings.h → ...core/labeling/qgslabelingenginesettings.h
View file
File renamed without changes.
0 src/core/qgslabelobstaclesettings.cpp → ...ore/labeling/qgslabelobstaclesettings.cpp
View file
File renamed without changes.
0 src/core/qgslabelobstaclesettings.h → src/core/labeling/qgslabelobstaclesettings.h
View file
File renamed without changes.
0 src/core/qgslabelsearchtree.cpp → src/core/labeling/qgslabelsearchtree.cpp
View file
File renamed without changes.
0 src/core/qgslabelsearchtree.h → src/core/labeling/qgslabelsearchtree.h
View file
File renamed without changes.
0 src/core/qgspallabeling.cpp → src/core/labeling/qgspallabeling.cpp
View file
File renamed without changes.
0 src/core/qgspallabeling.h → src/core/labeling/qgspallabeling.h
View file
File renamed without changes.
0 src/core/qgsrulebasedlabeling.cpp → src/core/labeling/qgsrulebasedlabeling.cpp
View file
File renamed without changes.
0 src/core/qgsrulebasedlabeling.h → src/core/labeling/qgsrulebasedlabeling.h
View file
File renamed without changes.
0 src/core/qgstextlabelfeature.cpp → src/core/labeling/qgstextlabelfeature.cpp
View file
File renamed without changes.
0 src/core/qgstextlabelfeature.h → src/core/labeling/qgstextlabelfeature.h
View file
File renamed without changes.
0 src/core/qgsvectorlayerlabeling.cpp → src/core/labeling/qgsvectorlayerlabeling.cpp
View file
File renamed without changes.
0 src/core/qgsvectorlayerlabeling.h → src/core/labeling/qgsvectorlayerlabeling.h
View file
File renamed without changes.
0 src/core/qgsvectorlayerlabelprovider.cpp → .../labeling/qgsvectorlayerlabelprovider.cpp
View file
File renamed without changes.
0 src/core/qgsvectorlayerlabelprovider.h → ...re/labeling/qgsvectorlayerlabelprovider.h
View file
File renamed without changes.
1 change: 1 addition & 0 deletions src/customwidgets/CMakeLists.txt
View file
Expand Up @@ -91,6 +91,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/auth
${CMAKE_SOURCE_DIR}/src/core/expression
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/core/symbology
${CMAKE_SOURCE_DIR}/src/core/effects
Expand Down
1 change: 1 addition & 0 deletions src/gui/CMakeLists.txt
View file
Expand Up @@ -956,6 +956,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/callouts
${CMAKE_SOURCE_DIR}/src/core/fieldformatter
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/layout
${CMAKE_SOURCE_DIR}/src/core/locator
Expand Down
1 change: 1 addition & 0 deletions src/plugins/coordinate_capture/CMakeLists.txt
View file
Expand Up @@ -22,6 +22,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/expression
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/core/raster
Expand Down
1 change: 1 addition & 0 deletions src/plugins/evis/CMakeLists.txt
View file
Expand Up @@ -47,6 +47,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/expression
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/core/raster
Expand Down
1 change: 1 addition & 0 deletions src/plugins/geometry_checker/CMakeLists.txt
View file
Expand Up @@ -40,6 +40,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/expression
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/core/symbology
Expand Down
1 change: 1 addition & 0 deletions src/plugins/georeferencer/CMakeLists.txt
View file
Expand Up @@ -60,6 +60,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/expression
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/core/raster
Expand Down
1 change: 1 addition & 0 deletions src/plugins/offline_editing/CMakeLists.txt
View file
Expand Up @@ -44,6 +44,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core/expression
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/raster
${CMAKE_SOURCE_DIR}/src/core/symbology
Expand Down
1 change: 1 addition & 0 deletions src/plugins/topology/CMakeLists.txt
View file
Expand Up @@ -35,6 +35,7 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/expression
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/labeling
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/core/raster
Expand Down

0 comments on commit a8adb2d

Please sign in to comment.