diff --git a/app/components/d3-alarm.js b/app/components/d3-alarm.js index 23eb42e..13f9560 100644 --- a/app/components/d3-alarm.js +++ b/app/components/d3-alarm.js @@ -18,7 +18,7 @@ export default Ember.Component.extend({ var radius = this.size / 2 * 0.97; // create body element - var body = d3.select('#' + this.elementId).append("svg:svg"); + var body = d3.select('#' + this.elementId).append("svg:svg").attr("width", this.size).attr("height", this.size); this.set('svgBody', body); // add background diff --git a/app/components/d3-gauge.js b/app/components/d3-gauge.js index fdd6f98..c28190b 100644 --- a/app/components/d3-gauge.js +++ b/app/components/d3-gauge.js @@ -32,10 +32,13 @@ export default Ember.Component.extend({ var majorDelta = range / (this.majorTicks - 1); var minorDelta = majorDelta / this.minorTicks; var midValue = (this.minValue + this.maxValue) / 2; - var pointerFontSize = Math.round(this.size / 7); + var pointerFontSize = Math.round(this.size / 10); // create body element - var body = d3.select('#' + this.elementId).append("svg:svg"); + var body = d3.select('#' + this.elementId) + .append("svg:svg") + .attr("width", this.size) + .attr("height", this.size); this.set('svgBody', body); // base circles @@ -165,7 +168,7 @@ export default Ember.Component.extend({ _redraw: function(value, transitionDuration) { var pointerContainer = this.svgBody.select(".pointerContainer"); - pointerContainer.selectAll("text").text(Math.round(value)); + pointerContainer.selectAll("text").text(Math.floor(value * 100) / 100); var pointer = pointerContainer.selectAll("path"); var _this = this; diff --git a/app/controllers/lab-mashup.js b/app/controllers/lab-mashup.js index 239952d..6a92a5c 100644 --- a/app/controllers/lab-mashup.js +++ b/app/controllers/lab-mashup.js @@ -45,8 +45,6 @@ export default Ember.Controller.extend({ LoadGenProfiles: function() { var entity = this.model.findBy('id', 'S1_ElectricalGrid'); if (entity) { - console.log(entity.get('properties').findBy('name', 'LoadProfile')); - return [ { label: 'Total consumption [MW]', diff --git a/app/styles/app.css b/app/styles/app.css index 8dcc2dd..e740c3d 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -24,7 +24,7 @@ html, body { margin: 0 auto; /*font: 16px 'Helvetica Neue', Helvetica, Arial, sans-serif;*/ - font: 1.6em Helvetica; + font: 1.7em Helvetica; font-weight: 300; font-smoothing: antialiased; -webkit-font-smoothing: antialiased; @@ -108,7 +108,7 @@ footer { } .svg-image { - width: 75%; + width: 120%; height: auto; } @@ -138,20 +138,24 @@ footer { } h1 { - font-size: 1.4em; + font-size: 1.5em; margin: 0; padding: 0; } h2 { - font-size: 1.2em; + font-size: 1.3em; + font-weight: bold; text-align: left; + + color: #103B7D; } h3 { - font-size: 0.9em; + font-size: 0.95em; + font-weight: bold; } h4 { @@ -159,7 +163,19 @@ h4 { } p { - font-size: 0.75em; + font-size: 0.85em; +} + +.gauge { + padding-left: 20px; + padding-top: 0px; + + float: left; +} + +.alarm { + float: right; + padding-left: 20px; } /* diff --git a/app/templates/lab-mashup.hbs b/app/templates/lab-mashup.hbs index be7bfc6..87af0c8 100644 --- a/app/templates/lab-mashup.hbs +++ b/app/templates/lab-mashup.hbs @@ -4,8 +4,8 @@
- - + + + + +
+

Italy - Piedmont region

@@ -18,29 +18,40 @@

Transmission system simulation

- -

- Piedmont Region - Italy -

    -
  • Surface area: 25,4 km²
    • -
  • Inhabitants: 4,45 m
    • -
- - 380-220kV transmission system: -
    -
  • 90 buses, 20 generators and 110 lines
    • -
  • Electric power capacity: 8458 MW
    • -
-

- - {{d3-gauge label="Freq" value=Freq575Value minValue=49 maxValue=51 minorTicks=4 size=150 greenZones=freq575GreenZones yellowZones=freq575YellowZones}} - - {{d3-alarm value=Freq575Value alarmZones=freq575AlarmZones}} + +
+
+

+ Piedmont Region - Italy +

    +
  • Surface area: 25,4 km²
    • +
  • Inhabitants: 4,45 m
    • +
+ + 380-220kV transmission system: +
    +
  • 90 buses, 20 generators and 110 lines
    • +
  • Electric power capacity: 8458 MW
    • +
+

+
+ 		+

+ Frequency measuerement
+ at STURA substation +

+ {{d3-alarm value=Freq575Value alarmZones=freq575AlarmZones}} + {{d3-gauge label="Freq" value=Freq575Value minValue=49 maxValue=51 minorTicks=4 size=180 greenZones=freq575GreenZones yellowZones=freq575YellowZones}} +
@@ -65,7 +76,7 @@ Voltage measurement - {{line-chart data=Voltage203937 height="90%" xaxisLength=120 minValue=0.95 maxValue=1.05 label="RMS voltage [pu]"}} + {{line-chart data=Voltage203937 height="90%" xaxisLength=120 minValue=0.90 maxValue=1.05 label="RMS voltage [pu]"}} @@ -81,7 +92,7 @@
- + + + + -
+

Italy - Piedmont - Turin

@@ -94,10 +105,16 @@

Distribution system simulation

- -

+

+ +
+

Turin - Piedmont - Italy
- 22kV distribution system
+ 22kV distribution system:

  • Five Medium Voltage lines derived from Stura HV/MV substation (220/22 kV)
  • 50 buses, 49 lines
    • @@ -108,9 +125,6 @@

- -
@@ -130,7 +144,7 @@ - +

Prosumer: Consumption and generation profiles

@@ -139,10 +153,10 @@ {{#if initState}} - + {{/if}} {{#if eventState}} - + {{/if}} diff --git a/public/assets/images/ControlCenter_section/CS_fig1.svg b/public/assets/images/ControlCenter_section/CS_fig1.svg index 765f1ac..9e0e12f 100644 --- a/public/assets/images/ControlCenter_section/CS_fig1.svg +++ b/public/assets/images/ControlCenter_section/CS_fig1.svg @@ -10,8 +10,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1148.582" - height="503.63904" + width="1547.9999" + height="624" id="svg2" version="1.1" inkscape:version="0.48.0 r9654" @@ -63,9 +63,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.35355341" - inkscape:cx="746.32317" - inkscape:cy="561.4172" + inkscape:zoom="0.70710682" + inkscape:cx="1149.2192" + inkscape:cy="142.06867" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -94,7 +94,7 @@ inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1" - transform="translate(3848.7837,7765.9067)"> + transform="translate(4054.2698,7820.3408)"> JOINT RESEARCH CENTRE + id="tspan3514-1">Joint Research Centre JRC Ispra + diff --git a/public/assets/images/DS_section/DS_fig1.svg b/public/assets/images/DS_section/DS_fig1.svg index 607570f..1b72b79 100644 --- a/public/assets/images/DS_section/DS_fig1.svg +++ b/public/assets/images/DS_section/DS_fig1.svg @@ -10,8 +10,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1205.673" - height="403.98267" + width="1547.9999" + height="624" id="svg2" version="1.1" inkscape:version="0.48.0 r9654" @@ -77,8 +77,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.50000002" - inkscape:cx="949.75199" - inkscape:cy="-64.890973" + inkscape:cx="1145.752" + inkscape:cy="55.108979" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -95,7 +95,7 @@ inkscape:guide-bbox="true"> + transform="translate(4113.1064,8052.2466)"> + diff --git a/public/assets/images/Prosumer_section/Cnsmr_fig1.svg b/public/assets/images/Prosumer_section/Cnsmr_fig1.svg index 95dbb6b..98ff592 100644 --- a/public/assets/images/Prosumer_section/Cnsmr_fig1.svg +++ b/public/assets/images/Prosumer_section/Cnsmr_fig1.svg @@ -10,8 +10,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1143.494" - height="510.04965" + width="1547.9999" + height="624" id="svg2" version="1.1" inkscape:version="0.48.0 r9654" @@ -55,9 +55,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="727.25376" - inkscape:cy="271.96058" + inkscape:zoom="0.5" + inkscape:cx="495.43179" + inkscape:cy="-11.108901" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -86,7 +86,7 @@ inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1" - transform="translate(4131.3406,8043.2637)"> + transform="translate(4337.3403,8103.2139)"> JOINT RESEARCH CENTRE + id="tspan3514">Joint Research Centre + diff --git a/public/assets/images/TS_section/TS_fig1.svg b/public/assets/images/TS_section/TS_fig1.svg index 60b6ccf..9675fae 100644 --- a/public/assets/images/TS_section/TS_fig1.svg +++ b/public/assets/images/TS_section/TS_fig1.svg @@ -10,8 +10,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1290.7563" - height="464.59662" + width="1547.9999" + height="624" id="svg2" version="1.1" inkscape:version="0.48.0 r9654" @@ -173,8 +173,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.50000002" - inkscape:cx="1039.2784" - inkscape:cy="-33.76162" + inkscape:cx="520.11892" + inkscape:cy="588.23848" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -203,42 +203,42 @@ inkscape:label="Ebene 1" inkscape:groupmode="layer" id="layer1" - transform="translate(3773.2317,7810.9473)"> + transform="translate(3931.2317,7188.3506)"> + x="-3660.3059" + y="-7051.5024" /> RWTH Aachen University + diff --git a/public/assets/images/UpperLayer.svg b/public/assets/images/UpperLayer.svg new file mode 100644 index 0000000..d7c1312 --- /dev/null +++ b/public/assets/images/UpperLayer.svg @@ -0,0 +1,2456 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + FIWARE + platform + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +