From 8b9b710f67e2f5a0b67154380ce978d0afe45bda Mon Sep 17 00:00:00 2001
From: SebastianEbert <sebastian.ebert@tu-dresden.de>
Date: Wed, 5 Oct 2022 12:46:27 +0200
Subject: [PATCH] fixed colors of the configuration
---
config/config_scene_ga_st-table-2.json | 8 ++++----
config/config_scene_ga_st-table-2.yaml | 8 ++++----
config/config_scene_ga_st-table-3.json | 8 ++++----
config/config_scene_ga_st-table-3.yaml | 8 ++++----
config/config_scene_ga_tum-table-1-left.json | 8 ++++----
config/config_scene_ga_tum-table-1-left.yaml | 4 ++--
config/config_scene_ga_tum-table-1-right.json | 8 ++++----
config/config_scene_ga_tum-table-1-right.yaml | 4 ++--
config/config_scene_ga_tum-table-2-left.json | 8 ++++----
config/config_scene_ga_tum-table-2-left.yaml | 4 ++--
config/config_scene_ga_tum-table-2-right.json | 8 ++++----
config/config_scene_ga_tum-table-2-right.yaml | 4 ++--
12 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/config/config_scene_ga_st-table-2.json b/config/config_scene_ga_st-table-2.json
index 1787f64..503c3df 100644
--- a/config/config_scene_ga_st-table-2.json
+++ b/config/config_scene_ga_st-table-2.json
@@ -320,7 +320,7 @@
"w": 1
},
"color": {
- "g": 1
+ "b": 1
}
},
{
@@ -340,7 +340,7 @@
"w": 1
},
"color": {
- "g": 1
+ "b": 1
}
},
{
@@ -360,7 +360,7 @@
"w": 1
},
"color": {
- "b": 1
+ "g": 1
}
},
{
@@ -380,7 +380,7 @@
"w": 1
},
"color": {
- "b": 1
+ "g": 1
}
},
{
diff --git a/config/config_scene_ga_st-table-2.yaml b/config/config_scene_ga_st-table-2.yaml
index f567a71..28ffbaa 100644
--- a/config/config_scene_ga_st-table-2.yaml
+++ b/config/config_scene_ga_st-table-2.yaml
@@ -33,11 +33,11 @@
{ 'id': 'binRed', 'type': 'BIN','pos': { 'x': -0.055,'y': 0.5475,'z': 0.9675 },'size': { 'length': 0.19,'width': 0.285,'height': 0.155 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
{ 'id': 'binGreen','type': 'BIN','pos': { 'x': 0.145,'y': 0.5475,'z': 0.9675 },'size': { 'length': 0.19,'width': 0.285,'height': 0.155 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
- { 'id': 'blue1','type': 'BOX','pos': { 'x': 0.20,'y': 0.05,'z': 0.940300 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
- { 'id': 'blue2','type': 'BOX','pos': { 'x': 0.30,'y': 0.30,'z': 0.935500 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
+ { 'id': 'blue1','type': 'BOX','pos': { 'x': 0.20,'y': 0.05,'z': 0.940300 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'b': 1 } },
+ { 'id': 'blue2','type': 'BOX','pos': { 'x': 0.30,'y': 0.30,'z': 0.935500 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'b': 1 } },
- { 'id': 'green1','type': 'BOX','pos': { 'x': 0.10,'y': -0.25,'z': 0.935500 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'b': 1 } },
- { 'id': 'green2','type': 'BOX','pos': { 'x': 0.10,'y': 0.20,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'b': 1 } },
+ { 'id': 'green1','type': 'BOX','pos': { 'x': 0.10,'y': -0.25,'z': 0.935500 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
+ { 'id': 'green2','type': 'BOX','pos': { 'x': 0.10,'y': 0.20,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
{ 'id': 'red1','type': 'BOX','pos': { 'x': 0.30,'y': -0.20,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
{ 'id': 'red2','type': 'BOX','pos': { 'x': 0.15,'y': -0.15,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
diff --git a/config/config_scene_ga_st-table-3.json b/config/config_scene_ga_st-table-3.json
index cf2a4ba..4c506d5 100644
--- a/config/config_scene_ga_st-table-3.json
+++ b/config/config_scene_ga_st-table-3.json
@@ -320,7 +320,7 @@
"w": 1
},
"color": {
- "g": 1
+ "r": 1
}
},
{
@@ -340,7 +340,7 @@
"w": 1
},
"color": {
- "g": 1
+ "r": 1
}
},
{
@@ -400,7 +400,7 @@
"w": 1
},
"color": {
- "r": 1
+ "g": 1
}
},
{
@@ -420,7 +420,7 @@
"w": 1
},
"color": {
- "r": 1
+ "g": 1
}
},
{
diff --git a/config/config_scene_ga_st-table-3.yaml b/config/config_scene_ga_st-table-3.yaml
index 31f7bd6..d9474c8 100644
--- a/config/config_scene_ga_st-table-3.yaml
+++ b/config/config_scene_ga_st-table-3.yaml
@@ -33,14 +33,14 @@
{ 'id': 'binRed', 'type': 'BIN','pos': { 'x': -0.055,'y': 0.5475,'z': 0.9675 },'size': { 'length': 0.19,'width': 0.285,'height': 0.155 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
{ 'id': 'binGreen','type': 'BIN','pos': { 'x': 0.145,'y': 0.5475,'z': 0.9675 },'size': { 'length': 0.19,'width': 0.285,'height': 0.155 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
- { 'id': 'red1','type': 'BOX','pos': { 'x': 0.20,'y': 0.05,'z': 0.940300 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
- { 'id': 'red2','type': 'BOX','pos': { 'x': 0.30,'y': 0.30,'z': 0.935500 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
+ { 'id': 'red1','type': 'BOX','pos': { 'x': 0.20,'y': 0.05,'z': 0.940300 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
+ { 'id': 'red2','type': 'BOX','pos': { 'x': 0.30,'y': 0.30,'z': 0.935500 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
{ 'id': 'blue1','type': 'BOX','pos': { 'x': 0.10,'y': -0.25,'z': 0.935500 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'b': 1 } },
{ 'id': 'blue2','type': 'BOX','pos': { 'x': 0.10,'y': 0.20,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'b': 1 } },
- { 'id': 'green1','type': 'BOX','pos': { 'x': 0.30,'y': -0.20,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
- { 'id': 'green2','type': 'BOX','pos': { 'x': 0.15,'y': -0.15,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
+ { 'id': 'green1','type': 'BOX','pos': { 'x': 0.30,'y': -0.20,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
+ { 'id': 'green2','type': 'BOX','pos': { 'x': 0.15,'y': -0.15,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
# heights of objects (including pins):
# formula: half-height * 9.6 + 4.6
diff --git a/config/config_scene_ga_tum-table-1-left.json b/config/config_scene_ga_tum-table-1-left.json
index 313e425..34b67ae 100644
--- a/config/config_scene_ga_tum-table-1-left.json
+++ b/config/config_scene_ga_tum-table-1-left.json
@@ -307,8 +307,8 @@
"id": "blue2",
"type": "BOX",
"pos": {
- "x": 0.1,
- "y": 0.2,
+ "x": 0.3,
+ "y": 0,
"z": 0.9307
},
"size": {
@@ -368,8 +368,8 @@
"type": "ARM",
"pos": {
"z": 0.89,
- "x": -0.2,
- "y": 0.24
+ "x": -0.298,
+ "y": 0.2655
},
"size": {},
"orientation": {
diff --git a/config/config_scene_ga_tum-table-1-left.yaml b/config/config_scene_ga_tum-table-1-left.yaml
index 451213f..70cdd70 100644
--- a/config/config_scene_ga_tum-table-1-left.yaml
+++ b/config/config_scene_ga_tum-table-1-left.yaml
@@ -34,7 +34,7 @@
{ 'id': 'green2','type': 'BOX','pos': { 'x': 0.30,'y': 0.30,'z': 0.935500 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
{ 'id': 'blue1','type': 'BOX','pos': { 'x': 0.30,'y': 0.15,'z': 0.935500 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'b': 1 } },
- { 'id': 'blue2','type': 'BOX','pos': { 'x': 0.10,'y': 0.20,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'b': 1 } },
+ { 'id': 'blue2','type': 'BOX','pos': { 'x': 0.30,'y': 0.00,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'b': 1 } },
{ 'id': 'red1','type': 'BOX','pos': { 'x': 0.30,'y': -0.15,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
{ 'id': 'red2','type': 'BOX','pos': { 'x': 0.15,'y': 0.45,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
@@ -44,5 +44,5 @@
# formula (python)
# for i in range(3,10): print("{ 'id': 'object4x2x%.1f','type': 'BOX','pos': { 'x': 0.3,'y': %f,'z': %f },'size': { 'length': .0318, 'width': .0636,'height': %f },'orientation': { 'w': 1 },'color': {} }," % (i/2, (i-6)*.1, (i*48+23+8900)/10000, (i*96+46)/10000));
- { 'id': 'arm','type': 'ARM','pos': { 'z': 0.89 , 'x': -0.20 , 'y' : 0.24 },'size': { },'orientation': { 'w': 1 },'color': { 'r': 1.00,'g': 1.00,'b': 1.00 } }
+ { 'id': 'arm','type': 'ARM','pos': { 'z': 0.89 , 'x': -0.298 , 'y' : 0.2655 },'size': { },'orientation': { 'w': 1 },'color': { 'r': 1.00,'g': 1.00,'b': 1.00 } }
] }
diff --git a/config/config_scene_ga_tum-table-1-right.json b/config/config_scene_ga_tum-table-1-right.json
index 4ef73db..fbe17a4 100644
--- a/config/config_scene_ga_tum-table-1-right.json
+++ b/config/config_scene_ga_tum-table-1-right.json
@@ -307,8 +307,8 @@
"id": "red2",
"type": "BOX",
"pos": {
- "x": 0.1,
- "y": -0.2,
+ "x": 0.3,
+ "y": 0,
"z": 0.9307
},
"size": {
@@ -368,8 +368,8 @@
"type": "ARM",
"pos": {
"z": 0.89,
- "x": -0.2,
- "y": -0.24
+ "x": -0.298,
+ "y": -0.2655
},
"size": {},
"orientation": {
diff --git a/config/config_scene_ga_tum-table-1-right.yaml b/config/config_scene_ga_tum-table-1-right.yaml
index d6bd748..f043258 100644
--- a/config/config_scene_ga_tum-table-1-right.yaml
+++ b/config/config_scene_ga_tum-table-1-right.yaml
@@ -34,7 +34,7 @@
{ 'id': 'blue2','type': 'BOX','pos': { 'x': 0.30,'y': -0.30,'z': 0.935500 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'b': 1 } },
{ 'id': 'green1','type': 'BOX','pos': { 'x': 0.30,'y': -0.15,'z': 0.935500 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
- { 'id': 'red2','type': 'BOX','pos': { 'x': 0.10,'y': -0.20,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
+ { 'id': 'red2','type': 'BOX','pos': { 'x': 0.30,'y': 0.00,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
{ 'id': 'red1','type': 'BOX','pos': { 'x': 0.30,'y': 0.15,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
{ 'id': 'green2','type': 'BOX','pos': { 'x': 0.15,'y': -0.45,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
@@ -44,5 +44,5 @@
# formula (python)
# for i in range(3,10): print("{ 'id': 'object4x2x%.1f','type': 'BOX','pos': { 'x': 0.3,'y': %f,'z': %f },'size': { 'length': .0318, 'width': .0636,'height': %f },'orientation': { 'w': 1 },'color': {} }," % (i/2, (i-6)*.1, (i*48+23+8900)/10000, (i*96+46)/10000));
- { 'id': 'arm','type': 'ARM','pos': { 'z': 0.89 , 'x': -0.20 , 'y' : -0.24 },'size': { },'orientation': { 'w': 1 },'color': { 'r': 1.00,'g': 1.00,'b': 1.00 } }
+ { 'id': 'arm','type': 'ARM','pos': { 'z': 0.89 , 'x': -0.298 , 'y' : -0.2655 },'size': { },'orientation': { 'w': 1 },'color': { 'r': 1.00,'g': 1.00,'b': 1.00 } }
] }
diff --git a/config/config_scene_ga_tum-table-2-left.json b/config/config_scene_ga_tum-table-2-left.json
index 08294d9..cb190d9 100644
--- a/config/config_scene_ga_tum-table-2-left.json
+++ b/config/config_scene_ga_tum-table-2-left.json
@@ -307,8 +307,8 @@
"id": "red2",
"type": "BOX",
"pos": {
- "x": 0.1,
- "y": 0.2,
+ "x": 0.3,
+ "y": 0,
"z": 0.9307
},
"size": {
@@ -368,8 +368,8 @@
"type": "ARM",
"pos": {
"z": 0.89,
- "x": -0.2,
- "y": 0.24
+ "x": -0.298,
+ "y": 0.2655
},
"size": {},
"orientation": {
diff --git a/config/config_scene_ga_tum-table-2-left.yaml b/config/config_scene_ga_tum-table-2-left.yaml
index 9c76a53..7ae2a15 100644
--- a/config/config_scene_ga_tum-table-2-left.yaml
+++ b/config/config_scene_ga_tum-table-2-left.yaml
@@ -34,7 +34,7 @@
{ 'id': 'blue2','type': 'BOX','pos': { 'x': 0.30,'y': 0.30,'z': 0.935500 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'b': 1 } },
{ 'id': 'red1','type': 'BOX','pos': { 'x': 0.30,'y': 0.15,'z': 0.935500 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
- { 'id': 'red2','type': 'BOX','pos': { 'x': 0.10,'y': 0.20,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
+ { 'id': 'red2','type': 'BOX','pos': { 'x': 0.30,'y': 0.00,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
{ 'id': 'green1','type': 'BOX','pos': { 'x': 0.30,'y': -0.15,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
{ 'id': 'green2','type': 'BOX','pos': { 'x': 0.15,'y': 0.45,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
@@ -44,5 +44,5 @@
# formula (python)
# for i in range(3,10): print("{ 'id': 'object4x2x%.1f','type': 'BOX','pos': { 'x': 0.3,'y': %f,'z': %f },'size': { 'length': .0318, 'width': .0636,'height': %f },'orientation': { 'w': 1 },'color': {} }," % (i/2, (i-6)*.1, (i*48+23+8900)/10000, (i*96+46)/10000));
- { 'id': 'arm','type': 'ARM','pos': { 'z': 0.89 , 'x': -0.20 , 'y' : 0.24 },'size': { },'orientation': { 'w': 1 },'color': { 'r': 1.00,'g': 1.00,'b': 1.00 } }
+ { 'id': 'arm','type': 'ARM','pos': { 'z': 0.89 , 'x': -0.298 , 'y' : 0.2655 },'size': { },'orientation': { 'w': 1 },'color': { 'r': 1.00,'g': 1.00,'b': 1.00 } }
] }
diff --git a/config/config_scene_ga_tum-table-2-right.json b/config/config_scene_ga_tum-table-2-right.json
index c8c3d0c..935f840 100644
--- a/config/config_scene_ga_tum-table-2-right.json
+++ b/config/config_scene_ga_tum-table-2-right.json
@@ -307,8 +307,8 @@
"id": "red2",
"type": "BOX",
"pos": {
- "x": 0.1,
- "y": -0.2,
+ "x": 0.3,
+ "y": 0,
"z": 0.9307
},
"size": {
@@ -368,8 +368,8 @@
"type": "ARM",
"pos": {
"z": 0.89,
- "x": -0.2,
- "y": -0.24
+ "x": -0.298,
+ "y": -0.2655
},
"size": {},
"orientation": {
diff --git a/config/config_scene_ga_tum-table-2-right.yaml b/config/config_scene_ga_tum-table-2-right.yaml
index 5739772..b12abdb 100644
--- a/config/config_scene_ga_tum-table-2-right.yaml
+++ b/config/config_scene_ga_tum-table-2-right.yaml
@@ -34,7 +34,7 @@
{ 'id': 'green1','type': 'BOX','pos': { 'x': 0.30,'y': -0.30,'z': 0.935500 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
{ 'id': 'blue2','type': 'BOX','pos': { 'x': 0.30,'y': -0.15,'z': 0.935500 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'b': 1 } },
- { 'id': 'red2','type': 'BOX','pos': { 'x': 0.10,'y': -0.20,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
+ { 'id': 'red2','type': 'BOX','pos': { 'x': 0.30,'y': 0.00,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
{ 'id': 'green2','type': 'BOX','pos': { 'x': 0.30,'y': 0.15,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'g': 1 } },
{ 'id': 'red2','type': 'BOX','pos': { 'x': 0.15,'y': -0.45,'z': 0.930700 },'size': { 'length': 0.05,'width': 0.044,'height': 0.055 },'orientation': { 'w': 1 },'color': { 'r': 1 } },
@@ -44,5 +44,5 @@
# formula (python)
# for i in range(3,10): print("{ 'id': 'object4x2x%.1f','type': 'BOX','pos': { 'x': 0.3,'y': %f,'z': %f },'size': { 'length': .0318, 'width': .0636,'height': %f },'orientation': { 'w': 1 },'color': {} }," % (i/2, (i-6)*.1, (i*48+23+8900)/10000, (i*96+46)/10000));
- { 'id': 'arm','type': 'ARM','pos': { 'z': 0.89 , 'x': -0.20 , 'y' : -0.24 },'size': { },'orientation': { 'w': 1 },'color': { 'r': 1.00,'g': 1.00,'b': 1.00 } }
+ { 'id': 'arm','type': 'ARM','pos': { 'z': 0.89 , 'x': -0.298 , 'y' : -0.2655 },'size': { },'orientation': { 'w': 1 },'color': { 'r': 1.00,'g': 1.00,'b': 1.00 } }
] }
--
GitLab