[QGIS Commit] r11496 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: homann
Date: 2009-08-24 15:51:50 -0400 (Mon, 24 Aug 2009)
New Revision: 11496

Modified:
   trunk/qgis/src/core/qgscoordinatereferencesystem.cpp
Log:
Changed debug output to use QgsDebugMsg()

Modified: trunk/qgis/src/core/qgscoordinatereferencesystem.cpp
===================================================================
--- trunk/qgis/src/core/qgscoordinatereferencesystem.cpp	2009-08-24 10:31:10 UTC (rev 11495)
+++ trunk/qgis/src/core/qgscoordinatereferencesystem.cpp	2009-08-24 19:51:50 UTC (rev 11496)
@@ -91,7 +91,7 @@
       break;
     default:
       //THIS IS BAD...THIS PART OF CODE SHOULD NEVER BE REACHED...
-      QgsLogger::critical( "Unexpected case reached in " + QString( __FILE__ ) + " : " + QString( __LINE__ ) );
+      QgsDebugMsg( "Unexpected case reached!" );
   };
 }
 
@@ -253,7 +253,6 @@
   if ( theWkt.isEmpty() )
   {
     QgsDebugMsg( "theWkt is uninitialised, operation failed" );
-    QgsLogger::critical( "QgsCoordinateReferenceSystem::createFromWkt -- theWkt is uninitialised, operation failed" );
     return mIsValidFlag;
   }
   QgsDebugMsg( "QgsCoordinateReferenceSystem::createFromWkt(QString theWkt) using: " + theWkt );
@@ -338,8 +337,7 @@
   myStart = myAxisRegExp.indexIn( theProj4String, myStart );
   if ( myStart == -1 && mEllipsoidAcronym.isNull() )
   {
-    QgsLogger::warning( "QgsCoordinateReferenceSystem::createFromProj4 error"
-                        " proj string supplied has no +ellps or +a argument" );
+    QgsDebugMsg( "proj string supplied has no +ellps or +a argument" );
     return mIsValidFlag;
   }
 
@@ -531,7 +529,7 @@
     myFileInfo.setFile( myDatabaseFileName );
     if ( !myFileInfo.exists( ) )
     {
-      QgsLogger::warning( "QgsCoordinateReferenceSystem::getRecord failed :  users qgis.db not found" );
+      QgsDebugMsg( "users qgis.db not found" );
       return myMap;
     }
 
@@ -557,7 +555,7 @@
     }
     else
     {
-      QgsLogger::warning( "QgsCoordinateReferenceSystem::getRecord failed :  " + theSql );
+      QgsDebugMsg( "failed :  " + theSql );
 
     }
   }
@@ -743,7 +741,7 @@
       mMapUnits = QGis::Feet;
     else
     {
-      QgsLogger::warning( "Unsupported map units of " + unit );
+      QgsDebugMsg( "Unsupported map units of " + unit );
       mMapUnits = QGis::UnknownUnit;
     }
   }
@@ -755,7 +753,7 @@
       mMapUnits = QGis::Degrees;
     else
     {
-      QgsLogger::warning( "Unsupported map units of " + unit );
+      QgsDebugMsg( "Unsupported map units of " + unit );
       mMapUnits = QGis::UnknownUnit;
     }
     QgsDebugMsg( "Projection has angular units of " + unit );
@@ -822,8 +820,7 @@
       }
     }
   }
-  QgsLogger::warning( "QgsCoordinateReferenceSystem::findMatchingProj ------->"
-                      "\n no match found in srs.db, trying user db now!" );
+  QgsDebugMsg( "no match found in srs.db, trying user db now!" );
   // close the sqlite3 statement
   sqlite3_finalize( myPreparedStatement );
   sqlite3_close( myDatabase );
@@ -862,7 +859,7 @@
       }
     }
   }
-  QgsLogger::warning( "QgsCoordinateReferenceSystem::findMatchingProj -------> no match found in user db" );
+  QgsDebugMsg( "no match found in user db" );
 
   // close the sqlite3 statement
   sqlite3_finalize( myPreparedStatement );
@@ -1078,7 +1075,7 @@
     myFileInfo.setFile( myDatabaseFileName );
     if ( !myFileInfo.exists( ) ) //its unlikely that this condition will ever be reached
     {
-      QgsLogger::critical( "QgsCoordinateReferenceSystem::getProj4FromSrsId :  users qgis.db not found" );
+      QgsDebugMsg( "users qgis.db not found" );
       return NULL;
     }
   }
@@ -1125,7 +1122,7 @@
 
   if ( myResult )
   {
-    QgsLogger::critical( "Can't open database: " + QString( sqlite3_errmsg( *db ) ) );
+    QgsDebugMsg( "Can't open database: " + QString( sqlite3_errmsg( *db ) ) );
     // XXX This will likely never happen since on open, sqlite creates the
     //     database if it does not exist.
     // ... unfortunately it happens on Windows