Merge pull request #2431 from Open-Systems-Pharmacology/2419-inconsis…

…tencies-in-comparison-chart 2419 inconsistencies in comparison chart
Open-Systems-Pharmacology · Nov 16, 2022 · 687c9c2 · 687c9c2
2 parents f9d3512 + c23220a
commit 687c9c2
Show file tree

Hide file tree

Showing 19 changed files with 71 additions and 51 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.50" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.50" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.54" />
   </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.50" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.50" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.54" />
   </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.50" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.50" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
     <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.50" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.50" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.54" />
   </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.50" />
-    <PackageReference Include="OSPSuite.Presentation" Version="11.1.50" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.50" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
     <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/Chart/IndividualSimulationComparison.cs b/src/PKSim.Core/Chart/IndividualSimulationComparison.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using OSPSuite.Core.Chart;
+using OSPSuite.Core.Domain;
 using OSPSuite.Utility.Collections;
 using PKSim.Core.Model;
 
@@ -8,11 +9,14 @@ namespace PKSim.Core.Chart
    public class IndividualSimulationComparison : ChartWithObservedData, ISimulationComparison<IndividualSimulation>
    {
       private readonly ICache<string, IndividualSimulation> _allSimulations;
+
+      public OutputMappings OutputMappingsOfAllSimulations { get; private set; }
       public bool IsLoaded { get; set; }
 
       public IndividualSimulationComparison()
       {
          _allSimulations = new Cache<string, IndividualSimulation>(x => x.Id);
+         OutputMappingsOfAllSimulations = new OutputMappings();
       }
 
       public void AddSimulation(IndividualSimulation simulation)
@@ -22,6 +26,11 @@ public void AddSimulation(IndividualSimulation simulation)
             return;
 
          _allSimulations.Add(simulation);
+
+         foreach (var simulationOutputMapping in simulation.OutputMappings)
+         {
+            OutputMappingsOfAllSimulations.Add(simulationOutputMapping);
+         }
       }
 
       public IReadOnlyCollection<IndividualSimulation> AllSimulations => _allSimulations;
@@ -40,11 +49,19 @@ public void RemoveSimulation(IndividualSimulation simulation)
 
          _allSimulations.Remove(simulation.Id);
          RemoveCurvesForDataRepository(simulation.DataRepository);
+         OutputMappingsOfAllSimulations.RemoveOutputsReferencing(simulation);
+         removeAllOutputMappings();
+      }
+
+      private void removeAllOutputMappings()
+      {
+         OutputMappingsOfAllSimulations.Clear();
       }
 
       public void RemoveAllSimulations()
       {
          _allSimulations.Clear();
+         removeAllOutputMappings();
       }
    }
 }
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.50" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.50" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.50" />
-    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.50" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.54" />
     <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.50" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.50" />
-    <PackageReference Include="OSPSuite.Infrastructure" Version="11.1.50" />
-    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.1.50" />
-    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.1.50" />
-    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.50" />
-    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.1.50" />
-    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.1.50" />
-    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="11.1.50" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Infrastructure" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="11.1.54" />
     <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.50" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.50" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.54" />
   </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.50" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
     <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.50" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.50" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.54" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PKSim.Presentation/Presenters/Charts/IndividualSimulationComparisonPresenter.cs b/src/PKSim.Presentation/Presenters/Charts/IndividualSimulationComparisonPresenter.cs
@@ -50,6 +50,8 @@ public IndividualSimulationComparisonPresenter(IIndividualSimulationComparisonVi
       {
          _lazyLoadTask = lazyLoadTask;
          PresentationKey = PresenterConstants.PresenterKeys.IndividualSimulationComparisonPresenter;
+         ChartEditorPresenter.SetLinkSimDataMenuItemVisibility(true);
+         //Chart.AddSimulation(simulation);
       }
 
       public void DragDrop(object sender, IDragEvent e)
@@ -103,6 +105,7 @@ private void addSimulationToChart(IndividualSimulation simulation)
             throw new PKSimException(PKSimConstants.Error.SimulationHasNoResultsAndCannotBeUsedInSummaryChart(simulation.Name));
 
          Chart.AddSimulation(simulation);
+         ChartEditorPresenter.AddOutputMappings(simulation.OutputMappings);
          UpdateAnalysisBasedOn(simulation, simulation.DataRepository);
 
          _chartTemplatingTask.UpdateDefaultSettings(ChartEditorPresenter, simulation.DataRepository.ToList(), new[] {simulation}, addCurveIfNoSourceDefined: false);
@@ -138,7 +141,7 @@ protected override void ConfigureColumns()
 
          Column(BrowserColumns.Container).Visible = true;
          Column(BrowserColumns.Container).Caption = PKSimConstants.UI.Organ;
-         Column(BrowserColumns.Container).GroupIndex = 0;
+         Column(BrowserColumns.Container).GroupIndex = -1;
          Column(BrowserColumns.Container).VisibleIndex = 0;
 
          Column(BrowserColumns.Molecule).Visible = true;

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.50" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.50" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.54" />
     <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.50" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
     <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.50" />
-    <PackageReference Include="OSPSuite.UI" Version="11.1.50" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.50" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.UI" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.54" />
   </ItemGroup>
 
   <ItemGroup>

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.50" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.50" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.54" />
     <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.50" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.54" 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.50" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.50" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.54" />
     <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.50" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.50" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.54" />
     <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.50" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.50" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.54" />
     <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.50" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.50" />
+  <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.54" />
     <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.50" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.54" 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.50" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.54" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.50" />
-    <PackageReference Include="OSPSuite.UI" Version="11.1.50" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.54" />
+    <PackageReference Include="OSPSuite.UI" Version="11.1.54" />
   </ItemGroup>
 
   <ItemGroup>