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

fix warnings

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@11851 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2009-10-26 15:17:43 +00:00
parent 08cdd0b182
commit 32ceff37f9
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/composer/qgscomposermap.cpp
View File

@ -1036,7 +1036,7 @@ int QgsComposerMap::xGridLines( QList< QPair< double, QLineF > >& lines ) const
QRectF mapBoundingRect = mapPolygon.boundingRect(); QRectF mapBoundingRect = mapPolygon.boundingRect();
double currentLevel = ( int )(( mapBoundingRect.top() - mGridOffsetY ) / mGridIntervalY + 1.0 ) * mGridIntervalY + mGridOffsetY; double currentLevel = ( int )(( mapBoundingRect.top() - mGridOffsetY ) / mGridIntervalY + 1.0 ) * mGridIntervalY + mGridOffsetY;
if ( !mRotation > 0.0 ) if ( mRotation <= 0.0 )
{ {
//no rotation. Do it 'the easy way' //no rotation. Do it 'the easy way'
@ -1101,7 +1101,7 @@ int QgsComposerMap::yGridLines( QList< QPair< double, QLineF > >& lines ) const
QRectF mapBoundingRect = mapPolygon.boundingRect(); QRectF mapBoundingRect = mapPolygon.boundingRect();
double currentLevel = ( int )(( mapBoundingRect.left() - mGridOffsetX ) / mGridIntervalX + 1.0 ) * mGridIntervalX + mGridOffsetX; double currentLevel = ( int )(( mapBoundingRect.left() - mGridOffsetX ) / mGridIntervalX + 1.0 ) * mGridIntervalX + mGridOffsetX;
if ( !mRotation > 0.0 ) if ( mRotation <= 0.0 )
{ {
//no rotation. Do it 'the easy way' //no rotation. Do it 'the easy way'
double xCanvasCoord; double xCanvasCoord;
@ -1312,7 +1312,7 @@ void QgsComposerMap::requestedExtent( QgsRectangle& extent ) const
double QgsComposerMap::mapUnitsToMM() const double QgsComposerMap::mapUnitsToMM() const
{ {
double extentWidth = mExtent.width(); double extentWidth = mExtent.width();
if ( !extentWidth > 0 ) if ( extentWidth <= 0 )
{ {
return 1; return 1;
} }

3
src/ui/qgsoptionsbase.ui
View File

@ -12,9 +12,6 @@
<property name="windowTitle" > <property name="windowTitle" >
<string>Options</string> <string>Options</string>
</property> </property>
<property name="windowIcon" >
<iconset/>
</property>
<property name="sizeGripEnabled" > <property name="sizeGripEnabled" >
<bool>true</bool> <bool>true</bool>
</property> </property>