sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Port algorithm countVisibleParameters to c++"

Browse Source 
This reverts commit c3c694f8ccfbe0b64df14365f950f5895968a66a.
This commit is contained in:
Nyall Dawson 2017-05-15 10:24:38 +10:00
parent a4b7af7fad
commit ae97c333d6
9 changed files with 13 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/core/processing/qgsprocessingalgorithm.sip
View File

@ -128,13 +128,6 @@ class QgsProcessingAlgorithm
:rtype: QgsProcessingParameterDefinition
%End
int countVisibleParameters() const;
%Docstring
Returns the number of visible (non-hidden) parameters defined by this
algorithm.
:rtype: int
%End
virtual QVariantMap run( const QVariantMap &parameters,
QgsProcessingContext &context, QgsProcessingFeedback *feedback ) const;
%Docstring

9
python/plugins/processing/core/GeoAlgorithm.py
View File

@ -430,6 +430,15 @@ class GeoAlgorithm(QgsProcessingAlgorithm):
i += 1
return i
def getVisibleParametersCount(self):
"""Returns the number of non-hidden parameters.
"""
i = 0
for param in self.parameters:
if not param.hidden:
i += 1
return i
def getHTMLOutputsCount(self):
"""Returns the number of HTML outputs.
"""

2
python/plugins/processing/core/Processing.py
View File

@ -170,7 +170,7 @@ class Processing(object):
Processing.tr("Processing"))
return
else:
if len(args) != alg.countVisibleParameters() + alg.getVisibleOutputsCount():
if len(args) != alg.getVisibleParametersCount() + alg.getVisibleOutputsCount():
# fix_print_with_import
print('Error: Wrong number of parameters')
QgsMessageLog.logMessage(Processing.tr('Error: Wrong number of parameters'),

2
python/plugins/processing/gui/BatchPanel.py
View File

@ -102,7 +102,7 @@ class BatchPanel(BASE, WIDGET):
nOutputs = 0
self.tblParameters.setColumnCount(
self.alg.countVisibleParameters() + nOutputs)
self.alg.getVisibleParametersCount() + nOutputs)
# Table headers
column = 0

2
python/plugins/processing/gui/ProcessingToolbox.py
View File

@ -275,7 +275,7 @@ class ProcessingToolbox(BASE, WIDGET):
alg = alg.getCopy()
alg.setProvider(provider)
if (alg.countVisibleParameters() + alg.getVisibleOutputsCount()) > 0:
if (alg.getVisibleParametersCount() + alg.getVisibleOutputsCount()) > 0:
dlg = alg.getCustomParametersDialog()
if not dlg:
dlg = AlgorithmDialog(alg)

2
python/plugins/processing/gui/menus.py
View File

@ -210,7 +210,7 @@ def _executeAlgorithm(alg):
alg.setProvider(provider)
context = dataobjects.createContext()
if (alg.countVisibleParameters() + alg.getVisibleOutputsCount()) > 0:
if (alg.getVisibleParametersCount() + alg.getVisibleOutputsCount()) > 0:
dlg = alg.getCustomParametersDialog()
if not dlg:
dlg = AlgorithmDialog(alg)

11
src/core/processing/qgsprocessingalgorithm.cpp
View File

@ -87,17 +87,6 @@ const QgsProcessingParameterDefinition *QgsProcessingAlgorithm::parameterDefinit
return nullptr;
}
int QgsProcessingAlgorithm::countVisibleParameters() const
{
int count = 0;
Q_FOREACH ( const QgsProcessingParameterDefinition *def, mParameters )
{
if ( !( def->flags() & QgsProcessingParameterDefinition::FlagHidden ) )
count++;
}
return count;
}
QString QgsProcessingAlgorithm::parameterAsString( const QVariantMap &parameters, const QString &name, const QgsProcessingContext &context ) const
{
return QgsProcessingParameters::parameterAsString( parameterDefinition( name ), parameters, name, context );

6
src/core/processing/qgsprocessingalgorithm.h
View File

@ -142,12 +142,6 @@ class CORE_EXPORT QgsProcessingAlgorithm
*/
const QgsProcessingParameterDefinition *parameterDefinition( const QString &name ) const;
/**
* Returns the number of visible (non-hidden) parameters defined by this
* algorithm.
*/
int countVisibleParameters() const;
/**
* Runs the algorithm using the specified \a parameters. Algorithms should implement
* their custom processing logic here.

9
tests/src/core/testqgsprocessing.cpp
View File

@ -62,15 +62,6 @@ class DummyAlgorithm : public QgsProcessingAlgorithm
// parameterDefinition should be case insensitive
QCOMPARE( parameterDefinition( "P1" ), parameterDefinitions().at( 0 ) );
QVERIFY( !parameterDefinition( "invalid" ) );
QCOMPARE( countVisibleParameters(), 1 );
QgsProcessingParameterBoolean *p3 = new QgsProcessingParameterBoolean( "p3" );
QVERIFY( addParameter( p3 ) );
QCOMPARE( countVisibleParameters(), 2 );
QgsProcessingParameterBoolean *p4 = new QgsProcessingParameterBoolean( "p4" );
p4->setFlags( QgsProcessingParameterDefinition::FlagHidden );
QVERIFY( addParameter( p4 ) );
QCOMPARE( countVisibleParameters(), 2 );
}
};