Skip to content

Rework weather info #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ConnorMolz merged 2 commits into from
May 26, 2025
Merged

Rework weather info #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d8e43b
Replace Text with SVG in WPF
ConnorMolz May 26, 2025
bf34c12
Update Style of html
ConnorMolz May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 38 additions & 5 deletions RaceOverlay/API/Overlays/WeatherInfo/WeatherInfo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@

.grid-item {
padding: 5px;
display: flex;
align-items: center;
}

.left-align {
Expand All @@ -44,6 +46,21 @@
.right-align {
text-align: right;
vertical-align: middle;
justify-content: flex-end;
}

.icon {
width: 20px;
height: 20px;
fill: white;
margin-right: 5px;
}

.thermometer-icon {
width: 20px;
height: 24px;
fill: white;
margin-right: 5px;
}

.wet-indicator-container {
Expand All @@ -70,13 +87,29 @@
<body>
<div class="overlay-container">
<div class="grid">
<div class="grid-item left-align">Air Temp:</div>
<div class="grid-item left-align">
<svg class="icon" viewBox="0 0 17 16">
<path d="M14.0729979,0 L9.03234845,5.5313194e-08 L9.03234845,1.04200006 L7.958,1.042 L7.958,0 L3.083,0 L1.083,16 L16.005493,16 L14.0729979,0 Z M9,15 L8,15 L8,12 L9,12 L9,15 L9,15 Z M9,10.042 L8,10.042 L8,7 L9,7 L9,10.042 L9,10.042 Z M7.958,4.959 L7.958,2.959 L8.958,2.959 L8.958,4.959 L7.958,4.959 Z"/>
</svg>
Air Temp:
</div>
<div class="grid-item right-align" id="AirTempText">40.2 C°</div>

<div class="grid-item left-align">Track Temp:</div>
<div class="grid-item left-align">
<svg class="thermometer-icon" viewBox="0 0 16 16">
<path d="M9.5 12.5a1.5 1.5 0 1 1-2-1.415V6.5a.5.5 0 0 1 1 0v4.585a1.5 1.5 0 0 1 1 1.415"/>
<path d="M5.5 2.5a2.5 2.5 0 0 1 5 0v7.55a3.5 3.5 0 1 1-5 0zM8 1a1.5 1.5 0 0 0-1.5 1.5v7.987l-.167.15a2.5 2.5 0 1 0 3.333 0l-.166-.15V2.5A1.5 1.5 0 0 0 8 1"/>
</svg>
Track Temp:
</div>
<div class="grid-item right-align" id="TrackTempText">55.4 C°</div>

<div class="grid-item left-align">Precipitation:</div>
<div class="grid-item left-align">
<svg class="icon" viewBox="0 0 16 16">
<path d="M4.158 12.025a.5.5 0 0 1 .316.633l-.5 1.5a.5.5 0 0 1-.948-.316l.5-1.5a.5.5 0 0 1 .632-.317m6 0a.5.5 0 0 1 .316.633l-.5 1.5a.5.5 0 0 1-.948-.316l.5-1.5a.5.5 0 0 1 .632-.317m-3.5 1.5a.5.5 0 0 1 .316.633l-.5 1.5a.5.5 0 0 1-.948-.316l.5-1.5a.5.5 0 0 1 .632-.317m6 0a.5.5 0 0 1 .316.633l-.5 1.5a.5.5 0 1 1-.948-.316l.5-1.5a.5.5 0 0 1 .632-.317m.747-8.498a5.001 5.001 0 0 0-9.499-1.004A3.5 3.5 0 1 0 3.5 11H13a3 3 0 0 0 .405-5.973M8.5 2a4 4 0 0 1 3.976 3.555.5.5 0 0 0 .5.445H13a2 2 0 0 1 0 4H3.5a2.5 2.5 0 1 1 .605-4.926.5.5 0 0 0 .596-.329A4 4 0 0 1 8.5 2"/>
</svg>
Precipitation:
</div>
<div class="grid-item right-align" id="PrecipitationText">100%</div>

<div class="wet-indicator-container" id="IsWetBorder">
Expand All @@ -91,15 +124,15 @@
try {
const response = await fetch('/overlay/weather-info/data');
const data = await response.json();

// Update the text elements with the fetched data
document.getElementById('AirTempText').innerText = `${data.airTemp.toFixed(1)} C°`;
document.getElementById('TrackTempText').innerText = `${data.trackTemp.toFixed(1)} C°`;
document.getElementById('PrecipitationText').innerText = `${data.precipitation.toFixed(1)}%`;
document.getElementById('IsWetText').innerText = data.isWet ? 'WET' : 'DRY';
document.getElementById('IsWetBorder').style.backgroundColor = data.isWet ? '#0000ff' : '#00ff00';


} catch (error) {
console.error('Failed to update weather-info:', error);
}
Expand Down
24 changes: 9 additions & 15 deletions RaceOverlay/Overlays/WeatherInfo/WeatherInfo.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:RaceOverlay.Overlays.WeatherInfo"
xmlns:internals="clr-namespace:RaceOverlay.Internals"
xmlns:av="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
mc:Ignorable="d"
Title="Weather Info" Height="{Binding _windowHeight}" Width="{Binding _windowWidth}"
Background="Transparent"
Expand All @@ -29,35 +30,28 @@
<ScaleTransform x:Name="ContentScaleTransform" ScaleX="1" ScaleY="1" />
</Grid.LayoutTransform>

<TextBlock Grid.Column="0" Grid.Row="0"
Text="Air Temp:"
Padding="5"
VerticalAlignment="Center"
HorizontalAlignment="Left"></TextBlock>

<Path Stretch="Uniform" Fill="White" Width="20" Height="20" Data="M14.0729979,0 L9.03234845,5.5313194e-08 L9.03234845,1.04200006 L7.958,1.042 L7.958,0 L3.083,0 L1.083,16 L16.005493,16 L14.0729979,0 Z M9,15 L8,15 L8,12 L9,12 L9,15 L9,15 Z M9,10.042 L8,10.042 L8,7 L9,7 L9,10.042 L9,10.042 Z M7.958,4.959 L7.958,2.959 L8.958,2.959 L8.958,4.959 L7.958,4.959 Z"></Path>
<TextBlock Grid.Column="1" Grid.Row="0"
Padding="5"
Name="AirTempText"
VerticalAlignment="Center"
HorizontalAlignment="Right"
Text="40.2 C°"></TextBlock>

<TextBlock Grid.Column="0" Grid.Row="1"
Text="Track Temp:"
VerticalAlignment="Center"
HorizontalAlignment="Left"
Padding="5"></TextBlock>

<Path Grid.Row="1" Grid.Column="0" Fill="White" Height="18" Width="20" Stretch="Uniform" Data="M9.5 12.5a1.5 1.5 0 1 1-2-1.415V6.5a.5.5 0 0 1 1 0v4.585a1.5 1.5 0 0 1 1 1.415"/>
<Path Grid.Row="1" Grid.Column="0" Fill="White" Height="24" Width="24" Stretch="Uniform" Data="M5.5 2.5a2.5 2.5 0 0 1 5 0v7.55a3.5 3.5 0 1 1-5 0zM8 1a1.5 1.5 0 0 0-1.5 1.5v7.987l-.167.15a2.5 2.5 0 1 0 3.333 0l-.166-.15V2.5A1.5 1.5 0 0 0 8 1"/>


<TextBlock Grid.Column="1" Grid.Row="1"
Padding="5"
VerticalAlignment="Center"
HorizontalAlignment="Right"
Name="TrackTempText"
Text="55.4 C°"></TextBlock>

<TextBlock Grid.Column="0" Grid.Row="2"
Text="Precipitation:"
VerticalAlignment="Center"
HorizontalAlignment="Left"
Padding="5"></TextBlock>
<Path Grid.Column="0" Grid.Row="2" Stretch="Uniform" Fill="White" Width="20" Height="20" Data="M4.158 12.025a.5.5 0 0 1 .316.633l-.5 1.5a.5.5 0 0 1-.948-.316l.5-1.5a.5.5 0 0 1 .632-.317m6 0a.5.5 0 0 1 .316.633l-.5 1.5a.5.5 0 0 1-.948-.316l.5-1.5a.5.5 0 0 1 .632-.317m-3.5 1.5a.5.5 0 0 1 .316.633l-.5 1.5a.5.5 0 0 1-.948-.316l.5-1.5a.5.5 0 0 1 .632-.317m6 0a.5.5 0 0 1 .316.633l-.5 1.5a.5.5 0 1 1-.948-.316l.5-1.5a.5.5 0 0 1 .632-.317m.747-8.498a5.001 5.001 0 0 0-9.499-1.004A3.5 3.5 0 1 0 3.5 11H13a3 3 0 0 0 .405-5.973M8.5 2a4 4 0 0 1 3.976 3.555.5.5 0 0 0 .5.445H13a2 2 0 0 1 0 4H3.5a2.5 2.5 0 1 1 .605-4.926.5.5 0 0 0 .596-.329A4 4 0 0 1 8.5 2"></Path>
<TextBlock Grid.Column="1" Grid.Row="2"
Padding="5"
VerticalAlignment="Center"
Expand Down
2 changes: 1 addition & 1 deletion RaceOverlay/Overlays/WeatherInfo/WeatherInfo.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@

private bool _blinkingIsActiv = true;

public WeatherInfo(): base("Weather Info", "Displays the current temperature, precipitation and if the track declared to be wet from race control.")

Check warning on line 27 in RaceOverlay/Overlays/WeatherInfo/WeatherInfo.xaml.cs

View workflow job for this annotation

GitHub Actions / test 

Non-nullable field '_data' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the field as nullable.
{
InitializeComponent();

_setWindowSize(150, 130);
_setWindowSize(120, 135);

Thread updateThread = new Thread(UpdateThreadMethod);
updateThread.IsBackground = true;
Expand Down
Loading