Fisheye: Tag 1b9154e057be736f57193470ecf62a188c737d39 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/AssemblyResultTotalContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r6e9a56e81658348b4a48acedb14eaa7395859571 -r1b9154e057be736f57193470ecf62a188c737d39 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6e9a56e81658348b4a48acedb14eaa7395859571) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1b9154e057be736f57193470ecf62a188c737d39) @@ -110,52 +110,6 @@ } /// - /// Looks up a localized string similar to Toetsoordeel groepen 3 en 4. - /// - public static string AssemblyResultTotalView_FailureMechanismsWithoutProbabilityResultLabel_Text { - get { - return ResourceManager.GetString("AssemblyResultTotalView_FailureMechanismsWithoutProbabilityResultLabel_Text", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Toetsoordeel groepen 1 en 2. - /// - public static string AssemblyResultTotalView_FailureMechanismsWithProbabilityResultLabel_Text { - get { - return ResourceManager.GetString("AssemblyResultTotalView_FailureMechanismsWithProbabilityResultLabel_Text", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Benaderde faalkans [1/jaar]. - /// - public static string AssemblyResultTotalView_Probability_DisplayName { - get { - return ResourceManager.GetString("AssemblyResultTotalView_Probability_DisplayName", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Veiligheidsoordeel. - /// - public static string AssemblyResultTotalView_TotalResultLabel_Text { - get { - return ResourceManager.GetString("AssemblyResultTotalView_TotalResultLabel_Text", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Toetsoordeel is verouderd. Druk op de "Toetsoordeel verversen" knop om opnieuw te berekenen.. - /// - public static string AssemblyResultView_RefreshAssemblyResultsButton_Warning_Result_is_outdated_Press_Refresh_button_to_recalculate { - get { - return ResourceManager.GetString("AssemblyResultView_RefreshAssemblyResultsButton_Warning_Result_is_outdated_Press_" + - "Refresh_button_to_recalculate", resourceCulture); - } - } - - /// /// Looks up a localized string similar to ID van het traject.. /// public static string AssessmentSection_Id_Description { Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx =================================================================== diff -u -r6e9a56e81658348b4a48acedb14eaa7395859571 -r1b9154e057be736f57193470ecf62a188c737d39 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6e9a56e81658348b4a48acedb14eaa7395859571) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 1b9154e057be736f57193470ecf62a188c737d39) @@ -298,18 +298,6 @@ Overig ({0}) - - Benaderde faalkans [1/jaar] - - - Veiligheidsoordeel - - - Toetsoordeel groepen 1 en 2 - - - Toetsoordeel groepen 3 en 4 - Toetsspoor @@ -322,9 +310,6 @@ Toetsoordeel verversen - - Toetsoordeel is verouderd. Druk op de "Toetsoordeel verversen" knop om opnieuw te berekenen. - De categoriegrenzen voor dit traject en toetsspoor. Fisheye: Tag 1b9154e057be736f57193470ecf62a188c737d39 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.Designer.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b9154e057be736f57193470ecf62a188c737d39 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1b9154e057be736f57193470ecf62a188c737d39 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.resx'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r6e9a56e81658348b4a48acedb14eaa7395859571 -r1b9154e057be736f57193470ecf62a188c737d39 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6e9a56e81658348b4a48acedb14eaa7395859571) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1b9154e057be736f57193470ecf62a188c737d39) @@ -100,16 +100,6 @@ } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap AssemblyResultTotal { - get { - object obj = ResourceManager.GetObject("AssemblyResultTotal", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// /// Looks up a localized string similar to Voer alle berekeningen binnen dit traject uit.. /// public static string AssessmentSection_Calculate_All_ToolTip { Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -r6e9a56e81658348b4a48acedb14eaa7395859571 -r1b9154e057be736f57193470ecf62a188c737d39 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 6e9a56e81658348b4a48acedb14eaa7395859571) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 1b9154e057be736f57193470ecf62a188c737d39) @@ -173,9 +173,6 @@ Weet u zeker dat u wilt doorgaan? - - ..\Resources\AssemblyResultTotal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Er zijn geen trajecten gevonden die samengevoegd kunnen worden. Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Resources/AssemblyResultTotal.png =================================================================== diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -r1b9154e057be736f57193470ecf62a188c737d39 Binary files differ Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Riskeer.Integration.Plugin.csproj =================================================================== diff -u -r6e9a56e81658348b4a48acedb14eaa7395859571 -r1b9154e057be736f57193470ecf62a188c737d39 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Riskeer.Integration.Plugin.csproj (.../Riskeer.Integration.Plugin.csproj) (revision 6e9a56e81658348b4a48acedb14eaa7395859571) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Riskeer.Integration.Plugin.csproj (.../Riskeer.Integration.Plugin.csproj) (revision 1b9154e057be736f57193470ecf62a188c737d39) @@ -69,7 +69,6 @@ - Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -r6e9a56e81658348b4a48acedb14eaa7395859571 -r1b9154e057be736f57193470ecf62a188c737d39 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 6e9a56e81658348b4a48acedb14eaa7395859571) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 1b9154e057be736f57193470ecf62a188c737d39) @@ -431,14 +431,6 @@ context.WrappedData, () => context.WrappedData.Output?.GeneralResult) }; - yield return new ViewInfo - { - GetViewName = (view, context) => RiskeerCommonFormsResources.CombinedAssembly_DisplayName, - Image = Resources.AssemblyResultTotal, - CloseForData = CloseAssemblyResultTotalViewForData, - CreateInstance = context => new AssemblyResultTotalView(context.WrappedData) - }; - yield return new ViewInfo { GetViewName = (view, context) => RiskeerCommonFormsResources.AssemblyCategories_DisplayName, @@ -807,15 +799,6 @@ .Build() }; - yield return new TreeNodeInfo - { - Text = context => RiskeerCommonFormsResources.CombinedAssembly_DisplayName, - Image = context => Resources.AssemblyResultTotal, - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddOpenItem() - .Build() - }; - yield return new TreeNodeInfo { Text = context => RiskeerCommonFormsResources.AssemblyCategories_DisplayName, @@ -1027,15 +1010,6 @@ #endregion - #region AssemblyResultTotalContext ViewInfo - - private static bool CloseAssemblyResultTotalViewForData(AssemblyResultTotalView view, object o) - { - return o is AssessmentSection assessmentSection && assessmentSection == view.AssessmentSection; - } - - #endregion - #region AssemblyResultCategoriesContext ViewInfo private static bool CloseAssemblyResultCategoriesViewForData(AssemblyResultCategoriesView view, object o) @@ -1567,8 +1541,7 @@ AssessmentSection assessmentSection = context.WrappedData; return new object[] { - new AssemblyResultCategoriesContext(assessmentSection), - new AssemblyResultTotalContext(assessmentSection) + new AssemblyResultCategoriesContext(assessmentSection) }; }