diff --git a/__pycache__/app_host.cpython-36.pyc b/__pycache__/app_host.cpython-36.pyc index c8f630e..a4e97b4 100644 Binary files a/__pycache__/app_host.cpython-36.pyc and b/__pycache__/app_host.cpython-36.pyc differ diff --git a/app.py b/app.py index 055e6e3..c46c2a4 100644 --- a/app.py +++ b/app.py @@ -3,8 +3,6 @@ #from flask.ext.session import Session import csv, json import sys, os -# import eplus as ep -# import data as cd import data_climates as ddc import CPlus_Climate as cc import climabox as cb @@ -24,18 +22,16 @@ def index(): ff = str(session['id']) except KeyError: ff = '1234' - # print("id not known") - - # if os.path.exists('static/'+ff+'.json'): - # os.remove('static/'+ff+'.json') - # session['location'] = '' - # session['city'] = '' session['location'] = '' session['city'] = '' session['id'] = time.time() return render_template("ClimateSelect.html") +@app.route('/ClimateSelect', methods=['GET', 'POST']) +def ClimateSelect(): + return render_template("ClimateSelect.html") + @app.route('/ClimateInfo', methods=['GET', 'POST']) def ClimateInfo(): if request.method == 'POST': @@ -46,38 +42,17 @@ def ClimateInfo(): _loc = ddc.findEPWN(str(city)) location = _loc.fileEPW session['locationJs'] = './static/json/'+_loc.fileEPW+'.json' - # print('************_loc vs location ', _loc, session['locationJs']) + session['locationJsPsy'] = './static/json/'+_loc.fileEPW+'.json' session['location'] = location session['city'] = city - # w = cc.wthImp('./static/epw/'+session['location']+'.epw') - - # wi = w.dataWth() - # ww = cc.wrangleWth(wi) - # wthdata = json.dumps(ww.WTH()) - - # with open('static/'+ff+'.json','w') as f: - # f.write(wthdata) - - # wthdata = request.get_json() - # if wthdata != None: - # session['city'] = wthdata['city'] - # with open('static/'+ff+'.json','w') as f: - # f.write(json.dumps(wthdata)) - - return render_template("ClimateInfo.html")#, wthdata=wthdata) + return render_template("ClimateInfo.html") @app.errorhandler(Exception) def handle_error(error): return render_template("ClimateSelect.html") -@app.route('/ClimateSelect', methods=['GET', 'POST']) -def ClimateSelect(): - # if request.method == 'POST': - # data_ = request.form['js_data'] - return render_template("ClimateSelect.html") - # a simple sunpath diagram @app.route('/SolarP', methods=['GET','POST']) def SolarP(): diff --git a/static/css/styleM.css b/static/css/styleM.css index 005ba1d..19c5b94 100644 --- a/static/css/styleM.css +++ b/static/css/styleM.css @@ -29,14 +29,16 @@ form { /*display: inline-block;*/ margin-left: auto; margin-right: auto; + margin-top: auto; + margin-bottom: : auto; /*text-align: justify-all;*/ } input { border: 0.5px solid transparent; - background-color: white; /*#f1f1f1;*/ - padding: 10px; - font-size: 16px; + background-color: white; + padding: 8px; + font-size: 15px; } input.cs[type=text] { @@ -46,7 +48,7 @@ input.cs[type=text] { } input.dd[type=text] { - font-size: 16px; + font-size: 12.75px; background-color: #f1f1f1; width: 35%; } @@ -59,12 +61,12 @@ input.cbform[type=text] { height: 12px; } -input.pdform[type=text] { +/*input.pdform[type=text] { border: 0.5px solid; font-size: 12px; background-color: white; height: 12px; -} +}*/ input[type=submit] { background-color: orangered; @@ -451,6 +453,40 @@ Sections } +#solar{ + width: 50; + /*height: 150;*/ +} +#solar img +{ + max-width: 100%; + max-height: 100%; + margin: auto; + display: block; +} +#temp{ + width: 50; + /*height: 150;*/ +} +#temp img +{ + max-width: 100%; + max-height: 100%; + margin: auto; + display: block; +} +#wind{ + width: 50; + /*height: 150;*/ +} +#wind img +{ + max-width: 100%; + max-height: 100%; + margin: auto; + display: block; +} + .grid line { stroke: white; stroke-opacity: 1; diff --git a/static/img/outdoor.png b/static/img/outdoor.png new file mode 100644 index 0000000..74d50c4 Binary files /dev/null and b/static/img/outdoor.png differ diff --git a/templates/Climabox.html b/templates/Climabox.html index 28cdba6..7b3165a 100644 --- a/templates/Climabox.html +++ b/templates/Climabox.html @@ -79,20 +79,48 @@

Climabox Settings

