sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert print scale fix.

Browse Source 
Use Marco Hugentobler's print scale fix. It's cleaner
This commit is contained in:
Matthias Kuhn 2012-08-31 17:08:52 +02:00
parent 83b4caae0c
commit 573d57ff69
5 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/diagram/qgsdiagram.cpp
View File

@ -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 )
{

1
src/core/diagram/qgsdiagram.h
View File

@ -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 );
};

6
src/core/diagram/qgshistogramdiagram.cpp
View File

@ -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 )

6
src/core/diagram/qgspiediagram.cpp
View File

@ -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;

6
src/core/diagram/qgstextdiagram.cpp
View File

@ -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 )