Skip to content

Commit b75f9f3

Browse files
m-kuhnm-kuhn
authoredSep 14, 2018
Merge pull request #7801 from signedav/qml-widget
[FEATURE] QML chart and drawings widget
·
ltr-3_40final-3_4_0
2 parents 2e91c29 + b8b737f commit b75f9f3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1086
-228
lines changed
 

‎debian/control.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ Architecture: all
7878
Depends:
7979
libjs-jquery,
8080
libjs-leaflet,
81-
${misc:Depends}
81+
${misc:Depends},
82+
qml-module-qtcharts
8283
Description: QGIS - architecture-independent data
8384
QGIS is a Geographic Information System (GIS) which manages, analyzes and
8485
display databases of geographic information.

‎python/core/auto_generated/qgsattributeeditorelement.sip.in

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ layer.
4747
AeTypeContainer,
4848
AeTypeField,
4949
AeTypeRelation,
50-
AeTypeInvalid
50+
AeTypeInvalid,
51+
AeTypeQmlElement
5152
};
5253

5354
QgsAttributeEditorElement( AttributeEditorType type, const QString &name, QgsAttributeEditorElement *parent = 0 );
@@ -345,6 +346,45 @@ Determines if the "unlink feature" button should be shown
345346

346347
};
347348

349+
class QgsAttributeEditorQmlElement : QgsAttributeEditorElement
350+
{
351+
%Docstring
352+
An attribute editor widget that will represent arbitrary QML code.
353+
354+
.. versionadded:: 3.4
355+
%End
356+
357+
%TypeHeaderCode
358+
#include "qgsattributeeditorelement.h"
359+
%End
360+
public:
361+
362+
QgsAttributeEditorQmlElement( const QString &name, QgsAttributeEditorElement *parent );
363+
%Docstring
364+
Creates a new element which can display QML
365+
366+
:param name: The name of the widget
367+
:param parent: The parent (used as container)
368+
%End
369+
370+
virtual QgsAttributeEditorElement *clone( QgsAttributeEditorElement *parent ) const /Factory/;
371+
372+
373+
QString qmlCode() const;
374+
%Docstring
375+
The QML code that will be represented within this widget.
376+
377+
.. versionadded:: 3.4
378+
%End
379+
380+
void setQmlCode( const QString &qmlCode );
381+
%Docstring
382+
The QML code that will be represented within this widget.
383+
384+
@param qmlCode
385+
%End
386+
387+
};
348388

349389
/************************************************************************
350390
* This file has been generated automatically from *

0 commit comments

Comments
 (0)
Please sign in to comment.