Skip to content

Commit 7a3ebff

Browse files
rwmcintoshrwmcintosh
committed
update core
1 parent 0da2bee commit 7a3ebff

17 files changed

Lines changed: 47 additions & 49 deletions

File tree

‎src/MoBi.Assets/MoBi.Assets.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="OSPSuite.Assets" Version="13.0.119" />
26-
<PackageReference Include="OSPSuite.Assets.Images" Version="13.0.119" />
27-
<PackageReference Include="OSPSuite.Core" Version="13.0.119" />
25+
<PackageReference Include="OSPSuite.Assets" Version="13.0.123" />
26+
<PackageReference Include="OSPSuite.Assets.Images" Version="13.0.123" />
27+
<PackageReference Include="OSPSuite.Core" Version="13.0.123" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

‎src/MoBi.BatchTool/MoBi.BatchTool.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</ItemGroup>
4141
<ItemGroup>
4242
<PackageReference Include="DevExpress.Win.Design" Version="25.2.7" Condition="'$(ExcludeDesigner)' != 'true'" />
43-
<PackageReference Include="OSPSuite.Core" Version="13.0.119" />
43+
<PackageReference Include="OSPSuite.Core" Version="13.0.123" />
4444
<PackageReference Include="OSPSuite.FuncParser" Version="5.0.0.3" />
4545
<PackageReference Include="OSPSuite.SimModel" Version="5.0.0.76" />
4646
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="5.0.0.53" />

‎src/MoBi.CLI.Core/MoBi.CLI.Core.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717

1818
<ItemGroup>
19-
<PackageReference Include="OSPSuite.Assets" Version="13.0.119" />
20-
<PackageReference Include="OSPSuite.Infrastructure.Autofac" Version="13.0.119" />
19+
<PackageReference Include="OSPSuite.Assets" Version="13.0.123" />
20+
<PackageReference Include="OSPSuite.Infrastructure.Autofac" Version="13.0.123" />
2121
<PackageReference Include="OSPSuite.Utility" Version="5.0.0.7" />
22-
<PackageReference Include="OSPSuite.Core" Version="13.0.119" />
23-
<PackageReference Include="OSPSuite.R" Version="13.0.119" />
24-
<PackageReference Include="OSPSuite.Infrastructure" Version="13.0.119" />
25-
<PackageReference Include="OSPSuite.Infrastructure.Castle" Version="13.0.119" />
22+
<PackageReference Include="OSPSuite.Core" Version="13.0.123" />
23+
<PackageReference Include="OSPSuite.R" Version="13.0.123" />
24+
<PackageReference Include="OSPSuite.Infrastructure" Version="13.0.123" />
25+
<PackageReference Include="OSPSuite.Infrastructure.Castle" Version="13.0.123" />
2626
</ItemGroup>
2727
<ItemGroup>
2828
<ProjectReference Include="..\MoBi.Assets\MoBi.Assets.csproj" />

‎src/MoBi.CLI/MoBi.CLI.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
<ItemGroup>
2222
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.6" />
2323
<PackageReference Include="CommandLineParser" Version="2.9.1" />
24-
<PackageReference Include="OSPSuite.Core" Version="13.0.119" />
25-
<PackageReference Include="OSPSuite.Assets" Version="13.0.119" />
24+
<PackageReference Include="OSPSuite.Core" Version="13.0.123" />
25+
<PackageReference Include="OSPSuite.Assets" Version="13.0.123" />
2626
<PackageReference Include="OSPSuite.Utility" Version="5.0.0.7" />
2727
<PackageReference Include="OSPSuite.FuncParser" Version="5.0.0.3" />
2828
<PackageReference Include="OSPSuite.SimModel" Version="5.0.0.76" />
2929
<PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="5.0.0.53" />
3030
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.11" />
31-
<PackageReference Include="OSPSuite.Infrastructure" Version="13.0.119" />
32-
<PackageReference Include="OSPSuite.Infrastructure.Castle" Version="13.0.119" />
31+
<PackageReference Include="OSPSuite.Infrastructure" Version="13.0.123" />
32+
<PackageReference Include="OSPSuite.Infrastructure.Castle" Version="13.0.123" />
3333
</ItemGroup>
3434
<ItemGroup>
3535
<Content Include="..\..\dimensions\OSPSuite.Dimensions.xml" Link="OSPSuite.Dimensions.xml">

