From 48c07bf59fae0d80958a63a19b7eb71105fa5b5e Mon Sep 17 00:00:00 2001 From: Sergey Sklyarov Date: Fri, 6 Jun 2025 17:37:04 +0300 Subject: [PATCH] === --- DroneSimulator/Drone.cs | 10 + DroneSimulator/FormMain.Designer.cs | 835 ++++++++++++++++------------ DroneSimulator/GPS.cs | 75 ++- 3 files changed, 545 insertions(+), 375 deletions(-) diff --git a/DroneSimulator/Drone.cs b/DroneSimulator/Drone.cs index 3c0a136..e9d0295 100644 --- a/DroneSimulator/Drone.cs +++ b/DroneSimulator/Drone.cs @@ -446,6 +446,16 @@ namespace DroneSimulator gps.Head.Type = DroneData.DataType.DataGPS; gps.Head.Time = (uint)Environment.TickCount; + GPS.Point p = new GPS.Point(); + p.x = PosXYZ.Y; p.y= PosXYZ.X; + + GPS.GlobalCoords g = new GPS.GlobalCoords(); + g.latitude=GPS.Home.Lat; g.longitude=GPS.Home.Lon; + + g=GPS.localToGlobal(p, g); + + gps.Lat = g.latitude; gps.Lon = g.longitude; + gps.Speed = MathF.Sqrt(SpdXYZ.X * SpdXYZ.X + SpdXYZ.Y * SpdXYZ.Y + SpdXYZ.Z * SpdXYZ.Z); gps.Alt = GPS.Home.Alt + PosXYZ.Z; diff --git a/DroneSimulator/FormMain.Designer.cs b/DroneSimulator/FormMain.Designer.cs index a2f1347..f72b94e 100644 --- a/DroneSimulator/FormMain.Designer.cs +++ b/DroneSimulator/FormMain.Designer.cs @@ -288,10 +288,12 @@ // // menuStrip_Menu // + menuStrip_Menu.ImageScalingSize = new Size(20, 20); menuStrip_Menu.Items.AddRange(new ToolStripItem[] { fileToolStripMenuItem }); menuStrip_Menu.Location = new Point(0, 0); menuStrip_Menu.Name = "menuStrip_Menu"; - menuStrip_Menu.Size = new Size(884, 24); + menuStrip_Menu.Padding = new Padding(7, 3, 0, 3); + menuStrip_Menu.Size = new Size(1010, 30); menuStrip_Menu.TabIndex = 0; menuStrip_Menu.Text = "menuStrip1"; // @@ -299,14 +301,14 @@ // fileToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { exitToolStripMenuItem }); fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - fileToolStripMenuItem.Size = new Size(37, 20); + fileToolStripMenuItem.Size = new Size(46, 24); fileToolStripMenuItem.Tag = "#file"; fileToolStripMenuItem.Text = "File"; // // exitToolStripMenuItem // exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - exitToolStripMenuItem.Size = new Size(93, 22); + exitToolStripMenuItem.Size = new Size(116, 26); exitToolStripMenuItem.Tag = "#exit"; exitToolStripMenuItem.Text = "Exit"; exitToolStripMenuItem.Click += exitToolStripMenuItem_Click; @@ -315,9 +317,11 @@ // groupBox_Screen.Controls.Add(pictureBox_2D); groupBox_Screen.Dock = DockStyle.Fill; - groupBox_Screen.Location = new Point(218, 24); + groupBox_Screen.Location = new Point(249, 30); + groupBox_Screen.Margin = new Padding(3, 4, 3, 4); groupBox_Screen.Name = "groupBox_Screen"; - groupBox_Screen.Size = new Size(466, 917); + groupBox_Screen.Padding = new Padding(3, 4, 3, 4); + groupBox_Screen.Size = new Size(532, 1025); groupBox_Screen.TabIndex = 1; groupBox_Screen.TabStop = false; // @@ -325,9 +329,10 @@ // pictureBox_2D.BackColor = Color.Gainsboro; pictureBox_2D.Dock = DockStyle.Fill; - pictureBox_2D.Location = new Point(3, 19); + pictureBox_2D.Location = new Point(3, 24); + pictureBox_2D.Margin = new Padding(3, 4, 3, 4); pictureBox_2D.Name = "pictureBox_2D"; - pictureBox_2D.Size = new Size(460, 895); + pictureBox_2D.Size = new Size(526, 997); pictureBox_2D.SizeMode = PictureBoxSizeMode.Zoom; pictureBox_2D.TabIndex = 0; pictureBox_2D.TabStop = false; @@ -339,20 +344,22 @@ tabControl_Menu.Controls.Add(tabPage_Area); tabControl_Menu.Controls.Add(tabPage_GPS); tabControl_Menu.Dock = DockStyle.Left; - tabControl_Menu.Location = new Point(0, 24); + tabControl_Menu.Location = new Point(0, 30); + tabControl_Menu.Margin = new Padding(3, 4, 3, 4); tabControl_Menu.Name = "tabControl_Menu"; tabControl_Menu.SelectedIndex = 0; - tabControl_Menu.Size = new Size(218, 917); + tabControl_Menu.Size = new Size(249, 1025); tabControl_Menu.TabIndex = 2; // // tabPage_Main // tabPage_Main.Controls.Add(groupBox_Visual); tabPage_Main.Controls.Add(groupBox_Clients); - tabPage_Main.Location = new Point(4, 24); + tabPage_Main.Location = new Point(4, 29); + tabPage_Main.Margin = new Padding(3, 4, 3, 4); tabPage_Main.Name = "tabPage_Main"; - tabPage_Main.Padding = new Padding(3); - tabPage_Main.Size = new Size(210, 889); + tabPage_Main.Padding = new Padding(3, 4, 3, 4); + tabPage_Main.Size = new Size(241, 992); tabPage_Main.TabIndex = 0; tabPage_Main.Tag = "#main"; tabPage_Main.Text = "Main"; @@ -368,9 +375,11 @@ groupBox_Visual.Controls.Add(numericUpDown_Visual_Port); groupBox_Visual.Controls.Add(label_Visual_Port); groupBox_Visual.Dock = DockStyle.Top; - groupBox_Visual.Location = new Point(3, 83); + groupBox_Visual.Location = new Point(3, 111); + groupBox_Visual.Margin = new Padding(3, 4, 3, 4); groupBox_Visual.Name = "groupBox_Visual"; - groupBox_Visual.Size = new Size(204, 91); + groupBox_Visual.Padding = new Padding(3, 4, 3, 4); + groupBox_Visual.Size = new Size(235, 121); groupBox_Visual.TabIndex = 2; groupBox_Visual.TabStop = false; groupBox_Visual.Tag = "#visual"; @@ -378,20 +387,21 @@ // // numericUpDown_Visual_Limit // - numericUpDown_Visual_Limit.Location = new Point(44, 57); + numericUpDown_Visual_Limit.Location = new Point(50, 76); + numericUpDown_Visual_Limit.Margin = new Padding(3, 4, 3, 4); numericUpDown_Visual_Limit.Maximum = new decimal(new int[] { 10, 0, 0, 0 }); numericUpDown_Visual_Limit.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Visual_Limit.Name = "numericUpDown_Visual_Limit"; - numericUpDown_Visual_Limit.Size = new Size(42, 23); + numericUpDown_Visual_Limit.Size = new Size(48, 27); numericUpDown_Visual_Limit.TabIndex = 13; numericUpDown_Visual_Limit.Value = new decimal(new int[] { 1, 0, 0, 0 }); // // label1 // label1.AutoSize = true; - label1.Location = new Point(6, 59); + label1.Location = new Point(7, 79); label1.Name = "label1"; - label1.Size = new Size(37, 15); + label1.Size = new Size(45, 20); label1.TabIndex = 12; label1.Tag = "#clients_limit"; label1.Text = "Limit:"; @@ -399,27 +409,28 @@ // label_Visual_Num // label_Visual_Num.AutoSize = true; - label_Visual_Num.Location = new Point(161, 59); + label_Visual_Num.Location = new Point(184, 79); label_Visual_Num.Name = "label_Visual_Num"; - label_Visual_Num.Size = new Size(13, 15); + label_Visual_Num.Size = new Size(17, 20); label_Visual_Num.TabIndex = 11; label_Visual_Num.Text = "0"; // // label3 // label3.AutoSize = true; - label3.Location = new Point(112, 59); + label3.Location = new Point(128, 79); label3.Name = "label3"; - label3.Size = new Size(43, 15); + label3.Size = new Size(51, 20); label3.TabIndex = 10; label3.Tag = "#clients_count"; label3.Text = "Count:"; // // button_Visual_Start // - button_Visual_Start.Location = new Point(112, 22); + button_Visual_Start.Location = new Point(128, 29); + button_Visual_Start.Margin = new Padding(3, 4, 3, 4); button_Visual_Start.Name = "button_Visual_Start"; - button_Visual_Start.Size = new Size(86, 23); + button_Visual_Start.Size = new Size(98, 31); button_Visual_Start.TabIndex = 9; button_Visual_Start.Tag = "#visual_start"; button_Visual_Start.Text = "Start"; @@ -428,20 +439,21 @@ // // numericUpDown_Visual_Port // - numericUpDown_Visual_Port.Location = new Point(44, 24); + numericUpDown_Visual_Port.Location = new Point(50, 32); + numericUpDown_Visual_Port.Margin = new Padding(3, 4, 3, 4); numericUpDown_Visual_Port.Maximum = new decimal(new int[] { 65000, 0, 0, 0 }); numericUpDown_Visual_Port.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Visual_Port.Name = "numericUpDown_Visual_Port"; - numericUpDown_Visual_Port.Size = new Size(62, 23); + numericUpDown_Visual_Port.Size = new Size(71, 27); numericUpDown_Visual_Port.TabIndex = 8; numericUpDown_Visual_Port.Value = new decimal(new int[] { 1002, 0, 0, 0 }); // // label_Visual_Port // label_Visual_Port.AutoSize = true; - label_Visual_Port.Location = new Point(6, 26); + label_Visual_Port.Location = new Point(7, 35); label_Visual_Port.Name = "label_Visual_Port"; - label_Visual_Port.Size = new Size(32, 15); + label_Visual_Port.Size = new Size(38, 20); label_Visual_Port.TabIndex = 7; label_Visual_Port.Tag = "#visual_port"; label_Visual_Port.Text = "Port:"; @@ -456,9 +468,11 @@ groupBox_Clients.Controls.Add(numericUpDown_Clients_Port); groupBox_Clients.Controls.Add(label_Clients_Port); groupBox_Clients.Dock = DockStyle.Top; - groupBox_Clients.Location = new Point(3, 3); + groupBox_Clients.Location = new Point(3, 4); + groupBox_Clients.Margin = new Padding(3, 4, 3, 4); groupBox_Clients.Name = "groupBox_Clients"; - groupBox_Clients.Size = new Size(204, 80); + groupBox_Clients.Padding = new Padding(3, 4, 3, 4); + groupBox_Clients.Size = new Size(235, 107); groupBox_Clients.TabIndex = 1; groupBox_Clients.TabStop = false; groupBox_Clients.Tag = "#clients"; @@ -466,20 +480,21 @@ // // numericUpDown_Clients_Limit // - numericUpDown_Clients_Limit.Location = new Point(44, 48); + numericUpDown_Clients_Limit.Location = new Point(50, 64); + numericUpDown_Clients_Limit.Margin = new Padding(3, 4, 3, 4); numericUpDown_Clients_Limit.Maximum = new decimal(new int[] { 10, 0, 0, 0 }); numericUpDown_Clients_Limit.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Clients_Limit.Name = "numericUpDown_Clients_Limit"; - numericUpDown_Clients_Limit.Size = new Size(42, 23); + numericUpDown_Clients_Limit.Size = new Size(48, 27); numericUpDown_Clients_Limit.TabIndex = 6; numericUpDown_Clients_Limit.Value = new decimal(new int[] { 1, 0, 0, 0 }); // // label_Clients_Limit // label_Clients_Limit.AutoSize = true; - label_Clients_Limit.Location = new Point(6, 50); + label_Clients_Limit.Location = new Point(7, 67); label_Clients_Limit.Name = "label_Clients_Limit"; - label_Clients_Limit.Size = new Size(37, 15); + label_Clients_Limit.Size = new Size(45, 20); label_Clients_Limit.TabIndex = 5; label_Clients_Limit.Tag = "#clients_limit"; label_Clients_Limit.Text = "Limit:"; @@ -487,18 +502,18 @@ // label_Clients_Num // label_Clients_Num.AutoSize = true; - label_Clients_Num.Location = new Point(161, 50); + label_Clients_Num.Location = new Point(184, 67); label_Clients_Num.Name = "label_Clients_Num"; - label_Clients_Num.Size = new Size(13, 15); + label_Clients_Num.Size = new Size(17, 20); label_Clients_Num.TabIndex = 4; label_Clients_Num.Text = "0"; // // label_Clients_Count // label_Clients_Count.AutoSize = true; - label_Clients_Count.Location = new Point(112, 50); + label_Clients_Count.Location = new Point(128, 67); label_Clients_Count.Name = "label_Clients_Count"; - label_Clients_Count.Size = new Size(43, 15); + label_Clients_Count.Size = new Size(51, 20); label_Clients_Count.TabIndex = 3; label_Clients_Count.Tag = "#clients_count"; label_Clients_Count.Text = "Count:"; @@ -506,9 +521,10 @@ // button_Client_Start // button_Client_Start.BackColor = Color.Transparent; - button_Client_Start.Location = new Point(112, 15); + button_Client_Start.Location = new Point(128, 20); + button_Client_Start.Margin = new Padding(3, 4, 3, 4); button_Client_Start.Name = "button_Client_Start"; - button_Client_Start.Size = new Size(86, 23); + button_Client_Start.Size = new Size(98, 31); button_Client_Start.TabIndex = 2; button_Client_Start.Tag = ""; button_Client_Start.Text = "Start"; @@ -517,20 +533,21 @@ // // numericUpDown_Clients_Port // - numericUpDown_Clients_Port.Location = new Point(44, 17); + numericUpDown_Clients_Port.Location = new Point(50, 23); + numericUpDown_Clients_Port.Margin = new Padding(3, 4, 3, 4); numericUpDown_Clients_Port.Maximum = new decimal(new int[] { 65000, 0, 0, 0 }); numericUpDown_Clients_Port.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Clients_Port.Name = "numericUpDown_Clients_Port"; - numericUpDown_Clients_Port.Size = new Size(62, 23); + numericUpDown_Clients_Port.Size = new Size(71, 27); numericUpDown_Clients_Port.TabIndex = 1; numericUpDown_Clients_Port.Value = new decimal(new int[] { 1001, 0, 0, 0 }); // // label_Clients_Port // label_Clients_Port.AutoSize = true; - label_Clients_Port.Location = new Point(6, 19); + label_Clients_Port.Location = new Point(7, 25); label_Clients_Port.Name = "label_Clients_Port"; - label_Clients_Port.Size = new Size(32, 15); + label_Clients_Port.Size = new Size(38, 20); label_Clients_Port.TabIndex = 0; label_Clients_Port.Tag = "#clients_port"; label_Clients_Port.Text = "Port:"; @@ -538,10 +555,11 @@ // tabPage_Model // tabPage_Model.Controls.Add(panel_Menu_Model); - tabPage_Model.Location = new Point(4, 24); + tabPage_Model.Location = new Point(4, 29); + tabPage_Model.Margin = new Padding(3, 4, 3, 4); tabPage_Model.Name = "tabPage_Model"; - tabPage_Model.Padding = new Padding(3); - tabPage_Model.Size = new Size(210, 889); + tabPage_Model.Padding = new Padding(3, 4, 3, 4); + tabPage_Model.Size = new Size(241, 1190); tabPage_Model.TabIndex = 1; tabPage_Model.Tag = "#model"; tabPage_Model.Text = "Model"; @@ -557,9 +575,10 @@ panel_Menu_Model.Controls.Add(groupBox_Gyr); panel_Menu_Model.Controls.Add(groupBox_Acc); panel_Menu_Model.Dock = DockStyle.Fill; - panel_Menu_Model.Location = new Point(3, 3); + panel_Menu_Model.Location = new Point(3, 4); + panel_Menu_Model.Margin = new Padding(3, 4, 3, 4); panel_Menu_Model.Name = "panel_Menu_Model"; - panel_Menu_Model.Size = new Size(204, 883); + panel_Menu_Model.Size = new Size(235, 1182); panel_Menu_Model.TabIndex = 5; // // groupBox1 @@ -579,9 +598,11 @@ groupBox1.Controls.Add(label46); groupBox1.Controls.Add(label47); groupBox1.Dock = DockStyle.Top; - groupBox1.Location = new Point(0, 688); + groupBox1.Location = new Point(0, 917); + groupBox1.Margin = new Padding(3, 4, 3, 4); groupBox1.Name = "groupBox1"; - groupBox1.Size = new Size(204, 133); + groupBox1.Padding = new Padding(3, 4, 3, 4); + groupBox1.Size = new Size(235, 177); groupBox1.TabIndex = 8; groupBox1.TabStop = false; groupBox1.Text = "Range"; @@ -589,9 +610,10 @@ // checkBox_Model_Range_Real // checkBox_Model_Range_Real.AutoSize = true; - checkBox_Model_Range_Real.Location = new Point(156, 20); + checkBox_Model_Range_Real.Location = new Point(178, 27); + checkBox_Model_Range_Real.Margin = new Padding(3, 4, 3, 4); checkBox_Model_Range_Real.Name = "checkBox_Model_Range_Real"; - checkBox_Model_Range_Real.Size = new Size(48, 19); + checkBox_Model_Range_Real.Size = new Size(60, 24); checkBox_Model_Range_Real.TabIndex = 41; checkBox_Model_Range_Real.Tag = "#en"; checkBox_Model_Range_Real.Text = "Real"; @@ -601,9 +623,9 @@ // label55 // label55.AutoSize = true; - label55.Location = new Point(115, 105); + label55.Location = new Point(131, 140); label55.Name = "label55"; - label55.Size = new Size(24, 15); + label55.Size = new Size(30, 20); label55.TabIndex = 35; label55.Text = "sec"; // @@ -611,10 +633,11 @@ // numericUpDown_Range_Laten.DecimalPlaces = 2; numericUpDown_Range_Laten.Increment = new decimal(new int[] { 2, 0, 0, 131072 }); - numericUpDown_Range_Laten.Location = new Point(68, 103); + numericUpDown_Range_Laten.Location = new Point(78, 137); + numericUpDown_Range_Laten.Margin = new Padding(3, 4, 3, 4); numericUpDown_Range_Laten.Maximum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Range_Laten.Name = "numericUpDown_Range_Laten"; - numericUpDown_Range_Laten.Size = new Size(41, 23); + numericUpDown_Range_Laten.Size = new Size(47, 27); numericUpDown_Range_Laten.TabIndex = 34; numericUpDown_Range_Laten.Value = new decimal(new int[] { 1, 0, 0, 65536 }); numericUpDown_Range_Laten.ValueChanged += numericUpDown_Range_Update; @@ -622,9 +645,9 @@ // label56 // label56.AutoSize = true; - label56.Location = new Point(5, 105); + label56.Location = new Point(6, 140); label56.Name = "label56"; - label56.Size = new Size(55, 15); + label56.Size = new Size(68, 20); label56.TabIndex = 33; label56.Text = "Lateness:"; // @@ -633,9 +656,10 @@ checkBox_Range_Enable.AutoSize = true; checkBox_Range_Enable.Checked = true; checkBox_Range_Enable.CheckState = CheckState.Checked; - checkBox_Range_Enable.Location = new Point(158, 108); + checkBox_Range_Enable.Location = new Point(181, 144); + checkBox_Range_Enable.Margin = new Padding(3, 4, 3, 4); checkBox_Range_Enable.Name = "checkBox_Range_Enable"; - checkBox_Range_Enable.Size = new Size(39, 19); + checkBox_Range_Enable.Size = new Size(47, 24); checkBox_Range_Enable.TabIndex = 31; checkBox_Range_Enable.Tag = "#en"; checkBox_Range_Enable.Text = "En"; @@ -644,10 +668,11 @@ // // numericUpDown_Range_Max // - numericUpDown_Range_Max.Location = new Point(69, 74); + numericUpDown_Range_Max.Location = new Point(79, 99); + numericUpDown_Range_Max.Margin = new Padding(3, 4, 3, 4); numericUpDown_Range_Max.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Range_Max.Name = "numericUpDown_Range_Max"; - numericUpDown_Range_Max.Size = new Size(40, 23); + numericUpDown_Range_Max.Size = new Size(46, 27); numericUpDown_Range_Max.TabIndex = 29; numericUpDown_Range_Max.Value = new decimal(new int[] { 8, 0, 0, 0 }); numericUpDown_Range_Max.ValueChanged += numericUpDown_Range_Update; @@ -655,18 +680,18 @@ // label42 // label42.AutoSize = true; - label42.Location = new Point(113, 76); + label42.Location = new Point(129, 101); label42.Name = "label42"; - label42.Size = new Size(18, 15); + label42.Size = new Size(22, 20); label42.TabIndex = 30; label42.Text = "m"; // // label43 // label43.AutoSize = true; - label43.Location = new Point(0, 76); + label43.Location = new Point(0, 101); label43.Name = "label43"; - label43.Size = new Size(70, 15); + label43.Size = new Size(86, 20); label43.TabIndex = 28; label43.Tag = "#max_height"; label43.Text = "Max height:"; @@ -674,19 +699,20 @@ // label44 // label44.AutoSize = true; - label44.Location = new Point(119, 47); + label44.Location = new Point(136, 63); label44.Name = "label44"; - label44.Size = new Size(18, 15); + label44.Size = new Size(22, 20); label44.TabIndex = 27; label44.Text = "m"; // // numericUpDown_Range_Noise // numericUpDown_Range_Noise.DecimalPlaces = 3; - numericUpDown_Range_Noise.Location = new Point(70, 45); + numericUpDown_Range_Noise.Location = new Point(80, 60); + numericUpDown_Range_Noise.Margin = new Padding(3, 4, 3, 4); numericUpDown_Range_Noise.Maximum = new decimal(new int[] { 10, 0, 0, 0 }); numericUpDown_Range_Noise.Name = "numericUpDown_Range_Noise"; - numericUpDown_Range_Noise.Size = new Size(47, 23); + numericUpDown_Range_Noise.Size = new Size(54, 27); numericUpDown_Range_Noise.TabIndex = 26; numericUpDown_Range_Noise.Value = new decimal(new int[] { 1, 0, 0, 131072 }); numericUpDown_Range_Noise.ValueChanged += numericUpDown_Range_Update; @@ -694,20 +720,21 @@ // label45 // label45.AutoSize = true; - label45.Location = new Point(24, 47); + label45.Location = new Point(27, 63); label45.Name = "label45"; - label45.Size = new Size(40, 15); + label45.Size = new Size(50, 20); label45.TabIndex = 25; label45.Tag = "#accuracy"; label45.Text = "Noise:"; // // numericUpDown_Range_Freq // - numericUpDown_Range_Freq.Location = new Point(70, 16); + numericUpDown_Range_Freq.Location = new Point(80, 21); + numericUpDown_Range_Freq.Margin = new Padding(3, 4, 3, 4); numericUpDown_Range_Freq.Maximum = new decimal(new int[] { 200, 0, 0, 0 }); numericUpDown_Range_Freq.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Range_Freq.Name = "numericUpDown_Range_Freq"; - numericUpDown_Range_Freq.Size = new Size(40, 23); + numericUpDown_Range_Freq.Size = new Size(46, 27); numericUpDown_Range_Freq.TabIndex = 22; numericUpDown_Range_Freq.Value = new decimal(new int[] { 50, 0, 0, 0 }); numericUpDown_Range_Freq.ValueChanged += numericUpDown_Range_Update; @@ -715,18 +742,18 @@ // label46 // label46.AutoSize = true; - label46.Location = new Point(113, 18); + label46.Location = new Point(129, 24); label46.Name = "label46"; - label46.Size = new Size(21, 15); + label46.Size = new Size(27, 20); label46.TabIndex = 24; label46.Text = "Hz"; // // label47 // label47.AutoSize = true; - label47.Location = new Point(2, 18); + label47.Location = new Point(2, 24); label47.Name = "label47"; - label47.Size = new Size(65, 15); + label47.Size = new Size(79, 20); label47.TabIndex = 23; label47.Tag = "#frequency"; label47.Text = "Frequency:"; @@ -755,9 +782,11 @@ groupBox_OF.Controls.Add(label14); groupBox_OF.Controls.Add(label15); groupBox_OF.Dock = DockStyle.Top; - groupBox_OF.Location = new Point(0, 519); + groupBox_OF.Location = new Point(0, 692); + groupBox_OF.Margin = new Padding(3, 4, 3, 4); groupBox_OF.Name = "groupBox_OF"; - groupBox_OF.Size = new Size(204, 169); + groupBox_OF.Padding = new Padding(3, 4, 3, 4); + groupBox_OF.Size = new Size(235, 225); groupBox_OF.TabIndex = 4; groupBox_OF.TabStop = false; groupBox_OF.Text = "Optical flow"; @@ -765,9 +794,10 @@ // checkBox_Model_OF_Real // checkBox_Model_OF_Real.AutoSize = true; - checkBox_Model_OF_Real.Location = new Point(156, 78); + checkBox_Model_OF_Real.Location = new Point(178, 104); + checkBox_Model_OF_Real.Margin = new Padding(3, 4, 3, 4); checkBox_Model_OF_Real.Name = "checkBox_Model_OF_Real"; - checkBox_Model_OF_Real.Size = new Size(48, 19); + checkBox_Model_OF_Real.Size = new Size(60, 24); checkBox_Model_OF_Real.TabIndex = 40; checkBox_Model_OF_Real.Tag = "#en"; checkBox_Model_OF_Real.Text = "Real"; @@ -777,9 +807,9 @@ // label40 // label40.AutoSize = true; - label40.Location = new Point(158, 18); + label40.Location = new Point(181, 24); label40.Name = "label40"; - label40.Size = new Size(28, 15); + label40.Size = new Size(35, 20); label40.TabIndex = 36; label40.Text = "lens"; // @@ -787,11 +817,12 @@ // numericUpDown_OF_Lens.DecimalPlaces = 1; numericUpDown_OF_Lens.Increment = new decimal(new int[] { 1, 0, 0, 65536 }); - numericUpDown_OF_Lens.Location = new Point(153, 36); + numericUpDown_OF_Lens.Location = new Point(175, 48); + numericUpDown_OF_Lens.Margin = new Padding(3, 4, 3, 4); numericUpDown_OF_Lens.Maximum = new decimal(new int[] { 10, 0, 0, 0 }); numericUpDown_OF_Lens.Minimum = new decimal(new int[] { 1, 0, 0, 65536 }); numericUpDown_OF_Lens.Name = "numericUpDown_OF_Lens"; - numericUpDown_OF_Lens.Size = new Size(40, 23); + numericUpDown_OF_Lens.Size = new Size(46, 27); numericUpDown_OF_Lens.TabIndex = 35; numericUpDown_OF_Lens.Value = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_OF_Lens.ValueChanged += numericUpDown_OF_Update; @@ -799,9 +830,9 @@ // label39 // label39.AutoSize = true; - label39.Location = new Point(168, 111); + label39.Location = new Point(192, 148); label39.Name = "label39"; - label39.Size = new Size(24, 15); + label39.Size = new Size(30, 20); label39.TabIndex = 34; label39.Text = "sec"; // @@ -809,10 +840,11 @@ // numericUpDown_OF_Wait.DecimalPlaces = 2; numericUpDown_OF_Wait.Increment = new decimal(new int[] { 1, 0, 0, 65536 }); - numericUpDown_OF_Wait.Location = new Point(119, 109); + numericUpDown_OF_Wait.Location = new Point(136, 145); + numericUpDown_OF_Wait.Margin = new Padding(3, 4, 3, 4); numericUpDown_OF_Wait.Maximum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_OF_Wait.Name = "numericUpDown_OF_Wait"; - numericUpDown_OF_Wait.Size = new Size(47, 23); + numericUpDown_OF_Wait.Size = new Size(54, 27); numericUpDown_OF_Wait.TabIndex = 33; numericUpDown_OF_Wait.Value = new decimal(new int[] { 1, 0, 0, 65536 }); numericUpDown_OF_Wait.ValueChanged += numericUpDown_OF_Update; @@ -820,9 +852,9 @@ // label53 // label53.AutoSize = true; - label53.Location = new Point(113, 139); + label53.Location = new Point(129, 185); label53.Name = "label53"; - label53.Size = new Size(24, 15); + label53.Size = new Size(30, 20); label53.TabIndex = 32; label53.Text = "sec"; // @@ -830,10 +862,11 @@ // numericUpDown_OF_Laten.DecimalPlaces = 2; numericUpDown_OF_Laten.Increment = new decimal(new int[] { 2, 0, 0, 131072 }); - numericUpDown_OF_Laten.Location = new Point(66, 137); + numericUpDown_OF_Laten.Location = new Point(75, 183); + numericUpDown_OF_Laten.Margin = new Padding(3, 4, 3, 4); numericUpDown_OF_Laten.Maximum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_OF_Laten.Name = "numericUpDown_OF_Laten"; - numericUpDown_OF_Laten.Size = new Size(41, 23); + numericUpDown_OF_Laten.Size = new Size(47, 27); numericUpDown_OF_Laten.TabIndex = 31; numericUpDown_OF_Laten.Value = new decimal(new int[] { 1, 0, 0, 65536 }); numericUpDown_OF_Laten.ValueChanged += numericUpDown_OF_Update; @@ -841,9 +874,9 @@ // label54 // label54.AutoSize = true; - label54.Location = new Point(3, 139); + label54.Location = new Point(3, 185); label54.Name = "label54"; - label54.Size = new Size(55, 15); + label54.Size = new Size(68, 20); label54.TabIndex = 30; label54.Text = "Lateness:"; // @@ -851,9 +884,10 @@ // numericUpDown_OF_Error.DecimalPlaces = 1; numericUpDown_OF_Error.Increment = new decimal(new int[] { 1, 0, 0, 65536 }); - numericUpDown_OF_Error.Location = new Point(38, 109); + numericUpDown_OF_Error.Location = new Point(43, 145); + numericUpDown_OF_Error.Margin = new Padding(3, 4, 3, 4); numericUpDown_OF_Error.Name = "numericUpDown_OF_Error"; - numericUpDown_OF_Error.Size = new Size(47, 23); + numericUpDown_OF_Error.Size = new Size(54, 27); numericUpDown_OF_Error.TabIndex = 24; numericUpDown_OF_Error.Value = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_OF_Error.ValueChanged += numericUpDown_OF_Update; @@ -861,27 +895,28 @@ // label38 // label38.AutoSize = true; - label38.Location = new Point(83, 111); + label38.Location = new Point(95, 148); label38.Name = "label38"; - label38.Size = new Size(17, 15); + label38.Size = new Size(21, 20); label38.TabIndex = 25; label38.Text = "%"; // // label37 // label37.AutoSize = true; - label37.Location = new Point(1, 111); + label37.Location = new Point(1, 148); label37.Name = "label37"; - label37.Size = new Size(35, 15); + label37.Size = new Size(44, 20); label37.TabIndex = 23; label37.Text = "Error:"; // // numericUpDown_OF_Len // - numericUpDown_OF_Len.Location = new Point(68, 80); + numericUpDown_OF_Len.Location = new Point(78, 107); + numericUpDown_OF_Len.Margin = new Padding(3, 4, 3, 4); numericUpDown_OF_Len.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_OF_Len.Name = "numericUpDown_OF_Len"; - numericUpDown_OF_Len.Size = new Size(40, 23); + numericUpDown_OF_Len.Size = new Size(46, 27); numericUpDown_OF_Len.TabIndex = 20; numericUpDown_OF_Len.Value = new decimal(new int[] { 8, 0, 0, 0 }); numericUpDown_OF_Len.ValueChanged += numericUpDown_OF_Update; @@ -891,9 +926,10 @@ checkBox_OF_Enable.AutoSize = true; checkBox_OF_Enable.Checked = true; checkBox_OF_Enable.CheckState = CheckState.Checked; - checkBox_OF_Enable.Location = new Point(159, 141); + checkBox_OF_Enable.Location = new Point(182, 188); + checkBox_OF_Enable.Margin = new Padding(3, 4, 3, 4); checkBox_OF_Enable.Name = "checkBox_OF_Enable"; - checkBox_OF_Enable.Size = new Size(39, 19); + checkBox_OF_Enable.Size = new Size(47, 24); checkBox_OF_Enable.TabIndex = 22; checkBox_OF_Enable.Tag = "#en"; checkBox_OF_Enable.Text = "En"; @@ -903,18 +939,18 @@ // label17 // label17.AutoSize = true; - label17.Location = new Point(111, 82); + label17.Location = new Point(127, 109); label17.Name = "label17"; - label17.Size = new Size(18, 15); + label17.Size = new Size(22, 20); label17.TabIndex = 21; label17.Text = "m"; // // label16 // label16.AutoSize = true; - label16.Location = new Point(-1, 82); + label16.Location = new Point(-1, 109); label16.Name = "label16"; - label16.Size = new Size(70, 15); + label16.Size = new Size(86, 20); label16.TabIndex = 19; label16.Tag = "#max_height"; label16.Text = "Max length:"; @@ -922,19 +958,20 @@ // label12 // label12.AutoSize = true; - label12.Location = new Point(111, 53); + label12.Location = new Point(127, 71); label12.Name = "label12"; - label12.Size = new Size(28, 15); + label12.Size = new Size(37, 20); label12.TabIndex = 18; label12.Text = "Deg"; // // numericUpDown_OF_Noise // numericUpDown_OF_Noise.DecimalPlaces = 1; - numericUpDown_OF_Noise.Location = new Point(69, 51); + numericUpDown_OF_Noise.Location = new Point(79, 68); + numericUpDown_OF_Noise.Margin = new Padding(3, 4, 3, 4); numericUpDown_OF_Noise.Maximum = new decimal(new int[] { 10, 0, 0, 0 }); numericUpDown_OF_Noise.Name = "numericUpDown_OF_Noise"; - numericUpDown_OF_Noise.Size = new Size(40, 23); + numericUpDown_OF_Noise.Size = new Size(46, 27); numericUpDown_OF_Noise.TabIndex = 17; numericUpDown_OF_Noise.Value = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_OF_Noise.ValueChanged += numericUpDown_OF_Update; @@ -942,20 +979,21 @@ // label13 // label13.AutoSize = true; - label13.Location = new Point(7, 53); + label13.Location = new Point(8, 71); label13.Name = "label13"; - label13.Size = new Size(40, 15); + label13.Size = new Size(50, 20); label13.TabIndex = 16; label13.Tag = "#accuracy"; label13.Text = "Noise:"; // // numericUpDown_OF_Freq // - numericUpDown_OF_Freq.Location = new Point(69, 22); + numericUpDown_OF_Freq.Location = new Point(79, 29); + numericUpDown_OF_Freq.Margin = new Padding(3, 4, 3, 4); numericUpDown_OF_Freq.Maximum = new decimal(new int[] { 200, 0, 0, 0 }); numericUpDown_OF_Freq.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_OF_Freq.Name = "numericUpDown_OF_Freq"; - numericUpDown_OF_Freq.Size = new Size(40, 23); + numericUpDown_OF_Freq.Size = new Size(46, 27); numericUpDown_OF_Freq.TabIndex = 13; numericUpDown_OF_Freq.Value = new decimal(new int[] { 100, 0, 0, 0 }); numericUpDown_OF_Freq.ValueChanged += numericUpDown_OF_Update; @@ -963,18 +1001,18 @@ // label14 // label14.AutoSize = true; - label14.Location = new Point(112, 24); + label14.Location = new Point(128, 32); label14.Name = "label14"; - label14.Size = new Size(21, 15); + label14.Size = new Size(27, 20); label14.TabIndex = 15; label14.Text = "Hz"; // // label15 // label15.AutoSize = true; - label15.Location = new Point(6, 24); + label15.Location = new Point(7, 32); label15.Name = "label15"; - label15.Size = new Size(65, 15); + label15.Size = new Size(79, 20); label15.TabIndex = 14; label15.Tag = "#frequency"; label15.Text = "Frequency:"; @@ -996,9 +1034,11 @@ groupBox_Barometer.Controls.Add(label5); groupBox_Barometer.Controls.Add(label7); groupBox_Barometer.Dock = DockStyle.Top; - groupBox_Barometer.Location = new Point(0, 389); + groupBox_Barometer.Location = new Point(0, 519); + groupBox_Barometer.Margin = new Padding(3, 4, 3, 4); groupBox_Barometer.Name = "groupBox_Barometer"; - groupBox_Barometer.Size = new Size(204, 130); + groupBox_Barometer.Padding = new Padding(3, 4, 3, 4); + groupBox_Barometer.Size = new Size(235, 173); groupBox_Barometer.TabIndex = 3; groupBox_Barometer.TabStop = false; groupBox_Barometer.Tag = "#barometer"; @@ -1007,9 +1047,10 @@ // checkBox_Model_Bar_Real // checkBox_Model_Bar_Real.AutoSize = true; - checkBox_Model_Bar_Real.Location = new Point(157, 43); + checkBox_Model_Bar_Real.Location = new Point(179, 57); + checkBox_Model_Bar_Real.Margin = new Padding(3, 4, 3, 4); checkBox_Model_Bar_Real.Name = "checkBox_Model_Bar_Real"; - checkBox_Model_Bar_Real.Size = new Size(48, 19); + checkBox_Model_Bar_Real.Size = new Size(60, 24); checkBox_Model_Bar_Real.TabIndex = 39; checkBox_Model_Bar_Real.Tag = "#en"; checkBox_Model_Bar_Real.Text = "Real"; @@ -1019,9 +1060,9 @@ // label30 // label30.AutoSize = true; - label30.Location = new Point(115, 103); + label30.Location = new Point(131, 137); label30.Name = "label30"; - label30.Size = new Size(24, 15); + label30.Size = new Size(30, 20); label30.TabIndex = 23; label30.Text = "sec"; // @@ -1029,10 +1070,11 @@ // numericUpDown_Bar_Laten.DecimalPlaces = 2; numericUpDown_Bar_Laten.Increment = new decimal(new int[] { 2, 0, 0, 131072 }); - numericUpDown_Bar_Laten.Location = new Point(68, 101); + numericUpDown_Bar_Laten.Location = new Point(78, 135); + numericUpDown_Bar_Laten.Margin = new Padding(3, 4, 3, 4); numericUpDown_Bar_Laten.Maximum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Bar_Laten.Name = "numericUpDown_Bar_Laten"; - numericUpDown_Bar_Laten.Size = new Size(41, 23); + numericUpDown_Bar_Laten.Size = new Size(47, 27); numericUpDown_Bar_Laten.TabIndex = 22; numericUpDown_Bar_Laten.Value = new decimal(new int[] { 3, 0, 0, 65536 }); numericUpDown_Bar_Laten.ValueChanged += numericUpDown_Bar_Update; @@ -1040,26 +1082,27 @@ // label29 // label29.AutoSize = true; - label29.Location = new Point(9, 103); + label29.Location = new Point(10, 137); label29.Name = "label29"; - label29.Size = new Size(55, 15); + label29.Size = new Size(68, 20); label29.TabIndex = 21; label29.Text = "Lateness:"; // // label19 // label19.AutoSize = true; - label19.Location = new Point(135, 19); + label19.Location = new Point(154, 25); label19.Name = "label19"; - label19.Size = new Size(20, 15); + label19.Size = new Size(24, 20); label19.TabIndex = 20; label19.Text = "Pa"; // // textBox_Bar_Pressure // - textBox_Bar_Pressure.Location = new Point(68, 16); + textBox_Bar_Pressure.Location = new Point(78, 21); + textBox_Bar_Pressure.Margin = new Padding(3, 4, 3, 4); textBox_Bar_Pressure.Name = "textBox_Bar_Pressure"; - textBox_Bar_Pressure.Size = new Size(61, 23); + textBox_Bar_Pressure.Size = new Size(69, 27); textBox_Bar_Pressure.TabIndex = 19; textBox_Bar_Pressure.Text = "102258"; textBox_Bar_Pressure.TextChanged += numericUpDown_Bar_Update; @@ -1067,9 +1110,9 @@ // label18 // label18.AutoSize = true; - label18.Location = new Point(6, 19); + label18.Location = new Point(7, 25); label18.Name = "label18"; - label18.Size = new Size(54, 15); + label18.Size = new Size(66, 20); label18.TabIndex = 18; label18.Tag = "#pressure"; label18.Text = "Pressure:"; @@ -1079,9 +1122,10 @@ checkBox_Bar_Enable.AutoSize = true; checkBox_Bar_Enable.Checked = true; checkBox_Bar_Enable.CheckState = CheckState.Checked; - checkBox_Bar_Enable.Location = new Point(162, 99); + checkBox_Bar_Enable.Location = new Point(185, 132); + checkBox_Bar_Enable.Margin = new Padding(3, 4, 3, 4); checkBox_Bar_Enable.Name = "checkBox_Bar_Enable"; - checkBox_Bar_Enable.Size = new Size(39, 19); + checkBox_Bar_Enable.Size = new Size(47, 24); checkBox_Bar_Enable.TabIndex = 17; checkBox_Bar_Enable.Tag = "#en"; checkBox_Bar_Enable.Text = "En"; @@ -1091,19 +1135,20 @@ // label9 // label9.AutoSize = true; - label9.Location = new Point(111, 74); + label9.Location = new Point(127, 99); label9.Name = "label9"; - label9.Size = new Size(20, 15); + label9.Size = new Size(24, 20); label9.TabIndex = 12; label9.Text = "Pa"; // // numericUpDown_Bar_Noise // numericUpDown_Bar_Noise.DecimalPlaces = 1; - numericUpDown_Bar_Noise.Location = new Point(68, 72); + numericUpDown_Bar_Noise.Location = new Point(78, 96); + numericUpDown_Bar_Noise.Margin = new Padding(3, 4, 3, 4); numericUpDown_Bar_Noise.Maximum = new decimal(new int[] { 10, 0, 0, 0 }); numericUpDown_Bar_Noise.Name = "numericUpDown_Bar_Noise"; - numericUpDown_Bar_Noise.Size = new Size(40, 23); + numericUpDown_Bar_Noise.Size = new Size(46, 27); numericUpDown_Bar_Noise.TabIndex = 11; numericUpDown_Bar_Noise.Value = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Bar_Noise.ValueChanged += numericUpDown_Bar_Update; @@ -1111,20 +1156,21 @@ // label8 // label8.AutoSize = true; - label8.Location = new Point(23, 74); + label8.Location = new Point(26, 99); label8.Name = "label8"; - label8.Size = new Size(40, 15); + label8.Size = new Size(50, 20); label8.TabIndex = 10; label8.Tag = "#accuracy"; label8.Text = "Noise:"; // // numericUpDown_Bar_Freq // - numericUpDown_Bar_Freq.Location = new Point(68, 43); + numericUpDown_Bar_Freq.Location = new Point(78, 57); + numericUpDown_Bar_Freq.Margin = new Padding(3, 4, 3, 4); numericUpDown_Bar_Freq.Maximum = new decimal(new int[] { 200, 0, 0, 0 }); numericUpDown_Bar_Freq.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Bar_Freq.Name = "numericUpDown_Bar_Freq"; - numericUpDown_Bar_Freq.Size = new Size(40, 23); + numericUpDown_Bar_Freq.Size = new Size(46, 27); numericUpDown_Bar_Freq.TabIndex = 7; numericUpDown_Bar_Freq.Value = new decimal(new int[] { 50, 0, 0, 0 }); numericUpDown_Bar_Freq.ValueChanged += numericUpDown_Bar_Update; @@ -1132,18 +1178,18 @@ // label5 // label5.AutoSize = true; - label5.Location = new Point(110, 45); + label5.Location = new Point(126, 60); label5.Name = "label5"; - label5.Size = new Size(21, 15); + label5.Size = new Size(27, 20); label5.TabIndex = 9; label5.Text = "Hz"; // // label7 // label7.AutoSize = true; - label7.Location = new Point(1, 45); + label7.Location = new Point(1, 60); label7.Name = "label7"; - label7.Size = new Size(65, 15); + label7.Size = new Size(79, 20); label7.TabIndex = 8; label7.Tag = "#frequency"; label7.Text = "Frequency:"; @@ -1162,9 +1208,11 @@ groupBox_GPS.Controls.Add(label48); groupBox_GPS.Controls.Add(checkBox_Pos_Enable); groupBox_GPS.Dock = DockStyle.Top; - groupBox_GPS.Location = new Point(0, 283); + groupBox_GPS.Location = new Point(0, 378); + groupBox_GPS.Margin = new Padding(3, 4, 3, 4); groupBox_GPS.Name = "groupBox_GPS"; - groupBox_GPS.Size = new Size(204, 106); + groupBox_GPS.Padding = new Padding(3, 4, 3, 4); + groupBox_GPS.Size = new Size(235, 141); groupBox_GPS.TabIndex = 2; groupBox_GPS.TabStop = false; groupBox_GPS.Text = "Position"; @@ -1172,9 +1220,10 @@ // checkBox_Model_Pos_Real // checkBox_Model_Pos_Real.AutoSize = true; - checkBox_Model_Pos_Real.Location = new Point(156, 15); + checkBox_Model_Pos_Real.Location = new Point(178, 20); + checkBox_Model_Pos_Real.Margin = new Padding(3, 4, 3, 4); checkBox_Model_Pos_Real.Name = "checkBox_Model_Pos_Real"; - checkBox_Model_Pos_Real.Size = new Size(48, 19); + checkBox_Model_Pos_Real.Size = new Size(60, 24); checkBox_Model_Pos_Real.TabIndex = 38; checkBox_Model_Pos_Real.Tag = "#en"; checkBox_Model_Pos_Real.Text = "Real"; @@ -1184,9 +1233,9 @@ // label2 // label2.AutoSize = true; - label2.Location = new Point(116, 77); + label2.Location = new Point(133, 103); label2.Name = "label2"; - label2.Size = new Size(24, 15); + label2.Size = new Size(30, 20); label2.TabIndex = 32; label2.Text = "sec"; // @@ -1194,10 +1243,11 @@ // numericUpDown_Pos_Laten.DecimalPlaces = 2; numericUpDown_Pos_Laten.Increment = new decimal(new int[] { 2, 0, 0, 131072 }); - numericUpDown_Pos_Laten.Location = new Point(69, 75); + numericUpDown_Pos_Laten.Location = new Point(79, 100); + numericUpDown_Pos_Laten.Margin = new Padding(3, 4, 3, 4); numericUpDown_Pos_Laten.Maximum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Pos_Laten.Name = "numericUpDown_Pos_Laten"; - numericUpDown_Pos_Laten.Size = new Size(41, 23); + numericUpDown_Pos_Laten.Size = new Size(47, 27); numericUpDown_Pos_Laten.TabIndex = 31; numericUpDown_Pos_Laten.Value = new decimal(new int[] { 3, 0, 0, 65536 }); numericUpDown_Pos_Laten.ValueChanged += numericUpDown_Pos_Update; @@ -1205,18 +1255,18 @@ // label4 // label4.AutoSize = true; - label4.Location = new Point(6, 77); + label4.Location = new Point(7, 103); label4.Name = "label4"; - label4.Size = new Size(55, 15); + label4.Size = new Size(68, 20); label4.TabIndex = 30; label4.Text = "Lateness:"; // // label6 // label6.AutoSize = true; - label6.Location = new Point(112, 48); + label6.Location = new Point(128, 64); label6.Name = "label6"; - label6.Size = new Size(18, 15); + label6.Size = new Size(22, 20); label6.TabIndex = 29; label6.Text = "m"; // @@ -1224,10 +1274,11 @@ // numericUpDown_Pos_Noise.DecimalPlaces = 1; numericUpDown_Pos_Noise.Increment = new decimal(new int[] { 1, 0, 0, 65536 }); - numericUpDown_Pos_Noise.Location = new Point(69, 46); + numericUpDown_Pos_Noise.Location = new Point(79, 61); + numericUpDown_Pos_Noise.Margin = new Padding(3, 4, 3, 4); numericUpDown_Pos_Noise.Maximum = new decimal(new int[] { 10, 0, 0, 0 }); numericUpDown_Pos_Noise.Name = "numericUpDown_Pos_Noise"; - numericUpDown_Pos_Noise.Size = new Size(40, 23); + numericUpDown_Pos_Noise.Size = new Size(46, 27); numericUpDown_Pos_Noise.TabIndex = 28; numericUpDown_Pos_Noise.Value = new decimal(new int[] { 1, 0, 0, 65536 }); numericUpDown_Pos_Noise.ValueChanged += numericUpDown_Pos_Update; @@ -1235,20 +1286,21 @@ // label10 // label10.AutoSize = true; - label10.Location = new Point(23, 48); + label10.Location = new Point(26, 64); label10.Name = "label10"; - label10.Size = new Size(40, 15); + label10.Size = new Size(50, 20); label10.TabIndex = 27; label10.Tag = "#accuracy"; label10.Text = "Noise:"; // // numericUpDown_Pos_Freq // - numericUpDown_Pos_Freq.Location = new Point(69, 17); + numericUpDown_Pos_Freq.Location = new Point(79, 23); + numericUpDown_Pos_Freq.Margin = new Padding(3, 4, 3, 4); numericUpDown_Pos_Freq.Maximum = new decimal(new int[] { 200, 0, 0, 0 }); numericUpDown_Pos_Freq.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Pos_Freq.Name = "numericUpDown_Pos_Freq"; - numericUpDown_Pos_Freq.Size = new Size(40, 23); + numericUpDown_Pos_Freq.Size = new Size(46, 27); numericUpDown_Pos_Freq.TabIndex = 24; numericUpDown_Pos_Freq.Value = new decimal(new int[] { 50, 0, 0, 0 }); numericUpDown_Pos_Freq.ValueChanged += numericUpDown_Pos_Update; @@ -1256,18 +1308,18 @@ // label11 // label11.AutoSize = true; - label11.Location = new Point(111, 19); + label11.Location = new Point(127, 25); label11.Name = "label11"; - label11.Size = new Size(21, 15); + label11.Size = new Size(27, 20); label11.TabIndex = 26; label11.Text = "Hz"; // // label48 // label48.AutoSize = true; - label48.Location = new Point(2, 19); + label48.Location = new Point(2, 25); label48.Name = "label48"; - label48.Size = new Size(65, 15); + label48.Size = new Size(79, 20); label48.TabIndex = 25; label48.Tag = "#frequency"; label48.Text = "Frequency:"; @@ -1277,9 +1329,10 @@ checkBox_Pos_Enable.AutoSize = true; checkBox_Pos_Enable.Checked = true; checkBox_Pos_Enable.CheckState = CheckState.Checked; - checkBox_Pos_Enable.Location = new Point(158, 78); + checkBox_Pos_Enable.Location = new Point(181, 104); + checkBox_Pos_Enable.Margin = new Padding(3, 4, 3, 4); checkBox_Pos_Enable.Name = "checkBox_Pos_Enable"; - checkBox_Pos_Enable.Size = new Size(39, 19); + checkBox_Pos_Enable.Size = new Size(47, 24); checkBox_Pos_Enable.TabIndex = 16; checkBox_Pos_Enable.Tag = "#en"; checkBox_Pos_Enable.Text = "En"; @@ -1295,9 +1348,11 @@ groupBox_Mag.Controls.Add(label22); groupBox_Mag.Dock = DockStyle.Top; groupBox_Mag.Enabled = false; - groupBox_Mag.Location = new Point(0, 232); + groupBox_Mag.Location = new Point(0, 310); + groupBox_Mag.Margin = new Padding(3, 4, 3, 4); groupBox_Mag.Name = "groupBox_Mag"; - groupBox_Mag.Size = new Size(204, 51); + groupBox_Mag.Padding = new Padding(3, 4, 3, 4); + groupBox_Mag.Size = new Size(235, 68); groupBox_Mag.TabIndex = 5; groupBox_Mag.TabStop = false; groupBox_Mag.Text = "Magnetometer"; @@ -1305,45 +1360,47 @@ // label27 // label27.AutoSize = true; - label27.Location = new Point(172, 20); + label27.Location = new Point(197, 27); label27.Name = "label27"; - label27.Size = new Size(12, 15); + label27.Size = new Size(16, 20); label27.TabIndex = 14; label27.Text = "?"; // // numericUpDown_Mag_Noise // numericUpDown_Mag_Noise.DecimalPlaces = 1; - numericUpDown_Mag_Noise.Location = new Point(126, 18); + numericUpDown_Mag_Noise.Location = new Point(144, 24); + numericUpDown_Mag_Noise.Margin = new Padding(3, 4, 3, 4); numericUpDown_Mag_Noise.Name = "numericUpDown_Mag_Noise"; - numericUpDown_Mag_Noise.Size = new Size(40, 23); + numericUpDown_Mag_Noise.Size = new Size(46, 27); numericUpDown_Mag_Noise.TabIndex = 13; // // label28 // label28.AutoSize = true; - label28.Location = new Point(83, 20); + label28.Location = new Point(95, 27); label28.Name = "label28"; - label28.Size = new Size(40, 15); + label28.Size = new Size(50, 20); label28.TabIndex = 12; label28.Text = "Noise:"; // // numericUpDown_Mag_Freq // - numericUpDown_Mag_Freq.Location = new Point(37, 18); + numericUpDown_Mag_Freq.Location = new Point(42, 24); + numericUpDown_Mag_Freq.Margin = new Padding(3, 4, 3, 4); numericUpDown_Mag_Freq.Maximum = new decimal(new int[] { 200, 0, 0, 0 }); numericUpDown_Mag_Freq.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Mag_Freq.Name = "numericUpDown_Mag_Freq"; - numericUpDown_Mag_Freq.Size = new Size(40, 23); + numericUpDown_Mag_Freq.Size = new Size(46, 27); numericUpDown_Mag_Freq.TabIndex = 10; numericUpDown_Mag_Freq.Value = new decimal(new int[] { 200, 0, 0, 0 }); // // label22 // label22.AutoSize = true; - label22.Location = new Point(3, 20); + label22.Location = new Point(3, 27); label22.Name = "label22"; - label22.Size = new Size(33, 15); + label22.Size = new Size(41, 20); label22.TabIndex = 9; label22.Text = "Freq:"; // @@ -1366,9 +1423,11 @@ groupBox_Gyr.Controls.Add(numericUpDown_Gyr_Freq); groupBox_Gyr.Controls.Add(label21); groupBox_Gyr.Dock = DockStyle.Top; - groupBox_Gyr.Location = new Point(0, 110); + groupBox_Gyr.Location = new Point(0, 147); + groupBox_Gyr.Margin = new Padding(3, 4, 3, 4); groupBox_Gyr.Name = "groupBox_Gyr"; - groupBox_Gyr.Size = new Size(204, 122); + groupBox_Gyr.Padding = new Padding(3, 4, 3, 4); + groupBox_Gyr.Size = new Size(235, 163); groupBox_Gyr.TabIndex = 7; groupBox_Gyr.TabStop = false; groupBox_Gyr.Text = "Gyroscope"; @@ -1376,9 +1435,10 @@ // checkBox_Model_Gyr_Real // checkBox_Model_Gyr_Real.AutoSize = true; - checkBox_Model_Gyr_Real.Location = new Point(153, 101); + checkBox_Model_Gyr_Real.Location = new Point(175, 135); + checkBox_Model_Gyr_Real.Margin = new Padding(3, 4, 3, 4); checkBox_Model_Gyr_Real.Name = "checkBox_Model_Gyr_Real"; - checkBox_Model_Gyr_Real.Size = new Size(48, 19); + checkBox_Model_Gyr_Real.Size = new Size(60, 24); checkBox_Model_Gyr_Real.TabIndex = 37; checkBox_Model_Gyr_Real.Tag = "#en"; checkBox_Model_Gyr_Real.Text = "Real"; @@ -1388,9 +1448,9 @@ // label51 // label51.AutoSize = true; - label51.Location = new Point(126, 94); + label51.Location = new Point(144, 125); label51.Name = "label51"; - label51.Size = new Size(24, 15); + label51.Size = new Size(30, 20); label51.TabIndex = 35; label51.Text = "sec"; // @@ -1398,10 +1458,11 @@ // numericUpDown_Gyr_Laten.DecimalPlaces = 3; numericUpDown_Gyr_Laten.Increment = new decimal(new int[] { 2, 0, 0, 131072 }); - numericUpDown_Gyr_Laten.Location = new Point(68, 92); + numericUpDown_Gyr_Laten.Location = new Point(78, 123); + numericUpDown_Gyr_Laten.Margin = new Padding(3, 4, 3, 4); numericUpDown_Gyr_Laten.Maximum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Gyr_Laten.Name = "numericUpDown_Gyr_Laten"; - numericUpDown_Gyr_Laten.Size = new Size(49, 23); + numericUpDown_Gyr_Laten.Size = new Size(56, 27); numericUpDown_Gyr_Laten.TabIndex = 34; numericUpDown_Gyr_Laten.Value = new decimal(new int[] { 1, 0, 0, 131072 }); numericUpDown_Gyr_Laten.ValueChanged += numericUpDown_Gyr_Update; @@ -1409,36 +1470,36 @@ // label52 // label52.AutoSize = true; - label52.Location = new Point(5, 94); + label52.Location = new Point(6, 125); label52.Name = "label52"; - label52.Size = new Size(55, 15); + label52.Size = new Size(68, 20); label52.TabIndex = 33; label52.Text = "Lateness:"; // // label36 // label36.AutoSize = true; - label36.Location = new Point(158, 44); + label36.Location = new Point(181, 59); label36.Name = "label36"; - label36.Size = new Size(14, 15); + label36.Size = new Size(18, 20); label36.TabIndex = 21; label36.Text = "Z"; // // label35 // label35.AutoSize = true; - label35.Location = new Point(103, 44); + label35.Location = new Point(118, 59); label35.Name = "label35"; - label35.Size = new Size(14, 15); + label35.Size = new Size(17, 20); label35.TabIndex = 20; label35.Text = "Y"; // // label34 // label34.AutoSize = true; - label34.Location = new Point(47, 44); + label34.Location = new Point(54, 59); label34.Name = "label34"; - label34.Size = new Size(14, 15); + label34.Size = new Size(18, 20); label34.TabIndex = 19; label34.Text = "X"; // @@ -1446,11 +1507,12 @@ // numericUpDown_Gyr_Shift_Z.DecimalPlaces = 2; numericUpDown_Gyr_Shift_Z.Increment = new decimal(new int[] { 1, 0, 0, 65536 }); - numericUpDown_Gyr_Shift_Z.Location = new Point(145, 62); + numericUpDown_Gyr_Shift_Z.Location = new Point(166, 83); + numericUpDown_Gyr_Shift_Z.Margin = new Padding(3, 4, 3, 4); numericUpDown_Gyr_Shift_Z.Maximum = new decimal(new int[] { 10, 0, 0, 0 }); numericUpDown_Gyr_Shift_Z.Minimum = new decimal(new int[] { 10, 0, 0, int.MinValue }); numericUpDown_Gyr_Shift_Z.Name = "numericUpDown_Gyr_Shift_Z"; - numericUpDown_Gyr_Shift_Z.Size = new Size(48, 23); + numericUpDown_Gyr_Shift_Z.Size = new Size(55, 27); numericUpDown_Gyr_Shift_Z.TabIndex = 18; numericUpDown_Gyr_Shift_Z.Value = new decimal(new int[] { 1, 0, 0, 131072 }); numericUpDown_Gyr_Shift_Z.ValueChanged += numericUpDown_Gyr_Update; @@ -1459,11 +1521,12 @@ // numericUpDown_Gyr_Shift_Y.DecimalPlaces = 2; numericUpDown_Gyr_Shift_Y.Increment = new decimal(new int[] { 1, 0, 0, 65536 }); - numericUpDown_Gyr_Shift_Y.Location = new Point(91, 62); + numericUpDown_Gyr_Shift_Y.Location = new Point(104, 83); + numericUpDown_Gyr_Shift_Y.Margin = new Padding(3, 4, 3, 4); numericUpDown_Gyr_Shift_Y.Maximum = new decimal(new int[] { 10, 0, 0, 0 }); numericUpDown_Gyr_Shift_Y.Minimum = new decimal(new int[] { 10, 0, 0, int.MinValue }); numericUpDown_Gyr_Shift_Y.Name = "numericUpDown_Gyr_Shift_Y"; - numericUpDown_Gyr_Shift_Y.Size = new Size(48, 23); + numericUpDown_Gyr_Shift_Y.Size = new Size(55, 27); numericUpDown_Gyr_Shift_Y.TabIndex = 17; numericUpDown_Gyr_Shift_Y.Value = new decimal(new int[] { 2, 0, 0, -2147352576 }); numericUpDown_Gyr_Shift_Y.ValueChanged += numericUpDown_Gyr_Update; @@ -1472,11 +1535,12 @@ // numericUpDown_Gyr_Shift_X.DecimalPlaces = 2; numericUpDown_Gyr_Shift_X.Increment = new decimal(new int[] { 1, 0, 0, 65536 }); - numericUpDown_Gyr_Shift_X.Location = new Point(37, 62); + numericUpDown_Gyr_Shift_X.Location = new Point(42, 83); + numericUpDown_Gyr_Shift_X.Margin = new Padding(3, 4, 3, 4); numericUpDown_Gyr_Shift_X.Maximum = new decimal(new int[] { 10, 0, 0, 0 }); numericUpDown_Gyr_Shift_X.Minimum = new decimal(new int[] { 10, 0, 0, int.MinValue }); numericUpDown_Gyr_Shift_X.Name = "numericUpDown_Gyr_Shift_X"; - numericUpDown_Gyr_Shift_X.Size = new Size(48, 23); + numericUpDown_Gyr_Shift_X.Size = new Size(55, 27); numericUpDown_Gyr_Shift_X.TabIndex = 16; numericUpDown_Gyr_Shift_X.Value = new decimal(new int[] { 1, 0, 0, -2147352576 }); numericUpDown_Gyr_Shift_X.ValueChanged += numericUpDown_Gyr_Update; @@ -1484,9 +1548,9 @@ // label33 // label33.AutoSize = true; - label33.Location = new Point(1, 64); + label33.Location = new Point(1, 85); label33.Name = "label33"; - label33.Size = new Size(34, 15); + label33.Size = new Size(42, 20); label33.TabIndex = 15; label33.Text = "Shift:"; // @@ -1494,10 +1558,11 @@ // numericUpDown_Gyr_Noise.DecimalPlaces = 1; numericUpDown_Gyr_Noise.Increment = new decimal(new int[] { 1, 0, 0, 65536 }); - numericUpDown_Gyr_Noise.Location = new Point(126, 19); + numericUpDown_Gyr_Noise.Location = new Point(144, 25); + numericUpDown_Gyr_Noise.Margin = new Padding(3, 4, 3, 4); numericUpDown_Gyr_Noise.Maximum = new decimal(new int[] { 10, 0, 0, 0 }); numericUpDown_Gyr_Noise.Name = "numericUpDown_Gyr_Noise"; - numericUpDown_Gyr_Noise.Size = new Size(40, 23); + numericUpDown_Gyr_Noise.Size = new Size(46, 27); numericUpDown_Gyr_Noise.TabIndex = 13; numericUpDown_Gyr_Noise.Value = new decimal(new int[] { 1, 0, 0, 65536 }); numericUpDown_Gyr_Noise.ValueChanged += numericUpDown_Gyr_Update; @@ -1505,28 +1570,29 @@ // label25 // label25.AutoSize = true; - label25.Location = new Point(168, 22); + label25.Location = new Point(192, 29); label25.Name = "label25"; - label25.Size = new Size(33, 15); + label25.Size = new Size(42, 20); label25.TabIndex = 14; label25.Text = "dgps"; // // label26 // label26.AutoSize = true; - label26.Location = new Point(83, 22); + label26.Location = new Point(95, 29); label26.Name = "label26"; - label26.Size = new Size(40, 15); + label26.Size = new Size(50, 20); label26.TabIndex = 12; label26.Text = "Noise:"; // // numericUpDown_Gyr_Freq // - numericUpDown_Gyr_Freq.Location = new Point(37, 19); + numericUpDown_Gyr_Freq.Location = new Point(42, 25); + numericUpDown_Gyr_Freq.Margin = new Padding(3, 4, 3, 4); numericUpDown_Gyr_Freq.Maximum = new decimal(new int[] { 200, 0, 0, 0 }); numericUpDown_Gyr_Freq.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Gyr_Freq.Name = "numericUpDown_Gyr_Freq"; - numericUpDown_Gyr_Freq.Size = new Size(40, 23); + numericUpDown_Gyr_Freq.Size = new Size(46, 27); numericUpDown_Gyr_Freq.TabIndex = 10; numericUpDown_Gyr_Freq.Value = new decimal(new int[] { 200, 0, 0, 0 }); numericUpDown_Gyr_Freq.ValueChanged += numericUpDown_Gyr_Update; @@ -1534,9 +1600,9 @@ // label21 // label21.AutoSize = true; - label21.Location = new Point(3, 21); + label21.Location = new Point(3, 28); label21.Name = "label21"; - label21.Size = new Size(33, 15); + label21.Size = new Size(41, 20); label21.TabIndex = 9; label21.Text = "Freq:"; // @@ -1557,8 +1623,10 @@ groupBox_Acc.Controls.Add(label20); groupBox_Acc.Dock = DockStyle.Top; groupBox_Acc.Location = new Point(0, 0); + groupBox_Acc.Margin = new Padding(3, 4, 3, 4); groupBox_Acc.Name = "groupBox_Acc"; - groupBox_Acc.Size = new Size(204, 110); + groupBox_Acc.Padding = new Padding(3, 4, 3, 4); + groupBox_Acc.Size = new Size(235, 147); groupBox_Acc.TabIndex = 6; groupBox_Acc.TabStop = false; groupBox_Acc.Text = "Accelerometer"; @@ -1566,9 +1634,10 @@ // checkBox_Model_Acc_Real // checkBox_Model_Acc_Real.AutoSize = true; - checkBox_Model_Acc_Real.Location = new Point(156, 91); + checkBox_Model_Acc_Real.Location = new Point(178, 121); + checkBox_Model_Acc_Real.Margin = new Padding(3, 4, 3, 4); checkBox_Model_Acc_Real.Name = "checkBox_Model_Acc_Real"; - checkBox_Model_Acc_Real.Size = new Size(48, 19); + checkBox_Model_Acc_Real.Size = new Size(60, 24); checkBox_Model_Acc_Real.TabIndex = 36; checkBox_Model_Acc_Real.Tag = "#en"; checkBox_Model_Acc_Real.Text = "Real"; @@ -1578,9 +1647,9 @@ // label49 // label49.AutoSize = true; - label49.Location = new Point(126, 80); + label49.Location = new Point(144, 107); label49.Name = "label49"; - label49.Size = new Size(24, 15); + label49.Size = new Size(30, 20); label49.TabIndex = 35; label49.Text = "sec"; // @@ -1588,10 +1657,11 @@ // numericUpDown_Acc_Laten.DecimalPlaces = 3; numericUpDown_Acc_Laten.Increment = new decimal(new int[] { 1, 0, 0, 131072 }); - numericUpDown_Acc_Laten.Location = new Point(68, 78); + numericUpDown_Acc_Laten.Location = new Point(78, 104); + numericUpDown_Acc_Laten.Margin = new Padding(3, 4, 3, 4); numericUpDown_Acc_Laten.Maximum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Acc_Laten.Name = "numericUpDown_Acc_Laten"; - numericUpDown_Acc_Laten.Size = new Size(49, 23); + numericUpDown_Acc_Laten.Size = new Size(56, 27); numericUpDown_Acc_Laten.TabIndex = 34; numericUpDown_Acc_Laten.Value = new decimal(new int[] { 2, 0, 0, 131072 }); numericUpDown_Acc_Laten.ValueChanged += numericUpDown_Acc_Update; @@ -1599,9 +1669,9 @@ // label50 // label50.AutoSize = true; - label50.Location = new Point(5, 80); + label50.Location = new Point(6, 107); label50.Name = "label50"; - label50.Size = new Size(55, 15); + label50.Size = new Size(68, 20); label50.TabIndex = 33; label50.Text = "Lateness:"; // @@ -1609,11 +1679,12 @@ // numericUpDown_Acc_Scale_Left.DecimalPlaces = 3; numericUpDown_Acc_Scale_Left.Increment = new decimal(new int[] { 1, 0, 0, 196608 }); - numericUpDown_Acc_Scale_Left.Location = new Point(48, 50); + numericUpDown_Acc_Scale_Left.Location = new Point(55, 67); + numericUpDown_Acc_Scale_Left.Margin = new Padding(3, 4, 3, 4); numericUpDown_Acc_Scale_Left.Maximum = new decimal(new int[] { 5, 0, 0, -2147418112 }); numericUpDown_Acc_Scale_Left.Minimum = new decimal(new int[] { 15, 0, 0, -2147418112 }); numericUpDown_Acc_Scale_Left.Name = "numericUpDown_Acc_Scale_Left"; - numericUpDown_Acc_Scale_Left.Size = new Size(60, 23); + numericUpDown_Acc_Scale_Left.Size = new Size(69, 27); numericUpDown_Acc_Scale_Left.TabIndex = 13; numericUpDown_Acc_Scale_Left.Value = new decimal(new int[] { 101, 0, 0, -2147352576 }); numericUpDown_Acc_Scale_Left.ValueChanged += numericUpDown_Acc_Update; @@ -1622,11 +1693,12 @@ // numericUpDown_Acc_Scale_Rigth.DecimalPlaces = 3; numericUpDown_Acc_Scale_Rigth.Increment = new decimal(new int[] { 1, 0, 0, 196608 }); - numericUpDown_Acc_Scale_Rigth.Location = new Point(136, 50); + numericUpDown_Acc_Scale_Rigth.Location = new Point(155, 67); + numericUpDown_Acc_Scale_Rigth.Margin = new Padding(3, 4, 3, 4); numericUpDown_Acc_Scale_Rigth.Maximum = new decimal(new int[] { 15, 0, 0, 65536 }); numericUpDown_Acc_Scale_Rigth.Minimum = new decimal(new int[] { 5, 0, 0, 65536 }); numericUpDown_Acc_Scale_Rigth.Name = "numericUpDown_Acc_Scale_Rigth"; - numericUpDown_Acc_Scale_Rigth.Size = new Size(59, 23); + numericUpDown_Acc_Scale_Rigth.Size = new Size(67, 27); numericUpDown_Acc_Scale_Rigth.TabIndex = 14; numericUpDown_Acc_Scale_Rigth.Value = new decimal(new int[] { 102, 0, 0, 131072 }); numericUpDown_Acc_Scale_Rigth.ValueChanged += numericUpDown_Acc_Update; @@ -1634,27 +1706,27 @@ // label32 // label32.AutoSize = true; - label32.Location = new Point(109, 52); + label32.Location = new Point(125, 69); label32.Name = "label32"; - label32.Size = new Size(28, 15); + label32.Size = new Size(35, 20); label32.TabIndex = 15; label32.Text = "<->"; // // label31 // label31.AutoSize = true; - label31.Location = new Point(5, 52); + label31.Location = new Point(6, 69); label31.Name = "label31"; - label31.Size = new Size(37, 15); + label31.Size = new Size(47, 20); label31.TabIndex = 12; label31.Text = "Scale:"; // // label24 // label24.AutoSize = true; - label24.Location = new Point(180, 24); + label24.Location = new Point(206, 32); label24.Name = "label24"; - label24.Size = new Size(15, 15); + label24.Size = new Size(19, 20); label24.TabIndex = 11; label24.Text = "G"; // @@ -1662,10 +1734,11 @@ // numericUpDown_Acc_Noise.DecimalPlaces = 3; numericUpDown_Acc_Noise.Increment = new decimal(new int[] { 1, 0, 0, 196608 }); - numericUpDown_Acc_Noise.Location = new Point(126, 21); + numericUpDown_Acc_Noise.Location = new Point(144, 28); + numericUpDown_Acc_Noise.Margin = new Padding(3, 4, 3, 4); numericUpDown_Acc_Noise.Maximum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Acc_Noise.Name = "numericUpDown_Acc_Noise"; - numericUpDown_Acc_Noise.Size = new Size(49, 23); + numericUpDown_Acc_Noise.Size = new Size(56, 27); numericUpDown_Acc_Noise.TabIndex = 10; numericUpDown_Acc_Noise.Value = new decimal(new int[] { 1, 0, 0, 196608 }); numericUpDown_Acc_Noise.ValueChanged += numericUpDown_Acc_Update; @@ -1673,19 +1746,20 @@ // label23 // label23.AutoSize = true; - label23.Location = new Point(83, 24); + label23.Location = new Point(95, 32); label23.Name = "label23"; - label23.Size = new Size(40, 15); + label23.Size = new Size(50, 20); label23.TabIndex = 9; label23.Text = "Noise:"; // // numericUpDown_Acc_Freq // - numericUpDown_Acc_Freq.Location = new Point(37, 21); + numericUpDown_Acc_Freq.Location = new Point(42, 28); + numericUpDown_Acc_Freq.Margin = new Padding(3, 4, 3, 4); numericUpDown_Acc_Freq.Maximum = new decimal(new int[] { 200, 0, 0, 0 }); numericUpDown_Acc_Freq.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Acc_Freq.Name = "numericUpDown_Acc_Freq"; - numericUpDown_Acc_Freq.Size = new Size(40, 23); + numericUpDown_Acc_Freq.Size = new Size(46, 27); numericUpDown_Acc_Freq.TabIndex = 8; numericUpDown_Acc_Freq.Value = new decimal(new int[] { 200, 0, 0, 0 }); numericUpDown_Acc_Freq.ValueChanged += numericUpDown_Acc_Update; @@ -1693,9 +1767,9 @@ // label20 // label20.AutoSize = true; - label20.Location = new Point(1, 23); + label20.Location = new Point(1, 31); label20.Name = "label20"; - label20.Size = new Size(33, 15); + label20.Size = new Size(41, 20); label20.TabIndex = 2; label20.Text = "Freq:"; // @@ -1703,9 +1777,10 @@ // tabPage_Area.Controls.Add(groupBox4); tabPage_Area.Controls.Add(groupBox3); - tabPage_Area.Location = new Point(4, 24); + tabPage_Area.Location = new Point(4, 29); + tabPage_Area.Margin = new Padding(3, 4, 3, 4); tabPage_Area.Name = "tabPage_Area"; - tabPage_Area.Size = new Size(210, 889); + tabPage_Area.Size = new Size(241, 1190); tabPage_Area.TabIndex = 2; tabPage_Area.Tag = "#area"; tabPage_Area.Text = "Area"; @@ -1730,9 +1805,11 @@ groupBox4.Controls.Add(numericUpDown_Area_Wind_Speed_From); groupBox4.Controls.Add(checkBox_Area_Wind_Enable); groupBox4.Dock = DockStyle.Top; - groupBox4.Location = new Point(0, 53); + groupBox4.Location = new Point(0, 71); + groupBox4.Margin = new Padding(3, 4, 3, 4); groupBox4.Name = "groupBox4"; - groupBox4.Size = new Size(210, 177); + groupBox4.Padding = new Padding(3, 4, 3, 4); + groupBox4.Size = new Size(241, 236); groupBox4.TabIndex = 1; groupBox4.TabStop = false; groupBox4.Text = "Air and Wind"; @@ -1741,10 +1818,11 @@ // numericUpDown_Area_Wind_RotResist.DecimalPlaces = 3; numericUpDown_Area_Wind_RotResist.Increment = new decimal(new int[] { 1, 0, 0, 65536 }); - numericUpDown_Area_Wind_RotResist.Location = new Point(89, 145); + numericUpDown_Area_Wind_RotResist.Location = new Point(102, 193); + numericUpDown_Area_Wind_RotResist.Margin = new Padding(3, 4, 3, 4); numericUpDown_Area_Wind_RotResist.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); numericUpDown_Area_Wind_RotResist.Name = "numericUpDown_Area_Wind_RotResist"; - numericUpDown_Area_Wind_RotResist.Size = new Size(60, 23); + numericUpDown_Area_Wind_RotResist.Size = new Size(69, 27); numericUpDown_Area_Wind_RotResist.TabIndex = 15; numericUpDown_Area_Wind_RotResist.Value = new decimal(new int[] { 1, 0, 0, 0 }); numericUpDown_Area_Wind_RotResist.ValueChanged += numericUpDown_Area_Wind_Update; @@ -1752,19 +1830,20 @@ // label65 // label65.AutoSize = true; - label65.Location = new Point(6, 147); + label65.Location = new Point(7, 196); label65.Name = "label65"; - label65.Size = new Size(77, 15); + label65.Size = new Size(98, 20); label65.TabIndex = 14; label65.Text = "Rotate Resist:"; // // numericUpDown_Area_Wind_PosResist // numericUpDown_Area_Wind_PosResist.DecimalPlaces = 3; - numericUpDown_Area_Wind_PosResist.Location = new Point(89, 116); + numericUpDown_Area_Wind_PosResist.Location = new Point(102, 155); + numericUpDown_Area_Wind_PosResist.Margin = new Padding(3, 4, 3, 4); numericUpDown_Area_Wind_PosResist.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); numericUpDown_Area_Wind_PosResist.Name = "numericUpDown_Area_Wind_PosResist"; - numericUpDown_Area_Wind_PosResist.Size = new Size(60, 23); + numericUpDown_Area_Wind_PosResist.Size = new Size(69, 27); numericUpDown_Area_Wind_PosResist.TabIndex = 13; numericUpDown_Area_Wind_PosResist.Value = new decimal(new int[] { 10, 0, 0, 0 }); numericUpDown_Area_Wind_PosResist.ValueChanged += numericUpDown_Area_Wind_Update; @@ -1772,28 +1851,29 @@ // label64 // label64.AutoSize = true; - label64.Location = new Point(6, 118); + label64.Location = new Point(7, 157); label64.Name = "label64"; - label64.Size = new Size(73, 15); + label64.Size = new Size(91, 20); label64.TabIndex = 12; label64.Text = "Move Resist:"; // // label63 // label63.AutoSize = true; - label63.Location = new Point(128, 89); + label63.Location = new Point(146, 119); label63.Name = "label63"; - label63.Size = new Size(42, 15); + label63.Size = new Size(52, 20); label63.TabIndex = 11; label63.Text = "kg/m3"; // // numericUpDown_Area_Wind_Density // numericUpDown_Area_Wind_Density.DecimalPlaces = 3; - numericUpDown_Area_Wind_Density.Location = new Point(63, 87); + numericUpDown_Area_Wind_Density.Location = new Point(72, 116); + numericUpDown_Area_Wind_Density.Margin = new Padding(3, 4, 3, 4); numericUpDown_Area_Wind_Density.Maximum = new decimal(new int[] { 10, 0, 0, 0 }); numericUpDown_Area_Wind_Density.Name = "numericUpDown_Area_Wind_Density"; - numericUpDown_Area_Wind_Density.Size = new Size(60, 23); + numericUpDown_Area_Wind_Density.Size = new Size(69, 27); numericUpDown_Area_Wind_Density.TabIndex = 10; numericUpDown_Area_Wind_Density.Value = new decimal(new int[] { 12, 0, 0, 65536 }); numericUpDown_Area_Wind_Density.ValueChanged += numericUpDown_Area_Wind_Update; @@ -1801,18 +1881,18 @@ // label62 // label62.AutoSize = true; - label62.Location = new Point(8, 89); + label62.Location = new Point(9, 119); label62.Name = "label62"; - label62.Size = new Size(49, 15); + label62.Size = new Size(61, 20); label62.TabIndex = 9; label62.Text = "Density:"; // // label61 // label61.AutoSize = true; - label61.Location = new Point(179, 29); + label61.Location = new Point(205, 39); label61.Name = "label61"; - label61.Size = new Size(28, 15); + label61.Size = new Size(34, 20); label61.TabIndex = 8; label61.Text = "m/s"; // @@ -1820,72 +1900,76 @@ // numericUpDown_Area_Wind_Speed_To.DecimalPlaces = 1; numericUpDown_Area_Wind_Speed_To.Enabled = false; - numericUpDown_Area_Wind_Speed_To.Location = new Point(125, 27); + numericUpDown_Area_Wind_Speed_To.Location = new Point(143, 36); + numericUpDown_Area_Wind_Speed_To.Margin = new Padding(3, 4, 3, 4); numericUpDown_Area_Wind_Speed_To.Name = "numericUpDown_Area_Wind_Speed_To"; - numericUpDown_Area_Wind_Speed_To.Size = new Size(53, 23); + numericUpDown_Area_Wind_Speed_To.Size = new Size(61, 27); numericUpDown_Area_Wind_Speed_To.TabIndex = 7; // // label60 // label60.AutoSize = true; - label60.Location = new Point(129, 57); + label60.Location = new Point(147, 76); label60.Name = "label60"; - label60.Size = new Size(27, 15); + label60.Size = new Size(35, 20); label60.TabIndex = 6; label60.Text = "deg"; // // label59 // label59.AutoSize = true; - label59.Location = new Point(8, 57); + label59.Location = new Point(9, 76); label59.Name = "label59"; - label59.Size = new Size(58, 15); + label59.Size = new Size(73, 20); label59.TabIndex = 5; label59.Text = "Direction:"; // // numericUpDown_Area_Wind_Direction // numericUpDown_Area_Wind_Direction.DecimalPlaces = 1; - numericUpDown_Area_Wind_Direction.Location = new Point(72, 55); + numericUpDown_Area_Wind_Direction.Location = new Point(82, 73); + numericUpDown_Area_Wind_Direction.Margin = new Padding(3, 4, 3, 4); numericUpDown_Area_Wind_Direction.Maximum = new decimal(new int[] { 359, 0, 0, 0 }); numericUpDown_Area_Wind_Direction.Name = "numericUpDown_Area_Wind_Direction"; - numericUpDown_Area_Wind_Direction.Size = new Size(51, 23); + numericUpDown_Area_Wind_Direction.Size = new Size(58, 27); numericUpDown_Area_Wind_Direction.TabIndex = 4; numericUpDown_Area_Wind_Direction.ValueChanged += numericUpDown_Area_Wind_Update; // // label58 // label58.AutoSize = true; - label58.Location = new Point(107, 29); + label58.Location = new Point(122, 39); label58.Name = "label58"; - label58.Size = new Size(12, 15); + label58.Size = new Size(15, 20); label58.TabIndex = 3; label58.Text = "-"; // // label57 // label57.AutoSize = true; - label57.Location = new Point(3, 29); + label57.Location = new Point(3, 39); label57.Name = "label57"; - label57.Size = new Size(42, 15); + label57.Size = new Size(54, 20); label57.TabIndex = 2; label57.Text = "Speed:"; // // numericUpDown_Area_Wind_Speed_From // numericUpDown_Area_Wind_Speed_From.DecimalPlaces = 1; - numericUpDown_Area_Wind_Speed_From.Location = new Point(51, 27); + numericUpDown_Area_Wind_Speed_From.Location = new Point(58, 36); + numericUpDown_Area_Wind_Speed_From.Margin = new Padding(3, 4, 3, 4); numericUpDown_Area_Wind_Speed_From.Name = "numericUpDown_Area_Wind_Speed_From"; - numericUpDown_Area_Wind_Speed_From.Size = new Size(50, 23); + numericUpDown_Area_Wind_Speed_From.Size = new Size(57, 27); numericUpDown_Area_Wind_Speed_From.TabIndex = 1; numericUpDown_Area_Wind_Speed_From.ValueChanged += numericUpDown_Area_Wind_Update; // // checkBox_Area_Wind_Enable // checkBox_Area_Wind_Enable.AutoSize = true; - checkBox_Area_Wind_Enable.Location = new Point(165, 149); + checkBox_Area_Wind_Enable.Location = new Point(189, 199); + checkBox_Area_Wind_Enable.Margin = new Padding(3, 4, 3, 4); checkBox_Area_Wind_Enable.Name = "checkBox_Area_Wind_Enable"; - checkBox_Area_Wind_Enable.Size = new Size(39, 19); + checkBox_Area_Wind_Enable.Size = new Size(47, 24); checkBox_Area_Wind_Enable.TabIndex = 0; checkBox_Area_Wind_Enable.Text = "En"; checkBox_Area_Wind_Enable.UseVisualStyleBackColor = true; @@ -1899,8 +1983,10 @@ groupBox3.Controls.Add(checkBox_Area_Freeze_X); groupBox3.Dock = DockStyle.Top; groupBox3.Location = new Point(0, 0); + groupBox3.Margin = new Padding(3, 4, 3, 4); groupBox3.Name = "groupBox3"; - groupBox3.Size = new Size(210, 53); + groupBox3.Padding = new Padding(3, 4, 3, 4); + groupBox3.Size = new Size(241, 71); groupBox3.TabIndex = 0; groupBox3.TabStop = false; groupBox3.Text = "Position"; @@ -1908,9 +1994,10 @@ // checkBox_Area_Freeze_Z // checkBox_Area_Freeze_Z.AutoSize = true; - checkBox_Area_Freeze_Z.Location = new Point(151, 23); + checkBox_Area_Freeze_Z.Location = new Point(173, 31); + checkBox_Area_Freeze_Z.Margin = new Padding(3, 4, 3, 4); checkBox_Area_Freeze_Z.Name = "checkBox_Area_Freeze_Z"; - checkBox_Area_Freeze_Z.Size = new Size(33, 19); + checkBox_Area_Freeze_Z.Size = new Size(40, 24); checkBox_Area_Freeze_Z.TabIndex = 3; checkBox_Area_Freeze_Z.Text = "Z"; checkBox_Area_Freeze_Z.UseVisualStyleBackColor = true; @@ -1919,9 +2006,10 @@ // checkBox_Area_Freeze_Y // checkBox_Area_Freeze_Y.AutoSize = true; - checkBox_Area_Freeze_Y.Location = new Point(103, 23); + checkBox_Area_Freeze_Y.Location = new Point(118, 31); + checkBox_Area_Freeze_Y.Margin = new Padding(3, 4, 3, 4); checkBox_Area_Freeze_Y.Name = "checkBox_Area_Freeze_Y"; - checkBox_Area_Freeze_Y.Size = new Size(33, 19); + checkBox_Area_Freeze_Y.Size = new Size(39, 24); checkBox_Area_Freeze_Y.TabIndex = 2; checkBox_Area_Freeze_Y.Text = "Y"; checkBox_Area_Freeze_Y.UseVisualStyleBackColor = true; @@ -1930,18 +2018,19 @@ // label41 // label41.AutoSize = true; - label41.Location = new Point(6, 24); + label41.Location = new Point(7, 32); label41.Name = "label41"; - label41.Size = new Size(43, 15); + label41.Size = new Size(55, 20); label41.TabIndex = 1; label41.Text = "Freeze:"; // // checkBox_Area_Freeze_X // checkBox_Area_Freeze_X.AutoSize = true; - checkBox_Area_Freeze_X.Location = new Point(55, 23); + checkBox_Area_Freeze_X.Location = new Point(63, 31); + checkBox_Area_Freeze_X.Margin = new Padding(3, 4, 3, 4); checkBox_Area_Freeze_X.Name = "checkBox_Area_Freeze_X"; - checkBox_Area_Freeze_X.Size = new Size(33, 19); + checkBox_Area_Freeze_X.Size = new Size(40, 24); checkBox_Area_Freeze_X.TabIndex = 0; checkBox_Area_Freeze_X.Text = "X"; checkBox_Area_Freeze_X.UseVisualStyleBackColor = true; @@ -1951,10 +2040,11 @@ // tabPage_GPS.Controls.Add(groupBox5); tabPage_GPS.Controls.Add(groupBox2); - tabPage_GPS.Location = new Point(4, 24); + tabPage_GPS.Location = new Point(4, 29); + tabPage_GPS.Margin = new Padding(3, 4, 3, 4); tabPage_GPS.Name = "tabPage_GPS"; - tabPage_GPS.Padding = new Padding(3); - tabPage_GPS.Size = new Size(210, 889); + tabPage_GPS.Padding = new Padding(3, 4, 3, 4); + tabPage_GPS.Size = new Size(241, 992); tabPage_GPS.TabIndex = 3; tabPage_GPS.Text = "GPS"; tabPage_GPS.UseVisualStyleBackColor = true; @@ -1976,9 +2066,11 @@ groupBox5.Controls.Add(label71); groupBox5.Controls.Add(label70); groupBox5.Dock = DockStyle.Top; - groupBox5.Location = new Point(3, 122); + groupBox5.Location = new Point(3, 163); + groupBox5.Margin = new Padding(3, 4, 3, 4); groupBox5.Name = "groupBox5"; - groupBox5.Size = new Size(204, 225); + groupBox5.Padding = new Padding(3, 4, 3, 4); + groupBox5.Size = new Size(235, 300); groupBox5.TabIndex = 2; groupBox5.TabStop = false; groupBox5.Text = "State"; @@ -1986,9 +2078,10 @@ // numericUpDown_GPS_VDOP // numericUpDown_GPS_VDOP.DecimalPlaces = 2; - numericUpDown_GPS_VDOP.Location = new Point(58, 165); + numericUpDown_GPS_VDOP.Location = new Point(66, 220); + numericUpDown_GPS_VDOP.Margin = new Padding(3, 4, 3, 4); numericUpDown_GPS_VDOP.Name = "numericUpDown_GPS_VDOP"; - numericUpDown_GPS_VDOP.Size = new Size(62, 23); + numericUpDown_GPS_VDOP.Size = new Size(71, 27); numericUpDown_GPS_VDOP.TabIndex = 19; numericUpDown_GPS_VDOP.Value = new decimal(new int[] { 1, 0, 0, 65536 }); numericUpDown_GPS_VDOP.ValueChanged += numericUpDown_GPS_ValueChanged; @@ -1996,9 +2089,10 @@ // numericUpDown_GPS_PDOP // numericUpDown_GPS_PDOP.DecimalPlaces = 2; - numericUpDown_GPS_PDOP.Location = new Point(58, 194); + numericUpDown_GPS_PDOP.Location = new Point(66, 259); + numericUpDown_GPS_PDOP.Margin = new Padding(3, 4, 3, 4); numericUpDown_GPS_PDOP.Name = "numericUpDown_GPS_PDOP"; - numericUpDown_GPS_PDOP.Size = new Size(62, 23); + numericUpDown_GPS_PDOP.Size = new Size(71, 27); numericUpDown_GPS_PDOP.TabIndex = 18; numericUpDown_GPS_PDOP.Value = new decimal(new int[] { 1, 0, 0, 65536 }); numericUpDown_GPS_PDOP.ValueChanged += numericUpDown_GPS_ValueChanged; @@ -2006,9 +2100,10 @@ // numericUpDown_GPS_HDOP // numericUpDown_GPS_HDOP.DecimalPlaces = 2; - numericUpDown_GPS_HDOP.Location = new Point(58, 136); + numericUpDown_GPS_HDOP.Location = new Point(66, 181); + numericUpDown_GPS_HDOP.Margin = new Padding(3, 4, 3, 4); numericUpDown_GPS_HDOP.Name = "numericUpDown_GPS_HDOP"; - numericUpDown_GPS_HDOP.Size = new Size(62, 23); + numericUpDown_GPS_HDOP.Size = new Size(71, 27); numericUpDown_GPS_HDOP.TabIndex = 17; numericUpDown_GPS_HDOP.Value = new decimal(new int[] { 1, 0, 0, 65536 }); numericUpDown_GPS_HDOP.ValueChanged += numericUpDown_GPS_ValueChanged; @@ -2016,66 +2111,70 @@ // label82 // label82.AutoSize = true; - label82.Location = new Point(15, 167); + label82.Location = new Point(17, 223); label82.Name = "label82"; - label82.Size = new Size(37, 15); + label82.Size = new Size(47, 20); label82.TabIndex = 16; label82.Text = "Vdop:"; // // label81 // label81.AutoSize = true; - label81.Location = new Point(14, 196); + label81.Location = new Point(16, 261); label81.Name = "label81"; - label81.Size = new Size(38, 15); + label81.Size = new Size(46, 20); label81.TabIndex = 15; label81.Text = "Pdop:"; // // label80 // label80.AutoSize = true; - label80.Location = new Point(12, 138); + label80.Location = new Point(14, 184); label80.Name = "label80"; - label80.Size = new Size(40, 15); + label80.Size = new Size(50, 20); label80.TabIndex = 14; label80.Text = "Hdop:"; // // numericUpDown_GPS_Noise // numericUpDown_GPS_Noise.DecimalPlaces = 2; - numericUpDown_GPS_Noise.Location = new Point(58, 107); + numericUpDown_GPS_Noise.Location = new Point(66, 143); + numericUpDown_GPS_Noise.Margin = new Padding(3, 4, 3, 4); numericUpDown_GPS_Noise.Name = "numericUpDown_GPS_Noise"; - numericUpDown_GPS_Noise.Size = new Size(62, 23); + numericUpDown_GPS_Noise.Size = new Size(71, 27); numericUpDown_GPS_Noise.TabIndex = 9; numericUpDown_GPS_Noise.Value = new decimal(new int[] { 10, 0, 0, 0 }); numericUpDown_GPS_Noise.ValueChanged += numericUpDown_GPS_ValueChanged; // // numericUpDown_GPS_Use // - numericUpDown_GPS_Use.Location = new Point(58, 78); + numericUpDown_GPS_Use.Location = new Point(66, 104); + numericUpDown_GPS_Use.Margin = new Padding(3, 4, 3, 4); numericUpDown_GPS_Use.Maximum = new decimal(new int[] { 255, 0, 0, 0 }); numericUpDown_GPS_Use.Name = "numericUpDown_GPS_Use"; - numericUpDown_GPS_Use.Size = new Size(40, 23); + numericUpDown_GPS_Use.Size = new Size(46, 27); numericUpDown_GPS_Use.TabIndex = 8; numericUpDown_GPS_Use.Value = new decimal(new int[] { 10, 0, 0, 0 }); numericUpDown_GPS_Use.ValueChanged += numericUpDown_GPS_ValueChanged; // // numericUpDown_GPS_Vis // - numericUpDown_GPS_Vis.Location = new Point(58, 49); + numericUpDown_GPS_Vis.Location = new Point(66, 65); + numericUpDown_GPS_Vis.Margin = new Padding(3, 4, 3, 4); numericUpDown_GPS_Vis.Maximum = new decimal(new int[] { 255, 0, 0, 0 }); numericUpDown_GPS_Vis.Name = "numericUpDown_GPS_Vis"; - numericUpDown_GPS_Vis.Size = new Size(40, 23); + numericUpDown_GPS_Vis.Size = new Size(46, 27); numericUpDown_GPS_Vis.TabIndex = 7; numericUpDown_GPS_Vis.Value = new decimal(new int[] { 15, 0, 0, 0 }); numericUpDown_GPS_Vis.ValueChanged += numericUpDown_GPS_ValueChanged; // // numericUpDown_GPS_Fix // - numericUpDown_GPS_Fix.Location = new Point(58, 20); + numericUpDown_GPS_Fix.Location = new Point(66, 27); + numericUpDown_GPS_Fix.Margin = new Padding(3, 4, 3, 4); numericUpDown_GPS_Fix.Maximum = new decimal(new int[] { 8, 0, 0, 0 }); numericUpDown_GPS_Fix.Name = "numericUpDown_GPS_Fix"; - numericUpDown_GPS_Fix.Size = new Size(40, 23); + numericUpDown_GPS_Fix.Size = new Size(46, 27); numericUpDown_GPS_Fix.TabIndex = 6; numericUpDown_GPS_Fix.Value = new decimal(new int[] { 3, 0, 0, 0 }); numericUpDown_GPS_Fix.ValueChanged += numericUpDown_GPS_ValueChanged; @@ -2083,36 +2182,36 @@ // label73 // label73.AutoSize = true; - label73.Location = new Point(12, 109); + label73.Location = new Point(14, 145); label73.Name = "label73"; - label73.Size = new Size(40, 15); + label73.Size = new Size(50, 20); label73.TabIndex = 3; label73.Text = "Noise:"; // // label72 // label72.AutoSize = true; - label72.Location = new Point(4, 80); + label72.Location = new Point(5, 107); label72.Name = "label72"; - label72.Size = new Size(48, 15); + label72.Size = new Size(61, 20); label72.TabIndex = 2; label72.Text = "Sat Use:"; // // label71 // label71.AutoSize = true; - label71.Location = new Point(8, 51); + label71.Location = new Point(9, 68); label71.Name = "label71"; - label71.Size = new Size(44, 15); + label71.Size = new Size(56, 20); label71.TabIndex = 1; label71.Text = "Sat Vis:"; // // label70 // label70.AutoSize = true; - label70.Location = new Point(27, 22); + label70.Location = new Point(31, 29); label70.Name = "label70"; - label70.Size = new Size(25, 15); + label70.Size = new Size(30, 20); label70.TabIndex = 0; label70.Text = "Fix:"; // @@ -2126,9 +2225,11 @@ groupBox2.Controls.Add(label67); groupBox2.Controls.Add(label66); groupBox2.Dock = DockStyle.Top; - groupBox2.Location = new Point(3, 3); + groupBox2.Location = new Point(3, 4); + groupBox2.Margin = new Padding(3, 4, 3, 4); groupBox2.Name = "groupBox2"; - groupBox2.Size = new Size(204, 119); + groupBox2.Padding = new Padding(3, 4, 3, 4); + groupBox2.Size = new Size(235, 159); groupBox2.TabIndex = 1; groupBox2.TabStop = false; groupBox2.Text = "Home"; @@ -2136,20 +2237,21 @@ // label69 // label69.AutoSize = true; - label69.Location = new Point(153, 83); + label69.Location = new Point(175, 111); label69.Name = "label69"; - label69.Size = new Size(18, 15); + label69.Size = new Size(22, 20); label69.TabIndex = 6; label69.Text = "m"; // // numericUpDown_GPS_Alt // numericUpDown_GPS_Alt.DecimalPlaces = 3; - numericUpDown_GPS_Alt.Location = new Point(58, 81); + numericUpDown_GPS_Alt.Location = new Point(66, 108); + numericUpDown_GPS_Alt.Margin = new Padding(3, 4, 3, 4); numericUpDown_GPS_Alt.Maximum = new decimal(new int[] { 10000, 0, 0, 0 }); numericUpDown_GPS_Alt.Minimum = new decimal(new int[] { 1000, 0, 0, int.MinValue }); numericUpDown_GPS_Alt.Name = "numericUpDown_GPS_Alt"; - numericUpDown_GPS_Alt.Size = new Size(89, 23); + numericUpDown_GPS_Alt.Size = new Size(102, 27); numericUpDown_GPS_Alt.TabIndex = 5; numericUpDown_GPS_Alt.Value = new decimal(new int[] { 503, 0, 0, 65536 }); numericUpDown_GPS_Alt.ValueChanged += numericUpDown_GPS_ValueChanged; @@ -2157,51 +2259,54 @@ // label68 // label68.AutoSize = true; - label68.Location = new Point(16, 83); + label68.Location = new Point(18, 111); label68.Name = "label68"; - label68.Size = new Size(25, 15); + label68.Size = new Size(31, 20); label68.TabIndex = 4; label68.Text = "Alt:"; // // numericUpDown_GPS_Lon // numericUpDown_GPS_Lon.DecimalPlaces = 8; - numericUpDown_GPS_Lon.Location = new Point(58, 52); + numericUpDown_GPS_Lon.Location = new Point(66, 69); + numericUpDown_GPS_Lon.Margin = new Padding(3, 4, 3, 4); numericUpDown_GPS_Lon.Maximum = new decimal(new int[] { 90, 0, 0, 0 }); numericUpDown_GPS_Lon.Minimum = new decimal(new int[] { 90, 0, 0, int.MinValue }); numericUpDown_GPS_Lon.Name = "numericUpDown_GPS_Lon"; - numericUpDown_GPS_Lon.Size = new Size(101, 23); + numericUpDown_GPS_Lon.Size = new Size(115, 27); numericUpDown_GPS_Lon.TabIndex = 3; - numericUpDown_GPS_Lon.Value = new decimal(new int[] { 472064791, 0, 0, 458752 }); + numericUpDown_GPS_Lon.Value = new decimal(new int[] { 389290690, 0, 0, 458752 }); numericUpDown_GPS_Lon.ValueChanged += numericUpDown_GPS_ValueChanged; // // numericUpDown_GPS_Lat // numericUpDown_GPS_Lat.DecimalPlaces = 8; - numericUpDown_GPS_Lat.Location = new Point(58, 23); + numericUpDown_GPS_Lat.Location = new Point(66, 31); + numericUpDown_GPS_Lat.Margin = new Padding(3, 4, 3, 4); numericUpDown_GPS_Lat.Maximum = new decimal(new int[] { 90, 0, 0, 0 }); numericUpDown_GPS_Lat.Minimum = new decimal(new int[] { 90, 0, 0, int.MinValue }); numericUpDown_GPS_Lat.Name = "numericUpDown_GPS_Lat"; - numericUpDown_GPS_Lat.Size = new Size(101, 23); + numericUpDown_GPS_Lat.Size = new Size(115, 27); numericUpDown_GPS_Lat.TabIndex = 2; - numericUpDown_GPS_Lat.Value = new decimal(new int[] { 389290690, 0, 0, 458752 }); + numericUpDown_GPS_Lat.Tag = ""; + numericUpDown_GPS_Lat.Value = new decimal(new int[] { 472064791, 0, 0, 458752 }); numericUpDown_GPS_Lat.ValueChanged += numericUpDown_GPS_ValueChanged; // // label67 // label67.AutoSize = true; - label67.Location = new Point(15, 54); + label67.Location = new Point(17, 72); label67.Name = "label67"; - label67.Size = new Size(30, 15); + label67.Size = new Size(36, 20); label67.TabIndex = 1; label67.Text = "Lon:"; // // label66 // label66.AutoSize = true; - label66.Location = new Point(19, 25); + label66.Location = new Point(22, 33); label66.Name = "label66"; - label66.Size = new Size(26, 15); + label66.Size = new Size(32, 20); label66.TabIndex = 0; label66.Text = "Lat:"; // @@ -2210,9 +2315,11 @@ groupBox_Navi.Controls.Add(panel1); groupBox_Navi.Controls.Add(comboBox_Drone); groupBox_Navi.Dock = DockStyle.Right; - groupBox_Navi.Location = new Point(684, 24); + groupBox_Navi.Location = new Point(781, 30); + groupBox_Navi.Margin = new Padding(3, 4, 3, 4); groupBox_Navi.Name = "groupBox_Navi"; - groupBox_Navi.Size = new Size(200, 917); + groupBox_Navi.Padding = new Padding(3, 4, 3, 4); + groupBox_Navi.Size = new Size(229, 1025); groupBox_Navi.TabIndex = 3; groupBox_Navi.TabStop = false; groupBox_Navi.Tag = "#navigation"; @@ -2224,25 +2331,28 @@ panel1.Controls.Add(button_Drone_Color); panel1.Controls.Add(comboBox_Drone_Rotor); panel1.Dock = DockStyle.Fill; - panel1.Location = new Point(3, 42); + panel1.Location = new Point(3, 52); + panel1.Margin = new Padding(3, 4, 3, 4); panel1.Name = "panel1"; - panel1.Size = new Size(194, 872); + panel1.Size = new Size(223, 969); panel1.TabIndex = 3; // // listBox_Drones // listBox_Drones.FormattingEnabled = true; - listBox_Drones.Location = new Point(3, 45); + listBox_Drones.Location = new Point(3, 60); + listBox_Drones.Margin = new Padding(3, 4, 3, 4); listBox_Drones.Name = "listBox_Drones"; - listBox_Drones.Size = new Size(188, 214); + listBox_Drones.Size = new Size(214, 284); listBox_Drones.TabIndex = 3; // // button_Drone_Color // button_Drone_Color.BackColor = Color.Tomato; - button_Drone_Color.Location = new Point(13, 6); + button_Drone_Color.Location = new Point(15, 8); + button_Drone_Color.Margin = new Padding(3, 4, 3, 4); button_Drone_Color.Name = "button_Drone_Color"; - button_Drone_Color.Size = new Size(45, 23); + button_Drone_Color.Size = new Size(51, 31); button_Drone_Color.TabIndex = 1; button_Drone_Color.UseVisualStyleBackColor = false; // @@ -2250,9 +2360,10 @@ // comboBox_Drone_Rotor.FormattingEnabled = true; comboBox_Drone_Rotor.Items.AddRange(new object[] { "4-Rotor", "6-Rotor", "8-Rotor" }); - comboBox_Drone_Rotor.Location = new Point(114, 6); + comboBox_Drone_Rotor.Location = new Point(130, 8); + comboBox_Drone_Rotor.Margin = new Padding(3, 4, 3, 4); comboBox_Drone_Rotor.Name = "comboBox_Drone_Rotor"; - comboBox_Drone_Rotor.Size = new Size(71, 23); + comboBox_Drone_Rotor.Size = new Size(81, 28); comboBox_Drone_Rotor.TabIndex = 2; comboBox_Drone_Rotor.Text = "4-Rotor"; // @@ -2260,9 +2371,10 @@ // comboBox_Drone.Dock = DockStyle.Top; comboBox_Drone.FormattingEnabled = true; - comboBox_Drone.Location = new Point(3, 19); + comboBox_Drone.Location = new Point(3, 24); + comboBox_Drone.Margin = new Padding(3, 4, 3, 4); comboBox_Drone.Name = "comboBox_Drone"; - comboBox_Drone.Size = new Size(194, 23); + comboBox_Drone.Size = new Size(223, 28); comboBox_Drone.TabIndex = 0; // // timer_Test @@ -2273,16 +2385,17 @@ // // Form_Main // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(884, 941); + ClientSize = new Size(1010, 1055); Controls.Add(groupBox_Screen); Controls.Add(groupBox_Navi); Controls.Add(tabControl_Menu); Controls.Add(menuStrip_Menu); Icon = (Icon)resources.GetObject("$this.Icon"); MainMenuStrip = menuStrip_Menu; - MinimumSize = new Size(900, 980); + Margin = new Padding(3, 4, 3, 4); + MinimumSize = new Size(1026, 1018); Name = "Form_Main"; Text = "Drone Simulator V1.0"; FormClosing += Form_Main_FormClosing; diff --git a/DroneSimulator/GPS.cs b/DroneSimulator/GPS.cs index c878c5e..00c97e6 100644 --- a/DroneSimulator/GPS.cs +++ b/DroneSimulator/GPS.cs @@ -3,25 +3,72 @@ using System.Collections.Generic; using System.Linq; using System.Numerics; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace DroneSimulator { - internal class GPS - { - public struct Home + internal class GPS { - public static double Lat, Lon; - public static float Alt; - } + static double PI = 3.14159265358979323846; + public struct Home + { + public static double Lat, Lon; + public static float Alt; + } - public struct State - { - public static byte Fix; // Тип решения 0-8 (NMEA Fix type) - public static byte SatVisible; // Количество видимых спутников - public static byte SatUsed; // Количество используемых спутников - public static float Hdop, Vdop, Pdop; // Геометрический фактор - public static float Noise; // Шум (db) + public struct State + { + public static byte Fix; // Тип решения 0-8 (NMEA Fix type) + public static byte SatVisible; // Количество видимых спутников + public static byte SatUsed; // Количество используемых спутников + public static float Hdop, Vdop, Pdop; // Геометрический фактор + public static float Noise; // Шум (db) + } + + public struct GlobalCoords + { + public double latitude, longitude; + } + + public struct Point + { + public double x, y; + } + + // Конвертация градусов в радианы + static double deg2rad(double deg) + { + return deg * PI / 180.0; + } + + // Конвертация радиан в градусы + static double rad2deg(double rad) + { + return rad * 180.0 / PI; + } + + // Перевод локальных координат в глобальные + public static GlobalCoords localToGlobal(Point local, GlobalCoords origin) + { + const double er = 6371000; // Radius of the earth in m + + // Преобразование приращений координат + double dLat = local.x / er; // В радианах + double originLatRad = deg2rad(origin.latitude); + + // Вычисление новой широты + double newLatRad = originLatRad + dLat; + double newLat = rad2deg(newLatRad); + + // Вычисление новой долготы (с использованием средней широты для точности) + double avgLatRad = (originLatRad + newLatRad) / 2.0; + double dLon = local.y / (er * Math.Cos(avgLatRad)); // В радианах + double newLon = origin.longitude + rad2deg(dLon); + GlobalCoords coord = new GlobalCoords(); + coord.latitude = newLat; + coord.longitude = newLon; + return coord; + } } - } }