##// END OF EJS Templates
DATABASES » madrigal
RSS
Fixing plots
jespinoza -
r7:4e0b343b0c61
parent child
Show More
Show file before | Show file after | Hide comments
@@ -59,10 +59,10
59 </div> <!-- end subdivide -->
59 </div> <!-- end subdivide -->
60
60
61 <!-- file select div -->
61 <!-- file select div -->
62 <div class="col-md-12 single_form" id="file_plot">
62 <div class="col-md-9 single_form" id="file_plot">
63 {% if form.show_plots %}
63 {% if form.show_plots %}
64 {% include "madweb/parameter_selection.html" %}
64 {% include "madweb/parameter_selection.html" %}
65 {% endif %}
65 {% endif %}
66 </div> <!-- end subdivide -->
66 </div> <!-- end subdivide -->
67
67
68 {% endblock %} No newline at end of file
68 {% endblock %}
Show file before | Show file after | Hide comments
@@ -259,7 +259,7
259
259
260 {% block file_plot %}
260 {% block file_plot %}
261 <!-- file select div -->
261 <!-- file select div -->
262 <div class="col-md-12 single_form" id="file_plot">
262 <div class="col-md-9 single_form" id="file_plot">
263 {% if form.show_plots %}
263 {% if form.show_plots %}
264 {% include "madweb/parameter_selection.html" %}
264 {% include "madweb/parameter_selection.html" %}
265 {% endif %}
265 {% endif %}
Show file before | Show file after | Hide comments
@@ -19,9 +19,9
19 <body>
19 <body>
20 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
20 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
21 <tr>
21 <tr>
22 <td width="5%"><a href="{% url 'docs' 'whatsNew.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
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>
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>
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 <td width="54%"><!-- InstanceBeginEditable name="EditTitleTop" -->Madrigal user's guide (How do I access Madrigal data?)<!-- InstanceEndEditable --></td>
25 <td width="54%"><!-- InstanceBeginEditable name="EditTitleTop" -->Madrigal user's guide (How do I access Madrigal data?)<!-- InstanceEndEditable --></td>
26 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
26 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
27 <td width="18%"><a href="/">Madrigal home</a></td>
27 <td width="18%"><a href="/">Madrigal home</a></td>
@@ -47,9 +47,9
47 <!-- InstanceEndEditable -->
47 <!-- InstanceEndEditable -->
48 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
48 <table width="100%" border="1" cellpadding="0" cellspacing="2" class="navigation">
49 <tr>
49 <tr>
50 <td width="5%"><a href="{% url 'docs' 'whatsNew.html' %}"><img src="/static/previous.png" alt="previous" width="32" height="32" /></a></td>
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>
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>
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 <td width="54%"><!-- InstanceBeginEditable name="EditTitleBottom" -->Madrigal user's guide (How do I access Madrigal data?)<!-- InstanceEndEditable --></td>
53 <td width="54%"><!-- InstanceBeginEditable name="EditTitleBottom" -->Madrigal user's guide (How do I access Madrigal data?)<!-- InstanceEndEditable --></td>
54 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
54 <td width="13%"><a href="{% url 'docs' 'madContents.html' %}">Doc home </a></td>
55 <td width="18%"><a href="/">Madrigal home</a></td>
55 <td width="18%"><a href="/">Madrigal home</a></td>
Show file before | Show file after | Hide comments
@@ -399,7 +399,11 def view_plot(request):
399 if param1d==0:
399 if param1d==0:
400 kindat = data['Table Layout']['kindat'][0]
400 kindat = data['Table Layout']['kindat'][0]
401 if kindat in (1950, 1911, 1913):
401 if kindat in (1950, 1911, 1913):
402 plot = plot_scatter(datatime, array['2D Parameters'][param2d][0], param2d, array['2D Parameters']['d'+param2d][0])
402 ecode = 'd'+param2d
403 if ecode.startswith('dd'):
404 plot = plot_scatter(datatime, array['2D Parameters'][param2d][0], param2d)
405 else:
406 plot = plot_scatter(datatime, array['2D Parameters'][param2d][0], param2d, array['2D Parameters']['d'+param2d][0])
403 else:
407 else:
404 plot = plot_heatmap(datatime, yrange, array['2D Parameters'][param2d], param2d)
408 plot = plot_heatmap(datatime, yrange, array['2D Parameters'][param2d], param2d)
405 else:
409 else:
@@ -452,6 +456,10 def plot_scatter(datatime,dataparam,paramname, error=[]):
452 type="date"
456 type="date"
453 )
457 )
454 )
458 )
459 fig.update_layout(
460 width=900,
461 height=600,
462 )
455
463
456
464
457 plot = py.plot(fig, include_plotlyjs=False, output_type='div')
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 fig.update_layout(
543 fig.update_layout(
544 width=900,
545 height=600,
536 annotations=[
546 annotations=[
537 dict(text="Colorscale", showarrow=False,
547 dict(text="Colorscale", showarrow=False,
538 x=0, xref="paper", y=1.05, yref="paper", align="left"),
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