Bug fixes and improvements

Fixed small issue when converting to .MFM
Fixed small issue when replacing a file
Database updates

Author: Digitoxin1

DiskImageTool/Bitstream/IBM_MFM/IBM_MFM_Bitstream.vb

@@ -104,7 +104,7 @@
                 _RPM = RPM
                 _DataRate = DataRate
 
-                Dim MaxSize = GetMaxSize(RPM, DataRate)
+                Dim MaxSize = MFMGetSize(RPM, DataRate)
                 Dim Diff = MaxSize - _Bitstream.Length
                 If Diff > 0 Then
                     AddGap(Diff \ 16)
@@ -192,13 +192,6 @@
                     Return _Bitstream.Get(_Bitstream.Length - 1)
                 End If
             End Function
-
-            Private Function GetMaxSize(RPM As UShort, DataRate As UShort) As UInteger
-                Dim MicrosecondsPerRev As Single = 1 / RPM * 60 * 1000000
-                Dim MicrossecondsPerBit As Single = DataRate / 1000
-
-                Return Math.Ceiling(MicrosecondsPerRev * MicrossecondsPerBit / 8) * 16
-            End Function
         End Class
     End Namespace
 End Namespace

DiskImageTool/Bitstream/IBM_MFM/IBM_MFM_Tools.vb

@@ -754,6 +754,13 @@
                 Return New Byte(-1) {}
             End Function
 
+            Public Function MFMGetSize(RPM As UShort, DataRate As UShort) As UInteger
+                Dim MicrosecondsPerRev As Single = 1 / RPM * 60 * 1000000
+                Dim MicrossecondsPerBit As Single = DataRate / 1000
+
+                Return Math.Ceiling(MicrosecondsPerRev * MicrossecondsPerBit / 8) * 16
+            End Function
+
             Public Function ResizeBitstream(Bitstream As BitArray, Length As UInteger) As BitArray
                 Dim NewBitstream = CType(Bitstream.Clone, BitArray)
                 NewBitstream.Length = Length

DiskImageTool/DiskImageTool.vbproj

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

DiskImageTool/FloppyDB.xml

@@ -292,8 +292,8 @@ Namespace ImageFormats
             Dim NewTrackCount = TrackCount \ Image.TrackStep
 
             Dim HFE = New HFE.HFEImage(NewTrackCount, Image.SideCount) With {
-                .BitRate = 0,
-                .RPM = 0
+                .BitRate = 250,
+                .RPM = 300
             }
 
             For Track = 0 To TrackCount - 1 Step Image.TrackStep
@@ -392,27 +392,37 @@ Namespace ImageFormats
             Dim NewTrackCount = TrackCount \ Image.TrackStep
 
             Dim MFM = New MFM.MFMImage(NewTrackCount, Image.SideCount, 1) With {
-                .BitRate = 0,
-                .RPM = 0
+                .BitRate = 250,
+                .RPM = 300
             }
 
             For Track = 0 To TrackCount - 1 Step Image.TrackStep
                 Dim NewTrack = Track \ Image.TrackStep
                 For Side = 0 To Image.SideCount - 1
                     BitstreamTrack = Image.GetTrack(Track, Side)
 
-                    Dim DriveSpeed = GetDriveSpeed(BitstreamTrack, Image.TrackStep)
+                    Dim MFMTrack As ImageFormats.MFM.MFMTrack
 
-                    If Track = 0 And Side = 0 Then
-                        MFM.BitRate = DriveSpeed.BitRate
-                        MFM.RPM = DriveSpeed.RPM
-                    End If
+                    If BitstreamTrack.TrackType = BitstreamTrackType.MFM Then
+                        Dim DriveSpeed = GetDriveSpeed(BitstreamTrack, Image.TrackStep)
 
-                    Dim MFMTrack = New MFM.MFMTrack(NewTrack, Side) With {
-                        .Bitstream = BitstreamTrack.Bitstream,
-                        .BitRate = DriveSpeed.BitRate,
-                        .RPM = DriveSpeed.RPM
-                    }
+                        If Track = 0 And Side = 0 Then
+                            MFM.BitRate = DriveSpeed.BitRate
+                            MFM.RPM = DriveSpeed.RPM
+                        End If
+
+                        MFMTrack = New MFM.MFMTrack(NewTrack, Side) With {
+                            .Bitstream = BitstreamTrack.Bitstream,
+                            .BitRate = DriveSpeed.BitRate,
+                            .RPM = DriveSpeed.RPM
+                        }
+                    Else
+                        MFMTrack = New MFM.MFMTrack(NewTrack, Side) With {
+                            .Bitstream = New BitArray(MFMGetSize(MFM.RPM, MFM.BitRate)),
+                            .BitRate = MFM.BitRate,
+                            .RPM = MFM.RPM
+                        }
+                    End If
 
                     MFM.SetTrack(NewTrack, Side, MFMTrack)
                 Next

DiskImageTool/ImageFormats/ImageConversion.vb

@@ -2279,7 +2279,7 @@ Public Class MainForm
         Dim ReplaceFileForm As New ReplaceFileForm(AvailableSpace, DirectoryEntry.ParentDirectory)
         With ReplaceFileForm
             .SetOriginalFile(DirectoryEntry.GetShortFileName, DirectoryEntry.GetLastWriteDate.DateObject, DirectoryEntry.FileSize)
-            .SetNewFile(DirectoryEntry.ParentDirectory.GetAvailableShortFileName(FileInfo.Name, False), FileInfo.LastWriteTime, FileInfo.Length)
+            .SetNewFile(DirectoryEntry.ParentDirectory.GetAvailableShortFileName(FileInfo.Name, False, DirectoryEntry.Index), FileInfo.LastWriteTime, FileInfo.Length)
             .RefreshText()
             .ShowDialog(Me)
             FormResult = .Result

DiskImageTool/MainForm.vb

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