Fisheye: Tag 085b64732dfe910e409fd168c9d5d2e4f1a1c63b refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/Controls/AssemblyResultControl.Designer.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 085b64732dfe910e409fd168c9d5d2e4f1a1c63b refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/Controls/AssemblyResultControl.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 085b64732dfe910e409fd168c9d5d2e4f1a1c63b refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/Controls/AssemblyResultControl.resx'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 085b64732dfe910e409fd168c9d5d2e4f1a1c63b refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/Controls/AssemblyResultWithProbabilityControl.Designer.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 085b64732dfe910e409fd168c9d5d2e4f1a1c63b refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/Controls/AssemblyResultWithProbabilityControl.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 085b64732dfe910e409fd168c9d5d2e4f1a1c63b refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/Controls/AssemblyResultWithProbabilityControl.resx'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 085b64732dfe910e409fd168c9d5d2e4f1a1c63b refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/Controls/FailureMechanismAssemblyCategoryGroupControl.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 085b64732dfe910e409fd168c9d5d2e4f1a1c63b refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/Controls/FailureMechanismAssemblyControl.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultControl.Designer.cs =================================================================== diff -u --- Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultControl.Designer.cs (revision 0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultControl.Designer.cs (revision 085b64732dfe910e409fd168c9d5d2e4f1a1c63b) @@ -0,0 +1,117 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer 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 Core.Common.Controls; + +namespace Riskeer.Integration.Forms.Controls +{ + abstract partial class AssemblyResultControl + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.GroupPanel = new System.Windows.Forms.TableLayoutPanel(); + this.GroupLabel = new Core.Common.Controls.BorderedLabel(); + this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components); + this.GroupPanel.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); + this.SuspendLayout(); + // + // GroupPanel + // + this.GroupPanel.AutoSize = true; + this.GroupPanel.ColumnCount = 1; + this.GroupPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.GroupPanel.Controls.Add(this.GroupLabel, 0, 0); + this.GroupPanel.Dock = System.Windows.Forms.DockStyle.Left; + this.GroupPanel.Location = new System.Drawing.Point(0, 0); + this.GroupPanel.Name = "GroupPanel"; + this.GroupPanel.RowCount = 1; + this.GroupPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.GroupPanel.Size = new System.Drawing.Size(56, 796); + this.GroupPanel.TabIndex = 0; + // + // GroupLabel + // + this.GroupLabel.AutoSize = true; + this.GroupLabel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.GroupLabel.Dock = System.Windows.Forms.DockStyle.Fill; + this.GroupLabel.Location = new System.Drawing.Point(3, 3); + this.GroupLabel.Margin = new System.Windows.Forms.Padding(3); + this.GroupLabel.MinimumSize = new System.Drawing.Size(50, 2); + this.GroupLabel.Name = "GroupLabel"; + this.GroupLabel.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.GroupLabel.Size = new System.Drawing.Size(50, 790); + this.GroupLabel.TabIndex = 1; + this.GroupLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // errorProvider + // + this.errorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink; + this.errorProvider.ContainerControl = this; + this.errorProvider.Icon = global::Riskeer.Common.Forms.Properties.Resources.ErrorIcon; + // + // AssemblyResultControl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoSize = true; + this.Controls.Add(this.GroupPanel); + this.Name = "AssemblyResultControl"; + this.Size = new System.Drawing.Size(1361, 796); + this.GroupPanel.ResumeLayout(false); + this.GroupPanel.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + protected System.Windows.Forms.TableLayoutPanel GroupPanel; + private System.Windows.Forms.ErrorProvider errorProvider; + protected BorderedLabel GroupLabel; + } +} Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultControl.cs =================================================================== diff -u --- Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultControl.cs (revision 0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultControl.cs (revision 085b64732dfe910e409fd168c9d5d2e4f1a1c63b) @@ -0,0 +1,80 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer 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.Drawing; +using System.Windows.Forms; + +namespace Riskeer.Integration.Forms.Controls +{ + /// + /// Base control to display an assembly result. + /// + public abstract partial class AssemblyResultControl : UserControl + { + /// + /// Creates a new instance of . + /// + protected AssemblyResultControl() + { + InitializeComponent(); + } + + /// + /// Sets the error message of the control. + /// + /// The error message to set. + /// Thrown when + /// is null. + public void SetError(string errorMessage) + { + if (errorMessage == null) + { + throw new ArgumentNullException(nameof(errorMessage)); + } + + errorProvider.SetError(this, errorMessage); + } + + /// + /// Clears the messages of the control. + /// + public void ClearMessages() + { + errorProvider.SetError(this, string.Empty); + } + + /// + /// Clears the assembly result of the control. + /// + public virtual void ClearAssemblyResult() + { + GroupLabel.Text = string.Empty; + GroupLabel.BackColor = Color.White; + } + + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + Dock = DockStyle.Left; + } + } +} \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultControl.resx =================================================================== diff -u --- Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultControl.resx (revision 0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultControl.resx (revision 085b64732dfe910e409fd168c9d5d2e4f1a1c63b) @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultWithProbabilityControl.Designer.cs =================================================================== diff -u --- Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultWithProbabilityControl.Designer.cs (revision 0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultWithProbabilityControl.Designer.cs (revision 085b64732dfe910e409fd168c9d5d2e4f1a1c63b) @@ -0,0 +1,106 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer 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 Core.Common.Controls; + +namespace Riskeer.Integration.Forms.Controls +{ + partial class AssemblyResultWithProbabilityControl + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.probabilityPanel = new System.Windows.Forms.TableLayoutPanel(); + this.ProbabilityLabel = new BorderedLabel(); + this.probabilityPanel.SuspendLayout(); + this.SuspendLayout(); + // + // probabilityPanel + // + this.probabilityPanel.ColumnCount = 1; + this.probabilityPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.probabilityPanel.Controls.Add(this.ProbabilityLabel, 0, 0); + this.probabilityPanel.Dock = System.Windows.Forms.DockStyle.Left; + this.probabilityPanel.Location = new System.Drawing.Point(56, 0); + this.probabilityPanel.Name = "probabilityPanel"; + this.probabilityPanel.AutoSize = true; + this.probabilityPanel.RowCount = 1; + this.probabilityPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.probabilityPanel.TabIndex = 1; + // + // ProbabilityLabel + // + this.ProbabilityLabel.AutoSize = true; + this.ProbabilityLabel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.ProbabilityLabel.Dock = System.Windows.Forms.DockStyle.Left; + this.ProbabilityLabel.Location = new System.Drawing.Point(3, 3); + this.ProbabilityLabel.Margin = new System.Windows.Forms.Padding(3); + this.ProbabilityLabel.MinimumSize = new System.Drawing.Size(50, 2); + this.ProbabilityLabel.Name = "ProbabilityLabel"; + this.ProbabilityLabel.BackColor = System.Drawing.Color.White; + this.ProbabilityLabel.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0); + this.ProbabilityLabel.Size = new System.Drawing.Size(50, 790); + this.ProbabilityLabel.TabIndex = 0; + this.ProbabilityLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // FailureMechanismAssemblyControl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.probabilityPanel); + this.Name = "FailureMechanismAssemblyControl"; + this.Controls.SetChildIndex(this.probabilityPanel, 0); + this.probabilityPanel.ResumeLayout(false); + this.probabilityPanel.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.TableLayoutPanel probabilityPanel; + protected BorderedLabel ProbabilityLabel; + } +} Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultWithProbabilityControl.cs =================================================================== diff -u --- Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultWithProbabilityControl.cs (revision 0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultWithProbabilityControl.cs (revision 085b64732dfe910e409fd168c9d5d2e4f1a1c63b) @@ -0,0 +1,75 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer 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.Util; +using Riskeer.AssemblyTool.Data; +using Riskeer.Common.Forms.Helpers; +using Riskeer.Common.Forms.Properties; +using Riskeer.Common.Forms.TypeConverters; + +namespace Riskeer.Integration.Forms.Controls +{ + /// + /// Control to display an assembly result with probability. + /// + public partial class AssemblyResultWithProbabilityControl : AssemblyResultControl + { + private readonly NoProbabilityValueDoubleConverter converter = new NoProbabilityValueDoubleConverter(); + + /// + /// Creates a new instance of . + /// + public AssemblyResultWithProbabilityControl() + { + InitializeComponent(); + } + + /// + /// Sets the value of on the control. + /// + /// The to set on the control. + /// Thrown when is null. + /// Thrown when + /// has an invalid value for . + /// Thrown when + /// is not supported. + public void SetAssemblyResult(AssessmentSectionAssemblyResult result) + { + if (result == null) + { + throw new ArgumentNullException(nameof(result)); + } + + GroupLabel.Text = new EnumDisplayWrapper(result.AssemblyCategoryGroup).DisplayName; + GroupLabel.BackColor = AssemblyCategoryGroupColorHelper.GetAssessmentSectionAssemblyCategoryGroupColor(result.AssemblyCategoryGroup); + + ProbabilityLabel.Text = converter.ConvertToString(result.Probability); + } + + public override void ClearAssemblyResult() + { + base.ClearAssemblyResult(); + ProbabilityLabel.Text = Resources.RoundedDouble_No_result_dash; + } + } +} \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultWithProbabilityControl.resx =================================================================== diff -u --- Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultWithProbabilityControl.resx (revision 0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssemblyResultWithProbabilityControl.resx (revision 085b64732dfe910e409fd168c9d5d2e4f1a1c63b) @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, + PublicKeyToken=b77a5c561934e089 + + + + 17, 17 + + \ No newline at end of file Fisheye: Tag 085b64732dfe910e409fd168c9d5d2e4f1a1c63b refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Forms/Controls/AssessmentSectionAssemblyCategoryGroupControl.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.Designer.cs =================================================================== diff -u -rb260802602d09b9b979e9ef76671e098e8508a52 -r085b64732dfe910e409fd168c9d5d2e4f1a1c63b --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.Designer.cs (.../AssemblyResultTotalView.Designer.cs) (revision b260802602d09b9b979e9ef76671e098e8508a52) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultTotalView.Designer.cs (.../AssemblyResultTotalView.Designer.cs) (revision 085b64732dfe910e409fd168c9d5d2e4f1a1c63b) @@ -42,7 +42,7 @@ this.dataGridViewControl = new Core.Common.Controls.DataGrid.DataGridViewControl(); this.refreshAssemblyResultsButton = new Core.Common.Controls.Forms.EnhancedButton(); this.assemblyResultGroupBox = new System.Windows.Forms.GroupBox(); - this.totalAssemblyCategoryGroupControl = new AssessmentSectionAssemblyCategoryGroupControl(); + this.totalAssemblyCategoryGroupControl = new AssemblyResultWithProbabilityControl(); this.refreshButtonPanel = new System.Windows.Forms.Panel(); this.warningProvider = new System.Windows.Forms.ErrorProvider(this.components); this.assemblyResultGroupBox.SuspendLayout(); @@ -135,7 +135,7 @@ private Core.Common.Controls.DataGrid.DataGridViewControl dataGridViewControl; private Core.Common.Controls.Forms.EnhancedButton refreshAssemblyResultsButton; private System.Windows.Forms.GroupBox assemblyResultGroupBox; - private Controls.AssessmentSectionAssemblyCategoryGroupControl totalAssemblyCategoryGroupControl; + private Controls.AssemblyResultWithProbabilityControl totalAssemblyCategoryGroupControl; private System.Windows.Forms.Panel refreshButtonPanel; private System.Windows.Forms.ErrorProvider warningProvider; }