diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 03c0eb0a873..fdad96a19b6 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -118,7 +118,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core/raster ${CMAKE_SOURCE_DIR}/src/core/scalebar ${CMAKE_SOURCE_DIR}/src/core/symbology - ${CMAKE_SOURCE_DIR}/src/core/symbology/classification + ${CMAKE_SOURCE_DIR}/src/core/classification ${CMAKE_SOURCE_DIR}/src/core/validity ${CMAKE_SOURCE_DIR}/src/plugins ${CMAKE_SOURCE_DIR}/external diff --git a/python/core/auto_generated/symbology/classification/qgsclassificationcustom.sip.in b/python/core/auto_generated/classification/qgsclassificationcustom.sip.in similarity index 91% rename from python/core/auto_generated/symbology/classification/qgsclassificationcustom.sip.in rename to python/core/auto_generated/classification/qgsclassificationcustom.sip.in index c0bf9b3723d..d62c70b154c 100644 --- a/python/core/auto_generated/symbology/classification/qgsclassificationcustom.sip.in +++ b/python/core/auto_generated/classification/qgsclassificationcustom.sip.in @@ -1,7 +1,7 @@ /************************************************************************ * This file has been generated automatically from * * * - * src/core/symbology/classification/qgsclassificationcustom.h * + * src/core/classification/qgsclassificationcustom.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ @@ -38,7 +38,7 @@ which does not compute any break. /************************************************************************ * This file has been generated automatically from * * * - * src/core/symbology/classification/qgsclassificationcustom.h * + * src/core/classification/qgsclassificationcustom.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ diff --git a/python/core/auto_generated/symbology/classification/qgsclassificationequalinterval.sip.in b/python/core/auto_generated/classification/qgsclassificationequalinterval.sip.in similarity index 90% rename from python/core/auto_generated/symbology/classification/qgsclassificationequalinterval.sip.in rename to python/core/auto_generated/classification/qgsclassificationequalinterval.sip.in index eac36942d19..13aa7a108d5 100644 --- a/python/core/auto_generated/symbology/classification/qgsclassificationequalinterval.sip.in +++ b/python/core/auto_generated/classification/qgsclassificationequalinterval.sip.in @@ -1,7 +1,7 @@ /************************************************************************ * This file has been generated automatically from * * * - * src/core/symbology/classification/qgsclassificationequalinterval.h * + * src/core/classification/qgsclassificationequalinterval.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ @@ -37,7 +37,7 @@ for equal intervals /************************************************************************ * This file has been generated automatically from * * * - * src/core/symbology/classification/qgsclassificationequalinterval.h * + * src/core/classification/qgsclassificationequalinterval.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ diff --git a/python/core/auto_generated/symbology/classification/qgsclassificationjenks.sip.in b/python/core/auto_generated/classification/qgsclassificationjenks.sip.in similarity index 91% rename from python/core/auto_generated/symbology/classification/qgsclassificationjenks.sip.in rename to python/core/auto_generated/classification/qgsclassificationjenks.sip.in index d5ab127fc04..5ce3bba1e81 100644 --- a/python/core/auto_generated/symbology/classification/qgsclassificationjenks.sip.in +++ b/python/core/auto_generated/classification/qgsclassificationjenks.sip.in @@ -1,7 +1,7 @@ /************************************************************************ * This file has been generated automatically from * * * - * src/core/symbology/classification/qgsclassificationjenks.h * + * src/core/classification/qgsclassificationjenks.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ @@ -35,7 +35,7 @@ for natural breaks based on Jenks method /************************************************************************ * This file has been generated automatically from * * * - * src/core/symbology/classification/qgsclassificationjenks.h * + * src/core/classification/qgsclassificationjenks.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ diff --git a/python/core/auto_generated/symbology/classification/qgsclassificationmethod.sip.in b/python/core/auto_generated/classification/qgsclassificationmethod.sip.in similarity index 98% rename from python/core/auto_generated/symbology/classification/qgsclassificationmethod.sip.in rename to python/core/auto_generated/classification/qgsclassificationmethod.sip.in index 81d948f54db..6ddb023f738 100644 --- a/python/core/auto_generated/symbology/classification/qgsclassificationmethod.sip.in +++ b/python/core/auto_generated/classification/qgsclassificationmethod.sip.in @@ -1,7 +1,7 @@ /************************************************************************ * This file has been generated automatically from * * * - * src/core/symbology/classification/qgsclassificationmethod.h * + * src/core/classification/qgsclassificationmethod.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ @@ -273,7 +273,7 @@ Format the number according to label properties /************************************************************************ * This file has been generated automatically from * * * - * src/core/symbology/classification/qgsclassificationmethod.h * + * src/core/classification/qgsclassificationmethod.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ diff --git a/python/core/auto_generated/symbology/classification/qgsclassificationmethodregistry.sip.in b/python/core/auto_generated/classification/qgsclassificationmethodregistry.sip.in similarity index 92% rename from python/core/auto_generated/symbology/classification/qgsclassificationmethodregistry.sip.in rename to python/core/auto_generated/classification/qgsclassificationmethodregistry.sip.in index bd194e19025..be38351022a 100644 --- a/python/core/auto_generated/symbology/classification/qgsclassificationmethodregistry.sip.in +++ b/python/core/auto_generated/classification/qgsclassificationmethodregistry.sip.in @@ -1,7 +1,7 @@ /************************************************************************ * This file has been generated automatically from * * * - * src/core/symbology/classification/qgsclassificationmethodregistry.h * + * src/core/classification/qgsclassificationmethodregistry.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ @@ -49,7 +49,7 @@ Returns a map of all registered methods /************************************************************************ * This file has been generated automatically from * * * - * src/core/symbology/classification/qgsclassificationmethodregistry.h * + * src/core/classification/qgsclassificationmethodregistry.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ diff --git a/python/core/auto_generated/symbology/classification/qgsclassificationprettybreaks.sip.in b/python/core/auto_generated/classification/qgsclassificationprettybreaks.sip.in similarity index 90% rename from python/core/auto_generated/symbology/classification/qgsclassificationprettybreaks.sip.in rename to python/core/auto_generated/classification/qgsclassificationprettybreaks.sip.in index 3a411a5e0ec..eb6e401d879 100644 --- a/python/core/auto_generated/symbology/classification/qgsclassificationprettybreaks.sip.in +++ b/python/core/auto_generated/classification/qgsclassificationprettybreaks.sip.in @@ -1,7 +1,7 @@ /************************************************************************ * This file has been generated automatically from * * * - * src/core/symbology/classification/qgsclassificationprettybreaks.h * + * src/core/classification/qgsclassificationprettybreaks.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ @@ -35,7 +35,7 @@ for pretty breaks /************************************************************************ * This file has been generated automatically from * * * - * src/core/symbology/classification/qgsclassificationprettybreaks.h * + * src/core/classification/qgsclassificationprettybreaks.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ diff --git a/python/core/auto_generated/symbology/classification/qgsclassificationquantile.sip.in b/python/core/auto_generated/classification/qgsclassificationquantile.sip.in similarity index 91% rename from python/core/auto_generated/symbology/classification/qgsclassificationquantile.sip.in rename to python/core/auto_generated/classification/qgsclassificationquantile.sip.in index 2a34ac46ed4..f58f58f6259 100644 --- a/python/core/auto_generated/symbology/classification/qgsclassificationquantile.sip.in +++ b/python/core/auto_generated/classification/qgsclassificationquantile.sip.in @@ -1,7 +1,7 @@ /************************************************************************ * This file has been generated automatically from * * * - * src/core/symbology/classification/qgsclassificationquantile.h * + * src/core/classification/qgsclassificationquantile.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ @@ -36,7 +36,7 @@ based on quantiles /************************************************************************ * This file has been generated automatically from * * * - * src/core/symbology/classification/qgsclassificationquantile.h * + * src/core/classification/qgsclassificationquantile.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ diff --git a/python/core/auto_generated/symbology/classification/qgsclassificationstandarddeviation.sip.in b/python/core/auto_generated/classification/qgsclassificationstandarddeviation.sip.in similarity index 91% rename from python/core/auto_generated/symbology/classification/qgsclassificationstandarddeviation.sip.in rename to python/core/auto_generated/classification/qgsclassificationstandarddeviation.sip.in index 87bd4ca1766..39e2e66188f 100644 --- a/python/core/auto_generated/symbology/classification/qgsclassificationstandarddeviation.sip.in +++ b/python/core/auto_generated/classification/qgsclassificationstandarddeviation.sip.in @@ -1,7 +1,7 @@ /************************************************************************ * This file has been generated automatically from * * * - * src/core/symbology/classification/qgsclassificationstandarddeviation.h * + * src/core/classification/qgsclassificationstandarddeviation.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ @@ -43,7 +43,7 @@ based on standard deviation /************************************************************************ * This file has been generated automatically from * * * - * src/core/symbology/classification/qgsclassificationstandarddeviation.h * + * src/core/classification/qgsclassificationstandarddeviation.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip index 2918f5520c7..c541cec9cfb 100644 --- a/python/core/core_auto.sip +++ b/python/core/core_auto.sip @@ -158,6 +158,14 @@ %Include auto_generated/auth/qgsauthmethod.sip %Include auto_generated/callouts/qgscallout.sip %Include auto_generated/callouts/qgscalloutsregistry.sip +%Include auto_generated/classification/qgsclassificationmethodregistry.sip +%Include auto_generated/classification/qgsclassificationmethod.sip +%Include auto_generated/classification/qgsclassificationcustom.sip +%Include auto_generated/classification/qgsclassificationequalinterval.sip +%Include auto_generated/classification/qgsclassificationprettybreaks.sip +%Include auto_generated/classification/qgsclassificationquantile.sip +%Include auto_generated/classification/qgsclassificationjenks.sip +%Include auto_generated/classification/qgsclassificationstandarddeviation.sip %Include auto_generated/diagram/qgsdiagram.sip %Include auto_generated/diagram/qgspiediagram.sip %Include auto_generated/diagram/qgstextdiagram.sip @@ -255,14 +263,6 @@ %Include auto_generated/scalebar/qgsscalebarrenderer.sip %Include auto_generated/scalebar/qgssingleboxscalebarrenderer.sip %Include auto_generated/scalebar/qgsticksscalebarrenderer.sip -%Include auto_generated/symbology/classification/qgsclassificationmethodregistry.sip -%Include auto_generated/symbology/classification/qgsclassificationmethod.sip -%Include auto_generated/symbology/classification/qgsclassificationcustom.sip -%Include auto_generated/symbology/classification/qgsclassificationequalinterval.sip -%Include auto_generated/symbology/classification/qgsclassificationprettybreaks.sip -%Include auto_generated/symbology/classification/qgsclassificationquantile.sip -%Include auto_generated/symbology/classification/qgsclassificationjenks.sip -%Include auto_generated/symbology/classification/qgsclassificationstandarddeviation.sip %Include auto_generated/symbology/qgs25drenderer.sip %Include auto_generated/symbology/qgsarrowsymbollayer.sip %Include auto_generated/symbology/qgscategorizedsymbolrenderer.sip diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 1e391a36102..4788a5834c8 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -20,21 +20,21 @@ SET(QGIS_CORE_SRCS callouts/qgscallout.cpp callouts/qgscalloutsregistry.cpp + classification/qgsclassificationmethodregistry.cpp + classification/qgsclassificationmethod.cpp + classification/qgsclassificationcustom.cpp + classification/qgsclassificationequalinterval.cpp + classification/qgsclassificationprettybreaks.cpp + classification/qgsclassificationquantile.cpp + classification/qgsclassificationjenks.cpp + classification/qgsclassificationstandarddeviation.cpp + gps/qgsgpsconnection.cpp gps/qgsgpsconnectionregistry.cpp gps/qgsgpsdconnection.cpp gps/qgsgpsdetector.cpp gps/qgsnmeaconnection.cpp - symbology/classification/qgsclassificationmethodregistry.cpp - symbology/classification/qgsclassificationmethod.cpp - symbology/classification/qgsclassificationcustom.cpp - symbology/classification/qgsclassificationequalinterval.cpp - symbology/classification/qgsclassificationprettybreaks.cpp - symbology/classification/qgsclassificationquantile.cpp - symbology/classification/qgsclassificationjenks.cpp - symbology/classification/qgsclassificationstandarddeviation.cpp - symbology/qgs25drenderer.cpp symbology/qgsarrowsymbollayer.cpp symbology/qgscategorizedsymbolrenderer.cpp @@ -1084,6 +1084,15 @@ SET(QGIS_CORE_HDRS callouts/qgscallout.h callouts/qgscalloutsregistry.h + classification/qgsclassificationmethodregistry.h + classification/qgsclassificationmethod.h + classification/qgsclassificationcustom.h + classification/qgsclassificationequalinterval.h + classification/qgsclassificationprettybreaks.h + classification/qgsclassificationquantile.h + classification/qgsclassificationjenks.h + classification/qgsclassificationstandarddeviation.h + diagram/qgsdiagram.h diagram/qgspiediagram.h diagram/qgstextdiagram.h @@ -1205,15 +1214,6 @@ SET(QGIS_CORE_HDRS scalebar/qgssingleboxscalebarrenderer.h scalebar/qgsticksscalebarrenderer.h - symbology/classification/qgsclassificationmethodregistry.h - symbology/classification/qgsclassificationmethod.h - symbology/classification/qgsclassificationcustom.h - symbology/classification/qgsclassificationequalinterval.h - symbology/classification/qgsclassificationprettybreaks.h - symbology/classification/qgsclassificationquantile.h - symbology/classification/qgsclassificationjenks.h - symbology/classification/qgsclassificationstandarddeviation.h - symbology/qgs25drenderer.h symbology/qgsarrowsymbollayer.h symbology/qgscategorizedsymbolrenderer.h @@ -1312,6 +1312,7 @@ INCLUDE_DIRECTORIES( 3d annotations auth + classification dxf effects ${CMAKE_SOURCE_DIR}/src/core/expression @@ -1335,7 +1336,6 @@ INCLUDE_DIRECTORIES( renderer scalebar symbology - symbology/classification metadata mesh validity diff --git a/src/core/symbology/classification/qgsclassificationcustom.cpp b/src/core/classification/qgsclassificationcustom.cpp similarity index 100% rename from src/core/symbology/classification/qgsclassificationcustom.cpp rename to src/core/classification/qgsclassificationcustom.cpp diff --git a/src/core/symbology/classification/qgsclassificationcustom.h b/src/core/classification/qgsclassificationcustom.h similarity index 100% rename from src/core/symbology/classification/qgsclassificationcustom.h rename to src/core/classification/qgsclassificationcustom.h diff --git a/src/core/symbology/classification/qgsclassificationequalinterval.cpp b/src/core/classification/qgsclassificationequalinterval.cpp similarity index 100% rename from src/core/symbology/classification/qgsclassificationequalinterval.cpp rename to src/core/classification/qgsclassificationequalinterval.cpp diff --git a/src/core/symbology/classification/qgsclassificationequalinterval.h b/src/core/classification/qgsclassificationequalinterval.h similarity index 100% rename from src/core/symbology/classification/qgsclassificationequalinterval.h rename to src/core/classification/qgsclassificationequalinterval.h diff --git a/src/core/symbology/classification/qgsclassificationjenks.cpp b/src/core/classification/qgsclassificationjenks.cpp similarity index 100% rename from src/core/symbology/classification/qgsclassificationjenks.cpp rename to src/core/classification/qgsclassificationjenks.cpp diff --git a/src/core/symbology/classification/qgsclassificationjenks.h b/src/core/classification/qgsclassificationjenks.h similarity index 100% rename from src/core/symbology/classification/qgsclassificationjenks.h rename to src/core/classification/qgsclassificationjenks.h diff --git a/src/core/symbology/classification/qgsclassificationmethod.cpp b/src/core/classification/qgsclassificationmethod.cpp similarity index 100% rename from src/core/symbology/classification/qgsclassificationmethod.cpp rename to src/core/classification/qgsclassificationmethod.cpp diff --git a/src/core/symbology/classification/qgsclassificationmethod.h b/src/core/classification/qgsclassificationmethod.h similarity index 100% rename from src/core/symbology/classification/qgsclassificationmethod.h rename to src/core/classification/qgsclassificationmethod.h diff --git a/src/core/symbology/classification/qgsclassificationmethodregistry.cpp b/src/core/classification/qgsclassificationmethodregistry.cpp similarity index 100% rename from src/core/symbology/classification/qgsclassificationmethodregistry.cpp rename to src/core/classification/qgsclassificationmethodregistry.cpp diff --git a/src/core/symbology/classification/qgsclassificationmethodregistry.h b/src/core/classification/qgsclassificationmethodregistry.h similarity index 100% rename from src/core/symbology/classification/qgsclassificationmethodregistry.h rename to src/core/classification/qgsclassificationmethodregistry.h diff --git a/src/core/symbology/classification/qgsclassificationprettybreaks.cpp b/src/core/classification/qgsclassificationprettybreaks.cpp similarity index 100% rename from src/core/symbology/classification/qgsclassificationprettybreaks.cpp rename to src/core/classification/qgsclassificationprettybreaks.cpp diff --git a/src/core/symbology/classification/qgsclassificationprettybreaks.h b/src/core/classification/qgsclassificationprettybreaks.h similarity index 100% rename from src/core/symbology/classification/qgsclassificationprettybreaks.h rename to src/core/classification/qgsclassificationprettybreaks.h diff --git a/src/core/symbology/classification/qgsclassificationquantile.cpp b/src/core/classification/qgsclassificationquantile.cpp similarity index 100% rename from src/core/symbology/classification/qgsclassificationquantile.cpp rename to src/core/classification/qgsclassificationquantile.cpp diff --git a/src/core/symbology/classification/qgsclassificationquantile.h b/src/core/classification/qgsclassificationquantile.h similarity index 100% rename from src/core/symbology/classification/qgsclassificationquantile.h rename to src/core/classification/qgsclassificationquantile.h diff --git a/src/core/symbology/classification/qgsclassificationstandarddeviation.cpp b/src/core/classification/qgsclassificationstandarddeviation.cpp similarity index 100% rename from src/core/symbology/classification/qgsclassificationstandarddeviation.cpp rename to src/core/classification/qgsclassificationstandarddeviation.cpp diff --git a/src/core/symbology/classification/qgsclassificationstandarddeviation.h b/src/core/classification/qgsclassificationstandarddeviation.h similarity index 100% rename from src/core/symbology/classification/qgsclassificationstandarddeviation.h rename to src/core/classification/qgsclassificationstandarddeviation.h diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 52481e98a61..00db510d4fd 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -1019,7 +1019,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/core/raster ${CMAKE_SOURCE_DIR}/src/core/scalebar ${CMAKE_SOURCE_DIR}/src/core/symbology - ${CMAKE_SOURCE_DIR}/src/core/symbology/classification + ${CMAKE_SOURCE_DIR}/src/core/classification ${CMAKE_SOURCE_DIR}/src/core/effects ${CMAKE_SOURCE_DIR}/src/core/metadata ${CMAKE_SOURCE_DIR}/src/core/expression diff --git a/tests/src/core/CMakeLists.txt b/tests/src/core/CMakeLists.txt index c48721abcff..dae7d4555a4 100644 --- a/tests/src/core/CMakeLists.txt +++ b/tests/src/core/CMakeLists.txt @@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/core/raster ${CMAKE_SOURCE_DIR}/src/core/scalebar ${CMAKE_SOURCE_DIR}/src/core/symbology - ${CMAKE_SOURCE_DIR}/src/core/symbology/classification + ${CMAKE_SOURCE_DIR}/src/core/classification ${CMAKE_SOURCE_DIR}/src/core/mesh ${CMAKE_SOURCE_DIR}/src/test ${CMAKE_BINARY_DIR}/src/core diff --git a/tests/src/gui/CMakeLists.txt b/tests/src/gui/CMakeLists.txt index fce3066e861..ce2a0864fdb 100644 --- a/tests/src/gui/CMakeLists.txt +++ b/tests/src/gui/CMakeLists.txt @@ -25,7 +25,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/core/processing ${CMAKE_SOURCE_DIR}/src/core/raster ${CMAKE_SOURCE_DIR}/src/core/symbology - ${CMAKE_SOURCE_DIR}/src/core/symbology/classification + ${CMAKE_SOURCE_DIR}/src/core/classification ${CMAKE_SOURCE_DIR}/src/core/fieldformatter ${CMAKE_SOURCE_DIR}/src/test ${CMAKE_SOURCE_DIR}/src/native