From b38b303907f603b9c54a306330f8513ca6815807 Mon Sep 17 00:00:00 2001
From: Christoph Dornieden <cdor@informatik.uni-kiel.de>
Date: Wed, 22 Jun 2016 16:46:44 +0200
Subject: [PATCH] style update
---
.../architecture-visualisation-cytoscape/style.js | 9 +++++++--
.../architecture-visualisation-cytoscape/themes.js | 8 +++++---
app/models/.gitkeep | 0
app/models/communication.js | 5 +++--
app/models/communicationinstance.js | 3 ++-
5 files changed, 17 insertions(+), 8 deletions(-)
delete mode 100644 app/models/.gitkeep
diff --git a/app/components/architecture-visualisation-cytoscape/style.js b/app/components/architecture-visualisation-cytoscape/style.js
index bf5af05..0d8ddba 100644
--- a/app/components/architecture-visualisation-cytoscape/style.js
+++ b/app/components/architecture-visualisation-cytoscape/style.js
@@ -61,8 +61,12 @@ $node > node { /* compounds. "Nodes" in meta model. $ selects the parent node th
[type="communicationInstance"] {
color: ${theme.arrowColor};
- line-color: ${theme.arrowLineColor};
+ line-color: ${theme.arrowColor};
target-arrow-color: ${theme.arrowColor};
+ text-background-color: ${theme.arrowLineColor};
+ text-background-opacity: 1;
+ text-background-shape: roundrectangle;
+ font-size: 12pt;
}
[type="nodeGroup"] {
@@ -80,7 +84,8 @@ edge {
font-weight: bold;
target-arrow-shape: triangle-backcurve;
curve-style: bezier; /* supports arrows */
- width: 2px;
+ width: data(workload);
+
}
:selected {
diff --git a/app/components/architecture-visualisation-cytoscape/themes.js b/app/components/architecture-visualisation-cytoscape/themes.js
index c627684..1110605 100644
--- a/app/components/architecture-visualisation-cytoscape/themes.js
+++ b/app/components/architecture-visualisation-cytoscape/themes.js
@@ -39,7 +39,7 @@ export default {
serviceBorderColor : '#ED8910',
arrowLineColor : '#002A4A',
arrowColor : '#002A4A',
- arrowLabelColor: 'black'
+ arrowLabelColor: '#FFFEED'
},
'forrest' :{
nodeGroupTextColor : '#36231B',
@@ -53,9 +53,10 @@ export default {
serviceBorderColor : '#93A608',
arrowLineColor : '#36231B',
arrowColor : '#36231B',
- arrowLabelColor: '#93A608'
+ arrowLabelColor: '#F0E3CA'
},
'maritim' :{
+ // https://color.adobe.com/RportalNew-color-theme-199478/
nodeGroupTextColor : '#1D3757',
nodeGroupColor : 'white',
nodeGroupBorderColor : '#1D3757',
@@ -67,9 +68,10 @@ export default {
serviceBorderColor : '#F29F01',
arrowLineColor : '#1D3757',
arrowColor : '#1D3757',
- arrowLabelColor: '#1D3757'
+ arrowLabelColor: '#D9E8F5'
},
'green' :{
+ // https://color.adobe.com/green-color-theme-1205538/
nodeGroupTextColor : '#403E21',
nodeGroupColor : 'white',
nodeGroupBorderColor : '#403E21',
diff --git a/app/models/.gitkeep b/app/models/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/app/models/communication.js b/app/models/communication.js
index 711f3fc..7be2d6c 100644
--- a/app/models/communication.js
+++ b/app/models/communication.js
@@ -1,8 +1,9 @@
import BaseEntity from './baseentity';
import attr from 'ember-data/attr';
-export default BaseEntity.extend({
+export default BaseEntity.extend({
technology: attr('string'),
sourceId: attr('string'),
- targetId: attr('string')
+ targetId: attr('string'),
+ workload: attr('number')
});
diff --git a/app/models/communicationinstance.js b/app/models/communicationinstance.js
index bcd718d..df39e8e 100644
--- a/app/models/communicationinstance.js
+++ b/app/models/communicationinstance.js
@@ -4,5 +4,6 @@ import attr from 'ember-data/attr';
export default BaseEntity.extend({
sourceId: attr('string'),
targetId: attr('string'),
- communicationId: attr('string')
+ communicationId: attr('string'),
+ workload: attr('number')
});
--
GitLab