Skip to content

Commit dc5d7ab

Browse files
nirvnnirvn
committedApr 5, 2016
[diagram] make use of unit widget for diagram size
·
ltr-3_40archive/master_2
1 parent 31d7be4 commit dc5d7ab

File tree

7 files changed

+67
-61
lines changed

7 files changed

+67
-61
lines changed
 

‎python/core/qgsdiagramrendererv2.sip

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -289,14 +289,13 @@ class QgsDiagramSettings
289289
//! @note added in 2.10
290290
QList< QString > categoryLabels;
291291
QSizeF size; //size
292-
SizeType sizeType; //mm or map units
293-
/** Line unit index (mm, map units, or pixels)
294-
* @note added in 2.16
295-
*/
292+
//! Diagram size unit index (mm, map units, or pixels)
293+
QgsSymbolV2::OutputUnit sizeType;
294+
//! Diagram size unit scale
295+
QgsMapUnitScale sizeScale;
296+
//! Line unit index (mm, map units, or pixels)
296297
QgsSymbolV2::OutputUnit lineSizeType;
297-
/** Line unit scale
298-
* @note added in 2.16
299-
*/
298+
//! Line unit scale
300299
QgsMapUnitScale lineSizeScale;
301300
QColor backgroundColor;
302301
QColor penColor;

‎src/app/qgsdiagramproperties.cpp

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare
8484

8585
mMaxValueSpinBox->setShowClearButton( false );
8686

87-
mDiagramUnitComboBox->insertItem( 0, tr( "mm" ), QgsDiagramSettings::MM );
88-
mDiagramUnitComboBox->insertItem( 1, tr( "Map units" ), QgsDiagramSettings::MapUnits );
87+
mDiagramUnitComboBox->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
8988
mDiagramLineUnitComboBox->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
9089

9190
QGis::GeometryType layerType = layer->geometryType();
@@ -193,7 +192,7 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare
193192
mDiagramTypeFrame->setEnabled( false );
194193
mDiagramFrame->setEnabled( false );
195194
mFixedSizeRadio->setChecked( true );
196-
mDiagramUnitComboBox->setCurrentIndex( mDiagramUnitComboBox->findText( tr( "mm" ) ) );
195+
mDiagramUnitComboBox->setUnit( QgsSymbolV2::MM );
197196
mDiagramLineUnitComboBox->setUnit( QgsSymbolV2::MM );
198197
mLabelPlacementComboBox->setCurrentIndex( mLabelPlacementComboBox->findText( tr( "x-height" ) ) );
199198
mDiagramSizeSpinBox->setEnabled( true );
@@ -265,14 +264,8 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare
265264
mScaleRangeWidget->setScaleRange( 1.0 / ( settingList.at( 0 ).maxScaleDenominator > 0 ? settingList.at( 0 ).maxScaleDenominator : layer->maximumScale() ),
266265
1.0 / ( settingList.at( 0 ).minScaleDenominator > 0 ? settingList.at( 0 ).minScaleDenominator : layer->minimumScale() ) );
267266
mScaleVisibilityGroupBox->setChecked( settingList.at( 0 ).scaleBasedVisibility );
268-
if ( settingList.at( 0 ).sizeType == QgsDiagramSettings::MM )
269-
{
270-
mDiagramUnitComboBox->setCurrentIndex( 0 );
271-
}
272-
else
273-
{
274-
mDiagramUnitComboBox->setCurrentIndex( 1 );
275-
}
267+
mDiagramUnitComboBox->setUnit( settingList.at( 0 ).sizeType );
268+
mDiagramUnitComboBox->setMapUnitScale( settingList.at( 0 ).sizeScale );
276269
mDiagramLineUnitComboBox->setUnit( settingList.at( 0 ).lineSizeType );
277270
mDiagramLineUnitComboBox->setMapUnitScale( settingList.at( 0 ).lineSizeScale );
278271

@@ -704,7 +697,8 @@ void QgsDiagramProperties::apply()
704697
ds.categoryAttributes = categoryAttributes;
705698
ds.categoryLabels = categoryLabels;
706699
ds.size = QSizeF( mDiagramSizeSpinBox->value(), mDiagramSizeSpinBox->value() );
707-
ds.sizeType = static_cast<QgsDiagramSettings::SizeType>( mDiagramUnitComboBox->itemData( mDiagramUnitComboBox->currentIndex() ).toInt() );
700+
ds.sizeType = mDiagramUnitComboBox->unit();
701+
ds.sizeScale = mDiagramUnitComboBox->getMapUnitScale();
708702
ds.lineSizeType = mDiagramLineUnitComboBox->unit();
709703
ds.lineSizeScale = mDiagramLineUnitComboBox->getMapUnitScale();
710704
ds.labelPlacementMethod = static_cast<QgsDiagramSettings::LabelPlacementMethod>( mLabelPlacementComboBox->itemData( mLabelPlacementComboBox->currentIndex() ).toInt() );

