Skip to content

Commit

Permalink
Merge pull request #2980 from nirvn/diagram_ui_improvement
Browse files Browse the repository at this point in the history 
[diagram] synchronize enabling UI to match labelling
  • Loading branch information
@nyalldawson
nyalldawson committed Apr 7, 2016
2 parents 794ef72 + 4f87525 commit 5530161
Show file tree
Hide file tree
Showing 4 changed files with 94 additions and 141 deletions.
175 changes: 87 additions & 88 deletions src/app/qgsdiagramproperties.cpp
View file
Expand Up @@ -65,8 +65,15 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare
// get rid of annoying outer focus rect on Mac
mDiagramOptionsListWidget->setAttribute( Qt::WA_MacShowFocusRect, false );

connect( mEnableDiagramsCheckBox, SIGNAL( toggled( bool ) ), mDiagramTypeFrame, SLOT( setEnabled( bool ) ) );
connect( mEnableDiagramsCheckBox, SIGNAL( toggled( bool ) ), mDiagramFrame, SLOT( setEnabled( bool ) ) );
mDiagramTypeComboBox->blockSignals( true );
mDiagramTypeComboBox->addItem( tr( "No diagrams" ), "None" );
QPixmap pix = QgsApplication::getThemePixmap( "pie-chart" );
mDiagramTypeComboBox->addItem( pix, tr( "Pie chart" ), DIAGRAM_NAME_PIE );
pix = QgsApplication::getThemePixmap( "text" );
mDiagramTypeComboBox->addItem( pix, tr( "Text diagram" ), DIAGRAM_NAME_TEXT );
pix = QgsApplication::getThemePixmap( "histogram" );
mDiagramTypeComboBox->addItem( pix, tr( "Histogram" ), DIAGRAM_NAME_HISTOGRAM );
mDiagramTypeComboBox->blockSignals( false );

mScaleRangeWidget->setMapCanvas( QgisApp::instance()->mapCanvas() );
mSizeFieldExpressionWidget->registerGetExpressionContextCallback( &_getExpressionContext, mLayer );
Expand All @@ -90,9 +97,7 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare
QGis::GeometryType layerType = layer->geometryType();
if ( layerType == QGis::UnknownGeometry || layerType == QGis::NoGeometry )
{
mEnableDiagramsCheckBox->setChecked( false );
mEnableDiagramsCheckBox->setEnabled( false );
mDiagramTypeFrame->setEnabled( false );
mDiagramTypeComboBox->setEnabled( false );
mDiagramFrame->setEnabled( false );
}

Expand Down Expand Up @@ -122,15 +127,6 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare
}
mPlacementComboBox->blockSignals( false );

mDiagramTypeComboBox->blockSignals( true );
QPixmap pix = QgsApplication::getThemePixmap( "pie-chart" );
mDiagramTypeComboBox->addItem( pix, tr( "Pie chart" ), DIAGRAM_NAME_PIE );
pix = QgsApplication::getThemePixmap( "text" );
mDiagramTypeComboBox->addItem( pix, tr( "Text diagram" ), DIAGRAM_NAME_TEXT );
pix = QgsApplication::getThemePixmap( "histogram" );
mDiagramTypeComboBox->addItem( pix, tr( "Histogram" ), DIAGRAM_NAME_HISTOGRAM );
mDiagramTypeComboBox->blockSignals( false );

mLabelPlacementComboBox->addItem( tr( "Height" ), QgsDiagramSettings::Height );
mLabelPlacementComboBox->addItem( tr( "x-height" ), QgsDiagramSettings::XHeight );

