Started Main form customisation
This commit is contained in:
@@ -29,7 +29,7 @@ namespace Test_Merge
|
||||
{
|
||||
Reader.ChangeImage(image);
|
||||
}
|
||||
public DriverData GetFullDriverData(string driverName, Panel lastFiveLapsPanel, Form1 form1)
|
||||
public DriverData GetFullDriverData(string driverName, Panel lastFiveLapsPanel, Main form1)
|
||||
{
|
||||
DriverData result = new DriverData();
|
||||
if (LiveDriverDataLogs.Count > 0)
|
||||
@@ -64,7 +64,7 @@ namespace Test_Merge
|
||||
|
||||
return result;
|
||||
}
|
||||
public void DisplayBattles(Panel pnlBattles,Form1 form1)
|
||||
public void DisplayBattles(Panel pnlBattles,Main form1)
|
||||
{
|
||||
DriverData oldDriver = null;
|
||||
List<(DriverData d1, DriverData d2, int gap)> battles = new List<(DriverData d1, DriverData d2, int gap)>();
|
||||
@@ -151,7 +151,7 @@ namespace Test_Merge
|
||||
}
|
||||
}
|
||||
}
|
||||
public void DisplayTimesDeltas(Panel pnlFastest,Panel pnlSlowest, Form1 form1)
|
||||
public void DisplayTimesDeltas(Panel pnlFastest,Panel pnlSlowest, Main form1)
|
||||
{
|
||||
List<(int avg, string driverName)> averages = new List<(int avg, string driverName)>();
|
||||
foreach (DriverData driver in LiveDriverDataLogs[LiveDriverDataLogs.Count - 1])
|
||||
@@ -254,7 +254,7 @@ namespace Test_Merge
|
||||
message += "Sector 3 : " + Reader.ConvertMsToTime(sectors[2]) + Environment.NewLine;
|
||||
MessageBox.Show(message);
|
||||
}
|
||||
public void DisplayLiveRanking(Panel pnl, Form1 form1)
|
||||
public void DisplayLiveRanking(Panel pnl, Main form1)
|
||||
{
|
||||
if (LiveDriverDataLogs.Count > 0)
|
||||
{
|
||||
|
||||
151
Test_Merge/Form1.Designer.cs
generated
151
Test_Merge/Form1.Designer.cs
generated
@@ -1,6 +1,6 @@
|
||||
namespace Test_Merge
|
||||
{
|
||||
partial class Form1
|
||||
partial class Main
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
@@ -35,11 +35,13 @@
|
||||
this.btnResetEmulator = new System.Windows.Forms.Button();
|
||||
this.lsbPresets = new System.Windows.Forms.ListBox();
|
||||
this.gpbxControls = new System.Windows.Forms.GroupBox();
|
||||
this.label7 = new System.Windows.Forms.Label();
|
||||
this.textBox1 = new System.Windows.Forms.TextBox();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.gpbxRanking = new System.Windows.Forms.GroupBox();
|
||||
this.pnlLiveRanking = new System.Windows.Forms.Panel();
|
||||
this.gpbxOvertakes = new System.Windows.Forms.GroupBox();
|
||||
this.lsbOvertakes = new System.Windows.Forms.ListBox();
|
||||
this.gpbxDriverInfos = new System.Windows.Forms.GroupBox();
|
||||
this.lblCurrentDriverPosition = new System.Windows.Forms.Label();
|
||||
this.lblCurrentDriverDRS = new System.Windows.Forms.Label();
|
||||
@@ -61,7 +63,7 @@
|
||||
this.pnlFastest = new System.Windows.Forms.Panel();
|
||||
this.gpbxBattles = new System.Windows.Forms.GroupBox();
|
||||
this.pnlBattles = new System.Windows.Forms.Panel();
|
||||
this.lsbOvertakes = new System.Windows.Forms.ListBox();
|
||||
this.label9 = new System.Windows.Forms.Label();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbxResult)).BeginInit();
|
||||
this.gpbxControls.SuspendLayout();
|
||||
this.gpbxRanking.SuspendLayout();
|
||||
@@ -73,28 +75,35 @@
|
||||
//
|
||||
// btnSettings
|
||||
//
|
||||
this.btnSettings.Location = new System.Drawing.Point(6, 21);
|
||||
this.btnSettings.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
|
||||
this.btnSettings.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
|
||||
this.btnSettings.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
|
||||
this.btnSettings.Location = new System.Drawing.Point(9, 21);
|
||||
this.btnSettings.Name = "btnSettings";
|
||||
this.btnSettings.Size = new System.Drawing.Size(127, 27);
|
||||
this.btnSettings.Size = new System.Drawing.Size(127, 46);
|
||||
this.btnSettings.TabIndex = 0;
|
||||
this.btnSettings.Text = "Config";
|
||||
this.btnSettings.UseVisualStyleBackColor = true;
|
||||
this.btnSettings.UseVisualStyleBackColor = false;
|
||||
this.btnSettings.Click += new System.EventHandler(this.btnSettings_Click);
|
||||
//
|
||||
// btnStartDecoding
|
||||
//
|
||||
this.btnStartDecoding.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
|
||||
this.btnStartDecoding.Enabled = false;
|
||||
this.btnStartDecoding.Location = new System.Drawing.Point(6, 54);
|
||||
this.btnStartDecoding.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
|
||||
this.btnStartDecoding.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
|
||||
this.btnStartDecoding.Location = new System.Drawing.Point(9, 73);
|
||||
this.btnStartDecoding.Name = "btnStartDecoding";
|
||||
this.btnStartDecoding.Size = new System.Drawing.Size(127, 27);
|
||||
this.btnStartDecoding.Size = new System.Drawing.Size(127, 46);
|
||||
this.btnStartDecoding.TabIndex = 2;
|
||||
this.btnStartDecoding.Text = "Start";
|
||||
this.btnStartDecoding.UseVisualStyleBackColor = true;
|
||||
this.btnStartDecoding.UseVisualStyleBackColor = false;
|
||||
this.btnStartDecoding.Click += new System.EventHandler(this.btnUpdate_Click);
|
||||
//
|
||||
// pbxResult
|
||||
//
|
||||
this.pbxResult.Location = new System.Drawing.Point(6, 191);
|
||||
this.pbxResult.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
|
||||
this.pbxResult.Location = new System.Drawing.Point(6, 263);
|
||||
this.pbxResult.Name = "pbxResult";
|
||||
this.pbxResult.Size = new System.Drawing.Size(274, 151);
|
||||
this.pbxResult.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
|
||||
@@ -103,37 +112,48 @@
|
||||
//
|
||||
// btnStopUpdating
|
||||
//
|
||||
this.btnStopUpdating.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
|
||||
this.btnStopUpdating.Enabled = false;
|
||||
this.btnStopUpdating.Location = new System.Drawing.Point(153, 54);
|
||||
this.btnStopUpdating.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
|
||||
this.btnStopUpdating.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
|
||||
this.btnStopUpdating.Location = new System.Drawing.Point(153, 73);
|
||||
this.btnStopUpdating.Name = "btnStopUpdating";
|
||||
this.btnStopUpdating.Size = new System.Drawing.Size(128, 27);
|
||||
this.btnStopUpdating.Size = new System.Drawing.Size(128, 46);
|
||||
this.btnStopUpdating.TabIndex = 4;
|
||||
this.btnStopUpdating.Text = "Stop";
|
||||
this.btnStopUpdating.UseVisualStyleBackColor = true;
|
||||
this.btnStopUpdating.UseVisualStyleBackColor = false;
|
||||
this.btnStopUpdating.Click += new System.EventHandler(this.btnStopUpdating_Click);
|
||||
//
|
||||
// btnResetEmulator
|
||||
//
|
||||
this.btnResetEmulator.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
|
||||
this.btnResetEmulator.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
|
||||
this.btnResetEmulator.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);
|
||||
this.btnResetEmulator.Location = new System.Drawing.Point(153, 21);
|
||||
this.btnResetEmulator.Name = "btnResetEmulator";
|
||||
this.btnResetEmulator.Size = new System.Drawing.Size(128, 27);
|
||||
this.btnResetEmulator.Size = new System.Drawing.Size(128, 46);
|
||||
this.btnResetEmulator.TabIndex = 5;
|
||||
this.btnResetEmulator.Text = "Start driver";
|
||||
this.btnResetEmulator.UseVisualStyleBackColor = true;
|
||||
this.btnResetEmulator.Text = "Launch";
|
||||
this.btnResetEmulator.UseVisualStyleBackColor = false;
|
||||
this.btnResetEmulator.Click += new System.EventHandler(this.button1_Click);
|
||||
//
|
||||
// lsbPresets
|
||||
//
|
||||
this.lsbPresets.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
|
||||
this.lsbPresets.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.lsbPresets.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(252)))), ((int)(((byte)(252)))));
|
||||
this.lsbPresets.FormattingEnabled = true;
|
||||
this.lsbPresets.ItemHeight = 16;
|
||||
this.lsbPresets.Location = new System.Drawing.Point(6, 133);
|
||||
this.lsbPresets.Location = new System.Drawing.Point(7, 167);
|
||||
this.lsbPresets.Name = "lsbPresets";
|
||||
this.lsbPresets.Size = new System.Drawing.Size(274, 52);
|
||||
this.lsbPresets.Size = new System.Drawing.Size(274, 64);
|
||||
this.lsbPresets.TabIndex = 6;
|
||||
this.lsbPresets.SelectedIndexChanged += new System.EventHandler(this.lsbPresets_SelectedIndexChanged);
|
||||
//
|
||||
// gpbxControls
|
||||
//
|
||||
this.gpbxControls.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(79)))), ((int)(((byte)(79)))), ((int)(((byte)(79)))));
|
||||
this.gpbxControls.Controls.Add(this.label7);
|
||||
this.gpbxControls.Controls.Add(this.textBox1);
|
||||
this.gpbxControls.Controls.Add(this.btnResetEmulator);
|
||||
this.gpbxControls.Controls.Add(this.label1);
|
||||
@@ -142,25 +162,39 @@
|
||||
this.gpbxControls.Controls.Add(this.btnStartDecoding);
|
||||
this.gpbxControls.Controls.Add(this.lsbPresets);
|
||||
this.gpbxControls.Controls.Add(this.btnSettings);
|
||||
this.gpbxControls.Location = new System.Drawing.Point(987, 360);
|
||||
this.gpbxControls.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(252)))), ((int)(((byte)(252)))));
|
||||
this.gpbxControls.Location = new System.Drawing.Point(987, 332);
|
||||
this.gpbxControls.Name = "gpbxControls";
|
||||
this.gpbxControls.Size = new System.Drawing.Size(287, 348);
|
||||
this.gpbxControls.Size = new System.Drawing.Size(287, 420);
|
||||
this.gpbxControls.TabIndex = 7;
|
||||
this.gpbxControls.TabStop = false;
|
||||
this.gpbxControls.Text = "Controls";
|
||||
this.gpbxControls.Paint += new System.Windows.Forms.PaintEventHandler(this.removeBorders);
|
||||
//
|
||||
// label7
|
||||
//
|
||||
this.label7.AutoSize = true;
|
||||
this.label7.Location = new System.Drawing.Point(6, 244);
|
||||
this.label7.Name = "label7";
|
||||
this.label7.Size = new System.Drawing.Size(55, 16);
|
||||
this.label7.TabIndex = 9;
|
||||
this.label7.Text = "Preview";
|
||||
//
|
||||
// textBox1
|
||||
//
|
||||
this.textBox1.Location = new System.Drawing.Point(6, 105);
|
||||
this.textBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
|
||||
this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.textBox1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(252)))), ((int)(((byte)(252)))));
|
||||
this.textBox1.Location = new System.Drawing.Point(7, 146);
|
||||
this.textBox1.Name = "textBox1";
|
||||
this.textBox1.Size = new System.Drawing.Size(274, 22);
|
||||
this.textBox1.Size = new System.Drawing.Size(274, 15);
|
||||
this.textBox1.TabIndex = 8;
|
||||
this.textBox1.TextChanged += new System.EventHandler(this.textBox1_TextChanged);
|
||||
//
|
||||
// label1
|
||||
//
|
||||
this.label1.AutoSize = true;
|
||||
this.label1.Location = new System.Drawing.Point(3, 86);
|
||||
this.label1.Location = new System.Drawing.Point(4, 127);
|
||||
this.label1.Name = "label1";
|
||||
this.label1.Size = new System.Drawing.Size(99, 16);
|
||||
this.label1.TabIndex = 7;
|
||||
@@ -168,13 +202,16 @@
|
||||
//
|
||||
// gpbxRanking
|
||||
//
|
||||
this.gpbxRanking.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(79)))), ((int)(((byte)(79)))), ((int)(((byte)(79)))));
|
||||
this.gpbxRanking.Controls.Add(this.pnlLiveRanking);
|
||||
this.gpbxRanking.Location = new System.Drawing.Point(12, 12);
|
||||
this.gpbxRanking.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(252)))), ((int)(((byte)(252)))));
|
||||
this.gpbxRanking.Location = new System.Drawing.Point(12, 56);
|
||||
this.gpbxRanking.Name = "gpbxRanking";
|
||||
this.gpbxRanking.Size = new System.Drawing.Size(353, 696);
|
||||
this.gpbxRanking.TabIndex = 8;
|
||||
this.gpbxRanking.TabStop = false;
|
||||
this.gpbxRanking.Text = "Live Ranking";
|
||||
this.gpbxRanking.Paint += new System.Windows.Forms.PaintEventHandler(this.removeBorders);
|
||||
//
|
||||
// pnlLiveRanking
|
||||
//
|
||||
@@ -185,16 +222,32 @@
|
||||
//
|
||||
// gpbxOvertakes
|
||||
//
|
||||
this.gpbxOvertakes.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(79)))), ((int)(((byte)(79)))), ((int)(((byte)(79)))));
|
||||
this.gpbxOvertakes.Controls.Add(this.lsbOvertakes);
|
||||
this.gpbxOvertakes.Location = new System.Drawing.Point(987, 12);
|
||||
this.gpbxOvertakes.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(252)))), ((int)(((byte)(252)))));
|
||||
this.gpbxOvertakes.Location = new System.Drawing.Point(987, 56);
|
||||
this.gpbxOvertakes.Name = "gpbxOvertakes";
|
||||
this.gpbxOvertakes.Size = new System.Drawing.Size(287, 342);
|
||||
this.gpbxOvertakes.Size = new System.Drawing.Size(287, 270);
|
||||
this.gpbxOvertakes.TabIndex = 9;
|
||||
this.gpbxOvertakes.TabStop = false;
|
||||
this.gpbxOvertakes.Text = "Overtakes";
|
||||
this.gpbxOvertakes.Paint += new System.Windows.Forms.PaintEventHandler(this.removeBorders);
|
||||
//
|
||||
// lsbOvertakes
|
||||
//
|
||||
this.lsbOvertakes.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
|
||||
this.lsbOvertakes.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.lsbOvertakes.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(252)))), ((int)(((byte)(252)))));
|
||||
this.lsbOvertakes.FormattingEnabled = true;
|
||||
this.lsbOvertakes.ItemHeight = 16;
|
||||
this.lsbOvertakes.Location = new System.Drawing.Point(6, 21);
|
||||
this.lsbOvertakes.Name = "lsbOvertakes";
|
||||
this.lsbOvertakes.Size = new System.Drawing.Size(274, 240);
|
||||
this.lsbOvertakes.TabIndex = 0;
|
||||
//
|
||||
// gpbxDriverInfos
|
||||
//
|
||||
this.gpbxDriverInfos.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(79)))), ((int)(((byte)(79)))), ((int)(((byte)(79)))));
|
||||
this.gpbxDriverInfos.Controls.Add(this.lblCurrentDriverPosition);
|
||||
this.gpbxDriverInfos.Controls.Add(this.lblCurrentDriverDRS);
|
||||
this.gpbxDriverInfos.Controls.Add(this.label11);
|
||||
@@ -208,12 +261,14 @@
|
||||
this.gpbxDriverInfos.Controls.Add(this.lblCurrentDriverLapTime);
|
||||
this.gpbxDriverInfos.Controls.Add(this.label4);
|
||||
this.gpbxDriverInfos.Controls.Add(this.lblCurrentDriverName);
|
||||
this.gpbxDriverInfos.Location = new System.Drawing.Point(371, 461);
|
||||
this.gpbxDriverInfos.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(252)))), ((int)(((byte)(252)))));
|
||||
this.gpbxDriverInfos.Location = new System.Drawing.Point(371, 505);
|
||||
this.gpbxDriverInfos.Name = "gpbxDriverInfos";
|
||||
this.gpbxDriverInfos.Size = new System.Drawing.Size(610, 247);
|
||||
this.gpbxDriverInfos.TabIndex = 10;
|
||||
this.gpbxDriverInfos.TabStop = false;
|
||||
this.gpbxDriverInfos.Text = "Driver infos";
|
||||
this.gpbxDriverInfos.Paint += new System.Windows.Forms.PaintEventHandler(this.removeBorders);
|
||||
//
|
||||
// lblCurrentDriverPosition
|
||||
//
|
||||
@@ -307,6 +362,7 @@
|
||||
//
|
||||
// pnlCurrentDriverLapsHistory
|
||||
//
|
||||
this.pnlCurrentDriverLapsHistory.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
|
||||
this.pnlCurrentDriverLapsHistory.Location = new System.Drawing.Point(304, 55);
|
||||
this.pnlCurrentDriverLapsHistory.Name = "pnlCurrentDriverLapsHistory";
|
||||
this.pnlCurrentDriverLapsHistory.Size = new System.Drawing.Size(300, 186);
|
||||
@@ -344,16 +400,19 @@
|
||||
//
|
||||
// gpbxLapTimes
|
||||
//
|
||||
this.gpbxLapTimes.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(79)))), ((int)(((byte)(79)))), ((int)(((byte)(79)))));
|
||||
this.gpbxLapTimes.Controls.Add(this.label3);
|
||||
this.gpbxLapTimes.Controls.Add(this.label2);
|
||||
this.gpbxLapTimes.Controls.Add(this.pnlSlowest);
|
||||
this.gpbxLapTimes.Controls.Add(this.pnlFastest);
|
||||
this.gpbxLapTimes.Location = new System.Drawing.Point(371, 12);
|
||||
this.gpbxLapTimes.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(252)))), ((int)(((byte)(252)))));
|
||||
this.gpbxLapTimes.Location = new System.Drawing.Point(371, 56);
|
||||
this.gpbxLapTimes.Name = "gpbxLapTimes";
|
||||
this.gpbxLapTimes.Size = new System.Drawing.Size(610, 239);
|
||||
this.gpbxLapTimes.TabIndex = 11;
|
||||
this.gpbxLapTimes.TabStop = false;
|
||||
this.gpbxLapTimes.Text = "Last five laps";
|
||||
this.gpbxLapTimes.Paint += new System.Windows.Forms.PaintEventHandler(this.removeBorders);
|
||||
//
|
||||
// label3
|
||||
//
|
||||
@@ -375,6 +434,7 @@
|
||||
//
|
||||
// pnlSlowest
|
||||
//
|
||||
this.pnlSlowest.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
|
||||
this.pnlSlowest.Location = new System.Drawing.Point(314, 33);
|
||||
this.pnlSlowest.Name = "pnlSlowest";
|
||||
this.pnlSlowest.Size = new System.Drawing.Size(290, 200);
|
||||
@@ -382,6 +442,7 @@
|
||||
//
|
||||
// pnlFastest
|
||||
//
|
||||
this.pnlFastest.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
|
||||
this.pnlFastest.Location = new System.Drawing.Point(6, 33);
|
||||
this.pnlFastest.Name = "pnlFastest";
|
||||
this.pnlFastest.Size = new System.Drawing.Size(290, 200);
|
||||
@@ -389,43 +450,52 @@
|
||||
//
|
||||
// gpbxBattles
|
||||
//
|
||||
this.gpbxBattles.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(79)))), ((int)(((byte)(79)))), ((int)(((byte)(79)))));
|
||||
this.gpbxBattles.Controls.Add(this.pnlBattles);
|
||||
this.gpbxBattles.Location = new System.Drawing.Point(371, 257);
|
||||
this.gpbxBattles.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(252)))), ((int)(((byte)(252)))));
|
||||
this.gpbxBattles.Location = new System.Drawing.Point(371, 301);
|
||||
this.gpbxBattles.Name = "gpbxBattles";
|
||||
this.gpbxBattles.Size = new System.Drawing.Size(610, 198);
|
||||
this.gpbxBattles.TabIndex = 11;
|
||||
this.gpbxBattles.TabStop = false;
|
||||
this.gpbxBattles.Text = "Battles";
|
||||
this.gpbxBattles.Paint += new System.Windows.Forms.PaintEventHandler(this.removeBorders);
|
||||
//
|
||||
// pnlBattles
|
||||
//
|
||||
this.pnlBattles.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
|
||||
this.pnlBattles.Location = new System.Drawing.Point(9, 21);
|
||||
this.pnlBattles.Name = "pnlBattles";
|
||||
this.pnlBattles.Size = new System.Drawing.Size(595, 171);
|
||||
this.pnlBattles.TabIndex = 2;
|
||||
//
|
||||
// lsbOvertakes
|
||||
// label9
|
||||
//
|
||||
this.lsbOvertakes.FormattingEnabled = true;
|
||||
this.lsbOvertakes.ItemHeight = 16;
|
||||
this.lsbOvertakes.Location = new System.Drawing.Point(6, 21);
|
||||
this.lsbOvertakes.Name = "lsbOvertakes";
|
||||
this.lsbOvertakes.Size = new System.Drawing.Size(274, 308);
|
||||
this.lsbOvertakes.TabIndex = 0;
|
||||
this.label9.AutoSize = true;
|
||||
this.label9.BackColor = System.Drawing.Color.Transparent;
|
||||
this.label9.Font = new System.Drawing.Font("Microsoft YaHei UI", 19.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.label9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(252)))), ((int)(((byte)(252)))));
|
||||
this.label9.Location = new System.Drawing.Point(12, 8);
|
||||
this.label9.Name = "label9";
|
||||
this.label9.Size = new System.Drawing.Size(221, 43);
|
||||
this.label9.TabIndex = 12;
|
||||
this.label9.Text = "Track Trends";
|
||||
//
|
||||
// Form1
|
||||
// Main
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(1286, 720);
|
||||
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
|
||||
this.ClientSize = new System.Drawing.Size(1284, 760);
|
||||
this.Controls.Add(this.label9);
|
||||
this.Controls.Add(this.gpbxBattles);
|
||||
this.Controls.Add(this.gpbxLapTimes);
|
||||
this.Controls.Add(this.gpbxDriverInfos);
|
||||
this.Controls.Add(this.gpbxOvertakes);
|
||||
this.Controls.Add(this.gpbxRanking);
|
||||
this.Controls.Add(this.gpbxControls);
|
||||
this.Name = "Form1";
|
||||
this.Text = "Form1";
|
||||
this.Name = "Main";
|
||||
this.Text = "Track Trends";
|
||||
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
|
||||
this.Load += new System.EventHandler(this.Form1_Load);
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbxResult)).EndInit();
|
||||
@@ -439,6 +509,7 @@
|
||||
this.gpbxLapTimes.PerformLayout();
|
||||
this.gpbxBattles.ResumeLayout(false);
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
}
|
||||
|
||||
@@ -478,6 +549,8 @@
|
||||
private System.Windows.Forms.GroupBox gpbxBattles;
|
||||
private System.Windows.Forms.Panel pnlBattles;
|
||||
private System.Windows.Forms.ListBox lsbOvertakes;
|
||||
private System.Windows.Forms.Label label7;
|
||||
private System.Windows.Forms.Label label9;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ using System.IO;
|
||||
|
||||
namespace Test_Merge
|
||||
{
|
||||
public partial class Form1 : Form
|
||||
public partial class Main : Form
|
||||
{
|
||||
//private Reader Reader = null;
|
||||
private F1TVEmulator Emulator = null;
|
||||
@@ -24,7 +24,7 @@ namespace Test_Merge
|
||||
string ConfigFile = "";
|
||||
string GpUrl = "";
|
||||
|
||||
public Form1()
|
||||
public Main()
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
@@ -175,10 +175,10 @@ namespace Test_Merge
|
||||
btnResetEmulator.Enabled = false;
|
||||
btnStopUpdating.Text = "Stopping";
|
||||
}
|
||||
|
||||
private async void button1_Click(object sender, EventArgs e)
|
||||
{
|
||||
btnResetEmulator.Text = "Restart driver";
|
||||
lsbOvertakes.Items.Clear();
|
||||
btnResetEmulator.Text = "Launching";
|
||||
btnResetEmulator.Enabled = false;
|
||||
btnSettings.Enabled = true;
|
||||
btnStartDecoding.Enabled = false;
|
||||
@@ -207,12 +207,28 @@ namespace Test_Merge
|
||||
else
|
||||
{
|
||||
Wrapper = new DataWrapper(ConfigFile, Emulator.Screenshot());
|
||||
btnResetEmulator.Text = "Re launch";
|
||||
btnResetEmulator.Enabled = true;
|
||||
btnSettings.Enabled = true;
|
||||
btnStartDecoding.Enabled = true;
|
||||
}
|
||||
}
|
||||
private void removeBorders(object sender, PaintEventArgs e)
|
||||
{
|
||||
GroupBox gpbx = (GroupBox)sender;
|
||||
|
||||
using (Pen pen = new Pen(gpbx.BackColor, 50))
|
||||
{
|
||||
e.Graphics.DrawRectangle(pen, 0, 0, gpbx.Width - 1, gpbx.Height - 1);
|
||||
e.Graphics.DrawRectangle(pen, 0, 0, gpbx.Width - 1, gpbx.Height - 1);
|
||||
}
|
||||
|
||||
using (var brush = new SolidBrush(gpbx.ForeColor))
|
||||
{
|
||||
var textPosition = new Point(5, 0); // Adjust the X and Y values as needed
|
||||
e.Graphics.DrawString(gpbx.Text, gpbx.Font, brush, textPosition);
|
||||
}
|
||||
}
|
||||
private void lsbPresets_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (lsbPresets.SelectedIndex >= 0)
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace Test_Merge
|
||||
{
|
||||
Application.EnableVisualStyles();
|
||||
Application.SetCompatibleTextRenderingDefault(false);
|
||||
Application.Run(new Form1());
|
||||
Application.Run(new Main());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
26
Test_Merge/Settings.Designer.cs
generated
26
Test_Merge/Settings.Designer.cs
generated
@@ -66,11 +66,11 @@
|
||||
// label1
|
||||
//
|
||||
this.label1.AutoSize = true;
|
||||
this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 16.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.label1.Font = new System.Drawing.Font("Microsoft YaHei UI", 19.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.label1.ForeColor = System.Drawing.Color.White;
|
||||
this.label1.Location = new System.Drawing.Point(12, 9);
|
||||
this.label1.Location = new System.Drawing.Point(12, 14);
|
||||
this.label1.Name = "label1";
|
||||
this.label1.Size = new System.Drawing.Size(260, 36);
|
||||
this.label1.Size = new System.Drawing.Size(323, 45);
|
||||
this.label1.TabIndex = 0;
|
||||
this.label1.Text = "Configuration tool";
|
||||
//
|
||||
@@ -79,7 +79,7 @@
|
||||
this.label2.AutoSize = true;
|
||||
this.label2.Font = new System.Drawing.Font("Microsoft YaHei UI", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.label2.ForeColor = System.Drawing.Color.White;
|
||||
this.label2.Location = new System.Drawing.Point(3, 17);
|
||||
this.label2.Location = new System.Drawing.Point(3, 25);
|
||||
this.label2.Name = "label2";
|
||||
this.label2.Size = new System.Drawing.Size(132, 23);
|
||||
this.label2.TabIndex = 1;
|
||||
@@ -93,10 +93,10 @@
|
||||
this.gpbxRaceSettings.Controls.Add(this.label2);
|
||||
this.gpbxRaceSettings.Font = new System.Drawing.Font("Microsoft YaHei UI", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.gpbxRaceSettings.ForeColor = System.Drawing.Color.White;
|
||||
this.gpbxRaceSettings.Location = new System.Drawing.Point(725, 2);
|
||||
this.gpbxRaceSettings.Location = new System.Drawing.Point(733, 9);
|
||||
this.gpbxRaceSettings.Name = "gpbxRaceSettings";
|
||||
this.gpbxRaceSettings.Padding = new System.Windows.Forms.Padding(0);
|
||||
this.gpbxRaceSettings.Size = new System.Drawing.Size(521, 47);
|
||||
this.gpbxRaceSettings.Size = new System.Drawing.Size(521, 58);
|
||||
this.gpbxRaceSettings.TabIndex = 2;
|
||||
this.gpbxRaceSettings.TabStop = false;
|
||||
this.gpbxRaceSettings.Text = "RaceSettings";
|
||||
@@ -108,7 +108,7 @@
|
||||
this.tbxGpUrl.BorderStyle = System.Windows.Forms.BorderStyle.None;
|
||||
this.tbxGpUrl.Font = new System.Drawing.Font("Microsoft YaHei UI", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.tbxGpUrl.ForeColor = System.Drawing.Color.White;
|
||||
this.tbxGpUrl.Location = new System.Drawing.Point(141, 18);
|
||||
this.tbxGpUrl.Location = new System.Drawing.Point(141, 25);
|
||||
this.tbxGpUrl.Name = "tbxGpUrl";
|
||||
this.tbxGpUrl.Size = new System.Drawing.Size(367, 22);
|
||||
this.tbxGpUrl.TabIndex = 4;
|
||||
@@ -125,7 +125,7 @@
|
||||
this.gpbxDriverList.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
|
||||
this.gpbxDriverList.Font = new System.Drawing.Font("Microsoft YaHei UI", 10F);
|
||||
this.gpbxDriverList.ForeColor = System.Drawing.Color.White;
|
||||
this.gpbxDriverList.Location = new System.Drawing.Point(986, 55);
|
||||
this.gpbxDriverList.Location = new System.Drawing.Point(995, 73);
|
||||
this.gpbxDriverList.Name = "gpbxDriverList";
|
||||
this.gpbxDriverList.Padding = new System.Windows.Forms.Padding(0);
|
||||
this.gpbxDriverList.Size = new System.Drawing.Size(259, 269);
|
||||
@@ -199,7 +199,7 @@
|
||||
this.gpbxPreview.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
|
||||
this.gpbxPreview.Font = new System.Drawing.Font("Microsoft YaHei UI", 10F);
|
||||
this.gpbxPreview.ForeColor = System.Drawing.Color.White;
|
||||
this.gpbxPreview.Location = new System.Drawing.Point(8, 55);
|
||||
this.gpbxPreview.Location = new System.Drawing.Point(18, 73);
|
||||
this.gpbxPreview.Name = "gpbxPreview";
|
||||
this.gpbxPreview.Padding = new System.Windows.Forms.Padding(0);
|
||||
this.gpbxPreview.Size = new System.Drawing.Size(968, 608);
|
||||
@@ -313,7 +313,7 @@
|
||||
this.gpbxWindowPreview.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
|
||||
this.gpbxWindowPreview.Font = new System.Drawing.Font("Microsoft YaHei UI", 10F);
|
||||
this.gpbxWindowPreview.ForeColor = System.Drawing.Color.White;
|
||||
this.gpbxWindowPreview.Location = new System.Drawing.Point(8, 669);
|
||||
this.gpbxWindowPreview.Location = new System.Drawing.Point(18, 688);
|
||||
this.gpbxWindowPreview.Name = "gpbxWindowPreview";
|
||||
this.gpbxWindowPreview.Padding = new System.Windows.Forms.Padding(0);
|
||||
this.gpbxWindowPreview.Size = new System.Drawing.Size(1237, 88);
|
||||
@@ -397,7 +397,7 @@
|
||||
this.gpbxPresets.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
|
||||
this.gpbxPresets.Font = new System.Drawing.Font("Microsoft YaHei UI", 10F);
|
||||
this.gpbxPresets.ForeColor = System.Drawing.Color.White;
|
||||
this.gpbxPresets.Location = new System.Drawing.Point(986, 330);
|
||||
this.gpbxPresets.Location = new System.Drawing.Point(995, 348);
|
||||
this.gpbxPresets.Name = "gpbxPresets";
|
||||
this.gpbxPresets.Padding = new System.Windows.Forms.Padding(0);
|
||||
this.gpbxPresets.Size = new System.Drawing.Size(259, 333);
|
||||
@@ -424,7 +424,7 @@
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 19F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(51)))), ((int)(((byte)(51)))));
|
||||
this.ClientSize = new System.Drawing.Size(1254, 760);
|
||||
this.ClientSize = new System.Drawing.Size(1266, 788);
|
||||
this.Controls.Add(this.gpbxPresets);
|
||||
this.Controls.Add(this.gpbxWindowPreview);
|
||||
this.Controls.Add(this.gpbxPreview);
|
||||
@@ -433,7 +433,7 @@
|
||||
this.Controls.Add(this.gpbxRaceSettings);
|
||||
this.Font = new System.Drawing.Font("Microsoft YaHei UI", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
|
||||
this.MinimumSize = new System.Drawing.Size(1262, 807);
|
||||
this.MinimumSize = new System.Drawing.Size(1284, 835);
|
||||
this.Name = "Settings";
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
||||
this.Text = "Settings";
|
||||
|
||||
@@ -454,5 +454,10 @@ namespace Test_Merge
|
||||
e.Graphics.DrawString(gpbx.Text, gpbx.Font, brush, textPosition);
|
||||
}
|
||||
}
|
||||
|
||||
private void Settings_Load(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user