‎src/core/diagram/qgsdiagram.cpp

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,38 +76,24 @@ void QgsDiagram::setPenWidth( QPen& pen, const QgsDiagramSettings& s, const QgsR
7676

7777
QSizeF QgsDiagram::sizePainterUnits( QSizeF size, const QgsDiagramSettings& s, const QgsRenderContext& c )
7878
{
79-
if ( s.sizeType == QgsDiagramSettings::MM )
80-
{
81-
return QSizeF( size.width() * c.scaleFactor(), size.height() * c.scaleFactor() );
82-
}
83-
else
84-
{
85-
return QSizeF( size.width() / c.mapToPixel().mapUnitsPerPixel(), size.height() / c.mapToPixel().mapUnitsPerPixel() );
86-
}
79+
return QSizeF( QgsSymbolLayerV2Utils::convertToPainterUnits( c, size.width(), s.sizeType, s.sizeScale ), QgsSymbolLayerV2Utils::convertToPainterUnits( c, size.height(), s.sizeType, s.sizeScale ) );
8780
}
8881

8982
float QgsDiagram::sizePainterUnits( float l, const QgsDiagramSettings& s, const QgsRenderContext& c )
9083
{
91-
if ( s.sizeType == QgsDiagramSettings::MM )
92-
{
93-
return l * c.scaleFactor();
94-
}
95-
else
96-
{
97-
return l / c.mapToPixel().mapUnitsPerPixel();
98-
}
84+
return QgsSymbolLayerV2Utils::convertToPainterUnits( c, l, s.sizeType, s.sizeScale );
9985
}
10086

10187
QFont QgsDiagram::scaledFont( const QgsDiagramSettings& s, const QgsRenderContext& c )
10288
{
10389
QFont f = s.font;
104-
if ( s.sizeType == QgsDiagramSettings::MM )
90+
if ( s.sizeType == QgsSymbolV2::MapUnit )
10591
{
106-
f.setPixelSize( s.font.pointSizeF() * 0.376 * c.scaleFactor() );
92+
f.setPixelSize( s.font.pointSizeF() / c.mapToPixel().mapUnitsPerPixel() );
10793
}
10894
else
10995
{
110-
f.setPixelSize( s.font.pointSizeF() / c.mapToPixel().mapUnitsPerPixel() );
96+
f.setPixelSize( s.font.pointSizeF() * 0.376 * c.scaleFactor() );
11197
}
11298

11399
return f;

‎src/core/qgsdiagramrendererv2.cpp

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -181,17 +181,19 @@ void QgsDiagramSettings::readXML( const QDomElement& elem, const QgsVectorLayer*
181181
scaleBasedVisibility = minScaleDenominator >= 0 && maxScaleDenominator >= 0;
182182
}
183183

184-
//mm vs map units for diagram
185-
if ( elem.attribute( "sizeType" ) == "MM" )
184+
//diagram size unit type and scale
185+
if ( elem.attribute( "sizeType" ) == "MapUnits" )
186186
{
187-
sizeType = MM;
187+
//compatibility with pre-2.16 project files
188+
sizeType = QgsSymbolV2::MapUnit;
188189
}
189190
else
190191
{
191-
sizeType = MapUnits;
192+
sizeType = QgsSymbolLayerV2Utils::decodeOutputUnit( elem.attribute( "sizeType" ) );
192193
}
194+
sizeScale = QgsSymbolLayerV2Utils::decodeMapUnitScale( elem.attribute( "sizeScale" ) );
193195

194-
//mm vs map units for line
196+
//line width unit type and scale
195197
lineSizeType = QgsSymbolLayerV2Utils::decodeOutputUnit( elem.attribute( "lineSizeType" ) );
196198
lineSizeScale = QgsSymbolLayerV2Utils::decodeMapUnitScale( elem.attribute( "lineSizeScale" ) );
197199

@@ -303,17 +305,11 @@ void QgsDiagramSettings::writeXML( QDomElement& rendererElem, QDomDocument& doc,
303305
categoryElem.setAttribute( "maxScaleDenominator", QString::number( maxScaleDenominator ) );
304306
categoryElem.setAttribute( "transparency", QString::number( transparency ) );
305307

306-
// site type (mm vs. map units) for diagram
307-
if ( sizeType == MM )
308-
{
309-
categoryElem.setAttribute( "sizeType", "MM" );
310-
}
311-
else
312-
{
313-
categoryElem.setAttribute( "sizeType", "MapUnits" );
314-
}
308+
//diagram size unit type and scale
309+
categoryElem.setAttribute( "sizeType", QgsSymbolLayerV2Utils::encodeOutputUnit( sizeType ) );
310+
categoryElem.setAttribute( "sizeScale", QgsSymbolLayerV2Utils::encodeMapUnitScale( sizeScale ) );
315311

316-
// site type (mm vs. map units) for line
312+
//line width unit type and scale
317313
categoryElem.setAttribute( "lineSizeType", QgsSymbolLayerV2Utils::encodeOutputUnit( lineSizeType ) );
318314
categoryElem.setAttribute( "lineSizeScale", QgsSymbolLayerV2Utils::encodeMapUnitScale( lineSizeScale ) );
319315

@@ -425,9 +421,20 @@ QSizeF QgsDiagramRendererV2::sizeMapUnits( const QgsFeature& feature, const QgsR
425421
}
426422

427423
QSizeF size = diagramSize( feature, c );
428-
if ( s.sizeType == QgsDiagramSettings::MM )
424+
if ( size.isValid() )
429425
{
430-
convertSizeToMapUnits( size, c );
426+
if ( s.sizeType == QgsSymbolV2::MM )
427+
{
428+
double pixelToMap = c.scaleFactor() * c.mapToPixel().mapUnitsPerPixel();
429+
size.rwidth() *= pixelToMap;
430+
size.rheight() *= pixelToMap;
431+
}
432+
else if ( s.sizeType == QgsSymbolV2::Pixel )
433+
{
434+
double pixelToMap = c.mapToPixel().mapUnitsPerPixel();
435+
size.rwidth() *= pixelToMap;
436+
size.rheight() *= pixelToMap;
437+
}
431438
}
432439
return size;
433440
}

‎src/core/qgsdiagramrendererv2.h

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ class CORE_EXPORT QgsDiagramSettings
321321

322322
QgsDiagramSettings()
323323
: enabled( true )
324-
, sizeType( MM )
324+
, sizeType( QgsSymbolV2::MM )
325325
, lineSizeType( QgsSymbolV2::MM )
326326
, penWidth( 0.0 )
327327
, labelPlacementMethod( QgsDiagramSettings::Height )
@@ -342,7 +342,14 @@ class CORE_EXPORT QgsDiagramSettings
342342
//! @note added in 2.10
343343
QList< QString > categoryLabels;
344344
QSizeF size; //size
345-
SizeType sizeType; //mm or map units
345+
/** Diagram size unit index (mm, map units, or pixels)
346+
* @note added in 2.16
347+
*/
348+
QgsSymbolV2::OutputUnit sizeType;
349+
/** Diagram size unit scale
350+
* @note added in 2.16
351+
*/
352+
QgsMapUnitScale sizeScale;
346353
/** Line unit index (mm, map units, or pixels)
347354
* @note added in 2.16
348355
*/

‎src/ui/qgsdiagrampropertiesbase.ui

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,10 @@
702702
<item row="1" column="1">
703703
<widget class="QgsDoubleSpinBox" name="mBarWidthSpinBox">
704704
<property name="minimum">
705-
<double>0.010000000000000</double>
705+
<double>0.00000000000000</double>
706+
</property>
707+
<property name="maximum">
708+
<double>99999999.99000000000</double>
706709
</property>
707710
<property name="value">
708711
<double>5.000000000000000</double>
@@ -1006,7 +1009,17 @@
10061009
</widget>
10071010
</item>
10081011
<item row="0" column="1">
1009-
<widget class="QComboBox" name="mDiagramUnitComboBox"/>
1012+
<widget class="QgsUnitSelectionWidget" name="mDiagramUnitComboBox" native="true">
1013+
<property name="minimumSize">
1014+
<size>
1015+
<width>0</width>
1016+
<height>0</height>
1017+
</size>
1018+
</property>
1019+
<property name="focusPolicy">
1020+
<enum>Qt::StrongFocus</enum>
1021+
</property>
1022+
</widget>
10101023
</item>
10111024
<item row="4" column="0">
10121025
<spacer name="verticalSpacer_3">

‎tests/src/core/testqgsdiagram.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class TestQgsDiagram : public QObject
144144
ds.penColor = Qt::green;
145145
ds.penWidth = .5;
146146
ds.scaleByArea = true;
147-
ds.sizeType = QgsDiagramSettings::MM;
147+
ds.sizeType = QgsSymbolV2::MM;
148148
ds.size = QSizeF( 5, 5 );
149149
ds.angleOffset = 0;
150150

@@ -181,7 +181,7 @@ class TestQgsDiagram : public QObject
181181
ds.penColor = Qt::green;
182182
ds.penWidth = .5;
183183
ds.scaleByArea = true;
184-
ds.sizeType = QgsDiagramSettings::MM;
184+
ds.sizeType = QgsSymbolV2::MM;
185185
ds.size = QSizeF( 5, 5 );
186186
ds.angleOffset = 0;
187187

0 commit comments

Comments
 (0)
Please sign in to comment.