From 1c30d618aa55f257f1ca5417e8e0dea83c81821f Mon Sep 17 00:00:00 2001 From: Alexandre Neto Date: Wed, 2 Aug 2023 01:08:07 +0100 Subject: [PATCH] Try to clean all traces of the Graphical modeler and replace by Model Designer --- README.md | 40 +++++++++---------- .../models/qgsprocessingmodelcomponent.sip.in | 12 +++--- python/plugins/grassprovider/grass7.txt | 2 +- python/plugins/processing/ProcessingPlugin.py | 2 +- .../models/qgsprocessingmodelcomponent.h | 14 +++---- .../processing/qgsmodeldesignerdialogbase.ui | 2 +- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index f9a25934be9..ea8333bacc2 100644 --- a/README.md +++ b/README.md @@ -10,23 +10,23 @@ QGIS is a full-featured, user-friendly, free-and-open-source (FOSS) geographical - * [Features](#features) - * [1. Flexible and powerful spatial data management](#1-flexible-and-powerful-spatial-data-management) - * [2. Beautiful cartography](#2-beautiful-cartography) - * [3. Advanced and robust geospatial analysis](#3-advanced-and-robust-geospatial-analysis) - * [4. Powerful customization and extensibility](#4-powerful-customization-and-extensibility) - * [5. QGIS Server](#5-qgis-server) - * [Under the hood](#under-the-hood) - * [Versions and release cycle](#versions-and-release-cycle) - * [Free and Open Source](#free-and-open-source) - * [Installing and using QGIS](#installing-and-using-qgis) - * [Documentation](#documentation) - * [Help and support channels](#help-and-support-channels) - * [Get involved with the community](#get-involved-with-the-community) - * [Bug reporting and bug fixing](#bug-reporting-and-bug-fixing) - * [New features and enhancements](#new-features-and-enhancements) - * [Translations](#translations) - * [Other ways to contribute](#other-ways-to-contribute) +- [Features](#features) + - [1. Flexible and powerful spatial data management](#1-flexible-and-powerful-spatial-data-management) + - [2. Beautiful cartography](#2-beautiful-cartography) + - [3. Advanced and robust geospatial analysis](#3-advanced-and-robust-geospatial-analysis) + - [4. Powerful customization and extensibility](#4-powerful-customization-and-extensibility) + - [5. QGIS Server](#5-qgis-server) +- [Under the hood](#under-the-hood) + - [Versions and release cycle](#versions-and-release-cycle) + - [Free and Open Source](#free-and-open-source) +- [Installing and using QGIS](#installing-and-using-qgis) + - [Documentation](#documentation) + - [Help and support channels](#help-and-support-channels) +- [Get involved with the community](#get-involved-with-the-community) + - [Bug reporting and bug fixing](#bug-reporting-and-bug-fixing) + - [New features and enhancements](#new-features-and-enhancements) + - [Translations](#translations) + - [Other ways to contribute](#other-ways-to-contribute) ## Features @@ -78,15 +78,15 @@ For more maps created with QGIS, visit the [QGIS Map Showcase Flickr Group](http - Access to 1000+ processing algorithms via providers such as GDAL, SAGA, GRASS, OrfeoToolbox, as well as custom models and processing scripts - Geospatial database engine (filters, joins, relations, forms, etc.), as close to datasource- and format-independent as possible - Immediate visualization of geospatial query and geoprocessing results -- Graphical modeler and batch processing +- Model designer and batch processing *Example: Travel isochrones* ![Example: Travel isochrones](images/README-md/network_analysis_2.png "Travel isochrones") -*Example: Graphical model* +*Example: Model designer* -![Example: graphical model](https://docs.qgis.org/latest/en/_images/models_model.png "Graphical model") +![Example: model designer](https://docs.qgis.org/latest/en/_images/models_model.png "Model designer") ### 4. Powerful customization and extensibility diff --git a/python/core/auto_generated/processing/models/qgsprocessingmodelcomponent.sip.in b/python/core/auto_generated/processing/models/qgsprocessingmodelcomponent.sip.in index e375686da23..63dee368ebf 100644 --- a/python/core/auto_generated/processing/models/qgsprocessingmodelcomponent.sip.in +++ b/python/core/auto_generated/processing/models/qgsprocessingmodelcomponent.sip.in @@ -42,21 +42,21 @@ Sets the friendly ``description`` text for the component. QPointF position() const; %Docstring -Returns the position of the model component within the graphical modeler. +Returns the position of the model component within the model designer. .. seealso:: :py:func:`setPosition` %End void setPosition( QPointF position ); %Docstring -Sets the ``position`` of the model component within the graphical modeler. +Sets the ``position`` of the model component within the model designer. .. seealso:: :py:func:`position` %End QSizeF size() const; %Docstring -Returns the size of the model component within the graphical modeler. +Returns the size of the model component within the model designer. .. seealso:: :py:func:`setSize` @@ -65,7 +65,7 @@ Returns the size of the model component within the graphical modeler. void setSize( QSizeF size ); %Docstring -Sets the ``size`` of the model component within the graphical modeler. +Sets the ``size`` of the model component within the model designer. .. seealso:: :py:func:`size` @@ -74,7 +74,7 @@ Sets the ``size`` of the model component within the graphical modeler. QColor color() const; %Docstring -Returns the color of the model component within the graphical modeler. +Returns the color of the model component within the model designer. An invalid color indicates that the default color for the component should be used. @@ -85,7 +85,7 @@ An invalid color indicates that the default color for the component should be us void setColor( const QColor &color ); %Docstring -Sets the ``color`` of the model component within the graphical modeler. An invalid ``color`` +Sets the ``color`` of the model component within the model designer. An invalid ``color`` indicates that the default color for the component should be used. .. seealso:: :py:func:`color` diff --git a/python/plugins/grassprovider/grass7.txt b/python/plugins/grassprovider/grass7.txt index 21e76a2487a..c9c05585b14 100644 --- a/python/plugins/grassprovider/grass7.txt +++ b/python/plugins/grassprovider/grass7.txt @@ -2,7 +2,7 @@ A short guide for creating and editing GRASS GIS 7 algorithms: ----------------------------------------------------------------------- Each GRASS command, to be executed from a processing framework element such as the toolbox -or the graphical modeler, needs to be described to let it know the inputs +or the model designer, needs to be described to let it know the inputs required by the commands, the output it generates and the parameters that are used to configure it. Each command is described in a separate text file, although some commands might be split in several algorithms, thus needing several files diff --git a/python/plugins/processing/ProcessingPlugin.py b/python/plugins/processing/ProcessingPlugin.py index 91190c83b4c..98bbe01ee78 100644 --- a/python/plugins/processing/ProcessingPlugin.py +++ b/python/plugins/processing/ProcessingPlugin.py @@ -262,7 +262,7 @@ class ProcessingPlugin(QObject): self.modelerAction = QAction( QgsApplication.getThemeIcon("/processingModel.svg"), - QCoreApplication.translate('ProcessingPlugin', '&Graphical Modeler…'), self.iface.mainWindow()) + QCoreApplication.translate('ProcessingPlugin', '&Model Designer…'), self.iface.mainWindow()) self.modelerAction.setObjectName('modelerAction') self.modelerAction.triggered.connect(self.openModeler) self.iface.registerMainWindowAction(self.modelerAction, diff --git a/src/core/processing/models/qgsprocessingmodelcomponent.h b/src/core/processing/models/qgsprocessingmodelcomponent.h index 41ec7e8aa1a..d33ea91edfa 100644 --- a/src/core/processing/models/qgsprocessingmodelcomponent.h +++ b/src/core/processing/models/qgsprocessingmodelcomponent.h @@ -52,33 +52,33 @@ class CORE_EXPORT QgsProcessingModelComponent void setDescription( const QString &description ); /** - * Returns the position of the model component within the graphical modeler. + * Returns the position of the model component within the model designer. * \see setPosition() */ QPointF position() const; /** - * Sets the \a position of the model component within the graphical modeler. + * Sets the \a position of the model component within the model designer. * \see position() */ void setPosition( QPointF position ); /** - * Returns the size of the model component within the graphical modeler. + * Returns the size of the model component within the model designer. * \see setSize() * \since QGIS 3.14 */ QSizeF size() const; /** - * Sets the \a size of the model component within the graphical modeler. + * Sets the \a size of the model component within the model designer. * \see size() * \since QGIS 3.14 */ void setSize( QSizeF size ); /** - * Returns the color of the model component within the graphical modeler. + * Returns the color of the model component within the model designer. * * An invalid color indicates that the default color for the component should be used. * @@ -88,7 +88,7 @@ class CORE_EXPORT QgsProcessingModelComponent QColor color() const; /** - * Sets the \a color of the model component within the graphical modeler. An invalid \a color + * Sets the \a color of the model component within the model designer. An invalid \a color * indicates that the default color for the component should be used. * * \see color() @@ -104,7 +104,7 @@ class CORE_EXPORT QgsProcessingModelComponent /** * Sets whether the link points for the specified \a edge for this component should be shown collapsed - * in the graphical modeler. + * in the model designer. * \see linksCollapsed() */ void setLinksCollapsed( Qt::Edge edge, bool collapsed ); diff --git a/src/ui/processing/qgsmodeldesignerdialogbase.ui b/src/ui/processing/qgsmodeldesignerdialogbase.ui index a7d1d6363f0..b143baa2718 100644 --- a/src/ui/processing/qgsmodeldesignerdialogbase.ui +++ b/src/ui/processing/qgsmodeldesignerdialogbase.ui @@ -11,7 +11,7 @@ - Graphical Modeler + Model Designer