Merge pull request #212 from nens/styling-value-maps-changes

Add values to value map labels and some other textual improvements
nens · Mar 12, 2024 · ff0ac40 · ff0ac40
2 parents 695018b + 8e63213
commit ff0ac40
Show file tree

Hide file tree

Showing 38 changed files with 526 additions and 555 deletions.
diff --git a/threedi_schematisation_editor/enumerators.py b/threedi_schematisation_editor/enumerators.py
@@ -10,7 +10,7 @@ class GeometryType(Enum):
 
 
 class BoundaryType(Enum):
-    WATERLEVEL = 1
+    WATER_LEVEL = 1
     VELOCITY = 2
     DISCHARGE = 3
     SOMMERFELD = 5
@@ -160,19 +160,17 @@ class PipeCalculationType(Enum):
     EMBEDDED = 0
     ISOLATED = 1
     CONNECTED = 2
-    BROAD_CRESTED = 3
-    SHORT_CRESTED = 4
 
 
 class SewerageType(Enum):
-    MIXED = 0
-    RAIN_WATER = 1
-    DRY_WEATHER_FLOW = 2
+    COMBINED_SEWER = 0
+    STORM_DRAIN = 1
+    SANITARY_SEWER = 2
     TRANSPORT = 3
     SPILLWAY = 4
-    ZINKER = 5
+    SYPHON = 5
     STORAGE = 6
-    STORAGE_TANK = 7
+    STORAGE_AND_SETTLEMENT_TANK = 7
 
 
 class PumpType(Enum):
@@ -181,9 +179,9 @@ class PumpType(Enum):
 
 
 class InfiltrationSurfaceOption(Enum):
-    RAIN = 0
-    WHOLE_SURFACE = 1
-    WET_SURFACE = 2
+    WHOLE_SURFACE_WHEN_RAINING = 0
+    ALWAYS_WHOLE_SURFACE = 1
+    WET_SURFACE_ONLY = 2
 
 
 class ZoomCategories(Enum):

diff --git a/threedi_schematisation_editor/styles/vector/1d_boundary_condition/default.qml b/threedi_schematisation_editor/styles/vector/1d_boundary_condition/default.qml
@@ -132,16 +132,16 @@
           <Option type="Map">
             <Option type="List" name="map">
               <Option type="Map">
-                <Option value="1" type="QString" name="1: waterlevel"/>
+                <Option value="1" type="QString" name="1: Water level"/>
               </Option>
               <Option type="Map">
-                <Option value="2" type="QString" name="2: velocity"/>
+                <Option value="2" type="QString" name="2: Velocity"/>
               </Option>
               <Option type="Map">
-                <Option value="3" type="QString" name="3: discharge"/>
+                <Option value="3" type="QString" name="3: Discharge"/>
               </Option>
               <Option type="Map">
-                <Option value="5" type="QString" name="5: sommerfeld"/>
+                <Option value="5" type="QString" name="5: Sommerfeld"/>
               </Option>
             </Option>
           </Option>

diff --git a/threedi_schematisation_editor/styles/vector/1d_boundary_condition/timeseries label.qml b/threedi_schematisation_editor/styles/vector/1d_boundary_condition/timeseries label.qml
@@ -142,16 +142,16 @@
           <Option type="Map">
             <Option type="List" name="map">
               <Option type="Map">
-                <Option type="QString" value="1" name="1: waterlevel"/>
+                <Option type="QString" value="1" name="1: Water level"/>
               </Option>
               <Option type="Map">
-                <Option type="QString" value="2" name="2: velocity"/>
+                <Option type="QString" value="2" name="2: Velocity"/>
               </Option>
               <Option type="Map">
-                <Option type="QString" value="3" name="3: discharge"/>
+                <Option type="QString" value="3" name="3: Discharge"/>
               </Option>
               <Option type="Map">
