Remove processing sip bindings from sip blacklist

This commit is contained in:
Nyall Dawson 2017-04-02 17:04:47 +10:00
parent bed74fc24a
commit f831a3c1a2
6 changed files with 226 additions and 148 deletions

View File

@ -243,9 +243,6 @@ core/layertree/qgslayertreemodellegendnode.sip
core/layertree/qgslayertreenode.sip
core/layertree/qgslayertreeregistrybridge.sip
core/layertree/qgslayertreeutils.sip
core/processing/qgsprocessingfeedback.sip
core/processing/qgsprocessingprovider.sip
core/processing/qgsprocessingregistry.sip
core/raster/qgsbilinearrasterresampler.sip
core/raster/qgsbrightnesscontrastfilter.sip
core/raster/qgscliptominmaxenhancement.sip

View File

@ -1,72 +1,94 @@
/**
* \class QgsProcessingFeedback
* \ingroup core
* Base class for providing feedback from a processing algorithm.
*
* This base class implementation silently ignores all feedback reported by algorithms.
* Subclasses of QgsProcessingFeedback can be used to log this feedback or report
* it to users via the GUI.
* \note added in QGIS 3.0
*/
class QgsProcessingFeedback : public QgsFeedback
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/processing/qgsprocessingfeedback.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
class QgsProcessingFeedback : QgsFeedback
{
%Docstring
\class QgsProcessingFeedback
\ingroup core
Base class for providing feedback from a processing algorithm.
This base class implementation silently ignores all feedback reported by algorithms.
Subclasses of QgsProcessingFeedback can be used to log this feedback or report
it to users via the GUI.
\note added in QGIS 3.0
%End
%TypeHeaderCode
#include <qgsprocessingfeedback.h>
#include "qgsprocessingfeedback.h"
%End
public:
/**
* Sets a progress report text string. This can be used in conjunction with
* setProgress() to provide detailed progress reports, such as "Transformed
* 4 of 5 layers".
* @see setProgress()
*/
virtual void setProgressText( const QString& text );
virtual void setProgressText( const QString &text );
%Docstring
Sets a progress report text string. This can be used in conjunction with
setProgress() to provide detailed progress reports, such as "Transformed
4 of 5 layers".
@see setProgress()
%End
/**
* Reports that the algorithm encountered an error which prevented it
* from successfully executing.
*/
virtual void reportError( const QString& error );
virtual void reportError( const QString &error );
%Docstring
Reports that the algorithm encountered an error which prevented it
from successfully executing.
%End
/**
* Pushes a general informational message from the algorithm. This can
* be used to report feedback which is neither a status report or an
* error, such as "Found 47 matching features".
* @see pushCommandInfo()
* @see pushDebugInfo()
* @see pushConsoleInfo()
*/
virtual void pushInfo( const QString& info );
virtual void pushInfo( const QString &info );
%Docstring
Pushes a general informational message from the algorithm. This can
be used to report feedback which is neither a status report or an
error, such as "Found 47 matching features".
@see pushCommandInfo()
@see pushDebugInfo()
@see pushConsoleInfo()
%End
/**
* Pushes an informational message containing a command from the algorithm.
* This is usually used to report commands which are executed in an external
* application or as subprocesses.
* @see pushInfo()
* @see pushDebugInfo()
* @see pushConsoleInfo()
*/
virtual void pushCommandInfo( const QString& info );
virtual void pushCommandInfo( const QString &info );
%Docstring
Pushes an informational message containing a command from the algorithm.
This is usually used to report commands which are executed in an external
application or as subprocesses.
@see pushInfo()
@see pushDebugInfo()
@see pushConsoleInfo()
%End
/**
* Pushes an informational message containing debugging helpers from
* the algorithm.
* @see pushInfo()
* @see pushCommandInfo()
* @see pushConsoleInfo()
*/
virtual void pushDebugInfo( const QString& info );
virtual void pushDebugInfo( const QString &info );
%Docstring
Pushes an informational message containing debugging helpers from
the algorithm.
@see pushInfo()
@see pushCommandInfo()
@see pushConsoleInfo()
%End
/**
* Pushes a console feedback message from the algorithm. This is used to
* report the output from executing an external command or subprocess.
* @see pushInfo()
* @see pushDebugInfo()
* @see pushCommandInfo()
*/
virtual void pushConsoleInfo( const QString& info );
virtual void pushConsoleInfo( const QString &info );
%Docstring
Pushes a console feedback message from the algorithm. This is used to
report the output from executing an external command or subprocess.
@see pushInfo()
@see pushDebugInfo()
@see pushCommandInfo()
%End
};
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/processing/qgsprocessingfeedback.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

