Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2419 inconsistencies in comparison chart #2431

Merged
merged 5 commits into from
Nov 16, 2022
Merged

2419 inconsistencies in comparison chart #2431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4144a23
just notes
georgeDaskalakis Nov 14, 2022
88dde9f
adding parameter
georgeDaskalakis Nov 15, 2022
4cba2ac
updating nuget
georgeDaskalakis Nov 15, 2022
ff0af2e
updating nugets
georgeDaskalakis Nov 16, 2022
c23220a
Merge branch 'develop' into 2419-inconsistencies-in-comparison-chart
georgeDaskalakis Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/PKSim.Assets.Images/PKSim.Assets.Images.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.Assets/PKSim.Assets.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.BatchTool/PKSim.BatchTool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.CLI.Core/PKSim.CLI.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/PKSim.CLI/PKSim.CLI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
17 changes: 17 additions & 0 deletions src/PKSim.Core/Chart/IndividualSimulationComparison.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using OSPSuite.Core.Chart;
using OSPSuite.Core.Domain;
using OSPSuite.Utility.Collections;
using PKSim.Core.Model;

Expand All @@ -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)
Expand All @@ -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;
Expand All @@ -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();
}
}
}
8 changes: 4 additions & 4 deletions src/PKSim.Core/PKSim.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
18 changes: 9 additions & 9 deletions src/PKSim.Infrastructure/PKSim.Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.Matlab/PKSim.Matlab.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/PKSim.Presentation/PKSim.Presentation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 4 additions & 1 deletion src/PKSim.Presentation/Presenters/Charts/IndividualSimulationComparisonPresenter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.R/PKSim.R.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
8 changes: 4 additions & 4 deletions src/PKSim.UI/PKSim.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/PKSim/PKSim.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions tests/PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions tests/PKSim.R.Tests/PKSim.R.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions tests/PKSim.Tests/PKSim.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
6 changes: 3 additions & 3 deletions tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down