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.

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

Update to latest core #2307

Merged
merged 2 commits into from
Aug 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.12" />
<PackageReference Include="OSPSuite.Assets.Images" Version="11.1.12" />
<PackageReference Include="OSPSuite.Assets" Version="11.1.14" />
<PackageReference Include="OSPSuite.Assets.Images" Version="11.1.14" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.Assets/PKSim.Assets.csproj
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.12" />
<PackageReference Include="OSPSuite.Assets.Images" Version="11.1.12" />
<PackageReference Include="OSPSuite.Assets" Version="11.1.14" />
<PackageReference Include="OSPSuite.Assets.Images" Version="11.1.14" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.BatchTool/PKSim.BatchTool.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="11.1.12" />
<PackageReference Include="OSPSuite.Core" Version="11.1.12" />
<PackageReference Include="OSPSuite.Assets" Version="11.1.14" />
<PackageReference Include="OSPSuite.Core" Version="11.1.14" />
<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.51" GeneratePathProperty="true" />
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.CLI.Core/PKSim.CLI.Core.csproj
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.12" />
<PackageReference Include="OSPSuite.Assets" Version="11.1.14" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.Core" Version="11.1.12" />
<PackageReference Include="OSPSuite.Core" Version="11.1.14" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/PKSim.CLI/PKSim.CLI.csproj
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.Assets" Version="11.1.12" />
<PackageReference Include="OSPSuite.Core" Version="11.1.12" />
<PackageReference Include="OSPSuite.Presentation" Version="11.1.12" />
<PackageReference Include="OSPSuite.Assets" Version="11.1.14" />
<PackageReference Include="OSPSuite.Core" Version="11.1.14" />
<PackageReference Include="OSPSuite.Presentation" Version="11.1.14" />
<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.51" GeneratePathProperty="true" />
Expand Down
8 changes: 4 additions & 4 deletions src/PKSim.Core/PKSim.Core.csproj
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.12" />
<PackageReference Include="OSPSuite.Assets" Version="11.1.12" />
<PackageReference Include="OSPSuite.Assets.Images" Version="11.1.12" />
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.12" />
<PackageReference Include="OSPSuite.Core" Version="11.1.14" />
<PackageReference Include="OSPSuite.Assets" Version="11.1.14" />
<PackageReference Include="OSPSuite.Assets.Images" Version="11.1.14" />
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.14" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/PKSim.Core/Services/GlobalPKAnalysisRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace PKSim.Core.Services
public interface IGlobalPKAnalysisRunner
{
/// <summary>
/// Creates a <see cref="Simulation"/> based on the given <paramref name="individualSimulation"/> for bioavailability calculations and run the simulation
/// Creates a <see cref="Simulation"/> based on the given <paramref name="simulation"/> for bioavailability calculations and run the simulation
/// </summary>
/// <param name="simpleIvProtocol">Iv protocol that will be used in the created simulation for the <paramref name="compound"/></param>
/// <param name="simulation">Base simulation</param>
Expand Down
18 changes: 9 additions & 9 deletions src/PKSim.Infrastructure/PKSim.Infrastructure.csproj
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.12" />
<PackageReference Include="OSPSuite.Core" Version="11.1.12" />
<PackageReference Include="OSPSuite.Infrastructure" Version="11.1.12" />
<PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.1.12" />
<PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.1.12" />
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.12" />
<PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.1.12" />
<PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.1.12" />
<PackageReference Include="OSPSuite.Presentation.Serialization" Version="11.1.12" />
<PackageReference Include="OSPSuite.Assets" Version="11.1.14" />
<PackageReference Include="OSPSuite.Core" Version="11.1.14" />
<PackageReference Include="OSPSuite.Infrastructure" Version="11.1.14" />
<PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.1.14" />
<PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.1.14" />
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.14" />
<PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.1.14" />
<PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.1.14" />
<PackageReference Include="OSPSuite.Presentation.Serialization" Version="11.1.14" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.Matlab/PKSim.Matlab.csproj
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.12" />
<PackageReference Include="OSPSuite.Assets" Version="11.1.14" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.Core" Version="11.1.12" />
<PackageReference Include="OSPSuite.Core" Version="11.1.14" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/PKSim.Presentation/PKSim.Presentation.csproj
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.12" />
<PackageReference Include="OSPSuite.Assets" Version="11.1.14" />
<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.12" />
<PackageReference Include="OSPSuite.Core" Version="11.1.12" />
<PackageReference Include="OSPSuite.Presentation" Version="11.1.14" />
<PackageReference Include="OSPSuite.Core" Version="11.1.14" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/PKSim.R/PKSim.R.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@


<ItemGroup>
<PackageReference Include="OSPSuite.Assets" Version="11.1.12" />
<PackageReference Include="OSPSuite.Assets" Version="11.1.14" />
<PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
<PackageReference Include="OSPSuite.Core" Version="11.1.12" />
<PackageReference Include="OSPSuite.Core" Version="11.1.14" />
<PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.54" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModel" Version="4.0.0.51" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />
Expand Down
13 changes: 0 additions & 13 deletions src/PKSim.UI/Extensions/LayoutControlExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,5 @@ public static LayoutControlItem AddButtonItemFor(this LayoutControl layoutContro
return item;
}


public static void DoInBatch(this LayoutControl layoutControl, Action action)
{
try
{
layoutControl.BeginUpdate();
action();
}
finally
{
layoutControl.EndUpdate();
}
}
}
}
17 changes: 1 addition & 16 deletions src/PKSim.UI/Extensions/LayoutControlItemExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,6 @@ public static void FillWith(this LayoutControlItem layoutControlItem, UxBuilding
layoutControlItem.SizeConstraintsType = SizeConstraintsType.Custom;
layoutControlItem.MinSize = size;
layoutControlItem.Size = size;
}

