FHWS/FtmPrologic
Archived
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed EG from path 1 map and added preliminary parameter values

Browse Source
This commit is contained in:
Markus Bullmann
2019-06-19 16:27:32 +02:00
parent 6c72c8dc07
commit 4142ffb950
3 changed files with 9 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/Plotty.h
View File

@@ -581,7 +581,7 @@ public:
splot.getAxisX().setRange(K::GnuplotAxis::Range(bbox.getMin().x, bbox.getMax().x));
splot.getAxisY().setRange(K::GnuplotAxis::Range(bbox.getMin().y, bbox.getMax().y));
splot.getAxisZ().setRange(K::GnuplotAxis::Range(0, 11));
splot.getAxisZ().setRange(K::GnuplotAxis::Range(0 /*bbox.getMin().z*/, bbox.getMax().z));
// process each selected floor
for (Floorplan::Floor* floor : floors) {
@@ -622,13 +622,13 @@ public:
splot.getObjects().add(gpol);
}
break;
}
// plot obstacles?
if (settings.obstacles) {
for (Floorplan::FloorObstacle* obs : floor->obstacles) {
Floorplan::FloorObstacleLine* line = dynamic_cast<Floorplan::FloorObstacleLine*>(obs);
//Floorplan::FloorObstacleLine* line = dynamic_cast<Floorplan::FloorObstacleLine*>(obs);
Floorplan::FloorObstacleWall* line = dynamic_cast<Floorplan::FloorObstacleWall*>(obs);
if (line) {
if (floor->atHeight < settings.minZ) {continue;}

9
code/Settings.h
View File

@@ -125,6 +125,7 @@ namespace Settings {
dataDir + "Pixel2/Path0_0605.csv",
},
{
// NUC, ID Pos X Y Z offset loss kalman stddev
{ NUC1, {1, { 7.5, 18.7, 0.8}, 1.25, 3.375, 6.156} }, // NUC 1
{ NUC2, {2, { 8.6, 26.8, 0.8}, 2.00, 3.000, 5.650} }, // NUC 2
{ NUC3, {3, {21.6, 19.1, 0.8}, 1.75, 3.375, 6.107} }, // NUC 3
@@ -138,10 +139,10 @@ namespace Settings {
dataDir + "Pixel2/Path1_7208.csv",
},
{
{ NUC1, {1, { 8.1, 18.7, 0.8}, 0, 0, 0} }, // NUC 1
{ NUC2, {2, { 8.4, 27.3, 0.8}, 0, 0, 0} }, // NUC 2
{ NUC3, {3, {21.3, 19.3, 0.8}, 0, 0, 0} }, // NUC 3
{ NUC4, {4, {20.6, 26.8, 0.8}, 0, 0, 0} }, // NUC 4
{ NUC1, {1, { 8.1, 18.7, 0.8}, 2.25, 0, 6.156f} }, // NUC 1
{ NUC2, {2, { 8.4, 27.3, 0.8}, 3.25, 0, 5.650f} }, // NUC 2
{ NUC3, {3, {21.3, 19.3, 0.8}, 2.50, 0, 6.107f} }, // NUC 3
{ NUC4, {4, {20.6, 26.8, 0.8}, 3.00, 0, 3.985f} }, // NUC 4
},
{ 1, 2, 6, 7, 6, 2, 1 }
};