Skip to content

Commit 9bb4009

Browse files
author
wonder
committed
merge from trunk 10769:10800
git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11127 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 4786e54 commit 9bb4009

38 files changed

+1072
-326
lines changed

i18n/qgis_de.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8954,7 +8954,7 @@ p, li { white-space: pre-wrap; }
89548954
</message>
89558955
<message>
89568956
<source>&amp;Make to toplevel item</source>
8957-
<translation>Als Top-Level Objekt &amp;machen</translation>
8957+
<translation>In oberste Ebene &amp;bringen</translation>
89588958
</message>
89598959
<message>
89608960
<source>Re&amp;name</source>
@@ -8966,7 +8966,7 @@ p, li { white-space: pre-wrap; }
89668966
</message>
89678967
<message>
89688968
<source>&amp;Expand all</source>
8969-
<translation>Alles Ausklapp&amp;en</translation>
8969+
<translation>Alles ausklapp&amp;en</translation>
89708970
</message>
89718971
<message>
89728972
<source>&amp;Collapse all</source>

i18n/qgis_pl_PL.ts

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!DOCTYPE TS>
3-
<TS version="2.0" language="pl_PL">
2+
<!DOCTYPE TS><TS version="1.1" language="pl_PL">
43
<defaultcodec></defaultcodec>
54
<context>
65
<name></name>
@@ -4738,7 +4737,7 @@ p, li { white-space: pre-wrap; }
47384737
<source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
47394738
p, li { white-space: pre-wrap; }
47404739
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Verdana&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
4741-
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;© QGIS 2009&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
4740+
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&#xa9; QGIS 2009&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
47424741
<translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Verdana&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;© QGIS 2009&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
47434742
</message>
47444743
</context>
@@ -8468,7 +8467,7 @@ p, li { white-space: pre-wrap; }
84688467
<translation>Maksymalna skala, dla której warstwa będzie wyświetlana.</translation>
84698468
</message>
84708469
<message>
8471-
<source>°</source>
8470+
<source>&#xb0;</source>
84728471
<translation>°</translation>
84738472
</message>
84748473
</context>
@@ -11040,23 +11039,23 @@ Musisz włączyć ponownie Quantum GISa, żeby ją przeładować.</translation>
1104011039
</message>
1104111040
<message>
1104211041
<source>not installed</source>
11043-
<translation type="unfinished"></translation>
11042+
<translation>niezainstalowana</translation>
1104411043
</message>
1104511044
<message>
1104611045
<source>installed</source>
11047-
<translation type="unfinished"></translation>
11046+
<translation>zainstalowana</translation>
1104811047
</message>
1104911048
<message>
1105011049
<source>upgradeable</source>
11051-
<translation type="unfinished">aktualizowalna</translation>
11050+
<translation>aktualizowalna</translation>
1105211051
</message>
1105311052
<message>
1105411053
<source>new!</source>
11055-
<translation type="unfinished">nowość!</translation>
11054+
<translation>nowość!</translation>
1105611055
</message>
1105711056
<message>
1105811057
<source>invalid</source>
11059-
<translation type="unfinished">niesprawna</translation>
11058+
<translation>niesprawna</translation>
1106011059
</message>
1106111060
</context>
1106211061
<context>
@@ -12144,23 +12143,27 @@ Z tego powodu wybrór odwzorowania nie będzie działał...</translation>
1214412143
</message>
1214512144
<message>
1214612145
<source>&amp;Execute</source>
12147-
<translation type="unfinished"></translation>
12146+
<translation>U&amp;ruchom</translation>
1214812147
</message>
1214912148
<message>
1215012149
<source>&amp;Previous</source>
12151-
<translation type="unfinished"></translation>
12150+
<translation>&amp;Poprzedni</translation>
1215212151
</message>
1215312152
<message>
1215412153
<source>&amp;Next</source>
12155-
<translation type="unfinished"></translation>
12154+
<translation>&amp;Następny</translation>
1215612155
</message>
1215712156
<message>
1215812157
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
1215912158
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
1216012159
p, li { white-space: pre-wrap; }
1216112160
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
1216212161
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
12163-
<translation type="unfinished"></translation>
12162+
<translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
12163+
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
12164+
p, li { white-space: pre-wrap; }
12165+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Sans Serif&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
12166+
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
1216412167
</message>
1216512168
</context>
1216612169
<context>
@@ -15513,11 +15516,11 @@ Tried URL: %1</source>
1551315516
</message>
1551415517
<message>
1551515518
<source>Unique values</source>
15516-
<translation type="unfinished"></translation>
15519+
<translation>Unikalne wartości</translation>
1551715520
</message>
1551815521
<message>
1551915522
<source>Total unique values</source>
15520-
<translation type="unfinished"></translation>
15523+
<translation>Łącznie unikalnych wartości</translation>
1552115524
</message>
1552215525
</context>
1552315526
<context>

