Adjusted tolerances when checking track bitcounts

Floppy access form now stays open after reading or writing to a floppy disk
Fixed the format of the volume date on the summary panel
Database updates

Author: Digitoxin1

DiskImageTool/Bitstream/Functions.vb

@@ -78,48 +78,48 @@ Namespace Bitstream
         End Function
 
         Public Function InferBitRate(BitCount As UInteger) As UShort
-            BitCount = Math.Round(BitCount / 10000) * 10000
+            BitCount = Math.Round(BitCount / 5000) * 5000
 
-            If BitCount <= 130000 Then
+            If BitCount <= 135000 Then
                 Return 250
-            ElseIf BitCount = 170000 Then
+            ElseIf BitCount >= 165000 And BitCount <= 175000 Then
                 Return 500
-            ElseIf BitCount = 200000 Then
+            ElseIf BitCount >= 195000 And BitCount <= 205000 Then
                 Return 500
-            ElseIf BitCount = 400000 Then
+            ElseIf BitCount >= 395000 And BitCount <= 405000 Then
                 Return 1000
-            ElseIf BitCount = 800000 Then
+            ElseIf BitCount >= 795000 And BitCount <= 805000 Then
                 Return 2000
             Else
                 Return 0
             End If
         End Function
 
         Public Function InferRPM(BitCount As UInteger) As UShort
-            BitCount = Math.Round(BitCount / 10000) * 10000
+            BitCount = Math.Round(BitCount / 5000) * 5000
 
-            If BitCount <= 130000 Then
+            If BitCount <= 135000 Then
                 Return 300
-            ElseIf BitCount = 170000 Then
+            ElseIf BitCount >= 165000 And BitCount <= 175000 Then
                 Return 360
-            ElseIf BitCount = 200000 Then
+            ElseIf BitCount >= 195000 And BitCount <= 205000 Then
                 Return 300
-            ElseIf BitCount = 400000 Then
+            ElseIf BitCount >= 395000 And BitCount <= 405000 Then
                 Return 300
             Else
                 Return 300
             End If
         End Function
         Public Function InferSectorCount(BitCount As UInteger) As UShort
-            BitCount = Math.Round(BitCount / 10000) * 10000
+            BitCount = Math.Round(BitCount / 5000) * 5000
 
-            If BitCount <= 130000 Then
+            If BitCount <= 135000 Then
                 Return 9
-            ElseIf BitCount = 170000 Then
+            ElseIf BitCount >= 165000 And BitCount <= 175000 Then
                 Return 15
-            ElseIf BitCount = 200000 Then
+            ElseIf BitCount >= 195000 And BitCount <= 205000 Then
                 Return 18
-            ElseIf BitCount = 400000 Then
+            ElseIf BitCount >= 395000 And BitCount <= 405000 Then
                 Return 36
             Else
                 Return 0

DiskImageTool/Bitstream/IBM_MFM/IBM_MFM_Tools.vb

@@ -596,15 +596,16 @@
                 Return (2 ^ Size) * 128
             End Function
 
-            Public Function GetTrackFormat(Size As UInteger) As MFMTrackFormat
-                Size = Math.Round(Size / 10000) * 10000
-                If Size = 100000 Then
+            Public Function GetTrackFormat(BitCount As UInteger) As MFMTrackFormat
+                BitCount = Math.Round(BitCount / 5000) * 5000
+
+                If BitCount <= 135000 Then
                     Return MFMTrackFormat.TrackFormatDD
-                ElseIf Size = 170000 Then
+                ElseIf BitCount >= 165000 And BitCount <= 175000 Then
                     Return MFMTrackFormat.TrackFormatHD1200
-                ElseIf Size = 200000 Then
+                ElseIf BitCount >= 195000 And BitCount <= 205000 Then
                     Return MFMTrackFormat.TrackFormatHD
-                ElseIf Size = 400000 Then
+                ElseIf BitCount >= 395000 And BitCount <= 405000 Then
                     Return MFMTrackFormat.TrackFormatED
                 Else
                     Return MFMTrackFormat.TrackFormatUnknown

DiskImageTool/DiskImageTool.vbproj

@@ -30,7 +30,7 @@
     <TargetCulture>en-US</TargetCulture>
     <ProductName>DiskImageTool</ProductName>
     <PublisherName>Digitoxin</PublisherName>
-    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationRevision>3</ApplicationRevision>
     <ApplicationVersion>2.9.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>

DiskImageTool/FloppyDB.xml

@@ -97,17 +97,22 @@
       <disk md5="08223BB189BD109938D1AE8190E73AB5" disk="1"/>
       <disk md5="B9804935D95DADD510C8047F581F8CD4" disk="2"/>
     </release>
