Merge pull request #24 from janpasek97/frontend-vue-edge-description

Issue #22 fixed displaying edges
ReliSA · Dec 11, 2021 · 54db0b5 · 54db0b5
2 parents 837d4b1 + 29f00dd
commit 54db0b5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/sources/frontend/src/components/svg/Edge.vue b/sources/frontend/src/components/svg/Edge.vue
@@ -11,7 +11,7 @@
          : `stroke:${style.strokeColor};stroke-width:${style.strokeWidth}`"
     />
     <text class="wrap" :x="titleX" :y="titleY">
-      <tspan text-anchor="middle" :fill="style.textColor">{{ title }}</tspan>
+      <tspan text-anchor="middle" :fill="style.textColor">{{ edgeDescription }}</tspan>
     </text>
   </g>
 </template>
@@ -25,7 +25,7 @@ export default {
     endY: Number,
     startOffset: Number,
     endOffset: Number,
-    title: String,
+    attributes: Object,
     highlighted: Boolean,
     style: Object
   },
@@ -76,7 +76,14 @@ export default {
     },
     endOffsetY() {
       return this.endOffsetRatio * this.b
-    }
+    },
+    edgeDescription() {
+      let ret = ''
+      Object.keys(this.attributes).forEach(attr => {
+        ret = this.attributes[attr]
+      })
+      return ret
+    },
   }
 }
 </script>
diff --git a/sources/frontend/src/components/svg/SvgCanvas.vue b/sources/frontend/src/components/svg/SvgCanvas.vue
@@ -21,7 +21,7 @@
                 :start-y="vertices[vertex_map[edge.from]].y"
                 :end-x="vertices[vertex_map[edge.to]].x"
                 :end-y="vertices[vertex_map[edge.to]].y"
-                :title="edge.attributes != null ? edge.attributes['3'] : ''"
+                :attributes="edge.attributes !== undefined ? edge.attributes : {}"
                 :style="style.edge"
                 :highlighted="edge.highlighted"
                 :start-offset="style.vertex.radius"