Merge pull request #366 from farmerbriantee/Maps

Menu GUI changes
farmerbriantee · Feb 10, 2024 · 3b4a416 · 3b4a416
2 parents 4782f8c + da0faeb
commit 3b4a416
Show file tree

Hide file tree

Showing 26 changed files with 270 additions and 183 deletions.
diff --git a/SourceCode/GPS/Forms/Field/FormBoundaryPlayer.cs b/SourceCode/GPS/Forms/Field/FormBoundaryPlayer.cs
@@ -97,37 +97,44 @@ private void timer1_Tick(object sender, EventArgs e)
 
         private void btnStop_Click(object sender, EventArgs e)
         {
-            if (mf.bnd.bndBeingMadePts.Count > 2)
+            DialogResult result3 = MessageBox.Show("Done?", gStr.gsBoundaryMenu,
+                MessageBoxButtons.YesNo,
+                MessageBoxIcon.Question,
+                MessageBoxDefaultButton.Button2);
+            if (result3 == DialogResult.Yes)
             {
-                CBoundaryList New = new CBoundaryList();
-
-                for (int i = 0; i < mf.bnd.bndBeingMadePts.Count; i++)
+                if (mf.bnd.bndBeingMadePts.Count > 2)
                 {
-                    New.fenceLine.Add(mf.bnd.bndBeingMadePts[i]);
-                }
+                    CBoundaryList New = new CBoundaryList();
 
-                New.CalculateFenceArea(mf.bnd.bndList.Count);
-                New.FixFenceLine(mf.bnd.bndList.Count);
+                    for (int i = 0; i < mf.bnd.bndBeingMadePts.Count; i++)
+                    {
+                        New.fenceLine.Add(mf.bnd.bndBeingMadePts[i]);
+                    }
 
-                mf.bnd.bndList.Add(New);
-                mf.fd.UpdateFieldBoundaryGUIAreas();
+                    New.CalculateFenceArea(mf.bnd.bndList.Count);
+                    New.FixFenceLine(mf.bnd.bndList.Count);
 
-                //turn lines made from boundaries
-                mf.CalculateMinMax();
-                mf.FileSaveBoundary();
-                mf.bnd.BuildTurnLines();
-                //mf.hd.BuildSingleSpaceHeadLines();
-                mf.btnABDraw.Visible = true;
-            }
+                    mf.bnd.bndList.Add(New);
+                    mf.fd.UpdateFieldBoundaryGUIAreas();
 
-            //stop it all for adding
-            mf.bnd.isOkToAddPoints = false;
-            mf.bnd.isBndBeingMade = false;
-            mf.bnd.bndBeingMadePts.Clear();
+                    //turn lines made from boundaries
+                    mf.CalculateMinMax();
+                    mf.FileSaveBoundary();
+                    mf.bnd.BuildTurnLines();
+                    //mf.hd.BuildSingleSpaceHeadLines();
+                    mf.btnABDraw.Visible = true;
+                }
+
+                //stop it all for adding
+                mf.bnd.isOkToAddPoints = false;
+                mf.bnd.isBndBeingMade = false;
+                mf.bnd.bndBeingMadePts.Clear();
 
-            //close window
-            isClosing = true;
-            Close();
+                //close window
+                isClosing = true;
+                Close();
+            }
         }
 
         //actually the record button

diff --git a/SourceCode/GPS/Forms/FormGPS.Designer.cs b/SourceCode/GPS/Forms/FormGPS.Designer.cs
diff --git a/SourceCode/GPS/Forms/FormGPS.cs b/SourceCode/GPS/Forms/FormGPS.cs
@@ -507,12 +507,13 @@ private void FormGPS_Load(object sender, EventArgs e)
             SmoothABtoolStripMenu.Text = gStr.gsSmoothABCurve;
             boundariesToolStripMenuItem.Text = gStr.gsBoundary;
             headlandToolStripMenuItem.Text = gStr.gsHeadland;
-            headlandBuildToolStripMenuItem.Text = gStr.gsHeadland + " (Lines)";
+            headlandBuildToolStripMenuItem.Text = gStr.gsHeadland + " (2)";
             deleteContourPathsToolStripMenuItem.Text = gStr.gsDeleteContourPaths;
             deleteAppliedToolStripMenuItem.Text = gStr.gsDeleteAppliedArea;
-            toolStripAreYouSure.Text = gStr.gsAreYouSure;
             tramLinesMenuField.Text = gStr.gsTramLines;
             recordedPathStripMenu.Text = gStr.gsRecordedPathMenu;
