From e46dc6dbb9f752ee65ea3d26dab2af880438f729 Mon Sep 17 00:00:00 2001 From: Peter Vaiko Date: Thu, 17 Oct 2024 13:34:22 -0400 Subject: [PATCH 01/11] feat: use radius to detect corners instead of xte --- scripts/geometry/Polyline.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/geometry/Polyline.lua b/scripts/geometry/Polyline.lua index 0aacf4595..2c24629d5 100644 --- a/scripts/geometry/Polyline.lua +++ b/scripts/geometry/Polyline.lua @@ -487,8 +487,9 @@ function Polyline:ensureMinimumRadius(r, makeCorners) currentIx = nextIx nextIx = currentIx + 1 local xte = self:at(currentIx):getXte(r) - if xte > CourseGenerator.cMaxCrossTrackError then - self.logger:debug('ensureMinimumRadius (%s): found a corner at %d, r: %.1f, xte: %.1f', debugId, currentIx, r, xte) + local radius = self:at(currentIx):getRadius() + if radius < r then + self.logger:debug('ensureMinimumRadius (%s): found a corner at %d with r: %.1f, r: %.1f, xte: %.1f', debugId, currentIx, radius, r, xte) -- looks like we can't make this turn without deviating too much from the course, local entry = CourseGenerator.Slider(self, currentIx, 0) local exit = CourseGenerator.Slider(self, currentIx, 0) From b953ee178743219a820c5b07c2dedaf64cc45e93 Mon Sep 17 00:00:00 2001 From: Peter Vaiko Date: Thu, 17 Oct 2024 13:41:01 -0400 Subject: [PATCH 02/11] feat: use radius _and_ xte to detect corners --- scripts/geometry/Polyline.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/geometry/Polyline.lua b/scripts/geometry/Polyline.lua index 2c24629d5..69753194c 100644 --- a/scripts/geometry/Polyline.lua +++ b/scripts/geometry/Polyline.lua @@ -488,7 +488,7 @@ function Polyline:ensureMinimumRadius(r, makeCorners) nextIx = currentIx + 1 local xte = self:at(currentIx):getXte(r) local radius = self:at(currentIx):getRadius() - if radius < r then + if radius < r or xte > CourseGenerator.cMaxCrossTrackError then self.logger:debug('ensureMinimumRadius (%s): found a corner at %d with r: %.1f, r: %.1f, xte: %.1f', debugId, currentIx, radius, r, xte) -- looks like we can't make this turn without deviating too much from the course, local entry = CourseGenerator.Slider(self, currentIx, 0) From ca51e25244f385cee5e221d3716eca05c758baf7 Mon Sep 17 00:00:00 2001 From: Peter Vaiko Date: Fri, 25 Oct 2024 05:29:26 -0400 Subject: [PATCH 03/11] fix: radius calculation Also, back to using xte when sharpening corners, that is a much better indicator of the radius at a vertex. --- scripts/courseGenerator/test/VertexTest.lua | 20 ++++++++++++++++---- scripts/geometry/Polyline.lua | 2 +- scripts/geometry/Vertex.lua | 13 +++---------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/scripts/courseGenerator/test/VertexTest.lua b/scripts/courseGenerator/test/VertexTest.lua index 3fbc9807f..b9d5e7bfd 100644 --- a/scripts/courseGenerator/test/VertexTest.lua +++ b/scripts/courseGenerator/test/VertexTest.lua @@ -35,20 +35,32 @@ function testVertex() v:getExitEdge():assertAlmostEquals(CourseGenerator.LineSegment(0, 0, 1, 0)) lu.assertEquals(v:getSignedRadius(), math.huge) + v = Vertex(0, 0) + v:calculateProperties(Vertex(-1, 0), Vertex(0, 1)) + lu.assertAlmostEquals(v:getEntryHeading(), 0) + lu.assertAlmostEquals(v:getExitHeading(), math.pi / 2) + + v:getEntryEdge():assertAlmostEquals(CourseGenerator.LineSegment(-1, 0, 0, 0)) + v:getExitEdge():assertAlmostEquals(CourseGenerator.LineSegment(0, 0, 0, 1)) + lu.assertAlmostEquals(v:getSignedRadius(), 1) + v:calculateProperties(Vertex(-1, 0), Vertex(0, -1)) + lu.assertAlmostEquals(v:getSignedRadius(), -1) + v = Vertex(0, 0) v:calculateProperties(Vertex(-1, 0), Vertex(1, 1)) lu.assertAlmostEquals(v:getEntryHeading(), 0) lu.assertAlmostEquals(v:getExitHeading(), math.pi / 4) + v:getEntryEdge():assertAlmostEquals(CourseGenerator.LineSegment(-1, 0, 0, 0)) v:getExitEdge():assertAlmostEquals(CourseGenerator.LineSegment(0, 0, 1, 1)) - lu.assertAlmostEquals(v:getSignedRadius(), 1.84) + lu.assertAlmostEquals(v:getSignedRadius(), 3.41) v:calculateProperties(Vertex(-1, 0), Vertex(1, -1)) - lu.assertAlmostEquals(v:getSignedRadius(), -1.84) + lu.assertAlmostEquals(v:getSignedRadius(), -3.41) v = Vertex(0, 0) v:calculateProperties(Vertex(-5, 0), Vertex(5, 5)) - lu.assertAlmostEquals(v:getSignedRadius(), 9.23) + lu.assertAlmostEquals(v:getSignedRadius(), 17.07) v:calculateProperties(Vertex(-5, 0), Vertex(0, 5)) - lu.assertAlmostEquals(v:getSignedRadius(), 2.5 * math.sqrt(2)) + lu.assertAlmostEquals(v:getSignedRadius(), 5) end os.exit(lu.LuaUnit.run()) \ No newline at end of file diff --git a/scripts/geometry/Polyline.lua b/scripts/geometry/Polyline.lua index 69753194c..0292892d5 100644 --- a/scripts/geometry/Polyline.lua +++ b/scripts/geometry/Polyline.lua @@ -488,7 +488,7 @@ function Polyline:ensureMinimumRadius(r, makeCorners) nextIx = currentIx + 1 local xte = self:at(currentIx):getXte(r) local radius = self:at(currentIx):getRadius() - if radius < r or xte > CourseGenerator.cMaxCrossTrackError then + if xte > CourseGenerator.cMaxCrossTrackError then self.logger:debug('ensureMinimumRadius (%s): found a corner at %d with r: %.1f, r: %.1f, xte: %.1f', debugId, currentIx, radius, r, xte) -- looks like we can't make this turn without deviating too much from the course, local entry = CourseGenerator.Slider(self, currentIx, 0) diff --git a/scripts/geometry/Vertex.lua b/scripts/geometry/Vertex.lua index d610120b0..7bbfd0c39 100644 --- a/scripts/geometry/Vertex.lua +++ b/scripts/geometry/Vertex.lua @@ -51,13 +51,6 @@ function Vertex:getExitHeading() return self.exitHeading end ---- The radius at this vertex, calculated from the direction of the entry/exit edges as unit vectors. ---- Positive values are left turns, negative values right turns ----@return number radius -function Vertex:getUnitRadius() - return self.unitRadius -end - --- The radius at this vertex, calculated from the direction of the entry/exit edges and the length of --- the exit edge. This is the radius a vehicle would need to drive to reach the next waypoint. --- Positive values are left turns, negative values right turns @@ -122,9 +115,9 @@ function Vertex:calculateProperties(entry, exit) end if self.entryHeading and self.exitHeading then self.dA = CpMathUtil.getDeltaAngle(self.entryHeading, self.exitHeading) - -- This is the radius of the unit circle written between - -- entryEdge and exitEdge, which are tangents of the circle - self.unitRadius = 1 / (2 * math.sin(self.dA / 2)) + -- This is the radius of a circle written between + -- entryEdge and exitEdge, which are tangents of the circle, touching them 1 unit away from the vertex + self.unitRadius = 1 / (math.tan(self.dA / 2)) self.curvature = 1 / self.unitRadius self.xte = math.abs(1 / math.cos(self.dA / 2)) - 1 end From 769545081a444532a64c45331a888b71ed3b205f Mon Sep 17 00:00:00 2001 From: Peter Vaiko Date: Fri, 25 Oct 2024 05:41:21 -0400 Subject: [PATCH 04/11] fix: unit tests --- scripts/courseGenerator/test/PolygonTest.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/courseGenerator/test/PolygonTest.lua b/scripts/courseGenerator/test/PolygonTest.lua index ceb97d93f..1addadc41 100644 --- a/scripts/courseGenerator/test/PolygonTest.lua +++ b/scripts/courseGenerator/test/PolygonTest.lua @@ -418,7 +418,7 @@ function testPolygon() p = Polygon({ Vector(-20, 0), Vector(-15, -3), Vector(-10, -4), Vector(-5, -4), Vector(0, 0), Vector(5, 0), Vector(10, 0), Vector(15, 0) }) - lu.assertAlmostEquals(p:getSmallestRadiusWithinDistance(4, 15, 20), 3.02) + lu.assertAlmostEquals(p:getSmallestRadiusWithinDistance(4, 15, 20), 1.61) p = Polygon({ Vector(0, 0), Vector(0, 5), Vector(5, 5), Vector(5, 0) }) lu.assertEquals(p:moveForward(1, 6), 3) From 999aff4442182c6d975fc3b29098231366923d50 Mon Sep 17 00:00:00 2001 From: Tensuko Date: Sat, 26 Oct 2024 11:37:20 +0200 Subject: [PATCH 05/11] Setting for corner radius --- config/CourseGeneratorSettingsSetup.xml | 1 + config/MasterTranslations.xml | 16 ++++++++++++---- .../courseGenerator/CourseGeneratorInterface.lua | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/config/CourseGeneratorSettingsSetup.xml b/config/CourseGeneratorSettingsSetup.xml index fc72644fa..b1972fa84 100644 --- a/config/CourseGeneratorSettingsSetup.xml +++ b/config/CourseGeneratorSettingsSetup.xml @@ -35,6 +35,7 @@ + diff --git a/config/MasterTranslations.xml b/config/MasterTranslations.xml index 4c2d85e56..358e3b6f1 100644 --- a/config/MasterTranslations.xml +++ b/config/MasterTranslations.xml @@ -917,6 +917,14 @@ + + + + + + + + @@ -1046,12 +1054,12 @@ - - + + - - + + diff --git a/scripts/courseGenerator/CourseGeneratorInterface.lua b/scripts/courseGenerator/CourseGeneratorInterface.lua index e702a14ba..d6845c125 100644 --- a/scripts/courseGenerator/CourseGeneratorInterface.lua +++ b/scripts/courseGenerator/CourseGeneratorInterface.lua @@ -39,7 +39,7 @@ function CourseGeneratorInterface.generate(fieldPolygon, context:setBaselineEdge(startPosition.x, -startPosition.z) context:setFieldMargin(settings.fieldMargin:getValue()) context:setUseBaselineEdge(settings.useBaseLineEdge:getValue()) - context:setFieldCornerRadius(settings.turningRadius:getValue()) + context:setFieldCornerRadius(settings.fieldCornerRadius:getValue()) context:setHeadlandFirst(settings.startOnHeadland:getValue()) context:setHeadlandClockwise(settings.headlandClockwise:getValue()) context:setHeadlandOverlap(settings.headlandOverlapPercent:getValue()) From 31f4afc2e62b89ed46ac0e7b5cd570267eab2477 Mon Sep 17 00:00:00 2001 From: Tensuko Date: Sat, 26 Oct 2024 09:37:38 +0000 Subject: [PATCH 06/11] Updated translations --- translations/translation_br.xml | 2 ++ translations/translation_cs.xml | 2 ++ translations/translation_ct.xml | 2 ++ translations/translation_cz.xml | 2 ++ translations/translation_da.xml | 2 ++ translations/translation_de.xml | 6 ++++-- translations/translation_ea.xml | 2 ++ translations/translation_en.xml | 6 ++++-- translations/translation_es.xml | 2 ++ translations/translation_fc.xml | 2 ++ translations/translation_fi.xml | 2 ++ translations/translation_fr.xml | 2 ++ translations/translation_hu.xml | 2 ++ translations/translation_it.xml | 2 ++ translations/translation_jp.xml | 2 ++ translations/translation_kr.xml | 2 ++ translations/translation_nl.xml | 2 ++ translations/translation_no.xml | 2 ++ translations/translation_pl.xml | 2 ++ translations/translation_pt.xml | 2 ++ translations/translation_ro.xml | 2 ++ translations/translation_ru.xml | 2 ++ translations/translation_sv.xml | 2 ++ translations/translation_tr.xml | 2 ++ 24 files changed, 52 insertions(+), 4 deletions(-) diff --git a/translations/translation_br.xml b/translations/translation_br.xml index 5a9fcfd2f..e64a80fae 100644 --- a/translations/translation_br.xml +++ b/translations/translation_br.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_cs.xml b/translations/translation_cs.xml index c22f82178..93ee3d607 100644 --- a/translations/translation_cs.xml +++ b/translations/translation_cs.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_ct.xml b/translations/translation_ct.xml index b6a060ca3..bb74a0ca0 100644 --- a/translations/translation_ct.xml +++ b/translations/translation_ct.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_cz.xml b/translations/translation_cz.xml index fb059cdbf..cbdef2135 100644 --- a/translations/translation_cz.xml +++ b/translations/translation_cz.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_da.xml b/translations/translation_da.xml index 035b4897b..b37de69d3 100644 --- a/translations/translation_da.xml +++ b/translations/translation_da.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_de.xml b/translations/translation_de.xml index e7ea5cf2f..cff47322c 100644 --- a/translations/translation_de.xml +++ b/translations/translation_de.xml @@ -282,6 +282,8 @@ + + @@ -314,8 +316,8 @@ - - + + diff --git a/translations/translation_ea.xml b/translations/translation_ea.xml index 27014830e..28f9d838b 100644 --- a/translations/translation_ea.xml +++ b/translations/translation_ea.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_en.xml b/translations/translation_en.xml index 9e9ac71bf..9304736db 100644 --- a/translations/translation_en.xml +++ b/translations/translation_en.xml @@ -282,6 +282,8 @@ + + @@ -314,8 +316,8 @@ - - + + diff --git a/translations/translation_es.xml b/translations/translation_es.xml index 74028aa66..ad99805e4 100644 --- a/translations/translation_es.xml +++ b/translations/translation_es.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_fc.xml b/translations/translation_fc.xml index 42eccd057..311b75d5f 100644 --- a/translations/translation_fc.xml +++ b/translations/translation_fc.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_fi.xml b/translations/translation_fi.xml index 1a59101fb..6a7e8bc04 100644 --- a/translations/translation_fi.xml +++ b/translations/translation_fi.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_fr.xml b/translations/translation_fr.xml index 1056efbc6..03612ffd4 100644 --- a/translations/translation_fr.xml +++ b/translations/translation_fr.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_hu.xml b/translations/translation_hu.xml index b2630d4df..7a48108f7 100644 --- a/translations/translation_hu.xml +++ b/translations/translation_hu.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_it.xml b/translations/translation_it.xml index bb919755a..363108563 100644 --- a/translations/translation_it.xml +++ b/translations/translation_it.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_jp.xml b/translations/translation_jp.xml index dc7d3eb05..d5aa7a7cd 100644 --- a/translations/translation_jp.xml +++ b/translations/translation_jp.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_kr.xml b/translations/translation_kr.xml index f0cc54f71..a267d95f4 100644 --- a/translations/translation_kr.xml +++ b/translations/translation_kr.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_nl.xml b/translations/translation_nl.xml index 16dcf94fe..304841aac 100644 --- a/translations/translation_nl.xml +++ b/translations/translation_nl.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_no.xml b/translations/translation_no.xml index 96d04d162..bb9f33e89 100644 --- a/translations/translation_no.xml +++ b/translations/translation_no.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_pl.xml b/translations/translation_pl.xml index 954b1838d..4656edc60 100644 --- a/translations/translation_pl.xml +++ b/translations/translation_pl.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_pt.xml b/translations/translation_pt.xml index d369fbe6d..827c98c69 100644 --- a/translations/translation_pt.xml +++ b/translations/translation_pt.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_ro.xml b/translations/translation_ro.xml index c35fffb60..bcf6ca54a 100644 --- a/translations/translation_ro.xml +++ b/translations/translation_ro.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_ru.xml b/translations/translation_ru.xml index 4ea80862c..afe4a7b6e 100644 --- a/translations/translation_ru.xml +++ b/translations/translation_ru.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_sv.xml b/translations/translation_sv.xml index badcecb43..8d8010cfb 100644 --- a/translations/translation_sv.xml +++ b/translations/translation_sv.xml @@ -282,6 +282,8 @@ + + diff --git a/translations/translation_tr.xml b/translations/translation_tr.xml index 42a6af7b4..ad5c855d3 100644 --- a/translations/translation_tr.xml +++ b/translations/translation_tr.xml @@ -282,6 +282,8 @@ + + From 96f575107cefbcb20f2ccee9cefa42f82daec48e Mon Sep 17 00:00:00 2001 From: Peter Vaiko Date: Sat, 26 Oct 2024 06:57:17 -0400 Subject: [PATCH 07/11] feat: add debug poly for adjusted field boundary --- scripts/courseGenerator/FieldworkCourse.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/courseGenerator/FieldworkCourse.lua b/scripts/courseGenerator/FieldworkCourse.lua index 5192b7834..e30f003e4 100644 --- a/scripts/courseGenerator/FieldworkCourse.lua +++ b/scripts/courseGenerator/FieldworkCourse.lua @@ -399,6 +399,7 @@ function FieldworkCourse:_setContext(context) self.logger:debug('sharpening field boundary corners') self.boundary:ensureMinimumRadius(self.context.fieldCornerRadius, true) end + CourseGenerator.addDebugPolyline(self.boundary, {0, 1, 1, 0.3}) end function FieldworkCourse:_removeHeadland(n) From ee308777c5e18570ccaaef1e5773e13bbf51ef3c Mon Sep 17 00:00:00 2001 From: Tensuko Date: Sat, 26 Oct 2024 12:58:26 +0200 Subject: [PATCH 08/11] Small adjustment --- config/CourseGeneratorSettingsSetup.xml | 2 +- scripts/courseGenerator/CourseGenerator.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/CourseGeneratorSettingsSetup.xml b/config/CourseGeneratorSettingsSetup.xml index b1972fa84..a78eab242 100644 --- a/config/CourseGeneratorSettingsSetup.xml +++ b/config/CourseGeneratorSettingsSetup.xml @@ -26,7 +26,7 @@ - + counterclockwise diff --git a/scripts/courseGenerator/CourseGenerator.lua b/scripts/courseGenerator/CourseGenerator.lua index 915793a13..6f8411d4a 100644 --- a/scripts/courseGenerator/CourseGenerator.lua +++ b/scripts/courseGenerator/CourseGenerator.lua @@ -21,7 +21,7 @@ CourseGenerator.cRowWaypointDistance = 7 -- Maximum cross track error we tolerate when a vehicle follows a path. This is used to -- find corners which the vehicle can't make due to its turning radius, without deviating more than -- cMaxCrossTrackError meters from the vertex in the corner. -CourseGenerator.cMaxCrossTrackError = 0.5 +CourseGenerator.cMaxCrossTrackError = 0.2 -- Maximum cross track error when generating rows parallel to a non-straight field edge. The row will end when -- the cross track error is bigger than this limit CourseGenerator.cMaxCrossTrackErrorForCurvedRows = 0.15 From 794a9e7b98ed3166b8a4d22e40431bebec8a7ec7 Mon Sep 17 00:00:00 2001 From: Tensuko Date: Sat, 26 Oct 2024 14:23:46 +0200 Subject: [PATCH 09/11] Revert "Setting for corner radius" This reverts commit 999aff4442182c6d975fc3b29098231366923d50. --- config/CourseGeneratorSettingsSetup.xml | 1 - config/MasterTranslations.xml | 16 ++++------------ .../courseGenerator/CourseGeneratorInterface.lua | 2 +- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/config/CourseGeneratorSettingsSetup.xml b/config/CourseGeneratorSettingsSetup.xml index a78eab242..613e229f3 100644 --- a/config/CourseGeneratorSettingsSetup.xml +++ b/config/CourseGeneratorSettingsSetup.xml @@ -35,7 +35,6 @@ - diff --git a/config/MasterTranslations.xml b/config/MasterTranslations.xml index 358e3b6f1..4c2d85e56 100644 --- a/config/MasterTranslations.xml +++ b/config/MasterTranslations.xml @@ -917,14 +917,6 @@ - - - - - - - - @@ -1054,12 +1046,12 @@ - - + + - - + + diff --git a/scripts/courseGenerator/CourseGeneratorInterface.lua b/scripts/courseGenerator/CourseGeneratorInterface.lua index d6845c125..e702a14ba 100644 --- a/scripts/courseGenerator/CourseGeneratorInterface.lua +++ b/scripts/courseGenerator/CourseGeneratorInterface.lua @@ -39,7 +39,7 @@ function CourseGeneratorInterface.generate(fieldPolygon, context:setBaselineEdge(startPosition.x, -startPosition.z) context:setFieldMargin(settings.fieldMargin:getValue()) context:setUseBaselineEdge(settings.useBaseLineEdge:getValue()) - context:setFieldCornerRadius(settings.fieldCornerRadius:getValue()) + context:setFieldCornerRadius(settings.turningRadius:getValue()) context:setHeadlandFirst(settings.startOnHeadland:getValue()) context:setHeadlandClockwise(settings.headlandClockwise:getValue()) context:setHeadlandOverlap(settings.headlandOverlapPercent:getValue()) From 8ab04b9088850d851e028fca336c1d5083c1187a Mon Sep 17 00:00:00 2001 From: Tensuko Date: Sat, 26 Oct 2024 12:24:07 +0000 Subject: [PATCH 10/11] Updated translations --- translations/translation_br.xml | 2 -- translations/translation_cs.xml | 2 -- translations/translation_ct.xml | 2 -- translations/translation_cz.xml | 2 -- translations/translation_da.xml | 2 -- translations/translation_de.xml | 6 ++---- translations/translation_ea.xml | 2 -- translations/translation_en.xml | 6 ++---- translations/translation_es.xml | 2 -- translations/translation_fc.xml | 2 -- translations/translation_fi.xml | 2 -- translations/translation_fr.xml | 2 -- translations/translation_hu.xml | 2 -- translations/translation_it.xml | 2 -- translations/translation_jp.xml | 2 -- translations/translation_kr.xml | 2 -- translations/translation_nl.xml | 2 -- translations/translation_no.xml | 2 -- translations/translation_pl.xml | 2 -- translations/translation_pt.xml | 2 -- translations/translation_ro.xml | 2 -- translations/translation_ru.xml | 2 -- translations/translation_sv.xml | 2 -- translations/translation_tr.xml | 2 -- 24 files changed, 4 insertions(+), 52 deletions(-) diff --git a/translations/translation_br.xml b/translations/translation_br.xml index e64a80fae..5a9fcfd2f 100644 --- a/translations/translation_br.xml +++ b/translations/translation_br.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_cs.xml b/translations/translation_cs.xml index 93ee3d607..c22f82178 100644 --- a/translations/translation_cs.xml +++ b/translations/translation_cs.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_ct.xml b/translations/translation_ct.xml index bb74a0ca0..b6a060ca3 100644 --- a/translations/translation_ct.xml +++ b/translations/translation_ct.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_cz.xml b/translations/translation_cz.xml index cbdef2135..fb059cdbf 100644 --- a/translations/translation_cz.xml +++ b/translations/translation_cz.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_da.xml b/translations/translation_da.xml index b37de69d3..035b4897b 100644 --- a/translations/translation_da.xml +++ b/translations/translation_da.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_de.xml b/translations/translation_de.xml index cff47322c..e7ea5cf2f 100644 --- a/translations/translation_de.xml +++ b/translations/translation_de.xml @@ -282,8 +282,6 @@ - - @@ -316,8 +314,8 @@ - - + + diff --git a/translations/translation_ea.xml b/translations/translation_ea.xml index 28f9d838b..27014830e 100644 --- a/translations/translation_ea.xml +++ b/translations/translation_ea.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_en.xml b/translations/translation_en.xml index 9304736db..9e9ac71bf 100644 --- a/translations/translation_en.xml +++ b/translations/translation_en.xml @@ -282,8 +282,6 @@ - - @@ -316,8 +314,8 @@ - - + + diff --git a/translations/translation_es.xml b/translations/translation_es.xml index ad99805e4..74028aa66 100644 --- a/translations/translation_es.xml +++ b/translations/translation_es.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_fc.xml b/translations/translation_fc.xml index 311b75d5f..42eccd057 100644 --- a/translations/translation_fc.xml +++ b/translations/translation_fc.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_fi.xml b/translations/translation_fi.xml index 6a7e8bc04..1a59101fb 100644 --- a/translations/translation_fi.xml +++ b/translations/translation_fi.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_fr.xml b/translations/translation_fr.xml index 03612ffd4..1056efbc6 100644 --- a/translations/translation_fr.xml +++ b/translations/translation_fr.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_hu.xml b/translations/translation_hu.xml index 7a48108f7..b2630d4df 100644 --- a/translations/translation_hu.xml +++ b/translations/translation_hu.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_it.xml b/translations/translation_it.xml index 363108563..bb919755a 100644 --- a/translations/translation_it.xml +++ b/translations/translation_it.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_jp.xml b/translations/translation_jp.xml index d5aa7a7cd..dc7d3eb05 100644 --- a/translations/translation_jp.xml +++ b/translations/translation_jp.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_kr.xml b/translations/translation_kr.xml index a267d95f4..f0cc54f71 100644 --- a/translations/translation_kr.xml +++ b/translations/translation_kr.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_nl.xml b/translations/translation_nl.xml index 304841aac..16dcf94fe 100644 --- a/translations/translation_nl.xml +++ b/translations/translation_nl.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_no.xml b/translations/translation_no.xml index bb9f33e89..96d04d162 100644 --- a/translations/translation_no.xml +++ b/translations/translation_no.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_pl.xml b/translations/translation_pl.xml index 4656edc60..954b1838d 100644 --- a/translations/translation_pl.xml +++ b/translations/translation_pl.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_pt.xml b/translations/translation_pt.xml index 827c98c69..d369fbe6d 100644 --- a/translations/translation_pt.xml +++ b/translations/translation_pt.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_ro.xml b/translations/translation_ro.xml index bcf6ca54a..c35fffb60 100644 --- a/translations/translation_ro.xml +++ b/translations/translation_ro.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_ru.xml b/translations/translation_ru.xml index afe4a7b6e..4ea80862c 100644 --- a/translations/translation_ru.xml +++ b/translations/translation_ru.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_sv.xml b/translations/translation_sv.xml index 8d8010cfb..badcecb43 100644 --- a/translations/translation_sv.xml +++ b/translations/translation_sv.xml @@ -282,8 +282,6 @@ - - diff --git a/translations/translation_tr.xml b/translations/translation_tr.xml index ad5c855d3..42a6af7b4 100644 --- a/translations/translation_tr.xml +++ b/translations/translation_tr.xml @@ -282,8 +282,6 @@ - - From 579d5fa4864625129930e5dfe8241fef6b627215 Mon Sep 17 00:00:00 2001 From: Tensuko Date: Sat, 26 Oct 2024 14:25:35 +0200 Subject: [PATCH 11/11] set default for fieldCornerRadius --- scripts/courseGenerator/CourseGeneratorInterface.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/courseGenerator/CourseGeneratorInterface.lua b/scripts/courseGenerator/CourseGeneratorInterface.lua index e702a14ba..57edb774c 100644 --- a/scripts/courseGenerator/CourseGeneratorInterface.lua +++ b/scripts/courseGenerator/CourseGeneratorInterface.lua @@ -39,7 +39,7 @@ function CourseGeneratorInterface.generate(fieldPolygon, context:setBaselineEdge(startPosition.x, -startPosition.z) context:setFieldMargin(settings.fieldMargin:getValue()) context:setUseBaselineEdge(settings.useBaseLineEdge:getValue()) - context:setFieldCornerRadius(settings.turningRadius:getValue()) + context:setFieldCornerRadius(7) --using a default, that is used during testing context:setHeadlandFirst(settings.startOnHeadland:getValue()) context:setHeadlandClockwise(settings.headlandClockwise:getValue()) context:setHeadlandOverlap(settings.headlandOverlapPercent:getValue())