Expand Down Expand Up @@ -188,9 +184,9 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare
const QgsDiagramRendererV2* dr = layer->diagramRenderer();
if ( !dr ) //no diagram renderer yet, insert reasonable default
{
mEnableDiagramsCheckBox->setChecked( false );
mDiagramTypeFrame->setEnabled( false );
mDiagramFrame->setEnabled( false );
mDiagramTypeComboBox->blockSignals( true );
mDiagramTypeComboBox->setCurrentIndex( 0 );
mDiagramTypeComboBox->blockSignals( false );
mFixedSizeRadio->setChecked( true );
mDiagramUnitComboBox->setUnit( QgsSymbolV2::MM );
mDiagramLineUnitComboBox->setUnit( QgsSymbolV2::MM );
Expand Down Expand Up @@ -225,9 +221,6 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare
break;
}
mBackgroundColorButton->setColor( QColor( 255, 255, 255, 255 ) );
mDiagramTypeComboBox->blockSignals( true );
mDiagramTypeComboBox->setCurrentIndex( 0 );
mDiagramTypeComboBox->blockSignals( false );
//force a refresh of widget status to match diagram type
on_mDiagramTypeComboBox_currentIndexChanged( mDiagramTypeComboBox->currentIndex() );
}
Expand All @@ -249,9 +242,7 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare
QList<QgsDiagramSettings> settingList = dr->diagramSettings();
if ( !settingList.isEmpty() )
{
mEnableDiagramsCheckBox->setChecked( settingList.at( 0 ).enabled );
mDiagramTypeFrame->setEnabled( mEnableDiagramsCheckBox->isChecked() );
mDiagramFrame->setEnabled( mEnableDiagramsCheckBox->isChecked() );
mDiagramFrame->setEnabled( settingList.at( 0 ).enabled );
mDiagramFont = settingList.at( 0 ).font;
QSizeF size = settingList.at( 0 ).size;
mBackgroundColorButton->setColor( settingList.at( 0 ).backgroundColor );
Expand Down Expand Up @@ -385,16 +376,17 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare

if ( dr->diagram() )
{
QString diagramName = dr->diagram()->diagramName();
mDiagramType = dr->diagram()->diagramName();

mDiagramTypeComboBox->blockSignals( true );
mDiagramTypeComboBox->setCurrentIndex( mDiagramTypeComboBox->findData( diagramName ) );
mDiagramTypeComboBox->setCurrentIndex( settingList.at( 0 ).enabled ? mDiagramTypeComboBox->findData( mDiagramType ) : 0 );
mDiagramTypeComboBox->blockSignals( false );
//force a refresh of widget status to match diagram type
on_mDiagramTypeComboBox_currentIndexChanged( mDiagramTypeComboBox->currentIndex() );
if ( mDiagramTypeComboBox->currentIndex() == -1 )
{
QMessageBox::warning( this, tr( "Unknown diagram type." ),
tr( "The diagram type '%1' is unknown. A default type is selected for you." ).arg( diagramName ), QMessageBox::Ok );
tr( "The diagram type '%1' is unknown. A default type is selected for you." ).arg( mDiagramType ), QMessageBox::Ok );
mDiagramTypeComboBox->setCurrentIndex( mDiagramTypeComboBox->findData( DIAGRAM_NAME_PIE ) );
}
}
Expand All @@ -414,71 +406,79 @@ QgsDiagramProperties::~QgsDiagramProperties()

