Fixes #2551 Use DevExpress skin to color grid cells (#2556)

Open-Systems-Pharmacology · Apr 3, 2023 · 9dc551e · 9dc551e
1 parent 2a46920
commit 9dc551e
Show file tree

Hide file tree

Showing 28 changed files with 162 additions and 227 deletions.
diff --git a/src/PKSim.Assets.Images/PKSim.Assets.Images.csproj b/src/PKSim.Assets.Images/PKSim.Assets.Images.csproj
@@ -26,8 +26,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Assets" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="12.0.127" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.Assets/PKSim.Assets.csproj b/src/PKSim.Assets/PKSim.Assets.csproj
@@ -26,8 +26,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Assets" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="12.0.127" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.BatchTool/BatchRegister.cs b/src/PKSim.BatchTool/BatchRegister.cs
@@ -19,7 +19,7 @@ public override void RegisterInContainer(IContainer container)
             scan.WithDefaultConvention();
          });
 
-         container.Register<IUserSettings, ICoreUserSettings, OSPSuite.Core.ICoreUserSettings, OSPSuite.Presentation.IPresentationUserSettings, BatchUserSettings>(LifeStyle.Singleton);
+         container.Register<IUserSettings, ICoreUserSettings, OSPSuite.Core.ICoreUserSettings, IPresentationUserSettings, BatchUserSettings>(LifeStyle.Singleton);
          container.Register<IDiagramModelToXmlMapper, CLIDiagramModelToXmlMapper>();
          container.Register<IDiagramModel, CLIDiagramModel>();
          container.Register<IJournalDiagramManagerFactory, CLIJournalDiagramManagerFactory>();

diff --git a/src/PKSim.BatchTool/PKSim.BatchTool.csproj b/src/PKSim.BatchTool/PKSim.BatchTool.csproj
@@ -59,8 +59,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Core" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Assets" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Core" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Assets" Version="12.0.127" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />

diff --git a/src/PKSim.CLI.Core/PKSim.CLI.Core.csproj b/src/PKSim.CLI.Core/PKSim.CLI.Core.csproj
@@ -27,9 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Assets" Version="12.0.127" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Core" Version="12.0.127" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.CLI/PKSim.CLI.csproj b/src/PKSim.CLI/PKSim.CLI.csproj
@@ -61,9 +61,9 @@
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
-    <PackageReference Include="OSPSuite.Core" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Presentation" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Assets" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Core" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Presentation" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Assets" Version="12.0.127" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />

diff --git a/src/PKSim.Core/PKSim.Core.csproj b/src/PKSim.Core/PKSim.Core.csproj
@@ -30,10 +30,10 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Assets" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Core" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Assets" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="12.0.127" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
 

diff --git a/src/PKSim.Core/PKSimColors.cs b/src/PKSim.Core/PKSimColors.cs
@@ -31,14 +31,6 @@ public static Color ChartDiagramBack
          set => Colors.ChartDiagramBack = value;
       }
 
-      /// <summary>
-      /// Color used for cell that are locked/disabled 
-      /// </summary>
-      public static Color Disabled
-      {
-         get => Colors.Disabled;
-         set => Colors.Disabled = value;
-      }
       /// <summary>
       /// Color used for the female gender (Start of gradient)
       /// </summary> 

diff --git a/src/PKSim.Infrastructure/PKSim.Infrastructure.csproj b/src/PKSim.Infrastructure/PKSim.Infrastructure.csproj
@@ -41,15 +41,15 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.13" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="OSPSuite.Assets" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Core" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Infrastructure" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Assets" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Core" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Infrastructure" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="12.0.127" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
   </ItemGroup>
 

diff --git a/src/PKSim.Infrastructure/ProjectConverter/v10/Converter9To10.cs b/src/PKSim.Infrastructure/ProjectConverter/v10/Converter9To10.cs
@@ -56,15 +56,8 @@ Converter90To100 coreConverter90To100
          _converted = false;
          element.DescendantsAndSelf("Individual").Each(convertIndividualProteinNodesIn);
          element.DescendantsAndSelf("BaseIndividual").Each(convertIndividualProteinNodesIn);
-         element.DescendantsAndSelf("UserSettings").Each(convertUserSettings);
-
-         return (ProjectVersions.V10, _converted);
-      }
-
-      private void convertUserSettings(XElement settingsElement)
-      {
-         settingsElement.SetAttributeValue("disabledColor", PKSimColors.Disabled.ToArgb().ToString());
          _converted = true;
+         return (ProjectVersions.V10, _converted);
       }
 
       private void convertIndividualProteinNodesIn(XElement individualElement)

diff --git a/src/PKSim.Infrastructure/Serialization/Xml/Serializers/UserSettingsXmlSerializer.cs b/src/PKSim.Infrastructure/Serialization/Xml/Serializers/UserSettingsXmlSerializer.cs
@@ -31,7 +31,6 @@ public override void PerformMapping()
          Map(x => x.ChartBackColor);
          Map(x => x.FormulaColor);
          Map(x => x.ChartDiagramBackColor);
-         Map(x => x.DisabledColor);
          Map(x => x.ChangedColor);
          Map(x => x.ShouldRestoreWorkspaceLayout);
          Map(x => x.DefaultParameterGroupingMode);

