mirror of
https://git.rwth-aachen.de/acs/public/villas/web/
synced 2025-03-09 00:00:01 +01:00
Fix stuff
This commit is contained in:
Markus Grigull
parent
83276c11c5
commit
9f83cee046
10 changed files with 2594 additions and 79 deletions
2
app/components/d3-alarm.js
vendored
2
app/components/d3-alarm.js
vendored
|
|
@ -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
|
||||
|
|
|
|||
9
app/components/d3-gauge.js
vendored
9
app/components/d3-gauge.js
vendored
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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]',
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<td style="padding-top: 20px;">
|
||||
<div class="layout-page">
|
||||
<table class="page-grid">
|
||||
<tr>
|
||||
<td style="width: 25%">
|
||||
<tr style="height: 25%">
|
||||
<td style="width: 25%" rowspan="2">
|
||||
<h3>
|
||||
Italy - Piedmont region
|
||||
</h3>
|
||||
|
|
@ -18,29 +18,40 @@
|
|||
</td>
|
||||
<td style="width: 50%; padding-left: 20px">
|
||||
<h2>Transmission system simulation</h2>
|
||||
|
||||
<p>
|
||||
Piedmont Region - Italy
|
||||
<ul>
|
||||
<li>Surface area: 25,4 km²</li>
|
||||
<li>Inhabitants: 4,45 m</li>
|
||||
</ul>
|
||||
|
||||
380-220kV transmission system:
|
||||
<ul>
|
||||
<li>90 buses, 20 generators and 110 lines</li>
|
||||
<li>Electric power capacity: 8458 MW</li>
|
||||
</ul>
|
||||
</p>
|
||||
|
||||
{{d3-gauge label="Freq" value=Freq575Value minValue=49 maxValue=51 minorTicks=4 size=150 greenZones=freq575GreenZones yellowZones=freq575YellowZones}}
|
||||
|
||||
{{d3-alarm value=Freq575Value alarmZones=freq575AlarmZones}}
|
||||
|
||||
|
||||
</td>
|
||||
<td style="width: 25%">
|
||||
<img src={{"assets/images/TS_section/TS_fig1.svg"}} class="svg-image" style="float: right" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr style="height: 75%">
|
||||
<td style="width: 40%">
|
||||
<div style="padding-top: 0px">
|
||||
<p style="padding-left: 60px; padding-top: 30px;">
|
||||
Piedmont Region - Italy
|
||||
<ul>
|
||||
<li>Surface area: 25,4 km²</li>
|
||||
<li>Inhabitants: 4,45 m</li>
|
||||
</ul>
|
||||
|
||||
380-220kV transmission system:
|
||||
<ul>
|
||||
<li>90 buses, 20 generators and 110 lines</li>
|
||||
<li>Electric power capacity: 8458 MW</li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</td>
|
||||
<td style="width: 35%">
|
||||
<h3>
|
||||
Frequency measuerement<br />
|
||||
at STURA substation
|
||||
</h3>
|
||||
{{d3-alarm value=Freq575Value alarmZones=freq575AlarmZones}}
|
||||
{{d3-gauge label="Freq" value=Freq575Value minValue=49 maxValue=51 minorTicks=4 size=180 greenZones=freq575GreenZones yellowZones=freq575YellowZones}}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</td>
|
||||
|
|
@ -65,7 +76,7 @@
|
|||
Voltage measurement
|
||||
</h3>
|
||||
|
||||
{{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]"}}
|
||||
</td>
|
||||
<td style="width: 50%" colspan="2">
|
||||
<button {{action 'resetData'}} disabled={{initState}}>Reset</button>
|
||||
|
|
@ -81,7 +92,7 @@
|
|||
<div class="layout-page">
|
||||
<table class="page-grid">
|
||||
<tr>
|
||||
<td style="width: 40%">
|
||||
<td style="width: 40%" rowspan="2">
|
||||
<h3>
|
||||
Italy - Piedmont - Turin
|
||||
</h3>
|
||||
|
|
@ -94,10 +105,16 @@
|
|||
</td>
|
||||
<td style="width: 35%; padding-left: 20px">
|
||||
<h2>Distribution system simulation</h2>
|
||||
|
||||
<p>
|
||||
</td>
|
||||
<td style="width: 25%">
|
||||
<img src={{"assets/images/DS_section/DS_fig1.svg"}} class="svg-image" style="float: right" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<p style="padding-left: 40px; padding-right: 20px">
|
||||
Turin - Piedmont - Italy<br />
|
||||
22kV distribution system<br />
|
||||
22kV distribution system:<br />
|
||||
<ul>
|
||||
<li>Five Medium Voltage lines derived from Stura HV/MV substation (220/22 kV)</li>
|
||||
<li>50 buses, 49 lines</li>
|
||||
|
|
@ -108,9 +125,6 @@
|
|||
</ul>
|
||||
</p>
|
||||
</td>
|
||||
<td style="width: 25%">
|
||||
<img src={{"assets/images/DS_section/DS_fig1.svg"}} class="svg-image" style="float: right" />
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
|
@ -130,7 +144,7 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr style="height: 75%">
|
||||
<td style="width: 50%" colspan="2">
|
||||
<td style="width: 50%; padding-left: 0px" colspan="2">
|
||||
<h3>
|
||||
Prosumer: Consumption and generation profiles
|
||||
</h3>
|
||||
|
|
@ -139,10 +153,10 @@
|
|||
</td>
|
||||
<td style="width: 50%;" colspan="2">
|
||||
{{#if initState}}
|
||||
<img src={{"assets/images/Prosumer_section/Prosumer_gif_m1.gif"}} style="width: 60%; height: auto" />
|
||||
<img src={{"assets/images/Prosumer_section/Prosumer_gif_m1.gif"}} style="width: 55%; height: auto; float: right; margin-right: 100px" />
|
||||
{{/if}}
|
||||
{{#if eventState}}
|
||||
<img src={{"assets/images/Prosumer_section/Prosumer_gif_m2.gif"}} style="width: 60%; height: auto" />
|
||||
<img src={{"assets/images/Prosumer_section/Prosumer_gif_m2.gif"}} style="width: 55%; height: auto; float: right; margin-right: 100px" />
|
||||
{{/if}}
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -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)">
|
||||
<rect
|
||||
style="color:#000000;fill:none;stroke:none;stroke-width:4.96899986;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||
id="rect2985-1-2-5-1-1-0"
|
||||
|
|
@ -670,7 +670,7 @@
|
|||
x="-3287.8584"
|
||||
sodipodi:role="line"
|
||||
y="-7704.0244"
|
||||
id="tspan3514-1">JOINT RESEARCH CENTRE</tspan>
|
||||
id="tspan3514-1">Joint Research Centre</tspan>
|
||||
<tspan
|
||||
style="font-size:85px;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
|
||||
x="-3287.8584"
|
||||
|
|
@ -678,5 +678,12 @@
|
|||
y="-7597.7744"
|
||||
id="tspan3111">JRC Ispra</tspan>
|
||||
</text>
|
||||
<rect
|
||||
style="color:#000000;fill:none;stroke:none;stroke-width:4.96899986;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||
id="rect3076"
|
||||
width="1547.9999"
|
||||
height="624"
|
||||
x="-4054.2698"
|
||||
y="-7820.3408" />
|
||||
</g>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 54 KiB |
|
|
@ -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">
|
||||
<sodipodi:guide
|
||||
orientation="-0.70710678,0.70710678"
|
||||
position="-709.09,706.51202"
|
||||
position="-513.08995,826.51197"
|
||||
id="guide3002" />
|
||||
</sodipodi:namedview>
|
||||
<metadata
|
||||
|
|
@ -114,7 +114,7 @@
|
|||
inkscape:label="Ebene 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(3917.1064,7952.2292)">
|
||||
transform="translate(4113.1064,8052.2466)">
|
||||
<text
|
||||
id="text3415-6"
|
||||
x="-3502.856"
|
||||
|
|
@ -161,5 +161,12 @@
|
|||
</g>
|
||||
</g>
|
||||
</g>
|
||||
<rect
|
||||
style="color:#000000;fill:none;stroke:none;stroke-width:4.96899986;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||
id="rect3076"
|
||||
width="1547.9999"
|
||||
height="624"
|
||||
x="-4113.1064"
|
||||
y="-8052.2466" />
|
||||
</g>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 178 KiB After Width: | Height: | Size: 178 KiB |
|
|
@ -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)">
|
||||
<g
|
||||
transform="matrix(1.1812552,0,0,1.1812552,-3211.6224,-8155.7077)"
|
||||
id="layer1-2"
|
||||
|
|
@ -633,7 +633,7 @@
|
|||
x="-3570.4153"
|
||||
sodipodi:role="line"
|
||||
y="-7981.3813"
|
||||
id="tspan3514">JOINT RESEARCH CENTRE</tspan>
|
||||
id="tspan3514">Joint Research Centre</tspan>
|
||||
<tspan
|
||||
style="font-size:85px;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#aa0000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
|
||||
x="-3570.4153"
|
||||
|
|
@ -649,5 +649,12 @@
|
|||
preserveAspectRatio="none"
|
||||
height="405.16147"
|
||||
width="343.85413" />
|
||||
<rect
|
||||
style="color:#000000;fill:none;stroke:none;stroke-width:4.96899986;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
|
||||
id="rect3076"
|
||||
width="1547.9999"
|
||||
height="624"
|
||||
x="-4337.3403"
|
||||
y="-8103.2139" />
|
||||
</g>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 62 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 52 KiB |
2456
public/assets/images/UpperLayer.svg
Normal file
2456
public/assets/images/UpperLayer.svg
Normal file
File diff suppressed because it is too large
Load diff
|
After Width: | Height: | Size: 109 KiB |
Loading…
Add table
Reference in a new issue