Skip to content

Commit

Permalink
Merge pull request #987 from nens/value_maps_include_values_in_labels
Browse files Browse the repository at this point in the history 
Styling: include values in value map labels
  • Loading branch information
@leendertvanwolfswinkel
leendertvanwolfswinkel authored Mar 11, 2024
2 parents 444094d + ce1b01c commit daaee85
Show file tree
Hide file tree
Showing 11 changed files with 131 additions and 125 deletions.
14 changes: 7 additions & 7 deletions layer_styles/grid/cell.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,25 +103,25 @@
<Option type="Map">
<Option name="map" type="List">
<Option type="Map">
<Option name="2D Surface water" type="QString" value="1"/>
<Option name="1: 2D Surface water" type="QString" value="1"/>
</Option>
<Option type="Map">
<Option name="2D Groundwater" type="QString" value="2"/>
<Option name="2: 2D Groundwater" type="QString" value="2"/>
</Option>
<Option type="Map">
<Option name="1D Without storage" type="QString" value="3"/>
<Option name="3: 1D Without storage" type="QString" value="3"/>
</Option>
<Option type="Map">
<Option name="1D With storage" type="QString" value="4"/>
<Option name="4: 1D With storage" type="QString" value="4"/>
</Option>
<Option type="Map">
<Option name="2D Surface water boundary" type="QString" value="5"/>
<Option name="5: 2D Surface water boundary" type="QString" value="5"/>
</Option>
<Option type="Map">
<Option name="2D Groundwater boundary" type="QString" value="6"/>
<Option name="6: 2D Groundwater boundary" type="QString" value="6"/>
</Option>
<Option type="Map">
<Option name="1D Boundary" type="QString" value="7"/>
<Option name="7: 1D Boundary" type="QString" value="7"/>
</Option>
<Option type="Map">
<Option name="&lt;NULL>" type="QString" value="{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}"/>
Expand Down
44 changes: 22 additions & 22 deletions layer_styles/grid/flowline.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2920,70 +2920,70 @@
<Option type="Map">
<Option name="map" type="List">
<Option type="Map">
<Option name="1D Embedded" type="QString" value="0"/>
<Option name="0: 1D Embedded" type="QString" value="0"/>
</Option>
<Option type="Map">
<Option name="1D Isolated" type="QString" value="1"/>
<Option name="1: 1D Isolated" type="QString" value="1"/>
</Option>
<Option type="Map">
<Option name="1D Connected" type="QString" value="2"/>
<Option name="2: 1D Connected" type="QString" value="2"/>
</Option>
<Option type="Map">
<Option name="1D Long-crested structure" type="QString" value="3"/>
<Option name="3: 1D Long-crested structure" type="QString" value="3"/>
</Option>
<Option type="Map">
<Option name="1D Short-crested structure" type="QString" value="4"/>
<Option name="4: 1D Short-crested structure" type="QString" value="4"/>
</Option>
<Option type="Map">
<Option name="1D Double connected" type="QString" value="5"/>
<Option name="5: 1D Double connected" type="QString" value="5"/>
</Option>
<Option type="Map">
<Option name="1D-2D Single connected line with storage" type="QString" value="51"/>
<Option name="51: 1D-2D Single connected line with storage" type="QString" value="51"/>
</Option>
<Option type="Map">
<Option name="1D-2D Single connected line without storage" type="QString" value="52"/>
<Option name="52: 1D-2D Single connected line without storage" type="QString" value="52"/>
</Option>
<Option type="Map">
<Option name="1D-2D Double connected line with storage" type="QString" value="53"/>
<Option name="53: 1D-2D Double connected line with storage" type="QString" value="53"/>
</Option>
<Option type="Map">
<Option name="1D-2D Double connected line without storage" type="QString" value="54"/>
<Option name="54: 1D-2D Double connected line without storage" type="QString" value="54"/>
</Option>
<Option type="Map">
<Option name="1D-2D Connected line possible breach" type="QString" value="55"/>
<Option name="55: 1D-2D Connected line possible breach" type="QString" value="55"/>
</Option>
<Option type="Map">
<Option name="1D-2D Connected line active breach" type="QString" value="56"/>
<Option name="56: 1D-2D Connected line active breach" type="QString" value="56"/>
</Option>
<Option type="Map">
<Option name="1D-2D Groundwater" type="QString" value="57"/>
<Option name="57: 1D-2D Groundwater" type="QString" value="57"/>
</Option>
<Option type="Map">
<Option name="1D-2D Groundwater" type="QString" value="58"/>
<Option name="58: 1D-2D Groundwater" type="QString" value="58"/>
</Option>
<Option type="Map">
<Option name="2D" type="QString" value="100"/>
<Option name="100: 2D" type="QString" value="100"/>
</Option>
<Option type="Map">
<Option name="2D Crossing obstacle/levee" type="QString" value="101"/>
<Option name="101: 2D Crossing obstacle/levee" type="QString" value="101"/>
</Option>
<Option type="Map">
<Option name="2D Vertical surface/groundwater link" type="QString" value="150"/>
<Option name="150: 2D Vertical surface/groundwater link" type="QString" value="150"/>
</Option>
<Option type="Map">
<Option name="2D Groundwater" type="QString" value="-150"/>
<Option name="-150: 2D Groundwater" type="QString" value="-150"/>
</Option>
<Option type="Map">
<Option name="2D Boundary" type="QString" value="200"/>
<Option name="200: 2D Boundary" type="QString" value="200"/>
</Option>
<Option type="Map">
<Option name="2D Boundary" type="QString" value="300"/>
<Option name="300: 2D Boundary" type="QString" value="300"/>
</Option>
<Option type="Map">
<Option name="2D Boundary" type="QString" value="400"/>
<Option name="400: 2D Boundary" type="QString" value="400"/>
</Option>
<Option type="Map">
<Option name="2D Boundary" type="QString" value="500"/>
<Option name="500: 2D Boundary" type="QString" value="500"/>
</Option>
<Option type="Map">
<Option name="NULL" type="QString" value="{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}"/>
Expand Down
36 changes: 18 additions & 18 deletions layer_styles/grid/node.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,25 +584,25 @@
<Option type="Map">
<Option name="map" type="List">
<Option type="Map">
<Option name="2D Surface water" type="QString" value="1"/>
<Option name="1: 2D Surface water" type="QString" value="1"/>
</Option>
<Option type="Map">
<Option name="2D Groundwater" type="QString" value="2"/>
<Option name="2: 2D Groundwater" type="QString" value="2"/>
</Option>
<Option type="Map">
<Option name="1D Without storage" type="QString" value="3"/>
<Option name="3: 1D Without storage" type="QString" value="3"/>
</Option>
<Option type="Map">
<Option name="1D With storage" type="QString" value="4"/>
<Option name="4: 1D With storage" type="QString" value="4"/>
</Option>
<Option type="Map">
<Option name="2D Surface water boundary" type="QString" value="5"/>
<Option name="5: 2D Surface water boundary" type="QString" value="5"/>
</Option>
<Option type="Map">
<Option name="2D Groundwater boundary" type="QString" value="6"/>
<Option name="6: 2D Groundwater boundary" type="QString" value="6"/>
</Option>
<Option type="Map">
<Option name="1D Boundary" type="QString" value="7"/>
<Option name="7: 1D Boundary" type="QString" value="7"/>
</Option>
<Option type="Map">
<Option name="&lt;NULL>" type="QString" value="{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}"/>
Expand All @@ -618,37 +618,37 @@
<Option type="Map">
<Option name="map" type="List">
<Option type="Map">
<Option name="Boundary" type="QString" value="-1"/>
<Option name="-1: Boundary" type="QString" value="-1"/>
</Option>
<Option type="Map">
<Option name="Embedded" type="QString" value="0"/>
<Option name="0: Embedded" type="QString" value="0"/>
</Option>
<Option type="Map">
<Option name="Isolated" type="QString" value="1"/>
<Option name="1: Isolated" type="QString" value="1"/>
</Option>
<Option type="Map">
<Option name="Connected" type="QString" value="2"/>
<Option name="2: Connected" type="QString" value="2"/>
</Option>
<Option type="Map">
<Option name="Broad crested" type="QString" value="3"/>
<Option name="3: Broad crested" type="QString" value="3"/>
</Option>
<Option type="Map">
<Option name="Short crested" type="QString" value="4"/>
<Option name="4: Short crested" type="QString" value="4"/>
</Option>
<Option type="Map">
<Option name="Double connected" type="QString" value="5"/>
<Option name="5: Double connected" type="QString" value="5"/>
</Option>
<Option type="Map">
<Option name="Embedded added node" type="QString" value="100"/>
<Option name="100: Embedded added node" type="QString" value="100"/>
</Option>
<Option type="Map">
<Option name="Isolated added node" type="QString" value="101"/>
<Option name="101: Isolated added node" type="QString" value="101"/>
</Option>
<Option type="Map">
<Option name="Connected added node" type="QString" value="102"/>
<Option name="102: Connected added node" type="QString" value="102"/>
</Option>
<Option type="Map">
<Option name="Double connected added node" type="QString" value="105"/>
<Option name="105: Double connected added node" type="QString" value="105"/>
</Option>
<Option type="Map">
<Option name="&lt;NULL>" type="QString" value="{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}"/>
Expand Down
4 changes: 2 additions & 2 deletions layer_styles/grid/pump.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@
<Option type="Map">
<Option name="map" type="List">
<Option type="Map">
<Option name="Suction side water level determines pump behaviour" type="QString" value="1"/>
<Option name="1: Suction side water level determines pump behaviour" type="QString" value="1"/>
</Option>
<Option type="Map">
<Option name="Delivery side water level determines pump behaviour" type="QString" value="2"/>
<Option name="2: Delivery side water level determines pump behaviour" type="QString" value="2"/>
</Option>
<Option type="Map">
<Option name="&lt;NULL>" type="QString" value="{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}"/>
Expand Down
4 changes: 2 additions & 2 deletions layer_styles/grid/pump_linestring.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,10 @@
<Option type="Map">
<Option name="map" type="List">
<Option type="Map">
<Option name="Suction side water level determines pump behaviour" type="QString" value="1"/>
<Option name="1: Suction side water level determines pump behaviour" type="QString" value="1"/>
</Option>
<Option type="Map">
<Option name="Delivery side water level determines pump behaviour" type="QString" value="2"/>
<Option name="2: Delivery side water level determines pump behaviour" type="QString" value="2"/>
</Option>
</Option>
</Option>
Expand Down
14 changes: 7 additions & 7 deletions processing/styles/cell.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,25 +103,25 @@
<Option type="Map">
<Option name="map" type="List">
<Option type="Map">
<Option name="2D Surface water" type="QString" value="1"/>
<Option name="1: 2D Surface water" type="QString" value="1"/>
</Option>
<Option type="Map">
<Option name="2D Groundwater" type="QString" value="2"/>
<Option name="2: 2D Groundwater" type="QString" value="2"/>
</Option>
<Option type="Map">
<Option name="1D Without storage" type="QString" value="3"/>
<Option name="3: 1D Without storage" type="QString" value="3"/>
</Option>
<Option type="Map">
<Option name="1D With storage" type="QString" value="4"/>
<Option name="4: 1D With storage" type="QString" value="4"/>
</Option>
<Option type="Map">
<Option name="2D Surface water boundary" type="QString" value="5"/>
<Option name="5: 2D Surface water boundary" type="QString" value="5"/>
</Option>
<Option type="Map">
<Option name="2D Groundwater boundary" type="QString" value="6"/>
<Option name="6: 2D Groundwater boundary" type="QString" value="6"/>
</Option>
<Option type="Map">
<Option name="1D Boundary" type="QString" value="7"/>
<Option name="7: 1D Boundary" type="QString" value="7"/>
</Option>
<Option type="Map">
<Option name="&lt;NULL>" type="QString" value="{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}"/>
Expand Down
49 changes: 26 additions & 23 deletions processing/styles/cross_sectional_discharge_flowlines.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,72 +310,75 @@
<editWidget type="ValueMap">
<config>
<Option type="Map">
<Option type="List" name="map">
<Option name="map" type="List">
<Option type="Map">
<Option type="QString" name="1D Embedded" value="0"/>
<Option name="0: 1D Embedded" type="QString" value="0"/>
</Option>
<Option type="Map">
<Option type="QString" name="1D Isolated" value="1"/>
<Option name="1: 1D Isolated" type="QString" value="1"/>
</Option>
<Option type="Map">
<Option type="QString" name="1D Connected" value="2"/>
<Option name="2: 1D Connected" type="QString" value="2"/>
</Option>
<Option type="Map">
<Option type="QString" name="1D Long-crested structure" value="3"/>
<Option name="3: 1D Long-crested structure" type="QString" value="3"/>
</Option>
<Option type="Map">
<Option type="QString" name="1D Short-crested structure" value="4"/>
<Option name="4: 1D Short-crested structure" type="QString" value="4"/>
</Option>
<Option type="Map">
<Option type="QString" name="1D Double connected" value="5"/>
<Option name="5: 1D Double connected" type="QString" value="5"/>
</Option>
<Option type="Map">
<Option type="QString" name="1D-2D Single connected line with storage" value="51"/>
<Option name="51: 1D-2D Single connected line with storage" type="QString" value="51"/>
</Option>
<Option type="Map">
<Option type="QString" name="1D-2D Single connected line without storage" value="52"/>
<Option name="52: 1D-2D Single connected line without storage" type="QString" value="52"/>
</Option>
<Option type="Map">
<Option type="QString" name="1D-2D Double connected line with storage" value="53"/>
<Option name="53: 1D-2D Double connected line with storage" type="QString" value="53"/>
</Option>
<Option type="Map">
<Option type="QString" name="1D-2D Double connected line without storage" value="54"/>
<Option name="54: 1D-2D Double connected line without storage" type="QString" value="54"/>
</Option>
<Option type="Map">
<Option type="QString" name="1D-2D Connected line possible breach" value="55"/>
<Option name="55: 1D-2D Connected line possible breach" type="QString" value="55"/>
</Option>
<Option type="Map">
<Option type="QString" name="1D-2D Connected line active breach" value="56"/>
<Option name="56: 1D-2D Connected line active breach" type="QString" value="56"/>
</Option>
<Option type="Map">
<Option type="QString" name="1D-2D Groundwater" value="57"/>
<Option name="57: 1D-2D Groundwater" type="QString" value="57"/>
</Option>
<Option type="Map">
<Option type="QString" name="1D-2D Groundwater" value="58"/>
<Option name="58: 1D-2D Groundwater" type="QString" value="58"/>
</Option>
<Option type="Map">
<Option type="QString" name="2D" value="100"/>
<Option name="100: 2D" type="QString" value="100"/>
</Option>
<Option type="Map">
<Option type="QString" name="2D Crossing obstacle/levee" value="101"/>
<Option name="101: 2D Crossing obstacle/levee" type="QString" value="101"/>
</Option>
<Option type="Map">
<Option type="QString" name="2D Vertical surface/groundwater link" value="150"/>
<Option name="150: 2D Vertical surface/groundwater link" type="QString" value="150"/>
</Option>
<Option type="Map">
<Option type="QString" name="2D Groundwater" value="-150"/>
<Option name="-150: 2D Groundwater" type="QString" value="-150"/>
</Option>
<Option type="Map">
<Option type="QString" name="2D Boundary" value="200"/>
<Option name="200: 2D Boundary" type="QString" value="200"/>
</Option>
<Option type="Map">
<Option type="QString" name="2D Boundary" value="300"/>
<Option name="300: 2D Boundary" type="QString" value="300"/>
</Option>
<Option type="Map">
<Option type="QString" name="2D Boundary" value="400"/>
<Option name="400: 2D Boundary" type="QString" value="400"/>
</Option>
<Option type="Map">
<Option type="QString" name="2D Boundary" value="500"/>
<Option name="500: 2D Boundary" type="QString" value="500"/>
</Option>
<Option type="Map">
<Option name="NULL" type="QString" value="{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}"/>
</Option>
</Option>
</Option>
Expand Down
Loading

0 comments on commit daaee85

Please sign in to comment.