Fixes #574 strange behavior (#575)

* Fixes #574 strange behavior * Fixes #574 strange behavior
Open-Systems-Pharmacology · Jun 12, 2019 · 7364a6f · 7364a6f
1 parent f939397
commit 7364a6f
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 43 deletions.
diff --git a/src/OSPSuite.Core/Chart/ChartUpdate.cs b/src/OSPSuite.Core/Chart/ChartUpdate.cs
@@ -7,18 +7,18 @@ public class ChartUpdate : IDisposable
    {
       private readonly IEventPublisher _eventPublisher;
       private readonly IChart _chart;
-      private readonly bool _propogateChartChangeEvent;
+      private readonly bool _propagateChartChangeEvent;
 
-      public ChartUpdate(IEventPublisher eventPublisher, IChart chart, bool propogateChartChangeEvent)
+      public ChartUpdate(IEventPublisher eventPublisher, IChart chart, bool propagateChartChangeEvent)
       {
          _eventPublisher = eventPublisher;
          _chart = chart;
-         _propogateChartChangeEvent = propogateChartChangeEvent;
+         _propagateChartChangeEvent = propagateChartChangeEvent;
       }
 
       public void Dispose()
       {
-         _eventPublisher.PublishEvent(new ChartUpdatedEvent(_chart,_propogateChartChangeEvent));
+         _eventPublisher.PublishEvent(new ChartUpdatedEvent(_chart,_propagateChartChangeEvent));
       }
    }
 }
diff --git a/src/OSPSuite.Core/Chart/ChartUpdater.cs b/src/OSPSuite.Core/Chart/ChartUpdater.cs
@@ -4,7 +4,7 @@ namespace OSPSuite.Core.Chart
 {
    public interface IChartUpdater
    {
-      ChartUpdate UpdateTransaction(IChart chart, bool propogateChartChangeEvent =true);
+      ChartUpdate UpdateTransaction(IChart chart, bool propagateChartChangeEvent =true);
       void Update(IChart chart);
    }
 
@@ -17,9 +17,9 @@ public ChartUpdater(IEventPublisher eventPublisher)
          _eventPublisher = eventPublisher;
       }
 
-      public ChartUpdate UpdateTransaction(IChart chart, bool propogateChartChangeEvent = true)
+      public ChartUpdate UpdateTransaction(IChart chart, bool propagateChartChangeEvent = true)
       {
-         return new ChartUpdate(_eventPublisher, chart, propogateChartChangeEvent);
+         return new ChartUpdate(_eventPublisher, chart, propagateChartChangeEvent);
       }
 
       public void Update(IChart chart)

diff --git a/src/OSPSuite.Core/Chart/CurveChart.cs b/src/OSPSuite.Core/Chart/CurveChart.cs
@@ -261,10 +261,9 @@ public void RemoveCurvesForColumn(DataColumn dataColumn)
          removeCurves(curve => curve.xData == dataColumn || curve.yData == dataColumn);
       }
 
