check validity of CRS before saving

qgis · May 4, 2013 · 60b4369 · 60b4369
1 parent c5a8ab6
commit 60b4369
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/src/app/qgscustomprojectiondialog.cpp b/src/app/qgscustomprojectiondialog.cpp
@@ -395,6 +395,17 @@ void QgsCustomProjectionDialog::on_buttonBox_accepted()
   }
 
   QgsDebugMsg( "We save the modified CRS." );
+
+  //Check if all CRS are valid:
+  for( size_t i = 0; i < customCRSids.size(); ++i )
+  {
+    if( customCRSparameters[i].isValid()==false )
+    {
+      QMessageBox::information( this, tr( "QGIS Custom Projection" ),
+                                tr( "The proj4 definition of '%1' is not valid." ).arg(customCRSnames[i]) );
+      return;
+    }
+  }
   //Modify the CRS changed:
   bool save_success;
   for( size_t i = 0; i < customCRSids.size(); ++i )
@@ -403,22 +414,18 @@ void QgsCustomProjectionDialog::on_buttonBox_accepted()
     if( customCRSids[i] == "" )
     {
       save_success = save_success && saveCRS( customCRSparameters[i],customCRSnames[i], "", true);
-      if( ! save_success )
-      {
-	QgsDebugMsg( QString( "Problem for layer %1" ).arg( customCRSparameters[i].toProj4() ));
-      }
     }
     else
     {
       if ( existingCRSnames[customCRSids[i]]!=customCRSnames[i] || existingCRSparameters[customCRSids[i]].toProj4() != customCRSparameters[i].toProj4() )
       {
-	save_success = save_success && saveCRS(customCRSparameters[i], customCRSnames[i], customCRSids[i], false );
-	if( ! save_success )
-	{
-	  QgsDebugMsg( QString( "Problem for layer %1" ).arg( customCRSparameters[i].toProj4() ));
-	}
+        save_success = save_success && saveCRS(customCRSparameters[i], customCRSnames[i], customCRSids[i], false );
       }
     }
+    if( ! save_success )
+    {
+      QgsDebugMsg( QString( "Error when saving CRS '%1'" ).arg( customCRSnames[i] ));
+    }
   }
   QgsDebugMsg( "We remove the deleted CRS." );
   for( size_t i = 0; i < deletedCRSs.size(); ++i )

diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -663,6 +663,7 @@ bool QgsCoordinateReferenceSystem::createFromProj4( const QString theProj4String
   if ( !mIsValidFlag )
   {
     QgsDebugMsg( "Projection is not found in databases." );
+    //setProj4String will set mIsValidFlag to true if there is no issue
     setProj4String( myProj4String );
   }