remove unuseful message managed by pushMessage from provider

qgis · Sep 26, 2017 · 8a4d32f · 8a4d32f
1 parent 1e2a213
commit 8a4d32f
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 23 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -7179,11 +7179,6 @@ void QgisApp::mergeSelectedFeatures()
   // addFeature can fail if newFeature has no compatibile geometry
   if ( !vl->addFeature( newFeature, false ) )
   {
-    messageBar()->pushMessage(
-      tr( "Merge features" ),
-      tr( "Invalid edit operation see the log for more info" ),
-      QgsMessageBar::WARNING );
-
     vl->destroyEditCommand();
   }
   else

diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
@@ -298,7 +298,7 @@ void QgsFieldCalculator::accept()
           if ( !mVectorLayer->changeGeometry( feature.id(), &geom ) )
           {
             calculationSuccess = false;
-            error = tr( "Invalid edit operation see the log for more info" );
+            error = tr( "Can not change geometry for feature: %1", "Field calculator" ).arg( feature.id() );
             break;
           }
         }

diff --git a/src/app/qgsmaptooldeletepart.cpp b/src/app/qgsmaptooldeletepart.cpp
@@ -106,11 +106,9 @@ void QgsMapToolDeletePart::canvasReleaseEvent( QgsMapMouseEvent* e )
   {
     vlayer->beginEditCommand( tr( "Part of multipart feature deleted" ) );
     if ( !vlayer->changeGeometry( f.id(), g ) )
-    {
-      emit messageEmitted( tr( "Invalid edit operation see the log for more info" ) );
       vlayer->destroyEditCommand();
-    }
-    vlayer->endEditCommand();
+    else
+      vlayer->endEditCommand();
     vlayer->triggerRepaint();
   }
   else

diff --git a/src/app/qgsmaptooldeletering.cpp b/src/app/qgsmaptooldeletering.cpp
@@ -115,7 +115,6 @@ void QgsMapToolDeleteRing::canvasReleaseEvent( QgsMapMouseEvent* e )
     vlayer->beginEditCommand( tr( "Ring deleted" ) );
     if ( !vlayer->changeGeometry( mPressedFid, g ) )
     {
-      emit messageEmitted( tr( "Invalid edit operation see the log for more info" ) );
       vlayer->destroyEditCommand();
       return;
     }

diff --git a/src/app/qgsmaptooloffsetcurve.cpp b/src/app/qgsmaptooloffsetcurve.cpp
@@ -183,7 +183,6 @@ void QgsMapToolOffsetCurve::applyOffset()
   }
   else
   {
-    emit messageEmitted( tr( "Invalid edit operation see the log for more info" ) );
     layer->destroyEditCommand();
   }
 

diff --git a/src/app/qgsmaptoolreshape.cpp b/src/app/qgsmaptoolreshape.cpp
@@ -136,7 +136,6 @@ void QgsMapToolReshape::cadCanvasReleaseEvent( QgsMapMouseEvent * e )
     }
     else
     {
-      emit messageEmitted( tr( "Invalid edit operation see the log for more info" ) );
       vlayer->destroyEditCommand();
     }
 

diff --git a/src/app/qgsmaptoolsimplify.cpp b/src/app/qgsmaptoolsimplify.cpp
@@ -183,7 +183,6 @@ void QgsMapToolSimplify::storeSimplified()
     {
       if ( !vlayer->changeGeometry( feat.id(), g ) )
       {
-        emit messageEmitted( tr( "Invalid edit operation see the log for more info" ) );
         success = false;
       }
       delete g;

diff --git a/src/core/qgsofflineediting.cpp b/src/core/qgsofflineediting.cpp
@@ -320,7 +320,7 @@ void QgsOfflineEditing::synchronize()
         else
         {
           remoteLayer->rollBack();
-          showWarning( tr( "Syncronization failed. see log for more details" ) );
+          showWarning( tr( "Syncronization failed" ) );
         }
       }
       else
@@ -703,10 +703,7 @@ QgsVectorLayer* QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlit
         }
 
         if ( !newLayer->addFeature( f, false ) )
-        {
-          showWarning( tr( "Invalid edit operation see the log for more info" ) );
           return nullptr;
-        }
 
         emit progressUpdated( featureCount++ );
       }

diff --git a/src/core/qgsvectorlayereditbuffer.cpp b/src/core/qgsvectorlayereditbuffer.cpp
@@ -200,10 +200,7 @@ bool QgsVectorLayerEditBuffer::adaptGeometry( QgsGeometry* geometry )
     {
       QgsGeometry* newGeom = provider->convertToProviderType( geometry );
       if ( !newGeom )
-      {
-        QgsMessageLog::logMessage( tr( "Geometry type is not compatible with the layer.", "not compatible geometry" ), "adaptGeometry", QgsMessageLog::CRITICAL );
         return false;
-      }
       geometry = newGeom;
     }
   }
@@ -228,7 +225,6 @@ bool QgsVectorLayerEditBuffer::changeGeometry( QgsFeatureId fid, QgsGeometry* ge
   // if not then try to convert to a compatible geometry type
   if ( !adaptGeometry( geom ) )
   {
-    QgsMessageLog::logMessage( tr( "Feature %1 not updated", "not updated feature" ).arg( fid ), "changeGeometry", QgsMessageLog::CRITICAL );
     return false;
   }
 

diff --git a/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp b/src/plugins/geometry_checker/ui/qgsgeometrycheckersetuptab.cpp
@@ -250,7 +250,7 @@ void QgsGeometryCheckerSetupTab::runChecks()
       }
       if ( !newlayer->dataProvider()->addFeatures( features ) )
       {
-        QMessageBox::critical( this, tr( "Populate output Layer" ), tr( "See message log. Can not add features to output layer: %1." ).arg( filename ) );
+        QMessageBox::critical( this, tr( "Populate output Layer" ), tr( "Can not add features to output layer: %1." ).arg( filename ) );
         return;
       }