public static void AdjustGridViewHeight(this LayoutControlItem layoutControlItem, UxGridView gridView, LayoutControl layoutControl)
{
//We infer to see if we need some extra height for view based on scaling. Nothing else works

var optimalHeight = gridView.OptimalHeight + gridView.RowCount * COMPUTED_EXTRA_HEIGHT;
layoutControlItem.AdjustControlHeight(optimalHeight, layoutControl);
}

public static void AdjustTablePanelHeight(this LayoutControlItem layoutControlItem, TablePanel tablePanel, LayoutControl layoutControl)
{
var visibleRows = tablePanel.Rows.Where(x => x.Visible).ToList();
var visibleRowHeight = visibleRows.Sum(x => ScaleForScreenDPI(Convert.ToInt16(x.Height)) + COMPUTED_EXTRA_HEIGHT);
layoutControlItem.AdjustControlHeight(visibleRowHeight, layoutControl);
}
}
}
}
8 changes: 4 additions & 4 deletions src/PKSim.UI/PKSim.UI.csproj
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.12" />
<PackageReference Include="OSPSuite.Assets" Version="11.1.14" />
<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.12" />
<PackageReference Include="OSPSuite.UI" Version="11.1.12" />
<PackageReference Include="OSPSuite.Core" Version="11.1.12" />
<PackageReference Include="OSPSuite.Presentation" Version="11.1.14" />
<PackageReference Include="OSPSuite.UI" Version="11.1.14" />
<PackageReference Include="OSPSuite.Core" Version="11.1.14" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 0 additions & 12 deletions src/PKSim.UI/UIConstants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,6 @@ public static class Size
public static readonly int SIMULATION_COMPOUND_CONFIGURATION_DEFAULT_HEIGHT = ScaleForScreenDPI(280);
public static readonly int SIMULATION_COMPOUND_PROCESS_DEFAULT_HEIGHT = ScaleForScreenDPI(250);
public static readonly int SIMULATION_COMPOUND_PROTOCOL_DEFAULT_HEIGHT = ScaleForScreenDPI(50);

public static readonly int COMPUTED_EXTRA_HEIGHT = computedExtraRowHeight();

private static int computedExtraRowHeight()
{
//This extra constant seems to be what we need to have perfect height on 200% scaling.
const int extraHeight = 3;
var scaledExtraHeight = ScaleForScreenDPI(extraHeight);
var needExtraHeight = scaledExtraHeight != extraHeight;
//We return the extra row height (not scaled)
return needExtraHeight ? extraHeight : 0;
}
}
}
}
34 changes: 16 additions & 18 deletions src/PKSim.UI/Views/BuildingBlockSelectionView.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public virtual void AdjustHeight()
HeightChanged(this, new ViewResizedEventArgs(OptimalHeight));
}

public virtual int OptimalHeight => _gridView.OptimalHeight + COMPUTED_EXTRA_HEIGHT + layoutItemGrid.Padding.Height;
public virtual int OptimalHeight => _gridView.OptimalHeight + layoutItemGrid.Padding.Height;

public virtual void Repaint()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public override void InitializeResources()
{
base.InitializeResources();
layoutItemOntogeny.TextVisible = false;
layoutControl.AutoScroll = false;
layoutItemMoleculeParameters.TextVisible = false;
OntogenyVisible = false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/PKSim.UI/Views/Parameters/MultiParameterEditView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ public void RefreshData()
gridParameters.RefreshDataSource();
}

public int OptimalHeight => gridView.OptimalHeight + Padding.All + 2;
public int OptimalHeight => gridView.OptimalHeight;

public bool AllowMultiSelect
{
Expand Down
6 changes: 3 additions & 3 deletions src/PKSim/PKSim.csproj
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.12" />
<PackageReference Include="OSPSuite.Core" Version="11.1.12" />
<PackageReference Include="OSPSuite.Assets" Version="11.1.14" />
<PackageReference Include="OSPSuite.Core" Version="11.1.14" />
<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.51" 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.12" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.Presentation" Version="11.1.14" GeneratePathProperty="true" />
<PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" GeneratePathProperty="true" />
</ItemGroup>

Expand Down
Loading