| @@ -59,7 +59,7 | |||
|
|
59 | 59 | </div> <!-- end subdivide --> |
|
|
60 | 60 | |
|
|
61 | 61 | <!-- file select div --> |
|
|
62 |
<div class="col-md- |
|
|
|
62 | <div class="col-md-9 single_form" id="file_plot"> | |
|
|
63 | 63 | {% if form.show_plots %} |
|
|
64 | 64 | {% include "madweb/parameter_selection.html" %} |
|
|
65 | 65 | {% endif %} |
| @@ -259,7 +259,7 | |||
|
|
259 | 259 | |
|
|
260 | 260 | {% block file_plot %} |
|
|
261 | 261 | <!-- file select div --> |
|
|
262 |
<div class="col-md- |
|
|
|
262 | <div class="col-md-9 single_form" id="file_plot"> | |
|
|
263 | 263 | {% if form.show_plots %} |
|
|
264 | 264 | {% include "madweb/parameter_selection.html" %} |
|
|
265 | 265 | {% endif %} |
| @@ -19,9 +19,9 | |||
|
|
19 | 19 | <body> |
|
|
20 | 20 | <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation"> |
|
|
21 | 21 | <tr> |
|
|
22 |
|
|
|
|
23 |
|
|
|
|
24 |
|
|
|
|
22 | <td width="5%"><a href="{% url 'docs' 'whatsNew.html' %}"><img src="{% static 'previous.png' %}" alt="previous" width="32" height="32" /></a></td> | |
|
|
23 | <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="{% static 'up.png' %}" alt="up" width="32" height="32" /></a></td> | |
|
|
24 | <td width="5%"><a href="{% url 'docs' 'wt_contents.html' %}"><img src="{% static 'next.png' %}" alt="next" width="32" height="32" /></a></td> | |
|
|
25 | 25 | <td width="54%"><!-- InstanceBeginEditable name="EditTitleTop" -->Madrigal user's guide (How do I access Madrigal data?)<!-- InstanceEndEditable --></td> |
|
|
26 | 26 | <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td> |
|
|
27 | 27 | <td width="18%"><a href="/">Madrigal home</a></td> |
| @@ -47,9 +47,9 | |||
|
|
47 | 47 | <!-- InstanceEndEditable --> |
|
|
48 | 48 | <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation"> |
|
|
49 | 49 | <tr> |
|
|
50 |
|
|
|
|
51 |
|
|
|
|
52 |
|
|
|
|
50 | <td width="5%"><a href="{% url 'docs' 'whatsNew.html' %}"><img src="{% static 'previous.png' %}" alt="previous" width="32" height="32" /></a></td> | |
|
|
51 | <td width="5%"><a href="{% url 'docs' 'madContents.html' %}"><img src="{% static 'up.png' %}" alt="up" width="32" height="32" /></a></td> | |
|
|
52 | <td width="5%"><a href="{% url 'docs' 'wt_contents.html' %}"><img src="{% static 'next.png' %}" alt="next" width="32" height="32" /></a></td> | |
|
|
53 | 53 | <td width="54%"><!-- InstanceBeginEditable name="EditTitleBottom" -->Madrigal user's guide (How do I access Madrigal data?)<!-- InstanceEndEditable --></td> |
|
|
54 | 54 | <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td> |
|
|
55 | 55 | <td width="18%"><a href="/">Madrigal home</a></td> |
| @@ -399,6 +399,10 def view_plot(request): | |||
|
|
399 | 399 | if param1d==0: |
|
|
400 | 400 | kindat = data['Table Layout']['kindat'][0] |
|
|
401 | 401 | if kindat in (1950, 1911, 1913): |
|
|
402 | ecode = 'd'+param2d | |
|
|
403 | if ecode.startswith('dd'): | |
|
|
404 | plot = plot_scatter(datatime, array['2D Parameters'][param2d][0], param2d) | |
|
|
405 | else: | |
|
|
402 | 406 | plot = plot_scatter(datatime, array['2D Parameters'][param2d][0], param2d, array['2D Parameters']['d'+param2d][0]) |
|
|
403 | 407 | else: |
|
|
404 | 408 | plot = plot_heatmap(datatime, yrange, array['2D Parameters'][param2d], param2d) |
| @@ -452,6 +456,10 def plot_scatter(datatime,dataparam,paramname, error=[]): | |||
|
|
452 | 456 | type="date" |
|
|
453 | 457 | ) |
|
|
454 | 458 | ) |
|
|
459 | fig.update_layout( | |
|
|
460 | width=900, | |
|
|
461 | height=600, | |
|
|
462 | ) | |
|
|
455 | 463 | |
|
|
456 | 464 | |
|
|
457 | 465 | plot = py.plot(fig, include_plotlyjs=False, output_type='div') |
| @@ -533,6 +541,8 def plot_heatmap(datatime,datarange,dataparam,paramname): | |||
|
|
533 | 541 | ) |
|
|
534 | 542 | |
|
|
535 | 543 | fig.update_layout( |
|
|
544 | width=900, | |
|
|
545 | height=600, | |
|
|
536 | 546 | annotations=[ |
|
|
537 | 547 | dict(text="Colorscale", showarrow=False, |
|
|
538 | 548 | x=0, xref="paper", y=1.05, yref="paper", align="left"), |
General Comments 0
You need to be logged in to leave comments.
Login now