From c0fb1cbfc559ac5042e3661b212235bbdae99295 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Fri, 1 Dec 2017 14:02:44 -0500 Subject: [PATCH 01/29] Fixes #216 preparation for version 7.3.0 (#217) --- MoBi.sln | 6 +- appveyor-coverage.yml | 2 +- appveyor-nightly.yml | 4 +- appveyor.yml | 2 +- rakefile.rb | 2 - setup/setup.wxs | 6 -- src/MoBi.Assets/MoBi.Assets.csproj | 14 ++-- src/MoBi.Assets/packages.config | 20 +++--- src/MoBi.BatchTool/App.config | 6 +- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 26 ++++---- src/MoBi.BatchTool/Program.cs | 1 - .../Properties/Resources.Designer.cs | 2 +- .../Properties/Settings.Designer.cs | 2 +- src/MoBi.BatchTool/packages.config | 61 +++++++++-------- src/MoBi.Core/CoreRegister.cs | 2 + src/MoBi.Core/MoBi.Core.csproj | 26 ++++---- src/MoBi.Core/Services/MoBiLogger.cs | 14 ++++ src/MoBi.Core/app.config | 6 +- src/MoBi.Core/packages.config | 47 +++++++------ .../Extensions/SmartXLSExtensions.cs | 4 +- .../ContextMenus/ContextMenuFor.cs | 3 +- .../MoBi.Presentation.csproj | 22 +++---- src/MoBi.Presentation/app.config | 6 +- src/MoBi.Presentation/packages.config | 53 ++++++++------- src/MoBi.UI/MoBi.UI.csproj | 26 ++++---- src/MoBi.UI/Properties/Resources.Designer.cs | 2 +- src/MoBi.UI/Properties/Settings.Designer.cs | 2 +- src/MoBi.UI/Services/ApplicationStartup.cs | 18 ++--- src/MoBi.UI/app.config | 6 +- src/MoBi.UI/packages.config | 61 +++++++++-------- src/MoBi/MoBi.csproj | 22 +++---- src/MoBi/Program.cs | 1 - src/MoBi/Properties/Resources.Designer.cs | 2 +- src/MoBi/Properties/Settings.Designer.cs | 2 +- src/MoBi/app.config | 6 +- src/MoBi/packages.config | 30 ++++----- .../SessionFactoryProviderHelperForSpecs.cs | 10 +-- tests/MoBi.Tests/MoBi.Tests.csproj | 22 +++---- tests/MoBi.Tests/app.config | 6 +- tests/MoBi.Tests/packages.config | 63 +++++++++--------- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 23 +++---- tests/MoBi.UI.Tests/app.config | 6 +- tests/MoBi.UI.Tests/packages.config | 66 +++++++++---------- 43 files changed, 332 insertions(+), 379 deletions(-) create mode 100644 src/MoBi.Core/Services/MoBiLogger.cs diff --git a/MoBi.sln b/MoBi.sln index 3ca20f490..847cc2e9f 100644 --- a/MoBi.sln +++ b/MoBi.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.4 +VisualStudioVersion = 15.0.26730.16 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoBi", "src\MoBi\MoBi.csproj", "{B831E5E2-431A-4627-B58C-3CE3F5002E42}" EndProject @@ -22,7 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution appveyor-coverage.yml = appveyor-coverage.yml appveyor-nightly.yml = appveyor-nightly.yml appveyor.yml = appveyor.yml - log4net.config.xml = log4net.config.xml postclean.bat = postclean.bat rakefile.rb = rakefile.rb README.md = README.md @@ -128,4 +127,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C33C05C2-2549-4699-9F93-C5D8264B44E8} + EndGlobalSection EndGlobal diff --git a/appveyor-coverage.yml b/appveyor-coverage.yml index e3f36f376..cd6240939 100644 --- a/appveyor-coverage.yml +++ b/appveyor-coverage.yml @@ -2,7 +2,7 @@ configuration: Debug image: Visual Studio 2017 environment: - app_version: '7.2.0' + app_version: '7.3.0' MIK_TEX_INSTALL_DIR: 'C:\MikTex\' version: '%app_version%.{build}' diff --git a/appveyor-nightly.yml b/appveyor-nightly.yml index ffcbbbacc..eebb21c8a 100644 --- a/appveyor-nightly.yml +++ b/appveyor-nightly.yml @@ -2,7 +2,7 @@ configuration: Debug image: Visual Studio 2017 environment: - app_version: '7.2.0' + app_version: '7.3.0' MIK_TEX_INSTALL_DIR: 'C:\MikTex\' version: '%app_version%.{build}' @@ -12,7 +12,7 @@ assembly_info: file: SolutionInfo.* assembly_version: "{version}" assembly_file_version: "{version}" - assembly_informational_version: "" + assembly_informational_version: "EAP" clone_depth: 1 diff --git a/appveyor.yml b/appveyor.yml index 05b97e4e2..0710e7f46 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ configuration: Debug image: Visual Studio 2017 environment: - app_version: '7.2.0' + app_version: '7.3.0' version: '%app_version%.{build}' diff --git a/rakefile.rb b/rakefile.rb index 087e99fb5..d024837dd 100644 --- a/rakefile.rb +++ b/rakefile.rb @@ -33,7 +33,6 @@ 'dimensions/*.xml', 'pkparameters/*.xml', 'setup/setup.wxs', - 'log4net.config.xml', 'setup/**/*.{msm,rtf,bmp}', 'Open Systems Pharmacology Suite License.pdf' ] @@ -60,7 +59,6 @@ 'pkparameters/*.xml', 'src/Data/*.xml', 'setup/**/*.{rtf}', - 'log4net.config.xml', ] setup_folders = [ diff --git a/setup/setup.wxs b/setup/setup.wxs index c4ba92403..7a24eda8f 100644 --- a/setup/setup.wxs +++ b/setup/setup.wxs @@ -91,11 +91,6 @@ - - - - - @@ -171,7 +166,6 @@ - diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index 524196733..77a9ef3d5 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -10,7 +10,7 @@ Properties MoBi.Assets MoBi.Assets - v4.5.2 + v4.6.2 512 @@ -47,11 +47,11 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.2.0.86\lib\net452\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.1\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.2.0.86\lib\net452\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.1\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -62,8 +62,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.Utility.2.0.1.4\lib\net452\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.Assets/packages.config b/src/MoBi.Assets/packages.config index 9066a570b..8e5bb596f 100644 --- a/src/MoBi.Assets/packages.config +++ b/src/MoBi.Assets/packages.config @@ -1,13 +1,13 @@  - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/MoBi.BatchTool/App.config b/src/MoBi.BatchTool/App.config index 694d566bb..728c74809 100644 --- a/src/MoBi.BatchTool/App.config +++ b/src/MoBi.BatchTool/App.config @@ -1,7 +1,7 @@  - + @@ -121,10 +121,6 @@ - - - - diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index e71dc6f99..593d566c7 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -9,7 +9,7 @@ Properties MoBi.BatchTool MoBi.BatchTool - v4.5.2 + v4.6.2 512 @@ -198,11 +198,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.2.0.86\lib\net452\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.1\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.2.0.86\lib\net452\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.1\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.1.0.5\lib\net452\OSPSuite.DataBinding.dll @@ -213,11 +213,11 @@ ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.2.0.86\lib\net452\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.1\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.2.0.86\lib\net452\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.1\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -228,11 +228,11 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.2.0.86\lib\net452\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.1\lib\net462\OSPSuite.UI.dll - - ..\..\packages\OSPSuite.Utility.2.0.1.4\lib\net452\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.BatchTool/Program.cs b/src/MoBi.BatchTool/Program.cs index 3a3e7b172..1d434a557 100644 --- a/src/MoBi.BatchTool/Program.cs +++ b/src/MoBi.BatchTool/Program.cs @@ -28,7 +28,6 @@ private static void Main(string[] args) catch (Exception e) { MessageBox.Show(e.ExceptionMessageWithStackTrace(), "Unhandled Exception", MessageBoxButtons.OK, MessageBoxIcon.Error); - e.LogError(); } } } diff --git a/src/MoBi.BatchTool/Properties/Resources.Designer.cs b/src/MoBi.BatchTool/Properties/Resources.Designer.cs index 8f9b962e3..a76f617f5 100644 --- a/src/MoBi.BatchTool/Properties/Resources.Designer.cs +++ b/src/MoBi.BatchTool/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace MoBi.BatchTool.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/src/MoBi.BatchTool/Properties/Settings.Designer.cs b/src/MoBi.BatchTool/Properties/Settings.Designer.cs index f5b2742fc..f6766ee1a 100644 --- a/src/MoBi.BatchTool/Properties/Settings.Designer.cs +++ b/src/MoBi.BatchTool/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace MoBi.BatchTool.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/src/MoBi.BatchTool/packages.config b/src/MoBi.BatchTool/packages.config index e23ae6369..1f43dc358 100644 --- a/src/MoBi.BatchTool/packages.config +++ b/src/MoBi.BatchTool/packages.config @@ -1,34 +1,33 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/MoBi.Core/CoreRegister.cs b/src/MoBi.Core/CoreRegister.cs index c5fd2d719..1f3c4f791 100644 --- a/src/MoBi.Core/CoreRegister.cs +++ b/src/MoBi.Core/CoreRegister.cs @@ -19,6 +19,7 @@ using OSPSuite.Core.Domain.Services; using OSPSuite.Core.Domain.Services.ParameterIdentifications; using OSPSuite.Core.Domain.UnitSystem; +using OSPSuite.Core.Services; using OSPSuite.Infrastructure.Reporting; using OSPSuite.Infrastructure.Serialization.ORM.History; using OSPSuite.Infrastructure.Services; @@ -47,6 +48,7 @@ public override void RegisterInContainer(IContainer container) scan.ExcludeType(); scan.ExcludeType(); scan.ExcludeType(); + scan.ExcludeType(); scan.ExcludeNamespaceContainingType(); scan.ExcludeNamespaceContainingType(); scan.ExcludeNamespaceContainingType(); diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index acaf91f44..b5ea24864 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -10,7 +10,7 @@ Properties MoBi.Core MoBi.Core - v4.5.2 + v4.6.2 512 @@ -86,9 +86,6 @@ ..\..\pre\libsbmlcsP.dll - - ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll @@ -103,20 +100,20 @@ ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll True - - ..\..\packages\OSPSuite.Assets.7.2.0.86\lib\net452\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.1\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.2.0.86\lib\net452\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.1\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.2.0.86\lib\net452\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.1\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.2.0.86\lib\net452\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.1\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -127,8 +124,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.Utility.2.0.1.4\lib\net452\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll @@ -477,6 +474,7 @@ + diff --git a/src/MoBi.Core/Services/MoBiLogger.cs b/src/MoBi.Core/Services/MoBiLogger.cs new file mode 100644 index 000000000..6addbe2ed --- /dev/null +++ b/src/MoBi.Core/Services/MoBiLogger.cs @@ -0,0 +1,14 @@ +using System.Diagnostics; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Services; + +namespace MoBi.Core.Services +{ + public class MoBiLogger : ILogger + { + public void AddToLog(string message, NotificationType messageStatus = NotificationType.None) + { + Debug.Print($"{messageStatus} - {message}"); + } + } +} \ No newline at end of file diff --git a/src/MoBi.Core/app.config b/src/MoBi.Core/app.config index ae2eaae6a..959f960f3 100644 --- a/src/MoBi.Core/app.config +++ b/src/MoBi.Core/app.config @@ -70,10 +70,6 @@ - - - - - \ No newline at end of file + diff --git a/src/MoBi.Core/packages.config b/src/MoBi.Core/packages.config index 621f38399..a363719e4 100644 --- a/src/MoBi.Core/packages.config +++ b/src/MoBi.Core/packages.config @@ -1,27 +1,26 @@  - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/MoBi.Presentation/Extensions/SmartXLSExtensions.cs b/src/MoBi.Presentation/Extensions/SmartXLSExtensions.cs index aa520fdac..f1ee4b90e 100644 --- a/src/MoBi.Presentation/Extensions/SmartXLSExtensions.cs +++ b/src/MoBi.Presentation/Extensions/SmartXLSExtensions.cs @@ -1,7 +1,7 @@ using System; using System.IO; +using OSPSuite.Core.Domain; using SmartXLS; -using OSPSuite.Utility.Resources; namespace MoBi.Presentation.Extensions { @@ -20,7 +20,7 @@ public static void ReadExcelFile(this WorkBook workBook, string filePath) using (var fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { - if (!string.IsNullOrEmpty(extension) && extension.Equals(Constants.XLSXExtension, StringComparison.CurrentCultureIgnoreCase)) + if (!string.IsNullOrEmpty(extension) && extension.Equals(Constants.Filter.XLSX_EXTENSION, StringComparison.CurrentCultureIgnoreCase)) workBook.readXLSX(fs); else workBook.read(fs); diff --git a/src/MoBi.Presentation/MenusAndBars/ContextMenus/ContextMenuFor.cs b/src/MoBi.Presentation/MenusAndBars/ContextMenus/ContextMenuFor.cs index d939e083f..eaa16a09e 100644 --- a/src/MoBi.Presentation/MenusAndBars/ContextMenus/ContextMenuFor.cs +++ b/src/MoBi.Presentation/MenusAndBars/ContextMenus/ContextMenuFor.cs @@ -58,9 +58,8 @@ public virtual IContextMenu InitializeWith(IObjectBaseDTO dto, IPresenter presen _allMenuItems.Add(CreateReportItemFor(objectBase)); return this; } - catch (InterfaceResolutionException interfaceResolutionException) + catch (InterfaceResolutionException) { - interfaceResolutionException.Log(); return new EmptyContextMenu(); } } diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index 45bf6a0ed..e8bba673e 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -10,7 +10,7 @@ Properties MoBi.Presentation MoBi.Presentation - v4.5.2 + v4.6.2 512 @@ -203,20 +203,20 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.2.0.86\lib\net452\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.1\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.2.0.86\lib\net452\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.1\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.2.0.86\lib\net452\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.1\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.2.0.86\lib\net452\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.1\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -227,8 +227,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.Utility.2.0.1.4\lib\net452\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.Presentation/app.config b/src/MoBi.Presentation/app.config index 3fadbe073..6f186a1e9 100644 --- a/src/MoBi.Presentation/app.config +++ b/src/MoBi.Presentation/app.config @@ -110,10 +110,6 @@ - - - - - \ No newline at end of file + diff --git a/src/MoBi.Presentation/packages.config b/src/MoBi.Presentation/packages.config index e1eb886a6..6f9b2ef76 100644 --- a/src/MoBi.Presentation/packages.config +++ b/src/MoBi.Presentation/packages.config @@ -1,30 +1,29 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index 8a14a21f0..eb1591da2 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -10,7 +10,7 @@ Properties MoBi.UI MoBi.UI - v4.5.2 + v4.6.2 512 @@ -239,11 +239,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.2.0.86\lib\net452\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.1\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.2.0.86\lib\net452\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.1\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.1.0.5\lib\net452\OSPSuite.DataBinding.dll @@ -254,11 +254,11 @@ ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.2.0.86\lib\net452\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.1\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.2.0.86\lib\net452\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.1\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -269,11 +269,11 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.2.0.86\lib\net452\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.1\lib\net462\OSPSuite.UI.dll - - ..\..\packages\OSPSuite.Utility.2.0.1.4\lib\net452\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.UI/Properties/Resources.Designer.cs b/src/MoBi.UI/Properties/Resources.Designer.cs index bd781567a..f434b03ab 100644 --- a/src/MoBi.UI/Properties/Resources.Designer.cs +++ b/src/MoBi.UI/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace MoBi.UI.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/src/MoBi.UI/Properties/Settings.Designer.cs b/src/MoBi.UI/Properties/Settings.Designer.cs index 66fbe660b..9932c3326 100644 --- a/src/MoBi.UI/Properties/Settings.Designer.cs +++ b/src/MoBi.UI/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace MoBi.UI.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/src/MoBi.UI/Services/ApplicationStartup.cs b/src/MoBi.UI/Services/ApplicationStartup.cs index e549211e4..a604395c5 100644 --- a/src/MoBi.UI/Services/ApplicationStartup.cs +++ b/src/MoBi.UI/Services/ApplicationStartup.cs @@ -9,6 +9,7 @@ using MoBi.Core.Domain.UnitSystem; using MoBi.Core.SBML; using MoBi.Core.Serialization.Xml.Services; +using MoBi.Core.Services; using MoBi.Presentation; using MoBi.Presentation.Presenter; using MoBi.Presentation.Serialization; @@ -27,10 +28,10 @@ using OSPSuite.Core.Domain.UnitSystem; using OSPSuite.Core.Importer; using OSPSuite.Core.Serialization.Xml; +using OSPSuite.Core.Services; using OSPSuite.FuncParser; using OSPSuite.Infrastructure; using OSPSuite.Infrastructure.Container.Castle; -using OSPSuite.Infrastructure.Logging.Log4NetLogging; using OSPSuite.Presentation; using OSPSuite.Presentation.Services; using OSPSuite.UI; @@ -40,10 +41,8 @@ using OSPSuite.Utility.Exceptions; using OSPSuite.Utility.Extensions; using OSPSuite.Utility.FileLocker; -using OSPSuite.Utility.Logging; -using ApplicationSettings = MoBi.Core.ApplicationSettings; using CoreRegister = OSPSuite.Core.CoreRegister; -using IApplicationSettings = OSPSuite.Core.IApplicationSettings; +using IApplicationSettings = MoBi.Core.IApplicationSettings; using IContainer = OSPSuite.Utility.Container.IContainer; namespace MoBi.UI.Services @@ -117,7 +116,7 @@ private void initContext(IContainer container) var userSettingsPersistor = container.Resolve>(); userSettingsPersistor.Load(); - var applicationSettingsPersistor = container.Resolve>(); + var applicationSettingsPersistor = container.Resolve>(); applicationSettingsPersistor.Load(); InitCalculationMethodRepository(container); @@ -229,6 +228,7 @@ public void InitializeForStartup() container.Register(LifeStyle.Singleton); container.Register(LifeStyle.Singleton); + container.Register(LifeStyle.Singleton); container.Register(); container.Register(); container.Register(); @@ -236,14 +236,6 @@ public void InitializeForStartup() container.Register(LifeStyle.Singleton); - var config = container.Resolve(); - - //Register log4Net factory and set the path to configuration file - var log4NetLogFactory = new Log4NetLogFactory(); - log4NetLogFactory.Configure(new FileInfo(config.LogConfigurationFile)); - log4NetLogFactory.UpdateLogFileLocation(config.AllUsersFolderPath); - container.RegisterImplementationOf((ILogFactory) log4NetLogFactory); - registerRunOptionsIn(container); EnvironmentHelper.ApplicationName = () => "mobi"; diff --git a/src/MoBi.UI/app.config b/src/MoBi.UI/app.config index fdc425ab1..069879d3e 100644 --- a/src/MoBi.UI/app.config +++ b/src/MoBi.UI/app.config @@ -118,10 +118,6 @@ - - - - - \ No newline at end of file + diff --git a/src/MoBi.UI/packages.config b/src/MoBi.UI/packages.config index e23ae6369..1f43dc358 100644 --- a/src/MoBi.UI/packages.config +++ b/src/MoBi.UI/packages.config @@ -1,34 +1,33 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index a513c3230..f7373e344 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -10,7 +10,7 @@ Properties MoBi MoBi - v4.5.2 + v4.6.2 512 @@ -89,17 +89,17 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.2.0.86\lib\net452\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.1\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.2.0.86\lib\net452\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.1\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Presentation.7.2.0.86\lib\net452\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.1\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -110,8 +110,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.Utility.2.0.1.4\lib\net452\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll ..\..\packages\OSPSuite.SmartXLS.2.6.5.7\lib\net45\SX.dll @@ -191,10 +191,6 @@ OSPSuite.Dimensions.xml PreserveNewest - - log4net.config.xml - PreserveNewest - OSPSuite.SimModelSolver_CVODES282.dll PreserveNewest diff --git a/src/MoBi/Program.cs b/src/MoBi/Program.cs index 7249ec8b6..f4654027a 100644 --- a/src/MoBi/Program.cs +++ b/src/MoBi/Program.cs @@ -27,7 +27,6 @@ private static void Main(string[] args) catch (Exception e) { MessageBox.Show(e.ExceptionMessageWithStackTrace(), "Unhandled Exception", MessageBoxButtons.OK, MessageBoxIcon.Error); - e.LogError(); } } } diff --git a/src/MoBi/Properties/Resources.Designer.cs b/src/MoBi/Properties/Resources.Designer.cs index 8944380e6..94a728821 100644 --- a/src/MoBi/Properties/Resources.Designer.cs +++ b/src/MoBi/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace MoBi.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/src/MoBi/Properties/Settings.Designer.cs b/src/MoBi/Properties/Settings.Designer.cs index 757a046ba..a5180e7b5 100644 --- a/src/MoBi/Properties/Settings.Designer.cs +++ b/src/MoBi/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace MoBi.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/src/MoBi/app.config b/src/MoBi/app.config index 05d48f93f..bf5e93b08 100644 --- a/src/MoBi/app.config +++ b/src/MoBi/app.config @@ -1,7 +1,7 @@  - + @@ -125,10 +125,6 @@ - - - - diff --git a/src/MoBi/packages.config b/src/MoBi/packages.config index 3bc921f7c..3b05a81e5 100644 --- a/src/MoBi/packages.config +++ b/src/MoBi/packages.config @@ -1,18 +1,18 @@  - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/MoBi.Tests/Core/SessionFactoryProviderHelperForSpecs.cs b/tests/MoBi.Tests/Core/SessionFactoryProviderHelperForSpecs.cs index 5b9e53487..bba54dded 100644 --- a/tests/MoBi.Tests/Core/SessionFactoryProviderHelperForSpecs.cs +++ b/tests/MoBi.Tests/Core/SessionFactoryProviderHelperForSpecs.cs @@ -1,10 +1,7 @@ -using OSPSuite.Utility; -using OSPSuite.Utility.Extensions; using MoBi.Core.Serialization.ORM; using NHibernate; -using FakeItEasy; using OSPSuite.BDDHelper; -using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Utility; namespace MoBi.Core { @@ -21,9 +18,6 @@ public override void GlobalContext() _dataBaseFile = FileHelper.GenerateTemporaryFileName(); _sessionFactory = _sessionFactoryProvider.InitalizeSessionFactoryFor(_dataBaseFile); - - this.LogDebug("Database file {0}", _dataBaseFile); - } public override void GlobalCleanup() @@ -35,4 +29,4 @@ public override void GlobalCleanup() FileHelper.DeleteFile(_dataBaseFile); } } -} \ No newline at end of file +} \ No newline at end of file diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index 1b56514fb..a2cefc6b4 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -10,7 +10,7 @@ Properties MoBi MoBi.Tests - v4.5.2 + v4.6.2 512 @@ -139,14 +139,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.2.0.86\lib\net452\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.1\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.2.0.86\lib\net452\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.1\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.1.0.5\lib\net452\OSPSuite.DataBinding.dll @@ -154,11 +154,11 @@ ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.2.0.86\lib\net452\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.1\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.2.0.86\lib\net452\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.1\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -169,8 +169,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.Utility.2.0.1.4\lib\net452\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll diff --git a/tests/MoBi.Tests/app.config b/tests/MoBi.Tests/app.config index 24fb1f6fe..bc0bba0b8 100644 --- a/tests/MoBi.Tests/app.config +++ b/tests/MoBi.Tests/app.config @@ -122,10 +122,6 @@ - - - - - \ No newline at end of file + diff --git a/tests/MoBi.Tests/packages.config b/tests/MoBi.Tests/packages.config index 2d658a016..bf37c4010 100644 --- a/tests/MoBi.Tests/packages.config +++ b/tests/MoBi.Tests/packages.config @@ -1,36 +1,35 @@  - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index 325c82783..798c408d4 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -9,10 +9,11 @@ Properties MoBi.UI.Tests MoBi.UI.Tests - v4.5.2 + v4.6.2 512 + true @@ -197,14 +198,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.2.0.86\lib\net452\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.1\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.2.0.86\lib\net452\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.1\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.1.0.5\lib\net452\OSPSuite.DataBinding.dll @@ -215,11 +216,11 @@ ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.2.0.86\lib\net452\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.1\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.2.0.86\lib\net452\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.1\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -233,8 +234,8 @@ ..\..\packages\OSPSuite.UI.7.2.0.86\lib\net452\OSPSuite.UI.dll - - ..\..\packages\OSPSuite.Utility.2.0.1.4\lib\net452\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll diff --git a/tests/MoBi.UI.Tests/app.config b/tests/MoBi.UI.Tests/app.config index bd69703bf..d7628eeb2 100644 --- a/tests/MoBi.UI.Tests/app.config +++ b/tests/MoBi.UI.Tests/app.config @@ -98,10 +98,6 @@ - - - - - \ No newline at end of file + diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index fb01a001d..242317589 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -1,37 +1,35 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 322572ae0d820929c1bd2fedeac9fa6c04c65a11 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Fri, 1 Dec 2017 14:18:16 -0500 Subject: [PATCH 02/29] Remove log4net references that were still there --- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 3 --- src/MoBi.Presentation/MoBi.Presentation.csproj | 3 --- src/MoBi.UI/MoBi.UI.csproj | 3 --- tests/MoBi.Tests/MoBi.Tests.csproj | 3 --- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 7 ++----- tests/MoBi.UI.Tests/packages.config | 1 + 6 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index 593d566c7..fd59f29f3 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -146,9 +146,6 @@ ..\..\packages\Iesi.Collections.4.0.2\lib\net40\Iesi.Collections.dll - - ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index e8bba673e..e4d8efdb1 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -158,9 +158,6 @@ ..\..\packages\Iesi.Collections.4.0.2\lib\net40\Iesi.Collections.dll - - ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index eb1591da2..ada4c2c15 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -185,9 +185,6 @@ ..\..\packages\Iesi.Collections.4.0.2\lib\net40\Iesi.Collections.dll - - ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index a2cefc6b4..ae8bd2241 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -79,9 +79,6 @@ ..\..\pre\libsbmlcsP.dll - - ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index 798c408d4..e681f951c 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -143,9 +143,6 @@ ..\..\packages\Iesi.Collections.4.0.2\lib\net40\Iesi.Collections.dll - - ..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll @@ -231,8 +228,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.2.0.86\lib\net452\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.1\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index 242317589..af7c22f79 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -13,6 +13,7 @@ + From 721e31bb13c14e13eeb02520803abf2edba1bf43 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Tue, 12 Dec 2017 09:20:00 -0500 Subject: [PATCH 03/29] Update to latest version of core --- src/MoBi.Assets/MoBi.Assets.csproj | 11 +++--- src/MoBi.Assets/packages.config | 5 +-- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 35 ++++++++++--------- .../Runners/PkmlFileFromFolderRunner.cs | 6 ++-- .../Runners/ProjectFromFolderRunner.cs | 6 ++-- .../Runners/ProjectOverviewRunner.cs | 6 ++-- src/MoBi.BatchTool/Services/BatchLogger.cs | 17 ++++----- src/MoBi.BatchTool/packages.config | 17 ++++----- src/MoBi.Core/MoBi.Core.csproj | 23 ++++++------ src/MoBi.Core/Services/MoBiLogger.cs | 8 ++--- src/MoBi.Core/packages.config | 11 +++--- .../MoBi.Presentation.csproj | 23 ++++++------ src/MoBi.Presentation/packages.config | 11 +++--- src/MoBi.UI/MoBi.UI.csproj | 35 ++++++++++--------- src/MoBi.UI/packages.config | 17 ++++----- src/MoBi/MoBi.csproj | 19 +++++----- src/MoBi/app.config | 2 +- src/MoBi/packages.config | 9 ++--- tests/MoBi.Tests/MoBi.Tests.csproj | 27 +++++++------- tests/MoBi.Tests/packages.config | 13 +++---- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 35 ++++++++++--------- tests/MoBi.UI.Tests/packages.config | 17 ++++----- 22 files changed, 193 insertions(+), 160 deletions(-) diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index 77a9ef3d5..204dfe154 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -44,14 +44,17 @@ ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.1\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.4\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.1\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.4\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi.Assets/packages.config b/src/MoBi.Assets/packages.config index 8e5bb596f..28d60ebff 100644 --- a/src/MoBi.Assets/packages.config +++ b/src/MoBi.Assets/packages.config @@ -2,8 +2,9 @@ - - + + + diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index fd59f29f3..1ed850b52 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -149,6 +149,9 @@ ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + ..\..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll True @@ -195,26 +198,26 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.1\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.4\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.1\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.4\lib\net462\OSPSuite.Core.dll - - ..\..\packages\OSPSuite.DataBinding.2.1.0.5\lib\net452\OSPSuite.DataBinding.dll + + ..\..\packages\OSPSuite.DataBinding.2.2.0.1\lib\net462\OSPSuite.DataBinding.dll - - ..\..\packages\OSPSuite.DataBinding.DevExpress.2.1.0.4\lib\net452\OSPSuite.DataBinding.DevExpress.dll + + ..\..\packages\OSPSuite.DataBinding.DevExpress.2.2.0.1\lib\net462\OSPSuite.DataBinding.DevExpress.dll ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.1\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.4\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.1\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.4\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -225,15 +228,15 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.1\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.4\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.5.7\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/src/MoBi.BatchTool/Runners/PkmlFileFromFolderRunner.cs b/src/MoBi.BatchTool/Runners/PkmlFileFromFolderRunner.cs index 9eaeeab3f..7ab88af21 100644 --- a/src/MoBi.BatchTool/Runners/PkmlFileFromFolderRunner.cs +++ b/src/MoBi.BatchTool/Runners/PkmlFileFromFolderRunner.cs @@ -31,7 +31,7 @@ public Task RunBatch(dynamic parameters) var inputFolder = parameters.inputFolder; return Task.Run(() => { - _logger.AddInSeparator($"Starting batch run: {DateTime.Now.ToIsoFormat(withSeconds: true)}"); + _logger.AddInfo($"Starting batch run: {DateTime.Now.ToIsoFormat(withSeconds: true)}"); var inputDirectory = new DirectoryInfo(inputFolder); if (!inputDirectory.Exists) @@ -61,9 +61,9 @@ public Task RunBatch(dynamic parameters) } var end = DateTime.UtcNow; var timeSpent = end - begin; - _logger.AddInSeparator($"{allSimulationFiles.Length} simulations computed in '{timeSpent.ToDisplay()}'"); + _logger.AddInfo($"{allSimulationFiles.Length} simulations computed in '{timeSpent.ToDisplay()}'"); - _logger.AddInSeparator($"Batch run finished: {DateTime.Now.ToIsoFormat(withSeconds: true)}"); + _logger.AddInfo($"Batch run finished: {DateTime.Now.ToIsoFormat(withSeconds: true)}"); }); } diff --git a/src/MoBi.BatchTool/Runners/ProjectFromFolderRunner.cs b/src/MoBi.BatchTool/Runners/ProjectFromFolderRunner.cs index 1d8cc3e75..2e7210019 100644 --- a/src/MoBi.BatchTool/Runners/ProjectFromFolderRunner.cs +++ b/src/MoBi.BatchTool/Runners/ProjectFromFolderRunner.cs @@ -31,7 +31,7 @@ public Task RunBatch(dynamic parameters) var inputFolder = parameters.inputFolder; return Task.Run(() => { - _logger.AddInSeparator($"Starting batch run: {DateTime.Now.ToIsoFormat(withSeconds: true)}"); + _logger.AddInfo($"Starting batch run: {DateTime.Now.ToIsoFormat(withSeconds: true)}"); var inputDirectory = new DirectoryInfo(inputFolder); if (!inputDirectory.Exists) @@ -61,8 +61,8 @@ public Task RunBatch(dynamic parameters) } var end = DateTime.UtcNow; var timeSpent = end - begin; - _logger.AddInSeparator($"{allProjectFiles.Length} projects computed in '{timeSpent.ToDisplay()}'"); - _logger.AddInSeparator($"Batch run finished: {DateTime.Now.ToIsoFormat(withSeconds: true)}"); + _logger.AddInfo($"{allProjectFiles.Length} projects computed in '{timeSpent.ToDisplay()}'"); + _logger.AddInfo($"Batch run finished: {DateTime.Now.ToIsoFormat(withSeconds: true)}"); }); } diff --git a/src/MoBi.BatchTool/Runners/ProjectOverviewRunner.cs b/src/MoBi.BatchTool/Runners/ProjectOverviewRunner.cs index 9b681543b..89daf3e25 100644 --- a/src/MoBi.BatchTool/Runners/ProjectOverviewRunner.cs +++ b/src/MoBi.BatchTool/Runners/ProjectOverviewRunner.cs @@ -47,7 +47,7 @@ public Task RunBatch(dynamic parameters) var outputFile = Path.Combine(inputFolder, "output.json"); - _logger.AddInSeparator($"Starting project overview run for {allProjectFiles.Length} projects: {DateTime.Now.ToIsoFormat()}"); + _logger.AddInfo($"Starting project overview run for {allProjectFiles.Length} projects: {DateTime.Now.ToIsoFormat()}"); var begin = DateTime.UtcNow; @@ -61,14 +61,14 @@ public Task RunBatch(dynamic parameters) var end = DateTime.UtcNow; var timeSpent = end - begin; - _logger.AddInSeparator($"Finished project overview run for {allProjectFiles.Length} projects in {timeSpent.ToDisplay()}'"); + _logger.AddInfo($"Finished project overview run for {allProjectFiles.Length} projects in {timeSpent.ToDisplay()}'"); }); } private ProjectInfo addProjectInfo(FileInfo projectFile) { var projectInfo = new ProjectInfo {FullPath = projectFile.FullName, Name = projectFile.Name}; - _logger.AddInSeparator($"Loading project file '{projectFile.FullName}'"); + _logger.AddInfo($"Loading project file '{projectFile.FullName}'"); try { diff --git a/src/MoBi.BatchTool/Services/BatchLogger.cs b/src/MoBi.BatchTool/Services/BatchLogger.cs index b9f37707b..d14af5d5d 100644 --- a/src/MoBi.BatchTool/Services/BatchLogger.cs +++ b/src/MoBi.BatchTool/Services/BatchLogger.cs @@ -1,8 +1,9 @@ using System.Collections.Generic; -using OSPSuite.Core.Domain; +using Microsoft.Extensions.Logging; using OSPSuite.Core.Events; using OSPSuite.Core.Services; using OSPSuite.Utility.Events; +using ILogger = OSPSuite.Core.Services.ILogger; namespace MoBi.BatchTool.Services { @@ -22,18 +23,18 @@ public BatchLogger(IEventPublisher eventPublisher) _eventPublisher = eventPublisher; } - public void AddToLog(string message, NotificationType messageStatus = NotificationType.None) - { - var logEntry = new LogEntry(messageStatus, message); - _entries.Add(logEntry.Display); - _eventPublisher.PublishEvent(new LogEntryEvent(logEntry)); - } - public void Clear() { _entries.Clear(); } public IEnumerable Entries => _entries; + + public void AddToLog(string message, LogLevel logLevel, string categoryName) + { + var logEntry = new LogEntry(logLevel, message); + _entries.Add(logEntry.Display); + _eventPublisher.PublishEvent(new LogEntryEvent(logEntry)); + } } } \ No newline at end of file diff --git a/src/MoBi.BatchTool/packages.config b/src/MoBi.BatchTool/packages.config index 1f43dc358..de48943ac 100644 --- a/src/MoBi.BatchTool/packages.config +++ b/src/MoBi.BatchTool/packages.config @@ -7,23 +7,24 @@ + - - - - + + + + - - + + - + - + diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index b5ea24864..24bc0da3c 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -90,6 +90,9 @@ ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll @@ -100,20 +103,20 @@ ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.1\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.4\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.1\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.4\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.1\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.4\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.1\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.4\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -128,8 +131,8 @@ ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.5.7\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/src/MoBi.Core/Services/MoBiLogger.cs b/src/MoBi.Core/Services/MoBiLogger.cs index 6addbe2ed..4d5ddcd07 100644 --- a/src/MoBi.Core/Services/MoBiLogger.cs +++ b/src/MoBi.Core/Services/MoBiLogger.cs @@ -1,14 +1,14 @@ using System.Diagnostics; -using OSPSuite.Core.Domain; -using OSPSuite.Core.Services; +using Microsoft.Extensions.Logging; +using ILogger = OSPSuite.Core.Services.ILogger; namespace MoBi.Core.Services { public class MoBiLogger : ILogger { - public void AddToLog(string message, NotificationType messageStatus = NotificationType.None) + public void AddToLog(string message, LogLevel logLevel, string categoryName) { - Debug.Print($"{messageStatus} - {message}"); + Debug.Print($"{logLevel} - {message}"); } } } \ No newline at end of file diff --git a/src/MoBi.Core/packages.config b/src/MoBi.Core/packages.config index a363719e4..710644a27 100644 --- a/src/MoBi.Core/packages.config +++ b/src/MoBi.Core/packages.config @@ -7,17 +7,18 @@ + - - + + - - + + - + diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index e4d8efdb1..b2d1ace6a 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -162,6 +162,9 @@ ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll @@ -200,20 +203,20 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.1\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.4\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.1\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.4\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.1\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.4\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.1\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.4\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -228,8 +231,8 @@ ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.5.7\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/src/MoBi.Presentation/packages.config b/src/MoBi.Presentation/packages.config index 6f9b2ef76..baf781f58 100644 --- a/src/MoBi.Presentation/packages.config +++ b/src/MoBi.Presentation/packages.config @@ -8,19 +8,20 @@ + - - + + - - + + - + diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index ada4c2c15..5f5f02788 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -189,6 +189,9 @@ ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + ..\..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll @@ -236,26 +239,26 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.1\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.4\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.1\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.4\lib\net462\OSPSuite.Core.dll - - ..\..\packages\OSPSuite.DataBinding.2.1.0.5\lib\net452\OSPSuite.DataBinding.dll + + ..\..\packages\OSPSuite.DataBinding.2.2.0.1\lib\net462\OSPSuite.DataBinding.dll - - ..\..\packages\OSPSuite.DataBinding.DevExpress.2.1.0.4\lib\net452\OSPSuite.DataBinding.DevExpress.dll + + ..\..\packages\OSPSuite.DataBinding.DevExpress.2.2.0.1\lib\net462\OSPSuite.DataBinding.DevExpress.dll ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.1\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.4\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.1\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.4\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -266,15 +269,15 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.1\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.4\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.5.7\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/src/MoBi.UI/packages.config b/src/MoBi.UI/packages.config index 1f43dc358..de48943ac 100644 --- a/src/MoBi.UI/packages.config +++ b/src/MoBi.UI/packages.config @@ -7,23 +7,24 @@ + - - - - + + + + - - + + - + - + diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index f7373e344..a33e352b4 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -79,6 +79,9 @@ ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + ..\..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll @@ -89,17 +92,17 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.1\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.4\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.1\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.4\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.1\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.4\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -113,8 +116,8 @@ ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.5.7\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/src/MoBi/app.config b/src/MoBi/app.config index bf5e93b08..7f1d9f12a 100644 --- a/src/MoBi/app.config +++ b/src/MoBi/app.config @@ -107,7 +107,7 @@ - + diff --git a/src/MoBi/packages.config b/src/MoBi/packages.config index 3b05a81e5..5fc276aa1 100644 --- a/src/MoBi/packages.config +++ b/src/MoBi/packages.config @@ -2,14 +2,15 @@ - - + + + - + - + diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index ae8bd2241..9ac6ef5b9 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -83,6 +83,9 @@ ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + ..\..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll True @@ -136,26 +139,26 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.1\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.4\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.1\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.4\lib\net462\OSPSuite.Core.dll - - ..\..\packages\OSPSuite.DataBinding.2.1.0.5\lib\net452\OSPSuite.DataBinding.dll + + ..\..\packages\OSPSuite.DataBinding.2.2.0.1\lib\net462\OSPSuite.DataBinding.dll ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.1\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.4\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.1\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.4\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -170,8 +173,8 @@ ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.5.7\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/tests/MoBi.Tests/packages.config b/tests/MoBi.Tests/packages.config index bf37c4010..4b54f464a 100644 --- a/tests/MoBi.Tests/packages.config +++ b/tests/MoBi.Tests/packages.config @@ -8,23 +8,24 @@ + - + - - + + - - + + - + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index e681f951c..81ee5510c 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -146,6 +146,9 @@ ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + ..\..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll True @@ -195,29 +198,29 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.1\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.4\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.1\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.4\lib\net462\OSPSuite.Core.dll - - ..\..\packages\OSPSuite.DataBinding.2.1.0.5\lib\net452\OSPSuite.DataBinding.dll + + ..\..\packages\OSPSuite.DataBinding.2.2.0.1\lib\net462\OSPSuite.DataBinding.dll - - ..\..\packages\OSPSuite.DataBinding.DevExpress.2.1.0.4\lib\net452\OSPSuite.DataBinding.DevExpress.dll + + ..\..\packages\OSPSuite.DataBinding.DevExpress.2.2.0.1\lib\net462\OSPSuite.DataBinding.DevExpress.dll ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.1\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.4\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.1\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.4\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -228,15 +231,15 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.1\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.4\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.5.7\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index af7c22f79..a49c733f1 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -8,25 +8,26 @@ + - - + - - - + + + - - + + - + + From 10fdff6269ebd8787f8702dd1d80a6d4d40f51ed Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Tue, 19 Dec 2017 12:44:02 -0500 Subject: [PATCH 04/29] Reintegrate branch 7.2.1 --- src/MoBi.BatchTool/App.config | 2 +- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 1 + src/MoBi.Core/MoBi.Core.csproj | 1 + src/MoBi.Core/app.config | 2 +- src/MoBi.Presentation/MoBi.Presentation.csproj | 1 + src/MoBi.Presentation/app.config | 2 +- src/MoBi.UI/MoBi.UI.csproj | 1 + src/MoBi.UI/app.config | 2 +- src/MoBi/app.config | 2 +- tests/MoBi.Tests/MoBi.Tests.csproj | 1 + tests/MoBi.Tests/app.config | 2 +- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 1 + tests/MoBi.UI.Tests/app.config | 2 +- 13 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/MoBi.BatchTool/App.config b/src/MoBi.BatchTool/App.config index 728c74809..2f2547013 100644 --- a/src/MoBi.BatchTool/App.config +++ b/src/MoBi.BatchTool/App.config @@ -83,7 +83,7 @@ - + diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index 1ed850b52..cad141dcf 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -236,6 +236,7 @@ + ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index 24bc0da3c..0fe407bca 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -132,6 +132,7 @@ + ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/src/MoBi.Core/app.config b/src/MoBi.Core/app.config index 959f960f3..64703bf42 100644 --- a/src/MoBi.Core/app.config +++ b/src/MoBi.Core/app.config @@ -56,7 +56,7 @@ - + diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index b2d1ace6a..2c050743a 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -232,6 +232,7 @@ + ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/src/MoBi.Presentation/app.config b/src/MoBi.Presentation/app.config index 6f186a1e9..5566a9fe6 100644 --- a/src/MoBi.Presentation/app.config +++ b/src/MoBi.Presentation/app.config @@ -76,7 +76,7 @@ - + diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index 5f5f02788..fc716e5fd 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -277,6 +277,7 @@ + ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/src/MoBi.UI/app.config b/src/MoBi.UI/app.config index 069879d3e..c7e373872 100644 --- a/src/MoBi.UI/app.config +++ b/src/MoBi.UI/app.config @@ -88,7 +88,7 @@ - + diff --git a/src/MoBi/app.config b/src/MoBi/app.config index 7f1d9f12a..fbaec2e96 100644 --- a/src/MoBi/app.config +++ b/src/MoBi/app.config @@ -107,7 +107,7 @@ - + diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index 9ac6ef5b9..4e96508f4 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -174,6 +174,7 @@ + ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/tests/MoBi.Tests/app.config b/tests/MoBi.Tests/app.config index bc0bba0b8..082982aa5 100644 --- a/tests/MoBi.Tests/app.config +++ b/tests/MoBi.Tests/app.config @@ -80,7 +80,7 @@ - + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index 81ee5510c..7daa53f09 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -239,6 +239,7 @@ + ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/tests/MoBi.UI.Tests/app.config b/tests/MoBi.UI.Tests/app.config index d7628eeb2..60578d0bf 100644 --- a/tests/MoBi.UI.Tests/app.config +++ b/tests/MoBi.UI.Tests/app.config @@ -12,7 +12,7 @@ - + From ca45ded38edfdfc5959f344c27602cb59326efa3 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Tue, 19 Dec 2017 16:29:15 -0500 Subject: [PATCH 05/29] Reintegrate branch 7.2.1 --- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 1 - src/MoBi.Core/MoBi.Core.csproj | 1 - src/MoBi.Presentation/MoBi.Presentation.csproj | 1 - src/MoBi.UI/MoBi.UI.csproj | 1 - tests/MoBi.Tests/MoBi.Tests.csproj | 1 - tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 1 - 6 files changed, 6 deletions(-) diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index cad141dcf..1ed850b52 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -236,7 +236,6 @@ - ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index 0fe407bca..24bc0da3c 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -132,7 +132,6 @@ - ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index 2c050743a..b2d1ace6a 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -232,7 +232,6 @@ - ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index fc716e5fd..5f5f02788 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -277,7 +277,6 @@ - ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index 4e96508f4..9ac6ef5b9 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -174,7 +174,6 @@ - ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index 7daa53f09..81ee5510c 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -239,7 +239,6 @@ - ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll From 5a336f5feab40da89270ee906ef27cb75c577bbc Mon Sep 17 00:00:00 2001 From: Juri Solodenko Date: Fri, 12 Jan 2018 12:04:19 +0100 Subject: [PATCH 06/29] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 24a926e05..cbced0104 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ where it should be considered. Everyone interacting in the Open Systems Pharmacology community (codebases, issue trackers, chat rooms, mailing lists etc...) is expected to follow the Open Systems Pharmacology [code of conduct](https://github.com/Open-Systems-Pharmacology/Suite/blob/master/CODE_OF_CONDUCT.md). ## Contribution -We encourage contribution to the Open Systems Pharmacology community. Before getting started please read the [contribution guidelines](https://github.com/Open-Systems-Pharmacology/Suite/blob/master/CONTRIBUTING.md). If you are contributing code, please be familiar with the [coding standard](https://github.com/Open-Systems-Pharmacology/Suite/blob/master/CODING_STANDARD.md). +We encourage contribution to the Open Systems Pharmacology community. Before getting started please read the [contribution guidelines](https://github.com/Open-Systems-Pharmacology/Suite/blob/master/CONTRIBUTING.md). If you are contributing code, please be familiar with the [coding standard](https://github.com/Open-Systems-Pharmacology/Suite/blob/master/CODING_STANDARDS.md). ## License MoBi® is released under the [GPLv2 License](LICENSE). From 8225458ac7c9c0f67fcefc14672a167409423dd6 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Fri, 26 Jan 2018 14:10:06 -0500 Subject: [PATCH 07/29] Fixes #231 incorporate value origin in mobi (#232) * Fixes #231 incorporate value origin in MoBi * Fixes #231 incorporate value origin in MoBi --- src/MoBi.Assets/AppConstants.cs | 2 +- src/MoBi.Assets/MoBi.Assets.csproj | 8 +- src/MoBi.Assets/packages.config | 4 +- src/MoBi.BatchTool/App.config | 6 +- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 39 +++--- src/MoBi.BatchTool/packages.config | 14 +- ...artValueFromQuantityInSimulationCommand.cs | 2 +- .../SynchronizeParameterStartValueCommand.cs | 2 +- .../SynchronizeParameterValueCommand.cs | 2 +- src/MoBi.Core/MoBi.Core.csproj | 28 ++-- src/MoBi.Core/app.config | 2 +- src/MoBi.Core/packages.config | 12 +- .../DTO/FavoriteParameterDTO.cs | 14 +- src/MoBi.Presentation/DTO/ParameterDTO.cs | 25 ++-- src/MoBi.Presentation/DTO/StartValueDTO.cs | 15 +- src/MoBi.Presentation/DTO/ValueOriginDTO.cs | 21 +++ .../MoBi.Presentation.csproj | 33 +++-- .../AbstractParameterBasePresenter.cs | 8 +- .../EditFavoritesPresenterInSimulation.cs | 4 +- .../Presenter/EditParameterPresenter.cs | 58 ++++---- .../Presenter/EditValueOriginPresenter.cs | 42 ++++++ .../Presenter/IParameterPresenter.cs | 3 +- .../Presenter/IStartValuesPresenter.cs | 5 +- .../Presenter/StartValuesPresenter.cs | 5 +- .../Interaction/AbstractStartValuesTask.cs | 15 +- .../Tasks/Interaction/IStartValuesTask.cs | 6 +- .../InteractionTaskForParameter.cs | 12 +- .../Views/IEditParameterView.cs | 1 + .../Views/IEditValueOriginView.cs | 13 ++ src/MoBi.Presentation/app.config | 2 +- src/MoBi.Presentation/packages.config | 14 +- src/MoBi.UI/MoBi.UI.csproj | 38 ++--- .../Views/BaseStartValuesView.Designer.cs | 1 + src/MoBi.UI/Views/BaseStartValuesView.cs | 46 +++--- .../Views/EditFavoritesView.Designer.cs | 1 + src/MoBi.UI/Views/EditFavoritesView.cs | 16 ++- .../Views/EditParameterListView.Designer.cs | 1 + src/MoBi.UI/Views/EditParameterListView.cs | 14 +- .../Views/EditParameterView.Designer.cs | 131 +++++++++--------- src/MoBi.UI/Views/EditParameterView.cs | 25 ++-- .../Views/EditValueOriginView.Designer.cs | 75 ++++++++++ src/MoBi.UI/Views/EditValueOriginView.cs | 65 +++++++++ src/MoBi.UI/Views/MoleculeStartValuesView.cs | 6 +- src/MoBi.UI/Views/ParameterStartValuesView.cs | 5 +- src/MoBi.UI/app.config | 2 +- src/MoBi.UI/packages.config | 14 +- src/MoBi/MoBi.csproj | 27 ++-- src/MoBi/app.config | 6 +- src/MoBi/packages.config | 8 +- ...chronizeParameterStartValueCommandSpecs.cs | 6 +- tests/MoBi.Tests/MoBi.Tests.csproj | 33 +++-- .../EditParameterPresenterSpecs.cs | 10 +- ...mportQuantityDTOMapperForMoleculesSpecs.cs | 2 +- .../MoleculeStartValuesPresenterSpecs.cs | 6 +- .../Tasks/MoleculeStartValuesTaskSpecs.cs | 2 +- .../Tasks/ParameterStartValueTaskSpecs.cs | 14 +- tests/MoBi.Tests/app.config | 2 +- tests/MoBi.Tests/packages.config | 14 +- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 35 +++-- tests/MoBi.UI.Tests/app.config | 2 +- tests/MoBi.UI.Tests/packages.config | 16 +-- 61 files changed, 623 insertions(+), 417 deletions(-) create mode 100644 src/MoBi.Presentation/DTO/ValueOriginDTO.cs create mode 100644 src/MoBi.Presentation/Presenter/EditValueOriginPresenter.cs create mode 100644 src/MoBi.Presentation/Views/IEditValueOriginView.cs create mode 100644 src/MoBi.UI/Views/EditValueOriginView.Designer.cs create mode 100644 src/MoBi.UI/Views/EditValueOriginView.cs diff --git a/src/MoBi.Assets/AppConstants.cs b/src/MoBi.Assets/AppConstants.cs index 15b86910b..75b811eaf 100644 --- a/src/MoBi.Assets/AppConstants.cs +++ b/src/MoBi.Assets/AppConstants.cs @@ -597,7 +597,7 @@ public static string CreateFormula(string formulaName) public static string SetConstantValueFormula(string objectType, ConstantFormula constantFormula, string newValueInDisplayUnits, string oldValueInDisplayUnits, string ownerIdentifier) { - return string.Format("Value of {3} '{2}' to {0} from {1}", newValueInDisplayUnits, oldValueInDisplayUnits, ownerIdentifier, objectType); + return string.Format("Value of {3} '{2}' set from '{1}' to '{0}'", newValueInDisplayUnits, oldValueInDisplayUnits, ownerIdentifier, objectType.ToLowerInvariant()); } public static string UpdateFromParameterIdentification(IModelCoreSimulation simulation) diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index 204dfe154..9fb138bde 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -50,11 +50,11 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.4\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.24\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.4\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.24\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi.Assets/packages.config b/src/MoBi.Assets/packages.config index 28d60ebff..e3083f6cc 100644 --- a/src/MoBi.Assets/packages.config +++ b/src/MoBi.Assets/packages.config @@ -3,8 +3,8 @@ - - + + diff --git a/src/MoBi.BatchTool/App.config b/src/MoBi.BatchTool/App.config index 2f2547013..0daa4864d 100644 --- a/src/MoBi.BatchTool/App.config +++ b/src/MoBi.BatchTool/App.config @@ -91,7 +91,7 @@ - + @@ -109,10 +109,6 @@ - - - - diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index 1ed850b52..17c78734e 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -9,6 +9,7 @@ Properties MoBi.BatchTool MoBi.BatchTool + true v4.6.2 512 @@ -198,11 +199,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.4\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.24\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.4\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.24\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.1\lib\net462\OSPSuite.DataBinding.dll @@ -213,11 +214,11 @@ ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.4\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.24\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.4\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.24\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -228,25 +229,22 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.4\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.24\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.5.9\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.6\lib\net45\SX.dll - - ..\..\packages\System.Data.SQLite.Core.1.0.105.2\lib\net451\System.Data.SQLite.dll - - - ..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll + + ..\..\packages\System.Data.SQLite.Core.1.0.106.0\lib\net46\System.Data.SQLite.dll @@ -351,19 +349,18 @@ - + SQLite.Interop.dll - PreserveNewest - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/src/MoBi.UI/Views/EditParameterListView.cs b/src/MoBi.UI/Views/EditParameterListView.cs index 970da26e6..25b88c583 100644 --- a/src/MoBi.UI/Views/EditParameterListView.cs +++ b/src/MoBi.UI/Views/EditParameterListView.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Linq; using System.Windows.Forms; using DevExpress.Utils; using DevExpress.XtraBars; @@ -215,10 +216,30 @@ public void SetVisibility(PathElement pathElement, bool isVisible) _pathBinder.SetVisibility(pathElement, isVisible); } + public IReadOnlyList SelectedParameters + { + get { return _gridView.GetSelectedRows().Select(rowHandle => _gridViewBinder.ElementAt(rowHandle)).ToList(); } + set + { + if (!value.Any()) + return; + + //Need to clear selection before setting another one programatically. Otherwise they overlap + _gridView.ClearSelection(); + + var firstRowHandle = _gridViewBinder.RowHandleFor(value.First()); + var lastRowHandle = _gridViewBinder.RowHandleFor(value.Last()); + _gridView.SelectRows(firstRowHandle, lastRowHandle); + + //Required to ensure that the background is still selected + if (firstRowHandle == lastRowHandle) + _gridView.FocusedRowHandle = firstRowHandle; + } + } + private void hideEditor() { _unitControl.Hide(); } - } } \ No newline at end of file diff --git a/src/MoBi.UI/Views/UserDefinedParametersView.Designer.cs b/src/MoBi.UI/Views/UserDefinedParametersView.Designer.cs new file mode 100644 index 000000000..2c40dca04 --- /dev/null +++ b/src/MoBi.UI/Views/UserDefinedParametersView.Designer.cs @@ -0,0 +1,37 @@ +namespace MoBi.UI.Views +{ + partial class UserDefinedParametersView + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + components = new System.ComponentModel.Container(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + } + + #endregion + } +} diff --git a/src/MoBi.UI/Views/UserDefinedParametersView.cs b/src/MoBi.UI/Views/UserDefinedParametersView.cs new file mode 100644 index 000000000..54fff7536 --- /dev/null +++ b/src/MoBi.UI/Views/UserDefinedParametersView.cs @@ -0,0 +1,26 @@ +using MoBi.Presentation.Presenter; +using MoBi.Presentation.Views; +using OSPSuite.Presentation.Views; +using OSPSuite.UI.Controls; +using OSPSuite.UI.Extensions; + +namespace MoBi.UI.Views +{ + public partial class UserDefinedParametersView : BaseUserControl, IUserDefinedParametersView + { + public UserDefinedParametersView() + { + InitializeComponent(); + } + + public void AttachPresenter(IUserDefinedParametersPresenter presenter) + { + //nothing to do here + } + + public void AddParametersView(IView view) + { + this.FillWith(view); + } + } +} \ No newline at end of file diff --git a/src/MoBi.UI/packages.config b/src/MoBi.UI/packages.config index 4fb5eb09e..a0296fd94 100644 --- a/src/MoBi.UI/packages.config +++ b/src/MoBi.UI/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index e3538ee20..f95facb6c 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -93,17 +93,17 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.27\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.30\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.27\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.30\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.27\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.30\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi/packages.config b/src/MoBi/packages.config index bed8ccfee..76cf8102a 100644 --- a/src/MoBi/packages.config +++ b/src/MoBi/packages.config @@ -3,11 +3,11 @@ - - + + - + diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index 29ed747e6..e6a63af3d 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -139,14 +139,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.27\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.30\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.27\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.30\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.1\lib\net462\OSPSuite.DataBinding.dll @@ -154,11 +154,11 @@ ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.27\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.30\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.27\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.30\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/tests/MoBi.Tests/Presentation/EditFavoritesInSimulationPresenterSpecs.cs b/tests/MoBi.Tests/Presentation/EditFavoritesInSimulationPresenterSpecs.cs index d119d576f..96732c2aa 100644 --- a/tests/MoBi.Tests/Presentation/EditFavoritesInSimulationPresenterSpecs.cs +++ b/tests/MoBi.Tests/Presentation/EditFavoritesInSimulationPresenterSpecs.cs @@ -1,51 +1,33 @@ using System.Collections.Generic; -using OSPSuite.BDDHelper; using FakeItEasy; using MoBi.Core.Domain.Model; -using MoBi.Core.Events; -using MoBi.Core.Services; -using MoBi.Presentation.DTO; -using MoBi.Presentation.Mappers; using MoBi.Presentation.Presenter; -using MoBi.Presentation.Tasks.Interaction; using MoBi.Presentation.Views; +using OSPSuite.BDDHelper; using OSPSuite.Core.Domain; -using OSPSuite.Core.Domain.Builder; using OSPSuite.Core.Domain.Repositories; using OSPSuite.Core.Domain.Services; using OSPSuite.Core.Events; using OSPSuite.Core.Services; -using OSPSuite.Presentation.Presenters.ContextMenus; namespace MoBi.Presentation { public abstract class concern_for_EditFavoritesInSimulationPresenter : ContextSpecification { - protected IViewItemContextMenuFactory _viewItemContextMenuFactory; protected IEntityPathResolver _entityPathResolver; - protected IFavoriteTask _favoriteTask; - protected IInteractionTasksForParameter _interactionTasksForParameter; protected IFavoriteRepository _favoriteRepository; - protected IEditParameterListView _view; - protected IQuantityTask _quantityTask; - protected IInteractionTaskContext _interactionTaskContext; - protected IFormulaToFormulaBuilderDTOMapper _formulaToFormulaBuilderDTOMapper; - protected IParameterToParameterDTOMapper _parameterToFavoriteParameterDTOMapper; + protected IEditFavoritesView _view; + protected IEditParameterListPresenter _editParameterListPresenter; + private IFavoriteTask _favoriteTask; protected override void Context() { - _viewItemContextMenuFactory = A.Fake(); _entityPathResolver = A.Fake(); - _favoriteTask = A.Fake(); - _interactionTasksForParameter = A.Fake(); _favoriteRepository = A.Fake(); - _view = A.Fake(); - _quantityTask = A.Fake(); - _interactionTaskContext = A.Fake(); - _formulaToFormulaBuilderDTOMapper = A.Fake(); - _parameterToFavoriteParameterDTOMapper = A.Fake(); - sut = new EditFavoritesInSimulationPresenter(_view, _quantityTask, _interactionTaskContext, _formulaToFormulaBuilderDTOMapper, _parameterToFavoriteParameterDTOMapper, - _favoriteRepository, _interactionTasksForParameter, _favoriteTask, _entityPathResolver, _viewItemContextMenuFactory); + _view = A.Fake(); + _editParameterListPresenter = A.Fake(); + _favoriteTask= A.Fake(); + sut = new EditFavoritesInSimulationPresenter(_view, _favoriteRepository, _entityPathResolver, _editParameterListPresenter, _favoriteTask); } } @@ -53,16 +35,13 @@ public class When_handling_a_quantity_changed_event_and_the_quantity_is_a_favori { private IParameter _quantity; private IMoBiSimulation _simulation; - private ParameterDTO _favoriteParameterDTO; protected override void Context() { base.Context(); _quantity = new Parameter(); A.CallTo(() => _favoriteRepository.All()).Returns(new[] {string.Empty}); - _favoriteParameterDTO = new ParameterDTO(_quantity); - A.CallTo(() => _parameterToFavoriteParameterDTOMapper.MapFrom(_quantity)).Returns(_favoriteParameterDTO); - + _simulation = new MoBiSimulation { BuildConfiguration = new MoBiBuildConfiguration(), @@ -83,7 +62,7 @@ protected override void Because() [Observation] public void the_view_should_be_rebound() { - A.CallTo(() => _view.BindTo(A>._)).MustHaveHappened(); + A.CallTo(() => _editParameterListPresenter.Edit(A>._)).MustHaveHappened(); } } -} +} \ No newline at end of file diff --git a/tests/MoBi.Tests/Presentation/EditFavoritesPresenterSpecs.cs b/tests/MoBi.Tests/Presentation/EditFavoritesPresenterSpecs.cs index a3892e2a5..baadce366 100644 --- a/tests/MoBi.Tests/Presentation/EditFavoritesPresenterSpecs.cs +++ b/tests/MoBi.Tests/Presentation/EditFavoritesPresenterSpecs.cs @@ -1,112 +1,117 @@ -using OSPSuite.BDDHelper; +using System.Collections.Generic; using FakeItEasy; using MoBi.Core.Domain.Model; -using MoBi.Core.Domain.Model.Diagram; -using MoBi.Core.Events; -using MoBi.Core.Services; -using MoBi.Presentation.DTO; -using MoBi.Presentation.Mappers; -using MoBi.Presentation.MenusAndBars.ContextMenus; using MoBi.Presentation.Presenter; -using MoBi.Presentation.Tasks.Interaction; using MoBi.Presentation.Views; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; using OSPSuite.Core.Domain; using OSPSuite.Core.Domain.Repositories; using OSPSuite.Core.Domain.Services; +using OSPSuite.Core.Events; using OSPSuite.Core.Services; -using OSPSuite.Presentation.Presenters.ContextMenus; namespace MoBi.Presentation { public abstract class concern_for_EditFavoritesPresenter : ContextSpecification { - protected IEditParameterListView _view; - protected IQuantityTask _quantityTask; - protected IInteractionTaskContext _interactionTaskContext; - protected IFormulaToFormulaBuilderDTOMapper _formulaMapper; - protected IParameterToParameterDTOMapper _favoriteMapper; + protected IEditFavoritesView _view; protected IFavoriteRepository _favoriteRepository; - protected IInteractionTasksForParameter _parameterTask; - protected IFavoriteTask _favoriteTask; protected IEntityPathResolver _entityPathResolver; protected IMoBiContext _context; - private IViewItemContextMenuFactory _contextMenufactory; + protected IEditParameterListPresenter _editParameterListPresenter; + protected IFavoriteTask _favoriteTask; + protected IMoBiSpatialStructure _spatialStructure; + protected IParameter _para; + protected IParameter _fav; protected override void Context() { - _view = A.Fake(); - _quantityTask = A.Fake(); - _interactionTaskContext = A.Fake(); - _formulaMapper = A.Fake(); - _favoriteMapper = A.Fake(); + _view = A.Fake(); + _editParameterListPresenter = A.Fake(); _favoriteRepository = A.Fake(); - _parameterTask = A.Fake(); - _favoriteTask = A.Fake(); _entityPathResolver = new EntityPathResolver(new ObjectPathFactory(A.Fake())); - _contextMenufactory = A.Fake(); - _context = A.Fake(); - A.CallTo(() => _interactionTaskContext.Context).Returns(_context); - sut = new EditFavoritesInSpatialStructurePresenter(_view, _quantityTask, _interactionTaskContext, - _formulaMapper, _favoriteMapper, _favoriteRepository, _parameterTask, _favoriteTask, _entityPathResolver,_contextMenufactory); + _favoriteTask = A.Fake(); + + sut = new EditFavoritesInSpatialStructurePresenter(_view, _favoriteRepository, _entityPathResolver, _editParameterListPresenter, _favoriteTask); + _spatialStructure = new MoBiSpatialStructure(); + var cont = new Container().WithName("root"); + _para = new Parameter().WithName("P").WithParentContainer(cont); + _fav = new Parameter().WithName("F").WithParentContainer(cont); + _spatialStructure.AddTopContainer(cont); + A.CallTo(() => _favoriteRepository.All()).Returns(new[] {_entityPathResolver.PathFor(_fav)}); } } - class When_go_to_is_called_for_a_favorite : concern_for_EditFavoritesPresenter + internal class When_editing_the_spatial_structure : concern_for_EditFavoritesPresenter { - private ParameterDTO _favoriteDTO; - private IParameter _parameter; + protected override void Because() + { + sut.Edit(_spatialStructure); + } + + [Observation] + public void should_show_the_favorites() + { + A.CallTo(() => _editParameterListPresenter.Edit(A>._)).MustHaveHappened(); + } + } + + public class When_the_favorite_parameters_is_moving_selected_parameters_up : concern_for_EditFavoritesPresenter + { + private IParameter _parameter1; + private IParameter _parameter2; + private IEnumerable _movedParameters; + private IParameter[] _selectedParameters; protected override void Context() { - base.Context(); - _parameter = new Parameter().WithName("P"); - _favoriteDTO = new ParameterDTO(_parameter); + _parameter1 = new Parameter().WithName("PATH1"); + _parameter2 = new Parameter().WithName("PATH2"); + + _selectedParameters = new[] {_parameter1, _parameter2}; + A.CallTo(() => _editParameterListPresenter.SelectedParameters).Returns(_selectedParameters); + + A.CallTo(() => _favoriteTask.MoveUp(A>._)) + .Invokes(x => _movedParameters = x.GetArgument>(0)); } protected override void Because() { - sut.GoTo(_favoriteDTO); + sut.MoveUp(); } [Observation] - public void should_raise_an_entity_selcted_event() + public void should_retrieve_the_selected_parameters_from_the_view_and_move_them_up() { - A.CallTo(() => _context.PublishEvent(A.That - .Matches(e=>e.ObjectBase.Equals(_parameter)))) - .MustHaveHappened(); - + _movedParameters.ShouldOnlyContainInOrder("PATH1", "PATH2"); + } + + [Observation] + public void should_update_the_parameter_selection() + { + _editParameterListPresenter.SelectedParameters.ShouldBeEqualTo(_selectedParameters); } } - internal class When_editing_the_spatial_structure : concern_for_EditFavoritesPresenter + public class When_the_favorite_parameters_presenter_is_notified_that_the_order_of_favorites_was_updated : concern_for_EditFavoritesPresenter { - private IMoBiSpatialStructure _spatialStructure; - private IParameter _para; - private IParameter _fav; - protected override void Context() { base.Context(); - _spatialStructure = new MoBiSpatialStructure(); - var cont = new Container().WithName("root"); - _para = new Parameter().WithName("P").WithParentContainer(cont); - _fav = new Parameter().WithName("F").WithParentContainer(cont); - _spatialStructure.AddTopContainer(cont); - A.CallTo(() => _favoriteRepository.All()).Returns(new[] {_entityPathResolver.PathFor(_fav)}); - A.CallTo(() => _favoriteMapper.MapFrom(_fav)).Returns(new ParameterDTO(_fav)); + sut.Edit(_spatialStructure); } protected override void Because() { - sut.Edit(_spatialStructure); + sut.Handle(new FavoritesOrderChangedEvent()); } [Observation] - public void should_show_the_favorites() + public void should_refresh_the_edited_parameters() { - A.CallTo(() => _favoriteMapper.MapFrom(_fav)).MustHaveHappened(); - A.CallTo(() => _favoriteMapper.MapFrom(_para)).MustNotHaveHappened(); + A.CallTo(() => _editParameterListPresenter.Edit(A>._)).MustHaveHappened(Repeated.Exactly.Twice); } } } \ No newline at end of file diff --git a/tests/MoBi.Tests/Presentation/UserDefinedParametersPresenterSpecs.cs b/tests/MoBi.Tests/Presentation/UserDefinedParametersPresenterSpecs.cs index 26f30f16c..343464cf9 100644 --- a/tests/MoBi.Tests/Presentation/UserDefinedParametersPresenterSpecs.cs +++ b/tests/MoBi.Tests/Presentation/UserDefinedParametersPresenterSpecs.cs @@ -1,54 +1,32 @@ using System.Collections.Generic; using System.Linq; using FakeItEasy; -using MoBi.Core.Events; -using MoBi.Core.Services; using MoBi.Presentation.DTO; -using MoBi.Presentation.Mappers; using MoBi.Presentation.Presenter; -using MoBi.Presentation.Tasks.Interaction; using MoBi.Presentation.Views; using OSPSuite.BDDHelper; using OSPSuite.BDDHelper.Extensions; using OSPSuite.Core.Domain; -using OSPSuite.Core.Services; -using OSPSuite.Presentation.Presenters.ContextMenus; namespace MoBi.Presentation { public abstract class concern_for_UserDefinedParametersPresenter : ContextSpecification { - protected IEditParameterListView _view; - protected IQuantityTask _quantityTask; - protected IInteractionTaskContext _interactionTaskContext; - protected IFormulaToFormulaBuilderDTOMapper _formulaMapper; - protected IInteractionTasksForParameter _parameterTask; - protected IFavoriteTask _favoriteTask; - protected IParameterToParameterDTOMapper _parameterDTOMapper; - protected IViewItemContextMenuFactory _viewContextMenuItemFactory; + protected IUserDefinedParametersView _view; protected IContainer _container1; protected IContainer _container2; protected IParameter _parameter1; protected IParameter _parameter2; protected IParameter _parameter3; - protected ParameterDTO _parameterDTO1; - protected ParameterDTO _parameterDTO2; - protected ParameterDTO _parameterDTO3; - protected List _allDTOs; + private IEditParameterListPresenter _editParameterListPresenter; + protected List _editedParameters; protected override void Context() { - _view = A.Fake(); - _quantityTask = A.Fake(); - _interactionTaskContext = A.Fake(); - _formulaMapper = A.Fake(); - _parameterTask = A.Fake(); - _favoriteTask = A.Fake(); - _parameterDTOMapper = A.Fake(); - _viewContextMenuItemFactory = A.Fake(); - - sut = new UserDefinedParametersPresenter(_view, _quantityTask, _interactionTaskContext, _formulaMapper, _parameterTask, _favoriteTask, _parameterDTOMapper, _viewContextMenuItemFactory); + _view = A.Fake(); + _editParameterListPresenter = A.Fake(); + sut = new UserDefinedParametersPresenter(_view, _editParameterListPresenter); _parameter1 = new Parameter().WithName("P1"); _parameter2 = new Parameter().WithName("P2"); @@ -61,16 +39,8 @@ protected override void Context() _parameter2.IsDefault = false; _parameter3.IsDefault = false; - _parameterDTO1 = new ParameterDTO(_parameter1); - _parameterDTO2 = new ParameterDTO(_parameter2); - _parameterDTO3 = new ParameterDTO(_parameter3); - - A.CallTo(() => _parameterDTOMapper.MapFrom(_parameter1)).Returns(_parameterDTO1); - A.CallTo(() => _parameterDTOMapper.MapFrom(_parameter2)).Returns(_parameterDTO2); - A.CallTo(() => _parameterDTOMapper.MapFrom(_parameter3)).Returns(_parameterDTO3); - - A.CallTo(() => _view.BindTo(A>._)) - .Invokes(x => _allDTOs = x.GetArgument>(0).ToList()); + A.CallTo(() => _editParameterListPresenter.Edit(A>._)) + .Invokes(x => _editedParameters = x.GetArgument>(0).ToList()); } } @@ -84,7 +54,7 @@ protected override void Because() [Observation] public void should_retrieve_all_parameters_with_that_are_not_in_the_default_state_and_display_them_in_the_view() { - _allDTOs.ShouldOnlyContain(_parameterDTO2, _parameterDTO3); + _editedParameters.ShouldOnlyContain(_parameter2, _parameter3); } } @@ -98,30 +68,7 @@ protected override void Because() [Observation] public void should_retrieve_all_parameters_with_that_are_not_in_the_default_state_and_display_them_in_the_view() { - _allDTOs.ShouldOnlyContain(_parameterDTO2); - } - } - - public class When_the_user_defined_parameters_presenter_is_navigating_to_a_given_parameter : concern_for_UserDefinedParametersPresenter - { - private EntitySelectedEvent _event; - - protected override void Context() - { - base.Context(); - A.CallTo(() => _interactionTaskContext.Context.PublishEvent(A._)) - .Invokes(x => _event = x.GetArgument(0)); - } - - protected override void Because() - { - sut.GoTo(_parameterDTO2); - } - - [Observation] - public void should_raise_the_entity_selected_event_with_the_given_parameter() - { - _event.ObjectBase.ShouldBeEqualTo(_parameterDTO2.Parameter); + _editedParameters.ShouldOnlyContain(_parameter2); } } } \ No newline at end of file diff --git a/tests/MoBi.Tests/packages.config b/tests/MoBi.Tests/packages.config index 5ff2c0d7f..60526823e 100644 --- a/tests/MoBi.Tests/packages.config +++ b/tests/MoBi.Tests/packages.config @@ -14,14 +14,14 @@ - + - + - - + + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index aec63ab69..0a8d17e68 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -198,14 +198,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.27\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.30\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.27\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.30\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.1\lib\net462\OSPSuite.DataBinding.dll @@ -216,11 +216,11 @@ ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.27\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.30\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.27\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.30\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -231,8 +231,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.27\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.30\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index 7e54f0328..3365a5f07 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -13,21 +13,21 @@ - + - + - - + + - + From e3d26c8b153c3ab86a7c6c2b9993fe4c587db2f4 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Sat, 17 Feb 2018 18:44:39 -0500 Subject: [PATCH 12/29] Fixes #157 and #242 (#243) * Fixes #157 Error occurs when trying to reload a Parameter Identification from Working Journal and Fixes #242 * Fixes #157 Error occurs when trying to reload a Parameter Identification from Working Journal and Fixes #242 --- src/MoBi.Assets/AppConstants.cs | 5 + src/MoBi.Assets/MoBi.Assets.csproj | 8 +- src/MoBi.Assets/packages.config | 4 +- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 20 +-- src/MoBi.BatchTool/packages.config | 10 +- src/MoBi.Core/Domain/Model/MoBiSimulation.cs | 4 + src/MoBi.Core/MoBi.Core.csproj | 16 +-- .../Mappers/ProjectMetaDataToProjectMapper.cs | 5 +- .../Services/SerializationContextFactory.cs | 44 ++++-- .../Services/MoBiProjectRetriever.cs | 20 +-- src/MoBi.Core/Services/SimulationLoader.cs | 9 +- src/MoBi.Core/packages.config | 8 +- .../MoBi.Presentation.csproj | 16 +-- .../Tasks/ReloadRelatedItemTask.cs | 38 +++-- src/MoBi.Presentation/packages.config | 8 +- src/MoBi.UI/MoBi.UI.csproj | 20 +-- src/MoBi.UI/Views/EditParameterListView.cs | 12 +- .../Views/EditParametersInContainerView.cs | 17 +-- src/MoBi.UI/packages.config | 10 +- src/MoBi/MoBi.csproj | 12 +- src/MoBi/packages.config | 6 +- .../Core/SerializationContextFactorySpecs.cs | 131 ++++++++++++++++++ tests/MoBi.Tests/MoBi.Tests.csproj | 17 +-- .../Tasks/ReloadRelatedItemTaskSpecs.cs | 48 +++++-- tests/MoBi.Tests/packages.config | 8 +- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 20 +-- tests/MoBi.UI.Tests/packages.config | 10 +- 27 files changed, 359 insertions(+), 167 deletions(-) create mode 100644 tests/MoBi.Tests/Core/SerializationContextFactorySpecs.cs diff --git a/src/MoBi.Assets/AppConstants.cs b/src/MoBi.Assets/AppConstants.cs index 442c2d51a..6c2436ecf 100644 --- a/src/MoBi.Assets/AppConstants.cs +++ b/src/MoBi.Assets/AppConstants.cs @@ -1232,6 +1232,11 @@ public static string ImportedDimensionNotRecognized(string dimensionName, IEnume { return $"The imported dimension is not correct. The dimension must be {dimensionName}. The possible units are: {unitNames.ToString(",")}"; } + + public static string CannotLoadRelatedItemAsObjectAlreadyExistInProject(string objectType, string objectName) + { + return $"Cannot load related item into project. A {objectType.ToLower()} named '{objectName}' already exists."; + } } public static class Captions diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index ab1175db2..216b5d13d 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -50,11 +50,11 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.30\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.37\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.30\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.37\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi.Assets/packages.config b/src/MoBi.Assets/packages.config index 759f5d845..e9c181ef3 100644 --- a/src/MoBi.Assets/packages.config +++ b/src/MoBi.Assets/packages.config @@ -3,8 +3,8 @@ - - + + diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index 11e8e4c8a..85917bb8b 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -199,11 +199,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.30\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.37\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.30\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.37\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.1\lib\net462\OSPSuite.DataBinding.dll @@ -214,11 +214,11 @@ ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.30\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.37\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.30\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.37\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -229,8 +229,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.30\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.37\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.BatchTool/packages.config b/src/MoBi.BatchTool/packages.config index a0296fd94..69cd53e7f 100644 --- a/src/MoBi.BatchTool/packages.config +++ b/src/MoBi.BatchTool/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + diff --git a/src/MoBi.Core/Domain/Model/MoBiSimulation.cs b/src/MoBi.Core/Domain/Model/MoBiSimulation.cs index 543e90568..e1b9a3cf3 100644 --- a/src/MoBi.Core/Domain/Model/MoBiSimulation.cs +++ b/src/MoBi.Core/Domain/Model/MoBiSimulation.cs @@ -30,6 +30,8 @@ public interface IMoBiSimulation : IModelCoreSimulation, IWithDiagramFor Results != null; + public override DataRepository Results { get => base.Results; diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index 7d37de644..5ccb184f4 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -103,20 +103,20 @@ ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.30\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.37\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.30\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.37\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.30\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.37\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.30\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.37\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi.Core/Serialization/ORM/Mappers/ProjectMetaDataToProjectMapper.cs b/src/MoBi.Core/Serialization/ORM/Mappers/ProjectMetaDataToProjectMapper.cs index 96e507e62..08eefab6b 100644 --- a/src/MoBi.Core/Serialization/ORM/Mappers/ProjectMetaDataToProjectMapper.cs +++ b/src/MoBi.Core/Serialization/ORM/Mappers/ProjectMetaDataToProjectMapper.cs @@ -28,7 +28,10 @@ public class ProjectMetaDataToProjectMapper : IProjectMetaDataToProjectMapper private readonly IDeserializedReferenceResolver _deserializedReferenceResolver; private IMoBiProject _project; - public ProjectMetaDataToProjectMapper(IXmlSerializationService serializationService, ISerializationContextFactory serializationContextFactory, IDeserializedReferenceResolver deserializedReferenceResolver) + public ProjectMetaDataToProjectMapper( + IXmlSerializationService serializationService, + ISerializationContextFactory serializationContextFactory, + IDeserializedReferenceResolver deserializedReferenceResolver) { _serializationService = serializationService; _serializationContextFactory = serializationContextFactory; diff --git a/src/MoBi.Core/Serialization/Services/SerializationContextFactory.cs b/src/MoBi.Core/Serialization/Services/SerializationContextFactory.cs index 948fa9278..117c03a62 100644 --- a/src/MoBi.Core/Serialization/Services/SerializationContextFactory.cs +++ b/src/MoBi.Core/Serialization/Services/SerializationContextFactory.cs @@ -1,9 +1,13 @@ -using OSPSuite.Utility.Extensions; +using System.Collections.Generic; +using System.Linq; +using MoBi.Core.Services; using OSPSuite.Core.Converter.v5_2; using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Data; using OSPSuite.Core.Domain.Services; -using OSPSuite.Core.Serialization; using OSPSuite.Core.Serialization.Xml; +using OSPSuite.Utility.Extensions; +using IContainer = OSPSuite.Utility.Container.IContainer; namespace MoBi.Core.Serialization.Services { @@ -17,26 +21,50 @@ public class SerializationContextFactory : ISerializationContextFactory private readonly ISerializationDimensionFactory _dimensionFactory; private readonly IObjectBaseFactory _objectBaseFactory; private readonly ICloneManagerForModel _cloneManagerForModel; + private readonly IContainer _container; - public SerializationContextFactory(ISerializationDimensionFactory dimensionFactory, IObjectBaseFactory objectBaseFactory, - ICloneManagerForModel cloneManagerForModel) + public SerializationContextFactory( + ISerializationDimensionFactory dimensionFactory, + IObjectBaseFactory objectBaseFactory, + ICloneManagerForModel cloneManagerForModel, + IContainer container + ) { _dimensionFactory = dimensionFactory; _objectBaseFactory = objectBaseFactory; _cloneManagerForModel = cloneManagerForModel; + _container = container; } public SerializationContext Create(SerializationContext parentSerializationContext = null) { - var serializationContext = SerializationTransaction.Create(_dimensionFactory, _objectBaseFactory, new WithIdRepository(), _cloneManagerForModel); + var projectRetriever = _container.Resolve(); + var project = projectRetriever.Current; + + var idRepository = new WithIdRepository(); + var allRepositories = new List(); if (parentSerializationContext != null) { - parentSerializationContext.Repositories.Each(serializationContext.AddRepository); - parentSerializationContext.IdRepository.All().Each(serializationContext.Register); + allRepositories.AddRange(parentSerializationContext.Repositories); + parentSerializationContext.IdRepository.All().Each(idRepository.Register); + } + + //if project is defined, retrieved all available results from existing simulation. Required to ensure correct deserialization + if (project != null) + { + var allSimulations = project.Simulations; + var allSimulationResults = allSimulations.Where(s => s.HasResults).Select(s => s.Results); + allRepositories.AddRange(allSimulationResults.Union(project.AllObservedData)); + + //Also register simulations to ensure that they are available as well for deserialization + allSimulations.Each(idRepository.Register); } - return serializationContext; + allRepositories.Each(idRepository.Register); + + + return new SerializationContext(_dimensionFactory, _objectBaseFactory, idRepository, allRepositories, _cloneManagerForModel, _container); } } } \ No newline at end of file diff --git a/src/MoBi.Core/Services/MoBiProjectRetriever.cs b/src/MoBi.Core/Services/MoBiProjectRetriever.cs index 96065f53e..199f8be04 100644 --- a/src/MoBi.Core/Services/MoBiProjectRetriever.cs +++ b/src/MoBi.Core/Services/MoBiProjectRetriever.cs @@ -19,29 +19,17 @@ public MoBiProjectRetriever(IMoBiContext moBiContext) _moBiContext = moBiContext; } - public IMoBiProject Current - { - get { return _moBiContext.CurrentProject; } - } + public IMoBiProject Current => _moBiContext.CurrentProject; public void AddToHistory(ICommand command) { _moBiContext.AddToHistory(command); } - public IProject CurrentProject - { - get { return Current; } - } + public IProject CurrentProject => Current; - public string ProjectName - { - get { return Current.Name; } - } + public string ProjectName => Current.Name; - public string ProjectFullPath - { - get { return Current.FilePath; } - } + public string ProjectFullPath => Current.FilePath; } } \ No newline at end of file diff --git a/src/MoBi.Core/Services/SimulationLoader.cs b/src/MoBi.Core/Services/SimulationLoader.cs index e76c6cd3a..e5943d836 100644 --- a/src/MoBi.Core/Services/SimulationLoader.cs +++ b/src/MoBi.Core/Services/SimulationLoader.cs @@ -36,7 +36,8 @@ public SimulationLoader(ICloneManagerForSimulation cloneManager, INameCorrector public ICommand AddSimulationToProject(IMoBiSimulation simulation) { var loadCommand = createLoadCommand(simulation); - addSimulationToProject(simulation, loadCommand); + var shouldCloneSimulation = _context.CurrentProject.Simulations.ExistsById(simulation.Id); + addSimulationToProject(simulation, loadCommand, shouldCloneSimulation); return loadCommand.Run(_context); } @@ -48,14 +49,14 @@ private static MoBiMacroCommand createLoadCommand(IMoBiSimulation simulation) }; } - private void addSimulationToProject(IMoBiSimulation simulation, MoBiMacroCommand loadCommand) + private void addSimulationToProject(IMoBiSimulation simulation, MoBiMacroCommand loadCommand, bool shouldCloneSimulation) { var moBiSimulation = simulation; simulation.MoBiBuildConfiguration.AllBuildingBlockInfos().Each(checkTemplateBuildingBlock); var project = _context.CurrentProject; - if (!project.IsEmpty) + if (shouldCloneSimulation) moBiSimulation = cloneSimulation(moBiSimulation); addBuildConfigurationToProject(project, moBiSimulation.MoBiBuildConfiguration, loadCommand); @@ -74,7 +75,7 @@ public ICommand AddSimulationToProject(SimulationTransfer simulationTransfer) project.Favorites.AddFavorites(simulationTransfer.Favorites); var simulation = simulationTransfer.Simulation.DowncastTo(); var loadCommand = createLoadCommand(simulation); - addSimulationToProject(simulation, loadCommand); + addSimulationToProject(simulation, loadCommand, shouldCloneSimulation: !project.IsEmpty); addObservedDataToProject(simulationTransfer.AllObservedData, loadCommand); return loadCommand.Run(_context); } diff --git a/src/MoBi.Core/packages.config b/src/MoBi.Core/packages.config index 7385d663d..be4344e48 100644 --- a/src/MoBi.Core/packages.config +++ b/src/MoBi.Core/packages.config @@ -10,12 +10,12 @@ - - + + - - + + diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index 82a26079a..79b6c7367 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -203,20 +203,20 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.30\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.37\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.30\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.37\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.30\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.37\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.30\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.37\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi.Presentation/Tasks/ReloadRelatedItemTask.cs b/src/MoBi.Presentation/Tasks/ReloadRelatedItemTask.cs index 02ede7808..24be18adb 100644 --- a/src/MoBi.Presentation/Tasks/ReloadRelatedItemTask.cs +++ b/src/MoBi.Presentation/Tasks/ReloadRelatedItemTask.cs @@ -1,4 +1,5 @@ -using MoBi.Assets; +using System; +using MoBi.Assets; using OSPSuite.Core.Services; using OSPSuite.Utility.Visitor; using MoBi.Core.Commands; @@ -16,6 +17,7 @@ using OSPSuite.Core.Domain.Services.SensitivityAnalyses; using OSPSuite.Core.Journal; using OSPSuite.Assets; +using OSPSuite.Utility.Exceptions; namespace MoBi.Presentation.Tasks { @@ -37,12 +39,21 @@ public class ReloadRelatedItemTask : OSPSuite.Core.Journal.ReloadRelatedItemTask private readonly IParameterIdentificationTask _parameterIdentificationTask; private readonly ISensitivityAnalysisTask _sensitivityAnalysisTask; - public ReloadRelatedItemTask(IApplicationConfiguration applicationConfiguration, IContentLoader contentLoader, - IDialogCreator dialogCreator, IRelatedItemSerializer relatedItemSerializer, - IMoBiContext context, ICloneManagerForBuildingBlock cloneManagerForBuildingBlock, - IBuildingBlockTaskRetriever taskRetriever, IPKSimExportTask pkSimExportTask, ISimulationLoader simulationLoader, - IObservedDataTask observedDataTask, IObjectIdResetter objectIdResetter, IParameterIdentificationTask parameterIdentificationTask, ISensitivityAnalysisTask sensitivityAnalysisTask) : - base(applicationConfiguration, contentLoader, dialogCreator) + public ReloadRelatedItemTask( + IApplicationConfiguration applicationConfiguration, + IContentLoader contentLoader, + IDialogCreator dialogCreator, + IRelatedItemSerializer relatedItemSerializer, + IMoBiContext context, + ICloneManagerForBuildingBlock cloneManagerForBuildingBlock, + IBuildingBlockTaskRetriever taskRetriever, + IPKSimExportTask pkSimExportTask, + ISimulationLoader simulationLoader, + IObservedDataTask observedDataTask, + IObjectIdResetter objectIdResetter, + IParameterIdentificationTask parameterIdentificationTask, + ISensitivityAnalysisTask sensitivityAnalysisTask + ) : base(applicationConfiguration, contentLoader, dialogCreator) { _relatedItemSerializer = relatedItemSerializer; _context = context; @@ -63,8 +74,16 @@ protected override void StartSisterApplicationWithContentFile(string contentFile protected override void LoadOwnContent(RelatedItem relatedItem) { - var relatedItemObject = _relatedItemSerializer.Deserialize(relatedItem); - this.Visit(relatedItemObject); + try + { + var relatedItemObject = _relatedItemSerializer.Deserialize(relatedItem); + this.Visit(relatedItemObject); + } + catch (NotUniqueIdException) + { + //Probably trying to load an object that was already loaded. Show a message to the user + throw new OSPSuiteException(AppConstants.Exceptions.CannotLoadRelatedItemAsObjectAlreadyExistInProject(relatedItem.ItemType, relatedItem.Name)); + } } protected override bool RelatedItemCanBeLaunchedBySisterApplication(RelatedItem relatedItem) @@ -99,7 +118,6 @@ private void addCommand(IMoBiCommand command) public void Visit(DataRepository observedData) { - _objectIdResetter.ResetIdFor(observedData); _observedDataTask.AddObservedDataToProject(observedData); } diff --git a/src/MoBi.Presentation/packages.config b/src/MoBi.Presentation/packages.config index 75f7d973d..65305ee73 100644 --- a/src/MoBi.Presentation/packages.config +++ b/src/MoBi.Presentation/packages.config @@ -12,13 +12,13 @@ - - + + - - + + diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index edd556003..3ff37cf25 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -239,11 +239,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.30\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.37\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.30\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.37\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.1\lib\net462\OSPSuite.DataBinding.dll @@ -254,11 +254,11 @@ ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.30\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.37\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.30\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.37\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -269,8 +269,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.30\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.37\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.UI/Views/EditParameterListView.cs b/src/MoBi.UI/Views/EditParameterListView.cs index 25b88c583..00b5c9e3d 100644 --- a/src/MoBi.UI/Views/EditParameterListView.cs +++ b/src/MoBi.UI/Views/EditParameterListView.cs @@ -129,16 +129,17 @@ public override void InitializeBinding() _unitControl.ParameterUnitSet += setParameterUnit; - var colDim = _gridViewBinder.AutoBind(dto => dto.Dimension) + _gridViewBinder.AutoBind(dto => dto.Dimension) + .AsHidden() .AsReadOnly() .WithShowInColumnChooser(true); - colDim.Visible = false; - _valueOriginBinder.InitializeBinding(_gridViewBinder, onParameterValueOriginSet); _gridViewBinder.Bind(dto => dto.Description) - .AsReadOnly().WithShowInColumnChooser(true); + .AsHidden() + .AsReadOnly() + .WithShowInColumnChooser(true); _gridViewBinder.Bind(dto => dto.IsFavorite) .WithCaption(Captions.Favorites) @@ -147,8 +148,7 @@ public override void InitializeBinding() .WithToolTip(OSPSuite.Assets.ToolTips.FavoritesToolTip) .WithOnValueUpdating((o, e) => onIsFavoriteSet(o, e.NewValue)); - _isFixedParameterEditRepository.ButtonClick += - (o, e) => this.DoWithinExceptionHandler(() => onResetValue(_gridViewBinder.FocusedElement)); + _isFixedParameterEditRepository.ButtonClick += (o, e) => OnEvent(() => onResetValue(_gridViewBinder.FocusedElement)); _pathBinder.SetVisibility(PathElement.Simulation, visible: false); } diff --git a/src/MoBi.UI/Views/EditParametersInContainerView.cs b/src/MoBi.UI/Views/EditParametersInContainerView.cs index 3a44f54ed..892649b03 100644 --- a/src/MoBi.UI/Views/EditParametersInContainerView.cs +++ b/src/MoBi.UI/Views/EditParametersInContainerView.cs @@ -151,6 +151,7 @@ public override void InitializeBinding() .WithShowInColumnChooser(true); _colDescription = _gridViewBinder.Bind(dto => dto.Description) + .AsHidden() .AsReadOnly() .WithShowInColumnChooser(true); @@ -198,12 +199,12 @@ private void onToolTipControllerGetActiveObjectInfo(object sender, ToolTipContro { if (e.SelectedControl != _gridView.GridControl) return; - var hi = _gridView.CalcHitInfo(e.ControlMousePosition); var parameterDTO = _gridViewBinder.ElementAt(e); if (parameterDTO == null) return; //check if subclass want to display a tool tip as well + var hi = _gridView.CalcHitInfo(e.ControlMousePosition); var superToolTip = GetToolTipFor(parameterDTO, hi); //An object that uniquely identifies a row cell @@ -212,10 +213,7 @@ private void onToolTipControllerGetActiveObjectInfo(object sender, ToolTipContro protected virtual SuperToolTip GetToolTipFor(ParameterDTO parameterDTO, GridHitInfo hi) { - if (hi.Column == _colFormula.XtraColumn) - return _toolTipCreator.ToolTipFor(parameterDTO); - - return null; + return _toolTipCreator.ToolTipFor(parameterDTO); } private void setParameterUnit(ParameterDTO parameter, Unit unit) @@ -323,7 +321,7 @@ public void AttachPresenter(IEditParametersInContainerPresenter presenter) public EditParameterMode EditMode { - get { return _editMode; } + get => _editMode; set { _editMode = value; @@ -335,7 +333,6 @@ public EditParameterMode EditMode _colRHSFormula.Visible = false; _colButtons.Visible = true; _colDimension.ReadOnly = false; - _colDescription.Visible = false; _colPersistable.Visible = false; btAddParameter.Visible = true; btAddParameter.Enabled = true; @@ -350,7 +347,6 @@ public EditParameterMode EditMode _colRHSFormula.Visible = false; _colButtons.Visible = false; _colDimension.ReadOnly = true; - _colDescription.Visible = true; btAddParameter.Enabled = false; btLoadParameter.Enabled = false; layoutControlItemAddParameter.Visibility = LayoutVisibility.Never; @@ -365,7 +361,6 @@ public EditParameterMode EditMode _colFormula.Visible = true; _colRHSFormula.Visible = true; _colDimension.ReadOnly = true; - _colDescription.Visible = true; btAddParameter.Enabled = false; btLoadParameter.Enabled = false; layoutControlItemAddParameter.Visibility = LayoutVisibility.Never; @@ -380,13 +375,13 @@ public EditParameterMode EditMode public bool ShowBuildMode { - set { _colBuildMode.Visible = value; } + set => _colBuildMode.Visible = value; get { return _colBuildMode.Visible; } } public string ParentName { - set { lblParentName.Text = value.FormatForLabel(checkCase: false); } + set => lblParentName.Text = value.FormatForLabel(checkCase: false); } public void SetEditParameterView(IView subView) diff --git a/src/MoBi.UI/packages.config b/src/MoBi.UI/packages.config index a0296fd94..69cd53e7f 100644 --- a/src/MoBi.UI/packages.config +++ b/src/MoBi.UI/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index f95facb6c..b218bf23d 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -93,17 +93,17 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.30\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.37\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.30\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.37\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.30\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.37\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi/packages.config b/src/MoBi/packages.config index 76cf8102a..b0d84112f 100644 --- a/src/MoBi/packages.config +++ b/src/MoBi/packages.config @@ -3,11 +3,11 @@ - - + + - + diff --git a/tests/MoBi.Tests/Core/SerializationContextFactorySpecs.cs b/tests/MoBi.Tests/Core/SerializationContextFactorySpecs.cs new file mode 100644 index 000000000..3dbde7f5d --- /dev/null +++ b/tests/MoBi.Tests/Core/SerializationContextFactorySpecs.cs @@ -0,0 +1,131 @@ +using FakeItEasy; +using MoBi.Core.Domain.Model; +using MoBi.Core.Serialization.Services; +using MoBi.Core.Services; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Converter.v5_2; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Data; +using OSPSuite.Core.Domain.Services; +using OSPSuite.Core.Serialization.Xml; +using IContainer = OSPSuite.Utility.Container.IContainer; + +namespace MoBi.Core +{ + public abstract class concern_for_SerializationContextFactory : ContextSpecification + { + protected ISerializationDimensionFactory _dimensionFactory; + protected IObjectBaseFactory _objectBaseFactory; + protected ICloneManagerForModel _cloneManagerForModel; + protected IContainer _container; + protected IMoBiProjectRetriever _projectRetriever; + protected IMoBiProject _project; + + protected override void Context() + { + _dimensionFactory = A.Fake(); + _objectBaseFactory = A.Fake(); + _cloneManagerForModel = A.Fake(); + _container = A.Fake(); + + sut = new SerializationContextFactory(_dimensionFactory, _objectBaseFactory, _cloneManagerForModel, _container); + + _projectRetriever = A.Fake(); + + A.CallTo(() => _container.Resolve()).Returns(_projectRetriever); + + _project = new MoBiProject(); + A.CallTo(() => _projectRetriever.Current).Returns(_project); + } + } + + public class When_creating_a_serialization_context_in_an_empty_project : concern_for_SerializationContextFactory + { + private SerializationContext _result; + + protected override void Because() + { + _result = sut.Create(); + } + + [Observation] + public void should_return_a_serialization_context_without_any_data_repositories_or_simulation_registered() + { + _result.IdRepository.All().ShouldBeEmpty(); + _result.Repositories.ShouldBeEmpty(); + } + } + + public class When_creating_a_serialization_context_based_on_a_parent_serialization_context : concern_for_SerializationContextFactory + { + private SerializationContext _result; + private SerializationContext _parentContext; + private DataRepository _dataRepo1; + private IWithId _simmulation; + + protected override void Context() + { + base.Context(); + _dataRepo1 = new DataRepository("OBS1"); + _simmulation = new MoBiSimulation().WithId("ID"); + _parentContext = new SerializationContext(_dimensionFactory, _objectBaseFactory, new WithIdRepository(), new[] {_dataRepo1}, _cloneManagerForModel, _container); + _parentContext.Register(_simmulation); + } + + protected override void Because() + { + _result = sut.Create(_parentContext); + } + + [Observation] + public void should_add_the_repositories_defined_in_the_parent_context() + { + _result.Repositories.ShouldContain(_dataRepo1); + } + + [Observation] + public void should_register_the_object_registered_in_the_parent_context() + { + _result.IdRepository.All().ShouldContain(_simmulation); + } + } + + public class When_creating_a_serialization_context_with_a_defined_project : concern_for_SerializationContextFactory + { + private SerializationContext _result; + private DataRepository _observedData; + private MoBiSimulation _simmulation; + private DataRepository _simulationResults; + + protected override void Context() + { + base.Context(); + _observedData = new DataRepository("OBS1"); + _simulationResults = new DataRepository("RES"); + _simmulation = new MoBiSimulation().WithId("ID"); + + _simmulation.Results = _simulationResults; + + _project.AddSimulation(_simmulation); + _project.AddObservedData(_observedData); + } + + protected override void Because() + { + _result = sut.Create(); + } + + [Observation] + public void should_add_the_repositories_defined_in_the_parent_context() + { + _result.Repositories.ShouldContain(_observedData, _simulationResults); + } + + [Observation] + public void should_register_the_object_registered_in_the_parent_context() + { + _result.IdRepository.All().ShouldContain(_simmulation, _observedData, _simulationResults); + } + } +} \ No newline at end of file diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index e6a63af3d..fe0310446 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -139,14 +139,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.30\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.37\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.30\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.37\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.1\lib\net462\OSPSuite.DataBinding.dll @@ -154,11 +154,11 @@ ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.30\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.37\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.30\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.37\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -221,6 +221,7 @@ + diff --git a/tests/MoBi.Tests/Presentation/Tasks/ReloadRelatedItemTaskSpecs.cs b/tests/MoBi.Tests/Presentation/Tasks/ReloadRelatedItemTaskSpecs.cs index 7209934ca..4eb34bdcb 100644 --- a/tests/MoBi.Tests/Presentation/Tasks/ReloadRelatedItemTaskSpecs.cs +++ b/tests/MoBi.Tests/Presentation/Tasks/ReloadRelatedItemTaskSpecs.cs @@ -1,10 +1,10 @@ -using OSPSuite.BDDHelper; -using OSPSuite.Core.Services; -using FakeItEasy; +using FakeItEasy; using MoBi.Core.Commands; using MoBi.Core.Domain.Model; using MoBi.Core.Services; using MoBi.Presentation.Tasks.Interaction; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; using OSPSuite.Core; using OSPSuite.Core.Domain; using OSPSuite.Core.Domain.Builder; @@ -13,10 +13,12 @@ using OSPSuite.Core.Domain.Services.ParameterIdentifications; using OSPSuite.Core.Domain.Services.SensitivityAnalyses; using OSPSuite.Core.Journal; +using OSPSuite.Core.Services; +using OSPSuite.Utility.Exceptions; namespace MoBi.Presentation.Tasks { - public abstract class concern_for_ReloadRelatedItemTaskSpecs : ContextSpecification + public abstract class concern_for_ReloadRelatedItemTask : ContextSpecification { protected IApplicationConfiguration _applicationConfiguration; protected IContentLoader _contentLoader; @@ -48,10 +50,10 @@ protected override void Context() _simulationLoader = A.Fake(); _objectIdResetter = A.Fake(); _observedDataTask = A.Fake(); - _parameterIdentificationTask= A.Fake(); - _sensitivityAnalysisTask= A.Fake(); + _parameterIdentificationTask = A.Fake(); + _sensitivityAnalysisTask = A.Fake(); sut = new ReloadRelatedItemTask(_applicationConfiguration, _contentLoader, _dialogCreator, - _relatedItemSerializer, _context, _cloneManager, _taskRetriever, _pkSimExportTask, _simulationLoader, _observedDataTask, _objectIdResetter,_parameterIdentificationTask,_sensitivityAnalysisTask); + _relatedItemSerializer, _context, _cloneManager, _taskRetriever, _pkSimExportTask, _simulationLoader, _observedDataTask, _objectIdResetter, _parameterIdentificationTask, _sensitivityAnalysisTask); _relatedItem = A.Fake(); } @@ -61,9 +63,9 @@ protected override void Because() } } - internal class When_reloading_a_simulation : concern_for_ReloadRelatedItemTaskSpecs + internal class When_reloading_a_simulation : concern_for_ReloadRelatedItemTask { - private IMoBiSimulation _simulation; + private IMoBiSimulation _simulation; protected override void Context() { @@ -80,7 +82,7 @@ public void should_add_simulation_to_project() } } - internal class When_reloading_a_building_block : concern_for_ReloadRelatedItemTaskSpecs + internal class When_reloading_a_building_block : concern_for_ReloadRelatedItemTask { private readonly IBuildingBlock _buildingBlock = new ReactionBuildingBlock(); private readonly IInteractionTasksForBuildingBlock _task = A.Fake(); @@ -123,7 +125,7 @@ public void should_add_add_command_to_history() } } - internal class When_reloading_some_observed_data : concern_for_ReloadRelatedItemTaskSpecs + internal class When_reloading_some_observed_data : concern_for_ReloadRelatedItemTask { private readonly IMoBiCommand _addCommand = A.Fake(); private DataRepository _observedData; @@ -137,15 +139,31 @@ protected override void Context() } [Observation] - public void should_reset_the_id_for_the_observed_data() + public void should_execute_the_correct_add_to_project_method() { - A.CallTo(() => _objectIdResetter.ResetIdFor(_observedData)).MustHaveHappened(); + A.CallTo(() => _observedDataTask.AddObservedDataToProject(_observedData)).MustHaveHappened(); + } + } + + public class When_reloading_an_object_whose_deserialization_process_results_in_an_not_unique_id_exception_being_thrown : concern_for_ReloadRelatedItemTask + { + protected override void Context() + { + base.Context(); + _relatedItem.ItemType = "Simulation"; + _relatedItem.Name = "MySim"; + A.CallTo(() => _relatedItemSerializer.Deserialize(_relatedItem)).Throws(new NotUniqueIdException("id")); + } + + protected override void Because() + { + //override because of exception } [Observation] - public void should_execute_the_correct_add_to_project_method() + public void should_throw_an_information_exception_explaining_to_the_user_that_the_object_cannot_be_loaeder() { - A.CallTo(() => _observedDataTask.AddObservedDataToProject(_observedData)).MustHaveHappened(); + The.Action(() => sut.Load(_relatedItem)).ShouldThrowAn(); } } } \ No newline at end of file diff --git a/tests/MoBi.Tests/packages.config b/tests/MoBi.Tests/packages.config index 60526823e..eb2235c4f 100644 --- a/tests/MoBi.Tests/packages.config +++ b/tests/MoBi.Tests/packages.config @@ -14,14 +14,14 @@ - + - + - - + + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index 0a8d17e68..173e450af 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -198,14 +198,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.30\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.37\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.30\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.37\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.1\lib\net462\OSPSuite.DataBinding.dll @@ -216,11 +216,11 @@ ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.30\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.37\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.30\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.37\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -231,8 +231,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.30\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.37\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index 3365a5f07..46ee03e98 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -13,21 +13,21 @@ - + - + - - + + - + From 26c663f9dc6921586edc576a25f8d89bd7ddd1d9 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 5 Apr 2018 15:19:02 -0400 Subject: [PATCH 13/29] Fixes #209 Parameter Identification will not accept mass concentration target data in MoBi model Fixes #209 Parameter Identification will not accept mass concentration target data in MoBi model --- SolutionInfo.cs | 2 +- src/MoBi.Assets/MoBi.Assets.csproj | 27 ++++---- src/MoBi.Assets/packages.config | 14 ++--- src/MoBi.BatchTool/App.config | 4 -- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 61 +++++++++--------- src/MoBi.BatchTool/packages.config | 30 ++++----- src/MoBi.Core/MoBi.Core.csproj | 49 ++++++++------- .../TEXBuilder/DataRepositoryTEXBuilder.cs | 1 + src/MoBi.Core/packages.config | 24 +++---- .../MoBi.Presentation.csproj | 51 +++++++-------- src/MoBi.Presentation/packages.config | 26 ++++---- src/MoBi.UI/MoBi.UI.csproj | 61 +++++++++--------- src/MoBi.UI/packages.config | 30 ++++----- src/MoBi/MoBi.csproj | 48 +++++++------- src/MoBi/app.config | 4 ++ src/MoBi/packages.config | 19 +++--- tests/MoBi.Tests/MoBi.Tests.csproj | 59 +++++++++--------- tests/MoBi.Tests/app.config | 4 ++ tests/MoBi.Tests/packages.config | 30 ++++----- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 62 ++++++++++--------- tests/MoBi.UI.Tests/packages.config | 32 +++++----- 21 files changed, 329 insertions(+), 309 deletions(-) diff --git a/SolutionInfo.cs b/SolutionInfo.cs index 6f4a22707..c67278ad2 100644 --- a/SolutionInfo.cs +++ b/SolutionInfo.cs @@ -4,7 +4,7 @@ [assembly: AssemblyCompany("Open Systems Pharmacology")] [assembly: AssemblyProduct("MoBi")] -[assembly: AssemblyCopyright("Copyright © 2002-2017 - Open Systems Pharmacology Community")] +[assembly: AssemblyCopyright("Copyright © 2002-2018 - Open Systems Pharmacology Community")] [assembly: ComVisible(false)] [assembly: AssemblyVersion("7.3.0.0")] [assembly: AssemblyFileVersion("7.3.0.0")] diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index 216b5d13d..aae2a49b2 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -41,38 +41,43 @@ false - - ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + + ..\..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.37\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.48\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.37\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.48\lib\net462\OSPSuite.Core.dll + + + ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.2.2.0.6\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll 3.5 + + ..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll diff --git a/src/MoBi.Assets/packages.config b/src/MoBi.Assets/packages.config index e9c181ef3..fad66b3d2 100644 --- a/src/MoBi.Assets/packages.config +++ b/src/MoBi.Assets/packages.config @@ -1,14 +1,14 @@  - - - - - + + + + + - + - + \ No newline at end of file diff --git a/src/MoBi.BatchTool/App.config b/src/MoBi.BatchTool/App.config index 296fa8be8..8ad754132 100644 --- a/src/MoBi.BatchTool/App.config +++ b/src/MoBi.BatchTool/App.config @@ -81,10 +81,6 @@ - - - - diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index 85917bb8b..b3b736977 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -44,9 +44,8 @@ ..\..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll True - - ..\..\packages\Dapper.1.50.2\lib\net451\Dapper.dll - True + + ..\..\packages\Dapper.1.50.4\lib\net451\Dapper.dll ..\..\packages\OSPSuite.DevExpress.17.1.5\lib\net45\DevExpress.BonusSkins.v17.1.dll @@ -147,11 +146,11 @@ ..\..\packages\Iesi.Collections.4.0.2\lib\net40\Iesi.Collections.dll - - ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + + ..\..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll ..\..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll @@ -164,8 +163,8 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll @@ -199,45 +198,45 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.37\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.48\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.37\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.48\lib\net462\OSPSuite.Core.dll - - ..\..\packages\OSPSuite.DataBinding.2.2.0.1\lib\net462\OSPSuite.DataBinding.dll + + ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll - - ..\..\packages\OSPSuite.DataBinding.DevExpress.2.2.0.1\lib\net462\OSPSuite.DataBinding.DevExpress.dll + + ..\..\packages\OSPSuite.DataBinding.DevExpress.2.2.0.2\lib\net462\OSPSuite.DataBinding.DevExpress.dll - - ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll + + ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.37\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.48\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.37\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.48\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.2.2.0.6\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.37\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.48\lib\net462\OSPSuite.UI.dll - - ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.6.4\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.1\lib\net45\SX.dll @@ -246,6 +245,8 @@ ..\..\packages\System.Data.SQLite.Core.1.0.106.0\lib\net46\System.Data.SQLite.dll + + diff --git a/src/MoBi.BatchTool/packages.config b/src/MoBi.BatchTool/packages.config index 69cd53e7f..557a6b2f8 100644 --- a/src/MoBi.BatchTool/packages.config +++ b/src/MoBi.BatchTool/packages.config @@ -3,29 +3,29 @@ - + - - - + + + - - - - + + + + - - - + + + - - + + - - + + diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index 5ccb184f4..a2fbd30cc 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -60,9 +60,8 @@ ..\..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll True - - ..\..\packages\Dapper.1.50.2\lib\net451\Dapper.dll - True + + ..\..\packages\Dapper.1.50.4\lib\net451\Dapper.dll ..\..\packages\OSPSuite.DevExpress.Presentation.17.1.5\lib\net45\DevExpress.Data.v17.1.dll @@ -86,53 +85,53 @@ ..\..\pre\libsbmlcsP.dll - - ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + + ..\..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.37\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.48\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.37\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.48\lib\net462\OSPSuite.Core.dll - - ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll + + ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.37\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.48\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.37\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.48\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.2.2.0.6\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.6.4\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.1\lib\net45\SX.dll @@ -142,6 +141,8 @@ ..\..\packages\System.Data.SQLite.Core.1.0.106.0\lib\net46\System.Data.SQLite.dll + + ..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll diff --git a/src/MoBi.Core/Reporting/TEXBuilder/DataRepositoryTEXBuilder.cs b/src/MoBi.Core/Reporting/TEXBuilder/DataRepositoryTEXBuilder.cs index 2bc54554e..efb485c88 100644 --- a/src/MoBi.Core/Reporting/TEXBuilder/DataRepositoryTEXBuilder.cs +++ b/src/MoBi.Core/Reporting/TEXBuilder/DataRepositoryTEXBuilder.cs @@ -11,6 +11,7 @@ using OSPSuite.TeXReporting.Builder; using OSPSuite.TeXReporting.Data; using OSPSuite.TeXReporting.Items; +using OSPSuite.Utility.Extensions; using DataColumn = OSPSuite.Core.Domain.Data.DataColumn; namespace MoBi.Core.Reporting.TEXBuilder diff --git a/src/MoBi.Core/packages.config b/src/MoBi.Core/packages.config index be4344e48..a6e7764a9 100644 --- a/src/MoBi.Core/packages.config +++ b/src/MoBi.Core/packages.config @@ -3,24 +3,24 @@ - + - - - + + + - - + + - - - + + + - - + + - + diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index 79b6c7367..40d85c479 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -52,9 +52,8 @@ ..\..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll True - - ..\..\packages\Dapper.1.50.2\lib\net451\Dapper.dll - True + + ..\..\packages\Dapper.1.50.4\lib\net451\Dapper.dll ..\..\packages\OSPSuite.DevExpress.17.1.5\lib\net45\DevExpress.BonusSkins.v17.1.dll @@ -145,7 +144,7 @@ True - ..\..\packages\FakeItEasy.4.3.0\lib\net45\FakeItEasy.dll + ..\..\packages\FakeItEasy.4.5.1\lib\net45\FakeItEasy.dll ..\..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll @@ -158,18 +157,18 @@ ..\..\packages\Iesi.Collections.4.0.2\lib\net40\Iesi.Collections.dll - - ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + + ..\..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll @@ -203,36 +202,36 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.37\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.48\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.37\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.48\lib\net462\OSPSuite.Core.dll - - ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll + + ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.37\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.48\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.37\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.48\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.2.2.0.6\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.6.4\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.1\lib\net45\SX.dll @@ -242,6 +241,8 @@ ..\..\packages\System.Data.SQLite.Core.1.0.106.0\lib\net46\System.Data.SQLite.dll + + ..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll diff --git a/src/MoBi.Presentation/packages.config b/src/MoBi.Presentation/packages.config index 65305ee73..4e1dfbe19 100644 --- a/src/MoBi.Presentation/packages.config +++ b/src/MoBi.Presentation/packages.config @@ -3,27 +3,27 @@ - - + + - - - + + + - - + + - - - + + + - - + + - + diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index 3ff37cf25..0bc1de1c3 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -82,9 +82,8 @@ ..\..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll True - - ..\..\packages\Dapper.1.50.2\lib\net451\Dapper.dll - True + + ..\..\packages\Dapper.1.50.4\lib\net451\Dapper.dll ..\..\packages\OSPSuite.DevExpress.17.1.5\lib\net45\DevExpress.BonusSkins.v17.1.dll @@ -185,12 +184,12 @@ ..\..\packages\Iesi.Collections.4.0.2\lib\net40\Iesi.Collections.dll - - ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + + ..\..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll @@ -204,8 +203,8 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll @@ -239,45 +238,45 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.37\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.48\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.37\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.48\lib\net462\OSPSuite.Core.dll - - ..\..\packages\OSPSuite.DataBinding.2.2.0.1\lib\net462\OSPSuite.DataBinding.dll + + ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll - - ..\..\packages\OSPSuite.DataBinding.DevExpress.2.2.0.1\lib\net462\OSPSuite.DataBinding.DevExpress.dll + + ..\..\packages\OSPSuite.DataBinding.DevExpress.2.2.0.2\lib\net462\OSPSuite.DataBinding.DevExpress.dll - - ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll + + ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.37\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.48\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.37\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.48\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.2.2.0.6\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.37\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.48\lib\net462\OSPSuite.UI.dll - - ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.6.4\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.1\lib\net45\SX.dll @@ -290,8 +289,10 @@ + + diff --git a/src/MoBi.UI/packages.config b/src/MoBi.UI/packages.config index 69cd53e7f..557a6b2f8 100644 --- a/src/MoBi.UI/packages.config +++ b/src/MoBi.UI/packages.config @@ -3,29 +3,29 @@ - + - - - + + + - - - - + + + + - - - + + + - - + + - - + + diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index b218bf23d..c6d4e5bea 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -77,11 +77,11 @@ ..\..\packages\OSPSuite.DevExpress.Presentation.17.1.5\lib\net45\DevExpress.Utils.v17.1.dll True - - ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + + ..\..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll @@ -93,37 +93,39 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.37\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.48\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.37\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.48\lib\net462\OSPSuite.Core.dll - - ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll + + ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.37\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.48\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.2.2.0.6\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.6.4\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.1\lib\net45\SX.dll 3.5 + + 3.5 @@ -190,22 +192,22 @@ - + OSPSuite.Dimensions.xml PreserveNewest - - + + OSPSuite.SimModelSolver_CVODES282.dll PreserveNewest - + SQLite.Interop.dll PreserveNewest - + OSPSuite.PKParameters.xml PreserveNewest - + libsbmlcs.dll PreserveNewest diff --git a/src/MoBi/app.config b/src/MoBi/app.config index f8978832f..8fa965e24 100644 --- a/src/MoBi/app.config +++ b/src/MoBi/app.config @@ -121,6 +121,10 @@ + + + + diff --git a/src/MoBi/packages.config b/src/MoBi/packages.config index b0d84112f..f040bb7ab 100644 --- a/src/MoBi/packages.config +++ b/src/MoBi/packages.config @@ -1,18 +1,19 @@  - - - - + + + + - - + + - - + + + - + diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index fe0310446..c808b6e41 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -50,9 +50,8 @@ ..\..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll True - - ..\..\packages\Dapper.1.50.2\lib\net451\Dapper.dll - True + + ..\..\packages\Dapper.1.50.4\lib\net451\Dapper.dll ..\..\packages\OSPSuite.DevExpress.Presentation.17.1.5\lib\net45\DevExpress.Data.v17.1.dll @@ -63,7 +62,7 @@ True - ..\..\packages\FakeItEasy.4.3.0\lib\net45\FakeItEasy.dll + ..\..\packages\FakeItEasy.4.5.1\lib\net45\FakeItEasy.dll ..\..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll @@ -79,12 +78,12 @@ ..\..\pre\libsbmlcsP.dll - - ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + + ..\..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll ..\..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll @@ -97,8 +96,8 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll @@ -139,42 +138,42 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.37\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.48\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.37\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.48\lib\net462\OSPSuite.Core.dll - - ..\..\packages\OSPSuite.DataBinding.2.2.0.1\lib\net462\OSPSuite.DataBinding.dll + + ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll - - ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll + + ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.37\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.48\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.37\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.48\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.2.2.0.6\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.6.4\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.1\lib\net45\SX.dll @@ -184,6 +183,8 @@ ..\..\packages\System.Data.SQLite.Core.1.0.106.0\lib\net46\System.Data.SQLite.dll + + ..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll @@ -592,10 +593,10 @@ OSPSuite.Dimensions.xml PreserveNewest - + OSPSuite.SimModelSolver_CVODES282.dll PreserveNewest - + SQLite.Interop.dll PreserveNewest diff --git a/tests/MoBi.Tests/app.config b/tests/MoBi.Tests/app.config index 46094670c..fb584117b 100644 --- a/tests/MoBi.Tests/app.config +++ b/tests/MoBi.Tests/app.config @@ -122,6 +122,10 @@ + + + + diff --git a/tests/MoBi.Tests/packages.config b/tests/MoBi.Tests/packages.config index eb2235c4f..e6011e946 100644 --- a/tests/MoBi.Tests/packages.config +++ b/tests/MoBi.Tests/packages.config @@ -3,31 +3,31 @@ - - + + - - - + + + - + - - + + - - - + + + - - - + + + - + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index 173e450af..0e1483cc6 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -40,8 +40,8 @@ ..\..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll - - ..\..\packages\Dapper.1.50.2\lib\net451\Dapper.dll + + ..\..\packages\Dapper.1.50.4\lib\net451\Dapper.dll ..\..\packages\OSPSuite.DevExpress.17.1.5\lib\net45\DevExpress.BonusSkins.v17.1.dll @@ -132,7 +132,7 @@ True - ..\..\packages\FakeItEasy.4.3.0\lib\net45\FakeItEasy.dll + ..\..\packages\FakeItEasy.4.5.1\lib\net45\FakeItEasy.dll ..\..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll @@ -143,11 +143,11 @@ ..\..\packages\Iesi.Collections.4.0.2\lib\net40\Iesi.Collections.dll - - ..\..\packages\MathNet.Numerics.3.20.0\lib\net40\MathNet.Numerics.dll + + ..\..\packages\MathNet.Numerics.4.4.0\lib\net461\MathNet.Numerics.dll - - ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + ..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll ..\..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll @@ -160,8 +160,8 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll @@ -198,48 +198,48 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.37\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.48\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.37\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.48\lib\net462\OSPSuite.Core.dll - - ..\..\packages\OSPSuite.DataBinding.2.2.0.1\lib\net462\OSPSuite.DataBinding.dll + + ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll - - ..\..\packages\OSPSuite.DataBinding.DevExpress.2.2.0.1\lib\net462\OSPSuite.DataBinding.DevExpress.dll + + ..\..\packages\OSPSuite.DataBinding.DevExpress.2.2.0.2\lib\net462\OSPSuite.DataBinding.DevExpress.dll - - ..\..\packages\OSPSuite.FuncParser.2.0.0.1\lib\net45\OSPSuite.FuncParser.dll + + ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.37\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.48\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.37\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.48\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.2.2.0.6\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.37\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.48\lib\net462\OSPSuite.UI.dll - - ..\..\packages\OSPSuite.Utility.3.0.0.1\lib\net462\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.6.4\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.1\lib\net45\SX.dll @@ -247,6 +247,8 @@ ..\..\packages\System.Data.SQLite.Core.1.0.106.0\lib\net46\System.Data.SQLite.dll + + ..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index 46ee03e98..2a08e13e3 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -3,32 +3,32 @@ - - + + - - - + + + - + - - - + + + - - - + + + - - + + - - + + From 74528d9a989889c4e39d274e67172f345ba513f8 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Tue, 17 Apr 2018 11:01:06 -0400 Subject: [PATCH 14/29] Fixes #248 Add an option to disable Circular Reference Check (#249) * Fixes #248 Add an option to disable Circular Reference Check * 248 update capation according to PR review --- src/MoBi.Assets/AppConstants.cs | 1 + src/MoBi.Assets/MoBi.Assets.csproj | 8 ++--- src/MoBi.Assets/packages.config | 4 +-- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 20 ++++++------ .../Services/BatchUserSettings.cs | 1 + src/MoBi.BatchTool/packages.config | 10 +++--- src/MoBi.Core/MoBi.Core.csproj | 16 +++++----- src/MoBi.Core/ValidationSettings.cs | 7 ++++ src/MoBi.Core/packages.config | 8 ++--- .../MoBi.Presentation.csproj | 16 +++++----- .../Presenter/CreateSimulationPresenter.cs | 30 ++++++++++------- .../Presenter/FinalOptionsPresenter.cs | 25 ++++----------- .../Serializer/UserSettingsXmlSerialiser.cs | 1 + .../Settings/IUserSettings.cs | 1 + src/MoBi.Presentation/packages.config | 8 ++--- src/MoBi.UI/MoBi.UI.csproj | 20 ++++++------ src/MoBi.UI/Settings/UserSettings.cs | 8 ++++- src/MoBi.UI/Views/CreateSimulationView.cs | 10 ++---- src/MoBi.UI/Views/FinalOptionsView.cs | 6 +--- .../Views/ValidationOptionsView.Designer.cs | 32 +++++++++++++++++-- src/MoBi.UI/Views/ValidationOptionsView.cs | 4 +++ src/MoBi.UI/packages.config | 10 +++--- src/MoBi/MoBi.csproj | 12 +++---- src/MoBi/packages.config | 6 ++-- tests/MoBi.Tests/MoBi.Tests.csproj | 16 +++++----- .../CreateSimulationPresenterSpecs.cs | 10 ++++-- tests/MoBi.Tests/packages.config | 8 ++--- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 20 ++++++------ tests/MoBi.UI.Tests/packages.config | 10 +++--- 29 files changed, 183 insertions(+), 145 deletions(-) diff --git a/src/MoBi.Assets/AppConstants.cs b/src/MoBi.Assets/AppConstants.cs index 6c2436ecf..9dfc668de 100644 --- a/src/MoBi.Assets/AppConstants.cs +++ b/src/MoBi.Assets/AppConstants.cs @@ -1579,6 +1579,7 @@ public static class Captions public static readonly string ExportObservedDataToExcel = "Export observed data to Excel"; public static readonly string ContainerPath = "Container Path"; public static readonly string ValidateRules = "Validate value constraints"; + public static readonly string PerformCircularReferenceCheck = "Perform circular reference check (uncheck only if you have some performance issue while creating a model).\nIf unchecked, make sure to save your work before starting any simulation"; public static readonly string OpenAnyway = "&Open Anyway"; public static readonly string MoleculeObserver = "Molecule Observer"; public static readonly string ContainerObserver = "Container Observer"; diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index aae2a49b2..09d3a9f87 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -50,11 +50,11 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.48\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.51\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.48\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.51\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll diff --git a/src/MoBi.Assets/packages.config b/src/MoBi.Assets/packages.config index fad66b3d2..2004e0bdc 100644 --- a/src/MoBi.Assets/packages.config +++ b/src/MoBi.Assets/packages.config @@ -3,8 +3,8 @@ - - + + diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index b3b736977..9534ddebc 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -198,11 +198,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.48\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.51\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.48\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.51\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -213,11 +213,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.48\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.51\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.48\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.51\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -228,8 +228,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.48\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.51\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.BatchTool/Services/BatchUserSettings.cs b/src/MoBi.BatchTool/Services/BatchUserSettings.cs index 980eb7013..1ca4fd7b9 100644 --- a/src/MoBi.BatchTool/Services/BatchUserSettings.cs +++ b/src/MoBi.BatchTool/Services/BatchUserSettings.cs @@ -70,6 +70,7 @@ public void RestoreLayout() public bool ShowCannotCalcErrors { get; set; } public bool ShowPKSimObserverMessages { get; set; } public bool CheckRules { get; set; } + public bool CheckCircularReference { get; set; } public ValidationSettings ValidationSettings { get; private set; } public OutputSelections OutputSelections { get; set; } public bool GroupParameters { get; set; } diff --git a/src/MoBi.BatchTool/packages.config b/src/MoBi.BatchTool/packages.config index 557a6b2f8..bab409db0 100644 --- a/src/MoBi.BatchTool/packages.config +++ b/src/MoBi.BatchTool/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index a2fbd30cc..cb750a8e7 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -102,20 +102,20 @@ ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.48\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.51\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.48\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.51\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.48\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.51\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.48\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.51\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi.Core/ValidationSettings.cs b/src/MoBi.Core/ValidationSettings.cs index 8e39b742b..9ed0bfa4f 100644 --- a/src/MoBi.Core/ValidationSettings.cs +++ b/src/MoBi.Core/ValidationSettings.cs @@ -9,6 +9,7 @@ public class ValidationSettings : Notifier private bool _showCannotCalcErrors; private bool _showPKSimObserverMessages; private bool _checkRules; + private bool _checkCircularReference; public bool CheckDimensions { @@ -46,5 +47,11 @@ public bool CheckRules get => _checkRules; set => SetProperty(ref _checkRules, value); } + + public bool CheckCircularReference + { + get => _checkCircularReference; + set => SetProperty(ref _checkCircularReference, value); + } } } \ No newline at end of file diff --git a/src/MoBi.Core/packages.config b/src/MoBi.Core/packages.config index a6e7764a9..c08d3ce8d 100644 --- a/src/MoBi.Core/packages.config +++ b/src/MoBi.Core/packages.config @@ -10,12 +10,12 @@ - - + + - - + + diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index 40d85c479..fc5f947c8 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -202,20 +202,20 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.48\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.51\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.48\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.51\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.48\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.51\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.48\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.51\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi.Presentation/Presenter/CreateSimulationPresenter.cs b/src/MoBi.Presentation/Presenter/CreateSimulationPresenter.cs index 9e52b8748..ecde86c31 100644 --- a/src/MoBi.Presentation/Presenter/CreateSimulationPresenter.cs +++ b/src/MoBi.Presentation/Presenter/CreateSimulationPresenter.cs @@ -9,6 +9,7 @@ using MoBi.Core.Services; using MoBi.Presentation.DTO; using MoBi.Presentation.Presenter.Simulation; +using MoBi.Presentation.Settings; using MoBi.Presentation.Views; using OSPSuite.Core.Domain; using OSPSuite.Core.Domain.Builder; @@ -33,20 +34,28 @@ public class CreateSimulationPresenter : ConfigureSimulationPresenterBase subPresenterManager, IDialogCreator dialogCreator, - IForbiddenNamesRetriever forbiddenNamesRetriever) + public CreateSimulationPresenter( + ICreateSimulationView view, + IMoBiContext context, + IModelConstructor modelConstructor, + IDimensionValidator dimensionValidator, + ISimulationFactory simulationFactory, + IBuildConfigurationFactory buildConfigurationFactory, + IHeavyWorkManager heavyWorkManager, + ISubPresenterItemManager subPresenterManager, + IDialogCreator dialogCreator, + IForbiddenNamesRetriever forbiddenNamesRetriever, + IUserSettings userSettings) : base(view, subPresenterManager, dialogCreator, buildConfigurationFactory, context, SimulationItems.All) { _simulationFactory = simulationFactory; _heavyWorkManager = heavyWorkManager; _forbiddenNamesRetriever = forbiddenNamesRetriever; + _userSettings = userSettings; _dimensionValidator = dimensionValidator; _modelConstructor = modelConstructor; } @@ -85,7 +94,7 @@ private IEnumerable nameOfSimulationAlreadyUsed() /// private void finish() { - SaveBuildConfiguration(); + saveBuildConfiguration(); CreationResult result = null; _heavyWorkManager.Start(() => { result = createModel(); }, AppConstants.Captions.CreatingSimulation); @@ -95,8 +104,6 @@ private void finish() Simulation = createSimulation(result.Model); - FinalOptionsPresenter.DoFinalActions(Simulation); - validateDimensions(Simulation.Model); } @@ -116,8 +123,6 @@ private CreationResult createModel() return null; showWarnings(result.ValidationResult); - if (result.IsInvalid) - return result; return result; } @@ -127,7 +132,7 @@ private void showWarnings(ValidationResult validationResult) _context.PublishEvent(new ShowValidationResultsEvent(validationResult)); } - protected void SaveBuildConfiguration() + private void saveBuildConfiguration() { ValidateStartValues(); @@ -135,6 +140,7 @@ protected void SaveBuildConfiguration() UpdateStartValueInfo(_buildConfiguration.ParameterStartValuesInfo, SelectedParameterStartValues); _buildConfiguration.ShouldValidate = true; + _buildConfiguration.PerformCircularReferenceCheck = _userSettings.CheckCircularReference; } private IMoBiSimulation createSimulation(IModel model) diff --git a/src/MoBi.Presentation/Presenter/FinalOptionsPresenter.cs b/src/MoBi.Presentation/Presenter/FinalOptionsPresenter.cs index 5e1c38bfc..cec0c1f7b 100644 --- a/src/MoBi.Presentation/Presenter/FinalOptionsPresenter.cs +++ b/src/MoBi.Presentation/Presenter/FinalOptionsPresenter.cs @@ -1,17 +1,14 @@ -using OSPSuite.Assets; -using MoBi.Core; -using MoBi.Core.Domain.Model; -using MoBi.Presentation.Settings; +using MoBi.Core.Domain.Model; using MoBi.Presentation.Presenter.Simulation; +using MoBi.Presentation.Settings; using MoBi.Presentation.Views; - +using OSPSuite.Assets; using OSPSuite.Presentation.Presenters; namespace MoBi.Presentation.Presenter { public interface IFinalOptionsPresenter : ISimulationItemPresenter { - void DoFinalActions(IMoBiSimulation simulation); } public class FinalOptionsPresenter : AbstractSubPresenter, IFinalOptionsPresenter @@ -19,30 +16,20 @@ public class FinalOptionsPresenter : AbstractSubPresenter null; public void Edit(IMoBiSimulation simulation) { _validationOptionsPresenter.Edit(_userSettings.ValidationSettings); } - public override ApplicationIcon Icon - { - get { return ApplicationIcons.Run; } - } + public override ApplicationIcon Icon => ApplicationIcons.Run; } } \ No newline at end of file diff --git a/src/MoBi.Presentation/Serialization/Xml/Serializer/UserSettingsXmlSerialiser.cs b/src/MoBi.Presentation/Serialization/Xml/Serializer/UserSettingsXmlSerialiser.cs index e45701872..1fdfe5f69 100644 --- a/src/MoBi.Presentation/Serialization/Xml/Serializer/UserSettingsXmlSerialiser.cs +++ b/src/MoBi.Presentation/Serialization/Xml/Serializer/UserSettingsXmlSerialiser.cs @@ -30,6 +30,7 @@ public override void PerformMapping() Map(x => x.ShowPKSimDimensionProblemWarnings); Map(x => x.ShowPKSimObserverMessages); Map(x => x.CheckRules); + Map(x => x.CheckCircularReference); Map(x => x.GroupParameters); Map(x => x.DisplayUnits); Map(x => x.ComparerSettings); diff --git a/src/MoBi.Presentation/Settings/IUserSettings.cs b/src/MoBi.Presentation/Settings/IUserSettings.cs index e1bb6aaef..4f3b191cc 100644 --- a/src/MoBi.Presentation/Settings/IUserSettings.cs +++ b/src/MoBi.Presentation/Settings/IUserSettings.cs @@ -47,6 +47,7 @@ public interface IUserSettings : IPresentationUserSettings, ICoreUserSettings bool ShowCannotCalcErrors { get; set; } bool ShowPKSimObserverMessages { get; set; } bool CheckRules { get; set; } + bool CheckCircularReference { get; set; } bool GroupParameters { get; set; } ValidationSettings ValidationSettings { get; } diff --git a/src/MoBi.Presentation/packages.config b/src/MoBi.Presentation/packages.config index 4e1dfbe19..4697867a7 100644 --- a/src/MoBi.Presentation/packages.config +++ b/src/MoBi.Presentation/packages.config @@ -12,13 +12,13 @@ - - + + - - + + diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index 0bc1de1c3..36a41d049 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -238,11 +238,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.48\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.51\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.48\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.51\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -253,11 +253,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.48\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.51\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.48\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.51\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -268,8 +268,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.48\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.51\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.UI/Settings/UserSettings.cs b/src/MoBi.UI/Settings/UserSettings.cs index 46b4cbfd9..cb9856c68 100644 --- a/src/MoBi.UI/Settings/UserSettings.cs +++ b/src/MoBi.UI/Settings/UserSettings.cs @@ -112,7 +112,7 @@ public UserSettings(DockManager dockManager, RibbonBarManager ribbonManager, Dir ShowAdvancedParameters = true; GroupParameters = false; VisibleNotification = NotificationType.Warning | NotificationType.Error; - ValidationSettings = new ValidationSettings {CheckDimensions = true}; + ValidationSettings = new ValidationSettings {CheckDimensions = true, CheckCircularReference = true}; DisplayUnits = new DisplayUnitsManager(); DefaultChartYScaling = Scalings.Log; IconSizeTreeView = IconSizes.Size24x24; @@ -159,6 +159,12 @@ public bool CheckRules set => ValidationSettings.CheckRules = value; } + public bool CheckCircularReference + { + get => ValidationSettings.CheckCircularReference; + set => ValidationSettings.CheckCircularReference = value; + } + public ValidationSettings ValidationSettings { get; } public uint DecimalPlace diff --git a/src/MoBi.UI/Views/CreateSimulationView.cs b/src/MoBi.UI/Views/CreateSimulationView.cs index 786fe4238..e72818999 100644 --- a/src/MoBi.UI/Views/CreateSimulationView.cs +++ b/src/MoBi.UI/Views/CreateSimulationView.cs @@ -60,14 +60,8 @@ public override void InitializeResources() } - public override XtraTabControl TabControl - { - get { return tabWizard; } - } + public override XtraTabControl TabControl => tabWizard; - public override bool HasError - { - get { return _screenBinder.HasError; } - } + public override bool HasError => _screenBinder.HasError; } } \ No newline at end of file diff --git a/src/MoBi.UI/Views/FinalOptionsView.cs b/src/MoBi.UI/Views/FinalOptionsView.cs index 0d1c532c7..d98aa9b05 100644 --- a/src/MoBi.UI/Views/FinalOptionsView.cs +++ b/src/MoBi.UI/Views/FinalOptionsView.cs @@ -4,7 +4,6 @@ using MoBi.Presentation.Presenter; using MoBi.Presentation.Views; using OSPSuite.UI.Controls; -using OSPSuite.Presentation.Extensions; using OSPSuite.Presentation.Views; using OSPSuite.UI.Extensions; @@ -28,10 +27,7 @@ public override void InitializeResources() layoutItemValidationOptions.TextVisible = false; } - public override ApplicationIcon ApplicationIcon - { - get { return _presenter.Icon; } - } + public override ApplicationIcon ApplicationIcon => _presenter.Icon; public void AttachPresenter(IFinalOptionsPresenter presenter) { diff --git a/src/MoBi.UI/Views/ValidationOptionsView.Designer.cs b/src/MoBi.UI/Views/ValidationOptionsView.Designer.cs index 910bce407..d079303f9 100644 --- a/src/MoBi.UI/Views/ValidationOptionsView.Designer.cs +++ b/src/MoBi.UI/Views/ValidationOptionsView.Designer.cs @@ -44,6 +44,8 @@ private void InitializeComponent() this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutItemPKSIMWarnings = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.chkPerformCircularReferenceCheck = new DevExpress.XtraEditors.CheckEdit(); + this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).BeginInit(); this.layoutControl.SuspendLayout(); @@ -58,11 +60,14 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemPKSIMWarnings)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.chkPerformCircularReferenceCheck.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); this.SuspendLayout(); // // layoutControl // this.layoutControl.AllowCustomization = false; + this.layoutControl.Controls.Add(this.chkPerformCircularReferenceCheck); this.layoutControl.Controls.Add(this.chkValidateRules); this.layoutControl.Controls.Add(this.chkShowPKSimWarnings); this.layoutControl.Controls.Add(this.chkShowUnableToCalculateWarnings); @@ -135,7 +140,8 @@ private void InitializeComponent() this.layoutControlItem2, this.layoutControlItem3, this.layoutItemPKSIMWarnings, - this.layoutControlItem4}); + this.layoutControlItem4, + this.layoutControlItem5}); this.layoutControlGroup.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup.Name = "layoutControlGroup"; this.layoutControlGroup.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); @@ -187,10 +193,28 @@ private void InitializeComponent() this.layoutControlItem4.Control = this.chkValidateRules; this.layoutControlItem4.Location = new System.Drawing.Point(0, 92); this.layoutControlItem4.Name = "layoutControlItem4"; - this.layoutControlItem4.Size = new System.Drawing.Size(331, 151); + this.layoutControlItem4.Size = new System.Drawing.Size(331, 23); this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem4.TextVisible = false; // + // chkPerformCircularReferenceCheck + // + this.chkPerformCircularReferenceCheck.Location = new System.Drawing.Point(2, 117); + this.chkPerformCircularReferenceCheck.Name = "chkPerformCircularReferenceCheck"; + this.chkPerformCircularReferenceCheck.Properties.Caption = "chkPerformCircularReferenceCheck"; + this.chkPerformCircularReferenceCheck.Size = new System.Drawing.Size(327, 19); + this.chkPerformCircularReferenceCheck.StyleController = this.layoutControl; + this.chkPerformCircularReferenceCheck.TabIndex = 9; + // + // layoutControlItem5 + // + this.layoutControlItem5.Control = this.chkPerformCircularReferenceCheck; + this.layoutControlItem5.Location = new System.Drawing.Point(0, 115); + this.layoutControlItem5.Name = "layoutControlItem5"; + this.layoutControlItem5.Size = new System.Drawing.Size(331, 128); + this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0); + this.layoutControlItem5.TextVisible = false; + // // ValidationOptionsView // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -212,6 +236,8 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemPKSIMWarnings)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.chkPerformCircularReferenceCheck.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); this.ResumeLayout(false); } @@ -230,5 +256,7 @@ private void InitializeComponent() private UxCheckEdit chkValiadatePkSimStandardObserver; private DevExpress.XtraEditors.CheckEdit chkValidateRules; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; + private DevExpress.XtraEditors.CheckEdit chkPerformCircularReferenceCheck; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; } } diff --git a/src/MoBi.UI/Views/ValidationOptionsView.cs b/src/MoBi.UI/Views/ValidationOptionsView.cs index 28126e7f7..92e2c5f0d 100644 --- a/src/MoBi.UI/Views/ValidationOptionsView.cs +++ b/src/MoBi.UI/Views/ValidationOptionsView.cs @@ -45,6 +45,9 @@ public override void InitializeBinding() _screenBinder.Bind(x => x.CheckRules) .To(chkValidateRules); + _screenBinder.Bind(x => x.CheckCircularReference) + .To(chkPerformCircularReferenceCheck); + RegisterValidationFor(_screenBinder, NotifyViewChanged); } @@ -56,6 +59,7 @@ public override void InitializeResources() chkShowPKSimWarnings.Text = AppConstants.Captions.ShowPKSimParameterWarnings; chkShowUnableToCalculateWarnings.Text = AppConstants.Captions.ShowUnableCalculateWarnings; chkValidateRules.Text = AppConstants.Captions.ValidateRules; + chkPerformCircularReferenceCheck.Text = AppConstants.Captions.PerformCircularReferenceCheck; } public void AttachPresenter(IValidationOptionsPresenter presenter) diff --git a/src/MoBi.UI/packages.config b/src/MoBi.UI/packages.config index 557a6b2f8..bab409db0 100644 --- a/src/MoBi.UI/packages.config +++ b/src/MoBi.UI/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index c6d4e5bea..132a448fa 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -93,17 +93,17 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.48\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.51\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.48\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.51\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.48\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.51\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi/packages.config b/src/MoBi/packages.config index f040bb7ab..48126ab4b 100644 --- a/src/MoBi/packages.config +++ b/src/MoBi/packages.config @@ -3,11 +3,11 @@ - - + + - + diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index c808b6e41..2eeda2228 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -138,14 +138,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.48\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.51\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.48\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.51\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -153,11 +153,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.48\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.51\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.48\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.51\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/tests/MoBi.Tests/Presentation/CreateSimulationPresenterSpecs.cs b/tests/MoBi.Tests/Presentation/CreateSimulationPresenterSpecs.cs index fc4032f37..e20a07d58 100644 --- a/tests/MoBi.Tests/Presentation/CreateSimulationPresenterSpecs.cs +++ b/tests/MoBi.Tests/Presentation/CreateSimulationPresenterSpecs.cs @@ -60,13 +60,14 @@ protected override void Context() _validationVisitor = A.Fake(); _userSettings = A.Fake(); + _userSettings.CheckCircularReference = true; _simulationFactory = A.Fake(); _buildConfigurationFactory = A.Fake(); _heavyWorkManager = new HeavyWorkManagerForSpecs(); _forbiddenNameRetriever = A.Fake(); sut = new CreateSimulationPresenter(_view, _context, _modelConstructor, _validationVisitor, _simulationFactory, _buildConfigurationFactory, _heavyWorkManager, _subPresenterManager, _dialogCreator, - _forbiddenNameRetriever); + _forbiddenNameRetriever,_userSettings); _simulation = A.Fake(); A.CallTo(() => _simulationFactory.Create()).Returns(_simulation); @@ -154,7 +155,12 @@ public void should_create_model() { A.CallTo(() => _modelConstructor.CreateModelFrom(_newBuildConfiguration, A._)).MustHaveHappened(); } - + + [Observation] + public void should_set_the_check_circular_reference_according_to_value_in_user_settings() + { + _buildConfiguration.PerformCircularReferenceCheck.ShouldBeEqualTo(_userSettings.CheckCircularReference); + } [Observation] public void should_generate_a_correct_buildconfiguration() diff --git a/tests/MoBi.Tests/packages.config b/tests/MoBi.Tests/packages.config index e6011e946..464a55e6e 100644 --- a/tests/MoBi.Tests/packages.config +++ b/tests/MoBi.Tests/packages.config @@ -14,14 +14,14 @@ - + - + - - + + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index 0e1483cc6..9ca41cba6 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -198,14 +198,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.48\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.51\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.48\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.51\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -216,11 +216,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.48\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.51\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.48\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.51\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -231,8 +231,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.48\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.51\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index 2a08e13e3..8492818ae 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -13,21 +13,21 @@ - + - + - - + + - + From 1863c90d9ecd6a48ec63e5c4a78e64bc16e7ad67 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 19 Apr 2018 12:49:46 -0400 Subject: [PATCH 15/29] Fixes #252 support for table formula with X-arg (#253) * Update schema * Fixes #252 support for table formula with X-arg * Add missing icons * Fixes failing test * Review for PR --- simmodel.schema | 2 +- src/MoBi.Assets/AppConstants.cs | 7 +- src/MoBi.Assets/MoBi.Assets.csproj | 8 +- src/MoBi.Assets/packages.config | 4 +- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 20 +-- src/MoBi.BatchTool/packages.config | 10 +- ...FormulaWithOffsetTableObjectPathCommand.cs | 50 +------ ...ableFormulaWithReferencePathCommandBase.cs | 47 ++++++ ...leFormulaWithXArgumentObjectPathCommand.cs | 34 +++++ .../Domain/Services/IMoBiFormulaTask.cs | 2 + .../UnitSystem/DimensionConverterFor.cs | 35 ++--- .../Helper/FormulaTypeCaptionRepository.cs | 11 +- src/MoBi.Core/MoBi.Core.csproj | 18 ++- src/MoBi.Core/MoBiConfiguration.cs | 8 +- src/MoBi.Core/packages.config | 8 +- .../DTO/FormulaUsablePathDTO.cs | 2 +- .../DTO/TableFormulaWithXArgumentDTO.cs | 8 + ...OffsetToTableFormulaWithOffsetDTOMapper.cs | 5 +- ...entToTableFormulaWithXArgumentDTOMapper.cs | 46 ++++++ .../MoBi.Presentation.csproj | 20 ++- .../Presenter/EditFormulaPresenter.cs | 9 +- ...tTableFormulaWithOffSetFormulaPresenter.cs | 34 +++-- ...bleFormulaWithXArgumentFormulaPresenter.cs | 96 ++++++++++++ .../Presenter/FormulaPresenterCache.cs | 5 +- .../SelectReferencePresenterFactory.cs | 2 +- .../Tasks/MoBiFormulaTask.cs | 47 ++++-- .../IEditTableFormulaWithOffSetFormulaView.cs | 2 +- ...ditTableFormulaWithXArgumentFormulaView.cs | 11 ++ src/MoBi.Presentation/packages.config | 8 +- src/MoBi.UI/MoBi.UI.csproj | 41 ++++-- src/MoBi.UI/Properties/licenses.licx | 3 + src/MoBi.UI/Services/ApplicationStartup.cs | 2 +- src/MoBi.UI/Views/EditContainerView.cs | 22 ++- src/MoBi.UI/Views/EditParameterView.cs | 2 + ...leFormulaWithOffSetFormulaView.Designer.cs | 4 +- .../EditTableFormulaWithOffSetFormulaView.cs | 8 +- ...ormulaWithXArgumentFormulaView.Designer.cs | 139 ++++++++++++++++++ ...ditTableFormulaWithXArgumentFormulaView.cs | 59 ++++++++ ...tTableFormulaWithXArgumentFormulaView.resx | 123 ++++++++++++++++ src/MoBi.UI/packages.config | 10 +- src/MoBi/MoBi.csproj | 12 +- src/MoBi/packages.config | 6 +- ...aWithOffsetOffsetObjectPathCommandSpecs.cs | 2 +- ...laWithOffsetTableObjectPathCommandSpecs.cs | 2 +- .../Core/MolWeightConverterSpecs.cs | 4 +- tests/MoBi.Tests/MoBi.Tests.csproj | 17 ++- ...eFormulaWithOffSetFormulaPresenterSpecs.cs | 8 +- ...rmulaWithXArgumentFormulaPresenterSpecs.cs | 126 ++++++++++++++++ .../FormulaPresenterCacheSpecs.cs | 3 +- .../Tasks/MoBiFormulaTaskSpecs.cs | 4 +- tests/MoBi.Tests/packages.config | 8 +- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 20 +-- tests/MoBi.UI.Tests/packages.config | 10 +- 53 files changed, 941 insertions(+), 253 deletions(-) create mode 100644 src/MoBi.Core/Commands/ChangeTableFormulaWithReferencePathCommandBase.cs create mode 100644 src/MoBi.Core/Commands/ChangeTableFormulaWithXArgumentObjectPathCommand.cs create mode 100644 src/MoBi.Presentation/DTO/TableFormulaWithXArgumentDTO.cs create mode 100644 src/MoBi.Presentation/Mappers/TableFormulaWithXArgumentToTableFormulaWithXArgumentDTOMapper.cs create mode 100644 src/MoBi.Presentation/Presenter/EditTableFormulaWithXArgumentFormulaPresenter.cs create mode 100644 src/MoBi.Presentation/Views/IEditTableFormulaWithXArgumentFormulaView.cs create mode 100644 src/MoBi.UI/Properties/licenses.licx create mode 100644 src/MoBi.UI/Views/EditTableFormulaWithXArgumentFormulaView.Designer.cs create mode 100644 src/MoBi.UI/Views/EditTableFormulaWithXArgumentFormulaView.cs create mode 100644 src/MoBi.UI/Views/EditTableFormulaWithXArgumentFormulaView.resx create mode 100644 tests/MoBi.Tests/Presentation/EditTableFormulaWithXArgumentFormulaPresenterSpecs.cs diff --git a/simmodel.schema b/simmodel.schema index 7eaddcc9b..ba10b251d 160000 --- a/simmodel.schema +++ b/simmodel.schema @@ -1 +1 @@ -Subproject commit 7eaddcc9b3addfde4c18cbdf392ae8972a43a7d8 +Subproject commit ba10b251d111d6370d04904da2b261acdc7279dd diff --git a/src/MoBi.Assets/AppConstants.cs b/src/MoBi.Assets/AppConstants.cs index 9dfc668de..1af1ce324 100644 --- a/src/MoBi.Assets/AppConstants.cs +++ b/src/MoBi.Assets/AppConstants.cs @@ -1392,8 +1392,10 @@ public static class Captions public static readonly string AddValuePoint = "Add Point"; public static readonly string UseDerivedValues = "Use derivative values"; public static readonly string OffsetObjectPath = "Path to offset object"; + public static readonly string XArgumentObjectPath = "Path to X-Argument object"; public static readonly string TableObjectPath = "Path to table object"; public static readonly string TableFormulaWithOffset = "Table Formula with Offset"; + public static readonly string TableFormulaWithXArgument = "Table Formula with X-Argument"; public static readonly string VariableName = "Variable name"; public static readonly string SumFormula = "Sum Formula"; public static readonly string Criteria = "Parameter criteria"; @@ -2002,8 +2004,9 @@ public static string RHSDimensionName(IDimension dimension) public static readonly string OutputIntervalId = "OutputIntervalId"; public static readonly string SolverSettingsId = "SolverSettingsId"; public static readonly string SimulationSettingsId = "SimulationSettingsId"; - public static readonly string OffsetAlias = "OFFSET"; - public static readonly string TableAlias = "TABLE"; + public static readonly string OFFSET_ALIAS = "OFFSET"; + public static readonly string TABLE_ALIAS = "TABLE"; + public static readonly string X_ARGUMENT_ALIAS = "X_ARGUMENT"; public static readonly string Param = "Param"; public static readonly string RHSFormula = "RHS Formula"; diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index 09d3a9f87..e5e2f3e4a 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -50,11 +50,11 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.51\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.55\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.51\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.55\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll diff --git a/src/MoBi.Assets/packages.config b/src/MoBi.Assets/packages.config index 2004e0bdc..1982236bd 100644 --- a/src/MoBi.Assets/packages.config +++ b/src/MoBi.Assets/packages.config @@ -3,8 +3,8 @@ - - + + diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index 9534ddebc..5d6f6eba8 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -198,11 +198,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.51\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.55\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.51\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.55\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -213,11 +213,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.51\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.55\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.51\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.55\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -228,8 +228,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.51\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.55\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.BatchTool/packages.config b/src/MoBi.BatchTool/packages.config index bab409db0..3e058ecba 100644 --- a/src/MoBi.BatchTool/packages.config +++ b/src/MoBi.BatchTool/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + diff --git a/src/MoBi.Core/Commands/ChangeTableFormulaWithOffsetTableObjectPathCommand.cs b/src/MoBi.Core/Commands/ChangeTableFormulaWithOffsetTableObjectPathCommand.cs index c9df98973..99706b065 100644 --- a/src/MoBi.Core/Commands/ChangeTableFormulaWithOffsetTableObjectPathCommand.cs +++ b/src/MoBi.Core/Commands/ChangeTableFormulaWithOffsetTableObjectPathCommand.cs @@ -1,5 +1,3 @@ -using System; -using System.Linq; using OSPSuite.Core.Commands.Core; using MoBi.Core.Domain.Model; using OSPSuite.Core.Domain; @@ -8,45 +6,7 @@ namespace MoBi.Core.Commands { - public abstract class ChangeTableFormulaWithOffsetPathPropertyCommandBase : BuildingBlockChangeCommandBase - { - protected TableFormulaWithOffset _tableFormulaWithOffset; - protected IFormulaUsablePath _newFormulaUsablePath; - protected IFormulaUsablePath _oldFormulaUsablePath; - private readonly Func _aliasFunc; - private readonly Action _addAction; - private readonly string _tableFormulaWithOffsetId; - - protected ChangeTableFormulaWithOffsetPathPropertyCommandBase(TableFormulaWithOffset tableFormulaWithOffset, - IFormulaUsablePath newFormulaUsablePath, IBuildingBlock buildingBlock, Func aliasFunc, Action addAction) - : base(buildingBlock) - { - _tableFormulaWithOffset = tableFormulaWithOffset; - _tableFormulaWithOffsetId = _tableFormulaWithOffset.Id; - _newFormulaUsablePath = newFormulaUsablePath; - _aliasFunc = aliasFunc; - _addAction = addAction; - } - - public override void RestoreExecutionData(IMoBiContext context) - { - base.RestoreExecutionData(context); - _tableFormulaWithOffset = context.Get(_tableFormulaWithOffsetId); - } - - protected override void ExecuteWith(IMoBiContext context) - { - base.ExecuteWith(context); - _oldFormulaUsablePath = _tableFormulaWithOffset.ObjectPaths.SingleOrDefault(path => _aliasFunc(_tableFormulaWithOffset).Equals(path.Alias)); - if (_oldFormulaUsablePath != null) - _tableFormulaWithOffset.RemoveObjectPath(_oldFormulaUsablePath); - - if (_newFormulaUsablePath != null) - _addAction(_newFormulaUsablePath); - } - } - - public class ChangeTableFormulaWithOffsetTableObjectPathCommand : ChangeTableFormulaWithOffsetPathPropertyCommandBase + public class ChangeTableFormulaWithOffsetTableObjectPathCommand : ChangeTableFormulaWithReferencePathCommandBase { public ChangeTableFormulaWithOffsetTableObjectPathCommand(TableFormulaWithOffset tableFormulaWithOffset, IFormulaUsablePath newFormulaUsablePath, IBuildingBlock buildingBlock) : base(tableFormulaWithOffset, newFormulaUsablePath, buildingBlock, x => x.TableObjectAlias, tableFormulaWithOffset.AddTableObjectPath) @@ -55,11 +15,11 @@ public ChangeTableFormulaWithOffsetTableObjectPathCommand(TableFormulaWithOffset protected override IReversibleCommand GetInverseCommand(IMoBiContext context) { - return new ChangeTableFormulaWithOffsetTableObjectPathCommand(_tableFormulaWithOffset, _oldFormulaUsablePath, _buildingBlock).AsInverseFor(this); + return new ChangeTableFormulaWithOffsetTableObjectPathCommand(_tableFormulaWithReference, _oldFormulaUsablePath, _buildingBlock).AsInverseFor(this); } } - public class ChangeTableFormulaWithOffsetOffsetObjectPathCommand : ChangeTableFormulaWithOffsetPathPropertyCommandBase + public class ChangeTableFormulaWithOffsetOffsetObjectPathCommand : ChangeTableFormulaWithReferencePathCommandBase { public ChangeTableFormulaWithOffsetOffsetObjectPathCommand(TableFormulaWithOffset tableFormulaWithOffset, IFormulaUsablePath newFormulaUsablePath, IBuildingBlock buildingBlock) : base(tableFormulaWithOffset, newFormulaUsablePath, buildingBlock, x => x.OffsetObjectAlias, tableFormulaWithOffset.AddOffsetObjectPath) @@ -68,7 +28,7 @@ public ChangeTableFormulaWithOffsetOffsetObjectPathCommand(TableFormulaWithOffse protected override IReversibleCommand GetInverseCommand(IMoBiContext context) { - return new ChangeTableFormulaWithOffsetOffsetObjectPathCommand(_tableFormulaWithOffset, _oldFormulaUsablePath, _buildingBlock).AsInverseFor(this); + return new ChangeTableFormulaWithOffsetOffsetObjectPathCommand(_tableFormulaWithReference, _oldFormulaUsablePath, _buildingBlock).AsInverseFor(this); } } -} \ No newline at end of file +} \ No newline at end of file diff --git a/src/MoBi.Core/Commands/ChangeTableFormulaWithReferencePathCommandBase.cs b/src/MoBi.Core/Commands/ChangeTableFormulaWithReferencePathCommandBase.cs new file mode 100644 index 000000000..0e3d9e8b0 --- /dev/null +++ b/src/MoBi.Core/Commands/ChangeTableFormulaWithReferencePathCommandBase.cs @@ -0,0 +1,47 @@ +using System; +using System.Linq; +using MoBi.Core.Domain.Model; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Builder; +using OSPSuite.Core.Domain.Formulas; + +namespace MoBi.Core.Commands +{ + public abstract class ChangeTableFormulaWithReferencePathCommandBase : BuildingBlockChangeCommandBase where TFormula: Formula + { + protected TFormula _tableFormulaWithReference; + protected IFormulaUsablePath _newFormulaUsablePath; + protected IFormulaUsablePath _oldFormulaUsablePath; + private readonly Func _aliasFunc; + private readonly Action _addAction; + private readonly string _tableFormulaWithReferenceId; + + protected ChangeTableFormulaWithReferencePathCommandBase(TFormula tableFormulaWithReference, + IFormulaUsablePath newFormulaUsablePath, IBuildingBlock buildingBlock, Func aliasFunc, Action addAction) + : base(buildingBlock) + { + _tableFormulaWithReference = tableFormulaWithReference; + _tableFormulaWithReferenceId = _tableFormulaWithReference.Id; + _newFormulaUsablePath = newFormulaUsablePath; + _aliasFunc = aliasFunc; + _addAction = addAction; + } + + public override void RestoreExecutionData(IMoBiContext context) + { + base.RestoreExecutionData(context); + _tableFormulaWithReference = context.Get(_tableFormulaWithReferenceId); + } + + protected override void ExecuteWith(IMoBiContext context) + { + base.ExecuteWith(context); + _oldFormulaUsablePath = _tableFormulaWithReference.ObjectPaths.SingleOrDefault(path => _aliasFunc(_tableFormulaWithReference).Equals(path.Alias)); + if (_oldFormulaUsablePath != null) + _tableFormulaWithReference.RemoveObjectPath(_oldFormulaUsablePath); + + if (_newFormulaUsablePath != null) + _addAction(_newFormulaUsablePath); + } + } +} \ No newline at end of file diff --git a/src/MoBi.Core/Commands/ChangeTableFormulaWithXArgumentObjectPathCommand.cs b/src/MoBi.Core/Commands/ChangeTableFormulaWithXArgumentObjectPathCommand.cs new file mode 100644 index 000000000..0cab38477 --- /dev/null +++ b/src/MoBi.Core/Commands/ChangeTableFormulaWithXArgumentObjectPathCommand.cs @@ -0,0 +1,34 @@ +using MoBi.Core.Domain.Model; +using OSPSuite.Core.Commands.Core; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Builder; +using OSPSuite.Core.Domain.Formulas; + +namespace MoBi.Core.Commands +{ + public class ChangeTableFormulaWithXArgumentTableObjectPathCommand : ChangeTableFormulaWithReferencePathCommandBase + { + public ChangeTableFormulaWithXArgumentTableObjectPathCommand(TableFormulaWithXArgument tableFormulaWithXArgument, IFormulaUsablePath newFormulaUsablePath, IBuildingBlock buildingBlock) + : base(tableFormulaWithXArgument, newFormulaUsablePath, buildingBlock, x => x.TableObjectAlias, tableFormulaWithXArgument.AddTableObjectPath) + { + } + + protected override IReversibleCommand GetInverseCommand(IMoBiContext context) + { + return new ChangeTableFormulaWithXArgumentTableObjectPathCommand(_tableFormulaWithReference, _oldFormulaUsablePath, _buildingBlock).AsInverseFor(this); + } + } + + public class ChangeTableFormulaWithXArgumentXArgumentObjectPathCommand : ChangeTableFormulaWithReferencePathCommandBase + { + public ChangeTableFormulaWithXArgumentXArgumentObjectPathCommand(TableFormulaWithXArgument tableFormulaWithXArgument, IFormulaUsablePath newFormulaUsablePath, IBuildingBlock buildingBlock) + : base(tableFormulaWithXArgument, newFormulaUsablePath, buildingBlock, x => x.XArgumentAlias, tableFormulaWithXArgument.AddXArgumentObjectPath) + { + } + + protected override IReversibleCommand GetInverseCommand(IMoBiContext context) + { + return new ChangeTableFormulaWithXArgumentXArgumentObjectPathCommand(_tableFormulaWithReference, _oldFormulaUsablePath, _buildingBlock).AsInverseFor(this); + } + } +} \ No newline at end of file diff --git a/src/MoBi.Core/Domain/Services/IMoBiFormulaTask.cs b/src/MoBi.Core/Domain/Services/IMoBiFormulaTask.cs index d745de318..8c6784434 100644 --- a/src/MoBi.Core/Domain/Services/IMoBiFormulaTask.cs +++ b/src/MoBi.Core/Domain/Services/IMoBiFormulaTask.cs @@ -79,6 +79,8 @@ public interface IMoBiFormulaTask IMoBiCommand RemoveValuePointFromTableFormula(TableFormula formula, ValuePoint valuePoint, IBuildingBlock buildingBlock); IMoBiCommand ChangeOffsetObject(TableFormulaWithOffset formula, IFormulaUsablePath path, IBuildingBlock buildingBlock); IMoBiCommand ChangeTableObject(TableFormulaWithOffset formula, IFormulaUsablePath path, IBuildingBlock buildingBlock); + IMoBiCommand ChangeXArgumentObject(TableFormulaWithXArgument formula, IFormulaUsablePath path, IBuildingBlock buildingBlock); + IMoBiCommand ChangeTableObject(TableFormulaWithXArgument formula, IFormulaUsablePath path, IBuildingBlock buildingBlock); IMoBiCommand SetConstantFormulaValue(ConstantFormula formula, double kernelValue, Unit newDisplayUnit, Unit oldDisplayUnit, IBuildingBlock buildingBlock, IEntity formulaOwner); IMoBiCommand UpdateFormula(IEntity usingFormula, IFormula oldFormula, IFormula newFormula, FormulaDecoder decoder, IBuildingBlock buildingBlock); diff --git a/src/MoBi.Core/Domain/UnitSystem/DimensionConverterFor.cs b/src/MoBi.Core/Domain/UnitSystem/DimensionConverterFor.cs index 98b80d68c..efeefe6bd 100644 --- a/src/MoBi.Core/Domain/UnitSystem/DimensionConverterFor.cs +++ b/src/MoBi.Core/Domain/UnitSystem/DimensionConverterFor.cs @@ -58,26 +58,18 @@ public double ConvertToTargetBaseUnit(double sourceBaseUnitValue) { var factor = GetFactor(); if (factor.HasValue && !Double.IsNaN(factor.Value)) - { return sourceBaseUnitValue * factor.Value; - } - else - { - throw new MoBiException(); - } + + throw new MoBiException(); } public double ConvertToSourceBaseUnit(double targetBaseUnitValue) { var factor = GetFactor(); if (factor.HasValue && !Double.IsNaN(factor.Value)) - { return targetBaseUnitValue / factor.Value; - } - else - { - throw new MoBiException(); - } + + throw new MoBiException(); } public bool CanConvertTo(IDimension dimension) @@ -95,23 +87,20 @@ public bool CanConvertFrom(IDimension dimension) protected abstract double? GetFactor(); } - public class MolWeightDimensonConverterForFormulaUseable : DimensionConverterFor + public class MolWeightDimensionConverterForFormulaUsable : DimensionConverterFor { private IQuantity _formulaUsable; private IObjectPath _useablePath; private readonly ObjectPathFactory _pathFactory; - public MolWeightDimensonConverterForFormulaUseable(IDimension sourceDimension, IDimension targetDimension) : base(sourceDimension, targetDimension) + public MolWeightDimensionConverterForFormulaUsable(IDimension sourceDimension, IDimension targetDimension) : base(sourceDimension, targetDimension) { _pathFactory = new ObjectPathFactory(new AliasCreator()); } public override bool CanResolveParameters() { - if (_formulaUsable == null) - return false; - - var root = _formulaUsable.RootContainer; + var root = _formulaUsable?.RootContainer; if (root == null) return false; @@ -124,10 +113,7 @@ public override void SetRefObject(IQuantity refObject) _formulaUsable = refObject; } - public override string UnableToResolveParametersMessage - { - get { return String.Format("Could not resolve path {0}", _useablePath); } - } + public override string UnableToResolveParametersMessage => $"Could not resolve path {_useablePath}"; protected override double? GetFactor() { @@ -153,10 +139,7 @@ protected MolWeightDimensionConverterForDataColumn(IDimension sourceDimension, I { } - public override string UnableToResolveParametersMessage - { - get { return "MolWeight not set at DataColumn"; } - } + public override string UnableToResolveParametersMessage => "MolWeight not set at DataColumn"; public override void SetRefObject(DataColumn refObject) { diff --git a/src/MoBi.Core/Helper/FormulaTypeCaptionRepository.cs b/src/MoBi.Core/Helper/FormulaTypeCaptionRepository.cs index 2526ddbfc..c364a360a 100644 --- a/src/MoBi.Core/Helper/FormulaTypeCaptionRepository.cs +++ b/src/MoBi.Core/Helper/FormulaTypeCaptionRepository.cs @@ -9,12 +9,13 @@ public class FormulaTypeCaptionRepository : Dictionary { public FormulaTypeCaptionRepository() { - Add(typeof(ConstantFormula),AppConstants.Captions.ConstantFormula); - Add(typeof(ExplicitFormula),AppConstants.Captions.ExplicitFormula); - Add(typeof(TableFormula),AppConstants.Captions.TableFormula); - Add(typeof(BlackBoxFormula),AppConstants.Captions.BlackBoxFormula); + Add(typeof(ConstantFormula), AppConstants.Captions.ConstantFormula); + Add(typeof(ExplicitFormula), AppConstants.Captions.ExplicitFormula); + Add(typeof(TableFormula), AppConstants.Captions.TableFormula); + Add(typeof(BlackBoxFormula), AppConstants.Captions.BlackBoxFormula); Add(typeof(TableFormulaWithOffset), AppConstants.Captions.TableFormulaWithOffset); - Add(typeof (SumFormula), AppConstants.Captions.SumFormula); + Add(typeof(TableFormulaWithXArgument), AppConstants.Captions.TableFormulaWithXArgument); + Add(typeof(SumFormula), AppConstants.Captions.SumFormula); } } } \ No newline at end of file diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index cb750a8e7..f4ee15c03 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -102,20 +102,20 @@ ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.51\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.55\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.51\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.55\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.51\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.55\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.51\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.55\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -172,6 +172,8 @@ + + diff --git a/src/MoBi.Core/MoBiConfiguration.cs b/src/MoBi.Core/MoBiConfiguration.cs index f0a41c7e8..ccb449809 100644 --- a/src/MoBi.Core/MoBiConfiguration.cs +++ b/src/MoBi.Core/MoBiConfiguration.cs @@ -41,11 +41,11 @@ public class MoBiConfiguration : OSPSuiteConfiguration, IMoBiConfiguration public MoBiConfiguration() { - CalculationMethodRepositoryFile = AllUsersOrLocalPathForFile(AppConstants.SpecialFileNames.CALCULATION_METHOD_REPOSITORY_FILE_NAME); - GroupRepositoryFile = AllUsersOrLocalPathForFile(AppConstants.SpecialFileNames.GROUP_REPOSITORY_FILE_NAME); - TemplateFolder = AllUsersOrLocalPathForFolder(AppConstants.SpecialFileNames.TEMPLATES_FOLDER, AppConstants.SpecialFileNames.TEMPLATES_FOLDER); + CalculationMethodRepositoryFile = LocalOrAllUsersPathForFile(AppConstants.SpecialFileNames.CALCULATION_METHOD_REPOSITORY_FILE_NAME); + GroupRepositoryFile = LocalOrAllUsersPathForFile(AppConstants.SpecialFileNames.GROUP_REPOSITORY_FILE_NAME); + TemplateFolder = LocalOrAllUsersPathForFolder(AppConstants.SpecialFileNames.TEMPLATES_FOLDER, AppConstants.SpecialFileNames.TEMPLATES_FOLDER); SpaceOrganismUserTemplate = CurrentUserFile(AppConstants.SpecialFileNames.SPATIAL_STRUCTURE_TEMPLATE); - SpaceOrganismBaseTemplate = AllUsersOrLocalPathForFile(AppConstants.SpecialFileNames.SPATIAL_STRUCTURE_TEMPLATE); + SpaceOrganismBaseTemplate = LocalOrAllUsersPathForFile(AppConstants.SpecialFileNames.SPATIAL_STRUCTURE_TEMPLATE); StandardMoleculeTemplateFile = templateFile(AppConstants.SpecialFileNames.STANDARD_MOLECULE); } diff --git a/src/MoBi.Core/packages.config b/src/MoBi.Core/packages.config index c08d3ce8d..995c8cee4 100644 --- a/src/MoBi.Core/packages.config +++ b/src/MoBi.Core/packages.config @@ -10,12 +10,12 @@ - - + + - - + + diff --git a/src/MoBi.Presentation/DTO/FormulaUsablePathDTO.cs b/src/MoBi.Presentation/DTO/FormulaUsablePathDTO.cs index eaaf24a83..60af29928 100644 --- a/src/MoBi.Presentation/DTO/FormulaUsablePathDTO.cs +++ b/src/MoBi.Presentation/DTO/FormulaUsablePathDTO.cs @@ -32,7 +32,7 @@ private bool isAliasUnique(string alias) return _formula.ObjectPaths.Where(x => !ReferenceEquals(x, FormulaUsablePath)) .All(usablePath => !string.Equals(usablePath.Alias, alias)); } - + private static class AllRules { private static IBusinessRule notEmptyNameRule { get; } = GenericRules.NonEmptyRule(x => x.Alias, AppConstants.Validation.EmptyAlias); diff --git a/src/MoBi.Presentation/DTO/TableFormulaWithXArgumentDTO.cs b/src/MoBi.Presentation/DTO/TableFormulaWithXArgumentDTO.cs new file mode 100644 index 000000000..56ea16bf4 --- /dev/null +++ b/src/MoBi.Presentation/DTO/TableFormulaWithXArgumentDTO.cs @@ -0,0 +1,8 @@ +namespace MoBi.Presentation.DTO +{ + public class TableFormulaWithXArgumentDTO : FormulaBuilderDTO + { + public FormulaUsablePathDTO XArgumentObjectPath { get; set; } + public FormulaUsablePathDTO TableObjectPath { get; set; } + } +} \ No newline at end of file diff --git a/src/MoBi.Presentation/Mappers/TableFormulaWithOffsetToTableFormulaWithOffsetDTOMapper.cs b/src/MoBi.Presentation/Mappers/TableFormulaWithOffsetToTableFormulaWithOffsetDTOMapper.cs index 76849d478..f6eb0bfbe 100644 --- a/src/MoBi.Presentation/Mappers/TableFormulaWithOffsetToTableFormulaWithOffsetDTOMapper.cs +++ b/src/MoBi.Presentation/Mappers/TableFormulaWithOffsetToTableFormulaWithOffsetDTOMapper.cs @@ -1,8 +1,8 @@ using System.Linq; -using OSPSuite.Utility; using MoBi.Presentation.DTO; using OSPSuite.Core.Domain; using OSPSuite.Core.Domain.Formulas; +using OSPSuite.Utility; namespace MoBi.Presentation.Mappers { @@ -10,7 +10,7 @@ public interface ITableFormulaWithOffsetToTableFormulaWithOffsetDTOMapper : IMap { } - internal class TableFormulaWithOffsetToTableFormulaWithOffsetDTOMapper : ObjectBaseToObjectBaseDTOMapperBase, ITableFormulaWithOffsetToTableFormulaWithOffsetDTOMapper + public class TableFormulaWithOffsetToTableFormulaWithOffsetDTOMapper : ObjectBaseToObjectBaseDTOMapperBase, ITableFormulaWithOffsetToTableFormulaWithOffsetDTOMapper { private readonly IFormulaUsablePathToFormulaUsablePathDTOMapper _mapper; @@ -34,6 +34,7 @@ public TableFormulaWithOffsetDTO MapFrom(TableFormulaWithOffset tableFormulaWith { dto.TableObjectPath = _mapper.MapFrom(tableObjectPath, tableFormulaWithOffset); } + return dto; } diff --git a/src/MoBi.Presentation/Mappers/TableFormulaWithXArgumentToTableFormulaWithXArgumentDTOMapper.cs b/src/MoBi.Presentation/Mappers/TableFormulaWithXArgumentToTableFormulaWithXArgumentDTOMapper.cs new file mode 100644 index 000000000..bf2f66b1e --- /dev/null +++ b/src/MoBi.Presentation/Mappers/TableFormulaWithXArgumentToTableFormulaWithXArgumentDTOMapper.cs @@ -0,0 +1,46 @@ +using System.Linq; +using MoBi.Presentation.DTO; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Formulas; +using OSPSuite.Utility; + +namespace MoBi.Presentation.Mappers +{ + public interface ITableFormulaWithXArgumentToTableFormulaWithXArgumentDTOMapper : IMapper + { + } + + public class TableFormulaWithXArgumentToTableFormulaWithXArgumentDTOMapper : ObjectBaseToObjectBaseDTOMapperBase, ITableFormulaWithXArgumentToTableFormulaWithXArgumentDTOMapper + { + private readonly IFormulaUsablePathToFormulaUsablePathDTOMapper _mapper; + + public TableFormulaWithXArgumentToTableFormulaWithXArgumentDTOMapper(IFormulaUsablePathToFormulaUsablePathDTOMapper mapper) + { + _mapper = mapper; + } + + public TableFormulaWithXArgumentDTO MapFrom(TableFormulaWithXArgument tableFormulaWithXArgument) + { + var dto = Map(tableFormulaWithXArgument); + + var xArgumentObjectPath = getPathByAlias(tableFormulaWithXArgument, tableFormulaWithXArgument.XArgumentAlias); + if (xArgumentObjectPath != null) + { + dto.XArgumentObjectPath = _mapper.MapFrom(xArgumentObjectPath, tableFormulaWithXArgument); + } + + var tableObjectPath = getPathByAlias(tableFormulaWithXArgument, tableFormulaWithXArgument.TableObjectAlias); + if (tableObjectPath != null) + { + dto.TableObjectPath = _mapper.MapFrom(tableObjectPath, tableFormulaWithXArgument); + } + + return dto; + } + + private static IFormulaUsablePath getPathByAlias(TableFormulaWithXArgument tableFormulaWithXArgument, string pathAlias) + { + return tableFormulaWithXArgument.ObjectPaths.SingleOrDefault(x => x.Alias.Equals(pathAlias)); + } + } +} \ No newline at end of file diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index fc5f947c8..4bde7956d 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -202,20 +202,20 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.51\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.55\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.51\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.55\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.51\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.55\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.51\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.55\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -271,6 +271,7 @@ + @@ -283,6 +284,7 @@ + @@ -375,6 +377,7 @@ + @@ -505,6 +508,7 @@ + diff --git a/src/MoBi.Presentation/Presenter/EditFormulaPresenter.cs b/src/MoBi.Presentation/Presenter/EditFormulaPresenter.cs index 23eaaf124..f87409993 100644 --- a/src/MoBi.Presentation/Presenter/EditFormulaPresenter.cs +++ b/src/MoBi.Presentation/Presenter/EditFormulaPresenter.cs @@ -124,7 +124,7 @@ public EditFormulaPresenter(IEditFormulaView view, IFormulaPresenterCache formul _circularReferenceChecker = circularReferenceChecker; _context = context; _formulaPresenterCache = formulaPresenterCache; - _allFormulaType = new HashSet {typeof(ConstantFormula), typeof(TableFormula), typeof(ExplicitFormula), typeof(TableFormulaWithOffset), typeof(SumFormula)}; + _allFormulaType = new HashSet {typeof(ConstantFormula), typeof(TableFormula), typeof(ExplicitFormula), typeof(TableFormulaWithOffset), typeof(TableFormulaWithXArgument), typeof(SumFormula)}; _defaultFormulaType = _allFormulaType.First(); } @@ -289,7 +289,7 @@ public bool IsRHS _isRHS = value; } - get { return _isRHS; } + get => _isRHS; } public override bool CanClose @@ -429,10 +429,7 @@ public string DisplayFor(Type formulaType) return _formulaTypeCaptionRepository[formulaType]; } - public object Subject - { - get { return _formula; } - } + public object Subject => _formula; public void Handle(RemovedEvent eventToHandle) { diff --git a/src/MoBi.Presentation/Presenter/EditTableFormulaWithOffSetFormulaPresenter.cs b/src/MoBi.Presentation/Presenter/EditTableFormulaWithOffSetFormulaPresenter.cs index b6ad20aa6..b6a466ad7 100644 --- a/src/MoBi.Presentation/Presenter/EditTableFormulaWithOffSetFormulaPresenter.cs +++ b/src/MoBi.Presentation/Presenter/EditTableFormulaWithOffSetFormulaPresenter.cs @@ -13,14 +13,14 @@ namespace MoBi.Presentation.Presenter { - public interface IEditTableFormulaWithOffSetFormulaPresenter : IEditTypedFormulaPresenter + public interface IEditTableFormulaWithOffsetFormulaPresenter : IEditTypedFormulaPresenter { void SetOffsetFormulaPath(); void SetTableObjectPath(); } - public class EditTableFormulaWithOffSetFormulaPresenter : EditTypedFormulaPresenter, IEditTableFormulaWithOffSetFormulaPresenter + public class EditTableFormulaWithOffsetFormulaPresenter : EditTypedFormulaPresenter, IEditTableFormulaWithOffsetFormulaPresenter { private readonly ITableFormulaWithOffsetToTableFormulaWithOffsetDTOMapper _mapper; private TableFormulaWithOffsetDTO _tableFormulaWithOffsetDTO; @@ -29,8 +29,14 @@ public class EditTableFormulaWithOffSetFormulaPresenter : EditTypedFormulaPresen private readonly ISelectReferencePresenterFactory _selectReferencePresenterFactory; private readonly IDimension _timeDimension; - public EditTableFormulaWithOffSetFormulaPresenter(IEditTableFormulaWithOffSetFormulaView view, ITableFormulaWithOffsetToTableFormulaWithOffsetDTOMapper mapper, IMoBiContext context, - IMoBiFormulaTask moBiFormulaTask, IDisplayUnitRetriever displayUnitRetriever, IApplicationController applicationController, ISelectReferencePresenterFactory selectReferencePresenterFactory) : base(view, displayUnitRetriever) + public EditTableFormulaWithOffsetFormulaPresenter( + IEditTableFormulaWithOffsetFormulaView view, + ITableFormulaWithOffsetToTableFormulaWithOffsetDTOMapper mapper, + IMoBiContext context, + IMoBiFormulaTask moBiFormulaTask, + IDisplayUnitRetriever displayUnitRetriever, + IApplicationController applicationController, + ISelectReferencePresenterFactory selectReferencePresenterFactory) : base(view, displayUnitRetriever) { _mapper = mapper; _moBiFormulaTask = moBiFormulaTask; @@ -42,22 +48,22 @@ public EditTableFormulaWithOffSetFormulaPresenter(IEditTableFormulaWithOffSetFor public override void Edit(TableFormulaWithOffset tableFormulaWithOffset) { _formula = tableFormulaWithOffset; - _tableFormulaWithOffsetDTO = _mapper.MapFrom(_formula); - _view.BindTo(_tableFormulaWithOffsetDTO); + bindToView(); } - private void rebind() + private void bindToView() { - Edit(_formula); + _tableFormulaWithOffsetDTO = _mapper.MapFrom(_formula); + _view.BindTo(_tableFormulaWithOffsetDTO); } public void SetOffsetFormulaPath() { - var path = selectFormulaUseablePath(_tableFormulaWithOffsetDTO.OffsetObjectPath, isValidOffsetObject, AppConstants.Captions.OffsetObjectPath); + var path = selectFormulaUseablePath(isValidOffsetObject, AppConstants.Captions.OffsetObjectPath); if (path == null) return; AddCommand(_moBiFormulaTask.ChangeOffsetObject(_formula, path, BuildingBlock)); - rebind(); + bindToView(); } private bool isValidOffsetObject(IObjectBase objectBase) @@ -68,11 +74,11 @@ private bool isValidOffsetObject(IObjectBase objectBase) public void SetTableObjectPath() { - var path = selectFormulaUseablePath(_tableFormulaWithOffsetDTO.TableObjectPath, isValidTableObject, AppConstants.Captions.TableObjectPath); + var path = selectFormulaUseablePath(isValidTableObject, AppConstants.Captions.TableObjectPath); if (path == null) return; AddCommand(_moBiFormulaTask.ChangeTableObject(_formula, path, BuildingBlock)); - rebind(); + bindToView(); } private bool isValidTableObject(IObjectBase objectBase) @@ -81,7 +87,7 @@ private bool isValidTableObject(IObjectBase objectBase) return parameter?.Formula.IsTable() ?? false; } - private IFormulaUsablePath selectFormulaUseablePath(FormulaUsablePathDTO initPath, Func predicate, string caption) + private IFormulaUsablePath selectFormulaUseablePath(Func predicate, string caption) { using (var presenter = _applicationController.Start()) { diff --git a/src/MoBi.Presentation/Presenter/EditTableFormulaWithXArgumentFormulaPresenter.cs b/src/MoBi.Presentation/Presenter/EditTableFormulaWithXArgumentFormulaPresenter.cs new file mode 100644 index 000000000..2b9f0bc7f --- /dev/null +++ b/src/MoBi.Presentation/Presenter/EditTableFormulaWithXArgumentFormulaPresenter.cs @@ -0,0 +1,96 @@ +using System; +using MoBi.Assets; +using MoBi.Core.Domain.Services; +using MoBi.Presentation.DTO; +using MoBi.Presentation.Mappers; +using MoBi.Presentation.Views; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Formulas; +using OSPSuite.Core.Services; +using OSPSuite.Presentation.Core; + +namespace MoBi.Presentation.Presenter +{ + public interface IEditTableFormulaWithXArgumentFormulaPresenter : IEditTypedFormulaPresenter + { + void SetXArgumentFormulaPath(); + void SetTableObjectPath(); + } + + public class EditTableFormulaWithXArgumentFormulaPresenter : + EditTypedFormulaPresenter, + IEditTableFormulaWithXArgumentFormulaPresenter + { + private readonly ITableFormulaWithXArgumentToTableFormulaWithXArgumentDTOMapper _mapper; + private TableFormulaWithXArgumentDTO _tableFormulaWithXArgumentDTO; + private readonly IMoBiFormulaTask _moBiFormulaTask; + private readonly IApplicationController _applicationController; + private readonly ISelectReferencePresenterFactory _selectReferencePresenterFactory; + + public EditTableFormulaWithXArgumentFormulaPresenter( + IEditTableFormulaWithXArgumentFormulaView view, + ITableFormulaWithXArgumentToTableFormulaWithXArgumentDTOMapper mapper, + IMoBiFormulaTask moBiFormulaTask, + IDisplayUnitRetriever displayUnitRetriever, + IApplicationController applicationController, + ISelectReferencePresenterFactory selectReferencePresenterFactory) : base(view, displayUnitRetriever) + { + _mapper = mapper; + _moBiFormulaTask = moBiFormulaTask; + _applicationController = applicationController; + _selectReferencePresenterFactory = selectReferencePresenterFactory; + } + + public override void Edit(TableFormulaWithXArgument tableFormulaWithXArgument) + { + _formula = tableFormulaWithXArgument; + bindToView(); + } + + private void bindToView() + { + _tableFormulaWithXArgumentDTO = _mapper.MapFrom(_formula); + _view.BindTo(_tableFormulaWithXArgumentDTO); + } + + public void SetXArgumentFormulaPath() + { + var path = selectFormulaUsablePath(isValidXArgumentObject, AppConstants.Captions.OffsetObjectPath); + if (path == null) return; + + AddCommand(_moBiFormulaTask.ChangeXArgumentObject(_formula, path, BuildingBlock)); + bindToView(); + } + + private bool isValidXArgumentObject(IObjectBase objectBase) + { + var parameter = objectBase as IParameter; + return parameter != null; + } + + public void SetTableObjectPath() + { + var path = selectFormulaUsablePath(isValidTableObject, AppConstants.Captions.TableObjectPath); + if (path == null) return; + + AddCommand(_moBiFormulaTask.ChangeTableObject(_formula, path, BuildingBlock)); + bindToView(); + } + + private bool isValidTableObject(IObjectBase objectBase) + { + var parameter = objectBase as IParameter; + return parameter?.Formula.IsTable() ?? false; + } + + private IFormulaUsablePath selectFormulaUsablePath(Func predicate, string caption) + { + using (var presenter = _applicationController.Start()) + { + var referencePresenter = _selectReferencePresenterFactory.ReferenceAtParameterFor(UsingObject.ParentContainer); + presenter.Init(predicate, UsingObject, new[] {UsingObject.RootContainer}, caption, referencePresenter); + return presenter.GetSelection(); + } + } + } +} \ No newline at end of file diff --git a/src/MoBi.Presentation/Presenter/FormulaPresenterCache.cs b/src/MoBi.Presentation/Presenter/FormulaPresenterCache.cs index 722cc53e9..71b06d42f 100644 --- a/src/MoBi.Presentation/Presenter/FormulaPresenterCache.cs +++ b/src/MoBi.Presentation/Presenter/FormulaPresenterCache.cs @@ -47,8 +47,11 @@ public IEditTypedFormulaPresenter PresenterFor(Type formulaType) if (formulaType == typeof (TableFormula)) return presenterFor(formulaType); + if (formulaType == typeof(TableFormulaWithXArgument)) + return presenterFor(formulaType); + if (formulaType == typeof (TableFormulaWithOffset)) - return presenterFor(formulaType); + return presenterFor(formulaType); if (formulaType == typeof (SumFormula)) return presenterFor(formulaType); diff --git a/src/MoBi.Presentation/Presenter/SelectReferencePresenterFactory.cs b/src/MoBi.Presentation/Presenter/SelectReferencePresenterFactory.cs index de10a9484..fef50bf9e 100644 --- a/src/MoBi.Presentation/Presenter/SelectReferencePresenterFactory.cs +++ b/src/MoBi.Presentation/Presenter/SelectReferencePresenterFactory.cs @@ -1,7 +1,7 @@ using System; -using OSPSuite.Utility.Extensions; using OSPSuite.Core.Domain; using OSPSuite.Core.Domain.Builder; +using OSPSuite.Utility.Extensions; namespace MoBi.Presentation.Presenter { diff --git a/src/MoBi.Presentation/Tasks/MoBiFormulaTask.cs b/src/MoBi.Presentation/Tasks/MoBiFormulaTask.cs index c7e22bb64..308961252 100644 --- a/src/MoBi.Presentation/Tasks/MoBiFormulaTask.cs +++ b/src/MoBi.Presentation/Tasks/MoBiFormulaTask.cs @@ -191,6 +191,18 @@ public IMoBiCommand ChangeTableObject(TableFormulaWithOffset formula, IFormulaUs return withUpdatedDefaultStateAndValueOrigin(command, formula, buildingBlock); } + public IMoBiCommand ChangeXArgumentObject(TableFormulaWithXArgument formula, IFormulaUsablePath path, IBuildingBlock buildingBlock) + { + var command = new ChangeTableFormulaWithXArgumentXArgumentObjectPathCommand(formula, path, buildingBlock).Run(_context); + return withUpdatedDefaultStateAndValueOrigin(command, formula, buildingBlock); + } + + public IMoBiCommand ChangeTableObject(TableFormulaWithXArgument formula, IFormulaUsablePath path, IBuildingBlock buildingBlock) + { + var command = new ChangeTableFormulaWithXArgumentTableObjectPathCommand(formula, path, buildingBlock).Run(_context); + return withUpdatedDefaultStateAndValueOrigin(command, formula, buildingBlock); + } + public IMoBiCommand SetConstantFormulaValue(ConstantFormula formula, double kernelValue, Unit newDisplayUnit, Unit oldDisplayUnit, IBuildingBlock buildingBlock, IEntity formulaOwner) { var command = new SetConstantFormulaValueCommand(formula, kernelValue, newDisplayUnit, oldDisplayUnit, buildingBlock, formulaOwner).Run(_context); @@ -260,28 +272,39 @@ private IFormula createFormulaFromType(Type formulaType) if (formulaType == typeof(TableFormulaWithOffset)) return createTableFormulaWithOffset(); + if (formulaType == typeof(TableFormulaWithXArgument)) + return createTableFormulaWithXArgument(); + //default return _context.Create(); } private IFormula createTableFormulaWithOffset() { - var tableFormulaWithOffset = _context.Create(); - tableFormulaWithOffset.OffsetObjectAlias = AppConstants.OffsetAlias; - tableFormulaWithOffset.TableObjectAlias = AppConstants.TableAlias; - return tableFormulaWithOffset; + var formula = _context.Create(); + formula.OffsetObjectAlias = AppConstants.OFFSET_ALIAS; + formula.TableObjectAlias = AppConstants.TABLE_ALIAS; + return formula; + } + + private IFormula createTableFormulaWithXArgument() + { + var formula = _context.Create(); + formula.XArgumentAlias = AppConstants.X_ARGUMENT_ALIAS; + formula.TableObjectAlias = AppConstants.TABLE_ALIAS; + return formula; } private IFormula createTableFormula() { - var newFormula = _context.Create(); - newFormula.UseDerivedValues = false; - newFormula.XDimension = _context.DimensionFactory.Dimension(Constants.Dimension.TIME); - newFormula.XDisplayUnit = newFormula.XDimension.DefaultUnit; - newFormula.XName = newFormula.XDimension.DisplayName; - newFormula.YName = AppConstants.Captions.DisplayNameYValue; - newFormula.AddPoint(0, 0); - return newFormula; + var formula = _context.Create(); + formula.UseDerivedValues = false; + formula.XDimension = _context.DimensionFactory.Dimension(Constants.Dimension.TIME); + formula.XDisplayUnit = formula.XDimension.DefaultUnit; + formula.XName = formula.XDimension.DisplayName; + formula.YName = AppConstants.Captions.DisplayNameYValue; + formula.AddPoint(0, 0); + return formula; } } } \ No newline at end of file diff --git a/src/MoBi.Presentation/Views/IEditTableFormulaWithOffSetFormulaView.cs b/src/MoBi.Presentation/Views/IEditTableFormulaWithOffSetFormulaView.cs index bcec1cce9..22ed610d6 100644 --- a/src/MoBi.Presentation/Views/IEditTableFormulaWithOffSetFormulaView.cs +++ b/src/MoBi.Presentation/Views/IEditTableFormulaWithOffSetFormulaView.cs @@ -4,7 +4,7 @@ namespace MoBi.Presentation.Views { - public interface IEditTableFormulaWithOffSetFormulaView : IView, IEditTypedFormulaView + public interface IEditTableFormulaWithOffsetFormulaView : IView, IEditTypedFormulaView { void BindTo(TableFormulaWithOffsetDTO tableFormulaWithOffsetDTO); } diff --git a/src/MoBi.Presentation/Views/IEditTableFormulaWithXArgumentFormulaView.cs b/src/MoBi.Presentation/Views/IEditTableFormulaWithXArgumentFormulaView.cs new file mode 100644 index 000000000..d8de9b3ed --- /dev/null +++ b/src/MoBi.Presentation/Views/IEditTableFormulaWithXArgumentFormulaView.cs @@ -0,0 +1,11 @@ +using MoBi.Presentation.DTO; +using MoBi.Presentation.Presenter; +using OSPSuite.Presentation.Views; + +namespace MoBi.Presentation.Views +{ + public interface IEditTableFormulaWithXArgumentFormulaView : IView, IEditTypedFormulaView + { + void BindTo(TableFormulaWithXArgumentDTO tableFormulaWithXArgumentDTO); + } +} \ No newline at end of file diff --git a/src/MoBi.Presentation/packages.config b/src/MoBi.Presentation/packages.config index 4697867a7..866bcfe04 100644 --- a/src/MoBi.Presentation/packages.config +++ b/src/MoBi.Presentation/packages.config @@ -12,13 +12,13 @@ - - + + - - + + diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index 36a41d049..7e48bc676 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -238,11 +238,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.51\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.55\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.51\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.55\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -253,11 +253,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.51\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.55\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.51\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.55\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -268,8 +268,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.51\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.55\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll @@ -574,11 +574,17 @@ EditSumFormulaView.cs - + UserControl - - EditTableFormulaWithOffSetFormulaView.cs + + EditTableFormulaWithXArgumentFormulaView.cs + + + UserControl + + + EditTableFormulaWithOffsetFormulaView.cs UserControl @@ -978,6 +984,7 @@ AboutView.cs Designer + ApplicationSettingsView.cs @@ -1060,8 +1067,12 @@ EditSumFormulaView.cs Designer - - EditTableFormulaWithOffSetFormulaView.cs + + EditTableFormulaWithXArgumentFormulaView.cs + Designer + + + EditTableFormulaWithOffsetFormulaView.cs Designer diff --git a/src/MoBi.UI/Properties/licenses.licx b/src/MoBi.UI/Properties/licenses.licx new file mode 100644 index 000000000..d794b5d48 --- /dev/null +++ b/src/MoBi.UI/Properties/licenses.licx @@ -0,0 +1,3 @@ +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v17.1, Version=17.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v17.1, Version=17.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/src/MoBi.UI/Services/ApplicationStartup.cs b/src/MoBi.UI/Services/ApplicationStartup.cs index a604395c5..92e86ae10 100644 --- a/src/MoBi.UI/Services/ApplicationStartup.cs +++ b/src/MoBi.UI/Services/ApplicationStartup.cs @@ -195,7 +195,7 @@ private static void setUpDimensionMergings(IDimensionFactory factory) var molarConcentrationDimomension = factory.Dimension(Constants.Dimension.MOLAR_CONCENTRATION); factory.AddMergingInformation(new MoBiDimensionMergingInformation(concentrationDimension, molarConcentrationDimomension, - new MolWeightDimensonConverterForFormulaUseable(concentrationDimension, molarConcentrationDimomension))); + new MolWeightDimensionConverterForFormulaUsable(concentrationDimension, molarConcentrationDimomension))); factory.AddMergingInformation(new MoBiDimensionMergingInformation(concentrationDimension, molarConcentrationDimomension, new ConcentrationToMolarConcentrationConverterForDataColumn(concentrationDimension, molarConcentrationDimomension))); diff --git a/src/MoBi.UI/Views/EditContainerView.cs b/src/MoBi.UI/Views/EditContainerView.cs index a9c92d7fb..6005db7ea 100644 --- a/src/MoBi.UI/Views/EditContainerView.cs +++ b/src/MoBi.UI/Views/EditContainerView.cs @@ -45,7 +45,7 @@ public override void InitializeBinding() _screenBinder.Bind(dto => dto.ContainerType) .To(cbContainerType) .WithValues(dto => _presenter.AllContainerTypes()) - .OnValueUpdating += OnValueUpdating; + .OnValueUpdating += onValueUpdating; _screenBinder.Bind(dto => dto.Name) .To(btName) @@ -53,7 +53,7 @@ public override void InitializeBinding() _screenBinder.Bind(dto => dto.Description) .To(htmlEditor) - .OnValueUpdating += OnValueUpdating; + .OnValueUpdating += onValueUpdating; _gridBinder = new GridViewBinder(gridView); _gridBinder.Bind(dto => dto.Value) @@ -87,6 +87,8 @@ public override void InitializeResources() btAddTag.InitWithImage(ApplicationIcons.Add, text: AppConstants.Captions.AddTag, toolTip: ToolTips.Container.AddTag); btName.ToolTip = ToolTips.Container.ContainerName; layoutItemContainerTags.Text = AppConstants.Captions.ContainerTags.FormatForLabel(); + tabProperties.Image = ApplicationIcons.Properties; + tabParameters.Image = ApplicationIcons.Parameter; } private void onNameSet(ContainerDTO container, PropertyValueSetEventArgs e) @@ -94,7 +96,7 @@ private void onNameSet(ContainerDTO container, PropertyValueSetEventArgs OnEvent(() => _presenter.SetInitialName(e.NewValue)); } - private void OnValueUpdating(ContainerDTO container, PropertyValueSetEventArgs e) + private void onValueUpdating(ContainerDTO container, PropertyValueSetEventArgs e) { OnEvent(() => _presenter.SetPropertyValueFromView(e.PropertyName, e.NewValue, e.OldValue)); } @@ -136,24 +138,18 @@ private void initNameControl(ContainerDTO dto) btName.Properties.ReadOnly = !isInit; } - private EditorButton editNameButton - { - get { return btName.Properties.Buttons[0]; } - } + private EditorButton editNameButton => btName.Properties.Buttons[0]; public void SetParameterView(IView view) { tabParameters.FillWith(view); } - public override bool HasError - { - get { return base.HasError || _screenBinder.HasError || _gridBinder.HasError; } - } + public override bool HasError => base.HasError || _screenBinder.HasError || _gridBinder.HasError; public virtual bool ReadOnly { - get { return _readOnly; } + get => _readOnly; set { _readOnly = value; @@ -165,7 +161,7 @@ public virtual bool ReadOnly public bool ContainerPropertiesEditable { - get { return cbContainerType.Enabled; } + get => cbContainerType.Enabled; set { cbContainerType.Enabled = value; diff --git a/src/MoBi.UI/Views/EditParameterView.cs b/src/MoBi.UI/Views/EditParameterView.cs index c1df3dbe8..8866bac3a 100644 --- a/src/MoBi.UI/Views/EditParameterView.cs +++ b/src/MoBi.UI/Views/EditParameterView.cs @@ -133,7 +133,9 @@ public override void InitializeResources() chkPersistable.ToolTip = ToolTips.ParameterView.Persistable; chkCanBeVariedInPopulation.Text = AppConstants.Captions.CanBeVariedInPopulation; tabProperties.Text = AppConstants.Captions.Properties; + tabProperties.Image = ApplicationIcons.Properties; tabTags.Text = AppConstants.Captions.Tags; + tabTags.Image = ApplicationIcons.Tag; btAddTag.InitWithImage(ApplicationIcons.Add, AppConstants.Captions.AddTag); layoutControlItemAddTag.AdjustButtonSize(); layoutControlItemTags.TextLocation = Locations.Top; diff --git a/src/MoBi.UI/Views/EditTableFormulaWithOffSetFormulaView.Designer.cs b/src/MoBi.UI/Views/EditTableFormulaWithOffSetFormulaView.Designer.cs index 683a3e5b8..0a3b0d387 100644 --- a/src/MoBi.UI/Views/EditTableFormulaWithOffSetFormulaView.Designer.cs +++ b/src/MoBi.UI/Views/EditTableFormulaWithOffSetFormulaView.Designer.cs @@ -1,6 +1,6 @@ namespace MoBi.UI.Views { - partial class EditTableFormulaWithOffSetFormulaView + partial class EditTableFormulaWithOffsetFormulaView { /// /// Required designer variable. @@ -114,7 +114,7 @@ private void InitializeComponent() this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.layoutControl1); - this.Name = "EditTableFormulaWithOffSetFormulaView"; + this.Name = "EditTableFormulaWithOffsetFormulaView"; this.Size = new System.Drawing.Size(334, 150); ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); this.layoutControl1.ResumeLayout(false); diff --git a/src/MoBi.UI/Views/EditTableFormulaWithOffSetFormulaView.cs b/src/MoBi.UI/Views/EditTableFormulaWithOffSetFormulaView.cs index f887e84f3..ad76d43c7 100644 --- a/src/MoBi.UI/Views/EditTableFormulaWithOffSetFormulaView.cs +++ b/src/MoBi.UI/Views/EditTableFormulaWithOffSetFormulaView.cs @@ -8,12 +8,12 @@ namespace MoBi.UI.Views { - public partial class EditTableFormulaWithOffSetFormulaView : BaseUserControl, IEditTableFormulaWithOffSetFormulaView + public partial class EditTableFormulaWithOffsetFormulaView : BaseUserControl, IEditTableFormulaWithOffsetFormulaView { - private IEditTableFormulaWithOffSetFormulaPresenter _presenter; + private IEditTableFormulaWithOffsetFormulaPresenter _presenter; public bool ReadOnly { get; set; } - public EditTableFormulaWithOffSetFormulaView() + public EditTableFormulaWithOffsetFormulaView() { InitializeComponent(); } @@ -27,7 +27,7 @@ public override void InitializeResources() btEditTableObjectPath.Properties.ReadOnly = true; } - public void AttachPresenter(IEditTableFormulaWithOffSetFormulaPresenter presenter) + public void AttachPresenter(IEditTableFormulaWithOffsetFormulaPresenter presenter) { _presenter = presenter; } diff --git a/src/MoBi.UI/Views/EditTableFormulaWithXArgumentFormulaView.Designer.cs b/src/MoBi.UI/Views/EditTableFormulaWithXArgumentFormulaView.Designer.cs new file mode 100644 index 000000000..2963918df --- /dev/null +++ b/src/MoBi.UI/Views/EditTableFormulaWithXArgumentFormulaView.Designer.cs @@ -0,0 +1,139 @@ +namespace MoBi.UI.Views +{ + partial class EditTableFormulaWithXArgumentFormulaView + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.layoutControl1 = new OSPSuite.UI.Controls.UxLayoutControl(); + this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); + this.btEditXArgumentObjectPath = new DevExpress.XtraEditors.ButtonEdit(); + this.layoutControlItemXArgumentObjectPath = new DevExpress.XtraLayout.LayoutControlItem(); + this.btEditTableObjectPath = new DevExpress.XtraEditors.ButtonEdit(); + this.layoutControlItemTableObjectPath = new DevExpress.XtraLayout.LayoutControlItem(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit(); + this.layoutControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.btEditXArgumentObjectPath.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemXArgumentObjectPath)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.btEditTableObjectPath.Properties)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemTableObjectPath)).BeginInit(); + this.SuspendLayout(); + // + // layoutControl1 + // + this.layoutControl1.Controls.Add(this.btEditTableObjectPath); + this.layoutControl1.Controls.Add(this.btEditXArgumentObjectPath); + this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.layoutControl1.Location = new System.Drawing.Point(0, 0); + this.layoutControl1.Name = "layoutControl1"; + this.layoutControl1.Root = this.layoutControlGroup1; + this.layoutControl1.Size = new System.Drawing.Size(334, 150); + this.layoutControl1.TabIndex = 0; + this.layoutControl1.Text = "layoutControl1"; + // + // layoutControlGroup1 + // + this.layoutControlGroup1.CustomizationFormText = "layoutControlGroup1"; + this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; + this.layoutControlGroup1.GroupBordersVisible = false; + this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { + this.layoutControlItemXArgumentObjectPath, + this.layoutControlItemTableObjectPath}); + this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0); + this.layoutControlGroup1.Name = "layoutControlGroup1"; + this.layoutControlGroup1.Size = new System.Drawing.Size(334, 150); + this.layoutControlGroup1.Text = "layoutControlGroup1"; + this.layoutControlGroup1.TextVisible = false; + // + // btEditOffsetObjectPath + // + this.btEditXArgumentObjectPath.Location = new System.Drawing.Point(188, 36); + this.btEditXArgumentObjectPath.Name = "btEditXArgumentObjectPath"; + this.btEditXArgumentObjectPath.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.btEditXArgumentObjectPath.Size = new System.Drawing.Size(134, 20); + this.btEditXArgumentObjectPath.StyleController = this.layoutControl1; + this.btEditXArgumentObjectPath.TabIndex = 4; + // + // layoutControlItemOffsetObjectPath + // + this.layoutControlItemXArgumentObjectPath.Control = this.btEditXArgumentObjectPath; + this.layoutControlItemXArgumentObjectPath.CustomizationFormText = "layoutControlItemOffsetObjectPath"; + this.layoutControlItemXArgumentObjectPath.Location = new System.Drawing.Point(0, 24); + this.layoutControlItemXArgumentObjectPath.Name = "layoutControlItemXArgumentObjectPath"; + this.layoutControlItemXArgumentObjectPath.Size = new System.Drawing.Size(314, 106); + this.layoutControlItemXArgumentObjectPath.Text = "layoutControlItemOffsetObjectPath"; + this.layoutControlItemXArgumentObjectPath.TextSize = new System.Drawing.Size(172, 13); + // + // btEditTableObjectPath + // + this.btEditTableObjectPath.Location = new System.Drawing.Point(188, 12); + this.btEditTableObjectPath.Name = "btEditTableObjectPath"; + this.btEditTableObjectPath.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton()}); + this.btEditTableObjectPath.Size = new System.Drawing.Size(134, 20); + this.btEditTableObjectPath.StyleController = this.layoutControl1; + this.btEditTableObjectPath.TabIndex = 5; + // + // layoutControlItemTableObjectPath + // + this.layoutControlItemTableObjectPath.Control = this.btEditTableObjectPath; + this.layoutControlItemTableObjectPath.CustomizationFormText = "layoutControlItemTableObjectPath"; + this.layoutControlItemTableObjectPath.Location = new System.Drawing.Point(0, 0); + this.layoutControlItemTableObjectPath.Name = "layoutControlItemTableObjectPath"; + this.layoutControlItemTableObjectPath.Size = new System.Drawing.Size(314, 24); + this.layoutControlItemTableObjectPath.Text = "layoutControlItemTableObjectPath"; + this.layoutControlItemTableObjectPath.TextSize = new System.Drawing.Size(172, 13); + // + // EditTableFormulaWithOffSetFormulaView + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.layoutControl1); + this.Name = "EditTableFormulaWithOffsetFormulaView"; + this.Size = new System.Drawing.Size(334, 150); + ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit(); + this.layoutControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.btEditXArgumentObjectPath.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemXArgumentObjectPath)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.btEditTableObjectPath.Properties)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutControlItemTableObjectPath)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private OSPSuite.UI.Controls.UxLayoutControl layoutControl1; + private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1; + private DevExpress.XtraEditors.ButtonEdit btEditTableObjectPath; + private DevExpress.XtraEditors.ButtonEdit btEditXArgumentObjectPath; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItemXArgumentObjectPath; + private DevExpress.XtraLayout.LayoutControlItem layoutControlItemTableObjectPath; + } +} diff --git a/src/MoBi.UI/Views/EditTableFormulaWithXArgumentFormulaView.cs b/src/MoBi.UI/Views/EditTableFormulaWithXArgumentFormulaView.cs new file mode 100644 index 000000000..207e771bd --- /dev/null +++ b/src/MoBi.UI/Views/EditTableFormulaWithXArgumentFormulaView.cs @@ -0,0 +1,59 @@ +using MoBi.Assets; +using MoBi.Presentation.DTO; +using MoBi.Presentation.Presenter; +using MoBi.Presentation.Views; +using OSPSuite.Presentation.Extensions; +using OSPSuite.UI.Controls; + +namespace MoBi.UI.Views +{ + public partial class EditTableFormulaWithXArgumentFormulaView : BaseUserControl, IEditTableFormulaWithXArgumentFormulaView + { + private IEditTableFormulaWithXArgumentFormulaPresenter _presenter; + public bool ReadOnly { get; set; } + + public EditTableFormulaWithXArgumentFormulaView() + { + InitializeComponent(); + } + + public override void InitializeResources() + { + base.InitializeResources(); + layoutControlItemXArgumentObjectPath.Text = AppConstants.Captions.XArgumentObjectPath.FormatForLabel(checkCase: false); + layoutControlItemTableObjectPath.Text = AppConstants.Captions.TableObjectPath.FormatForLabel(); + btEditXArgumentObjectPath.Properties.ReadOnly = true; + btEditTableObjectPath.Properties.ReadOnly = true; + } + + public void AttachPresenter(IEditTableFormulaWithXArgumentFormulaPresenter presenter) + { + _presenter = presenter; + } + + public override void InitializeBinding() + { + base.InitializeBinding(); + btEditXArgumentObjectPath.ButtonClick += (o, e) => OnEvent(_presenter.SetXArgumentFormulaPath); + btEditTableObjectPath.ButtonClick += (o, e) => OnEvent(_presenter.SetTableObjectPath); + } + + public void BindTo(TableFormulaWithXArgumentDTO tableFormulaWithXArgumentDTO) + { + showXArgumentObjectPath(tableFormulaWithXArgumentDTO.XArgumentObjectPath); + showTableObjectPath(tableFormulaWithXArgumentDTO.TableObjectPath); + } + + private void showXArgumentObjectPath(FormulaUsablePathDTO forrmulaUsablePathDTO) + { + if (forrmulaUsablePathDTO != null) + btEditXArgumentObjectPath.Text = forrmulaUsablePathDTO.Path; + } + + private void showTableObjectPath(FormulaUsablePathDTO forrmulaUsablePathDTO) + { + if (forrmulaUsablePathDTO != null) + btEditTableObjectPath.Text = forrmulaUsablePathDTO.Path; + } + } +} \ No newline at end of file diff --git a/src/MoBi.UI/Views/EditTableFormulaWithXArgumentFormulaView.resx b/src/MoBi.UI/Views/EditTableFormulaWithXArgumentFormulaView.resx new file mode 100644 index 000000000..e63857027 --- /dev/null +++ b/src/MoBi.UI/Views/EditTableFormulaWithXArgumentFormulaView.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/src/MoBi.UI/packages.config b/src/MoBi.UI/packages.config index bab409db0..3e058ecba 100644 --- a/src/MoBi.UI/packages.config +++ b/src/MoBi.UI/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index 132a448fa..cae4857d6 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -93,17 +93,17 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.51\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.55\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.51\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.55\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.51\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.55\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi/packages.config b/src/MoBi/packages.config index 48126ab4b..bd952c426 100644 --- a/src/MoBi/packages.config +++ b/src/MoBi/packages.config @@ -3,11 +3,11 @@ - - + + - + diff --git a/tests/MoBi.Tests/Core/Commands/ChangeTableFormulaWithOffsetOffsetObjectPathCommandSpecs.cs b/tests/MoBi.Tests/Core/Commands/ChangeTableFormulaWithOffsetOffsetObjectPathCommandSpecs.cs index 35599413e..e05eafe0e 100644 --- a/tests/MoBi.Tests/Core/Commands/ChangeTableFormulaWithOffsetOffsetObjectPathCommandSpecs.cs +++ b/tests/MoBi.Tests/Core/Commands/ChangeTableFormulaWithOffsetOffsetObjectPathCommandSpecs.cs @@ -19,7 +19,7 @@ public abstract class concern_for_ChangeTableFormulaWithOffsetOffsetObjectPathCo protected override void Context() { _oldPath = A.Fake(); - _oldPath.Alias = AppConstants.OffsetAlias; + _oldPath.Alias = AppConstants.OFFSET_ALIAS; _tableFormulaWithOffset = new TableFormulaWithOffset(); _tableFormulaWithOffset.AddOffsetObjectPath(_oldPath); _tableFormulaWithOffset.OffsetObjectAlias = _oldPath.Alias; diff --git a/tests/MoBi.Tests/Core/Commands/ChangeTableFormulaWithOffsetTableObjectPathCommandSpecs.cs b/tests/MoBi.Tests/Core/Commands/ChangeTableFormulaWithOffsetTableObjectPathCommandSpecs.cs index 63daac855..f277e758b 100644 --- a/tests/MoBi.Tests/Core/Commands/ChangeTableFormulaWithOffsetTableObjectPathCommandSpecs.cs +++ b/tests/MoBi.Tests/Core/Commands/ChangeTableFormulaWithOffsetTableObjectPathCommandSpecs.cs @@ -19,7 +19,7 @@ public abstract class concern_for_ChangeTableFormulaWithOffsetTableObjectPathCom protected override void Context() { _oldPath = A.Fake(); - _oldPath.Alias = AppConstants.TableAlias; + _oldPath.Alias = AppConstants.TABLE_ALIAS; _tableFormulaWithOffset = new TableFormulaWithOffset(); _tableFormulaWithOffset.AddTableObjectPath(_oldPath); _context = A.Fake(); diff --git a/tests/MoBi.Tests/Core/MolWeightConverterSpecs.cs b/tests/MoBi.Tests/Core/MolWeightConverterSpecs.cs index 667fa2510..812cd6443 100644 --- a/tests/MoBi.Tests/Core/MolWeightConverterSpecs.cs +++ b/tests/MoBi.Tests/Core/MolWeightConverterSpecs.cs @@ -66,7 +66,7 @@ public void should_be_able_to_resolve_parameters() } } - public abstract class concern_for_type_MolWeightDimensionConverterForFormulaUsable : ContextSpecification + public abstract class concern_for_type_MolWeightDimensionConverterForFormulaUsable : ContextSpecification { protected IQuantity _formulaUsable; protected double _mw; @@ -84,7 +84,7 @@ protected override void Context() _target = new Dimension(new BaseDimensionRepresentation(), "Target", "mol"); _target.AddUnit("mmol", 300, 0); _target.DefaultUnit = _target.Unit("mmol"); - sut = new MolWeightDimensonConverterForFormulaUseable(_source, _target); + sut = new MolWeightDimensionConverterForFormulaUsable(_source, _target); sut.SetRefObject(_formulaUsable); } } diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index 2eeda2228..44c06afd4 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -138,14 +138,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.51\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.55\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.51\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.55\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -153,11 +153,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.51\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.55\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.51\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.55\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -231,6 +231,7 @@ + diff --git a/tests/MoBi.Tests/Presentation/EditTableFormulaWithOffSetFormulaPresenterSpecs.cs b/tests/MoBi.Tests/Presentation/EditTableFormulaWithOffSetFormulaPresenterSpecs.cs index fc2b15d8f..7fb3fecf6 100644 --- a/tests/MoBi.Tests/Presentation/EditTableFormulaWithOffSetFormulaPresenterSpecs.cs +++ b/tests/MoBi.Tests/Presentation/EditTableFormulaWithOffSetFormulaPresenterSpecs.cs @@ -20,9 +20,9 @@ namespace MoBi.Presentation { - public abstract class concern_for_EditTableFormulaWithOffSetFormulaPresenter : ContextSpecification + public abstract class concern_for_EditTableFormulaWithOffSetFormulaPresenter : ContextSpecification { - protected IEditTableFormulaWithOffSetFormulaView _view; + protected IEditTableFormulaWithOffsetFormulaView _view; protected ITableFormulaWithOffsetToTableFormulaWithOffsetDTOMapper _mapper; protected IMoBiContext _context; protected IMoBiFormulaTask _mobiFormulaTask; @@ -41,7 +41,7 @@ public abstract class concern_for_EditTableFormulaWithOffSetFormulaPresenter : C protected override void Context() { - _view = A.Fake(); + _view = A.Fake(); _mapper = A.Fake(); _context = A.Fake(); _mobiFormulaTask = A.Fake(); @@ -51,7 +51,7 @@ protected override void Context() _timeDimension = DomainHelperForSpecs.TimeDimension; A.CallTo(() => _context.DimensionFactory.Dimension(Constants.Dimension.TIME)).Returns(_timeDimension); - sut = new EditTableFormulaWithOffSetFormulaPresenter(_view, _mapper, _context, _mobiFormulaTask, _displayUnitRetriever, _applicationController, _selectReferencePresenterFactory); + sut = new EditTableFormulaWithOffsetFormulaPresenter(_view, _mapper, _context, _mobiFormulaTask, _displayUnitRetriever, _applicationController, _selectReferencePresenterFactory); _commandCollector = A.Fake(); _buildingBlock = A.Fake(); diff --git a/tests/MoBi.Tests/Presentation/EditTableFormulaWithXArgumentFormulaPresenterSpecs.cs b/tests/MoBi.Tests/Presentation/EditTableFormulaWithXArgumentFormulaPresenterSpecs.cs new file mode 100644 index 000000000..4a1717dec --- /dev/null +++ b/tests/MoBi.Tests/Presentation/EditTableFormulaWithXArgumentFormulaPresenterSpecs.cs @@ -0,0 +1,126 @@ +using FakeItEasy; +using MoBi.Core.Commands; +using MoBi.Core.Domain.Services; +using MoBi.Presentation.Mappers; +using MoBi.Presentation.Presenter; +using MoBi.Presentation.Views; +using OSPSuite.BDDHelper; +using OSPSuite.Core.Commands.Core; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Builder; +using OSPSuite.Core.Domain.Formulas; +using OSPSuite.Core.Services; +using OSPSuite.Presentation.Core; + +namespace MoBi.Presentation +{ + public abstract class concern_for_EditTableFormulaWithXArgumentFormulaPresenter : ContextSpecification + { + protected IEditTableFormulaWithXArgumentFormulaView _view; + protected ITableFormulaWithXArgumentToTableFormulaWithXArgumentDTOMapper _mapper; + protected IMoBiFormulaTask _formulaTask; + protected IDisplayUnitRetriever _displayUnitRetriever; + protected IApplicationController _applicationController; + protected ISelectReferencePresenterFactory _selectReferencePresenterFactory; + protected IParameter _parameter; + + protected TableFormulaWithXArgument _tableFormulaWithXArgument; + protected Container _container; + protected ISelectReferenceAtParameterPresenter _referencePresenter; + protected ISelectFormulaUsablePathPresenter _selectFormulaUsablePathPresenter; + protected IBuildingBlock _buildingBlock; + protected ICommandCollector _commandCollector; + + protected override void Context() + { + _view = A.Fake(); + _mapper = A.Fake(); + _formulaTask = A.Fake(); + _displayUnitRetriever = A.Fake(); + _applicationController = A.Fake(); + _selectReferencePresenterFactory = A.Fake(); + _commandCollector = A.Fake(); + sut = new EditTableFormulaWithXArgumentFormulaPresenter(_view, _mapper, _formulaTask, _displayUnitRetriever, _applicationController, _selectReferencePresenterFactory); + + _tableFormulaWithXArgument = new TableFormulaWithXArgument(); + _parameter = new Parameter().WithName("Parameter"); + _container = new Container().WithName("Parent"); + _container.Add(_parameter); + _referencePresenter = A.Fake(); + _selectFormulaUsablePathPresenter = A.Fake(); + _buildingBlock = A.Fake(); + + A.CallTo(() => _selectReferencePresenterFactory.ReferenceAtParameterFor(_container)).Returns(_referencePresenter); + A.CallTo(() => _applicationController.Start()).Returns(_selectFormulaUsablePathPresenter); + + sut.BuildingBlock = _buildingBlock; + sut.InitializeWith(_commandCollector); + } + } + + public class When_the_edit_table_formula_with_x_argument_presenter_is_selecting_a_table_object_path_for_the_edited_table_formula : concern_for_EditTableFormulaWithXArgumentFormulaPresenter + { + private IFormulaUsablePath _selectedPath; + private IMoBiCommand _command; + + protected override void Context() + { + base.Context(); + _command = A.Fake(); + _selectedPath = A.Fake(); + sut.Edit(_tableFormulaWithXArgument, _parameter); + A.CallTo(() => _selectFormulaUsablePathPresenter.GetSelection()).Returns(_selectedPath); + A.CallTo(() => _formulaTask.ChangeTableObject(_tableFormulaWithXArgument, _selectedPath, _buildingBlock)).Returns(_command); + } + + protected override void Because() + { + sut.SetTableObjectPath(); + } + + [Observation] + public void should_let_the_user_select_a_new_path_and_updated_the_selected_path() + { + A.CallTo(() => _formulaTask.ChangeTableObject(_tableFormulaWithXArgument, _selectedPath, _buildingBlock)).MustHaveHappened(); + } + + [Observation] + public void should_add_the_command_to_history() + { + A.CallTo(() => _commandCollector.AddCommand(_command)).MustHaveHappened(); + } + } + + public class When_the_edit_table_formula_with_x_argument_presenter_is_selecting_a_x_argument_object_path_for_the_edited_table_formula : concern_for_EditTableFormulaWithXArgumentFormulaPresenter + { + private IFormulaUsablePath _selectedPath; + private IMoBiCommand _command; + + protected override void Context() + { + base.Context(); + _command = A.Fake(); + _selectedPath = A.Fake(); + sut.Edit(_tableFormulaWithXArgument, _parameter); + A.CallTo(() => _selectFormulaUsablePathPresenter.GetSelection()).Returns(_selectedPath); + A.CallTo(() => _formulaTask.ChangeXArgumentObject(_tableFormulaWithXArgument, _selectedPath, _buildingBlock)).Returns(_command); + } + + protected override void Because() + { + sut.SetXArgumentFormulaPath(); + } + + [Observation] + public void should_let_the_user_select_a_new_path_and_updated_the_selected_path() + { + A.CallTo(() => _formulaTask.ChangeXArgumentObject(_tableFormulaWithXArgument, _selectedPath, _buildingBlock)).MustHaveHappened(); + } + + [Observation] + public void should_add_the_command_to_history() + { + A.CallTo(() => _commandCollector.AddCommand(_command)).MustHaveHappened(); + } + } +} \ No newline at end of file diff --git a/tests/MoBi.Tests/Presentation/FormulaPresenterCacheSpecs.cs b/tests/MoBi.Tests/Presentation/FormulaPresenterCacheSpecs.cs index fe3d2c1b2..aa8aac861 100644 --- a/tests/MoBi.Tests/Presentation/FormulaPresenterCacheSpecs.cs +++ b/tests/MoBi.Tests/Presentation/FormulaPresenterCacheSpecs.cs @@ -27,8 +27,9 @@ public class When_retrieving_the_formula_presenter_for_a_given_formula : concern [TestCase(typeof(ExplicitFormula), typeof(IEditExplicitFormulaPresenter))] [TestCase(typeof(BlackBoxFormula), typeof(IEditBlackBoxFormulaPresenter))] [TestCase(typeof(TableFormula), typeof(IEditTableFormulaPresenter))] - [TestCase(typeof(TableFormulaWithOffset), typeof(IEditTableFormulaWithOffSetFormulaPresenter))] + [TestCase(typeof(TableFormulaWithOffset), typeof(IEditTableFormulaWithOffsetFormulaPresenter))] [TestCase(typeof(SumFormula), typeof(IEditSumFormulaPresenter))] + [TestCase(typeof(TableFormulaWithXArgument), typeof(IEditTableFormulaWithXArgumentFormulaPresenter))] public void should_return_the_expected_presenter_type(Type formulaType, Type expectedPresenterType) { sut.PresenterFor(formulaType).IsAnImplementationOf(expectedPresenterType).ShouldBeTrue(); diff --git a/tests/MoBi.Tests/Presentation/Tasks/MoBiFormulaTaskSpecs.cs b/tests/MoBi.Tests/Presentation/Tasks/MoBiFormulaTaskSpecs.cs index 00d863a80..34613d4f6 100644 --- a/tests/MoBi.Tests/Presentation/Tasks/MoBiFormulaTaskSpecs.cs +++ b/tests/MoBi.Tests/Presentation/Tasks/MoBiFormulaTaskSpecs.cs @@ -230,8 +230,8 @@ public void should_return_a_table_formula_with_default_properties_for_table_form public void should_return_a_table_formula_with_off_set_and_default_properties_for_table_formula_with_offset_type() { var tableFormulaWithOffset = validateFormula(); - tableFormulaWithOffset.OffsetObjectAlias.ShouldBeEqualTo(AppConstants.OffsetAlias); - tableFormulaWithOffset.TableObjectAlias.ShouldBeEqualTo(AppConstants.TableAlias); + tableFormulaWithOffset.OffsetObjectAlias.ShouldBeEqualTo(AppConstants.OFFSET_ALIAS); + tableFormulaWithOffset.TableObjectAlias.ShouldBeEqualTo(AppConstants.TABLE_ALIAS); } [Observation] diff --git a/tests/MoBi.Tests/packages.config b/tests/MoBi.Tests/packages.config index 464a55e6e..e6e1c9529 100644 --- a/tests/MoBi.Tests/packages.config +++ b/tests/MoBi.Tests/packages.config @@ -14,14 +14,14 @@ - + - + - - + + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index 9ca41cba6..8d8b97a04 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -198,14 +198,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.51\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.55\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.51\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.55\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -216,11 +216,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.51\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.55\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.51\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.55\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -231,8 +231,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.51\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.55\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index 8492818ae..40d651de1 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -13,21 +13,21 @@ - + - + - - + + - + From ea8c8d40482c2a61e78d3ebb99e27bb6353d787c Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Mon, 23 Apr 2018 14:10:46 -0400 Subject: [PATCH 16/29] Fixes #170 Parameter with flag CanBeVaried set to false should be excluded from PI (#254) --- .../ParameterAnalysableParameterSelector.cs | 4 +- ...rameterAnalysableParameterSelectorSpecs.cs | 60 +++++++++++++++++++ tests/MoBi.Tests/MoBi.Tests.csproj | 1 + 3 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 tests/MoBi.Tests/Core/ParameterAnalysableParameterSelectorSpecs.cs diff --git a/src/MoBi.Core/Services/ParameterAnalysableParameterSelector.cs b/src/MoBi.Core/Services/ParameterAnalysableParameterSelector.cs index c065396af..dc2f8695d 100644 --- a/src/MoBi.Core/Services/ParameterAnalysableParameterSelector.cs +++ b/src/MoBi.Core/Services/ParameterAnalysableParameterSelector.cs @@ -7,8 +7,8 @@ public class ParameterAnalysableParameterSelector : AbstractParameterAnalysableP { public override bool CanUseParameter(IParameter parameter) { - //in MoBi, you can use any parameter except table parameters and categorial parameters - return !ParameterIsTable(parameter) + return parameter.CanBeVaried + && !ParameterIsTable(parameter) && !ParameterIsCategorial(parameter); } diff --git a/tests/MoBi.Tests/Core/ParameterAnalysableParameterSelectorSpecs.cs b/tests/MoBi.Tests/Core/ParameterAnalysableParameterSelectorSpecs.cs new file mode 100644 index 000000000..5b3ad0950 --- /dev/null +++ b/tests/MoBi.Tests/Core/ParameterAnalysableParameterSelectorSpecs.cs @@ -0,0 +1,60 @@ +using FakeItEasy; +using MoBi.Core.Services; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Formulas; +using OSPSuite.Core.Domain.Services; + +namespace MoBi.Core +{ + public abstract class concern_for_ParameterAnalysableParameterSelector : ContextSpecification + { + protected override void Context() + { + sut = new ParameterAnalysableParameterSelector(); + } + } + + public class When_checking_if_a_parameter_can_be_used_in_a_parameter_analysis : concern_for_ParameterAnalysableParameterSelector + { + private Parameter _parameter; + + protected override void Context() + { + base.Context(); + _parameter = new Parameter(); + } + + [Observation] + public void should_return_false_if_the_parameter_cannot_be_varied() + { + _parameter.CanBeVaried = false; + sut.CanUseParameter(_parameter).ShouldBeFalse(); + } + + [Observation] + public void should_return_false_if_the_parameter_formula_is_table() + { + _parameter.CanBeVaried = true; + _parameter.Formula = new TableFormula(); + sut.CanUseParameter(_parameter).ShouldBeFalse(); + } + + [Observation] + public void should_return_false_if_the_parmaeter_is_a_categorial_parameter() + { + _parameter.CanBeVaried = true; + _parameter.Name = Constants.Parameters.COMPOUND_TYPE1; + sut.CanUseParameter(_parameter).ShouldBeFalse(); + } + + [Observation] + public void should_return_true_otherwise() + { + _parameter.CanBeVaried = true; + _parameter.Name = "Hello Parameter"; + sut.CanUseParameter(_parameter).ShouldBeTrue(); + } + } +} \ No newline at end of file diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index 44c06afd4..847ed8e5d 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -221,6 +221,7 @@ + From 645e7a534cf1f5c8ddbe255c7013ecdadaeb0442 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Mon, 23 Apr 2018 16:31:40 -0400 Subject: [PATCH 17/29] Fixes #235 Changing parameter Volume of protein container in MoBi does not result in changed value being displayed in comparison view (#255) --- src/MoBi.Assets/MoBi.Assets.csproj | 12 ++++----- src/MoBi.Assets/packages.config | 8 +++--- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 27 ++++++++++--------- src/MoBi.BatchTool/packages.config | 14 +++++----- src/MoBi.Core/MoBi.Core.csproj | 23 ++++++++-------- src/MoBi.Core/packages.config | 12 ++++----- .../MoBi.Presentation.csproj | 23 ++++++++-------- src/MoBi.Presentation/packages.config | 12 ++++----- src/MoBi.UI/MoBi.UI.csproj | 27 ++++++++++--------- src/MoBi.UI/packages.config | 14 +++++----- src/MoBi/MoBi.csproj | 19 ++++++------- src/MoBi/packages.config | 10 +++---- tests/MoBi.Tests/MoBi.Tests.csproj | 23 ++++++++-------- tests/MoBi.Tests/packages.config | 12 ++++----- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 27 ++++++++++--------- tests/MoBi.UI.Tests/packages.config | 14 +++++----- 16 files changed, 142 insertions(+), 135 deletions(-) diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index e5e2f3e4a..9c32bfd43 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -50,11 +50,11 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.55\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.59\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.55\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.59\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll @@ -65,8 +65,8 @@ ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll - - ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll + + ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.Assets/packages.config b/src/MoBi.Assets/packages.config index 1982236bd..96265d5b1 100644 --- a/src/MoBi.Assets/packages.config +++ b/src/MoBi.Assets/packages.config @@ -3,12 +3,12 @@ - - + + - - + + \ No newline at end of file diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index 5d6f6eba8..b87baad38 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -198,11 +198,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.55\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.59\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.55\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.59\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -213,23 +213,24 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.55\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.59\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.55\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.59\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll + False + ..\..\packages\OSPSuite.SimModel.3.0.0.9\lib\net45\OSPSuite.SimModel.dll - - ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll + + ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.55\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.59\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.BatchTool/packages.config b/src/MoBi.BatchTool/packages.config index 3e058ecba..c556797ee 100644 --- a/src/MoBi.BatchTool/packages.config +++ b/src/MoBi.BatchTool/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + - - + + diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index f4ee15c03..73c24c1f7 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -102,29 +102,30 @@ ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.55\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.59\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.55\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.59\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.55\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.59\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.55\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.59\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll + False + ..\..\packages\OSPSuite.SimModel.3.0.0.9\lib\net45\OSPSuite.SimModel.dll - - ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll + + ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.Core/packages.config b/src/MoBi.Core/packages.config index 995c8cee4..425993ca1 100644 --- a/src/MoBi.Core/packages.config +++ b/src/MoBi.Core/packages.config @@ -10,16 +10,16 @@ - - + + - - + + - + - + diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index 4bde7956d..4d2a22103 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -202,29 +202,30 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.55\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.59\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.55\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.59\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.55\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.59\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.55\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.59\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll + False + ..\..\packages\OSPSuite.SimModel.3.0.0.9\lib\net45\OSPSuite.SimModel.dll - - ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll + + ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.Presentation/packages.config b/src/MoBi.Presentation/packages.config index 866bcfe04..da64db56d 100644 --- a/src/MoBi.Presentation/packages.config +++ b/src/MoBi.Presentation/packages.config @@ -12,17 +12,17 @@ - - + + - - + + - + - + diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index 7e48bc676..d3ed05cf3 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -238,11 +238,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.55\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.59\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.55\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.59\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -253,23 +253,24 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.55\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.59\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.55\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.59\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll + False + ..\..\packages\OSPSuite.SimModel.3.0.0.9\lib\net45\OSPSuite.SimModel.dll - - ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll + + ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.55\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.59\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.UI/packages.config b/src/MoBi.UI/packages.config index 3e058ecba..c556797ee 100644 --- a/src/MoBi.UI/packages.config +++ b/src/MoBi.UI/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + - - + + diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index cae4857d6..ffd032075 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -93,26 +93,27 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.55\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.59\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.55\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.59\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.55\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.59\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll + False + ..\..\packages\OSPSuite.SimModel.3.0.0.9\lib\net45\OSPSuite.SimModel.dll - - ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll + + ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi/packages.config b/src/MoBi/packages.config index bd952c426..f32562b36 100644 --- a/src/MoBi/packages.config +++ b/src/MoBi/packages.config @@ -3,16 +3,16 @@ - - + + - + - + - + diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index 847ed8e5d..92828ec2c 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -138,14 +138,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.55\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.59\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.55\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.59\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -153,20 +153,21 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.55\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.59\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.55\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.59\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll + False + ..\..\packages\OSPSuite.SimModel.3.0.0.9\lib\net45\OSPSuite.SimModel.dll - - ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll + + ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/tests/MoBi.Tests/packages.config b/tests/MoBi.Tests/packages.config index e6e1c9529..aefc48ba0 100644 --- a/tests/MoBi.Tests/packages.config +++ b/tests/MoBi.Tests/packages.config @@ -14,19 +14,19 @@ - + - + - - + + - + - + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index 8d8b97a04..8c2d7a206 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -198,14 +198,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.55\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.59\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.55\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.59\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -216,23 +216,24 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.55\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.59\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.55\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.59\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll + False + ..\..\packages\OSPSuite.SimModel.3.0.0.9\lib\net45\OSPSuite.SimModel.dll - - ..\..\packages\OSPSuite.TeXReporting.2.0.1.7\lib\net45\OSPSuite.TeXReporting.dll + + ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.55\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.59\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index 40d651de1..bc5d95b1d 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -13,21 +13,21 @@ - + - + - - + + - + - - + + From 695e2db4dfae5156d0dd09ac7f75d87bbecb3cca Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 25 Apr 2018 09:34:42 -0400 Subject: [PATCH 18/29] Fixes #212 PSV und MSV difference. Instead of Absent and present the value of the present value should be shown (#256) --- src/MoBi.Assets/MoBi.Assets.csproj | 8 ++++---- src/MoBi.Assets/packages.config | 4 ++-- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 20 +++++++++---------- src/MoBi.BatchTool/packages.config | 10 +++++----- src/MoBi.Core/MoBi.Core.csproj | 16 +++++++-------- src/MoBi.Core/packages.config | 8 ++++---- .../MoBi.Presentation.csproj | 16 +++++++-------- src/MoBi.Presentation/packages.config | 8 ++++---- src/MoBi.UI/MoBi.UI.csproj | 20 +++++++++---------- src/MoBi.UI/packages.config | 10 +++++----- src/MoBi/MoBi.csproj | 12 +++++------ src/MoBi/packages.config | 6 +++--- tests/MoBi.Tests/MoBi.Tests.csproj | 16 +++++++-------- tests/MoBi.Tests/packages.config | 8 ++++---- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 20 +++++++++---------- tests/MoBi.UI.Tests/packages.config | 10 +++++----- 16 files changed, 96 insertions(+), 96 deletions(-) diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index 9c32bfd43..b2de2c05a 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -50,11 +50,11 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.59\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.61\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.59\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.61\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll diff --git a/src/MoBi.Assets/packages.config b/src/MoBi.Assets/packages.config index 96265d5b1..0c03518cd 100644 --- a/src/MoBi.Assets/packages.config +++ b/src/MoBi.Assets/packages.config @@ -3,8 +3,8 @@ - - + + diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index b87baad38..fffb89cac 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -198,11 +198,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.59\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.61\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.59\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.61\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -213,11 +213,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.59\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.61\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.59\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.61\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -229,8 +229,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.59\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.61\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.BatchTool/packages.config b/src/MoBi.BatchTool/packages.config index c556797ee..bde65dd76 100644 --- a/src/MoBi.BatchTool/packages.config +++ b/src/MoBi.BatchTool/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index 73c24c1f7..1635ef391 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -102,20 +102,20 @@ ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.59\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.61\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.59\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.61\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.59\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.61\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.59\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.61\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi.Core/packages.config b/src/MoBi.Core/packages.config index 425993ca1..2f415a084 100644 --- a/src/MoBi.Core/packages.config +++ b/src/MoBi.Core/packages.config @@ -10,12 +10,12 @@ - - + + - - + + diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index 4d2a22103..e721ab323 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -202,20 +202,20 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.59\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.61\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.59\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.61\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.59\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.61\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.59\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.61\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi.Presentation/packages.config b/src/MoBi.Presentation/packages.config index da64db56d..2213479b7 100644 --- a/src/MoBi.Presentation/packages.config +++ b/src/MoBi.Presentation/packages.config @@ -12,13 +12,13 @@ - - + + - - + + diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index d3ed05cf3..712816f9a 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -238,11 +238,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.59\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.61\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.59\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.61\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -253,11 +253,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.59\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.61\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.59\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.61\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -269,8 +269,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.59\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.61\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.UI/packages.config b/src/MoBi.UI/packages.config index c556797ee..bde65dd76 100644 --- a/src/MoBi.UI/packages.config +++ b/src/MoBi.UI/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index ffd032075..c5ca6d9f2 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -93,17 +93,17 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.59\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.61\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.59\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.61\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.59\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.61\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi/packages.config b/src/MoBi/packages.config index f32562b36..9b80e66cb 100644 --- a/src/MoBi/packages.config +++ b/src/MoBi/packages.config @@ -3,11 +3,11 @@ - - + + - + diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index 92828ec2c..a93b60e88 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -138,14 +138,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.59\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.61\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.59\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.61\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -153,11 +153,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.59\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.61\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.59\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.61\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/tests/MoBi.Tests/packages.config b/tests/MoBi.Tests/packages.config index aefc48ba0..04963619f 100644 --- a/tests/MoBi.Tests/packages.config +++ b/tests/MoBi.Tests/packages.config @@ -14,14 +14,14 @@ - + - + - - + + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index 8c2d7a206..7cca08c0c 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -198,14 +198,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.59\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.61\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.59\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.61\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -216,11 +216,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.59\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.61\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.59\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.61\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -232,8 +232,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.59\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.61\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index bc5d95b1d..238c040f0 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -13,21 +13,21 @@ - + - + - - + + - + From 71dcec41c027f599119a3afc01fed86bf4fec7a3 Mon Sep 17 00:00:00 2001 From: Juri Solodenko Date: Wed, 2 May 2018 19:18:10 +0200 Subject: [PATCH 19/29] Fixes #257 Update SimModel (#258) * Fixes #257 Update SimModel * Fixes #259 Update to latest OSPSuite.Core --- src/MoBi.Assets/MoBi.Assets.csproj | 10 +++++----- src/MoBi.Assets/packages.config | 6 +++--- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 11 +++++------ src/MoBi.BatchTool/packages.config | 6 +++--- src/MoBi.Core/MoBi.Core.csproj | 11 +++++------ src/MoBi.Core/packages.config | 6 +++--- src/MoBi.Presentation/MoBi.Presentation.csproj | 11 +++++------ src/MoBi.Presentation/packages.config | 6 +++--- src/MoBi.UI/MoBi.UI.csproj | 11 +++++------ src/MoBi.UI/packages.config | 6 +++--- src/MoBi/MoBi.csproj | 11 +++++------ src/MoBi/packages.config | 6 +++--- tests/MoBi.Tests/MoBi.Tests.csproj | 11 +++++------ tests/MoBi.Tests/packages.config | 6 +++--- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 11 +++++------ tests/MoBi.UI.Tests/packages.config | 6 +++--- 16 files changed, 64 insertions(+), 71 deletions(-) diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index b2de2c05a..c70b6a67f 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -50,11 +50,11 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.61\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.64\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.61\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.64\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll @@ -63,7 +63,7 @@ ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.1.0.7\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.10\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi.Assets/packages.config b/src/MoBi.Assets/packages.config index 0c03518cd..34ea0ec45 100644 --- a/src/MoBi.Assets/packages.config +++ b/src/MoBi.Assets/packages.config @@ -3,11 +3,11 @@ - - + + - + diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index fffb89cac..c255767b7 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -198,11 +198,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.61\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.64\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.61\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.64\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -223,8 +223,7 @@ ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - False - ..\..\packages\OSPSuite.SimModel.3.0.0.9\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.10\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi.BatchTool/packages.config b/src/MoBi.BatchTool/packages.config index bde65dd76..5a42ebaff 100644 --- a/src/MoBi.BatchTool/packages.config +++ b/src/MoBi.BatchTool/packages.config @@ -11,8 +11,8 @@ - - + + @@ -21,7 +21,7 @@ - + diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index 1635ef391..fd735bfb9 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -102,11 +102,11 @@ ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.61\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.64\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.61\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.64\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll @@ -121,8 +121,7 @@ ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - False - ..\..\packages\OSPSuite.SimModel.3.0.0.9\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.10\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi.Core/packages.config b/src/MoBi.Core/packages.config index 2f415a084..f4f0c0c72 100644 --- a/src/MoBi.Core/packages.config +++ b/src/MoBi.Core/packages.config @@ -10,14 +10,14 @@ - - + + - + diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index e721ab323..9699a4eaf 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -202,11 +202,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.61\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.64\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.61\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.64\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll @@ -221,8 +221,7 @@ ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - False - ..\..\packages\OSPSuite.SimModel.3.0.0.9\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.10\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi.Presentation/packages.config b/src/MoBi.Presentation/packages.config index 2213479b7..0c509005f 100644 --- a/src/MoBi.Presentation/packages.config +++ b/src/MoBi.Presentation/packages.config @@ -12,15 +12,15 @@ - - + + - + diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index 712816f9a..ff2c44175 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -238,11 +238,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.61\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.64\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.61\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.64\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -263,8 +263,7 @@ ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - False - ..\..\packages\OSPSuite.SimModel.3.0.0.9\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.10\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi.UI/packages.config b/src/MoBi.UI/packages.config index bde65dd76..5a42ebaff 100644 --- a/src/MoBi.UI/packages.config +++ b/src/MoBi.UI/packages.config @@ -11,8 +11,8 @@ - - + + @@ -21,7 +21,7 @@ - + diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index c5ca6d9f2..d76acb8d9 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -93,11 +93,11 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.61\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.64\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.61\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.64\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll @@ -109,8 +109,7 @@ ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - False - ..\..\packages\OSPSuite.SimModel.3.0.0.9\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.10\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi/packages.config b/src/MoBi/packages.config index 9b80e66cb..3419d5ef9 100644 --- a/src/MoBi/packages.config +++ b/src/MoBi/packages.config @@ -3,13 +3,13 @@ - - + + - + diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index a93b60e88..8eef6cc32 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -138,14 +138,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.61\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.64\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.61\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.64\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -163,8 +163,7 @@ ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - False - ..\..\packages\OSPSuite.SimModel.3.0.0.9\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.10\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/tests/MoBi.Tests/packages.config b/tests/MoBi.Tests/packages.config index 04963619f..546a2ac86 100644 --- a/tests/MoBi.Tests/packages.config +++ b/tests/MoBi.Tests/packages.config @@ -14,16 +14,16 @@ - + - + - + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index 7cca08c0c..a22407e79 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -198,14 +198,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.61\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.64\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.61\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.64\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -226,8 +226,7 @@ ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - False - ..\..\packages\OSPSuite.SimModel.3.0.0.9\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.10\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index 238c040f0..326eff899 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -13,9 +13,9 @@ - + - + @@ -24,7 +24,7 @@ - + From b4ad82dcf60ccb5c51cb1e15480f7f197349635b Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 3 May 2018 14:18:30 -0400 Subject: [PATCH 20/29] Fixes #261 update to latest core (#262) --- SolutionInfo.cs | 2 +- appveyor-nightly.yml | 2 +- src/MoBi.Assets/MoBi.Assets.csproj | 8 ++++---- src/MoBi.Assets/packages.config | 4 ++-- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 20 +++++++++---------- src/MoBi.BatchTool/packages.config | 10 +++++----- src/MoBi.Core/MoBi.Core.csproj | 16 +++++++-------- src/MoBi.Core/packages.config | 8 ++++---- .../MoBi.Presentation.csproj | 16 +++++++-------- .../Presenter/AboutPresenter.cs | 2 +- .../Presenter/Main/StatusBarPresenter.cs | 2 +- src/MoBi.Presentation/packages.config | 8 ++++---- src/MoBi.UI/MoBi.UI.csproj | 20 +++++++++---------- src/MoBi.UI/packages.config | 10 +++++----- src/MoBi/MoBi.csproj | 12 +++++------ src/MoBi/packages.config | 6 +++--- tests/MoBi.Tests/MoBi.Tests.csproj | 16 +++++++-------- tests/MoBi.Tests/packages.config | 8 ++++---- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 20 +++++++++---------- tests/MoBi.UI.Tests/packages.config | 10 +++++----- 20 files changed, 100 insertions(+), 100 deletions(-) diff --git a/SolutionInfo.cs b/SolutionInfo.cs index c67278ad2..76db1a654 100644 --- a/SolutionInfo.cs +++ b/SolutionInfo.cs @@ -8,7 +8,7 @@ [assembly: ComVisible(false)] [assembly: AssemblyVersion("7.3.0.0")] [assembly: AssemblyFileVersion("7.3.0.0")] -[assembly: AssemblyInformationalVersion("")] +[assembly: AssemblyInformationalVersion("7.3.0.0")] [assembly: InternalsVisibleTo("MoBi.Tests")] [assembly: InternalsVisibleTo("MoBi.UI.Tests")] diff --git a/appveyor-nightly.yml b/appveyor-nightly.yml index eebb21c8a..21e51c6b0 100644 --- a/appveyor-nightly.yml +++ b/appveyor-nightly.yml @@ -12,7 +12,7 @@ assembly_info: file: SolutionInfo.* assembly_version: "{version}" assembly_file_version: "{version}" - assembly_informational_version: "EAP" + assembly_informational_version: "{version} Beta" clone_depth: 1 diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index c70b6a67f..845785fd6 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -50,11 +50,11 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.64\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.67\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.64\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.67\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll diff --git a/src/MoBi.Assets/packages.config b/src/MoBi.Assets/packages.config index 34ea0ec45..d09b46d63 100644 --- a/src/MoBi.Assets/packages.config +++ b/src/MoBi.Assets/packages.config @@ -3,8 +3,8 @@ - - + + diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index c255767b7..66a5e432e 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -198,11 +198,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.64\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.67\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.64\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.67\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -213,11 +213,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.61\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.67\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.61\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.67\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -228,8 +228,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.61\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.67\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.BatchTool/packages.config b/src/MoBi.BatchTool/packages.config index 5a42ebaff..43ca8a87a 100644 --- a/src/MoBi.BatchTool/packages.config +++ b/src/MoBi.BatchTool/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index fd735bfb9..62c0666ca 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -102,20 +102,20 @@ ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.64\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.67\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.64\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.67\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.61\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.67\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.61\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.67\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi.Core/packages.config b/src/MoBi.Core/packages.config index f4f0c0c72..f2d51daf3 100644 --- a/src/MoBi.Core/packages.config +++ b/src/MoBi.Core/packages.config @@ -10,12 +10,12 @@ - - + + - - + + diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index 9699a4eaf..4b7adef6f 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -202,20 +202,20 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.64\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.67\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.64\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.67\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.61\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.67\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.61\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.67\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi.Presentation/Presenter/AboutPresenter.cs b/src/MoBi.Presentation/Presenter/AboutPresenter.cs index 2825ce65f..4d9ce68be 100644 --- a/src/MoBi.Presentation/Presenter/AboutPresenter.cs +++ b/src/MoBi.Presentation/Presenter/AboutPresenter.cs @@ -22,7 +22,7 @@ public AboutPresenter(IAboutView view, IMoBiConfiguration configuration) : base( public override void Initialize() { _view.Product = AppConstants.PRODUCT_NAME; - _view.VersionInformation = $"Version {_configuration.FullVersion}"; + _view.VersionInformation = $"Version {_configuration.FullVersionDisplay}"; _view.Display(); } } diff --git a/src/MoBi.Presentation/Presenter/Main/StatusBarPresenter.cs b/src/MoBi.Presentation/Presenter/Main/StatusBarPresenter.cs index 9573c2b52..e1dcf4245 100644 --- a/src/MoBi.Presentation/Presenter/Main/StatusBarPresenter.cs +++ b/src/MoBi.Presentation/Presenter/Main/StatusBarPresenter.cs @@ -45,7 +45,7 @@ public void Initialize() StatusBarElements.All().Each(_view.AddItem); updateProjectInfo(AppConstants.None, string.Empty, string.Empty, false); update(StatusBarElements.Version) - .WithCaption(_moBiConfiguration.FullVersion); + .WithCaption(_moBiConfiguration.FullVersionDisplay); hideProgressBar(); } diff --git a/src/MoBi.Presentation/packages.config b/src/MoBi.Presentation/packages.config index 0c509005f..655c82e94 100644 --- a/src/MoBi.Presentation/packages.config +++ b/src/MoBi.Presentation/packages.config @@ -12,13 +12,13 @@ - - + + - - + + diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index ff2c44175..913cd52f5 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -238,11 +238,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.64\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.67\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.64\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.67\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -253,11 +253,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.61\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.67\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.61\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.67\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -268,8 +268,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.61\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.67\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.UI/packages.config b/src/MoBi.UI/packages.config index 5a42ebaff..43ca8a87a 100644 --- a/src/MoBi.UI/packages.config +++ b/src/MoBi.UI/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index d76acb8d9..22ef72526 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -93,17 +93,17 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.64\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.67\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.64\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.67\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.61\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.67\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/src/MoBi/packages.config b/src/MoBi/packages.config index 3419d5ef9..f5c7f20ee 100644 --- a/src/MoBi/packages.config +++ b/src/MoBi/packages.config @@ -3,11 +3,11 @@ - - + + - + diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index 8eef6cc32..4efe25944 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -138,14 +138,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.64\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.67\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.64\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.67\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -153,11 +153,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.61\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.67\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.61\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.67\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll diff --git a/tests/MoBi.Tests/packages.config b/tests/MoBi.Tests/packages.config index 546a2ac86..4c92308ed 100644 --- a/tests/MoBi.Tests/packages.config +++ b/tests/MoBi.Tests/packages.config @@ -14,14 +14,14 @@ - + - + - - + + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index a22407e79..3c4c018d9 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -198,14 +198,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.64\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.67\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.64\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.67\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -216,11 +216,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.61\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.67\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.61\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.67\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -231,8 +231,8 @@ ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.61\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.67\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index 326eff899..7da904ce4 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -13,21 +13,21 @@ - + - + - - + + - + From 74ae2494744605f570d365fa663423d3ac808982 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Tue, 15 May 2018 12:30:10 -0400 Subject: [PATCH 21/29] Fixes #269 Automatic switch of ValueOrigin to unknown and #268 (#271) --- src/MoBi.Assets/MoBi.Assets.csproj | 8 +++---- src/MoBi.Assets/packages.config | 4 ++-- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 24 +++++++++---------- src/MoBi.BatchTool/packages.config | 12 +++++----- src/MoBi.Core/MoBi.Core.csproj | 20 ++++++++-------- src/MoBi.Core/MoBiConfiguration.cs | 1 + src/MoBi.Core/Services/QuantityTask.cs | 11 +-------- src/MoBi.Core/packages.config | 10 ++++---- .../MoBi.Presentation.csproj | 20 ++++++++-------- src/MoBi.Presentation/packages.config | 10 ++++---- src/MoBi.UI/MoBi.UI.csproj | 24 +++++++++---------- src/MoBi.UI/packages.config | 12 +++++----- src/MoBi/MoBi.csproj | 16 ++++++------- src/MoBi/app.config | 2 +- src/MoBi/packages.config | 8 +++---- tests/MoBi.Tests/Core/QuantityTaskSpecs.cs | 15 +++++++----- tests/MoBi.Tests/MoBi.Tests.csproj | 20 ++++++++-------- tests/MoBi.Tests/packages.config | 10 ++++---- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 24 +++++++++---------- tests/MoBi.UI.Tests/packages.config | 12 +++++----- 20 files changed, 129 insertions(+), 134 deletions(-) diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index 845785fd6..3c168cb60 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -50,11 +50,11 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.67\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.73\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.67\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.73\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll diff --git a/src/MoBi.Assets/packages.config b/src/MoBi.Assets/packages.config index d09b46d63..b2e76c14d 100644 --- a/src/MoBi.Assets/packages.config +++ b/src/MoBi.Assets/packages.config @@ -3,8 +3,8 @@ - - + + diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index 66a5e432e..b0b0faef6 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -198,11 +198,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.67\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.73\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.67\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.73\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -213,11 +213,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.67\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.73\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.67\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.73\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -228,15 +228,15 @@ ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.67\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.73\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.7.1\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.5\lib\net45\SX.dll diff --git a/src/MoBi.BatchTool/packages.config b/src/MoBi.BatchTool/packages.config index 43ca8a87a..56c9f6542 100644 --- a/src/MoBi.BatchTool/packages.config +++ b/src/MoBi.BatchTool/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + - + diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index 62c0666ca..1d16beb9f 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -102,20 +102,20 @@ ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.67\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.73\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.67\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.73\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.67\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.73\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.67\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.73\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -130,8 +130,8 @@ ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.7.1\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.5\lib\net45\SX.dll diff --git a/src/MoBi.Core/MoBiConfiguration.cs b/src/MoBi.Core/MoBiConfiguration.cs index ccb449809..bf397ba4c 100644 --- a/src/MoBi.Core/MoBiConfiguration.cs +++ b/src/MoBi.Core/MoBiConfiguration.cs @@ -38,6 +38,7 @@ public class MoBiConfiguration : OSPSuiteConfiguration, IMoBiConfiguration public string StandardMoleculeTemplateFile { get; } public override string WatermarkOptionLocation { get; } = "Utilties -> Options -> Application"; public override string ApplicationFolderPathName { get; } = AppConstants.SpecialFileNames.APPLICATION_FOLDER_PATH; + public override int InternalVersion { get; } = ProjectVersions.Current; public MoBiConfiguration() { diff --git a/src/MoBi.Core/Services/QuantityTask.cs b/src/MoBi.Core/Services/QuantityTask.cs index 379f315fa..44741a737 100644 --- a/src/MoBi.Core/Services/QuantityTask.cs +++ b/src/MoBi.Core/Services/QuantityTask.cs @@ -183,16 +183,7 @@ private void addUpdateDefaultStateAndValueOriginCommand( var setParameterDefaultStateCommand = setParameterDefaultStateFunc(parameter, false, buildingBlockOrSimulation).AsHidden(); macroCommand.Add(setParameterDefaultStateCommand); - if (!parameter.ValueOrigin.IsUndefined) - return; - - var undefinedValueOrigin = new ValueOrigin - { - Source = ValueOriginSources.Unknown, - Method = ValueOriginDeterminationMethods.Undefined - }; - - var setValueOriginCommand = setParameterValueOriginFunc(parameter, undefinedValueOrigin, buildingBlockOrSimulation).AsHidden(); + var setValueOriginCommand = setParameterValueOriginFunc(parameter, ValueOrigin.Unknown, buildingBlockOrSimulation).AsHidden(); macroCommand.Add(setValueOriginCommand); } diff --git a/src/MoBi.Core/packages.config b/src/MoBi.Core/packages.config index f2d51daf3..7f2259c3d 100644 --- a/src/MoBi.Core/packages.config +++ b/src/MoBi.Core/packages.config @@ -10,15 +10,15 @@ - - + + - - + + - + diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index 4b7adef6f..087b42222 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -202,20 +202,20 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.67\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.73\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.67\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.73\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.67\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.73\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.67\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.73\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -230,8 +230,8 @@ ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.7.1\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.5\lib\net45\SX.dll diff --git a/src/MoBi.Presentation/packages.config b/src/MoBi.Presentation/packages.config index 655c82e94..6ddb2c3ca 100644 --- a/src/MoBi.Presentation/packages.config +++ b/src/MoBi.Presentation/packages.config @@ -12,16 +12,16 @@ - - + + - - + + - + diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index 913cd52f5..83deab2d9 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -238,11 +238,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.67\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.73\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.67\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.73\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -253,11 +253,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.67\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.73\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.67\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.73\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -268,15 +268,15 @@ ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.67\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.73\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.7.1\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.5\lib\net45\SX.dll diff --git a/src/MoBi.UI/packages.config b/src/MoBi.UI/packages.config index 43ca8a87a..56c9f6542 100644 --- a/src/MoBi.UI/packages.config +++ b/src/MoBi.UI/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + - + diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index 22ef72526..f1eac85f7 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -93,17 +93,17 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.67\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.73\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.67\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.73\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.67\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.73\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -117,8 +117,8 @@ ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.7.1\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.5\lib\net45\SX.dll diff --git a/src/MoBi/app.config b/src/MoBi/app.config index 8fa965e24..93d640fb7 100644 --- a/src/MoBi/app.config +++ b/src/MoBi/app.config @@ -107,7 +107,7 @@ - + diff --git a/src/MoBi/packages.config b/src/MoBi/packages.config index f5c7f20ee..97569f26d 100644 --- a/src/MoBi/packages.config +++ b/src/MoBi/packages.config @@ -3,15 +3,15 @@ - - + + - + - + diff --git a/tests/MoBi.Tests/Core/QuantityTaskSpecs.cs b/tests/MoBi.Tests/Core/QuantityTaskSpecs.cs index c46b2cfee..5e5bf5d27 100644 --- a/tests/MoBi.Tests/Core/QuantityTaskSpecs.cs +++ b/tests/MoBi.Tests/Core/QuantityTaskSpecs.cs @@ -110,9 +110,10 @@ public void should_update_the_parameter_value() } [Observation] - public void should_not_update_the_value_origin() + public void should_update_the_value_origin() { - _parameter.ValueOrigin.Source.ShouldBeEqualTo(ValueOriginSources.Internet); + _parameter.ValueOrigin.Source.ShouldBeEqualTo(ValueOriginSources.Unknown); + _parameter.ValueOrigin.Method.ShouldBeEqualTo(ValueOriginDeterminationMethods.Undefined); } [Observation] @@ -239,9 +240,10 @@ public void should_update_the_parameter_value() } [Observation] - public void should_not_update_the_value_origin() + public void should_update_the_value_origin() { - _parameter.ValueOrigin.Source.ShouldBeEqualTo(ValueOriginSources.Internet); + _parameter.ValueOrigin.Source.ShouldBeEqualTo(ValueOriginSources.Unknown); + _parameter.ValueOrigin.Method.ShouldBeEqualTo(ValueOriginDeterminationMethods.Undefined); } [Observation] @@ -355,11 +357,12 @@ protected override void Because() } [Observation] - public void should_return_a_macro_command_containing_only_the_set_default_command() + public void should_return_a_macro_command_containing_only_the_default_command_and_the_update_command() { var macro = _result.DowncastTo(); - macro.Count.ShouldBeEqualTo(1); + macro.Count.ShouldBeEqualTo(2); macro.All().ElementAt(0).ShouldBeAnInstanceOf(); + macro.All().ElementAt(1).ShouldBeAnInstanceOf(); } [Observation] diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index 4efe25944..5a9523da5 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -138,14 +138,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.67\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.73\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.67\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.73\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -153,11 +153,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.67\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.73\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.67\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.73\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -172,8 +172,8 @@ ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.7.1\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.5\lib\net45\SX.dll diff --git a/tests/MoBi.Tests/packages.config b/tests/MoBi.Tests/packages.config index 4c92308ed..d900b81eb 100644 --- a/tests/MoBi.Tests/packages.config +++ b/tests/MoBi.Tests/packages.config @@ -14,18 +14,18 @@ - + - + - - + + - + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index 3c4c018d9..4e2b53888 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -198,14 +198,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.67\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.73\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.67\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.73\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -216,11 +216,11 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.67\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.73\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.67\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.73\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll @@ -231,15 +231,15 @@ ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.67\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.73\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.7.1\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.5\lib\net45\SX.dll diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index 7da904ce4..d7efb9145 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -13,21 +13,21 @@ - + - + - - + + - + - + From 2e203b1a7d04e32e42b3addd219ba1ba6e3bb5db Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 16 May 2018 12:59:59 -0400 Subject: [PATCH 22/29] Fixes #270 Project Conversion MoBi 7.3 : IsDefault true for all parameters (#273) --- src/Data/AllCalculationMethods.pkml | 642 ++++++------------ src/MoBi.Assets/MoBi.Assets.csproj | 10 +- src/MoBi.Assets/packages.config | 6 +- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 22 +- src/MoBi.BatchTool/packages.config | 12 +- src/MoBi.Core/MoBi.Core.csproj | 20 +- .../Converter/v7_3/Converter710To730.cs | 30 + src/MoBi.Core/packages.config | 10 +- .../MoBi.Presentation.csproj | 18 +- src/MoBi.Presentation/packages.config | 10 +- src/MoBi.UI/MoBi.UI.csproj | 22 +- src/MoBi.UI/Views/EditTransportBuilderView.cs | 2 + src/MoBi.UI/packages.config | 12 +- src/MoBi/MoBi.csproj | 14 +- src/MoBi/packages.config | 8 +- tests/MoBi.Tests/MoBi.Tests.csproj | 23 +- .../v7_3/Converter710To730Specs.cs | 53 ++ tests/MoBi.Tests/packages.config | 12 +- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 26 +- tests/MoBi.UI.Tests/packages.config | 14 +- 20 files changed, 424 insertions(+), 542 deletions(-) create mode 100644 src/MoBi.Core/Serialization/Converter/v7_3/Converter710To730.cs create mode 100644 tests/MoBi.Tests/ProjectConversion/v7_3/Converter710To730Specs.cs diff --git a/src/Data/AllCalculationMethods.pkml b/src/Data/AllCalculationMethods.pkml index 3dec376f6..53689f292 100644 --- a/src/Data/AllCalculationMethods.pkml +++ b/src/Data/AllCalculationMethods.pkml @@ -1,8 +1,8 @@  - + - + @@ -72,9 +72,8 @@ - + - @@ -83,9 +82,8 @@ - + - @@ -94,9 +92,8 @@ - + - @@ -105,9 +102,8 @@ - + - @@ -116,9 +112,8 @@ - + - @@ -127,9 +122,8 @@ - + - @@ -138,9 +132,8 @@ - + - @@ -149,9 +142,8 @@ - + - @@ -160,9 +152,8 @@ - + - @@ -171,9 +162,8 @@ - + - @@ -182,9 +172,8 @@ - + - @@ -193,9 +182,8 @@ - + - @@ -204,9 +192,8 @@ - + - @@ -410,7 +397,7 @@ - + @@ -478,7 +465,7 @@ - + @@ -548,9 +535,8 @@ - + - @@ -559,9 +545,8 @@ - + - @@ -570,9 +555,8 @@ - + - @@ -581,9 +565,8 @@ - + - @@ -592,9 +575,8 @@ - + - @@ -603,9 +585,8 @@ - + - @@ -614,9 +595,8 @@ - + - @@ -625,9 +605,8 @@ - + - @@ -636,9 +615,8 @@ - + - @@ -647,9 +625,8 @@ - + - @@ -658,9 +635,8 @@ - + - @@ -669,9 +645,8 @@ - + - @@ -680,9 +655,8 @@ - + - @@ -886,7 +860,7 @@ - + @@ -964,9 +938,8 @@ - + - @@ -975,9 +948,8 @@ - + - @@ -986,9 +958,8 @@ - + - @@ -997,9 +968,8 @@ - + - @@ -1008,9 +978,8 @@ - + - @@ -1019,9 +988,8 @@ - + - @@ -1030,9 +998,8 @@ - + - @@ -1041,9 +1008,8 @@ - + - @@ -1052,9 +1018,8 @@ - + - @@ -1063,9 +1028,8 @@ - + - @@ -1074,9 +1038,8 @@ - + - @@ -1085,9 +1048,8 @@ - + - @@ -1096,9 +1058,8 @@ - + - @@ -1107,9 +1068,8 @@ - + - @@ -1118,9 +1078,8 @@ - + - @@ -1129,9 +1088,8 @@ - + - @@ -1140,9 +1098,8 @@ - + - @@ -1151,9 +1108,8 @@ - + - @@ -1162,9 +1118,8 @@ - + - @@ -1173,9 +1128,8 @@ - + - @@ -1184,9 +1138,8 @@ - + - @@ -1195,9 +1148,8 @@ - + - @@ -1206,9 +1158,8 @@ - + - @@ -1217,9 +1168,8 @@ - + - @@ -1228,9 +1178,8 @@ - + - @@ -1239,9 +1188,8 @@ - + - @@ -1250,9 +1198,8 @@ - + - @@ -1261,9 +1208,8 @@ - + - @@ -1272,9 +1218,8 @@ - + - @@ -1283,9 +1228,8 @@ - + - @@ -1294,9 +1238,8 @@ - + - @@ -1305,9 +1248,8 @@ - + - @@ -1316,9 +1258,8 @@ - + - @@ -1327,9 +1268,8 @@ - + - @@ -1338,9 +1278,8 @@ - + - @@ -1349,9 +1288,8 @@ - + - @@ -1360,9 +1298,8 @@ - + - @@ -1826,7 +1763,7 @@ - + @@ -1880,9 +1817,8 @@ - + - @@ -1891,9 +1827,8 @@ - + - @@ -1902,9 +1837,8 @@ - + - @@ -1913,9 +1847,8 @@ - + - @@ -1924,9 +1857,8 @@ - + - @@ -1935,9 +1867,8 @@ - + - @@ -1946,9 +1877,8 @@ - + - @@ -1957,9 +1887,8 @@ - + - @@ -1968,9 +1897,8 @@ - + - @@ -1979,9 +1907,8 @@ - + - @@ -1990,9 +1917,8 @@ - + - @@ -2001,9 +1927,8 @@ - + - @@ -2012,9 +1937,8 @@ - + - @@ -2023,9 +1947,8 @@ - + - @@ -2034,9 +1957,8 @@ - + - @@ -2045,9 +1967,8 @@ - + - @@ -2056,9 +1977,8 @@ - + - @@ -2067,9 +1987,8 @@ - + - @@ -2078,9 +1997,8 @@ - + - @@ -2089,9 +2007,8 @@ - + - @@ -2100,9 +2017,8 @@ - + - @@ -2111,9 +2027,8 @@ - + - @@ -2122,9 +2037,8 @@ - + - @@ -2133,9 +2047,8 @@ - + - @@ -2144,9 +2057,8 @@ - + - @@ -2155,9 +2067,8 @@ - + - @@ -2166,9 +2077,8 @@ - + - @@ -2177,9 +2087,8 @@ - + - @@ -2188,9 +2097,8 @@ - + - @@ -2199,9 +2107,8 @@ - + - @@ -2210,9 +2117,8 @@ - + - @@ -2221,9 +2127,8 @@ - + - @@ -2232,9 +2137,8 @@ - + - @@ -2243,9 +2147,8 @@ - + - @@ -2656,10 +2559,10 @@ - + - + @@ -2669,7 +2572,7 @@ - + @@ -2679,7 +2582,7 @@ - + @@ -2689,7 +2592,7 @@ - + @@ -2702,7 +2605,7 @@ - + @@ -2807,9 +2710,8 @@ - + - @@ -2818,9 +2720,8 @@ - + - @@ -2829,9 +2730,8 @@ - + - @@ -2840,9 +2740,8 @@ - + - @@ -2851,9 +2750,8 @@ - + - @@ -2862,9 +2760,8 @@ - + - @@ -2873,9 +2770,8 @@ - + - @@ -2884,9 +2780,8 @@ - + - @@ -2895,9 +2790,8 @@ - + - @@ -2906,9 +2800,8 @@ - + - @@ -2917,9 +2810,8 @@ - + - @@ -2928,9 +2820,8 @@ - + - @@ -2939,9 +2830,8 @@ - + - @@ -2950,9 +2840,8 @@ - + - @@ -2961,9 +2850,8 @@ - + - @@ -2972,9 +2860,8 @@ - + - @@ -2983,9 +2870,8 @@ - + - @@ -2994,9 +2880,8 @@ - + - @@ -3005,9 +2890,8 @@ - + - @@ -3016,9 +2900,8 @@ - + - @@ -3027,9 +2910,8 @@ - + - @@ -3038,9 +2920,8 @@ - + - @@ -3049,9 +2930,8 @@ - + - @@ -3060,9 +2940,8 @@ - + - @@ -3071,9 +2950,8 @@ - + - @@ -3082,9 +2960,8 @@ - + - @@ -3093,9 +2970,8 @@ - + - @@ -3104,9 +2980,8 @@ - + - @@ -3115,9 +2990,8 @@ - + - @@ -3126,9 +3000,8 @@ - + - @@ -3137,9 +3010,8 @@ - + - @@ -3148,9 +3020,8 @@ - + - @@ -3159,9 +3030,8 @@ - + - @@ -3170,9 +3040,8 @@ - + - @@ -3181,9 +3050,8 @@ - + - @@ -3192,9 +3060,8 @@ - + - @@ -3203,9 +3070,8 @@ - + - @@ -3214,9 +3080,8 @@ - + - @@ -3225,9 +3090,8 @@ - + - @@ -3236,9 +3100,8 @@ - + - @@ -3247,9 +3110,8 @@ - + - @@ -3258,9 +3120,8 @@ - + - @@ -3269,9 +3130,8 @@ - + - @@ -3280,9 +3140,8 @@ - + - @@ -3703,7 +3562,7 @@ - + @@ -3808,9 +3667,8 @@ - + - @@ -3819,9 +3677,8 @@ - + - @@ -3830,9 +3687,8 @@ - + - @@ -3841,9 +3697,8 @@ - + - @@ -3852,9 +3707,8 @@ - + - @@ -3863,9 +3717,8 @@ - + - @@ -3874,9 +3727,8 @@ - + - @@ -3885,9 +3737,8 @@ - + - @@ -3896,9 +3747,8 @@ - + - @@ -3907,9 +3757,8 @@ - + - @@ -3918,9 +3767,8 @@ - + - @@ -3929,9 +3777,8 @@ - + - @@ -3940,9 +3787,8 @@ - + - @@ -3951,9 +3797,8 @@ - + - @@ -3962,9 +3807,8 @@ - + - @@ -3973,9 +3817,8 @@ - + - @@ -3984,9 +3827,8 @@ - + - @@ -3995,9 +3837,8 @@ - + - @@ -4006,9 +3847,8 @@ - + - @@ -4017,9 +3857,8 @@ - + - @@ -4028,9 +3867,8 @@ - + - @@ -4039,9 +3877,8 @@ - + - @@ -4050,9 +3887,8 @@ - + - @@ -4061,9 +3897,8 @@ - + - @@ -4072,9 +3907,8 @@ - + - @@ -4083,9 +3917,8 @@ - + - @@ -4094,9 +3927,8 @@ - + - @@ -4105,9 +3937,8 @@ - + - @@ -4116,9 +3947,8 @@ - + - @@ -4127,9 +3957,8 @@ - + - @@ -4138,9 +3967,8 @@ - + - @@ -4149,9 +3977,8 @@ - + - @@ -4160,9 +3987,8 @@ - + - @@ -4171,9 +3997,8 @@ - + - @@ -4182,9 +4007,8 @@ - + - @@ -4193,9 +4017,8 @@ - + - @@ -4204,9 +4027,8 @@ - + - @@ -4215,9 +4037,8 @@ - + - @@ -4226,9 +4047,8 @@ - + - @@ -4237,9 +4057,8 @@ - + - @@ -4248,9 +4067,8 @@ - + - @@ -4259,9 +4077,8 @@ - + - @@ -4270,9 +4087,8 @@ - + - @@ -4281,9 +4097,8 @@ - + - @@ -4704,7 +4519,7 @@ - + @@ -4726,9 +4541,8 @@ - + - @@ -4737,9 +4551,8 @@ - + - @@ -4748,9 +4561,8 @@ - + - @@ -4759,9 +4571,8 @@ - + - @@ -4770,9 +4581,8 @@ - + - @@ -4781,9 +4591,8 @@ - + - @@ -4793,9 +4602,8 @@ - + - @@ -4804,9 +4612,8 @@ - + - @@ -4815,9 +4622,8 @@ - + - @@ -4826,9 +4632,8 @@ - + - @@ -4837,9 +4642,8 @@ - + - @@ -4849,9 +4653,8 @@ - + - @@ -4860,9 +4663,8 @@ - + - @@ -4871,9 +4673,8 @@ - + - @@ -4882,9 +4683,8 @@ - + - @@ -4893,9 +4693,8 @@ - + - @@ -4904,9 +4703,8 @@ - + - @@ -5052,13 +4850,12 @@ - + - + - @@ -5067,9 +4864,8 @@ - + - diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index 3c168cb60..a122cfd56 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -50,11 +50,11 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.73\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.75\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.73\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.75\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll @@ -63,7 +63,7 @@ ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.10\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.11\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi.Assets/packages.config b/src/MoBi.Assets/packages.config index b2e76c14d..771b81068 100644 --- a/src/MoBi.Assets/packages.config +++ b/src/MoBi.Assets/packages.config @@ -3,11 +3,11 @@ - - + + - + diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index b0b0faef6..d3da4fce3 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -198,11 +198,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.73\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.75\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.73\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.75\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -213,23 +213,23 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.73\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.75\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.73\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.75\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.10\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.11\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.73\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.75\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.BatchTool/packages.config b/src/MoBi.BatchTool/packages.config index 56c9f6542..0ea02408a 100644 --- a/src/MoBi.BatchTool/packages.config +++ b/src/MoBi.BatchTool/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + - + diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index 1d16beb9f..063a048e4 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -102,26 +102,26 @@ ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.73\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.75\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.73\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.75\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.73\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.75\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.73\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.75\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.10\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.11\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll @@ -450,6 +450,7 @@ + @@ -644,7 +645,6 @@ - diff --git a/src/MoBi.Core/Serialization/Converter/v7_3/Converter710To730.cs b/src/MoBi.Core/Serialization/Converter/v7_3/Converter710To730.cs new file mode 100644 index 000000000..a29f859be --- /dev/null +++ b/src/MoBi.Core/Serialization/Converter/v7_3/Converter710To730.cs @@ -0,0 +1,30 @@ +using System.Xml.Linq; +using MoBi.Core.Domain.Model; + +namespace MoBi.Core.Serialization.Converter.v7_3 +{ + public class Converter710To730 : IMoBiObjectConverter + { + private readonly OSPSuite.Core.Converter.v7_3.Converter710To730 _coreConverter; + + public Converter710To730(OSPSuite.Core.Converter.v7_3.Converter710To730 coreConverter) + { + _coreConverter = coreConverter; + } + + public bool IsSatisfiedBy(int version) + { + return version == ProjectVersions.V7_1_0; + } + + public (int convertedToVersion, bool conversionHappened) Convert(object objectToUpdate, IMoBiProject project) + { + return _coreConverter.Convert(objectToUpdate); + } + + public (int convertedToVersion, bool conversionHappened) ConvertXml(XElement element, IMoBiProject project) + { + return _coreConverter.ConvertXml(element); + } + } +} \ No newline at end of file diff --git a/src/MoBi.Core/packages.config b/src/MoBi.Core/packages.config index 7f2259c3d..50626b577 100644 --- a/src/MoBi.Core/packages.config +++ b/src/MoBi.Core/packages.config @@ -10,14 +10,14 @@ - - + + - - + + - + diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index 087b42222..fbf4e1bbe 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -202,26 +202,26 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.73\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.75\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.73\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.75\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.73\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.75\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.73\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.75\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.10\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.11\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi.Presentation/packages.config b/src/MoBi.Presentation/packages.config index 6ddb2c3ca..a5c5b8e07 100644 --- a/src/MoBi.Presentation/packages.config +++ b/src/MoBi.Presentation/packages.config @@ -12,15 +12,15 @@ - - + + - - + + - + diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index 83deab2d9..913fa4ded 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -238,11 +238,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.73\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.75\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.73\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.75\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -253,23 +253,23 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.73\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.75\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.73\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.75\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.10\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.11\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.73\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.75\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.UI/Views/EditTransportBuilderView.cs b/src/MoBi.UI/Views/EditTransportBuilderView.cs index 8c0077ca6..5df609242 100644 --- a/src/MoBi.UI/Views/EditTransportBuilderView.cs +++ b/src/MoBi.UI/Views/EditTransportBuilderView.cs @@ -70,6 +70,8 @@ public override void InitializeResources() chkCreateParameter.Text = AppConstants.Captions.CreateProcessRateParameter; chkPlotParameter.Text = AppConstants.Captions.PlotProcessRateParameter; tabKinetic.Text = AppConstants.Captions.Kinetic; + tabParameters.Image = ApplicationIcons.Parameter; + tabProperties.Image = ApplicationIcons.Properties; _errorImage = ApplicationIcons.DxError.ToImage(); _passiveTransportImage = ApplicationIcons.PassiveTransport.ToImage(); splitContainerControl1.PanelVisibility = SplitPanelVisibility.Panel1; diff --git a/src/MoBi.UI/packages.config b/src/MoBi.UI/packages.config index 56c9f6542..0ea02408a 100644 --- a/src/MoBi.UI/packages.config +++ b/src/MoBi.UI/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + - + diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index f1eac85f7..14e8711e5 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -93,23 +93,23 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.73\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.75\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.73\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.75\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.73\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.75\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.10\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.11\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi/packages.config b/src/MoBi/packages.config index 97569f26d..4382e686c 100644 --- a/src/MoBi/packages.config +++ b/src/MoBi/packages.config @@ -3,13 +3,13 @@ - - + + - + - + diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index 5a9523da5..b5d62324b 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -138,14 +138,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.73\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.75\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll + + ..\..\packages\OSPSuite.BDDHelper.2.0.1.4\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.73\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.75\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -153,17 +153,17 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.73\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.75\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.73\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.75\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.10\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.11\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll @@ -550,6 +550,7 @@ + diff --git a/tests/MoBi.Tests/ProjectConversion/v7_3/Converter710To730Specs.cs b/tests/MoBi.Tests/ProjectConversion/v7_3/Converter710To730Specs.cs new file mode 100644 index 000000000..ce9be454e --- /dev/null +++ b/tests/MoBi.Tests/ProjectConversion/v7_3/Converter710To730Specs.cs @@ -0,0 +1,53 @@ +using FluentNHibernate.Utils; +using MoBi.Core.Domain.Model; +using MoBi.IntegrationTests; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Builder; + +namespace MoBi.ProjectConversion.v7_3 +{ + public class When_converting_a_project_to_7_3_0 : ContextWithLoadedProject + { + private IMoBiProject _project; + + public override void GlobalContext() + { + base.GlobalContext(); + _project = LoadProject("EB_LV"); + } + + [Observation] + public void should_have_set_all_parameters_of_all_building_blocks_to_default() + { + _project.MoleculeBlockCollection.Each(validateIsDefaultFlagInParameters); + _project.ReactionBlockCollection.Each(validateIsDefaultFlagInParameters); + _project.SpatialStructureCollection.Each(validateIsDefaultFlagInParameters); + _project.EventBlockCollection.Each(validateIsDefaultFlagInParameters); + _project.PassiveTransportCollection.Each(validateIsDefaultFlagInParameters); + _project.ParametersStartValueBlockCollection.Each(validateIsDefaultFlagInParameters); + } + + private void validateIsDefaultFlagInParameters(IBuildingBlock buildingBlock) where T : class, IObjectBase + { + foreach (var builder in buildingBlock) + { + if (builder is IContainer container) + validateIsDefaultFlagInContainerParameters(container); + else if (builder is IParameterStartValue psv) + validateIsDefaultStateIn(psv); + } + } + + private void validateIsDefaultFlagInContainerParameters(IContainer container) + { + container.GetAllChildren().Each(validateIsDefaultStateIn); + } + + private void validateIsDefaultStateIn(IWithDefaultState withDefaultState) + { + withDefaultState.IsDefault.ShouldBeTrue(); + } + } +} \ No newline at end of file diff --git a/tests/MoBi.Tests/packages.config b/tests/MoBi.Tests/packages.config index d900b81eb..43c99fea7 100644 --- a/tests/MoBi.Tests/packages.config +++ b/tests/MoBi.Tests/packages.config @@ -14,16 +14,16 @@ - - - + + + - - + + - + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index 4e2b53888..245040673 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -198,14 +198,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.73\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.75\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll + + ..\..\packages\OSPSuite.BDDHelper.2.0.1.4\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.73\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.75\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -216,23 +216,23 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.73\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.75\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.73\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.75\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.10\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.11\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.73\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.75\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index d7efb9145..4aa5e4d74 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -13,21 +13,21 @@ - - - + + + - - + + - + - + From 141c10384dbb1095e102a925df24f9c01afbbcc1 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Fri, 18 May 2018 09:15:17 -0400 Subject: [PATCH 23/29] Fixes #264 directory issue when file does not exist (#276) --- .../Serialization/Xml/SettingsPersistor.cs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/MoBi.Presentation/Serialization/Xml/SettingsPersistor.cs b/src/MoBi.Presentation/Serialization/Xml/SettingsPersistor.cs index 8de399fa9..d858c8cf8 100644 --- a/src/MoBi.Presentation/Serialization/Xml/SettingsPersistor.cs +++ b/src/MoBi.Presentation/Serialization/Xml/SettingsPersistor.cs @@ -36,11 +36,23 @@ public virtual void Save() { var serializer = _serializerRepository.SerializerFor(_settings); var xml = serializer.Serialize(_settings, serializationContext); - var doc = XDocument.Load(new StringReader(xml.ToString())); - doc.Save(SettingsFilePath); + saveSerializedSettingsToFile(xml); } } + private void saveSerializedSettingsToFile(XElement xml) + { + ensureSettingsFileDirectoryExists(); + var doc = XDocument.Load(new StringReader(xml.ToString())); + doc.Save(SettingsFilePath); + } + + private void ensureSettingsFileDirectoryExists() + { + var directory = Path.GetDirectoryName(SettingsFilePath); + DirectoryHelper.CreateDirectory(directory); + } + protected abstract string SettingsFilePath { get; } public void Load() From eacf693989b4131da8726975489f98c52b9725d7 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Fri, 18 May 2018 11:04:43 -0400 Subject: [PATCH 24/29] Fixes #275 update simmodel (#277) --- src/MoBi.Assets/MoBi.Assets.csproj | 10 ++++----- src/MoBi.Assets/packages.config | 6 ++--- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 22 +++++++++---------- src/MoBi.BatchTool/packages.config | 12 +++++----- src/MoBi.Core/MoBi.Core.csproj | 18 +++++++-------- src/MoBi.Core/packages.config | 10 ++++----- .../MoBi.Presentation.csproj | 18 +++++++-------- src/MoBi.Presentation/packages.config | 10 ++++----- src/MoBi.UI/MoBi.UI.csproj | 22 +++++++++---------- src/MoBi.UI/packages.config | 12 +++++----- src/MoBi/MoBi.csproj | 14 ++++++------ src/MoBi/packages.config | 8 +++---- tests/MoBi.Tests/MoBi.Tests.csproj | 18 +++++++-------- tests/MoBi.Tests/packages.config | 10 ++++----- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 22 +++++++++---------- tests/MoBi.UI.Tests/packages.config | 12 +++++----- 16 files changed, 112 insertions(+), 112 deletions(-) diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index a122cfd56..e46736d70 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -50,11 +50,11 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.75\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.77\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.75\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.77\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll @@ -63,7 +63,7 @@ ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.11\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.13\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi.Assets/packages.config b/src/MoBi.Assets/packages.config index 771b81068..420e97e19 100644 --- a/src/MoBi.Assets/packages.config +++ b/src/MoBi.Assets/packages.config @@ -3,11 +3,11 @@ - - + + - + diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index d3da4fce3..3bdac560a 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -198,11 +198,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.75\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.77\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.75\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.77\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -213,23 +213,23 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.75\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.77\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.75\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.77\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.11\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.13\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.75\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.77\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.BatchTool/packages.config b/src/MoBi.BatchTool/packages.config index 0ea02408a..c789cd921 100644 --- a/src/MoBi.BatchTool/packages.config +++ b/src/MoBi.BatchTool/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + - + diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index 063a048e4..744a75384 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -102,26 +102,26 @@ ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.75\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.77\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.75\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.77\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.75\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.77\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.75\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.77\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.11\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.13\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi.Core/packages.config b/src/MoBi.Core/packages.config index 50626b577..d1b61ce38 100644 --- a/src/MoBi.Core/packages.config +++ b/src/MoBi.Core/packages.config @@ -10,14 +10,14 @@ - - + + - - + + - + diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index fbf4e1bbe..064d051ff 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -202,26 +202,26 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.75\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.77\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.75\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.77\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.75\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.77\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.75\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.77\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.11\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.13\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi.Presentation/packages.config b/src/MoBi.Presentation/packages.config index a5c5b8e07..4405bb6e0 100644 --- a/src/MoBi.Presentation/packages.config +++ b/src/MoBi.Presentation/packages.config @@ -12,15 +12,15 @@ - - + + - - + + - + diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index 913fa4ded..6a131d0e1 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -238,11 +238,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.75\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.77\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.75\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.77\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -253,23 +253,23 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.75\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.77\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.75\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.77\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.11\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.13\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.75\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.77\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.UI/packages.config b/src/MoBi.UI/packages.config index 0ea02408a..c789cd921 100644 --- a/src/MoBi.UI/packages.config +++ b/src/MoBi.UI/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + - + diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index 14e8711e5..4331fab77 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -93,23 +93,23 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.75\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.77\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.75\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.77\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.75\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.77\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.11\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.13\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi/packages.config b/src/MoBi/packages.config index 4382e686c..0752a6a45 100644 --- a/src/MoBi/packages.config +++ b/src/MoBi/packages.config @@ -3,13 +3,13 @@ - - + + - + - + diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index b5d62324b..69c3ade39 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -138,14 +138,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.75\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.77\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.1.4\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.75\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.77\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -153,17 +153,17 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.75\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.77\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.75\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.77\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.11\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.13\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/tests/MoBi.Tests/packages.config b/tests/MoBi.Tests/packages.config index 43c99fea7..7b7fd94d0 100644 --- a/tests/MoBi.Tests/packages.config +++ b/tests/MoBi.Tests/packages.config @@ -14,16 +14,16 @@ - + - + - - + + - + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index 245040673..d7e185faf 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -198,14 +198,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.75\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.77\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.1.4\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.75\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.77\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -216,23 +216,23 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.75\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.77\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.75\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.77\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.11\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.13\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.75\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.77\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index 4aa5e4d74..7ef3a0519 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -13,21 +13,21 @@ - + - + - - + + - + - + From e9ef4ceb2af513e91867509abf5dbe483950cf06 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Fri, 18 May 2018 11:34:57 -0400 Subject: [PATCH 25/29] Fixes #218 update building block templates (#278) --- src/Data/GroupRepository.xml | 2 +- .../Templates/2 Pores Passive Transports.pkml | 220 +- src/Data/Templates/Human 2 Pores.pkml | 26077 +++++++--------- src/Data/Templates/Human Standard.pkml | 20222 ++++++------ src/Data/Templates/IV Bolus (mg).pkml | 45 +- src/Data/Templates/IV Bolus.pkml | 45 +- src/Data/Templates/Standard Molecule.pkml | 935 +- src/Data/Templates/Standard Observer.pkml | 110 +- .../Standard Passive Transports.pkml | 164 +- 9 files changed, 21406 insertions(+), 26414 deletions(-) diff --git a/src/Data/GroupRepository.xml b/src/Data/GroupRepository.xml index 761102145..b63920363 100644 --- a/src/Data/GroupRepository.xml +++ b/src/Data/GroupRepository.xml @@ -26,7 +26,7 @@ - + diff --git a/src/Data/Templates/2 Pores Passive Transports.pkml b/src/Data/Templates/2 Pores Passive Transports.pkml index 53b911c50..c20b3a2d2 100644 --- a/src/Data/Templates/2 Pores Passive Transports.pkml +++ b/src/Data/Templates/2 Pores Passive Transports.pkml @@ -1,8 +1,8 @@  - - + + - + @@ -17,7 +17,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -143,7 +143,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -173,7 +173,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -218,7 +218,7 @@ - + @@ -233,7 +233,7 @@ - + @@ -248,7 +248,7 @@ - + @@ -265,7 +265,7 @@ - + @@ -286,7 +286,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -327,7 +327,7 @@ - + @@ -347,7 +347,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -378,7 +378,7 @@ - + @@ -393,7 +393,7 @@ - + @@ -414,7 +414,7 @@ - + @@ -430,7 +430,7 @@ - + @@ -446,7 +446,7 @@ - + @@ -467,7 +467,7 @@ - + @@ -486,7 +486,7 @@ - + @@ -505,7 +505,7 @@ - + @@ -520,7 +520,7 @@ - + @@ -540,7 +540,7 @@ - + @@ -562,7 +562,7 @@ - + @@ -583,7 +583,7 @@ - + @@ -604,7 +604,7 @@ - + @@ -624,7 +624,7 @@ - + @@ -647,7 +647,7 @@ - + @@ -664,7 +664,7 @@ - + @@ -680,7 +680,7 @@ - + @@ -696,7 +696,7 @@ - + @@ -711,7 +711,7 @@ - + @@ -730,7 +730,7 @@ - + @@ -751,7 +751,7 @@ - + @@ -767,7 +767,7 @@ - + @@ -783,7 +783,7 @@ - + @@ -804,7 +804,7 @@ - + @@ -822,7 +822,7 @@ - + @@ -840,7 +840,7 @@ - + @@ -861,7 +861,7 @@ - + @@ -880,7 +880,7 @@ - + @@ -899,7 +899,7 @@ - + @@ -920,7 +920,7 @@ - + @@ -939,7 +939,7 @@ - + @@ -958,7 +958,7 @@ - + @@ -976,7 +976,7 @@ - + @@ -1000,7 +1000,7 @@ - + @@ -1018,7 +1018,7 @@ - + @@ -1033,7 +1033,7 @@ - + @@ -1057,7 +1057,7 @@ - + @@ -1077,7 +1077,7 @@ - + @@ -1094,29 +1094,29 @@ - + - + - + - + - + @@ -1125,14 +1125,14 @@ - + - + @@ -1141,7 +1141,7 @@ - + @@ -1152,14 +1152,14 @@ - + - + @@ -1167,7 +1167,7 @@ - + @@ -1175,28 +1175,28 @@ - + - + - + - + @@ -1205,7 +1205,7 @@ - + @@ -1213,39 +1213,39 @@ - + - + - + - + - + - + - + @@ -1253,7 +1253,7 @@ - + @@ -1264,7 +1264,7 @@ - + @@ -1276,14 +1276,14 @@ - + - + @@ -1291,14 +1291,14 @@ - + - + @@ -1307,7 +1307,7 @@ - + @@ -1316,21 +1316,21 @@ - + - + - + @@ -1338,7 +1338,7 @@ - + @@ -1346,7 +1346,7 @@ - + @@ -1355,7 +1355,7 @@ - + @@ -1364,7 +1364,7 @@ - + @@ -1372,7 +1372,7 @@ - + @@ -1381,7 +1381,7 @@ - + @@ -1390,7 +1390,7 @@ - + @@ -1398,7 +1398,7 @@ - + @@ -1408,7 +1408,7 @@ - + @@ -1418,7 +1418,7 @@ - + @@ -1429,7 +1429,7 @@ - + @@ -1438,7 +1438,7 @@ - + @@ -1456,7 +1456,7 @@ - + @@ -1472,7 +1472,7 @@ - + diff --git a/src/Data/Templates/Human 2 Pores.pkml b/src/Data/Templates/Human 2 Pores.pkml index 7fe790d55..aaee7dfd9 100644 --- a/src/Data/Templates/Human 2 Pores.pkml +++ b/src/Data/Templates/Human 2 Pores.pkml @@ -1,351 +1,303 @@  - - - + + + - + - - + - - + - - + - - + - - + - - + + - - + - - + - - + - - + - - + - + + - - + - - + + - - + + - - + - - + - - + - - + - - + + - - + - - - - - - - - - - + + - - + + - - + + - - + + + + + - - + + + + + + - - + + - - + + - - + - - - - + + + - + + - - + + - - - - + + + - + - - - - + + + - - - + + - - - + + - + - - - - + + - + + - - - - - - + + - - + + + + - - + - - - - - - + - - + + + + + - - + + - - - - - - + - - + + + + - - + - - + - - + + - - + + - - + + - - + + - - + + - - + + - - + - + - - + - - + - + - - + - - + - - + - + - - + - - + - - - + + - + - - + - - + - - + - - + - + - - + - - + - @@ -353,69 +305,61 @@ - + - + - - + + - - + - + + - - + - - + - - + - - + - + - - + + - - + - - - - - + - - + + + + - @@ -423,59 +367,52 @@ - + - + - - + - - + - + - - + + - + - - + - - + - + - - + - - + - @@ -483,69 +420,61 @@ - + - + - - + + - - + - - - + + - - - + + + - + - - - - + + - + - + - - + + - - + - - - - - + - - + + + + - @@ -553,330 +482,307 @@ - + - + + - - + + + + + - - + + - - + + - - - - - - + + - - + + - - + - - + + - + - - + + - + - - + - + - - + - - + - + - - + - + - - + - - + + - + - - + - + - - + - - + - - + + - + - - + + - + - - + + - + + - - + - - + - + - - + + - + + - - + - - + + - + - - + - + - - + - + + - - + - - + + - + + - - + + - - + + - - + - - + + - + - - + - + + - - + - - + - - + - + - - + + - + - - + - + - - + + - + - - + + - + - - + - + - + - - - - + + - + - - + - + - + - - + - - + - @@ -884,194 +790,174 @@ - + - + - - + + - - + + - - + - - - - - - - - - + - - + + + + - + + + + - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + + - - + - - + - - - - - + + - - + - - + - + + + - + - + - - + + - - + + - - + - - - + + - + - - - - + + - + - - - - - + + - - + + + + + - - + - + + - - + - - - - - - + + - + + + @@ -1079,337 +965,312 @@ - + - + - - + - - + - - + - - + - - + - + - + + - - - - - - - - - - + + - - - - - - + - - + + + + + + + + + + + + + - - + - + - - + + - + + - - + - - + + - - + - - + - - + - + - - + - + - - + - - + - - + - - + + - + - - + + - + - - + + - + - - + + - + - - + - + - - + + - + + - - + + - - + - - + - - + + - + - - + + - + - - + - + - - + + - + - - + + - + + - - + + - - + - - + - - + - + - - + + - + - - + - + - - + + - + - - + - + - - + + - + + - - + - - + - + - - + - - + - @@ -1417,214 +1278,191 @@ - + - + - - - - + + - + - - + - + - - - - - + + - - + + + + + - - + - - - + + - + - - - - + + + - - - + + - + - + - - + + - - + - + - - - - - - + - + + + - + - - - - - + + - - + + + + + - - + - - + - - - + + - + - - - - - - + - + + + + - + - + - - + + - - + + - - + - + - - + - - + - - + - + - - + + - - + + - - + - - - - - + + - - + - - + + - + + + @@ -1632,219 +1470,205 @@ - + - + + - - - - - - + - - + + - - + + - - + + + + + + - - + - - + - + + - - + - - + + - + - - + + - - + - - + - - + - + - - + + - + - - + - + - - + - + - - + - - + - - + + - + - - + + - + - - + + - + - - + + - + + - - + + - - + - - + + - + - - + + - + + - - + - - + - - + - + - - + + - + - + - - + - - + - @@ -1852,15 +1676,13 @@ - + - + - - + - @@ -1868,31 +1690,28 @@ - + - + - - + - + - + - + - - + - @@ -1900,15 +1719,13 @@ - + - + - - + - @@ -1916,47 +1733,56 @@ - + - - - + + - - - + + - + + - + - - - + + - - - + + - + - + - - - + + - + + + + + + + + + + + + + + + - @@ -1964,31 +1790,27 @@ - + - + - - + - - + - + - + - - + - @@ -1996,47 +1818,41 @@ - + - + - - + - - + - + - + - - + - - + - + - + - - + - @@ -2044,35 +1860,16 @@ - - - - - - - - - - - - - - - - - + - + - - + - - + - @@ -2080,194 +1877,174 @@ - + - + - - + + - - + + - - + - + + - - + - - + - - + - - + - + - - + + - - + - - - - - + - - + + + + - - + - + - - + + - - + + - - + - - + - + + - - + - - + - - + - - + - + - - + + - - + + - - + - + - - + - - + - - + - + - - + + - - + + - - + - + + - - + - - + + - - + - @@ -2275,303 +2052,279 @@ - + - + + - - + + - - + + + + + + + + + - - - - - - - - - - + + - - + - - + - + - - + + - + + - - + - - + + - - + - - + - + - - + - + - - + - + - - + - + - - + - - - - - - - - - + + - - + + - - + + - - + - - + + - + - - + + + + + + + + + - - + - - + + - - + - - + - - + - + - - + + - + - - + - + - - + + - + + - - + - - + - + - - + - + - - + - + - - + - + - - + + - - + - - + - + - - + + - + - - + + - - + - + - - + - - + - @@ -2579,214 +2332,191 @@ - + - + - - - - + + - + - - + - + - - - - - + - - + + + + + + - - + - + + + + + - - + - - + - - - - - - + - + - - + + - - + - + + + + - - + - - - - - - + - + - - + + - - + + - - + - - + - + + - - + - - + - - + - - + - + - - + + - - + + - - + - + + + + - - + - - - - - - + - - - - - + - - + + + + + + - - + - + + - - + - - + + - - + - @@ -2794,303 +2524,283 @@ - + - + + - - + + + + + + + + - - + + - - + + - - + + - - - - - - - - - + + - - + + - - + - - + - - + + - - + - - + - + - - + - + - - + - + - - + - + - - + - - + - - + + - + - - + + - + + - - + - - + + - + - - + + - - + + - - + - - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + - + + - - + - - + + - - + + - - + - - + - - + + - + - - + - + - - + - + - - + + - + - - + + - + - - + - + - + - - + - - + - @@ -3098,214 +2808,191 @@ - + - + - - - - + + - + - - + - + - - - - - + + - - + + + + + - - + - + + + + + - - + - - + - - - - - - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + + - - + - - + - - - - - + + - - + + + + - - - - + + - + - + - - + + - - + + - - + - + - - + - - + - - + - - - - - + + - - + + + + + - - + - - - + + - - - + + + - + + - - - - + + @@ -3313,338 +3000,315 @@ - + - + + - - + - - + + - - + + - - - - - - + + - - + + + + + - - + + - - + + - - + - - + - - + - + - - + - + + - - + + - - + - - + - + - - + - + - - + - + - - + - + - - + - - + - - + + - - + + - - + - - + + - + - - + + - + - - + + - + - - + - + + - - + + - - + - - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - + - - + + - - + - - + + - + - - + - + - - + + - + - - + - + - - + + - - + - - + - + - - + + - + + - - + - + - - + - - + - @@ -3652,143 +3316,130 @@ - + - + - - + + + + + + + + + + + + + + + + - - + - + - + - + - - - - + + - + + - + - + - - + - - + - + - + - + - - - - + + + + + - + + - + - + - - - - + + - + + - + - + - - - - - - - - + + - + + - + - - - - - - - - - - - - - - - - - + - - + - - + - @@ -3796,363 +3447,317 @@ - + - + - - + + - - + + - - + - - - - - - - - - + - - + - + + + + + + + - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + + - - + - - + - + + - - + + + + - - + - - - - - - + - + - - + + - - + + - - + - - - - - + - - + + + + - - + - + + - - + - - + + - - + - + + - - + - - + + - - + - - + - + - - + - + - - - + + - + - - - - + + - + - + - - + - - + - - + - + + + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - - - + - - + - + - - + - + - - + - + - - + + - + - - + - + - + - - + - @@ -4161,95 +3766,82 @@ - + - - - - - - - + + - - - + + - + - + - + - - - - + + - + - - + - + - + - - - - + + - + - - + - + - - - + + - - - + + + + + - + - + - + - - + - @@ -4258,287 +3850,245 @@ - + - - - - - + - - + + + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - - - + + + + + - + - - - - + + - + - - - + + - - - + + - + - - + - + - - + + + + - - + - + - - + - - + + + + - + - - + - + - - - - - - + - - + + + + - + - - + - - + + - - - - - - - - - - + - - + - + - - + - + - - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + + - + - + - - + - @@ -4547,291 +4097,248 @@ - + - - - + + - - - + + + + + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - - - + + - - - + + - - - + + - - - + + - + - - - + + - + - - + + + + + + + - + - - - - - - + - + - - + - - + - - - + + - + + + + - - - - - - - - - - + - + - - + - - - + + - + - - - - - - + - + - - + + + + + - + - - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + + - + - + - - + - @@ -4840,291 +4347,248 @@ - + - + - - + - - + - - + - - + - - - - - - + - - + - - - - + + - - - + + - + - - - - - - + - - + - - - - + + - + - - + - + + + + + + + + + - + - + + + + + + + + - - + - - + - - + - - - - - - - - - - + - - + + + + - + - - + + + + - - + - - + + - - + - - + - - + - - + - - + - - + - + - - + - + - - + - + - - + - + - - + - - + - - + - - + - - + - - - - - - - - - - + - - + - + - - + - + - - + + - + - + - - + - @@ -5133,291 +4597,248 @@ - + - + - - - - + + - - - + + - - - + + - + - - + - - + - - - - + + - - - + + - - - + + - + - - + - - + - - - - + + - - - + + - - - + + - + + + + - - + - - - - - + - - - - - - - - - - - - - - + - - + - - - + + - + - - + + - + - - + - - - - - - + - - - - + + - + - - + - + + + + + + + + + + - - - - - - + - - - + + - + - - + + + + - + - - + - - + - - + - - + - + - - + - - + - - + - - + - - + - - + + + + + + + + - - + - - + + - + - + - - + - @@ -5426,291 +4847,248 @@ - + - + - - - - + + - - - + + + + + - + - - + - - + - - + - - + - - - - + + - - - + + - + - - + - - + + + + - - - - + + - + - - - - - - - - + + - + - + - - + - - - + + - + - - + - - - + + - + - - - - - - - - + + - + - - + + - + - - + - - + - + - - + - - + + + + - + - - + - - + - - + - - + - - + - - + - + - - + - + - - + - - + - + - - + - + - - + - + - - + - - + - - + - + - - + - + - - + + - + - - + - + - - + - @@ -5719,291 +5097,248 @@ - + - + + + + - - + - - + - - - - + + - + - - - - + + - + - - + - - + - - + - - + - - + - - + - - - - + + - - - + + - - - + + - - - + + - + - + + + + + + + - - - - - - - - - - + - - + - - + - - + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - - + - - + - - + - + - - + - + - - + - + - - + - + - - + + - + - + - - + - @@ -6012,291 +5347,248 @@ - + - - - + + + + + - + + + + - - + - - + - - + - - + - - - - + + - - - + + - - - + + - + - - + - - + - - - - - - - - + + - - - + + - - - + + - + - - + - + - - + + + + + + + + - - + - - + - - + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - - - - - - - + - - + - - + - + - - + - - + - + - - + + - + - - + - + - - + - + - - + - - + - + - - + - + - - + - - + - + - - + - + - - + - + - + - - + - @@ -6305,291 +5597,248 @@ - + - - - + + - - - + + - + - - - - + + - - - + + - - - + + - - - + + - + - - + - - + - - - - + + - - - + + + + + - + - - + - - + - - - - + + - - - + + - + - - - + + + + + + + + + + + + + - + + - - + - - + - - + - - + - - + - - - - - - - - + + - - - - - - - + + - + - - + - - + - - + - - - - + + - - - - - - - + + - + - - + - + - - + - + - - + - - + - + - - + - - + - - + - - + - + - - + - + - - + - - + - - + - - + + - + - + - - + - @@ -6598,291 +5847,248 @@ - + - - - + + - + - - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - + - - + - - + - - - - + + - - - + + + + + - + - - - - + + - - - + + - + - - + - + - - + + - + - - - - - - - - - - + - - + - - + - - + - - + - - + - - + - - + - - - - - - - - + + - + - - + - - + - - - - - - + - - + - + - - + - + - - + - + - - + - - + - + - - + - + - - + - - + + - - + - - + - - + - - + - - + + + + + + + + + + + + + + + - + - + - - + - @@ -6891,291 +6097,248 @@ - + - + + + + - - + + + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - - - - - + + - + - - - - + + - + - + + + + + + + + + + + - - + - - + - - + - - + - - + - - + + + + - - - - - - + + - + - - + - - - - + + - + - - + - - + - - + - - - - - - + - + - - + - + - - + - - + - - + - + - - + - - + - + - - + - - + - + - - + + - + - - + - - - - - - - - - - + - + - - + - + - + - - + - @@ -7184,291 +6347,248 @@ - + - - - + + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - + - - + - - + - + + + - + - + - - + - - + + - - + - - + - - + - - - - - - - - - - + - + - - + - + - - + - + - - + + + + - - - - - - + - - - + + - + - - + + + + + + + - + - - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - - + - + - - + - + - - + - + - - + + - + - + - - + - @@ -7477,433 +6597,397 @@ - + - - - + + - - - + + - - - + + - + - - + - - - - + + - - - + + - + + + + - - - - + + - - - + + - + - - + - - + - - + - - + - - + - - - - + + - + - + - - + - - + - + + - - - - + + + - + + - - + + - - - - + + + - + - - + - - + - + - - + + - + + - - + - - + + - - + - - + - + - - + - + - - + - + - - + - + - - + - - + + - - + + - - + - - + + - + - - + + - + - - + + - - + + - - + + - - + - - + - - + - + - - + + - + + - - + - - + + - + - - + + - + + - - + - - + + - + - - + - + - - + + - + - - + - + + - - + - - + + - - + - - + - - + + - - + - + - - + - - + - @@ -7912,19 +6996,16 @@ - + - + - - + - - + - @@ -7933,201 +7014,180 @@ - + - - - - - + - - + + + + + + - - + - + + - - + - - + - - + - - + - + - - + + - - + - + - - + - - + - - + - - - - - + + - - + + + + + - - + - - + - + + - - + - - - - - - + - + + + - + - + - - + + - - + - - + - + + + + - - + - - - - - - + - + - - + + - - + + - - + - + + - - + - - + + - - + - @@ -8135,397 +7195,372 @@ - + - + + - - - - - - + + - - + - - + - - + + - - + + - - + + + + + + - - + - - + - + - - + + - + - - + + - + - - + + - + - - + + - - + - - + - - + - - + - + - - + - + - - + - + - - + - - + - - + - + - - + - + - - + + - - + - - + + - + - - + + - + + - - + - - + + - + - - + - + + - - + - - + + - - + + - - + - - + + - + + - - + - - + - + + - - + + - - + - - + + - + - - + - + - - + + - + - - + - + - - + + - - + + - - + - - + - - + + - + - - + - + - + - - + - - + - @@ -8534,19 +7569,16 @@ - + - + - - + - - + - @@ -8555,520 +7587,466 @@ - + - + - - - - + + - + - - + - + - + - - + + - - + + - - + - + + - - + - - + - - + - - + - + - - + + - - + - + - - + - - + - - + - - - - - + - - + + + + + + - - + - - + - - - + + - + - - - - + + + - - - + + - + - + - - + + - - + - - + - - - + + - + - - - - + + - + - + - - + + - - + + - - + - + + - - + - - + + - - + - - + - + - + + - - - - - - - - + + - + + - - + + - - - - + + + + + + + - + + - - + + - - - - - - + - - + + + + + + - - + - - + - - - - - - + - - - - + + - - - + + - + + - - + + + + + + - - + + - - + + - - + - - + - - - - - - + - - - - + + + - + + - - + + - - + + + + + + - - + - - + - - - - - - + - - + + + + + + - - + - - + - - + + - - - - - - + + - - - - + + - + - - + + + + + - - - - - + - - + + + + + + - - + - + + - - + - - + - - + - - + - + - - + + - - + - + + + + - - + - - - - - - + - + + - - + - - + + - - + - - + - - - - - + + - - + - - + - + + + - + @@ -9076,377 +8054,340 @@ - + - - + + - - + + - - + - - - - - + - - + - + + + - + - + + - - + - - + + - - + - + + - - + - - + + - - + - - + - + - + + - - - - - - + + - - + + - - + + - - + - - + + + + + + - - + + - - - - - - + - - + + + + + + - - + - - + - - + - - + - - + - - + + + + + + - - + + - - - - - - + + - - + - - + + - - + - - + + - - + - - - - + + - - - + + + - + + - - - - + + + - - - + + + - + - - - - - - + + - - + + + + - - + + - - + - - + + - - + - - + + - - - - - - + + - - + + + + - + + - - + - - + + - - + - - - - - + + - - + - - + - + + + - + - + - - + + - - + - + - - + - - + - - + - + + - - + - - + + - - + - - + - + + - - + + + + - - + - - - - - - + @@ -9454,377 +8395,340 @@ - + - - + + - - + + - - + - + - - + - - + - - + - - - - - + + - - + + + + + - - + - - - + + + - + - - - - - - + - + + + + - + - + - + + - - + - - + + - - + + - - + + - - + + - - + + - - + - - + + - - + + - - + + - - + - - + - - + - - + - - + - - - - + + + - + + - - - - - - + + - - - - + + + - + - - - - + + + - - - + + - + + - - - - + + - - - + + + - + + - - + + + + + - - - - + + + - + - - - - - - + - - - - + + + - + - - - - + + + - + - - + + + + + + - - + - - - - - - + + - - + + + + - + + - - + - - + + - - + - + + - - + - - + - - + - - + - + - - + + - - + - + - - - - - - + - + + + - + - - - - - + - - + + + + + + - - + - - + - - - - - + + - - + + + + - - + - - + @@ -9832,377 +8736,340 @@ - + - - + + - - + + - - + - + - - + - - + - - + - + + - - + - - + + - - + - + + - - + - - + + - - + - - + - + - + + - - - - - - + + - - + + - - + + - - + - - + + + + + + - - + - - - - - - + + - - + + + + + + - - + - - + - - + - - + - - + - - - - - - - - + + + - + + - - - - + + + - - - + + + - + + - - - - + + - - - + + - + - - - - + + + - + + - - + + + + + - - - - + + + - + + - - + - - + - - + + - - + - - + + - - + + - - + - - + + - - + - - + - - + + - - + - + + - - + - - + + - - + - + + - - + - - + - - + - - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + + - - + - - + - - - - - + + - - + + + + - - - - + + - + @@ -10210,377 +9077,340 @@ - + - - + + - - + + - - + - - - - - + - - + + + + - - + - + + - - + - - + + - - + - + + - - + - - + + - - + - - + - + - + + - - - - - - + + - - + + + + + + - - + + - - + - - + + - - - - - - + + - - + + - - + + + + + - - + - - + - - - - - - + - - + + + + - - - - + + + - + + - - - - + + + - + + - - + - - + + - - + - - + + + + + - - - - + + + - - - + + - + + - - + + - - - - - - - - + + + - + - - - - - - + - - + + + + + - - + + - - + + - - + - - + + - - + - - - - - - + + - - + + + + - + + - - + - - + + - - + - + + - - - - - - + - - + + + + - - + - + - - + + - - + - + - - + - - + - - + - - - - - + + - - + + + + + - - + - - + - + + - - + - - + - - + - - + @@ -10588,477 +9418,446 @@ - + - - + + - - + + - - + - + - - + - - + - - + - - - - - + - - + + + + + + - - + - + + - - + - - - - - - + - + + + + - + - + - + + - - + + - - - - - - + + - - + - - - - - - + - + - - + + + + + + + + + - + - - + - + - - + + - + - - + - + + - - + + - - + - - + + - + - - + + - - + - - + - + - - + - - + - + - - + - + - - + - - + - - + - - + - - + + - - + - - + + - + + - - + - - + + - + - - + + - + - - + - + + - - + - - + - + - - + + - + + - - + - - + + - + - - + + - + - - + + - + - - + - + + - - + + - - + - - + - - + - + - - + + - + - - + + - - + - - + + - - + - - + - + - - + + - + - + - - + - @@ -11067,19 +9866,16 @@ - + - + - - + - - + - @@ -11088,19 +9884,16 @@ - + - + - - + - - + - @@ -11109,499 +9902,448 @@ - + - + + - - + - - + + - - + - - - + + - - - + + + - + - - - - + + - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + + - - + - - + - - - + + + - - - + + - + - - - - + + - + - + - - + + - - + - - + - - - + + - + - - - - + + - + - + + - - + - - + + - - + - + + - - + - - + + - - + - - + - + - + + - - - - - - + + - - + + + + + + - - + + - - + - - + + - - + - - + + - - + + - - + + - - + - - + - - + - - + - - + - - + + - - - - - - + + - - + + - - - - + + + - + - - - - + + + - - - + + - + - - + + + + + + - - + + - - + + - - + + - - + - - + - - - - - - + + - - + + + + + - - + - - - - - - + + - - + + + + - - + + - - + - - + + - - + - + - - + + - - + + - - + - - - - - + + - - + + + + - - + - - + - + - - + + - - + - + - - + - - + - - + - + + - - + - - + + - - + - - + - + + - - + - - + - - + - - + @@ -11609,377 +10351,340 @@ - + - - + + - - + + - - + - + + + + - - + - - - - - - + - - - - - + + - - + + + + + - - + - - - + + - + + - - - - + + - - - + + + - + - + - + + - - - - + + + - + + - - - - - - + + - - + + + + + - - + + - - - - - - + - - + + + + + + - - + + - - + - - + - - - - - - + - - + + + + - - + + + + + + - - + + - - + + - - - - + + + - + - - - - - - + - - + + + + + - - - - + + - - - + + + - + + - - - - - - - - + + + - - - + + + - + - - + - - + + - - - - - - + - - - - + + + - + - - + + + + + - - + + - - + - - + + - - + - + + - - + - - + + - - + - - - + + + - + - - - - + + - - - + + - + - + - - + + - - + - + - - - - - - + - + + + - + - - - - - + - - + + + + + + - - + - - + - + + - - + - - + - - + - - + @@ -11987,377 +10692,340 @@ - + - - + + - - + + - - + - + - - + - - + - - + - + + - - + - - + + - - + - - - - - + + - - - - - - + - + + + + + + + - + - + - + + - - + + + + + + - - + + - - + + - - + - - - - - - + + - - + - - + + - - + + - - + + - - + - - + - - + - - + - - + - - - - + + + - - - + + + - + + - - - - - - - - + + + - + + - - + + + + - - + - - + + - - - - - - + - - + + - - - - + + + - + + - - + + + + + - - + + - - + - - + - - + + - - - - - - + - - - - + + + - + + - - + + + + - - + + - - + - - - - - + + - - + + + + + - - + - + + - - + - - + - - + - - + - + - - + + - - + - + + + + - - + - - - - - - + - + + - - + - - + + - - + - - + - + + + + + - - + - - + - - - - - - + @@ -12365,377 +11033,340 @@ - + - - + + - - + + - - + - - - - - + - - + - + + + - + - - - - - + - - + + + + + + - - + - - - + + + - + - - - - + + + - - - + + - + - + - + + - - - - - - + + - - + + - - + - - + + - - + + + + + + - - + - - - - - - + + - - - - + + + + + + + - + - - + - - + - - + - - + - - + + - - - - + + + - + + - - - - + + + - + - - + + - - + - - - - - - + - - - - - - - - + + + - + + - - + + - - + + - - + + + + + + + + - - + - - + + - - + - - + + - - - - - - + + - - - - + + - + - - + + + + + + - - + - - + - + + - - + - - + + - - + - - - - - - - - - + + - - + + + + - + + + - + - + - - + + - - + - - - - - + - - + + + + - - + - + + - - + - - + + - - + - - + - - - - - - - - - + - - + - + + + + + + + - + @@ -12743,377 +11374,340 @@ - + - - + + - - + + - - + - + - - + - - + - - + - + + - - + - - + + - - + - + + - - + - - + + - - + - - + - + - + + - - + + + + + - - + + - - + + - - + + - - - - - - + + - - + + + + + - - + + - - - - - - + + - - + - - + - - - - - - + - - - - - - - - + + - - - + + - + + - - + + + + + + - - - - + + + - + + - - - - + + - - - + + - + - - - - + + + - - - + + + - + + - - + + + + + + - - + - - + - - + - - + + - - - - - - + + - - - - + + - + + - - - - + + - + + - - + + + + + - - + - - + - + - - + + - - + + - - + - - - + + + - + - - - - + + - - - + + - + - + - - + + - - + - + - - + - - + - - + - + + - - + - - + + - - + - - + - - - - - - - - - + + - - + - + + + + + + - + @@ -13121,377 +11715,340 @@ - + - - + + - - + + - - + - - - + + - + - - - - + + - + - - - - - + + - - + + + + + - - + - - - - - - - - - + + - - + - + + + + + + + - + - + - + + - - + + + + + - - + + - - + + - - + + - - - - - - + + - - + - - + + - - + + - - + + - - + - - + - - + - - + - - + - - + + - - + + - - + + - - + + - - + + - - + - - + - - + - - + + - - + + - - + + - - + - - - - - - + + - - - - + + + - - - + + - + + - - - - + + - + - - - - + + + - + - - - - + + + - + - - + + + + + - - + + - - + - + + - - + - - + + - - + - - - - - + + - - + + + + - - - - + + - + - + - - + + - - + - - - + + - + - - - - + + - + - + + - - + - - + + - - + - - + - - - + + - + - - - - - - + - + + + + - + @@ -13499,800 +12056,703 @@ - + - - + + - - + + - - + - + - - + - - + - - + - + + - - + - - + + - - + - - - - - - - + + + - + - - - - + + + + + + - + - + - + + - - + + + + + - - + + - - + + - - + + - - - - - - - - + + + - + - - - - - - - - + + + - + - - + + + + - - + + - - - - + + - + - - + - - - - + + - + - - + - - + - - - - - - + + - - + + - - + + - - - - + + + - + - - + + + + + + - - + + + + + - - - - + + + - + + - - + + - - - - + + + - + - - - - + + - + - - - - - - + + - - - - - - + + - - - - + + - + + - - + + + + + - - + - - + + - - + - - - - - - + - - + + + + + - + - - + - - + - - + - + - - - - + + - + - - + - + - + - - - - - - - - - + - - + - - + - - + - - + - - + - - + - - + - - + - + - - + - + - - + - + - - + - + - - + - + + - - + - - + + - - + - - + - + - - + - - + - + - - + + + + + + + - - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - - + - + - - + - - + - - + - - + - - + - + - - + - + - - + - + - - + - + - - + - - + - - + - - + - - + - - + - + - - + + - - + + - - + - + + - - + - - + - - + - - + - + - - + + - - + - + + + + - - + - - - - - - + - - - - - + + - - + + + + + - - + - - + - - - - - + - - + - - + + + + + - - + - + - - + + - - + - - + - + - - + - - + - - + - - - - - + + - - + + + + + - - + - - - + + + - + - - - - - - + - + + + + @@ -14300,492 +12760,430 @@ - + - + - - + + + + + + + - - + + + + - - + - + - - + - - + - - - - - - + - - + - + - - + - + - - + - + - - + - - + - + - - + - + - - + + - + - - + + - + - - + - + - - + - + - - + - - + - + - - + - - + - + - - + - + - - + - - + - + - - + - + - - + - - + - - - - - - - - - + - - + - - + - - + - - + - - + - - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - - + - - - - - + - - + + + + + + - - + - + + + + + - - + - - + - - - - - - + - + - - + + - - + - - - + + - + - - - - + + - + - - - - - + - - + + + + + + - - + - - + - - - - - - - + + + - + - - - - + + + + + - + - + - - + + - - + - - + - - - - - + - - + - + + + - + - - - - - + - - + + + + + + - - + - - - - - + + - - + + + + + - - - - + + @@ -14793,367 +13191,345 @@ - + - + + - - + - + + - - + - + + - - + - - + - + + - - + + - - + - + + - - + - + + - - + + - - + + + + + + + + + - - + + - - - - - - - - - - + - - + + - + + - - + - - + - + - - + - - + - - + - + - - + - + - - + - + - - + - + - - + - - - - - - - - - + + - - + + - - + + - - + - - + + - + + - - + + + + + + + + - - + - - + - - + - + - - + + - + - - + + - + - - + + - + - - + + - + + - - + - - + - + - - + + - + - - + - + - - + + - + - - + + - - + - - + + - + - - + - + - - + + - - + - + - - + - - + - @@ -15161,15 +13537,13 @@ - + - + - - + - @@ -15177,194 +13551,174 @@ - + - + + - - + - - + + - - + - + + + + + - - + - - + - - - - - - + - + - - + + - - + - + + + + - - + - - - - - - + - - - - - + - - + + + + + + - - + - - + - + + - - + - - + - - + - - + - + - - + + - - + + - - + - + - - + - - + - - + - - - - - + - - + + + + + + - - + - - - - - + - - + + + + + + - - + - @@ -15372,205 +13726,192 @@ - + - + + - - - - - - + + - - + - - - - + + + - + + - - + + + + + + - - + - - + - + - - + + - + - - + + - - + - - + - + - - + - + - - + - + - - + + - + - - + - - + - - + - - + + - + + - - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + + - - + - - + + - - + - + - - + - - + - @@ -15578,15 +13919,13 @@ - + - + - - + - @@ -15594,95 +13933,86 @@ - + - + - - + - + - + - - - + + - - - + + - + - + - - - + + - - - + + - + + - + - - - + + - - - + + - + + - + - - - + + - - - + + - + - + - + - - + - @@ -15690,15 +14020,13 @@ - + - + - - + - @@ -15706,31 +14034,28 @@ - + - + - - + - + - + - + - - + - @@ -15738,47 +14063,28 @@ - + - + - - + - + - - - - - - - - - - - - - - - - - + - + - - + - @@ -15786,31 +14092,27 @@ - + - + - - + - - + - + - + - - + - @@ -15818,214 +14120,205 @@ - + + + + + + + + + + + + + + + - + - - - - + + - + - - + - + - - - - - + + - - - - + + + + + + - + - + + - - - - - - + - - + + + + - - + - + - - + + - - + - + - - - - - - + - + + + - + - - - - - + - - + + + + + + - - + - - + - + + - - + - - + - - + - - + - + - - + + - - + + - - + - - - - - + - - + + + + - - + - + - - + + - - + + - - + - - - - - + + - - + - - + + - + + + @@ -16033,341 +14326,321 @@ - + - + + - - + - - + + - - + + - - + + - - + + - - + - - + - - + + - + - - + + - + - - + + - - + - - + - + - - + - + - - + - + - - + - + - - + - - + - - + + - + - - + + - + - - + + - + + - - + - - + + - + - - + - + - - + + - + - - + - + - - + - + - - + + - + + - - + - - + + - + - - + + - + + - - + + - - + - - + + - + - - + - + - - + + - - + - - + + - + - - + - + - - + - + - - + + - + + - - + - - + - + - - + - - + - @@ -16376,222 +14649,198 @@ - + - + - - - - + + - + - - + - + - + - - + + - - + + - - + - + + - - + - - - - - - + - + + + - + - + - - + + - - + - + - - + - - + - - + - - - - - + + - - + + + + + - - + - - + - - - - - - - + + + - + - - - - + + + + + - + - + - - + + - - + - - + - + + + + - - + - - - - - - + - - - - - + - - + + + + + + - - + - - - - - - - + + + - + - - - - + + + + + + @@ -16599,66 +14848,58 @@ - + - + - - + + - - + - - + - - + - - + - - + - + - - + - - + - @@ -16666,69 +14907,61 @@ - + - + - - + + - - + - + + - - + - - + - - + - - + - + - - + + - - + - + - - + - - + - @@ -16736,310 +14969,290 @@ - + - + + - - + + + + + + + + + - - - - - - + + - - - - - - + + - - + - - + + - + - - + - + - - + + - + - - + + - - + - - + - + - - + - - + - + - - + - + - - + + - + - - + - - + + - - + + - - + + - - + - - + + - + - - + + - + + - - + - - - - - - - - - + - - + - - + + - + + - - + - - + + - + - - + + - - + - - + + - + - - + + - + + - - + - - + - + - - + - - + + - + - - + + + + + + + + + - - + - - + - - + + - + - - + - + - + - - + - - + - @@ -17047,214 +15260,191 @@ - + - + - - - - + + - + - - + - + - + - - + + - - + + - - + - - - + + - + - - - - + + - - - + + + - + - + - - + + - - + - - - + + - + - - - - + + - + - + - - + + - - + + - - + - - + - - - - - + + - - + + + + - - + - - + - + - - + + - - + + - - + - + - - + - - + - - + - + - - + + - - + + - - + - - - + + - - - + + + - + + - - - - + + @@ -17262,341 +15452,321 @@ - + - + + - - + + + + + + + + + - - - - - - + + - - + + - - - - - - + + - - + + - - + - - + - - + + - - + - - + - + - - + - - + - + - - + - + - - + - - + - - + + - + - - + + - + - - + + - + - - + + - + + - - + - - + - - + - + - - + + - + + - - + + - - + - - + + - + - - + - + + - - + - - + + - + + - - + - - + + - + - - + - + - - + - + - - + + - + - - + + - + - - + - + - - + - + - - + + - + - - + + - - + - + - - + - - + - @@ -17605,19 +15775,16 @@ - + - + - - + - - + - @@ -17626,201 +15793,181 @@ - + - - - - - + - - + + + + + + - - + - - - - - - - - - + + - - + - + + + + + + - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + + - - + - - + - - - - - + + - - + - - + + + + - - + - + - - + + - - + + - - + - + - - + - - + - - + - + - - + + - - + + - - + - - - - - + + - - + + + + + - - - - + + @@ -17828,7801 +15975,7131 @@ - + - + + + + + + + + + + - - + + - - + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + + - - + + - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + + - - + + - - + + - - + + - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + - - - - - - + + - - + + + + + + - - + + - - - - - - - - + + + - + + - - - - + + + + + + + - + - - - - - + + - - + + + + + - - + + - - + - + - - + - + - - + + - - + + - - + - - + - + - - + - + + - - + + - - + + - - + + - - + - + - + - - + - + - + + - - + - + - - + + - - + + - - + - - + - + - - + + - - + - + - + - - + - + - + + - - + - + - + + + + + + + + + - - + + - - + - + - + - + - + + + + + + + - + - - + + - - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + - + - + + + + - - + - - + - - + - - - - - - - - - - + - - + - + + + - + - - + - + - + - + - + - - - - - - - - + - + - + - + - + - + - - - + + + - - - + + + - + + - - - - + + + - + + - - + + - - + - - + + - - - - - - + + - + + + + - + - - + + - + - + - + - + - + - + + + + + + + - + - + + + + + + + + + + + + + + + + + - + - + - - - - - - - + + - + - - + - - + - - + - - - - + + - + + + + - - + - - + + + + + + + + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + - + - + - + - + - - - - - - - + + + - + + - - + + - - - - + + - - - + + + + + + + - + + - - + + - - - - - - + + - + + + + - + - - + + - + - + - + + + + + + + - + - + - + - + - + - + - - - + + + - + + + + + + - - - - + + + - + + - - + + - - - - + + + - - - + + - + + - - - - - - - - + + + - + - - + + - + - + - + - - + + - - + - + - + - + - + - - - + + - - - + + - - - + + - + - - + - - - - + + - - - + + - - - + + - + - - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - - + + + - + + - - - - - - + - - + + - - - - - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - - - - - - - - - - - - - - + - + - - + + - - - - - - - - - - - - - - - - - + - - - - - - - - - + - + - - - - - - - - - - - - - - - - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - + - - + - - + - - + - - + - + + + + + + + + + - + - - + - + - + + + + + + + - + - + - + - + - - - - - - - - - + - + - + - - - - - - - - + - + - + - + + - - - - - - - - - - + - + - - - + + - + - - - - + + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - + - - + - - - - + + - - - + + - + - - + - - + - - - - + + - + - - + - - - - + + - - - + + - + - - + - - - - + + - + - + - + + + + - - + - - + + + + + + + + + + + + + - - + - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + - + - + - + + - - + + - - + + - - + + - - + - - + + - - + + - - + + - - + + - - + + - - + + - - + - + - + - + - + - - - - - - - - + - + - + + + + + + + + + - + - + - + - - - - - + - - + - - + - - - - + + - + - - + - - + + + + - - + - - - - - - - - - - + - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - - - - - - - + - - - - + + - - - + + - + - - + - - - - + + - + - - + - - + - - - - + + - + - - + - - - - + + + + + - + - - + - + + + - + - + - + + + + - - + - - - - + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - - - + + + - + - + - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - - - - - - - - + - + - + - + - + - + - + - - - - - - - - - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - + - + - - + - + - + - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + - + - + - - + - - + - - + - - + - - + - - + - - - - + + - + - - - - + + - + - - - - + + - + - - + - - - - + + - - - + + - + - - + - - + - - - - + + - + - - + - - - - + + - - - + + - + - - + - - + - - + - - + - - + - + - - - - - - - - + - + - + + + + + + + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - - - - - - - - + + + + + + + - + - + - + + - - + - + - + + - - + - + - + - + - - - - - - - - - - - - - - - + + + + + - + - + - + - + + - - + - + - + - - + - - + - - + - + - + - - + - - + - - + - - + - - + - - - - + + - - - + + - + - - + - - - - + + - + - - + - - - - + + - - - + + - - - + + - + - - + - - - - + + - + - - + - - + - - + - - + - - + - - + - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + - + - + - + + - - + - + - + + - - + - + - + + - - + - + - + - + + - - + - + + + + + + + + + + - + - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + - - + - - - - - - + - - + - - + - - + - - + - - + - - - - - - - - - - - + - - + - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - + + + - + + - - - - - - + + - - + + + + + + + + + - - + + - - + + - - + + - - + + - - - - - - + + - - + - - + - + - + - + + - - - - - - - - + - + - + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - + - + - + + - - - - - - - - + - + - + + - - - - - - - - + + + + + + + + - + - + + + + + + + + + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + + - - + - + - + + - - + - + - + - + + - - + - + - + + - - + - + - + + - - + - + - + + - - - - - - - - - - - + - + + + + + + + + - + - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - + - - + - - - - - - - - - + + + + + + + + - + - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - + - - + - + + + + + + + + - + - - + - + + + + + + + + - + - + - - - - - - - - + - + - + - + - + - + - + - - + + - + - - + + - + - + - + + + + + + + - + - - + + - - + - + - - - - - - - - + - + - + - - - + + - - - + + - + - - + - - + - - - - + + - - - + + - + - - + - - + - + - + + + + + + + - + - + - + - + - - - - - - - - - + + - - + + - - + + + + + - - + + - - - - + + + - - - + + + - + + - - - - + + + + + + + - + - - + + + + + + + + + - + - - - + + + - + + - - - - + + + - + + - - + + + + + + - - + + - - + - - - - - - - - + + + - - - + + + - + - - + - + - + - + - - + + - - + - + - + - - - - - - + - - - - + + - + - - + - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - + - - + - - - - - - - - - + - + - + - + - + - + + + + + - - + + - - + + - - + + - - + + - - + + - - - - + + + - - - + + + - + + - - - - - - + + - - - - - - - - - - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - - - - - + - - + - - + + + + + + + - - + - - + - - + - - - - - - + - - + - + - + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + + + + + + + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - + + + - - - + + + - - - + + + - - - + + + + + + + - + - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + - + + - - + + + + + + + + + - - + + - - + - + + + + + + + + + + + + + + + + + - + - + - + + + + - - + - - - - - - + - - + - - - - + + - + - - - - + + - + - - + - + - + - + - + - + - + - + - + + - - + - + - + + - - + - + - + - - - + + - + - - - - - - - - - - - - - - - - - + - - + - - + - - - - - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - + - - + - - + + + + + + + + + + + + + + + + + + - - + - - + + - - + - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + + + + + + + + + + - - + + - - + - - + + - - + + - - - - + + + - + + - - - - - - + + - - - - - - + + - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + - + - + + + + + + + + + - + - + - + - - - + + - + - - - - + + - - - + + - - - + + - - - + + - - - + + - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - - + + - - + - + - + - + - + - - - + + - + + - - - - - - + + - - - - - - + + - - + + - - + + + + + + - - + + - - - - + + + + + + + - + + - - + - + - + - + - - + + + - - + - + - + - + - + - + - + - + + + + + + + + + - + - + - + - + + - - + - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - + - + - - + + - - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - + + - + - - + - - + - - + - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + + + + + + + + - + - + - + - - - + + + - - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + - + - + - - + + - + - + - + - - - - - - - - - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - + - + - - + - + + + + + + + + + + + + + + + + + + + - + - + - + - + - - - + + + - - - + + + + + + + - + + + + + - - + + - - + + - - - - - - - - - - - - + + + - - - + + + - - - + + + - + + - - + - + - + - - + + - - + - + - - - - - + - - + - - + - - + - - + - - - - + + - + - + + + - + - - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - - - - - - - - - + - + - + - - - + + + - + + - - - - - - + + - - + - - + + - - + + - - - - + + + - + + - - - - + + + + + + + - + + - - + - + + + + + + + + + + + + + + + + + - + - + - - - + + + + + - + - - - - + + - + - - - - - - - - + + - + - - - - + + - + - - + + + + + + + + + + + + + + + + + - + - + - + - + - - - - - - - + + + - - - + + + - - - + + + - + + - - + + + + + + - - - - + + + - - - + + - - - + + + - - - + + + - + + - - + - + - - - - - - - - - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + - - + - - + + + + + + + - - + - - + - - + - - - - - - + + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - + + + + + + + + + + - + - + + - - + + - - + + - - + + - - + - - + + - - + + - - + + + + + + - - + + - - - - - - + + - - + - + - - - - - - - - - + - - + + + + - - + - - + - - + - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + - + - - + - + + + + + + + + + + - + - + - + - + - + - + - + + + + + + + + - + - + - + - + - - - + + + - + + - - - - + + + - - - + + - + + - - + + - - + + - - + + - - + + - - - - + + + - + - - - - - - - - - - - - - - - - - - - + + - + - + - + - - - - - - + - - + - - + - - + - - + + + + - - + - - + - - + - + + + + + + + + + + + + + + + + + + + - + - + - + - + + + + + + - - - - + + + - + + - - - - + + + - + + - - + + - - + + - - + - - + + - - - - - - + - - + + - - - - - - - - - - + - + - + - - + + - - + - + - + - + - - + - - + - - + - - + - - + - - - - - - + - + + + - + - - + - + - + - + - + - - - - - - - - - + - + - + - + - + - + - + - - + - - + - - + + + + - - + - - + - - + - - - - - - + - - + - + - + - + + + + + + + + - + - + - + + - - + - - + + - - + + + + + + + + + + - - - - + + + - + + - - - - - - + + - - + + - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - + - + - + - - - + + + - + + - - - - - - - - - - + - - + + - - + + - - + + - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + - + - + - - + + - + - + - + - + - + - + - + - + - + + + + - - + - - + - - - - + + - + - - + - - + - - - - - - + - - + - + - + + + + + + + + - + - + - + - + - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - + - - + - - - - - - - - - + - + - + - + - + - - - - + + - + - - - - - - - - + + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - + - - + - - + - - + - - + - - + + + + - - + + + + - - + - - + - - + - - + - - - - - - - - + + - + - + + + + + + + + + - + - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + - - + - + - + - + - + + + + + + - + - + - + + - - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + - + - - + - + - + - - - + + - + - - + - - - - + + - - - + + - + - - + - - + - - + - - + - - - - - - + - - - - - - - - + + - - - + + - + - - + - - + - - - - + + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + + + + + + + - - + - + - + - + + - - - - - - - - - - + - + - + - + - + + + + + + - + - + - + - + + - - - - - - - - - - + - + - + + - - + - + - + + - - + - + - + - - - - - - - - - + - - + - - + - - + - - + - - + - - - - + + - - - + + - + - - + - - - - + + - + - - + - - + + + + + + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - - - + + - + - + - + - + - + + + + + + - + - + - + - + + - - + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - + - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - + + - - - + + - - - + + - + - + - + - - - - - - - + + - - - + + - + - - + + + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + + + + - + - - - - + + - + + + + + + + + + + + + + - - + - + - + - + + - - - - - - - - - - + - + - + - + - - + - - + - - + - - + - - + - - - - + + + + + - + - - + - - + - - - - + + - + - - + - - - - + + - - - + + - + - - + - - + - - + - - + - - + - - + - - - - - - - - + + - + - - + - - - - + + - + - - - - + + - + - + - + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - + - + + + + + + + + - + - + + + + + + + + - + - + - + - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - + - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + + + + - + - - - - + - + - + - + - + + + + - + @@ -25725,6 +23202,14 @@ + + + + + + + + @@ -25734,16 +23219,8 @@ - - - - - - - - @@ -25820,19 +23297,19 @@ - + - + - + - + - + - + @@ -25846,27 +23323,27 @@ - + - - + + + + + + - + - - - - - - + + + - + - - - + + @@ -25939,8 +23416,8 @@ - - + + @@ -25956,8 +23433,8 @@ - - + + @@ -25973,14 +23450,14 @@ - - + + - - + + @@ -25996,14 +23473,14 @@ - - + + - - + + @@ -26019,14 +23496,14 @@ - - + + - - + + @@ -26042,37 +23519,37 @@ - - + + - - + + - + - - + + + + + - + - - - - - + + - - + + @@ -26091,8 +23568,8 @@ - - + + @@ -26127,8 +23604,8 @@ - - + + @@ -26156,7 +23633,7 @@ - + @@ -26165,142 +23642,162 @@ - + - - + - - - - + - + - - - - + + + + - + + + + + + + + + - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - + + - + - - - + + + - + - - + + - + - + - - - + + + @@ -26310,85 +23807,77 @@ - - - - - - - - - - + + + + - - - - - - - - + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - + - - - - - - - + + - + + + + + + - - + + + + + + + - + @@ -26396,28 +23885,23 @@ - - - - - - + - - - - - - - + + + + + + + - - - - + + + + @@ -26427,71 +23911,77 @@ - + - + - - + - - - - + - + - + + - + + + + - - - + + + - - - + + + - - + + - - - - + + + + - + - - + + + + + + + - + - + + - + - - - + + + @@ -26504,58 +23994,52 @@ - + - + - - - - - - - + - - - - + + + + - + - - - + + + - - - + + + - - + + - + - - - + + + @@ -26563,7 +24047,7 @@ - + @@ -26573,42 +24057,42 @@ - - - - + + + + - + - - + + - - - + + + - - - + + + - + - - - + + + @@ -26616,7 +24100,7 @@ - + @@ -26626,39 +24110,44 @@ - - - - + + + + + + + + + - + - - - + + + - - - + + + - - - + + + - + @@ -26666,23 +24155,31 @@ - + - + + - + - - + + + + - + + + + + + + - - - - + + + @@ -26690,79 +24187,66 @@ - + - - + - + - - - + + + - - - + + + - - - - - - - - - - - - - - - + + + - - - - + + + + - - - + + + - - - + + + - - + + - + - - - + + + @@ -26770,35 +24254,41 @@ - + - + - + - + - + - - - - + + + + + + + + + + - + - - - + + + @@ -26806,7 +24296,7 @@ - + @@ -26816,49 +24306,51 @@ - - - - - - - + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - + + + + + + - - + + + + + @@ -26872,104 +24364,96 @@ - - - - - - + - - - - - + + - - - - + + + + - + - - + + - + - + - - + + - - - + + + - - - - - - + + + + + + - + - - - - - - + + - + - - + + + + + + - - - - - + + + + + - + @@ -26977,7 +24461,7 @@ - + @@ -26985,1192 +24469,1192 @@ - + - + - + - + - + - - + + - - + + - - - + + + - + - - - + + - + - - + + + - - - + + + - + - + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - - + + - + - - - + + + + + + - + - - - - - - + + + - + - - - - - - - + + - - - - - - - + + + + + + + - + - - + + + + + + + - + - + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - - + + - - + + - + - + - + - + - + - + - + - + - - - + + + - + - - + - - - - - - + - + - + + - - - + + + - + - - - + + + - + - + - + - + - + - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - - - - - + + + + + - - - - - + + + + + - - + + - + - + - - + + - - + + - + - + - - + + + + + + + + + + + + + + + + + + - - + + - - + + - + - - - - + - + - - - - + + + + + + + - - - - - - - + + + + + + + - - - + + + - + - - - - - - - - - - - - - - + - - - + + + - - - + + + - - - - - - - - - - - - - + + + - + - - + + - + - - + + + + + + + + + + + + + + - - - - - - + + + + + + - + - - - - - - + + - + - - - - - - - + + + + + + - + - - + + + + + + + - - - - - - - - - - + + + + + - - - - - + + + + + - - + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + - + - + + + + + + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + - + - + + + + + + @@ -28180,429 +25664,424 @@ - + - + - - - - - - + - + - - + + + + - + - - + + + - + - - + + + + + + + - + - - + - - + + + + + + + - + - - - - + + + + + + - + - - - + + + + + + + - + - + - - + + - - + + - + - - - - - - + - + - - - - - - + + - - + - - - - - - - + + - + - - - - - - - + + - + + + + + + + + - + - + - + - + - + - - + + + - + + + + + + + + + + + - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - - - + + + + - + - - - - + - + - - - - + + + + - + - - + - + - - - + + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - + - - - + + + - + - - - + + + + - + - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + + + - - - - - + + + + + - + - + + + @@ -28610,851 +26089,856 @@ + + + + + - + - + - - - - - - - - - - - + + + + + + + + + + + - + - + - + - - - + + + - + - - - + - + - + - + - + + + - - + + - - - + + + - + - - - - + + + + - - + + - + - + - - - + + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - - - + + + + + - - + + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - - - - + - + - - + + - + - + - + - + + - - + + - - + + - + + + + + + - + - + - - + + - + - - + + - + - + - + - - + - - + + - - + + - + - - + + - + - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + @@ -29610,10 +27094,10 @@ - - - - + + + + @@ -29621,26 +27105,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -29676,19 +27160,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -29737,844 +27221,849 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + \ No newline at end of file diff --git a/src/Data/Templates/Human Standard.pkml b/src/Data/Templates/Human Standard.pkml index 519d2b3fb..ec35a5436 100644 --- a/src/Data/Templates/Human Standard.pkml +++ b/src/Data/Templates/Human Standard.pkml @@ -1,351 +1,303 @@  - - - + + + - + - - + - - + - - + - - + - - + - - + + - - + - - + - - + - - + - - + - + + - - + - - + + - - + + - - + - - + - - + - - + - - + + - - + - - - - - - - - - - + + - - + + - - + + - - + + + + + - - + + + + + + - - + + - - + + - - + - - - - + + + - + + - - + + - - - - + + + - + - - - - + + + - - - + + - - - + + - + - - - - + + - + + - - - - - - + + - - + + + + - - + - - - - - - + - - + + + + + - - + + - - - - - - + - - + + + + - - + - - + - - + + - - + + - - + + - - + + - - + + - - + + - - + - + - - + - - + - + - - + - - + - - + - + - - + - - + - - - + + - + - - + - - + - - + - - + - + - - + - - + - @@ -353,65 +305,57 @@ - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - - - - - + - - + + + + - @@ -419,59 +363,52 @@ - + - + - - + - - + - + - - + + - + - - + - - + - + - - + - - + - @@ -479,65 +416,57 @@ - + - + - - + + - - + - - - + + - + - - - - + + - + - + - - + + - - + - - - - - + - - + + + + - @@ -545,344 +474,316 @@ - + - + - - + - - + - - + - - + - - + - + - + - - + + - - + - - + + - + - - + + - + - - + - + - - + - - + - + - - + - + - - + - - + + - + - - + - + - - + - - + - - + + - + - - + + - + - - + + - + + - - + - - + - + - - + + - + + - - + - - + + - + - - + - + - - + - + + - - + - - + + - + + - - + + - - + + - - + - - + + - + - - + - + + - - + - - + - - + - + - - + + - + - - + - + - - + + - + - - + + - + - - + - + - + - - - - + + - + - - + - + - + - - + - - + - @@ -890,139 +791,122 @@ - + - + - - + + - - + - - - - - + - - + + + + - - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - - + - - - - - + - - + - + + + - + - + - - + + - - + + - - + - - - + + - + - - - - + + @@ -1030,283 +914,263 @@ - + - + - - + - - + - + - - + + - + + - - + - - + + - - + - - + - - + - + - - + - + - - + - - + - - + - - + + - + - - + + - + - - + + - + - - + + - + - - + - + - - + + - + + - - + + - - + - - + - - + + - + - - + + - + - - + - + - - + + - + - - + + - + + - - + + - - + - - + - - + - + - - + + - + - - + - + - - + + - + - - + - + - - + + - + + - - + - - + - + - - + - - + - @@ -1314,159 +1178,139 @@ - + - + - - - - + + - + - - + - + - + - - + + - - + - + + + + - - + - - - - - - + - + - - + + - - + - + - - - - - - + - + + + - + - + - - + + - - + - - + - - - - - + - - + + + + - - + - + - - + + - - + + - - + - + - - + - - + - @@ -1474,199 +1318,185 @@ - + - + - - + - - + - + + - - + - - + + - + - - + + - - + - - + - - + - + - - + + - + - - + - + - - + - + - - + - - + - - + + - + - - + + - + - - + + - + - - + + - + + - - + + - - + - - + + - + - - + + - + + - - + - - + - - + - + - - + + - + - + - - + - - + - @@ -1674,15 +1504,13 @@ - + - + - - + - @@ -1690,31 +1518,28 @@ - + - + - - + - + - + - + - - + - @@ -1722,15 +1547,13 @@ - + - + - - + - @@ -1738,15 +1561,28 @@ - + - + + + + + + + + + + + + + + + + - - + - @@ -1754,31 +1590,27 @@ - + - - - + + - - - + + - + - + - + - - + - @@ -1786,31 +1618,27 @@ - + - + - - + - - + - + - + - - + - @@ -1818,47 +1646,41 @@ - + - + - - + - - + - + - + - - + - - + - + - + - - + - @@ -1866,35 +1688,16 @@ - - - - - - - - - - - - - - - - - + - + - - + - - + - @@ -1902,139 +1705,122 @@ - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - - - - - + - - + + + + - - + - + - - + + - - + - - + - + - - + - - + - - + - + - - + + - - + + - - + - + - - + - - + - @@ -2042,283 +1828,259 @@ - + - + - - + - - + - + - - + + - + + - - + - - + + - - + - - + - + - - + - + - - + - + - - + - + - - + - - - - - - - - - + + - - + + - - + + - - + - - + + - + - - + + + + + + + + + - - + - - + + - - + - - + - - + - + - - + + - + - - + - + - - + + - + + - - + - - + - + - - + - + - - + - + - - + - + - - + + - - + - - + - + - - + + - + - - + + - - + - + - - + - - + - @@ -2326,159 +2088,139 @@ - + - + - - - - + + - + - - + - + - + - - + + - - + - + + + + - - + - - - - - - + - + - - + + - - + - + + + + - - + - - - - - - + - + - - + + - - + - - + - + - - + - - + - - + - + - - + + - - + + - - + - + + + + - - + - - - - - @@ -2486,283 +2228,263 @@ - + - + - - + + - - + + - - + - - + - - + + - - + - - + - + - - + - + - - + - + - - + - + - - + - - + - - + + - + - - + + - + + - - + - - + + - + - - + + - - + + - - + - - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + - + + - - + - - + + - - + + - - + - - + - - + + - + - - + - + - - + - + - - + + - + - - + + - + - - + - + - + - - + - - + - @@ -2770,159 +2492,139 @@ - + - + - - - - + + - + - - + - + - + - - + + - - + - + + + + - - + - - - - - - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - - + - - - + + - + - - - - + + - + - + - - + + - - + + - - + - + - - + - - + - @@ -2930,318 +2632,295 @@ - + - + - - + - - + + - - + + - - + - - + - - + - + - - + - + + - - + + - - + - - + - + - - + - + - - + - + - - + - + - - + - - + - - + + - - + + - - + - - + + - + - - + + - + - - + + - + - - + - + + - - + + - - + - - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - - + - - + + - - + - - + + - + - - + - + - - + + - + - - + - + - - + + - - + - - + - + - - + + - + + - - + - + - - + - - + - @@ -3249,143 +2928,130 @@ - + + + + + + + + + + + + + + + + - + - - + - - + - + - + - + - - - - + + - + + - + - + - - + - - + - + - + - + - - - - + + - - - - - - - - - + - - - - - - + + - + - + - - - - - - - - + + - + + - + - + - - - - + + - + + - + - + - - + - - + - @@ -3393,308 +3059,265 @@ - + - + - - + + - - + - - - - - + - - + - + + + - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - - + - + + + + - - + - - - - - - + - + - - + + - - + + - - + - - - - - + - - + + + + - - + - + - - + - + - - - + + - + - - - - + + - + - + - - + - - + - - + - + + + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - - - + - - + - + - - + - + - - + - + - - + + - + - - + - + - + - - + - @@ -3703,95 +3326,82 @@ - + - - - - - - - + + - - - + + - + - + - + - - - - + + - + - - + - + - + - - - - + + - + - - + - + - - - + + - - - + + + + + - + - + - + - - + - @@ -3800,287 +3410,245 @@ - + - - - - - + - - + + + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - - - + + + + + - + - - - - + + - + - + + + + + + + + + + + - - + - - + - - + - - + - - + - - + - - + - - - - - - - - - - + - - + - - + + + + - + - - + - - + + - - - - - - - - - - + - - + - + - - + - + - - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + + - + - + - - + - @@ -4089,291 +3657,248 @@ - + - - - + + - - - + + + + + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - - - + + - - - + + - - - + + - - - + + - + - - - - - - - - - - - + + - + - - + - + - - - - + + - + - - + - + - - + - - + - - - + + - + - - + - - - - - - + - + - - + - - - + + - + - - + + + + + + + + + + + + - + - - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + + - + - + - - + - @@ -4382,291 +3907,248 @@ - + - + - - + - - + - - + - - + - - - - - - + - - + - - - - + + - - - + + - + - - - - - - + - - + - - - - + + - + - - + - + + + + + + + + + - + - + + + + + + + + - - + - - + - - + - - - - - - - - - - + - - + + + + - + - - + + + + - - + - - + + - - + - - + - - + - - + - - + - - + - + - - + - + - - + - + - - + - + - - + - - + - - + - - + - - + - - - - - - - - - - + - - + - + - - + - + - - + + - + - + - - + - @@ -4675,291 +4157,248 @@ - + - + - - - - + + - - - + + - - - + + - + - - + - - + - - - - + + - - - + + - - - + + - + - - + - - + - - - - + + - - - + + - - - + + - + + + + - - + - - - - - + - - + - - - - - - - - - - - - - - + - - - + + - + - - + + - + - - + - - - - - - + - - - - + + - + - - + + + + + + + - + + + + - - - - - - + - - - + + - + - - + + + + - + - - + - - + - - + - - + - + - - + - - + - - + - - + - - + - - + + + + + + + + - - + - - + + - + - + - - + - @@ -4968,291 +4407,248 @@ - + - + - - - - + + - - - + + + + + - + - - + - - + - - + - - + - - - - + + - - - + + - + - - + - - + + + + - - - - + + - + - - - - - - - - + + - + - - - - - - - + + - + - - + - - - - + + + + + + - + - - - - + + - + - - + + - + - - + - - + - + - - - - - - + - - + + + + - + - - + - - + - - + - - + - - + - - + - + - - + - + - - + - - + - + - - + - + - - + - + - - + - - + - - + - + - - + - + - - + + - + - - + - + - - + - @@ -5261,291 +4657,248 @@ - + - + + + + - - + - - + - - - - + + - + - - - - + + - + - - + - - + - - + - - + - - + - - + - - - - + + - - - + + - - - + + - - - + + - + - + + + + - - - - - - + - - + - - + - - + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - - + - - + - - + - + - - + - + - - + - + - - + - + - - + + - + - + - - + - @@ -5554,291 +4907,248 @@ - + - - - + + + + + - + + + + - - + - - + - - + - - + - - - - + + - - - + + - - - + + - + - - + - - + - - - - - - - - + + - - - + + - - - + + - + - - + - + - - + + + + + + + + - - + - - + - - + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - - - - - - - + - - + - - + - + - - + - - + - + - - + + - + - - + - + - - + - + - - + - - + - + - - + - + - - + - - + - + - - + - + - - + - + - + - - + - @@ -5847,291 +5157,248 @@ - + - - - + + - - - + + - + - - - - + + - - - + + - - - + + - - - + + - + - - + - - + - - - - + + - - - + + + + + - + - - + - - + - - - - + + - - - + + - + - - - + + + + + + + + + + + + + - + + - - + - - + - - + - - + - - + - - - - - - - - + + - - - - - - - + + - + - - + - - + - - + - - - - + + - - - - - - - + + - + - - + - + - - + - + - - + - - + - + - - + - - + - - + - - + - + - - + - + - - + - - + - - + - - + + - + - + - - + - @@ -6140,291 +5407,248 @@ - + - - - + + - + - - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - + - - + - - + - - - - + + - - - + + + + + - + - - - - + + - - - + + - + - - + - + - - + + - + - - - - - - - - - - + - - + - - + - - + - - + - - + - - + - - + - - - - - - - - + + - + - - + - - + - - - - - - + - - + - + - - + - + - - + - + - - + - - + - + - - + - + - - + - - + + - - + - - + - - + - - + - - + + + + + + + + + + + + + + + - + - + - - + - @@ -6433,291 +5657,248 @@ - + - + + + + - - + + + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - - - - - + + - + - - - - + + - + - + + + + + + + + + + + + + + - - + - - + - - + - - + - - + - - + - - - - - - - - - - + + - + - - + - - + + + + - - + - - + - - + - - - - - - + - + - - + - + - - + - - + - - + - + - - + - - + - + - - + - - + - + - - + + - + - - - - - - - - - - + - - + - + - - + - + - + - - + - @@ -6726,291 +5907,248 @@ - + - - - + + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - + - - + - - + - + + + - + - + - - + - - + + - - + - - + - - + - - - - - - + - - - + + + + + + - + - - + + + + + + + - + - - + - - + - - + - - + - - - - - - - - - - + - - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - - + - + - - + - + - - + - + - - + + - + - + - - + - @@ -7019,413 +6157,377 @@ - + - - - + + - - - + + - - - + + - + - - + - - - - + + - - - + + - + + + + - - - - + + - - - + + - + - - + - - + - - + - - + - - + - - - - + + - + - + - - + - - + - + - - + - - + - + - - + + - + + - - + - - + + - - + - - + - + - - + - + - - + - + - - + - + - - + - - + + - - + + - - + - - + + - + - - + + - + - - + + - - + + - - + + - - + - - + - - + - + - - + + - + + - - + - - + + - + - - + + - + + - - + - - + + - + - - + - + - - + + - + - - + - + + - - + - - + + - - + - - + - - + + - - + - + - - + - - + - @@ -7434,19 +6536,16 @@ - + - + - - + - - + - @@ -7455,145 +6554,127 @@ - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - - + - + - - - - - - + - + + + - + - + - - + + - - + - - + - + + + + - - + - - - - - @@ -7601,377 +6682,352 @@ - + - + - - + - - + + - - + - - + - + - - + + - + - - + + - + - - + + - + - - + + - - + - - + - - + - - + - + - - + - + - - + - + - - + - - + - - + - + - - + - + - - + + - - + - - + + - + - - + + - + + - - + - - + + - + - - + - + + - - + - - + + - - + + - - + - - + + - + + - - + - - + - + + - - + + - - + - - + + - + - - + - + - - + + - + - - + - + - - + + - - + + - - + - - + - - + + - + - - + - + - + - - + - - + - @@ -7980,19 +7036,16 @@ - + - + - - + - - + - @@ -8001,428 +7054,377 @@ - + - + - - - - + + - + - - + - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - - + - + + + + - - + - - - - - - + - + - - + + - - + - - + - - - + + - + - - - - + + - + - + - + - - + + - - + + - - - - - - + - - + + + + + + - - + - - + - - - - - - + - - - - + + - - - + + - + + - - + + + + + + - - + + - - + + - - + - - + - - - - - - + - - - - + + + - + + - - + + - - + + + + + + - - + - - + - - - - - - + - - + + + + + + - - + - - + - - + + - - - - - - + + - - - - + + - + - - + + + + + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - + + + + - - + - - - - - - + - + - - + + - - + - - + - - - - - + - - + - + + + - + @@ -8430,300 +7432,266 @@ - + - - + + - - + + - - + - - - - - + - - + - + + + - + - + - + - - + + - - + + - - - - - - + - - + + + + + + - - + - - + - - + - - + - - + - - + + + + + + - - + + - - - - - - + + - - + - - + + - - + - - + + - - + - - - - + + - - - + + + - + + - - - - + + + - - - + + + - + - - - - - - + + - - + + + + - - + + - - + - - + + - - + - - + + - - - - - - + + - - + + + + - + - - + + - - + - - - - - + - - + - + + + - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - - + - + + + + - - + - - - - - - + @@ -8731,300 +7699,266 @@ - + - - + + - - + + - - + - + - - + - - + - - + - + - + - - + + - - + - - + + - - + + - - + + - - + - - + - - + - - + - - + - - - - + + + - + + - - - - - - + + - - - - + + + - + - - + + + + + - - - - - - + + - - - - + + - - - + + + - + + - - + + + + + - - - - + + + - + - - - - - - + - - - - + + + - + - - - - + + + - + - - + + + + + + - - + - - - - - - + + - - + + + + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - + - - - - - - + - + + + - + - + - - + + - - + - - + - + - - + - - + - - + @@ -9032,300 +7966,266 @@ - + - - + + - - + + - - + - + - - + - - + - - + - + - + - - + + - - + - - - - - - + + - - + + + + + + - - + - - + - - + - - + - - + - - - - - - - - + + + - + + - - - - + + + - - - + + + - + + - - - - + + - - - + + - + - - - - + + + - + + - - + + + + + - - - - + + + - + + - - + - - + - - + + - - + - - + + - - + + - - + - - + + - - + - - + - - + + - - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - - + - - - + + - + - - - - + + - + @@ -9333,300 +8233,266 @@ - + - - + + - - + + - - + - - - - - + - - + + + + - - + - + - + - - + + - - - - - - + + - - + + - - + + + + + - - + - - + - - - - - - + - - + + + + - - - - + + + - + + - - - - + + + - + + - - + - - + + - - + - - + + + + + - - - - + + + - - - + + - + + - - + + - - - - - - - - + + + - + - - - - - - + - - + + + + + - - + + - - + + - - + - - + + - - + - - - - - - + + - - + + + + - + - - + + - - + - - - - - + - - + + + + - - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - - + - + - - + - - + - - + @@ -9634,416 +8500,388 @@ - + - - + + - - + + - - + - + - - + - - + - - + - + - + - - + - + - - + - + - - + - + - - + + - + - - + - + + - - + + - - + - - + + - + - - + + - - + - - + - + - - + - - + - + - - + - + - - + - - + - - + - - + - - + + - - + - - + + - + + - - + - - + + - + - - + + - + - - + - + + - - + - - + - + - - + + - + + - - + - - + + - + - - + + - + - - + + - + - - + - + + - - + + - - + - - + - - + - + - - + + - + - - + + - - + - - + + - - + - - + - + - - + + - + - + - - + - @@ -10052,19 +8890,16 @@ - + - + - - + - - + - @@ -10073,19 +8908,16 @@ - + - + - - + - - + - @@ -10094,407 +8926,359 @@ - + - + - - + + - - + - - - + + - + - - - - + + - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - - + - + - - - - - - + - + + + - + - + - - + + - - + - - + - - - + + - + - - - - + + - + - + - + - - + + - - + - - + + - - + + - - + + - - + - - + - - + - - + - - + - - + + - - - - - - + + - - + + - - - - + + + - + - - - - + + + - - - + + - + - - + + + + + + - - + + - - + + - - + + - - + - - + - - - - - - + + - - + + + + + - - + - - - - - - + + - - + + + + - - + + - - + - - + + - - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - - + - + - - + - - + - - + @@ -10502,300 +9286,266 @@ - + - - + + - - + + - - + - + + + + - - + - - - - - - + - + - + - - + + - - - - - - + - - + + + + + + - - + + - - + - - + - - - - - - + - - + + + + - - + + + + + + - - + + - - + + - - - - + + + - + - - - - - - + - - + + + + + - - - - + + - - - + + + - + + - - - - - - - - + + + - - - + + + - + - - + - - + + - - - - - - + - - - - + + + - + - - + + + + + - - + + - - + - - + + - - + - + - - + + - - + - - - - - + - - + + + + - - + - + - - + + - - + - + - - - - - - + - + + + - + - + - - + + - - + - - + - + - - + - - + - - + @@ -10803,300 +9553,266 @@ - + - - + + - - + + - - + - + - - + - - + - - + - + - + - - + + - - + - - + + - - + + - - + + - - + - - + - - + - - + - - + - - - - + + + - - - + + + - + + - - - - - - - - + + + - + + - - + + + + - - + - - + + - - - - - - + - - + + - - - - + + + - + + - - + + + + + - - + + - - + - - + - - + + - - - - - - + - - - - + + + - + + - - + + + + - - + + - - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - + + + + - - + - - - - - - + - + - - + + - - + - - + - + + + + - - + - - - - - - + @@ -11104,300 +9820,266 @@ - + - - + + - - + + - - + - - - - - + - - + - + + + - + - + - + - - + + - - + - - - - - - + + - - + + + + + + - - + - - + - - + - - + - - + - - + + - - - - + + + - + + - - - - + + + - + - - + + - - + - - - - - - + - - - - + + + - - - - - + + - - + + - - + + - - + + + + + + + + - - + - - + + - - + - - + + - - - - - - + + - - - - + + - + - - + + + + + + - - + - - + - + - - + + - - + - + - - - - - - + - + + + - + - + - - + + - - + - - - - - + - - + + + + - - + - + - - + + - - + - - + - - - - - + - - + - + + + - + @@ -11405,300 +10087,266 @@ - + - - + + - - + + - - + - + - - + - - + - - + - + - + - - + + - - + + + + + - - + + - - - - - - + + - - + - - + - - - - - - + - - - - - - - - + + - - - + + - + + - - + + + + + + - - - - + + + - + + - - - - + + - - - + + - + - - - - + + + - - - + + + - + + - - + + + + + + - - + - - + - - + - - + + - - - - - - + + - - - - + + - + + - - - - + + - + + - - + + + + + - - + - - + - + - - + + - - + - - - - - + - - + + + + - - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - - + - + + + + - - + - - - - - - + @@ -11706,300 +10354,266 @@ - + - - + + - - + + - - + - - - + + - + - - - - + + - + - + - + - - + + - - + - - + + - - + + - - + + - - + - - + - - + - - + - - + - - + + - - + + - - + + - - + + - - + + - - + - - + - - + - - + + - - + + - - + + - - + - - - - - - + + - - - - + + + - - - + + - + + - - - - + + - + - - - - + + + - + - - - - + + + - + - - + + + + + - - + + - - + - + - - + + - - + - - - + + - + - - - - + + - + - + - - + + - - + - - - + + - + - - - - + + - + - + - - + + - - + - - + - - - - - + - - + + + + - - + @@ -12007,663 +10621,577 @@ - + - - + + - - + + - - + - + - - + - - + - - + - + - + - - - - + + + - + - - - - - - - - + + + - + - - + + + + - - + + - - - - + + - + - - + - - - - + + - + - - + - - + - - - - - - + + - - + + - - + + - - - - + + + - + - - + + + + + + - - + + + + + - - - - + + + - + + - - + + - - - - + + + - + - - - - + + - + - - - - - - + + - - - - - - + + - - - - + + - + + - - + + + + + - - + - - + + - - + - - - - - - + - - + + + + + - + - - + - - + - - + - + - - - - + + - + - - + - + - - - - - - - - + - - + - - + - - + - - + - + - - + - + - - + - + - - + - + - - + - + + - - + - - + + - - + - - + - + - - + - - + - + - - + + + + + + + - - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - - + - + - - + - - + - - + - - + - - + - + - - + - + - - + - + - - + - + - - + - - + - - + - - + - - + - - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - + + + + - - + - - - - - - + - + - - + + - - + - - + - + - - + - - + - - + - + - - + + - - + - - + - + - - + - - + - @@ -12671,416 +11199,362 @@ - + - + - - + - + - - + - + - - + - + - - + - + - - + - - + - + - - + - + - - + - + - - + - + + - - + + - - + - - + - - + - + - - + - + - - + - + - - + - + - - + - - + - + - - + - + - - + - - + - + - - + - + - - + - + - - + - + - - + - - + - - + - - + - - + - - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - + - - + - - + - + - - + + - - + - + + + + - - + - - - - - - + - + - - + + - - + - - - + + - + - - - - + + - + - + - - + + - - + - - + - - - + + - + - - - - + + - + - + - - + + - - + - - + - - - - - + - - + - + + + @@ -13088,336 +11562,314 @@ - + - + + - - + - + + - - + - + + - - + - - + - + + - - + + - - + - + - - + - - + + - + + - - + - - + - + - - + - - + - - + - + - - + - + - - + - + - - + - + - - + - - - - - - - - - + + - - + + - - + + - - + - - + + - + + - - + + + + + + + + - - + - - + - - + - + - - + + - + - - + + - + - - + + - + - - + + - + + - - + - - + - + - - + + - + - - + - + - - + + - + - - + + - - + - - + + - + - - + - + - - + + - - + - + - - + - - + - @@ -13425,15 +11877,13 @@ - + - + - - + - @@ -13441,139 +11891,122 @@ - + - + - - + + - - + - + + + + - - + - - - - - - + - + - - + + - - + - + + + + - - + - - - - - - + - + - - + + - - + - - + - + - - + - - + - - + - + - - + + - - + + - - + - + - - + - - + - @@ -13581,185 +12014,172 @@ - + - + - - + + - - + - - + - + - - + + - + - - + + - - + - - + - + - - + - + - - + - + - - + + - + - - + - - + - - + - - + + - + + - - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + + - - + - - + + - - + - + - - + - - + - @@ -13767,15 +12187,13 @@ - + - + - - + - @@ -13783,95 +12201,86 @@ - + - + - - + - + - + - - - + + - - - + + - + - + - - - + + - - - + + - + + - + - - - + + - - - + + - + + - + - - - + + - - - + + - + - + - + - - + - @@ -13879,15 +12288,13 @@ - + - + - - + - @@ -13895,31 +12302,28 @@ - + - + - - + - + - + - + - - + - @@ -13927,47 +12331,28 @@ - + - + - - + - + - - - - - - - - - - - - - - - - - + - + - - + - @@ -13975,31 +12360,27 @@ - + - + - - + - - + - + - + - - + - @@ -14007,159 +12388,153 @@ - + + + + + + + + + + + + + + + - + - - - - + + - + - - + - + - + - - + + - - + - - - - - + - - + + + + - - + - + - - + + - - + - + - - - - - - + - + + + - + - + - - + + - - + - - + - + - - + - - + - - + - + - - + + - - + + - - + - - - - - + - - + + + + - @@ -14167,321 +12542,301 @@ - + - + - - + - - + - - + + - + - - + + - + - - + + - - + - - + - + - - + - + - - + - + - - + - + - - + - - + - - + + - + - - + + - + - - + + - + + - - + - - + + - + - - + - + - - + + - + - - + - + - - + - + - - + + - + + - - + - - + + - + - - + + - + + - - + + - - + - - + + - + - - + - + - - + + - - + - - + + - + - - + - + - - + - + - - + + - + + - - + - - + - + - - + - - + - @@ -14490,166 +12845,145 @@ - + - + - - - - + + - + - - + - + - + - - + + - - + - + - - - - - - + - + + + - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - - + - + + + + - - + - - - - - - + - + - - + + - - + - - + - + + + + - - + - - - - - @@ -14657,66 +12991,58 @@ - + - + - - + + - - + - - + - - + - - + - - + - + - - + - - + - @@ -14724,65 +13050,57 @@ - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - + - - + - - + - @@ -14790,290 +13108,270 @@ - + - + - - + - - + + - + - - + - + - - + + - + - - + + - - + - - + - + - - + - - + - + - - + - + - - + + - + - - + - - + + - - + + - - + + - - + - - + + - + - - + + - + + - - + - - - - - - - - - + - - + - - + + - + + - - + - - + + - + - - + + - - + - - + + - + - - + + - + + - - + - - + - + - - + - - + + - + - - + + + + + + + + + - - + - - + - - + + - + - - + - + - + - - + - - + - @@ -15081,159 +13379,139 @@ - + - + - - - - + + - + - - + - + - + - - + + - - + - - - + + - + - - - - + + - + - + - - + + - - + - - - + + - + - - - - + + - + - + - - + + - - + - - + - + - - + - - + - - + - + - - + + - - + + - - + - + - - + - - + - @@ -15241,321 +13519,301 @@ - + - + - - + + - - + + - - + - - + - - + + - - + - - + - + - - + - - + - + - - + - + - - + - - + - - + + - + - - + + - + - - + + - + - - + + - + + - - + - - + - - + - + - - + + - + + - - + + - - + - - + + - + - - + - + + - - + - - + + - + + - - + - - + + - + - - + - + - - + - + - - + + - + - - + + - + - - + - + - - + - + - - + + - + - - + + - - + - + - - + - - + - @@ -15564,19 +13822,16 @@ - + - + - - + - - + - @@ -15585,145 +13840,128 @@ - + - + - - + + - - + - + + + + - - + - - - - - - + - + - - + + - - + - + - - + - - + - - + - + - - + + - - + - - + - - - - - + - - + + + + - - + - + - - + + - - + + - - + - + - - + - - + - @@ -15731,5785 +13969,5121 @@ - + - + - - + + - - + + - - + - - + - + - - + + - - + - + - + - - + - + - + - + + + + + + + + + - - + + - - + - + - + - + - + + + + + + + - + - - + + - - + - + - + - + - + - + - - - + + + - - - + + - + + + + + + + + + + + + + + + + + + + - - - - + + + + + - + - - + - - + - - + - + + + - + - - + - + - - - - - - - - + - + - + - + - - + - - + - - + + + + + + + + + + + + + + + + - + + + + + + + + + - + - + - + - - - - - - - + + - + - - + - - + - - + - - - - + + + + + - + - - + - - + - + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + - + - + - + - - + + - - + - - + + - + - + - + + + + + + + - + - + - + - + - + - + - + + - - + - - + - - + + - + - - + + - - + - + - + - - - + + - - - + + - - - + + - + - - + - - - - + + - - - + + - - - + + - + - - + - + - + - + - + - + - + - + + - - + - - + - - + + - + + + + + + + + + - + - - - - - - - - - + - - + - - + - - - - + + - + - - - - + + + + + + + + - + - - + - + - - + + - - + - + - - - - - - - - - - - - - - - - + - + - - - - - - - - - + - - - - - - - + + + - - - - - - - - + - + - + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + + + + + + + + + + + + + - + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + + + + + + + + + + + + + - + - + - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - + - + - + - - - - - + - - + - + + + - + - + - + - + - + - + - - - - - - - + + - - - - - - - - + - + - + - + - + - - - - - - - - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - + - + - + - + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + + + + + + + - - + - - + - - - - - - - - - - + - - + - - - - + + - + - - + - - - - + + - - - + + - + - - + - - + - - + - - + - - + - + - - - - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - - + - - - + + + + + + + + + + + + + - + - + - + + + + + + + - + - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - + - + + + + + + + + - + - + - - - - - - - - + + + + + + + + + + + + + - + - + - + - - - - - - - + + + - - - - - - - - + - + - + - + - - + - - + - - + - + - + - + - - + - - + - - + - - + - - + - - - - + + - + - - + - - - - - - + - - + - - + - - + - - + - - + - - + + + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - + - + + - - + - + - + - + + - - - - - - - - - - + - + - + + - - + - + - + + - - + - + - + + - - + - + - + + - - + - + - + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + - - + - - - - - - - - - - - - - - - - + - + + - - + - + - + + - - + - - - - - - - - + - + - + - + + + + - - + - - - - - - + - - + - - + - - + - - + - - + - - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + - - + - - + + - - + - + - - - - - - - - + - + - + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + - + - - - + + + + + + + + + + + + + + - + - + + + + + + + + + - + + - - + - + - + - + + - - + - + - + + - - + - + - + - + + - - + - + - + + - - + - + - + + - - + - + - + + - - + - + - + + - - + - + + + + + + + + - + - + - + + + + + + + + - + - - + - + - - - - - - - + + + - - - - - - - - - + - - + - - - - - - - - - + + + + + + + + - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - + + + - - + - - + + - - - - - - - - - - + - - + + - - - - - - - - - - - - - - - - - + - + - - - + + - - - + + - + - - + - - + - - - - + + - - - + + - + - - + - - + + + + + + + + + + + + + + + - + - - - - - + + - + + + - + - - + - + - + + - - + - - + - - + - - + + - - + - + - + - - - - - - + - - - - + + - + - - + - - + - - + - + + + - + - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + - + - + - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - + - + - + - + - + - - - - - - - - - - - - - + + - + - - + - + - + - + - + - + - + - - - - - - + - - + + + + - - + - - + - - + - - - - + + - + - - + - + - - + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - + - + - + + - - + - - + + - - + - + - - - - - + + + + + + + + + + + + + - - + - + - + + + + - - + - - - - - - + - - + - - - - + + - + - - - - + + - + - - + - + - + - + - + - + + - - + - + - + + - - + - + - + - - - + + - + - - - - - - - - - - - - - - - - - + - - + - - + - - - - - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - + - - + - - + + + + + + + + + + + + + + + + + + - - + - - + + - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - + - + - + - + + + + - - + - - - - - - + - - + - - + - - - - - - + - + + + - + - - + - + - + + + + + + + + + + + + + + + + + + - + - - + + - - + - + + + + + + + + + - + - + - - - + + - + - - - - + + - - - + + - - - + + - - - + + - - - + + - + - - + - - + - + - + - + - - + + - - + - + - - - - - + - + + + + - + + - - + - + - + + - - + - - - - - - - - - - - - - - - - - - - + - + - + - - + + - - + + - - + + + + + + + + + + + + + + + + + - + - - - + + + + + + + + - + - - + - - + - - + - - - - - - - - - - - - + + - + - - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + - - + - - - - - - + - - + - - + - - + - - + - - + - - + - + - - - - - + - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - + + - - + - - + + - - + - + - - - - - + - - + - - + - - + - - + - - - - + + - + - + + + - + - - - - - - - - - - - - - - - - - - - + - + - + - - - + + - - - + + - - - - - - - - - - - - - - - - - - - - - + - - + - - + - - + - - - - + + - + - - - - - - - - - - + - - + - + - + + - - + - - + - - + + - + - - + + - - + - + - + - - - - - + - - + - - + - - + - - - - - - + - - + + + + + + + - - + - - + - + - - + + - + - - + - + - + - + - - - - - + - + + + + - + - + - - + + - + - + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - + - - - - - - - - - - - - - + + - + - - + - + - + - - + + + + + + + + + + + + - + - - + + - + - + - + + + + - - + - - - - - - + - - + - - + - - + - - - - + + - + - - + - + - - - - - + - + + + + - + - - + + + + + + + + + + + + + + + + + + - + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + - - + - - + - - - - + + - + - - + - - - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + - + - - - + + - + - - + + + + - - + - - + - - + - - + - - - - - - + - - + - + - + - - - + + - - - + + + + + + + + + + + + + + + + + + + + - + - + - - + - + - - + + - - + - + - - - - - + - + + + + - + + - - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + - + - + - - + + - + - + - + + + + - - + - - + - - - - + + - + - - + - - + - - - - - - + - - + - + - - - - - - - - - - - - - + + - + - - + - + - - + - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + - + - + - - - - + + - + - - - - - - - - + + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - + - - + - - + - - + - - + - - + + + + - - + + + + - - + - - + - - + - - + - - - - - - - - + + - + - - - - - - - - + - + - + - + - + - + + + + + + - + - + - - - - - - - - + - + - - - - - - - - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + - + - - - - + + - - - + + + + + + + + + + + + + + - + + + + + + + + + + + + - - - - + + - + - - + - + - + - - - + + - + - - + - - - - + + - - - + + - + - - + - - + - - + - - + - - - - - - + - - - - - - - - + + - - - + + - + - - + - - + - - - - + + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + + + + + + + - - + - + - + - + + - - - - - - - - - - + - + - + - + - + + + + + + - + - + - + - + + - - - - - - - - - - + - + - + + - - + - + - + + - - + - + - + - + - - - - - - + - - + - - + - - + - - + - - - - - - - - + + - - - + + - + - - + - - - - + + - + - - + - - - - + + - - - + + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + - - - + + - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - + + - + - + - + - + - - + - - + - - + - + - + + - - + - + - + - - - + + - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - - - - - - + + - - - + + - + - - + + + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - - + + + + + - + - - - - + + - + + + + + + + + + + + + + - - + - + - + - + + - - - - - - - - - - + - + - + - + - - + - - + - - + - - + - - + - - - - + + - + + + + - - + - - + - - - - + + - + - - + - - - - + + - - - + + - + - - + - - + - - + - - + - - + - - + - - - - - - - - + + - + - - + - - - - + + - + - - - - + + - + - + - + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - + - + + + + + + + + - + - + + + + + + + + - + - - - - - - - - - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - + - - - - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + @@ -21612,6 +19186,14 @@ + + + + + + + + @@ -21621,16 +19203,8 @@ - - - - - - - - @@ -21709,29 +19283,29 @@ - - - - - - - - - - + + + + - + - - + + + + + + + + @@ -21786,8 +19360,8 @@ - - + + @@ -21802,8 +19376,8 @@ - - + + @@ -21818,8 +19392,8 @@ - - + + @@ -21834,8 +19408,8 @@ - - + + @@ -21850,31 +19424,31 @@ - - + + - + - - + + + + + - + - - - - - + + - - + + @@ -21922,8 +19496,8 @@ - - + + @@ -21951,7 +19525,7 @@ - + @@ -21960,142 +19534,162 @@ - + - - + - - - - + - + - - - - + + + + - + + + + + + + + + - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + + + + + + + + + - + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - + + - + - - - + + + - + - - + + - + - + - - - + + + @@ -22105,85 +19699,77 @@ - - - - - - - - - - + + + + - - - - - - - - + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - + - - - - - - - + + - + + + + + + - - + + + + + + + - + @@ -22191,28 +19777,23 @@ - - - - - - + - - - - - - - + + + + + + + - - - - + + + + @@ -22222,71 +19803,77 @@ - + - + - - + - - - - + - + - + + - + + + + - - - + + + - - - + + + - - + + - - - - + + + + - + - - + + + + + + + - + - + + - + - - - + + + @@ -22299,58 +19886,52 @@ - + - + - - - - - - - + - - - - + + + + - + - - - + + + - - - + + + - - + + - + - - - + + + @@ -22358,7 +19939,7 @@ - + @@ -22368,42 +19949,42 @@ - - - - + + + + - + - - + + - - - + + + - - - + + + - + - - - + + + @@ -22411,7 +19992,7 @@ - + @@ -22421,39 +20002,44 @@ - - - - + + + + + + + + + - + - - - + + + - - - + + + - - - + + + - + @@ -22461,23 +20047,31 @@ - + - + + - + - - + + + + - + + + + + + + - - - - + + + @@ -22485,79 +20079,66 @@ - + - - + - + - - - + + + - - - + + + - - - - - - - - - - - - - - - + + + - - - - + + + + - - - + + + - - - + + + - - + + - + - - - + + + @@ -22565,35 +20146,41 @@ - + - + - + - + - + - - - - + + + + + + + + + + - + - - - + + + @@ -22601,7 +20188,7 @@ - + @@ -22611,49 +20198,51 @@ - - - - - - - + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - + + + + + + - - + + + + + @@ -22667,97 +20256,89 @@ - - - - - - + - - - - - + + - - - - + + + + - + - - + + - + - + - - - + + + - - - - - - + + + + + + - + - - - - - - + + - + - - + + + + + + - - - - - + + + + + - + @@ -22765,7 +20346,7 @@ - + @@ -22773,704 +20354,704 @@ - + - + - + - + - + - - + + - - - + + + - + - - - + + - + - - + + + - - - + + + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - + - - - + + + + + + - + - - - - - - + + + - + - - - - - - - + + - - - - - - - + + + + + + + - + - - + + + + + + + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - + - + - + - - - + + + - + - - + - - - - - - + - + - + + - - - + + + - + - - - + + + - + - + - + - + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - - + + + - - - + + + - - + + - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - + - - + + - + - + - - + + - + - + - - - - - + + + + + - - - - - + + + + + - - + + - + - + - - + + - + - + @@ -23480,364 +21061,359 @@ - + - + - + - + - + + + + - + - - + + + + + + + + + - - + + + + + + + + - - + + - + - + - + - - - - + - + - - - + - - + - + - + - + - + - + - + - + + + - + + + + + + + + + + + - + + + - + + + + + + + + + + + - - - + + + + - + - - - + + + + - + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - - - + + + + - + - - - - + - + - - - - + + + + - + - - + - + - - - + + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - + - - - + + + - + - - - + + + + - + - - - + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + + + - - - - - + + + + + - + - + + + @@ -23845,831 +21421,836 @@ + + + + + - + - + - - - - - - - - - - - + + + + + + + + + + + - + - + - + - - + + - + - - - + - + - + - + - + + + - - + + - - - + + + - + - - - - + + + + - - + + - + - + - - - + + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + - + - + - + - + - + - + - + - - - - - + + + + + - - + + - + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - - - - + - + - - + + - + - + - + - + + - - + + - - + + - + + + + + + - + - + - - + + - + - - + + - + - + - + - - + - - + + - - + + - + - - + + - + - + + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + @@ -24827,26 +22408,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -24873,19 +22454,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -24934,620 +22515,625 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + \ No newline at end of file diff --git a/src/Data/Templates/IV Bolus (mg).pkml b/src/Data/Templates/IV Bolus (mg).pkml index afd554225..918fa1caa 100644 --- a/src/Data/Templates/IV Bolus (mg).pkml +++ b/src/Data/Templates/IV Bolus (mg).pkml @@ -1,61 +1,56 @@  - - + + - + - + - + - + - + - + - + - - + - - - - - - + - - + - + + + - + @@ -78,25 +73,25 @@ - + - + - + - + diff --git a/src/Data/Templates/IV Bolus.pkml b/src/Data/Templates/IV Bolus.pkml index 3499df877..adaf375bc 100644 --- a/src/Data/Templates/IV Bolus.pkml +++ b/src/Data/Templates/IV Bolus.pkml @@ -1,61 +1,56 @@  - - + + - + - + - + - + - + - + - + - - + - - + - - - - - - + - + + + - + @@ -78,19 +73,19 @@ - + - + - + @@ -102,7 +97,7 @@ - + diff --git a/src/Data/Templates/Standard Molecule.pkml b/src/Data/Templates/Standard Molecule.pkml index 8a84dab22..cadd90063 100644 --- a/src/Data/Templates/Standard Molecule.pkml +++ b/src/Data/Templates/Standard Molecule.pkml @@ -1,360 +1,287 @@  - - + + - + - + - - + - - - - - - - - + + - - - + + - - - + + - - - + + - + - - - - + + + - - - + + - - - + + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - + - - - - + + - - - + + - - - + + + + + + + + + + - + + + + + + + + + + + + + + + + - - + - - + - - + - - + - - + - - + - - + - - - - - - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - + - - + - - + - - - - + + - + - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - + - - + - - + - - + + + + - - + - - + - - + + - - + - - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + - - + - @@ -386,72 +313,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - + - + + + + - - - - - - - - - - - - - - - - - + + + + + @@ -465,107 +351,81 @@ - + - - - + + + + + - + - - - - - - - + + - + - - - - - - - + + + - + - - - - - - + - - - - - - - - - - - - - - + - - - - + + - + - - - + + - + - + - - + - + + + + - + - - - + + - + - - + + + - + @@ -575,8 +435,8 @@ - - + + @@ -594,114 +454,161 @@ - + - + - + - + - + - + - - + + - + - + - - + + + - + - - + + + - + - - + + + + - + - - - - - + + + - + - - - - + + + - + - - + + + - + - - + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - + + + - - - + + + @@ -710,42 +617,62 @@ - + - + - + - + + + + + + + - - - + + + + + + + + + + + + + + + + + - - - + + + - + - + - + @@ -754,7 +681,7 @@ - + @@ -771,94 +698,94 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Data/Templates/Standard Observer.pkml b/src/Data/Templates/Standard Observer.pkml index 2e67dc6a5..f1e12ab45 100644 --- a/src/Data/Templates/Standard Observer.pkml +++ b/src/Data/Templates/Standard Observer.pkml @@ -1,8 +1,8 @@  - - + + - + @@ -14,7 +14,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -153,7 +153,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -254,7 +254,7 @@ - + @@ -268,7 +268,7 @@ - + @@ -290,7 +290,7 @@ - + @@ -303,7 +303,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -330,7 +330,7 @@ - + @@ -342,7 +342,7 @@ - + @@ -354,7 +354,7 @@ - + @@ -366,7 +366,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -395,13 +395,13 @@ - + - + @@ -409,7 +409,7 @@ - + @@ -417,7 +417,7 @@ - + @@ -425,7 +425,7 @@ - + @@ -433,7 +433,7 @@ - + @@ -441,7 +441,7 @@ - + @@ -460,25 +460,25 @@ - + - + - + - + @@ -488,13 +488,13 @@ - + - + @@ -504,7 +504,7 @@ - + @@ -518,13 +518,13 @@ - + - + @@ -539,7 +539,7 @@ - + @@ -547,7 +547,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -591,7 +591,7 @@ - + @@ -619,14 +619,14 @@ - + - + @@ -646,19 +646,19 @@ - + - + - + diff --git a/src/Data/Templates/Standard Passive Transports.pkml b/src/Data/Templates/Standard Passive Transports.pkml index d24ae544b..53486a12d 100644 --- a/src/Data/Templates/Standard Passive Transports.pkml +++ b/src/Data/Templates/Standard Passive Transports.pkml @@ -1,8 +1,8 @@  - - + + - + @@ -17,7 +17,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -182,7 +182,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -212,7 +212,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -277,7 +277,7 @@ - + @@ -292,7 +292,7 @@ - + @@ -308,7 +308,7 @@ - + @@ -323,7 +323,7 @@ - + @@ -338,7 +338,7 @@ - + @@ -354,7 +354,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -386,7 +386,7 @@ - + @@ -402,7 +402,7 @@ - + @@ -417,7 +417,7 @@ - + @@ -432,7 +432,7 @@ - + @@ -449,7 +449,7 @@ - + @@ -465,7 +465,7 @@ - + @@ -481,7 +481,7 @@ - + @@ -496,7 +496,7 @@ - + @@ -514,7 +514,7 @@ - + @@ -531,7 +531,7 @@ - + @@ -547,7 +547,7 @@ - + @@ -563,7 +563,7 @@ - + @@ -578,7 +578,7 @@ - + @@ -597,7 +597,7 @@ - + @@ -613,7 +613,7 @@ - + @@ -629,7 +629,7 @@ - + @@ -645,7 +645,7 @@ - + @@ -661,7 +661,7 @@ - + @@ -674,7 +674,7 @@ - + @@ -691,7 +691,7 @@ - + @@ -704,7 +704,7 @@ - + @@ -719,7 +719,7 @@ - + @@ -736,17 +736,17 @@ - + - + - + @@ -755,14 +755,14 @@ - + - + @@ -771,7 +771,7 @@ - + @@ -780,49 +780,49 @@ - + - + - + - + - + - + - + @@ -830,7 +830,7 @@ - + @@ -838,34 +838,34 @@ - + - + - + - + - + - + @@ -874,7 +874,7 @@ - + @@ -883,28 +883,28 @@ - + - + - + - + @@ -913,7 +913,7 @@ - + @@ -922,21 +922,21 @@ - + - + - + @@ -946,7 +946,7 @@ - + @@ -956,7 +956,7 @@ - + @@ -967,7 +967,7 @@ - + @@ -976,7 +976,7 @@ - + From ae419b50d23d672f358285814c6db8ecef924268 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Mon, 21 May 2018 19:21:27 -0400 Subject: [PATCH 26/29] Fixes #279 update latest simmodel (#280) --- src/MoBi.Assets/MoBi.Assets.csproj | 10 ++++----- src/MoBi.Assets/packages.config | 6 ++--- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 22 +++++++++---------- src/MoBi.BatchTool/packages.config | 12 +++++----- src/MoBi.Core/MoBi.Core.csproj | 18 +++++++-------- src/MoBi.Core/packages.config | 10 ++++----- .../MoBi.Presentation.csproj | 18 +++++++-------- src/MoBi.Presentation/packages.config | 10 ++++----- src/MoBi.UI/MoBi.UI.csproj | 22 +++++++++---------- src/MoBi.UI/packages.config | 12 +++++----- src/MoBi/MoBi.csproj | 14 ++++++------ src/MoBi/packages.config | 8 +++---- tests/MoBi.Tests/MoBi.Tests.csproj | 18 +++++++-------- tests/MoBi.Tests/packages.config | 10 ++++----- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 22 +++++++++---------- tests/MoBi.UI.Tests/packages.config | 12 +++++----- 16 files changed, 112 insertions(+), 112 deletions(-) diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index e46736d70..0f39bfb80 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -50,11 +50,11 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.77\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.78\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.77\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.78\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll @@ -63,7 +63,7 @@ ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.13\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.14\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi.Assets/packages.config b/src/MoBi.Assets/packages.config index 420e97e19..f1c0d0157 100644 --- a/src/MoBi.Assets/packages.config +++ b/src/MoBi.Assets/packages.config @@ -3,11 +3,11 @@ - - + + - + diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index 3bdac560a..a8ab31f2d 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -198,11 +198,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.77\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.78\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.77\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.78\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -213,23 +213,23 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.77\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.78\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.77\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.78\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.13\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.14\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.77\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.78\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.BatchTool/packages.config b/src/MoBi.BatchTool/packages.config index c789cd921..534cd4fb3 100644 --- a/src/MoBi.BatchTool/packages.config +++ b/src/MoBi.BatchTool/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + - + diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index 744a75384..41c73e6c5 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -102,26 +102,26 @@ ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.77\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.78\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.77\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.78\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.77\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.78\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.77\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.78\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.13\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.14\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi.Core/packages.config b/src/MoBi.Core/packages.config index d1b61ce38..b998083db 100644 --- a/src/MoBi.Core/packages.config +++ b/src/MoBi.Core/packages.config @@ -10,14 +10,14 @@ - - + + - - + + - + diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index 064d051ff..8852bf10a 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -202,26 +202,26 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.77\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.78\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.77\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.78\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.77\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.78\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.77\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.78\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.13\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.14\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi.Presentation/packages.config b/src/MoBi.Presentation/packages.config index 4405bb6e0..1125f3d1d 100644 --- a/src/MoBi.Presentation/packages.config +++ b/src/MoBi.Presentation/packages.config @@ -12,15 +12,15 @@ - - + + - - + + - + diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index 6a131d0e1..3def7b70c 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -238,11 +238,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.77\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.78\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.77\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.78\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -253,23 +253,23 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.77\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.78\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.77\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.78\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.13\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.14\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.77\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.78\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/src/MoBi.UI/packages.config b/src/MoBi.UI/packages.config index c789cd921..534cd4fb3 100644 --- a/src/MoBi.UI/packages.config +++ b/src/MoBi.UI/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - + - + diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index 4331fab77..0683ad5c2 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -93,23 +93,23 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.77\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.78\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.77\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.78\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.77\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.78\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.13\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.14\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi/packages.config b/src/MoBi/packages.config index 0752a6a45..abd4ccada 100644 --- a/src/MoBi/packages.config +++ b/src/MoBi/packages.config @@ -3,13 +3,13 @@ - - + + - + - + diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index 69c3ade39..63f72f14f 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -138,14 +138,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.77\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.78\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.1.4\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.77\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.78\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -153,17 +153,17 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.77\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.78\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.77\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.78\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.13\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.14\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/tests/MoBi.Tests/packages.config b/tests/MoBi.Tests/packages.config index 7b7fd94d0..7331cd0ef 100644 --- a/tests/MoBi.Tests/packages.config +++ b/tests/MoBi.Tests/packages.config @@ -14,16 +14,16 @@ - + - + - - + + - + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index d7e185faf..b9f5d9cc5 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -198,14 +198,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.77\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.78\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.1.4\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.77\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.78\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -216,23 +216,23 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.77\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.78\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.77\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.78\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.13\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.14\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.77\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.78\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index 7ef3a0519..67cff31a9 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -13,21 +13,21 @@ - + - + - - + + - + - + From c2c3d76cb79e35378c5282f95f349b12838263ed Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Tue, 29 May 2018 20:15:36 -0400 Subject: [PATCH 27/29] Fixes #275 update latest simmodel (#286) --- src/MoBi.Assets/MoBi.Assets.csproj | 10 +++---- src/MoBi.Assets/packages.config | 6 ++--- src/MoBi.BatchTool/MoBi.BatchTool.csproj | 26 +++++++++---------- src/MoBi.BatchTool/packages.config | 14 +++++----- src/MoBi.Core/MoBi.Core.csproj | 22 ++++++++-------- src/MoBi.Core/app.config | 2 +- src/MoBi.Core/packages.config | 12 ++++----- .../MoBi.Presentation.csproj | 22 ++++++++-------- src/MoBi.Presentation/app.config | 2 +- src/MoBi.Presentation/packages.config | 12 ++++----- src/MoBi.UI/MoBi.UI.csproj | 26 +++++++++---------- src/MoBi.UI/app.config | 2 +- src/MoBi.UI/packages.config | 14 +++++----- src/MoBi/MoBi.csproj | 18 ++++++------- src/MoBi/app.config | 2 +- src/MoBi/packages.config | 10 +++---- tests/MoBi.Tests/MoBi.Tests.csproj | 22 ++++++++-------- tests/MoBi.Tests/app.config | 2 +- tests/MoBi.Tests/packages.config | 12 ++++----- tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj | 26 +++++++++---------- tests/MoBi.UI.Tests/app.config | 2 +- tests/MoBi.UI.Tests/packages.config | 14 +++++----- 22 files changed, 139 insertions(+), 139 deletions(-) diff --git a/src/MoBi.Assets/MoBi.Assets.csproj b/src/MoBi.Assets/MoBi.Assets.csproj index 0f39bfb80..cc4602877 100644 --- a/src/MoBi.Assets/MoBi.Assets.csproj +++ b/src/MoBi.Assets/MoBi.Assets.csproj @@ -50,11 +50,11 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.78\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.81\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.78\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.81\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll @@ -63,7 +63,7 @@ ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.14\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.16\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll diff --git a/src/MoBi.Assets/packages.config b/src/MoBi.Assets/packages.config index f1c0d0157..ca21b0652 100644 --- a/src/MoBi.Assets/packages.config +++ b/src/MoBi.Assets/packages.config @@ -3,11 +3,11 @@ - - + + - + diff --git a/src/MoBi.BatchTool/MoBi.BatchTool.csproj b/src/MoBi.BatchTool/MoBi.BatchTool.csproj index a8ab31f2d..d2ea278a1 100644 --- a/src/MoBi.BatchTool/MoBi.BatchTool.csproj +++ b/src/MoBi.BatchTool/MoBi.BatchTool.csproj @@ -198,11 +198,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.78\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.81\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.78\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.81\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -213,30 +213,30 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.78\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.81\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.78\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.81\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.14\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.16\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.78\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.81\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.7.5\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.6\lib\net45\SX.dll diff --git a/src/MoBi.BatchTool/packages.config b/src/MoBi.BatchTool/packages.config index 534cd4fb3..04ff71fe4 100644 --- a/src/MoBi.BatchTool/packages.config +++ b/src/MoBi.BatchTool/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - - + + - + diff --git a/src/MoBi.Core/MoBi.Core.csproj b/src/MoBi.Core/MoBi.Core.csproj index 41c73e6c5..0cda0b857 100644 --- a/src/MoBi.Core/MoBi.Core.csproj +++ b/src/MoBi.Core/MoBi.Core.csproj @@ -102,26 +102,26 @@ ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.78\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.81\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.78\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.81\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.78\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.81\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.78\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.81\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.14\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.16\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll @@ -130,8 +130,8 @@ ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.7.5\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.6\lib\net45\SX.dll diff --git a/src/MoBi.Core/app.config b/src/MoBi.Core/app.config index fe57c251b..9f904f802 100644 --- a/src/MoBi.Core/app.config +++ b/src/MoBi.Core/app.config @@ -56,7 +56,7 @@ - + diff --git a/src/MoBi.Core/packages.config b/src/MoBi.Core/packages.config index b998083db..57d29a22f 100644 --- a/src/MoBi.Core/packages.config +++ b/src/MoBi.Core/packages.config @@ -10,15 +10,15 @@ - - + + - - + + - - + + diff --git a/src/MoBi.Presentation/MoBi.Presentation.csproj b/src/MoBi.Presentation/MoBi.Presentation.csproj index 8852bf10a..f63c52912 100644 --- a/src/MoBi.Presentation/MoBi.Presentation.csproj +++ b/src/MoBi.Presentation/MoBi.Presentation.csproj @@ -202,26 +202,26 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.78\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.81\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.78\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.81\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.78\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.81\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.78\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.81\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.14\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.16\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll @@ -230,8 +230,8 @@ ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.7.5\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.6\lib\net45\SX.dll diff --git a/src/MoBi.Presentation/app.config b/src/MoBi.Presentation/app.config index 739d2a391..42ad779c2 100644 --- a/src/MoBi.Presentation/app.config +++ b/src/MoBi.Presentation/app.config @@ -76,7 +76,7 @@ - + diff --git a/src/MoBi.Presentation/packages.config b/src/MoBi.Presentation/packages.config index 1125f3d1d..b671b5507 100644 --- a/src/MoBi.Presentation/packages.config +++ b/src/MoBi.Presentation/packages.config @@ -12,16 +12,16 @@ - - + + - - + + - - + + diff --git a/src/MoBi.UI/MoBi.UI.csproj b/src/MoBi.UI/MoBi.UI.csproj index 3def7b70c..f7dd155a6 100644 --- a/src/MoBi.UI/MoBi.UI.csproj +++ b/src/MoBi.UI/MoBi.UI.csproj @@ -238,11 +238,11 @@ ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.Xml.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.78\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.81\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.78\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.81\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -253,30 +253,30 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.78\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.81\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.78\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.81\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.14\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.16\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.78\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.81\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.7.5\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.6\lib\net45\SX.dll diff --git a/src/MoBi.UI/app.config b/src/MoBi.UI/app.config index d29cd0e41..e771fbba1 100644 --- a/src/MoBi.UI/app.config +++ b/src/MoBi.UI/app.config @@ -88,7 +88,7 @@ - + diff --git a/src/MoBi.UI/packages.config b/src/MoBi.UI/packages.config index 534cd4fb3..04ff71fe4 100644 --- a/src/MoBi.UI/packages.config +++ b/src/MoBi.UI/packages.config @@ -11,20 +11,20 @@ - - + + - - + + - - + + - + diff --git a/src/MoBi/MoBi.csproj b/src/MoBi/MoBi.csproj index 0683ad5c2..3de1af627 100644 --- a/src/MoBi/MoBi.csproj +++ b/src/MoBi/MoBi.csproj @@ -93,23 +93,23 @@ ..\..\packages\csmpfit.1.1.1\lib\net20\MPFitLib.dll - - ..\..\packages\OSPSuite.Assets.7.3.0.78\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.81\lib\net462\OSPSuite.Assets.dll - - ..\..\packages\OSPSuite.Core.7.3.0.78\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.81\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.78\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.81\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.14\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.16\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll @@ -117,8 +117,8 @@ ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.7.5\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.6\lib\net45\SX.dll diff --git a/src/MoBi/app.config b/src/MoBi/app.config index 93d640fb7..44bc6bd08 100644 --- a/src/MoBi/app.config +++ b/src/MoBi/app.config @@ -107,7 +107,7 @@ - + diff --git a/src/MoBi/packages.config b/src/MoBi/packages.config index abd4ccada..ce2884eda 100644 --- a/src/MoBi/packages.config +++ b/src/MoBi/packages.config @@ -3,15 +3,15 @@ - - + + - + - + - + diff --git a/tests/MoBi.Tests/MoBi.Tests.csproj b/tests/MoBi.Tests/MoBi.Tests.csproj index 63f72f14f..94fef0905 100644 --- a/tests/MoBi.Tests/MoBi.Tests.csproj +++ b/tests/MoBi.Tests/MoBi.Tests.csproj @@ -138,14 +138,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.78\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.81\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.1.4\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.78\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.81\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -153,17 +153,17 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.78\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.81\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.78\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.81\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.14\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.16\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll @@ -172,8 +172,8 @@ ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.7.5\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.6\lib\net45\SX.dll diff --git a/tests/MoBi.Tests/app.config b/tests/MoBi.Tests/app.config index fb584117b..2dbdb4495 100644 --- a/tests/MoBi.Tests/app.config +++ b/tests/MoBi.Tests/app.config @@ -80,7 +80,7 @@ - + diff --git a/tests/MoBi.Tests/packages.config b/tests/MoBi.Tests/packages.config index 7331cd0ef..d28ee1392 100644 --- a/tests/MoBi.Tests/packages.config +++ b/tests/MoBi.Tests/packages.config @@ -14,18 +14,18 @@ - + - + - - + + - + - + diff --git a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj index b9f5d9cc5..35a29fd19 100644 --- a/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj +++ b/tests/MoBi.UI.Tests/MoBi.UI.Tests.csproj @@ -198,14 +198,14 @@ ..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll True - - ..\..\packages\OSPSuite.Assets.7.3.0.78\lib\net462\OSPSuite.Assets.dll + + ..\..\packages\OSPSuite.Assets.7.3.0.81\lib\net462\OSPSuite.Assets.dll ..\..\packages\OSPSuite.BDDHelper.2.0.1.4\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Core.7.3.0.78\lib\net462\OSPSuite.Core.dll + + ..\..\packages\OSPSuite.Core.7.3.0.81\lib\net462\OSPSuite.Core.dll ..\..\packages\OSPSuite.DataBinding.2.2.0.2\lib\net462\OSPSuite.DataBinding.dll @@ -216,30 +216,30 @@ ..\..\packages\OSPSuite.FuncParser.3.0.0.6\lib\net45\OSPSuite.FuncParser.dll - - ..\..\packages\OSPSuite.Infrastructure.7.3.0.78\lib\net462\OSPSuite.Infrastructure.dll + + ..\..\packages\OSPSuite.Infrastructure.7.3.0.81\lib\net462\OSPSuite.Infrastructure.dll - - ..\..\packages\OSPSuite.Presentation.7.3.0.78\lib\net462\OSPSuite.Presentation.dll + + ..\..\packages\OSPSuite.Presentation.7.3.0.81\lib\net462\OSPSuite.Presentation.dll ..\..\packages\OSPSuite.Serializer.2.0.1.4\lib\net45\OSPSuite.Serializer.dll - ..\..\packages\OSPSuite.SimModel.3.0.0.14\lib\net45\OSPSuite.SimModel.dll + ..\..\packages\OSPSuite.SimModel.3.0.0.16\lib\net45\OSPSuite.SimModel.dll ..\..\packages\OSPSuite.TeXReporting.2.1.0.8\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.UI.7.3.0.78\lib\net462\OSPSuite.UI.dll + + ..\..\packages\OSPSuite.UI.7.3.0.81\lib\net462\OSPSuite.UI.dll ..\..\packages\OSPSuite.Utility.3.0.0.3\lib\net462\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.7.5\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.7.6\lib\net45\SX.dll diff --git a/tests/MoBi.UI.Tests/app.config b/tests/MoBi.UI.Tests/app.config index 310e4fb56..c2787107c 100644 --- a/tests/MoBi.UI.Tests/app.config +++ b/tests/MoBi.UI.Tests/app.config @@ -12,7 +12,7 @@ - + diff --git a/tests/MoBi.UI.Tests/packages.config b/tests/MoBi.UI.Tests/packages.config index 67cff31a9..fba01edb9 100644 --- a/tests/MoBi.UI.Tests/packages.config +++ b/tests/MoBi.UI.Tests/packages.config @@ -13,21 +13,21 @@ - + - + - - + + - - + + - + From f29bde7599802b81f5bb7713b1716b97030274e3 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 31 May 2018 13:05:57 -0400 Subject: [PATCH 28/29] Ensure that Journal view is not opened everytime a simulation is loaded. Also update rakefile for postclean --- rakefile.rb | 2 +- src/MoBi.Core/Serialization/ORM/ContextPersistor.cs | 4 +++- src/MoBi.Presentation/Tasks/ISerializationTask.cs | 2 +- src/MoBi.Presentation/Tasks/SerializationTask.cs | 3 +++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/rakefile.rb b/rakefile.rb index d024837dd..cb7889991 100644 --- a/rakefile.rb +++ b/rakefile.rb @@ -100,7 +100,7 @@ def update_smart_xls(args) packages_dir = File.join(solution_dir, 'packages') all_users_dir = ENV['ALLUSERSPROFILE'] - all_users_application_dir = File.join(all_users_dir, manufacturer, product_name, '7.2') + all_users_application_dir = File.join(all_users_dir, manufacturer, product_name, '7.3') copy_depdencies solution_dir, all_users_application_dir do copy_files 'Data', ['xml', 'mbdt'] diff --git a/src/MoBi.Core/Serialization/ORM/ContextPersistor.cs b/src/MoBi.Core/Serialization/ORM/ContextPersistor.cs index 1cba44a2d..7844f1cac 100644 --- a/src/MoBi.Core/Serialization/ORM/ContextPersistor.cs +++ b/src/MoBi.Core/Serialization/ORM/ContextPersistor.cs @@ -122,7 +122,9 @@ public void LoadJournal(IMoBiContext context, string journalPath, string project { var journal = _journalLoader.Load(journalPath, projectFullPath); context.Journal = journal; - _journalTask.ShowJournal(); + + if (showJournal) + _journalTask.ShowJournal(); } } } \ No newline at end of file diff --git a/src/MoBi.Presentation/Tasks/ISerializationTask.cs b/src/MoBi.Presentation/Tasks/ISerializationTask.cs index 170a62703..61ccf391d 100644 --- a/src/MoBi.Presentation/Tasks/ISerializationTask.cs +++ b/src/MoBi.Presentation/Tasks/ISerializationTask.cs @@ -9,6 +9,6 @@ public interface ISerializationTask : OSPSuite.Core.Serialization.ISerialization void CloseProject(); void NewProject(); IEnumerable LoadMany(string fileName, bool resetIds = false); - void LoadJournal(string journalPath, string projectFullPath=null, bool showJournal = false); + void LoadJournal(string journalPath, string projectFullPath = null, bool showJournal = false); } } \ No newline at end of file diff --git a/src/MoBi.Presentation/Tasks/SerializationTask.cs b/src/MoBi.Presentation/Tasks/SerializationTask.cs index 2c3ead635..d6514b48c 100644 --- a/src/MoBi.Presentation/Tasks/SerializationTask.cs +++ b/src/MoBi.Presentation/Tasks/SerializationTask.cs @@ -108,6 +108,9 @@ public void NewProject() public void LoadJournal(string journalPath, string projectFullPath = null, bool showJournal = false) { + if (string.IsNullOrEmpty(journalPath)) + return; + _contextPersistor.LoadJournal(_context, journalPath, projectFullPath, showJournal); } From 4cdfc53175b234d95252a90381fe70903442b032 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Tue, 5 Jun 2018 09:56:34 -0400 Subject: [PATCH 29/29] Remove beta from version --- appveyor-nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor-nightly.yml b/appveyor-nightly.yml index 21e51c6b0..1749958a3 100644 --- a/appveyor-nightly.yml +++ b/appveyor-nightly.yml @@ -12,7 +12,7 @@ assembly_info: file: SolutionInfo.* assembly_version: "{version}" assembly_file_version: "{version}" - assembly_informational_version: "{version} Beta" + assembly_informational_version: "{version}" clone_depth: 1