aaru-dps/Aaru-aaru-dps
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2026-04-05 21:44:17 +00:00
Code Issues 657 Packages Projects Releases 19 Wiki Activity

Show negative sectors in sector viewer

Browse Source
This commit is contained in:
Rebecca Wallander
2026-02-22 12:09:36 +01:00
parent 9e6f7c06ab
commit 96640a8c5f
2 changed files with 64 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs
View File

@@ -37,6 +37,7 @@ using Aaru.Gui.Controls;
using Avalonia.Media;
using CommunityToolkit.Mvvm.ComponentModel;
using JetBrains.Annotations;
using Spectre.Console;
namespace Aaru.Gui.ViewModels.Windows;
@@ -72,15 +73,7 @@ public sealed partial class ViewSectorViewModel : ViewModelBase
set
{
SetProperty(ref field, value);
ErrorNumber errno = LongSectorChecked
? _inputFormat.ReadSectorLong((ulong)SectorNumber, false, out byte[] sector, out _)
: _inputFormat.ReadSector((ulong)SectorNumber, false, out sector, out _);
if(errno != ErrorNumber.NoError) return;
SectorData = sector;
ColorSector();
ReadSectorAt((long)SectorNumber);
}
}
@@ -90,20 +83,71 @@ public sealed partial class ViewSectorViewModel : ViewModelBase
set
{
SetProperty(ref field, value);
ErrorNumber errno = LongSectorChecked
? _inputFormat.ReadSectorLong((ulong)SectorNumber, false, out byte[] sector, out _)
: _inputFormat.ReadSector((ulong)SectorNumber, false, out sector, out _);
if(errno != ErrorNumber.NoError) return;
SectorData = sector;
ColorSector();
ReadSectorAt((long)SectorNumber);
}
}
void ReadSectorAt(long displaySector)
{
bool negative = displaySector < 0;
ulong sectorAddress = negative ? (ulong)-displaySector : (ulong)displaySector;
ErrorNumber errno = LongSectorChecked
? _inputFormat.ReadSectorLong(sectorAddress, negative, out byte[] sector, out _)
: _inputFormat.ReadSector(sectorAddress, negative, out sector, out _);
if(errno != ErrorNumber.NoError) return;
SectorData = sector;
ColorSector();
}
void ColorSector()
{
if(SectorData.LongLength == 2064 && LongSectorChecked)
{
// DVD sector
ColorRange dvd_id_si = new ColorRange
{
Color = Brushes.DeepPink,
Start = 0,
End = 0
};
ColorRange dvd_id_sn = new ColorRange
{
Color = Brushes.Yellow,
Start = 1,
End = 3
};
ColorRange dvd_ied = new ColorRange
{
Color = Brushes.Green,
Start = 4,
End = 5
};
ColorRange dvd_cprmai = new ColorRange
{
Color = Brushes.Orange,
Start = 6,
End = 11
};
ColorRange dvd_edc = new ColorRange
{
Color = Brushes.LimeGreen,
Start = 2060,
End = 2063
};
HighlightRanges = [dvd_id_si, dvd_id_sn, dvd_ied, dvd_cprmai, dvd_edc];
return;
}
// Not a standard CD sector
if(SectorData.Length != 2352) return;

4
Aaru.Gui/Views/Windows/ViewSector.xaml
View File

@@ -1,4 +1,4 @@
<!--
<!--
// /***************************************************************************
// Aaru Data Preservation Suite
// ‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐‐
@@ -59,7 +59,7 @@
<TextBlock Text="{x:Static localization:UI.Title_Sector}"
VerticalAlignment="Center" />
<NumericUpDown Value="{Binding SectorNumber, Mode=TwoWay}"
Width="120" />
Width="160" />
<TextBlock Text="{Binding TotalSectorsText, Mode=OneWay}"
VerticalAlignment="Center" />
</StackPanel>