Skip to content

Commit

Permalink
change to using frame instead of groupbox
Browse files Browse the repository at this point in the history
  • Loading branch information
NEDJIMAbelgacem authored and wonder-sk committed Dec 3, 2020
1 parent 492f9b9 commit 6204d6b
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 80 deletions.
18 changes: 9 additions & 9 deletions src/app/3d/qgspointcloud3dsymbolwidget.cpp
Expand Up @@ -125,19 +125,19 @@ void QgsPointCloud3DSymbolWidget::onRenderingStyleChanged( int current )
switch ( currentStyle )
{
case QgsPointCloud3DSymbol::RenderingStyle::NoRendering:
mColorRampGroupBox->setVisible( false );
mSingleColorGroupBox->setVisible( false );
mPointSizeGroupBox->setVisible( false );
mColorRampFrame->setVisible( false );
mSingleColorFrame->setVisible( false );
mPointSizeFrame->setVisible( false );
break;
case QgsPointCloud3DSymbol::RenderingStyle::SingleColor:
mColorRampGroupBox->setVisible( false );
mSingleColorGroupBox->setVisible( true );
mPointSizeGroupBox->setVisible( true );
mColorRampFrame->setVisible( false );
mSingleColorFrame->setVisible( true );
mPointSizeFrame->setVisible( true );
break;
case QgsPointCloud3DSymbol::RenderingStyle::ColorRamp:
mColorRampGroupBox->setVisible( true );
mSingleColorGroupBox->setVisible( false );
mPointSizeGroupBox->setVisible( true );
mColorRampFrame->setVisible( true );
mSingleColorFrame->setVisible( false );
mPointSizeFrame->setVisible( true );
break;
}
}
133 changes: 62 additions & 71 deletions src/ui/3d/qgspointcloud3dsymbolwidget.ui
Expand Up @@ -6,50 +6,50 @@
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>310</height>
<width>549</width>
<height>484</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="2" colspan="2">
<widget class="QComboBox" name="mRenderingStyleComboBox">
<item>
<property name="text">
<string>No Rendering</string>
</property>
</item>
<item>
<property name="text">
<string>Single color</string>
</property>
</item>
<item>
<property name="text">
<string>Color ramp</string>
</property>
</item>
</widget>
</item>
<item row="7" column="0" colspan="4">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Rendering style</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="4">
<widget class="QGroupBox" name="mSingleColorGroupBox">
<property name="title">
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="topMargin">
<number>0</number>
</property>
<item row="0" column="0" rowspan="2" colspan="2">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Single Color</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QgsColorButton" name="mSingleColorBtn">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" colspan="4">
<widget class="Line" name="line">
<property name="orientation">
Expand All @@ -58,10 +58,7 @@
</widget>
</item>
<item row="3" column="0" colspan="4">
<widget class="QGroupBox" name="mPointSizeGroupBox">
<property name="title">
<string/>
</property>
<widget class="QFrame" name="mPointSizeFrame">
<layout class="QGridLayout" name="gridLayout_4">
<property name="topMargin">
<number>0</number>
Expand All @@ -86,43 +83,37 @@
</layout>
</widget>
</item>
<item row="7" column="0" colspan="4">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="2" colspan="2">
<widget class="QComboBox" name="mRenderingStyleComboBox">
<item>
<property name="text">
<string>No Rendering</string>
</property>
</item>
<item>
<property name="text">
<string>Single color</string>
</property>
</item>
<item>
<property name="text">
<string>Color ramp</string>
<item row="4" column="0" colspan="4">
<widget class="QFrame" name="mSingleColorFrame">
<layout class="QGridLayout" name="gridLayout_3">
<property name="topMargin">
<number>0</number>
</property>
</item>
<item row="1" column="1">
<widget class="QgsColorButton" name="mSingleColorBtn">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="0" column="0" rowspan="2" colspan="2">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Single Color</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="5" column="0" colspan="4">
<widget class="QGroupBox" name="mColorRampGroupBox">
<property name="title">
<string/>
</property>
<widget class="QFrame" name="mColorRampFrame">
<layout class="QGridLayout" name="gridLayout_2">
<property name="topMargin">
<number>0</number>
Expand Down

0 comments on commit 6204d6b

Please sign in to comment.