void QgsDiagramProperties::on_mDiagramTypeComboBox_currentIndexChanged( int index )
{
QString diagramType = mDiagramTypeComboBox->itemData( index ).toString();

if ( DIAGRAM_NAME_TEXT == diagramType )
if ( index == 0 )
{
mTextOptionsFrame->show();
mBackgroundColorLabel->show();
mBackgroundColorButton->show();
mDiagramFontButton->show();
mDiagramFrame->setEnabled( false );
}
else
{
mTextOptionsFrame->hide();
mBackgroundColorLabel->hide();
mBackgroundColorButton->hide();
mDiagramFontButton->hide();
}
mDiagramFrame->setEnabled( true );

if ( DIAGRAM_NAME_HISTOGRAM == diagramType )
{
mBarWidthLabel->show();
mBarWidthSpinBox->show();
mBarOptionsFrame->show();
mAttributeBasedScalingRadio->setChecked( true );
mFixedSizeRadio->setEnabled( false );
mDiagramSizeSpinBox->setEnabled( false );
mLinearlyScalingLabel->setText( tr( "Bar length: Scale linearly, so that the following value matches the specified bar length:" ) );
mSizeLabel->setText( tr( "Bar length" ) );
mFrameIncreaseSize->setVisible( false );
}
else
{
mBarWidthLabel->hide();
mBarWidthSpinBox->hide();
mBarOptionsFrame->hide();
mLinearlyScalingLabel->setText( tr( "Scale linearly between 0 and the following attribute value / diagram size:" ) );
mSizeLabel->setText( tr( "Size" ) );
mAttributeBasedScalingRadio->setEnabled( true );
mFixedSizeRadio->setEnabled( true );
mDiagramSizeSpinBox->setEnabled( mFixedSizeRadio->isChecked() );
mFrameIncreaseSize->setVisible( true );
}
mDiagramType = mDiagramTypeComboBox->itemData( index ).toString();

if ( DIAGRAM_NAME_TEXT == diagramType || DIAGRAM_NAME_PIE == diagramType )
{
mScaleDependencyComboBox->show();
mScaleDependencyLabel->show();
}
else
{
mScaleDependencyComboBox->hide();
mScaleDependencyLabel->hide();
}
if ( DIAGRAM_NAME_TEXT == mDiagramType )
{
mTextOptionsFrame->show();
mBackgroundColorLabel->show();
mBackgroundColorButton->show();
mDiagramFontButton->show();
}
else
{
mTextOptionsFrame->hide();
mBackgroundColorLabel->hide();
mBackgroundColorButton->hide();
mDiagramFontButton->hide();
}

if ( DIAGRAM_NAME_PIE == diagramType )
{
mAngleOffsetComboBox->show();
mAngleOffsetLabel->show();
}
else
{
mAngleOffsetComboBox->hide();
mAngleOffsetLabel->hide();
if ( DIAGRAM_NAME_HISTOGRAM == mDiagramType )
{
mBarWidthLabel->show();
mBarWidthSpinBox->show();
mBarOptionsFrame->show();
mAttributeBasedScalingRadio->setChecked( true );
mFixedSizeRadio->setEnabled( false );
mDiagramSizeSpinBox->setEnabled( false );
mLinearlyScalingLabel->setText( tr( "Bar length: Scale linearly, so that the following value matches the specified bar length:" ) );
mSizeLabel->setText( tr( "Bar length" ) );
mFrameIncreaseSize->setVisible( false );
}
else
{
mBarWidthLabel->hide();
mBarWidthSpinBox->hide();
mBarOptionsFrame->hide();
mLinearlyScalingLabel->setText( tr( "Scale linearly between 0 and the following attribute value / diagram size:" ) );
mSizeLabel->setText( tr( "Size" ) );
mAttributeBasedScalingRadio->setEnabled( true );
mFixedSizeRadio->setEnabled( true );
mDiagramSizeSpinBox->setEnabled( mFixedSizeRadio->isChecked() );
mFrameIncreaseSize->setVisible( true );
}

if ( DIAGRAM_NAME_TEXT == mDiagramType || DIAGRAM_NAME_PIE == mDiagramType )
{
mScaleDependencyComboBox->show();
mScaleDependencyLabel->show();
}
else
{
mScaleDependencyComboBox->hide();
mScaleDependencyLabel->hide();
}

if ( DIAGRAM_NAME_PIE == mDiagramType )
{
mAngleOffsetComboBox->show();
mAngleOffsetLabel->show();
}
else
{
mAngleOffsetComboBox->hide();
mAngleOffsetLabel->hide();
}
}
}

