Skip to content

Commit 8414ff9

Browse files
author
Sandro Santilli
committed
Split edge layer into "edge" and "edge label"
Mind you: you may need to re-run cmake as a filename changed
1 parent 81f99d6 commit 8414ff9

File tree

3 files changed

+159
-4
lines changed

3 files changed

+159
-4
lines changed

‎python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,16 @@ def run(item, action, mainwindow):
124124

125125
# edge
126126
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
127-
layer = QgsVectorLayer(uri.uri(), u'%s.edges' % toponame, provider)
128-
layer.loadNamedStyle(os.path.join(template_dir, 'edge_style.qml'))
127+
layer = QgsVectorLayer(uri.uri(), u'%s.edge' % toponame, provider)
128+
layer.loadNamedStyle(os.path.join(template_dir, 'edge.qml'))
129+
registry.addMapLayer(layer)
130+
legend.setLayerVisible(layer, False)
131+
legend.moveLayer(layer, group)
132+
133+
# edge labels
134+
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
135+
layer = QgsVectorLayer(uri.uri(), u'%s.edge label' % toponame, provider)
136+
layer.loadNamedStyle(os.path.join(template_dir, 'edge_label.qml'))
129137
registry.addMapLayer(layer)
130138
legend.setLayerVisible(layer, False)
131139
legend.moveLayer(layer, group)

‎python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge_style.qml renamed to ‎python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge.qml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2-
<qgis version="1.9.0-Master" minimumScale="-4.65661e-10" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0">
2+
<qgis version="1.9.0-Master" minimumScale="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0">
33
<transparencyLevelInt>255</transparencyLevelInt>
44
<renderer-v2 symbollevels="0" type="RuleRenderer">
55
<rules>
@@ -214,7 +214,7 @@
214214
<property key="labeling/displayAll" value="false"/>
215215
<property key="labeling/dist" value="0"/>
216216
<property key="labeling/distInMapUnits" value="false"/>
217-
<property key="labeling/enabled" value="true"/>
217+
<property key="labeling/enabled" value="false"/>
218218
<property key="labeling/fieldName" value="edge_id"/>
219219
<property key="labeling/fontCapitals" value="0"/>
220220
<property key="labeling/fontFamily" value="AlArabiya"/>
@@ -233,6 +233,8 @@
233233
<property key="labeling/mergeLines" value="false"/>
234234
<property key="labeling/minFeatureSize" value="0"/>
235235
<property key="labeling/multiLineLabels" value="false"/>
236+
<property key="labeling/multilineAlign" value="0"/>
237+
<property key="labeling/multilineHeight" value="1"/>
236238
<property key="labeling/namedStyle" value=""/>
237239
<property key="labeling/obstacle" value="true"/>
238240
<property key="labeling/placement" value="2"/>
@@ -247,12 +249,14 @@
247249
<property key="labeling/textColorG" value="0"/>
248250
<property key="labeling/textColorR" value="0"/>
249251
<property key="labeling/textTransp" value="0"/>
252+
<property key="labeling/upsidedownLabels" value="0"/>
250253
<property key="labeling/wrapChar" value=""/>
251254
<property key="labeling/xOffset" value="0"/>
252255
<property key="labeling/xQuadOffset" value="0"/>
253256
<property key="labeling/yOffset" value="0"/>
254257
<property key="labeling/yQuadOffset" value="0"/>
255258
</customproperties>
259+
<editorlayout>generatedlayout</editorlayout>
256260
<displayfield>edge_id</displayfield>
257261
<label>0</label>
258262
<labelattributes>
@@ -289,5 +293,7 @@
289293
<editform>.</editform>
290294
<editforminit></editforminit>
291295
<annotationform>.</annotationform>
296+
<excludeAttributesWMS/>
297+
<excludeAttributesWFS/>
292298
<attributeactions/>
293299
</qgis>