-    <release year="1991" version="1.5, Int. 7.1.91" media="720K" status="V">
-      <disk md5="899FC331FB780F9F5555E53CBF7A2E7B" disk="1" status="U"/>
-      <disk md5="671A3DC0E7C69565D60050270E019439" disk="2" version="1.5, Int. 7.1.91, 1.51, Int. 8.22.91"/>
-      <disk md5="E5EAAC338C6BACABE917E4A7B60AD0F5" disk="3" version="1.5, Int. 7.1.91, 1.51, Int. 8.22.91"/>
-      <disk md5="6D67747ACD6D3A1C118695D000809FFA" disk="4" version="1.5, Int. 7.1.91, 1.51, Int. 8.22.91"/>
+    <release year="1991" version="1.5, Int. 7.1.91">
+      <media media="1.2M" status="V">
+        <disk md5="F7B7A0E352276BD6A0B04F32F8753C71" disk="1"/>"
+        <disk md5="E0FDC283DE1625B5A9F5C6C3C987A4A0" disk="2" version="1.5, Int. 7.1.91, 1.51, Int. 8.22.91"/>
+        <disk md5="1389B6C6927B810A9B16EBAFE66B1DEB" disk="3" version="1.5, Int. 7.1.91, 1.51, Int. 8.22.91"/>
+      </media>
+      <media media="720K" status="V">
+        <disk md5="899FC331FB780F9F5555E53CBF7A2E7B" disk="1"/>
+        <disk md5="671A3DC0E7C69565D60050270E019439" disk="2" version="1.5, Int. 7.1.91, 1.51, Int. 8.22.91"/>
+        <disk md5="E5EAAC338C6BACABE917E4A7B60AD0F5" disk="3" version="1.5, Int. 7.1.91, 1.51, Int. 8.22.91"/>
+        <disk md5="6D67747ACD6D3A1C118695D000809FFA" disk="4" version="1.5, Int. 7.1.91, 1.51, Int. 8.22.91"/>
+      </media>      
     </release>
     <release year="1991" version="1.51, Int. 8.22.91">
       <media media="1.2M" status="U">
-        <disk md5="2B1C4810954FA51432B2115C18D16242" disk="1"/>
-        <disk md5="E0FDC283DE1625B5A9F5C6C3C987A4A0" disk="2"/>
-        <disk md5="1389B6C6927B810A9B16EBAFE66B1DEB" disk="3"/>
+        <disk md5="2B1C4810954FA51432B2115C18D16242" disk="1"/>        
       </media>
       <media media="720K" status="V">
         <disk md5="8C83F4EAD1BCE3ECB7F337183BF6CC55" disk="1"/>
@@ -297,7 +302,7 @@
     </release>
   </title>
   <title name="Alien Legacy" publisher="Sierra On-Line, Inc.">
-    <release year="1994" version="1.0, Int. 5.14.94" media="1.44M" status="U">
+    <release year="1994" version="1.0, Int. 5.14.94" media="1.44M" status="V">
       <disk md5="63829096EE27748916B27820976CF81B" disk="1"/>
       <disk md5="3CB704DED28F1DFB42221F7FD2DC18F0" disk="2"/>
       <disk md5="9A7CA1B1EA461E0668102D3311A0B6BD" disk="3"/>
@@ -3718,7 +3723,7 @@
       <disk md5="46FC067879694EF6831DF48F021F9FA5" disk="9" status="U"/>
       <disk md5="5D88C1BD6793EB048CA942D643A39783" disk="10"/>
     </release>
-    <release year="1993" version="1.0, Int. 2.17.93" media="1.44M" status="U">
+    <release year="1993" version="1.0, Int. 2.17.93" media="1.44M" status="V">
       <disk md5="0A06AA8B5C6FD5442D494729EC96852D" disk="1"/>
       <disk md5="B5EBA5BD1829595DE91E7BFE3FF8E750" disk="2"/>
       <disk md5="CC3BF598D7F1F6B4109A92BAD0CF4A7A" disk="3"/>

DiskImageTool/FloppyDiskIO.vb

@@ -18,12 +18,11 @@ Module FloppyDiskIO
         If Result Then
             Dim BPB = FloppyDiskGetReadOptions(Owner, FloppyDrive)
             If BPB IsNot Nothing Then
-                Dim FloppyAccessForm As New FloppyAccessForm(FloppyDrive, BPB, FloppyAccessForm.FloppyAccessType.Read)
+                Dim FloppyAccessForm As New FloppyAccessForm(FloppyDrive, BPB, FloppyAccessForm.FloppyAccessType.Read) With {
+                    .LoadedFileNames = LoadedFileNames
+                }
                 FloppyAccessForm.ShowDialog(Owner)