diff --git a/src/PKSim.Matlab/PKSim.Matlab.csproj b/src/PKSim.Matlab/PKSim.Matlab.csproj
@@ -26,9 +26,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Assets" Version="12.0.127" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Core" Version="12.0.127" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.Presentation/IUserSettings.cs b/src/PKSim.Presentation/IUserSettings.cs
@@ -57,11 +57,6 @@ public interface IUserSettings : ICoreUserSettings, IPresentationUserSettings, I
       /// </summary>
       Color FormulaColor { get; set; }
 
-      /// <summary>
-      ///    Color used for cell that are locked/disabled
-      /// </summary>
-      Color DisabledColor { get; set; }
-
       /// <summary>
       ///    Should the opened view saved in project be restored when opening the project (default true)
       /// </summary>

diff --git a/src/PKSim.Presentation/PKSim.Presentation.csproj b/src/PKSim.Presentation/PKSim.Presentation.csproj
@@ -27,11 +27,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Assets" Version="12.0.127" />
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Presentation" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Core" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Presentation" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Core" Version="12.0.127" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.R/PKSim.R.csproj b/src/PKSim.R/PKSim.R.csproj
@@ -49,9 +49,9 @@
 
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Assets" Version="12.0.127" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Core" Version="12.0.127" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.53" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />

diff --git a/src/PKSim.UI.Starter/PKSim.UI.Starter.csproj b/src/PKSim.UI.Starter/PKSim.UI.Starter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <Version>12.0.0</Version>
     <PackageVersion>12.0.0</PackageVersion>
@@ -23,10 +23,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Presentation" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.UI" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Core" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Infrastructure" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Presentation" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.UI" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Core" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Infrastructure" Version="12.0.127" />
   </ItemGroup>
 
 </Project>
diff --git a/src/PKSim.UI/PKSim.UI.csproj b/src/PKSim.UI/PKSim.UI.csproj
@@ -60,14 +60,14 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.0" />
-    <PackageReference Include="OSPSuite.Assets" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Assets" Version="12.0.127" />
     <PackageReference Include="OSPSuite.DataBinding" Version="3.0.0.4" />
     <PackageReference Include="OSPSuite.DataBinding.DevExpress" Version="6.0.0.2" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Presentation" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.UI" Version="12.0.126" />
-    <PackageReference Include="OSPSuite.Core" Version="12.0.126" />
+    <PackageReference Include="OSPSuite.Presentation" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.UI" Version="12.0.127" />
+    <PackageReference Include="OSPSuite.Core" Version="12.0.127" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.UI/UserSettings.cs b/src/PKSim.UI/UserSettings.cs
@@ -277,16 +277,6 @@ public Color ChartDiagramBackColor
          }
       }
 
-      public Color DisabledColor
-      {
-         get => PKSimColors.Disabled;
-         set
-         {
-            PKSimColors.Disabled = value;
-            OnPropertyChanged(() => DisabledColor);
-         }
-      }
-
       private static class AllRules
       {
          private static IBusinessRule nonEmpty(Expression<Func<ICoreUserSettings, string>> expression) => GenericRules.NonEmptyRule(expression);

diff --git a/src/PKSim.UI/Views/Core/UxGridView.cs b/src/PKSim.UI/Views/Core/UxGridView.cs
@@ -17,7 +17,6 @@ public UxGridView()
       protected override void DoInit()
       {
          base.DoInit();
-         _colorDisabled = PKSimColors.Disabled;
          EditorShowMode = EditorShowMode.Default;
          ShowColumnChooser = true;
          OptionsNavigation.AutoFocusNewRow = true;

diff --git a/src/PKSim.UI/Views/Individuals/ExpressionParametersView.cs b/src/PKSim.UI/Views/Individuals/ExpressionParametersView.cs
@@ -350,7 +350,7 @@ protected virtual void UpdateExpressionParameterAppearance(TExpressionParameterD
             _gridView.AdjustAppearance(e, isEnabled: false);
 
          else if (_presenter.IsSetByUser(parameterDTO))
-            _gridView.AdjustAppearance(e, PKSimColors.Changed);
+            _gridView.AdjustAppearance(e, PKSimColors.Changed, e.Appearance.ForeColor);
 
          else
             e.CombineAppearance(_gridView.Appearance.Row);

diff --git a/src/PKSim.UI/Views/Parameters/ParameterSetView.cs b/src/PKSim.UI/Views/Parameters/ParameterSetView.cs
@@ -303,10 +303,10 @@ private void updateRowCellStyle(object sender, RowCellStyleEventArgs e)
             _gridView.AdjustAppearance(e, false);
 
          else if (_presenter.IsFormulaNotFixed(parameterDTO))
-            _gridView.AdjustAppearance(e, PKSimColors.Formula);
+            _gridView.AdjustAppearance(e, PKSimColors.Formula, e.Appearance.ForeColor);
 
          else if (_presenter.IsSetByUser(parameterDTO))
-            _gridView.AdjustAppearance(e, PKSimColors.Changed);
+            _gridView.AdjustAppearance(e, PKSimColors.Changed, e.Appearance.ForeColor);
          else
             e.CombineAppearance(_gridView.Appearance.Row);
       }