diff --git a/.idea/.idea.DiscImageChef/.idea/contentModel.xml b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
index 14fc0acec..e0c2c033a 100644
--- a/.idea/.idea.DiscImageChef/.idea/contentModel.xml
+++ b/.idea/.idea.DiscImageChef/.idea/contentModel.xml
@@ -1634,6 +1634,8 @@
+
+
diff --git a/DiscImageChef.Gui/Forms/frmMain.xeto.cs b/DiscImageChef.Gui/Forms/frmMain.xeto.cs
index 02eb1e1db..fde28d91e 100644
--- a/DiscImageChef.Gui/Forms/frmMain.xeto.cs
+++ b/DiscImageChef.Gui/Forms/frmMain.xeto.cs
@@ -184,11 +184,15 @@ namespace DiscImageChef.Gui.Forms
null).Show();
};
treeImagesMenu.Items.Add(menuItem);
+ menuItem = new ButtonMenuItem {Text = "View sectors"};
+ menuItem.Click += (a, b) => { new frmPrintHex(image).Show(); };
+ treeImagesMenu.Items.Add(menuItem);
}
}
void CloseAllImages(object sender, EventArgs eventArgs)
{
+ // TODO
MessageBox.Show("Not yet implemented");
}
diff --git a/DiscImageChef.Gui/Forms/frmPrintHex.xeto b/DiscImageChef.Gui/Forms/frmPrintHex.xeto
new file mode 100644
index 000000000..a1fb6a8f5
--- /dev/null
+++ b/DiscImageChef.Gui/Forms/frmPrintHex.xeto
@@ -0,0 +1,46 @@
+
+
\ No newline at end of file
diff --git a/DiscImageChef.Gui/Forms/frmPrintHex.xeto.cs b/DiscImageChef.Gui/Forms/frmPrintHex.xeto.cs
new file mode 100644
index 000000000..61f0ab819
--- /dev/null
+++ b/DiscImageChef.Gui/Forms/frmPrintHex.xeto.cs
@@ -0,0 +1,85 @@
+// /***************************************************************************
+// The Disc Image Chef
+// ----------------------------------------------------------------------------
+//
+// Filename : frmPrintHex.xeto.cs
+// Author(s) : Natalia Portillo
+//
+// Component : Form to show hexadecimal dumps of sectors.
+//
+// --[ Description ] ----------------------------------------------------------
+//
+// Implements hexadecimal sector viewer.
+//
+// --[ License ] --------------------------------------------------------------
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General public License for more details.
+//
+// You should have received a copy of the GNU General public License
+// along with this program. If not, see ;http://www.gnu.org/licenses/>.
+//
+// ----------------------------------------------------------------------------
+// Copyright © 2011-2018 Natalia Portillo
+// ****************************************************************************/
+
+using System;
+using DiscImageChef.CommonTypes.Interfaces;
+using Eto.Forms;
+using Eto.Serialization.Xaml;
+
+namespace DiscImageChef.Gui.Forms
+{
+ // TODO: Decode long sector components
+ // TODO: Panel with string representation of contents
+ public class frmPrintHex : Form
+ {
+ const int HEX_COLUMNS = 32;
+ IMediaImage inputFormat;
+
+ public frmPrintHex(IMediaImage inputFormat)
+ {
+ this.inputFormat = inputFormat;
+ XamlReader.Load(this);
+ }
+
+ protected override void OnLoad(EventArgs e)
+ {
+ base.OnLoad(e);
+
+ try
+ {
+ inputFormat.ReadSectorLong(0);
+ chkLongSector.Checked = true;
+ }
+ catch { chkLongSector.Visible = false; }
+
+ lblSectors.Text = $"of {inputFormat.Info.Sectors}";
+ nmuSector.Value = 0;
+ OnNmuSectorValueChanged(nmuSector, e);
+ }
+
+ void OnNmuSectorValueChanged(object sender, EventArgs e)
+ {
+ txtPrintHex.Text =
+ PrintHex
+ .ByteArrayToHexArrayString(chkLongSector.Checked == true ? inputFormat.ReadSectorLong((ulong)nmuSector.Value) : inputFormat.ReadSector((ulong)nmuSector.Value),
+ HEX_COLUMNS);
+ }
+
+ #region XAML IDs
+ Label lblSector;
+ NumericStepper nmuSector;
+ Label lblSectors;
+ CheckBox chkLongSector;
+ TextArea txtPrintHex;
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/DiscImageChef.Gui/Panels/pnlImageInfo.xeto b/DiscImageChef.Gui/Panels/pnlImageInfo.xeto
index 8784e13c8..e0290ef98 100644
--- a/DiscImageChef.Gui/Panels/pnlImageInfo.xeto
+++ b/DiscImageChef.Gui/Panels/pnlImageInfo.xeto
@@ -118,6 +118,7 @@
+
diff --git a/DiscImageChef.Gui/Panels/pnlImageInfo.xeto.cs b/DiscImageChef.Gui/Panels/pnlImageInfo.xeto.cs
index e13694c81..c927e79ab 100644
--- a/DiscImageChef.Gui/Panels/pnlImageInfo.xeto.cs
+++ b/DiscImageChef.Gui/Panels/pnlImageInfo.xeto.cs
@@ -61,6 +61,7 @@ namespace DiscImageChef.Gui.Panels
frmImageEntropy frmImageEntropy;
frmImageSidecar frmImageSidecar;
frmImageVerify frmImageVerify;
+ frmPrintHex frmPrintHex;
IMediaImage imageFormat;
string imagePath;
@@ -859,6 +860,19 @@ namespace DiscImageChef.Gui.Panels
frmImageSidecar.Show();
}
+ protected void OnBtnViewSectors(object sender, EventArgs e)
+ {
+ if(frmPrintHex != null)
+ {
+ frmPrintHex.Show();
+ return;
+ }
+
+ frmPrintHex = new frmPrintHex(imageFormat);
+ frmPrintHex.Closed += (s, ea) => { frmPrintHex = null; };
+ frmPrintHex.Show();
+ }
+
#region XAML controls
#pragma warning disable 169
#pragma warning disable 649
@@ -908,6 +922,7 @@ namespace DiscImageChef.Gui.Panels
Button btnVerify;
Button btnChecksum;
Button btnConvert;
+ Button btnViewSectors;
#pragma warning restore 169
#pragma warning restore 649
#endregion