got blueprints working for facilitating module structure

CHRIS.py

@@ -66,91 +66,17 @@ for i in range(nCA):
 app = Flask(__name__)
 app.debug = True
 
+from color_module import blueprint
+app.register_blueprint(blueprint)
+
 @app.route('/', methods=['GET'])
 def app_init():
     return render_template('main.html')
 
-@app.route('/color', methods=['GET'])
-def colors():
-    return render_template('index.html', polymers=polymers, CAs=CAs, caMW=caMW)
-
 @app.route('/exposure', methods=['GET'])
 def exposure():
     return render_template('exposure_index.html', polymers=polymers, CAs=CAs, caMW=caMW)
 
-@app.route('/color', methods=['POST'])
-def app_post():
-    amount = float(request.form["amount"])
-    mass = float(request.form["mass"])
-    density = float(request.form["density"])
-    vol = mass / density
-    polymer = request.form["polymer"]
-    pIndex = (np.where(polymers == polymer)[0])[0]
-    area = float(request.form["area"])
-    exposure = request.form["exposure"]
-    CA = request.form["CA"]
-    caIndex = (np.where(CAs == CA)[0])[0]
-
-    TI = caData[caIndex][1]
-    impurity = 1.
-    MW = 1100.
-    isCA = True
-    chemName = ''
-
-    if caIndex < 11:
-        MW = caData[caIndex][2]
-        chemName = '*' + caData[caIndex][0].decode('UTF-8') + '*'
-        impurity = float(request.form["impurity"]) * amount * 1e-2
-    if caIndex == 11:
-        MW = caData[caIndex][2]
-        chemName = '*' + request.form["chemName"] + '*'
-        impurity = float(request.form["impurity"]) * amount * 1e-2
-    if caIndex == 12:
-        MW = float(request.form["MW"])
-        chemName = '*' + request.form["chemName"] + '*'
-        impurity = float(request.form["impurity"]) * amount * 1e-2
-    if caIndex == 13:
-        MW = float(request.form["MW"])
-        chemName = '*' + request.form["chemName"] + '*'
-
-    if exposure != "limited":
-        time = 24.
-    else:
-        time = float(request.form["exptime"])
-    if exposure != "long-term":
-        TTC = 0.12
-    else:
-        TTC = 0.0015
-
-    assume1 = request.form.get("assume1") is not None
-    assume2 = request.form.get("assume2") is not None
-    assume3 = request.form.get("assume3") is not None
-    assume4 = request.form.get("assume4") is not None
-    assume5 = request.form.get("assume5") is not None
-
-    assume = np.array((assume1, assume2, assume3, assume4, assume5))
-
-    release, diff = calcexposure(MW, amount, vol, area, time, pIndex)
-
-    if caIndex > 10:
-        MOS = TTC / release
-    else:
-        MOS = 50. * TI / release
-
-    iMOS = TTC / impurity
-
-    release = sigfigs(release, 2)
-    MOS = sigfigs(MOS, 2)
-    diff = sigfigs(diff, 2)
-    iMOS = sigfigs(iMOS, 2)
-    impurity = sigfigs(impurity, 2)
-
-    return render_template('report.html', polymers=polymers, pIndex=pIndex, caIndex=caIndex, release=release,
-                           assume=assume,
-                           area=area, vol=vol, amount=amount, diff=diff, time=time, exposure=exposure, TTC=TTC,
-                           isCA=isCA, TI=TI, MOS=MOS,
-                           chemName=chemName, impurity=impurity, iMOS=iMOS)
-
 @app.route('/exposure', methods=['POST'])
 def exp_post():
     amount = float(request.form["amount"])

color_module/__init__.py

@@ -0,0 +1,5 @@
+from flask import Blueprint
+
+blueprint = Blueprint('color_module', __name__, template_folder='templates', static_folder='static', static_url_path='/color_module')
+
+from . import colors

color_module/colors.py