+            flagByLatLonToolStripMenuItem.Text = gStr.gsFlagByLatLon;
+            boundaryToolToolStripMenu.Text = gStr.gsBoundary + "Knn";
 
             webcamToolStrip.Text = gStr.gsWebCam;
             offsetFixToolStrip.Text = gStr.gsOffsetFix;

diff --git a/SourceCode/GPS/Forms/FormMap.Designer.cs b/SourceCode/GPS/Forms/FormMap.Designer.cs
diff --git a/SourceCode/GPS/Forms/FormMap.cs b/SourceCode/GPS/Forms/FormMap.cs
@@ -41,7 +41,9 @@ public FormMap(Form callingForm)
 
         private void FormMap_Load(object sender, EventArgs e)
         {
-            mapControl.ZoomLevel = 15;//mapControl
+            Size = Properties.Settings.Default.setWindow_BingMap;
+
+            mapControl.ZoomLevel = Properties.Settings.Default.setWindow_BingZoom;//mapControl
             mapControl.Center = new GeoPoint((float)mf.pn.longitude, (float)mf.pn.latitude);
 
             mapControl.Invalidate();
@@ -61,6 +63,7 @@ private void FormMap_Load(object sender, EventArgs e)
 
             if (mf.worldGrid.isGeoMap) cboxDrawMap.Image = Properties.Resources.MappingOn;
             else cboxDrawMap.Image = Properties.Resources.MappingOff;
+
         }
 
         private void FormMap_FormClosing(object sender, FormClosingEventArgs e)
@@ -70,6 +73,10 @@ private void FormMap_FormClosing(object sender, FormClosingEventArgs e)
                 e.Cancel = true;
                 return;
             }
+
+            Properties.Settings.Default.setWindow_BingMap = Size;
+            Properties.Settings.Default.setWindow_BingZoom = mapControl.ZoomLevel;
+            Properties.Settings.Default.Save();
         }
 
         private void btnExit_Click(object sender, EventArgs e)
@@ -245,9 +252,6 @@ private void btnAddFence_Click(object sender, EventArgs e)
             btnDeleteAll.Enabled = false;
             btnAddFence.Enabled = false;
             btnDeletePoint.Enabled = false;
-            gboxField.Enabled = true;
-
-            gboxField.Enabled = true;
         }
 
         private void btnDeleteAll_Click(object sender, EventArgs e)
@@ -294,7 +298,6 @@ private void btnDeleteAll_Click(object sender, EventArgs e)
             btnDeleteAll.Enabled = false;
             btnAddFence.Enabled = false;
             btnDeletePoint.Enabled = false;
-            gboxField.Enabled = true;
         }
 
         private void cboxEnableLineDraw_Click(object sender, EventArgs e)
@@ -307,7 +310,6 @@ private void cboxEnableLineDraw_Click(object sender, EventArgs e)
                 bingLine.Clear();
                 mapControl.Markers.Clear();
                 mapControl.Invalidate();
-                gboxField.Enabled = false;
             }
             else
             {
@@ -318,7 +320,6 @@ private void cboxEnableLineDraw_Click(object sender, EventArgs e)
                 btnDeleteAll.Enabled = false;
                 btnAddFence.Enabled = false;
                 btnDeletePoint.Enabled = false;
-                gboxField.Enabled = true;
             }
         }
 

diff --git a/SourceCode/GPS/Properties/Settings.Designer.cs b/SourceCode/GPS/Properties/Settings.Designer.cs
diff --git a/SourceCode/GPS/Properties/Settings.settings b/SourceCode/GPS/Properties/Settings.settings
@@ -701,5 +701,11 @@
     <Setting Name="setWindow_MapBndSize" Type="System.Drawing.Size" Scope="User">
       <Value Profile="(Default)">1022, 742</Value>
     </Setting>
+    <Setting Name="setWindow_BingMap" Type="System.Drawing.Size" Scope="User">
+      <Value Profile="(Default)">965, 700</Value>
+    </Setting>
+    <Setting Name="setWindow_BingZoom" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">15</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/SourceCode/GPS/app.config b/SourceCode/GPS/app.config
@@ -703,6 +703,12 @@
             <setting name="setWindow_MapBndSize" serializeAs="String">
                 <value>1022, 742</value>
             </setting>
