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

sip fixes

Browse Source
This commit is contained in:
Martin Dobias 2023-12-18 12:07:17 +01:00
parent db47e939e9
commit fa49d149fe
5 changed files with 150 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/3d/3d_auto.sip
View File

@ -4,6 +4,7 @@
%Include auto_generated/qgs3dmapscene.sip
%Include auto_generated/qgs3dmapsettings.sip
%Include auto_generated/qgs3dtypes.sip
%Include auto_generated/qgs3dwindow.sip
%Include auto_generated/qgsabstractvectorlayer3drenderer.sip
%Include auto_generated/qgscameracontroller.sip
%Include auto_generated/qgscamerapose.sip

69
python/3d/auto_generated/qgs3dwindow.sip.in Normal file
View File

@ -0,0 +1,69 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/3d/qgs3dwindow.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
class Qgs3DWindow : QWindow
{
%Docstring(signature="appended")
qgs3dWindow is a convenience wrapper to simplify the creation of a 3D window ready to be used with QGIS.
.. note::
This is a port of qtwindow3d which does not set the default surface when initialized.
.. note::
The default surface must be set before the construction of the QApplication when using shared OpenGL context.
.. note::
This is required in order to use QT3d and QtWebEngine at the same time.
.. versionadded:: 3.36
%End
%TypeHeaderCode
#include "qgs3dwindow.h"
%End
public:
Qgs3DWindow();
%Docstring
Constructor for Qgs3DWindow.
%End
~Qgs3DWindow();
protected:
virtual void showEvent( QShowEvent *e );
%Docstring
Manages the display events specified in e.
%End
virtual void resizeEvent( QResizeEvent * );
%Docstring
Resets the aspect ratio of the 3D window.
%End
};
/************************************************************************
* This file has been generated automatically from *
* *
* src/3d/qgs3dwindow.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

1
python/PyQt6/3d/3d_auto.sip
View File

@ -4,6 +4,7 @@
%Include auto_generated/qgs3dmapscene.sip
%Include auto_generated/qgs3dmapsettings.sip
%Include auto_generated/qgs3dtypes.sip
%Include auto_generated/qgs3dwindow.sip
%Include auto_generated/qgsabstractvectorlayer3drenderer.sip
%Include auto_generated/qgscameracontroller.sip
%Include auto_generated/qgscamerapose.sip

69
python/PyQt6/3d/auto_generated/qgs3dwindow.sip.in Normal file
View File

@ -0,0 +1,69 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/3d/qgs3dwindow.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
class Qgs3DWindow : QWindow
{
%Docstring(signature="appended")
qgs3dWindow is a convenience wrapper to simplify the creation of a 3D window ready to be used with QGIS.
.. note::
This is a port of qtwindow3d which does not set the default surface when initialized.
.. note::
The default surface must be set before the construction of the QApplication when using shared OpenGL context.
.. note::
This is required in order to use QT3d and QtWebEngine at the same time.
.. versionadded:: 3.36
%End
%TypeHeaderCode
#include "qgs3dwindow.h"
%End
public:
Qgs3DWindow();
%Docstring
Constructor for Qgs3DWindow.
%End
~Qgs3DWindow();
protected:
virtual void showEvent( QShowEvent *e );
%Docstring
Manages the display events specified in e.
%End
virtual void resizeEvent( QResizeEvent * );
%Docstring
Resets the aspect ratio of the 3D window.
%End
};
/************************************************************************
* This file has been generated automatically from *
* *
* src/3d/qgs3dwindow.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

14
src/3d/qgs3dwindow.h
View File

@ -16,9 +16,11 @@
#ifndef QGS3DWINDOW_H
#define QGS3DWINDOW_H
#include "qgis_3d.h"
#include <QtGui/QWindow>
#ifndef SIP_RUN
namespace Qt3DCore
{
class QAspectEngine;
@ -49,6 +51,8 @@ namespace Qt3DLogic
{
class QLogicAspect;
}
#endif
/**
* \ingroup 3d
@ -58,9 +62,9 @@ namespace Qt3DLogic
* \note The default surface must be set before the construction of the QApplication when using shared OpenGL context.
* \note This is required in order to use QT3d and QtWebEngine at the same time.
*
* \since QGIS 3.32
* \since QGIS 3.36
*/
class Qgs3DWindow : public QWindow
class _3D_EXPORT Qgs3DWindow : public QWindow
{
Q_OBJECT
public:
@ -75,6 +79,8 @@ class Qgs3DWindow : public QWindow
*/
~Qgs3DWindow();
#ifndef SIP_RUN
/**
* Sets the specified root entity of the scene.
*/
@ -104,7 +110,7 @@ class Qgs3DWindow : public QWindow
* Returns the render settings of the 3D Window.
*/
Qt3DRender::QRenderSettings *renderSettings() const;
#endif
protected: