Skip to content

🎨 [Frontend] Do not change annotations' color when selected #6048

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
merged 6 commits into from
Jul 11, 2024
Merged

🎨 [Frontend] Do not change annotations' color when selected #6048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
12ce9b4
typo
odeimaiz Jul 10, 2024
2536727
minor
odeimaiz Jul 10, 2024
943c566
showBoundingBox instead of updateItemColor
odeimaiz Jul 10, 2024
f966f43
Merge branch 'master' into enh/do-not-highlight-annotations
odeimaiz Jul 11, 2024
43b3c9b
drawBoundingBox
odeimaiz Jul 11, 2024
a407a78
drawBoundingBox
odeimaiz Jul 11, 2024
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
19 changes: 12 additions & 7 deletions services/static-webserver/client/source/class/osparc/workbench/Annotation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ qx.Class.define("osparc.workbench.Annotation", {
}
},

getRepresenationPosition: function() {
getRepresentationPosition: function() {
const representation = this.getRepresentation();
if (representation) {
const attrs = osparc.wrapper.Svg.getRectAttributes(representation);
Expand Down Expand Up @@ -183,15 +183,20 @@ qx.Class.define("osparc.workbench.Annotation", {
setSelected: function(selected) {
const representation = this.getRepresentation();
if (representation) {
const selectedColor = qx.theme.manager.Color.getInstance().resolve("busy-orange");
switch (this.getType()) {
case "rect":
osparc.wrapper.Svg.updateItemColor(representation, selected ? selectedColor : this.getColor());
break;
case "note":
case "text":
osparc.wrapper.Svg.updateTextColor(representation, selected ? selectedColor : this.getColor());
case "text": {
if (selected) {
if (!("bBox" in representation.node)) {
const bBox = this.__svgLayer.drawBoundingBox(this);
representation.node["bBox"] = bBox;
}
} else if ("bBox" in representation.node) {
osparc.wrapper.Svg.removeItem(representation.node["bBox"]);
delete representation.node["bBox"];
}
break;
}
}
}
},
Expand Down
10 changes: 10 additions & 0 deletions services/static-webserver/client/source/class/osparc/workbench/SvgWidget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,16 @@ qx.Class.define("osparc.workbench.SvgWidget", {

drawNodeUI: function(width = osparc.workbench.NodeUI.NODE_WIDTH, height = osparc.workbench.NodeUI.NODE_HEIGHT, radius = 4, x = 0, y = 0) {
return osparc.wrapper.Svg.drawNodeUI(this.__canvas, width, height, radius, x, y);
},

drawBoundingBox: function(annotation) {
const offset = 10;
const bBox = annotation.getRepresentation().bbox();
const width = bBox.width + 2*offset;
const height = bBox.height + 2*offset;
const x = bBox.x - offset;
const y = bBox.y - offset;
return osparc.wrapper.Svg.drawDashedRect(this.__canvas, width, height, x, y);
}
}
});
2 changes: 1 addition & 1 deletion services/static-webserver/client/source/class/osparc/workbench/WorkbenchUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
}, this);
annotation.addListener("annotationMoving", () => {
if ("initPos" in annotation) {
const reprPos = annotation.getRepresenationPosition();
const reprPos = annotation.getRepresentationPosition();
const xDiff = reprPos.x - annotation.initPos.x;
const yDiff = reprPos.y - annotation.initPos.y;
this.__itemMoving(annotation.getId(), xDiff, yDiff);
Expand Down
46 changes: 25 additions & 21 deletions services/static-webserver/client/source/class/osparc/wrapper/Svg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ qx.Class.define("osparc.wrapper.Svg", {
}
},

/* ANNOTATIONS */

getRectAttributes: function(rect) {
const rectAttrs = rect.node.attributes;
return {
Expand Down Expand Up @@ -272,6 +274,29 @@ qx.Class.define("osparc.wrapper.Svg", {
return rect;
},

updateText: function(representation, label) {
if (representation.type === "text") {
representation.text(label);
} else if (representation.type === "svg") {
// nested
representation["textChild"].innerText = label;
}
},

updateTextColor: function(text, color) {
text.font({
fill: color
});
},

updateTextSize: function(text, size) {
text.font({
size: size + "px"
});
},

/* / ANNOTATIONS */

drawDashedRect: function(draw, width, height, x, y) {
const edgeColor = qx.theme.manager.Color.getInstance().getTheme().colors["workbench-edge-comp-active"];
const rect = draw.rect(width, height)
Expand Down Expand Up @@ -335,27 +360,6 @@ qx.Class.define("osparc.wrapper.Svg", {
item.remove();
},

updateText: function(representation, label) {
if (representation.type === "text") {
representation.text(label);
} else if (representation.type === "svg") {
// nested
representation["textChild"].innerText = label;
}
},

updateTextColor: function(text, color) {
text.font({
fill: color
});
},

updateTextSize: function(text, size) {
text.font({
size: size + "px"
});
},

updateCurveDashes: function(curve, dashed) {
curve.attr({
"stroke-dasharray": dashed ? 5 : 0
Expand Down
Loading