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

Address review comments

Browse Source
This commit is contained in:
Nyall Dawson 2018-09-04 15:33:23 +10:00
parent 3c2499ba95
commit d563034583
12 changed files with 21 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/gui/auto_generated/processing/qgsprocessingmodelerwidget.sip.in → python/gui/auto_generated/processing/qgsprocessingmodelerparameterwidget.sip.in
View File

@ -1,7 +1,7 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/processing/qgsprocessingmodelerwidget.h *
* src/gui/processing/qgsprocessingmodelerparameterwidget.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@ -32,7 +32,7 @@ QgsGui.processingGuiRegistry()->createModelerParameterWidget().
%End
%TypeHeaderCode
#include "qgsprocessingmodelerwidget.h"
#include "qgsprocessingmodelerparameterwidget.h"
%End
public:
@ -65,7 +65,7 @@ Populates the widget with available sources for the parameter's value, e.g.
adding the available child algorithm outputs and model input parameter
choices.
In order to determine the available source, the ``compatibleParameterTypes``,
In order to determine the available source, the ``compatibleParameterTypes`` and
``compatibleOutputTypes`` arguments are used. These lists correspond to the
various available values for QgsProcessingParameterDefinition.type() (for
``compatibleParameterTypes``) and the values for :py:func:`QgsProcessingOutputDefinition.type()`
@ -107,7 +107,7 @@ Returns the current value of the parameter.
/************************************************************************
* This file has been generated automatically from *
* *
* src/gui/processing/qgsprocessingmodelerwidget.h *
* src/gui/processing/qgsprocessingmodelerparameterwidget.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

1
python/gui/auto_generated/processing/qgsprocessingwidgetwrapper.sip.in
View File

@ -234,7 +234,6 @@ The ``type`` argument indicates the dialog type to create a wrapper for.
.. seealso:: :py:func:`createModelerWidgetWrapper`
%End
virtual QgsProcessingModelerParameterWidget *createModelerWidgetWrapper( QgsProcessingModelAlgorithm *model,
const QString &childId,
const QgsProcessingParameterDefinition *parameter,

2
python/gui/gui_auto.sip
View File

@ -317,7 +317,7 @@
%Include auto_generated/locator/qgslocatorwidget.sip
%Include auto_generated/processing/qgsprocessingalgorithmconfigurationwidget.sip
%Include auto_generated/processing/qgsprocessingalgorithmdialogbase.sip
%Include auto_generated/processing/qgsprocessingmodelerwidget.sip
%Include auto_generated/processing/qgsprocessingmodelerparameterwidget.sip
%Include auto_generated/processing/qgsprocessingrecentalgorithmlog.sip
%Include auto_generated/processing/qgsprocessingtoolboxmodel.sip
%Include auto_generated/processing/qgsprocessingtoolboxtreeview.sip

2
src/core/processing/qgsprocessingparameters.h
View File

@ -198,7 +198,7 @@ Q_DECLARE_METATYPE( QgsProcessingOutputLayerDefinition )
* \since QGIS 3.0
*/
class CORE_EXPORT QgsProcessingParameterDefinition
class CORE_EXPORT QgsProcessingParameterDefinition
{
#ifdef SIP_RUN

4
src/gui/CMakeLists.txt
View File

@ -197,7 +197,7 @@ SET(QGIS_GUI_SRCS
processing/qgsprocessingalgorithmdialogbase.cpp
processing/qgsprocessingconfigurationwidgets.cpp
processing/qgsprocessingguiregistry.cpp
processing/qgsprocessingmodelerwidget.cpp
processing/qgsprocessingmodelerparameterwidget.cpp
processing/qgsprocessingrecentalgorithmlog.cpp
processing/qgsprocessingtoolboxmodel.cpp
processing/qgsprocessingtoolboxtreeview.cpp
@ -726,7 +726,7 @@ SET(QGIS_GUI_MOC_HDRS
processing/qgsprocessingalgorithmconfigurationwidget.h
processing/qgsprocessingalgorithmdialogbase.h
processing/qgsprocessingconfigurationwidgets.h
processing/qgsprocessingmodelerwidget.h
processing/qgsprocessingmodelerparameterwidget.h
processing/qgsprocessingrecentalgorithmlog.h
processing/qgsprocessingtoolboxmodel.h
processing/qgsprocessingtoolboxtreeview.h

4
src/gui/processing/qgsprocessinggui.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
qgsprocessingwidgetwrapper.h
---------------------
qgsprocessinggui.h
------------------
begin : August 2018
copyright : (C) 2018 by Nyall Dawson
email : nyall dot dawson at gmail dot com

6
src/gui/processing/qgsprocessingmodelerwidget.cpp → src/gui/processing/qgsprocessingmodelerparameterwidget.cpp
View File

@ -1,6 +1,6 @@
/***************************************************************************
qgsprocessingmodelerwidgetwrapper.cpp
---------------------
qgsprocessingmodelerparameterwidget.cpp
---------------------------------------
begin : August 2018
copyright : (C) 2018 by Nyall Dawson
email : nyall dot dawson at gmail dot com
@ -16,7 +16,7 @@
***************************************************************************/
#include "qgsprocessingmodelerwidget.h"
#include "qgsprocessingmodelerparameterwidget.h"
#include "qgsprocessingparameters.h"
#include "qgsexpressionlineedit.h"
#include "qgsprocessingguiregistry.h"

12
src/gui/processing/qgsprocessingmodelerwidget.h → src/gui/processing/qgsprocessingmodelerparameterwidget.h
View File

@ -1,6 +1,6 @@
/***************************************************************************
qgsprocessingmodelerwidgetwrapper.h
---------------------
qgsprocessingmodelerparameterwidget.h
-------------------------------------
begin : August 2018
copyright : (C) 2018 by Nyall Dawson
email : nyall dot dawson at gmail dot com
@ -16,8 +16,8 @@
***************************************************************************/
#ifndef QGSPROCESSINGMODELERWIDGETWRAPPER_H
#define QGSPROCESSINGMODELERWIDGETWRAPPER_H
#ifndef QGSPROCESSINGMODELERPARAMETERWIDGET_H
#define QGSPROCESSINGMODELERPARAMETERWIDGET_H
#include <QWidget>
#include "qgis_gui.h"
@ -87,7 +87,7 @@ class GUI_EXPORT QgsProcessingModelerParameterWidget : public QWidget
* adding the available child algorithm outputs and model input parameter
* choices.
*
* In order to determine the available source, the \a compatibleParameterTypes,
* In order to determine the available source, the \a compatibleParameterTypes and
* \a compatibleOutputTypes arguments are used. These lists correspond to the
* various available values for QgsProcessingParameterDefinition::type() (for
* \a compatibleParameterTypes) and the values for QgsProcessingOutputDefinition::type()
@ -161,4 +161,4 @@ class GUI_EXPORT QgsProcessingModelerParameterWidget : public QWidget
};
#endif // QGSPROCESSINGMODELERWIDGETWRAPPER_H
#endif // QGSPROCESSINGMODELERPARAMETERWIDGET_H

2
src/gui/processing/qgsprocessingwidgetwrapper.cpp
View File

@ -18,7 +18,7 @@
#include "qgsprocessingwidgetwrapper.h"
#include "qgsprocessingparameters.h"
#include "qgsprocessingmodelerwidget.h"
#include "qgsprocessingmodelerparameterwidget.h"
#include "qgspropertyoverridebutton.h"
#include <QLabel>
#include <QHBoxLayout>

6
src/gui/processing/qgsprocessingwidgetwrapper.h
View File

@ -275,12 +275,6 @@ class GUI_EXPORT QgsProcessingParameterWidgetFactoryInterface
virtual QgsAbstractProcessingParameterWidgetWrapper *createWidgetWrapper( const QgsProcessingParameterDefinition *parameter,
QgsProcessingGui::WidgetType type ) = 0 SIP_FACTORY;
/**
* Creates a new widget wrapper for the specified \a parameter definition.
*
* The \a type argument indicates the dialog type to create a wrapper for.
*/
/**
* Creates a new modeler parameter widget for the given \a parameter. This widget allows
* configuration of the parameter's value when used inside a Processing \a model.

52
src/gui/processing/qgsprocessingwidgetwrapperimpl.h.bom
View File

@ -1,52 +0,0 @@
/***************************************************************************
qgsprocessingwidgetwrapperimpl.h
---------------------
begin : August 2018
copyright : (C) 2018 by Nyall Dawson
email : nyall dot dawson at gmail dot com
***************************************************************************/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef QGSPROCESSINGWIDGETWRAPPERIMPL_H
#define QGSPROCESSINGWIDGETWRAPPERIMPL_H
#define SIP_NO_FILE
#include "qgsprocessingwidgetwrapper.h"
class QCheckBox;
class QgsProcessingBooleanWidgetWrapper : public QgsProcessingParameterWidgetWrapper
{
public:
QgsProcessingBooleanWidgetWrapper( const QgsProcessingParameterDefinition *parameter, QgsProcessingParameterWidgetWrapper::WidgetType type, QWidget *parent = nullptr );
void setValue( const QVariant &value ) override;
QVariant value() const override;
private:
QCheckBox *mCheckBox = nullptr;
};
class QgsProcessingBooleanWidgetFactory : public QgsProcessingParameterWidgetFactory
{
public:
QString parameterType() const override;
QgsProcessingParameterWidgetWrapper *createWidget( const QgsProcessingParameterDefinition *parameter, QgsProcessingParameterWidgetWrapper::WidgetType type ) override;
QLabel *createLabel( const QgsProcessingParameterDefinition *parameter, QgsProcessingParameterWidgetWrapper::WidgetType type ) override;
};
#endif // QGSPROCESSINGWIDGETWRAPPERIMPL_H

2
tests/src/gui/testprocessinggui.cpp
View File

@ -30,7 +30,7 @@
#include "qgsprocessingalgorithmconfigurationwidget.h"
#include "qgsprocessingwidgetwrapper.h"
#include "qgsprocessingwidgetwrapperimpl.h"
#include "qgsprocessingmodelerwidget.h"
#include "qgsprocessingmodelerparameterwidget.h"
#include "qgsnativealgorithms.h"
#include "processing/models/qgsprocessingmodelalgorithm.h"
#include "qgsxmlutils.h"