Skip to content

Commit 62a9ae7

Browse files
farmerbrianteefarmerbriantee
authored
Merge pull request #560 from AgOpenGPS-Official/simtest
Simtest
2 parents 29638bb + 6bb514a commit 62a9ae7

30 files changed

+2232
-505
lines changed

‎SourceCode/AgIO/Source/Classes/CSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public static void Load()
9090
}
9191

9292
//keep below 500 kb
93-
Log.CheckLogSize(Path.Combine(logsDirectory, "AgIO_Events_Log.txt"), 500000);
93+
Log.CheckLogSize(Path.Combine(logsDirectory, "AgIO_Events_Log.txt"), 1000000);
9494

9595
try
9696
{

‎SourceCode/GPS/AgOpenGPS.csproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,12 @@
248248
<Compile Include="Forms\Field\FormFieldExisting.Designer.cs">
249249
<DependentUpon>FormFieldExisting.cs</DependentUpon>
250250
</Compile>
251+
<Compile Include="Forms\Guidance\FormTramLine.cs">
252+
<SubType>Form</SubType>
253+
</Compile>
254+
<Compile Include="Forms\Guidance\FormTramLine.Designer.cs">
255+
<DependentUpon>FormTramLine.cs</DependentUpon>
256+
</Compile>
251257
<Compile Include="Forms\Settings\FormAllSettings.cs">
252258
<SubType>Form</SubType>
253259
</Compile>
@@ -708,6 +714,9 @@
708714
<EmbeddedResource Include="Forms\Field\FormFieldExisting.resx">
709715
<DependentUpon>FormFieldExisting.cs</DependentUpon>
710716
</EmbeddedResource>
717+
<EmbeddedResource Include="Forms\Guidance\FormTramLine.resx">
718+
<DependentUpon>FormTramLine.cs</DependentUpon>
719+
</EmbeddedResource>
711720
<EmbeddedResource Include="Forms\Settings\FormAllSettings.resx">
712721
<DependentUpon>FormAllSettings.cs</DependentUpon>
713722
</EmbeddedResource>
@@ -982,9 +991,12 @@
982991
<None Include="btnImages\Config\ConD_LineSmooth.png" />
983992
<None Include="btnImages\QR\QRAOG.png" />
984993
<None Include="btnImages\QR\QRYouTube.png" />
994+
<None Include="btnImages\BoundarySectionControlOnOff.png" />
995+
<None Include="btnImages\TramMulti.png" />
985996
<Content Include="License.txt">
986997
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
987998
</Content>
999+
<None Include="Resources\BoundarySectionControlOnOff.png" />
9881000
<Content Include="UDP_SimTool.exe">
9891001
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9901002
</Content>

‎SourceCode/GPS/Classes/CFence.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public partial class CBoundary
1212
public bool isBndBeingMade;
1313

1414
public bool isDrawRightSide = true, isDrawAtPivot = true, isOkToAddPoints = false;
15-
15+
public bool isRecBoundaryWhenSectionOn = false;
1616
public int closestFenceNum;
1717

1818
//point at the farthest boundary segment from pivotAxle

‎SourceCode/GPS/Classes/CSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ public static void Load()
344344
CreateDirectories();
345345

346346
//keep below 500 kb
347-
Log.CheckLogSize(Path.Combine(logsDirectory, "AgOpenGPS_Events_Log.txt"), 500000);
347+
Log.CheckLogSize(Path.Combine(logsDirectory, "AgOpenGPS_Events_Log.txt"), 1000000);
348348

349349
//what's in the vehicle directory
350350
try

‎SourceCode/GPS/Classes/CVehicle.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ public void DrawVehicle()
483483
// GL.End();
484484
//}
485485

486-
if (mf.bnd.isBndBeingMade)
486+
if (mf.bnd.isBndBeingMade && mf.bnd.isDrawAtPivot)
487487
{
488488
if (mf.bnd.isDrawRightSide)
489489
{

‎SourceCode/GPS/Forms/Controls.Designer.cs

Lines changed: 23 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SourceCode/GPS/Forms/Field/FormBoundaryPlayer.Designer.cs

Lines changed: 48 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SourceCode/GPS/Forms/Field/FormBoundaryPlayer.cs

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ private void timer1_Tick(object sender, EventArgs e)
105105
{
106106
lblArea.Text = Math.Round(area * 0.000247105, 2).ToString();
107107
}
108-
lblPoints.Text = mf.bnd.bndBeingMadePts.Count.ToString();
109108
}
110109

111110
private void btnStop_Click(object sender, EventArgs e)
@@ -135,7 +134,6 @@ private void btnStop_Click(object sender, EventArgs e)
135134
mf.CalculateMinMax();
136135
mf.FileSaveBoundary();
137136
mf.bnd.BuildTurnLines();
138-
//mf.hd.BuildSingleSpaceHeadLines();
139137
mf.btnABDraw.Visible = true;
140138

141139
Log.EventWriter("Driven Boundary Created, Area: " + lblArea.Text);
@@ -159,15 +157,13 @@ private void btnPausePlay_Click(object sender, EventArgs e)
159157
{
160158
mf.bnd.isOkToAddPoints = false;
161159
btnPausePlay.Image = Properties.Resources.BoundaryRecord;
162-
//btnPausePlay.Text = gStr.gsRecord;
163160
btnAddPoint.Enabled = true;
164161
btnDeleteLast.Enabled = true;
165162
}
166163
else
167164
{
168165
mf.bnd.isOkToAddPoints = true;
169166
btnPausePlay.Image = Properties.Resources.boundaryPause;
170-
//btnPausePlay.Text = gStr.gsPause;
171167
btnAddPoint.Enabled = false;
172168
btnDeleteLast.Enabled = false;
173169
}
@@ -178,15 +174,13 @@ private void btnAddPoint_Click(object sender, EventArgs e)
178174
mf.bnd.isOkToAddPoints = true;
179175
mf.AddBoundaryPoint();
180176
mf.bnd.isOkToAddPoints = false;
181-
lblPoints.Text = mf.bnd.bndBeingMadePts.Count.ToString();
182177
}
183178

184179
private void btnDeleteLast_Click(object sender, EventArgs e)
185180
{
186181
int ptCount = mf.bnd.bndBeingMadePts.Count;
187182
if (ptCount > 0)
188183
mf.bnd.bndBeingMadePts.RemoveAt(ptCount - 1);
189-
lblPoints.Text = mf.bnd.bndBeingMadePts.Count.ToString();
190184
}
191185

192186
private void btnRestart_Click(object sender, EventArgs e)
@@ -199,7 +193,6 @@ private void btnRestart_Click(object sender, EventArgs e)
199193
if (result3 == DialogResult.Yes)
200194
{
201195
mf.bnd.bndBeingMadePts?.Clear();
202-
lblPoints.Text = mf.bnd.bndBeingMadePts.Count.ToString();
203196
}
204197
}
205198

