From 573d57ff69304ca1a4e99b82b2784ade6f4368e4 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias.kuhn@gmx.ch>
Date: Fri, 31 Aug 2012 17:08:52 +0200
Subject: [PATCH] Revert print scale fix. Use Marco Hugentobler's print scale
 fix. It's cleaner

---
 src/core/diagram/qgsdiagram.cpp          | 11 -----------
 src/core/diagram/qgsdiagram.h            |  1 -
 src/core/diagram/qgshistogramdiagram.cpp |  6 ++----
 src/core/diagram/qgspiediagram.cpp       |  6 ++----
 src/core/diagram/qgstextdiagram.cpp      |  6 ++----
 5 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/core/diagram/qgsdiagram.cpp b/src/core/diagram/qgsdiagram.cpp
index b6a603604e3b..f5a54b333281 100644
--- a/src/core/diagram/qgsdiagram.cpp
+++ b/src/core/diagram/qgsdiagram.cpp
@@ -30,17 +30,6 @@ void QgsDiagram::setPenWidth( QPen& pen, const QgsDiagramSettings& s, const QgsR
   }
 }
 
-QSizeF QgsDiagram::sizeForPAL( const QSizeF& size, const QgsDiagramSettings& s, const QgsRenderContext& c )
-{
-  if ( s.sizeType == QgsDiagramSettings::MM )
-  {
-    return QSizeF( size.width() / c.rasterScaleFactor(), size.height() / c.rasterScaleFactor() );
-  }
-  else
-  {
-    return QSizeF( size );
-  }
-}
 
 QSizeF QgsDiagram::sizePainterUnits( const QSizeF& size, const QgsDiagramSettings& s, const QgsRenderContext& c )
 {
diff --git a/src/core/diagram/qgsdiagram.h b/src/core/diagram/qgsdiagram.h
index 428eb7426790..3e90843bfcfa 100644
--- a/src/core/diagram/qgsdiagram.h
+++ b/src/core/diagram/qgsdiagram.h
@@ -44,7 +44,6 @@ class CORE_EXPORT QgsDiagram
   protected:
     void setPenWidth( QPen& pen, const QgsDiagramSettings& s, const QgsRenderContext& c );
     QSizeF sizePainterUnits( const QSizeF& size, const QgsDiagramSettings& s, const QgsRenderContext& c );
-    QSizeF sizeForPAL(  const QSizeF& size, const QgsDiagramSettings& s, const QgsRenderContext& c );
     float sizePainterUnits( float l, const QgsDiagramSettings& s, const QgsRenderContext& c );
     QFont scaledFont( const QgsDiagramSettings& s, const QgsRenderContext& c );
 };
diff --git a/src/core/diagram/qgshistogramdiagram.cpp b/src/core/diagram/qgshistogramdiagram.cpp
index f74cba6a2410..c4202f98fbc5 100644
--- a/src/core/diagram/qgshistogramdiagram.cpp
+++ b/src/core/diagram/qgshistogramdiagram.cpp
@@ -67,8 +67,7 @@ QSizeF QgsHistogramDiagram::diagramSize( const QgsAttributeMap& attributes, cons
       break;
   }
 
-  QSizeF scaledSize = sizeForPAL( size, s, c );
-  return scaledSize;
+  return size;
 }
 
 QSizeF QgsHistogramDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s )
@@ -104,8 +103,7 @@ QSizeF QgsHistogramDiagram::diagramSize( const QgsAttributeMap& attributes, cons
       break;
   }
 
-  QSizeF scaledSize = sizeForPAL( size, s, c );
-  return scaledSize;
+  return size;
 }
 
 void QgsHistogramDiagram::renderDiagram( const QgsAttributeMap& att, QgsRenderContext& c, const QgsDiagramSettings& s, const QPointF& position )
diff --git a/src/core/diagram/qgspiediagram.cpp b/src/core/diagram/qgspiediagram.cpp
index ce208e149877..a7e7cb851496 100644
--- a/src/core/diagram/qgspiediagram.cpp
+++ b/src/core/diagram/qgspiediagram.cpp
@@ -69,14 +69,12 @@ QSizeF QgsPieDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsR
     size.scale( s.minimumSize, s.minimumSize, Qt::KeepAspectRatio );
   }
 
-  QSizeF scaledSize = sizeForPAL( size, s, c );
-  return scaledSize;
+  return size;
 }
 
 QSizeF QgsPieDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s )
 {
-  QSizeF scaledSize = sizeForPAL( s.size, s, c );
-  return scaledSize;
+  return s.size;
 }
 
 int  QgsPieDiagram::sCount = 0;
diff --git a/src/core/diagram/qgstextdiagram.cpp b/src/core/diagram/qgstextdiagram.cpp
index 06c25a605998..df5fd1fa8e1d 100644
--- a/src/core/diagram/qgstextdiagram.cpp
+++ b/src/core/diagram/qgstextdiagram.cpp
@@ -70,14 +70,12 @@ QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const Qgs
     size.scale( s.minimumSize, s.minimumSize, Qt::KeepAspectRatio );
   }
 
-  QSizeF scaledSize = sizeForPAL( size, s, c );
-  return scaledSize;
+  return size;
 }
 
 QSizeF QgsTextDiagram::diagramSize( const QgsAttributeMap& attributes, const QgsRenderContext& c, const QgsDiagramSettings& s )
 {
-  QSizeF scaledSize = sizeForPAL( s.size, s, c );
-  return scaledSize;
+  return s.size;
 }
 
 void QgsTextDiagram::renderDiagram( const QgsAttributeMap& att, QgsRenderContext& c, const QgsDiagramSettings& s, const QPointF& position )