Added preliminary support for PcImgCnv

Author: Digitoxin1

DiskImageTool/DiskImageTool.vbproj

@@ -172,7 +172,9 @@
     <Compile Include="Filters\ImageFilters.vb" />
     <Compile Include="Filters\ImageFiltersBase.vb" />
     <Compile Include="DiskImageLib.vb" />
+    <Compile Include="Flux\DeviceLib.vb" />
     <Compile Include="Flux\Enums.vb" />
+    <Compile Include="Flux\Greaseweazle\GreaseweazleDevice.vb" />
     <Compile Include="Flux\Greaseweazle\SettingsPanel.Designer.vb">
       <DependentUpon>SettingsPanel.vb</DependentUpon>
     </Compile>
@@ -183,10 +185,12 @@
     <Compile Include="Flux\Forms\ConvertImageForm.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Flux\IDevice.vb" />
     <Compile Include="Flux\ISettings.vb" />
     <Compile Include="Flux\ITrackStatus.vb" />
     <Compile Include="Flux\Kryoflux\CommandLineBuilder.vb" />
     <Compile Include="Flux\Kryoflux\ConsoleParser.vb" />
+    <Compile Include="Flux\Kryoflux\KryofluxDevice.vb" />
     <Compile Include="Flux\Kryoflux\KryofluxLib.vb" />
     <Compile Include="Flux\Kryoflux\SettingsPanel.Designer.vb">
       <DependentUpon>SettingsPanel.vb</DependentUpon>
@@ -195,6 +199,18 @@
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="Flux\Kryoflux\TrackStatus.vb" />
+    <Compile Include="Flux\PcImgCnv\CommandLineBuilder.vb" />
+    <Compile Include="Flux\PcImgCnv\ConsoleParser.vb" />
+    <Compile Include="Flux\PcImgCnv\PcImgCnvDevice.vb" />
+    <Compile Include="Flux\PcImgCnv\PcImgCnvLib.vb" />
+    <Compile Include="Flux\PcImgCnv\PcImgCnvSettings.vb" />
+    <Compile Include="Flux\PcImgCnv\SettingsPanel.Designer.vb">
+      <DependentUpon>SettingsPanel.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Flux\PcImgCnv\SettingsPanel.vb">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Flux\PcImgCnv\TrackStatus.vb" />
     <Compile Include="Flux\SharedLib.vb" />
     <Compile Include="Globals.vb" />
     <Compile Include="Flux\Greaseweazle\Forms\CleanDiskForm.vb">
@@ -569,6 +585,18 @@
     <EmbeddedResource Include="Flux\Kryoflux\SettingsPanel.resx">
       <DependentUpon>SettingsPanel.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Flux\PcImgCnv\SettingsPanel.de.resx">
+      <DependentUpon>SettingsPanel.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Flux\PcImgCnv\SettingsPanel.es.resx">
+      <DependentUpon>SettingsPanel.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Flux\PcImgCnv\SettingsPanel.fr.resx">
+      <DependentUpon>SettingsPanel.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Flux\PcImgCnv\SettingsPanel.resx">
+      <DependentUpon>SettingsPanel.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\AboutBox.resx">
       <DependentUpon>AboutBox.vb</DependentUpon>
       <SubType>Designer</SubType>

DiskImageTool/Flux/DeviceLib.vb

@@ -0,0 +1,55 @@
+Namespace Flux
+    Module DeviceLib
+        Public Function FluxDeviceGetList(FileType As InputFileTypeEnum) As List(Of IDevice)
+            Dim list As New List(Of IDevice)
+
+            For Each dev As IDevice.FluxDevice In [Enum].GetValues(GetType(IDevice.FluxDevice))
+
+                ' Skip if not available
+                If Not FluxDeviceIsAvailable(dev) Then
+                    Continue For
+                End If
+
+                ' Get FluxDeviceInfo
+                Dim Device = FluxDeviceGet(dev)
+                If Device IsNot Nothing Then
+                    If Not Device.InputTypeSupported(FileType) Then
+                        Continue For
+                    End If
+                    list.Add(Device)
+                End If
+            Next
+
+            Return list
+        End Function
+
+        Private Function FluxDeviceGet(Device As IDevice.FluxDevice) As IDevice
+            Select Case Device
+                Case IDevice.FluxDevice.Greaseweazle
+                    Return New Greaseweazle.GreaseweazleDevice
+
+                Case IDevice.FluxDevice.Kryoflux
+                    Return New Kryoflux.KryofluxDevice
+
+                Case IDevice.FluxDevice.PcImgCnv
+                    Return New PcImgCnv.PcImgCnvDevice
+
+                Case Else
+                    Return Nothing
+            End Select
+        End Function
+
+        Private Function FluxDeviceIsAvailable(Device As IDevice.FluxDevice) As Boolean
+            Select Case Device
+                Case IDevice.FluxDevice.Greaseweazle
+                    Return App.AppSettings.Greaseweazle.IsPathValid
+                Case IDevice.FluxDevice.Kryoflux
+                    Return App.AppSettings.Kryoflux.IsPathValid
+                Case IDevice.FluxDevice.PcImgCnv
+                    Return App.AppSettings.PcImgCnv.IsPathValid
+                Case Else
+                    Return False
+            End Select
+        End Function
+    End Module
+End Namespace

DiskImageTool/Flux/Enums.vb

@@ -9,14 +9,12 @@
             Complete
         End Enum
 
-        Enum FluxDevice
-            Greaseweazle
-            Kryoflux
-        End Enum
-
         Public Enum ImageImportOutputTypes
             IMA
             HFE
+            MFM
+            F86
+            TC
         End Enum
 
         Public Enum InputFileTypeEnum
@@ -36,6 +34,12 @@
             Select Case Value
                 Case ImageImportOutputTypes.HFE
                     Return "HxC HFE Image"
+                Case ImageImportOutputTypes.MFM
+                    Return "HxC MFM Image"
+                Case ImageImportOutputTypes.F86
+                    Return "86Box 86F Image"
+                Case ImageImportOutputTypes.TC
+                    Return "TransCopy Image"
                 Case ImageImportOutputTypes.IMA
                     Return "Basic Sector Image"
                 Case Else
@@ -47,6 +51,12 @@
             Select Case Value
                 Case ImageImportOutputTypes.HFE
                     Return ".hfe"
+                Case ImageImportOutputTypes.MFM
+                    Return ".mfm"
+                Case ImageImportOutputTypes.F86
+                    Return ".86f"
+                Case ImageImportOutputTypes.TC
+                    Return ".tc"
                 Case ImageImportOutputTypes.IMA
                     Return ".ima"
                 Case Else