View File

@ -1,56 +1,82 @@
/**
* \class QgsProcessingProvider
* \ingroup core
* Abstract base class for processing providers. An algorithm provider is a set of
* related algorithms, typically from the same external application or related
* to a common area of analysis.
* \note added in QGIS 3.0
*/
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/processing/qgsprocessingprovider.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
class QgsProcessingProvider
{
%Docstring
\class QgsProcessingProvider
\ingroup core
Abstract base class for processing providers. An algorithm provider is a set of
related algorithms, typically from the same external application or related
to a common area of analysis.
\note added in QGIS 3.0
%End
%TypeHeaderCode
#include <qgsprocessingprovider.h>
#include "qgsprocessingprovider.h"
%End
public:
QgsProcessingProvider();
%Docstring
Constructor for QgsProcessingProvider.
%End
virtual ~QgsProcessingProvider();
/**
* Returns an icon for the provider.
* @see svgIcon()
*/
virtual QIcon icon() const;
%Docstring
Returns an icon for the provider.
@see svgIconPath()
%End
/**
* Returns a path to an SVG version of the provider's icon.
* @see icon()
*/
virtual QString svgIconPath() const;
%Docstring
Returns a path to an SVG version of the provider's icon.
@see icon()
%End
/**
* Returns the unique provider id, used for identifying the provider. This string
* should be a unique, short, character only string, eg "qgis" or "gdal". This
* string should not be localised.
* @see name()
*/
virtual QString id() const = 0;
%Docstring
Returns the unique provider id, used for identifying the provider. This string
should be a unique, short, character only string, eg "qgis" or "gdal". This
string should not be localised.
@see name()
%End
/**
* Returns the full provider name, which is used to describe the provider within the GUI.
* This string should be localised.
* @see id()
*/
virtual QString name() const = 0;
%Docstring
Returns the full provider name, which is used to describe the provider within the GUI.
This string should be localised.
@see id()
%End
virtual bool canBeActivated() const;
%Docstring
Returns true if the provider can be activated, or false if it cannot be activated (e.g. due to
missing external dependencies).
%End
private:
//! Providers cannot be copied
QgsProcessingProvider( const QgsProcessingProvider& other );
//! Providers cannot be copied
//QgsProcessingProvider& operator=( const QgsProcessingProvider& other );
QgsProcessingProvider( const QgsProcessingProvider &other );
};
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/processing/qgsprocessingprovider.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

View File

