Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add a warning to EDL when draw order is default
  • Loading branch information
wonder-sk committed Sep 2, 2022
1 parent 5947177 commit 7f66cb6
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 18 deletions.
5 changes: 5 additions & 0 deletions src/gui/pointcloud/qgspointcloudrendererpropertieswidget.cpp
Expand Up @@ -114,6 +114,10 @@ QgsPointCloudRendererPropertiesWidget::QgsPointCloudRendererPropertiesWidget( Qg

connect( mPointStyleComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsPointCloudRendererPropertiesWidget::emitWidgetChanged );
connect( mDrawOrderComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsPointCloudRendererPropertiesWidget::emitWidgetChanged );
connect( mDrawOrderComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, [ = ]
{
mEdlWarningLabel->setVisible( mDrawOrderComboBox->currentIndex() == 0 ); // visible on default draw order
} );
connect( mEyeDomeLightingGroupBox, &QGroupBox::toggled, this, &QgsPointCloudRendererPropertiesWidget::emitWidgetChanged );
connect( mEdlStrength, qOverload<int>( &QSpinBox::valueChanged ), this, &QgsPointCloudRendererPropertiesWidget::emitWidgetChanged );
connect( mEdlDistance, qOverload<int>( &QSpinBox::valueChanged ), this, &QgsPointCloudRendererPropertiesWidget::emitWidgetChanged );
Expand Down Expand Up @@ -163,6 +167,7 @@ void QgsPointCloudRendererPropertiesWidget::syncToLayer( QgsMapLayer *layer )
mEyeDomeLightingGroupBox->setChecked( mLayer->renderer()->useEyeDomeLighting() );
mEdlStrength->setValue( mLayer->renderer()->eyeDomeLightingStrength() );
mEdlDistance->setValue( mLayer->renderer()->eyeDomeLightingDistance() );
mEdlWarningLabel->setVisible( mLayer->renderer()->drawOrder2d() == Qgis::PointCloudDrawOrder::Default );
}

mBlockChangedSignal = false;
Expand Down
Expand Up @@ -25,6 +25,12 @@
</property>
<item row="1" column="0" colspan="2">
<widget class="QTreeView" name="viewCategories">
<property name="minimumSize">
<size>
<width>0</width>
<height>250</height>
</size>
</property>
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
Expand Down
50 changes: 32 additions & 18 deletions src/ui/pointcloud/qgspointcloudrendererpropsdialogbase.ui
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>569</width>
<height>521</height>
<height>529</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -251,55 +251,65 @@
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<item row="0" column="0">
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="mEdlWarningLabel">
<property name="text">
<string>Note: with default draw order, the shading may be incorrect.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Strength</string>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Distance</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QgsSpinBox" name="mEdlStrength" native="true">
<property name="minimum" stdset="0">
<item row="1" column="1">
<widget class="QgsSpinBox" name="mEdlStrength">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum" stdset="0">
<property name="maximum">
<number>100000</number>
</property>
<property name="singleStep" stdset="0">
<property name="singleStep">
<number>100</number>
</property>
<property name="value" stdset="0">
<number>1000</number>
</property>
<property name="clearValue" stdset="0">
<property name="value">
<number>1000</number>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QgsSpinBox" name="mEdlDistance" native="true">
<property name="minimum" stdset="0">
<item row="3" column="1">
<widget class="QgsSpinBox" name="mEdlDistance">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum" stdset="0">
<property name="maximum">
<number>10</number>
</property>
<property name="clearValue" stdset="0">
<property name="value">
<number>2</number>
</property>
</widget>
Expand Down Expand Up @@ -356,7 +366,7 @@
</customwidget>
<customwidget>
<class>QgsSpinBox</class>
<extends>QWidget</extends>
<extends>QSpinBox</extends>
<header>qgsspinbox.h</header>
</customwidget>
</customwidgets>
Expand All @@ -365,10 +375,14 @@
<tabstop>mPointSizeSpinBox</tabstop>
<tabstop>mPointSizeUnitWidget</tabstop>
<tabstop>mPointStyleComboBox</tabstop>
<tabstop>mDrawOrderComboBox</tabstop>
<tabstop>mMaxErrorSpinBox</tabstop>
<tabstop>mMaxErrorUnitWidget</tabstop>
<tabstop>mOpacityWidget</tabstop>
<tabstop>mBlendModeComboBox</tabstop>
<tabstop>mEyeDomeLightingGroupBox</tabstop>
<tabstop>mEdlStrength</tabstop>
<tabstop>mEdlDistance</tabstop>
</tabstops>
<resources/>
<connections/>
Expand Down

0 comments on commit 7f66cb6

Please sign in to comment.