-                <Option type="QString" value="5" name="5: sommerfeld"/>
+                <Option type="QString" value="5" name="5: Sommerfeld"/>
               </Option>
             </Option>
           </Option>

diff --git a/threedi_schematisation_editor/styles/vector/2d_boundary_condition/default.qml b/threedi_schematisation_editor/styles/vector/2d_boundary_condition/default.qml
@@ -145,16 +145,16 @@
           <Option type="Map">
             <Option type="List" name="map">
               <Option type="Map">
-                <Option value="1" type="QString" name="1: waterlevel"/>
+                <Option value="1" type="QString" name="1: Water level"/>
               </Option>
               <Option type="Map">
-                <Option value="2" type="QString" name="2: velocity"/>
+                <Option value="2" type="QString" name="2: Velocity"/>
               </Option>
               <Option type="Map">
-                <Option value="3" type="QString" name="3: discharge"/>
+                <Option value="3" type="QString" name="3: Discharge"/>
               </Option>
               <Option type="Map">
-                <Option value="5" type="QString" name="5: sommerfeld"/>
+                <Option value="5" type="QString" name="5: Sommerfeld"/>
               </Option>
             </Option>
           </Option>

diff --git a/threedi_schematisation_editor/styles/vector/2d_boundary_condition/timeseries label.qml b/threedi_schematisation_editor/styles/vector/2d_boundary_condition/timeseries label.qml
@@ -182,16 +182,16 @@
           <Option type="Map">
             <Option name="map" type="List">
               <Option type="Map">
-                <Option value="1" name="1: waterlevel" type="QString"/>
+                <Option value="1" name="1: Water level" type="QString"/>
               </Option>
               <Option type="Map">
-                <Option value="2" name="2: velocity" type="QString"/>
+                <Option value="2" name="2: Velocity" type="QString"/>
               </Option>
               <Option type="Map">
-                <Option value="3" name="3: discharge" type="QString"/>
+                <Option value="3" name="3: Discharge" type="QString"/>
               </Option>
               <Option type="Map">
-                <Option value="5" name="5: sommerfeld" type="QString"/>
+                <Option value="5" name="5: Sommerfeld" type="QString"/>
               </Option>
             </Option>
           </Option>

diff --git a/threedi_schematisation_editor/styles/vector/channel/calculation point distance.qml b/threedi_schematisation_editor/styles/vector/channel/calculation point distance.qml
@@ -547,16 +547,16 @@
           <Option type="Map">
             <Option type="List" name="map">
               <Option type="Map">
-                <Option value="100" type="int" name="Embedded"/>
+                <Option value="100" type="int" name="100: Embedded"/>
               </Option>
               <Option type="Map">
-                <Option value="101" type="int" name="Isolated"/>
+                <Option value="101" type="int" name="101: Isolated"/>
               </Option>
               <Option type="Map">
-                <Option value="102" type="int" name="Connected"/>
+                <Option value="102" type="int" name="102: Connected"/>
               </Option>
               <Option type="Map">
-                <Option value="105" type="int" name="Double connected"/>
+                <Option value="105" type="int" name="105: Double connected"/>
               </Option>
             </Option>
           </Option>
@@ -582,22 +582,22 @@
                 <Option value="{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}" type="QString" name=""/>
               </Option>
               <Option type="Map">
-                <Option value="0" type="int" name="Lowest visibility"/>
+                <Option value="0" type="int" name="0: Lowest visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="1" type="int" name="Low visibility"/>
+                <Option value="1" type="int" name="1: Low visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="2" type="int" name="Medium low visibility"/>
+                <Option value="2" type="int" name="2: Medium low visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="3" type="int" name="Medium visibility"/>
+                <Option value="3" type="int" name="3: Medium visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="4" type="int" name="High visibility"/>
+                <Option value="4" type="int" name="4: High visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="5" type="int" name="Highest visibility"/>
+                <Option value="5" type="int" name="5: Highest visibility"/>
               </Option>
             </Option>
           </Option>

