merge: Add missing attributes and default styling

DSD-DBS · Nov 1, 2023 · d62d953 · d62d953
2 parents a3dfe6b + 27560e6
commit d62d953
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 2 deletions.
diff --git a/capellambse/diagram/_styleclass.py b/capellambse/diagram/_styleclass.py
@@ -30,6 +30,8 @@ def get_styleclass(obj: model.ModelObject) -> str:
 
 
 def _default(obj: model.ModelObject) -> str:
+    if isinstance(obj, model.GenericElement):
+        return obj.xtype.split(":")[-1]
     return type(obj).__name__
 
 

diff --git a/capellambse/diagram/capstyle.py b/capellambse/diagram/capstyle.py
@@ -341,6 +341,26 @@ class in the form::
             "stroke": COLORS["_CAP_Datatype_Border_Gray"],
             "text_fill": COLORS["black"],
         },
+        "Box.BooleanType": {
+            "fill": COLORS["_CAP_Class_Brown"],
+            "stroke": COLORS["_CAP_Datatype_Border_Gray"],
+            "text_fill": COLORS["black"],
+        },
+        "Box.NumericType": {
+            "fill": COLORS["_CAP_Class_Brown"],
+            "stroke": COLORS["_CAP_Datatype_Border_Gray"],
+            "text_fill": COLORS["black"],
+        },
+        "Box.PhysicalQuantity": {
+            "fill": COLORS["_CAP_Class_Brown"],
+            "stroke": COLORS["_CAP_Datatype_Border_Gray"],
+            "text_fill": COLORS["black"],
+        },
+        "Box.StringType": {
+            "fill": COLORS["_CAP_Class_Brown"],
+            "stroke": COLORS["_CAP_Datatype_Border_Gray"],
+            "text_fill": COLORS["black"],
+        },
         "Box.ExchangeItem": {  # DT_ExchangeItem
             "fill": COLORS["_CAP_ExchangeItem_Pinkkish"],
             "stroke": COLORS["_CAP_Interface_Border_Reddish"],

diff --git a/capellambse/model/crosslayer/capellacore.py b/capellambse/model/crosslayer/capellacore.py
@@ -26,6 +26,8 @@ class Generalization(c.GenericElement):
 
     _xmltag = "ownedGeneralizations"
 
+    super: c.Accessor
+
 
 @c.xtype_handler(None)
 class EnumerationPropertyLiteral(c.GenericElement):

diff --git a/capellambse/model/crosslayer/information/__init__.py b/capellambse/model/crosslayer/information/__init__.py
@@ -122,6 +122,9 @@ class Class(c.GenericElement):
         capellacommon.StateMachine, aslist=c.ElementList
     )
     owned_properties = c.DirectProxyAccessor(Property, aslist=c.ElementList)
+    generalizations = c.DirectProxyAccessor(
+        capellacore.Generalization, aslist=c.ElementList
+    )
 
     @property
     def properties(self) -> c.ElementList[Property]:
@@ -207,6 +210,9 @@ class ExchangeItem(c.GenericElement):
     exchanges: c.Accessor[c.GenericElement]
 
 
+c.set_accessor(
+    capellacore.Generalization, "super", c.AttrProxyAccessor(None, "super")
+)
 for cls in [Class, Union, datatype.Enumeration, Collection]:
     c.set_accessor(
         cls,

diff --git a/capellambse/svg/decorations.py b/capellambse/svg/decorations.py
@@ -32,15 +32,20 @@
 DiagramClass = str
 FaultyClass = str
 PatchClass = str
-always_top_label = {
+needs_feature_line = {
+    "BooleanType",
     "Class",
     "Enumeration",
+    "NumericType",
+    "PhysicalQuantity",
+    "StringType",
+}
+always_top_label = needs_feature_line | {
     "Note",
     "RepresentationLink",
     "OperationalActivity",
     "PhysicalComponent",
 }
-needs_feature_line = {"Class", "Enumeration"}
 
 
 class DecoFactories(t.Dict[str, cabc.Callable]):