[QGIS Commit] r13307 - in trunk/qgis/src: app core

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-04-13 18:22:23 -0400 (Tue, 13 Apr 2010)
New Revision: 13307

Modified:
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/core/qgscoordinatereferencesystem.cpp
Log:
show message in status bar, when CRS of an added layer is undefined

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2010-04-13 13:05:51 UTC (rev 13306)
+++ trunk/qgis/src/app/qgisapp.cpp	2010-04-13 22:22:23 UTC (rev 13307)
@@ -341,11 +341,13 @@
     // XXX TODO: Change project to store selected CS as 'projectCRS' not 'selectedWkt'
     toProj4 = QgsProject::instance()->readEntry( "SpatialRefSys", "//ProjectCRSProj4String", GEOPROJ4 );
     QgsDebugMsg( "Layer srs set from project: " + toProj4 );
+    QgisApp::instance()->statusBar()->showMessage( QObject::tr( "CRS undefined - defaulting to project CRS" ) );
     srs->createFromProj4( toProj4 );
   }
   else ///Projections/defaultBehaviour==useGlobal
   {
     srs->createFromProj4( mySettings.value( "/Projections/defaultProjectionString", GEOPROJ4 ).toString() );
+    QgisApp::instance()->statusBar()->showMessage( QObject::tr( "CRS undefined - defaulting to default CRS" ) );
   }
 
 }
@@ -2603,7 +2605,7 @@
 // Let render() do its own cursor management
 //  QApplication::restoreOverrideCursor();
 
-  statusBar()->showMessage( mMapCanvas->extent().toString( 2 ) );
+  // statusBar()->showMessage( mMapCanvas->extent().toString( 2 ) );
 
   return true;
 } // QgisApp::addVectorLayer()

Modified: trunk/qgis/src/core/qgscoordinatereferencesystem.cpp
===================================================================
--- trunk/qgis/src/core/qgscoordinatereferencesystem.cpp	2010-04-13 13:05:51 UTC (rev 13306)
+++ trunk/qgis/src/core/qgscoordinatereferencesystem.cpp	2010-04-13 22:22:23 UTC (rev 13307)
@@ -245,7 +245,7 @@
   }
   QgsDebugMsg( "QgsCoordinateReferenceSystem::createFromWkt(QString theWkt) using: " + theWkt );
   QByteArray ba = theWkt.toLatin1();
-  const char *pWkt = ba;
+  const char *pWkt = ba.data();
 
   OGRErr myInputResult = OSRImportFromWkt( mCRS, ( char ** ) & pWkt );
 
@@ -254,6 +254,7 @@
     QgsDebugMsg( "\n---------------------------------------------------------------" );
     QgsDebugMsg( "This CRS could *** NOT *** be set from the supplied Wkt " );
     QgsDebugMsg( "INPUT: " + theWkt );
+    QgsDebugMsg( QString( "UNUSED WKT: %1" ).arg( pWkt ) );
     QgsDebugMsg( "---------------------------------------------------------------\n" );
     return mIsValidFlag;
   }