Scale labels with configured label margin

Author: malte-hansen

app/utils/elk-layouter.ts

@@ -257,20 +257,18 @@ export function convertElkToBoxLayout(
   zOffset = 0,
   depth = 0
 ): Map<string, BoxLayout> {
-  const SCALAR = 0.3;
-
   let height = COMPONENT_HEIGHT;
   if (elkGraph.id.startsWith(CLASS_PREFIX)) {
     height = 5;
   }
 
   const boxLayout = new BoxLayout();
-  boxLayout.positionX = (xOffset + elkGraph.x!) * SCALAR;
+  boxLayout.positionX = xOffset + elkGraph.x!;
   boxLayout.positionY = COMPONENT_HEIGHT * depth;
-  boxLayout.positionZ = (zOffset + elkGraph.y!) * SCALAR;
+  boxLayout.positionZ = zOffset + elkGraph.y!;
   // Prevent 0 value for width and depth
-  boxLayout.width = elkGraph.width! * SCALAR || CLASS_FOOTPRINT;
-  boxLayout.depth = elkGraph.height! * SCALAR || CLASS_FOOTPRINT;
+  boxLayout.width = elkGraph.width || CLASS_FOOTPRINT;
+  boxLayout.depth = elkGraph.height || CLASS_FOOTPRINT;
   boxLayout.height = height;
 
   // Landscape and applications are on the same level

app/utils/settings/default-settings.ts

@@ -327,10 +327,10 @@ export const defaultVizSettings: VisualizationSettings = {
     isRangeSetting: true,
   },
   openedComponentHeight: {
-    value: 1.5,
+    value: 7.5,
     range: {
       min: 0.1,
-      max: 10.0,
+      max: 100.0,
       step: 0.1,
     },
     group: 'Layout',
@@ -340,10 +340,10 @@ export const defaultVizSettings: VisualizationSettings = {
     isRangeSetting: true,
   },
   closedComponentHeight: {
-    value: 6,
+    value: 20,
     range: {
       min: 0.1,
-      max: 20.0,
+      max: 100,
       step: 0.1,
     },
     group: 'Layout',

app/view-objects/3d/application/component-label-mesh.ts

@@ -5,6 +5,7 @@ import LabelMesh from '../label-mesh';
 import ComponentMesh from './component-mesh';
 import FoundationMesh from './foundation-mesh';
 import K8sMesh from '../k8s/k8s-mesh';
+import { getStoredNumberSetting } from 'explorviz-frontend/utils/settings/local-storage-settings';
 
 export default class ComponentLabelMesh extends LabelMesh {
   minHeight: number;
@@ -35,8 +36,7 @@ export default class ComponentLabelMesh extends LabelMesh {
    */
   computeLabel(
     componentMesh: ComponentMesh | FoundationMesh | K8sMesh,
-    labelText = this.labelText,
-    scalar = 1
+    labelText = this.labelText
   ) {
     /**
      * Updates bounding box of geometry and returns respective dimensions
@@ -48,11 +48,19 @@ export default class ComponentLabelMesh extends LabelMesh {
       return { x: boxDimensions.x, y: boxDimensions.y, z: boxDimensions.z };
     }
 
+    let labelMargin;
+    if (componentMesh instanceof ComponentMesh) {
+      labelMargin = getStoredNumberSetting('packageLabelMargin') || 0.1;
+    } else {
+      labelMargin = getStoredNumberSetting('appLabelMargin') || 0.1;
+    }
+
     const parentScale = componentMesh.scale;
     const parentAspectRatio = parentScale.z / parentScale.x;
 
     // Adjust desired text size with possible scaling
-    const textSize = (2.0 / parentScale.z) * parentAspectRatio * scalar;
+    const textSize =
+      (2.0 / parentScale.z) * parentAspectRatio * (labelMargin / 4);
     // Text should look like it is written on the parent's box (no height required)
     const textHeight = 0.0;