sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-29 00:03:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove 'layercount' attribute from project file

Browse Source 
The 'layercount' attribute was not used anyway and the calculated number could already be outdated when loading the project file again due to changes to embedded projects.
This commit is contained in:
Sebastian Dietrich 2015-12-27 15:33:23 +01:00
parent 95a56b9c65
commit d26bd46d99
7 changed files with 6 additions and 7 deletions
python/plugins/processing/tests/data
project.qgs
src/core
qgsproject.cpp
tests/testdata
labeling
test-labeling.qgs
qgis_local_server/test-project
test-server.qgs
qgis_server
test+project.qgstest+project_wfs.qgs
qgis_server_accesscontrol
project.qgs

2
python/plugins/processing/tests/data/project.qgs

@ -45,7 +45,7 @@
</filegroup> </filegroup>
</legendlayer> </legendlayer>
</legend> </legend>
<projectlayers layercount="4"> <projectlayers>
<maplayer minimumScale="0" maximumScale="1e+08" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0"> <maplayer minimumScale="0" maximumScale="1e+08" geometry="Line" type="vector" hasScaleBasedVisibilityFlag="0">
<id>lines20130323011923044</id> <id>lines20130323011923044</id>
<datasource>./lines.shp</datasource> <datasource>./lines.shp</datasource>

1
src/core/qgsproject.cpp

@ -1058,7 +1058,6 @@ bool QgsProject::write()
// Iterate over layers in zOrder // Iterate over layers in zOrder
// Call writeXML() on each // Call writeXML() on each
QDomElement projectLayersNode = doc->createElement( "projectlayers" ); QDomElement projectLayersNode = doc->createElement( "projectlayers" );
projectLayersNode.setAttribute( "layercount", qulonglong( layers.size() ) );
QMap<QString, QgsMapLayer*>::ConstIterator li = layers.constBegin(); QMap<QString, QgsMapLayer*>::ConstIterator li = layers.constBegin();
while ( li != layers.end() ) while ( li != layers.end() )

2
tests/testdata/labeling/test-labeling.qgs vendored

@ -42,7 +42,7 @@
</filegroup> </filegroup>
</legendlayer> </legendlayer>
</legend> </legend>
<projectlayers layercount="3"> <projectlayers>
<maplayer minimumScale="0" maximumScale="1e+08" simplifyDrawingHints="1" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Polygon" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> <maplayer minimumScale="0" maximumScale="1e+08" simplifyDrawingHints="1" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Polygon" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0">
<id>aoi20130902095858570</id> <id>aoi20130902095858570</id>
<datasource>dbname='./pal_features_v3.sqlite' table="aoi" (geometry) sql=</datasource> <datasource>dbname='./pal_features_v3.sqlite' table="aoi" (geometry) sql=</datasource>

2
tests/testdata/qgis_local_server/test-project/test-server.qgs vendored

@ -37,7 +37,7 @@
</filegroup> </filegroup>
</legendlayer> </legendlayer>
</legend> </legend>
<projectlayers layercount="2"> <projectlayers>
<maplayer minimumScale="0" maximumScale="1e+08" simplifyDrawingHints="1" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Polygon" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> <maplayer minimumScale="0" maximumScale="1e+08" simplifyDrawingHints="1" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Polygon" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0">
<id>aoi20130902095858570</id> <id>aoi20130902095858570</id>
<datasource>dbname='./features_v3.sqlite' table="aoi" (geometry) sql=</datasource> <datasource>dbname='./features_v3.sqlite' table="aoi" (geometry) sql=</datasource>

2
tests/testdata/qgis_server/test+project.qgs vendored

@ -47,7 +47,7 @@
</filegroup> </filegroup>
</legendlayer> </legendlayer>
</legend> </legend>
<projectlayers layercount="1"> <projectlayers>
<maplayer minimumScale="-4.65661e-10" maximumScale="1e+08" simplifyDrawingHints="0" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Point" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> <maplayer minimumScale="-4.65661e-10" maximumScale="1e+08" simplifyDrawingHints="0" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Point" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0">
<id>testlayer20150528120452665</id> <id>testlayer20150528120452665</id>
<datasource>./testlayer.shp</datasource> <datasource>./testlayer.shp</datasource>

2
tests/testdata/qgis_server/test+project_wfs.qgs vendored

@ -72,7 +72,7 @@
<layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="testlayer20150528120452665"/> <layer_coordinate_transform destAuthId="EPSG:4326" srcAuthId="EPSG:4326" srcDatumTransform="-1" destDatumTransform="-1" layerid="testlayer20150528120452665"/>
</layer_coordinate_transform_info> </layer_coordinate_transform_info>
</mapcanvas> </mapcanvas>
<projectlayers layercount="1"> <projectlayers>
<maplayer minimumScale="-4.65661e-10" maximumScale="1e+08" simplifyDrawingHints="0" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Point" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> <maplayer minimumScale="-4.65661e-10" maximumScale="1e+08" simplifyDrawingHints="0" minLabelScale="0" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Point" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0">
<id>testlayer20150528120452665</id> <id>testlayer20150528120452665</id>
<datasource>./testlayer.shp</datasource> <datasource>./testlayer.shp</datasource>

2
tests/testdata/qgis_server_accesscontrol/project.qgs vendored

@ -375,7 +375,7 @@
</ComposerLabel> </ComposerLabel>
</Composition> </Composition>
</Composer> </Composer>
<projectlayers layercount="5"> <projectlayers>
<maplayer minimumScale="-4.65661e-10" maximumScale="1e+08" simplifyDrawingHints="1" minLabelScale="1" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Polygon" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0"> <maplayer minimumScale="-4.65661e-10" maximumScale="1e+08" simplifyDrawingHints="1" minLabelScale="1" maxLabelScale="1e+08" simplifyDrawingTol="1" geometry="Polygon" simplifyMaxScale="1" type="vector" hasScaleBasedVisibilityFlag="0" simplifyLocal="1" scaleBasedLabelVisibilityFlag="0">
<id>Hello_copy20150804164427541</id> <id>Hello_copy20150804164427541</id>
<datasource>dbname='./helloworld.db' table="hello" (geom) sql=</datasource> <datasource>dbname='./helloworld.db' table="hello" (geom) sql=</datasource>