From 61cda848d1d8ebff2a0a01af17326e060d372f0b Mon Sep 17 00:00:00 2001 From: xg353y Date: Fri, 17 May 2019 10:18:34 +0200 Subject: [PATCH] Improve the loop logs view Move the loop log table down; color the log level; adjust the proportion of the log attributes; adjust the location of the Loop view and the log table. Issue-ID: CLAMP-388 Change-Id: Ifec6da8dfb330304c8adffbb3257d325e234aa17 Signed-off-by: xg353y --- .../org/onap/clamp/clds/util/drawing/Painter.java | 2 +- .../resources/designer/modeler/dist/index.html | 19 ++++++++++++++----- .../resources/designer/scripts/CldsModelService.js | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java b/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java index fe2d5cb3..d88a17e8 100755 --- a/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java +++ b/src/main/java/org/onap/clamp/clds/util/drawing/Painter.java @@ -64,7 +64,7 @@ public class Painter { adjustGraphics2DProperties(); - Point origin = new Point(0, rectHeight / 2); + Point origin = new Point(1, rectHeight / 2); ImageBuilder ib = new ImageBuilder(g2d, documentBuilder, origin, baseLength, rectHeight); doTheActualDrawing(collector, microServices, policy, ib); diff --git a/src/main/resources/META-INF/resources/designer/modeler/dist/index.html b/src/main/resources/META-INF/resources/designer/modeler/dist/index.html index ead478a4..ab337de8 100644 --- a/src/main/resources/META-INF/resources/designer/modeler/dist/index.html +++ b/src/main/resources/META-INF/resources/designer/modeler/dist/index.html @@ -20,6 +20,11 @@ =================================================================== --> + @@ -43,9 +48,12 @@ -
+
+
+
+ -
+
@@ -57,9 +65,9 @@ - - - + + +
{{log.logInstant}}{{log.logType}}{{log.message}}{{log.logInstant}}{{log.logType}}{{log.message}}
@@ -67,6 +75,7 @@
+
diff --git a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js index a75326de..0cc5c38f 100644 --- a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js +++ b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js @@ -191,7 +191,7 @@ app var svg = pars; if ($("#svgContainer").length > 0) $("#svgContainer").remove(); - $("#js-canvas").append( + $("#loop-content").append( "" + svg + ""); $("#svgContainer svg").attr('width', '100%'); $("#svgContainer svg").attr('height', '100%'); -- 2.16.6