Skip to content
Permalink
Browse files

moved debug settings to the advanced tab and fixed CI problems

  • Loading branch information
NEDJIMAbelgacem authored and wonder-sk committed Nov 6, 2020
1 parent 4ade4f0 commit 6f542e7ea002c55f4bac50b5146b2d577224fe05
@@ -458,9 +458,9 @@ Returns the eye dome lighting distance value (contributes to the contrast of the
%Docstring
Sets the debugging settings of the shadow map

.. versionadded:: 3.18

.. seealso:: :py:func:`debugShadowMapEnabled`

.. versionadded:: 3.18
%End
bool debugShadowMapEnabled() const;
%Docstring
@@ -479,9 +479,9 @@ Returns the size of the shadow map preview
%Docstring
Sets the debugging settings of the depth map

.. versionadded:: 3.18

.. seealso:: :py:func:`debugDepthMapEnabled`

.. versionadded:: 3.18
%End
bool debugDepthMapEnabled() const;
%Docstring
@@ -391,8 +391,8 @@ class _3D_EXPORT Qgs3DMapSettings : public QObject, public QgsTemporalRangeObjec

/**
* Sets the debugging settings of the shadow map
* \since QGIS 3.18
* \see debugShadowMapEnabled() debugShadowMapCorner() debugShadowMapSize()
* \since QGIS 3.18
*/
void setDebugShadowMapSettings( bool enabled, const QString &corner, double size );
//! Returns whether the shadow map debugging is enabled
@@ -404,8 +404,8 @@ class _3D_EXPORT Qgs3DMapSettings : public QObject, public QgsTemporalRangeObjec

/**
* Sets the debugging settings of the depth map
* \since QGIS 3.18
* \see debugDepthMapEnabled() debugDepthMapCorner() debugDepthMapSize()
* \since QGIS 3.18
*/
void setDebugDepthMapSettings( bool enabled, const QString &corner, double size );
//! Returns whether the shadow map debugging is enabled
@@ -36,6 +36,7 @@ class QgsPreviewQuadMaterial : public Qt3DRender::QMaterial
//! Constructor
QgsPreviewQuadMaterial( Qt3DRender::QAbstractTexture *texture, const QMatrix4x4 &modelMatrix, QVector<Qt3DRender::QParameter *> additionalShaderParameters = QVector<Qt3DRender::QParameter *>(), QNode *parent = nullptr );

//! Sets the model matrix of the quad
void setModelMatrix( const QMatrix4x4 &modelMatrix );
private:
Qt3DRender::QEffect *mEffect = nullptr;
@@ -65,6 +66,7 @@ class QgsPreviewQuad : public Qt3DCore::QEntity
*/
QgsPreviewQuad( Qt3DRender::QAbstractTexture *texture, const QPointF &centerNDC, const QSizeF &size, QVector<Qt3DRender::QParameter *> additionalShaderParameters = QVector<Qt3DRender::QParameter *>(), Qt3DCore::QEntity *parent = nullptr );

//! Sets where the quad will be located on the scene
void setViewPort( const QPointF &centerNDC, const QSizeF &size );
private:
QgsPreviewQuadMaterial *mMaterial = nullptr;
@@ -146,11 +146,6 @@
<normaloff>:/images/themes/default/propertyicons/system.svg</normaloff>:/images/themes/default/propertyicons/system.svg</iconset>
</property>
</item>
<item>
<property name="text">
<string>Debug</string>
</property>
</item>
</widget>
</item>
</layout>
@@ -184,7 +179,7 @@
<item>
<widget class="QStackedWidget" name="m3DOptionsStackedWidget">
<property name="currentIndex">
<number>5</number>
<number>4</number>
</property>
<widget class="QWidget" name="mPageTerrain">
<layout class="QVBoxLayout" name="verticalLayout_61">
@@ -482,8 +477,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>133</width>
<height>43</height>
<width>699</width>
<height>604</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayoutShadow">
@@ -572,8 +567,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>153</width>
<height>126</height>
<width>699</width>
<height>604</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayoutCameraSkybox">
@@ -671,9 +666,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>283</width>
<height>418</height>
<y>-22</y>
<width>685</width>
<height>632</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayoutAdvanced">
@@ -694,8 +689,8 @@
<property name="title">
<string>Advanced Settings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_32">
<item>
<layout class="QGridLayout" name="gridLayout_11">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayoutAdvanced">
<item row="4" column="0" colspan="2">
<widget class="QCheckBox" name="chkShowLabels">
@@ -808,131 +803,82 @@
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="edlGroupBox">
<item row="2" column="0">
<widget class="QGroupBox" name="mDebugShadowMapGroupBox">
<property name="title">
<string>Eye Dome Lighting</string>
<string>Debug shadow map</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<layout class="QGridLayout" name="gridLayout_10">
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="edlStrengthSpinBox">
<property name="maximum">
<double>10000.000000000000000</double>
</property>
<property name="value">
<double>1000.000000000000000</double>
</property>
</widget>
<widget class="QComboBox" name="mDebugShadowMapCornerComboBox"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Eye dome lighting strength</string>
<string>Corner:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<widget class="QLabel" name="label_10">
<property name="text">
<string>Eye dome lighting distance</string>
<string>Size</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="edlDistanceSpinBox">
<property name="minimum">
<number>1</number>
</property>
<widget class="QDoubleSpinBox" name="mDebugShadowMapSizeSpinBox">
<property name="maximum">
<number>20</number>
<double>1.000000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
<property name="value">
<double>0.100000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacerAdvanced">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="mPageDebug">
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QScrollArea" name="scrollAreaDebug">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>688</width>
<height>584</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0">
<widget class="QGroupBox" name="DebugSroupBox">
<property name="title">
<string>Debug</string>
</property>
<layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="0">
<widget class="QGroupBox" name="mDebugShadowMapGroupBox">
<item row="3" column="0">
<widget class="QGroupBox" name="mDebugDepthMapGroupBox">
<property name="title">
<string>Debug shadow map</string>
<string>Debug depth map</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_10">
<layout class="QGridLayout" name="gridLayout_9">
<item row="0" column="1">
<widget class="QComboBox" name="mDebugShadowMapCornerComboBox"/>
<widget class="QComboBox" name="mDebugDepthMapCornerComboBox"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_8">
<item row="1" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Corner:</string>
<string>Size</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_10">
<item row="0" column="0">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Size</string>
<string>Corner</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="mDebugShadowMapSizeSpinBox">
<widget class="QDoubleSpinBox" name="mDebugDepthMapSizeSpinBox">
<property name="maximum">
<double>1.000000000000000</double>
</property>
@@ -948,59 +894,63 @@
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="mDebugDepthMapGroupBox">
<widget class="QGroupBox" name="edlGroupBox">
<property name="title">
<string>Debug depth map</string>
<string>Eye Dome Lighting</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_9">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="edlStrengthSpinBox">
<property name="maximum">
<double>10000.000000000000000</double>
</property>
<property name="value">
<double>1000.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_9">
<widget class="QLabel" name="label">
<property name="text">
<string>Corner</string>
<string>Eye dome lighting strength</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="mDebugDepthMapCornerComboBox"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_11">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Size</string>
<string>Eye dome lighting distance</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="mDebugDepthMapSizeSpinBox">
<property name="maximum">
<double>1.000000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
<widget class="QSpinBox" name="edlDistanceSpinBox">
<property name="minimum">
<number>1</number>
</property>
<property name="value">
<double>0.100000000000000</double>
<property name="maximum">
<number>20</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<spacer name="verticalSpacer">
<item row="4" column="0">
<spacer name="verticalSpacerAdvanced">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>0</height>
</size>
</property>
</spacer>

0 comments on commit 6f542e7

Please sign in to comment.
You can’t perform that action at this time.