images/themes/default/mIconLock.png

1.11 KB
Loading

mac/xcode/Qgis.xcodeproj/project.pbxproj

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,10 @@
546546
72267A4B0F9A1CFD00010C18 /* mActionZoomNext.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 72267A4A0F9A1CE800010C18 /* mActionZoomNext.png */; };
547547
72267A4E0F9A1D1D00010C18 /* mActionZoomNext.png in Copy - theme-gis */ = {isa = PBXBuildFile; fileRef = 72267A4D0F9A1D1400010C18 /* mActionZoomNext.png */; };
548548
72267A510F9A1D3D00010C18 /* mActionZoomNext.png in Copy - theme-nkids */ = {isa = PBXBuildFile; fileRef = 72267A500F9A1D3100010C18 /* mActionZoomNext.png */; };
549+
723FD05F0FBCB87900EFA55D /* qgspalgeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 723FD05D0FBCB85D00EFA55D /* qgspalgeometry.cpp */; };
550+
723FD0620FBCB91C00EFA55D /* qgis.db.connect-login.pg.1.png in Copy - modules */ = {isa = PBXBuildFile; fileRef = 723FD0610FBCB8E100EFA55D /* qgis.db.connect-login.pg.1.png */; };
551+
723FD0630FBCB91C00EFA55D /* qgis.db.connect-login.pg.qgm in Copy - modules */ = {isa = PBXBuildFile; fileRef = 723FD0600FBCB8E100EFA55D /* qgis.db.connect-login.pg.qgm */; };
552+
723FD06B0FBCBA3500EFA55D /* qgis.db.connect-login.pg.py in Copy - scripts */ = {isa = PBXBuildFile; fileRef = 723FD0670FBCB94600EFA55D /* qgis.db.connect-login.pg.py */; };
549553
7256F2D70F4146AC0022BE1F /* qgis_new_80pct.png in Copy - doc-images */ = {isa = PBXBuildFile; fileRef = 7209F0190F39E5DA003DC336 /* qgis_new_80pct.png */; };
550554
7256F2FA0F4148FC0022BE1F /* Carl_Anderson.jpg in Copy - images-developers */ = {isa = PBXBuildFile; fileRef = 7209EE000F39E5D9003DC336 /* Carl_Anderson.jpg */; };
551555
7256F2FB0F4148FC0022BE1F /* Christoph_Spoerri.jpg in Copy - images-developers */ = {isa = PBXBuildFile; fileRef = 7209EE010F39E5D9003DC336 /* Christoph_Spoerri.jpg */; };
@@ -1073,6 +1077,7 @@
10731077
72745A130F770319007F4218 /* spit.png in Copy - theme-gis-plugins */ = {isa = PBXBuildFile; fileRef = 72745A030F770252007F4218 /* spit.png */; };
10741078
72745A140F770319007F4218 /* wfs.png in Copy - theme-gis-plugins */ = {isa = PBXBuildFile; fileRef = 72745A040F770252007F4218 /* wfs.png */; };
10751079
72745A190F770356007F4218 /* coordinate_capture.png in Copy - theme-gis-plug-cc */ = {isa = PBXBuildFile; fileRef = 727459F80F770252007F4218 /* coordinate_capture.png */; };
1080+
727CEC220FBAFFA200F5B88C /* mIconLock.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 727CEC210FBAFF6000F5B88C /* mIconLock.png */; };
10761081
72820FE10FACCE770011C963 /* qgsmaptooldeletering.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72820FDE0FACCE520011C963 /* qgsmaptooldeletering.cpp */; };
10771082
72820FE20FACCE770011C963 /* qgsmaptooldeletepart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72820FDD0FACCE520011C963 /* qgsmaptooldeletepart.cpp */; };
10781083
72820FE30FACCE770011C963 /* qgsmaptoolsimplify.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72820FE00FACCE520011C963 /* qgsmaptoolsimplify.cpp */; };
@@ -3667,6 +3672,17 @@
36673672
/* End PBXContainerItemProxy section */
36683673