@@ -0,0 +1,133 @@
+import numpy as np
+from flask import render_template, request
+from functions import *
+from . import blueprint
+
+# Named polymer matrices and category numbers
+nPoly = 20
+PolyData = np.zeros((nPoly,), dtype=[('name', 'a75'), ('Category', 'i')])
+PolyData[0] = ('Silicone', 0)
+PolyData[1] = ('Polyethylene (density <= 0.94 g/cm3)', 1)
+PolyData[2] = ('Polyethylene (density > 0.94 g/cm3)', 2)
+PolyData[3] = ('Polyethylene terephthalate', 3)
+PolyData[4] = ('Polyurethane (polyether)', 1)
+PolyData[5] = ('Polycarbonate', 3)
+PolyData[6] = ('Polyoxymethylene', 2)
+PolyData[7] = ('Poly(methyl methacrylate)', 3)
+PolyData[8] = ('Acrylonitrile butadiene styrene', 2)
+PolyData[9] = ('Polyether block amide', 1)
+PolyData[10] = ('Polyamide', 3)
+PolyData[11] = ('Polystyrene', 3)
+PolyData[12] = ('Polyvinyl chloride (plasticized)', 0)
+PolyData[13] = ('Polytetrafluoroethylene', 2)
+PolyData[14] = ('Polyvinyl acetate', 1)
+PolyData[15] = ('Polypropylene', 2)
+PolyData[16] = ('Polybutylene terephthalate', 3)
+PolyData[17] = ('Polyetheretherketone', 3)
+PolyData[18] = ('Fluorinated ethylene propylene', 2)
+PolyData[19] = ('Other polymer', 4)
+
+nCA = 14
+caData = np.zeros((nPoly,), dtype=[('name', 'a75'), ('TI', 'd'), ('MW', 'd')])
+caData[0] = ('Titanium dioxide (CAS#:13463-67-7)', 1.0, 1100.)
+caData[1] = ('Carbon black (CAS#:1333-86-4)', 2.0, 1100.)
+caData[2] = ('Pigment brown 24 (CAS#:68186-90-3)', 0.5, 1100.)
+caData[3] = ('Zinc Oxide (CAS#:1314-13-2)', 0.05, 1100.)
+caData[4] = ('Pigment Red 101 (CAS#: 1309-37-1)', 1.0, 1100.)
+caData[5] = ('Solvent violet 13 (CAS#:81-48-1)', 0.0013, 319.4)
+caData[6] = ('Manganese phthalocyanine (CAS#:14325-24-7)', 0.15, 567.5)
+caData[7] = ('Pigment blue 15 (CAS#:147-14-8)', 0.15, 576.1)
+caData[8] = ('Phthalocyanine green (CAS#:1326-53-6)', 0.15, 1092.8)
+caData[9] = ('Ultramarine blue (CAS#:57445-37-5)', 3.3, 1100.)
+caData[10] = ('Pigment Yellow 138 (CAS#:30125-47-4)', 1.0, 693.96)
+caData[11] = ('Other metal oxide color additive', 1.0, 1100.0)
+caData[12] = ('Other non-metal oxide color additive', 1.0, 1100.0)
+caData[13] = ('Other compound (non-color additive)', 1.0, 1100.0)
+
+polymers = np.zeros(nPoly, dtype='object')
+for i in range(nPoly):
+    polymers[i] = PolyData[i][0].decode('UTF-8')
+
+CAs = np.zeros(nCA, dtype='object')
+caMW = np.zeros(nCA, dtype='object')
+for i in range(nCA):
+    CAs[i] = caData[i][0].decode('UTF-8')
+for i in range(nCA):
+    caMW[i] = caData[i][2]
+
+@blueprint.route('/color', methods=['GET'])
+def colors():
+    return render_template('index.html', polymers=polymers, CAs=CAs, caMW=caMW)
+
+@blueprint.route('/color', methods=['POST'])
+def app_post():
+    amount = float(request.form["amount"])
+    mass = float(request.form["mass"])
+    density = float(request.form["density"])
+    vol = mass / density
+    polymer = request.form["polymer"]
+    pIndex = (np.where(polymers == polymer)[0])[0]
+    area = float(request.form["area"])
+    exposure = request.form["exposure"]
+    CA = request.form["CA"]
+    caIndex = (np.where(CAs == CA)[0])[0]
+
+    TI = caData[caIndex][1]
+    impurity = 1.
+    MW = 1100.
+    isCA = True
+    chemName = ''
+
+    if caIndex < 11:
+        MW = caData[caIndex][2]
+        chemName = '*' + caData[caIndex][0].decode('UTF-8') + '*'
+        impurity = float(request.form["impurity"]) * amount * 1e-2
+    if caIndex == 11:
+        MW = caData[caIndex][2]
+        chemName = '*' + request.form["chemName"] + '*'
+        impurity = float(request.form["impurity"]) * amount * 1e-2
+    if caIndex == 12:
+        MW = float(request.form["MW"])
+        chemName = '*' + request.form["chemName"] + '*'
+        impurity = float(request.form["impurity"]) * amount * 1e-2
+    if caIndex == 13:
+        MW = float(request.form["MW"])
+        chemName = '*' + request.form["chemName"] + '*'
+
+    if exposure != "limited":
+        time = 24.
+    else:
+        time = float(request.form["exptime"])
+    if exposure != "long-term":
+        TTC = 0.12
+    else:
+        TTC = 0.0015
+
+    assume1 = request.form.get("assume1") is not None
+    assume2 = request.form.get("assume2") is not None
+    assume3 = request.form.get("assume3") is not None
+    assume4 = request.form.get("assume4") is not None
+    assume5 = request.form.get("assume5") is not None
+
+    assume = np.array((assume1, assume2, assume3, assume4, assume5))
+
+    release, diff = calcexposure(MW, amount, vol, area, time, pIndex, PolyData)
+
+    if caIndex > 10:
+        MOS = TTC / release
+    else:
+        MOS = 50. * TI / release
+
+    iMOS = TTC / impurity
+
+    release = sigfigs(release, 2)
+    MOS = sigfigs(MOS, 2)
+    diff = sigfigs(diff, 2)
+    iMOS = sigfigs(iMOS, 2)
+    impurity = sigfigs(impurity, 2)
+
+    return render_template('report.html', polymers=polymers, pIndex=pIndex, caIndex=caIndex, release=release,
+                           assume=assume,
+                           area=area, vol=vol, amount=amount, diff=diff, time=time, exposure=exposure, TTC=TTC,
+                           isCA=isCA, TI=TI, MOS=MOS,
+                           chemName=chemName, impurity=impurity, iMOS=iMOS)