‎src/MoBi.Core/Chart/MoBiSimulationTimeProfileChart.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ namespace MoBi.Core.Chart
44
{
55
public class MoBiSimulationTimeProfileChart : AnalysisChart
66
{
7-
public override AnalysisChartTypes AnalysisChartType => AnalysisChartTypes.TimeProfile;
87
}
98
}

‎src/MoBi.Core/Domain/Model/MoBiSimulation.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,6 @@ public void RemoveOutputMappings(DataRepository dataRepository)
239239

240240
public IEnumerable<CurveChartTemplate> ChartTemplates => Settings.ChartTemplates;
241241

242-
public CurveChartTemplate DefaultChartTemplate => Settings.DefaultChartTemplate;
243-
244242
public bool IsLoaded { get; set; }
245243

246244
public void RemoveAnalysis(ISimulationAnalysis simulationAnalysis)

‎src/MoBi.Core/MoBi.Core.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
<PackageReference Include="NHibernate.Extensions.Sqlite" Version="10.0.1" />
3232
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
3333
<PackageReference Include="OSPSuite.Utility" Version="5.0.0.7" />
34-
<PackageReference Include="OSPSuite.Core" Version="13.0.119" />
35-
<PackageReference Include="OSPSuite.Assets" Version="13.0.119" />
36-
<PackageReference Include="OSPSuite.Assets.Images" Version="13.0.119" />
37-
<PackageReference Include="OSPSuite.Infrastructure.Export" Version="13.0.119" />
38-
<PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="13.0.119" />
39-
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="13.0.119" />
34+
<PackageReference Include="OSPSuite.Core" Version="13.0.123" />
35+
<PackageReference Include="OSPSuite.Assets" Version="13.0.123" />
36+
<PackageReference Include="OSPSuite.Assets.Images" Version="13.0.123" />
37+
<PackageReference Include="OSPSuite.Infrastructure.Export" Version="13.0.123" />
38+
<PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="13.0.123" />
39+
<PackageReference Include="OSPSuite.Infrastructure.Import" Version="13.0.123" />
4040
<PackageReference Include="Microsoft.Data.Sqlite" Version="10.0.7" />
4141
</ItemGroup>
4242
<ItemGroup>

‎src/MoBi.Engine/MoBi.Engine.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
</ItemGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="OSPSuite.Core" Version="13.0.119" />
32-
<PackageReference Include="OSPSuite.Assets" Version="13.0.119" />
31+
<PackageReference Include="OSPSuite.Core" Version="13.0.123" />
32+
<PackageReference Include="OSPSuite.Assets" Version="13.0.123" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

‎src/MoBi.Presentation/MoBi.Presentation.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
<ItemGroup>
2222
<PackageReference Include="OSPSuite.TeXReporting" Version="3.0.1.3" />
2323
<PackageReference Include="OSPSuite.Utility" Version="5.0.0.7" />
24-
<PackageReference Include="OSPSuite.Presentation" Version="13.0.119" />
25-
<PackageReference Include="OSPSuite.Presentation.Serialization" Version="13.0.119" />
26-
<PackageReference Include="OSPSuite.Core" Version="13.0.119" />
24+
<PackageReference Include="OSPSuite.Presentation" Version="13.0.123" />
25+
<PackageReference Include="OSPSuite.Presentation.Serialization" Version="13.0.123" />
26+
<PackageReference Include="OSPSuite.Core" Version="13.0.123" />
2727
</ItemGroup>
2828
<ItemGroup>
2929
<None Include="..\..\LICENSE">

‎src/MoBi.Presentation/Presenter/SimulationChartPresenter.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using OSPSuite.Core.Chart;
1010
using OSPSuite.Core.Domain;
1111
using OSPSuite.Core.Domain.Data;
12+
using OSPSuite.Core.Extensions;
1213
using OSPSuite.Core.Services;
1314
using OSPSuite.Presentation.Presenters;
1415
using OSPSuite.Presentation.Services.Charts;
@@ -75,7 +76,7 @@ private void refreshChartData()
7576
plottedData.Add(_simulation.ResultsDataRepository);
7677

7778
if (_analysisChart.Curves.Count == 0)
78-
defaultTemplate = _simulation.DefaultChartTemplate;
79+
defaultTemplate = _simulation.DefaultChartTemplateFor(_analysisChart.CurveChartType);
7980

8081
addObservedDataRepositories(plottedData, _analysisChart.Curves);
8182
var notPlottedData = mappedObservedDataExcept(plottedData);

0 commit comments

Comments
 (0)