Version 11.2

Open-Systems-Pharmacology · Apr 28, 2023 · df173a8 · df173a8
2 parents 5ba2d97 + 5034fba
commit df173a8
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 37 deletions.
diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj
@@ -26,9 +26,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Core" Version="11.2.155" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj
@@ -60,7 +60,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Core" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Core" Version="11.2.155" />
     <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/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj
@@ -32,13 +32,13 @@
     <PackageReference Include="FluentNHibernate" Version="2.1.2" />
     <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.Export" 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.Infrastructure.Import" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Core" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.2.155" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
 

diff --git a/src/MoBi.Engine/MoBi.Engine.csproj b/src/MoBi.Engine/MoBi.Engine.csproj
@@ -32,8 +32,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.2.155" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.2.155" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj
@@ -28,10 +28,10 @@
     <PackageReference Include="Northwoods.GoWin" Version="5.2.0" />
     <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.Presentation.Serialization" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.97" />  
-   </ItemGroup>
+    <PackageReference Include="OSPSuite.Presentation" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Core" Version="11.2.155" />  
+  </ItemGroup>
   <ItemGroup>
     <None Include="..\..\LICENSE">
       <Pack>True</Pack>

diff --git a/src/MoBi.Presentation/Presenter/Main/NotificationPresenter.cs b/src/MoBi.Presentation/Presenter/Main/NotificationPresenter.cs
@@ -272,7 +272,7 @@ public NotificationMessageDTO(NotificationMessage notificationMessage)
          _notificationMessage = notificationMessage;
       }
 
-      public ApplicationIcon Image => _notificationMessage.Image;
+      public Image Image => _notificationMessage.Image.ToImage();
       public NotificationType Type => _notificationMessage.Type;
       public NotificationMessage NotificationMessage => _notificationMessage;
       public IObjectBase Object => _notificationMessage.Object;

diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj
@@ -27,11 +27,11 @@
     <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.Infrastructure" Version="11.1.97" />
-    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.1.97" />
-    <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.Infrastructure" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.UI" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Core" Version="11.2.155" />
    </ItemGroup>
   <ItemGroup>
     <None Include="..\..\LICENSE">

diff --git a/src/MoBi.UI/Views/NotificationView.cs b/src/MoBi.UI/Views/NotificationView.cs
@@ -29,7 +29,6 @@ public partial class NotificationView : BaseUserControl, INotificationView, IVie
       private readonly ICache<NotificationType, BarButtonItem> _buttonCache;
       private readonly GridViewBinder<NotificationMessageDTO> _gridViewBinder;
       private readonly RepositoryItemPictureEdit _statusIconRepository;
-      private readonly ToolTipController _toolTipController;
       private readonly BarManager _popupBarManager;
       private readonly IStartOptions _runOptions;
 
@@ -44,10 +43,10 @@ public NotificationView(IImageListRetriever imageListRetriever, IToolTipCreator
          _gridViewBinder = new GridViewBinder<NotificationMessageDTO>(gridViewMessages);
          gridViewMessages.CustomRowFilter += customRowFilter;
          _statusIconRepository = new RepositoryItemPictureEdit();
-         _toolTipController = new ToolTipController {ImageList = imageListRetriever.AllImages16x16};
-         _toolTipController.AutoPopDelay = AppConstants.NotificationToolTipDelay;
-         _toolTipController.GetActiveObjectInfo += onToolTipControllerGetActiveObjectInfo;
-         gridMessages.ToolTipController = _toolTipController;
+         var toolTipController = new ToolTipController {ImageList = imageListRetriever.AllImages16x16};
+         toolTipController.AutoPopDelay = AppConstants.NotificationToolTipDelay;
+         toolTipController.GetActiveObjectInfo += onToolTipControllerGetActiveObjectInfo;
+         gridMessages.ToolTipController = toolTipController;
          gridViewMessages.MouseDown += (o, e) => this.DoWithinExceptionHandler(() => onGridViewMouseDown(e));
          gridViewMessages.DoubleClick += (o, e) => this.DoWithinExceptionHandler(onDoubleClick);
          gridViewMessages.ShouldUseColorForDisabledCell = false;
@@ -59,7 +58,7 @@ private void customRowFilter(object sender, RowFilterEventArgs e)
          if (notification == null) return;
          e.Visible = _presenter.ShouldShow(notification);
 
-         //handle filter only if we explicitely hide the record
+         //handle filter only if we explicitly hide the record
          if (!e.Visible)
             e.Handled = true;
       }

diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj
@@ -71,13 +71,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OSPSuite.Core" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Core" Version="11.2.155" />
     <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.2.155" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" GeneratePathProperty="true" />
 
   </ItemGroup>

diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj
@@ -45,10 +45,10 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="nunit" Version="3.13.2" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
-    <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.UI" Version="11.1.97" />
+    <PackageReference Include="OSPSuite.Core" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Infrastructure" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.2.155" />
+    <PackageReference Include="OSPSuite.UI" Version="11.2.155" />
     <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/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj
@@ -17,8 +17,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="nunit" Version="3.13.2" />
     <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.2.155" />
+    <PackageReference Include="OSPSuite.UI" Version="11.2.155" />
    </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\MoBi.Core\MoBi.Core.csproj" />