You can now see up to 4 of the battles that are going on (You can even click on the drivers to see them on the bottom of the screen)

This commit is contained in:
2023-05-24 13:54:42 +02:00
parent e4edd71adc
commit f356d90c35
5 changed files with 189 additions and 53 deletions
+23 -9
View File
@@ -49,7 +49,7 @@ namespace Test_Merge
Settings settingsForm = new Settings();
settingsForm.ShowDialog();
//MessageBox.Show(settingsForm.GrandPrixUrl + Environment.NewLine + settingsForm.GrandPrixName + Environment.NewLine + settingsForm.GrandPrixYear);
if(settingsForm.GrandPrixUrl != "" && settingsForm.SelectedConfigFile != "")
if (settingsForm.GrandPrixUrl != "" && settingsForm.SelectedConfigFile != "")
{
GpUrl = settingsForm.GrandPrixUrl;
if (File.Exists(settingsForm.SelectedConfigFile))
@@ -112,10 +112,11 @@ namespace Test_Merge
int errorCode = Wrapper.Refresh();
sw.Stop();
// Task completed
// Task completed
Invoke((MethodInvoker)delegate
{
DisplayResults(errorCode,sw, screen);
DisplayResults(errorCode, sw, screen);
DisplayBattles();
});
});
}
@@ -132,6 +133,10 @@ namespace Test_Merge
btnSettings.Enabled = true;
}
}
private void DisplayBattles()
{
Wrapper.DisplayBattles(pnlBattles,this);
}
private void Form1_FormClosing(object sender, FormClosingEventArgs e)
{
if (Emulator != null)
@@ -139,7 +144,7 @@ namespace Test_Merge
Emulator.Stop();
}
}
private void DisplayResults(int errorCode,Stopwatch sw, Bitmap screen)
private void DisplayResults(int errorCode, Stopwatch sw, Bitmap screen)
{
if (errorCode != 0)
{
@@ -148,7 +153,7 @@ namespace Test_Merge
}
else
{
Wrapper.DisplayLiveRanking(pnlLiveRanking,this);
Wrapper.DisplayLiveRanking(pnlLiveRanking, this);
}
}
@@ -206,14 +211,16 @@ namespace Test_Merge
private void textBox1_TextChanged(object sender, EventArgs e)
{
if (tbxResult.Text != "")
if (textBox1.Text != "")
GpUrl = textBox1.Text;
}
public void btnDriver_Click(object sender, EventArgs e)
{
//Happens when a driver button has been clicked
//MessageBox.Show((sender as Button).Name + " has been selected");
DriverData driver = Wrapper.GetFullDriverData((sender as Button).Name,pnlCurrentDriverLapsHistory);
Button btn = (sender as Button);
string[] parts = btn.Name.Split('_');
DriverData driver = Wrapper.GetFullDriverData(parts[0], pnlCurrentDriverLapsHistory,this);
lblCurrentDriverName.Text = driver.Name;
lblCurrentDriverPosition.Text = driver.Position.ToString();
lblCurrentDriverGapToLeader.Text = Reader.ConvertMsToTime(driver.GapToLeader);
@@ -234,10 +241,10 @@ namespace Test_Merge
case Tyre.Type.Undefined:
lblCurrentDriverTyreType.Text = "uuuuh...";
lblCurrentDriverTyreType.ForeColor = Color.Violet;
break;
break;
case Tyre.Type.Hard:
lblCurrentDriverTyreType.Text = "Hard";
lblCurrentDriverTyreType.ForeColor = Color.FromArgb(164,165,168);
lblCurrentDriverTyreType.ForeColor = Color.FromArgb(164, 165, 168);
break;
case Tyre.Type.Medium:
lblCurrentDriverTyreType.Text = "Medium";
@@ -257,5 +264,12 @@ namespace Test_Merge
break;
}
}
public void btnLapTime_Click(object sender, EventArgs e)
{
//Happens when a lapTime has been clicked
Button btn = sender as Button;
string[] parts = btn.Name.Split('_');
Wrapper.DisplayLapTimeInfos(parts[0], Convert.ToInt32(parts[1]),btn.Text);
}
}
}