Skip to content

Commit

Permalink
Merge pull request #214 from JdeRobot/fix-213
Browse files Browse the repository at this point in the history
Resetting main tree
  • Loading branch information
OscarMrZ authored Oct 26, 2024
2 parents 879ddb1 + 2ee9cf9 commit 713d2eb
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 39 deletions.
77 changes: 38 additions & 39 deletions backend/filesystem/library_demo/code/trees/main.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,36 @@
{
"id": "6965f5c5-3788-427f-a066-24494d05dbf4",
"locked": true,
"offsetX": 25.89245937311682,
"offsetY": -409.98333532552954,
"zoom": 177.45404060767967,
"id": "fa2362dc-cffa-4764-9b70-90d475be0c02",
"offsetX": -5.628119613229821,
"offsetY": 4.788388817065306,
"zoom": 66,
"gridSize": 0,
"layers": [
{
"id": "3c777675-aadf-46eb-9bc1-7772fe191011",
"id": "1d9af8b5-858e-4253-9057-fbf3c9f2442d",
"type": "diagram-links",
"isSvg": true,
"transformed": true,
"models": {
"05289e7f-8530-4cc3-9a6e-66cab663336c": {
"id": "05289e7f-8530-4cc3-9a6e-66cab663336c",
"169691b6-2a5b-4643-b157-d7c962f0bcd6": {
"id": "169691b6-2a5b-4643-b157-d7c962f0bcd6",
"type": "default",
"selected": false,
"source": "e6829f4f-5e0c-494a-be5c-be3b1a0b5a4c",
"sourcePort": "42be04c1-b9a7-482f-a3ad-14af212d8195",
"target": "c257bfc2-393a-4b3b-8c45-f9730407ceff",
"targetPort": "7416a36e-6fd6-42c8-b3d1-e954a4965526",
"source": "94891f48-9deb-4724-a39d-3551b000dcf6",
"sourcePort": "d988236c-73d4-423a-8acc-05911daede71",
"target": "a2100779-beb1-430f-9310-927c87883326",
"targetPort": "49704d8b-0c59-4254-b6c6-183efa93bca4",
"points": [
{
"id": "aa7d43cc-3531-401c-9e2f-d9f97dc7bc75",
"id": "0df50557-9aac-4ee2-9d40-68f4b9fdcb01",
"type": "point",
"x": 150.94941793990392,
"y": 340.44965020351117
"x": 323.9133995974606,
"y": 269.4848528887388
},
{
"id": "7b1d08da-2832-4819-a615-c9f5c7af8253",
"id": "90c2490f-8751-4954-b907-c09b4f21abe1",
"type": "point",
"x": 245.69700569603543,
"y": 282.36888444778697
"x": 455.03032446133284,
"y": 198.27273167661733
}
],
"labels": [],
Expand All @@ -43,28 +42,28 @@
}
},
{
"id": "96ed375b-efac-45e3-b77b-77040d3ad195",
"id": "fed3b351-5f1a-4cad-9f61-031f8a6af57e",
"type": "diagram-nodes",
"isSvg": false,
"transformed": true,
"models": {
"e6829f4f-5e0c-494a-be5c-be3b1a0b5a4c": {
"id": "e6829f4f-5e0c-494a-be5c-be3b1a0b5a4c",
"94891f48-9deb-4724-a39d-3551b000dcf6": {
"id": "94891f48-9deb-4724-a39d-3551b000dcf6",
"type": "basic",
"selected": false,
"x": 54.3078226359289,
"y": 318.9550351879278,
"x": 227.27272727272728,
"y": 248.4848484848485,
"ports": [
{
"id": "42be04c1-b9a7-482f-a3ad-14af212d8195",
"id": "d988236c-73d4-423a-8acc-05911daede71",
"type": "children",
"x": 145.94812297383373,
"y": 335.448355237441,
"x": 318.9134180929625,
"y": 264.48484826486333,
"name": "children",
"alignment": "right",
"parentNode": "e6829f4f-5e0c-494a-be5c-be3b1a0b5a4c",
"parentNode": "94891f48-9deb-4724-a39d-3551b000dcf6",
"links": [
"05289e7f-8530-4cc3-9a6e-66cab663336c"
"169691b6-2a5b-4643-b157-d7c962f0bcd6"
],
"in": false,
"label": "children"
Expand All @@ -74,31 +73,31 @@
"color": "rgb(0,204,0)",
"is_selected": false
},
"c257bfc2-393a-4b3b-8c45-f9730407ceff": {
"id": "c257bfc2-393a-4b3b-8c45-f9730407ceff",
"a2100779-beb1-430f-9310-927c87883326": {
"id": "a2100779-beb1-430f-9310-927c87883326",
"type": "basic",
"selected": false,
"x": 243.69917930680492,
"y": 260.86082888288206,
"selected": true,
"x": 453.030303030303,
"y": 178.7878787878788,
"ports": [
{
"id": "7416a36e-6fd6-42c8-b3d1-e954a4965526",
"id": "49704d8b-0c59-4254-b6c6-183efa93bca4",
"type": "parent",
"x": 240.69571072996524,
"y": 277.36758948171683,
"x": 450.0303429568346,
"y": 193.27272705274197,
"name": "parent",
"alignment": "left",
"parentNode": "c257bfc2-393a-4b3b-8c45-f9730407ceff",
"parentNode": "a2100779-beb1-430f-9310-927c87883326",
"links": [
"05289e7f-8530-4cc3-9a6e-66cab663336c"
"169691b6-2a5b-4643-b157-d7c962f0bcd6"
],
"in": true,
"label": "parent"
}
],
"name": "FollowPerson",
"color": "rgb(179,89,0)",
"is_selected": false,
"is_selected": true,
"is_subtree": true
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<Root name="Tree Root">
<BehaviorTree>
<Sequence name="Sequence">
<CheckObstacle name="CheckObstacle" amplitude="20" obs_dist="1.0"/>
</Sequence>
</BehaviorTree>
</Root>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"fa2362dc-cffa-4764-9b70-90d475be0c02","offsetX":-112.03742592618858,"offsetY":-81.85840512126316,"zoom":136.0682448315521,"gridSize":0,"layers":[{"id":"1d9af8b5-858e-4253-9057-fbf3c9f2442d","type":"diagram-links","isSvg":true,"transformed":true,"models":{"4ea193f3-e2a3-4950-ac0e-913c924abdf6":{"id":"4ea193f3-e2a3-4950-ac0e-913c924abdf6","type":"default","selected":false,"source":"94891f48-9deb-4724-a39d-3551b000dcf6","sourcePort":"d988236c-73d4-423a-8acc-05911daede71","target":"7fbad7c8-0553-4cd7-8996-fd88e4c295b2","targetPort":"39a81e3f-a122-4527-9fce-90ea315d46ef","points":[{"id":"3c9add18-2b52-4665-90c1-9b38f18ae7ad","type":"point","x":305.5937496138324,"y":167.95312932635392},{"id":"6d0495a3-1b86-4997-9290-103e39ea70c5","type":"point","x":392.81252952475097,"y":146.42187824654525}],"labels":[],"width":3,"color":"gray","curvyness":50,"selectedColor":"rgb(0,192,255)"},"ea893d26-7706-4f55-a723-fcbdd21ffa0b":{"id":"ea893d26-7706-4f55-a723-fcbdd21ffa0b","type":"default","selected":false,"source":"7fbad7c8-0553-4cd7-8996-fd88e4c295b2","sourcePort":"cee881c8-58b1-4bb4-aa5f-516fd1952cc0","target":"cd38d649-173f-494b-97e1-2e50ca2eb46f","targetPort":"3063ffb8-d61c-476c-8ec0-834325285870","points":[{"id":"cb0060c1-b8e4-4b5b-a6ad-73603222bf7b","type":"point","x":486.2812698406922,"y":146.42187824654525},{"id":"27d1b6dc-9324-4a68-9625-33c6a4439cfb","type":"point","x":640.5000397655033,"y":113.48438102173947}],"labels":[],"width":3,"color":"gray","curvyness":50,"selectedColor":"rgb(0,192,255)"},"6818d1c3-5b51-487c-b2e9-3a0d94694d25":{"id":"6818d1c3-5b51-487c-b2e9-3a0d94694d25","type":"default","selected":false,"source":"ce150c68-2dc1-4228-9785-61292509ef84","sourcePort":"a9404ba5-6927-43ce-aaeb-efeb2e72ff33","target":"cd38d649-173f-494b-97e1-2e50ca2eb46f","targetPort":"3b15617d-ed8e-4bcf-8106-a4d89199f7dd","points":[{"id":"5678ab21-de46-4fe6-9d0f-717e6925eae6","type":"point","x":528.6718921733725,"y":201.7187632380718},{"id":"e2dcdc31-1698-45da-ae24-81bd27b67c38","type":"point","x":641.5000208705478,"y":136.48437257244706}],"labels":[],"width":3,"color":"gray","curvyness":50,"selectedColor":"rgb(0,192,255)"},"ec7c359a-1415-4463-8643-982460a14890":{"id":"ec7c359a-1415-4463-8643-982460a14890","type":"default","selected":false,"source":"bed3db79-1ed5-47bd-a17b-64367416751f","sourcePort":"6353ad76-15bf-4994-b587-2bb419a7d8e2","target":"cd38d649-173f-494b-97e1-2e50ca2eb46f","targetPort":"b315b244-9b78-44ba-a917-b74bcbc1a6ca","points":[{"id":"0a0bcc10-34e0-4dcd-92dd-a8ac7bc1106d","type":"point","x":533.7031522400398,"y":254.2968865211114},{"id":"43cde0d2-baa0-484c-b5c8-fa974d93ad04","type":"point","x":641.5000208705478,"y":159.4843753372253}],"labels":[],"width":3,"color":"gray","curvyness":50,"selectedColor":"rgb(0,192,255)"}}},{"id":"fed3b351-5f1a-4cad-9f61-031f8a6af57e","type":"diagram-nodes","isSvg":false,"transformed":true,"models":{"94891f48-9deb-4724-a39d-3551b000dcf6":{"id":"94891f48-9deb-4724-a39d-3551b000dcf6","type":"basic","selected":false,"x":208.96367945847655,"y":146.9648965373471,"ports":[{"id":"d988236c-73d4-423a-8acc-05911daede71","type":"children","x":300.59375437604484,"y":162.95312287449573,"name":"children","alignment":"right","parentNode":"94891f48-9deb-4724-a39d-3551b000dcf6","links":["4ea193f3-e2a3-4950-ac0e-913c924abdf6"],"in":false,"label":"children"}],"name":"Tree Root","color":"rgb(0,204,0)","is_selected":false},"7fbad7c8-0553-4cd7-8996-fd88e4c295b2":{"id":"7fbad7c8-0553-4cd7-8996-fd88e4c295b2","type":"basic","selected":false,"x":390.82427115413583,"y":125.43470124414453,"ports":[{"id":"39a81e3f-a122-4527-9fce-90ea315d46ef","type":"parent","x":387.81257914324584,"y":141.42188300875765,"name":"parent","alignment":"left","parentNode":"7fbad7c8-0553-4cd7-8996-fd88e4c295b2","links":["4ea193f3-e2a3-4950-ac0e-913c924abdf6"],"in":true,"label":"parent"},{"id":"cee881c8-58b1-4bb4-aa5f-516fd1952cc0","type":"children","x":481.2812297466221,"y":141.42188300875765,"name":"children","alignment":"right","parentNode":"7fbad7c8-0553-4cd7-8996-fd88e4c295b2","links":["ea893d26-7706-4f55-a723-fcbdd21ffa0b"],"in":false,"label":"children"}],"name":"Sequence","color":"rgb(0,128,255)","is_selected":false,"is_subtree":false},"cd38d649-173f-494b-97e1-2e50ca2eb46f":{"id":"cd38d649-173f-494b-97e1-2e50ca2eb46f","type":"basic","selected":false,"x":638.5009250542528,"y":92.4965301618108,"ports":[{"id":"3063ffb8-d61c-476c-8ec0-834325285870","type":"parent","x":635.4999996714332,"y":108.48438578395188,"name":"parent","alignment":"left","parentNode":"cd38d649-173f-494b-97e1-2e50ca2eb46f","links":["ea893d26-7706-4f55-a723-fcbdd21ffa0b"],"in":true,"label":"parent"},{"id":"3b15617d-ed8e-4bcf-8106-a4d89199f7dd","type":"input","x":636.5000256327602,"y":131.48437733465948,"name":"amplitude","alignment":"left","parentNode":"cd38d649-173f-494b-97e1-2e50ca2eb46f","links":["6818d1c3-5b51-487c-b2e9-3a0d94694d25"],"in":true,"label":"input"},{"id":"b315b244-9b78-44ba-a917-b74bcbc1a6ca","type":"input","x":636.5000256327602,"y":154.4843688853671,"name":"obs_dist","alignment":"left","parentNode":"cd38d649-173f-494b-97e1-2e50ca2eb46f","links":["ec7c359a-1415-4463-8643-982460a14890"],"in":true,"label":"input"}],"name":"CheckObstacle","color":"rgb(128,0,128)","is_selected":false,"is_subtree":false},"ce150c68-2dc1-4228-9785-61292509ef84":{"id":"ce150c68-2dc1-4228-9785-61292509ef84","type":"tag","selected":false,"x":494.6114369501465,"y":185.72825024437927,"ports":[{"id":"a9404ba5-6927-43ce-aaeb-efeb2e72ff33","type":"tag output","x":523.6718520793024,"y":196.71875678621362,"name":"tag output","alignment":"right","parentNode":"ce150c68-2dc1-4228-9785-61292509ef84","links":["6818d1c3-5b51-487c-b2e9-3a0d94694d25"],"in":false,"label":"tag output"}],"name":"20","color":"var(--bt-tag-normal-background)","is_selected":false,"is_blackboard":false},"bed3db79-1ed5-47bd-a17b-64367416751f":{"id":"bed3db79-1ed5-47bd-a17b-64367416751f","type":"tag","selected":false,"x":495.7274356467904,"y":238.29830563701535,"ports":[{"id":"6353ad76-15bf-4994-b587-2bb419a7d8e2","type":"tag output","x":528.7031121459697,"y":249.2968912833238,"name":"tag output","alignment":"right","parentNode":"bed3db79-1ed5-47bd-a17b-64367416751f","links":["ec7c359a-1415-4463-8643-982460a14890"],"in":false,"label":"tag output"}],"name":"1.0","color":"var(--bt-tag-normal-background)","is_selected":false,"is_blackboard":false}}}]}

0 comments on commit 713d2eb

Please sign in to comment.