From 8a7bf03e3832834b0bc43036a99008ea2ebbe519 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Wed, 9 Oct 2024 08:23:42 +1000 Subject: [PATCH] Remove all references to "trademark" And remove any mention of non-open source friendly company --- .../core/auto_additions/qgslayoutexporter.py | 2 +- .../auto_additions/qgsmapsettingsutils.py | 4 +-- .../layout/qgslayoutitem.sip.in | 2 +- .../qgsprovidersublayerdetails.sip.in | 2 +- .../core/auto_additions/qgslayoutexporter.py | 2 +- .../auto_additions/qgsmapsettingsutils.py | 4 +-- .../layout/qgslayoutitem.sip.in | 2 +- .../qgsprovidersublayerdetails.sip.in | 2 +- src/app/layout/qgslayoutdesignerdialog.cpp | 6 ++-- src/core/layout/qgslayoutexporter.h | 16 ++++----- src/core/layout/qgslayoutgeopdfexporter.h | 8 ++--- src/core/layout/qgslayoutitem.h | 2 +- src/core/maprenderer/qgsmaprenderertask.h | 4 +-- .../providers/qgsprovidersublayerdetails.h | 2 +- src/core/qgsabstractgeopdfexporter.h | 34 +++++++++---------- src/core/qgsmapsettingsutils.h | 2 +- .../layout/qgslayoutpdfexportoptionsdialog.h | 14 ++++---- src/server/services/wms/qgswmsparameters.h | 4 +-- src/ui/layout/qgslayoutitemwidgetbase.ui | 2 +- src/ui/layout/qgspdfexportoptions.ui | 4 +-- src/ui/qgsmapsavedialog.ui | 2 +- 21 files changed, 60 insertions(+), 60 deletions(-) diff --git a/python/PyQt6/core/auto_additions/qgslayoutexporter.py b/python/PyQt6/core/auto_additions/qgslayoutexporter.py index adca0f29b779..246fd4c3ab6b 100644 --- a/python/PyQt6/core/auto_additions/qgslayoutexporter.py +++ b/python/PyQt6/core/auto_additions/qgslayoutexporter.py @@ -19,7 +19,7 @@ except NameError: pass try: - QgsLayoutExporter.PdfExportSettings.__attribute_docs__ = {'dpi': 'Resolution to export layout at. If dpi <= 0 the default layout dpi will be used.', 'rasterizeWholeImage': 'Set to ``True`` to force whole layout to be rasterized while exporting.\n\nThis option is mutually exclusive with forceVectorOutput.', 'forceVectorOutput': 'Set to ``True`` to force vector object exports, even when the resultant appearance will differ\nfrom the layout. If ``False``, some items may be rasterized in order to maintain their\ncorrect appearance in the output.\n\nThis option is mutually exclusive with rasterizeWholeImage.', 'appendGeoreference': 'Indicates whether PDF export should append georeference data\n\n.. versionadded:: 3.10', 'exportMetadata': "Indicates whether PDF export should include metadata generated\nfrom the layout's project's metadata.\n\n.. versionadded:: 3.2", 'flags': 'Layout context flags, which control how the export will be created.', 'textRenderFormat': 'Text rendering format, which controls how text should be rendered in the export (e.g.\nas paths or real text objects).\n\n.. versionadded:: 3.4.3', 'simplifyGeometries': 'Indicates whether vector geometries should be simplified to avoid redundant extraneous detail,\nsuch as vertices which are not visible at the specified dpi of the output.\n\n.. versionadded:: 3.10', 'writeGeoPdf': '``True`` if GeoPDF files should be created, instead of normal PDF files.\n\nWhilst GeoPDF files can include some desirable properties like the ability to interactively\nquery map features, they also can result in lower-quality output files, or forced rasterization\nof layers.\n\n.. note::\n\n Requires builds based on GDAL 3.0 or greater.\n\n.. versionadded:: 3.10', 'exportLayersAsSeperateFiles': '``True`` if individual layers from the layout should be rendered to separate PDF files.\n\nThis option allows for separation of logic layout layers to individual PDF files. For instance,\nif this option is ``True``, then a separate PDF file will be created per layer per map item in the\nlayout. Additionally, separate PDF files may be created for other complex layout items, resulting\nin a set of PDF files which contain logical atomic components of the layout.\n\nThis option is designed to allow the PDF files to be composited back together in an external\napplication (e.g. Adobe Illustrator) as a non-QGIS, post-production step.\n\n.. versionadded:: 3.14', 'useIso32000ExtensionFormatGeoreferencing': '``True`` if ISO3200 extension format georeferencing should be used.\n\nThis is a recommended setting which results in Geospatial PDF files compatible\nwith the built-in Acrobat geospatial tools.\n\nIf PdfExportSettings.writeGeoPdf is ``False`` than this option has no effect.', 'useOgcBestPracticeFormatGeoreferencing': '``True`` if OGC "best practice" format georeferencing should be used.\n\n.. warning::\n\n This results in GeoPDF files compatible with the TerraGo suite of tools, but\n can break compatibility with the built-in Acrobat geospatial tools (yes, GeoPDF\n format is a mess!).\n\nIf PdfExportSettings.writeGeoPdf is ``False`` than this option has no effect.', 'includeGeoPdfFeatures': '``True`` if feature vector information (such as attributes) should be exported during GeoPDF exports.\n\nIf PdfExportSettings.writeGeoPdf is ``False`` than this option has no effect.', 'exportThemes': "Optional list of map themes to export as GeoPDF layer groups.\n\nIf set, map item's which are not assigned a specific map theme will iterate through all listed\nthemes and a GeoPDF layer group will be created for each.\n\nIf PdfExportSettings.writeGeoPdf is ``False`` than this option has no effect.", 'predefinedMapScales': 'A list of predefined scales to use with the layout. This is used\nfor maps which are set to the predefined atlas scaling mode.\n\n.. versionadded:: 3.10'} + QgsLayoutExporter.PdfExportSettings.__attribute_docs__ = {'dpi': 'Resolution to export layout at. If dpi <= 0 the default layout dpi will be used.', 'rasterizeWholeImage': 'Set to ``True`` to force whole layout to be rasterized while exporting.\n\nThis option is mutually exclusive with forceVectorOutput.', 'forceVectorOutput': 'Set to ``True`` to force vector object exports, even when the resultant appearance will differ\nfrom the layout. If ``False``, some items may be rasterized in order to maintain their\ncorrect appearance in the output.\n\nThis option is mutually exclusive with rasterizeWholeImage.', 'appendGeoreference': 'Indicates whether PDF export should append georeference data\n\n.. versionadded:: 3.10', 'exportMetadata': "Indicates whether PDF export should include metadata generated\nfrom the layout's project's metadata.\n\n.. versionadded:: 3.2", 'flags': 'Layout context flags, which control how the export will be created.', 'textRenderFormat': 'Text rendering format, which controls how text should be rendered in the export (e.g.\nas paths or real text objects).\n\n.. versionadded:: 3.4.3', 'simplifyGeometries': 'Indicates whether vector geometries should be simplified to avoid redundant extraneous detail,\nsuch as vertices which are not visible at the specified dpi of the output.\n\n.. versionadded:: 3.10', 'writeGeoPdf': '``True`` if Geospatial PDF files should be created, instead of normal PDF files.\n\nWhilst Geospatial PDF files can include some desirable properties like the ability to interactively\nquery map features, they also can result in lower-quality output files, or forced rasterization\nof layers.\n\n.. note::\n\n Requires builds based on GDAL 3.0 or greater.\n\n.. versionadded:: 3.10', 'exportLayersAsSeperateFiles': '``True`` if individual layers from the layout should be rendered to separate PDF files.\n\nThis option allows for separation of logic layout layers to individual PDF files. For instance,\nif this option is ``True``, then a separate PDF file will be created per layer per map item in the\nlayout. Additionally, separate PDF files may be created for other complex layout items, resulting\nin a set of PDF files which contain logical atomic components of the layout.\n\nThis option is designed to allow the PDF files to be composited back together in an external\napplication (e.g. Adobe Illustrator) as a non-QGIS, post-production step.\n\n.. versionadded:: 3.14', 'useIso32000ExtensionFormatGeoreferencing': '``True`` if ISO3200 extension format georeferencing should be used.\n\nThis is a recommended setting which results in Geospatial PDF files compatible\nwith the built-in Acrobat geospatial tools.\n\nIf PdfExportSettings.writeGeoPdf is ``False`` than this option has no effect.', 'useOgcBestPracticeFormatGeoreferencing': '``True`` if OGC "best practice" format georeferencing should be used.\n\n.. warning::\n\n This results in Geospatial PDF files compatible with some non-open source friendly suites of tools, but\n can break compatibility with the built-in Acrobat geospatial tools (yes, third party providers of the Geospatial PDF\n format are a mess!).\n\nIf PdfExportSettings.writeGeoPdf is ``False`` than this option has no effect.', 'includeGeoPdfFeatures': '``True`` if feature vector information (such as attributes) should be exported during Geospatial PDF exports.\n\nIf PdfExportSettings.writeGeoPdf is ``False`` than this option has no effect.', 'exportThemes': "Optional list of map themes to export as Geospatial PDF layer groups.\n\nIf set, map item's which are not assigned a specific map theme will iterate through all listed\nthemes and a Geospatial PDF layer group will be created for each.\n\nIf PdfExportSettings.writeGeoPdf is ``False`` than this option has no effect.", 'predefinedMapScales': 'A list of predefined scales to use with the layout. This is used\nfor maps which are set to the predefined atlas scaling mode.\n\n.. versionadded:: 3.10'} QgsLayoutExporter.PdfExportSettings.__doc__ = """Contains settings relating to exporting layouts to PDF""" QgsLayoutExporter.PdfExportSettings.__group__ = ['layout'] except NameError: diff --git a/python/PyQt6/core/auto_additions/qgsmapsettingsutils.py b/python/PyQt6/core/auto_additions/qgsmapsettingsutils.py index 1e181a20564c..03c1d264c0ea 100644 --- a/python/PyQt6/core/auto_additions/qgsmapsettingsutils.py +++ b/python/PyQt6/core/auto_additions/qgsmapsettingsutils.py @@ -1,11 +1,11 @@ # The following has been generated automatically from src/core/qgsmapsettingsutils.h # monkey patching scoped based enum -QgsMapSettingsUtils.EffectsCheckFlag.IgnoreGeoPdfSupportedEffects.__doc__ = "Ignore advanced effects which are supported in GeoPDF exports" +QgsMapSettingsUtils.EffectsCheckFlag.IgnoreGeoPdfSupportedEffects.__doc__ = "Ignore advanced effects which are supported in Geospatial PDF exports" QgsMapSettingsUtils.EffectsCheckFlag.__doc__ = """Flags for controlling the behavior of :py:func:`~QgsMapSettingsUtils.containsAdvancedEffects` .. versionadded:: 3.14 -* ``IgnoreGeoPdfSupportedEffects``: Ignore advanced effects which are supported in GeoPDF exports +* ``IgnoreGeoPdfSupportedEffects``: Ignore advanced effects which are supported in Geospatial PDF exports """ # -- diff --git a/python/PyQt6/core/auto_generated/layout/qgslayoutitem.sip.in b/python/PyQt6/core/auto_generated/layout/qgslayoutitem.sip.in index 7bc94a70b6f5..79606f2ae8dc 100644 --- a/python/PyQt6/core/auto_generated/layout/qgslayoutitem.sip.in +++ b/python/PyQt6/core/auto_generated/layout/qgslayoutitem.sip.in @@ -432,7 +432,7 @@ Sets the item's parent ``group``. virtual ExportLayerBehavior exportLayerBehavior() const; %Docstring -Returns the behavior of this item during exporting to layered exports (e.g. SVG or GeoPDF). +Returns the behavior of this item during exporting to layered exports (e.g. SVG or Geospatial PDF). .. seealso:: :py:func:`numberExportLayers` diff --git a/python/PyQt6/core/auto_generated/providers/qgsprovidersublayerdetails.sip.in b/python/PyQt6/core/auto_generated/providers/qgsprovidersublayerdetails.sip.in index 12d0c8048c5d..4c0e80babbce 100644 --- a/python/PyQt6/core/auto_generated/providers/qgsprovidersublayerdetails.sip.in +++ b/python/PyQt6/core/auto_generated/providers/qgsprovidersublayerdetails.sip.in @@ -21,7 +21,7 @@ according to a specific data provider. It is possible that multiple data providers may be able to utilize the same underlying sub layer in a single dataset, yet will interpret this layer differently. For instance, a layer - in a GeoPDF document can be interpreted as either a vector layer by the OGR data provider or a raster + in a Geospatial PDF document can be interpreted as either a vector layer by the OGR data provider or a raster layer by the GDAL provider. The :py:func:`~providerKey` property can be used to determine the data provider associated with a :py:class:`QgsProviderSubLayerDetails` instance. diff --git a/python/core/auto_additions/qgslayoutexporter.py b/python/core/auto_additions/qgslayoutexporter.py index 6b7cef4511e6..895a24eceb64 100644 --- a/python/core/auto_additions/qgslayoutexporter.py +++ b/python/core/auto_additions/qgslayoutexporter.py @@ -12,7 +12,7 @@ except NameError: pass try: - QgsLayoutExporter.PdfExportSettings.__attribute_docs__ = {'dpi': 'Resolution to export layout at. If dpi <= 0 the default layout dpi will be used.', 'rasterizeWholeImage': 'Set to ``True`` to force whole layout to be rasterized while exporting.\n\nThis option is mutually exclusive with forceVectorOutput.', 'forceVectorOutput': 'Set to ``True`` to force vector object exports, even when the resultant appearance will differ\nfrom the layout. If ``False``, some items may be rasterized in order to maintain their\ncorrect appearance in the output.\n\nThis option is mutually exclusive with rasterizeWholeImage.', 'appendGeoreference': 'Indicates whether PDF export should append georeference data\n\n.. versionadded:: 3.10', 'exportMetadata': "Indicates whether PDF export should include metadata generated\nfrom the layout's project's metadata.\n\n.. versionadded:: 3.2", 'flags': 'Layout context flags, which control how the export will be created.', 'textRenderFormat': 'Text rendering format, which controls how text should be rendered in the export (e.g.\nas paths or real text objects).\n\n.. versionadded:: 3.4.3', 'simplifyGeometries': 'Indicates whether vector geometries should be simplified to avoid redundant extraneous detail,\nsuch as vertices which are not visible at the specified dpi of the output.\n\n.. versionadded:: 3.10', 'writeGeoPdf': '``True`` if GeoPDF files should be created, instead of normal PDF files.\n\nWhilst GeoPDF files can include some desirable properties like the ability to interactively\nquery map features, they also can result in lower-quality output files, or forced rasterization\nof layers.\n\n.. note::\n\n Requires builds based on GDAL 3.0 or greater.\n\n.. versionadded:: 3.10', 'exportLayersAsSeperateFiles': '``True`` if individual layers from the layout should be rendered to separate PDF files.\n\nThis option allows for separation of logic layout layers to individual PDF files. For instance,\nif this option is ``True``, then a separate PDF file will be created per layer per map item in the\nlayout. Additionally, separate PDF files may be created for other complex layout items, resulting\nin a set of PDF files which contain logical atomic components of the layout.\n\nThis option is designed to allow the PDF files to be composited back together in an external\napplication (e.g. Adobe Illustrator) as a non-QGIS, post-production step.\n\n.. versionadded:: 3.14', 'useIso32000ExtensionFormatGeoreferencing': '``True`` if ISO3200 extension format georeferencing should be used.\n\nThis is a recommended setting which results in Geospatial PDF files compatible\nwith the built-in Acrobat geospatial tools.\n\nIf PdfExportSettings.writeGeoPdf is ``False`` than this option has no effect.', 'useOgcBestPracticeFormatGeoreferencing': '``True`` if OGC "best practice" format georeferencing should be used.\n\n.. warning::\n\n This results in GeoPDF files compatible with the TerraGo suite of tools, but\n can break compatibility with the built-in Acrobat geospatial tools (yes, GeoPDF\n format is a mess!).\n\nIf PdfExportSettings.writeGeoPdf is ``False`` than this option has no effect.', 'includeGeoPdfFeatures': '``True`` if feature vector information (such as attributes) should be exported during GeoPDF exports.\n\nIf PdfExportSettings.writeGeoPdf is ``False`` than this option has no effect.', 'exportThemes': "Optional list of map themes to export as GeoPDF layer groups.\n\nIf set, map item's which are not assigned a specific map theme will iterate through all listed\nthemes and a GeoPDF layer group will be created for each.\n\nIf PdfExportSettings.writeGeoPdf is ``False`` than this option has no effect.", 'predefinedMapScales': 'A list of predefined scales to use with the layout. This is used\nfor maps which are set to the predefined atlas scaling mode.\n\n.. versionadded:: 3.10'} + QgsLayoutExporter.PdfExportSettings.__attribute_docs__ = {'dpi': 'Resolution to export layout at. If dpi <= 0 the default layout dpi will be used.', 'rasterizeWholeImage': 'Set to ``True`` to force whole layout to be rasterized while exporting.\n\nThis option is mutually exclusive with forceVectorOutput.', 'forceVectorOutput': 'Set to ``True`` to force vector object exports, even when the resultant appearance will differ\nfrom the layout. If ``False``, some items may be rasterized in order to maintain their\ncorrect appearance in the output.\n\nThis option is mutually exclusive with rasterizeWholeImage.', 'appendGeoreference': 'Indicates whether PDF export should append georeference data\n\n.. versionadded:: 3.10', 'exportMetadata': "Indicates whether PDF export should include metadata generated\nfrom the layout's project's metadata.\n\n.. versionadded:: 3.2", 'flags': 'Layout context flags, which control how the export will be created.', 'textRenderFormat': 'Text rendering format, which controls how text should be rendered in the export (e.g.\nas paths or real text objects).\n\n.. versionadded:: 3.4.3', 'simplifyGeometries': 'Indicates whether vector geometries should be simplified to avoid redundant extraneous detail,\nsuch as vertices which are not visible at the specified dpi of the output.\n\n.. versionadded:: 3.10', 'writeGeoPdf': '``True`` if Geospatial PDF files should be created, instead of normal PDF files.\n\nWhilst Geospatial PDF files can include some desirable properties like the ability to interactively\nquery map features, they also can result in lower-quality output files, or forced rasterization\nof layers.\n\n.. note::\n\n Requires builds based on GDAL 3.0 or greater.\n\n.. versionadded:: 3.10', 'exportLayersAsSeperateFiles': '``True`` if individual layers from the layout should be rendered to separate PDF files.\n\nThis option allows for separation of logic layout layers to individual PDF files. For instance,\nif this option is ``True``, then a separate PDF file will be created per layer per map item in the\nlayout. Additionally, separate PDF files may be created for other complex layout items, resulting\nin a set of PDF files which contain logical atomic components of the layout.\n\nThis option is designed to allow the PDF files to be composited back together in an external\napplication (e.g. Adobe Illustrator) as a non-QGIS, post-production step.\n\n.. versionadded:: 3.14', 'useIso32000ExtensionFormatGeoreferencing': '``True`` if ISO3200 extension format georeferencing should be used.\n\nThis is a recommended setting which results in Geospatial PDF files compatible\nwith the built-in Acrobat geospatial tools.\n\nIf PdfExportSettings.writeGeoPdf is ``False`` than this option has no effect.', 'useOgcBestPracticeFormatGeoreferencing': '``True`` if OGC "best practice" format georeferencing should be used.\n\n.. warning::\n\n This results in Geospatial PDF files compatible with some non-open source friendly suites of tools, but\n can break compatibility with the built-in Acrobat geospatial tools (yes, third party providers of the Geospatial PDF\n format are a mess!).\n\nIf PdfExportSettings.writeGeoPdf is ``False`` than this option has no effect.', 'includeGeoPdfFeatures': '``True`` if feature vector information (such as attributes) should be exported during Geospatial PDF exports.\n\nIf PdfExportSettings.writeGeoPdf is ``False`` than this option has no effect.', 'exportThemes': "Optional list of map themes to export as Geospatial PDF layer groups.\n\nIf set, map item's which are not assigned a specific map theme will iterate through all listed\nthemes and a Geospatial PDF layer group will be created for each.\n\nIf PdfExportSettings.writeGeoPdf is ``False`` than this option has no effect.", 'predefinedMapScales': 'A list of predefined scales to use with the layout. This is used\nfor maps which are set to the predefined atlas scaling mode.\n\n.. versionadded:: 3.10'} QgsLayoutExporter.PdfExportSettings.__doc__ = """Contains settings relating to exporting layouts to PDF""" QgsLayoutExporter.PdfExportSettings.__group__ = ['layout'] except NameError: diff --git a/python/core/auto_additions/qgsmapsettingsutils.py b/python/core/auto_additions/qgsmapsettingsutils.py index ac70d86e3514..25abdbdfc26e 100644 --- a/python/core/auto_additions/qgsmapsettingsutils.py +++ b/python/core/auto_additions/qgsmapsettingsutils.py @@ -1,11 +1,11 @@ # The following has been generated automatically from src/core/qgsmapsettingsutils.h # monkey patching scoped based enum -QgsMapSettingsUtils.EffectsCheckFlag.IgnoreGeoPdfSupportedEffects.__doc__ = "Ignore advanced effects which are supported in GeoPDF exports" +QgsMapSettingsUtils.EffectsCheckFlag.IgnoreGeoPdfSupportedEffects.__doc__ = "Ignore advanced effects which are supported in Geospatial PDF exports" QgsMapSettingsUtils.EffectsCheckFlag.__doc__ = """Flags for controlling the behavior of :py:func:`~QgsMapSettingsUtils.containsAdvancedEffects` .. versionadded:: 3.14 -* ``IgnoreGeoPdfSupportedEffects``: Ignore advanced effects which are supported in GeoPDF exports +* ``IgnoreGeoPdfSupportedEffects``: Ignore advanced effects which are supported in Geospatial PDF exports """ # -- diff --git a/python/core/auto_generated/layout/qgslayoutitem.sip.in b/python/core/auto_generated/layout/qgslayoutitem.sip.in index d04120dea9f9..6d4fb8590d94 100644 --- a/python/core/auto_generated/layout/qgslayoutitem.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitem.sip.in @@ -432,7 +432,7 @@ Sets the item's parent ``group``. virtual ExportLayerBehavior exportLayerBehavior() const; %Docstring -Returns the behavior of this item during exporting to layered exports (e.g. SVG or GeoPDF). +Returns the behavior of this item during exporting to layered exports (e.g. SVG or Geospatial PDF). .. seealso:: :py:func:`numberExportLayers` diff --git a/python/core/auto_generated/providers/qgsprovidersublayerdetails.sip.in b/python/core/auto_generated/providers/qgsprovidersublayerdetails.sip.in index 12d0c8048c5d..4c0e80babbce 100644 --- a/python/core/auto_generated/providers/qgsprovidersublayerdetails.sip.in +++ b/python/core/auto_generated/providers/qgsprovidersublayerdetails.sip.in @@ -21,7 +21,7 @@ according to a specific data provider. It is possible that multiple data providers may be able to utilize the same underlying sub layer in a single dataset, yet will interpret this layer differently. For instance, a layer - in a GeoPDF document can be interpreted as either a vector layer by the OGR data provider or a raster + in a Geospatial PDF document can be interpreted as either a vector layer by the OGR data provider or a raster layer by the GDAL provider. The :py:func:`~providerKey` property can be used to determine the data provider associated with a :py:class:`QgsProviderSubLayerDetails` instance. diff --git a/src/app/layout/qgslayoutdesignerdialog.cpp b/src/app/layout/qgslayoutdesignerdialog.cpp index 23a8701aadb2..18708d4ecf22 100644 --- a/src/app/layout/qgslayoutdesignerdialog.cpp +++ b/src/app/layout/qgslayoutdesignerdialog.cpp @@ -3389,7 +3389,7 @@ void QgsLayoutDesignerDialog::exportAtlasToPdf() if ( singleFile ) { allowGeoPdfExport = false; - geoPdfReason = tr( "GeoPDF export is not available when exporting an atlas to a single PDF file." ); + geoPdfReason = tr( "Geospatial PDF export is not available when exporting an atlas to a single PDF file." ); } QgsLayoutExporter::PdfExportSettings pdfSettings; @@ -4579,14 +4579,14 @@ bool QgsLayoutDesignerDialog::getPdfExportSettings( QgsLayoutExporter::PdfExport if ( !map->crs().isValid() ) { allowGeoPdfExport = false; - dialogGeoPdfReason = tr( "One or more map items do not have a valid CRS set. This is required for GeoPDF export." ); + dialogGeoPdfReason = tr( "One or more map items do not have a valid CRS set. This is required for Geospatial PDF export." ); break; } if ( map->mapRotation() != 0 || map->itemRotation() != 0 || map->dataDefinedProperties().isActive( QgsLayoutObject::DataDefinedProperty::MapRotation ) ) { allowGeoPdfExport = false; - dialogGeoPdfReason = tr( "One or more map items are rotated. This is not supported for GeoPDF export." ); + dialogGeoPdfReason = tr( "One or more map items are rotated. This is not supported for Geospatial PDF export." ); break; } } diff --git a/src/core/layout/qgslayoutexporter.h b/src/core/layout/qgslayoutexporter.h index 834a6a18e956..7855aa324901 100644 --- a/src/core/layout/qgslayoutexporter.h +++ b/src/core/layout/qgslayoutexporter.h @@ -324,9 +324,9 @@ class CORE_EXPORT QgsLayoutExporter bool simplifyGeometries = true; /** - * TRUE if GeoPDF files should be created, instead of normal PDF files. + * TRUE if Geospatial PDF files should be created, instead of normal PDF files. * - * Whilst GeoPDF files can include some desirable properties like the ability to interactively + * Whilst Geospatial PDF files can include some desirable properties like the ability to interactively * query map features, they also can result in lower-quality output files, or forced rasterization * of layers. * @@ -364,26 +364,26 @@ class CORE_EXPORT QgsLayoutExporter /** * TRUE if OGC "best practice" format georeferencing should be used. * - * \warning This results in GeoPDF files compatible with the TerraGo suite of tools, but - * can break compatibility with the built-in Acrobat geospatial tools (yes, GeoPDF - * format is a mess!). + * \warning This results in Geospatial PDF files compatible with some non-open source friendly suites of tools, but + * can break compatibility with the built-in Acrobat geospatial tools (yes, third party providers of the Geospatial PDF + * format are a mess!). * * If PdfExportSettings::writeGeoPdf is FALSE than this option has no effect. */ bool useOgcBestPracticeFormatGeoreferencing = false; /** - * TRUE if feature vector information (such as attributes) should be exported during GeoPDF exports. + * TRUE if feature vector information (such as attributes) should be exported during Geospatial PDF exports. * * If PdfExportSettings::writeGeoPdf is FALSE than this option has no effect. */ bool includeGeoPdfFeatures = true; /** - * Optional list of map themes to export as GeoPDF layer groups. + * Optional list of map themes to export as Geospatial PDF layer groups. * * If set, map item's which are not assigned a specific map theme will iterate through all listed - * themes and a GeoPDF layer group will be created for each. + * themes and a Geospatial PDF layer group will be created for each. * * If PdfExportSettings::writeGeoPdf is FALSE than this option has no effect. */ diff --git a/src/core/layout/qgslayoutgeopdfexporter.h b/src/core/layout/qgslayoutgeopdfexporter.h index 9c32018f37e2..23383d711975 100644 --- a/src/core/layout/qgslayoutgeopdfexporter.h +++ b/src/core/layout/qgslayoutgeopdfexporter.h @@ -71,8 +71,8 @@ class CORE_EXPORT QgsLayoutGeoPdfExporter : public QgsAbstractGeoPdfExporter QMap< QString, bool > initialLayerVisibility() const { return mInitialLayerVisibility; } /** - * Optional list of map layer IDs in the order they should be shown in the generated GeoPDF layer tree. - * Layer IDs earlier in the list will appear higher in the GeoPDF layer tree. + * Optional list of map layer IDs in the order they should be shown in the generated Geospatial PDF layer tree. + * Layer IDs earlier in the list will appear higher in the Geospatial PDF layer tree. * * \see layerTreeGroupOrder() * \since QGIS 3.14 @@ -80,9 +80,9 @@ class CORE_EXPORT QgsLayoutGeoPdfExporter : public QgsAbstractGeoPdfExporter QStringList layerOrder() const { return mLayerOrder; } /** - * Specifies the ordering of layer tree groups in the generated GeoPDF file. + * Specifies the ordering of layer tree groups in the generated Geospatial PDF file. * - * Groups appearing earlier in the list will show earlier in the GeoPDF layer tree list. + * Groups appearing earlier in the list will show earlier in the Geospatial PDF layer tree list. * * \see layerOrder() * \see customLayerTreeGroups() diff --git a/src/core/layout/qgslayoutitem.h b/src/core/layout/qgslayoutitem.h index 95d5545d4e26..a8605e31c559 100644 --- a/src/core/layout/qgslayoutitem.h +++ b/src/core/layout/qgslayoutitem.h @@ -462,7 +462,7 @@ class CORE_EXPORT QgsLayoutItem : public QgsLayoutObject, public QGraphicsRectIt }; /** - * Returns the behavior of this item during exporting to layered exports (e.g. SVG or GeoPDF). + * Returns the behavior of this item during exporting to layered exports (e.g. SVG or Geospatial PDF). * * \see numberExportLayers() * \see exportLayerDetails() diff --git a/src/core/maprenderer/qgsmaprenderertask.h b/src/core/maprenderer/qgsmaprenderertask.h index 4e8f624c6f3f..b1b200255cdf 100644 --- a/src/core/maprenderer/qgsmaprenderertask.h +++ b/src/core/maprenderer/qgsmaprenderertask.h @@ -59,8 +59,8 @@ class CORE_EXPORT QgsMapRendererTask : public QgsTask /** * Constructor for QgsMapRendererTask to render a map to an image file. * - * If the output \a fileFormat is set to PDF, the \a geoPdf argument controls whether a GeoPDF file is created. - * See QgsAbstractGeoPdfExporter::geoPDFCreationAvailable() for conditions on GeoPDF creation availability. + * If the output \a fileFormat is set to PDF, the \a geoPdf argument controls whether a Geospatial PDF file is created. + * See QgsAbstractGeoPdfExporter::geoPDFCreationAvailable() for conditions on Geospatial PDF creation availability. * * Since QGIS 3.26 the optional \a flags argument can be used to control the task flags. */ diff --git a/src/core/providers/qgsprovidersublayerdetails.h b/src/core/providers/qgsprovidersublayerdetails.h index 86c349b0f874..f77f06bee406 100644 --- a/src/core/providers/qgsprovidersublayerdetails.h +++ b/src/core/providers/qgsprovidersublayerdetails.h @@ -36,7 +36,7 @@ * * \note It is possible that multiple data providers may be able to utilize the same underlying * sub layer in a single dataset, yet will interpret this layer differently. For instance, a layer - * in a GeoPDF document can be interpreted as either a vector layer by the OGR data provider or a raster + * in a Geospatial PDF document can be interpreted as either a vector layer by the OGR data provider or a raster * layer by the GDAL provider. The providerKey() property can be used to determine the data provider * associated with a QgsProviderSubLayerDetails instance. * diff --git a/src/core/qgsabstractgeopdfexporter.h b/src/core/qgsabstractgeopdfexporter.h index 408b97c911d9..495c680eb901 100644 --- a/src/core/qgsabstractgeopdfexporter.h +++ b/src/core/qgsabstractgeopdfexporter.h @@ -37,9 +37,9 @@ class QgsGeoPdfRenderedFeatureHandler; * \class QgsAbstractGeoPdfExporter * \ingroup core * - * \brief Abstract base class for GeoPDF exporters. + * \brief Abstract base class for Geospatial PDF exporters. * - * The base class handles generic GeoPDF export setup, cleanup and processing steps. + * The base class handles generic Geospatial PDF export setup, cleanup and processing steps. * * This class is a low level implementation detail only. Generally, you should use the high level interface exposed by * classes like QgsLayoutExporter instead. @@ -57,7 +57,7 @@ class CORE_EXPORT QgsAbstractGeoPdfExporter public: /** - * Returns TRUE if the current QGIS build is capable of GeoPDF support. + * Returns TRUE if the current QGIS build is capable of Geospatial PDF support. * * If FALSE is returned, a user-friendly explanation why can be retrieved via * geoPDFAvailabilityExplanation(). @@ -65,9 +65,9 @@ class CORE_EXPORT QgsAbstractGeoPdfExporter static bool geoPDFCreationAvailable(); /** - * Returns a user-friendly, translated string explaining why GeoPDF export + * Returns a user-friendly, translated string explaining why Geospatial PDF export * support is not available on the current QGIS build (or an empty string if - * GeoPDF support IS available). + * Geospatial PDF support IS available). * \see geoPDFCreationAvailable() */ static QString geoPDFAvailabilityExplanation(); @@ -132,7 +132,7 @@ class CORE_EXPORT QgsAbstractGeoPdfExporter }; /** - * \brief Contains details of a control point used during georeferencing GeoPDF outputs. + * \brief Contains details of a control point used during georeferencing Geospatial PDF outputs. * \ingroup core * \since QGIS 3.10 */ @@ -233,9 +233,9 @@ class CORE_EXPORT QgsAbstractGeoPdfExporter /** * TRUE if OGC "best practice" format georeferencing should be used. * - * \warning This results in GeoPDF files compatible with the TerraGo suite of tools, but - * can break compatibility with the built-in Acrobat geospatial tools (yes, GeoPDF - * format is a mess!). + * \warning This results in Geospatial PDF files compatible with some non-open source friendly suites of tools, but + * can break compatibility with the built-in Acrobat geospatial tools (yes, third party providers of the Geospatial PDF + * format are a mess!). */ bool useOgcBestPracticeFormatGeoreferencing = false; @@ -274,9 +274,9 @@ class CORE_EXPORT QgsAbstractGeoPdfExporter QMap< QString, bool > initialLayerVisibility; /** - * Optional list of layer IDs, in the order desired to appear in the generated GeoPDF file. + * Optional list of layer IDs, in the order desired to appear in the generated Geospatial PDF file. * - * Layers appearing earlier in the list will show earlier in the GeoPDF layer tree list. + * Layers appearing earlier in the list will show earlier in the Geospatial PDF layer tree list. * * \see layerTreeGroupOrder * @@ -285,9 +285,9 @@ class CORE_EXPORT QgsAbstractGeoPdfExporter QStringList layerOrder; /** - * Specifies the ordering of layer tree groups in the generated GeoPDF file. + * Specifies the ordering of layer tree groups in the generated Geospatial PDF file. * - * Groups appearing earlier in the list will show earlier in the GeoPDF layer tree list. + * Groups appearing earlier in the list will show earlier in the Geospatial PDF layer tree list. * * \see layerOrder * \see customLayerTreeGroups @@ -312,7 +312,7 @@ class CORE_EXPORT QgsAbstractGeoPdfExporter * argument gives a list of additional layers to include in the generated PDF file. These must have already * been created, e.g. as a result of rendering layers to separate PDF source files. * - * Any features previously collected by calls to pushRenderedFeature() will be included automatically in the GeoPDF + * Any features previously collected by calls to pushRenderedFeature() will be included automatically in the Geospatial PDF * export. * * Returns TRUE if the operation was successful, or FALSE if an error occurred. If an error occurred, it @@ -326,13 +326,13 @@ class CORE_EXPORT QgsAbstractGeoPdfExporter QString errorMessage() const { return mErrorMessage; } /** - * Returns a file path to use for temporary files required for GeoPDF creation. + * Returns a file path to use for temporary files required for Geospatial PDF creation. */ QString generateTemporaryFilepath( const QString &filename ) const; /** * Returns TRUE if the specified composition \a mode is supported for layers - * during GeoPDF exports. + * during Geospatial PDF exports. * * \since QGIS 3.14 */ @@ -341,7 +341,7 @@ class CORE_EXPORT QgsAbstractGeoPdfExporter protected: /** - * Contains information relating to a single PDF layer in the GeoPDF export. + * Contains information relating to a single PDF layer in the Geospatial PDF export. */ struct VectorComponentDetail { diff --git a/src/core/qgsmapsettingsutils.h b/src/core/qgsmapsettingsutils.h index 1391749deb73..a828ff265f51 100644 --- a/src/core/qgsmapsettingsutils.h +++ b/src/core/qgsmapsettingsutils.h @@ -39,7 +39,7 @@ class CORE_EXPORT QgsMapSettingsUtils */ enum class EffectsCheckFlag : int SIP_ENUM_BASETYPE( IntFlag ) { - IgnoreGeoPdfSupportedEffects = 1 << 0, //!< Ignore advanced effects which are supported in GeoPDF exports + IgnoreGeoPdfSupportedEffects = 1 << 0, //!< Ignore advanced effects which are supported in Geospatial PDF exports }; Q_DECLARE_FLAGS( EffectsCheckFlags, EffectsCheckFlag ) diff --git a/src/gui/layout/qgslayoutpdfexportoptionsdialog.h b/src/gui/layout/qgslayoutpdfexportoptionsdialog.h index 68c39c5aec44..886a31e55f47 100644 --- a/src/gui/layout/qgslayoutpdfexportoptionsdialog.h +++ b/src/gui/layout/qgslayoutpdfexportoptionsdialog.h @@ -45,9 +45,9 @@ class GUI_EXPORT QgsLayoutPdfExportOptionsDialog: public QDialog, private Ui::Qg /** * Constructor for QgsLayoutPdfExportOptionsDialog * \param parent parent widget - * \param allowGeoPdfExport set to FALSE if geoPdf export is blocked - * \param geoPdfReason set to a descriptive translated string explaining why geopdf export is not available if applicable - * \param geoPdfLayerOrder optional layer ID order list for layers in the geopdf file. Any layers not present in this list + * \param allowGeoPdfExport set to FALSE if Geospatial PDF export is blocked + * \param geoPdfReason set to a descriptive translated string explaining why Geospatial PDF export is not available if applicable + * \param geoPdfLayerOrder optional layer ID order list for layers in the Geospatial PDF file. Any layers not present in this list * will instead be appended to the end of the geopdf layer list * \param flags window flags */ @@ -89,9 +89,9 @@ class GUI_EXPORT QgsLayoutPdfExportOptionsDialog: public QDialog, private Ui::Qg //! Returns whether lossless image compression is enabled bool losslessImageExport() const; - //! Sets whether to export a Geo-PDF + //! Sets whether to export a Geospatial PDF void setExportGeoPdf( bool enabled ); - //! Returns whether Geo-PDF export is enabled + //! Returns whether Geospatial PDF export is enabled bool exportGeoPdf() const; //! Sets whether to use OGC best-practice format @@ -104,10 +104,10 @@ class GUI_EXPORT QgsLayoutPdfExportOptionsDialog: public QDialog, private Ui::Qg //! Returns the list of export themes QStringList exportThemes() const; - //! Returns a list of map layer IDs in the desired order they should appear in a generated GeoPDF file + //! Returns a list of map layer IDs in the desired order they should appear in a generated Geospatial PDF file QStringList geoPdfLayerOrder() const; - //! Returns a list of groups in the desired order they should appear in a generated GeoPDF file + //! Returns a list of groups in the desired order they should appear in a generated Geospatial PDF file QStringList geoPdfGroupOrder() const; //! Sets whether to open the pdf after exporting it diff --git a/src/server/services/wms/qgswmsparameters.h b/src/server/services/wms/qgswmsparameters.h index 63d85d9ca9aa..bc41615b3571 100644 --- a/src/server/services/wms/qgswmsparameters.h +++ b/src/server/services/wms/qgswmsparameters.h @@ -1418,7 +1418,7 @@ namespace QgsWms bool exportLinesWithZeroWidth() const; /** - * Returns if a GeoPDF shall be exported + * Returns if a Geospatial PDF shall be exported * \since QGIS 3.32 */ bool writeGeoPdf() const; @@ -1478,7 +1478,7 @@ namespace QgsWms bool pdfUseOgcBestPracticeFormatGeoreferencing() const; /** - * Returns map themes for GeoPDF export + * Returns map themes for Geospatial PDF export * \since QGIS 3.32 */ QStringList pdfExportMapThemes() const; diff --git a/src/ui/layout/qgslayoutitemwidgetbase.ui b/src/ui/layout/qgslayoutitemwidgetbase.ui index 199ee7ed0d7b..1294e2729592 100644 --- a/src/ui/layout/qgslayoutitemwidgetbase.ui +++ b/src/ui/layout/qgslayoutitemwidgetbase.ui @@ -752,7 +752,7 @@ - GeoPDF group + Geospatial PDF group diff --git a/src/ui/layout/qgspdfexportoptions.ui b/src/ui/layout/qgspdfexportoptions.ui index 82255c19bbc6..abbd454e1325 100644 --- a/src/ui/layout/qgspdfexportoptions.ui +++ b/src/ui/layout/qgspdfexportoptions.ui @@ -106,7 +106,7 @@ - Create Geospatial PDF (GeoPDF) + Create Geospatial PDF true @@ -215,7 +215,7 @@ - Uncheck layers to avoid exporting vector feature information for those layers, and optionally set the group name to allow multiple layers to be joined into a single logical PDF group. Layers can be dragged and dropped to rearrange their order in the generated GeoPDF table of contents. + Uncheck layers to avoid exporting vector feature information for those layers, and optionally set the group name to allow multiple layers to be joined into a single logical PDF group. Layers can be dragged and dropped to rearrange their order in the generated Geospatial PDF table of contents. true diff --git a/src/ui/qgsmapsavedialog.ui b/src/ui/qgsmapsavedialog.ui index 26e9446e2ccc..b8cf03fd6d1b 100644 --- a/src/ui/qgsmapsavedialog.ui +++ b/src/ui/qgsmapsavedialog.ui @@ -69,7 +69,7 @@ - Create Geospatial PDF (GeoPDF) + Create Geospatial PDF true