diff --git a/threedi_schematisation_editor/styles/vector/channel/calculation type.qml b/threedi_schematisation_editor/styles/vector/channel/calculation type.qml
@@ -572,16 +572,16 @@
           <Option type="Map">
             <Option type="List" name="map">
               <Option type="Map">
-                <Option value="100" type="int" name="Embedded"/>
+                <Option value="100" type="int" name="100: Embedded"/>
               </Option>
               <Option type="Map">
-                <Option value="101" type="int" name="Isolated"/>
+                <Option value="101" type="int" name="101: Isolated"/>
               </Option>
               <Option type="Map">
-                <Option value="102" type="int" name="Connected"/>
+                <Option value="102" type="int" name="102: Connected"/>
               </Option>
               <Option type="Map">
-                <Option value="105" type="int" name="Double connected"/>
+                <Option value="105" type="int" name="105: Double connected"/>
               </Option>
             </Option>
           </Option>
@@ -607,22 +607,22 @@
                 <Option value="{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}" type="QString" name=""/>
               </Option>
               <Option type="Map">
-                <Option value="0" type="int" name="Lowest visibility"/>
+                <Option value="0" type="int" name="0: Lowest visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="1" type="int" name="Low visibility"/>
+                <Option value="1" type="int" name="1: Low visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="2" type="int" name="Medium low visibility"/>
+                <Option value="2" type="int" name="2: Medium low visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="3" type="int" name="Medium visibility"/>
+                <Option value="3" type="int" name="3: Medium visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="4" type="int" name="High visibility"/>
+                <Option value="4" type="int" name="4: High visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="5" type="int" name="Highest visibility"/>
+                <Option value="5" type="int" name="5: Highest visibility"/>
               </Option>
             </Option>
           </Option>

diff --git a/threedi_schematisation_editor/styles/vector/channel/code.qml b/threedi_schematisation_editor/styles/vector/channel/code.qml
@@ -462,18 +462,21 @@
       <editWidget type="ValueMap">
         <config>
           <Option type="Map">
-            <Option type="List" name="map">
+            <Option name="map" type="List">
+              <Option type="Map">
+                <Option name="" type="QString" value="{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}"/>
+              </Option>
               <Option type="Map">
-                <Option value="100" type="int" name="Embedded"/>
+                <Option value="100" type="int" name="100: Embedded"/>
               </Option>
               <Option type="Map">
-                <Option value="101" type="int" name="Isolated"/>
+                <Option value="101" type="int" name="101: Isolated"/>
               </Option>
               <Option type="Map">
-                <Option value="102" type="int" name="Connected"/>
+                <Option value="102" type="int" name="102: Connected"/>
               </Option>
               <Option type="Map">
-                <Option value="105" type="int" name="Double connected"/>
+                <Option value="105" type="int" name="105: Double connected"/>
               </Option>
             </Option>
           </Option>
@@ -499,22 +502,22 @@
                 <Option value="{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}" type="QString" name=""/>
               </Option>
               <Option type="Map">
-                <Option value="0" type="int" name="Lowest visibility"/>
+                <Option value="0" type="int" name="0: Lowest visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="1" type="int" name="Low visibility"/>
+                <Option value="1" type="int" name="1: Low visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="2" type="int" name="Medium low visibility"/>
+                <Option value="2" type="int" name="2: Medium low visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="3" type="int" name="Medium visibility"/>
+                <Option value="3" type="int" name="3: Medium visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="4" type="int" name="High visibility"/>
+                <Option value="4" type="int" name="4: High visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="5" type="int" name="Highest visibility"/>
+                <Option value="5" type="int" name="5: Highest visibility"/>
               </Option>
             </Option>
           </Option>

diff --git a/threedi_schematisation_editor/styles/vector/channel/default.qml b/threedi_schematisation_editor/styles/vector/channel/default.qml
@@ -332,18 +332,21 @@
       <editWidget type="ValueMap">
         <config>
           <Option type="Map">