color_module/static/md2html.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+pandoc FAQ.md > FAQ.html
+pandoc README.md > README.html
+pandoc COU.md > COU.html
+pandoc exposure_COU.md > exposure_COU.html
+

color_module/static/styles.css

@@ -0,0 +1,42 @@
+body {font-family: Arial, Helvetica, sans-serif;}
+
+/* The Modal (background) */
+.modal {
+    display: none; /* Hidden by default */
+    position: fixed; /* Stay in place */
+    z-index: 1; /* Sit on top */
+    padding-top: 100px; /* Location of the box */
+    left: 0;
+    top: 0;
+    width: 100%; /* Full width */
+    height: 100%; /* Full height */
+    max-height: calc(100vh - 210px);
+    overflow: auto; /* Enable scroll if needed */
+    background-color: rgb(0,0,0); /* Fallback color */
+    background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
+}
+
+/* Modal Content */
+.modal-content {
+    background-color: #fefefe;
+    margin: auto;
+    padding: 20px;
+    border: 1px solid #888;
+    width: 80%;
+}
+
+/* The Close Button */
+.close {
+    color: #aaaaaa;
+    float: right;
+    font-size: 28px;
+    font-weight: bold;
+}
+
+.close:hover,
+.close:focus {
+    color: #000;
+    text-decoration: none;
+    cursor: pointer;
+}
+

{templates → color_module/templates}/index.html

@@ -27,9 +27,9 @@
   for their device type and color additive. </strong></p>
 
 
