Added Image Preview when reading a disk

Author: Digitoxin1

DiskImageTool/DiskImageTool.vbproj

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

DiskImageTool/Flux/Forms/ConvertImageForm.vb

@@ -91,7 +91,7 @@ Namespace Flux
             Return TextBoxFileName.Text & Extension
         End Function
 
-        Public Sub PreviewImage()
+        Private Sub PreviewImage()
             If _SelectedDevice Is Nothing Then
                 Exit Sub
             End If

DiskImageTool/Flux/Greaseweazle/Forms/ReadDiskForm.vb

@@ -10,6 +10,7 @@ Namespace Flux.Greaseweazle
         Private WithEvents ButtonDetect As Button
         Private WithEvents ButtonDiscard As Button
         Private WithEvents ButtonImport As Button
+        Private WithEvents ButtonPreview As Button
         Private WithEvents ButtonProcess As Button
         Private WithEvents ButtonReset As Button
         Private WithEvents CheckBoxDoublestep As CheckBox
@@ -279,6 +280,41 @@ Namespace Flux.Greaseweazle
             Return FileName & Item.Extension
         End Function
 
+        Private Sub PreviewImage()
+            Dim ImageParams As FloppyDiskParams = ComboImageFormat.SelectedValue
+            Dim Opt As DriveOption = ComboImageDrives.SelectedValue
+            Dim HasOutputfile As Boolean = Not String.IsNullOrEmpty(_OutputFilePath)
+            Dim IsFluxOutput = CheckIsFluxOutput()
+
+            If HasOutputfile AndAlso Not IsFluxOutput Then
+                Dim ImageData = New ImageData(_OutputFilePath)
+
+                Dim Caption As String = TextBoxFileName.Text
+
+                If Not ImagePreview.Display(ImageData, Caption, Me) Then
+                    MsgBox(My.Resources.Dialog_ImagePreviewFail, MsgBoxStyle.Exclamation)
+                End If
+            Else
+                If ImageParams.IsNonImage OrElse Opt.Id = "" Then
+                    Exit Sub
+                End If
+
+                Dim Response = ReadFirstTrack(Opt.Id, True, ImageParams)
+
+                If Not Response.Result Then
+                    MsgBox(My.Resources.Dialog_ImagePreviewFail, MsgBoxStyle.Exclamation)
+                End If
+
+                Dim Caption As String = TextBoxFileName.Text
+
+                If Not ImagePreview.Display(Response.FileName, ImageParams, Caption, Me) Then
+                    MsgBox(My.Resources.Dialog_ImagePreviewFail, MsgBoxStyle.Exclamation)
+                End If
+
+                DeleteTempFileIfExists(Response.FileName)
+            End If
+        End Sub
+
         Private Function GetOutputFilePaths() As (FilePath As String, LogFilePath As String, IsFlux As Boolean)
             Dim Response As (FilePath As String, LogFilePath As String, IsFlux As Boolean)
             Response.LogFilePath = ""
@@ -466,8 +502,16 @@ Namespace Flux.Greaseweazle
                 .Margin = New Padding(12, 24, 3, 3)
             }
 
-            ButtonProcess = New Button With {
+            ButtonPreview = New Button With {
                 .Margin = New Padding(3, 0, 3, 3),
+                .Text = My.Resources.Label_Preview,
+                .MinimumSize = New Size(75, 0),
+                .AutoSize = True,
+                .Anchor = AnchorStyles.Left Or AnchorStyles.Right
+            }
+
+            ButtonProcess = New Button With {
+                .Margin = New Padding(3, 12, 3, 3),
                 .Text = My.Resources.Label_Write,
                 .MinimumSize = New Size(75, 0),
                 .AutoSize = True,
@@ -519,6 +563,7 @@ Namespace Flux.Greaseweazle
                 .Text = My.Resources.Label_Detect
             }
 
+            ButtonContainer.Controls.Add(ButtonPreview)
             ButtonContainer.Controls.Add(ButtonProcess)
             ButtonContainer.Controls.Add(ButtonConvert)
             ButtonContainer.Controls.Add(ButtonDiscard)
@@ -803,7 +848,7 @@ Namespace Flux.Greaseweazle
         End Sub
 
         Private Function ReadImageFormat(DriveId As String) As DiskImage.FloppyDiskFormat
-            Dim Response = ReadFirstTrack(DriveId)
+            Dim Response = ReadFirstTrack(DriveId, False)
 
             TextBoxConsole.Text = Response.Output
 
@@ -860,6 +905,8 @@ Namespace Flux.Greaseweazle
 
             ButtonCancel.Text = If(IsRunning OrElse HasOutputfile, WithoutHotkey(My.Resources.Menu_Cancel), WithoutHotkey(My.Resources.Menu_Close))
 
+            ButtonPreview.Enabled = IsIdle AndAlso DriveSelected AndAlso Not ImageParams.IsNonImage
+
             RefreshProcessButtonState()
             RefreshImportButtonState()
             ToggleRootFolderControls()
@@ -1254,6 +1301,10 @@ Namespace Flux.Greaseweazle
                 FluxFolderBrowse()
             End If
         End Sub
+
+        Private Sub ButtonPreview_Click(sender As Object, e As EventArgs) Handles ButtonPreview.Click
+            PreviewImage()
+        End Sub
 #End Region
     End Class
 End Namespace

DiskImageTool/Flux/Greaseweazle/GreaseweazleLib.vb

@@ -303,7 +303,7 @@ Namespace Flux.Greaseweazle
             End With
         End Sub
 
-        Public Function ReadFirstTrack(DriveId As String) As (Result As Boolean, FileName As String, Output As String)
+        Public Function ReadFirstTrack(DriveId As String, BothSides As Boolean, Optional ImageParams As FloppyDiskParams? = Nothing) As (Result As Boolean, FileName As String, Output As String)
             Dim TempPath = InitTempImagePath()
 
             If TempPath = "" Then
@@ -312,12 +312,19 @@ Namespace Flux.Greaseweazle
 
             Dim FileName = GenerateUniqueFileName(TempPath, "temp.ima")
 
+            Dim Format As String = "ibm.scan"
+
+            If ImageParams.HasValue Then
+                Dim ImageFormat = GreaseweazleImageFormatFromFloppyDiskFormat(ImageParams.Value.Format)
+                Format = GreaseweazleImageFormatCommandLine(ImageFormat)
+            End If
+
             Dim Builder As New CommandLineBuilder(CommandLineBuilder.CommandAction.read) With {
             .Device = Settings.ComPort,
             .Drive = DriveId,
             .File = FileName,
-            .Format = "ibm.scan",
-            .Heads = TrackHeads.head0
+            .Format = Format,
+            .Heads = If(BothSides, TrackHeads.both, TrackHeads.head0)
         }
             Builder.AddCylinder(0)
 

DiskImageTool/Forms/ImagePreview.vb

@@ -12,7 +12,10 @@
         _SummaryPanel = New SummaryPanel(ListViewSummary)
         FilePanelMain = New FilePanel(ListViewFiles, True, FullDisplay)
 
-        Me.Text = My.Resources.Label_ImagePreview & " - " & Caption
+        Me.Text = My.Resources.Label_ImagePreview
+        If Not String.IsNullOrEmpty(Caption) Then
+            Me.Text &= " - " & Caption
+        End If
 
         Dim CurrentImage = New DiskImageContainer(_Disk, New ImageData(""))
 

DiskImageTool/My Project/AssemblyInfo.vb

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