Skip to content

Added Prapti's code for highlighting a block with a fixed end block. #11

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
peeratham merged 1 commit into from
Mar 5, 2019
Merged

Added Prapti's code for highlighting a block with a fixed end block. #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
77 changes: 77 additions & 0 deletions core/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,3 +958,80 @@ Blockly.utils.startsWith = function(str, prefix) {
Blockly.utils.toRadians = function(angleDegrees) {
return angleDegrees * Math.PI / 180;
};

/**
*Returns path string which bounds the blocks between block1 and block2 (inclusive)
*/
Blockly.utils.getBoundingPath = function(block1, block2=null){
if(block2 == null){
return block1.svgPath_.getAttribute("d");
}
var d = "";
var pd1 = block1.svgPath_.getAttribute("d").split(" H");
var pd2 = block2.svgPath_.getAttribute("d").split(" H");
d = d + pd1[0] + " H" + pd1[1];
var block2Type = block2.type.replace("control_","");
d = d + Blockly.utils.pathBetween(block1,block2);
if(["if","repeat","repeat_until","forever"].includes(block2Type)){
var substack = block2.inputList[1].connection ? block2.inputList[1].connection.targetConnection.getSourceBlock() : block2.inputList[2].connection.targetConnection.getSourceBlock();
var newTranslate = parseInt(substack.getSvgRoot().getAttribute("transform").replace("translate(","").split(",")[0]);
d = d + " H" + pd2[2] + Blockly.utils.pathBetween(substack, null, newTranslate)
+ " H" + pd2[4];
d = d + " H" + pd2[6] + " H" + pd2[7];
} else if(block2Type == "if_else"){
var substack1 = block2.inputList[2].connection.targetConnection.getSourceBlock();
var substack2 = block2.inputList[4].connection.targetConnection.getSourceBlock();
var newTranslate1 = parseInt(substack1.getSvgRoot().getAttribute("transform").replace("translate(","").split(",")[0]);
var newTranslate2 = parseInt(substack2.getSvgRoot().getAttribute("transform").replace("translate(","").split(",")[0]);
d = d + " H" + pd2[2] + Blockly.utils.pathBetween(substack1, null, newTranslate1)
+ " H" + pd2[5] + Blockly.utils.pathBetween(substack2, null, newTranslate2)
+ " H" + pd2[7];
d = d + " H" + pd2[8] + " H" + pd2[9];
} else {
d = d + " H" + pd2[2];
d = d + " H" + pd2[3] + " H" + pd2[4];
}
return d;
};

/**
*Returns path string for nested blocks
*/
Blockly.utils.pathBetween = function(block1, block2, translate=0){
var d = "";
var block = block1;
while (block != null && block != block2){
var pd = block.svgPath_.getAttribute("d").split(" H");
pd[2] = pd[2].replace(pd[2].split(" ")[1],parseInt(pd[2].split(" ")[1]) + translate);
var blockType = block.type.replace("control_","");
if(["repeat","repeat_until","forever"].includes(blockType)){
pd[5] = pd[5].replace(pd[5].split(" ")[1],parseInt(pd[5].split(" ")[1]) + translate )
var substack = block.inputList[1].connection ? block.inputList[1].connection.targetConnection.getSourceBlock() : block.inputList[2].connection.targetConnection.getSourceBlock();
var newTranslate = parseInt(substack.getSvgRoot().getAttribute("transform").replace("translate(","").split(",")[0]) + translate;
d = d + " H" + pd[2] + Blockly.utils.pathBetween(substack, null, newTranslate)
+ " H" + pd[5];
} else if(blockType == "if"){
pd[4] = pd[4].replace(pd[4].split(" ")[1],parseInt(pd[4].split(" ")[1]) + translate )
var substack = block.inputList[1].connection ? block.inputList[1].connection.targetConnection.getSourceBlock() : block.inputList[2].connection.targetConnection.getSourceBlock();
var newTranslate = parseInt(substack.getSvgRoot().getAttribute("transform").replace("translate(","").split(",")[0]) + translate;
d = d + " H" + pd[2] + Blockly.utils.pathBetween(substack, null, newTranslate)
+ " H" + pd[4];
} else if(blockType == "if_else"){
pd[5] = pd[5].replace(pd[5].split(" ")[1],parseInt(pd[5].split(" ")[1]) + translate )
pd[7] = pd[7].replace(pd[7].split(" ")[1],parseInt(pd[7].split(" ")[1]) + translate )
var substack1 = block.inputList[2].connection.targetConnection.getSourceBlock();
var substack2 = block.inputList[4].connection.targetConnection.getSourceBlock();
var newTranslate1 = parseInt(substack1.getSvgRoot().getAttribute("transform").replace("translate(","").split(",")[0]) + translate;
var newTranslate2 = parseInt(substack2.getSvgRoot().getAttribute("transform").replace("translate(","").split(",")[0]) + translate;
d = d + " H" + pd[2] + Blockly.utils.pathBetween(substack1, null, newTranslate1)
+ " H" + pd[5] + Blockly.utils.pathBetween(substack2, null, newTranslate2)
+ " H" + pd[7];
} else if (block.type.includes("event_when")){
d = d ;
} else {
d = d + " H" + pd[2];
}
block = block.getNextBlock();
}
return d;
};
38 changes: 16 additions & 22 deletions core/workspace_svg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,35 +992,29 @@ Blockly.WorkspaceSvg.prototype.glowMessyBlock = function(ids, isMessyGlowingBloc
* @param {?string} (optional) end id ID of block to find.
*/
Blockly.WorkspaceSvg.prototype.drawHighlightBox = function(id, id2=null) {
var block = null;
var height = 0;
var block1 = null, block2 = null;
if (id) {
block = this.getBlockById(id);
if (!block) {
block1 = this.getBlockById(id);
if (!block1) {
throw 'Tried to highlight block that does not exist.';
}
}
var lastBlock = null;
var block2 = null;
if(id2==null){
lastBlock = block.getNextBlock();
} else {
if (id2) {
block2 = this.getBlockById(id2);
lastBlock = block2.getNextBlock();
}
if(lastBlock==null){
height = block.getHeightWidth().height;
} else {
height = block.getHeightWidth().height-lastBlock.getHeightWidth().height;
if (!block2) {
throw 'Tried to highlight block that does not exist.';
}
}
this.highlightBoxs_.push(Blockly.utils.createSvgElement('rect',
{'height': height,
'width' : block.getHeightWidth().width+10,
'style' : "fill: none;stroke-width:5;stroke:rgb(255,0,0);",
'x' : block.getBoundingRectangle().topLeft.x-5,
'y' : block.getBoundingRectangle().topLeft.y
this.highlightBoxs_.push(Blockly.utils.createSvgElement('path',
{
'd': Blockly.utils.getBoundingPath(block1,block2),
'class': 'blocklyPath blocklyBlockBackground',
'stroke': 'black',
'style': 'stroke-width: 5px',
'fill-opacity': '0',
'fill': 'black'
},
this.svgBlockCanvas_));
block1.getSvgRoot()));
};

/**
Expand Down