Skip to content
Permalink
Browse files
Applied patch in ticket #34 to 0.7 branch as requested
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_7-candidate@5461 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
g_j_m committed May 16, 2006
1 parent e18d898 commit c8a444bd1508b8d33e73133078e5b917f7eeedd8
Showing with 7 additions and 4 deletions.
  1. +3 −1 qgis/src/qgsdlgvectorlayerproperties.cpp
  2. +4 −3 qgis/src/qgsmapcanvas.cpp
@@ -36,6 +36,8 @@
#include <qregexp.h>
#include <qtabwidget.h>

#include <string>

#include "qgis.h"
#include "qgsrect.h"
#include "qgsfield.h"
@@ -536,7 +538,7 @@ QString QgsDlgVectorLayerProperties::getMetadata()

if ( ! coordinateTransform )
{
throw QgsCsException( string("unable to get layer coordinate transform object") );
throw QgsCsException( std::string("unable to get layer coordinate transform object") );
}

QgsRect myProjectedExtent = coordinateTransform->transformBoundingBox(layer->extent());
@@ -22,6 +22,7 @@
#include <iosfwd>
#include <cmath>
#include <cfloat>
#include <string>

// added double sentinals to take load off gcc 3.3.3 pre-processor, which was dying

@@ -1353,7 +1354,7 @@ void QgsMapCanvas::zoomToSelected()
#ifdef QGISDEBUG
std::cout << "Throwing exception "<< __FILE__ << __LINE__ << std::endl;
#endif
throw QgsCsException( string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
throw QgsCsException( std::string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
}

rect = lyr->coordinateTransform()->transformBoundingBox(lyr->bBoxOfSelected());
@@ -2531,7 +2532,7 @@ void QgsMapCanvas::recalculateExtents()
#ifdef QGISDEBUG
std::cout << "Throwing exception "<< __FILE__ << __LINE__ << std::endl;
#endif
throw QgsCsException( string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
throw QgsCsException( std::string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
}

std::cout << "Transformed extent" <<
@@ -2555,7 +2556,7 @@ void QgsMapCanvas::recalculateExtents()
#ifdef QGISDEBUG
std::cout << "Throwing exception "<< __FILE__ << __LINE__ << std::endl;
#endif
throw QgsCsException( string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
throw QgsCsException( std::string("NO COORDINATE TRANSFORM FOUND FOR LAYER") );
}

updateFullExtent(lyr->coordinateTransform()->transformBoundingBox(lyr->extent()));

0 comments on commit c8a444b

Please sign in to comment.