sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

update vector layer extent in case of (not commited) deleted features and fixed a small memory leak in QgsMapCanvas

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3226 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
mhugent 2005-04-25 19:52:43 +00:00
parent e1913af4a4
commit 11a3931215
2 changed files with 66 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qgsmapcanvas.cpp
View File

@ -945,6 +945,7 @@ void QgsMapCanvas::render(QPaintDevice * theQPaintDevice)
paint->end();
mCanvasProperties->drawing = false;
delete paint;
}
mCanvasProperties->dirty = false;
repaint();

91
src/qgsvectorlayer.cpp
View File

@ -1546,23 +1546,61 @@ long QgsVectorLayer::updateFeatureCount() const
void QgsVectorLayer::updateExtents()
{
if ( ! dataProvider )
{
std::cerr << __FILE__ << ":" << __LINE__
<< " QgsVectorLayer::updateFeatureCount() invoked with null dataProvider\n";
}
if(dataProvider)
{
if(mDeleted.size()==0)
{
// get the extent of the layer from the provider
layerExtent.setXmin(dataProvider->extent()->xMin());
layerExtent.setYmin(dataProvider->extent()->yMin());
layerExtent.setXmax(dataProvider->extent()->xMax());
layerExtent.setYmax(dataProvider->extent()->yMax());
}
else
{
QgsFeature* fet=0;
double xmin=DBL_MAX;
double xmax=-DBL_MAX;
double ymin=DBL_MAX;
double ymax=-DBL_MAX;
QgsRect bb;
dataProvider->reset();
while(fet=dataProvider->getNextFeature(false))
{
if(mDeleted.find(fet->featureId())==mDeleted.end())
{
bb=fet->boundingBox();
if(bb.xMin()<xmin)
{
xmin=bb.xMin();
}
if(bb.xMax()>xmax)
{
xmax=bb.xMax();
}
if(bb.yMin()<ymin)
{
ymin=bb.yMin();
}
if(bb.yMax()>ymax)
{
ymax=bb.yMax();
}
}
delete fet;
}
layerExtent.setXmin(xmin);
layerExtent.setXmax(xmax);
layerExtent.setYmin(ymin);
layerExtent.setYmax(ymax);
}
}
else
{
#ifdef QGISDEBUG
qDebug("QgsVectorLayer: Getting current extents from the provider");
qDebug(dataProvider->extent()->stringRep());
#endif
// get the extent of the layer from the provider
layerExtent.setXmin(dataProvider->extent()->xMin());
layerExtent.setYmin(dataProvider->extent()->yMin());
layerExtent.setXmax(dataProvider->extent()->xMax());
layerExtent.setYmax(dataProvider->extent()->yMax());
}
{
std::cerr << __FILE__ << ":" << __LINE__
<< " QgsVectorLayer::updateFeatureCount() invoked with null dataProvider\n";
}
//todo: also consider the not commited features
for(std::list<QgsFeature*>::iterator iter=mAddedFeatures.begin();iter!=mAddedFeatures.end();++iter)
@ -1732,17 +1770,18 @@ bool QgsVectorLayer::deleteSelectedFeatures()
if(mSelected.size()>0)
{
mModified=true;
mSelected.clear();
triggerRepaint();
mModified=true;
mSelected.clear();
triggerRepaint();
updateExtents();
//hide and delete the table because it is not up to date any more
if (tabledisplay)
{
tabledisplay->close();
delete tabledisplay;
tabledisplay=0;
}
//hide and delete the table because it is not up to date any more
if (tabledisplay)
{
tabledisplay->close();
delete tabledisplay;
tabledisplay=0;
}
}