Index: Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs =================================================================== diff -u -r944d2501b3f780d208e00015a1b850afad4c3aa8 -r5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2 --- Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision 944d2501b3f780d208e00015a1b850afad4c3aa8) +++ Application/Ringtoets/src/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2) @@ -44,6 +44,7 @@ using Core.Plugins.ProjectExplorer; using log4net; using log4net.Appender; +using Ringtoets.ClosingStructures.Plugin; using Ringtoets.GrassCoverErosionInwards.Plugin; using Ringtoets.GrassCoverErosionOutwards.Plugin; using Ringtoets.HeightStructures.Plugin; @@ -150,6 +151,7 @@ new ProjectExplorerPlugin(), new CommonToolsPlugin(), new RingtoetsPlugin(), + new ClosingStructuresPlugin(), new WaveImpactAsphaltCoverPlugin(), new GrassCoverErosionInwardsPlugin(), new GrassCoverErosionOutwardsPlugin(), Index: Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj =================================================================== diff -u -r944d2501b3f780d208e00015a1b850afad4c3aa8 -r5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2 --- Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj (.../Application.Ringtoets.csproj) (revision 944d2501b3f780d208e00015a1b850afad4c3aa8) +++ Application/Ringtoets/src/Application.Ringtoets/Application.Ringtoets.csproj (.../Application.Ringtoets.csproj) (revision 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2) @@ -159,6 +159,11 @@ Demo.Ringtoets False + + {7DA0AB85-828D-4B1D-B532-58B89E39BEF5} + Ringtoets.ClosingStructures.Plugin + False + {83A782F1-BA78-4D5C-B213-39066605AFD8} Ringtoets.WaveImpactAsphaltCover.Plugin Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresFailureMechanismContext.cs =================================================================== diff -u --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresFailureMechanismContext.cs (revision 0) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresFailureMechanismContext.cs (revision 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2) @@ -0,0 +1,43 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets 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 . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Ringtoets.ClosingStructures.Data; +using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Forms.PresentationObjects; + +namespace Ringtoets.ClosingStructures.Forms.PresentationObjects +{ + /// + /// This class is a presentation object for an instance of . + /// + public class ClosingStructuresFailureMechanismContext : FailureMechanismContext + { + /// + /// Initializes a new instance of the class. + /// + /// The instance wrapped by this context object. + /// The assessment section which the failure mechanism belongs to. + /// When any input argument is null. + public ClosingStructuresFailureMechanismContext(ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + : base(failureMechanism, assessmentSection) {} + } +} \ No newline at end of file Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj =================================================================== diff -u -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6 -r5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj (.../Ringtoets.ClosingStructures.Forms.csproj) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj (.../Ringtoets.ClosingStructures.Forms.csproj) (revision 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2) @@ -40,11 +40,12 @@ Properties\GlobalAssembly.cs + - + UserControl - + Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs =================================================================== diff -u --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs (revision 0) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismResultView.cs (revision 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2) @@ -0,0 +1,91 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets 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 . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Windows.Forms; +using Core.Common.Utils.Reflection; +using Ringtoets.ClosingStructures.Data; +using Ringtoets.Common.Forms.Views; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; + +namespace Ringtoets.ClosingStructures.Forms.Views +{ + /// + /// The view for a collection of . + /// + public class ClosingStructuresFailureMechanismResultView : FailureMechanismResultView + { + private const int assessmentLayerOneColumnIndex = 1; + + /// + /// Creates a new instance of . + /// + public ClosingStructuresFailureMechanismResultView() + { + DataGridViewControl.AddCellFormattingHandler(OnCellFormatting); + + AddDataGridColumns(); + } + + protected override object CreateFailureMechanismSectionResultRow(ClosingStructuresFailureMechanismSectionResult sectionResult) + { + return new ClosingStructuresFailureMechanismSectionResultRow(sectionResult); + } + + protected override void Dispose(bool disposing) + { + DataGridViewControl.RemoveCellFormattingHandler(OnCellFormatting); + + base.Dispose(disposing); + } + + private void AddDataGridColumns() + { + DataGridViewControl.AddTextBoxColumn( + TypeUtils.GetMemberName(sr => sr.Name), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Section_name, + true); + DataGridViewControl.AddCheckBoxColumn( + TypeUtils.GetMemberName(sr => sr.AssessmentLayerOne), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_one); + DataGridViewControl.AddTextBoxColumn( + TypeUtils.GetMemberName(sr => sr.AssessmentLayerTwoA), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_two_a); + DataGridViewControl.AddTextBoxColumn( + TypeUtils.GetMemberName(sr => sr.AssessmentLayerThree), + RingtoetsCommonFormsResources.FailureMechanismResultView_InitializeDataGridView_Assessment_layer_three); + } + + private void OnCellFormatting(object sender, DataGridViewCellFormattingEventArgs eventArgs) + { + if (eventArgs.ColumnIndex > assessmentLayerOneColumnIndex) + { + if (HasPassedLevelOne(eventArgs.RowIndex)) + { + DataGridViewControl.DisableCell(eventArgs.RowIndex, eventArgs.ColumnIndex); + } + else + { + DataGridViewControl.RestoreCell(eventArgs.RowIndex, eventArgs.ColumnIndex); + } + } + } + } +} \ No newline at end of file Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs =================================================================== diff -u --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs (revision 0) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs (revision 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2) @@ -0,0 +1,114 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets 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 . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.ComponentModel; +using Core.Common.Base.Data; +using Ringtoets.ClosingStructures.Data; +using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Forms.TypeConverters; + +namespace Ringtoets.ClosingStructures.Forms.Views +{ + /// + /// Class for displaying as a row in a grid view. + /// + public class ClosingStructuresFailureMechanismSectionResultRow + { + private readonly ClosingStructuresFailureMechanismSectionResult sectionResult; + + /// + /// Creates a new instance of . + /// + /// The to wrap + /// so that it can be displayed as a row. + /// Thrown when is null. + public ClosingStructuresFailureMechanismSectionResultRow(ClosingStructuresFailureMechanismSectionResult sectionResult) + { + if (sectionResult == null) + { + throw new ArgumentNullException("sectionResult"); + } + this.sectionResult = sectionResult; + } + + /// + /// Gets the name of the . + /// + public string Name + { + get + { + return sectionResult.Section.Name; + } + } + + /// + /// Gets or sets the value representing the result of the . + /// + public bool AssessmentLayerOne + { + get + { + return sectionResult.AssessmentLayerOne; + } + set + { + sectionResult.AssessmentLayerOne = value; + sectionResult.NotifyObservers(); + } + } + + /// + /// Gets or sets the value representing the result of the . + /// + /// Thrown when is + /// not in the range [0,1]. + [TypeConverter(typeof(FailureMechanismSectionResultNoProbabilityValueDoubleConverter))] + public double AssessmentLayerTwoA + { + get + { + return sectionResult.AssessmentLayerTwoA; + } + set + { + sectionResult.AssessmentLayerTwoA = value; + } + } + + /// + /// Gets or sets the value representing the result of the . + /// + [TypeConverter(typeof(NoValueRoundedDoubleConverter))] + public RoundedDouble AssessmentLayerThree + { + get + { + return sectionResult.AssessmentLayerThree; + } + set + { + sectionResult.AssessmentLayerThree = value; + } + } + } +} \ No newline at end of file Fisheye: Tag 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2 refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresResultView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2 refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresSectionResultRow.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs =================================================================== diff -u --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (revision 0) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (revision 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2) @@ -0,0 +1,179 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets 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 . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Windows.Forms; +using Core.Common.Controls.TreeView; +using Core.Common.Gui.Plugin; +using Ringtoets.ClosingStructures.Data; +using Ringtoets.ClosingStructures.Forms.PresentationObjects; +using Ringtoets.ClosingStructures.Forms.Views; +using Ringtoets.Common.Data; +using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Forms.PresentationObjects; +using Ringtoets.Common.Forms.TreeNodeInfos; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; + +namespace Ringtoets.ClosingStructures.Plugin +{ + /// + /// The plug-in for the . + /// + public class ClosingStructuresPlugin : PluginBase + { + public override IEnumerable GetViewInfos() + { + yield return new ViewInfo< + FailureMechanismSectionResultContext, + IEnumerable, + ClosingStructuresFailureMechanismResultView> + { + GetViewName = (v, o) => RingtoetsCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, + Image = RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, + CloseForData = CloseFailureMechanismResultViewForData, + GetViewData = context => context.WrappedData, + AfterCreate = (view, context) => view.FailureMechanism = context.FailureMechanism + }; + } + + /// + /// Returns all instances provided for data of . + /// + public override IEnumerable GetTreeNodeInfos() + { + yield return RingtoetsTreeNodeInfoFactory.CreateFailureMechanismContextTreeNodeInfo( + FailureMechanismEnabledChildNodeObjects, + FailureMechanismDisabledChildNodeObjects, + FailureMechanismEnabledContextMenuStrip, + FailureMechanismDisabledContextMenuStrip); + + yield return new TreeNodeInfo> + { + Text = context => RingtoetsCommonFormsResources.FailureMechanism_AssessmentResult_DisplayName, + Image = context => RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, + ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) + .AddOpenItem() + .Build() + }; + } + + #region TreeNodeInfo + + #region ClosingStructuresFailureMechanismContext TreeNodeInfo + + private object[] FailureMechanismEnabledChildNodeObjects(ClosingStructuresFailureMechanismContext closingStructuresFailureMechanismContext) + { + ClosingStructuresFailureMechanism wrappedData = closingStructuresFailureMechanismContext.WrappedData; + return new object[] + { + new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Inputs_DisplayName, GetInputs(wrappedData, closingStructuresFailureMechanismContext.Parent), TreeFolderCategory.Input), + new CategoryTreeFolder(RingtoetsCommonFormsResources.FailureMechanism_Outputs_DisplayName, GetOutputs(wrappedData), TreeFolderCategory.Output) + }; + } + + private object[] FailureMechanismDisabledChildNodeObjects(ClosingStructuresFailureMechanismContext closingStructuresFailureMechanismContext) + { + return new object[] + { + new CommentContext(closingStructuresFailureMechanismContext.WrappedData) + }; + } + + private static IList GetInputs(ClosingStructuresFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + { + return new ArrayList + { + new FailureMechanismSectionsContext(failureMechanism, assessmentSection), + new CommentContext(failureMechanism) + }; + } + + private static IList GetOutputs(ClosingStructuresFailureMechanism failureMechanism) + { + return new ArrayList + { + new FailureMechanismSectionResultContext(failureMechanism.SectionResults, failureMechanism) + }; + } + + private ContextMenuStrip FailureMechanismEnabledContextMenuStrip(ClosingStructuresFailureMechanismContext closingStructuresFailureMechanismContext, object parentData, TreeViewControl treeViewControl) + { + var builder = new RingtoetsContextMenuBuilder(Gui.Get(closingStructuresFailureMechanismContext, treeViewControl)); + + return builder.AddToggleRelevancyOfFailureMechanismItem(closingStructuresFailureMechanismContext, RemoveAllViewsForItem) + .AddSeparator() + .AddExpandAllItem() + .AddCollapseAllItem() + .AddSeparator() + .AddPropertiesItem() + .Build(); + } + + private void RemoveAllViewsForItem(ClosingStructuresFailureMechanismContext failureMechanismContext) + { + Gui.ViewCommands.RemoveAllViewsForItem(failureMechanismContext); + } + + private ContextMenuStrip FailureMechanismDisabledContextMenuStrip(ClosingStructuresFailureMechanismContext closingStructuresFailureMechanismContext, object parentData, TreeViewControl treeViewControl) + { + var builder = new RingtoetsContextMenuBuilder(Gui.Get(closingStructuresFailureMechanismContext, treeViewControl)); + + return builder.AddToggleRelevancyOfFailureMechanismItem(closingStructuresFailureMechanismContext, null) + .AddSeparator() + .AddExpandAllItem() + .AddCollapseAllItem() + .Build(); + } + + #endregion + + #endregion + + #region ViewInfo + + #region ClosingStructuresFailureMechanismResultView ViewInfo + + private static bool CloseFailureMechanismResultViewForData(ClosingStructuresFailureMechanismResultView view, object o) + { + var assessmentSection = o as IAssessmentSection; + var failureMechanism = o as ClosingStructuresFailureMechanism; + var failureMechanismContext = o as IFailureMechanismContext; + if (assessmentSection != null) + { + return assessmentSection + .GetFailureMechanisms() + .OfType() + .Any(fm => ReferenceEquals(view.Data, fm.SectionResults)); + } + if (failureMechanismContext != null) + { + failureMechanism = failureMechanismContext.WrappedData; + } + return failureMechanism != null && ReferenceEquals(view.Data, failureMechanism.SectionResults); + } + + #endregion + + #endregion + } +} \ No newline at end of file Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/Ringtoets.ClosingStructures.Plugin.csproj =================================================================== diff -u -r5b93e866c25c39a178b2fdd6d10b1baf5a05d070 -r5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/Ringtoets.ClosingStructures.Plugin.csproj (.../Ringtoets.ClosingStructures.Plugin.csproj) (revision 5b93e866c25c39a178b2fdd6d10b1baf5a05d070) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/Ringtoets.ClosingStructures.Plugin.csproj (.../Ringtoets.ClosingStructures.Plugin.csproj) (revision 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2) @@ -34,18 +34,63 @@ + + Properties\GlobalAssembly.cs + Copying.licenseheader + + + {3bbfd65b-b277-4e50-ae6d-bd24c3434609} + Core.Common.Base + False + + + {1D27F91F-4E62-4EAF-A0A8-A32708B9A9B1} + Core.Common.Controls.TreeView + False + + + {9a2d67e6-26ac-4d17-b11a-2b4372f2f572} + Core.Common.Controls + False + + + {30E4C2AE-719E-4D70-9FA9-668A9767FBFA} + Core.Common.Gui + False + + + {d4200f43-3f72-4f42-af0a-8ced416a38ec} + Ringtoets.Common.Data + False + + + {4D840673-3812-4338-A352-84854E32B8A0} + Ringtoets.Common.Forms + False + + + {C6309704-D67B-434C-BC98-9F8910BC1D10} + Ringtoets.ClosingStructures.Data + False + + + {22E191F2-B2E3-413C-9511-4C2CDEDB2EFF} + Ringtoets.ClosingStructures.Forms + False + + + \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2) @@ -123,7 +123,7 @@ } [Test] - public void Data_SetOtherThanFailureMechanismSectionResultListData_DataNullAndDataGridViewEmtpy() + public void Data_SetOtherThanFailureMechanismSectionResultListData_DataNullAndDataGridViewEmpty() { // Setup var testData = new object(); Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj =================================================================== diff -u -rae14c5d4e4624fa87390e6d63bb419c648e12dda -r5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision ae14c5d4e4624fa87390e6d63bb419c648e12dda) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2) @@ -112,11 +112,6 @@ Ringtoets.ClosingStructures.Data False - - {22E191F2-B2E3-413C-9511-4C2CDEDB2EFF} - Ringtoets.ClosingStructures.Forms - False - {3D4B9740-8348-4434-8D77-B611FC6EE57F} Ringtoets.StabilityPointStructures.Data Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r4e578730273a943bb02a2861c694a2707c8ef852 -r5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 4e578730273a943bb02a2861c694a2707c8ef852) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2) @@ -36,7 +36,6 @@ using Core.Common.Utils.Extensions; using log4net; using Ringtoets.ClosingStructures.Data; -using Ringtoets.ClosingStructures.Forms.Views; using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; @@ -383,9 +382,6 @@ yield return CreateFailureMechanismResultViewInfo< StabilityPointStructuresFailureMechanismSectionResult, StabilityPointStructuresResultView>(); - yield return CreateFailureMechanismResultViewInfo< - ClosingStructuresFailureMechanismSectionResult, - ClosingStructuresResultView>(); yield return new ViewInfo, ICommentable, CommentView> { @@ -625,7 +621,6 @@ yield return CreateFailureMechanismSectionResultTreeNodeInfo(); yield return CreateFailureMechanismSectionResultTreeNodeInfo(); yield return CreateFailureMechanismSectionResultTreeNodeInfo(); - yield return CreateFailureMechanismSectionResultTreeNodeInfo(); yield return CreateFailureMechanismSectionResultTreeNodeInfo(); yield return CreateFailureMechanismSectionResultTreeNodeInfo(); yield return CreateFailureMechanismSectionResultTreeNodeInfo(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj =================================================================== diff -u -r4a204921c07e423981a5c4c0e51202a9859abe25 -r5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision 4a204921c07e423981a5c4c0e51202a9859abe25) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2) @@ -95,7 +95,6 @@ - Fisheye: Tag 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ClosingStructuresFailureMechanismSectionResultContextTreeNodeInfoTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj =================================================================== diff -u -rae14c5d4e4624fa87390e6d63bb419c648e12dda -r5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj (.../Ringtoets.Integration.Plugin.Test.csproj) (revision ae14c5d4e4624fa87390e6d63bb419c648e12dda) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj (.../Ringtoets.Integration.Plugin.Test.csproj) (revision 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2) @@ -82,7 +82,6 @@ - @@ -135,18 +134,6 @@ {4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5} Core.Components.Gis.Forms - - {C6309704-D67B-434C-BC98-9F8910BC1D10} - Ringtoets.ClosingStructures.Data - - - {22E191F2-B2E3-413C-9511-4C2CDEDB2EFF} - Ringtoets.ClosingStructures.Forms - - - {AF1ACFA2-AEE5-4DB7-98CA-8B3720E46AD9} - Ringtoets.Revetment.Forms - {3D4B9740-8348-4434-8D77-B611FC6EE57F} Ringtoets.StabilityPointStructures.Data @@ -159,14 +146,6 @@ {567E0B69-5280-41CE-ADD6-443725A61C86} Ringtoets.WaveImpactAsphaltCover.Data - - {1AC97B51-88C2-437D-89E6-65C69AB3CCAD} - Ringtoets.WaveImpactAsphaltCover.Forms - - - {83A782F1-BA78-4D5C-B213-39066605AFD8} - Ringtoets.WaveImpactAsphaltCover.Plugin - {d4200f43-3f72-4f42-af0a-8ced416a38ec} Ringtoets.Common.Data Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs =================================================================== diff -u -r4a204921c07e423981a5c4c0e51202a9859abe25 -r5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 4a204921c07e423981a5c4c0e51202a9859abe25) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2) @@ -37,8 +37,6 @@ using NUnit.Extensions.Forms; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.ClosingStructures.Data; -using Ringtoets.ClosingStructures.Forms.Views; using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; @@ -335,7 +333,7 @@ ViewInfo[] viewInfos = plugin.GetViewInfos().ToArray(); // Assert - Assert.AreEqual(17, viewInfos.Length); + Assert.AreEqual(16, viewInfos.Length); var contributionViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismContributionContext)); Assert.AreEqual(typeof(FailureMechanismContributionView), contributionViewInfo.ViewType); @@ -363,11 +361,6 @@ Assert.AreEqual(typeof(WaterPressureAsphaltCoverResultView), waterPressureAsphaltCoverResultViewInfo.ViewType); TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, waterPressureAsphaltCoverResultViewInfo.Image); - var closingStructuresResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext)); - Assert.AreEqual(typeof(IEnumerable), closingStructuresResultViewInfo.ViewDataType); - Assert.AreEqual(typeof(ClosingStructuresResultView), closingStructuresResultViewInfo.ViewType); - TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.FailureMechanismSectionResultIcon, closingStructuresResultViewInfo.Image); - var macrostabilityOutwardsResultViewInfo = viewInfos.Single(vi => vi.DataType == typeof(FailureMechanismSectionResultContext)); Assert.AreEqual(typeof(IEnumerable), macrostabilityOutwardsResultViewInfo.ViewDataType); Assert.AreEqual(typeof(MacrostabilityOutwardsResultView), macrostabilityOutwardsResultViewInfo.ViewType); @@ -429,7 +422,7 @@ TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray(); // Assert - Assert.AreEqual(27, treeNodeInfos.Length); + Assert.AreEqual(26, treeNodeInfos.Length); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssessmentSection))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ReferenceLineContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismContext))); @@ -450,7 +443,6 @@ Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); - Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Fisheye: Tag 5b1276bcb70296a150fd4a26fbf8867e6f8aa0f2 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/ClosingStructuresResultViewInfoTest.cs'. Fisheye: No comparison available. Pass `N' to diff?