From ffa44c5621a6235f357ed3006346fbfb10a286d3 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 2 May 2019 19:41:49 +0100 Subject: [PATCH] Do not show geometry on image-info over a tape image. --- DiscImageChef.Core/ImageInfo.cs | 7 ++--- DiscImageChef.Gui/Panels/pnlImageInfo.xeto.cs | 27 ++++++++++--------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/DiscImageChef.Core/ImageInfo.cs b/DiscImageChef.Core/ImageInfo.cs index 1dd94d341..50d79e180 100644 --- a/DiscImageChef.Core/ImageInfo.cs +++ b/DiscImageChef.Core/ImageInfo.cs @@ -105,9 +105,10 @@ namespace DiscImageChef.Core DicConsole.WriteLine("Drive serial number: {0}", imageFormat.Info.DriveSerialNumber); if(!string.IsNullOrWhiteSpace(imageFormat.Info.DriveFirmwareRevision)) DicConsole.WriteLine("Drive firmware info: {0}", imageFormat.Info.DriveFirmwareRevision); - if(imageFormat.Info.Cylinders > 0 && imageFormat.Info.Heads > 0 && - imageFormat.Info.SectorsPerTrack > 0 && - imageFormat.Info.XmlMediaType != XmlMediaType.OpticalDisc) + if(imageFormat.Info.Cylinders > 0 && imageFormat.Info.Heads > 0 && + imageFormat.Info.SectorsPerTrack > 0 && + imageFormat.Info.XmlMediaType != XmlMediaType.OpticalDisc && + (!(imageFormat is ITapeImage tapeImage) || !tapeImage.IsTape)) DicConsole.WriteLine("Media geometry: {0} cylinders, {1} heads, {2} sectors per track", imageFormat.Info.Cylinders, imageFormat.Info.Heads, imageFormat.Info.SectorsPerTrack); diff --git a/DiscImageChef.Gui/Panels/pnlImageInfo.xeto.cs b/DiscImageChef.Gui/Panels/pnlImageInfo.xeto.cs index cad333f23..8111b675a 100644 --- a/DiscImageChef.Gui/Panels/pnlImageInfo.xeto.cs +++ b/DiscImageChef.Gui/Panels/pnlImageInfo.xeto.cs @@ -54,16 +54,16 @@ namespace DiscImageChef.Gui.Panels { public class pnlImageInfo : Panel { - IFilter filter; - frmDecodeMediaTags frmDecodeMediaTags; - frmImageChecksum frmImageChecksum; - frmImageConvert frmImageConvert; - frmImageEntropy frmImageEntropy; - frmImageSidecar frmImageSidecar; - frmImageVerify frmImageVerify; - frmPrintHex frmPrintHex; - IMediaImage imageFormat; - string imagePath; + readonly IFilter filter; + frmDecodeMediaTags frmDecodeMediaTags; + frmImageChecksum frmImageChecksum; + frmImageConvert frmImageConvert; + frmImageEntropy frmImageEntropy; + frmImageSidecar frmImageSidecar; + frmImageVerify frmImageVerify; + frmPrintHex frmPrintHex; + readonly IMediaImage imageFormat; + readonly string imagePath; public pnlImageInfo(string imagePath, IFilter filter, IMediaImage imageFormat) { @@ -205,9 +205,10 @@ namespace DiscImageChef.Gui.Panels lblDriveFirmwareRevision.Text = $"Drive firmware info: {imageFormat.Info.DriveFirmwareRevision}"; } - if(imageFormat.Info.Cylinders > 0 && imageFormat.Info.Heads > 0 && - imageFormat.Info.SectorsPerTrack > 0 && - imageFormat.Info.XmlMediaType != XmlMediaType.OpticalDisc) + if(imageFormat.Info.Cylinders > 0 && imageFormat.Info.Heads > 0 && + imageFormat.Info.SectorsPerTrack > 0 && + imageFormat.Info.XmlMediaType != XmlMediaType.OpticalDisc && + (!(imageFormat is ITapeImage tapeImage) || !tapeImage.IsTape)) { lblMediaGeometry.Visible = true; lblMediaGeometry.Text =