-
Climabox
- Climabox dimensions + + +
+
+ +
+ + +
+ +
+
+
+
+
+
+
+
+ +
+
+ +
+ + +
+ + + Climabox dimensions
-
W (m)
-
L (m)
-
H (m)
+
W (m)
+
L (m)
+
H (m)
Window to wall ratio
- + + @@ -105,7 +133,8 @@

- + + @@ -131,7 +161,8 @@

+ @@ -165,6 +197,13 @@

Wall

+ Floor
+
+
Operable windows
+ Operable windows
Heating furnace (COP 0.85), 18 deg C
AC for Cooling (COP 3), 26 deg C
--> -
+
@@ -334,7 +373,7 @@

- +

Indoor temperature

Discomfort hours during occupancy
due to high temperature - 0 hrs
@@ -432,6 +471,8 @@

Cost
+ FREQUENCY + +

+
+
+

+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+ + +
+

+ + +
+
+
+ +
+
+

Energy

+
+
+

CO2e

+
+
+

Cost

+
+
+
+
+ Energy use intensity in kWh/m2.yr
+ + Total: 0 + , Equipment - 0 + , Lighting - 0 + , Heating - 0 + , Cooling - 0
+ + Operational cost in $/m2.yr
+ + Total: 0 + , Electricity - 0 + , Gas - 0
+ + Emissions in kgCO2e/m2.yr
+ + Total: 0 + , Electricity - 0 + , Gas - 0 +
+ +
+
+ +
+ + + +
+

+ + +{% endblock %} +{% block scripts %} + + + + + + + +{% endblock %} \ No newline at end of file diff --git a/templates/ClimateInfo.html b/templates/ClimateInfo.html index 6d030ee..73f1ee7 100644 --- a/templates/ClimateInfo.html +++ b/templates/ClimateInfo.html @@ -2,10 +2,7 @@ {% extends "baseM.html" %} {% block main %} - - - - - - - - -
- - - -
-

- - - -
-
-
+
+ +
+

+ +
+

CLIMATE

-
+
-
-
- -
-
+
SOLAR
Trulli
+
Sun path diagram
A sun path diagram is a 2-dimensional representation of the position of the sun with respect to given site over the course of the year. The figure can be used for outdoor direct shading studies or to predict the occurrence of glare indoors. @@ -161,7 +126,7 @@

CLIMATE

Trulli
- Degree Days
+ Degree Days
This graph shows monthly heating and cooling degree days for adjustable set point temperatures. More>>
@@ -235,11 +200,11 @@

CLIMATE

- - {% endblock %} \ No newline at end of file diff --git a/templates/ClimateSelect.html b/templates/ClimateSelect.html index a87496e..ee9c2dc 100644 --- a/templates/ClimateSelect.html +++ b/templates/ClimateSelect.html @@ -84,6 +84,16 @@ opacity: 1; } + +.navbar-collapse { + color: currentColor; + cursor: not-allowed; + opacity: 0.5; + pointer-events: none; + text-decoration: none; +} + + diff --git a/templates/TempRH.html b/templates/TempRH.html index eac4454..99ad394 100644 --- a/templates/TempRH.html +++ b/templates/TempRH.html @@ -7,16 +7,32 @@ -
+ +
+ +
+
solar
+
temperature
+
wind
+
+
+ +

-
+
+
-
+
solar
+
temperature
+
wind
+
+
+ +

Outdoor Temperature

@@ -48,16 +64,7 @@

Outdoor Temperature

, Lower treshold limit, (default is 18)
-
- -
- -
-

- -
-
-
+

Degree Days

@@ -88,26 +95,13 @@

Degree Days

, CDD setpoint temperature: (default is 10)
-
- -
- -
-

- -
-
-
+

Psychrometric Chart

Hourly air temperature and humidity
(Credit: Adopted from a responsive-d3 project by James Perakis)
-
[download svg] @@ -120,36 +114,41 @@

Psychrometric Chart

+ + +
+ +
+
+
- - -
+
+ +
+

+ +
+
+ - -
+
+
- - -
+
+
+

+
+
+ +
+
--> {% endblock %} {% block scripts %} @@ -275,6 +274,7 @@

Psychrometric Chart

var CDDL = {{dd_data["CDDL"]}} var CITY = "{{session['city']}}" var epwName = "{{session['location']}}" + // var jsFileLoc = "{{session['locationJs']}}" var jsFileLoc = "{{session['locationJs']}}" var wthjson = "{{session['id']}}"+".json" // console.log(wthjson) diff --git a/templates/baseM.html b/templates/baseM.html index 9494b97..c900867 100644 --- a/templates/baseM.html +++ b/templates/baseM.html @@ -10,6 +10,7 @@ + @@ -24,17 +25,24 @@