Skip to content

Smarter formatting based on amount of data #3086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sulkaharo merged 2 commits into from
Nov 29, 2017
Merged

Smarter formatting based on amount of data #3086

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ad3829
Smarter formatting based on amount of data, to make sure the renderin…
sulkaharo Nov 29, 2017
5b27df2
Move comment to where it belongs, changed math so first 10 treatments…
sulkaharo Nov 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions lib/client/renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,13 +444,18 @@ function init (client, d3) {
}

if ( treatment.insulin > 0) {
var dosage_units = Math.round(treatment.insulin * 100)/100;
var dosage_units = '' + Math.round(treatment.insulin * 100)/100;

var unit_of_measurement = ' U'; // One international unit of insulin (1 IU) is shown as '1 U'
if ( treatment.insulin < 1 && !treatment.carbs ) { // don't show the unit of measurement for insulin boluses < 1 without carbs (e.g. oref0 SMB's). Otherwise lot's of small insulin only dosages are often unreadable
var enteredBy = '' + treatment.enteredBy;

if ( treatment.insulin < 1 && !treatment.carbs && enteredBy.indexOf('openaps') > -1) { // don't show the unit of measurement for insulin boluses < 1 without carbs (e.g. oref0 SMB's). Otherwise lot's of small insulin only dosages are often unreadable
unit_of_measurement = '';
// remove leading zeros to avoid overlap with adjacent boluses
dosage_units = (dosage_units+"").replace(/^0/,"");
}
// remove leading zeros to avoid overlap with adjacent boluses
arc_data[3].element = (dosage_units+"").replace(/^0/,"")+unit_of_measurement;

arc_data[3].element = dosage_units + unit_of_measurement;
}

if (treatment.status) {
Expand Down Expand Up @@ -855,10 +860,12 @@ function init (client, d3) {
.attr('class', 'path')
.attr('id', 'label')
.style('fill', 'white');

// reduce the treatment label font size to make it readable with SMB
var fontBaseSize = (opts.treatments >= 50) ? 40 : 50 - Math.floor((60-opts.treatments)/50 * 10);

label.append('text')
// reduce the treatment label font size to make it readable with SMB
.style('font-size', 30 / opts.scale)
.style('font-size', fontBaseSize / opts.scale)
.style('text-shadow', '0px 0px 10px rgba(0, 0, 0, 1)')
.attr('text-anchor', 'middle')
.attr('dy', '.35em')
Expand All @@ -874,11 +881,19 @@ function init (client, d3) {
}

renderer.drawTreatments = function drawTreatments(client) {

var treatmentCount = 0;

_.forEach(client.ddata.treatments, function eachTreatment (d) {
if (Number(d.insulin) > 0 || Number(d.carbs) > 0) { treatmentCount += 1; };
});

// add treatment bubbles
_.forEach(client.ddata.treatments, function eachTreatment (d) {
renderer.drawTreatment(d, {
scale: renderer.bubbleScale()
, showLabels: true
, treatments: treatmentCount
}, client.sbx.data.profile.getCarbRatio(new Date()));
});
};
Expand Down