revert Merge branch 'main' of https://git.skbkit.ru/CPL/Simulator
This commit is contained in:
2025-08-04 18:02:42 +00:00
parent a67275b402
commit 3565372ffc
4 changed files with 200 additions and 336 deletions

View File

@ -34,13 +34,6 @@
pictureBox_2D = new PictureBox();
tabControl_Menu = new TabControl();
tabPage_Main = new TabPage();
groupBox6 = new GroupBox();
checkBox_Freq_Boost = new CheckBox();
label84 = new Label();
numericUpDown_Timing_Freq = new NumericUpDown();
label83 = new Label();
label_Timing = new Label();
label79 = new Label();
groupBox_Visual = new GroupBox();
numericUpDown_Visual_Limit = new NumericUpDown();
label1 = new Label();
@ -78,9 +71,14 @@
checkBox_Model_OF_Real = new CheckBox();
label40 = new Label();
numericUpDown_OF_Lens = new NumericUpDown();
label39 = new Label();
numericUpDown_OF_Wait = new NumericUpDown();
label53 = new Label();
numericUpDown_OF_Laten = new NumericUpDown();
label54 = new Label();
numericUpDown_OF_Error = new NumericUpDown();
label38 = new Label();
label37 = new Label();
numericUpDown_OF_Len = new NumericUpDown();
checkBox_OF_Enable = new CheckBox();
label17 = new Label();
@ -219,14 +217,10 @@
comboBox_Drone_Rotor = new ComboBox();
comboBox_Drone = new ComboBox();
timer_Test = new System.Windows.Forms.Timer(components);
label37 = new Label();
label_Timing_Lag = new Label();
groupBox_Screen.SuspendLayout();
((System.ComponentModel.ISupportInitialize)pictureBox_2D).BeginInit();
tabControl_Menu.SuspendLayout();
tabPage_Main.SuspendLayout();
groupBox6.SuspendLayout();
((System.ComponentModel.ISupportInitialize)numericUpDown_Timing_Freq).BeginInit();
groupBox_Visual.SuspendLayout();
((System.ComponentModel.ISupportInitialize)numericUpDown_Visual_Limit).BeginInit();
((System.ComponentModel.ISupportInitialize)numericUpDown_Visual_Port).BeginInit();
@ -242,7 +236,9 @@
((System.ComponentModel.ISupportInitialize)numericUpDown_Range_Freq).BeginInit();
groupBox_OF.SuspendLayout();
((System.ComponentModel.ISupportInitialize)numericUpDown_OF_Lens).BeginInit();
((System.ComponentModel.ISupportInitialize)numericUpDown_OF_Wait).BeginInit();
((System.ComponentModel.ISupportInitialize)numericUpDown_OF_Laten).BeginInit();
((System.ComponentModel.ISupportInitialize)numericUpDown_OF_Error).BeginInit();
((System.ComponentModel.ISupportInitialize)numericUpDown_OF_Len).BeginInit();
((System.ComponentModel.ISupportInitialize)numericUpDown_OF_Noise).BeginInit();
((System.ComponentModel.ISupportInitialize)numericUpDown_OF_Freq).BeginInit();
@ -307,7 +303,7 @@
groupBox_Screen.Dock = DockStyle.Fill;
groupBox_Screen.Location = new Point(218, 0);
groupBox_Screen.Name = "groupBox_Screen";
groupBox_Screen.Size = new Size(466, 781);
groupBox_Screen.Size = new Size(466, 816);
groupBox_Screen.TabIndex = 1;
groupBox_Screen.TabStop = false;
//
@ -317,7 +313,7 @@
pictureBox_2D.Dock = DockStyle.Fill;
pictureBox_2D.Location = new Point(3, 19);
pictureBox_2D.Name = "pictureBox_2D";
pictureBox_2D.Size = new Size(460, 759);
pictureBox_2D.Size = new Size(460, 794);
pictureBox_2D.SizeMode = PictureBoxSizeMode.Zoom;
pictureBox_2D.TabIndex = 0;
pictureBox_2D.TabStop = false;
@ -333,99 +329,22 @@
tabControl_Menu.Location = new Point(0, 0);
tabControl_Menu.Name = "tabControl_Menu";
tabControl_Menu.SelectedIndex = 0;
tabControl_Menu.Size = new Size(218, 781);
tabControl_Menu.Size = new Size(218, 816);
tabControl_Menu.TabIndex = 2;
//
// tabPage_Main
//
tabPage_Main.Controls.Add(groupBox6);
tabPage_Main.Controls.Add(groupBox_Visual);
tabPage_Main.Controls.Add(groupBox_Clients);
tabPage_Main.Location = new Point(4, 24);
tabPage_Main.Name = "tabPage_Main";
tabPage_Main.Padding = new Padding(3);
tabPage_Main.Size = new Size(210, 753);
tabPage_Main.Size = new Size(210, 788);
tabPage_Main.TabIndex = 0;
tabPage_Main.Tag = "#main";
tabPage_Main.Text = "Main";
tabPage_Main.UseVisualStyleBackColor = true;
//
// groupBox6
//
groupBox6.Controls.Add(label_Timing_Lag);
groupBox6.Controls.Add(numericUpDown_Timing_Freq);
groupBox6.Controls.Add(label37);
groupBox6.Controls.Add(checkBox_Freq_Boost);
groupBox6.Controls.Add(label84);
groupBox6.Controls.Add(label83);
groupBox6.Controls.Add(label_Timing);
groupBox6.Controls.Add(label79);
groupBox6.Dock = DockStyle.Top;
groupBox6.Location = new Point(3, 174);
groupBox6.Name = "groupBox6";
groupBox6.Size = new Size(204, 75);
groupBox6.TabIndex = 3;
groupBox6.TabStop = false;
groupBox6.Text = "Frequency";
//
// checkBox_Freq_Boost
//
checkBox_Freq_Boost.AutoSize = true;
checkBox_Freq_Boost.Location = new Point(148, 18);
checkBox_Freq_Boost.Name = "checkBox_Freq_Boost";
checkBox_Freq_Boost.Size = new Size(56, 19);
checkBox_Freq_Boost.TabIndex = 11;
checkBox_Freq_Boost.Text = "boost";
checkBox_Freq_Boost.UseVisualStyleBackColor = true;
checkBox_Freq_Boost.CheckedChanged += numericUpDown_Timing_Freq_ValueChanged;
//
// label84
//
label84.AutoSize = true;
label84.Location = new Point(116, 43);
label84.Name = "label84";
label84.Size = new Size(21, 15);
label84.TabIndex = 10;
label84.Text = "Hz";
//
// numericUpDown_Timing_Freq
//
numericUpDown_Timing_Freq.Location = new Point(64, 41);
numericUpDown_Timing_Freq.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
numericUpDown_Timing_Freq.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
numericUpDown_Timing_Freq.Name = "numericUpDown_Timing_Freq";
numericUpDown_Timing_Freq.Size = new Size(51, 23);
numericUpDown_Timing_Freq.TabIndex = 9;
numericUpDown_Timing_Freq.Value = new decimal(new int[] { 1000, 0, 0, 0 });
numericUpDown_Timing_Freq.ValueChanged += numericUpDown_Timing_Freq_ValueChanged;
//
// label83
//
label83.AutoSize = true;
label83.Location = new Point(7, 43);
label83.Name = "label83";
label83.Size = new Size(57, 15);
label83.TabIndex = 2;
label83.Text = "Required:";
//
// label_Timing
//
label_Timing.AutoSize = true;
label_Timing.Location = new Point(70, 19);
label_Timing.Name = "label_Timing";
label_Timing.Size = new Size(13, 15);
label_Timing.TabIndex = 1;
label_Timing.Text = "0";
//
// label79
//
label79.AutoSize = true;
label79.Location = new Point(6, 19);
label79.Name = "label79";
label79.Size = new Size(58, 15);
label79.TabIndex = 0;
label79.Text = "Available:";
//
// groupBox_Visual
//
groupBox_Visual.Controls.Add(numericUpDown_Visual_Limit);
@ -609,7 +528,7 @@
tabPage_Model.Location = new Point(4, 24);
tabPage_Model.Name = "tabPage_Model";
tabPage_Model.Padding = new Padding(3);
tabPage_Model.Size = new Size(210, 753);
tabPage_Model.Size = new Size(210, 788);
tabPage_Model.TabIndex = 1;
tabPage_Model.Tag = "#model";
tabPage_Model.Text = "Model";
@ -627,7 +546,7 @@
panel_Menu_Model.Dock = DockStyle.Fill;
panel_Menu_Model.Location = new Point(3, 3);
panel_Menu_Model.Name = "panel_Menu_Model";
panel_Menu_Model.Size = new Size(204, 747);
panel_Menu_Model.Size = new Size(204, 782);
panel_Menu_Model.TabIndex = 5;
//
// groupBox1
@ -647,7 +566,7 @@
groupBox1.Controls.Add(label46);
groupBox1.Controls.Add(label47);
groupBox1.Dock = DockStyle.Top;
groupBox1.Location = new Point(0, 623);
groupBox1.Location = new Point(0, 652);
groupBox1.Name = "groupBox1";
groupBox1.Size = new Size(204, 126);
groupBox1.TabIndex = 8;
@ -772,7 +691,7 @@
// numericUpDown_Range_Freq
//
numericUpDown_Range_Freq.Location = new Point(70, 16);
numericUpDown_Range_Freq.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
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);
@ -804,9 +723,14 @@
groupBox_OF.Controls.Add(checkBox_Model_OF_Real);
groupBox_OF.Controls.Add(label40);
groupBox_OF.Controls.Add(numericUpDown_OF_Lens);
groupBox_OF.Controls.Add(label39);
groupBox_OF.Controls.Add(numericUpDown_OF_Wait);
groupBox_OF.Controls.Add(label53);
groupBox_OF.Controls.Add(numericUpDown_OF_Laten);
groupBox_OF.Controls.Add(label54);
groupBox_OF.Controls.Add(numericUpDown_OF_Error);
groupBox_OF.Controls.Add(label38);
groupBox_OF.Controls.Add(label37);
groupBox_OF.Controls.Add(numericUpDown_OF_Len);
groupBox_OF.Controls.Add(checkBox_OF_Enable);
groupBox_OF.Controls.Add(label17);
@ -820,7 +744,7 @@
groupBox_OF.Dock = DockStyle.Top;
groupBox_OF.Location = new Point(0, 489);
groupBox_OF.Name = "groupBox_OF";
groupBox_OF.Size = new Size(204, 134);
groupBox_OF.Size = new Size(204, 163);
groupBox_OF.TabIndex = 4;
groupBox_OF.TabStop = false;
groupBox_OF.Text = "Optical flow";
@ -859,10 +783,31 @@
numericUpDown_OF_Lens.Value = new decimal(new int[] { 1, 0, 0, 0 });
numericUpDown_OF_Lens.ValueChanged += numericUpDown_OF_Update;
//
// label39
//
label39.AutoSize = true;
label39.Location = new Point(168, 105);
label39.Name = "label39";
label39.Size = new Size(24, 15);
label39.TabIndex = 34;
label39.Text = "sec";
//
// numericUpDown_OF_Wait
//
numericUpDown_OF_Wait.DecimalPlaces = 2;
numericUpDown_OF_Wait.Increment = new decimal(new int[] { 1, 0, 0, 65536 });
numericUpDown_OF_Wait.Location = new Point(119, 103);
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.TabIndex = 33;
numericUpDown_OF_Wait.Value = new decimal(new int[] { 1, 0, 0, 65536 });
numericUpDown_OF_Wait.ValueChanged += numericUpDown_OF_Update;
//
// label53
//
label53.AutoSize = true;
label53.Location = new Point(114, 107);
label53.Location = new Point(113, 132);
label53.Name = "label53";
label53.Size = new Size(24, 15);
label53.TabIndex = 32;
@ -872,7 +817,7 @@
//
numericUpDown_OF_Laten.DecimalPlaces = 2;
numericUpDown_OF_Laten.Increment = new decimal(new int[] { 2, 0, 0, 131072 });
numericUpDown_OF_Laten.Location = new Point(67, 105);
numericUpDown_OF_Laten.Location = new Point(66, 130);
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);
@ -883,12 +828,41 @@
// label54
//
label54.AutoSize = true;
label54.Location = new Point(4, 107);
label54.Location = new Point(3, 132);
label54.Name = "label54";
label54.Size = new Size(55, 15);
label54.TabIndex = 30;
label54.Text = "Lateness:";
//
// numericUpDown_OF_Error
//
numericUpDown_OF_Error.DecimalPlaces = 1;
numericUpDown_OF_Error.Increment = new decimal(new int[] { 1, 0, 0, 65536 });
numericUpDown_OF_Error.Location = new Point(38, 103);
numericUpDown_OF_Error.Name = "numericUpDown_OF_Error";
numericUpDown_OF_Error.Size = new Size(47, 23);
numericUpDown_OF_Error.TabIndex = 24;
numericUpDown_OF_Error.Value = new decimal(new int[] { 1, 0, 0, 0 });
numericUpDown_OF_Error.ValueChanged += numericUpDown_OF_Update;
//
// label38
//
label38.AutoSize = true;
label38.Location = new Point(83, 105);
label38.Name = "label38";
label38.Size = new Size(17, 15);
label38.TabIndex = 25;
label38.Text = "%";
//
// label37
//
label37.AutoSize = true;
label37.Location = new Point(1, 105);
label37.Name = "label37";
label37.Size = new Size(35, 15);
label37.TabIndex = 23;
label37.Text = "Error:";
//
// numericUpDown_OF_Len
//
numericUpDown_OF_Len.Location = new Point(68, 76);
@ -904,7 +878,7 @@
checkBox_OF_Enable.AutoSize = true;
checkBox_OF_Enable.Checked = true;
checkBox_OF_Enable.CheckState = CheckState.Checked;
checkBox_OF_Enable.Location = new Point(160, 109);
checkBox_OF_Enable.Location = new Point(159, 134);
checkBox_OF_Enable.Name = "checkBox_OF_Enable";
checkBox_OF_Enable.Size = new Size(39, 19);
checkBox_OF_Enable.TabIndex = 22;
@ -965,7 +939,7 @@
// numericUpDown_OF_Freq
//
numericUpDown_OF_Freq.Location = new Point(69, 22);
numericUpDown_OF_Freq.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
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);
@ -1134,7 +1108,7 @@
// numericUpDown_Bar_Freq
//
numericUpDown_Bar_Freq.Location = new Point(68, 42);
numericUpDown_Bar_Freq.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
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);
@ -1258,7 +1232,7 @@
// numericUpDown_Pos_Freq
//
numericUpDown_Pos_Freq.Location = new Point(69, 17);
numericUpDown_Pos_Freq.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
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);
@ -1333,7 +1307,7 @@
// numericUpDown_Mag_Freq
//
numericUpDown_Mag_Freq.Location = new Point(37, 18);
numericUpDown_Mag_Freq.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
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);
@ -1525,7 +1499,7 @@
// numericUpDown_Gyr_Freq
//
numericUpDown_Gyr_Freq.Location = new Point(37, 19);
numericUpDown_Gyr_Freq.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
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);
@ -1684,7 +1658,7 @@
// numericUpDown_Acc_Freq
//
numericUpDown_Acc_Freq.Location = new Point(37, 16);
numericUpDown_Acc_Freq.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
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);
@ -1707,7 +1681,7 @@
tabPage_Area.Controls.Add(groupBox3);
tabPage_Area.Location = new Point(4, 24);
tabPage_Area.Name = "tabPage_Area";
tabPage_Area.Size = new Size(210, 753);
tabPage_Area.Size = new Size(210, 788);
tabPage_Area.TabIndex = 2;
tabPage_Area.Tag = "#area";
tabPage_Area.Text = "Area";
@ -1958,7 +1932,7 @@
tabPage_GPS.Location = new Point(4, 24);
tabPage_GPS.Name = "tabPage_GPS";
tabPage_GPS.Padding = new Padding(3);
tabPage_GPS.Size = new Size(210, 753);
tabPage_GPS.Size = new Size(210, 788);
tabPage_GPS.TabIndex = 3;
tabPage_GPS.Text = "GPS";
tabPage_GPS.UseVisualStyleBackColor = true;
@ -2216,7 +2190,7 @@
tabPage_Drone.Location = new Point(4, 24);
tabPage_Drone.Name = "tabPage_Drone";
tabPage_Drone.Padding = new Padding(3);
tabPage_Drone.Size = new Size(210, 753);
tabPage_Drone.Size = new Size(210, 788);
tabPage_Drone.TabIndex = 4;
tabPage_Drone.Text = "Drone";
tabPage_Drone.UseVisualStyleBackColor = true;
@ -2337,7 +2311,7 @@
groupBox_Navi.Dock = DockStyle.Right;
groupBox_Navi.Location = new Point(684, 0);
groupBox_Navi.Name = "groupBox_Navi";
groupBox_Navi.Size = new Size(200, 781);
groupBox_Navi.Size = new Size(200, 816);
groupBox_Navi.TabIndex = 3;
groupBox_Navi.TabStop = false;
groupBox_Navi.Tag = "#navigation";
@ -2351,7 +2325,7 @@
panel1.Dock = DockStyle.Fill;
panel1.Location = new Point(3, 42);
panel1.Name = "panel1";
panel1.Size = new Size(194, 736);
panel1.Size = new Size(194, 771);
panel1.TabIndex = 3;
//
// listBox_Drones
@ -2396,34 +2370,16 @@
timer_Test.Interval = 10;
timer_Test.Tick += timer_Test_Tick;
//
// label37
//
label37.AutoSize = true;
label37.Location = new Point(143, 43);
label37.Name = "label37";
label37.Size = new Size(29, 15);
label37.TabIndex = 12;
label37.Text = "Lag:";
//
// label_Timing_Lag
//
label_Timing_Lag.AutoSize = true;
label_Timing_Lag.Location = new Point(168, 43);
label_Timing_Lag.Name = "label_Timing_Lag";
label_Timing_Lag.Size = new Size(13, 15);
label_Timing_Lag.TabIndex = 13;
label_Timing_Lag.Text = "0";
//
// Form_Main
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(884, 781);
ClientSize = new Size(884, 816);
Controls.Add(groupBox_Screen);
Controls.Add(groupBox_Navi);
Controls.Add(tabControl_Menu);
Icon = (Icon)resources.GetObject("$this.Icon");
MinimumSize = new Size(900, 820);
MinimumSize = new Size(900, 855);
Name = "Form_Main";
Text = "Drone Simulator V1.0";
FormClosing += Form_Main_FormClosing;
@ -2431,9 +2387,6 @@
((System.ComponentModel.ISupportInitialize)pictureBox_2D).EndInit();
tabControl_Menu.ResumeLayout(false);
tabPage_Main.ResumeLayout(false);
groupBox6.ResumeLayout(false);
groupBox6.PerformLayout();
((System.ComponentModel.ISupportInitialize)numericUpDown_Timing_Freq).EndInit();
groupBox_Visual.ResumeLayout(false);
groupBox_Visual.PerformLayout();
((System.ComponentModel.ISupportInitialize)numericUpDown_Visual_Limit).EndInit();
@ -2453,7 +2406,9 @@
groupBox_OF.ResumeLayout(false);
groupBox_OF.PerformLayout();
((System.ComponentModel.ISupportInitialize)numericUpDown_OF_Lens).EndInit();
((System.ComponentModel.ISupportInitialize)numericUpDown_OF_Wait).EndInit();
((System.ComponentModel.ISupportInitialize)numericUpDown_OF_Laten).EndInit();
((System.ComponentModel.ISupportInitialize)numericUpDown_OF_Error).EndInit();
((System.ComponentModel.ISupportInitialize)numericUpDown_OF_Len).EndInit();
((System.ComponentModel.ISupportInitialize)numericUpDown_OF_Noise).EndInit();
((System.ComponentModel.ISupportInitialize)numericUpDown_OF_Freq).EndInit();
@ -2608,6 +2563,9 @@
private Label label34;
private Label label36;
private Label label35;
private NumericUpDown numericUpDown_OF_Error;
private Label label37;
private Label label38;
private GroupBox groupBox1;
private CheckBox checkBox_Range_Enable;
private NumericUpDown numericUpDown_Range_Max;
@ -2641,6 +2599,8 @@
private NumericUpDown numericUpDown_Range_Laten;
private Label label56;
private ListBox listBox_Drones;
private Label label39;
private NumericUpDown numericUpDown_OF_Wait;
private Label label40;
private NumericUpDown numericUpDown_OF_Lens;
private GroupBox groupBox3;
@ -2706,14 +2666,5 @@
private Label label78;
private NumericUpDown numericUpDown_Physics_Power;
private Label label77;
private GroupBox groupBox6;
private Label label_Timing;
private Label label79;
private Label label84;
private NumericUpDown numericUpDown_Timing_Freq;
private Label label83;
private CheckBox checkBox_Freq_Boost;
private Label label_Timing_Lag;
private Label label37;
}
}