-<p> For details on how to use CHRIS, please read the <a href="{{url_for('static', filename='README.html')}}"> instructions.</a> and
-  <a href="{{url_for('static', filename='COU.html')}}"> context of use (COU)</a>. Answers to frequently asked questions can be
-  found <a href="{{url_for('static', filename='FAQ.html')}}"> here</a>.</p>
+<p> For details on how to use CHRIS, please read the <a href="{{url_for('.static', filename='README.html')}}"> instructions.</a> and
+  <a href="{{url_for('color_module.static', filename='COU.html')}}"> context of use (COU)</a>. Answers to frequently asked questions can be
+  found <a href="{{url_for('color_module.static', filename='FAQ.html')}}"> here</a>.</p>
 
 <body>
 

functions.py

@@ -0,0 +1,49 @@
+import math
+import numpy as np
+
+def sigfigs(number, n):
+    return round(number, n - int(math.floor(math.log10(math.fabs(number)))) - 1)
+
+def calcexposure(MW, amount, vol, area, time, pIndex, PolyData):
+    Ap = np.array((16.9, 11.7, 8.2, 2.6))
+    L = vol / area
+    if PolyData[pIndex][1] < 4:
+        D = 1e4 * np.exp(Ap[PolyData[pIndex][1]] - 0.1351 * MW ** (2. / 3.) + 0.003 * MW - 10454. / 310.)
+    else:
+        Va = 4.76 + 1.32 * MW
+        D = 7.4e-8 * (18. * 2.6) ** 0.5 * 310. / 0.6913 / Va ** 0.6
+
+    D = D * 3600.
+    tau = D * time / L ** 2.
+    if tau <= 0.5:
+        release = 2. * amount * np.sqrt(tau / np.pi)
+    else:
+        release = amount * (1. - (8. / (np.pi ** 2.)) * np.exp(-tau * np.pi ** 2. / 4.))
+
+    return release, D
+
+def calcrates(MW, amount, vol, area, time, pIndex):
+    Ap = np.array((16.9, 11.7, 8.2, 2.6))
+    L = vol / area
+    if PolyData[pIndex][1] < 4:
+        D = 1e4 * np.exp(Ap[PolyData[pIndex][1]] - 0.1351 * MW ** (2. / 3.) + 0.003 * MW - 10454. / 310.)
+    else:
+        Va = 4.76 + 1.32 * MW
+        D = 7.4e-8 * (18. * 2.6) ** 0.5 * 310. / 0.6913 / Va ** 0.6
+    D = D * 86400.
+
+    rates = np.zeros(len(time))
+    tau = D * time[0] / L ** 2.
+    if tau < 0.2:
+        rates[0] = 2. * amount * np.sqrt(tau / np.pi)
+    else:
+        rates[0] = amount * (1. - (8. / (np.pi ** 2.)) * np.exp(-tau * np.pi ** 2. / 4.))
+
+    for i in range(1, len(time)):
+        tau = D * time[i] / L ** 2.
+        if tau < 0.2:
+            rates[i] = 2. * amount * np.sqrt(tau / np.pi) - np.sum(rates[:i])
+        else:
+            rates[i] = amount * (1. - (8. / (np.pi ** 2.)) * np.exp(-tau * np.pi ** 2. / 4.)) - np.sum(rates[:i])
+
+    return rates

static/mainpage.css

@@ -1,9 +0,0 @@
-a {
-    display:inline-block;
-    vertical-align: middle;
-    text-align: center;
-    width:150px;
-    height:150px;
-    background-color:#fff;
-    border:5px solid #0070C0;
-   }

templates/main.html

@@ -4,8 +4,6 @@
     <meta charset="UTF-8">
     <title>CHRIS</title>
 
-<!--    <link rel= "stylesheet" type= "text/css" href= "{{ url_for('static',filename='mainpage.css') }}">-->
-
 </head>
 
 <img src="{{ url_for('static',filename='images/FDAlogo.png') }}" style="float: left;" height="100"/>