-      public void RemoveCurvesForDataRepository(DataRepository dataRepository)
-      {
-         removeCurves(curve => dataRepository.Contains(curve.xData.Id) || dataRepository.Contains(curve.yData.Id));
-      }
+      public void RemoveCurvesForColumns(IEnumerable<DataColumn> dataColumns) => dataColumns.Each(RemoveCurvesForColumn);
+
+      public void RemoveCurvesForDataRepository(DataRepository dataRepository) => RemoveCurvesForColumns(dataRepository);
 
       private void removeCurves(Func<Curve, bool> shouldRemoveCurveFunc)
       {

diff --git a/src/OSPSuite.Core/Chart/Events.cs b/src/OSPSuite.Core/Chart/Events.cs
@@ -12,11 +12,11 @@ protected ChartEvent(IChart chart)
 
    public class ChartUpdatedEvent : ChartEvent
    {
-      public bool PropogateChartChangeEvent { get; }
+      public bool PropagateChartChangeEvent { get; }
 
-      public ChartUpdatedEvent(IChart chart, bool propogateChartChangeEvent) : base(chart)
+      public ChartUpdatedEvent(IChart chart, bool propagateChartChangeEvent) : base(chart)
       {
-         PropogateChartChangeEvent = propogateChartChangeEvent;
+         PropagateChartChangeEvent = propagateChartChangeEvent;
       }
    }
 

diff --git a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj
@@ -100,8 +100,8 @@
     <Reference Include="Remotion.Linq.EagerFetching, Version=2.2.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Remotion.Linq.EagerFetching.2.2.0\lib\net45\Remotion.Linq.EagerFetching.dll</HintPath>
     </Reference>
-    <Reference Include="SX, Version=2.7.0.4, Culture=neutral, PublicKeyToken=882b9c044052e7f6, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OSPSuite.SmartXLS.2.7.0.4\lib\net45\SX.dll</HintPath>
+    <Reference Include="SX, Version=2.7.0.9, Culture=neutral, PublicKeyToken=882b9c044052e7f6, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\OSPSuite.SmartXLS.2.7.0.9\lib\net45\SX.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

diff --git a/src/OSPSuite.Infrastructure/packages.config b/src/OSPSuite.Infrastructure/packages.config
@@ -16,7 +16,7 @@
   <package id="Microsoft.Extensions.Primitives" version="2.2.0" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net462" />
   <package id="NHibernate" version="5.2.5" targetFramework="net462" />
-  <package id="OSPSuite.SmartXLS" version="2.7.0.4" targetFramework="net462" />
+  <package id="OSPSuite.SmartXLS" version="2.7.0.9" targetFramework="net462" />
   <package id="OSPSuite.TeXReporting" version="2.1.1.9" targetFramework="net462" />
   <package id="OSPSuite.Utility" version="3.0.1.7" targetFramework="net462" />
   <package id="Remotion.Linq" version="2.2.0" targetFramework="net462" />

diff --git a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj
@@ -50,8 +50,8 @@
     <Reference Include="OSPSuite.Utility, Version=3.0.1.7, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\OSPSuite.Utility.3.0.1.7\lib\net462\OSPSuite.Utility.dll</HintPath>
     </Reference>
-    <Reference Include="SX, Version=2.7.0.4, Culture=neutral, PublicKeyToken=882b9c044052e7f6, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OSPSuite.SmartXLS.2.7.0.4\lib\net45\SX.dll</HintPath>
+    <Reference Include="SX, Version=2.7.0.9, Culture=neutral, PublicKeyToken=882b9c044052e7f6, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\OSPSuite.SmartXLS.2.7.0.9\lib\net45\SX.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/OSPSuite.Presentation/Presenters/Charts/ChartEditorPresenter.cs b/src/OSPSuite.Presentation/Presenters/Charts/ChartEditorPresenter.cs
@@ -228,12 +228,12 @@ public ChartEditorPresenter(IChartEditorView view, IAxisSettingsPresenter axisSe
          _dataBrowserPresenter.UsedChanged += (o, e) => onDataBrowserUsedChanged(e);
          _dataBrowserPresenter.SelectionChanged += (o, e) => onSelectionChanged(e.Columns);
 
-         _chartExportSettingsPresenter.ChartExportSettingsChanged += (o,e)=> onChartPropertiesChanged();
+         _chartExportSettingsPresenter.ChartExportSettingsChanged += (o, e) => onChartPropertiesChanged();
          _chartSettingsPresenter.ChartSettingsChanged += (o, e) => updateChart();
 
-         _curveSettingsPresenter.AddCurves += (o,e) => addCurvesForColumns(e.Columns);
-         _curveSettingsPresenter.RemoveCurve += (o,e)=> removeCurve(e.Curve);
-         _curveSettingsPresenter.CurvePropertyChanged += (o,e) => updateChart();
+         _curveSettingsPresenter.AddCurves += (o, e) => addCurvesForColumns(e.Columns);
+         _curveSettingsPresenter.RemoveCurve += (o, e) => removeCurve(e.Curve);
+         _curveSettingsPresenter.CurvePropertyChanged += (o, e) => updateChart();
 
          _axisSettingsPresenter.AxisRemoved += (o, e) => onAxisRemoved(e.Axis);
          _axisSettingsPresenter.AxisAdded += (o, e) => onAxisAdded();
@@ -381,10 +381,7 @@ public void AddDataRepositories(IEnumerable<DataRepository> dataRepositories)
 
       private bool hasColumn(DataColumn dataColumn) => _dataBrowserPresenter.ContainsDataColumn(dataColumn);
 
-      public void RemoveAllDataRepositories()
-      {
-         _dataBrowserPresenter.Clear();
-      }
+      public void RemoveAllDataRepositories() => _dataBrowserPresenter.Clear();
 
       public void RemoveUnusedColumns() => removeColumns(unusedColumns);
 
@@ -408,7 +405,9 @@ public void RemoveDataRepositories(IEnumerable<DataRepository> dataRepositories)
 
       private void removeColumns(IEnumerable<DataColumn> dataColumns)
       {
-         _dataBrowserPresenter.RemoveDataColumns(dataColumns);
+         var columnsToRemove = dataColumns.ToList();
+         _dataBrowserPresenter.RemoveDataColumns(columnsToRemove);
+         Chart.RemoveCurvesForColumns(columnsToRemove);
       }
 
       public IReadOnlyList<DataColumn> AllDataColumns => _dataBrowserPresenter.AllDataColumns;
@@ -418,7 +417,7 @@ public void CopySettingsFrom(ChartEditorSettings settings)
          CopySettingsFrom(settings, loadEditorLayout: true, loadColumnSettings: true);
       }
 
-      private void copyColumSettings(IEnumerable<GridColumnSettings> settings, Func<string, GridColumnSettings> columnSettingsInPresenterByName)
+      private void copyColumnSettings(IEnumerable<GridColumnSettings> settings, Func<string, GridColumnSettings> columnSettingsInPresenterByName)
       {
          foreach (var layoutColumnSettings in settings)
          {
@@ -431,10 +430,11 @@ public void CopySettingsFrom(ChartEditorSettings settings, bool loadEditorLayout
       {
          if (loadColumnSettings)
          {
-            copyColumSettings(settings.DataBrowserColumnSettings, _dataBrowserPresenter.ColumnSettings);
-            copyColumSettings(settings.CurveOptionsColumnSettings, _curveSettingsPresenter.ColumnSettings);
-            copyColumSettings(settings.AxisOptionsColumnSettings, _axisSettingsPresenter.ColumnSettings);
+            copyColumnSettings(settings.DataBrowserColumnSettings, _dataBrowserPresenter.ColumnSettings);
+            copyColumnSettings(settings.CurveOptionsColumnSettings, _curveSettingsPresenter.ColumnSettings);
+            copyColumnSettings(settings.AxisOptionsColumnSettings, _axisSettingsPresenter.ColumnSettings);
          }
+
          if (loadEditorLayout)
             _view.LoadLayoutFromString(settings.DockingLayout);
       }
@@ -552,7 +552,7 @@ public void Handle(ChartUpdatedEvent chartUpdatedEvent)
 
          Refresh();
 
-         if (chartUpdatedEvent.PropogateChartChangeEvent)
+         if (chartUpdatedEvent.PropagateChartChangeEvent)
             ChartChanged();
       }
    }

diff --git a/src/OSPSuite.Presentation/packages.config b/src/OSPSuite.Presentation/packages.config
@@ -3,6 +3,6 @@
   <package id="Microsoft.Extensions.Logging.Abstractions" version="2.2.0" targetFramework="net462" />
   <package id="OSPSuite.DevExpress.Presentation" version="18.2.7" targetFramework="net462" />
   <package id="OSPSuite.Serializer" version="2.0.1.4" targetFramework="net462" />
-  <package id="OSPSuite.SmartXLS" version="2.7.0.4" targetFramework="net462" />
+  <package id="OSPSuite.SmartXLS" version="2.7.0.9" targetFramework="net462" />
   <package id="OSPSuite.Utility" version="3.0.1.7" targetFramework="net462" />
 </packages>
diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj
@@ -119,8 +119,8 @@
     <Reference Include="Remotion.Linq.EagerFetching, Version=2.2.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Remotion.Linq.EagerFetching.2.2.0\lib\net45\Remotion.Linq.EagerFetching.dll</HintPath>
     </Reference>
-    <Reference Include="SX, Version=2.7.0.4, Culture=neutral, PublicKeyToken=882b9c044052e7f6, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\OSPSuite.SmartXLS.2.7.0.4\lib\net45\SX.dll</HintPath>
+    <Reference Include="SX, Version=2.7.0.9, Culture=neutral, PublicKeyToken=882b9c044052e7f6, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\OSPSuite.SmartXLS.2.7.0.9\lib\net45\SX.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/tests/OSPSuite.Core.Tests/Presentation/ChartEditorPresenterSpecs.cs b/tests/OSPSuite.Core.Tests/Presentation/ChartEditorPresenterSpecs.cs
@@ -307,7 +307,7 @@ protected override void Context()
 
       protected override void Because()
       {
-         sut.Handle(new ChartUpdatedEvent(_curveChart, propogateChartChangeEvent: true));
+         sut.Handle(new ChartUpdatedEvent(_curveChart, propagateChartChangeEvent: true));
       }
 
       [Observation]
@@ -338,7 +338,7 @@ protected override void Context()
 
       protected override void Because()
       {
-         sut.Handle(new ChartUpdatedEvent(_curveChart, propogateChartChangeEvent: false));
+         sut.Handle(new ChartUpdatedEvent(_curveChart, propagateChartChangeEvent: false));
       }
 
       [Observation]

diff --git a/tests/OSPSuite.Core.Tests/packages.config b/tests/OSPSuite.Core.Tests/packages.config
@@ -15,7 +15,7 @@
   <package id="OSPSuite.Serializer" version="2.0.1.4" targetFramework="net462" />
   <package id="OSPSuite.SimModel" version="3.0.1.27" targetFramework="net462" />
   <package id="OSPSuite.SimModelSolver_CVODES" version="4.0.0.5" />
-  <package id="OSPSuite.SmartXLS" version="2.7.0.4" targetFramework="net462" />
+  <package id="OSPSuite.SmartXLS" version="2.7.0.9" targetFramework="net462" />
   <package id="OSPSuite.TeXReporting" version="2.1.1.9" targetFramework="net462" />
   <package id="OSPSuite.Utility" version="3.0.1.7" targetFramework="net462" />
   <package id="Remotion.Linq" version="2.2.0" targetFramework="net462" />

diff --git a/tests/OSPSuite.Starter/Presenters/ChartTestPresenter.cs b/tests/OSPSuite.Starter/Presenters/ChartTestPresenter.cs
@@ -182,10 +182,6 @@ public void ClearChart()
          using (_chartUpdater.UpdateTransaction(Chart))
          {
             ChartEditorPresenter.RemoveDataRepositories(_dataRepositories);
-            _dataRepositories.Each(repository =>
-            {
-               Chart.RemoveCurvesForDataRepository(repository);
-            });
             _dataRepositories.Clear();
          }
       }