Skip to content

Commit

Permalink
Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Sep 4, 2018
1 parent 3c2499b commit d563034
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 80 deletions.
Original file line number Diff line number Diff line change
@@ -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 *
************************************************************************/
Expand Down Expand Up @@ -32,7 +32,7 @@ QgsGui.processingGuiRegistry()->createModelerParameterWidget().
%End

%TypeHeaderCode
#include "qgsprocessingmodelerwidget.h"
#include "qgsprocessingmodelerparameterwidget.h"
%End
public:

Expand Down Expand Up @@ -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()`
Expand Down Expand Up @@ -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 *
************************************************************************/
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion python/gui/gui_auto.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/core/processing/qgsprocessingparameters.h
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ Q_DECLARE_METATYPE( QgsProcessingOutputLayerDefinition )
* \since QGIS 3.0
*/

class CORE_EXPORT QgsProcessingParameterDefinition
class CORE_EXPORT QgsProcessingParameterDefinition
{

#ifdef SIP_RUN
Expand Down
4 changes: 2 additions & 2 deletions src/gui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/gui/processing/qgsprocessinggui.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -16,7 +16,7 @@
***************************************************************************/


#include "qgsprocessingmodelerwidget.h"
#include "qgsprocessingmodelerparameterwidget.h"
#include "qgsprocessingparameters.h"
#include "qgsexpressionlineedit.h"
#include "qgsprocessingguiregistry.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -16,8 +16,8 @@
***************************************************************************/


#ifndef QGSPROCESSINGMODELERWIDGETWRAPPER_H
#define QGSPROCESSINGMODELERWIDGETWRAPPER_H
#ifndef QGSPROCESSINGMODELERPARAMETERWIDGET_H
#define QGSPROCESSINGMODELERPARAMETERWIDGET_H

#include <QWidget>
#include "qgis_gui.h"
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -161,4 +161,4 @@ class GUI_EXPORT QgsProcessingModelerParameterWidget : public QWidget
};


#endif // QGSPROCESSINGMODELERWIDGETWRAPPER_H
#endif // QGSPROCESSINGMODELERPARAMETERWIDGET_H
2 changes: 1 addition & 1 deletion src/gui/processing/qgsprocessingwidgetwrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include "qgsprocessingwidgetwrapper.h"
#include "qgsprocessingparameters.h"
#include "qgsprocessingmodelerwidget.h"
#include "qgsprocessingmodelerparameterwidget.h"
#include "qgspropertyoverridebutton.h"
#include <QLabel>
#include <QHBoxLayout>
Expand Down
6 changes: 0 additions & 6 deletions src/gui/processing/qgsprocessingwidgetwrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
52 changes: 0 additions & 52 deletions src/gui/processing/qgsprocessingwidgetwrapperimpl.h.bom

This file was deleted.

2 changes: 1 addition & 1 deletion tests/src/gui/testprocessinggui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit d563034

Please sign in to comment.