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

changed the ungrouped groupid to 0 from NULL

Browse Source
This commit is contained in:
Arunmozhi 2012-12-24 14:38:00 +05:30
parent 6880a7600f
commit 2b7b5da76e
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/symbol_xml2db.py
View File

@ -90,7 +90,7 @@ for symbol in symbols:
symdom.getElementsByTagName( "layer" )[ layerno ].appendChild( symbol ) symdom.getElementsByTagName( "layer" )[ layerno ].appendChild( symbol )
c.execute( "UPDATE symbol SET xml=? WHERE name=?", ( symdom.toxml(), parent_name )) c.execute( "UPDATE symbol SET xml=? WHERE name=?", ( symdom.toxml(), parent_name ))
else: else:
c.execute( "INSERT INTO symbol VALUES (?,?,?,?)", ( None, symbol_name, symbol.toxml(), None ) ) c.execute( "INSERT INTO symbol VALUES (?,?,?,?)", ( None, symbol_name, symbol.toxml(), 0 ) )
conn.commit() conn.commit()
@ -98,7 +98,7 @@ conn.commit()
colorramps = dom.getElementsByTagName( "colorramp" ) colorramps = dom.getElementsByTagName( "colorramp" )
for ramp in colorramps: for ramp in colorramps:
ramp_name = ramp.getAttribute( "name" ) ramp_name = ramp.getAttribute( "name" )
c.execute( "INSERT INTO colorramp VALUES (?,?,?,?)", ( None, ramp_name, ramp.toxml(), None ) ) c.execute( "INSERT INTO colorramp VALUES (?,?,?,?)", ( None, ramp_name, ramp.toxml(), 0 ) )
conn.commit() conn.commit()
# Finally close the sqlite cursor # Finally close the sqlite cursor

16
src/core/symbology-ng/qgsstylev2.cpp
View File

@ -512,15 +512,11 @@ QStringList QgsStyleV2::symbolsOfGroup( StyleEntity type, int groupid )
char *query; char *query;
if ( type == SymbolEntity ) if ( type == SymbolEntity )
{ {
query = groupid query = sqlite3_mprintf( "SELECT name FROM symbol WHERE groupid=%d", groupid );
? sqlite3_mprintf( "SELECT name FROM symbol WHERE groupid=%d", groupid )
: sqlite3_mprintf( "SELECT name FROM symbol WHERE groupid IS NULL" );
} }
else if ( type == ColorrampEntity ) else if ( type == ColorrampEntity )
{ {
query = groupid query = sqlite3_mprintf( "SELECT name FROM colorramp WHERE groupid=%d", groupid );
? sqlite3_mprintf( "SELECT name FROM colorramp WHERE groupid=%d", groupid )
: sqlite3_mprintf( "SELECT name FROM colorramp WHERE groupid IS NULL" );
} }
else else
{ {
@ -734,14 +730,10 @@ bool QgsStyleV2::group( StyleEntity type, QString name, int groupid )
switch ( type ) switch ( type )
{ {
case SymbolEntity: case SymbolEntity:
query = groupid query = sqlite3_mprintf( "UPDATE symbol SET groupid=%d WHERE name='%q'", groupid, name.toUtf8().constData() );
? sqlite3_mprintf( "UPDATE symbol SET groupid=%d WHERE name='%q'", groupid, name.toUtf8().constData() )
: sqlite3_mprintf( "UPDATE symbol SET groupid=NULL WHERE name='%q'", name.toUtf8().constData() );
break; break;
case ColorrampEntity: case ColorrampEntity:
query = groupid query = sqlite3_mprintf( "UPDATE colorramp SET groupid=%d WHERE name='%q'", groupid, name.toUtf8().constData() );
? sqlite3_mprintf( "UPDATE colorramp SET groupid=%d WHERE name='%q'", groupid, name.toUtf8().constData() )
: sqlite3_mprintf( "UPDATE colorramp SET groupid=NULL WHERE name='%q'", name.toUtf8().constData() );
break; break;
default: default: