Skip to content

Commit

Permalink
Fix capitalisation, spin box clear values in eye dome lighting widgets
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Nov 9, 2020
1 parent 63d875b commit 68ceaf2
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 23 deletions.
4 changes: 4 additions & 0 deletions src/app/3d/qgs3dmapconfigwidget.cpp
View file
Expand Up @@ -75,6 +75,10 @@ Qgs3DMapConfigWidget::Qgs3DMapConfigWidget( Qgs3DMapSettings *map, QgsMapCanvas
spinMapResolution->setClearValue( 512 );
spinScreenError->setClearValue( 3 );
spinGroundError->setClearValue( 1 );
edlStrengthSpinBox->setClearValue( 1000 );
edlDistanceSpinBox->setClearValue( 1 );
mDebugShadowMapSizeSpinBox->setClearValue( 0.1 );
mDebugDepthMapSizeSpinBox->setClearValue( 0.1 );

cboTerrainLayer->setAllowEmptyLayer( true );
cboTerrainLayer->setFilters( QgsMapLayerProxyModel::RasterLayer );
Expand Down
49 changes: 26 additions & 23 deletions src/ui/3d/map3dconfigwidget.ui
View file
Expand Up @@ -205,8 +205,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>239</width>
<height>251</height>
<width>707</width>
<height>604</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayoutTerrain">
Expand Down Expand Up @@ -393,8 +393,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>77</width>
<height>43</height>
<width>707</width>
<height>604</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayoutLight">
Expand Down Expand Up @@ -477,7 +477,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>699</width>
<width>707</width>
<height>604</height>
</rect>
</property>
Expand Down Expand Up @@ -567,7 +567,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>699</width>
<width>707</width>
<height>604</height>
</rect>
</property>
Expand Down Expand Up @@ -666,9 +666,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-22</y>
<width>685</width>
<height>632</height>
<y>-66</y>
<width>693</width>
<height>670</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayoutAdvanced">
Expand Down Expand Up @@ -806,7 +806,7 @@
<item row="2" column="0">
<widget class="QGroupBox" name="mDebugShadowMapGroupBox">
<property name="title">
<string>Debug shadow map</string>
<string>Debug Shadow Map</string>
</property>
<property name="checkable">
<bool>true</bool>
Expand All @@ -833,7 +833,7 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="mDebugShadowMapSizeSpinBox">
<widget class="QgsDoubleSpinBox" name="mDebugShadowMapSizeSpinBox">
<property name="maximum">
<double>1.000000000000000</double>
</property>
Expand All @@ -851,7 +851,7 @@
<item row="3" column="0">
<widget class="QGroupBox" name="mDebugDepthMapGroupBox">
<property name="title">
<string>Debug depth map</string>
<string>Debug Depth Map</string>
</property>
<property name="checkable">
<bool>true</bool>
Expand All @@ -878,7 +878,7 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QDoubleSpinBox" name="mDebugDepthMapSizeSpinBox">
<widget class="QgsDoubleSpinBox" name="mDebugDepthMapSizeSpinBox">
<property name="maximum">
<double>1.000000000000000</double>
</property>
Expand All @@ -896,7 +896,7 @@
<item row="1" column="0">
<widget class="QGroupBox" name="edlGroupBox">
<property name="title">
<string>Eye Dome Lighting</string>
<string>Show Eye Dome Lighting</string>
</property>
<property name="checkable">
<bool>true</bool>
Expand All @@ -906,10 +906,13 @@
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="edlStrengthSpinBox">
<widget class="QgsDoubleSpinBox" name="edlStrengthSpinBox">
<property name="maximum">
<double>10000.000000000000000</double>
</property>
<property name="singleStep">
<double>100.000000000000000</double>
</property>
<property name="value">
<double>1000.000000000000000</double>
</property>
Expand All @@ -918,19 +921,19 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Eye dome lighting strength</string>
<string>Lighting strength</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Eye dome lighting distance</string>
<string>Lighting distance</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="edlDistanceSpinBox">
<widget class="QgsSpinBox" name="edlDistanceSpinBox">
<property name="minimum">
<number>1</number>
</property>
Expand Down Expand Up @@ -978,6 +981,11 @@
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
<customwidget>
<class>QgsSpinBox</class>
<extends>QSpinBox</extends>
<header>qgsspinbox.h</header>
</customwidget>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
Expand All @@ -995,11 +1003,6 @@
<extends>QComboBox</extends>
<header>qgsmaplayercombobox.h</header>
</customwidget>
<customwidget>
<class>QgsSpinBox</class>
<extends>QSpinBox</extends>
<header>qgsspinbox.h</header>
</customwidget>
<customwidget>
<class>QgsLightsWidget</class>
<extends>QWidget</extends>
Expand Down

0 comments on commit 68ceaf2

Please sign in to comment.