Code refactoring

morphx666 · Feb 13, 2019 · 3cdd05e · 3cdd05e
1 parent 0b6001e
commit 3cdd05e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 24 deletions.
diff --git a/GenOpCodes/My Project/AssemblyInfo.vb b/GenOpCodes/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2019.2.1.420")>
-<Assembly: AssemblyFileVersion("2019.2.1.420")>
+<Assembly: AssemblyVersion("2019.2.13.422")>
+<Assembly: AssemblyFileVersion("2019.2.13.422")>
diff --git a/RunTests/My Project/AssemblyInfo.vb b/RunTests/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2019.2.1.719")>
-<Assembly: AssemblyFileVersion("2019.2.1.719")>
+<Assembly: AssemblyVersion("2019.2.13.721")>
+<Assembly: AssemblyFileVersion("2019.2.13.721")>
diff --git a/x8086NetEmu/Adapters/WebUI.vb b/x8086NetEmu/Adapters/WebUI.vb
@@ -17,8 +17,8 @@ Public Class WebUI
 
     Public Sub New(cpu As X8086, dBmp As DirectBitmap, syncObj As Object)
         Me.cpu = cpu
-        Me.mBitmap = dBmp
         Me.syncObj = syncObj
+        mBitmap = dBmp
 
         CreateClient()
 
@@ -188,7 +188,7 @@ Public Class WebUI
         Try
             SyncLock syncObj
                 ' FIXME: When using the VGA adapter and UseVRAM is true we need to send the VGA adapter's RAM instead
-                Return CType(Bitmap, Byte())
+                Return CType(mBitmap, Byte())
             End SyncLock
         Catch
             Return Nothing

diff --git a/x8086NetEmu/Helpers/ConsoleCrayon.vb b/x8086NetEmu/Helpers/ConsoleCrayon.vb
@@ -65,13 +65,9 @@ Public NotInheritable Class ConsoleCrayon
                 If foreColor <> Console.ForegroundColor Then Console.ForegroundColor = foreColor
                 If backColor <> Console.BackgroundColor Then Console.BackgroundColor = backColor
 
-                'If row = Console.WindowHeight - 1 AndAlso col + text.Length >= Console.WindowWidth Then
                 Dim index As Integer = col + row * Console.WindowWidth
                 Dim size As Integer = Console.WindowWidth * Console.WindowHeight
-                If index + text.Length >= size Then
-                    'text = text.Substring(0, text.Length * 2 + col - Console.WindowWidth - 1)
-                    text = text.Substring(0, size - index - 1)
-                End If
+                If index + text.Length >= size Then text = text.Substring(0, size - index - 1)
 
                 Console.Write(text)
             End If
@@ -194,11 +190,7 @@ Public NotInheritable Class ConsoleCrayon
         Dim a As Double
 
         If dy = 0 Then
-            If dx > 0 Then
-                a = 0
-            Else
-                a = 180
-            End If
+            a = If(dx > 0, 0, 180)
         Else
             a = Math.Atan(dy / dx) * toDegrees
             Select Case a
@@ -295,8 +287,8 @@ Public NotInheritable Class ConsoleCrayon
         End Select
     End Function
 
-    Private Const ESC = Chr(27) + "["
-    Private Const ColorReset = ESC + "0m"
+    Private Const ESC As String = Chr(27) + "["
+    Private Const ColorReset As String = ESC + "0m"
     Private Shared Function GetAnsiColorControlCode(color As ConsoleColor, isForeground As Boolean) As String
         ' lighter fg colours are 90 -> 97 rather than 30 -> 37
         ' lighter bg colours are 100 -> 107 rather than 40 -> 47

diff --git a/x8086NetEmu/My Project/AssemblyInfo.vb b/x8086NetEmu/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2019.2.1.6526")>
-<Assembly: AssemblyFileVersion("2019.2.1.6519")>
+<Assembly: AssemblyVersion("2019.2.13.6529")>
+<Assembly: AssemblyFileVersion("2019.2.13.6522")>
diff --git a/x8086NetEmuConsole/My Project/AssemblyInfo.vb b/x8086NetEmuConsole/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2019.2.1.789")>
-<Assembly: AssemblyFileVersion("2019.2.1.784")>
+<Assembly: AssemblyVersion("2019.2.13.792")>
+<Assembly: AssemblyFileVersion("2019.2.13.787")>
diff --git a/x8086NetEmuWinForms/My Project/AssemblyInfo.vb b/x8086NetEmuWinForms/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2019.2.1.6348")>
-<Assembly: AssemblyFileVersion("2019.2.1.6346")>
+<Assembly: AssemblyVersion("2019.2.13.6350")>
+<Assembly: AssemblyFileVersion("2019.2.13.6348")>