fix for bug #85 (remove layer does not work for legend layer files)

mhugent · mhugent · commit e49b162f7a4c · 2006-05-11T13:38:15.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5440 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp
@@ -102,7 +102,6 @@ void QgsMapToolCapture::canvasReleaseEvent(QMouseEvent * e)
 QMessageBox::Ok);
 	return;
       }
-
     QgsPoint idPoint = toMapCoords(e->pos());
     
     // emit signal - QgisApp can catch it and save point position to clipboard
@@ -150,8 +149,6 @@ QMessageBox::Ok);
   }  
   else if (mTool == CaptureLine || mTool == CapturePolygon)
   {
-    // LINE & POLYGON CAPTURING
-  
     //check we only use the line tool for line/multiline layers
     if(mTool == CaptureLine && vlayer->vectorType() != QGis::Line)
       {
diff --git a/src/legend/qgslegend.cpp b/src/legend/qgslegend.cpp
@@ -592,39 +592,51 @@ void QgsLegend::legendGroupRemove()
 
 void QgsLegend::legendLayerRemove()
 {
-    //remove all layers of the current legendLayer
+    //if the current item is a legend layer: remove all layers of the current legendLayer
    QgsLegendLayer* ll = dynamic_cast<QgsLegendLayer*>(currentItem());
-   if(!ll)
-   {
-       return;
-   }
-
-   std::list<QgsMapLayer*> maplayers = ll->mapLayers();
-   mStateOfCheckBoxes.erase(ll);
-
-   //todo: also remove the entries for the QgsLegendLayerFiles from the map
-   std::list<QgsLegendLayerFile*> llfiles = ll->legendLayerFiles();
-   for(std::list<QgsLegendLayerFile*>::iterator it = llfiles.begin(); it != llfiles.end(); ++it)
-     {
-       mStateOfCheckBoxes.erase(*it);
-     }
-
-   for(std::list<QgsMapLayer*>::iterator it = maplayers.begin(); it!=maplayers.end(); ++it)
+   if(ll)
    {
-       //remove the layer
-       if(*it)
+     std::list<QgsMapLayer*> maplayers = ll->mapLayers();
+     mStateOfCheckBoxes.erase(ll);
+     
+     //also remove the entries for the QgsLegendLayerFiles from the map
+     std::list<QgsLegendLayerFile*> llfiles = ll->legendLayerFiles();
+     for(std::list<QgsLegendLayerFile*>::iterator it = llfiles.begin(); it != llfiles.end(); ++it)
+       {
+	 mStateOfCheckBoxes.erase(*it);
+       }
+     
+     for(std::list<QgsMapLayer*>::iterator it = maplayers.begin(); it!=maplayers.end(); ++it)
        {
-	   QgsMapLayerRegistry::instance()->removeMapLayer((*it)->getLayerID());
+	 //remove the layer
+	 if(*it)
+	   {
+	     QgsMapLayerRegistry::instance()->removeMapLayer((*it)->getLayerID());
+	   }
        }
+     
+     if(maplayers.size()>0)
+       {
+	 mMapCanvas->refresh();
+       }
+     removeItem(ll);
+     delete ll;
+     adjustIconSize();
+     return;
    }
 
-   if(maplayers.size()>0)
-   {
-     mMapCanvas->refresh();
-   }
-   removeItem(ll);
-   delete ll;
-   adjustIconSize();
+   //if the current item is a legend layer file
+   QgsLegendLayerFile* llf = dynamic_cast<QgsLegendLayerFile*>(currentItem());
+   if(llf)
+     {
+       if(llf->layer())
+	 {
+	   //the map layer registry emits a signal an this will remove the legend layer
+	   //from the legend and from memory by calling QgsLegend::removeLayer(QString layer key)
+	   QgsMapLayerRegistry::instance()->removeMapLayer(llf->layer()->getLayerID());
+	 }
+     }
+   return;
 }
 
 void QgsLegend::legendLayerAddToOverview()

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,6 @@ void QgsMapToolCapture::canvasReleaseEvent(QMouseEvent * e)`
`102`	`102`	`QMessageBox::Ok);`
`103`	`103`	`return;`
`104`	`104`	`}`
`105`		`-`
`106`	`105`	`QgsPoint idPoint = toMapCoords(e->pos());`
`107`	`106`
`108`	`107`	`// emit signal - QgisApp can catch it and save point position to clipboard`
`@@ -150,8 +149,6 @@ QMessageBox::Ok);`
`150`	`149`	`}`
`151`	`150`	`else if (mTool == CaptureLine \|\| mTool == CapturePolygon)`
`152`	`151`	`{`
`153`		`- // LINE & POLYGON CAPTURING`
`154`		`-`
`155`	`152`	`//check we only use the line tool for line/multiline layers`
`156`	`153`	`if(mTool == CaptureLine && vlayer->vectorType() != QGis::Line)`
`157`	`154`	`{`