+            <setting name="setWindow_BingMap" serializeAs="String">
+                <value>965, 700</value>
+            </setting>
+            <setting name="setWindow_BingZoom" serializeAs="String">
+                <value>15</value>
+            </setting>
         </AgOpenGPS.Properties.Settings>
   </userSettings>
 </configuration>
diff --git a/SourceCode/GPS/gStr.Designer.cs b/SourceCode/GPS/gStr.Designer.cs
diff --git a/SourceCode/GPS/gStr.af.resx b/SourceCode/GPS/gStr.af.resx
@@ -294,6 +294,9 @@
   <data name="gsFileError" xml:space="preserve">
     <value>zFile Error</value>
   </data>
+  <data name="gsFlagByLatLon" xml:space="preserve">
+    <value>Flag By Lat Lon</value>
+  </data>
   <data name="gsFlagFileIsCorrupt" xml:space="preserve">
     <value>zFlag File Corrupt</value>
   </data>

diff --git a/SourceCode/GPS/gStr.da.resx b/SourceCode/GPS/gStr.da.resx
@@ -276,6 +276,9 @@
   <data name="gsFileError" xml:space="preserve">
     <value>Fejl I  Fil</value>
   </data>
+  <data name="gsFlagByLatLon" xml:space="preserve">
+    <value>Flag af Lat Lon</value>
+  </data>
   <data name="gsFlagFileIsCorrupt" xml:space="preserve">
     <value>Fejl I Afmærkningsfil</value>
   </data>

diff --git a/SourceCode/GPS/gStr.de.resx b/SourceCode/GPS/gStr.de.resx
@@ -291,6 +291,9 @@
   <data name="gsFileError" xml:space="preserve">
     <value>Dateien fehlerhaft</value>
   </data>
+  <data name="gsFlagByLatLon" xml:space="preserve">
+    <value>Flagge von Lat Lon</value>
+  </data>
   <data name="gsFlagFileIsCorrupt" xml:space="preserve">
     <value>Flaggen Datei fehlerhaft</value>
   </data>

diff --git a/SourceCode/GPS/gStr.es.resx b/SourceCode/GPS/gStr.es.resx
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="gsCloseAllWindowsFirst" xml:space="preserve">
-    <value>Por favor, cierre primero todas las ventanas</value>
-  </data>
   <data name="gsABCurve" xml:space="preserve">
     <value>Curva AB</value>
   </data>
@@ -183,6 +180,9 @@
   <data name="gsClose" xml:space="preserve">
     <value>Cerrar</value>
   </data>
+  <data name="gsCloseAllWindowsFirst" xml:space="preserve">
+    <value>Por favor, cierre primero todas las ventanas</value>
+  </data>
   <data name="gsCloseFieldFirst" xml:space="preserve">
     <value>Antes cierre el fichero</value>
   </data>
@@ -291,6 +291,9 @@
   <data name="gsFileError" xml:space="preserve">
     <value>Error de archivo</value>
   </data>
+  <data name="gsFlagByLatLon" xml:space="preserve">
+    <value>Bandera de Lat Lon</value>
+  </data>
   <data name="gsFlagFileIsCorrupt" xml:space="preserve">
     <value>Fichero de marcas corrupto</value>
   </data>

diff --git a/SourceCode/GPS/gStr.fi.resx b/SourceCode/GPS/gStr.fi.resx
@@ -291,6 +291,9 @@
   <data name="gsFileError" xml:space="preserve">
     <value>Tiedostovirhe</value>
   </data>
+  <data name="gsFlagByLatLon" xml:space="preserve">
+    <value>Lat Lonin lippu</value>
+  </data>
   <data name="gsFlagFileIsCorrupt" xml:space="preserve">
     <value>Lipputiedosto korruptoitunut</value>
   </data>

diff --git a/SourceCode/GPS/gStr.fr.resx b/SourceCode/GPS/gStr.fr.resx
@@ -291,6 +291,9 @@
   <data name="gsFileError" xml:space="preserve">
     <value>Erreur de fichier</value>
   </data>
+  <data name="gsFlagByLatLon" xml:space="preserve">
+    <value>Drapeau par Latitude et Longitude</value>
+  </data>
   <data name="gsFlagFileIsCorrupt" xml:space="preserve">
     <value>Fichier Flag corrompu</value>
   </data>

diff --git a/SourceCode/GPS/gStr.hu.resx b/SourceCode/GPS/gStr.hu.resx
@@ -296,6 +296,9 @@
   <data name="gsFileError" xml:space="preserve">
     <value>Fájl hiba</value>
   </data>
