Revize 8dc25caa

Added padding size calculation to html rendering

Backend/Core/Services/AnnotationService/AnnotationServiceEF.cs

@@ -15 +15 @@
 using HtmlAgilityPack;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
+using Core.GraphUtils;
 
 namespace Core.Services.AnnotationService
 {
@@ -293 +294 @@
 
             HtmlDocument doc = new HtmlDocument();
             doc.LoadHtml(docToRender);
-            var cssNode = GenerateCSS(doc, tags, new());
+            var cssNode = GenerateCSS(doc, tags);
             doc.DocumentNode.ChildNodes.Insert(0, cssNode);
 
             return doc.DocumentNode.OuterHtml;
@@ -493 +494 @@
             }
         }
 
-        private HtmlNode GenerateCSS(HtmlDocument docToEdit, List<AnnotationTag> tags, List<int> paddings)
+        private HtmlNode GenerateCSS(HtmlDocument docToEdit, List<AnnotationTag> tags)
         {
             HtmlNode style = docToEdit.CreateElement("style");
 
             string inner = "span.annotation {border-bottom: 2px solid;}";
             inner += "span {line-height: 30px}\n";
 
-            // TODO temporary
-            int lastPadding = 0;
+            var tagPaddingDict = Intersections.ColorGraph(Intersections.FindIntersections(tags));
+
             foreach (var tag in tags)
             {
-                inner += $"span[{TAG_INSTANCE_ATTRIBUTE_NAME}=\"{tag.Instance}\"] {{ border-color:{tag.Tag.Color}; padding-bottom: {lastPadding % 5}px }}";
-                lastPadding += 2;
+                var padding = (tagPaddingDict[tag] + 1) * 2;
+                inner += $"span[{TAG_INSTANCE_ATTRIBUTE_NAME}=\"{tag.Instance}\"] {{ border-color:{tag.Tag.Color}; padding-bottom: {padding}px }}";
             }
 
             inner += "span[end=\"1\"] {border-end-end-radius: 0px; border-right: 1px solid darkgray}\n";
@@ -621 +622 @@
                 }
             }
 
-            var cssNode = GenerateCSS(docToEdit, tags, new());
+            var cssNode = GenerateCSS(docToEdit, tags);
             docToEdit.DocumentNode.ChildNodes.Insert(0, cssNode);
 
             return docToEdit.DocumentNode.OuterHtml;
@@ -691 +692 @@
                 }
             }
 
-            var cssNode = GenerateCSS(docToEdit, tags, new());
+            var cssNode = GenerateCSS(docToEdit, tags);
             docToEdit.DocumentNode.ChildNodes.Insert(0, cssNode);
 
             return docToEdit.DocumentNode.OuterHtml;