pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

typo in short-range words

Browse source
This commit is contained in:
Luis Aleixo 2022-05-31 16:15:24 +02:00
parent c407ca4518
commit f15f2368b3
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cara/apps/calculator/static/js/report.js
View file

@ -103,7 +103,7 @@ function draw_plot(svg_id) {
sr_unique_activities = [...new Set(short_range_expirations)]
if (show_sr_legend) {
// Long range cumulative dose line legend - line and area
// Long-range cumulative dose line legend - line and area
var legendLongCumulativeIcon = vis.append('line')
.style("stroke-dasharray", "5 5") //dashed array for line
.attr('stroke-width', '2')
@ -113,18 +113,18 @@ function draw_plot(svg_id) {
.text('Long-range cumulative dose')
.style('font-size', '15px')
.attr('opacity', 0);
// Short range area icon
// Short-range area icon
var legendShortRangeAreaIcon = {};
sr_unique_activities.forEach((b, index) => {
legendShortRangeAreaIcon[index] = vis.append('rect')
.attr('width', 20)
.attr('height', 15);
// Short range area icon colors
// Short-range area icon colors
if (sr_unique_activities[index] == 'Breathing') legendShortRangeAreaIcon[index].attr('fill', 'red').attr('fill-opacity', '0.2');
else if (sr_unique_activities[index] == 'Speaking') legendShortRangeAreaIcon[index].attr('fill', 'green').attr('fill-opacity', '0.1');
else legendShortRangeAreaIcon[index].attr('fill', 'blue').attr('fill-opacity', '0.1');
});
// Short range area text
// Short-range area text
var legendShortRangeText = {};
sr_unique_activities.forEach((b, index) => {
legendShortRangeText[index] = vis.append('text')
@ -541,7 +541,7 @@ function draw_plot(svg_id) {
// Generate the alternative scenarios plot using d3 library.
// 'alternative_scenarios' is a dictionary with all the alternative scenarios
// 'times' is a list of times for all the scenarios
// The method is prepared to consider short range interactions if needed.
// The method is prepared to consider short-range interactions if needed.
function draw_alternative_scenarios_plot(concentration_plot_svg_id, alternative_plot_svg_id) {
// H:M format
var time_format = d3.timeFormat('%H:%M');

4
cara/apps/templates/base/calculator.report.html.j2
View file

@ -71,7 +71,7 @@
<h6 class="card-title">
<b>Probability of infection (%)</b><br>
{% if form.short_range_option == "short_range_yes" %}
Without <b>short range interactions</b>
Without <b>short-range interactions</b>
{% endif %}
</h6>
<br>
@ -93,7 +93,7 @@
<div class="card card-body align-self-center" style="text-align:center; max-width: 300px">
<h6 class="card-title">
<b>Probability of infection (%)</b><br>
With <b>short range interactions</b>
With <b>short-range interactions</b>
</h6>
<br>
<img src="/static/images/short_range_anim.png" class="align-middle mb-3">

2
cara/tests/test_full_algorithm.py
View file

@ -438,7 +438,7 @@ class SimpleExposureModel(SimpleConcentrationModel):
def dose(self) -> _VectorisedFloat:
"""
total deposited dose (integrated over time and over particle
diameters), including short and long range.
diameters), including short and long-range.
"""
result = 0.
for t1,t2 in self.infected_presence.boundaries():