Ad5001/LogarithmPlotter
Ad5001/LogarithmPlotter
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Wiki Activity

Fixing bugs with repartition function

Browse source
This commit is contained in:
Adsooi 2021-03-09 09:10:04 +01:00
parent d04c5ae52d
commit faffd67e28
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
qml/js/objects.js
View file

@ -1143,7 +1143,7 @@ class RepartitionFunction extends ExecutableObject {
'beginIncluded': 'Boolean', 'beginIncluded': 'Boolean',
'drawLineEnds': 'Boolean', 'drawLineEnds': 'Boolean',
'comment1': 'Note: Specify the properties for each potential result.', 'comment1': 'Note: Specify the properties for each potential result.',
'probabilities': new P.Dictionary('string', 'int', /^[\d.]+$/, /^[\d\.]+$/, 'P({name} = ', ') = '), 'probabilities': new P.Dictionary('string', 'float', /^-?[\d.]+$/, /^-?[\d\.]+$/, 'P({name} = ', ') = '),
'labelPosition': new P.Enum('above', 'below', 'left', 'right', 'above-left', 'above-right', 'below-left', 'below-right'), 'labelPosition': new P.Enum('above', 'below', 'left', 'right', 'above-left', 'above-right', 'below-left', 'below-right'),
'labelX': 'number' 'labelX': 'number'
}} }}
@ -1198,7 +1198,7 @@ class RepartitionFunction extends ExecutableObject {
draw(canvas, ctx) { draw(canvas, ctx) {
var currentY = 0; var currentY = 0;
var keys = Object.keys(this.probabilities).sort() var keys = Object.keys(this.probabilities).map(idx => parseInt(idx)).sort((a,b) => a-b)
console.log("Keys", keys) console.log("Keys", keys)
if(canvas.visible(keys[0],this.probabilities[keys[0]])) { if(canvas.visible(keys[0],this.probabilities[keys[0]])) {
canvas.drawLine(ctx, canvas.drawLine(ctx,
@ -1236,15 +1236,19 @@ class RepartitionFunction extends ExecutableObject {
} }
} }
} }
if(canvas.visible(keys[keys.length-1],this.probabilities[keys[keys.length-1]])) { console.log("Checking end", canvas.visible(keys[keys.length-1],currentY+parseFloat(this.probabilities[keys[keys.length-1]])), canvas.y2px(currentY+parseFloat(this.probabilities[keys[keys.length-1]])))
if(canvas.visible(keys[keys.length-1],currentY+parseFloat(this.probabilities[keys[keys.length-1]]))) {
canvas.drawLine(ctx, canvas.drawLine(ctx,
Math.max(0,canvas.x2px(keys[keys.length-1])), Math.max(0,canvas.x2px(keys[keys.length-1])),
canvas.y2px(this.probabilities[keys[keys.length-1]]), canvas.y2px(currentY+parseFloat(this.probabilities[keys[keys.length-1]])),
canvas.canvasSize.width, canvas.canvasSize.width,
canvas.y2px(this.probabilities[keys[keys.length-1]]) canvas.y2px(currentY+parseFloat(this.probabilities[keys[keys.length-1]]))
) )
ctx.beginPath(); ctx.beginPath();
ctx.arc(canvas.x2px(idx),canvas.y2px(currentY), 4, 0, 2 * Math.PI); ctx.arc(
canvas.x2px(keys[keys.length-1]),
canvas.y2px(currentY+parseFloat(this.probabilities[keys[keys.length-1]])),
4, 0, 2 * Math.PI);
ctx.fill(); ctx.fill();
} }