From ecb0234258908abab4d09149b24ebaf44df05586 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 9 Mar 2021 14:06:18 -0800 Subject: [PATCH] Make inner and outer layers more apparent Also makes label and data side data make more sense --- CHANGELIST.md | 1 + MPF.Library/Utilities/DumpEnvironment.cs | 38 +++++++++++---------- MPF/Windows/DiscInformationWindow.xaml.cs | 41 ++++++++++++----------- MPF/Windows/MainWindow.xaml.cs | 2 -- 4 files changed, 42 insertions(+), 40 deletions(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index bc209b4f..3619f93a 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -36,6 +36,7 @@ - Internal overhaul of options and dump environment - VideoNow discs are audio only - Hook up default system in options +- Make inner and outer layers in UI and outputs more clear ### 1.18 (2020-11-10) - Add more information extraction and generation for Aaru diff --git a/MPF.Library/Utilities/DumpEnvironment.cs b/MPF.Library/Utilities/DumpEnvironment.cs index f125a0fa..00a30b00 100644 --- a/MPF.Library/Utilities/DumpEnvironment.cs +++ b/MPF.Library/Utilities/DumpEnvironment.cs @@ -962,10 +962,14 @@ namespace MPF.Utilities AddIfExists(output, "Layer 0 (Inner) " + Template.MasteringRingField, info.CommonDiscInfo.Layer0MasteringRing, 2); AddIfExists(output, "Layer 0 (Inner) " + Template.MasteringSIDField, info.CommonDiscInfo.Layer0MasteringSID, 2); AddIfExists(output, "Layer 0 (Inner) " + Template.ToolstampField, info.CommonDiscInfo.Layer0ToolstampMasteringCode, 2); + AddIfExists(output, "Data Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer0MouldSID, 2); + AddIfExists(output, "Data Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer0AdditionalMould, 2); AddIfExists(output, "Layer 1 " + Template.MasteringRingField, info.CommonDiscInfo.Layer1MasteringRing, 2); AddIfExists(output, "Layer 1 " + Template.MasteringSIDField, info.CommonDiscInfo.Layer1MasteringSID, 2); AddIfExists(output, "Layer 1 " + Template.ToolstampField, info.CommonDiscInfo.Layer1ToolstampMasteringCode, 2); + AddIfExists(output, "Label Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer1MouldSID, 2); + AddIfExists(output, "Label Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer1AdditionalMould, 2); AddIfExists(output, "Layer 2 " + Template.MasteringRingField, info.CommonDiscInfo.Layer2MasteringRing, 2); AddIfExists(output, "Layer 2 " + Template.MasteringSIDField, info.CommonDiscInfo.Layer2MasteringSID, 2); @@ -974,10 +978,6 @@ namespace MPF.Utilities AddIfExists(output, "Layer 3 (Outer) " + Template.MasteringRingField, info.CommonDiscInfo.Layer3MasteringRing, 2); AddIfExists(output, "Layer 3 (Outer) " + Template.MasteringSIDField, info.CommonDiscInfo.Layer3MasteringSID, 2); AddIfExists(output, "Layer 3 (Outer) " + Template.ToolstampField, info.CommonDiscInfo.Layer3ToolstampMasteringCode, 2); - - AddIfExists(output, "Data-Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer0MouldSID, 2); - AddIfExists(output, "Label-Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer1MouldSID, 2); - AddIfExists(output, Template.AdditionalMouldField, info.CommonDiscInfo.Layer0AdditionalMould, 2); } // If we have a triple-layer disc else if (info.SizeAndChecksums.Layerbreak2 != default) @@ -985,18 +985,18 @@ namespace MPF.Utilities AddIfExists(output, "Layer 0 (Inner) " + Template.MasteringRingField, info.CommonDiscInfo.Layer0MasteringRing, 2); AddIfExists(output, "Layer 0 (Inner) " + Template.MasteringSIDField, info.CommonDiscInfo.Layer0MasteringSID, 2); AddIfExists(output, "Layer 0 (Inner) " + Template.ToolstampField, info.CommonDiscInfo.Layer0ToolstampMasteringCode, 2); + AddIfExists(output, "Data Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer0MouldSID, 2); + AddIfExists(output, "Data Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer0AdditionalMould, 2); AddIfExists(output, "Layer 1 " + Template.MasteringRingField, info.CommonDiscInfo.Layer1MasteringRing, 2); AddIfExists(output, "Layer 1 " + Template.MasteringSIDField, info.CommonDiscInfo.Layer1MasteringSID, 2); AddIfExists(output, "Layer 1 " + Template.ToolstampField, info.CommonDiscInfo.Layer1ToolstampMasteringCode, 2); + AddIfExists(output, "Label Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer1MouldSID, 2); + AddIfExists(output, "Label Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer1AdditionalMould, 2); AddIfExists(output, "Layer 2 (Outer) " + Template.MasteringRingField, info.CommonDiscInfo.Layer2MasteringRing, 2); AddIfExists(output, "Layer 2 (Outer) " + Template.MasteringSIDField, info.CommonDiscInfo.Layer2MasteringSID, 2); AddIfExists(output, "Layer 2 (Outer) " + Template.ToolstampField, info.CommonDiscInfo.Layer2ToolstampMasteringCode, 2); - - AddIfExists(output, "Data-Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer0MouldSID, 2); - AddIfExists(output, "Label-Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer1MouldSID, 2); - AddIfExists(output, Template.AdditionalMouldField, info.CommonDiscInfo.Layer0AdditionalMould, 2); } // If we have a dual-layer disc else if (info.SizeAndChecksums.Layerbreak != default) @@ -1004,24 +1004,26 @@ namespace MPF.Utilities AddIfExists(output, "Layer 0 (Inner) " + Template.MasteringRingField, info.CommonDiscInfo.Layer0MasteringRing, 2); AddIfExists(output, "Layer 0 (Inner) " + Template.MasteringSIDField, info.CommonDiscInfo.Layer0MasteringSID, 2); AddIfExists(output, "Layer 0 (Inner) " + Template.ToolstampField, info.CommonDiscInfo.Layer0ToolstampMasteringCode, 2); + AddIfExists(output, "Data Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer0MouldSID, 2); + AddIfExists(output, "Data Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer0AdditionalMould, 2); AddIfExists(output, "Layer 1 (Outer) " + Template.MasteringRingField, info.CommonDiscInfo.Layer1MasteringRing, 2); AddIfExists(output, "Layer 1 (Outer) " + Template.MasteringSIDField, info.CommonDiscInfo.Layer1MasteringSID, 2); AddIfExists(output, "Layer 1 (Outer) " + Template.ToolstampField, info.CommonDiscInfo.Layer1ToolstampMasteringCode, 2); - - AddIfExists(output, "Data-Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer0MouldSID, 2); - AddIfExists(output, "Label-Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer1MouldSID, 2); - AddIfExists(output, Template.AdditionalMouldField, info.CommonDiscInfo.Layer0AdditionalMould, 2); + AddIfExists(output, "Label Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer1MouldSID, 2); + AddIfExists(output, "Label Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer1AdditionalMould, 2); } // If we have a single-layer disc else { - AddIfExists(output, Template.MasteringRingField, info.CommonDiscInfo.Layer0MasteringRing, 2); - AddIfExists(output, Template.MasteringSIDField, info.CommonDiscInfo.Layer0MasteringSID, 2); - AddIfExists(output, "Data-Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer0MouldSID, 2); - AddIfExists(output, "Label-Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer1MouldSID, 2); - AddIfExists(output, Template.AdditionalMouldField, info.CommonDiscInfo.Layer0AdditionalMould, 2); - AddIfExists(output, Template.ToolstampField, info.CommonDiscInfo.Layer0ToolstampMasteringCode, 2); + AddIfExists(output, "Data Side " + Template.MasteringRingField, info.CommonDiscInfo.Layer0MasteringRing, 2); + AddIfExists(output, "Data Side " + Template.MasteringSIDField, info.CommonDiscInfo.Layer0MasteringSID, 2); + AddIfExists(output, "Data Side " + Template.ToolstampField, info.CommonDiscInfo.Layer0ToolstampMasteringCode, 2); + AddIfExists(output, "Data Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer0MouldSID, 2); + AddIfExists(output, "Data Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer0AdditionalMould, 2); + + AddIfExists(output, "Label Side " + Template.MouldSIDField, info.CommonDiscInfo.Layer1MouldSID, 2); + AddIfExists(output, "Label Side " + Template.AdditionalMouldField, info.CommonDiscInfo.Layer1AdditionalMould, 2); } AddIfExists(output, Template.BarcodeField, info.CommonDiscInfo.Barcode, 1); diff --git a/MPF/Windows/DiscInformationWindow.xaml.cs b/MPF/Windows/DiscInformationWindow.xaml.cs index 16954a4e..fa203d93 100644 --- a/MPF/Windows/DiscInformationWindow.xaml.cs +++ b/MPF/Windows/DiscInformationWindow.xaml.cs @@ -47,6 +47,7 @@ namespace MPF.Windows this.SubmissionInfo = submissionInfo; ManipulateFields(); + Load(); } /// @@ -67,9 +68,9 @@ namespace MPF.Windows L0AdditionalMould.Label = "Additional Mould"; L1Info.Header = "Label Side"; - L1MasteringRing.Label = "Mastering Ring"; - L1MasteringSID.Label = "Mastering SID"; - L1Toolstamp.Label = "Toolstamp/Mastering Code"; + L1MasteringRing.Visibility = Visibility.Collapsed; + L1MasteringSID.Visibility = Visibility.Collapsed; + L1Toolstamp.Visibility = Visibility.Collapsed; L1MouldSID.Label = "Mould SID"; L1AdditionalMould.Label = "Additional Mould"; break; @@ -90,15 +91,15 @@ namespace MPF.Windows L0MasteringRing.Label = "Mastering Ring"; L0MasteringSID.Label = "Mastering SID"; L0Toolstamp.Label = "Toolstamp/Mastering Code"; - L0MouldSID.Label = "Data-Side Mould SID"; - L0AdditionalMould.Label = "Data-Side Additional Mould"; + L0MouldSID.Label = "Data Side Mould SID"; + L0AdditionalMould.Label = "Data Side Additional Mould"; L1Info.Header = "Layer 1"; L1MasteringRing.Label = "Mastering Ring"; - L1MasteringSID.Label = "Layer 1 Mastering SID"; + L1MasteringSID.Label = "Mastering SID"; L1Toolstamp.Label = "Toolstamp/Mastering Code"; - L1MouldSID.Label = "Label-Side Mould SID"; - L1AdditionalMould.Label = "Label-Side Additional Mould"; + L1MouldSID.Label = "Label Side Mould SID"; + L1AdditionalMould.Label = "Label Side Additional Mould"; L2Info.Header = "Layer 2"; L2MasteringRing.Label = "Mastering Ring"; @@ -120,15 +121,15 @@ namespace MPF.Windows L0MasteringRing.Label = "Mastering Ring"; L0MasteringSID.Label = "Mastering SID"; L0Toolstamp.Label = "Toolstamp/Mastering Code"; - L0MouldSID.Label = "Data-Side Mould SID"; - L0AdditionalMould.Label = "Data-Side Additional Mould"; + L0MouldSID.Label = "Data Side Mould SID"; + L0AdditionalMould.Label = "Data Side Additional Mould"; L1Info.Header = "Layer 1"; L1MasteringRing.Label = "Mastering Ring"; L1MasteringSID.Label = "Mastering SID"; L1Toolstamp.Label = "Toolstamp/Mastering Code"; - L1MouldSID.Label = "Label-Side Mould SID"; - L1AdditionalMould.Label = "Label-Side Additional Mould"; + L1MouldSID.Label = "Label Side Mould SID"; + L1AdditionalMould.Label = "Label Side Additional Mould"; L2Info.Header = "Layer 2 (Outer)"; L2MasteringRing.Label = "Mastering Ring"; @@ -143,15 +144,15 @@ namespace MPF.Windows L0MasteringRing.Label = "Mastering Ring"; L0MasteringSID.Label = "Mastering SID"; L0Toolstamp.Label = "Toolstamp/Mastering Code"; - L0MouldSID.Label = "Data-Side Mould SID"; - L0AdditionalMould.Label = "Data-Side Additional Mould"; + L0MouldSID.Label = "Data Side Mould SID"; + L0AdditionalMould.Label = "Data Side Additional Mould"; L1Info.Header = "Layer 1 (Outer)"; L1MasteringRing.Label = "Mastering Ring"; L1MasteringSID.Label = "Mastering SID"; L1Toolstamp.Label = "Toolstamp/Mastering Code"; - L1MouldSID.Label = "Label-Side Mould SID"; - L1AdditionalMould.Label = "Label-Side Additional Mould"; + L1MouldSID.Label = "Label Side Mould SID"; + L1AdditionalMould.Label = "Label Side Additional Mould"; } // Single-layer discs @@ -165,9 +166,9 @@ namespace MPF.Windows L0AdditionalMould.Label = "Additional Mould"; L1Info.Header = "Label Side"; - L1MasteringRing.Label = "Mastering Ring"; - L1MasteringSID.Label = "Mastering SID"; - L1Toolstamp.Label = "Toolstamp/Mastering Code"; + L1MasteringRing.Visibility = Visibility.Collapsed; + L1MasteringSID.Visibility = Visibility.Collapsed; + L1Toolstamp.Visibility = Visibility.Collapsed; L1MouldSID.Label = "Mould SID"; L1AdditionalMould.Label = "Additional Mould"; } @@ -187,7 +188,7 @@ namespace MPF.Windows /// /// Load the current contents of the base SubmissionInfo to the UI /// - public void Load() + private void Load() { GameTitle.Text = SubmissionInfo.CommonDiscInfo.Title ?? ""; ForeignTitle.Text = SubmissionInfo.CommonDiscInfo.ForeignTitleNonLatin ?? ""; diff --git a/MPF/Windows/MainWindow.xaml.cs b/MPF/Windows/MainWindow.xaml.cs index 2472515e..54043945 100644 --- a/MPF/Windows/MainWindow.xaml.cs +++ b/MPF/Windows/MainWindow.xaml.cs @@ -520,7 +520,6 @@ namespace MPF.Windows var discInformationWindow = new DiscInformationWindow(submissionInfo); discInformationWindow.Owner = this; discInformationWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner; - discInformationWindow.Load(); return discInformationWindow.ShowDialog(); } @@ -758,7 +757,6 @@ namespace MPF.Windows /// private void OptionsMenuItemClick(object sender, RoutedEventArgs e) { - // Show the window and wait for the response var optionsWindow = new OptionsWindow(UIOptions); optionsWindow.Owner = this; optionsWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;