-                If FloppyAccessForm.Complete Then
-                    Dim DiskFormat = GetFloppyDiskFormat(BPB, False)
-                    FileName = FloppyDiskSaveFile(FloppyAccessForm.DiskBuffer, DiskFormat, LoadedFileNames)
-                End If
+                FileName = FloppyAccessForm.FileName
                 FloppyAccessForm.Close()
             End If
             FloppyDrive.Close()

DiskImageTool/Forms/FloppyAccessForm.Designer.vb

@@ -15,6 +15,8 @@ Public Class FloppyAccessForm
     Private _SectorData As SectorData = Nothing
     Private _SectorError As Boolean = False
     Private _TotalBadSectors As UInteger = 0
+    Private _LoadedFileNames As New Dictionary(Of String, ImageData)
+    Private _FileName As String = ""
 
     Public Enum FloppyAccessType
         Read
@@ -51,6 +53,8 @@ Public Class FloppyAccessForm
         Me.Text = StatusTypeString & " " & GetFloppyDiskFormatName(_BPB, False) & " Floppy"
         StatusType.Text = StatusTypeString
 
+        btnAbort.Text = "Abort"
+
         InitTables()
     End Sub
 
@@ -87,6 +91,21 @@ Public Class FloppyAccessForm
         End Set
     End Property
 
+    Public ReadOnly Property FileName As String
+        Get
+            Return _FileName
+        End Get
+    End Property
+
+    Public Property LoadedFileNames As Dictionary(Of String, ImageData)
+        Get
+            Return _LoadedFileNames
+        End Get
+        Set(value As Dictionary(Of String, ImageData))
+            _LoadedFileNames = value
+        End Set
+    End Property
+
     Public ReadOnly Property TotalBadSectors As UInteger
         Get
             Return _TotalBadSectors
@@ -569,20 +588,31 @@ Public Class FloppyAccessForm
                 Exit Sub
             End If
         End If
+
         If Not _Complete Then
             If Not ConfirmAbort() Then
                 Exit Sub
             End If
+            StatusType.Text = "Aborted"
+        Else
+            StatusType.Text = "Complete"
         End If
 
         If _AccessType = FloppyAccessType.Write Then
             If _Complete Then
                 Dim Msg As String = $"Your disk has been written successfully.{vbCrLf}{vbCrLf}Please remove the disk from the drive and write protect it now.{vbCrLf}{vbCrLf}Warning: If you continue without write protecting the disk, The operating system may make modifications to the disk as soon as you close this window."
                 MsgBox(Msg, MsgBoxStyle.Information)
             End If
+        Else
+            If _Complete Then
+                Dim DiskFormat = GetFloppyDiskFormat(_BPB, False)
+                _FileName = FloppyDiskSaveFile(_DiskBuffer, DiskFormat, _LoadedFileNames)
+            End If
         End If
 
-        Me.Hide()
+        btnAbort.Text = "Close"
+
+        'Me.Hide()
     End Sub
 
     Private Sub FloppyAccessForm_Activated(sender As Object, e As EventArgs) Handles Me.Activated
@@ -641,5 +671,4 @@ Public Class FloppyAccessForm
         Public ReadOnly Property Sector As UInteger
         Public Property Status As TrackStatus
     End Class
-
 End Class

DiskImageTool/Forms/FloppyAccessForm.vb

@@ -466,7 +466,7 @@ Namespace ImageFormats
                     BitstreamTrack = Image.GetTrack(Track, Side)
 
                     If BitstreamTrack.Decoded Then
-                        Dim TrackFormat = GetTrackFormat(BitstreamTrack.MFMData.Size)
+                        Dim TrackFormat = GetTrackFormat(BitstreamTrack.Bitstream.Length)
 
                         If DiskFormat = MFMTrackFormat.TrackFormatUnknown And TrackFormat <> MFMTrackFormat.TrackFormatUnknown Then
                             DiskFormat = TrackFormat

DiskImageTool/ImageFormats/ImageConversion.vb

@@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
 ' <Assembly: AssemblyVersion("1.0.*")>
 
 <Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("2.9.0.2")>
+<Assembly: AssemblyFileVersion("2.9.0.3")>

DiskImageTool/My Project/AssemblyInfo.vb

@@ -559,7 +559,7 @@ Module SummaryPanel
             If fsi.VolumeLabel IsNot Nothing Then
                 .AddItem(FileSystemGroup, "Volume Label", fsi.VolumeLabel.GetVolumeName.TrimEnd(NULL_CHAR))
                 Dim VolumeDate = fsi.VolumeLabel.GetLastWriteDate
-                .AddItem(FileSystemGroup, "Volume Date", VolumeDate.ToString(True, False, False, False))
+                .AddItem(FileSystemGroup, "Volume Date", VolumeDate.ToString(True, True, False, True))
             End If
 
             .AddItem(FileSystemGroup, "Total Space", Format(Disk.SectorToBytes(Disk.BPB.DataRegionSize), "N0") & " bytes")