Fixes #2563 notification weird column no image data (#2564)

Open-Systems-Pharmacology · Mar 18, 2023 · d1159ac · d1159ac
1 parent 680dc8a
commit d1159ac
Show file tree

Hide file tree

Showing 18 changed files with 53 additions and 52 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="11.1.97" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.133" />
   </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="11.1.97" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.133" />
   </ItemGroup>
 
   <ItemGroup>

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="11.1.97" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
     <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="11.1.97" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.133" />
   </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="11.1.97" />
-    <PackageReference Include="OSPSuite.Presentation" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
     <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="11.1.97" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.133" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
 

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="11.1.97" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Infrastructure" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Infrastructure" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="11.1.133" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
   </ItemGroup>
 

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="11.1.97" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.133" />
   </ItemGroup>
 
   <ItemGroup>

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="11.1.97" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Presentation" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.133" />
   </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="11.1.97" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.133" />
     <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/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="11.1.97" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
     <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="11.1.97" />
-    <PackageReference Include="OSPSuite.UI" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.UI" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.133" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.UI/Views/Populations/ImportPopulationSettingsView.cs b/src/PKSim.UI/Views/Populations/ImportPopulationSettingsView.cs
@@ -19,6 +19,7 @@
 using OSPSuite.UI.Controls;
 using OSPSuite.Presentation.Extensions;
 using OSPSuite.UI;
+using static OSPSuite.UI.UIConstants.Size;
 
 namespace PKSim.UI.Views.Populations
 {
@@ -61,7 +62,7 @@ public override void InitializeBinding()
          _gridViewBinder.Bind(x => x.Image)
             .WithCaption(PKSimConstants.UI.EmptyColumn)
             .WithRepository(dto => _statusIconRepository)
-            .WithFixedWidth(OSPSuite.UI.UIConstants.Size.EMBEDDED_BUTTON_WIDTH);
+            .WithFixedWidth(EMBEDDED_BUTTON_WIDTH);
 
          _gridViewBinder.Bind(x => x.FilePath)
             .WithShowButton(ShowButtonModeEnum.ShowAlways)
@@ -77,7 +78,7 @@ public override void InitializeBinding()
             .WithCaption(PKSimConstants.UI.EmptyColumn)
             .WithShowButton(ShowButtonModeEnum.ShowAlways)
             .WithRepository(x => _removeButtonRepository)
-            .WithFixedWidth(OSPSuite.UI.UIConstants.Size.EMBEDDED_BUTTON_WIDTH * 2);
+            .WithFixedWidth(EMBEDDED_BUTTON_WIDTH * 2);
 
          gridView.FocusedRowChanged += (o, e) => OnEvent(selectedRowChanged, e);
          _removeButtonRepository.ButtonClick += (o, e) => OnEvent(_presenter.RemoveFile, _gridViewBinder.FocusedElement);

diff --git a/src/PKSim/PKSim.csproj b/src/PKSim/PKSim.csproj
@@ -76,14 +76,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.133" />
     <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" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" GeneratePathProperty="true" />
-    <PackageReference Include="OSPSuite.Presentation" Version="11.1.97" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.133" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" GeneratePathProperty="true" />
   </ItemGroup>
 

diff --git a/tests/PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj b/tests/PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj
@@ -22,9 +22,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.133" />
     <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/tests/PKSim.R.Tests/PKSim.R.Tests.csproj b/tests/PKSim.R.Tests/PKSim.R.Tests.csproj
@@ -22,9 +22,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.133" />
     <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/tests/PKSim.Tests/PKSim.Tests.csproj b/tests/PKSim.Tests/PKSim.Tests.csproj
@@ -20,9 +20,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.133" />
     <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/tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj b/tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj
@@ -56,14 +56,14 @@
   </ItemGroup>
 
   <ItemGroup>
-  <PackageReference Include="OSPSuite.Assets" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.97" />
+  <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.133" />
     <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" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" GeneratePathProperty="true" />
-    <PackageReference Include="OSPSuite.Presentation" Version="11.1.97" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.133" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" GeneratePathProperty="true" />
   </ItemGroup>
 

diff --git a/tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj b/tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj
@@ -17,10 +17,10 @@
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="nunit" Version="3.13.2" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.133" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.UI" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.133" />
+    <PackageReference Include="OSPSuite.UI" Version="11.1.133" />
   </ItemGroup>
 
   <ItemGroup>