+  <data name="gsFlagByLatLon" xml:space="preserve">
+    <value>Zászló koordináták alapján</value>
+  </data>
   <data name="gsFlagFileIsCorrupt" xml:space="preserve">
     <value>Zászló fájl sérült</value>
   </data>

diff --git a/SourceCode/GPS/gStr.it.resx b/SourceCode/GPS/gStr.it.resx
@@ -276,6 +276,9 @@
   <data name="gsFileError" xml:space="preserve">
     <value>Errore Nel File</value>
   </data>
+  <data name="gsFlagByLatLon" xml:space="preserve">
+    <value>Bandiera di Lat Lon</value>
+  </data>
   <data name="gsFlagFileIsCorrupt" xml:space="preserve">
     <value>File Segnaposto Corrotto</value>
   </data>

diff --git a/SourceCode/GPS/gStr.lt.resx b/SourceCode/GPS/gStr.lt.resx
@@ -288,6 +288,9 @@
   <data name="gsFileError" xml:space="preserve">
     <value>Failo klaida</value>
   </data>
+  <data name="gsFlagByLatLon" xml:space="preserve">
+    <value>Lat Lon vėliava</value>
+  </data>
   <data name="gsFlagFileIsCorrupt" xml:space="preserve">
     <value>Vėliavėlės failas sugadintas</value>
   </data>

diff --git a/SourceCode/GPS/gStr.lv.resx b/SourceCode/GPS/gStr.lv.resx
@@ -288,6 +288,9 @@
   <data name="gsFileError" xml:space="preserve">
     <value>Faila kļūda</value>
   </data>
+  <data name="gsFlagByLatLon" xml:space="preserve">
+    <value>Karogs ar Lat Lon</value>
+  </data>
   <data name="gsFlagFileIsCorrupt" xml:space="preserve">
     <value>Bojāts karoga fails</value>
   </data>

diff --git a/SourceCode/GPS/gStr.nl.resx b/SourceCode/GPS/gStr.nl.resx
@@ -291,6 +291,9 @@
   <data name="gsFileError" xml:space="preserve">
     <value>Bestandfout</value>
   </data>
+  <data name="gsFlagByLatLon" xml:space="preserve">
+    <value>Vlag van Lat Lon</value>
+  </data>
   <data name="gsFlagFileIsCorrupt" xml:space="preserve">
     <value>POI bestand corrupt</value>
   </data>

diff --git a/SourceCode/GPS/gStr.pl.resx b/SourceCode/GPS/gStr.pl.resx
@@ -270,6 +270,9 @@
   <data name="gsFileError" xml:space="preserve">
     <value>Błąd pliku</value>
   </data>
+  <data name="gsFlagByLatLon" xml:space="preserve">
+    <value>Flaga firmy Lat Lon</value>
+  </data>
   <data name="gsFlagFileIsCorrupt" xml:space="preserve">
     <value>Uszkodzony plik flagi</value>
   </data>

diff --git a/SourceCode/GPS/gStr.resx b/SourceCode/GPS/gStr.resx
@@ -294,6 +294,9 @@
   <data name="gsFileError" xml:space="preserve">
     <value>File Error</value>
   </data>
+  <data name="gsFlagByLatLon" xml:space="preserve">
+    <value>Flag By Lat Lon</value>
+  </data>
   <data name="gsFlagFileIsCorrupt" xml:space="preserve">
     <value>Flag File Corrupt</value>
   </data>

diff --git a/SourceCode/GPS/gStr.ru.resx b/SourceCode/GPS/gStr.ru.resx
@@ -288,6 +288,9 @@
   <data name="gsFileError" xml:space="preserve">
     <value>Ошибка файла</value>
   </data>
+  <data name="gsFlagByLatLon" xml:space="preserve">
+    <value>Флаг Лат Лона</value>
+  </data>
   <data name="gsFlagFileIsCorrupt" xml:space="preserve">
     <value>Флаг Файл Поврежден</value>
   </data>

diff --git a/SourceCode/GPS/gStr.sk.resx b/SourceCode/GPS/gStr.sk.resx
@@ -288,6 +288,9 @@
   <data name="gsFileError" xml:space="preserve">
     <value>Chyba súboru</value>
   </data>
+  <data name="gsFlagByLatLon" xml:space="preserve">
+    <value>Vlajka od Lat Lon</value>
+  </data>
   <data name="gsFlagFileIsCorrupt" xml:space="preserve">
     <value>Súbor so značkami je neplatný</value>
   </data>