Fixes #2143 missing icons (#2146)

* Fixes #2143 missing icons * Fixes #2143 missing icons
Open-Systems-Pharmacology · Mar 28, 2022 · 6e30306 · 6e30306
1 parent d97339c
commit 6e30306
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 12 deletions.
diff --git a/src/PKSim.Presentation/DTO/Simulations/IWithImageDTO.cs b/src/PKSim.Presentation/DTO/Simulations/IWithImageDTO.cs
@@ -0,0 +1,11 @@
+using System.Drawing;
+using DevExpress.XtraEditors.DXErrorProvider;
+using OSPSuite.Assets;
+
+namespace PKSim.Presentation.DTO.Simulations
+{
+   public interface IWithImageDTO : IDXDataErrorInfo
+   {
+      Image Image { get; }
+   }
+}
diff --git a/src/PKSim.Presentation/DTO/Simulations/SimulationPartialProcessSelectionDTO.cs b/src/PKSim.Presentation/DTO/Simulations/SimulationPartialProcessSelectionDTO.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Drawing;
 using DevExpress.XtraEditors.DXErrorProvider;
 using OSPSuite.Assets;
 using OSPSuite.Utility.Reflection;
@@ -7,7 +8,7 @@
 
 namespace PKSim.Presentation.DTO.Simulations
 {
-   public class SimulationPartialProcessSelectionDTO : Notifier, IDXDataErrorInfo
+   public class SimulationPartialProcessSelectionDTO : Notifier, IWithImageDTO
    {
       public SimulationPartialProcess SimulationPartialProcess { get; }
 
@@ -36,7 +37,7 @@ public SimulationPartialProcessSelectionDTO(SimulationPartialProcess simulationP
       ///    Status of the selection (Image that will be displayed to the end user indicating if the mapping
       ///    appears to be allowed or not)
       /// </summary>
-      public ApplicationIcon Image => imageFrom(Status);
+      public Image Image => imageFrom(Status).ToImage();
 
       public void GetPropertyError(string propertyName, ErrorInfo info)
       {

diff --git a/src/PKSim.Presentation/DTO/Simulations/SimulationSystemicProcessSelectionDTO.cs b/src/PKSim.Presentation/DTO/Simulations/SimulationSystemicProcessSelectionDTO.cs
@@ -8,7 +8,7 @@
 
 namespace PKSim.Presentation.DTO.Simulations
 {
-   public class SimulationSystemicProcessSelectionDTO : Notifier, IDXDataErrorInfo
+   public class SimulationSystemicProcessSelectionDTO : Notifier, IWithImageDTO
    {
       public SystemicProcessType SystemicProcessType { get; set; }
       private SystemicProcess _selectedProcess;
@@ -17,7 +17,9 @@ public class SimulationSystemicProcessSelectionDTO : Notifier, IDXDataErrorInfo
       ///    Status of the selection (Image that will be displayed to the end user indicating if the mapping
       ///    appears to be allowed or not)
       /// </summary>
-      public ApplicationIcon Image
+      public Image Image => imageFromType.ToImage();
+
+      private ApplicationIcon imageFromType
       {
          get
          {
@@ -30,7 +32,6 @@ public ApplicationIcon Image
             return ApplicationIcons.OK;
          }
       }
-
       public SystemicProcess SelectedProcess
       {
          get => _selectedProcess;

diff --git a/src/PKSim.UI/Views/Simulations/SimulationCompoundEnzymaticProcessView.cs b/src/PKSim.UI/Views/Simulations/SimulationCompoundEnzymaticProcessView.cs
@@ -4,7 +4,6 @@
 using DevExpress.XtraGrid.Views.Base;
 using OSPSuite.DataBinding.DevExpress;
 using OSPSuite.DataBinding.DevExpress.XtraGrid;
-using OSPSuite.UI;
 using OSPSuite.UI.Controls;
 using OSPSuite.UI.Extensions;
 using OSPSuite.UI.RepositoryItems;

diff --git a/src/PKSim.UI/Views/Simulations/SimulationCompoundProcessView.cs b/src/PKSim.UI/Views/Simulations/SimulationCompoundProcessView.cs
@@ -9,12 +9,10 @@
 using OSPSuite.Assets;
 using OSPSuite.DataBinding.DevExpress;
 using OSPSuite.DataBinding.DevExpress.XtraGrid;
-using OSPSuite.UI;
 using OSPSuite.UI.Controls;
 using OSPSuite.UI.Extensions;
 using OSPSuite.UI.RepositoryItems;
 using PKSim.Assets;
-using PKSim.Core;
 using PKSim.Core.Model;
 using PKSim.Presentation.DTO.Simulations;
 using PKSim.Presentation.Presenters.Simulations;
@@ -30,7 +28,7 @@ public partial class SimulationCompoundProcessView<TPartialProcess, TPartialProc
       where TPartialProcess : PartialProcess
    {
       private readonly UxRepositoryItemComboBox _compoundMoleculeRepository;
-      private readonly RepositoryItemPictureEdit _statusIconRepository;
+      private readonly RepositoryItemPictureEdit _imageRepository;
       private readonly UxRepositoryItemComboBox _systemicProcessRepository;
       private readonly RepositoryItemTextEdit _repositoryItemDisabled = new RepositoryItemTextEdit {Enabled = false, ReadOnly = true};
       protected readonly GridViewBinder<TPartialProcessDTO> _gridViewPartialBinder;
@@ -45,7 +43,7 @@ public SimulationCompoundProcessView()
          InitializeComponent();
          _compoundMoleculeRepository = new UxRepositoryItemComboBox(gridViewPartialProcesses);
          _systemicProcessRepository = new UxRepositoryItemComboBox(gridViewSystemicProcesses);
-         _statusIconRepository = new RepositoryItemPictureEdit();
+         _imageRepository = new RepositoryItemPictureEdit();
          gridViewSystemicProcesses.AllowsFiltering = false;
          gridViewSystemicProcesses.HorzScrollVisibility = ScrollVisibility.Never;
          gridViewPartialProcesses.AllowsFiltering = false;
@@ -108,7 +106,7 @@ protected virtual void InitializeSystemicBinding()
       {
          _gridViewSystemicBinder.Bind(x => x.Image)
             .WithCaption(PKSimConstants.UI.EmptyColumn)
-            .WithRepository(dto => _statusIconRepository)
+            .WithRepository(dto => _imageRepository)
             .WithFixedWidth(EMBEDDED_BUTTON_WIDTH)
             .AsReadOnly();
 
@@ -152,7 +150,7 @@ protected IGridViewColumn BindToPartialImage()
       {
          return _gridViewPartialBinder.Bind(x => x.Image)
             .WithCaption(PKSimConstants.UI.EmptyColumn)
-            .WithRepository(dto => _statusIconRepository)
+            .WithRepository(dto => _imageRepository)
             .WithFixedWidth(EMBEDDED_BUTTON_WIDTH)
             .AsReadOnly();
       }