added logos for Thalys, Eurostar, TGV, ICE

tom-2015 · Dec 30, 2016 · 68b3139 · 68b3139
1 parent 9efe905
commit 68b3139
Show file tree

Hide file tree

Showing 20 changed files with 65 additions and 2 deletions.
diff --git a/EUR.bmp b/EUR.bmp
diff --git a/ICE.bmp b/ICE.bmp
diff --git a/RailtimeScreenSaver/FrmOptions.Designer.vb b/RailtimeScreenSaver/FrmOptions.Designer.vb
diff --git a/RailtimeScreenSaver/My Project/Resources.Designer.vb b/RailtimeScreenSaver/My Project/Resources.Designer.vb
diff --git a/RailtimeScreenSaver/My Project/Resources.resx b/RailtimeScreenSaver/My Project/Resources.resx
@@ -121,4 +121,16 @@
   <data name="airplane" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\airplane.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="EUR" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\EUR.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ICE" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ICE.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="TGV" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TGV.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="THA" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\THA.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/RailtimeScreenSaver/RailtimeScreenSaver.vbproj b/RailtimeScreenSaver/RailtimeScreenSaver.vbproj
@@ -178,6 +178,10 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="AM96.ico" />
+    <None Include="Resources\EUR.bmp" />
+    <None Include="Resources\ICE.bmp" />
+    <None Include="Resources\TGV.bmp" />
+    <None Include="Resources\THA.bmp" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/RailtimeScreenSaver/Resources/EUR.bmp b/RailtimeScreenSaver/Resources/EUR.bmp
diff --git a/RailtimeScreenSaver/Resources/ICE.bmp b/RailtimeScreenSaver/Resources/ICE.bmp
diff --git a/RailtimeScreenSaver/Resources/TGV.bmp b/RailtimeScreenSaver/Resources/TGV.bmp
diff --git a/RailtimeScreenSaver/Resources/THA.bmp b/RailtimeScreenSaver/Resources/THA.bmp
diff --git a/RailtimeScreenSaver/Templates.vb b/RailtimeScreenSaver/Templates.vb
@@ -201,6 +201,7 @@ Public Class SNCBTemplate
                         End If
                         PrintCentered(TrackText, TrackRect, Graphics, TrainFont, New SolidBrush(TrackColor))
 
+                        Dim TrainType As String = UCase$(Train.Type)
                         'draw train type
                         If Train.IsSBahnTrain Then
                             Dim STrainType As String = Mid(Train.Type, 2)
@@ -213,7 +214,7 @@ Public Class SNCBTemplate
 
                             Graphics.FillEllipse(m_ForeColorBrush, STrainTypeCricle)
                             PrintCentered(STrainType, STrainTypeCricle, Graphics, STrainTypeFont, New SolidBrush(TrainRectColor))
-                        ElseIf Train.IsAirportTrain AndAlso (Now().Second Mod 2) = 0 Then
+                        ElseIf Train.IsAirportTrain AndAlso (Now.Second Mod 2) = 0 Then
                             Dim TrainTypeSize As SizeF = Graphics.MeasureString("XX", TrainFont)
                             Dim AirPlaneSize As Integer = TrainTypeSize.Width * 4 / 5
                             Dim AirplaneIcon As Bitmap = My.Resources.airplane
@@ -222,6 +223,24 @@ Public Class SNCBTemplate
                             Pallete.Entries(1) = Color.FromArgb(0, 0, 0, 0)
                             AirplaneIcon.Palette = Pallete
                             Graphics.DrawImage(AirplaneIcon, New RectangleF(TrackRect.X - BorderWidth - AirPlaneSize, TrackRect.Y, AirPlaneSize, AirPlaneSize))
+                        ElseIf TrainType = "TGV" OrElse TrainType = "THA" OrElse TrainType = "ICE" OrElse TrainType = "TGV" OrElse TrainType = "EUR" Then
+                            If (Now.Second Mod 2) = 0 OrElse Train.TrainNumber = "" Then
+                                'Dim LogoSize As SizeF = Graphics.MeasureString("Ag", TrainFont)
+                                ' LogoSize.Height * 4 / 5
+                                Dim Logo As Bitmap = My.Resources.ResourceManager.GetObject(TrainType)
+                                Dim LogoWidth As Double = TrackRect.Height / Logo.Height * Logo.Width * 7 / 8
+                                Dim Pallete As System.Drawing.Imaging.ColorPalette = Logo.Palette
+                                Pallete.Entries(0) = m_ForeColor
+                                Pallete.Entries(1) = Color.FromArgb(0, 0, 0, 0)
+                                Logo.Palette = Pallete
+                                Graphics.InterpolationMode = Drawing2D.InterpolationMode.HighQualityBilinear
+                                Graphics.DrawImage(Logo, New RectangleF(TrackRect.X - BorderWidth - LogoWidth, TrackRect.Y, LogoWidth, TrackRect.Height))
+                                Graphics.InterpolationMode = Drawing2D.InterpolationMode.Default
+                                Graphics.DrawImage(Logo, New RectangleF(TrackRect.X - BorderWidth - LogoWidth, TrackRect.Y, LogoWidth, TrackRect.Height))
+                            Else
+                                Dim TrainTypeSize As SizeF = Graphics.MeasureString(Train.TrainNumber, TrainFont)
+                                Graphics.DrawString(Train.TrainNumber, TrainFont, m_ForeColorBrush, TrackRect.X - BorderWidth - TrainTypeSize.Width, TrackRect.Y)
+                            End If
                         Else
                             Dim TrainTypeSize As SizeF = Graphics.MeasureString(Train.Type, TrainFont)
                             Graphics.DrawString(Train.Type, TrainFont, m_ForeColorBrush, TrackRect.X - BorderWidth - TrainTypeSize.Width, TrackRect.Y)

diff --git a/TGV.bmp b/TGV.bmp
diff --git a/THA.bmp b/THA.bmp
diff --git a/eurostar-logo.png b/eurostar-logo.png
diff --git a/exe/RailtimeScreenSaver.exe b/exe/RailtimeScreenSaver.exe
diff --git a/exe/RailtimeScreenSaver.scr b/exe/RailtimeScreenSaver.scr
diff --git a/ice-logo.png b/ice-logo.png
diff --git a/icons.PNG b/icons.PNG
diff --git a/tgv-logo.png b/tgv-logo.png
diff --git a/thalys-logo.png b/thalys-logo.png