Merge pull request #374 from farmerbriantee/ABLine

Ab line
AgOpenGPS-Official · Feb 16, 2024 · c942df1 · c942df1
2 parents 7b4811e + f938dd3
commit c942df1
Show file tree

Hide file tree

Showing 11 changed files with 2,449 additions and 2,400 deletions.
diff --git a/SourceCode/GPS/AgOpenGPS.csproj b/SourceCode/GPS/AgOpenGPS.csproj
@@ -925,6 +925,8 @@
   <ItemGroup>
     <Content Include="AOG.ico" />
     <Content Include="aChangeLog.txt" />
+    <None Include="btnImages\VR.png" />
+    <None Include="btnImages\Background.png" />
     <Content Include="Resources\TF012.WAV" />
     <None Include="Resources\SectionOn.wav" />
     <None Include="Resources\SectionOff.wav" />

diff --git a/SourceCode/GPS/Classes/CABLine.cs b/SourceCode/GPS/Classes/CABLine.cs
@@ -143,20 +143,27 @@ public void BuildCurrentABLineList(vec3 pivot)
 
             //move the curline as well. 
             vec2 nudgePtA = new vec2(mf.trk.gArr[idx].ptA);
+            vec2 nudgePtB = new vec2(mf.trk.gArr[idx].ptB);
 
             nudgePtA.easting += (Math.Sin(abHeading + glm.PIBy2) * mf.trk.gArr[idx].nudgeDistance);
             nudgePtA.northing += (Math.Cos(abHeading + glm.PIBy2) * mf.trk.gArr[idx].nudgeDistance);
 
+            nudgePtB.easting += (Math.Sin(abHeading + glm.PIBy2) * mf.trk.gArr[idx].nudgeDistance);
+            nudgePtB.northing += (Math.Cos(abHeading + glm.PIBy2) * mf.trk.gArr[idx].nudgeDistance);
+
             //depending which way you are going, the offset can be either side
             vec2 point1 = new vec2((Math.Cos(-abHeading) * (distAway + (isHeadingSameWay ? -mf.tool.offset : mf.tool.offset))) + nudgePtA.easting,
             (Math.Sin(-abHeading) * (distAway + (isHeadingSameWay ? -mf.tool.offset : mf.tool.offset))) + nudgePtA.northing);
 
+            vec2 point2 = new vec2((Math.Cos(-abHeading) * (distAway + (isHeadingSameWay ? -mf.tool.offset : mf.tool.offset))) + nudgePtB.easting,
+            (Math.Sin(-abHeading) * (distAway + (isHeadingSameWay ? -mf.tool.offset : mf.tool.offset))) + nudgePtB.northing);
+
             //create the new line extent points for current ABLine based on original heading of AB line
             currentLinePtA.easting = point1.easting - (Math.Sin(abHeading) * abLength);
             currentLinePtA.northing = point1.northing - (Math.Cos(abHeading) * abLength);
 
-            currentLinePtB.easting = point1.easting + (Math.Sin(abHeading) * abLength);
-            currentLinePtB.northing = point1.northing + (Math.Cos(abHeading) * abLength);
+            currentLinePtB.easting = point2.easting + (Math.Sin(abHeading) * abLength);
+            currentLinePtB.northing = point2.northing + (Math.Cos(abHeading) * abLength);
 
             currentLinePtA.heading = abHeading;
             currentLinePtB.heading = abHeading;

diff --git a/SourceCode/GPS/Forms/FormGPS.Designer.cs b/SourceCode/GPS/Forms/FormGPS.Designer.cs
diff --git a/SourceCode/GPS/Forms/FormGPS.resx b/SourceCode/GPS/Forms/FormGPS.resx
@@ -138,9 +138,6 @@
   <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1050, 16</value>
   </metadata>
-  <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1050, 16</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>54</value>
   </metadata>

diff --git a/SourceCode/GPS/Forms/FormMap.Designer.cs b/SourceCode/GPS/Forms/FormMap.Designer.cs
diff --git a/SourceCode/GPS/Forms/FormRateMap.Designer.cs b/SourceCode/GPS/Forms/FormRateMap.Designer.cs
diff --git a/SourceCode/GPS/Forms/Guidance/FormABDraw.cs b/SourceCode/GPS/Forms/Guidance/FormABDraw.cs
@@ -754,7 +754,7 @@ private void DrawBuiltLines()
                     GL.Begin(PrimitiveType.Lines);
 
                     GL.Vertex3(gTemp[i].ptA.easting - (Math.Sin(gTemp[i].heading) * mf.ABLine.abLength), gTemp[i].ptA.northing - (Math.Cos(gTemp[i].heading) * mf.ABLine.abLength), 0);
-                    GL.Vertex3(gTemp[i].ptA.easting + (Math.Sin(gTemp[i].heading) * mf.ABLine.abLength), gTemp[i].ptA.northing + (Math.Cos(gTemp[i].heading) * mf.ABLine.abLength), 0);
+                    GL.Vertex3(gTemp[i].ptB.easting + (Math.Sin(gTemp[i].heading) * mf.ABLine.abLength), gTemp[i].ptB.northing + (Math.Cos(gTemp[i].heading) * mf.ABLine.abLength), 0);
 
                     GL.End();
 

diff --git a/SourceCode/GPS/Properties/Resources.Designer.cs b/SourceCode/GPS/Properties/Resources.Designer.cs