Spaces:
Paused
Paused
Update app.py
Browse files
app.py
CHANGED
|
@@ -606,11 +606,12 @@ def lab_management(year_slider, column_changer):
|
|
| 606 |
elif column_changer == 'hrHPV/ASC-US rate (%)':
|
| 607 |
ref_value = 36.6
|
| 608 |
ref_hline = hv.HLine(y=ref_value).opts(color='black', alpha=1, line_width=2).opts(shared_axes=False, toolbar=None, default_tools=[])
|
|
|
|
| 609 |
|
| 610 |
-
line_plot = line_data.hvplot.line(x='year', y=column_changer, color='#5B91D1', line_dash ='dashed', line_width=2, height=
|
| 611 |
|
| 612 |
-
|
| 613 |
-
point = hv.Points(
|
| 614 |
|
| 615 |
hpvascus_goal = hv.HSpan(30, 60).opts(shared_axes=False, toolbar=None, default_tools = [])
|
| 616 |
hpvascus_bdln_1 = hv.HSpan(20, 30).opts(shared_axes=False,toolbar=None, default_tools = [])
|
|
@@ -620,13 +621,16 @@ def lab_management(year_slider, column_changer):
|
|
| 620 |
hpvascus_bg = (hpvascus_goal.opts(color='#ACFFA0', alpha=0.75) * hpvascus_bdln_1.opts(color='#6AB35F', alpha=0.75) * hpvascus_bdln_2.opts(color='#6AB35F', alpha=0.75)) * hpvascus_att_1.opts(color='#B34D93', alpha = 0.9) * hpvascus_att_2.opts(color='#B34D93', alpha = 0.9)
|
| 621 |
|
| 622 |
|
| 623 |
-
return (hpvascus_bg * ref_hline * line_plot * point).opts(toolbar='above', default_tools=[]).opts(shared_axes=False)
|
| 624 |
|
| 625 |
elif column_changer == 'hrHPV Prevalence (%)':
|
| 626 |
ref_value = 21
|
| 627 |
ref_hline = hv.HLine(y=ref_value).opts(color='black', alpha=1, line_width=2).opts(shared_axes=False, toolbar=None, default_tools=[])
|
| 628 |
|
| 629 |
-
line_plot = line_data.hvplot.line(x='year', y=column_changer, color='#5B91D1', line_dash ='dashed', line_width=2, height=
|
|
|
|
|
|
|
|
|
|
| 630 |
|
| 631 |
hpvprev_goal = hv.HSpan(11, 29).opts(shared_axes=False, toolbar=None, default_tools = [])
|
| 632 |
hpvprev_bdln_1 = hv.HSpan(5, 11).opts(shared_axes=False,toolbar=None, default_tools = [])
|
|
|
|
| 606 |
elif column_changer == 'hrHPV/ASC-US rate (%)':
|
| 607 |
ref_value = 36.6
|
| 608 |
ref_hline = hv.HLine(y=ref_value).opts(color='black', alpha=1, line_width=2).opts(shared_axes=False, toolbar=None, default_tools=[])
|
| 609 |
+
ref_text = hv.Text(ref_value, year_slider, f"{ref_value:.2f}").opts(text_align='left', text_color='black', text_font_size='10pt')
|
| 610 |
|
| 611 |
+
line_plot = line_data.hvplot.line(x='year', y=column_changer, color='#5B91D1', line_dash ='dashed', line_width=2, height=600, title=column_changer, xlabel='Year', ylabel=column_changer, tools=[hover_cp]).opts(fontsize=pl_title, fontscale=f_scale_lab, shared_axes=False, toolbar=None, default_tools=[], ylim=(10, 90))
|
| 612 |
|
| 613 |
+
selected_year = line_data[line_data['year'] == year_slider]
|
| 614 |
+
point = hv.Points(selected_year, ['year', column_changer]).opts(color='black', size=20, marker='o', line_color='black')
|
| 615 |
|
| 616 |
hpvascus_goal = hv.HSpan(30, 60).opts(shared_axes=False, toolbar=None, default_tools = [])
|
| 617 |
hpvascus_bdln_1 = hv.HSpan(20, 30).opts(shared_axes=False,toolbar=None, default_tools = [])
|
|
|
|
| 621 |
hpvascus_bg = (hpvascus_goal.opts(color='#ACFFA0', alpha=0.75) * hpvascus_bdln_1.opts(color='#6AB35F', alpha=0.75) * hpvascus_bdln_2.opts(color='#6AB35F', alpha=0.75)) * hpvascus_att_1.opts(color='#B34D93', alpha = 0.9) * hpvascus_att_2.opts(color='#B34D93', alpha = 0.9)
|
| 622 |
|
| 623 |
|
| 624 |
+
return (hpvascus_bg * ref_hline * ref_text * line_plot * point).opts(toolbar='above', default_tools=[]).opts(shared_axes=False)
|
| 625 |
|
| 626 |
elif column_changer == 'hrHPV Prevalence (%)':
|
| 627 |
ref_value = 21
|
| 628 |
ref_hline = hv.HLine(y=ref_value).opts(color='black', alpha=1, line_width=2).opts(shared_axes=False, toolbar=None, default_tools=[])
|
| 629 |
|
| 630 |
+
line_plot = line_data.hvplot.line(x='year', y=column_changer, color='#5B91D1', line_dash ='dashed', line_width=2, height=600, title=column_changer, xlabel='Year', ylabel=column_changer, tools=[hover_cp]).opts(fontsize=pl_title, fontscale=f_scale_lab, shared_axes=False, toolbar=None, default_tools=[], ylim=(0, 50))
|
| 631 |
+
|
| 632 |
+
selected_year = line_data[line_data['year'] == year_slider]
|
| 633 |
+
point = hv.Points(selected_year, ['year', column_changer]).opts(color='black', size=20, marker='o', line_color='black')
|
| 634 |
|
| 635 |
hpvprev_goal = hv.HSpan(11, 29).opts(shared_axes=False, toolbar=None, default_tools = [])
|
| 636 |
hpvprev_bdln_1 = hv.HSpan(5, 11).opts(shared_axes=False,toolbar=None, default_tools = [])
|