From 66df61ae8d6edb4f3ba36e061d1e11698b747309 Mon Sep 17 00:00:00 2001 From: Jarr3 Date: Wed, 26 Jun 2024 18:40:41 +0200 Subject: [PATCH] Potential New Feature to B2S Snippet x/y translation #71: Make only the absolute B2SSetPos(Id, xpos, ypos) available --- .../B2SBackglassServer.vbproj | 1 - .../b2sbackglassserver/Server.vb | 37 ------------------- 2 files changed, 38 deletions(-) diff --git a/b2sbackglassserver/b2sbackglassserver/B2SBackglassServer.vbproj b/b2sbackglassserver/b2sbackglassserver/B2SBackglassServer.vbproj index 949729b..390860b 100644 --- a/b2sbackglassserver/b2sbackglassserver/B2SBackglassServer.vbproj +++ b/b2sbackglassserver/b2sbackglassserver/B2SBackglassServer.vbproj @@ -118,7 +118,6 @@ - Background.vb diff --git a/b2sbackglassserver/b2sbackglassserver/Server.vb b/b2sbackglassserver/b2sbackglassserver/Server.vb index 82e9f5a..b47f9f5 100644 --- a/b2sbackglassserver/b2sbackglassserver/Server.vb +++ b/b2sbackglassserver/b2sbackglassserver/Server.vb @@ -1715,14 +1715,6 @@ Public Class Server End If End Sub - - Public Sub B2SSetPosAbsolute(ByVal idORname As Object, ByVal xpos As Object, ByVal ypos As Object) - - If IsNumeric(idORname) And IsNumeric(xpos) And IsNumeric(ypos) Then - MyB2SSetPosAbsolute(CInt(idORname), CInt(xpos), CInt(ypos)) - End If - End Sub - ' method to set illumination Public Sub B2SSetIllumination(ByVal name As Object, ByVal value As Object) @@ -2145,35 +2137,6 @@ Public Class Server Private Sub MyB2SSetPos(ByVal id As Integer, ByVal xpos As Integer, ByVal ypos As Integer) - If B2SData.IsBackglassRunning Then - - If B2SData.IsBackglassStartedAsEXE Then - - Else - If B2SData.UsedRomLampIDs.ContainsKey(id) Then - Dim rescaleBackglass As SizeF - Me.formBackglass.GetScaleFactor(rescaleBackglass) - - For Each picbox As B2SPictureBox In B2SData.UsedRomLampIDs(id) - If picbox IsNot Nothing AndAlso (Not B2SData.UseIlluminationLocks OrElse String.IsNullOrEmpty(picbox.GroupName) OrElse Not B2SData.IlluminationLocks.ContainsKey(picbox.GroupName)) Then - picbox.Left += xpos - picbox.Top += ypos - ' Using RectangleF as this is used in the DrawImage within OnPaint for picturBoxes. - picbox.RectangleF = New RectangleF(CInt(picbox.Left / rescaleBackglass.Width), CInt(picbox.Top / rescaleBackglass.Height), picbox.RectangleF.Width, picbox.RectangleF.Height) - 'Invalidating this object does not work, need to Invalidate the parent. - If picbox.Parent IsNot Nothing Then - picbox.Parent.Invalidate() - End If - End If - Next - End If - End If - End If - - End Sub - - Private Sub MyB2SSetPosAbsolute(ByVal id As Integer, ByVal xpos As Integer, ByVal ypos As Integer) - If B2SData.IsBackglassRunning Then If B2SData.IsBackglassStartedAsEXE Then