Commit 6306d980 by Александр

vsepr: geometries and molecules now are passed from xml as parameters

parent 495814c7
...@@ -726,6 +726,9 @@ def crystallography(element, value, status, render_template, msg=''): ...@@ -726,6 +726,9 @@ def crystallography(element, value, status, render_template, msg=''):
escapedict = {'"': '"'} escapedict = {'"': '"'}
value = saxutils.escape(value, escapedict) value = saxutils.escape(value, escapedict)
molecules = element.get('molecules')
geometries = element.get('geometries')
context = {'id': eid, context = {'id': eid,
'value': value, 'value': value,
'state': status, 'state': status,
...@@ -782,6 +785,8 @@ def vsepr_input(element, value, status, render_template, msg=''): ...@@ -782,6 +785,8 @@ def vsepr_input(element, value, status, render_template, msg=''):
'width': width, 'width': width,
'height': height, 'height': height,
'display_file': display_file, 'display_file': display_file,
'molecules': molecules,
'geometries': geometries,
} }
html = render_template("vsepr_input.html", context) html = render_template("vsepr_input.html", context)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<section id="textinput_${id}" class="textinput ${doinline}" > <section id="textinput_${id}" class="textinput ${doinline}" >
<table><tr><td height='600'> <table><tr><td height='600'>
<div id="vsepr_div" style="position:relative;"> <div id="vsepr_div" style="position:relative;" data-molecules="${molecules}" data-geometries="${geometries}">
<canvas id="vsepr" width="${width}" height="${height}"> <canvas id="vsepr" width="${width}" height="${height}">
</canvas> </canvas>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment