Merge master into develop

.github/workflows/build.yml

@@ -32,12 +32,12 @@ jobs:
       uses: actions/setup-dotnet@v4
 
     - name: Setup GitVersion
-      uses: gittools/actions/gitversion/setup@v4.1.0
+      uses: gittools/actions/gitversion/setup@v3.2.0
       with:
-        versionSpec: '6.3.x'
+        versionSpec: '5.12.x'
 
     - name: Determine Version
-      uses: gittools/actions/gitversion/execute@v4.1.0
+      uses: gittools/actions/gitversion/execute@v3.2.0
       with:
         updateProjectFiles: true
 

.github/workflows/release.yml

@@ -33,12 +33,12 @@ jobs:
       uses: actions/setup-dotnet@v4
 
     - name: Setup GitVersion
-      uses: gittools/actions/gitversion/setup@v4.1.0
+      uses: gittools/actions/gitversion/setup@v3.2.0
       with:
-        versionSpec: '6.3.x'
+        versionSpec: '5.12.x'
 
     - name: Determine Version
-      uses: gittools/actions/gitversion/execute@v4.1.0
+      uses: gittools/actions/gitversion/execute@v3.2.0
       with:
         updateProjectFiles: true
 
@@ -63,6 +63,7 @@ jobs:
       with:
         name: Release ${{ env.GitVersion_SemVer }}
         tag_name: ${{ env.GitVersion_SemVer }}
+        target_commitish: ${{ github.sha }}
         body: |
           Automated Release by GitHub Action CI
         draft: ${{ github.ref_name == 'master' }}

SourceCode/AgOpenGPS.Core/DrawLib/GLW.cs

@@ -103,6 +103,11 @@ private static void DrawPrimitiveLayered(
             vertex2Array.DeleteBuffer();
         }
 
+        public static void Vertex2(GeoCoord geoCoord)
+        {
+            GL.Vertex2(geoCoord.Easting, geoCoord.Northing);
+        }
+
         public static void Translate(double x, double y, double z)
         {
             GL.Translate(x, y, z);

SourceCode/AgOpenGPS.Core/Models/Base/GeoDir.cs

@@ -13,6 +13,9 @@ public GeoDir(GeoDelta delta)
         {
             AngleInRadians = Math.Atan2(delta.EastingDelta, delta.NorthingDelta);
         }
+        public GeoDir(GeoCoord fromCoord, GeoCoord toCoord) : this(new GeoDelta(fromCoord, toCoord))
+        {
+        }
 
         public double AngleInRadians { get; }
         public double AngleInDegrees => Units.RadiansToDegrees(AngleInRadians);

SourceCode/AgOpenGPS.Core/Models/Base/GeoLine.cs

@@ -0,0 +1,24 @@
+using System;
+
+namespace AgOpenGPS.Core.Models
+{
+    public struct GeoLine
+    {
+        public GeoLine(GeoCoord coordA, GeoCoord coordB)
+        {
+            CoordA = coordA;
+            CoordB = coordB;
+        }
+
+        public GeoCoord CoordA { get; }
+        public GeoCoord CoordB { get; }
+
+        public GeoDir Direction => new GeoDir(CoordA, CoordB);
+
+        public GeoLine ParallelLine(GeoDelta offset)
+        {
+            return new GeoLine(CoordA + offset, CoordB + offset);
+        }
+
+    }
+}

SourceCode/AgOpenGPS.Core/Translations/gStr.resx

@@ -372,7 +372,7 @@ The order you push them will be the order they appear on the menu from bottom up
     <value>Delete Field</value>
   </data>
   <data name="gsDeleteForSure" xml:space="preserve">
-    <value>Delete For Sure?</value>
+    <value>Are you sure you want to delete?</value>
   </data>
   <data name="gsDiameter" xml:space="preserve">
     <value>Diameter</value>

SourceCode/GPS/Classes/CABLine.cs

@@ -1,3 +1,4 @@
+using AgOpenGPS.Core.DrawLib;
 using AgOpenGPS.Core.Models;
 using OpenTK.Graphics.OpenGL;
 using System;
@@ -431,145 +432,48 @@ public void DrawABLines()
 
             if (mf.isSideGuideLines && mf.camera.camSetDistance > mf.tool.width * -400)
             {
-                //get the tool offset and width
-                double toolOffset = mf.tool.offset * 2;
                 double toolWidth = mf.tool.width - mf.tool.overlap;
-                double cosHeading = Math.Cos(-abHeading);
-                double sinHeading = Math.Sin(-abHeading);
-
-                if (toolOffset == 0)
+                //heavy shadow
+                GL.Color4(0, 0, 0, 0.5);
+                GL.LineWidth(lineWidth * 3);
+                GL.Begin(PrimitiveType.Lines);
+                GeoLine currentLine = new GeoLine(currentLinePtA.ToGeoCoord(), currentLinePtB.ToGeoCoord());
+                GeoDir perpendicularRightDir = currentLine.Direction.PerpendicularRight;
+                List<GeoLine> lines = new List<GeoLine>();
+
+                double oddOffset = 2 * (isHeadingSameWay ? mf.tool.offset : -mf.tool.offset);
+                for (int i = 1; i <= numGuideLines; i += 2)
                 {
-                    GL.Color4(0, 0, 0, 0.5);
-                    GL.LineWidth(lineWidth * 3);
-                    GL.Begin(PrimitiveType.Lines);
-
-                    for (int i = 1; i <= numGuideLines; i++)
-                    {
-                        GL.Vertex3((cosHeading * (toolWidth * i)) + currentLinePtA.easting, (sinHeading * (toolWidth * i)) + currentLinePtA.northing, 0);
-                        GL.Vertex3((cosHeading * (toolWidth * i)) + currentLinePtB.easting, (sinHeading * (toolWidth * i)) + currentLinePtB.northing, 0);
-
-                        GL.Vertex3((cosHeading * (-toolWidth * i)) + currentLinePtA.easting, (sinHeading * (-toolWidth * i)) + currentLinePtA.northing, 0);
-                        GL.Vertex3((cosHeading * (-toolWidth * i)) + currentLinePtB.easting, (sinHeading * (-toolWidth * i)) + currentLinePtB.northing, 0);
-                    }
-                    GL.End();
-
-                    GL.Color4(0.19907f, 0.6f, 0.19750f, 0.6f);
-                    GL.LineWidth(lineWidth);
-                    GL.Begin(PrimitiveType.Lines);
-
-                    for (int i = 1; i <= numGuideLines; i += 2)
-                    {
-                        GL.Vertex3((cosHeading * (toolWidth * i)) + currentLinePtA.easting, (sinHeading * (toolWidth * i)) + currentLinePtA.northing, 0);
-                        GL.Vertex3((cosHeading * (toolWidth * i)) + currentLinePtB.easting, (sinHeading * (toolWidth * i)) + currentLinePtB.northing, 0);
-
-                        GL.Vertex3((cosHeading * (-toolWidth * i)) + currentLinePtA.easting, (sinHeading * (-toolWidth * i)) + currentLinePtA.northing, 0);
-                        GL.Vertex3((cosHeading * (-toolWidth * i)) + currentLinePtB.easting, (sinHeading * (-toolWidth * i)) + currentLinePtB.northing, 0);
-                    }
-                    GL.End();
+                    GeoLine rightOddLine = currentLine.ParallelLine((toolWidth * i + oddOffset) * perpendicularRightDir);
+                    GeoLine leftOddLine = currentLine.ParallelLine((toolWidth * -i + oddOffset) * perpendicularRightDir);
+                    lines.Add(rightOddLine);
+                    lines.Add(leftOddLine);
                 }
-                else
+                for (int i = 2; i <= numGuideLines; i += 2)
                 {
-                    toolOffset *= 0.5;
-
-                    vec3 mA = new vec3();
-                    vec3 mB = new vec3();
-
-                    if (!isHeadingSameWay)
-                    {
-                        toolOffset *= -1;
-                    }
-
-                    mA.easting = cosHeading * toolOffset + currentLinePtA.easting;
-                    mA.northing = sinHeading * toolOffset + currentLinePtA.northing;
-
-                    mB.easting = cosHeading * toolOffset + currentLinePtB.easting;
-                    mB.northing = sinHeading * toolOffset + currentLinePtB.northing;
-
-                    //heavy shadow
-                    GL.Color4(0, 0, 0, 0.5);
-                    GL.LineWidth(lineWidth * 3);
-                    GL.Begin(PrimitiveType.Lines);
-
-                    for (int i = 1; i <= numGuideLines; i++)
-                    {
-                        GL.Vertex3((cosHeading * ((toolWidth * i) + toolOffset)) + mA.easting, (sinHeading * ((toolWidth * i) + toolOffset)) + mA.northing, 0);
-                        GL.Vertex3((cosHeading * ((toolWidth * i) + toolOffset)) + mB.easting, (sinHeading * ((toolWidth * i) + toolOffset)) + mB.northing, 0);
-
-                        GL.Vertex3((cosHeading * ((toolWidth * -i) + toolOffset)) + mA.easting, (sinHeading * ((toolWidth * -i) + toolOffset)) + mA.northing, 0);
-                        GL.Vertex3((cosHeading * ((toolWidth * -i) + toolOffset)) + mB.easting, (sinHeading * ((toolWidth * -i) + toolOffset)) + mB.northing, 0);
-
-                        i++;
-
-                        GL.Vertex3((cosHeading * ((toolWidth * i) - toolOffset)) + mA.easting, (sinHeading * ((toolWidth * i) - toolOffset)) + mA.northing, 0);
-                        GL.Vertex3((cosHeading * ((toolWidth * i) - toolOffset)) + mB.easting, (sinHeading * ((toolWidth * i) - toolOffset)) + mB.northing, 0);
-
-                        GL.Vertex3((cosHeading * ((toolWidth * -i) - toolOffset)) + mA.easting, (sinHeading * ((toolWidth * -i) - toolOffset)) + mA.northing, 0);
-                        GL.Vertex3((cosHeading * ((toolWidth * -i) - toolOffset)) + mB.easting, (sinHeading * ((toolWidth * -i) - toolOffset)) + mB.northing, 0);
-                    }
-                    GL.End();
-
-                    //green lines
-                    GL.Color4(0.19907f, 0.6f, 0.19750f, 0.6f);
-                    GL.LineWidth(lineWidth);
-                    GL.Begin(PrimitiveType.Lines);
-
-                    for (int i = 1; i <= numGuideLines; i++)
-                    {
-                        GL.Vertex3((cosHeading * ((toolWidth * i) + toolOffset)) + mA.easting, (sinHeading * ((toolWidth * i) + toolOffset)) + mA.northing, 0);
-                        GL.Vertex3((cosHeading * ((toolWidth * i) + toolOffset)) + mB.easting, (sinHeading * ((toolWidth * i) + toolOffset)) + mB.northing, 0);
-
-                        GL.Vertex3((cosHeading * ((toolWidth * -i) + toolOffset)) + mA.easting, (sinHeading * ((toolWidth * -i) + toolOffset)) + mA.northing, 0);
-                        GL.Vertex3((cosHeading * ((toolWidth * -i) + toolOffset)) + mB.easting, (sinHeading * ((toolWidth * -i) + toolOffset)) + mB.northing, 0);
-
-                        i++;
-
-                        GL.Vertex3((cosHeading * ((toolWidth * i) - toolOffset)) + mA.easting, (sinHeading * ((toolWidth * i) - toolOffset)) + mA.northing, 0);
-                        GL.Vertex3((cosHeading * ((toolWidth * i) - toolOffset)) + mB.easting, (sinHeading * ((toolWidth * i) - toolOffset)) + mB.northing, 0);
-
-                        GL.Vertex3((cosHeading * ((toolWidth * -i) - toolOffset)) + mA.easting, (sinHeading * ((toolWidth * -i) - toolOffset)) + mA.northing, 0);
-                        GL.Vertex3((cosHeading * ((toolWidth * -i) - toolOffset)) + mB.easting, (sinHeading * ((toolWidth * -i) - toolOffset)) + mB.northing, 0);
-                    }
-                    GL.End();
+                    GeoLine rightEvenLine = currentLine.ParallelLine((toolWidth * i) * perpendicularRightDir);
+                    GeoLine leftEvenLine = currentLine.ParallelLine((toolWidth * -i) * perpendicularRightDir);
+                    lines.Add(rightEvenLine);
+                    lines.Add(leftEvenLine);
                 }
-            }
+                for (int i = 0; i < lines.Count; i++)
+                {
+                    GLW.Vertex2(lines[i].CoordA);
+                    GLW.Vertex2(lines[i].CoordB);
+                }
+                GL.End();
 
-            if (!mf.isStanleyUsed && mf.camera.camSetDistance > -200)
-            {
-                ////Draw lookahead Point
-                //GL.PointSize(16.0f);
-                //GL.Begin(PrimitiveType.Points);
-                //GL.Color3(1.0f, 1.0f, 0.0f);
-                //GL.Vertex3(goalPointAB.easting, goalPointAB.northing, 0.0);
-                ////GL.Vertex3(mf.gyd.rEastSteer, mf.gyd.rNorthSteer, 0.0);
-                ////GL.Vertex3(mf.gyd.rEastPivot, mf.gyd.rNorthPivot, 0.0);
-                //GL.End();
-                //GL.PointSize(1.0f);
-
-                //if (ppRadiusAB < 50 && ppRadiusAB > -50)
-                //{
-                //    const int numSegments = 200;
-                //    double theta = glm.twoPI / numSegments;
-                //    double c = Math.Cos(theta);//precalculate the sine and cosine
-                //    double s = Math.Sin(theta);
-                //    //double x = ppRadiusAB;//we start at angle = 0
-                //    double x = 0;//we start at angle = 0
-                //    double y = 0;
-
-                //    GL.LineWidth(2);
-                //    GL.Color3(0.53f, 0.530f, 0.950f);
-                //    GL.Begin(PrimitiveType.Lines);
-                //    for (int ii = 0; ii < numSegments - 15; ii++)
-                //    {
-                //        //glVertex2f(x + cx, y + cy);//output vertex
-                //        GL.Vertex3(x + radiusPointAB.easting, y + radiusPointAB.northing, 0);//output vertex
-                //        double t = x;//apply the rotation matrix
-                //        x = (c * x) - (s * y);
-                //        y = (s * t) + (c * y);
-                //    }
-                //    GL.End();
-                //}
+                //green lines
+                GL.Color4(0.19907f, 0.6f, 0.19750f, 0.6f);
+                GL.LineWidth(lineWidth);
+                GL.Begin(PrimitiveType.Lines);
+                for (int i = 0; i < lines.Count; i++)
+                {
+                    GLW.Vertex2(lines[i].CoordA);
+                    GLW.Vertex2(lines[i].CoordB);
+                }
+                GL.End();
             }
-
             mf.yt.DrawYouTurn();
 
             GL.PointSize(1.0f);