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 @@ -97,6 +97,7 @@ this.textBox1 = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.tboxMessageBox = new System.Windows.Forms.TextBox(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.MainMap = new Demo.WindowsForms.Map(); this.splitter1 = new BSE.Windows.Forms.Splitter(); this.panelMenu = new BSE.Windows.Forms.Panel(); @@ -193,6 +194,9 @@ this.tabData.SuspendLayout(); this.gboxSlaveData.SuspendLayout(); this.gboxMasterData.SuspendLayout(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); this.panelMenu.SuspendLayout(); this.xPanderPanelList1.SuspendLayout(); this.xPanderPanelMain.SuspendLayout(); @@ -216,7 +220,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(862, 701); + this.tabMap.Size = new System.Drawing.Size(863, 425); this.tabMap.TabIndex = 0; this.tabMap.Text = "Map"; this.tabMap.UseVisualStyleBackColor = true; @@ -230,7 +234,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(856, 695); + this.panel4.Size = new System.Drawing.Size(857, 419); this.panel4.TabIndex = 44; // // panel2 @@ -242,13 +246,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(628, 826); + this.panel2.Size = new System.Drawing.Size(599, 419); 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(587, 669); + this.btnTest.Location = new System.Drawing.Point(555, 393); this.btnTest.Name = "btnTest"; this.btnTest.Size = new System.Drawing.Size(41, 26); this.btnTest.TabIndex = 32; @@ -264,10 +268,10 @@ this.tabControl.Controls.Add(this.tabMap); this.tabControl.Controls.Add(this.tabGraphs); this.tabControl.Controls.Add(this.tabData); - this.tabControl.Location = new System.Drawing.Point(13, 13); + this.tabControl.Location = new System.Drawing.Point(0, 0); this.tabControl.Name = "tabControl"; this.tabControl.SelectedIndex = 0; - this.tabControl.Size = new System.Drawing.Size(870, 727); + this.tabControl.Size = new System.Drawing.Size(871, 451); this.tabControl.TabIndex = 45; // // tabGraphs @@ -277,7 +281,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(862, 701); + this.tabGraphs.Size = new System.Drawing.Size(863, 425); this.tabGraphs.TabIndex = 2; this.tabGraphs.Text = "Graphs"; this.tabGraphs.UseVisualStyleBackColor = true; @@ -298,7 +302,7 @@ this.pnlDataListDisplay.Controls.Add(this.lblMin); this.pnlDataListDisplay.Location = new System.Drawing.Point(6, 6); this.pnlDataListDisplay.Name = "pnlDataListDisplay"; - this.pnlDataListDisplay.Size = new System.Drawing.Size(850, 26); + this.pnlDataListDisplay.Size = new System.Drawing.Size(851, 26); this.pnlDataListDisplay.TabIndex = 29; // // tboxChartData @@ -404,8 +408,8 @@ // ctnParentChartHolder.Panel2 // this.ctnParentChartHolder.Panel2.Controls.Add(this.ctnBottomChartHolder); - this.ctnParentChartHolder.Size = new System.Drawing.Size(850, 436); - this.ctnParentChartHolder.SplitterDistance = 197; + this.ctnParentChartHolder.Size = new System.Drawing.Size(851, 381); + this.ctnParentChartHolder.SplitterDistance = 170; this.ctnParentChartHolder.TabIndex = 28; // // ctnTopChartHolder @@ -426,7 +430,7 @@ // this.ctnTopChartHolder.Panel2.Controls.Add(this.lblTopRightChartTitle); this.ctnTopChartHolder.Panel2.Controls.Add(this.chrtTopRight); - this.ctnTopChartHolder.Size = new System.Drawing.Size(844, 191); + this.ctnTopChartHolder.Size = new System.Drawing.Size(845, 164); this.ctnTopChartHolder.SplitterDistance = 407; this.ctnTopChartHolder.TabIndex = 0; // @@ -434,7 +438,7 @@ // 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(3, 164); + this.lblTopLeftChartTitle.Location = new System.Drawing.Point(0, 149); this.lblTopLeftChartTitle.Name = "lblTopLeftChartTitle"; this.lblTopLeftChartTitle.Size = new System.Drawing.Size(42, 13); this.lblTopLeftChartTitle.TabIndex = 2; @@ -447,7 +451,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.chrtTopLeft.Location = new System.Drawing.Point(3, 3); this.chrtTopLeft.Name = "chrtTopLeft"; - this.chrtTopLeft.Size = new System.Drawing.Size(399, 173); + this.chrtTopLeft.Size = new System.Drawing.Size(399, 156); this.chrtTopLeft.TabIndex = 1; this.chrtTopLeft.Text = "chart4"; this.chrtTopLeft.Click += new System.EventHandler(this.chrtTopLeft_Click); @@ -456,7 +460,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(3, 164); + this.lblTopRightChartTitle.Location = new System.Drawing.Point(0, 149); this.lblTopRightChartTitle.Name = "lblTopRightChartTitle"; this.lblTopRightChartTitle.Size = new System.Drawing.Size(47, 13); this.lblTopRightChartTitle.TabIndex = 1; @@ -469,7 +473,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.chrtTopRight.Location = new System.Drawing.Point(3, 3); this.chrtTopRight.Name = "chrtTopRight"; - this.chrtTopRight.Size = new System.Drawing.Size(425, 173); + this.chrtTopRight.Size = new System.Drawing.Size(426, 156); this.chrtTopRight.TabIndex = 0; this.chrtTopRight.Text = "chart4"; this.chrtTopRight.Click += new System.EventHandler(this.chrtTopRight_Click); @@ -492,7 +496,7 @@ // this.ctnBottomChartHolder.Panel2.Controls.Add(this.lblBottomRightChartTitle); this.ctnBottomChartHolder.Panel2.Controls.Add(this.chrtBottomRight); - this.ctnBottomChartHolder.Size = new System.Drawing.Size(844, 229); + this.ctnBottomChartHolder.Size = new System.Drawing.Size(845, 201); this.ctnBottomChartHolder.SplitterDistance = 407; this.ctnBottomChartHolder.TabIndex = 0; // @@ -500,7 +504,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(3, 202); + this.lblBottomLeftChartTitle.Location = new System.Drawing.Point(0, 186); this.lblBottomLeftChartTitle.Name = "lblBottomLeftChartTitle"; this.lblBottomLeftChartTitle.Size = new System.Drawing.Size(48, 13); this.lblBottomLeftChartTitle.TabIndex = 1; @@ -511,9 +515,9 @@ 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, 3); + this.chrtBottomLeft.Location = new System.Drawing.Point(3, -1); this.chrtBottomLeft.Name = "chrtBottomLeft"; - this.chrtBottomLeft.Size = new System.Drawing.Size(399, 211); + this.chrtBottomLeft.Size = new System.Drawing.Size(399, 197); this.chrtBottomLeft.TabIndex = 0; this.chrtBottomLeft.Text = "chart2"; this.chrtBottomLeft.Click += new System.EventHandler(this.chrtBottomLeft_Click); @@ -522,7 +526,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(3, 202); + this.lblBottomRightChartTitle.Location = new System.Drawing.Point(0, 186); this.lblBottomRightChartTitle.Name = "lblBottomRightChartTitle"; this.lblBottomRightChartTitle.Size = new System.Drawing.Size(28, 13); this.lblBottomRightChartTitle.TabIndex = 2; @@ -533,9 +537,9 @@ 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, 3); + this.chrtBottomRight.Location = new System.Drawing.Point(3, -1); this.chrtBottomRight.Name = "chrtBottomRight"; - this.chrtBottomRight.Size = new System.Drawing.Size(425, 211); + this.chrtBottomRight.Size = new System.Drawing.Size(426, 197); this.chrtBottomRight.TabIndex = 1; this.chrtBottomRight.Text = "chart2"; this.chrtBottomRight.Click += new System.EventHandler(this.chrtBottomRight_Click); @@ -547,7 +551,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(862, 701); + this.tabData.Size = new System.Drawing.Size(863, 425); this.tabData.TabIndex = 3; this.tabData.Text = "Data"; this.tabData.UseVisualStyleBackColor = true; @@ -931,17 +935,38 @@ // tboxMessageBox // this.tboxMessageBox.AcceptsReturn = true; - this.tboxMessageBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + 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(12, 746); + this.tboxMessageBox.Location = new System.Drawing.Point(0, 3); 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(871, 73); + this.tboxMessageBox.Size = new System.Drawing.Size(868, 69); this.tboxMessageBox.TabIndex = 30; // + // splitContainer1 + // + this.splitContainer1.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.splitContainer1.Location = new System.Drawing.Point(12, 12); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.tabControl); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.tboxMessageBox); + this.splitContainer1.Size = new System.Drawing.Size(871, 526); + this.splitContainer1.SplitterDistance = 450; + this.splitContainer1.TabIndex = 46; + // // MainMap // this.MainMap.Bearing = 0F; @@ -964,7 +989,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(628, 826); + this.MainMap.Size = new System.Drawing.Size(599, 419); this.MainMap.TabIndex = 0; this.MainMap.Zoom = 0D; // @@ -973,12 +998,12 @@ this.splitter1.BackColor = System.Drawing.Color.Transparent; this.splitter1.Dock = System.Windows.Forms.DockStyle.Right; this.splitter1.Enabled = false; - this.splitter1.Location = new System.Drawing.Point(626, 0); + this.splitter1.Location = new System.Drawing.Point(597, 0); this.splitter1.Margin = new System.Windows.Forms.Padding(2); this.splitter1.MinExtra = 390; this.splitter1.MinSize = 390; this.splitter1.Name = "splitter1"; - this.splitter1.Size = new System.Drawing.Size(2, 695); + this.splitter1.Size = new System.Drawing.Size(2, 419); this.splitter1.TabIndex = 42; this.splitter1.TabStop = false; // @@ -1006,13 +1031,13 @@ this.panelMenu.ForeColor = System.Drawing.SystemColors.ControlText; this.panelMenu.Image = null; this.panelMenu.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - this.panelMenu.Location = new System.Drawing.Point(628, 0); + this.panelMenu.Location = new System.Drawing.Point(599, 0); this.panelMenu.Margin = new System.Windows.Forms.Padding(2); this.panelMenu.MinimumSize = new System.Drawing.Size(27, 27); this.panelMenu.Name = "panelMenu"; this.panelMenu.PanelStyle = BSE.Windows.Forms.PanelStyle.Office2007; this.panelMenu.ShowExpandIcon = true; - this.panelMenu.Size = new System.Drawing.Size(228, 695); + this.panelMenu.Size = new System.Drawing.Size(258, 419); this.panelMenu.TabIndex = 40; this.panelMenu.Text = "Menu"; this.panelMenu.ToolTipTextCloseIcon = null; @@ -1033,7 +1058,7 @@ this.xPanderPanelList1.PanelColors = null; this.xPanderPanelList1.PanelStyle = BSE.Windows.Forms.PanelStyle.Office2007; this.xPanderPanelList1.ShowExpandIcon = true; - this.xPanderPanelList1.Size = new System.Drawing.Size(228, 666); + this.xPanderPanelList1.Size = new System.Drawing.Size(258, 390); this.xPanderPanelList1.TabIndex = 0; this.xPanderPanelList1.Text = "xPanderPanelList1"; // @@ -1069,7 +1094,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(228, 616); + this.xPanderPanelMain.Size = new System.Drawing.Size(258, 340); this.xPanderPanelMain.TabIndex = 0; this.xPanderPanelMain.Text = "map"; this.xPanderPanelMain.ToolTipTextCloseIcon = null; @@ -1090,7 +1115,7 @@ 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(226, 591); + this.tableLayoutPanel4.Size = new System.Drawing.Size(256, 315); this.tableLayoutPanel4.TabIndex = 38; // // tableLayoutPanel5 @@ -1112,7 +1137,7 @@ 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(176, 589); + this.tableLayoutPanel5.Size = new System.Drawing.Size(206, 313); this.tableLayoutPanel5.TabIndex = 30; // // groupBox8 @@ -1124,7 +1149,7 @@ 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(170, 74); + this.groupBox8.Size = new System.Drawing.Size(200, 74); this.groupBox8.TabIndex = 37; this.groupBox8.TabStop = false; this.groupBox8.Text = "markers"; @@ -1187,7 +1212,7 @@ 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(170, 155); + this.groupBox7.Size = new System.Drawing.Size(200, 155); this.groupBox7.TabIndex = 35; this.groupBox7.TabStop = false; this.groupBox7.Text = "routing"; @@ -1310,7 +1335,7 @@ 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(170, 146); + this.groupBox5.Size = new System.Drawing.Size(200, 146); this.groupBox5.TabIndex = 31; this.groupBox5.TabStop = false; this.groupBox5.Text = "gmap"; @@ -1436,7 +1461,7 @@ 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(170, 128); + this.groupBox3.Size = new System.Drawing.Size(200, 128); this.groupBox3.TabIndex = 28; this.groupBox3.TabStop = false; this.groupBox3.Text = "coordinates"; @@ -1520,7 +1545,7 @@ 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, 17); + this.cboxCollectData.Size = new System.Drawing.Size(84, 1); this.cboxCollectData.TabIndex = 38; this.cboxCollectData.Text = "Collect Data"; this.cboxCollectData.UseVisualStyleBackColor = true; @@ -1540,7 +1565,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, 587); + this.tableLayoutPanel6.Size = new System.Drawing.Size(44, 311); this.tableLayoutPanel6.TabIndex = 31; // // btnZoomIn @@ -1567,7 +1592,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, 533); + this.trackBarZoomLevel.Size = new System.Drawing.Size(45, 257); this.trackBarZoomLevel.TabIndex = 29; this.trackBarZoomLevel.TickFrequency = 100; this.trackBarZoomLevel.TickStyle = System.Windows.Forms.TickStyle.TopLeft; @@ -1578,7 +1603,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, 560); + this.btnZoomOut.Location = new System.Drawing.Point(0, 284); this.btnZoomOut.Margin = new System.Windows.Forms.Padding(0); this.btnZoomOut.Name = "btnZoomOut"; this.btnZoomOut.Size = new System.Drawing.Size(45, 27); @@ -1617,7 +1642,7 @@ this.xPanderPanelInfo.Margin = new System.Windows.Forms.Padding(2); this.xPanderPanelInfo.Name = "xPanderPanelInfo"; this.xPanderPanelInfo.PanelStyle = BSE.Windows.Forms.PanelStyle.Office2007; - this.xPanderPanelInfo.Size = new System.Drawing.Size(228, 25); + this.xPanderPanelInfo.Size = new System.Drawing.Size(258, 25); this.xPanderPanelInfo.TabIndex = 3; this.xPanderPanelInfo.Text = "info"; this.xPanderPanelInfo.ToolTipTextCloseIcon = null; @@ -1659,7 +1684,7 @@ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 16F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(226, 0); + this.tableLayoutPanel2.Size = new System.Drawing.Size(256, 0); this.tableLayoutPanel2.TabIndex = 14; // // textBoxZoomCurrent @@ -1669,7 +1694,7 @@ this.textBoxZoomCurrent.Location = new System.Drawing.Point(18, 142); this.textBoxZoomCurrent.Name = "textBoxZoomCurrent"; this.textBoxZoomCurrent.ReadOnly = true; - this.textBoxZoomCurrent.Size = new System.Drawing.Size(190, 28); + this.textBoxZoomCurrent.Size = new System.Drawing.Size(220, 28); this.textBoxZoomCurrent.TabIndex = 8; this.textBoxZoomCurrent.Text = "15"; // @@ -1680,7 +1705,7 @@ this.textBoxrouteCount.Location = new System.Drawing.Point(18, 236); this.textBoxrouteCount.Name = "textBoxrouteCount"; this.textBoxrouteCount.ReadOnly = true; - this.textBoxrouteCount.Size = new System.Drawing.Size(190, 28); + this.textBoxrouteCount.Size = new System.Drawing.Size(220, 28); this.textBoxrouteCount.TabIndex = 12; this.textBoxrouteCount.Text = "..."; // @@ -1709,7 +1734,7 @@ this.textBoxLngCurrent.Location = new System.Drawing.Point(18, 79); this.textBoxLngCurrent.Name = "textBoxLngCurrent"; this.textBoxLngCurrent.ReadOnly = true; - this.textBoxLngCurrent.Size = new System.Drawing.Size(190, 28); + this.textBoxLngCurrent.Size = new System.Drawing.Size(220, 28); this.textBoxLngCurrent.TabIndex = 5; this.textBoxLngCurrent.Text = "..."; // @@ -1720,7 +1745,7 @@ this.textBoxMarkerCount.Location = new System.Drawing.Point(18, 189); this.textBoxMarkerCount.Name = "textBoxMarkerCount"; this.textBoxMarkerCount.ReadOnly = true; - this.textBoxMarkerCount.Size = new System.Drawing.Size(190, 28); + this.textBoxMarkerCount.Size = new System.Drawing.Size(220, 28); this.textBoxMarkerCount.TabIndex = 10; this.textBoxMarkerCount.Text = "..."; // @@ -1749,7 +1774,7 @@ this.textBoxLatCurrent.Location = new System.Drawing.Point(18, 32); this.textBoxLatCurrent.Name = "textBoxLatCurrent"; this.textBoxLatCurrent.ReadOnly = true; - this.textBoxLatCurrent.Size = new System.Drawing.Size(190, 28); + this.textBoxLatCurrent.Size = new System.Drawing.Size(220, 28); this.textBoxLatCurrent.TabIndex = 4; this.textBoxLatCurrent.Text = "..."; // @@ -1793,7 +1818,7 @@ this.xPanderPanelCache.Margin = new System.Windows.Forms.Padding(2); this.xPanderPanelCache.Name = "xPanderPanelCache"; this.xPanderPanelCache.PanelStyle = BSE.Windows.Forms.PanelStyle.Office2007; - this.xPanderPanelCache.Size = new System.Drawing.Size(228, 25); + this.xPanderPanelCache.Size = new System.Drawing.Size(258, 25); this.xPanderPanelCache.TabIndex = 4; this.xPanderPanelCache.Text = "cache"; this.xPanderPanelCache.ToolTipTextCloseIcon = null; @@ -1842,7 +1867,7 @@ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 16F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(226, 0); + this.tableLayoutPanel1.Size = new System.Drawing.Size(256, 0); this.tableLayoutPanel1.TabIndex = 41; // // textBoxCacheSize @@ -1852,7 +1877,7 @@ this.textBoxCacheSize.Location = new System.Drawing.Point(18, 238); this.textBoxCacheSize.Name = "textBoxCacheSize"; this.textBoxCacheSize.ReadOnly = true; - this.textBoxCacheSize.Size = new System.Drawing.Size(190, 28); + this.textBoxCacheSize.Size = new System.Drawing.Size(220, 28); this.textBoxCacheSize.TabIndex = 49; this.textBoxCacheSize.Text = "..."; // @@ -1863,7 +1888,7 @@ this.textBoxCacheStatus.Location = new System.Drawing.Point(18, 301); this.textBoxCacheStatus.Name = "textBoxCacheStatus"; this.textBoxCacheStatus.ReadOnly = true; - this.textBoxCacheStatus.Size = new System.Drawing.Size(190, 28); + this.textBoxCacheStatus.Size = new System.Drawing.Size(220, 28); this.textBoxCacheStatus.TabIndex = 46; this.textBoxCacheStatus.Text = "..."; // @@ -1872,7 +1897,7 @@ this.button10.Dock = System.Windows.Forms.DockStyle.Fill; this.button10.Location = new System.Drawing.Point(18, 19); this.button10.Name = "button10"; - this.button10.Size = new System.Drawing.Size(190, 20); + this.button10.Size = new System.Drawing.Size(220, 20); this.button10.TabIndex = 5; this.button10.Text = "Import"; this.button10.UseVisualStyleBackColor = true; @@ -1884,7 +1909,7 @@ this.textBoxMemory.Location = new System.Drawing.Point(18, 175); this.textBoxMemory.Name = "textBoxMemory"; this.textBoxMemory.ReadOnly = true; - this.textBoxMemory.Size = new System.Drawing.Size(190, 28); + this.textBoxMemory.Size = new System.Drawing.Size(220, 28); this.textBoxMemory.TabIndex = 39; this.textBoxMemory.Text = "..."; // @@ -1905,7 +1930,7 @@ this.button9.Dock = System.Windows.Forms.DockStyle.Fill; this.button9.Location = new System.Drawing.Point(18, 45); this.button9.Name = "button9"; - this.button9.Size = new System.Drawing.Size(190, 20); + this.button9.Size = new System.Drawing.Size(220, 20); this.button9.TabIndex = 4; this.button9.Text = "Export"; this.button9.UseVisualStyleBackColor = true; @@ -1915,7 +1940,7 @@ this.button11.Dock = System.Windows.Forms.DockStyle.Fill; this.button11.Location = new System.Drawing.Point(18, 71); this.button11.Name = "button11"; - this.button11.Size = new System.Drawing.Size(190, 20); + this.button11.Size = new System.Drawing.Size(220, 20); this.button11.TabIndex = 38; this.button11.Text = "Prefetch selected area"; this.button11.UseVisualStyleBackColor = true; @@ -1934,7 +1959,7 @@ this.button2.Dock = System.Windows.Forms.DockStyle.Fill; this.button2.Location = new System.Drawing.Point(18, 97); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(190, 20); + this.button2.Size = new System.Drawing.Size(220, 20); this.button2.TabIndex = 43; this.button2.Text = "Clear tiles in disk cache"; this.button2.UseVisualStyleBackColor = true; @@ -1963,7 +1988,7 @@ this.button17.Location = new System.Drawing.Point(17, 122); this.button17.Margin = new System.Windows.Forms.Padding(2); this.button17.Name = "button17"; - this.button17.Size = new System.Drawing.Size(192, 19); + this.button17.Size = new System.Drawing.Size(222, 19); this.button17.TabIndex = 50; this.button17.Text = "Open cache location"; this.button17.UseVisualStyleBackColor = true; @@ -1973,9 +1998,8 @@ 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, 828); - this.Controls.Add(this.tboxMessageBox); - this.Controls.Add(this.tabControl); + this.ClientSize = new System.Drawing.Size(895, 550); + this.Controls.Add(this.splitContainer1); this.KeyPreview = true; this.MinimumSize = new System.Drawing.Size(554, 105); this.Name = "MainForm"; @@ -2014,6 +2038,10 @@ this.gboxSlaveData.PerformLayout(); this.gboxMasterData.ResumeLayout(false); this.gboxMasterData.PerformLayout(); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.Panel2.PerformLayout(); + this.splitContainer1.ResumeLayout(false); this.panelMenu.ResumeLayout(false); this.xPanderPanelList1.ResumeLayout(false); this.xPanderPanelMain.ResumeLayout(false); @@ -2038,7 +2066,6 @@ this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } @@ -2187,6 +2214,7 @@ private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label20; private System.Windows.Forms.CheckBox cboxCollectData; + private System.Windows.Forms.SplitContainer splitContainer1; } 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 @@ -2557,6 +2557,7 @@ namespace Demo.WindowsForms string longitude; //handle line of input data and put into chart + //parses transmissions and saves data to CSV file public void ParseIncomingData(string rawDataReceived) { //check to see if data should be processed @@ -2568,6 +2569,7 @@ namespace Demo.WindowsForms KD8TDF-9>APRS,WIDE2-1:/151916z3944.87N/08348.75WO005/0.013 SV:09 A-30.5 B45.64 C99542 ^char 31 ^char 40 ^60 */ + //TODO: verify index charcter accuracy with real transmission int indexStart = rawDataReceived.IndexOf("z"); int indexEnd = rawDataReceived.IndexOf("N/"); @@ -2577,8 +2579,6 @@ namespace Demo.WindowsForms indexEnd = rawDataReceived.IndexOf("WO"); longitude = rawDataReceived.Substring(indexStart + 2, indexEnd - indexStart - 2); - //latitude = rawDataReceived.Substring(30, 7); //does not include the N/S char - //longitude = rawDataReceived.Substring(41, 7); //does not include the N/S char addMarkerFromTransmit(latitude, longitude); AddText(rawDataReceived + "\r\n"); @@ -2592,6 +2592,7 @@ namespace Demo.WindowsForms string typeCode; double data; string csvData = ""; + //loop through all datums in the transmission and send them to the chart builder for (int i = 1; i < dataTransmission.Length; i++) { @@ -2600,12 +2601,15 @@ namespace Demo.WindowsForms addToChart(typeCode, data); csvData += typeCode + data + ","; } + + //write the data to CSV file WriteToCSV(csvData); } + //write the data to CSV file private void WriteToCSV(string data) { - using (StreamWriter writer = new StreamWriter("C:/Users/mkanning/Documents/Visual Studio 2010/Projects/greatmaps_05f05ab16904 - unchanged/Demo.WindowsForms/debug.csv", true)) + using (StreamWriter writer = new StreamWriter("debug.csv", true)) { writer.WriteLine(data); } @@ -2812,8 +2816,6 @@ namespace Demo.WindowsForms #endregion - - } } //TODO: CSV logging, offline caching diff --git a/GMap.NET vs10.sln b/GMap.NET vs10.sln --- a/GMap.NET vs10.sln +++ b/GMap.NET vs10.sln @@ -1,46 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GMap.NET", "GMap.NET", "{775C3C1A-44D3-41F4-9FC6-F83E39D3ABB8}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demo", "Demo", "{4071E6E4-D401-4EF2-94B0-6F5257088116}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{A24009F2-84ED-4F0A-BC1C-8B05F474986A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Info", "Info", "{9EB13FA2-ADB7-4C90-A6DA-18EDFE256273}" - ProjectSection(SolutionItems) = preProject - Info\google maps.pdf = Info\google maps.pdf - Info\License.txt = Info\License.txt - EndProjectSection -EndProject +# Visual C# Express 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.WindowsForms", "Demo.WindowsForms\Demo.WindowsForms.csproj", "{A2E07A76-8B2C-41A2-B23E-EA31AE94D706}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.WindowsPresentation", "Demo.WindowsPresentation\Demo.WindowsPresentation.csproj", "{83195AEF-0071-471C-9E8B-E67211F5D028}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GMap.NET.Core", "GMap.NET.Core\GMap.NET.Core.csproj", "{D0C39D9D-BED0-418B-9A5E-713176CAF40C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GMap.NET.WindowsForms", "GMap.NET.WindowsForms\GMap.NET.WindowsForms.csproj", "{E06DEF77-F933-42FB-AFD7-DB2D0D8D6A98}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GMap.NET.WindowsPresentation", "GMap.NET.WindowsPresentation\GMap.NET.WindowsPresentation.csproj", "{644FE7D4-0184-400F-B2D7-99CB41360658}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TemplatedBinding", "Testing\TemplatedBinding\TemplatedBinding.csproj", "{C7CD6A76-D941-493F-91F8-6222AB87BECA}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPF-GMapControlNew", "Testing\WPF-GMapControlNew\WPF-GMapControlNew.csproj", "{B5A673B4-6286-4150-A536-1C16F3B8DC8B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.StreetView", "Testing\Demo.StreetView\Demo.StreetView.csproj", "{B6E411A2-DFD8-461E-8207-BDBA405264CA}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BigMapMaker", "Testing\BigMapMaker\BigMapMaker.csproj", "{A6E9D42C-935B-44D0-9FB0-E2E0319627D1}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.Clouds", "Testing\Demo.Clouds\Demo.Clouds.csproj", "{097FA134-51A5-4801-AADD-A1914EAA32FF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Setup", "Setup", "{BA76BAF9-B8BB-46B3-89D2-3087524D80B0}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GMap.NET - Hot Build", "Setup\GMap.NET - Hot Build\GMap.NET - Hot Build.csproj", "{C5E9D4B5-F9A8-4414-9B17-5A70DC2705C0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Demo.Docking", "Testing\Demo.Docking\Demo.Docking.csproj", "{F729FF99-2991-4819-9855-7CD7A1199089}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication", "Testing\ConsoleApplication\ConsoleApplication.csproj", "{448B761F-C033-447D-93D5-F4380A7DB0E2}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -51,10 +19,6 @@ Global {A2E07A76-8B2C-41A2-B23E-EA31AE94D706}.Debug|Any CPU.Build.0 = Debug|Any CPU {A2E07A76-8B2C-41A2-B23E-EA31AE94D706}.Release|Any CPU.ActiveCfg = Release|Any CPU {A2E07A76-8B2C-41A2-B23E-EA31AE94D706}.Release|Any CPU.Build.0 = Release|Any CPU - {83195AEF-0071-471C-9E8B-E67211F5D028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83195AEF-0071-471C-9E8B-E67211F5D028}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83195AEF-0071-471C-9E8B-E67211F5D028}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83195AEF-0071-471C-9E8B-E67211F5D028}.Release|Any CPU.Build.0 = Release|Any CPU {D0C39D9D-BED0-418B-9A5E-713176CAF40C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D0C39D9D-BED0-418B-9A5E-713176CAF40C}.Debug|Any CPU.Build.0 = Debug|Any CPU {D0C39D9D-BED0-418B-9A5E-713176CAF40C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -63,26 +27,8 @@ Global {E06DEF77-F933-42FB-AFD7-DB2D0D8D6A98}.Debug|Any CPU.Build.0 = Debug|Any CPU {E06DEF77-F933-42FB-AFD7-DB2D0D8D6A98}.Release|Any CPU.ActiveCfg = Release|Any CPU {E06DEF77-F933-42FB-AFD7-DB2D0D8D6A98}.Release|Any CPU.Build.0 = Release|Any CPU - {644FE7D4-0184-400F-B2D7-99CB41360658}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {644FE7D4-0184-400F-B2D7-99CB41360658}.Debug|Any CPU.Build.0 = Debug|Any CPU - {644FE7D4-0184-400F-B2D7-99CB41360658}.Release|Any CPU.ActiveCfg = Release|Any CPU - {644FE7D4-0184-400F-B2D7-99CB41360658}.Release|Any CPU.Build.0 = Release|Any CPU - {C7CD6A76-D941-493F-91F8-6222AB87BECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C7CD6A76-D941-493F-91F8-6222AB87BECA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5A673B4-6286-4150-A536-1C16F3B8DC8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5A673B4-6286-4150-A536-1C16F3B8DC8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6E411A2-DFD8-461E-8207-BDBA405264CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6E411A2-DFD8-461E-8207-BDBA405264CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A6E9D42C-935B-44D0-9FB0-E2E0319627D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A6E9D42C-935B-44D0-9FB0-E2E0319627D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {097FA134-51A5-4801-AADD-A1914EAA32FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {097FA134-51A5-4801-AADD-A1914EAA32FF}.Release|Any CPU.ActiveCfg = Release|Any CPU {C5E9D4B5-F9A8-4414-9B17-5A70DC2705C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C5E9D4B5-F9A8-4414-9B17-5A70DC2705C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F729FF99-2991-4819-9855-7CD7A1199089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F729FF99-2991-4819-9855-7CD7A1199089}.Release|Any CPU.ActiveCfg = Release|Any CPU - {448B761F-C033-447D-93D5-F4380A7DB0E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {448B761F-C033-447D-93D5-F4380A7DB0E2}.Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Setup/GMap.NET - Hot Build/GMap.NET - Hot Build.csproj b/Setup/GMap.NET - Hot Build/GMap.NET - Hot Build.csproj --- a/Setup/GMap.NET - Hot Build/GMap.NET - Hot Build.csproj +++ b/Setup/GMap.NET - Hot Build/GMap.NET - Hot Build.csproj @@ -179,20 +179,16 @@ {A2E07A76-8B2C-41A2-B23E-EA31AE94D706} Demo.WindowsForms - - {83195AEF-0071-471C-9E8B-E67211F5D028} - Demo.WindowsPresentation - False - Exclude - True + Exclude + True Assembly