Skip to content

Commit

Permalink
Try to clean all traces of the Graphical modeler and replace by Model…
Browse files Browse the repository at this point in the history
… Designer
  • Loading branch information
SrNetoChan authored and nyalldawson committed Aug 5, 2023
1 parent b252da6 commit 1c30d61
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 36 deletions.
40 changes: 20 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ QGIS is a full-featured, user-friendly, free-and-open-source (FOSS) geographical

<!-- TOC generated with https://freelance-tech-writer.github.io/table-of-contents-generator/index.html -->

* [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

Expand Down Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand All @@ -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`

Expand All @@ -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.

Expand All @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/grassprovider/grass7.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/ProcessingPlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ def initGui(self):

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,
Expand Down
14 changes: 7 additions & 7 deletions src/core/processing/models/qgsprocessingmodelcomponent.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand All @@ -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()
Expand All @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion src/ui/processing/qgsmodeldesignerdialogbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Graphical Modeler</string>
<string>Model Designer</string>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QVBoxLayout" name="mainLayout">
Expand Down

0 comments on commit 1c30d61

Please sign in to comment.