Index: Riskeer/Integration/src/Riskeer.Integration.Data/Properties/Resources.Designer.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r6e9a56e81658348b4a48acedb14eaa7395859571 --- Riskeer/Integration/src/Riskeer.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6e9a56e81658348b4a48acedb14eaa7395859571) @@ -40,7 +40,7 @@ // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -128,15 +128,6 @@ } /// - /// Looks up a localized string similar to GABI. - /// - public static string GrassCoverSlipOffInwardsFailureMechanism_Code { - get { - return ResourceManager.GetString("GrassCoverSlipOffInwardsFailureMechanism_Code", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Dijken en dammen - Grasbekleding afschuiven binnentalud. /// public static string GrassCoverSlipOffInwardsFailureMechanism_DisplayName { @@ -146,15 +137,6 @@ } /// - /// Looks up a localized string similar to GABU. - /// - public static string GrassCoverSlipOffOutwardsFailureMechanism_Code { - get { - return ResourceManager.GetString("GrassCoverSlipOffOutwardsFailureMechanism_Code", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Dijken en dammen - Grasbekleding afschuiven buitentalud. /// public static string GrassCoverSlipOffOutwardsFailureMechanism_DisplayName { @@ -164,15 +146,6 @@ } /// - /// Looks up a localized string similar to STBU. - /// - public static string MacroStabilityOutwardsFailureMechanism_Code { - get { - return ResourceManager.GetString("MacroStabilityOutwardsFailureMechanism_Code", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Dijken en dammen - Macrostabiliteit buitenwaarts. /// public static string MacroStabilityOutwardsFailureMechanism_DisplayName { @@ -182,15 +155,6 @@ } /// - /// Looks up a localized string similar to STMI. - /// - public static string MicrostabilityFailureMechanism_Code { - get { - return ResourceManager.GetString("MicrostabilityFailureMechanism_Code", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Dijken en dammen - Microstabiliteit. /// public static string MicrostabilityFailureMechanism_DisplayName { @@ -200,15 +164,6 @@ } /// - /// Looks up a localized string similar to PKW. - /// - public static string PipingStructureFailureMechanism_Code { - get { - return ResourceManager.GetString("PipingStructureFailureMechanism_Code", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Kunstwerken - Piping bij kunstwerk. /// public static string PipingStructureFailureMechanism_DisplayName { @@ -218,15 +173,6 @@ } /// - /// Looks up a localized string similar to STKWl. - /// - public static string StrengthStabilityLengthwiseConstructionFailureMechanism_Code { - get { - return ResourceManager.GetString("StrengthStabilityLengthwiseConstructionFailureMechanism_Code", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Kunstwerken - Sterkte en stabiliteit langsconstructies. /// public static string StrengthStabilityLengthwiseConstructionFailureMechanism_DisplayName { @@ -236,15 +182,6 @@ } /// - /// Looks up a localized string similar to INN. - /// - public static string TechnicalInnovationFailureMechanism_Code { - get { - return ResourceManager.GetString("TechnicalInnovationFailureMechanism_Code", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Technische innovaties - Technische innovaties. /// public static string TechnicalInnovationFailureMechanismFailureMechanism_DisplayName { @@ -254,15 +191,6 @@ } /// - /// Looks up a localized string similar to AWO. - /// - public static string WaterPressureAsphaltCoverFailureMechanism_Code { - get { - return ResourceManager.GetString("WaterPressureAsphaltCoverFailureMechanism_Code", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Dijken en dammen - Wateroverdruk bij asfaltbekleding. /// public static string WaterPressureAsphaltCoverFailureMechanism_DisplayName { Index: Riskeer/Integration/src/Riskeer.Integration.Data/Properties/Resources.resx =================================================================== diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -r6e9a56e81658348b4a48acedb14eaa7395859571 --- Riskeer/Integration/src/Riskeer.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision 2e55afd890468db1b25c734216956ab5c2126e58) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision 6e9a56e81658348b4a48acedb14eaa7395859571) @@ -129,42 +129,18 @@ Kunstwerken - Piping bij kunstwerk - - GABU - - - PKW - - - GABI - Dijken en dammen - Grasbekleding afschuiven binnentalud - - STBU - Dijken en dammen - Macrostabiliteit buitenwaarts - - STMI - Dijken en dammen - Microstabiliteit - - STKWl - - - INN - Technische innovaties - Technische innovaties - - AWO - Dijken en dammen - Wateroverdruk bij asfaltbekleding Fisheye: Tag 6e9a56e81658348b4a48acedb14eaa7395859571 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/AssessmentSectionAssemblyMapDataFeaturesFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6e9a56e81658348b4a48acedb14eaa7395859571 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Factories/CombinedSectionAssemblyMapDataFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6e9a56e81658348b4a48acedb14eaa7395859571 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/PresentationObjects/AssemblyResultPerSectionContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r86e58b9755637593fda3d7edd069afb2c1fc413d -r6e9a56e81658348b4a48acedb14eaa7395859571 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 86e58b9755637593fda3d7edd069afb2c1fc413d) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6e9a56e81658348b4a48acedb14eaa7395859571) @@ -110,15 +110,6 @@ } /// - /// Looks up a localized string similar to Gecombineerd vakoordeel. - /// - public static string AssemblyResultPerSection_DisplayName { - get { - return ResourceManager.GetString("AssemblyResultPerSection_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Toetsoordeel groepen 3 en 4. /// public static string AssemblyResultTotalView_FailureMechanismsWithoutProbabilityResultLabel_Text { Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx =================================================================== diff -u -r86e58b9755637593fda3d7edd069afb2c1fc413d -r6e9a56e81658348b4a48acedb14eaa7395859571 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 86e58b9755637593fda3d7edd069afb2c1fc413d) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6e9a56e81658348b4a48acedb14eaa7395859571) @@ -353,9 +353,6 @@ Hydraulische belastingen op trajectniveau worden altijd samengevoegd. Daarbij gaan de huidige berekeningsresultaten voor belastingen op trajectniveau niet verloren. - - Gecombineerd vakoordeel - De categoriegrenzen voor de gecombineerde toetssporen in groep 1 en 2. Fisheye: Tag 6e9a56e81658348b4a48acedb14eaa7395859571 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.Designer.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6e9a56e81658348b4a48acedb14eaa7395859571 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6e9a56e81658348b4a48acedb14eaa7395859571 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultPerSectionView.resx'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r86e58b9755637593fda3d7edd069afb2c1fc413d -r6e9a56e81658348b4a48acedb14eaa7395859571 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 86e58b9755637593fda3d7edd069afb2c1fc413d) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6e9a56e81658348b4a48acedb14eaa7395859571) @@ -91,16 +91,6 @@ } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// - public static System.Drawing.Bitmap AssemblyResultPerSection { - get { - object obj = ResourceManager.GetObject("AssemblyResultPerSection", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// /// Looks up a localized string similar to Assemblage. /// public static string AssemblyResultsCategoryTreeFolder_DisplayName { Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -r86e58b9755637593fda3d7edd069afb2c1fc413d -r6e9a56e81658348b4a48acedb14eaa7395859571 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 86e58b9755637593fda3d7edd069afb2c1fc413d) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 6e9a56e81658348b4a48acedb14eaa7395859571) @@ -173,9 +173,6 @@ Weet u zeker dat u wilt doorgaan? - - ..\Resources\AssemblyResultPerSection.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\AssemblyResultTotal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Resources/AssemblyResultPerSection.png =================================================================== diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -r6e9a56e81658348b4a48acedb14eaa7395859571 Binary files differ Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Riskeer.Integration.Plugin.csproj =================================================================== diff -u -r86e58b9755637593fda3d7edd069afb2c1fc413d -r6e9a56e81658348b4a48acedb14eaa7395859571 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Riskeer.Integration.Plugin.csproj (.../Riskeer.Integration.Plugin.csproj) (revision 86e58b9755637593fda3d7edd069afb2c1fc413d) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Riskeer.Integration.Plugin.csproj (.../Riskeer.Integration.Plugin.csproj) (revision 6e9a56e81658348b4a48acedb14eaa7395859571) @@ -69,7 +69,6 @@ - Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -r86e58b9755637593fda3d7edd069afb2c1fc413d -r6e9a56e81658348b4a48acedb14eaa7395859571 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 86e58b9755637593fda3d7edd069afb2c1fc413d) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 6e9a56e81658348b4a48acedb14eaa7395859571) @@ -51,7 +51,6 @@ using Riskeer.Common.Data.IllustrationPoints; using Riskeer.Common.Data.Structures; using Riskeer.Common.Forms.ChangeHandlers; -using Riskeer.Common.Forms.Controls; using Riskeer.Common.Forms.GuiServices; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Forms.PropertyClasses; @@ -440,14 +439,6 @@ CreateInstance = context => new AssemblyResultTotalView(context.WrappedData) }; - yield return new ViewInfo - { - GetViewName = (view, context) => RiskeerFormsResources.AssemblyResultPerSection_DisplayName, - Image = Resources.AssemblyResultPerSection, - CloseForData = CloseAssemblyResultPerSectionViewForData, - CreateInstance = context => new AssemblyResultPerSectionView(context.WrappedData) - }; - yield return new ViewInfo { GetViewName = (view, context) => RiskeerCommonFormsResources.AssemblyCategories_DisplayName, @@ -825,15 +816,6 @@ .Build() }; - yield return new TreeNodeInfo - { - Text = context => RiskeerFormsResources.AssemblyResultPerSection_DisplayName, - Image = context => Resources.AssemblyResultPerSection, - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddOpenItem() - .Build() - }; - yield return new TreeNodeInfo { Text = context => RiskeerCommonFormsResources.AssemblyCategories_DisplayName, @@ -870,41 +852,6 @@ }; } - private static ViewInfo, IObservableEnumerable, TView> CreateFailureMechanismResultViewInfo< - TFailureMechanism, TResult, TView, TResultRow, TAssemblyResultControl>( - Func, TView> createInstanceFunc) - where TResult : FailureMechanismSectionResult - where TView : FailureMechanismResultView - where TFailureMechanism : FailureMechanismBase, IHasSectionResults - where TResultRow : FailureMechanismSectionResultRow - where TAssemblyResultControl : AssemblyResultControl, new() - { - return new ViewInfo< - FailureMechanismSectionResultContext, - IObservableEnumerable, - TView> - { - GetViewName = (view, context) => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - CloseForData = CloseFailureMechanismResultViewForData, - GetViewData = context => context.WrappedData, - CreateInstance = createInstanceFunc - }; - } - - private TreeNodeInfo> CreateFailureMechanismSectionResultTreeNodeInfo() - where T : FailureMechanismSectionResult - { - return new TreeNodeInfo> - { - Text = context => RiskeerCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, - Image = context => RiskeerCommonFormsResources.FailureMechanismSectionResultIcon, - ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) - .AddOpenItem() - .Build() - }; - } - private static void RemoveOnOpenProjectListener(IProjectOwner projectOwner) { if (projectOwner != null) @@ -986,76 +933,6 @@ #region ViewInfos - #region FailureMechanismWithDetailedAssessmentView ViewInfo - - private static ViewInfo> CreateFailureMechanismWithDetailedAssessmentViewInfo< - TFailureMechanismContext, TFailureMechanism, TSectionResult>( - Func> createInstanceFunc) - where TSectionResult : FailureMechanismSectionResult - where TFailureMechanism : FailureMechanismBase, IHasSectionResults - where TFailureMechanismContext : IFailureMechanismContext - { - return new ViewInfo> - { - GetViewName = (view, context) => context.WrappedData.Name, - Image = RiskeerCommonFormsResources.FailureMechanismIcon, - CloseForData = CloseFailureMechanismWithDetailedAssessmentViewForData, - AdditionalDataCheck = context => context.WrappedData.IsRelevant, - CreateInstance = createInstanceFunc - }; - } - - private static bool CloseFailureMechanismWithDetailedAssessmentViewForData( - FailureMechanismWithDetailedAssessmentView view, object o) - where TFailureMechanism : IHasSectionResults - where TSectionResult : FailureMechanismSectionResult - { - var assessmentSection = o as IAssessmentSection; - var failureMechanism = o as IFailureMechanism; - - return assessmentSection != null - ? ReferenceEquals(view.AssessmentSection, assessmentSection) - : ReferenceEquals(view.FailureMechanism, failureMechanism); - } - - #endregion - - #region FailureMechanismWithoutDetailedAssessmentView ViewInfo - - private static ViewInfo> CreateFailureMechanismWithoutDetailedAssessmentViewInfo< - TFailureMechanismContext, TFailureMechanism, TSectionResult>( - Func> createInstanceFunc) - where TSectionResult : FailureMechanismSectionResult - where TFailureMechanism : FailureMechanismBase, IHasSectionResults - where TFailureMechanismContext : IFailureMechanismContext - { - return new ViewInfo> - { - GetViewName = (view, context) => context.WrappedData.Name, - Image = RiskeerCommonFormsResources.FailureMechanismIcon, - CloseForData = CloseFailureMechanismWithoutDetailedAssessmentViewForData, - AdditionalDataCheck = context => context.WrappedData.IsRelevant, - CreateInstance = createInstanceFunc - }; - } - - private static bool CloseFailureMechanismWithoutDetailedAssessmentViewForData( - FailureMechanismWithoutDetailedAssessmentView view, object o) - where TFailureMechanism : IHasSectionResults - where TSectionResult : FailureMechanismSectionResult - { - var assessmentSection = o as IAssessmentSection; - var failureMechanism = o as IFailureMechanism; - - return assessmentSection != null - ? ReferenceEquals(view.AssessmentSection, assessmentSection) - : ReferenceEquals(view.FailureMechanism, failureMechanism); - } - - #endregion - #region FailureMechanismContributionContext ViewInfo private static bool CloseFailureMechanismContributionViewForData(FailureMechanismContributionView view, object o) @@ -1074,38 +951,6 @@ #endregion - #region FailureMechanismResults ViewInfo - - private static bool CloseFailureMechanismResultViewForData(TView view, object dataToCloseFor) - where TView : FailureMechanismResultView - where TFailureMechanism : FailureMechanismBase, IHasSectionResults - where TResult : FailureMechanismSectionResult - where TResultRow : FailureMechanismSectionResultRow - where TAssemblyResultControl : AssemblyResultControl, new() - { - var assessmentSection = dataToCloseFor as IAssessmentSection; - var failureMechanism = dataToCloseFor as IFailureMechanism; - var failureMechanismContext = dataToCloseFor as IFailureMechanismContext; - - if (assessmentSection != null) - { - return assessmentSection - .GetFailureMechanisms() - .OfType>() - .Any(fm => ReferenceEquals(view.FailureMechanism.SectionResults, fm.SectionResults)); - } - - if (failureMechanismContext != null) - { - failureMechanism = failureMechanismContext.WrappedData; - } - - return failureMechanism is IHasSectionResults failureMechanismWithSectionResults - && ReferenceEquals(view.FailureMechanism.SectionResults, failureMechanismWithSectionResults.SectionResults); - } - - #endregion - #region HydraulicBoundaryCalculationsView ViewInfo private static bool CloseHydraulicBoundaryCalculationsViewForData(HydraulicBoundaryCalculationsView view, object dataToCloseFor) @@ -1191,15 +1036,6 @@ #endregion - #region AssemblyResultPerSectionContext ViewInfo - - private static bool CloseAssemblyResultPerSectionViewForData(AssemblyResultPerSectionView view, object o) - { - return o is AssessmentSection assessmentSection && assessmentSection == view.AssessmentSection; - } - - #endregion - #region AssemblyResultCategoriesContext ViewInfo private static bool CloseAssemblyResultCategoriesViewForData(AssemblyResultCategoriesView view, object o) @@ -1732,8 +1568,7 @@ return new object[] { new AssemblyResultCategoriesContext(assessmentSection), - new AssemblyResultTotalContext(assessmentSection), - new AssemblyResultPerSectionContext(assessmentSection) + new AssemblyResultTotalContext(assessmentSection) }; }