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

fix for #1169, added check for isle's area

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@12678 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
rblazek 2010-01-06 11:23:43 +00:00
parent 6eb6076a27
commit 74312693ec
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/grass/qgsgrassedit.cpp
View File

@ -892,10 +892,10 @@ int QgsGrassEdit::lineSymbFromMap( int line )
if ( !( mProvider->lineAreas( line, &left, &right ) ) ) return 0;
/* Count areas/isles on both sides */
/* Count areas on both sides */
nareas = 0;
if ( left != 0 ) nareas++;
if ( right != 0 ) nareas++;
if ( left > 0 || (left < 0 && mProvider->isleArea(-left) > 0 ) ) nareas++;
if ( right > 0 || (right < 0 && mProvider->isleArea(-right) > 0 ) ) nareas++;
if ( nareas == 0 ) return SYMB_BOUNDARY_0;
else if ( nareas == 1 ) return SYMB_BOUNDARY_1;
else return SYMB_BOUNDARY_2;

12
src/providers/grass/qgsgrassprovider.cpp
View File

@ -1749,6 +1749,18 @@ bool QgsGrassProvider::lineAreas( int line, int *left, int *right )
return true;
}
int QgsGrassProvider::isleArea( int isle )
{
QgsDebugMsgLevel( "entered.", 3 );
if ( !Vect_isle_alive( mMap, isle ) )
{
return 0;
}
return ( Vect_get_isle_area( mMap, isle ) );
}
int QgsGrassProvider::centroidArea( int centroid )
{
QgsDebugMsgLevel( "entered.", 3 );

6
src/providers/grass/qgsgrassprovider.h
View File

@ -280,6 +280,12 @@ class GRASS_EXPORT QgsGrassProvider : public QgsVectorDataProvider
*/
bool lineAreas( int line, int *left, int *right );
/** Get isle area
* @param isle number
* @return area number
*/
int isleArea( int isle );
/** Get centroid area
* @param centroid line number
* @return area number (negative for island)