From 379d906cdd51a2dbab647966f4b5d41560d30ba7 Mon Sep 17 00:00:00 2001 From: Valentin Platzgummer Date: Fri, 16 Oct 2020 17:50:24 +0200 Subject: [PATCH] minor changes --- Paths/KlingenbachTest.wima | 967 +---------------------- src/Wima/Geometry/WimaMeasurementArea.cc | 2 +- 2 files changed, 5 insertions(+), 964 deletions(-) diff --git a/Paths/KlingenbachTest.wima b/Paths/KlingenbachTest.wima index 7be92fc60..0f3778fe7 100644 --- a/Paths/KlingenbachTest.wima +++ b/Paths/KlingenbachTest.wima @@ -30,13 +30,11 @@ { "AreaType": "Measurement Area", "BorderPolygonOffset": 6, - "MinTileArea": 10, - "MinTransectLength": 1, + "MinTileAreaPercent": 30, "ShowBorderPolygon": 0, "ShowTiles": true, "TileHeight": 5, "TileWidth": 5, - "TransectDistance": 3, "maxAltitude": 30, "polygon": [ [ @@ -81,968 +79,11 @@ "firmwareType": 3, "hoverSpeed": 1, "items": [ - { - "autoContinue": true, - "command": 22, - "doJumpId": 1, - "frame": 3, - "params": [ - 15, - 0, - 0, - null, - 47.76779586216649, - 16.530510396830728, - 5 - ], - "type": "SimpleItem" - }, - { - "Alpha": 23, - "MinLength": 5, - "NumRuns": 1, - "ReferencePointAlt": 0, - "ReferencePointLat": 47.76807182520187, - "ReferencePointLong": 16.530610531894183, - "Run": 1, - "TransectDistance": 2, - "TransectStyleComplexItem": { - "CameraCalc": { - "AdjustedFootprintFrontal": 25, - "AdjustedFootprintSide": 25, - "CameraName": "Manual (no camera specs)", - "DistanceToSurface": 15, - "DistanceToSurfaceRelative": true, - "version": 1 - }, - "CameraShots": 0, - "CameraTriggerInTurnAround": true, - "FollowTerrain": false, - "HoverAndCapture": false, - "Items": [ - { - "autoContinue": true, - "command": 16, - "doJumpId": 2, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76782117293054, - 16.53045952207802, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 3, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76801762181985, - 16.531145995440625, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 4, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76812651838593, - 16.53090512987649, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 5, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.768125250928335, - 16.530839239105784, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 6, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.768187963203616, - 16.531058383792516, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 7, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.768204997344334, - 16.531049622605572, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 8, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76812144975848, - 16.530757670470322, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 9, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76811764852164, - 16.530676101820056, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 10, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.768222031484335, - 16.53104086139957, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 11, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.768239065614615, - 16.53103210018785, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 12, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.768113847226864, - 16.530594533208365, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 13, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76811004588309, - 16.530512964621895, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 14, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76825609974418, - 16.531023338983744, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 15, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76827313388202, - 16.53101457776058, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 16, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76810624447235, - 16.53043139603398, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 17, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76815568510607, - 16.530399305509537, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 18, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76832423627323, - 16.530988294070095, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 19, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76834127040819, - 16.53097953282404, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 20, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76822245220941, - 16.530564330637993, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 21, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76831125125834, - 16.530806346203697, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 22, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.768358304533436, - 16.530970771572267, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 23, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.768307202146545, - 16.53099705529708, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 24, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76809864148597, - 16.530268258893802, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 25, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.768102443012644, - 16.530349827431266, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 26, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76829016801015, - 16.531005816531692, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 27, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.768170929071175, - 16.531067144987073, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 28, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76812500283788, - 16.530906658047133, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 29, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76809124406109, - 16.53085697602152, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 30, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76815389493801, - 16.53107590617591, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 31, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.768136860795146, - 16.531084667345684, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 32, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76805748523563, - 16.53080729404687, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 33, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76802372639744, - 16.53075761214986, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 34, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76811982666054, - 16.531093428523086, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 35, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76810279252523, - 16.53110218969476, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 36, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76798996754654, - 16.530707930317146, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 37, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76795620865596, - 16.530658248522045, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 38, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.768085758380195, - 16.53111095084737, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 39, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76806872423443, - 16.5311197120076, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 40, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76792244976166, - 16.53060856681793, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 41, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76788869084566, - 16.53055888517811, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 42, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.768051690105956, - 16.531128473148772, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 43, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76803465596775, - 16.53113723429756, - 15 - ], - "type": "SimpleItem" - }, - { - "autoContinue": true, - "command": 16, - "doJumpId": 44, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.767854931889964, - 16.530509203589244, - 15 - ], - "type": "SimpleItem" - } - ], - "Refly90Degrees": false, - "TurnAroundDistance": 10, - "VisualTransectPoints": [ - [ - 47.76782117293054, - 16.53045952207802 - ], - [ - 47.76801762181985, - 16.531145995440625 - ], - [ - 47.76812651838593, - 16.53090512987649 - ], - [ - 47.768125250928335, - 16.530839239105784 - ], - [ - 47.768187963203616, - 16.531058383792516 - ], - [ - 47.768204997344334, - 16.531049622605572 - ], - [ - 47.76812144975848, - 16.530757670470322 - ], - [ - 47.76811764852164, - 16.530676101820056 - ], - [ - 47.768222031484335, - 16.53104086139957 - ], - [ - 47.768239065614615, - 16.53103210018785 - ], - [ - 47.768113847226864, - 16.530594533208365 - ], - [ - 47.76811004588309, - 16.530512964621895 - ], - [ - 47.76825609974418, - 16.531023338983744 - ], - [ - 47.76827313388202, - 16.53101457776058 - ], - [ - 47.76810624447235, - 16.53043139603398 - ], - [ - 47.76815568510607, - 16.530399305509537 - ], - [ - 47.76832423627323, - 16.530988294070095 - ], - [ - 47.76834127040819, - 16.53097953282404 - ], - [ - 47.76822245220941, - 16.530564330637993 - ], - [ - 47.76831125125834, - 16.530806346203697 - ], - [ - 47.768358304533436, - 16.530970771572267 - ], - [ - 47.768307202146545, - 16.53099705529708 - ], - [ - 47.76809864148597, - 16.530268258893802 - ], - [ - 47.768102443012644, - 16.530349827431266 - ], - [ - 47.76829016801015, - 16.531005816531692 - ], - [ - 47.768170929071175, - 16.531067144987073 - ], - [ - 47.76812500283788, - 16.530906658047133 - ], - [ - 47.76809124406109, - 16.53085697602152 - ], - [ - 47.76815389493801, - 16.53107590617591 - ], - [ - 47.768136860795146, - 16.531084667345684 - ], - [ - 47.76805748523563, - 16.53080729404687 - ], - [ - 47.76802372639744, - 16.53075761214986 - ], - [ - 47.76811982666054, - 16.531093428523086 - ], - [ - 47.76810279252523, - 16.53110218969476 - ], - [ - 47.76798996754654, - 16.530707930317146 - ], - [ - 47.76795620865596, - 16.530658248522045 - ], - [ - 47.768085758380195, - 16.53111095084737 - ], - [ - 47.76806872423443, - 16.5311197120076 - ], - [ - 47.76792244976166, - 16.53060856681793 - ], - [ - 47.76788869084566, - 16.53055888517811 - ], - [ - 47.768051690105956, - 16.531128473148772 - ], - [ - 47.76803465596775, - 16.53113723429756 - ], - [ - 47.767854931889964, - 16.530509203589244 - ] - ], - "version": 1 - }, - "Type": 1, - "Variant": 0, - "complexItemType": "CircularSurvey", - "polygon": [ - [ - 47.76809580679245, - 16.530246122817612 - ], - [ - 47.76823933601322, - 16.53060087654427 - ], - [ - 47.7683711160486, - 16.530967006195464 - ], - [ - 47.7680076482754, - 16.531153949077463 - ], - [ - 47.7677855557718, - 16.530403347547246 - ], - [ - 47.768126518382985, - 16.5309051298743 - ] - ], - "type": "ComplexItem", - "version": 1 - }, - { - "AMSLAltAboveTerrain": 0, - "Altitude": 0, - "AltitudeMode": 1, - "autoContinue": true, - "command": 21, - "doJumpId": 48, - "frame": 3, - "params": [ - 0, - 0, - 0, - null, - 47.76779586216649, - 16.530510396830728, - 0 - ], - "type": "SimpleItem" - } ], "plannedHomePosition": [ - 47.76779586216649, - 16.530510396830728, - 178 + null, + null, + null ], "vehicleType": 2, "version": 2 diff --git a/src/Wima/Geometry/WimaMeasurementArea.cc b/src/Wima/Geometry/WimaMeasurementArea.cc index 3e367ba7a..49598e9ac 100644 --- a/src/Wima/Geometry/WimaMeasurementArea.cc +++ b/src/Wima/Geometry/WimaMeasurementArea.cc @@ -233,7 +233,7 @@ void WimaMeasurementArea::doUpdate() { auto start = std::chrono::high_resolution_clock::now(); // Check state. - if (this->_state != STATE::UPDATEING && !this->_state == STATE::STOP) { + if (this->_state != STATE::UPDATEING && this->_state != STATE::STOP) { const auto height = this->_tileHeight.rawValue().toDouble() * si::meter; const auto width = this->_tileWidth.rawValue().toDouble() * si::meter; const auto tileArea = width * height; -- 2.22.0