mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-25 00:58:06 -05:00
Misc. tidy up.
git-svn-id: http://svn.osgeo.org/qgis/trunk@5290 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
870c61aeb1
commit
9bffb8aaf7
@ -22,8 +22,8 @@
|
|||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#include <limits>
|
#include <limits>
|
||||||
#endif
|
#endif
|
||||||
#include <qstring.h>
|
#include <QString>
|
||||||
#include <qtextstream.h>
|
#include <QTextStream>
|
||||||
|
|
||||||
#include "qgspoint.h"
|
#include "qgspoint.h"
|
||||||
#include "qgsrect.h"
|
#include "qgsrect.h"
|
||||||
@ -86,7 +86,7 @@ void QgsRect::setMinimal()
|
|||||||
ymax =-std::numeric_limits<double>::max();
|
ymax =-std::numeric_limits<double>::max();
|
||||||
}
|
}
|
||||||
|
|
||||||
void QgsRect::scale(double scaleFactor, QgsPoint * cp)
|
void QgsRect::scale(double scaleFactor, const QgsPoint * cp)
|
||||||
{
|
{
|
||||||
// scale from the center
|
// scale from the center
|
||||||
double centerX, centerY;
|
double centerX, centerY;
|
||||||
@ -107,7 +107,7 @@ void QgsRect::scale(double scaleFactor, QgsPoint * cp)
|
|||||||
ymax = centerY + newHeight / 2.0;
|
ymax = centerY + newHeight / 2.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void QgsRect::expand(double scaleFactor, QgsPoint * cp)
|
void QgsRect::expand(double scaleFactor, const QgsPoint * cp)
|
||||||
{
|
{
|
||||||
// scale from the center
|
// scale from the center
|
||||||
double centerX, centerY;
|
double centerX, centerY;
|
||||||
|
@ -21,9 +21,7 @@
|
|||||||
|
|
||||||
#include <iosfwd>
|
#include <iosfwd>
|
||||||
|
|
||||||
#ifndef QSTRING_H
|
class QString;
|
||||||
#include <qstring.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "qgspoint.h"
|
#include "qgspoint.h"
|
||||||
|
|
||||||
@ -79,9 +77,9 @@ class QgsRect
|
|||||||
//! Center point of the rectangle
|
//! Center point of the rectangle
|
||||||
QgsPoint center() const;
|
QgsPoint center() const;
|
||||||
//! Scale the rectangle around its center point
|
//! Scale the rectangle around its center point
|
||||||
void scale(double, QgsPoint *c =0);
|
void scale(double, const QgsPoint *c =0);
|
||||||
//! Expand the rectangle to support zoom out scaling
|
//! Expand the rectangle to support zoom out scaling
|
||||||
void expand(double, QgsPoint *c = 0);
|
void expand(double, const QgsPoint *c = 0);
|
||||||
//! return the intersection with the given rectangle
|
//! return the intersection with the given rectangle
|
||||||
QgsRect intersect(QgsRect *rect);
|
QgsRect intersect(QgsRect *rect);
|
||||||
//! expand the rectangle so that covers both the original rectangle and the given rectangle
|
//! expand the rectangle so that covers both the original rectangle and the given rectangle
|
||||||
|
Loading…
x
Reference in New Issue
Block a user