Skip to content
Permalink
Browse files

Fix warnings

  • Loading branch information
m-kuhn committed Sep 5, 2012
1 parent 8cb578f commit ba0bed00fac97b1039084e6bfe01a00c5e7fee9c
Showing with 29 additions and 17 deletions.
  1. +3 −0 src/core/diagram/qgspiediagram.cpp
  2. +9 −3 src/core/diagram/qgstextdiagram.cpp
  3. +17 −14 src/ui/qgsdiagrampropertiesbase.ui
@@ -31,6 +31,7 @@ QgsPieDiagram::~QgsPieDiagram()

QSizeF QgsPieDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s, const QgsDiagramInterpolationSettings& is )
{
Q_UNUSED( c );
QgsAttributeMap::const_iterator attIt = attributes.find( is.classificationAttribute );
if ( attIt == attributes.constEnd() )
{
@@ -74,6 +75,8 @@ QSizeF QgsPieDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsR

QSizeF QgsPieDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s )
{
Q_UNUSED( c );
Q_UNUSED( attributes );
return s.size;
}

@@ -32,7 +32,10 @@ QgsTextDiagram::~QgsTextDiagram()

QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s, const QgsDiagramInterpolationSettings& is )
{
QgsAttributeMap::const_iterator attIt = attributes.find( is.classificationAttribute );
Q_UNUSED( c );

QgsAttributeMap::const_iterator attIt = attributes.find( is.classificationAttribute );

if ( attIt == attributes.constEnd() )
{
return QSizeF(); //zero size if attribute is missing
@@ -74,8 +77,11 @@ QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const Qgs
}

QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s )
{
return s.size;
{
Q_UNUSED( c );
Q_UNUSED( attributes );

return s.size;
}

void QgsTextDiagram::renderDiagram( const QgsAttributeMap& att, QgsRenderContext& c, const QgsDiagramSettings& s, const QPointF& position )
@@ -11,6 +11,9 @@
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QGroupBox" name="mDisplayDiagramsGroupBox">
<property name="title">
@@ -36,8 +39,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>742</width>
<height>610</height>
<width>756</width>
<height>627</height>
</rect>
</property>
<layout class="QVBoxLayout" name="scrollAreaLayout">
@@ -121,8 +124,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>708</width>
<height>278</height>
<width>723</width>
<height>356</height>
</rect>
</property>
<attribute name="label">
@@ -331,8 +334,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>708</width>
<height>239</height>
<width>640</width>
<height>289</height>
</rect>
</property>
<attribute name="label">
@@ -520,8 +523,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>165</width>
<height>220</height>
<width>216</width>
<height>284</height>
</rect>
</property>
<attribute name="label">
@@ -682,8 +685,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>109</width>
<height>151</height>
<width>137</width>
<height>191</height>
</rect>
</property>
<attribute name="label">
@@ -747,7 +750,7 @@
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string>mOrientationButtonGroup</string>
<string notr="true">mOrientationButtonGroup</string>
</attribute>
</widget>
</item>
@@ -757,7 +760,7 @@
<string>Down</string>
</property>
<attribute name="buttonGroup">
<string>mOrientationButtonGroup</string>
<string notr="true">mOrientationButtonGroup</string>
</attribute>
</widget>
</item>
@@ -767,7 +770,7 @@
<string>Right</string>
</property>
<attribute name="buttonGroup">
<string>mOrientationButtonGroup</string>
<string notr="true">mOrientationButtonGroup</string>
</attribute>
</widget>
</item>
@@ -777,7 +780,7 @@
<string>Left</string>
</property>
<attribute name="buttonGroup">
<string>mOrientationButtonGroup</string>
<string notr="true">mOrientationButtonGroup</string>
</attribute>
</widget>
</item>

0 comments on commit ba0bed0

Please sign in to comment.
You can’t perform that action at this time.