@@ -213,8 +206,7 @@ private void btnAntennaTool_Click(object sender, EventArgs e)
213206
{
214207
mf.bnd.isDrawAtPivot = !mf.bnd.isDrawAtPivot;
215208
btnAntennaTool.Image = mf.bnd.isDrawAtPivot ? Properties.Resources.BoundaryRecordPivot : Properties.Resources.BoundaryRecordTool;
216-
Properties.Settings.Default.setBnd_isDrawPivot = mf.bnd.isDrawAtPivot;
217-
Properties.Settings.Default.Save();
209+
Properties.Settings.Default.setBnd_isDrawPivot = mf.bnd.isDrawAtPivot;
218210
}
219211

220212
protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
@@ -224,15 +216,13 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
224216
mf.bnd.isOkToAddPoints = true;
225217
mf.AddBoundaryPoint();
226218
mf.bnd.isOkToAddPoints = false;
227-
lblPoints.Text = mf.bnd.bndBeingMadePts.Count.ToString();
228219
}
229220

230221
if (keyData == Keys.D) //autosteer button on off
231222
{
232223
int ptCount = mf.bnd.bndBeingMadePts.Count;
233224
if (ptCount > 0)
234225
mf.bnd.bndBeingMadePts.RemoveAt(ptCount - 1);
235-
lblPoints.Text = mf.bnd.bndBeingMadePts.Count.ToString();
236226
}
237227

238228
if (keyData == Keys.R) //autosteer button on off
@@ -257,20 +247,9 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
257247
// Call the base class
258248
return base.ProcessCmdKey(ref msg, keyData);
259249
}
260-
250+
private void cboxIsRecBoundaryWhenSectionOn_Click(object sender, EventArgs e)
251+
{
252+
mf.bnd.isRecBoundaryWhenSectionOn = cboxIsRecBoundaryWhenSectionOn.Checked;
253+
}
261254
}
262-
}
263-
264-
/*
265-
266-
MessageBox.Show(gStr, gStr.gsHelp);
267-
268-
DialogResult result2 = MessageBox.Show(gStr, gStr.gsHelp,
269-
MessageBoxButtons.YesNo, MessageBoxIcon.Information);
270-
271-
if (result2 == DialogResult.Yes)
272-
{
273-
System.Diagnostics.Process.Start("https://www.youtube.com/watch?v=rsJMRZrcuX4");
274-
}
275-
276-
*/
255+
}

‎SourceCode/GPS/Forms/Field/FormSaveOrNot.Designer.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SourceCode/GPS/Forms/FormGPS.Designer.cs

Lines changed: 25 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)