From f3ac48c1496951479eab4c801178384d7cc6a661 Mon Sep 17 00:00:00 2001 From: Markus Grigull Date: Tue, 27 Oct 2015 07:09:22 -0400 Subject: [PATCH] Add latest changes --- app/controllers/lab-mashup.js | 10 +- app/styles/app.css | 12 +- app/templates/application.hbs | 3 +- app/templates/lab-mashup.hbs | 29 +- public/assets/images/DS_section/DS_fig1.svg | 12420 ++++++++++++++++- public/assets/images/Logo3_Polito.svg | 12468 ++++++++++++++++++ 6 files changed, 24901 insertions(+), 41 deletions(-) create mode 100644 public/assets/images/Logo3_Polito.svg diff --git a/app/controllers/lab-mashup.js b/app/controllers/lab-mashup.js index f1d6337..3ebd302 100644 --- a/app/controllers/lab-mashup.js +++ b/app/controllers/lab-mashup.js @@ -48,7 +48,12 @@ export default Ember.Controller.extend({ } } - if (control.get('Status') === 'EOF' && control.get('ForceReload') === false) { + var status = control.get('Status'); + var reload = control.get('ForceReload'); + + /*Ember.debug('status: ' + status + ', reload: ' + reload);*/ + + if ((status === 'EOF') && ((reload === false) || (reload) === 'false')) { if (this.get('state') === 1) { control.set('ForceReload', true); } else { @@ -130,8 +135,7 @@ export default Ember.Controller.extend({ this.set('totalPValue', [ { bars: { show: true }, - data: [[0, attr_totalP.get('currentValue')]], - label: 'Total DS absorb [MW]' + data: [[0, attr_totalP.get('currentValue')]] } ]); } else { diff --git a/app/styles/app.css b/app/styles/app.css index 85c2b26..8e299db 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -108,7 +108,7 @@ footer { } .svg-image { - width: 50%; + width: 60%; height: auto; } @@ -166,7 +166,7 @@ p { } .gauge { - padding-top: 20px; + margin-top: -20px; padding-left: 20px; float: left; @@ -174,8 +174,8 @@ p { .alarm { float: right; - padding-top: 20px; - padding-right: 80px; + /*padding-top: 20px;*/ + padding-right: 60px; } button { @@ -269,7 +269,6 @@ overflow: hidden; .layout-page h2 { text-align: center; - font-size: 1em; margin: 0; } @@ -305,9 +304,8 @@ overflow: hidden; } .page-grid h2 { - font-size: 1.4em; - padding-top: 35px; + padding-top: 5px; } .page-grid h3 { diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 4ebf23f..a0a0140 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -6,7 +6,8 @@
- + +
diff --git a/app/templates/lab-mashup.hbs b/app/templates/lab-mashup.hbs index 1bf5e63..91ded5a 100644 --- a/app/templates/lab-mashup.hbs +++ b/app/templates/lab-mashup.hbs @@ -38,11 +38,11 @@
  • Electric power capacity: 8458 MW

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

    Frequency measurement
    at STURA substation @@ -56,17 +56,17 @@
    - + - + @@ -113,14 +113,17 @@

    Control Center

    		 - +

    Distribution grid monitoring voltage measurement @@ -81,7 +81,7 @@
    -

    -

    +

    Turin - Piedmont - Italy

    • Medium Voltage lines derived from Stura HV/MV
    • Total length of lines: 38,54 km

    - {{bar-chart data=totalPValue width='200px' height='250px' maxValue=25}} + {{bar-chart data=totalPValue width='200px' height='250px' maxValue=30}} +

    + Total Net Consumption [MW] +

    @@ -130,17 +133,17 @@
    - + - + diff --git a/public/assets/images/DS_section/DS_fig1.svg b/public/assets/images/DS_section/DS_fig1.svg index abd1297..3b8e5a5 100644 --- a/public/assets/images/DS_section/DS_fig1.svg +++ b/public/assets/images/DS_section/DS_fig1.svg @@ -76,9 +76,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.50000002" - inkscape:cx="1019.7521" - inkscape:cy="661.10913" + inkscape:zoom="0.64" + inkscape:cx="289.80975" + inkscape:cy="-93.909739" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -118,27 +118,15 @@ Politecnico di Torino - - - @@ -161,5 +149,12403 @@ + diff --git a/public/assets/images/Logo3_Polito.svg b/public/assets/images/Logo3_Polito.svg new file mode 100644 index 0000000..671b64d --- /dev/null +++ b/public/assets/images/Logo3_Polito.svg @@ -0,0 +1,12468 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + +

    Prosumer behavior

    		 - +

    Prosumer: Consumption and generation profiles @@ -150,10 +153,10 @@

    		{{#if initState}} - + {{/if}} {{#if eventState}} - + {{/if}}