Skip to content
Open
Changes from all commits
Commits
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
16 changes: 11 additions & 5 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -817,21 +817,21 @@ angular.module('abTreePractice', ['d3', 'Enums', 'Tree'])
if (!scope.useAb) {
var val;
if (d.nodeType == TreeNodeTypeEnum.maxNode) {
val = ' ' + d.beta.toString().replace('Infinity', '');
val = 'e ' + d.beta.toString().replace('Infinity', '');
} else if (d.nodeType == TreeNodeTypeEnum.minNode) {
val = ' ' + d.alpha.toString().replace('Infinity', '');
val = 'd ' + d.alpha.toString().replace('Infinity', '');
}
return 'c ' + val;
}
return 'α: ' + d.alpha.toString().replace('Infinity', '');
return ': ' + d.alpha.toString().replace('Infinity', '');
});
vertex.select('text.beta')
.attr('x', function(d) { return d.x + 45 })
.attr('y', function(d) { return d.y + 16; })
.text(function(d) {
if (d.alpha == null || d.beta == null) { return; };
if (!scope.useAb) { return; };
return 'β: ' + d.beta.toString().replace('Infinity', '');
return ': ' + d.beta.toString().replace('Infinity', '');
});
// update existing cursor
vertex.select('rect.cursor')
Expand Down Expand Up @@ -933,9 +933,15 @@ angular.module('abTreePractice', ['d3', 'Enums', 'Tree'])
valStr = (nodeVal == null) ? '' : nodeVal.toString();
if ((lastKeyDown > 47 && lastKeyDown < 58) // number keys
|| lastKeyDown == 189 // minus dash
|| lastKeyDown == 190) { // decimal point
|| lastKeyDown == 190
//key strok value for numpad and digits are different
|| (lastKeyDown >= 96 && lastKeyDown <= 105)
|| lastKeyDown == 109
|| lastKeyDown == 110){ // decimal point
var leftSlice = valStr.slice(0, valCharIndex),
rightSlice = valStr.slice(valCharIndex, valStr.length),
lastKeyDown = (lastKeyDown > 108 && lastKeyDown < 111) ? lastKeyDown - 64: lastKeyDown, //109 is for '-' and 110 is for '.'
lastKeyDown = (lastKeyDown > 95 && lastKeyDown < 106) ? lastKeyDown - 48: lastKeyDown, //96 to 105 for 0 to 9 in numpad
lastKeyDown = (lastKeyDown > 188) ? (lastKeyDown - 144) : lastKeyDown,
newNum = String.fromCharCode(lastKeyDown);
valStr = leftSlice + newNum + rightSlice;
Expand Down