-            <Option type="List" name="map">
+            <Option name="map" type="List">
+              <Option type="Map">
+                <Option name="" type="QString" value="{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}"/>
+              </Option>
               <Option type="Map">
-                <Option value="100" type="int" name="Embedded"/>
+                <Option value="100" type="int" name="100: Embedded"/>
               </Option>
               <Option type="Map">
-                <Option value="101" type="int" name="Isolated"/>
+                <Option value="101" type="int" name="101: Isolated"/>
               </Option>
               <Option type="Map">
-                <Option value="102" type="int" name="Connected"/>
+                <Option value="102" type="int" name="102: Connected"/>
               </Option>
               <Option type="Map">
-                <Option value="105" type="int" name="Double connected"/>
+                <Option value="105" type="int" name="105: Double connected"/>
               </Option>
             </Option>
           </Option>
@@ -369,22 +372,22 @@
                 <Option value="{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}" type="QString" name=""/>
               </Option>
               <Option type="Map">
-                <Option value="0" type="int" name="Lowest visibility"/>
+                <Option value="0" type="int" name="0: Lowest visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="1" type="int" name="Low visibility"/>
+                <Option value="1" type="int" name="1: Low visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="2" type="int" name="Medium low visibility"/>
+                <Option value="2" type="int" name="2: Medium low visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="3" type="int" name="Medium visibility"/>
+                <Option value="3" type="int" name="3: Medium visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="4" type="int" name="High visibility"/>
+                <Option value="4" type="int" name="4: High visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="5" type="int" name="Highest visibility"/>
+                <Option value="5" type="int" name="5: Highest visibility"/>
               </Option>
             </Option>
           </Option>

diff --git a/threedi_schematisation_editor/styles/vector/channel/drawing direction.qml b/threedi_schematisation_editor/styles/vector/channel/drawing direction.qml
@@ -404,18 +404,21 @@
       <editWidget type="ValueMap">
         <config>
           <Option type="Map">
-            <Option type="List" name="map">
+            <Option name="map" type="List">
+              <Option type="Map">
+                <Option name="" type="QString" value="{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}"/>
+              </Option>
               <Option type="Map">
-                <Option value="100" type="int" name="Embedded"/>
+                <Option value="100" type="int" name="100: Embedded"/>
               </Option>
               <Option type="Map">
-                <Option value="101" type="int" name="Isolated"/>
+                <Option value="101" type="int" name="101: Isolated"/>
               </Option>
               <Option type="Map">
-                <Option value="102" type="int" name="Connected"/>
+                <Option value="102" type="int" name="102: Connected"/>
               </Option>
               <Option type="Map">
-                <Option value="105" type="int" name="Double connected"/>
+                <Option value="105" type="int" name="105: Double connected"/>
               </Option>
             </Option>
           </Option>
@@ -441,22 +444,22 @@
                 <Option value="{2839923C-8B7D-419E-B84B-CA2FE9B80EC7}" type="QString" name=""/>
               </Option>
               <Option type="Map">
-                <Option value="0" type="int" name="Lowest visibility"/>
+                <Option value="0" type="int" name="0: Lowest visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="1" type="int" name="Low visibility"/>
+                <Option value="1" type="int" name="1: Low visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="2" type="int" name="Medium low visibility"/>
+                <Option value="2" type="int" name="2: Medium low visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="3" type="int" name="Medium visibility"/>
+                <Option value="3" type="int" name="3: Medium visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="4" type="int" name="High visibility"/>
+                <Option value="4" type="int" name="4: High visibility"/>
               </Option>
               <Option type="Map">
-                <Option value="5" type="int" name="Highest visibility"/>
+                <Option value="5" type="int" name="5: Highest visibility"/>
               </Option>
             </Option>
           </Option>