# HG changeset patch # User mkanning@CL-ENS241-10.cedarville.edu # Date 2013-02-28 14:32:40 # Node ID bdc2be1924e8c2305a1bb22c9559e792824790e6 # Parent bd55ba5f4fde7023a338660c820f004ad6b4ff2a Fixed some bugs with the markers used for tracking balloon and creating routes diff --git a/Demo.WindowsForms/Forms/MainForm.Designer.cs b/Demo.WindowsForms/Forms/MainForm.Designer.cs --- a/Demo.WindowsForms/Forms/MainForm.Designer.cs +++ b/Demo.WindowsForms/Forms/MainForm.Designer.cs @@ -58,6 +58,8 @@ this.chrtBottomRight = new System.Windows.Forms.DataVisualization.Charting.Chart(); this.tabData = new System.Windows.Forms.TabPage(); this.gboxSlaveData = new System.Windows.Forms.GroupBox(); + this.tboxAtmoLight = new System.Windows.Forms.TextBox(); + this.label31 = new System.Windows.Forms.Label(); this.tboxCameraBatteryLevel = new System.Windows.Forms.TextBox(); this.label26 = new System.Windows.Forms.Label(); this.tboxCameraBoardTemp = new System.Windows.Forms.TextBox(); @@ -84,6 +86,10 @@ this.label8 = new System.Windows.Forms.Label(); this.label20 = new System.Windows.Forms.Label(); this.gboxMasterData = new System.Windows.Forms.GroupBox(); + this.tboxMasterHDOP = new System.Windows.Forms.TextBox(); + this.label30 = new System.Windows.Forms.Label(); + this.tboxMasterSatellites = new System.Windows.Forms.TextBox(); + this.label29 = new System.Windows.Forms.Label(); this.textBox6 = new System.Windows.Forms.TextBox(); this.label7 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); @@ -98,10 +104,6 @@ this.label1 = new System.Windows.Forms.Label(); this.tboxMessageBox = new System.Windows.Forms.TextBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.tboxMasterSatellites = new System.Windows.Forms.TextBox(); - this.label29 = new System.Windows.Forms.Label(); - this.tboxMasterHDOP = new System.Windows.Forms.TextBox(); - this.label30 = new System.Windows.Forms.Label(); this.MainMap = new Demo.WindowsForms.Map(); this.splitter1 = new BSE.Windows.Forms.Splitter(); this.panelMenu = new BSE.Windows.Forms.Panel(); @@ -109,23 +111,21 @@ this.xPanderPanelMain = new BSE.Windows.Forms.XPanderPanel(); this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); - this.groupBox8 = new System.Windows.Forms.GroupBox(); - this.btnZoomCenter = new System.Windows.Forms.Button(); - this.xboxPlacemarkInfo = new System.Windows.Forms.CheckBox(); + this.gboxRemove = new System.Windows.Forms.GroupBox(); this.btnClearAll = new System.Windows.Forms.Button(); - this.btnAddMarker = new System.Windows.Forms.Button(); - this.groupBox7 = new System.Windows.Forms.GroupBox(); + this.btnClearMarkers = new System.Windows.Forms.Button(); + this.btnClearRoutes = new System.Windows.Forms.Button(); + this.gboxMapItems = new System.Windows.Forms.GroupBox(); this.buttonExportToGpx = new System.Windows.Forms.Button(); + this.xboxPlacemarkInfo = new System.Windows.Forms.CheckBox(); this.MobileLogTo = new System.Windows.Forms.DateTimePicker(); - this.lblClear = new System.Windows.Forms.Label(); - this.btnClearPolygons = new System.Windows.Forms.Button(); this.MobileLogFrom = new System.Windows.Forms.DateTimePicker(); this.btnMobileLog = new System.Windows.Forms.Button(); - this.buttonSetEnd = new System.Windows.Forms.Button(); - this.buttonSetStart = new System.Windows.Forms.Button(); - this.btnClearRoutes = new System.Windows.Forms.Button(); + this.btnAddMarker = new System.Windows.Forms.Button(); + this.btnSetEnd = new System.Windows.Forms.Button(); + this.btnSetStart = new System.Windows.Forms.Button(); this.btnAddRoute = new System.Windows.Forms.Button(); - this.groupBox5 = new System.Windows.Forms.GroupBox(); + this.gboxGmap = new System.Windows.Forms.GroupBox(); this.btnLoadGPX = new System.Windows.Forms.Button(); this.btnGetStatic = new System.Windows.Forms.Button(); this.xboxGrid = new System.Windows.Forms.CheckBox(); @@ -136,16 +136,15 @@ this.xboxCurrentMarker = new System.Windows.Forms.CheckBox(); this.lblMapType = new System.Windows.Forms.Label(); this.comboBoxMapType = new System.Windows.Forms.ComboBox(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.lblGoTo = new System.Windows.Forms.Label(); - this.textBoxGeo = new System.Windows.Forms.TextBox(); + this.gboxCoordinates = new System.Windows.Forms.GroupBox(); + this.btnZoomCenter = new System.Windows.Forms.Button(); this.btnReload = new System.Windows.Forms.Button(); this.btnGoToCoords = new System.Windows.Forms.Button(); this.lblLng = new System.Windows.Forms.Label(); + this.cboxCollectData = new System.Windows.Forms.CheckBox(); this.lblLat = new System.Windows.Forms.Label(); this.textBoxLng = new System.Windows.Forms.TextBox(); this.textBoxLat = new System.Windows.Forms.TextBox(); - this.cboxCollectData = new System.Windows.Forms.CheckBox(); this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); this.btnZoomIn = new System.Windows.Forms.Button(); this.trackBarZoomLevel = new System.Windows.Forms.TrackBar(); @@ -176,8 +175,6 @@ this.label13 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label(); this.button17 = new System.Windows.Forms.Button(); - this.tboxAtmoLight = new System.Windows.Forms.TextBox(); - this.label31 = new System.Windows.Forms.Label(); this.tabMap.SuspendLayout(); this.panel4.SuspendLayout(); this.panel2.SuspendLayout(); @@ -208,10 +205,10 @@ this.xPanderPanelMain.SuspendLayout(); this.tableLayoutPanel4.SuspendLayout(); this.tableLayoutPanel5.SuspendLayout(); - this.groupBox8.SuspendLayout(); - this.groupBox7.SuspendLayout(); - this.groupBox5.SuspendLayout(); - this.groupBox3.SuspendLayout(); + this.gboxRemove.SuspendLayout(); + this.gboxMapItems.SuspendLayout(); + this.gboxGmap.SuspendLayout(); + this.gboxCoordinates.SuspendLayout(); this.tableLayoutPanel6.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.trackBarZoomLevel)).BeginInit(); this.xPanderPanelInfo.SuspendLayout(); @@ -226,7 +223,7 @@ this.tabMap.Location = new System.Drawing.Point(4, 22); this.tabMap.Name = "tabMap"; this.tabMap.Padding = new System.Windows.Forms.Padding(3); - this.tabMap.Size = new System.Drawing.Size(863, 425); + this.tabMap.Size = new System.Drawing.Size(863, 690); this.tabMap.TabIndex = 0; this.tabMap.Text = "Map"; this.tabMap.UseVisualStyleBackColor = true; @@ -240,7 +237,7 @@ this.panel4.Location = new System.Drawing.Point(3, 3); this.panel4.Margin = new System.Windows.Forms.Padding(2); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(857, 419); + this.panel4.Size = new System.Drawing.Size(857, 684); this.panel4.TabIndex = 44; // // panel2 @@ -252,13 +249,13 @@ this.panel2.Controls.Add(this.MainMap); this.panel2.Location = new System.Drawing.Point(0, 0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(599, 419); + this.panel2.Size = new System.Drawing.Size(599, 684); this.panel2.TabIndex = 41; // // btnTest // this.btnTest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnTest.Location = new System.Drawing.Point(555, 393); + this.btnTest.Location = new System.Drawing.Point(555, 658); this.btnTest.Name = "btnTest"; this.btnTest.Size = new System.Drawing.Size(41, 26); this.btnTest.TabIndex = 32; @@ -277,7 +274,7 @@ this.tabControl.Location = new System.Drawing.Point(0, 0); this.tabControl.Name = "tabControl"; this.tabControl.SelectedIndex = 0; - this.tabControl.Size = new System.Drawing.Size(871, 516); + this.tabControl.Size = new System.Drawing.Size(871, 716); this.tabControl.TabIndex = 45; // // tabGraphs @@ -287,7 +284,7 @@ this.tabGraphs.Location = new System.Drawing.Point(4, 22); this.tabGraphs.Name = "tabGraphs"; this.tabGraphs.Padding = new System.Windows.Forms.Padding(3); - this.tabGraphs.Size = new System.Drawing.Size(863, 425); + this.tabGraphs.Size = new System.Drawing.Size(863, 690); this.tabGraphs.TabIndex = 2; this.tabGraphs.Text = "Graphs"; this.tabGraphs.UseVisualStyleBackColor = true; @@ -414,17 +411,15 @@ // ctnParentChartHolder.Panel2 // this.ctnParentChartHolder.Panel2.Controls.Add(this.ctnBottomChartHolder); - this.ctnParentChartHolder.Size = new System.Drawing.Size(851, 381); - this.ctnParentChartHolder.SplitterDistance = 170; + this.ctnParentChartHolder.Size = new System.Drawing.Size(851, 646); + this.ctnParentChartHolder.SplitterDistance = 288; this.ctnParentChartHolder.TabIndex = 28; // // ctnTopChartHolder // - this.ctnTopChartHolder.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.ctnTopChartHolder.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.ctnTopChartHolder.Location = new System.Drawing.Point(3, 3); + this.ctnTopChartHolder.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctnTopChartHolder.Location = new System.Drawing.Point(0, 0); this.ctnTopChartHolder.Name = "ctnTopChartHolder"; // // ctnTopChartHolder.Panel1 @@ -436,15 +431,15 @@ // this.ctnTopChartHolder.Panel2.Controls.Add(this.lblTopRightChartTitle); this.ctnTopChartHolder.Panel2.Controls.Add(this.chrtTopRight); - this.ctnTopChartHolder.Size = new System.Drawing.Size(845, 164); - this.ctnTopChartHolder.SplitterDistance = 407; + this.ctnTopChartHolder.Size = new System.Drawing.Size(851, 288); + this.ctnTopChartHolder.SplitterDistance = 408; this.ctnTopChartHolder.TabIndex = 0; // // lblTopLeftChartTitle // this.lblTopLeftChartTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.lblTopLeftChartTitle.AutoSize = true; - this.lblTopLeftChartTitle.Location = new System.Drawing.Point(0, 149); + this.lblTopLeftChartTitle.Location = new System.Drawing.Point(0, 273); this.lblTopLeftChartTitle.Name = "lblTopLeftChartTitle"; this.lblTopLeftChartTitle.Size = new System.Drawing.Size(42, 13); this.lblTopLeftChartTitle.TabIndex = 2; @@ -452,12 +447,10 @@ // // chrtTopLeft // - this.chrtTopLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.chrtTopLeft.Location = new System.Drawing.Point(3, 3); + this.chrtTopLeft.Dock = System.Windows.Forms.DockStyle.Fill; + this.chrtTopLeft.Location = new System.Drawing.Point(0, 0); this.chrtTopLeft.Name = "chrtTopLeft"; - this.chrtTopLeft.Size = new System.Drawing.Size(399, 156); + this.chrtTopLeft.Size = new System.Drawing.Size(406, 286); this.chrtTopLeft.TabIndex = 1; this.chrtTopLeft.Text = "chart4"; this.chrtTopLeft.Click += new System.EventHandler(this.chrtTopLeft_Click); @@ -466,7 +459,7 @@ // this.lblTopRightChartTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.lblTopRightChartTitle.AutoSize = true; - this.lblTopRightChartTitle.Location = new System.Drawing.Point(0, 149); + this.lblTopRightChartTitle.Location = new System.Drawing.Point(0, 273); this.lblTopRightChartTitle.Name = "lblTopRightChartTitle"; this.lblTopRightChartTitle.Size = new System.Drawing.Size(47, 13); this.lblTopRightChartTitle.TabIndex = 1; @@ -474,12 +467,10 @@ // // chrtTopRight // - this.chrtTopRight.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.chrtTopRight.Location = new System.Drawing.Point(3, 3); + this.chrtTopRight.Dock = System.Windows.Forms.DockStyle.Fill; + this.chrtTopRight.Location = new System.Drawing.Point(0, 0); this.chrtTopRight.Name = "chrtTopRight"; - this.chrtTopRight.Size = new System.Drawing.Size(426, 156); + this.chrtTopRight.Size = new System.Drawing.Size(437, 286); this.chrtTopRight.TabIndex = 0; this.chrtTopRight.Text = "chart4"; this.chrtTopRight.Click += new System.EventHandler(this.chrtTopRight_Click); @@ -502,7 +493,7 @@ // this.ctnBottomChartHolder.Panel2.Controls.Add(this.lblBottomRightChartTitle); this.ctnBottomChartHolder.Panel2.Controls.Add(this.chrtBottomRight); - this.ctnBottomChartHolder.Size = new System.Drawing.Size(845, 201); + this.ctnBottomChartHolder.Size = new System.Drawing.Size(845, 348); this.ctnBottomChartHolder.SplitterDistance = 407; this.ctnBottomChartHolder.TabIndex = 0; // @@ -510,7 +501,7 @@ // this.lblBottomLeftChartTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.lblBottomLeftChartTitle.AutoSize = true; - this.lblBottomLeftChartTitle.Location = new System.Drawing.Point(0, 186); + this.lblBottomLeftChartTitle.Location = new System.Drawing.Point(0, 333); this.lblBottomLeftChartTitle.Name = "lblBottomLeftChartTitle"; this.lblBottomLeftChartTitle.Size = new System.Drawing.Size(48, 13); this.lblBottomLeftChartTitle.TabIndex = 1; @@ -518,12 +509,10 @@ // // chrtBottomLeft // - this.chrtBottomLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.chrtBottomLeft.Location = new System.Drawing.Point(3, -1); + this.chrtBottomLeft.Dock = System.Windows.Forms.DockStyle.Fill; + this.chrtBottomLeft.Location = new System.Drawing.Point(0, 0); this.chrtBottomLeft.Name = "chrtBottomLeft"; - this.chrtBottomLeft.Size = new System.Drawing.Size(399, 197); + this.chrtBottomLeft.Size = new System.Drawing.Size(405, 346); this.chrtBottomLeft.TabIndex = 0; this.chrtBottomLeft.Text = "chart2"; this.chrtBottomLeft.Click += new System.EventHandler(this.chrtBottomLeft_Click); @@ -532,7 +521,7 @@ // this.lblBottomRightChartTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.lblBottomRightChartTitle.AutoSize = true; - this.lblBottomRightChartTitle.Location = new System.Drawing.Point(0, 186); + this.lblBottomRightChartTitle.Location = new System.Drawing.Point(0, 333); this.lblBottomRightChartTitle.Name = "lblBottomRightChartTitle"; this.lblBottomRightChartTitle.Size = new System.Drawing.Size(44, 13); this.lblBottomRightChartTitle.TabIndex = 2; @@ -540,12 +529,10 @@ // // chrtBottomRight // - this.chrtBottomRight.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.chrtBottomRight.Location = new System.Drawing.Point(3, -1); + this.chrtBottomRight.Dock = System.Windows.Forms.DockStyle.Fill; + this.chrtBottomRight.Location = new System.Drawing.Point(0, 0); this.chrtBottomRight.Name = "chrtBottomRight"; - this.chrtBottomRight.Size = new System.Drawing.Size(426, 197); + this.chrtBottomRight.Size = new System.Drawing.Size(432, 346); this.chrtBottomRight.TabIndex = 1; this.chrtBottomRight.Text = "chart2"; this.chrtBottomRight.Click += new System.EventHandler(this.chrtBottomRight_Click); @@ -557,7 +544,7 @@ this.tabData.Location = new System.Drawing.Point(4, 22); this.tabData.Name = "tabData"; this.tabData.Padding = new System.Windows.Forms.Padding(10); - this.tabData.Size = new System.Drawing.Size(863, 490); + this.tabData.Size = new System.Drawing.Size(863, 690); this.tabData.TabIndex = 3; this.tabData.Text = "Data"; this.tabData.UseVisualStyleBackColor = true; @@ -599,6 +586,25 @@ this.gboxSlaveData.TabStop = false; this.gboxSlaveData.Text = "Slave Modules"; // + // tboxAtmoLight + // + this.tboxAtmoLight.BackColor = System.Drawing.SystemColors.Control; + this.tboxAtmoLight.Location = new System.Drawing.Point(146, 134); + this.tboxAtmoLight.Name = "tboxAtmoLight"; + this.tboxAtmoLight.ReadOnly = true; + this.tboxAtmoLight.Size = new System.Drawing.Size(100, 20); + this.tboxAtmoLight.TabIndex = 43; + // + // label31 + // + this.label31.AutoSize = true; + this.label31.Location = new System.Drawing.Point(40, 137); + this.label31.Margin = new System.Windows.Forms.Padding(30, 7, 5, 7); + this.label31.Name = "label31"; + this.label31.Size = new System.Drawing.Size(71, 13); + this.label31.TabIndex = 42; + this.label31.Text = "Ambient Light"; + // // tboxCameraBatteryLevel // this.tboxCameraBatteryLevel.Location = new System.Drawing.Point(146, 403); @@ -854,6 +860,42 @@ this.gboxMasterData.TabStop = false; this.gboxMasterData.Text = "Master Module"; // + // tboxMasterHDOP + // + this.tboxMasterHDOP.Location = new System.Drawing.Point(120, 214); + this.tboxMasterHDOP.Name = "tboxMasterHDOP"; + this.tboxMasterHDOP.ReadOnly = true; + this.tboxMasterHDOP.Size = new System.Drawing.Size(100, 20); + this.tboxMasterHDOP.TabIndex = 21; + // + // label30 + // + this.label30.AutoSize = true; + this.label30.Location = new System.Drawing.Point(14, 217); + this.label30.Margin = new System.Windows.Forms.Padding(5, 7, 5, 7); + this.label30.Name = "label30"; + this.label30.Size = new System.Drawing.Size(38, 13); + this.label30.TabIndex = 20; + this.label30.Text = "HDOP"; + // + // tboxMasterSatellites + // + this.tboxMasterSatellites.Location = new System.Drawing.Point(121, 188); + this.tboxMasterSatellites.Name = "tboxMasterSatellites"; + this.tboxMasterSatellites.ReadOnly = true; + this.tboxMasterSatellites.Size = new System.Drawing.Size(100, 20); + this.tboxMasterSatellites.TabIndex = 19; + // + // label29 + // + this.label29.AutoSize = true; + this.label29.Location = new System.Drawing.Point(15, 191); + this.label29.Margin = new System.Windows.Forms.Padding(5, 7, 5, 7); + this.label29.Name = "label29"; + this.label29.Size = new System.Drawing.Size(86, 13); + this.label29.TabIndex = 18; + this.label29.Text = "Satellites in View"; + // // textBox6 // this.textBox6.Location = new System.Drawing.Point(120, 162); @@ -966,16 +1008,14 @@ // tboxMessageBox // this.tboxMessageBox.AcceptsReturn = true; - this.tboxMessageBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.tboxMessageBox.BackColor = System.Drawing.SystemColors.ScrollBar; - this.tboxMessageBox.Location = new System.Drawing.Point(0, 3); + this.tboxMessageBox.Dock = System.Windows.Forms.DockStyle.Fill; + this.tboxMessageBox.Location = new System.Drawing.Point(0, 0); this.tboxMessageBox.Multiline = true; this.tboxMessageBox.Name = "tboxMessageBox"; this.tboxMessageBox.ReadOnly = true; this.tboxMessageBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.tboxMessageBox.Size = new System.Drawing.Size(868, 81); + this.tboxMessageBox.Size = new System.Drawing.Size(871, 120); this.tboxMessageBox.TabIndex = 30; // // splitContainer1 @@ -994,46 +1034,10 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.tboxMessageBox); - this.splitContainer1.Size = new System.Drawing.Size(871, 603); - this.splitContainer1.SplitterDistance = 515; + this.splitContainer1.Size = new System.Drawing.Size(871, 839); + this.splitContainer1.SplitterDistance = 715; this.splitContainer1.TabIndex = 46; // - // tboxMasterSatellites - // - this.tboxMasterSatellites.Location = new System.Drawing.Point(121, 188); - this.tboxMasterSatellites.Name = "tboxMasterSatellites"; - this.tboxMasterSatellites.ReadOnly = true; - this.tboxMasterSatellites.Size = new System.Drawing.Size(100, 20); - this.tboxMasterSatellites.TabIndex = 19; - // - // label29 - // - this.label29.AutoSize = true; - this.label29.Location = new System.Drawing.Point(15, 191); - this.label29.Margin = new System.Windows.Forms.Padding(5, 7, 5, 7); - this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(86, 13); - this.label29.TabIndex = 18; - this.label29.Text = "Satellites in View"; - // - // tboxMasterHDOP - // - this.tboxMasterHDOP.Location = new System.Drawing.Point(120, 214); - this.tboxMasterHDOP.Name = "tboxMasterHDOP"; - this.tboxMasterHDOP.ReadOnly = true; - this.tboxMasterHDOP.Size = new System.Drawing.Size(100, 20); - this.tboxMasterHDOP.TabIndex = 21; - // - // label30 - // - this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(14, 217); - this.label30.Margin = new System.Windows.Forms.Padding(5, 7, 5, 7); - this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(38, 13); - this.label30.TabIndex = 20; - this.label30.Text = "HDOP"; - // // MainMap // this.MainMap.Bearing = 0F; @@ -1056,7 +1060,7 @@ this.MainMap.ScaleMode = GMap.NET.WindowsForms.ScaleModes.Integer; this.MainMap.SelectedAreaFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(33)))), ((int)(((byte)(65)))), ((int)(((byte)(105)))), ((int)(((byte)(225))))); this.MainMap.ShowTileGridLines = false; - this.MainMap.Size = new System.Drawing.Size(599, 419); + this.MainMap.Size = new System.Drawing.Size(599, 684); this.MainMap.TabIndex = 0; this.MainMap.Zoom = 0D; // @@ -1070,7 +1074,7 @@ this.splitter1.MinExtra = 390; this.splitter1.MinSize = 390; this.splitter1.Name = "splitter1"; - this.splitter1.Size = new System.Drawing.Size(2, 419); + this.splitter1.Size = new System.Drawing.Size(2, 684); this.splitter1.TabIndex = 42; this.splitter1.TabStop = false; // @@ -1104,7 +1108,7 @@ this.panelMenu.Name = "panelMenu"; this.panelMenu.PanelStyle = BSE.Windows.Forms.PanelStyle.Office2007; this.panelMenu.ShowExpandIcon = true; - this.panelMenu.Size = new System.Drawing.Size(258, 419); + this.panelMenu.Size = new System.Drawing.Size(258, 684); this.panelMenu.TabIndex = 40; this.panelMenu.Text = "Menu"; this.panelMenu.ToolTipTextCloseIcon = null; @@ -1125,7 +1129,7 @@ this.xPanderPanelList1.PanelColors = null; this.xPanderPanelList1.PanelStyle = BSE.Windows.Forms.PanelStyle.Office2007; this.xPanderPanelList1.ShowExpandIcon = true; - this.xPanderPanelList1.Size = new System.Drawing.Size(258, 390); + this.xPanderPanelList1.Size = new System.Drawing.Size(258, 655); this.xPanderPanelList1.TabIndex = 0; this.xPanderPanelList1.Text = "xPanderPanelList1"; // @@ -1161,7 +1165,7 @@ this.xPanderPanelMain.Margin = new System.Windows.Forms.Padding(2); this.xPanderPanelMain.Name = "xPanderPanelMain"; this.xPanderPanelMain.PanelStyle = BSE.Windows.Forms.PanelStyle.Office2007; - this.xPanderPanelMain.Size = new System.Drawing.Size(258, 340); + this.xPanderPanelMain.Size = new System.Drawing.Size(258, 605); this.xPanderPanelMain.TabIndex = 0; this.xPanderPanelMain.Text = "map"; this.xPanderPanelMain.ToolTipTextCloseIcon = null; @@ -1182,18 +1186,17 @@ this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 1; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(256, 315); + this.tableLayoutPanel4.Size = new System.Drawing.Size(256, 580); this.tableLayoutPanel4.TabIndex = 38; // // tableLayoutPanel5 // this.tableLayoutPanel5.ColumnCount = 1; this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel5.Controls.Add(this.groupBox8, 0, 3); - this.tableLayoutPanel5.Controls.Add(this.groupBox7, 0, 2); - this.tableLayoutPanel5.Controls.Add(this.groupBox5, 0, 1); - this.tableLayoutPanel5.Controls.Add(this.groupBox3, 0, 0); - this.tableLayoutPanel5.Controls.Add(this.cboxCollectData, 0, 4); + this.tableLayoutPanel5.Controls.Add(this.gboxRemove, 0, 3); + this.tableLayoutPanel5.Controls.Add(this.gboxMapItems, 0, 2); + this.tableLayoutPanel5.Controls.Add(this.gboxGmap, 0, 1); + this.tableLayoutPanel5.Controls.Add(this.gboxCoordinates, 0, 0); this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel5.Location = new System.Drawing.Point(48, 0); this.tableLayoutPanel5.Margin = new System.Windows.Forms.Padding(0, 0, 2, 2); @@ -1204,85 +1207,76 @@ this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 6F)); - this.tableLayoutPanel5.Size = new System.Drawing.Size(206, 313); + this.tableLayoutPanel5.Size = new System.Drawing.Size(206, 578); this.tableLayoutPanel5.TabIndex = 30; // - // groupBox8 - // - this.groupBox8.Controls.Add(this.btnZoomCenter); - this.groupBox8.Controls.Add(this.xboxPlacemarkInfo); - this.groupBox8.Controls.Add(this.btnClearAll); - this.groupBox8.Controls.Add(this.btnAddMarker); - this.groupBox8.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox8.Location = new System.Drawing.Point(3, 450); - this.groupBox8.Name = "groupBox8"; - this.groupBox8.Size = new System.Drawing.Size(200, 74); - this.groupBox8.TabIndex = 37; - this.groupBox8.TabStop = false; - this.groupBox8.Text = "markers"; - // - // btnZoomCenter + // gboxRemove // - this.btnZoomCenter.Location = new System.Drawing.Point(6, 45); - this.btnZoomCenter.Name = "btnZoomCenter"; - this.btnZoomCenter.Size = new System.Drawing.Size(82, 24); - this.btnZoomCenter.TabIndex = 15; - this.btnZoomCenter.Text = "Zoom Center"; - this.btnZoomCenter.UseVisualStyleBackColor = true; - this.btnZoomCenter.Click += new System.EventHandler(this.button7_Click); - // - // xboxPlacemarkInfo - // - this.xboxPlacemarkInfo.AutoSize = true; - this.xboxPlacemarkInfo.CheckAlign = System.Drawing.ContentAlignment.TopLeft; - this.xboxPlacemarkInfo.Checked = true; - this.xboxPlacemarkInfo.CheckState = System.Windows.Forms.CheckState.Checked; - this.xboxPlacemarkInfo.Location = new System.Drawing.Point(94, 19); - this.xboxPlacemarkInfo.Name = "xboxPlacemarkInfo"; - this.xboxPlacemarkInfo.Size = new System.Drawing.Size(72, 17); - this.xboxPlacemarkInfo.TabIndex = 14; - this.xboxPlacemarkInfo.Text = "place info"; - this.xboxPlacemarkInfo.UseVisualStyleBackColor = true; + this.gboxRemove.AutoSize = true; + this.gboxRemove.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.gboxRemove.Controls.Add(this.btnClearAll); + this.gboxRemove.Controls.Add(this.btnClearMarkers); + this.gboxRemove.Controls.Add(this.btnClearRoutes); + this.gboxRemove.Dock = System.Windows.Forms.DockStyle.Fill; + this.gboxRemove.Location = new System.Drawing.Point(3, 495); + this.gboxRemove.Name = "gboxRemove"; + this.gboxRemove.Size = new System.Drawing.Size(200, 91); + this.gboxRemove.TabIndex = 37; + this.gboxRemove.TabStop = false; + this.gboxRemove.Text = "Remove Map Item"; // // btnClearAll // - this.btnClearAll.Location = new System.Drawing.Point(94, 45); + this.btnClearAll.Location = new System.Drawing.Point(9, 49); this.btnClearAll.Name = "btnClearAll"; - this.btnClearAll.Size = new System.Drawing.Size(63, 24); - this.btnClearAll.TabIndex = 13; + this.btnClearAll.Size = new System.Drawing.Size(75, 23); + this.btnClearAll.TabIndex = 46; this.btnClearAll.Text = "Clear All"; this.btnClearAll.UseVisualStyleBackColor = true; - this.btnClearAll.Click += new System.EventHandler(this.btnClearMarkers_Click); + this.btnClearAll.Click += new System.EventHandler(this.btnClearAll_Click); // - // btnAddMarker + // btnClearMarkers // - this.btnAddMarker.Location = new System.Drawing.Point(6, 15); - this.btnAddMarker.Name = "btnAddMarker"; - this.btnAddMarker.Size = new System.Drawing.Size(82, 24); - this.btnAddMarker.TabIndex = 12; - this.btnAddMarker.Text = "Add Marker"; - this.btnAddMarker.UseVisualStyleBackColor = true; - this.btnAddMarker.Click += new System.EventHandler(this.btnAddMarker_Click); + this.btnClearMarkers.AutoSize = true; + this.btnClearMarkers.Location = new System.Drawing.Point(68, 19); + this.btnClearMarkers.Name = "btnClearMarkers"; + this.btnClearMarkers.Size = new System.Drawing.Size(63, 24); + this.btnClearMarkers.TabIndex = 13; + this.btnClearMarkers.Text = "Markers"; + this.btnClearMarkers.UseVisualStyleBackColor = true; + this.btnClearMarkers.Click += new System.EventHandler(this.btnClearMarkers_Click); // - // groupBox7 + // btnClearRoutes // - this.groupBox7.Controls.Add(this.buttonExportToGpx); - this.groupBox7.Controls.Add(this.MobileLogTo); - this.groupBox7.Controls.Add(this.lblClear); - this.groupBox7.Controls.Add(this.btnClearPolygons); - this.groupBox7.Controls.Add(this.MobileLogFrom); - this.groupBox7.Controls.Add(this.btnMobileLog); - this.groupBox7.Controls.Add(this.buttonSetEnd); - this.groupBox7.Controls.Add(this.buttonSetStart); - this.groupBox7.Controls.Add(this.btnClearRoutes); - this.groupBox7.Controls.Add(this.btnAddRoute); - this.groupBox7.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox7.Location = new System.Drawing.Point(3, 289); - this.groupBox7.Name = "groupBox7"; - this.groupBox7.Size = new System.Drawing.Size(200, 155); - this.groupBox7.TabIndex = 35; - this.groupBox7.TabStop = false; - this.groupBox7.Text = "routing"; + this.btnClearRoutes.AutoSize = true; + this.btnClearRoutes.Location = new System.Drawing.Point(9, 19); + this.btnClearRoutes.Name = "btnClearRoutes"; + this.btnClearRoutes.Size = new System.Drawing.Size(55, 24); + this.btnClearRoutes.TabIndex = 34; + this.btnClearRoutes.Text = "Routes"; + this.btnClearRoutes.UseVisualStyleBackColor = true; + this.btnClearRoutes.Click += new System.EventHandler(this.btnClearRoutes_Click); + // + // gboxMapItems + // + this.gboxMapItems.AutoSize = true; + this.gboxMapItems.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.gboxMapItems.Controls.Add(this.buttonExportToGpx); + this.gboxMapItems.Controls.Add(this.xboxPlacemarkInfo); + this.gboxMapItems.Controls.Add(this.MobileLogTo); + this.gboxMapItems.Controls.Add(this.MobileLogFrom); + this.gboxMapItems.Controls.Add(this.btnMobileLog); + this.gboxMapItems.Controls.Add(this.btnAddMarker); + this.gboxMapItems.Controls.Add(this.btnSetEnd); + this.gboxMapItems.Controls.Add(this.btnSetStart); + this.gboxMapItems.Controls.Add(this.btnAddRoute); + this.gboxMapItems.Dock = System.Windows.Forms.DockStyle.Fill; + this.gboxMapItems.Location = new System.Drawing.Point(3, 322); + this.gboxMapItems.Name = "gboxMapItems"; + this.gboxMapItems.Size = new System.Drawing.Size(200, 167); + this.gboxMapItems.TabIndex = 35; + this.gboxMapItems.TabStop = false; + this.gboxMapItems.Text = "Add Map Item"; // // buttonExportToGpx // @@ -1295,6 +1289,19 @@ this.buttonExportToGpx.UseVisualStyleBackColor = true; this.buttonExportToGpx.Click += new System.EventHandler(this.buttonExportToGpx_Click); // + // xboxPlacemarkInfo + // + this.xboxPlacemarkInfo.AutoSize = true; + this.xboxPlacemarkInfo.CheckAlign = System.Drawing.ContentAlignment.TopLeft; + this.xboxPlacemarkInfo.Checked = true; + this.xboxPlacemarkInfo.CheckState = System.Windows.Forms.CheckState.Checked; + this.xboxPlacemarkInfo.Location = new System.Drawing.Point(97, 129); + this.xboxPlacemarkInfo.Name = "xboxPlacemarkInfo"; + this.xboxPlacemarkInfo.Size = new System.Drawing.Size(72, 17); + this.xboxPlacemarkInfo.TabIndex = 14; + this.xboxPlacemarkInfo.Text = "place info"; + this.xboxPlacemarkInfo.UseVisualStyleBackColor = true; + // // MobileLogTo // this.MobileLogTo.CustomFormat = "yyyy\'.\'MM\'.\'dd HH\':\'mm"; @@ -1306,25 +1313,6 @@ this.MobileLogTo.Size = new System.Drawing.Size(110, 20); this.MobileLogTo.TabIndex = 47; // - // lblClear - // - this.lblClear.AutoSize = true; - this.lblClear.Location = new System.Drawing.Point(9, 128); - this.lblClear.Name = "lblClear"; - this.lblClear.Size = new System.Drawing.Size(34, 13); - this.lblClear.TabIndex = 46; - this.lblClear.Text = "Clear:"; - // - // btnClearPolygons - // - this.btnClearPolygons.Location = new System.Drawing.Point(104, 124); - this.btnClearPolygons.Name = "btnClearPolygons"; - this.btnClearPolygons.Size = new System.Drawing.Size(56, 24); - this.btnClearPolygons.TabIndex = 45; - this.btnClearPolygons.Text = "Polygons"; - this.btnClearPolygons.UseVisualStyleBackColor = true; - this.btnClearPolygons.Click += new System.EventHandler(this.btnClearPolygons_Click); - // // MobileLogFrom // this.MobileLogFrom.CustomFormat = "yyyy\'.\'MM\'.\'dd HH\':\'mm"; @@ -1347,35 +1335,35 @@ this.btnMobileLog.UseVisualStyleBackColor = true; this.btnMobileLog.Click += new System.EventHandler(this.btnMobileLog_Click); // - // buttonSetEnd + // btnAddMarker // - this.buttonSetEnd.Location = new System.Drawing.Point(88, 19); - this.buttonSetEnd.Name = "buttonSetEnd"; - this.buttonSetEnd.Size = new System.Drawing.Size(73, 24); - this.buttonSetEnd.TabIndex = 42; - this.buttonSetEnd.Text = "set End"; - this.buttonSetEnd.UseVisualStyleBackColor = true; - this.buttonSetEnd.Click += new System.EventHandler(this.buttonSetEnd_Click); + this.btnAddMarker.Location = new System.Drawing.Point(9, 124); + this.btnAddMarker.Name = "btnAddMarker"; + this.btnAddMarker.Size = new System.Drawing.Size(82, 24); + this.btnAddMarker.TabIndex = 12; + this.btnAddMarker.Text = "Add Marker"; + this.btnAddMarker.UseVisualStyleBackColor = true; + this.btnAddMarker.Click += new System.EventHandler(this.addUserMarker); // - // buttonSetStart + // btnSetEnd // - this.buttonSetStart.Location = new System.Drawing.Point(9, 19); - this.buttonSetStart.Name = "buttonSetStart"; - this.buttonSetStart.Size = new System.Drawing.Size(73, 24); - this.buttonSetStart.TabIndex = 41; - this.buttonSetStart.Text = "set Start"; - this.buttonSetStart.UseVisualStyleBackColor = true; - this.buttonSetStart.Click += new System.EventHandler(this.buttonSetStart_Click); + this.btnSetEnd.Location = new System.Drawing.Point(88, 19); + this.btnSetEnd.Name = "btnSetEnd"; + this.btnSetEnd.Size = new System.Drawing.Size(73, 24); + this.btnSetEnd.TabIndex = 42; + this.btnSetEnd.Text = "set End"; + this.btnSetEnd.UseVisualStyleBackColor = true; + this.btnSetEnd.Click += new System.EventHandler(this.buttonSetEnd_Click); // - // btnClearRoutes + // btnSetStart // - this.btnClearRoutes.Location = new System.Drawing.Point(45, 124); - this.btnClearRoutes.Name = "btnClearRoutes"; - this.btnClearRoutes.Size = new System.Drawing.Size(55, 24); - this.btnClearRoutes.TabIndex = 34; - this.btnClearRoutes.Text = "Routes"; - this.btnClearRoutes.UseVisualStyleBackColor = true; - this.btnClearRoutes.Click += new System.EventHandler(this.btnClearRoutes_Click); + this.btnSetStart.Location = new System.Drawing.Point(9, 19); + this.btnSetStart.Name = "btnSetStart"; + this.btnSetStart.Size = new System.Drawing.Size(73, 24); + this.btnSetStart.TabIndex = 41; + this.btnSetStart.Text = "set Start"; + this.btnSetStart.UseVisualStyleBackColor = true; + this.btnSetStart.Click += new System.EventHandler(this.buttonSetStart_Click); // // btnAddRoute // @@ -1387,25 +1375,27 @@ this.btnAddRoute.UseVisualStyleBackColor = true; this.btnAddRoute.Click += new System.EventHandler(this.btnAddRoute_Click); // - // groupBox5 + // gboxGmap // - this.groupBox5.Controls.Add(this.btnLoadGPX); - this.groupBox5.Controls.Add(this.btnGetStatic); - this.groupBox5.Controls.Add(this.xboxGrid); - this.groupBox5.Controls.Add(this.btnSaveView); - this.groupBox5.Controls.Add(this.lblMode); - this.groupBox5.Controls.Add(this.comboBoxMode); - this.groupBox5.Controls.Add(this.xboxCanDrag); - this.groupBox5.Controls.Add(this.xboxCurrentMarker); - this.groupBox5.Controls.Add(this.lblMapType); - this.groupBox5.Controls.Add(this.comboBoxMapType); - this.groupBox5.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox5.Location = new System.Drawing.Point(3, 137); - this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(200, 146); - this.groupBox5.TabIndex = 31; - this.groupBox5.TabStop = false; - this.groupBox5.Text = "gmap"; + this.gboxGmap.AutoSize = true; + this.gboxGmap.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.gboxGmap.Controls.Add(this.btnLoadGPX); + this.gboxGmap.Controls.Add(this.btnGetStatic); + this.gboxGmap.Controls.Add(this.xboxGrid); + this.gboxGmap.Controls.Add(this.btnSaveView); + this.gboxGmap.Controls.Add(this.lblMode); + this.gboxGmap.Controls.Add(this.comboBoxMode); + this.gboxGmap.Controls.Add(this.xboxCanDrag); + this.gboxGmap.Controls.Add(this.xboxCurrentMarker); + this.gboxGmap.Controls.Add(this.lblMapType); + this.gboxGmap.Controls.Add(this.comboBoxMapType); + this.gboxGmap.Dock = System.Windows.Forms.DockStyle.Fill; + this.gboxGmap.Location = new System.Drawing.Point(3, 153); + this.gboxGmap.Name = "gboxGmap"; + this.gboxGmap.Size = new System.Drawing.Size(200, 163); + this.gboxGmap.TabIndex = 31; + this.gboxGmap.TabStop = false; + this.gboxGmap.Text = "gmap"; // // btnLoadGPX // @@ -1419,7 +1409,7 @@ // // btnGetStatic // - this.btnGetStatic.Location = new System.Drawing.Point(9, 117); + this.btnGetStatic.Location = new System.Drawing.Point(9, 121); this.btnGetStatic.Margin = new System.Windows.Forms.Padding(2); this.btnGetStatic.Name = "btnGetStatic"; this.btnGetStatic.Size = new System.Drawing.Size(73, 24); @@ -1442,7 +1432,7 @@ // // btnSaveView // - this.btnSaveView.Location = new System.Drawing.Point(92, 117); + this.btnSaveView.Location = new System.Drawing.Point(92, 121); this.btnSaveView.Margin = new System.Windows.Forms.Padding(2); this.btnSaveView.Name = "btnSaveView"; this.btnSaveView.Size = new System.Drawing.Size(69, 24); @@ -1515,46 +1505,39 @@ this.comboBoxMapType.TabIndex = 9; this.comboBoxMapType.DropDownClosed += new System.EventHandler(this.comboBoxMapType_DropDownClosed); // - // groupBox3 - // - this.groupBox3.Controls.Add(this.lblGoTo); - this.groupBox3.Controls.Add(this.textBoxGeo); - this.groupBox3.Controls.Add(this.btnReload); - this.groupBox3.Controls.Add(this.btnGoToCoords); - this.groupBox3.Controls.Add(this.lblLng); - this.groupBox3.Controls.Add(this.lblLat); - this.groupBox3.Controls.Add(this.textBoxLng); - this.groupBox3.Controls.Add(this.textBoxLat); - this.groupBox3.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox3.Location = new System.Drawing.Point(3, 3); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(200, 128); - this.groupBox3.TabIndex = 28; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "coordinates"; + // gboxCoordinates // - // lblGoTo - // - this.lblGoTo.AutoSize = true; - this.lblGoTo.Location = new System.Drawing.Point(132, 74); - this.lblGoTo.Name = "lblGoTo"; - this.lblGoTo.Size = new System.Drawing.Size(37, 13); - this.lblGoTo.TabIndex = 11; - this.lblGoTo.Text = "Go To"; + this.gboxCoordinates.AutoSize = true; + this.gboxCoordinates.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.gboxCoordinates.Controls.Add(this.btnZoomCenter); + this.gboxCoordinates.Controls.Add(this.btnReload); + this.gboxCoordinates.Controls.Add(this.btnGoToCoords); + this.gboxCoordinates.Controls.Add(this.lblLng); + this.gboxCoordinates.Controls.Add(this.cboxCollectData); + this.gboxCoordinates.Controls.Add(this.lblLat); + this.gboxCoordinates.Controls.Add(this.textBoxLng); + this.gboxCoordinates.Controls.Add(this.textBoxLat); + this.gboxCoordinates.Dock = System.Windows.Forms.DockStyle.Fill; + this.gboxCoordinates.Location = new System.Drawing.Point(3, 3); + this.gboxCoordinates.Name = "gboxCoordinates"; + this.gboxCoordinates.Size = new System.Drawing.Size(200, 144); + this.gboxCoordinates.TabIndex = 28; + this.gboxCoordinates.TabStop = false; + this.gboxCoordinates.Text = "coordinates"; // - // textBoxGeo + // btnZoomCenter // - this.textBoxGeo.Location = new System.Drawing.Point(9, 71); - this.textBoxGeo.Name = "textBoxGeo"; - this.textBoxGeo.Size = new System.Drawing.Size(122, 20); - this.textBoxGeo.TabIndex = 10; - this.textBoxGeo.Text = "lietuva vilnius"; - this.textBoxGeo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBoxGeo_KeyPress); + this.btnZoomCenter.Location = new System.Drawing.Point(84, 71); + this.btnZoomCenter.Name = "btnZoomCenter"; + this.btnZoomCenter.Size = new System.Drawing.Size(82, 24); + this.btnZoomCenter.TabIndex = 15; + this.btnZoomCenter.Text = "Zoom Center"; + this.btnZoomCenter.UseVisualStyleBackColor = true; + this.btnZoomCenter.Click += new System.EventHandler(this.button7_Click); // // btnReload // - this.btnReload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btnReload.Location = new System.Drawing.Point(85, 98); + this.btnReload.Location = new System.Drawing.Point(6, 101); this.btnReload.Name = "btnReload"; this.btnReload.Size = new System.Drawing.Size(74, 24); this.btnReload.TabIndex = 9; @@ -1564,8 +1547,7 @@ // // btnGoToCoords // - this.btnGoToCoords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btnGoToCoords.Location = new System.Drawing.Point(9, 98); + this.btnGoToCoords.Location = new System.Drawing.Point(6, 71); this.btnGoToCoords.Name = "btnGoToCoords"; this.btnGoToCoords.Size = new System.Drawing.Size(72, 24); this.btnGoToCoords.TabIndex = 8; @@ -1576,16 +1558,26 @@ // lblLng // this.lblLng.AutoSize = true; - this.lblLng.Location = new System.Drawing.Point(132, 48); + this.lblLng.Location = new System.Drawing.Point(135, 48); this.lblLng.Name = "lblLng"; this.lblLng.Size = new System.Drawing.Size(54, 13); this.lblLng.TabIndex = 3; this.lblLng.Text = "Longitude"; // + // cboxCollectData + // + this.cboxCollectData.AutoSize = true; + this.cboxCollectData.Location = new System.Drawing.Point(86, 106); + this.cboxCollectData.Name = "cboxCollectData"; + this.cboxCollectData.Size = new System.Drawing.Size(84, 17); + this.cboxCollectData.TabIndex = 38; + this.cboxCollectData.Text = "Collect Data"; + this.cboxCollectData.UseVisualStyleBackColor = true; + // // lblLat // this.lblLat.AutoSize = true; - this.lblLat.Location = new System.Drawing.Point(132, 22); + this.lblLat.Location = new System.Drawing.Point(135, 22); this.lblLat.Name = "lblLat"; this.lblLat.Size = new System.Drawing.Size(45, 13); this.lblLat.TabIndex = 2; @@ -1607,16 +1599,6 @@ this.textBoxLat.TabIndex = 0; this.textBoxLat.Text = "39.751248"; // - // cboxCollectData - // - this.cboxCollectData.AutoSize = true; - this.cboxCollectData.Location = new System.Drawing.Point(3, 530); - this.cboxCollectData.Name = "cboxCollectData"; - this.cboxCollectData.Size = new System.Drawing.Size(84, 1); - this.cboxCollectData.TabIndex = 38; - this.cboxCollectData.Text = "Collect Data"; - this.cboxCollectData.UseVisualStyleBackColor = true; - // // tableLayoutPanel6 // this.tableLayoutPanel6.ColumnCount = 1; @@ -1632,7 +1614,7 @@ this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel6.Size = new System.Drawing.Size(44, 311); + this.tableLayoutPanel6.Size = new System.Drawing.Size(44, 576); this.tableLayoutPanel6.TabIndex = 31; // // btnZoomIn @@ -1659,7 +1641,7 @@ this.trackBarZoomLevel.Minimum = 1; this.trackBarZoomLevel.Name = "trackBarZoomLevel"; this.trackBarZoomLevel.Orientation = System.Windows.Forms.Orientation.Vertical; - this.trackBarZoomLevel.Size = new System.Drawing.Size(45, 257); + this.trackBarZoomLevel.Size = new System.Drawing.Size(45, 522); this.trackBarZoomLevel.TabIndex = 29; this.trackBarZoomLevel.TickFrequency = 100; this.trackBarZoomLevel.TickStyle = System.Windows.Forms.TickStyle.TopLeft; @@ -1670,7 +1652,7 @@ // this.btnZoomOut.Dock = System.Windows.Forms.DockStyle.Fill; this.btnZoomOut.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnZoomOut.Location = new System.Drawing.Point(0, 284); + this.btnZoomOut.Location = new System.Drawing.Point(0, 549); this.btnZoomOut.Margin = new System.Windows.Forms.Padding(0); this.btnZoomOut.Name = "btnZoomOut"; this.btnZoomOut.Size = new System.Drawing.Size(45, 27); @@ -2060,31 +2042,12 @@ this.button17.Text = "Open cache location"; this.button17.UseVisualStyleBackColor = true; // - // tboxAtmoLight - // - this.tboxAtmoLight.BackColor = System.Drawing.SystemColors.Control; - this.tboxAtmoLight.Location = new System.Drawing.Point(146, 134); - this.tboxAtmoLight.Name = "tboxAtmoLight"; - this.tboxAtmoLight.ReadOnly = true; - this.tboxAtmoLight.Size = new System.Drawing.Size(100, 20); - this.tboxAtmoLight.TabIndex = 43; - // - // label31 - // - this.label31.AutoSize = true; - this.label31.Location = new System.Drawing.Point(40, 137); - this.label31.Margin = new System.Windows.Forms.Padding(30, 7, 5, 7); - this.label31.Name = "label31"; - this.label31.Size = new System.Drawing.Size(71, 13); - this.label31.TabIndex = 42; - this.label31.Text = "Ambient Light"; - // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.AliceBlue; - this.ClientSize = new System.Drawing.Size(895, 627); + this.ClientSize = new System.Drawing.Size(895, 863); this.Controls.Add(this.splitContainer1); this.KeyPreview = true; this.MinimumSize = new System.Drawing.Size(554, 105); @@ -2134,14 +2097,14 @@ this.tableLayoutPanel4.ResumeLayout(false); this.tableLayoutPanel5.ResumeLayout(false); this.tableLayoutPanel5.PerformLayout(); - this.groupBox8.ResumeLayout(false); - this.groupBox8.PerformLayout(); - this.groupBox7.ResumeLayout(false); - this.groupBox7.PerformLayout(); - this.groupBox5.ResumeLayout(false); - this.groupBox5.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); + this.gboxRemove.ResumeLayout(false); + this.gboxRemove.PerformLayout(); + this.gboxMapItems.ResumeLayout(false); + this.gboxMapItems.PerformLayout(); + this.gboxGmap.ResumeLayout(false); + this.gboxGmap.PerformLayout(); + this.gboxCoordinates.ResumeLayout(false); + this.gboxCoordinates.PerformLayout(); this.tableLayoutPanel6.ResumeLayout(false); this.tableLayoutPanel6.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.trackBarZoomLevel)).EndInit(); @@ -2167,23 +2130,21 @@ private BSE.Windows.Forms.XPanderPanel xPanderPanelMain; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5; - private System.Windows.Forms.GroupBox groupBox8; + private System.Windows.Forms.GroupBox gboxRemove; private System.Windows.Forms.Button btnZoomCenter; private System.Windows.Forms.CheckBox xboxPlacemarkInfo; - private System.Windows.Forms.Button btnClearAll; + private System.Windows.Forms.Button btnClearMarkers; private System.Windows.Forms.Button btnAddMarker; - private System.Windows.Forms.GroupBox groupBox7; + private System.Windows.Forms.GroupBox gboxMapItems; private System.Windows.Forms.Button buttonExportToGpx; private System.Windows.Forms.DateTimePicker MobileLogTo; - private System.Windows.Forms.Label lblClear; - private System.Windows.Forms.Button btnClearPolygons; private System.Windows.Forms.DateTimePicker MobileLogFrom; private System.Windows.Forms.Button btnMobileLog; - private System.Windows.Forms.Button buttonSetEnd; - private System.Windows.Forms.Button buttonSetStart; + private System.Windows.Forms.Button btnSetEnd; + private System.Windows.Forms.Button btnSetStart; private System.Windows.Forms.Button btnClearRoutes; private System.Windows.Forms.Button btnAddRoute; - private System.Windows.Forms.GroupBox groupBox5; + private System.Windows.Forms.GroupBox gboxGmap; private System.Windows.Forms.Button btnLoadGPX; private System.Windows.Forms.Button btnGetStatic; private System.Windows.Forms.CheckBox xboxGrid; @@ -2194,9 +2155,7 @@ private System.Windows.Forms.CheckBox xboxCurrentMarker; private System.Windows.Forms.Label lblMapType; private System.Windows.Forms.ComboBox comboBoxMapType; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.Label lblGoTo; - private System.Windows.Forms.TextBox textBoxGeo; + private System.Windows.Forms.GroupBox gboxCoordinates; private System.Windows.Forms.Button btnReload; private System.Windows.Forms.Button btnGoToCoords; private System.Windows.Forms.Label lblLng; @@ -2307,6 +2266,7 @@ private System.Windows.Forms.Label label30; private System.Windows.Forms.TextBox tboxAtmoLight; private System.Windows.Forms.Label label31; + private System.Windows.Forms.Button btnClearAll; } diff --git a/Demo.WindowsForms/Forms/MainForm.cs b/Demo.WindowsForms/Forms/MainForm.cs --- a/Demo.WindowsForms/Forms/MainForm.cs +++ b/Demo.WindowsForms/Forms/MainForm.cs @@ -194,6 +194,7 @@ namespace Demo.WindowsForms // set current marker currentMarker = new GMarkerGoogle(MainMap.Position, GMarkerGoogleType.arrow); currentMarker.IsHitTestVisible = false; + currentMarker.ToolTipText = "Current Marker"; top.Markers.Add(currentMarker); //MainMap.VirtualSizeEnabled = true; @@ -288,26 +289,13 @@ namespace Demo.WindowsForms int tt = 0; void timer_Tick(object sender, EventArgs e) { - var pos = new PointLatLng(NextDouble(rnd, MainMap.ViewArea.Top, MainMap.ViewArea.Bottom), NextDouble(rnd, MainMap.ViewArea.Left, MainMap.ViewArea.Right)); - GMapMarker m = new GMarkerGoogle(pos, GMarkerGoogleType.green_pushpin); - { - m.ToolTipText = (tt++).ToString(); - m.ToolTipMode = MarkerTooltipMode.Always; - } - - objects.Markers.Add(m); - - if (tt >= 333) - { - timerPerf.Stop(); - tt = 0; - } + } System.Windows.Forms.Timer timerPerf = new System.Windows.Forms.Timer(); #endregion - #region -- flight demo -- + //#region -- flight demo -- //BackgroundWorker flightWorker = new BackgroundWorker(); //readonly List flights = new List(); @@ -392,9 +380,9 @@ namespace Demo.WindowsForms // flightMarkers.Clear(); //} - #endregion - - #region -- transport demo -- + //#endregion + /// + //#region -- transport demo -- //BackgroundWorker transportWorker = new BackgroundWorker(); //#region -- old vehicle demo -- @@ -522,9 +510,9 @@ namespace Demo.WindowsForms // busMarkers.Clear(); //} - #endregion - - #region -- tcp/ip connections demo -- + //#endregion + /// + //#region -- tcp/ip connections demo -- // BackgroundWorker connectionsWorker = new BackgroundWorker(); // BackgroundWorker ipInfoSearchWorker = new BackgroundWorker(); // BackgroundWorker iptracerWorker = new BackgroundWorker(); @@ -1219,7 +1207,7 @@ namespace Demo.WindowsForms // return ret; // } - #endregion + //#endregion #region -- some functions -- @@ -1259,6 +1247,7 @@ namespace Demo.WindowsForms //} // load mobile gps log + void AddGpsMobileLogRoutes(string file) { try @@ -1334,30 +1323,30 @@ namespace Demo.WindowsForms } } - /// - /// adds marker using geocoder - /// - /// - void AddLocationLithuania(string place) - { - GeoCoderStatusCode status = GeoCoderStatusCode.Unknow; - PointLatLng? pos = GMapProviders.GoogleMap.GetPoint("Lithuania, " + place, out status); - if (pos != null && status == GeoCoderStatusCode.G_GEO_SUCCESS) - { - GMarkerGoogle m = new GMarkerGoogle(pos.Value, GMarkerGoogleType.green); - m.ToolTip = new GMapRoundedToolTip(m); - - GMapMarkerRect mBorders = new GMapMarkerRect(pos.Value); - { - mBorders.InnerMarker = m; - mBorders.ToolTipText = place; - mBorders.ToolTipMode = MarkerTooltipMode.Always; - } - - objects.Markers.Add(m); - objects.Markers.Add(mBorders); - } - } + ///// + ///// adds marker using geocoder + ///// + ///// + //void AddLocationLithuania(string place) + //{ + // GeoCoderStatusCode status = GeoCoderStatusCode.Unknow; + // PointLatLng? pos = GMapProviders.GoogleMap.GetPoint("Lithuania, " + place, out status); + // if (pos != null && status == GeoCoderStatusCode.G_GEO_SUCCESS) + // { + // GMarkerGoogle m = new GMarkerGoogle(pos.Value, GMarkerGoogleType.green); + // m.ToolTip = new GMapRoundedToolTip(m); + + // GMapMarkerRect mBorders = new GMapMarkerRect(pos.Value); + // { + // mBorders.InnerMarker = m; + // mBorders.ToolTipText = place; + // mBorders.ToolTipMode = MarkerTooltipMode.Always; + // } + + // objects.Markers.Add(m); + // objects.Markers.Add(mBorders); + // } + //} #endregion @@ -1504,6 +1493,8 @@ namespace Demo.WindowsForms void MainMap_MouseDoubleClick(object sender, MouseEventArgs e) { var cc = new GMapMarkerCircle(MainMap.FromLocalToLatLng(e.X, e.Y)); + cc.ToolTipMode = MarkerTooltipMode.Always; + cc.ToolTipText = "CC"; objects.Markers.Add(cc); } @@ -1774,17 +1765,17 @@ namespace Demo.WindowsForms } // goto by geocoder - private void textBoxGeo_KeyPress(object sender, KeyPressEventArgs e) - { - if ((Keys)e.KeyChar == Keys.Enter) - { - GeoCoderStatusCode status = MainMap.SetCurrentPositionByKeywords(textBoxGeo.Text); - if (status != GeoCoderStatusCode.G_GEO_SUCCESS) - { - MessageBox.Show("Google Maps Geocoder can't find: '" + textBoxGeo.Text + "', reason: " + status.ToString(), "GMap.NET", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); - } - } - } + //private void textBoxGeo_KeyPress(object sender, KeyPressEventArgs e) + //{ + // if ((Keys)e.KeyChar == Keys.Enter) + // { + // GeoCoderStatusCode status = MainMap.SetCurrentPositionByKeywords(textBoxGeo.Text); + // if (status != GeoCoderStatusCode.G_GEO_SUCCESS) + // { + // MessageBox.Show("Google Maps Geocoder can't find: '" + textBoxGeo.Text + "', reason: " + status.ToString(), "GMap.NET", MessageBoxButtons.OK, MessageBoxIcon.Exclamation); + // } + // } + //} // reload map private void btnReload_Click(object sender, EventArgs e) @@ -1818,6 +1809,51 @@ namespace Demo.WindowsForms } } + // set route start + bool hasStartMarker = false; + private void buttonSetStart_Click(object sender, EventArgs e) + { + start = currentMarker.Position; + // - MDKAdd + GMarkerGoogle m = new GMarkerGoogle(currentMarker.Position, GMarkerGoogleType.green_small); + + //prevent multiple start markers from existing + if(hasStartMarker){ + objects.Markers.RemoveAt(0); + } + m.ToolTipText = "Start"; + m.ToolTipMode = MarkerTooltipMode.Always; + objects.Markers.Insert(0, m); + + hasStartMarker = true; + } + + // set route end + bool hasEndMarker = false; + private void buttonSetEnd_Click(object sender, EventArgs e) + { + end = currentMarker.Position; + // - MDKAdd + GMarkerGoogle m = new GMarkerGoogle(currentMarker.Position, GMarkerGoogleType.red_small); + + //prevent multiple start markers from existing + if (hasEndMarker) + { + objects.Markers.RemoveAt(1); + } + m.ToolTipText = "End"; + m.ToolTipMode = MarkerTooltipMode.Always; + if (hasStartMarker) + { + objects.Markers.Insert(1, m); + } + else + { + objects.Markers.Insert(0, m); + } + hasEndMarker = true; + } + // add test route private void btnAddRoute_Click(object sender, EventArgs e) { @@ -1853,7 +1889,7 @@ namespace Demo.WindowsForms } // add marker on current position - MDKEdit - private void btnAddMarker_Click(object sender, EventArgs e) + private void addUserMarker(object sender, EventArgs e) { GMarkerGoogle m = new GMarkerGoogle(currentMarker.Position, GMarkerGoogleType.blue_small); //GMapMarkerRect mBorders = new GMapMarkerRect(currentMarker.Position); @@ -1885,7 +1921,49 @@ namespace Demo.WindowsForms //{ // mBorders.ToolTipText = currentMarker.Position.ToString(); //} - + m.ToolTipText = "User"; + m.ToolTipMode = MarkerTooltipMode.Always; + objects.Markers.Add(m); + //objects.Markers.Add(mBorders); + + //RegeneratePolygon(); + } + + // add marker from APRS transmission - MDKEdit - TODO: Function not needed; addUserMarker() replaces it ?? + private void addMarkerFromButton(object sender, EventArgs e) + { + GMarkerGoogle m = new GMarkerGoogle(currentMarker.Position, GMarkerGoogleType.blue_small); + //GMapMarkerRect mBorders = new GMapMarkerRect(currentMarker.Position); + //{ + // mBorders.InnerMarker = m; + // if(polygon != null) + // { + // mBorders.Tag = polygon.Points.Count; + // } + // mBorders.ToolTipMode = MarkerTooltipMode.Always; + //} + + Placemark? p = null; + if (xboxPlacemarkInfo.Checked) + { + GeoCoderStatusCode status; + var ret = GMapProviders.GoogleMap.GetPlacemark(currentMarker.Position, out status); + if (status == GeoCoderStatusCode.G_GEO_SUCCESS && ret != null) + { + p = ret; + } + } + + //if(p != null) + //{ + // mBorders.ToolTipText = p.Value.Address; + //} + //else + //{ + // mBorders.ToolTipText = currentMarker.Position.ToString(); + //} + m.ToolTipText = "Tracker"; + m.ToolTipMode = MarkerTooltipMode.Always; objects.Markers.Add(m); //objects.Markers.Add(mBorders); @@ -1896,18 +1974,47 @@ namespace Demo.WindowsForms private void btnClearRoutes_Click(object sender, EventArgs e) { routes.Routes.Clear(); + + //remove start/end markes of this route + string markerText = ""; + int count = objects.Markers.Count; + for (int i = count-1; i >= 0; i--) + { + markerText = objects.Markers[i].ToolTipText.ToString(); + if (markerText.StartsWith("Start")) + { + objects.Markers.RemoveAt(i); + } + else if (markerText.StartsWith("End")) + { + objects.Markers.RemoveAt(i); + //objects.Markers[i].Dispose(); + } + } + hasEndMarker = false; + hasStartMarker = false; } - - // clear polygons - private void btnClearPolygons_Click(object sender, EventArgs e) - { - //polygons.Polygons.Clear(); - } - + // clear markers private void btnClearMarkers_Click(object sender, EventArgs e) { + //preserve stert/end markes of this route + string markerText = ""; + int count = objects.Markers.Count; + for (int i = (count - 1); i >= 0; i--) + { + markerText = objects.Markers[i].ToolTipText.ToString(); + if (markerText.StartsWith("User")) + { + objects.Markers.RemoveAt(i); + } + } + } + + private void btnClearAll_Click(object sender, EventArgs e) + { objects.Markers.Clear(); + objects.Routes.Clear(); hasEndMarker = false; hasStartMarker = false; } @@ -1924,43 +2031,7 @@ namespace Demo.WindowsForms MainMap.CanDragMap = xboxCanDrag.Checked; } - bool hasStartMarker = false; - // set route start - private void buttonSetStart_Click(object sender, EventArgs e) - { - start = currentMarker.Position; - // - MDKAdd - GMarkerGoogle m = new GMarkerGoogle(currentMarker.Position, GMarkerGoogleType.green_small); - - //prevent multiple start markers from existing - if(hasStartMarker){ - objects.Markers.RemoveAt(0); - } - - objects.Markers.Insert(0, m); - if (hasEndMarker) - { - objects.Markers.Move(2, 1); - } - hasStartMarker = true; - } - - bool hasEndMarker = false; - // set route end - private void buttonSetEnd_Click(object sender, EventArgs e) - { - end = currentMarker.Position; - // - MDKAdd - GMarkerGoogle m = new GMarkerGoogle(currentMarker.Position, GMarkerGoogleType.red_small); - - //prevent multiple start markers from existing - if (hasEndMarker) - { - objects.Markers.RemoveAt(1); - } - objects.Markers.Insert(1, m); - hasEndMarker = true; - } + // zoom to max for markers private void button7_Click(object sender, EventArgs e) @@ -2433,56 +2504,54 @@ namespace Demo.WindowsForms chrtBottomRight.BackColor = Color.LightGray; } - //highlight Top Left chart on click - //set text box values based on this chart + ///TODO: check min/max/average with real data + + //highlight Top Left chart on click and set text box values based on this chart private void chrtTopLeft_Click(object sender, EventArgs e) { ResetChartColors(); chrtTopLeft.BackColor = Color.Gray; tboxChartData.Text = "Altitude"; - tboxCurrent.Text = ""; - tboxAverage.Text = ""; - tboxMax.Text = ""; - tboxMin.Text = ""; + tboxCurrent.Text = tboxAtmoAltitude.Text; + tboxAverage.Text = (velocitySum / chrtBottomRight.Series.FindByName("altitudeTrend").Points.Count).ToString(); + tboxMax.Text = chrtBottomRight.Series.FindByName("altitudeTrend").Points.FindMaxByValue().ToString(); + tboxMin.Text = chrtBottomRight.Series.FindByName("altitudeTrend").Points.FindMinByValue().ToString(); } - //highlight Top Right chart on click - //set text box values based on this chart + //highlight Top Right chart on click and set text box values based on this chart private void chrtTopRight_Click(object sender, EventArgs e) { ResetChartColors(); chrtTopRight.BackColor = Color.Gray; tboxChartData.Text = "Humidity"; - tboxCurrent.Text = ""; - tboxAverage.Text = ""; - tboxMax.Text = ""; - tboxMin.Text = ""; + tboxCurrent.Text = tboxAtmoHumidity.Text; + tboxAverage.Text = (humiditySum / chrtBottomRight.Series.FindByName("humidityTrend").Points.Count).ToString(); + tboxMax.Text = chrtBottomRight.Series.FindByName("humidityTrend").Points.FindMaxByValue().ToString(); + tboxMin.Text = chrtBottomRight.Series.FindByName("humidityTrend").Points.FindMinByValue().ToString(); } - //highlight Bottom Left chart on click - //set text box values based on this chart + //highlight Bottom Left chart on click and set text box values based on this chart private void chrtBottomLeft_Click(object sender, EventArgs e) { ResetChartColors(); chrtBottomLeft.BackColor = Color.Gray; tboxChartData.Text = "Pressure"; - tboxCurrent.Text = ""; - tboxAverage.Text = ""; - tboxMax.Text = ""; - tboxMin.Text = ""; + tboxCurrent.Text = tboxAtmoPressure.Text; + tboxAverage.Text = (pressureSum / chrtBottomRight.Series.FindByName("pressureTrend").Points.Count).ToString(); + tboxMax.Text = chrtBottomRight.Series.FindByName("pressureTrend").Points.FindMaxByValue().ToString(); + tboxMin.Text = chrtBottomRight.Series.FindByName("pressureTrend").Points.FindMinByValue().ToString(); } - //highlight Bottom Right chart on click - //set text box values based on this chart + //highlight Bottom Right chart on click and set text box values based on this chart private void chrtBottomRight_Click(object sender, EventArgs e) { ResetChartColors(); chrtBottomRight.BackColor = Color.Gray; - tboxChartData.Text = "Map"; - tboxCurrent.Text = ""; - tboxAverage.Text = ""; - tboxMax.Text = ""; - tboxMin.Text = ""; + tboxChartData.Text = "Velocity"; + tboxCurrent.Text = tboxMasterVelocity.Text; + tboxAverage.Text = (velocitySum / chrtBottomRight.Series.FindByName("velocityTrend").Points.Count).ToString(); + tboxMax.Text = chrtBottomRight.Series.FindByName("velocityTrend").Points.FindMaxByValue().ToString(); + tboxMin.Text = chrtBottomRight.Series.FindByName("velocityTrend").Points.FindMinByValue().ToString(); } #endregion @@ -2492,7 +2561,11 @@ namespace Demo.WindowsForms string latitude; string longitude; bool firstTransmissionDatum = false; - + double velocitySum = 0; + double humiditySum = 0; + double altitudeSum = 0; + double pressureSum = 0; + //runs on init public void PrepareGraphs(){ @@ -2650,7 +2723,7 @@ namespace Demo.WindowsForms else { //marker added here so extra accuracy can be added - addMarkerFromTransmit(latitude, longitude); + addTrackerMarker(latitude, longitude); } //display transmission in message box @@ -2670,18 +2743,17 @@ namespace Demo.WindowsForms } - //write the data to CSV file + //write the data to CSV file -- usually seniordesign-ui\Demo.WindowsForms\bin\Debug private void WriteToCSV(string data) { string path = Directory.GetCurrentDirectory(); - string filename = path+"\\debug" + unixTime.Milliseconds + ".csv"; + string filename = path+"\\TransmissionData" + unixTime.Milliseconds + ".csv"; using (StreamWriter writer = new StreamWriter(filename, true)) { writer.WriteLine(data); } } - //must change lat/long coords to properly place map marker float conv_coords(float in_coords) { @@ -2702,7 +2774,7 @@ namespace Demo.WindowsForms } // add marker from an APRS transmission - MDKEdit - private void addMarkerFromTransmit(string lat, string lng) + private void addTrackerMarker(string lat, string lng) { double latitude = double.Parse(lat), longitude = double.Parse(lng); @@ -2722,12 +2794,10 @@ namespace Demo.WindowsForms p = ret; } } - + m.ToolTipText = "Tracker"; + m.ToolTipMode = MarkerTooltipMode.Always; objects.Markers.Add(m); } - #endregion - - #region cross theading //places text in the message box delegate void SetTextDelegate(string value); @@ -2835,6 +2905,7 @@ namespace Demo.WindowsForms else if (dataType.Equals("v")) //Velocity { chrtBottomRight.Series.FindByName("velocityTrend").Points.AddY(double.Parse(data)); + velocitySum += double.Parse(data); tboxMasterVelocity.Text = data.ToString(); tboxMasterVelocity.BackColor = Color.Chartreuse; } @@ -2858,18 +2929,21 @@ namespace Demo.WindowsForms else if (dataType.Equals("H")) //Humidity { chrtTopRight.Series.FindByName("humidityTrend").Points.AddY(double.Parse(data)); + humiditySum += double.Parse(data); tboxAtmoHumidity.Text = data.ToString(); tboxAtmoHumidity.BackColor = Color.Chartreuse; } else if (dataType.Equals("P")) //Pressure { chrtBottomLeft.Series.FindByName("pressureTrend").Points.AddY(double.Parse(data)); + pressureSum += double.Parse(data); tboxAtmoPressure.Text = data.ToString(); tboxAtmoPressure.BackColor = Color.Chartreuse; } else if (dataType.Equals("A")) //Altitude { chrtTopLeft.Series.FindByName("altitudeTrend").Points.AddY(double.Parse(data)); + altitudeSum += double.Parse(data); tboxAtmoAltitude.Text = data.ToString(); tboxAtmoAltitude.BackColor = Color.Chartreuse; } @@ -2993,3 +3067,5 @@ namespace Demo.WindowsForms } } //TODO: CSV logging, offline caching +//weekly changes: chart text display, map functionality[routes, layout, markers], +//resume @: start/stop markers clear tracker markers after route clear \ No newline at end of file