742 empty columns (#756)

* Fixes #750 remove not visible * Fixes #742 also by updating dep
Open-Systems-Pharmacology · Sep 22, 2022 · a26af51 · a26af51
1 parent ae6423f
commit a26af51
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 45 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.14" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.14" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.14" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.15" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.15" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.15" />
   </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.14" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.15" />
     <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" />

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.14" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.14" />
-    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.14" />
-    <PackageReference Include="OSPSuite.Infrastructure.Export" 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.Infrastructure.Import" Version="11.1.14" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.15" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.15" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.1.15" />
+    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.1.15" />
+    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.1.15" />
+    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.1.15" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.1.15" />
     <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.14" />
-    <PackageReference Include="OSPSuite.Assets" Version="11.1.14" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.15" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.1.15" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj
@@ -28,9 +28,9 @@
     <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.14" />
-    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="11.1.14" />
-    <PackageReference Include="OSPSuite.Core" Version="11.1.14" />  
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.15" />
+    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="11.1.15" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.15" />  
    </ItemGroup>
   <ItemGroup>
     <None Include="..\..\LICENSE">

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

diff --git a/src/MoBi.UI/Views/EditParametersInContainerView.cs b/src/MoBi.UI/Views/EditParametersInContainerView.cs
@@ -50,9 +50,9 @@ public partial class EditParametersInContainerView : BaseUserControl, IEditParam
       private IGridViewColumn _colBuildMode;
       private IGridViewColumn _colDescription;
       private readonly UxComboBoxUnit<ParameterDTO> _unitControl;
-      private readonly RepositoryItemTextEdit _stantdardParameterEditRepository = new RepositoryItemTextEdit();
+      private readonly RepositoryItemTextEdit _standardParameterEditRepository = new RepositoryItemTextEdit();
       private RepositoryItemButtonEdit _isFixedParameterEditRepository;
-      private readonly RepositoryItemButtonEdit _addRemoveButtonRepository = new UxRepositoryItemButtonEdit(ButtonPredefines.Delete);
+      private readonly RepositoryItemButtonEdit _removeButtonRepository = new UxRepositoryItemButtonEdit(ButtonPredefines.Delete);
       private RepositoryItemButtonEdit _nameButtonRepository;
       private readonly UxRepositoryItemCheckEdit _checkBoxRepository;
 
@@ -94,7 +94,7 @@ public override void InitializeResources()
          layoutControlItemLoadParameter.AdjustLargeButtonSize();
          chkShowAdvancedParameter.Text = AppConstants.Captions.ShowAdvancedParameters;
          chkGroupBy.Text = AppConstants.Captions.GroupParameters;
-         _addRemoveButtonRepository.Buttons[0].ToolTip = ToolTips.ParameterList.DeleteParameter;
+         _removeButtonRepository.Buttons[0].ToolTip = ToolTips.ParameterList.DeleteParameter;
          _gridView.MultiSelect = true;
       }
 
@@ -172,10 +172,10 @@ public override void InitializeBinding()
          _colButtons = _gridViewBinder.AddUnboundColumn()
             .WithCaption(OSPSuite.UI.UIConstants.EMPTY_COLUMN)
             .WithShowButton(ShowButtonModeEnum.ShowAlways)
-            .WithRepository(dto => _addRemoveButtonRepository)
+            .WithRepository(dto => _removeButtonRepository)
             .WithFixedWidth(OSPSuite.UI.UIConstants.Size.EMBEDDED_BUTTON_WIDTH);
 
-         _addRemoveButtonRepository.ButtonClick += (o, e) => OnEvent(() => _presenter.RemoveParameter(_gridViewBinder.FocusedElement));
+         _removeButtonRepository.ButtonClick += (o, e) => OnEvent(_presenter.RemoveParameter, _gridViewBinder.FocusedElement);
 
 
          _gridView.FocusedRowChanged += (o, e) => OnEvent(gridViewRowChanged, e);
@@ -186,15 +186,9 @@ public override void InitializeBinding()
          btLoadParameter.Click += (o, e) => OnEvent(_presenter.LoadParameter);
       }
 
-      private void onIsFavoriteSet(ParameterDTO parameterDTO, bool newValue)
-      {
-         _presenter.SetIsFavorite(parameterDTO, newValue);
-      }
+      private void onIsFavoriteSet(ParameterDTO parameterDTO, bool newValue) => _presenter.SetIsFavorite(parameterDTO, newValue);
 
-      private void onIsPersistableSet(ParameterDTO parameterDTO, bool newValue)
-      {
-         _presenter.SetIsPersistable(parameterDTO, newValue);
-      }
+      private void onIsPersistableSet(ParameterDTO parameterDTO, bool newValue) => _presenter.SetIsPersistable(parameterDTO, newValue);
 
       private void onToolTipControllerGetActiveObjectInfo(object sender, ToolTipControllerGetActiveObjectInfoEventArgs e)
       {
@@ -246,7 +240,7 @@ private RepositoryItem repositoryForValue(ParameterDTO parameter)
          if (_presenter.IsFixedValue(parameter))
             return _isFixedParameterEditRepository;
 
-         return _stantdardParameterEditRepository;
+         return _standardParameterEditRepository;
       }
 
       private void configureRepository(BaseEdit activeEditor, ParameterDTO parameter)

diff --git a/src/MoBi.UI/Views/EditTableFormulaView.cs b/src/MoBi.UI/Views/EditTableFormulaView.cs
@@ -139,9 +139,8 @@ private void setUseDerivedValues(TableFormulaBuilderDTO dtoTableFormula, Propert
 
       private UxRepositoryItemButtonEdit createButtonRepository()
       {
-         var buttonRepositoryItem = new UxRepositoryItemButtonEdit(ButtonPredefines.Plus);
+         var buttonRepositoryItem = new UxAddAndRemoveButtonRepository();
          buttonRepositoryItem.Buttons[0].ToolTip = ToolTips.Formula.AddPoint;
-         buttonRepositoryItem.AddButton(ButtonPredefines.Delete);
          buttonRepositoryItem.Buttons[1].ToolTip = ToolTips.Formula.DeletePoint;
          buttonRepositoryItem.ButtonClick += (o, e) => OnEvent(onButtonClick, e);
          return buttonRepositoryItem;

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.14" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.15" />
     <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.14" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.1.15" 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.14" />
-    <PackageReference Include="OSPSuite.Infrastructure" Version="11.1.14" />
-    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.1.14" />
-    <PackageReference Include="OSPSuite.UI" Version="11.1.14" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.15" />
+    <PackageReference Include="OSPSuite.Infrastructure" Version="11.1.15" />
+    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.1.15" />
+    <PackageReference Include="OSPSuite.UI" Version="11.1.15" />
     <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" />

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.14" />
-    <PackageReference Include="OSPSuite.UI" Version="11.1.14" />
+    <PackageReference Include="OSPSuite.Core" Version="11.1.15" />
+    <PackageReference Include="OSPSuite.UI" Version="11.1.15" />
    </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\MoBi.Core\MoBi.Core.csproj" />