diff --git a/SourceCode/GPS/AgOpenGPS.csproj b/SourceCode/GPS/AgOpenGPS.csproj index d89293574..e3cf29e55 100644 --- a/SourceCode/GPS/AgOpenGPS.csproj +++ b/SourceCode/GPS/AgOpenGPS.csproj @@ -927,6 +927,7 @@ ResXFileCodeGenerator gStr.zh-CHS.Designer.cs + Designer ResXFileCodeGenerator diff --git a/SourceCode/GPS/Forms/FormGPS.cs b/SourceCode/GPS/Forms/FormGPS.cs index de0a178e7..134ae6e7b 100644 --- a/SourceCode/GPS/Forms/FormGPS.cs +++ b/SourceCode/GPS/Forms/FormGPS.cs @@ -583,7 +583,14 @@ private void FormGPS_FormClosing(object sender, FormClosingEventArgs e) SaveFormGPSWindowSettings(); - Log.EventWriter("Missed Sentence Counter Total: " + missedSentenceCount.ToString()); + double minutesSinceStart = ((DateTime.Now - Process.GetCurrentProcess().StartTime).TotalSeconds)/60; + if (minutesSinceStart < 1) + { + minutesSinceStart = 1; + } + + Log.EventWriter("Missed Sentence Counter Total: " + missedSentenceCount.ToString() + + " Missed Per Minute: " + ((double)missedSentenceCount/minutesSinceStart).ToString("N4")); Log.EventWriter("Program Exit: " + DateTime.Now.ToString("f", CultureInfo.CreateSpecificCulture(RegistrySettings.culture)) + "\r"); diff --git a/SourceCode/GPS/Forms/GUI.Designer.cs b/SourceCode/GPS/Forms/GUI.Designer.cs index 3255b5852..45f5eea82 100644 --- a/SourceCode/GPS/Forms/GUI.Designer.cs +++ b/SourceCode/GPS/Forms/GUI.Designer.cs @@ -443,7 +443,6 @@ public void LoadSettings() if (isSideGuideLines) guidelinesToolStripMenuItem.Checked = true; else guidelinesToolStripMenuItem.Checked = false; - //left side btnStartAgIO.Visible = Properties.Settings.Default.setFeatures.isAgIOOn; @@ -539,7 +538,6 @@ public void LoadSettings() isSideGuideLines = Settings.Default.setMenu_isSideGuideLines; isSvennArrowOn = Settings.Default.setDisplay_isSvennArrowOn; - //isLogNMEA = Settings.Default.setMenu_isLogNMEA; isPureDisplayOn = Settings.Default.setMenu_isPureOn; isAutoStartAgIO = Settings.Default.setDisplay_isAutoStartAgIO; diff --git a/SourceCode/GPS/Forms/Settings/FormConfig.Designer.cs b/SourceCode/GPS/Forms/Settings/FormConfig.Designer.cs index 42b11d239..b69e7f454 100644 --- a/SourceCode/GPS/Forms/Settings/FormConfig.Designer.cs +++ b/SourceCode/GPS/Forms/Settings/FormConfig.Designer.cs @@ -28,6 +28,7 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); this.panelLeftSideMenu = new System.Windows.Forms.Panel(); this.btnFeatureHides = new System.Windows.Forms.Button(); this.btnDisplay = new System.Windows.Forms.Button(); @@ -518,7 +519,6 @@ private void InitializeComponent() this.label42 = new System.Windows.Forms.Label(); this.label101 = new System.Windows.Forms.Label(); this.label43 = new System.Windows.Forms.Label(); - this.label36 = new System.Windows.Forms.Label(); this.label33 = new System.Windows.Forms.Label(); this.label28 = new System.Windows.Forms.Label(); this.chkSpeedo = new System.Windows.Forms.Label(); @@ -531,7 +531,6 @@ private void InitializeComponent() this.chkDisplayKeyboard = new System.Windows.Forms.CheckBox(); this.chkDisplayPolygons = new System.Windows.Forms.CheckBox(); this.chkDisplayStartFullScreen = new System.Windows.Forms.CheckBox(); - this.chkDisplayLogNMEA = new System.Windows.Forms.CheckBox(); this.chkDisplayGrid = new System.Windows.Forms.CheckBox(); this.chkDisplaySpeedo = new System.Windows.Forms.CheckBox(); this.chkDisplayExtraGuides = new System.Windows.Forms.CheckBox(); @@ -546,7 +545,7 @@ private void InitializeComponent() this.lblFeetMeters = new System.Windows.Forms.Label(); this.btnOK = new System.Windows.Forms.Button(); this.label22 = new System.Windows.Forms.Label(); - this.timer1 = new System.Windows.Forms.Timer(); + this.timer1 = new System.Windows.Forms.Timer(this.components); this.panelLeftSideMenu.SuspendLayout(); this.panelArduinoSubMenu.SuspendLayout(); this.panelDataSourcesSubMenu.SuspendLayout(); @@ -1230,7 +1229,7 @@ private void InitializeComponent() this.tab1.Name = "tab1"; this.tab1.Padding = new System.Drawing.Point(0, 0); this.tab1.SelectedIndex = 0; - this.tab1.Size = new System.Drawing.Size(859, 632); + this.tab1.Size = new System.Drawing.Size(865, 632); this.tab1.TabIndex = 0; // // tabSummary @@ -3496,7 +3495,7 @@ private void InitializeComponent() this.tabTSections.ForeColor = System.Drawing.Color.Black; this.tabTSections.Location = new System.Drawing.Point(4, 44); this.tabTSections.Name = "tabTSections"; - this.tabTSections.Size = new System.Drawing.Size(851, 584); + this.tabTSections.Size = new System.Drawing.Size(857, 584); this.tabTSections.TabIndex = 7; this.tabTSections.Text = "tSect"; this.tabTSections.Enter += new System.EventHandler(this.tabTSections_Enter); @@ -4083,7 +4082,7 @@ private void InitializeComponent() this.label106.Font = new System.Drawing.Font("Tahoma", 15.75F); this.label106.ForeColor = System.Drawing.Color.Black; this.label106.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label106.Location = new System.Drawing.Point(441, 473); + this.label106.Location = new System.Drawing.Point(355, 472); this.label106.Name = "label106"; this.label106.Size = new System.Drawing.Size(168, 32); this.label106.TabIndex = 502; @@ -4197,7 +4196,7 @@ private void InitializeComponent() this.label50.Font = new System.Drawing.Font("Tahoma", 15.75F); this.label50.ForeColor = System.Drawing.Color.Black; this.label50.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label50.Location = new System.Drawing.Point(228, 473); + this.label50.Location = new System.Drawing.Point(902, 223); this.label50.Name = "label50"; this.label50.Size = new System.Drawing.Size(174, 32); this.label50.TabIndex = 293; @@ -4475,7 +4474,7 @@ private void InitializeComponent() this.cboxSectionBoundaryControl.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cboxSectionBoundaryControl.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cboxSectionBoundaryControl.ForeColor = System.Drawing.Color.Black; - this.cboxSectionBoundaryControl.Location = new System.Drawing.Point(473, 508); + this.cboxSectionBoundaryControl.Location = new System.Drawing.Point(387, 507); this.cboxSectionBoundaryControl.Name = "cboxSectionBoundaryControl"; this.cboxSectionBoundaryControl.Size = new System.Drawing.Size(104, 52); this.cboxSectionBoundaryControl.TabIndex = 501; @@ -4581,7 +4580,7 @@ private void InitializeComponent() this.nudMinCoverage.BackColor = System.Drawing.Color.AliceBlue; this.nudMinCoverage.Font = new System.Drawing.Font("Tahoma", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nudMinCoverage.InterceptArrowKeys = false; - this.nudMinCoverage.Location = new System.Drawing.Point(258, 508); + this.nudMinCoverage.Location = new System.Drawing.Point(932, 258); this.nudMinCoverage.Name = "nudMinCoverage"; this.nudMinCoverage.ReadOnly = true; this.nudMinCoverage.Size = new System.Drawing.Size(132, 52); @@ -9006,7 +9005,6 @@ private void InitializeComponent() this.tabDisplay.Controls.Add(this.label42); this.tabDisplay.Controls.Add(this.label101); this.tabDisplay.Controls.Add(this.label43); - this.tabDisplay.Controls.Add(this.label36); this.tabDisplay.Controls.Add(this.label33); this.tabDisplay.Controls.Add(this.label28); this.tabDisplay.Controls.Add(this.chkSpeedo); @@ -9019,7 +9017,6 @@ private void InitializeComponent() this.tabDisplay.Controls.Add(this.chkDisplayKeyboard); this.tabDisplay.Controls.Add(this.chkDisplayPolygons); this.tabDisplay.Controls.Add(this.chkDisplayStartFullScreen); - this.tabDisplay.Controls.Add(this.chkDisplayLogNMEA); this.tabDisplay.Controls.Add(this.chkDisplayGrid); this.tabDisplay.Controls.Add(this.chkDisplaySpeedo); this.tabDisplay.Controls.Add(this.chkDisplayExtraGuides); @@ -9140,7 +9137,7 @@ private void InitializeComponent() this.label79.AutoSize = true; this.label79.BackColor = System.Drawing.Color.Transparent; this.label79.ForeColor = System.Drawing.Color.Black; - this.label79.Location = new System.Drawing.Point(713, 232); + this.label79.Location = new System.Drawing.Point(712, 111); this.label79.Name = "label79"; this.label79.Size = new System.Drawing.Size(58, 16); this.label79.TabIndex = 531; @@ -9249,18 +9246,6 @@ private void InitializeComponent() this.label43.TabIndex = 523; this.label43.Text = "Polygons"; // - // label36 - // - this.label36.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label36.AutoSize = true; - this.label36.BackColor = System.Drawing.Color.Transparent; - this.label36.ForeColor = System.Drawing.Color.Black; - this.label36.Location = new System.Drawing.Point(713, 111); - this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(60, 16); - this.label36.TabIndex = 522; - this.label36.Text = "LogNMEA"; - // // label33 // this.label33.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -9333,7 +9318,7 @@ private void InitializeComponent() this.chkDisplayLogElevation.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkDisplayLogElevation.ForeColor = System.Drawing.SystemColors.ControlText; this.chkDisplayLogElevation.Image = global::AgOpenGPS.Properties.Resources.ConD_LogElevation; - this.chkDisplayLogElevation.Location = new System.Drawing.Point(709, 160); + this.chkDisplayLogElevation.Location = new System.Drawing.Point(708, 39); this.chkDisplayLogElevation.Name = "chkDisplayLogElevation"; this.chkDisplayLogElevation.RightToLeft = System.Windows.Forms.RightToLeft.Yes; this.chkDisplayLogElevation.Size = new System.Drawing.Size(100, 69); @@ -9466,26 +9451,6 @@ private void InitializeComponent() this.chkDisplayStartFullScreen.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.chkDisplayStartFullScreen.UseVisualStyleBackColor = false; // - // chkDisplayLogNMEA - // - this.chkDisplayLogNMEA.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.chkDisplayLogNMEA.Appearance = System.Windows.Forms.Appearance.Button; - this.chkDisplayLogNMEA.BackColor = System.Drawing.Color.WhiteSmoke; - this.chkDisplayLogNMEA.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.chkDisplayLogNMEA.FlatAppearance.BorderSize = 2; - this.chkDisplayLogNMEA.FlatAppearance.CheckedBackColor = System.Drawing.Color.LightGreen; - this.chkDisplayLogNMEA.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.chkDisplayLogNMEA.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.chkDisplayLogNMEA.ForeColor = System.Drawing.SystemColors.ControlText; - this.chkDisplayLogNMEA.Image = global::AgOpenGPS.Properties.Resources.ConD_LogNMEA; - this.chkDisplayLogNMEA.Location = new System.Drawing.Point(709, 39); - this.chkDisplayLogNMEA.Name = "chkDisplayLogNMEA"; - this.chkDisplayLogNMEA.RightToLeft = System.Windows.Forms.RightToLeft.Yes; - this.chkDisplayLogNMEA.Size = new System.Drawing.Size(100, 69); - this.chkDisplayLogNMEA.TabIndex = 508; - this.chkDisplayLogNMEA.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.chkDisplayLogNMEA.UseVisualStyleBackColor = false; - // // chkDisplayGrid // this.chkDisplayGrid.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -9586,7 +9551,7 @@ private void InitializeComponent() this.lblCurrentVehicle.Font = new System.Drawing.Font("Tahoma", 14.25F); this.lblCurrentVehicle.ForeColor = System.Drawing.Color.Black; this.lblCurrentVehicle.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.lblCurrentVehicle.Location = new System.Drawing.Point(15, 4); + this.lblCurrentVehicle.Location = new System.Drawing.Point(21, 4); this.lblCurrentVehicle.Name = "lblCurrentVehicle"; this.lblCurrentVehicle.Size = new System.Drawing.Size(138, 23); this.lblCurrentVehicle.TabIndex = 450; @@ -9669,7 +9634,7 @@ private void InitializeComponent() this.panelBottom.ForeColor = System.Drawing.Color.Lime; this.panelBottom.Location = new System.Drawing.Point(124, 645); this.panelBottom.Name = "panelBottom"; - this.panelBottom.Size = new System.Drawing.Size(859, 66); + this.panelBottom.Size = new System.Drawing.Size(865, 66); this.panelBottom.TabIndex = 112; // // lblFeetMeters @@ -9693,7 +9658,7 @@ private void InitializeComponent() this.btnOK.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnOK.ForeColor = System.Drawing.SystemColors.ButtonFace; this.btnOK.Image = global::AgOpenGPS.Properties.Resources.OK64; - this.btnOK.Location = new System.Drawing.Point(774, 1); + this.btnOK.Location = new System.Drawing.Point(780, 1); this.btnOK.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(80, 62); @@ -9726,7 +9691,7 @@ private void InitializeComponent() this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.BackColor = System.Drawing.SystemColors.GradientInactiveCaption; - this.ClientSize = new System.Drawing.Size(987, 715); + this.ClientSize = new System.Drawing.Size(993, 715); this.ControlBox = false; this.Controls.Add(this.tab1); this.Controls.Add(this.panelBottom); @@ -10281,7 +10246,6 @@ private void InitializeComponent() private System.Windows.Forms.Label label101; private System.Windows.Forms.CheckBox chkDisplayFloor; private System.Windows.Forms.Label label43; - private System.Windows.Forms.Label label36; private System.Windows.Forms.Label label33; private System.Windows.Forms.Label label28; private System.Windows.Forms.Label chkSpeedo; @@ -10291,7 +10255,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox chkDisplayKeyboard; private System.Windows.Forms.CheckBox chkDisplayPolygons; private System.Windows.Forms.CheckBox chkDisplayStartFullScreen; - private System.Windows.Forms.CheckBox chkDisplayLogNMEA; private System.Windows.Forms.CheckBox chkDisplayGrid; private System.Windows.Forms.CheckBox chkDisplaySpeedo; private System.Windows.Forms.CheckBox chkDisplayExtraGuides; diff --git a/SourceCode/GPS/Properties/Resources.Designer.cs b/SourceCode/GPS/Properties/Resources.Designer.cs index d036a1e5e..b21d0f133 100644 --- a/SourceCode/GPS/Properties/Resources.Designer.cs +++ b/SourceCode/GPS/Properties/Resources.Designer.cs @@ -1099,16 +1099,6 @@ internal static System.Drawing.Bitmap ConD_LogElevation { } } - /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - internal static System.Drawing.Bitmap ConD_LogNMEA { - get { - object obj = ResourceManager.GetObject("ConD_LogNMEA", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/SourceCode/GPS/Properties/Resources.resx b/SourceCode/GPS/Properties/Resources.resx index a282e35ba..89281e6e7 100644 --- a/SourceCode/GPS/Properties/Resources.resx +++ b/SourceCode/GPS/Properties/Resources.resx @@ -151,9 +151,6 @@ ..\btnImages\Play.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\btnImages\Config\ConD_LogNMEA.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\btnImages\BoundaryCenter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/SourceCode/GPS/btnImages/Config/ConD_LogNMEA.png b/SourceCode/GPS/btnImages/Config/ConD_LogNMEA.png deleted file mode 100644 index c02be3d90..000000000 Binary files a/SourceCode/GPS/btnImages/Config/ConD_LogNMEA.png and /dev/null differ