@ -1,72 +1,95 @@
/**
* \class QgsProcessingRegistry
* \ingroup core
* Registry for various processing components, including providers, algorithms
* and various parameters and outputs.
*
* QgsProcessingRegistry is not usually directly created, but rather accessed through
* QgsApplication::processingRegistry().
* \note added in QGIS 3.0
*/
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/processing/qgsprocessingregistry.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
class QgsProcessingRegistry : QObject
{
%Docstring
\class QgsProcessingRegistry
\ingroup core
Registry for various processing components, including providers, algorithms
and various parameters and outputs.
QgsProcessingRegistry is not usually directly created, but rather accessed through
QgsApplication::processingRegistry().
\note added in QGIS 3.0
%End
%TypeHeaderCode
#include <qgsprocessingregistry.h>
#include "qgsprocessingregistry.h"
%End
public:
/**
* Constructor for QgsProcessingRegistry.
*/
QgsProcessingRegistry( QObject* parent /TransferThis/ = nullptr );
QgsProcessingRegistry( QObject *parent /TransferThis/ = 0 );
%Docstring
Constructor for QgsProcessingRegistry.
%End
~QgsProcessingRegistry();
/**
* Get list of available providers.
*/
QList<QgsProcessingProvider*> providers() const;
/**
* Add a processing provider to the registry. Ownership of the provider is transferred to the registry.
* Returns false if the provider could not be added (eg if a provider with a duplicate ID already exists
* in the registry).
* @see removeProvider()
*/
bool addProvider( QgsProcessingProvider* provider /Transfer/ );
QList<QgsProcessingProvider *> providers() const;
%Docstring
Get list of available providers.
%End
/**
* Removes a provider implementation from the registry (the provider object is deleted).
* Returns false if the provider could not be removed (eg provider does not exist in the registry).
* @see addProvider()
*/
bool removeProvider( QgsProcessingProvider* provider );
bool addProvider( QgsProcessingProvider *provider /Transfer/ );
%Docstring
Add a processing provider to the registry. Ownership of the provider is transferred to the registry.
Returns false if the provider could not be added (eg if a provider with a duplicate ID already exists
in the registry).
@see removeProvider()
%End
/**
* Removes a provider implementation from the registry (the provider object is deleted).
* Returns false if the provider could not be removed (eg provider does not exist in the registry).
* @see addProvider()
*/
bool removeProvider( const QString& providerId );
bool removeProvider( QgsProcessingProvider *provider );
%Docstring
Removes a provider implementation from the registry (the provider object is deleted).
Returns false if the provider could not be removed (eg provider does not exist in the registry).
@see addProvider()
%End
/**
* Returns a matching provider by provider ID.
*/
QgsProcessingProvider* providerById( const QString& id );
bool removeProvider( const QString &providerId );
%Docstring
Removes a provider implementation from the registry (the provider object is deleted).
Returns false if the provider could not be removed (eg provider does not exist in the registry).
@see addProvider()
%End
QgsProcessingProvider *providerById( const QString &id );
%Docstring
Returns a matching provider by provider ID.
%End
signals:
//! Emitted when a provider has been added to the registry.
void providerAdded( const QString& id );
void providerAdded( const QString &id );
%Docstring
Emitted when a provider has been added to the registry.
%End
//! Emitted when a provider is removed from the registry
void providerRemoved( const QString& id );
void providerRemoved( const QString &id );
%Docstring
Emitted when a provider is removed from the registry
%End
private:
//! Registry cannot be copied
QgsProcessingRegistry( const QgsProcessingRegistry& other );
//! Registry cannot be copied
//QgsProcessingRegistry& operator=( const QgsProcessingRegistry& other );
QgsProcessingRegistry( const QgsProcessingRegistry &other );
};
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/processing/qgsprocessingregistry.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

View File

@ -79,6 +79,11 @@ class CORE_EXPORT QgsProcessingProvider
*/
virtual bool canBeActivated() const { return true; }
private:
#ifdef SIP_RUN
QgsProcessingProvider( const QgsProcessingProvider &other );
#endif
};
#endif // QGSPROCESSINGPROVIDER_H

View File

@ -19,6 +19,7 @@
#define QGSPROCESSINGREGISTRY_H
#include "qgis_core.h"
#include "qgis.h"
#include "qgsprocessingprovider.h"
#include <QMap>
@ -41,7 +42,7 @@ class CORE_EXPORT QgsProcessingRegistry : public QObject
/**
* Constructor for QgsProcessingRegistry.
*/
QgsProcessingRegistry( QObject *parent = nullptr );
QgsProcessingRegistry( QObject *parent SIP_TRANSFERTHIS = nullptr );
~QgsProcessingRegistry();
@ -61,7 +62,7 @@ class CORE_EXPORT QgsProcessingRegistry : public QObject
* in the registry).
* @see removeProvider()
*/
bool addProvider( QgsProcessingProvider *provider );
bool addProvider( QgsProcessingProvider *provider SIP_TRANSFER );
/**
* Removes a provider implementation from the registry (the provider object is deleted).
@ -94,6 +95,10 @@ class CORE_EXPORT QgsProcessingRegistry : public QObject
//! Map of available providers by id. This class owns the pointers
QMap<QString, QgsProcessingProvider *> mProviders;
#ifdef SIP_RUN
QgsProcessingRegistry( const QgsProcessingRegistry &other );
#endif
};
#endif // QGSPROCESSINGREGISTRY_H