36693674
/* Begin PBXCopyFilesBuildPhase section */
3675+
723FD0700FBCBA3D00EFA55D /* Copy - scripts */ = {
3676+
isa = PBXCopyFilesBuildPhase;
3677+
buildActionMask = 2147483647;
3678+
dstPath = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_DATA_SUBDIR)/grass/scripts";
3679+
dstSubfolderSpec = 0;
3680+
files = (
3681+
723FD06B0FBCBA3500EFA55D /* qgis.db.connect-login.pg.py in Copy - scripts */,
3682+
);
3683+
name = "Copy - scripts";
3684+
runOnlyForDeploymentPostprocessing = 0;
3685+
};
36703686
7256F2D60F4146A70022BE1F /* Copy - doc-images */ = {
36713687
isa = PBXCopyFilesBuildPhase;
36723688
buildActionMask = 2147483647;
@@ -3992,6 +4008,7 @@
39924008
dstPath = "$(QGIS_DATA_SUBDIR)/themes/default";
39934009
dstSubfolderSpec = 6;
39944010
files = (
4011+
727CEC220FBAFFA200F5B88C /* mIconLock.png in Copy - theme-default */,
39954012
72267A4B0F9A1CFD00010C18 /* mActionZoomNext.png in Copy - theme-default */,
39964013
7256F4220F41C4DD0022BE1F /* clearInput.png in Copy - theme-default */,
39974014
7256F4230F41C4DD0022BE1F /* extents.png in Copy - theme-default */,
@@ -5224,6 +5241,8 @@
52245241
72E70A1C0F426C7600142011 /* v.what.vect.1.png in Copy - modules */,
52255242
72E70A1D0F426C7600142011 /* v.what.vect.2.png in Copy - modules */,
52265243
72E70A1E0F426C7600142011 /* v.what.vect.qgm in Copy - modules */,
5244+
723FD0620FBCB91C00EFA55D /* qgis.db.connect-login.pg.1.png in Copy - modules */,
5245+
723FD0630FBCB91C00EFA55D /* qgis.db.connect-login.pg.qgm in Copy - modules */,
52275246
);
52285247
name = "Copy - modules";
52295248
runOnlyForDeploymentPostprocessing = 0;
@@ -8302,6 +8321,12 @@
83028321
72331DFB0F8E2A2100398D2B /* qgsoverlayobject.sip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsoverlayobject.sip; path = ../../python/core/qgsoverlayobject.sip; sourceTree = SOURCE_ROOT; };
83038322
72331DFC0F8E2A5D00398D2B /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../../src/core/spatialite/sqlite3.c; sourceTree = SOURCE_ROOT; };
83048323
72331DFD0F8E2A5D00398D2B /* spatialite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = spatialite.c; path = ../../src/core/spatialite/spatialite.c; sourceTree = SOURCE_ROOT; };
8324+
723FD05D0FBCB85D00EFA55D /* qgspalgeometry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgspalgeometry.cpp; path = ../../src/core/qgspalgeometry.cpp; sourceTree = SOURCE_ROOT; };
8325+
723FD05E0FBCB85D00EFA55D /* qgspalgeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgspalgeometry.h; path = ../../src/core/qgspalgeometry.h; sourceTree = SOURCE_ROOT; };
8326+
723FD0600FBCB8E100EFA55D /* qgis.db.connect-login.pg.qgm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = "qgis.db.connect-login.pg.qgm"; path = "../../src/plugins/grass/modules/qgis.db.connect-login.pg.qgm"; sourceTree = SOURCE_ROOT; };
8327+
723FD0610FBCB8E100EFA55D /* qgis.db.connect-login.pg.1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "qgis.db.connect-login.pg.1.png"; path = "../../src/plugins/grass/modules/qgis.db.connect-login.pg.1.png"; sourceTree = SOURCE_ROOT; };
8328+
723FD0660FBCB94600EFA55D /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../../src/plugins/grass/scripts/CMakeLists.txt; sourceTree = SOURCE_ROOT; };
8329+
723FD0670FBCB94600EFA55D /* qgis.db.connect-login.pg.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = "qgis.db.connect-login.pg.py"; path = "../../src/plugins/grass/scripts/qgis.db.connect-login.pg.py"; sourceTree = SOURCE_ROOT; };
83058330
7256F2DC0F4147890022BE1F /* TODO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = TODO; path = ../../TODO; sourceTree = SOURCE_ROOT; };
83068331
7256F2DD0F4147890022BE1F /* SPONSORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = SPONSORS; path = ../../SPONSORS; sourceTree = SOURCE_ROOT; };
83078332
7256F2DE0F4147890022BE1F /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README; path = ../../README; sourceTree = SOURCE_ROOT; };
@@ -8371,6 +8396,7 @@
83718396
72745A020F770252007F4218 /* scale_bar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = scale_bar.png; path = ../../images/themes/gis/plugins/scale_bar.png; sourceTree = SOURCE_ROOT; };
83728397
72745A030F770252007F4218 /* spit.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = spit.png; path = ../../images/themes/gis/plugins/spit.png; sourceTree = SOURCE_ROOT; };
83738398
72745A040F770252007F4218 /* wfs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = wfs.png; path = ../../images/themes/gis/plugins/wfs.png; sourceTree = SOURCE_ROOT; };
8399+
727CEC210FBAFF6000F5B88C /* mIconLock.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mIconLock.png; path = ../../images/themes/default/mIconLock.png; sourceTree = SOURCE_ROOT; };
83748400
72820FDB0FACCE520011C963 /* qgsmaptooldeletering.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsmaptooldeletering.h; path = ../../src/app/qgsmaptooldeletering.h; sourceTree = SOURCE_ROOT; };
83758401
72820FDC0FACCE520011C963 /* qgsmaptooldeletepart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsmaptooldeletepart.h; path = ../../src/app/qgsmaptooldeletepart.h; sourceTree = SOURCE_ROOT; };
83768402
72820FDD0FACCE520011C963 /* qgsmaptooldeletepart.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsmaptooldeletepart.cpp; path = ../../src/app/qgsmaptooldeletepart.cpp; sourceTree = SOURCE_ROOT; };
@@ -9418,6 +9444,8 @@
94189444
7209E6AC0F39E57A003DC336 /* qgsmaptopixel.h */,
94199445
7209E6AD0F39E57A003DC336 /* qgsmessageoutput.cpp */,
94209446
7209E6AE0F39E57A003DC336 /* qgsmessageoutput.h */,
9447+
723FD05D0FBCB85D00EFA55D /* qgspalgeometry.cpp */,
9448+
723FD05E0FBCB85D00EFA55D /* qgspalgeometry.h */,
94219449
7209E6AF0F39E57A003DC336 /* qgspoint.cpp */,
94229450
7209E6B00F39E57A003DC336 /* qgspoint.h */,
94239451
7209E6B10F39E57A003DC336 /* qgsproject.cpp */,
@@ -10122,6 +10150,7 @@
1012210150
7209E8300F39E57B003DC336 /* config */,
1012310151
7209E8340F39E57B003DC336 /* images */,
1012410152
7209E8370F39E57B003DC336 /* modules */,
10153+
723FD0650FBCB94600EFA55D /* scripts */,
1012510154
7209EB490F39E57B003DC336 /* themes */,
1012610155
);
1012710156
name = grass;
@@ -10911,6 +10940,8 @@
1091110940
7209EB200F39E57B003DC336 /* v.what.vect.1.png */,
1091210941
7209EB210F39E57B003DC336 /* v.what.vect.2.png */,
1091310942
7209EB220F39E57B003DC336 /* v.what.vect.qgm */,
10943+
723FD0600FBCB8E100EFA55D /* qgis.db.connect-login.pg.qgm */,
10944+
723FD0610FBCB8E100EFA55D /* qgis.db.connect-login.pg.1.png */,
1091410945
);
1091510946
name = modules;
1091610947
path = ../../src/plugins/grass/modules;
@@ -12391,6 +12422,7 @@
1239112422
7209EF610F39E5D9003DC336 /* user.svg */,
1239212423
7209EF620F39E5D9003DC336 /* zoomMaster.svg */,
1239312424
7262ED890F7A75FB00498385 /* mActionAddSpatiaLiteLayer.png */,
12425+
727CEC210FBAFF6000F5B88C /* mIconLock.png */,
1239412426
72EB12940F7E9B51002C38FA /* plugins */,
1239512427
);
1239612428
name = default;
@@ -12777,6 +12809,16 @@
1277712809
path = ../../src/plugins/oracle_raster;
1277812810
sourceTree = SOURCE_ROOT;
1277912811
};
12812+
723FD0650FBCB94600EFA55D /* scripts */ = {
12813+
isa = PBXGroup;
12814+
children = (
12815+
723FD0660FBCB94600EFA55D /* CMakeLists.txt */,
12816+
723FD0670FBCB94600EFA55D /* qgis.db.connect-login.pg.py */,
12817+
);
12818+
name = scripts;
12819+
path = ../../src/plugins/grass/scripts;
12820+
sourceTree = SOURCE_ROOT;
12821+
};
1278012822
7262ED8C0F7A767400498385 /* spatialite */ = {
1278112823
isa = PBXGroup;
1278212824
children = (
@@ -13670,6 +13712,7 @@
1367013712
72E70A4E0F426D3B00142011 /* Copy - theme-classic */,
1367113713
72E70A810F426DF300142011 /* Copy - theme-gis */,
1367213714
72EBC9800F49D7F60016BA3C /* Copy - theme-default */,
13715+
723FD0700FBCBA3D00EFA55D /* Copy - scripts */,
1367313716
);
1367413717
buildRules = (
1367513718
729288440F71F4F0006D9489 /* PBXBuildRule */,
@@ -14637,6 +14680,7 @@
1463714680
7203830A0F8B8C8F0083B883 /* qgscentralpointpositionmanager.cpp in Sources */,
1463814681
7203830B0F8B8C8F0083B883 /* qgsoverlayobject.cpp in Sources */,
1463914682
7203830C0F8B8C8F0083B883 /* qgspalobjectpositionmanager.cpp in Sources */,
14683+
723FD05F0FBCB87900EFA55D /* qgspalgeometry.cpp in Sources */,
1464014684
7203830D0F8B8C8F0083B883 /* qgsvectoroverlay.cpp in Sources */,
1464114685
720383780F8BA8C50083B883 /* feature.cpp in Sources */,
1464214686
720383790F8BA8C50083B883 /* geomfunction.cpp in Sources */,

python/core/conversions.sip

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ which are not wrapped by PyQt:
1010
- QMap<QString, QVariant::Type>
1111
- QMap<TYPE1, TYPE2*>
1212
- QMultiMap<double, TYPE2>
13+
- QMap<int, QgsOverlayObject*>*
1314
*/
1415

1516
%ModuleHeaderCode
@@ -22,6 +23,7 @@ typedef int Py_ssize_t;
2223
%End
2324

2425

26+
2527
template <TYPE>
2628
%MappedType QVector< QVector<TYPE> >
2729
{
@@ -817,3 +819,80 @@ template<double, TYPE2>
817819
return sipGetState(sipTransferObj);
818820
%End
819821
};
822+
823+
%MappedType QMap<int, QgsOverlayObject*>
824+
{
825+
%TypeHeaderCode
826+
#include <QMap>
827+
%End
828+
829+
%ConvertFromTypeCode
830+
831+
//convert map to a python dictionary
832+
PyObject *d;
833+
834+
if ((d = PyDict_New()) == NULL)
835+
return NULL;
836+
837+
for (QMap<int, QgsOverlayObject*>::iterator it = sipCpp->begin(); it != sipCpp->end(); ++it)
838+
{
839+
QgsOverlayObject* oobj = new QgsOverlayObject(*it.value());
840+
841+
PyObject* keyobj = PyInt_FromLong(it.key());
842+
PyObject* pyOobj = sipConvertFromInstance(oobj, sipClass_QgsOverlayObject, sipTransferObj);
843+
PyDict_SetItem(d, keyobj, pyOobj);
844+
845+
if(pyOobj == NULL || keyobj == NULL || PyDict_SetItem(d, keyobj, pyOobj) < 0)
846+
{
847+
Py_DECREF(d);
848+
849+
if (pyOobj)
850+
{
851+
Py_DECREF(pyOobj);
852+
}
853+
854+
if (keyobj)
855+
{
856+
Py_DECREF(keyobj);
857+
}
858+
return NULL;
859+
}
860+
Py_DECREF(pyOobj);
861+
Py_DECREF(keyobj);
862+
}
863+
return d;
864+
865+
%End
866+
%ConvertToTypeCode
867+
PyObject *t1obj, *t2obj;
868+
#if PY_VERSION_HEX >= 0x02050000
869+
Py_ssize_t i = 0;
870+
#else
871+
int i = 0;
872+
#endif
873+
874+
QMap<int, QgsOverlayObject*> *qm = new QMap<int, QgsOverlayObject*>;
875+
876+
while (PyDict_Next(sipPy, &i, &t1obj, &t2obj))
877+
{
878+
int state;
879+
int t1 = (int)(PyFloat_AsDouble(t1obj));
880+
QgsOverlayObject* t2 = reinterpret_cast<QgsOverlayObject*>(sipConvertToInstance(t2obj, sipClass_QgsOverlayObject, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
881+
882+
if (*sipIsErr)
883+
{
884+
sipReleaseInstance(t2, sipClass_QgsOverlayObject, state);
885+
delete qm;
886+
return 0;
887+
}
888+
889+
qm->insert(t1, t2);
890+
891+
sipReleaseInstance(t2, sipClass_QgsOverlayObject, state);
892+
}
893+
894+
*sipCppPtr = qm;
895+
896+
return sipGetState(sipTransferObj);
897+
%End
898+
};

python/core/core.sip

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
%Include qgsmaptopixel.sip
4343
%Include qgsmarkercatalogue.sip
4444
%Include qgsmessageoutput.sip
45+
%Include qgsoverlayobject.sip
4546
%Include qgspoint.sip
4647
%Include qgsproject.sip
4748
%Include qgsprovidermetadata.sip
@@ -70,5 +71,6 @@
7071
%Include qgsvectordataprovider.sip
7172
%Include qgsvectorfilewriter.sip
7273
%Include qgsvectorlayer.sip
74+
%Include qgsvectoroverlay.sip
7375

7476
%Include symbology-ng-core.sip

0 commit comments

Comments
 (0)