QString QgsDiagramProperties::guessLegendText( const QString& expression )
{
//trim unwanted characters from expression text for legend
Expand Down Expand Up @@ -598,11 +598,10 @@ void QgsDiagramProperties::on_mEngineSettingsButton_clicked()

void QgsDiagramProperties::apply()
{
bool diagramsEnabled = mEnableDiagramsCheckBox->isChecked();
int index = mDiagramTypeComboBox->currentIndex();
bool diagramsEnabled = ( index != 0 );

QgsDiagram* diagram = nullptr;
int index = mDiagramTypeComboBox->currentIndex();
QString diagramType = mDiagramTypeComboBox->itemData( index ).toString();

if ( diagramsEnabled && 0 == mDiagramAttributesTreeWidget->topLevelItemCount() )
{
Expand Down Expand Up @@ -661,11 +660,11 @@ void QgsDiagramProperties::apply()
}
#endif

if ( diagramType == DIAGRAM_NAME_TEXT )
if ( mDiagramType == DIAGRAM_NAME_TEXT )
{
diagram = new QgsTextDiagram();
}
else if ( diagramType == DIAGRAM_NAME_PIE )
else if ( mDiagramType == DIAGRAM_NAME_PIE )
{
diagram = new QgsPieDiagram();
}
Expand All @@ -675,7 +674,7 @@ void QgsDiagramProperties::apply()
}

QgsDiagramSettings ds;
ds.enabled = mEnableDiagramsCheckBox->isChecked();
ds.enabled = ( mDiagramTypeComboBox->currentIndex() != 0 );
ds.font = mDiagramFont;
ds.transparency = mTransparencySpinBox->value() * 255.0 / 100.0;

Expand Down
2 changes: 2 additions & 0 deletions src/app/qgsdiagramproperties.h
View file
Expand Up @@ -55,6 +55,8 @@ class APP_EXPORT QgsDiagramProperties : public QWidget, private Ui::QgsDiagramPr
QgsVectorLayer* mLayer;

private:
// Keeps track of the diagram type to properly save / restore settings when the diagram type combo box is set to no diagram.
QString mDiagramType;

QString guessLegendText( const QString &expression );

Expand Down
3 changes: 2 additions & 1 deletion src/core/diagram/qgsdiagram.cpp
View file
Expand Up @@ -89,7 +89,8 @@ QFont QgsDiagram::scaledFont( const QgsDiagramSettings& s, const QgsRenderContex
QFont f = s.font;
if ( s.sizeType == QgsSymbolV2::MapUnit )
{
f.setPixelSize( s.font.pointSizeF() / c.mapToPixel().mapUnitsPerPixel() );
int pixelsize = s.font.pointSizeF() / c.mapToPixel().mapUnitsPerPixel();
f.setPixelSize( pixelsize > 0 ? pixelsize : 1 );
}
else
{
Expand Down
55 changes: 3 additions & 52 deletions src/ui/qgsdiagrampropertiesbase.ui
View file
Expand Up @@ -10,7 +10,7 @@
<height>491</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8" stretch="0,0,1">
<layout class="QVBoxLayout" name="verticalLayout_8" stretch="0,1">
<property name="leftMargin">
<number>6</number>
</property>
Expand Down Expand Up @@ -39,11 +39,7 @@
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="mEnableDiagramsCheckBox">
<property name="text">
<string>Show diagrams for this layer</string>
</property>
</widget>
<widget class="QComboBox" name="mDiagramTypeComboBox"/>
</item>
<item>
<spacer name="horizontalSpacer_7">
Expand Down Expand Up @@ -97,50 +93,6 @@
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="mDiagramTypeFrame">
<layout class="QHBoxLayout" name="diagramTypeAndPriorityLayout">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="mTypeLabel">
<property name="text">
<string>Diagram type</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mDiagramTypeComboBox"/>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QFrame" name="mDiagramFrame">
<property name="frameShape">
Expand Down Expand Up @@ -1877,9 +1829,8 @@
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mEnableDiagramsCheckBox</tabstop>
<tabstop>mEngineSettingsButton</tabstop>
<tabstop>mDiagramTypeComboBox</tabstop>
<tabstop>mEngineSettingsButton</tabstop>
<tabstop>mDiagramOptionsListWidget</tabstop>
<tabstop>scrollArea</tabstop>
<tabstop>mAttributesTreeWidget</tabstop>
Expand Down

0 comments on commit 5530161

Please sign in to comment.