‎python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/templates/edge_label.qml

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
2+
<qgis version="1.9.0-Master" minimumScale="0" maximumScale="1e+08" hasScaleBasedVisibilityFlag="0">
3+
<transparencyLevelInt>255</transparencyLevelInt>
4+
<renderer-v2 symbollevels="0" type="singleSymbol">
5+
<symbols>
6+
<symbol outputUnit="MM" alpha="0" type="line" name="0">
7+
<layer pass="0" class="SimpleLine" locked="0">
8+
<prop k="capstyle" v="square"/>
9+
<prop k="color" v="167,236,159,255"/>
10+
<prop k="customdash" v="5;2"/>
11+
<prop k="joinstyle" v="bevel"/>
12+
<prop k="offset" v="0"/>
13+
<prop k="penstyle" v="solid"/>
14+
<prop k="use_custom_dash" v="0"/>
15+
<prop k="width" v="0.26"/>
16+
</layer>
17+
</symbol>
18+
</symbols>
19+
<rotation field=""/>
20+
<sizescale field="" scalemethod=""/>
21+
</renderer-v2>
22+
<customproperties>
23+
<property key="labeling" value="pal"/>
24+
<property key="labeling/addDirectionSymbol" value="false"/>
25+
<property key="labeling/angleOffset" value="0"/>
26+
<property key="labeling/bufferColorB" value="255"/>
27+
<property key="labeling/bufferColorG" value="255"/>
28+
<property key="labeling/bufferColorR" value="255"/>
29+
<property key="labeling/bufferJoinStyle" value="64"/>
30+
<property key="labeling/bufferNoFill" value="false"/>
31+
<property key="labeling/bufferSize" value="1"/>
32+
<property key="labeling/bufferSizeInMapUnits" value="false"/>
33+
<property key="labeling/bufferTransp" value="0"/>
34+
<property key="labeling/centroidWhole" value="false"/>
35+
<property key="labeling/dataDefinedProperty0" value=""/>
36+
<property key="labeling/dataDefinedProperty1" value=""/>
37+
<property key="labeling/dataDefinedProperty10" value=""/>
38+
<property key="labeling/dataDefinedProperty11" value=""/>
39+
<property key="labeling/dataDefinedProperty12" value=""/>
40+
<property key="labeling/dataDefinedProperty13" value=""/>
41+
<property key="labeling/dataDefinedProperty14" value=""/>
42+
<property key="labeling/dataDefinedProperty15" value=""/>
43+
<property key="labeling/dataDefinedProperty16" value=""/>
44+
<property key="labeling/dataDefinedProperty17" value=""/>
45+
<property key="labeling/dataDefinedProperty18" value=""/>
46+
<property key="labeling/dataDefinedProperty19" value=""/>
47+
<property key="labeling/dataDefinedProperty2" value=""/>
48+
<property key="labeling/dataDefinedProperty3" value=""/>
49+
<property key="labeling/dataDefinedProperty4" value=""/>
50+
<property key="labeling/dataDefinedProperty5" value=""/>
51+
<property key="labeling/dataDefinedProperty6" value=""/>
52+
<property key="labeling/dataDefinedProperty7" value=""/>
53+
<property key="labeling/dataDefinedProperty8" value=""/>
54+
<property key="labeling/dataDefinedProperty9" value=""/>
55+
<property key="labeling/decimals" value="0"/>
56+
<property key="labeling/displayAll" value="false"/>
57+
<property key="labeling/dist" value="0"/>
58+
<property key="labeling/distInMapUnits" value="false"/>
59+
<property key="labeling/enabled" value="true"/>
60+
<property key="labeling/fieldName" value="edge_id"/>
61+
<property key="labeling/fontCapitals" value="0"/>
62+
<property key="labeling/fontFamily" value="AlArabiya"/>
63+
<property key="labeling/fontItalic" value="false"/>
64+
<property key="labeling/fontLetterSpacing" value="0"/>
65+
<property key="labeling/fontSize" value="8"/>
66+
<property key="labeling/fontSizeInMapUnits" value="false"/>
67+
<property key="labeling/fontStrikeout" value="false"/>
68+
<property key="labeling/fontUnderline" value="false"/>
69+
<property key="labeling/fontWeight" value="50"/>
70+
<property key="labeling/fontWordSpacing" value="0"/>
71+
<property key="labeling/formatNumbers" value="false"/>
72+
<property key="labeling/isExpression" value="false"/>
73+
<property key="labeling/labelOffsetInMapUnits" value="true"/>
74+
<property key="labeling/labelPerPart" value="false"/>
75+
<property key="labeling/mergeLines" value="false"/>
76+
<property key="labeling/minFeatureSize" value="0"/>
77+
<property key="labeling/multiLineLabels" value="false"/>
78+
<property key="labeling/multilineAlign" value="0"/>
79+
<property key="labeling/multilineHeight" value="1"/>
80+
<property key="labeling/namedStyle" value=""/>
81+
<property key="labeling/obstacle" value="true"/>
82+
<property key="labeling/placement" value="2"/>
83+
<property key="labeling/placementFlags" value="9"/>
84+
<property key="labeling/plussign" value="true"/>
85+
<property key="labeling/preserveRotation" value="true"/>
86+
<property key="labeling/previewBkgrdColor" value="#ffffff"/>
87+
<property key="labeling/priority" value="5"/>
88+
<property key="labeling/scaleMax" value="0"/>
89+
<property key="labeling/scaleMin" value="0"/>
90+
<property key="labeling/textColorB" value="0"/>
91+
<property key="labeling/textColorG" value="0"/>
92+
<property key="labeling/textColorR" value="0"/>
93+
<property key="labeling/textTransp" value="0"/>
94+
<property key="labeling/upsidedownLabels" value="0"/>
95+
<property key="labeling/wrapChar" value=""/>
96+
<property key="labeling/xOffset" value="0"/>
97+
<property key="labeling/xQuadOffset" value="0"/>
98+
<property key="labeling/yOffset" value="0"/>
99+
<property key="labeling/yQuadOffset" value="0"/>
100+
</customproperties>
101+
<editorlayout>generatedlayout</editorlayout>
102+
<displayfield>edge_id</displayfield>
103+
<label>0</label>
104+
<labelattributes>
105+
<label fieldname="" text="Label"/>
106+
<family fieldname="" name="Sans"/>
107+
<size fieldname="" units="pt" value="12"/>
108+
<bold fieldname="" on="0"/>
109+
<italic fieldname="" on="0"/>
110+
<underline fieldname="" on="0"/>
111+
<strikeout fieldname="" on="0"/>
112+
<color fieldname="" red="0" blue="0" green="0"/>
113+
<x fieldname=""/>
114+
<y fieldname=""/>
115+
<offset x="0" y="0" units="pt" yfieldname="" xfieldname=""/>
116+
<angle fieldname="" value="0" auto="0"/>
117+
<alignment fieldname="" value="center"/>
118+
<buffercolor fieldname="" red="255" blue="255" green="255"/>
119+
<buffersize fieldname="" units="pt" value="1"/>
120+
<bufferenabled fieldname="" on=""/>
121+
<multilineenabled fieldname="" on=""/>
122+
<selectedonly on=""/>
123+
</labelattributes>
124+
<edittypes>
125+
<edittype type="0" name="abs_next_left_edge"/>
126+
<edittype type="0" name="abs_next_right_edge"/>
127+
<edittype type="0" name="edge_id"/>
128+
<edittype type="0" name="end_node"/>
129+
<edittype type="0" name="left_face"/>
130+
<edittype type="0" name="next_left_edge"/>
131+
<edittype type="0" name="next_right_edge"/>
132+
<edittype type="0" name="right_face"/>
133+
<edittype type="0" name="start_node"/>
134+
</edittypes>
135+
<editform>.</editform>
136+
<editforminit></editforminit>
137+
<annotationform>.</annotationform>
138+
<excludeAttributesWMS/>
139+
<excludeAttributesWFS/>
140+
<attributeactions/>
141+
</qgis>

0 commit comments

Comments
 (0)