From ece3e78a8347480e538e8f73bea6653d1d8506bb Mon Sep 17 00:00:00 2001
From: Paul-Winpenny <92634321+Paul-Winpenny@users.noreply.github.com>
Date: Wed, 8 Jan 2025 21:43:08 +0000
Subject: [PATCH] New graph around the table and a few rows
---
.../Beacons_tag_position/output/graph.json | 100 ++++--------------
.../robobin/robobin/helpers/graph_maker.py | 4 +-
2 files changed, 21 insertions(+), 83 deletions(-)
diff --git a/Wireless_Communication/UWB/Beacons_tag_position/output/graph.json b/Wireless_Communication/UWB/Beacons_tag_position/output/graph.json
index d2d310c9..18e442e8 100644
--- a/Wireless_Communication/UWB/Beacons_tag_position/output/graph.json
+++ b/Wireless_Communication/UWB/Beacons_tag_position/output/graph.json
@@ -4,17 +4,17 @@
{
"name": "A1",
"x": 0,
- "y": 723.28280083741
+ "y": 682.1246591046016
},
{
"name": "A2",
- "x": 1332.5948478187718,
- "y": 698.2372140115226
+ "x": 1494.2442134974192,
+ "y": 253.65194388011844
},
{
"name": "A3",
- "x": 1333.341228197096,
- "y": 697.4833185679433
+ "x": 645.2206629627362,
+ "y": -647.9713995353983
},
{
"name": "A4",
@@ -23,84 +23,42 @@
},
{
"name": "Node5",
- "x": 113.51534888805257,
- "y": 519.1779016436765
+ "x": 205.80241418662237,
+ "y": 249.93836001672082
},
{
"name": "Node6",
- "x": 479.3668277261978,
- "y": 517.3835214667192
+ "x": 738.845549707868,
+ "y": 217.7100236584424
},
{
"name": "Node7",
- "x": 533.5819743431442,
- "y": 762.7457012243916
+ "x": 1306.390334776231,
+ "y": 221.69310005724623
},
{
"name": "Node8",
- "x": 774.1591726422764,
- "y": 823.2828008371517
+ "x": 1223.1286925351685,
+ "y": 583.1619314106301
},
{
"name": "Node9",
- "x": 982.0575668099018,
- "y": 823.2828008374099
+ "x": 113.02743332452039,
+ "y": 591.3265233330367
},
{
"name": "Node10",
- "x": 855.3727756463587,
- "y": 823.2828008374094
+ "x": 795.0822056696198,
+ "y": 604.0129922266117
},
{
"name": "Node11",
- "x": 492.6441422355185,
- "y": 259.8858908230761
- },
- {
- "name": "Node12",
- "x": 425.22254386639605,
- "y": 823.2828008372848
- },
- {
- "name": "Node13",
- "x": 324.99668197373444,
- "y": 654.8388922100263
+ "x": 797.4040669553373,
+ "y": 222.27968277975478
}
],
"connections": [
[
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false
- ],
- [
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false,
- false
- ],
- [
- false,
- false,
false,
false,
false,
@@ -124,8 +82,6 @@
false,
false,
false,
- false,
- false,
false
],
[
@@ -134,8 +90,6 @@
false,
false,
false,
- true,
- false,
false,
false,
false,
@@ -148,9 +102,7 @@
false,
false,
false,
- true,
false,
- true,
false,
false,
false,
@@ -166,8 +118,6 @@
false,
true,
false,
- true,
- false,
false,
false,
false,
@@ -178,8 +128,6 @@
false,
false,
false,
- false,
- false,
true,
false,
true,
@@ -194,8 +142,6 @@
false,
false,
false,
- false,
- false,
true,
false,
true,
@@ -210,8 +156,6 @@
false,
false,
false,
- false,
- false,
true,
false,
true,
@@ -226,8 +170,6 @@
false,
false,
false,
- false,
- false,
true,
false,
true,
@@ -242,8 +184,6 @@
false,
false,
false,
- false,
- false,
true,
false,
true
@@ -258,8 +198,6 @@
false,
false,
false,
- false,
- false,
true,
false
]
diff --git a/ros2/src/robobin/robobin/helpers/graph_maker.py b/ros2/src/robobin/robobin/helpers/graph_maker.py
index 8225f0da..ad86ef8d 100644
--- a/ros2/src/robobin/robobin/helpers/graph_maker.py
+++ b/ros2/src/robobin/robobin/helpers/graph_maker.py
@@ -74,8 +74,8 @@ class GraphMaker:
print(f"Node {new_node_index+1} added at ({tag1_x:.2f}, {tag1_y:.2f}).")
def save_graph(self):
- # directory = "/Users/paulwinpenny/Documents/GitHub/robobin/Wireless_Communication/UWB/Beacons_tag_position/output"
- directory = "C:/Users/joell/OneDrive/Documents/GitHub"
+ directory = "/Users/paulwinpenny/Documents/GitHub/robobin/Wireless_Communication/UWB/Beacons_tag_position/output"
+ # directory = "C:/Users/joell/OneDrive/Documents/GitHub"
os.makedirs(directory, exist_ok=True) # Create the directory if it doesn't exist
file_path = os.path.join(directory, "graph.json")
with open(file_path, "w") as f:
--
GitLab