From 80eaa213b0faefd9112b0cc4a9ca1cccedc0967b Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 22 Mar 2017 15:25:48 -0400 Subject: [PATCH 01/50] Fixes #15 code coverage (#18) * WIP #15 - Code coverage using coveralls.io (#17) * adding badge to readme * Update README.md * adding build-scripts * update appveyor.yml * appveyor requires sln name in appveyor.yml * adding rakefile * modify rakefile.rb * reformat appveyor.yml * update build-scripts * update build-scripts * re-initialize coveralls repository * update build-scripts * update build-scripts * remove UI from coverage calculations * move build-scripts to scripts * update scripts * move build-scripts to upstream * remove extra submodule * Add coverage yml file * Fixes 15 code coverage --- .gitmodules | 3 ++ OSPSuite.Core.sln | 1 + README.md | 1 + appveyor-coverage.yml | 43 +++++++++++++++++++++++ appveyor.yml | 8 ++++- rakefile.rb | 1 + scripts | 1 + tests/OSPSuite.Core.Tests/packages.config | 2 ++ 8 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 appveyor-coverage.yml create mode 100644 rakefile.rb create mode 160000 scripts diff --git a/.gitmodules b/.gitmodules index b4e8b8fe2..87834778c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "src/OSPSuite.PKParameters"] path = src/OSPSuite.PKParameters url = https://github.com/Open-Systems-Pharmacology/OSPSuite.PKParameters.git +[submodule "scripts"] + path = scripts + url = https://github.com/Open-Systems-Pharmacology/build-scripts.git diff --git a/OSPSuite.Core.sln b/OSPSuite.Core.sln index b0f982cfa..288200d9c 100644 --- a/OSPSuite.Core.sln +++ b/OSPSuite.Core.sln @@ -8,6 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution appveyor.yml = appveyor.yml copy_to_mobi.bat = copy_to_mobi.bat copy_to_pksim.bat = copy_to_pksim.bat + rakefile.rb = rakefile.rb README.md = README.md SolutionInfo.cs = SolutionInfo.cs EndProjectSection diff --git a/README.md b/README.md index 3619ebadb..2ae1156ba 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ Core functionalities of the Open Systems Pharmacology Suite. ## Code Status [![NuGet version](https://img.shields.io/nuget/v/OSPSuite.Core.svg?style=flat)](https://www.nuget.org/packages/OSPSuite.Core) [![Build status](https://ci.appveyor.com/api/projects/status/w3ecxmp3grryc5ts/branch/master?svg=true&passingText=master%20-%20passing)](https://ci.appveyor.com/project/open-systems-pharmacology-ci/ospsuite-core/branch/master) +[![Coverage Status](https://coveralls.io/repos/github/rwmcintosh/OSPSuite.Core/badge.svg?branch=master)](https://coveralls.io/github/rwmcintosh/OSPSuite.Core?branch=master) ## Code of conduct 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). diff --git a/appveyor-coverage.yml b/appveyor-coverage.yml new file mode 100644 index 000000000..75a7d3cdc --- /dev/null +++ b/appveyor-coverage.yml @@ -0,0 +1,43 @@ +configuration: Debug + +environment: + app_version: '7.1.0' + COVERALLS_REPO_TOKEN: + secure: RNtCVakeVmnnxGR4djlmhBbE83cx/t4sqqFkqhQLeHw8uf5n5UT0rvYGdkNseeIi/Ab5+RIITpexnKCP + +version: '%app_version%.{build}' + +assembly_info: + patch: true + file: SolutionInfo.* + assembly_version: "{version}" + assembly_file_version: "{version}" + +cache: + packages -> **\packages.config + +before_build: + - nuget sources add -name bddhelper -source https://ci.appveyor.com/nuget/ospsuite-bddhelper + - nuget sources add -name utility -source https://ci.appveyor.com/nuget/ospsuite-utility + - nuget sources add -name serializer -source https://ci.appveyor.com/nuget/ospsuite-serializer + - nuget sources add -name databinding -source https://ci.appveyor.com/nuget/ospsuite-databinding + - nuget sources add -name texreporting -source https://ci.appveyor.com/nuget/ospsuite-texreporting + - nuget sources add -name databinding-devexpress -source https://ci.appveyor.com/nuget/ospsuite-databinding-devexpress + - nuget sources add -name funcparser -source https://ci.appveyor.com/nuget/ospsuite-funcparser + - nuget sources add -name simmodel -source https://ci.appveyor.com/nuget/ospsuite-simmodel + - nuget sources add -name cvodes -source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes-282 + - nuget restore + +build: + verbosity: minimal + project: OSPSuite.Core.sln + +test_script: + - rake cover["+[OSPSuite.Core]* +[OSPSuite.Assets]* +[OSPSuite.Infrastructure]* +[OSPSuite.Presentation]*"] + +install: + - git submodule update --init --recursive + - ps: >- + (new-object net.webclient).DownloadFile('https://download.microsoft.com/download/A/2/D/A2D8587D-0027-4217-9DAD-38AFDB0A177E/msxml.msi', 'C:\\msxml.msi') + + Start-Process msiexec.exe -ArgumentList /i, C:\msxml.msi, /quiet, /qn, /norestart -Wait diff --git a/appveyor.yml b/appveyor.yml index fb68557b4..10658c73c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ assembly_info: patch: true file: SolutionInfo.* assembly_version: "{version}" - assembly_file_version: "{version}" + assembly_file_version: "{version}" cache: packages -> **\packages.config @@ -49,6 +49,12 @@ skip_commits: files: - '*.md' +pull_requests: + do_not_increment_build_number: true + +nuget: + disable_publish_on_pr: true + notifications: - provider: Slack incoming_webhook: diff --git a/rakefile.rb b/rakefile.rb new file mode 100644 index 000000000..1ac4ccf28 --- /dev/null +++ b/rakefile.rb @@ -0,0 +1 @@ +require_relative 'scripts/coverage' diff --git a/scripts b/scripts new file mode 160000 index 000000000..9482f13cd --- /dev/null +++ b/scripts @@ -0,0 +1 @@ +Subproject commit 9482f13cdf895c752e63b88434270395c9aecdea diff --git a/tests/OSPSuite.Core.Tests/packages.config b/tests/OSPSuite.Core.Tests/packages.config index f33f41ace..db37be32a 100644 --- a/tests/OSPSuite.Core.Tests/packages.config +++ b/tests/OSPSuite.Core.Tests/packages.config @@ -2,12 +2,14 @@ + + From 87778174c5b5a54d934c7497db7ff9b7d03ef91c Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 22 Mar 2017 16:06:58 -0400 Subject: [PATCH 02/50] Update coverage badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ae1156ba..9b937d85b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Core functionalities of the Open Systems Pharmacology Suite. ## Code Status [![NuGet version](https://img.shields.io/nuget/v/OSPSuite.Core.svg?style=flat)](https://www.nuget.org/packages/OSPSuite.Core) [![Build status](https://ci.appveyor.com/api/projects/status/w3ecxmp3grryc5ts/branch/master?svg=true&passingText=master%20-%20passing)](https://ci.appveyor.com/project/open-systems-pharmacology-ci/ospsuite-core/branch/master) -[![Coverage Status](https://coveralls.io/repos/github/rwmcintosh/OSPSuite.Core/badge.svg?branch=master)](https://coveralls.io/github/rwmcintosh/OSPSuite.Core?branch=master) +[![Coverage Status](https://coveralls.io/repos/github/Open-Systems-Pharmacology/OSPSuite.Core/badge.svg?branch=develop)](https://coveralls.io/github/Open-Systems-Pharmacology/OSPSuite.Core?branch=develop) ## Code of conduct 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). From 6c05300f574c382e4c994e3775abd0c73e9ae946 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 22 Mar 2017 16:10:45 -0400 Subject: [PATCH 03/50] Update coverall token --- appveyor-coverage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor-coverage.yml b/appveyor-coverage.yml index 75a7d3cdc..2d015bf20 100644 --- a/appveyor-coverage.yml +++ b/appveyor-coverage.yml @@ -3,7 +3,7 @@ configuration: Debug environment: app_version: '7.1.0' COVERALLS_REPO_TOKEN: - secure: RNtCVakeVmnnxGR4djlmhBbE83cx/t4sqqFkqhQLeHw8uf5n5UT0rvYGdkNseeIi/Ab5+RIITpexnKCP + secure: RNtCVakeVmnnxGR4djlmhBbE83cx/t4sqqFkqhQLeHw8uf5n5UT0rvYGdkNseeIi version: '%app_version%.{build}' From 87c6faed2b958229db34e136bef68aefa8865dc0 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 23 Mar 2017 11:11:20 -0400 Subject: [PATCH 04/50] Fixes #19 move tests from PKSim into core and optimize some integrationstests (#20) --- .../Core/OptimizationAlgorithmSpecs.cs | 23 ++- .../Helpers/DiagramModelForSpecs.cs | 155 ++++++++++++++++++ .../UnitTestContextSpecificationSpecs.cs | 65 ++++++-- ...AddRelatedItemToJournalPageCommandSpecs.cs | 38 +++++ .../AllJournalDiagramsQuerySpecs.cs | 25 +++ .../AllJournalItemsQuerySpecs.cs | 37 +++++ .../Infrastructure/AllKnownTagsQuerySpecs.cs | 25 +++ .../ContextForJournalDatabase.cs | 58 +++++++ .../CreateWorkingJournalItemCommandSpecs.cs | 46 ++++++ .../DeleteJournalPageCommandSpecs.cs | 68 ++++++++ ...eRelatedItemFromJournalPageCommandSpecs.cs | 32 ++++ .../JournalPageIdsFromSearchQuerySpecs.cs | 105 ++++++++++++ ...tAvailableWorkingJournalIndexQuerySpecs.cs | 27 +++ .../UpdateJournalDiagramCommandSpecs.cs | 28 ++++ .../UpdateJournalPageCommandSpecs.cs | 50 ++++++ .../UpdateJournalPageTagsCommandSpecs.cs | 24 +++ .../OSPSuite.Core.Tests.csproj | 18 ++ 17 files changed, 796 insertions(+), 28 deletions(-) create mode 100644 tests/OSPSuite.Core.Tests/Helpers/DiagramModelForSpecs.cs create mode 100644 tests/OSPSuite.Core.Tests/Infrastructure/AddRelatedItemToJournalPageCommandSpecs.cs create mode 100644 tests/OSPSuite.Core.Tests/Infrastructure/AllJournalDiagramsQuerySpecs.cs create mode 100644 tests/OSPSuite.Core.Tests/Infrastructure/AllJournalItemsQuerySpecs.cs create mode 100644 tests/OSPSuite.Core.Tests/Infrastructure/AllKnownTagsQuerySpecs.cs create mode 100644 tests/OSPSuite.Core.Tests/Infrastructure/ContextForJournalDatabase.cs create mode 100644 tests/OSPSuite.Core.Tests/Infrastructure/CreateWorkingJournalItemCommandSpecs.cs create mode 100644 tests/OSPSuite.Core.Tests/Infrastructure/DeleteJournalPageCommandSpecs.cs create mode 100644 tests/OSPSuite.Core.Tests/Infrastructure/DeleteRelatedItemFromJournalPageCommandSpecs.cs create mode 100644 tests/OSPSuite.Core.Tests/Infrastructure/JournalPageIdsFromSearchQuerySpecs.cs create mode 100644 tests/OSPSuite.Core.Tests/Infrastructure/NextAvailableWorkingJournalIndexQuerySpecs.cs create mode 100644 tests/OSPSuite.Core.Tests/Infrastructure/UpdateJournalDiagramCommandSpecs.cs create mode 100644 tests/OSPSuite.Core.Tests/Infrastructure/UpdateJournalPageCommandSpecs.cs create mode 100644 tests/OSPSuite.Core.Tests/Infrastructure/UpdateJournalPageTagsCommandSpecs.cs diff --git a/tests/OSPSuite.Core.Tests/Core/OptimizationAlgorithmSpecs.cs b/tests/OSPSuite.Core.Tests/Core/OptimizationAlgorithmSpecs.cs index 0c8d1c004..d1c1b65be 100644 --- a/tests/OSPSuite.Core.Tests/Core/OptimizationAlgorithmSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Core/OptimizationAlgorithmSpecs.cs @@ -2,13 +2,11 @@ using System.Linq; using OSPSuite.BDDHelper; using OSPSuite.BDDHelper.Extensions; -using OSPSuite.Utility.Exceptions; using OSPSuite.Core.Domain; using OSPSuite.Core.Domain.Data; using OSPSuite.Core.Domain.ParameterIdentifications; using OSPSuite.Core.Domain.ParameterIdentifications.Algorithms; - -// ReSharper disable InconsistentNaming +using OSPSuite.Utility.Exceptions; namespace OSPSuite.Core { @@ -26,7 +24,7 @@ protected override void Context() protected override void Because() { var constraints = CreateConstraints(); - sut.Optimize(constraints, objectiveFunction); + sut.Optimize(constraints, ObjectiveFunction); } protected virtual IReadOnlyList CreateConstraints() @@ -45,13 +43,13 @@ protected virtual IReadOnlyList CreateConstraints( /// /// /// - protected virtual OptimizationRunResult objectiveFunction(IReadOnlyList values) + protected virtual OptimizationRunResult ObjectiveFunction(IReadOnlyList values) { var residualResult = new ResidualsResult(); var outputResiduals = new OutputResiduals("A|B", new DataRepository(), new[] { - new Residual(0, values[0].Value - 3,1), - new Residual(0, values[1].Value - 4,1) + new Residual(0, values[0].Value - 3, 1), + new Residual(0, values[1].Value - 4, 1) }); residualResult.AddOutputResiduals(outputResiduals); @@ -88,7 +86,7 @@ protected void CheckOptimizedValues() } } - class When_optimizing_using_Monte_carlo : concern_for_OptimizationAlgorithm + public class When_optimizing_using_monte_carlo : concern_for_OptimizationAlgorithm { protected override IOptimizationAlgorithm CreateOptimizationAlgorithm() { @@ -131,6 +129,7 @@ public void should_return_optimal_values() public class When_optimizing_using_MPFit_LM_with_invalid_start_values : concern_for_OptimizationAlgorithm { private OSPSuiteException _exception; + protected override IOptimizationAlgorithm CreateOptimizationAlgorithm() { return new MPFitLevenbergMarquardtOptimizer(); @@ -141,7 +140,7 @@ protected override IReadOnlyList CreateConstraints var constraint1 = new OptimizedParameterConstraint("x[0]", 0, 2, double.PositiveInfinity, Scalings.Linear); var constraint2 = new OptimizedParameterConstraint("x[1]", 0, 10, 1, Scalings.Linear); - return new List() { constraint1, constraint2 }; + return new List() {constraint1, constraint2}; } protected override void Because() @@ -166,14 +165,14 @@ public void should_throw_an_exception() public class When_optimizing_using_MPFit_LM_with_error_in_objective_function : concern_for_OptimizationAlgorithm { private OSPSuiteException _exception; - private string _objectiveFunctionErrorMessage = "Warum ist die Banane krumm?"; + private readonly string _objectiveFunctionErrorMessage = "Warum ist die Banane krumm?"; protected override IOptimizationAlgorithm CreateOptimizationAlgorithm() { return new MPFitLevenbergMarquardtOptimizer(); } - protected override OptimizationRunResult objectiveFunction(IReadOnlyList values) + protected override OptimizationRunResult ObjectiveFunction(IReadOnlyList values) { var residualResult = new ResidualsResult() { @@ -213,7 +212,7 @@ public class When_the_first_initial_run_with_default_start_values_throws_an_exce { private OSPSuiteException _exception; - protected override OptimizationRunResult objectiveFunction(IReadOnlyList values) + protected override OptimizationRunResult ObjectiveFunction(IReadOnlyList values) { return new OptimizationRunResult { diff --git a/tests/OSPSuite.Core.Tests/Helpers/DiagramModelForSpecs.cs b/tests/OSPSuite.Core.Tests/Helpers/DiagramModelForSpecs.cs new file mode 100644 index 000000000..7e3f4510d --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Helpers/DiagramModelForSpecs.cs @@ -0,0 +1,155 @@ +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using OSPSuite.Core.Diagram; + +namespace OSPSuite.Helpers +{ + public class DiagramModelForSpecs : IDiagramModel + { + public PointF Location { get; set; } + public PointF Center { get; set; } + public SizeF Size { get; set; } + public RectangleF Bounds { get; set; } + + public IEnumerable GetDirectChildren() where T : class + { + return Enumerable.Empty(); + } + + public IEnumerable GetAllChildren() where T : class + { + return Enumerable.Empty(); + } + + public void AddChildNode(IBaseNode node) + { + } + + public void RemoveChildNode(IBaseNode node) + { + } + + public bool ContainsChildNode(IBaseNode node, bool recursive) + { + return false; + } + + public RectangleF CalculateBounds() + { + return new RectangleF(0, 0, 10, 10); + } + + public void SetHiddenRecursive(bool hidden) + { + } + + public void PostLayoutStep() + { + } + + public void Collapse(int level) + { + } + + public void Expand(int level) + { + } + + public IBaseNode GetNode(string id) + { + return null; + } + + public T GetNode(string id) where T : class, IBaseNode + { + return null; + } + + public T CreateNode(string id, PointF location, IContainerBase parentContainerBase) where T : class, IBaseNode, new() + { + return new T(); + } + + public void RemoveNode(string id) + { + } + + public void RenameNode(string id, string name) + { + } + + public IDiagramModel CreateCopy(string containerId = null) + { + return new DiagramModelForSpecs(); + } + + public void ReplaceNodeIds(IDictionary changedIds) + { + } + + public bool IsEmpty() + { + return true; + } + + public void Clear() + { + } + + public void SetDefaultExpansion() + { + } + + public void RefreshSize() + { + } + + public void Undo() + { + } + + public void ClearUndoStack() + { + } + + public void BeginUpdate() + { + } + + public void EndUpdate() + { + } + + public bool StartTransaction() + { + return true; + } + + public bool FinishTransaction(string layoutrecursivedone) + { + return true; + } + + public void ShowDefaultExpansion() + { + } + + public IBaseNode FindByName(string name) + { + return null; + } + + public void AddNodeId(IBaseNode baseNode) + { + } + + public bool IsLayouted { get; set; } + public IDiagramOptions DiagramOptions { get; set; } + + public IDiagramModel Create() + { + return new DiagramModelForSpecs(); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Helpers/UnitTestContextSpecificationSpecs.cs b/tests/OSPSuite.Core.Tests/Helpers/UnitTestContextSpecificationSpecs.cs index 30e396520..1f0159f4f 100644 --- a/tests/OSPSuite.Core.Tests/Helpers/UnitTestContextSpecificationSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Helpers/UnitTestContextSpecificationSpecs.cs @@ -4,14 +4,17 @@ using FakeItEasy; using OSPSuite.BDDHelper; using OSPSuite.Core; +using OSPSuite.Core.Commands; using OSPSuite.Core.Converter.v5_2; using OSPSuite.Core.Domain; using OSPSuite.Core.Domain.Services; using OSPSuite.Core.Domain.UnitSystem; +using OSPSuite.Core.Journal; using OSPSuite.Core.Serialization; using OSPSuite.Core.Serialization.Exchange; using OSPSuite.Core.Serialization.Xml; using OSPSuite.Core.Services; +using OSPSuite.Infrastructure; using OSPSuite.Infrastructure.Container.Castle; using OSPSuite.Presentation.Services; using OSPSuite.Utility.Collections; @@ -27,6 +30,8 @@ public abstract class ContextForIntegration : ContextSpecification { public override void GlobalContext() { + if (IoC.Container != null) return; + base.GlobalContext(); var container = new CastleWindsorContainer(); @@ -34,7 +39,6 @@ public override void GlobalContext() IoC.RegisterImplementationOf(IoC.Container); container.WindsorContainer.AddFacility(); - container.AddRegister(x => x.FromType()); container.Register(LifeStyle.Singleton); container.Register(LifeStyle.Singleton); container.Register(LifeStyle.Singleton); @@ -45,42 +49,71 @@ public override void GlobalContext() container.Register(LifeStyle.Singleton); container.Register(typeof(IRepository<>), typeof(ImplementationRepository<>)); container.RegisterImplementationOf(A.Fake()); + var stringCompression = A.Fake(); A.CallTo(() => stringCompression.Compress(A._)).ReturnsLazily(x=>x.GetArgument(0)); A.CallTo(() => stringCompression.Decompress(A._)).ReturnsLazily(x=>x.GetArgument(0)); - container.RegisterImplementationOf(stringCompression); + container.RegisterImplementationOf(A.Fake()); container.RegisterImplementationOf(A.Fake()); container.RegisterImplementationOf(A.Fake()); + container.RegisterImplementationOf(A.Fake()); + container.RegisterImplementationOf(A.Fake()); + container.RegisterImplementationOf(A.Fake()); + container.RegisterImplementationOf(A.Fake()); + container.RegisterImplementationOf(A.Fake()); + var applicationConfiguration = A.Fake(); A.CallTo(() => applicationConfiguration.Product).Returns(Origins.Other); - IoC.Container.RegisterImplementationOf(applicationConfiguration); + container.RegisterImplementationOf(applicationConfiguration); - var groupRepository = IoC.Resolve(); - var moBiGroup = new Group { Name = Constants.Groups.MOBI, Id="1" }; - var undefinedGroup = new Group { Name = Constants.Groups.UNDEFINED, Id = "0" }; - var solverSettingsGroup = new Group { Name = Constants.Groups.SOLVER_SETTINGS, Id = "2" }; - groupRepository.AddGroup(moBiGroup); - groupRepository.AddGroup(solverSettingsGroup); - groupRepository.AddGroup(undefinedGroup); + initGroupRepository(); var progressMananager = A.Fake(); A.CallTo(() => progressMananager.Create()).Returns(A.Fake()); - IoC.Container.RegisterImplementationOf(progressMananager); + container.RegisterImplementationOf(progressMananager); + + using (container.OptimizeDependencyResolution()) + { + container.AddRegister(x => x.FromType()); + container.AddRegister(x => x.FromType()); + var register = new CoreSerializerRegister(); + container.AddRegister(x => x.FromInstance(register)); + register.PerformMappingForSerializerIn(container); + } + + initializeDimensions(); + + Environment.CurrentDirectory = AppDomain.CurrentDomain.BaseDirectory; + } - var register = new CoreSerializerRegister(); - IoC.Container.AddRegister(x => x.FromInstance(register)); - register.PerformMappingForSerializerIn(IoC.Container); + private static void initGroupRepository() + { + var groupRepository = IoC.Resolve(); + var moBiGroup = new Group {Name = Constants.Groups.MOBI, Id = "1"}; + var undefinedGroup = new Group {Name = Constants.Groups.UNDEFINED, Id = "0"}; + var solverSettingsGroup = new Group {Name = Constants.Groups.SOLVER_SETTINGS, Id = "2"}; + groupRepository.AddGroup(moBiGroup); + groupRepository.AddGroup(solverSettingsGroup); + groupRepository.AddGroup(undefinedGroup); + } + private static void initializeDimensions() + { var dimensionFactory = IoC.Resolve(); - var persistor = IoC.Resolve(); + var persistor = IoC.Resolve(); persistor.Load(dimensionFactory, Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "OSPSuite.Dimensions.xml")); dimensionFactory.AddDimension(Constants.Dimension.NO_DIMENSION); var dimensionMapper = IoC.Resolve(); dimensionMapper.DummyDimensionsForConversion.Each(dimensionFactory.AddDimension); + } - Environment.CurrentDirectory = AppDomain.CurrentDomain.BaseDirectory; + public override void GlobalCleanup() + { + base.GlobalCleanup(); + var withIdRepository = IoC.Resolve(); + withIdRepository.Clear(); } } diff --git a/tests/OSPSuite.Core.Tests/Infrastructure/AddRelatedItemToJournalPageCommandSpecs.cs b/tests/OSPSuite.Core.Tests/Infrastructure/AddRelatedItemToJournalPageCommandSpecs.cs new file mode 100644 index 000000000..7c9a3fc38 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Infrastructure/AddRelatedItemToJournalPageCommandSpecs.cs @@ -0,0 +1,38 @@ +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Domain; +using OSPSuite.Infrastructure.Journal.Commands; + +namespace OSPSuite.Infrastructure +{ + public class When_adding_a_related_item_to_an_existing_journal_entry : ContextForJournalDatabase + { + [Observation] + public void should_be_able_to_retrieve_the_related_item() + { + var workingJournalItem = _journalPageFactory.Create(); + workingJournalItem.Title = "Test Title"; + _databaseMediator.ExecuteCommand(new CreateJournalPage { JournalPage = workingJournalItem }); + + var container = new Core.Domain.Container { Name = "toto" }; + var relatedItem = _relatedItemFactory.Create(container); + relatedItem.Description = "ABC"; + relatedItem.Origin = Origins.PKSim; + relatedItem.Version = "123"; + relatedItem.Discriminator = "SIM"; + relatedItem.FullPath = "FullPath"; + _databaseMediator.ExecuteCommand(new AddRelatedPageToJournalPage { JournalPage = workingJournalItem, RelatedItem = relatedItem }); + + var workingJournalItemFromDb = JournalPageById(workingJournalItem.Id); + workingJournalItemFromDb.RelatedItems.Count.ShouldBeEqualTo(1); + var relatedItemFromDb = workingJournalItemFromDb.RelatedItems[0]; + relatedItemFromDb.IsLoaded.ShouldBeFalse(); + relatedItemFromDb.Name.ShouldBeEqualTo(relatedItem.Name); + relatedItemFromDb.Origin.ShouldBeEqualTo(relatedItem.Origin); + relatedItemFromDb.Description.ShouldBeEqualTo(relatedItem.Description); + relatedItemFromDb.Version.ShouldBeEqualTo(relatedItem.Version); + relatedItemFromDb.Discriminator.ShouldBeEqualTo(relatedItem.Discriminator); + relatedItemFromDb.FullPath.ShouldBeEqualTo(relatedItem.FullPath); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Infrastructure/AllJournalDiagramsQuerySpecs.cs b/tests/OSPSuite.Core.Tests/Infrastructure/AllJournalDiagramsQuerySpecs.cs new file mode 100644 index 000000000..0dc43f7e9 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Infrastructure/AllJournalDiagramsQuerySpecs.cs @@ -0,0 +1,25 @@ +using System.Linq; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Journal; +using OSPSuite.Helpers; +using OSPSuite.Infrastructure.Journal.Commands; +using OSPSuite.Infrastructure.Journal.Queries; + +namespace OSPSuite.Infrastructure +{ + public class When_retrieving_all_journal_diagram_defined_in_the_database : ContextForJournalDatabase + { + [Observation] + public void should_return_all_available_journal_diagrams() + { + var diagram = new JournalDiagram { Name = "TOTO", DiagramModel = new DiagramModelForSpecs() }; + _databaseMediator.ExecuteCommand(new CreateJournalDiagram { Diagram = diagram }); + + var allWorkingJournalDiagrams = _databaseMediator.ExecuteQuery(new AllJournalDiagrams()); + var diagramFromDb = allWorkingJournalDiagrams.ElementAt(0); + diagramFromDb.Name.ShouldBeEqualTo("TOTO"); + diagramFromDb.DiagramModel.ShouldNotBeNull(); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Infrastructure/AllJournalItemsQuerySpecs.cs b/tests/OSPSuite.Core.Tests/Infrastructure/AllJournalItemsQuerySpecs.cs new file mode 100644 index 000000000..e2c06b723 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Infrastructure/AllJournalItemsQuerySpecs.cs @@ -0,0 +1,37 @@ +using System.Linq; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Domain; +using OSPSuite.Infrastructure.Journal.Commands; +using OSPSuite.Infrastructure.Journal.Queries; + +namespace OSPSuite.Infrastructure +{ + public class When_retrieving_all_journal_pages_defined_in_the_database : ContextForJournalDatabase + { + [Observation] + public void should_return_all_available_journal_pages_with_tags_and_related_items() + { + var workingJournalItem = _journalPageFactory.Create(); + workingJournalItem.Title = "Test Title"; + _databaseMediator.ExecuteCommand(new CreateJournalPage {JournalPage = workingJournalItem}); + + workingJournalItem.AddTag("Tag1"); + workingJournalItem.AddTag("Tag2"); + _databaseMediator.ExecuteCommand(new UpdateJournalPage {JournalPage = workingJournalItem}); + + var container = new Core.Domain.Container {Name = "toto"}; + var relatedItem = _relatedItemFactory.Create(container); + relatedItem.Description = "ABC"; + relatedItem.Origin = Origins.PKSim; + relatedItem.Version = "123"; + _databaseMediator.ExecuteCommand(new AddRelatedPageToJournalPage {JournalPage = workingJournalItem, RelatedItem = relatedItem}); + + var allWorkingJournalItems = _databaseMediator.ExecuteQuery(new AllJournalPages()); + var workingJournalItemFromDb = allWorkingJournalItems.ElementAt(0); + workingJournalItemFromDb.Tags.ShouldContain("Tag1", "Tag2"); + workingJournalItemFromDb.RelatedItems.Count.ShouldBeEqualTo(1); + workingJournalItemFromDb.RelatedItems[0].Origin.ShouldBeEqualTo(relatedItem.Origin); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Infrastructure/AllKnownTagsQuerySpecs.cs b/tests/OSPSuite.Core.Tests/Infrastructure/AllKnownTagsQuerySpecs.cs new file mode 100644 index 000000000..bdd9626a5 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Infrastructure/AllKnownTagsQuerySpecs.cs @@ -0,0 +1,25 @@ +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Infrastructure.Journal.Commands; +using OSPSuite.Infrastructure.Journal.Queries; + +namespace OSPSuite.Infrastructure +{ + public class When_querying_all_available_tags_in_the_database : ContextForJournalDatabase + { + [Observation] + public void should_return_the_expected_tags() + { + var workingJournalItem = _journalPageFactory.Create(); + workingJournalItem.Title = "Test Title"; + _databaseMediator.ExecuteCommand(new CreateJournalPage { JournalPage = workingJournalItem }); + + workingJournalItem.AddTag("Tag1"); + workingJournalItem.AddTag("Tag2"); + _databaseMediator.ExecuteCommand(new UpdateJournalPageTags { JournalPage = workingJournalItem }); + + var tags = _databaseMediator.ExecuteQuery(new AllKnownTags()); + tags.ShouldOnlyContain("Tag1", "Tag2"); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Infrastructure/ContextForJournalDatabase.cs b/tests/OSPSuite.Core.Tests/Infrastructure/ContextForJournalDatabase.cs new file mode 100644 index 000000000..aac674529 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Infrastructure/ContextForJournalDatabase.cs @@ -0,0 +1,58 @@ +using System.Text; +using OSPSuite.Core.Journal; +using OSPSuite.Helpers; +using OSPSuite.Infrastructure.Journal; +using OSPSuite.Infrastructure.Journal.Queries; +using OSPSuite.Utility; +using OSPSuite.Utility.Container; + +namespace OSPSuite.Infrastructure +{ + public abstract class ContextForJournalDatabase : ContextForIntegration + { + private string _databaseFile; + protected IJournalPageFactory _journalPageFactory; + protected IContentLoader _contendLoader; + protected IDatabaseMediator _databaseMediator; + protected IJournalSession _journalSession; + protected IRelatedItemFactory _relatedItemFactory; + + public override void GlobalContext() + { + base.GlobalContext(); + _databaseFile = FileHelper.GenerateTemporaryFileName(); + _journalSession = IoC.Resolve(); + _journalPageFactory = IoC.Resolve(); + _contendLoader = IoC.Resolve(); + _databaseMediator = IoC.Resolve(); + _relatedItemFactory = IoC.Resolve(); + _journalSession.Create(_databaseFile); + } + + protected override void Context() + { + } + + public override void GlobalCleanup() + { + base.GlobalCleanup(); + _journalSession.Close(); + FileHelper.DeleteFile(_databaseFile); + } + + protected byte[] StringToBytes(string stringToConvert) + { + return Encoding.UTF8.GetBytes(stringToConvert); + } + + protected string BytesToString(byte[] bytes) + { + return Encoding.UTF8.GetString(bytes); + } + + protected JournalPage JournalPageById(string id) + { + return _databaseMediator.ExecuteQuery(new JournalPageById { Id = id }); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Infrastructure/CreateWorkingJournalItemCommandSpecs.cs b/tests/OSPSuite.Core.Tests/Infrastructure/CreateWorkingJournalItemCommandSpecs.cs new file mode 100644 index 000000000..468a1e14b --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Infrastructure/CreateWorkingJournalItemCommandSpecs.cs @@ -0,0 +1,46 @@ +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Journal; +using OSPSuite.Infrastructure.Journal.Commands; + +namespace OSPSuite.Infrastructure +{ + public class When_creating_a_journal_database_and_saving_some_journal_page_with_content : ContextForJournalDatabase + { + private readonly string _data = "My data converted in bytes"; + private JournalPage _journalPage; + + protected override void Context() + { + _journalPage = _journalPageFactory.Create(); + _journalPage.Title = "Test Title"; + _journalPage.Origin = Origins.Matlab; + _journalPage.Content.Data = StringToBytes(_data); + } + + protected override void Because() + { + _databaseMediator.ExecuteCommand(new CreateJournalPage { JournalPage = _journalPage }); + } + + [Observation] + public void should_be_able_to_retrieve_the_content() + { + var workingJournalItemFromDb = JournalPageById(_journalPage.Id); + + workingJournalItemFromDb.CreatedBy.ShouldBeEqualTo(_journalPage.CreatedBy); + _journalPage.UniqueIndex.ShouldBeEqualTo(1); + _journalPage.Origin.ShouldBeEqualTo(Origins.Matlab); + workingJournalItemFromDb.UniqueIndex.ShouldBeEqualTo(_journalPage.UniqueIndex); + + workingJournalItemFromDb.IsLoaded.ShouldBeFalse(); + + _contendLoader.Load(workingJournalItemFromDb); + workingJournalItemFromDb.IsLoaded.ShouldBeTrue(); + var stringContent = BytesToString(workingJournalItemFromDb.Content.Data); + + stringContent.ShouldBeEqualTo(_data); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Infrastructure/DeleteJournalPageCommandSpecs.cs b/tests/OSPSuite.Core.Tests/Infrastructure/DeleteJournalPageCommandSpecs.cs new file mode 100644 index 000000000..62bba3b61 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Infrastructure/DeleteJournalPageCommandSpecs.cs @@ -0,0 +1,68 @@ +using System.Linq; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Journal; +using OSPSuite.Infrastructure.Journal.Commands; + +namespace OSPSuite.Infrastructure +{ + public class When_deleting_an_existing_journal_page_entry : ContextForJournalDatabase + { + [Observation] + public void should_remove_the_content_of_the_journal_and_the_content_of_all_related_items_as_well_as_the_item_itself() + { + var journalPage = _journalPageFactory.Create(); + journalPage.Title = "Test Title"; + _databaseMediator.ExecuteCommand(new CreateJournalPage { JournalPage = journalPage }); + + var relatedItem = _relatedItemFactory.Create(new Core.Domain.Container { Name = "toto" }); + relatedItem.Description = "ABC"; + relatedItem.Origin = Origins.PKSim; + relatedItem.Version = "123"; + _databaseMediator.ExecuteCommand(new AddRelatedPageToJournalPage { JournalPage = journalPage, RelatedItem = relatedItem }); + journalPage.AddRelatedItem(relatedItem); + + //One content for working journal item, one for related item + _journalSession.Current.Contents.All().Count().ShouldBeEqualTo(2); + + _databaseMediator.ExecuteCommand(new DeleteJournalPage { JournalPage = journalPage }); + _journalSession.Current.Contents.All().Count().ShouldBeEqualTo(0); + _journalSession.Current.RelatedItems.All().Count().ShouldBeEqualTo(0); + _journalSession.Current.JournalPages.All().Count().ShouldBeEqualTo(0); + } + } + + public class When_deleting_a_journal_page_that_is_the_parent_of_another_journal_page : ContextForJournalDatabase + { + private JournalPage _parentPage; + private JournalPage _childPage; + + protected override void Context() + { + base.Context(); + _childPage = _journalPageFactory.Create(); + _childPage.Title = "Child"; + _databaseMediator.ExecuteCommand(new CreateJournalPage { JournalPage = _childPage }); + + _parentPage = _journalPageFactory.Create(); + _parentPage.Title = "Parent"; + _databaseMediator.ExecuteCommand(new CreateJournalPage { JournalPage = _parentPage }); + + _childPage.ParentId = _parentPage.Id; + _databaseMediator.ExecuteCommand(new UpdateJournalPage() { JournalPage = _childPage }); + } + + protected override void Because() + { + _databaseMediator.ExecuteCommand(new DeleteJournalPage() { JournalPage = _parentPage }); + } + + [Observation] + public void should_have_remove_the_parent_relation_ship_from_the_child_page() + { + var childPageFromDb = JournalPageById(_childPage.Id); + childPageFromDb.ParentId.ShouldBeNull(); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Infrastructure/DeleteRelatedItemFromJournalPageCommandSpecs.cs b/tests/OSPSuite.Core.Tests/Infrastructure/DeleteRelatedItemFromJournalPageCommandSpecs.cs new file mode 100644 index 000000000..61f3f8214 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Infrastructure/DeleteRelatedItemFromJournalPageCommandSpecs.cs @@ -0,0 +1,32 @@ +using System.Linq; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Domain; +using OSPSuite.Infrastructure.Journal.Commands; + +namespace OSPSuite.Infrastructure +{ + public class When_deleting_an_existing_related_item_from_a_journal_page_entry : ContextForJournalDatabase + { + [Observation] + public void should_remove_the_content_of_the_journal_and_the_content_of_all_related_items_as_well_as_the_item_itself() + { + var workingJournalItem = _journalPageFactory.Create(); + workingJournalItem.Title = "Test Title"; + _databaseMediator.ExecuteCommand(new CreateJournalPage { JournalPage = workingJournalItem }); + + var container = new Core.Domain.Container { Name = "toto" }; + var relatedItem = _relatedItemFactory.Create(container); + relatedItem.Description = "ABC"; + relatedItem.Origin = Origins.PKSim; + relatedItem.Version = "123"; + _databaseMediator.ExecuteCommand(new AddRelatedPageToJournalPage { JournalPage = workingJournalItem, RelatedItem = relatedItem }); + workingJournalItem.AddRelatedItem(relatedItem); + + _databaseMediator.ExecuteCommand(new DeleteRelatedItemFromJournalPage { RelatedItem = relatedItem }); + _journalSession.Current.Contents.All().Count().ShouldBeEqualTo(1); + _journalSession.Current.RelatedItems.All().Count().ShouldBeEqualTo(0); + _journalSession.Current.JournalPages.All().Count().ShouldBeEqualTo(1); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Infrastructure/JournalPageIdsFromSearchQuerySpecs.cs b/tests/OSPSuite.Core.Tests/Infrastructure/JournalPageIdsFromSearchQuerySpecs.cs new file mode 100644 index 000000000..a1c9c7724 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Infrastructure/JournalPageIdsFromSearchQuerySpecs.cs @@ -0,0 +1,105 @@ +using System.Collections.Generic; +using System.Linq; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Journal; +using OSPSuite.Infrastructure.Journal.Commands; +using OSPSuite.Infrastructure.Journal.Queries; + +namespace OSPSuite.Infrastructure +{ + public abstract class concern_for_WorkingJournalItemIdsFromSearchQuery : ContextForJournalDatabase + { + protected JournalSearch _search; + protected List _ids; + protected JournalPage _journalItem1; + protected JournalPage _journalItem2; + + protected override void Context() + { + base.Context(); + _search = new JournalSearch(); + _journalItem1 = _journalPageFactory.Create(); + _journalItem1.Title = "Item1"; + _journalItem1.FullText = "A small house full of fun"; + + _journalItem2 = _journalPageFactory.Create(); + _journalItem2.Title = "Item2"; + _journalItem2.FullText = "A big House empty"; + + _databaseMediator.ExecuteCommand(new CreateJournalPage { JournalPage = _journalItem1 }); + _databaseMediator.ExecuteCommand(new CreateJournalPage { JournalPage = _journalItem2 }); + } + + protected override void Because() + { + _ids = _databaseMediator.ExecuteQuery(new JournalPageIdsFromSearch { Search = _search }).ToList(); + } + } + + public class When_retrieving_all_journal_ids_matching_an_AND_query : concern_for_WorkingJournalItemIdsFromSearchQuery + { + protected override void Context() + { + base.Context(); + _search.MatchAll = true; + _search.Search = "A house full"; + } + + [Observation] + public void should_return_the_expected_ids() + { + _ids.ShouldOnlyContain(_journalItem1.Id); + } + } + + public class When_retrieving_all_journal_ids_matching_a_query_case_sensitive_with_match : concern_for_WorkingJournalItemIdsFromSearchQuery + { + protected override void Context() + { + base.Context(); + _search.MatchAll = true; + _search.Search = "House"; + _search.MatchCase = true; + } + + [Observation] + public void should_return_the_expected_ids() + { + _ids.ShouldOnlyContain(_journalItem2.Id); + } + } + + public class When_retrieving_all_journal_ids_matching_a_query_case_insensitive : concern_for_WorkingJournalItemIdsFromSearchQuery + { + protected override void Context() + { + base.Context(); + _search.MatchAll = true; + _search.Search = "House"; + _search.MatchCase = false; + } + + [Observation] + public void should_return_the_expected_ids() + { + _ids.ShouldOnlyContain(_journalItem1.Id, _journalItem2.Id); + } + } + + public class When_retrieving_all_journal_ids_matching_an_OR_query : concern_for_WorkingJournalItemIdsFromSearchQuery + { + protected override void Context() + { + base.Context(); + _search.MatchAll = false; + _search.Search = "house full"; + } + + [Observation] + public void should_return_the_expected_ids() + { + _ids.ShouldOnlyContain(_journalItem1.Id, _journalItem2.Id); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Infrastructure/NextAvailableWorkingJournalIndexQuerySpecs.cs b/tests/OSPSuite.Core.Tests/Infrastructure/NextAvailableWorkingJournalIndexQuerySpecs.cs new file mode 100644 index 000000000..c1967e4cd --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Infrastructure/NextAvailableWorkingJournalIndexQuerySpecs.cs @@ -0,0 +1,27 @@ +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Infrastructure.Journal.Commands; +using OSPSuite.Infrastructure.Journal.Queries; + +namespace OSPSuite.Infrastructure +{ + public class When_retrieving_a_new_unique_index : ContextForJournalDatabase + { + protected override void Context() + { + var workingJournalItem = _journalPageFactory.Create(); + workingJournalItem.Title = "Test Title"; + _databaseMediator.ExecuteCommand(new CreateJournalPage { JournalPage = workingJournalItem }); + + workingJournalItem = _journalPageFactory.Create(); + workingJournalItem.Title = "Test Title"; + _databaseMediator.ExecuteCommand(new CreateJournalPage { JournalPage = workingJournalItem }); + } + + [Observation] + public void should_return_the_next_available_index() + { + _databaseMediator.ExecuteQuery(new NextAvailableJournalPageIndex()).ShouldBeEqualTo(3); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Infrastructure/UpdateJournalDiagramCommandSpecs.cs b/tests/OSPSuite.Core.Tests/Infrastructure/UpdateJournalDiagramCommandSpecs.cs new file mode 100644 index 000000000..5c8bbceaa --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Infrastructure/UpdateJournalDiagramCommandSpecs.cs @@ -0,0 +1,28 @@ +using System.Linq; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Journal; +using OSPSuite.Helpers; +using OSPSuite.Infrastructure.Journal.Commands; +using OSPSuite.Infrastructure.Journal.Queries; + +namespace OSPSuite.Infrastructure +{ + public class When_upadting_an_existing_journal_in_the_database : ContextForJournalDatabase + { + [Observation] + public void should_return_all_available_journal_diagrams() + { + var diagram = new JournalDiagram {Name = "TOTO", DiagramModel = new DiagramModelForSpecs()}; + _databaseMediator.ExecuteCommand(new CreateJournalDiagram {Diagram = diagram}); + + diagram.Name = "TATA"; + _databaseMediator.ExecuteCommand(new UpdateJournalDiagram {Diagram = diagram}); + + var allWorkingJournalDiagrams = _databaseMediator.ExecuteQuery(new AllJournalDiagrams()); + var diagramFromDb = allWorkingJournalDiagrams.ElementAt(0); + diagramFromDb.Name.ShouldBeEqualTo("TATA"); + diagramFromDb.DiagramModel.ShouldNotBeNull(); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Infrastructure/UpdateJournalPageCommandSpecs.cs b/tests/OSPSuite.Core.Tests/Infrastructure/UpdateJournalPageCommandSpecs.cs new file mode 100644 index 000000000..81c62a451 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Infrastructure/UpdateJournalPageCommandSpecs.cs @@ -0,0 +1,50 @@ +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Journal; +using OSPSuite.Infrastructure.Journal.Commands; + +namespace OSPSuite.Infrastructure +{ + public class When_updating_a_journal_page_entry : ContextForJournalDatabase + { + private JournalPage _journalPage; + private JournalPage _parentJournalPage; + + protected override void Context() + { + base.Context(); + _journalPage = _journalPageFactory.Create(); + _journalPage.Title = "Test Title"; + + _parentJournalPage = _journalPageFactory.Create(); + _parentJournalPage.Title = "ParentTitle"; + + _databaseMediator.ExecuteCommand(new CreateJournalPage { JournalPage = _journalPage }); + _databaseMediator.ExecuteCommand(new CreateJournalPage { JournalPage = _parentJournalPage }); + + _journalPage.Title = "New Title"; + _journalPage.FullText = "AAAA"; + _journalPage.Origin = Origins.R; + _journalPage.AddTag("Tag1"); + _journalPage.AddTag("Tag2"); + _journalPage.ParentId = _parentJournalPage.Id; + } + + protected override void Because() + { + _databaseMediator.ExecuteCommand(new UpdateJournalPage { JournalPage = _journalPage }); + } + + [Observation] + public void should_be_able_to_retrieve_the_updated_content() + { + var workingJournalItemFromDb = JournalPageById(_journalPage.Id); + workingJournalItemFromDb.Title.ShouldBeEqualTo("New Title"); + workingJournalItemFromDb.OriginId.ShouldBeEqualTo(OriginId.R); + workingJournalItemFromDb.Tags.ShouldContain("Tag1", "Tag2"); + workingJournalItemFromDb.ParentId.ShouldBeEqualTo(_parentJournalPage.Id); + workingJournalItemFromDb.FullText.ShouldBeEqualTo("AAAA"); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Infrastructure/UpdateJournalPageTagsCommandSpecs.cs b/tests/OSPSuite.Core.Tests/Infrastructure/UpdateJournalPageTagsCommandSpecs.cs new file mode 100644 index 000000000..0f8dbfccc --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Infrastructure/UpdateJournalPageTagsCommandSpecs.cs @@ -0,0 +1,24 @@ +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Infrastructure.Journal.Commands; + +namespace OSPSuite.Infrastructure +{ + public class When_updating_the_tags_of_a_journal_page_entry : ContextForJournalDatabase + { + [Observation] + public void should_be_able_to_retrieve_the_updated_content() + { + var journalPage = _journalPageFactory.Create(); + journalPage.Title = "Test Title"; + _databaseMediator.ExecuteCommand(new CreateJournalPage { JournalPage = journalPage }); + + journalPage.AddTag("Tag1"); + journalPage.AddTag("Tag2"); + _databaseMediator.ExecuteCommand(new UpdateJournalPageTags { JournalPage = journalPage }); + + var journalPageFromDb = JournalPageById(journalPage.Id); + journalPageFromDb.Tags.ShouldOnlyContain("Tag1", "Tag2"); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj index ac7f7d596..c6953e7c3 100644 --- a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj +++ b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj @@ -166,6 +166,7 @@ + @@ -521,14 +522,27 @@ + + + + + + + + + + + + + @@ -704,6 +718,10 @@ OSPSuite.SimModelSolver_CVODES282.dll PreserveNewest + + SQLite.Interop.dll + PreserveNewest + OSPSuite.Dimensions.xml PreserveNewest From 6b2f25470388bda45b01bd6c6d537831cc9be4ec Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 23 Mar 2017 11:52:19 -0400 Subject: [PATCH 05/50] Fixes #12 format clipboard for github (#21) --- OSPSuite.Core.sln | 1 + appveyor.yml | 1 + .../Services/ExceptionManager.cs | 21 ++++- .../Views/IExceptionView.cs | 4 +- src/OSPSuite.UI/Views/ExceptionView.cs | 22 ++--- .../OSPSuite.Core.Tests.csproj | 1 + .../Presentation/ExceptionManagerSpecs.cs | 90 +++++++++++++++++++ 7 files changed, 121 insertions(+), 19 deletions(-) create mode 100644 tests/OSPSuite.Core.Tests/Presentation/ExceptionManagerSpecs.cs diff --git a/OSPSuite.Core.sln b/OSPSuite.Core.sln index 288200d9c..5e464131a 100644 --- a/OSPSuite.Core.sln +++ b/OSPSuite.Core.sln @@ -5,6 +5,7 @@ VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 14.0.24720.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9ED8AA66-5E2F-4900-846B-4D2758832061}" ProjectSection(SolutionItems) = preProject + appveyor-coverage.yml = appveyor-coverage.yml appveyor.yml = appveyor.yml copy_to_mobi.bat = copy_to_mobi.bat copy_to_pksim.bat = copy_to_pksim.bat diff --git a/appveyor.yml b/appveyor.yml index 10658c73c..9700cd142 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,6 +30,7 @@ build: publish_nuget: true verbosity: minimal include_nuget_references: true + project: OSPSuite.Core.sln skip_branch_with_pr: true diff --git a/src/OSPSuite.Presentation/Services/ExceptionManager.cs b/src/OSPSuite.Presentation/Services/ExceptionManager.cs index f317fb7be..01d5b2f25 100644 --- a/src/OSPSuite.Presentation/Services/ExceptionManager.cs +++ b/src/OSPSuite.Presentation/Services/ExceptionManager.cs @@ -15,13 +15,14 @@ public class ExceptionManager : ExceptionManagerBase { private readonly IDialogCreator _dialogCreator; private readonly IExceptionView _exceptionView; + private readonly string _productInfo; public ExceptionManager(IDialogCreator dialogCreator, IExceptionView exceptionView, IApplicationConfiguration configuration) { _dialogCreator = dialogCreator; _exceptionView = exceptionView; - var productInfo = $"{configuration.ProductNameWithTrademark} {configuration.FullVersion}"; - _exceptionView.Initialize($"{productInfo} - Error", configuration.Icon, productInfo, configuration.IssueTrackerUrl, configuration.ProductName); + _productInfo = $"{configuration.ProductNameWithTrademark} {configuration.FullVersion}"; + _exceptionView.Initialize($"{_productInfo} - Error", configuration.Icon, _productInfo, configuration.IssueTrackerUrl, configuration.ProductName); } public override void LogException(Exception ex) @@ -34,11 +35,23 @@ public override void LogException(Exception ex) } else { - _exceptionView.Display(ex); - this.LogError(ex); + showException(ex); } } + private void showException(Exception ex) + { + var message = ex.FullMessage(); + var stackTrace = ex.FullStackTrace(); + _exceptionView.Display(message, stackTrace, clipboardContentFrom(message, stackTrace)); + this.LogError(ex); + } + + private string clipboardContentFrom(string message, string stackTrace) + { + return $"Application:\n{_productInfo}\n\n{message}\n\nStack trace:\n```\n{stackTrace}\n```"; + } + private static bool isInfoException(Exception ex) { if (ex == null) diff --git a/src/OSPSuite.Presentation/Views/IExceptionView.cs b/src/OSPSuite.Presentation/Views/IExceptionView.cs index 8a0e378fd..a272f9d18 100644 --- a/src/OSPSuite.Presentation/Views/IExceptionView.cs +++ b/src/OSPSuite.Presentation/Views/IExceptionView.cs @@ -26,9 +26,9 @@ public interface IExceptionView string FullStackTrace { set; } /// - /// Displays the view, set the owner form and also sets exception and stack trace bypassing the value sets by the user + /// Displays the view, set the owner form and also sets exception, stack trace and clipboard content /// - void Display(Exception e); + void Display(string message, string stackTrace, string clipboardContent); /// /// Displays the view for the given owner diff --git a/src/OSPSuite.UI/Views/ExceptionView.cs b/src/OSPSuite.UI/Views/ExceptionView.cs index 0fae97dde..048ceda61 100644 --- a/src/OSPSuite.UI/Views/ExceptionView.cs +++ b/src/OSPSuite.UI/Views/ExceptionView.cs @@ -13,8 +13,9 @@ namespace OSPSuite.UI.Views { public partial class ExceptionView : XtraForm, IExceptionView { - private string _assemblyInfo; + private string _productInfo; private string _issueTrackerUrl; + private string _cliboardContent; private const string _couldNotCopyToClipboard = "Unable to copy the information to the clipboard."; public object MainView { private get; set; } @@ -63,7 +64,7 @@ public void Initialize(string caption, ApplicationIcon icon, string productInfo, { Text = caption; Icon = icon; - _assemblyInfo = productInfo; + _productInfo = productInfo; _issueTrackerUrl = issueTrackerUrl; Description = Captions.ExceptionViewDescription(issueTrackerUrl); issueTrackerLink.Text = Captions.IssueTrackerLinkFor(productName); @@ -97,14 +98,10 @@ private void invokeOnSTAThread(ThreadStart method) private void copyToClipboardOnUIThread() { - Clipboard.SetText(fullContent()); - } - - private string fullContent() - { - return $"Application:\n{_assemblyInfo}\n\n{ExceptionMessage}\n\nStack trace:\n{FullStackTrace}"; + Clipboard.SetText(_cliboardContent); } + private void showException(string message) { XtraMessageBox.Show(this, message, Text, MessageBoxButtons.OK, MessageBoxIcon.Error); @@ -145,13 +142,12 @@ private void showDialogWithOwner() } } - public void Display(Exception exception) + public void Display(string message, string stackTrace, string clipboardContent) { - ExceptionMessage = exception.FullMessage(); - FullStackTrace = exception.FullStackTrace(); + ExceptionMessage = message; + FullStackTrace = stackTrace; + _cliboardContent = clipboardContent; Display(); } - - } } \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj index c6953e7c3..e0b3dcbc2 100644 --- a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj +++ b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj @@ -592,6 +592,7 @@ + diff --git a/tests/OSPSuite.Core.Tests/Presentation/ExceptionManagerSpecs.cs b/tests/OSPSuite.Core.Tests/Presentation/ExceptionManagerSpecs.cs new file mode 100644 index 000000000..1d4fb35a1 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Presentation/ExceptionManagerSpecs.cs @@ -0,0 +1,90 @@ +using System; +using FakeItEasy; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core; +using OSPSuite.Core.Services; +using OSPSuite.Presentation.Services; +using OSPSuite.Presentation.Views; +using OSPSuite.Utility.Exceptions; +using OSPSuite.Utility.Extensions; + +namespace OSPSuite.Presentation +{ + public abstract class concern_for_ExceptionManager : ContextSpecification + { + protected IDialogCreator _dialogCreator; + protected IExceptionView _exceptionView; + private IApplicationConfiguration _configuration; + + protected override void Context() + { + _dialogCreator = A.Fake(); + _exceptionView = A.Fake(); + _configuration = A.Fake(); + sut = new ExceptionManager(_dialogCreator, _exceptionView, _configuration); + } + } + + public class When_showing_an_osp_suite_exception : concern_for_ExceptionManager + { + private Exception _exceptionToShow; + private Exception _childException; + private string _message; + + protected override void Context() + { + base.Context(); + _childException = new OSPSuiteException("ChildMessageError"); + _exceptionToShow = new OSPSuiteException("ParentMessageError", _childException); + A.CallTo(() => _dialogCreator.MessageBoxInfo(A.Ignored)).Invokes( + x => _message = x.GetArgument(0)); + } + + protected override void Because() + { + sut.LogException(_exceptionToShow); + } + + [Observation] + public void should_leverage_the_dialog_creator_to_display_an_error_message_containg_the_exception_message() + { + _message.Contains("ParentMessageError").ShouldBeTrue(); + _message.Contains("ChildMessageError").ShouldBeTrue(); + } + } + + public class When_show_a_generic_exception : concern_for_ExceptionManager + { + private Exception _exceptionToShow; + private string _message; + private string _stackTrace; + private string _clipboard; + + protected override void Context() + { + base.Context(); + _exceptionToShow = new Exception("Error"); + A.CallTo(() => _exceptionView.Display(A._, A._, A._)) + .Invokes(x => + { + _message = x.GetArgument(0); + _stackTrace = x.GetArgument(1); + _clipboard = x.GetArgument(2); + }); + } + + protected override void Because() + { + sut.LogException(_exceptionToShow); + } + + [Observation] + public void should_leverage_the_exception_view_to_display_an_error_message_containg_the_exception_message() + { + _message.ShouldBeEqualTo(_exceptionToShow.FullMessage()); + _stackTrace.ShouldBeEqualTo(_exceptionToShow.FullStackTrace()); + _clipboard.Contains($"```\n{_exceptionToShow.FullStackTrace()}\n```").ShouldBeTrue(); + } + } +} \ No newline at end of file From 1117942a8163bc37bec97b8e9b277952c3b3a757 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 23 Mar 2017 12:45:00 -0400 Subject: [PATCH 06/50] 22 update coverage integration (#23) * Update command line to remove namespaces that do not need coverage * Update token --- appveyor-coverage.yml | 4 ++-- scripts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor-coverage.yml b/appveyor-coverage.yml index 2d015bf20..9622a233b 100644 --- a/appveyor-coverage.yml +++ b/appveyor-coverage.yml @@ -33,9 +33,9 @@ build: project: OSPSuite.Core.sln test_script: - - rake cover["+[OSPSuite.Core]* +[OSPSuite.Assets]* +[OSPSuite.Infrastructure]* +[OSPSuite.Presentation]*"] + - rake cover["+[OSPSuite.Core]* +[OSPSuite.Assets]* +[OSPSuite.Infrastructure]* +[OSPSuite.Presentation]* -[OSPSuite.Infrastructure]OSPSuite.Infrastructure.Reporting* -[OSPSuite.Infrastructure]OSPSuite.Infrastructure.Serialization.ORM* -[OSPSuite.Presentation]OSPSuite.Presentation.MenuAndBars -[OSPSuite.Presentation]OSPSuite.Presentation.Presenters.ContextMenus",OSPSuite.Core.Tests.csproj] -install: +install: - git submodule update --init --recursive - ps: >- (new-object net.webclient).DownloadFile('https://download.microsoft.com/download/A/2/D/A2D8587D-0027-4217-9DAD-38AFDB0A177E/msxml.msi', 'C:\\msxml.msi') diff --git a/scripts b/scripts index 9482f13cd..f18c68d73 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 9482f13cdf895c752e63b88434270395c9aecdea +Subproject commit f18c68d7339bda7af808abd4a60990e3856a00f5 From 1ab7b37d9307c9311081c79dd4346ba93f1b2785 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 23 Mar 2017 13:00:06 -0400 Subject: [PATCH 07/50] Update ruby (#24) --- appveyor-coverage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor-coverage.yml b/appveyor-coverage.yml index 9622a233b..c128f2eed 100644 --- a/appveyor-coverage.yml +++ b/appveyor-coverage.yml @@ -36,6 +36,7 @@ test_script: - rake cover["+[OSPSuite.Core]* +[OSPSuite.Assets]* +[OSPSuite.Infrastructure]* +[OSPSuite.Presentation]* -[OSPSuite.Infrastructure]OSPSuite.Infrastructure.Reporting* -[OSPSuite.Infrastructure]OSPSuite.Infrastructure.Serialization.ORM* -[OSPSuite.Presentation]OSPSuite.Presentation.MenuAndBars -[OSPSuite.Presentation]OSPSuite.Presentation.Presenters.ContextMenus",OSPSuite.Core.Tests.csproj] install: + - set PATH=C:\Ruby22\bin;%PATH% - git submodule update --init --recursive - ps: >- (new-object net.webclient).DownloadFile('https://download.microsoft.com/download/A/2/D/A2D8587D-0027-4217-9DAD-38AFDB0A177E/msxml.msi', 'C:\\msxml.msi') From 94efa1c32a74ba468f8aa2ca3e4536c4a1788d2a Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Fri, 24 Mar 2017 09:05:17 -0400 Subject: [PATCH 08/50] Update README.md Use develop for appveyor badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9b937d85b..600646c72 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Core functionalities of the Open Systems Pharmacology Suite. ## Code Status [![NuGet version](https://img.shields.io/nuget/v/OSPSuite.Core.svg?style=flat)](https://www.nuget.org/packages/OSPSuite.Core) -[![Build status](https://ci.appveyor.com/api/projects/status/w3ecxmp3grryc5ts/branch/master?svg=true&passingText=master%20-%20passing)](https://ci.appveyor.com/project/open-systems-pharmacology-ci/ospsuite-core/branch/master) +[![Build status](https://ci.appveyor.com/api/projects/status/w3ecxmp3grryc5ts/branch/develop?svg=true)](https://ci.appveyor.com/project/open-systems-pharmacology-ci/ospsuite-core/branch/develop) [![Coverage Status](https://coveralls.io/repos/github/Open-Systems-Pharmacology/OSPSuite.Core/badge.svg?branch=develop)](https://coveralls.io/github/Open-Systems-Pharmacology/OSPSuite.Core?branch=develop) ## Code of conduct From 01ee7f824add85be886dd2eea528b60dbc3e9fd2 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Fri, 24 Mar 2017 14:59:09 -0400 Subject: [PATCH 09/50] Fixes #25 use rake for copy scripts instead of batch (#26) --- copy_to_mobi.bat | 9 ++------- copy_to_pksim.bat | 9 ++------- rakefile.rb | 31 +++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/copy_to_mobi.bat b/copy_to_mobi.bat index 6c0b30bfe..0d2409151 100644 --- a/copy_to_mobi.bat +++ b/copy_to_mobi.bat @@ -1,9 +1,4 @@ @echo off - -set SolutionDir=%~d0%~p0 -set SrcDir=%SolutionDir%src\ -set AppDebugDir=%SolutionDir%..\MoBi\src\MoBi\bin\Debug\ - -copy "%SrcDir%OSPSuite.UI\bin\debug\OSPSuite*.dll" "%AppDebugDir%" -copy "%SrcDir%OSPSuite.UI\bin\debug\OSPSuite*.pdb" "%AppDebugDir%" +cls +rake copy_to_mobi pause \ No newline at end of file diff --git a/copy_to_pksim.bat b/copy_to_pksim.bat index 00178f625..25e0684c0 100644 --- a/copy_to_pksim.bat +++ b/copy_to_pksim.bat @@ -1,9 +1,4 @@ @echo off - -set SolutionDir=%~d0%~p0 -set SrcDir=%SolutionDir%src\ -set AppDebugDir=%SolutionDir%..\PK-Sim\src\PKSim\bin\Debug - -copy "%SrcDir%OSPSuite.UI\bin\debug\OSPSuite*.dll" "%AppDebugDir%" -copy "%SrcDir%OSPSuite.UI\bin\debug\OSPSuite*.pdb" "%AppDebugDir%" +cls +rake copy_to_pksim pause \ No newline at end of file diff --git a/rakefile.rb b/rakefile.rb index 1ac4ccf28..ad028b00d 100644 --- a/rakefile.rb +++ b/rakefile.rb @@ -1 +1,32 @@ require_relative 'scripts/coverage' +require_relative 'scripts/copy-dependencies' + +task :copy_to_pksim do + copy_to_app '../PK-Sim/src/PKSim/bin/Debug/' +end + +task :copy_to_mobi do + copy_to_app '../MoBi/src/MoBi/bin/Debug/' +end + +private + +def copy_to_app(app_target_relative_path) + app_target_path = File.join(solution_dir, app_target_relative_path) + source_dir = File.join(src_dir, 'OSPSuite.UI', 'bin', 'Debug') + + copy_depdencies source_dir, app_target_path do + copy_file 'OSPSuite.*.dll' + copy_file 'OSPSuite.*.pdb' + end + +end + +def solution_dir + File.dirname(__FILE__) +end + +def src_dir + File.join(solution_dir, 'src') +end + \ No newline at end of file From ab88a3c1a01c44d761269eeb198e69fe170f56fe Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Fri, 24 Mar 2017 15:12:24 -0400 Subject: [PATCH 10/50] Only enable build for master and develop for now --- appveyor.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 9700cd142..2f555db53 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,6 +34,11 @@ build: skip_branch_with_pr: true +branches: + only: + - master + - develop + test: assemblies: - OSPSuite.Core.Tests.dll From 320368f7e6fd6608e6922c3c73fbe0624891d1b7 Mon Sep 17 00:00:00 2001 From: Robert McIntosh Date: Mon, 27 Mar 2017 15:34:50 -0400 Subject: [PATCH 11/50] Fixes #27 - Change coverage service to codecov.io (#28) --- README.md | 2 +- appveyor-coverage.yml | 7 +++---- rakefile.rb | 15 +++++++++++++++ scripts | 2 +- tests/OSPSuite.Core.Tests/packages.config | 1 - 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 600646c72..ce75cfc43 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Core functionalities of the Open Systems Pharmacology Suite. ## Code Status [![NuGet version](https://img.shields.io/nuget/v/OSPSuite.Core.svg?style=flat)](https://www.nuget.org/packages/OSPSuite.Core) [![Build status](https://ci.appveyor.com/api/projects/status/w3ecxmp3grryc5ts/branch/develop?svg=true)](https://ci.appveyor.com/project/open-systems-pharmacology-ci/ospsuite-core/branch/develop) -[![Coverage Status](https://coveralls.io/repos/github/Open-Systems-Pharmacology/OSPSuite.Core/badge.svg?branch=develop)](https://coveralls.io/github/Open-Systems-Pharmacology/OSPSuite.Core?branch=develop) +[![Coverage status](https://codecov.io/gh/Open-Systems-Pharmacology/OSPSuite.Core/branch/develop/graph/badge.svg)](https://codecov.io/gh/Open-Systems-Pharmacology/OSPSuite.Core) ## Code of conduct 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). diff --git a/appveyor-coverage.yml b/appveyor-coverage.yml index c128f2eed..c21e4c04b 100644 --- a/appveyor-coverage.yml +++ b/appveyor-coverage.yml @@ -2,8 +2,6 @@ configuration: Debug environment: app_version: '7.1.0' - COVERALLS_REPO_TOKEN: - secure: RNtCVakeVmnnxGR4djlmhBbE83cx/t4sqqFkqhQLeHw8uf5n5UT0rvYGdkNseeIi version: '%app_version%.{build}' @@ -33,10 +31,11 @@ build: project: OSPSuite.Core.sln test_script: - - rake cover["+[OSPSuite.Core]* +[OSPSuite.Assets]* +[OSPSuite.Infrastructure]* +[OSPSuite.Presentation]* -[OSPSuite.Infrastructure]OSPSuite.Infrastructure.Reporting* -[OSPSuite.Infrastructure]OSPSuite.Infrastructure.Serialization.ORM* -[OSPSuite.Presentation]OSPSuite.Presentation.MenuAndBars -[OSPSuite.Presentation]OSPSuite.Presentation.Presenters.ContextMenus",OSPSuite.Core.Tests.csproj] + - rake cover install: - - set PATH=C:\Ruby22\bin;%PATH% + - set PATH=C:\Ruby22\bin;C:\\Python34;C:\\Python34\\Scripts;%PATH%" + - pip install codecov - git submodule update --init --recursive - ps: >- (new-object net.webclient).DownloadFile('https://download.microsoft.com/download/A/2/D/A2D8587D-0027-4217-9DAD-38AFDB0A177E/msxml.msi', 'C:\\msxml.msi') diff --git a/rakefile.rb b/rakefile.rb index ad028b00d..9e647c737 100644 --- a/rakefile.rb +++ b/rakefile.rb @@ -1,6 +1,21 @@ require_relative 'scripts/coverage' require_relative 'scripts/copy-dependencies' +task :cover do + filter = [] + filter << "+[OSPSuite.Core]*" + filter << "+[OSPSuite.Infrastructure]*" + filter << "+[OSPSuite.Presentation]*" + + #exclude namespaces that are tested from applications + filter << "-[OSPSuite.Infrastructure]OSPSuite.Infrastructure.Reporting*" + filter << "-[OSPSuite.Infrastructure]OSPSuite.Infrastructure.Serialization.ORM*" + filter << "-[OSPSuite.Presentation]OSPSuite.Presentation.MenuAndBars" + filter << "-[OSPSuite.Presentation]OSPSuite.Presentation.Presenters.ContextMenus" + + Coverage.cover(filter, "OSPSuite.Core.Tests.csproj") +end + task :copy_to_pksim do copy_to_app '../PK-Sim/src/PKSim/bin/Debug/' end diff --git a/scripts b/scripts index f18c68d73..1f7603305 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit f18c68d7339bda7af808abd4a60990e3856a00f5 +Subproject commit 1f760330518b4d74f79a123b42d646aa7686854f diff --git a/tests/OSPSuite.Core.Tests/packages.config b/tests/OSPSuite.Core.Tests/packages.config index db37be32a..dc77ee8ac 100644 --- a/tests/OSPSuite.Core.Tests/packages.config +++ b/tests/OSPSuite.Core.Tests/packages.config @@ -2,7 +2,6 @@ - From cc96d45701a72d35f29536dfb4bd5859691fd4ae Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Mon, 27 Mar 2017 15:37:27 -0400 Subject: [PATCH 12/50] Fixes #29 register context menu with dedicated convention (#30) --- .../OSPSuite.Presentation.csproj | 1 + .../PresentationRegister.cs | 33 +++++++++++++------ .../ContextMenuRegistrationConvention.cs | 20 +++++++++++ 3 files changed, 44 insertions(+), 10 deletions(-) create mode 100644 src/OSPSuite.Presentation/Presenters/ContextMenus/ContextMenuRegistrationConvention.cs diff --git a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj index dfba0ccb7..e0bf62bed 100644 --- a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj +++ b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj @@ -126,6 +126,7 @@ + diff --git a/src/OSPSuite.Presentation/PresentationRegister.cs b/src/OSPSuite.Presentation/PresentationRegister.cs index 325293970..b32882c9e 100644 --- a/src/OSPSuite.Presentation/PresentationRegister.cs +++ b/src/OSPSuite.Presentation/PresentationRegister.cs @@ -55,17 +55,10 @@ public override void RegisterInContainer(IContainer container) scan.ExcludeType(); }); - container.AddScanner(scan => - { - scan.AssemblyContainingType(); - //Commands - scan.IncludeNamespaceContainingType(); - - //Context Menus - scan.IncludeNamespaceContainingType(); - scan.WithConvention(new ConcreteTypeRegistrationConvention()); - }); + registerUICommands(container); + registerContextMenus(container); + registerSingleStartPresenters(container); //OPEN TYPES @@ -86,6 +79,26 @@ public override void RegisterInContainer(IContainer container) container.Register(); } + private static void registerContextMenus(IContainer container) + { + container.AddScanner(scan => + { + scan.AssemblyContainingType(); + scan.IncludeNamespaceContainingType(); + scan.WithConvention(); + }); + } + + private static void registerUICommands(IContainer container) + { + container.AddScanner(scan => + { + scan.AssemblyContainingType(); + scan.IncludeNamespaceContainingType(); + scan.WithConvention(); + }); + } + private static void registerSingleStartPresenters(IContainer container) { container.AddScanner(scan => diff --git a/src/OSPSuite.Presentation/Presenters/ContextMenus/ContextMenuRegistrationConvention.cs b/src/OSPSuite.Presentation/Presenters/ContextMenus/ContextMenuRegistrationConvention.cs new file mode 100644 index 000000000..df57e34f9 --- /dev/null +++ b/src/OSPSuite.Presentation/Presenters/ContextMenus/ContextMenuRegistrationConvention.cs @@ -0,0 +1,20 @@ +using System; +using System.Linq; +using OSPSuite.Utility.Container; +using OSPSuite.Utility.Container.Conventions; + +namespace OSPSuite.Presentation.Presenters.ContextMenus +{ + public class ContextMenuRegistrationConvention : IRegistrationConvention + { + public void Process(Type concreteType, IContainer container, LifeStyle lifeStyle) + { + var allInterfaces = concreteType.GetInterfaces() + .Where(x => x.IsInterface) + .ToList(); + + allInterfaces.Add(concreteType); + container.Register(allInterfaces, concreteType, lifeStyle); + } + } +} \ No newline at end of file From da1b93a1653f098f1610c10afc6cee30e9d36659 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Mon, 27 Mar 2017 16:36:08 -0400 Subject: [PATCH 13/50] Fixes #31 remove duplicate registration (#32) --- scripts | 2 +- .../OSPSuite.Presentation.csproj | 1 - .../PresentationRegister.cs | 2 +- .../ContextMenuRegistrationConvention.cs | 20 ------------------- 4 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 src/OSPSuite.Presentation/Presenters/ContextMenus/ContextMenuRegistrationConvention.cs diff --git a/scripts b/scripts index 1f7603305..f18c68d73 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 1f760330518b4d74f79a123b42d646aa7686854f +Subproject commit f18c68d7339bda7af808abd4a60990e3856a00f5 diff --git a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj index e0bf62bed..dfba0ccb7 100644 --- a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj +++ b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj @@ -126,7 +126,6 @@ - diff --git a/src/OSPSuite.Presentation/PresentationRegister.cs b/src/OSPSuite.Presentation/PresentationRegister.cs index b32882c9e..79864e8c8 100644 --- a/src/OSPSuite.Presentation/PresentationRegister.cs +++ b/src/OSPSuite.Presentation/PresentationRegister.cs @@ -85,7 +85,7 @@ private static void registerContextMenus(IContainer container) { scan.AssemblyContainingType(); scan.IncludeNamespaceContainingType(); - scan.WithConvention(); + scan.WithConvention(); }); } diff --git a/src/OSPSuite.Presentation/Presenters/ContextMenus/ContextMenuRegistrationConvention.cs b/src/OSPSuite.Presentation/Presenters/ContextMenus/ContextMenuRegistrationConvention.cs deleted file mode 100644 index df57e34f9..000000000 --- a/src/OSPSuite.Presentation/Presenters/ContextMenus/ContextMenuRegistrationConvention.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Linq; -using OSPSuite.Utility.Container; -using OSPSuite.Utility.Container.Conventions; - -namespace OSPSuite.Presentation.Presenters.ContextMenus -{ - public class ContextMenuRegistrationConvention : IRegistrationConvention - { - public void Process(Type concreteType, IContainer container, LifeStyle lifeStyle) - { - var allInterfaces = concreteType.GetInterfaces() - .Where(x => x.IsInterface) - .ToList(); - - allInterfaces.Add(concreteType); - container.Register(allInterfaces, concreteType, lifeStyle); - } - } -} \ No newline at end of file From 8ae6bc26beb35f662b6e71efdc09c8aaa089b0cf Mon Sep 17 00:00:00 2001 From: Robert McIntosh Date: Mon, 27 Mar 2017 19:09:10 -0400 Subject: [PATCH 14/50] Fixes #27 - Change coverage service to codecov.io (#33) --- scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts b/scripts index f18c68d73..1f7603305 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit f18c68d7339bda7af808abd4a60990e3856a00f5 +Subproject commit 1f760330518b4d74f79a123b42d646aa7686854f From b8bcbc5223e88541c0c1339f33a92207e1adb0a6 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 29 Mar 2017 09:56:09 -0400 Subject: [PATCH 15/50] Fixes #34 move some tests from PKSim to Core (#35) --- rakefile.rb | 4 +- scripts | 2 +- .../Domain/ClassifiableObservedData.cs | 5 +- .../Helpers/ClassifiableSimulation.cs | 11 + .../Helpers/DomainHelperForSpecs.cs | 2 + .../Helpers/SimulationNode.cs | 11 + tests/OSPSuite.Core.Tests/Helpers/TestNode.cs | 14 +- .../OSPSuite.Core.Tests.csproj | 5 + .../ClassificationPresenterSpecs.cs | 599 ++++++++++++++++++ .../Presentation/ObjectBaseNodeSpecs.cs | 90 +++ .../Presentation/SubPresenterItemSpecs.cs | 40 ++ 11 files changed, 766 insertions(+), 17 deletions(-) create mode 100644 tests/OSPSuite.Core.Tests/Helpers/ClassifiableSimulation.cs create mode 100644 tests/OSPSuite.Core.Tests/Helpers/SimulationNode.cs create mode 100644 tests/OSPSuite.Core.Tests/Presentation/ClassificationPresenterSpecs.cs create mode 100644 tests/OSPSuite.Core.Tests/Presentation/ObjectBaseNodeSpecs.cs create mode 100644 tests/OSPSuite.Core.Tests/Presentation/SubPresenterItemSpecs.cs diff --git a/rakefile.rb b/rakefile.rb index 9e647c737..942e02ae5 100644 --- a/rakefile.rb +++ b/rakefile.rb @@ -10,8 +10,8 @@ #exclude namespaces that are tested from applications filter << "-[OSPSuite.Infrastructure]OSPSuite.Infrastructure.Reporting*" filter << "-[OSPSuite.Infrastructure]OSPSuite.Infrastructure.Serialization.ORM*" - filter << "-[OSPSuite.Presentation]OSPSuite.Presentation.MenuAndBars" - filter << "-[OSPSuite.Presentation]OSPSuite.Presentation.Presenters.ContextMenus" + filter << "-[OSPSuite.Presentation]OSPSuite.Presentation.MenuAndBars*" + filter << "-[OSPSuite.Presentation]OSPSuite.Presentation.Presenters.ContextMenus*" Coverage.cover(filter, "OSPSuite.Core.Tests.csproj") end diff --git a/scripts b/scripts index 1f7603305..f18c68d73 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 1f760330518b4d74f79a123b42d646aa7686854f +Subproject commit f18c68d7339bda7af808abd4a60990e3856a00f5 diff --git a/src/OSPSuite.Core/Domain/ClassifiableObservedData.cs b/src/OSPSuite.Core/Domain/ClassifiableObservedData.cs index 91f95b35c..8a94fc006 100644 --- a/src/OSPSuite.Core/Domain/ClassifiableObservedData.cs +++ b/src/OSPSuite.Core/Domain/ClassifiableObservedData.cs @@ -19,9 +19,6 @@ public string ExtendedPropertyValueFor(string propertyName) return Subject.ExtendedPropertyValueFor(propertyName); } - public DataRepository Repository - { - get { return Subject; } - } + public DataRepository Repository => Subject; } } \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Helpers/ClassifiableSimulation.cs b/tests/OSPSuite.Core.Tests/Helpers/ClassifiableSimulation.cs new file mode 100644 index 000000000..2a06f2430 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Helpers/ClassifiableSimulation.cs @@ -0,0 +1,11 @@ +using OSPSuite.Core.Domain; + +namespace OSPSuite.Helpers +{ + public class ClassifiableSimulation : Classifiable + { + public ClassifiableSimulation() : base(ClassificationType.Simulation) + { + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Helpers/DomainHelperForSpecs.cs b/tests/OSPSuite.Core.Tests/Helpers/DomainHelperForSpecs.cs index 507292014..5745af481 100644 --- a/tests/OSPSuite.Core.Tests/Helpers/DomainHelperForSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Helpers/DomainHelperForSpecs.cs @@ -185,4 +185,6 @@ public PathCacheForSpecs() : base(new EntityPathResolverForSpecs()) { } } + + } \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Helpers/SimulationNode.cs b/tests/OSPSuite.Core.Tests/Helpers/SimulationNode.cs new file mode 100644 index 000000000..1577844a2 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Helpers/SimulationNode.cs @@ -0,0 +1,11 @@ +using OSPSuite.Presentation.Presenters.Nodes; + +namespace OSPSuite.Helpers +{ + public class SimulationNode : ObjectWithIdAndNameNode + { + public SimulationNode(ClassifiableSimulation tag) : base(tag) + { + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Helpers/TestNode.cs b/tests/OSPSuite.Core.Tests/Helpers/TestNode.cs index 58af6ee8b..ed6ceed72 100644 --- a/tests/OSPSuite.Core.Tests/Helpers/TestNode.cs +++ b/tests/OSPSuite.Core.Tests/Helpers/TestNode.cs @@ -5,10 +5,9 @@ namespace OSPSuite.Helpers { public class TestNode : AbstractNode { - private readonly string _id; private readonly string _name; - public TestNode():this(string.Empty) + public TestNode() : this(string.Empty) { } @@ -17,18 +16,13 @@ public TestNode(string name) { } - public TestNode(string id, string name):base(id) + public TestNode(string id, string name) : base(id) { - _id = id; + Id = id; _name = name; Text = _name; } - public override string Id - { - get { return _id; } - } - - + public override string Id { get; } } } \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj index e0b3dcbc2..68d06d1ca 100644 --- a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj +++ b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj @@ -166,7 +166,9 @@ + + @@ -559,6 +561,7 @@ + @@ -624,6 +627,7 @@ + @@ -690,6 +694,7 @@ + diff --git a/tests/OSPSuite.Core.Tests/Presentation/ClassificationPresenterSpecs.cs b/tests/OSPSuite.Core.Tests/Presentation/ClassificationPresenterSpecs.cs new file mode 100644 index 000000000..aed9c5889 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Presentation/ClassificationPresenterSpecs.cs @@ -0,0 +1,599 @@ +using System.Linq; +using FakeItEasy; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Data; +using OSPSuite.Core.Domain.Services; +using OSPSuite.Helpers; +using OSPSuite.Presentation.Core; +using OSPSuite.Presentation.Mappers; +using OSPSuite.Presentation.Nodes; +using OSPSuite.Presentation.Presenters; +using OSPSuite.Presentation.Presenters.Classifications; +using OSPSuite.Presentation.Presenters.Nodes; +using OSPSuite.Utility.Collections; +using OSPSuite.Utility.Extensions; + +namespace OSPSuite.Presentation +{ + public abstract class concern_for_ClassificationPresenter : ContextSpecification + { + protected IClassificationTypeToRootNodeTypeMapper _rootNodeTypeMapper; + private IProjectRetriever _projectRetriever; + protected IExplorerPresenter _explorerPresenter; + protected IApplicationController _applicationController; + protected IProject _project; + protected RootNode _simulationFolderNode; + protected RootNode _observedDataFolderNode; + + protected Cache> _classificationNodesCache; + + protected override void Context() + { + _rootNodeTypeMapper = A.Fake(); + _projectRetriever = A.Fake(); + _applicationController = A.Fake(); + _project = new TestProject(); + _classificationNodesCache = new Cache>(x => x.Tag, x => null); + + A.CallTo(() => _projectRetriever.CurrentProject).Returns(_project); + sut = new ClassificationPresenter(_rootNodeTypeMapper, _applicationController, _projectRetriever); + + _explorerPresenter = A.Fake(); + sut.InitializeWith(_explorerPresenter); + + _simulationFolderNode = createRootNode(RootNodeTypes.SimulationFolder, ClassificationType.Simulation); + _observedDataFolderNode = createRootNode(RootNodeTypes.ObservedDataFolder, ClassificationType.ObservedData); + + A.CallTo(() => _explorerPresenter.AddNode(A._)) + .Invokes(x => + { + var classificationNode = x.GetArgument(0) as ITreeNode; + if (classificationNode != null) + addToCache(classificationNode); + }); + + A.CallTo(() => _explorerPresenter.RemoveNode(A._)) + .Invokes(x => + { + var classificationNode = x.GetArgument(0) as ITreeNode; + if (classificationNode != null) + removeFromCache(classificationNode); + }); + } + + private void removeFromCache(ITreeNode classificationNode) + { + if (_classificationNodesCache.Contains(classificationNode.Tag)) + _classificationNodesCache.Remove(classificationNode.Tag); + } + + private void addToCache(ITreeNode classificationNode) + { + if (!_classificationNodesCache.Contains(classificationNode.Tag)) + _classificationNodesCache.Add(classificationNode); + } + + private RootNode createRootNode(RootNodeType rootNodeType, ClassificationType classificationType) + { + var node = new RootNode(rootNodeType); + A.CallTo(() => _rootNodeTypeMapper.MapFrom(classificationType)).Returns(rootNodeType); + A.CallTo(() => _explorerPresenter.NodeByType(rootNodeType)).Returns(node); + return node; + } + } + + public class When_the_presenter_is_asked_to_remove_classification_node : concern_for_ClassificationPresenter + { + protected ITreeNode _parentNode; + + protected override void Context() + { + base.Context(); + var root = new Classification(); + var rootNode = new ClassificationNode(root); + var parent = new Classification(); + _parentNode = A.Fake>(); + A.CallTo(() => _parentNode.Tag).Returns(parent); + + _parentNode.Under(rootNode); + } + + protected override void Because() + { + sut.RemoveClassification(_parentNode); + } + + [Observation] + public void the_node_should_be_cleared_from_the_view() + { + A.CallTo(() => _explorerPresenter.RemoveNode(A.Ignored)).MustHaveHappened(); + } + + [Observation] + public void the_node_should_be_removed() + { + A.CallTo(() => _parentNode.Delete()).MustHaveHappened(); + } + } + + public class When_the_classification_presenter_is_creating_a_classification_node_for_a_given_classification : concern_for_ClassificationPresenter + { + private IClassification _classification; + private IClassification _parent; + + protected override void Context() + { + base.Context(); + _parent = new Classification { ClassificationType = ClassificationType.ObservedData } + .WithId("parent").WithName("parent"); + + _classification = new Classification { ClassificationType = ClassificationType.ObservedData } + .WithId("child").WithName("child"); + + _classification.Parent = _parent; + } + + protected override void Because() + { + sut.AddClassificationsToTree(new[] { _parent, _classification }); + } + + [Observation] + public void should_create_a_node_for_each_classification_in_the_hiearchy() + { + var node = _classificationNodesCache[_classification]; + var parentNode = node.ParentNode.DowncastTo>(); + node.ShouldNotBeNull(); + node.Tag.ShouldBeEqualTo(_classification); + node.RootNode.ShouldBeEqualTo(_observedDataFolderNode); + parentNode.Tag.ShouldBeEqualTo(_parent); + } + } + + public class When_creating_a_classification_folder : concern_for_ClassificationPresenter + { + private INameClassificationPresenter _presenter; + private ITreeNode _parentClassificationNode; + private IClassification _parentClassification; + + protected override void Context() + { + base.Context(); + _presenter = A.Fake(); + A.CallTo(() => _applicationController.Start()).Returns(_presenter); + //required to use this unspecific CallTo because of an issue with enum type + A.CallTo(_presenter).WithReturnType().Returns(true); + A.CallTo(() => _presenter.Name).Returns("CLASS"); + _parentClassification = new Classification { ClassificationType = ClassificationType.Simulation }; + _project.AddClassification(_parentClassification); + _parentClassificationNode = new ClassificationNode(_parentClassification); + A.CallTo(() => _explorerPresenter.NodeFor(A._)).Returns(null); + } + + protected override void Because() + { + sut.CreateClassificationFolderUnder(_parentClassificationNode); + } + + [Observation] + public void should_ask_the_user_to_enter_a_new_name_for_the_classification_and_the_returned_node_should_represent_the_classificaiton_node() + { + var newClassification = _project.AllClassificationsByType(ClassificationType.Simulation).FindByName("CLASS"); + newClassification.ShouldNotBeNull(); + newClassification.Parent.ShouldBeEqualTo(_parentClassification); + } + } + + public class When_renaning_a_classifiaction : concern_for_ClassificationPresenter + { + private ITreeNode _classificationNode; + private IClassification _classification; + private IRenameClassificationPresenter _presenter; + + protected override void Context() + { + base.Context(); + _classificationNode = A.Fake>(); + _classification = A.Fake().WithName("OLD_NAME"); + _presenter = A.Fake(); + A.CallTo(() => _classificationNode.Tag).Returns(_classification); + A.CallTo(() => _applicationController.Start()).Returns(_presenter); + A.CallTo(() => _presenter.Rename(_classification)).Returns(true); + A.CallTo(() => _presenter.Name).Returns("NEW_NAME"); + } + + protected override void Because() + { + sut.RenameClassification(_classificationNode); + } + + [Observation] + public void should_ask_the_user_to_enter_a_new_name_for_the_classification() + { + A.CallTo(() => _presenter.Rename(_classification)).MustHaveHappened(); + } + + [Observation] + public void should_have_renamed_the_classification() + { + _classification.Name.ShouldBeEqualTo("NEW_NAME"); + } + } + + public class When_grouping_all_classifications_defined_in_a_project_by_a_given_category : concern_for_ClassificationPresenter + { + private ClassifiableSimulation _simulation1; + private ClassifiableSimulation _simulation2; + private ClassifiableSimulation _simulation3WithParent; + private ClassifiableObservedData _observedData; + + protected override void Context() + { + base.Context(); + var simulation1 = A.Fake().WithId("1"); + _simulation1 = new ClassifiableSimulation { Subject = A.Fake().WithId("1") }; + _simulation2 = new ClassifiableSimulation { Subject = A.Fake().WithId("2") }; + var parentClassification = new Classification { ClassificationType = ClassificationType.Simulation }; + _simulation3WithParent = new ClassifiableSimulation { Subject = A.Fake().WithId("3"), Parent = parentClassification }; + _observedData = new ClassifiableObservedData { Subject = new DataRepository() }; + _project.AddClassifiable(_simulation1); + _project.AddClassifiable(_simulation2); + _project.AddClassifiable(_simulation3WithParent); + _project.AddClassifiable(_observedData); + var simulationNode1 = new SimulationNode(_simulation1); + A.CallTo(() => _explorerPresenter.NodeFor(_simulation1)).Returns(simulationNode1); + var simulationNode2 = new SimulationNode(_simulation2); + var simulationNode3 = new SimulationNode(_simulation3WithParent); + A.CallTo(() => _explorerPresenter.NodeFor(_simulation2)).Returns(simulationNode2); + A.CallTo(() => _explorerPresenter.NodeFor(_simulation3WithParent)).Returns(simulationNode3); + A.CallTo(() => _explorerPresenter.NodeFor(_observedData)).Returns(new ObservedDataNode(_observedData)); + var parentClassificationNode = new ClassificationNode(parentClassification); + A.CallTo(() => _explorerPresenter.NodeFor(parentClassification)).Returns(parentClassificationNode); + _simulationFolderNode.AddChild(simulationNode1); + _simulationFolderNode.AddChild(simulationNode2); + _simulationFolderNode.AddChild(parentClassificationNode); + + } + + protected override void Because() + { + sut.GroupClassificationsByCategory(_simulationFolderNode, "Individual", x => "Human"); + } + + [Observation] + public void should_have_created_a_classifiaction_named_after_the_distinct_category_values() + { + humanClassification.ShouldNotBeNull(); + } + + private IClassification humanClassification + { + get { return _project.AllClassificationsByType(ClassificationType.Simulation).FindByName("Human"); } + } + + [Observation] + public void should_have_moved_the_node_for_the_simulations_that_were_not_classified_under_the_newly_created_classification() + { + _simulation1.Parent.ShouldBeEqualTo(humanClassification); + _simulation2.Parent.ShouldBeEqualTo(humanClassification); + } + + [Observation] + public void should_not_have_moved_the_node_for_the_simulations_that_were_already_classified() + { + _simulation3WithParent.Parent.ShouldNotBeEqualTo(humanClassification); + } + + [Observation] + public void should_not_have_moved_the_node_for_the_classifiable_that_do_not_have_the_right_type() + { + _observedData.Parent.ShouldNotBeEqualTo(humanClassification); + } + } + + public class When_removing_a_classification_folder_containing_classifiable_items : concern_for_ClassificationPresenter + { + private Classification _parentClassification; + private Classification _childClassification; + private ClassifiableSimulation _simulation; + private ITreeNode _childClassificationNode; + private ITreeNode _parentClassificationNode; + private SimulationNode _simulationNode; + + protected override void Context() + { + base.Context(); + + _parentClassification = new Classification { ClassificationType = ClassificationType.Simulation, Name = "parent" }; + _childClassification = new Classification { ClassificationType = ClassificationType.Simulation, Name = "child", Parent = _parentClassification }; + + sut.AddClassificationsToTree(new[] { _childClassification, _parentClassification }); + + //do that after so that real node and node fakes are created when adding the classificaiton to the tree + _project.AddClassification(_childClassification); + _project.AddClassification(_parentClassification); + + _simulation = new ClassifiableSimulation { Parent = _childClassification, Subject = A.Fake().WithId("Sim") }; + + _childClassificationNode = _classificationNodesCache[_childClassification]; + _simulationNode = new SimulationNode(_simulation); + _childClassificationNode.AddChild(_simulationNode); + + _parentClassificationNode = _childClassificationNode.ParentNode.DowncastTo>(); + } + + protected override void Because() + { + sut.RemoveClassification(_childClassificationNode); + } + + [Observation] + public void should_move_the_classifiable_node_to_the_parent_classification() + { + _parentClassificationNode.Children.ShouldContain(_simulationNode); + } + + [Observation] + public void should_attach_the_simulation_to_the_parent_classificaiton() + { + _simulation.Parent.ShouldBeEqualTo(_parentClassification); + } + + [Observation] + public void should_remove_the_classification_node_from_the_underlying_cache() + { + _classificationNodesCache[_childClassification].ShouldBeNull(); + } + + [Observation] + public void should_remove_the_classification_from_the_project() + { + _project.AllClassifications.Contains(_childClassification).ShouldBeFalse(); + } + + [Observation] + public void should_remove_the_classification_node_from_the_view() + { + _childClassificationNode.ParentNode.ShouldBeNull(); + _parentClassificationNode.Children.Contains(_childClassificationNode).ShouldBeFalse(); + } + } + + public class When_removing_a_classification_would_result_in_a_duplicate_node : concern_for_ClassificationPresenter + { + private IClassification _humanClassification; + private IClassification _humanOralClassification; + private IClassification _oralClassification; + private ClassifiableSimulation _simulation1; + private ClassifiableSimulation _simulation2; + private ITreeNode _humanOralClassificationNode; + private ITreeNode _humanClassificationNode; + private ITreeNode _oralClassificationNode; + + protected override void Context() + { + base.Context(); + //create the following tree + //human => oral=>S1 + //oral=>S2 + _humanClassification = new Classification { ClassificationType = ClassificationType.Simulation, Name = "human" }; + _humanOralClassification = new Classification { ClassificationType = ClassificationType.Simulation, Name = "oral", Parent = _humanClassification }; + _oralClassification = new Classification { ClassificationType = ClassificationType.Simulation, Name = "oral" }; + + sut.AddClassificationsToTree(new[] { _humanOralClassification, _humanClassification, _oralClassification }); + + _project.AddClassification(_humanOralClassification); + _project.AddClassification(_humanClassification); + _project.AddClassification(_oralClassification); + + _simulation1 = new ClassifiableSimulation { Parent = _humanOralClassification, Subject = A.Fake().WithName("S1")}; + _simulation2 = new ClassifiableSimulation { Parent = _oralClassification, Subject = A.Fake().WithName("S2") }; + + _humanOralClassificationNode = _classificationNodesCache[_humanOralClassification]; + _oralClassificationNode = _classificationNodesCache[_oralClassification]; + var simulation1Node = new SimulationNode(_simulation1).Under(_humanOralClassificationNode); + var simulation2Node = new SimulationNode(_simulation2).Under(_oralClassificationNode); + + _humanClassificationNode = _humanOralClassificationNode.ParentNode.DowncastTo>(); + + A.CallTo(() => _explorerPresenter.NodeFor(_humanOralClassification)).Returns(_humanOralClassificationNode); + A.CallTo(() => _explorerPresenter.NodeFor(_oralClassification)).Returns(_oralClassificationNode); + A.CallTo(() => _explorerPresenter.NodeFor(_humanClassification)).Returns(_humanClassificationNode); + } + + protected override void Because() + { + sut.RemoveClassification(_humanClassificationNode); + } + + [Observation] + public void should_move_the_classifiable_from_the_duplicate_into_the_equivalent_classification() + { + _simulation1.Parent.ShouldBeEqualTo(_oralClassification); + _simulation2.Parent.ShouldBeEqualTo(_oralClassification); + } + + [Observation] + public void should_delete_the_duplicate_classification_from_the_project() + { + _project.AllClassifications.Contains(_humanClassification).ShouldBeFalse(); + _project.AllClassifications.Contains(_humanOralClassification).ShouldBeFalse(); + } + + [Observation] + public void should_delete_the_duplicate_classification_node_from_the_view() + { + _classificationNodesCache[_humanClassification].ShouldBeNull(); + _classificationNodesCache[_humanOralClassification].ShouldBeNull(); + } + } + + public class When_moving_a_classifiable_node_defined_under_a_given_classification_node_under_another_classification_node : concern_for_ClassificationPresenter + { + private ClassifiableSimulation _simulation; + private IClassification _originalClassification; + private IClassification _targetClassification; + private SimulationNode _simulationNode; + private ITreeNode _originalClassificationNode; + private ITreeNode _targetClassificationNode; + + protected override void Context() + { + base.Context(); + _originalClassification = new Classification { ClassificationType = ClassificationType.Simulation, Name = "Original" }; + _targetClassification = new Classification { ClassificationType = ClassificationType.Simulation, Name = "Target" }; + _simulation = new ClassifiableSimulation { Parent = _originalClassification, Subject = A.Fake().WithName("S1") }; + sut.AddClassificationsToTree(new[] { _originalClassification, _targetClassification }); + _project.AddClassification(_originalClassification); + _project.AddClassification(_targetClassification); + _originalClassificationNode = _classificationNodesCache[_originalClassification]; + _targetClassificationNode = _classificationNodesCache[_targetClassification]; + _simulationNode = new SimulationNode(_simulation).Under(_originalClassificationNode); + } + + protected override void Because() + { + sut.MoveNode(_simulationNode, _targetClassificationNode); + } + + [Observation] + public void should_move_the_underlying_classifiable_under_the_new_classification() + { + _simulation.Parent.ShouldBeEqualTo(_targetClassification); + } + + [Observation] + public void should_move_the_simulation_node_under_the_new_classification_node() + { + _simulationNode.ParentNode.ShouldBeEqualTo(_targetClassificationNode); + _originalClassificationNode.Children.Contains(_simulationNode).ShouldBeFalse(); + } + } + + public class When_moving_an_observed_data_node_under_root_node : concern_for_ClassificationPresenter + { + private ITreeNode _observedDataNode; + private ClassifiableObservedData _classifiableObservedData; + private Classification _originalClassification; + + protected override void Context() + { + base.Context(); + _originalClassification = new Classification { ClassificationType = ClassificationType.ObservedData, Name = "Original" }; + _classifiableObservedData = new ClassifiableObservedData { Subject = new DataRepository(), Parent = _originalClassification }; + _observedDataNode = new ObservedDataNode(_classifiableObservedData); + _project.AddClassification(_originalClassification); + sut.AddClassificationsToTree(new[] { _originalClassification }); + } + + protected override void Because() + { + sut.MoveNode(_observedDataNode, _observedDataFolderNode); + } + + [Observation] + public void should_have_set_the_parent_classification_of_the_observed_data_classifiable_to_null() + { + _classifiableObservedData.Parent.ShouldBeNull(); + } + } + + public class When_testing_if_a_classification_node_can_be_moved_under_another_classification_node : concern_for_ClassificationPresenter + { + private ClassificationNode _observedDataClassificationNode; + private ClassificationNode _simulationClassificationNode; + private ClassificationNode _groupClassificationNode; + private ClassificationNode _subClassificationNode; + + protected override void Context() + { + base.Context(); + _observedDataClassificationNode = new ClassificationNode(new Classification { ClassificationType = ClassificationType.ObservedData, Name = "OBS" }); + _simulationClassificationNode = new ClassificationNode(new Classification { ClassificationType = ClassificationType.Simulation, Name = "SIM" }); + _groupClassificationNode = new ClassificationNode(new Classification { ClassificationType = ClassificationType.Simulation, Name = "PARENT" }); + _subClassificationNode = new ClassificationNode(new Classification { ClassificationType = ClassificationType.Simulation, Name = "SIM" }); + _groupClassificationNode.AddChild(_subClassificationNode); + } + + [Observation] + public void should_return_false_if_the_two_nodes_are_the_same() + { + sut.CanMove(_observedDataClassificationNode, _observedDataClassificationNode).ShouldBeFalse(); + } + + [Observation] + public void should_return_false_if_the_two_underlying_classification_do_not_have_the_same_type() + { + sut.CanMove(_observedDataClassificationNode, _simulationClassificationNode).ShouldBeFalse(); + } + + [Observation] + public void should_return_false_if_the_target_classification_already_have_a_sub_classifiation_with_the_same_name() + { + sut.CanMove(_simulationClassificationNode, _groupClassificationNode).ShouldBeFalse(); + } + + [Observation] + public void should_return_false_if_the_classification_to_move_is_an_ancestor_of_the_target_classification() + { + sut.CanMove(_groupClassificationNode, _subClassificationNode).ShouldBeFalse(); + } + + [Observation] + public void should_return_true_otherwise() + { + sut.CanMove(_subClassificationNode, _simulationClassificationNode).ShouldBeTrue(); + } + } + + public class When_removing_all_empty_classifications_from_the_classification_presenter : concern_for_ClassificationPresenter + { + private IClassification _parentClassification; + private IClassification _childEmptyClassification; + private IClassification _childClassification; + private ITreeNode _childEmptyClassificationNode; + private ITreeNode _childClassificationNode; + private ITreeNode _parentClassificationNode; + private SimulationNode _simulationNode; + private ClassifiableSimulation _simulation; + + protected override void Context() + { + base.Context(); + _parentClassification = new Classification { ClassificationType = ClassificationType.Simulation, Name = "parent" }; + _childEmptyClassification = new Classification { ClassificationType = ClassificationType.Simulation, Name = "childEmpty", Parent = _parentClassification }; + _childClassification = new Classification { ClassificationType = ClassificationType.Simulation, Name = "child", Parent = _parentClassification }; + _simulation = new ClassifiableSimulation { Subject = A.Fake() }; + sut.AddClassificationsToTree(new[] { _childEmptyClassification, _parentClassification, _childClassification }); + + //do that after so that real node and node fakes are created when adding the classificaiton to the tree + _project.AddClassification(_childEmptyClassification); + _project.AddClassification(_parentClassification); + _project.AddClassification(_childClassification); + _childEmptyClassificationNode = _classificationNodesCache[_childEmptyClassification]; + _childClassificationNode = _classificationNodesCache[_childClassification]; + _parentClassificationNode = _childClassificationNode.ParentNode.DowncastTo>(); + _simulationNode = new SimulationNode(_simulation); + _childClassificationNode.AddChild(_simulationNode); + _parentClassificationNode = _childClassificationNode.ParentNode.DowncastTo>(); + A.CallTo(() => _explorerPresenter.NodeFor(_childEmptyClassification)).Returns(_childEmptyClassificationNode); + A.CallTo(() => _explorerPresenter.NodeFor(_childClassification)).Returns(_childClassificationNode); + A.CallTo(() => _explorerPresenter.NodeFor(_parentClassification)).Returns(_parentClassificationNode); + } + + protected override void Because() + { + sut.RemoveEmptyClassifcations(); + } + + [Observation] + public void should_remove_all_classifications_that_do_not_contain_any_classifiable() + { + _project.AllClassifications.Contains(_childEmptyClassification).ShouldBeFalse(); + _project.AllClassifications.Contains(_childClassification).ShouldBeTrue(); + _project.AllClassifications.Contains(_parentClassification).ShouldBeTrue(); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Presentation/ObjectBaseNodeSpecs.cs b/tests/OSPSuite.Core.Tests/Presentation/ObjectBaseNodeSpecs.cs new file mode 100644 index 000000000..53c1c4b1c --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Presentation/ObjectBaseNodeSpecs.cs @@ -0,0 +1,90 @@ +using System.Linq; +using FakeItEasy; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Domain; +using OSPSuite.Presentation.Nodes; +using OSPSuite.Presentation.Presenters.Nodes; + +namespace OSPSuite.Presentation +{ + public abstract class concern_for_ObjectBaseNode : ContextSpecification> + { + protected IEntity _entity; + + protected override void Context() + { + _entity = new Parameter().WithId("id").WithName("tutu"); + sut = new ObjectWithIdAndNameNode(_entity); + } + } + + public class When_retrieving_the_name_of_an_object_base_node : concern_for_ObjectBaseNode + { + [Observation] + public void should_return_the_name_of_the_underlying_entity() + { + sut.Text.ShouldBeEqualTo(_entity.Name); + } + } + + public class When_retrieving_the_id_of_an_object_base_node : concern_for_ObjectBaseNode + { + [Observation] + public void should_return_the_id_of_the_underlying_entity() + { + sut.Id.ShouldBeEqualTo(_entity.Id); + } + } + + public class When_the_underlying_object_base_name_has_been_changed : concern_for_ObjectBaseNode + { + private bool _eventReceived; + + protected override void Context() + { + base.Context(); + sut.TextChanged += node => _eventReceived = true; + } + + protected override void Because() + { + _entity.Name = "tralala"; + } + + [Observation] + public void should_notify_that_its_name_has_changed() + { + _eventReceived.ShouldBeTrue(); + } + } + + public class When_removing_a_child_node : concern_for_ObjectBaseNode + { + private IEntity _anotherEntity; + private ITreeNode _childNode; + private ITreeNode _anotherChild; + + protected override void Context() + { + base.Context(); + _anotherEntity = new Parameter().WithId("tata").WithName("tutu"); + _childNode = new ObjectWithIdAndNameNode(_anotherEntity); + _anotherChild = A.Fake>(); + sut.AddChild(_childNode); + sut.AddChild(_anotherChild); + } + + protected override void Because() + { + sut.RemoveChild(_childNode); + sut.RemoveChild(_anotherChild); + } + + [Observation] + public void should_remove_the_node_from_the_internal_list_of_children() + { + sut.Children.Contains(_childNode).ShouldBeFalse(); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Presentation/SubPresenterItemSpecs.cs b/tests/OSPSuite.Core.Tests/Presentation/SubPresenterItemSpecs.cs new file mode 100644 index 000000000..d02543e67 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Presentation/SubPresenterItemSpecs.cs @@ -0,0 +1,40 @@ +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Presentation.Core; +using OSPSuite.Presentation.Presenters; + +namespace OSPSuite.Presentation +{ + public abstract class concern_for_SubPresenterItem : ContextSpecification + { + protected int _index; + + protected override void Context() + { + _index = 1; + sut = new SubPresenterItemForSpecs {Index = _index}; + } + } + + public class When_returning_the_index_for_an_individual_item : concern_for_SubPresenterItem + { + [Observation] + public void should_return_the_index_it_was_created_with() + { + sut.Index.ShouldBeEqualTo(_index); + } + } + + public class When_returning_its_presenter_type_ : concern_for_SubPresenterItem + { + [Observation] + public void should_return_the_type_it_was_created_with() + { + sut.PresenterType.ShouldBeEqualTo(typeof(IQuantitySelectionPresenter)); + } + } + + internal class SubPresenterItemForSpecs : SubPresenterItem + { + } +} \ No newline at end of file From 59b6aea45947f70e8d09b818613b91c05dd9dc09 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 29 Mar 2017 10:59:16 -0400 Subject: [PATCH 16/50] Update scripts version --- scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts b/scripts index f18c68d73..1f7603305 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit f18c68d7339bda7af808abd4a60990e3856a00f5 +Subproject commit 1f760330518b4d74f79a123b42d646aa7686854f From 1af0f5e9345deb829fab12207b2b61058cffb04b Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 29 Mar 2017 14:53:30 -0400 Subject: [PATCH 17/50] Update Smart XLS (#37) --- appveyor-coverage.yml | 1 + appveyor.yml | 1 + src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj | 5 +++-- src/OSPSuite.Infrastructure/packages.config | 6 +++--- src/OSPSuite.Presentation/OSPSuite.Presentation.csproj | 5 +++-- src/OSPSuite.Presentation/packages.config | 2 +- tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj | 5 +++-- tests/OSPSuite.Core.Tests/packages.config | 2 +- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/appveyor-coverage.yml b/appveyor-coverage.yml index c21e4c04b..e3afce6d2 100644 --- a/appveyor-coverage.yml +++ b/appveyor-coverage.yml @@ -24,6 +24,7 @@ before_build: - nuget sources add -name funcparser -source https://ci.appveyor.com/nuget/ospsuite-funcparser - nuget sources add -name simmodel -source https://ci.appveyor.com/nuget/ospsuite-simmodel - nuget sources add -name cvodes -source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes-282 + - nuget sources add -name smartxls -source https://ci.appveyor.com/nuget/ospsuite-smartxls - nuget restore build: diff --git a/appveyor.yml b/appveyor.yml index 2f555db53..f4a63a41f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,6 +24,7 @@ before_build: - nuget sources add -name funcparser -source https://ci.appveyor.com/nuget/ospsuite-funcparser - nuget sources add -name simmodel -source https://ci.appveyor.com/nuget/ospsuite-simmodel - nuget sources add -name cvodes -source https://ci.appveyor.com/nuget/ospsuite-simmodel-solver-cvodes-282 + - nuget sources add -name smartxls -source https://ci.appveyor.com/nuget/ospsuite-smartxls - nuget restore build: diff --git a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj index 93503c9d8..0cf5abc7a 100644 --- a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj +++ b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj @@ -79,8 +79,9 @@ ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.2.8\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.2.9\lib\net45\SX.dll + True diff --git a/src/OSPSuite.Infrastructure/packages.config b/src/OSPSuite.Infrastructure/packages.config index 08b131d4b..16afc079d 100644 --- a/src/OSPSuite.Infrastructure/packages.config +++ b/src/OSPSuite.Infrastructure/packages.config @@ -8,9 +8,9 @@ - - - + + + \ No newline at end of file diff --git a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj index dfba0ccb7..9c1efb0f8 100644 --- a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj +++ b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj @@ -51,8 +51,9 @@ ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.2.8\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.2.9\lib\net45\SX.dll + True diff --git a/src/OSPSuite.Presentation/packages.config b/src/OSPSuite.Presentation/packages.config index 3ac9ca443..2d15ef643 100644 --- a/src/OSPSuite.Presentation/packages.config +++ b/src/OSPSuite.Presentation/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj index 68d06d1ca..5b5f7024a 100644 --- a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj +++ b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj @@ -113,8 +113,9 @@ ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.2.8\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.2.9\lib\net45\SX.dll + True diff --git a/tests/OSPSuite.Core.Tests/packages.config b/tests/OSPSuite.Core.Tests/packages.config index dc77ee8ac..d382f4768 100644 --- a/tests/OSPSuite.Core.Tests/packages.config +++ b/tests/OSPSuite.Core.Tests/packages.config @@ -15,7 +15,7 @@ - + \ No newline at end of file From 47ae48f6cd4528083f317a2a3c836fb1ca44e7ae Mon Sep 17 00:00:00 2001 From: Robert McIntosh Date: Thu, 30 Mar 2017 10:34:20 -0400 Subject: [PATCH 18/50] Fixes Open-Systems-Pharmacology/PK-Sim#78 - Crash when starting obs data import (#36) --- .../Views/Importer/ImporterView.cs | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/OSPSuite.UI/Views/Importer/ImporterView.cs b/src/OSPSuite.UI/Views/Importer/ImporterView.cs index c32cc823e..d264a6dd9 100644 --- a/src/OSPSuite.UI/Views/Importer/ImporterView.cs +++ b/src/OSPSuite.UI/Views/Importer/ImporterView.cs @@ -472,7 +472,7 @@ private void importAllData() if (newTables.Count == 0) { - XtraMessageBox.Show("Nothing imported!", base.Text, MessageBoxButtons.OK, MessageBoxIcon.Information); + XtraMessageBox.Show("Nothing imported!", Text, MessageBoxButtons.OK, MessageBoxIcon.Information); return; } @@ -535,7 +535,7 @@ private bool promptForOverwrite(IList sheets, string excelFile) if (_imports.Tables.Cast().Any(existingTable => existingTable.Source == sourceSheet)) { overwrite = - (XtraMessageBox.Show(OVERWRITE_QUERY_TEXT, base.Text, MessageBoxButtons.YesNo, + (XtraMessageBox.Show(OVERWRITE_QUERY_TEXT, Text, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes); asked = true; @@ -553,8 +553,7 @@ private List collectAllTables(IList sheets, DataSet pre foreach (var sheet in sheets) { if (!preview.Tables.Contains(sheet)) continue; - ColumnMappingControl cmc; - cmc = _columnMappingControls.ContainsKey(sheet) + var cmc = _columnMappingControls.ContainsKey(sheet) ? getExistingColumnMappingControl(sheet) : createNewColumnMappingControl(preview, sheet); cmc.ValidateMapping(); @@ -586,8 +585,7 @@ private ColumnMappingControl createNewColumnMappingControl(DataSet preview, stri private ColumnMappingControl getExistingColumnMappingControl(string sheet) { - ColumnMappingControl cmc; - cmc = _columnMappingControls[sheet]; + var cmc = _columnMappingControls[sheet]; cmc.OnMappingCompleted += setImportFlagToTrue; cmc.OnMissingMapping += setImportFlagToFalse; cmc.OnMappingCompleted -= onColumnMappingMappingCompleted; @@ -629,27 +627,31 @@ private void cleanColumnMappingControls() private void cleanMemory() { _namingView = null; - _openSourceFileControl.OnOpenSourceFile -= openSourceFileEvent; - _openSourceFileControl = null; + if (_openSourceFileControl != null) + { + _openSourceFileControl.OnOpenSourceFile -= openSourceFileEvent; + _openSourceFileControl = null; + } + if (_imports != null) { foreach (ImportDataTable table in _imports.Tables) { - if (table.MetaData != null) table.MetaData.Dispose(); + table.MetaData?.Dispose(); table.Dispose(); } _imports.Dispose(); } if (_importDataTable != null) { - if (_importDataTable.MetaData != null) _importDataTable.MetaData.Dispose(); + _importDataTable.MetaData?.Dispose(); _importDataTable.Dispose(); } CleanUpHelper.ReleaseEvents(_dataSetControl); - if (_dataSetControl != null) _dataSetControl.Dispose(); + _dataSetControl?.Dispose(); CleanUpHelper.ReleaseEvents(_sourceFilePreviewControl); - if (_sourceFilePreviewControl != null) _sourceFilePreviewControl.Dispose(); + _sourceFilePreviewControl?.Dispose(); CleanUpHelper.ReleaseControls(Controls); Controls.Clear(); @@ -666,7 +668,7 @@ private void cleanMemory() _columnInfos = null; cleanColumnMappingControls(); - if (_columnMappingControls != null) _columnMappingControls.Clear(); + _columnMappingControls?.Clear(); _columnMappingControls = null; columnMappingControlPanel.Controls.Clear(); From c63862817c52ad5a3c405b695490ab3bda1befdb Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 30 Mar 2017 11:02:15 -0400 Subject: [PATCH 19/50] Fixes references to corrupted SX --- src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj | 3 +-- src/OSPSuite.Presentation/OSPSuite.Presentation.csproj | 3 +-- tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj index 0cf5abc7a..e091b39ce 100644 --- a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj +++ b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj @@ -79,9 +79,8 @@ ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll - + ..\..\packages\OSPSuite.SmartXLS.2.6.2.9\lib\net45\SX.dll - True diff --git a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj index 9c1efb0f8..3de1b3632 100644 --- a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj +++ b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj @@ -51,9 +51,8 @@ ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll - + ..\..\packages\OSPSuite.SmartXLS.2.6.2.9\lib\net45\SX.dll - True diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj index 5b5f7024a..4806373b7 100644 --- a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj +++ b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj @@ -113,9 +113,8 @@ ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll - + ..\..\packages\OSPSuite.SmartXLS.2.6.2.9\lib\net45\SX.dll - True From d0548b05a8eeb5a9b4286b5a7a9da8373d0a8801 Mon Sep 17 00:00:00 2001 From: Robert McIntosh Date: Wed, 5 Apr 2017 14:30:44 -0400 Subject: [PATCH 20/50] update ospsuite.SmartXLS to release version (#38) --- src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj | 5 +++-- src/OSPSuite.Infrastructure/packages.config | 2 +- src/OSPSuite.Presentation/OSPSuite.Presentation.csproj | 5 +++-- src/OSPSuite.Presentation/packages.config | 2 +- tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj | 5 +++-- tests/OSPSuite.Core.Tests/packages.config | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj index e091b39ce..b07f4a154 100644 --- a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj +++ b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj @@ -79,8 +79,9 @@ ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.2.9\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.2.90\lib\net45\SX.dll + True diff --git a/src/OSPSuite.Infrastructure/packages.config b/src/OSPSuite.Infrastructure/packages.config index 16afc079d..38ea15d82 100644 --- a/src/OSPSuite.Infrastructure/packages.config +++ b/src/OSPSuite.Infrastructure/packages.config @@ -8,7 +8,7 @@ - + diff --git a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj index 3de1b3632..f781012ef 100644 --- a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj +++ b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj @@ -51,8 +51,9 @@ ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.2.9\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.2.90\lib\net45\SX.dll + True diff --git a/src/OSPSuite.Presentation/packages.config b/src/OSPSuite.Presentation/packages.config index 2d15ef643..309c0a61b 100644 --- a/src/OSPSuite.Presentation/packages.config +++ b/src/OSPSuite.Presentation/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj index 4806373b7..ea3403ed6 100644 --- a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj +++ b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj @@ -113,8 +113,9 @@ ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.2.9\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.2.90\lib\net45\SX.dll + True diff --git a/tests/OSPSuite.Core.Tests/packages.config b/tests/OSPSuite.Core.Tests/packages.config index d382f4768..4085e9682 100644 --- a/tests/OSPSuite.Core.Tests/packages.config +++ b/tests/OSPSuite.Core.Tests/packages.config @@ -15,7 +15,7 @@ - + \ No newline at end of file From ee5ba8f0ebda231635535b5f9172190992db9c3e Mon Sep 17 00:00:00 2001 From: Robert McIntosh Date: Tue, 11 Apr 2017 10:49:15 -0400 Subject: [PATCH 21/50] Fixes #97 - Cannot zoom-out after zoom-in simulated-plot (#39) * Fixes #97 - Cannot zoom-out after zoom-in simulated-plot * Fixes #97 - Cannot zoom-out after zoom-in simulated-plot --- src/OSPSuite.UI/Controls/UxChartControl.cs | 2 +- src/OSPSuite.UI/Views/Charts/ChartDisplayView.Designer.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OSPSuite.UI/Controls/UxChartControl.cs b/src/OSPSuite.UI/Controls/UxChartControl.cs index 39c2aa337..64c99771b 100644 --- a/src/OSPSuite.UI/Controls/UxChartControl.cs +++ b/src/OSPSuite.UI/Controls/UxChartControl.cs @@ -32,7 +32,6 @@ public UxChartControl(bool addDefaultPopup = true) _clipboardTask = new ClipboardTask(); _barManager = new BarManager {Form = this}; _popupMenu = new PopupMenu(_barManager); - _barManager.SetPopupContextMenu(this, _popupMenu); if (addDefaultPopup) initializePopup(); @@ -103,6 +102,7 @@ public virtual void CopyChartToClipboard(ChartControl chartControl) private void initializePopup() { + _barManager.SetPopupContextMenu(this, _popupMenu); AddPopupMenu(Captions.CopyAsImage, CopyToClipboard, ApplicationIcons.Paste); } diff --git a/src/OSPSuite.UI/Views/Charts/ChartDisplayView.Designer.cs b/src/OSPSuite.UI/Views/Charts/ChartDisplayView.Designer.cs index fdb7e5ba8..4f69ac823 100644 --- a/src/OSPSuite.UI/Views/Charts/ChartDisplayView.Designer.cs +++ b/src/OSPSuite.UI/Views/Charts/ChartDisplayView.Designer.cs @@ -55,7 +55,7 @@ private void InitializeComponent() this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl(); this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl(); this.barDockControlRight = new DevExpress.XtraBars.BarDockControl(); - this.chartControl = new UxChartControl(); + this.chartControl = new UxChartControl(addDefaultPopup: false); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this._barManager)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.chartControl)).BeginInit(); From 48da22ba00531e73d3880e1284e9615e15269640 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Tue, 11 Apr 2017 11:37:20 -0400 Subject: [PATCH 22/50] Fixes #94 and Fixes #96 (#40) --- src/OSPSuite.Core/CoreRegister.cs | 10 ++++++- .../Core/EventBuilderTaskIntegrationTests.cs | 4 +-- .../Core/RegistrationSpecs.cs | 30 +++++++++++++++++++ .../UnitTestContextSpecificationSpecs.cs | 2 ++ .../OSPSuite.Core.Tests.csproj | 1 + 5 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 tests/OSPSuite.Core.Tests/Core/RegistrationSpecs.cs diff --git a/src/OSPSuite.Core/CoreRegister.cs b/src/OSPSuite.Core/CoreRegister.cs index 9c434a108..a306a859b 100644 --- a/src/OSPSuite.Core/CoreRegister.cs +++ b/src/OSPSuite.Core/CoreRegister.cs @@ -10,7 +10,6 @@ using OSPSuite.Core.Domain.Services.ParameterIdentifications; using OSPSuite.Core.Domain.Services.SensitivityAnalyses; using OSPSuite.Core.Domain.UnitSystem; -using OSPSuite.Core.Reporting; using OSPSuite.Core.Serialization; using OSPSuite.Core.Serialization.Xml; using OSPSuite.Utility.Container; @@ -81,6 +80,8 @@ public override void RegisterInContainer(IContainer container) reigsterConverters(container); + registerParameterIdentificationRunFactories(container); + //FACTORIES container.RegisterFactory(); container.RegisterFactory(); @@ -124,5 +125,12 @@ private static void registerComparers(IContainer container) }); container.Register(); } + + private static void registerParameterIdentificationRunFactories(IContainer container) + { + container.Register(); + container.Register(); + container.Register(); + } } } \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Core/EventBuilderTaskIntegrationTests.cs b/tests/OSPSuite.Core.Tests/Core/EventBuilderTaskIntegrationTests.cs index 883e06749..389ba2b0a 100644 --- a/tests/OSPSuite.Core.Tests/Core/EventBuilderTaskIntegrationTests.cs +++ b/tests/OSPSuite.Core.Tests/Core/EventBuilderTaskIntegrationTests.cs @@ -7,7 +7,7 @@ namespace OSPSuite.Core { - public abstract class concern_for_event_builder_task : ContextForModelConstructorIntegration + public abstract class concern_for_EventBuilderTask : ContextForModelConstructorIntegration { protected CreationResult _creationResult; @@ -18,7 +18,7 @@ public override void GlobalContext() } } - public class When_creating_simulation_with_many_floating_molecules_and_nested_applications_and_nonapplication_eventgroups : concern_for_event_builder_task + public class When_creating_simulation_with_many_floating_molecules_and_nested_applications_and_nonapplication_eventgroups : concern_for_EventBuilderTask { private IList _allEventGroups; private const string C1 = "C1"; diff --git a/tests/OSPSuite.Core.Tests/Core/RegistrationSpecs.cs b/tests/OSPSuite.Core.Tests/Core/RegistrationSpecs.cs new file mode 100644 index 000000000..b86ad3a7e --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Core/RegistrationSpecs.cs @@ -0,0 +1,30 @@ +using System.Threading; +using OSPSuite.BDDHelper; +using OSPSuite.Core.Domain.ParameterIdentifications; +using OSPSuite.Core.Domain.Services.ParameterIdentifications; +using OSPSuite.Helpers; +using OSPSuite.Utility.Container; + +namespace OSPSuite.Core +{ + public class When_performing_core_registration : ContextForIntegration + { + [Observation] + public void should_be_able_to_retrieve_parameter_identification_run_factories_for_all_registered_mode() + { + var parameterIdentificationRunFactory = IoC.Resolve(); + var cancellationToken = new CancellationToken(); + var parameterIdentification = new ParameterIdentification(); + + createFor(parameterIdentification, parameterIdentificationRunFactory, cancellationToken); + createFor(parameterIdentification, parameterIdentificationRunFactory, cancellationToken); + createFor(parameterIdentification, parameterIdentificationRunFactory, cancellationToken); + } + + private static void createFor(ParameterIdentification parameterIdentification, IParameterIdentificationRunFactory parameterIdentificationRunFactory, CancellationToken cancellationToken) where T : ParameterIdentificationRunMode, new() + { + parameterIdentification.Configuration.RunMode = new T(); + parameterIdentificationRunFactory.CreateFor(parameterIdentification, cancellationToken); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Helpers/UnitTestContextSpecificationSpecs.cs b/tests/OSPSuite.Core.Tests/Helpers/UnitTestContextSpecificationSpecs.cs index 1f0159f4f..fc55d3c67 100644 --- a/tests/OSPSuite.Core.Tests/Helpers/UnitTestContextSpecificationSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Helpers/UnitTestContextSpecificationSpecs.cs @@ -63,6 +63,8 @@ public override void GlobalContext() container.RegisterImplementationOf(A.Fake()); container.RegisterImplementationOf(A.Fake()); container.RegisterImplementationOf(A.Fake()); + container.RegisterImplementationOf(A.Fake()); + container.RegisterImplementationOf(A.Fake()); var applicationConfiguration = A.Fake(); A.CallTo(() => applicationConfiguration.Product).Returns(Origins.Other); diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj index ea3403ed6..90859263a 100644 --- a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj +++ b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj @@ -167,6 +167,7 @@ + From e4be1db4207ce20df63e58a27b9dff1da9123172 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Tue, 11 Apr 2017 14:45:45 -0400 Subject: [PATCH 23/50] Work on #82 Swap SmartXLS (#41) --- src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj | 4 ++-- src/OSPSuite.Infrastructure/packages.config | 2 +- src/OSPSuite.Presentation/OSPSuite.Presentation.csproj | 5 ++--- src/OSPSuite.Presentation/packages.config | 2 +- tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj | 4 ++-- tests/OSPSuite.Core.Tests/packages.config | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj index b07f4a154..81378345f 100644 --- a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj +++ b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj @@ -80,8 +80,8 @@ ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll - ..\..\packages\OSPSuite.SmartXLS.2.6.2.90\lib\net45\SX.dll - True + False + ..\..\packages\OSPSuite.SmartXLS.2.6.2.9\lib\net45\SX.dll diff --git a/src/OSPSuite.Infrastructure/packages.config b/src/OSPSuite.Infrastructure/packages.config index 38ea15d82..16afc079d 100644 --- a/src/OSPSuite.Infrastructure/packages.config +++ b/src/OSPSuite.Infrastructure/packages.config @@ -8,7 +8,7 @@ - + diff --git a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj index f781012ef..3de1b3632 100644 --- a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj +++ b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj @@ -51,9 +51,8 @@ ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.2.90\lib\net45\SX.dll - True + + ..\..\packages\OSPSuite.SmartXLS.2.6.2.9\lib\net45\SX.dll diff --git a/src/OSPSuite.Presentation/packages.config b/src/OSPSuite.Presentation/packages.config index 309c0a61b..2d15ef643 100644 --- a/src/OSPSuite.Presentation/packages.config +++ b/src/OSPSuite.Presentation/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj index 90859263a..6394078fe 100644 --- a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj +++ b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj @@ -114,8 +114,8 @@ ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll - ..\..\packages\OSPSuite.SmartXLS.2.6.2.90\lib\net45\SX.dll - True + False + ..\..\packages\OSPSuite.SmartXLS.2.6.2.9\lib\net45\SX.dll diff --git a/tests/OSPSuite.Core.Tests/packages.config b/tests/OSPSuite.Core.Tests/packages.config index 4085e9682..d382f4768 100644 --- a/tests/OSPSuite.Core.Tests/packages.config +++ b/tests/OSPSuite.Core.Tests/packages.config @@ -15,7 +15,7 @@ - + \ No newline at end of file From 2cd98856096aae776377e35a031b35774dd95ffd Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 12 Apr 2017 10:52:41 -0400 Subject: [PATCH 24/50] Fixes #42 preview origin data button too small (#43) --- .../OSPSuite.Infrastructure.csproj | 6 +- src/OSPSuite.Infrastructure/packages.config | 2 +- .../OSPSuite.Presentation.csproj | 5 +- src/OSPSuite.Presentation/packages.config | 2 +- .../Views/Charts/ChartTemplateManagerView.cs | 2 +- .../Views/Importer/ImporterView.Designer.cs | 167 ++++++++---------- .../Views/Importer/ImporterView.cs | 11 +- .../OSPSuite.Core.Tests.csproj | 6 +- tests/OSPSuite.Core.Tests/packages.config | 2 +- 9 files changed, 101 insertions(+), 102 deletions(-) diff --git a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj index 81378345f..fe4aff88f 100644 --- a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj +++ b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj @@ -79,9 +79,9 @@ ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll - - False - ..\..\packages\OSPSuite.SmartXLS.2.6.2.9\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.3.1\lib\net45\SX.dll + True diff --git a/src/OSPSuite.Infrastructure/packages.config b/src/OSPSuite.Infrastructure/packages.config index 16afc079d..7ea49cc45 100644 --- a/src/OSPSuite.Infrastructure/packages.config +++ b/src/OSPSuite.Infrastructure/packages.config @@ -8,7 +8,7 @@ - + diff --git a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj index 3de1b3632..e0087890c 100644 --- a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj +++ b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj @@ -51,8 +51,9 @@ ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll - - ..\..\packages\OSPSuite.SmartXLS.2.6.2.9\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.3.1\lib\net45\SX.dll + True diff --git a/src/OSPSuite.Presentation/packages.config b/src/OSPSuite.Presentation/packages.config index 2d15ef643..2d2779627 100644 --- a/src/OSPSuite.Presentation/packages.config +++ b/src/OSPSuite.Presentation/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/src/OSPSuite.UI/Views/Charts/ChartTemplateManagerView.cs b/src/OSPSuite.UI/Views/Charts/ChartTemplateManagerView.cs index a249219af..04685d7f5 100644 --- a/src/OSPSuite.UI/Views/Charts/ChartTemplateManagerView.cs +++ b/src/OSPSuite.UI/Views/Charts/ChartTemplateManagerView.cs @@ -117,7 +117,7 @@ public override void InitializeResources() gridViewTemplates.OptionsSelection.EnableAppearanceFocusedRow = true; loadTemplateButton.InitWithImage(ApplicationIcons.Load, Captions.LoadTemplate); - loadTemplateControlItem.AdjustButtonSize(UIConstants.Size.LARGE_BUTTON_WIDTH, UIConstants.Size.BUTTON_HEIGHT); + loadTemplateControlItem.AdjustLongButtonSize(); Caption = Captions.ManageChartTemplates; } diff --git a/src/OSPSuite.UI/Views/Importer/ImporterView.Designer.cs b/src/OSPSuite.UI/Views/Importer/ImporterView.Designer.cs index 489b52150..a758b0575 100644 --- a/src/OSPSuite.UI/Views/Importer/ImporterView.Designer.cs +++ b/src/OSPSuite.UI/Views/Importer/ImporterView.Designer.cs @@ -33,21 +33,17 @@ private void InitializeComponent() this.SourcePage = new DevExpress.XtraTab.XtraTabPage(); this.layoutControlSourceTab = new DevExpress.XtraLayout.LayoutControl(); this.btnSelectRange = new DevExpress.XtraEditors.SimpleButton(); - this.btnImportAll = new DevExpress.XtraEditors.SimpleButton(); this.openSourceFileControlPanel = new DevExpress.XtraEditors.PanelControl(); this.columnMappingControlPanel = new DevExpress.XtraEditors.PanelControl(); this.sourceFilePreviewControlPanel = new DevExpress.XtraEditors.PanelControl(); - this.btnImport = new DevExpress.XtraEditors.SimpleButton(); this.layoutControlGroupSourceTab = new DevExpress.XtraLayout.LayoutControlGroup(); this.Mapping = new DevExpress.XtraLayout.LayoutControlItem(); this.Preview = new DevExpress.XtraLayout.LayoutControlItem(); this.splitterItem = new DevExpress.XtraLayout.SplitterItem(); this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); + this.layoutItemSelectRange = new DevExpress.XtraLayout.LayoutControlItem(); this.ImportsPage = new DevExpress.XtraTab.XtraTabPage(); this.layoutControlTab = new DevExpress.XtraLayout.LayoutControl(); this.panelImportedTabs = new DevExpress.XtraEditors.PanelControl(); @@ -59,6 +55,10 @@ private void InitializeComponent() this.layoutControl = new DevExpress.XtraLayout.LayoutControl(); this.layoutControlGroup = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); + this.btnImportAll = new DevExpress.XtraEditors.SimpleButton(); + this.layoutItemImportAll = new DevExpress.XtraLayout.LayoutControlItem(); + this.btnImport = new DevExpress.XtraEditors.SimpleButton(); + this.layoutItemImport = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlBase)).BeginInit(); this.layoutControlBase.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroupBase)).BeginInit(); @@ -81,10 +81,8 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.splitterItem)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutItemSelectRange)).BeginInit(); this.ImportsPage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlTab)).BeginInit(); this.layoutControlTab.SuspendLayout(); @@ -98,6 +96,8 @@ private void InitializeComponent() this.layoutControl.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutItemImportAll)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutItemImport)).BeginInit(); this.SuspendLayout(); // // btnCancel @@ -107,8 +107,8 @@ private void InitializeComponent() // // btnOk // - this.btnOk.Location = new System.Drawing.Point(468, 12); - this.btnOk.Size = new System.Drawing.Size(153, 22); + this.btnOk.Location = new System.Drawing.Point(459, 12); + this.btnOk.Size = new System.Drawing.Size(162, 22); // // layoutControlBase // @@ -128,8 +128,8 @@ private void InitializeComponent() // // layoutItemOK // - this.layoutItemOK.Location = new System.Drawing.Point(456, 0); - this.layoutItemOK.Size = new System.Drawing.Size(157, 26); + this.layoutItemOK.Location = new System.Drawing.Point(447, 0); + this.layoutItemOK.Size = new System.Drawing.Size(166, 26); // // layoutItemCancel // @@ -139,7 +139,7 @@ private void InitializeComponent() // emptySpaceItemBase // this.emptySpaceItemBase.Location = new System.Drawing.Point(228, 0); - this.emptySpaceItemBase.Size = new System.Drawing.Size(228, 26); + this.emptySpaceItemBase.Size = new System.Drawing.Size(219, 26); // // layoutItemExtra // @@ -169,12 +169,12 @@ private void InitializeComponent() // layoutControlSourceTab // this.layoutControlSourceTab.AllowCustomization = false; - this.layoutControlSourceTab.Controls.Add(this.btnSelectRange); + this.layoutControlSourceTab.Controls.Add(this.btnImport); this.layoutControlSourceTab.Controls.Add(this.btnImportAll); + this.layoutControlSourceTab.Controls.Add(this.btnSelectRange); this.layoutControlSourceTab.Controls.Add(this.openSourceFileControlPanel); this.layoutControlSourceTab.Controls.Add(this.columnMappingControlPanel); this.layoutControlSourceTab.Controls.Add(this.sourceFilePreviewControlPanel); - this.layoutControlSourceTab.Controls.Add(this.btnImport); this.layoutControlSourceTab.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutControlSourceTab.Location = new System.Drawing.Point(0, 0); this.layoutControlSourceTab.Name = "layoutControlSourceTab"; @@ -188,25 +188,12 @@ private void InitializeComponent() // btnSelectRange // this.btnSelectRange.Location = new System.Drawing.Point(12, 497); - this.btnSelectRange.MaximumSize = new System.Drawing.Size(120, 22); - this.btnSelectRange.MinimumSize = new System.Drawing.Size(120, 22); this.btnSelectRange.Name = "btnSelectRange"; - this.btnSelectRange.Size = new System.Drawing.Size(120, 22); + this.btnSelectRange.Size = new System.Drawing.Size(285, 22); this.btnSelectRange.StyleController = this.layoutControlSourceTab; - this.btnSelectRange.TabIndex = 8; + this.btnSelectRange.TabIndex = 9; this.btnSelectRange.Text = "btnSelectRange"; // - // btnImportAll - // - this.btnImportAll.Location = new System.Drawing.Point(566, 497); - this.btnImportAll.MaximumSize = new System.Drawing.Size(78, 22); - this.btnImportAll.MinimumSize = new System.Drawing.Size(78, 22); - this.btnImportAll.Name = "btnImportAll"; - this.btnImportAll.Size = new System.Drawing.Size(78, 22); - this.btnImportAll.StyleController = this.layoutControlSourceTab; - this.btnImportAll.TabIndex = 5; - this.btnImportAll.Text = "Import All"; - // // openSourceFileControlPanel // this.openSourceFileControlPanel.Location = new System.Drawing.Point(24, 24); @@ -228,15 +215,6 @@ private void InitializeComponent() this.sourceFilePreviewControlPanel.Size = new System.Drawing.Size(371, 411); this.sourceFilePreviewControlPanel.TabIndex = 6; // - // btnImport - // - this.btnImport.Location = new System.Drawing.Point(648, 497); - this.btnImport.Name = "btnImport"; - this.btnImport.Size = new System.Drawing.Size(77, 22); - this.btnImport.StyleController = this.layoutControlSourceTab; - this.btnImport.TabIndex = 4; - this.btnImport.Text = "Import"; - // // layoutControlGroupSourceTab // this.layoutControlGroupSourceTab.CustomizationFormText = "Root"; @@ -247,12 +225,12 @@ private void InitializeComponent() this.Preview, this.splitterItem, this.layoutControlGroup2, - this.layoutControlItem1, - this.layoutControlItem3, - this.layoutControlItem5, - this.emptySpaceItem1}); + this.emptySpaceItem1, + this.layoutItemSelectRange, + this.layoutItemImportAll, + this.layoutItemImport}); this.layoutControlGroupSourceTab.Location = new System.Drawing.Point(0, 0); - this.layoutControlGroupSourceTab.Name = "layoutControlGroupSourceTab"; + this.layoutControlGroupSourceTab.Name = "Root"; this.layoutControlGroupSourceTab.Size = new System.Drawing.Size(737, 531); this.layoutControlGroupSourceTab.TextVisible = false; // @@ -307,48 +285,23 @@ private void InitializeComponent() this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem2.TextVisible = false; // - // layoutControlItem1 - // - this.layoutControlItem1.Control = this.btnImport; - this.layoutControlItem1.CustomizationFormText = "layoutControlItem1"; - this.layoutControlItem1.Location = new System.Drawing.Point(636, 485); - this.layoutControlItem1.MaxSize = new System.Drawing.Size(81, 26); - this.layoutControlItem1.MinSize = new System.Drawing.Size(81, 26); - this.layoutControlItem1.Name = "layoutControlItem1"; - this.layoutControlItem1.Size = new System.Drawing.Size(81, 26); - this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; - this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem1.TextVisible = false; - // - // layoutControlItem3 - // - this.layoutControlItem3.Control = this.btnImportAll; - this.layoutControlItem3.CustomizationFormText = "layoutControlItem3"; - this.layoutControlItem3.Location = new System.Drawing.Point(554, 485); - this.layoutControlItem3.Name = "layoutControlItem3"; - this.layoutControlItem3.Size = new System.Drawing.Size(82, 26); - this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem3.TextVisible = false; - // - // layoutControlItem5 - // - this.layoutControlItem5.Control = this.btnSelectRange; - this.layoutControlItem5.CustomizationFormText = "layoutControlItem5"; - this.layoutControlItem5.Location = new System.Drawing.Point(0, 485); - this.layoutControlItem5.Name = "layoutControlItem5"; - this.layoutControlItem5.Size = new System.Drawing.Size(124, 26); - this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0); - this.layoutControlItem5.TextVisible = false; - // // emptySpaceItem1 // this.emptySpaceItem1.AllowHotTrack = false; - this.emptySpaceItem1.CustomizationFormText = "emptySpaceItem1"; - this.emptySpaceItem1.Location = new System.Drawing.Point(124, 485); + this.emptySpaceItem1.Location = new System.Drawing.Point(289, 485); this.emptySpaceItem1.Name = "emptySpaceItem1"; - this.emptySpaceItem1.Size = new System.Drawing.Size(430, 26); + this.emptySpaceItem1.Size = new System.Drawing.Size(166, 26); this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0); // + // layoutItemSelectRange + // + this.layoutItemSelectRange.Control = this.btnSelectRange; + this.layoutItemSelectRange.Location = new System.Drawing.Point(0, 485); + this.layoutItemSelectRange.Name = "layoutItemSelectRange"; + this.layoutItemSelectRange.Size = new System.Drawing.Size(289, 26); + this.layoutItemSelectRange.TextSize = new System.Drawing.Size(0, 0); + this.layoutItemSelectRange.TextVisible = false; + // // ImportsPage // this.ImportsPage.Controls.Add(this.layoutControlTab); @@ -465,6 +418,42 @@ private void InitializeComponent() this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem4.TextVisible = false; // + // btnImportAll + // + this.btnImportAll.Location = new System.Drawing.Point(467, 497); + this.btnImportAll.Name = "btnImportAll"; + this.btnImportAll.Size = new System.Drawing.Size(68, 22); + this.btnImportAll.StyleController = this.layoutControlSourceTab; + this.btnImportAll.TabIndex = 10; + this.btnImportAll.Text = "btnImportAll"; + // + // layoutItemImportAll + // + this.layoutItemImportAll.Control = this.btnImportAll; + this.layoutItemImportAll.Location = new System.Drawing.Point(455, 485); + this.layoutItemImportAll.Name = "layoutItemImportAll"; + this.layoutItemImportAll.Size = new System.Drawing.Size(72, 26); + this.layoutItemImportAll.TextSize = new System.Drawing.Size(0, 0); + this.layoutItemImportAll.TextVisible = false; + // + // btnImport + // + this.btnImport.Location = new System.Drawing.Point(539, 497); + this.btnImport.Name = "btnImport"; + this.btnImport.Size = new System.Drawing.Size(186, 22); + this.btnImport.StyleController = this.layoutControlSourceTab; + this.btnImport.TabIndex = 11; + this.btnImport.Text = "btnImport"; + // + // layoutItemImport + // + this.layoutItemImport.Control = this.btnImport; + this.layoutItemImport.Location = new System.Drawing.Point(527, 485); + this.layoutItemImport.Name = "layoutItemImport"; + this.layoutItemImport.Size = new System.Drawing.Size(190, 26); + this.layoutItemImport.TextSize = new System.Drawing.Size(0, 0); + this.layoutItemImport.TextVisible = false; + // // ImporterView // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -499,10 +488,8 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.splitterItem)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutItemSelectRange)).EndInit(); this.ImportsPage.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutControlTab)).EndInit(); this.layoutControlTab.ResumeLayout(false); @@ -516,6 +503,8 @@ private void InitializeComponent() this.layoutControl.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutItemImportAll)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutItemImport)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -529,16 +518,12 @@ private void InitializeComponent() private DevExpress.XtraLayout.LayoutControl layoutControlSourceTab; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroupSourceTab; private DevExpress.XtraLayout.SplitterItem splitterItem; - private DevExpress.XtraEditors.SimpleButton btnImport; - private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraEditors.PanelControl columnMappingControlPanel; private DevExpress.XtraEditors.PanelControl sourceFilePreviewControlPanel; private DevExpress.XtraEditors.PanelControl openSourceFileControlPanel; private DevExpress.XtraLayout.LayoutControlItem Preview; private DevExpress.XtraLayout.LayoutControlItem Mapping; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; - private DevExpress.XtraEditors.SimpleButton btnImportAll; private DevExpress.XtraLayout.LayoutControl layoutControl; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; @@ -550,8 +535,12 @@ private void InitializeComponent() private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2; private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; + private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1; private DevExpress.XtraEditors.SimpleButton btnSelectRange; - private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; + private DevExpress.XtraLayout.LayoutControlItem layoutItemSelectRange; + private DevExpress.XtraEditors.SimpleButton btnImport; + private DevExpress.XtraEditors.SimpleButton btnImportAll; + private DevExpress.XtraLayout.LayoutControlItem layoutItemImportAll; + private DevExpress.XtraLayout.LayoutControlItem layoutItemImport; } } \ No newline at end of file diff --git a/src/OSPSuite.UI/Views/Importer/ImporterView.cs b/src/OSPSuite.UI/Views/Importer/ImporterView.cs index d264a6dd9..c3fb51068 100644 --- a/src/OSPSuite.UI/Views/Importer/ImporterView.cs +++ b/src/OSPSuite.UI/Views/Importer/ImporterView.cs @@ -70,12 +70,21 @@ private void changeTabs(IXtraTabPage page, IXtraTabPage prevPage) prevPage.Appearance.Header.Font = Fonts.NonSelectedTabHeaderFont; } + public override void InitializeResources() + { + base.InitializeResources(); + layoutItemSelectRange.AdjustLongButtonSize(); + layoutItemImportAll.AdjustButtonSize(); + layoutItemImport.AdjustButtonSize(); + btnSelectRange.InitWithImage(ApplicationIcons.PreviewOriginData, Captions.Importer.PreviewExcelData); + resetImportButtonText(); + } + public void StartImport(string sourceFile, ImportTableConfiguration configuration, Mode mode) { var metaDataCategories = configuration.MetaDataCategories; _mode = mode; _columnInfos = configuration.ColumnInfos; - btnSelectRange.InitWithImage(ApplicationIcons.PreviewOriginData, Captions.Importer.PreviewExcelData); var importDataTable = _importMapper.ConvertToImportDataTable(metaDataCategories, _columnInfos); diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj index 6394078fe..e8a91c023 100644 --- a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj +++ b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj @@ -113,9 +113,9 @@ ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll - - False - ..\..\packages\OSPSuite.SmartXLS.2.6.2.9\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.3.1\lib\net45\SX.dll + True diff --git a/tests/OSPSuite.Core.Tests/packages.config b/tests/OSPSuite.Core.Tests/packages.config index d382f4768..e5f757b3b 100644 --- a/tests/OSPSuite.Core.Tests/packages.config +++ b/tests/OSPSuite.Core.Tests/packages.config @@ -15,7 +15,7 @@ - + \ No newline at end of file From 27f64db15db7a299b8dd624816d57900e5d8e8fd Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 13 Apr 2017 11:24:32 -0400 Subject: [PATCH 25/50] Fixes #44 startable registration. Also defines a constant for default chart template (#45) --- src/OSPSuite.Core/Domain/Constants.cs | 1 + .../OSPSuiteRegistrationConvention.cs | 5 ++ .../PresentationRegister.cs | 5 +- .../Charts/ChartEditorAndDisplayPresenter.cs | 48 ++++++++----------- 4 files changed, 28 insertions(+), 31 deletions(-) diff --git a/src/OSPSuite.Core/Domain/Constants.cs b/src/OSPSuite.Core/Domain/Constants.cs index 278936fa2..a5be19a8d 100644 --- a/src/OSPSuite.Core/Domain/Constants.cs +++ b/src/OSPSuite.Core/Domain/Constants.cs @@ -45,6 +45,7 @@ public static class Constants public const int DEFAULT_TEMPLATE_WARNING_THRESHOLD = 10; public const double DEFAULT_SCALE_DIVISOR = 1; public const double DEFAULT_SCALE_DIVISOR_MIN_VALUE = 1e-15; + public const string DEFAULT_CHART_LAYOUT = "Standard View"; public const string VOLUME_ALIAS = "V"; public const string START_VALUE_ALIAS = "StartValue"; diff --git a/src/OSPSuite.Core/OSPSuiteRegistrationConvention.cs b/src/OSPSuite.Core/OSPSuiteRegistrationConvention.cs index 2fae6ee98..dee909b5e 100644 --- a/src/OSPSuite.Core/OSPSuiteRegistrationConvention.cs +++ b/src/OSPSuite.Core/OSPSuiteRegistrationConvention.cs @@ -1,7 +1,9 @@ using System; using System.Linq; +using OSPSuite.Utility; using OSPSuite.Utility.Container; using OSPSuite.Utility.Container.Conventions; +using OSPSuite.Utility.Extensions; namespace OSPSuite.Core { @@ -44,6 +46,9 @@ protected virtual bool Register(Type concreteType, IContainer container, LifeSty if (!serviceTypes.Any()) return false; + if (concreteType.IsAnImplementationOf()) + serviceTypes.Add(typeof(IStartable)); + container.Register(serviceTypes, concreteType, lifeStyle); return true; diff --git a/src/OSPSuite.Presentation/PresentationRegister.cs b/src/OSPSuite.Presentation/PresentationRegister.cs index 79864e8c8..b02fa25ec 100644 --- a/src/OSPSuite.Presentation/PresentationRegister.cs +++ b/src/OSPSuite.Presentation/PresentationRegister.cs @@ -12,6 +12,7 @@ using OSPSuite.Presentation.Services.Charts; using OSPSuite.Presentation.Settings; using OSPSuite.Presentation.UICommands; +using OSPSuite.Utility; using OSPSuite.Utility.Container; namespace OSPSuite.Presentation @@ -66,9 +67,9 @@ public override void RegisterInContainer(IContainer container) container.Register(typeof(IParameterToParameterDTOInContainerMapper<>), typeof(ParameterToParameterDTOInContainerMapper<>)); container.Register(typeof(ICloneObjectBasePresenter<>), typeof(CloneObjectBasePresenter<>)); - //SINGLETON + //SINGLETONS container.Register(LifeStyle.Singleton); - container.Register(LifeStyle.Singleton); + container.Register(LifeStyle.Singleton); container.Register(LifeStyle.Singleton); container.Register(LifeStyle.Singleton); container.Register(LifeStyle.Singleton); diff --git a/src/OSPSuite.Presentation/Presenters/Charts/ChartEditorAndDisplayPresenter.cs b/src/OSPSuite.Presentation/Presenters/Charts/ChartEditorAndDisplayPresenter.cs index 4cf814ad1..bbd77e938 100644 --- a/src/OSPSuite.Presentation/Presenters/Charts/ChartEditorAndDisplayPresenter.cs +++ b/src/OSPSuite.Presentation/Presenters/Charts/ChartEditorAndDisplayPresenter.cs @@ -2,7 +2,6 @@ using System.Windows.Forms; using OSPSuite.Assets; using OSPSuite.Core; -using OSPSuite.Utility.Extensions; using OSPSuite.Core.Domain.Data; using OSPSuite.Presentation.Charts; using OSPSuite.Presentation.Core; @@ -10,6 +9,7 @@ using OSPSuite.Presentation.Services.Charts; using OSPSuite.Presentation.Settings; using OSPSuite.Presentation.Views.Charts; +using OSPSuite.Utility.Extensions; namespace OSPSuite.Presentation.Presenters.Charts { @@ -32,7 +32,8 @@ public interface IChartEditorAndDisplayPresenter : ICommandCollectorPresenter void SetCurveNameDefinition(Func curveNameDefinition); /// - /// If no curves have been added to the chart, then text will appear in place of the empty chart + /// If no curves have been added to the chart, then text will appear in place of the empty + /// chart /// void SetNoCurvesSelectedHint(string hint); @@ -43,12 +44,10 @@ public interface IChartEditorAndDisplayPresenter : ICommandCollectorPresenter public class ChartEditorAndDisplayPresenter : AbstractCommandCollectorPresenter, IChartEditorAndDisplayPresenter { private readonly IChartEditorAndDisplayControl _chartEditorAndDisplayControl; - private readonly IChartEditorPresenter _chartEditorPresenter; - private readonly IChartDisplayPresenter _chartDisplayPresenter; private readonly IChartEditorLayoutTask _chartEditorLayoutTask; private readonly IStartOptions _startOptions; private readonly IPresentationUserSettings _presentationUserSettings; - public Action PostEditorLayout { get; set; } = () => {}; + public Action PostEditorLayout { get; set; } = () => { }; public ChartEditorAndDisplayPresenter(IChartEditorAndDisplayControl chartEditorAndDisplayControl, IChartDisplayPresenter chartDisplayPresenter, IChartEditorPresenter chartEditorPresenter, IChartEditorLayoutTask chartEditorLayoutTask, IStartOptions startOptions, @@ -56,43 +55,33 @@ public ChartEditorAndDisplayPresenter(IChartEditorAndDisplayControl chartEditorA : base(chartEditorAndDisplayControl) { _chartEditorAndDisplayControl = chartEditorAndDisplayControl; - _chartDisplayPresenter = chartDisplayPresenter; - _chartEditorPresenter = chartEditorPresenter; + DisplayPresenter = chartDisplayPresenter; + EditorPresenter = chartEditorPresenter; _chartEditorLayoutTask = chartEditorLayoutTask; _startOptions = startOptions; _presentationUserSettings = presentationUserSettings; - _chartEditorAndDisplayControl.AddDisplay(_chartDisplayPresenter.Control); - _chartEditorAndDisplayControl.AddEditor(_chartEditorPresenter.View); - - AddSubPresenters(_chartEditorPresenter, chartDisplayPresenter); + _chartEditorAndDisplayControl.AddDisplay(DisplayPresenter.Control); + _chartEditorAndDisplayControl.AddEditor(EditorPresenter.View); + AddSubPresenters(EditorPresenter, chartDisplayPresenter); } - public Control Control - { - get { return _chartEditorAndDisplayControl as Control; } - } + public Control Control => _chartEditorAndDisplayControl as Control; public void SetCurveNameDefinition(Func curveNameDefinition) { - _chartDisplayPresenter.SetCurveNameDefinition(curveNameDefinition); - _chartEditorPresenter.SetCurveNameDefinition(curveNameDefinition); + DisplayPresenter.SetCurveNameDefinition(curveNameDefinition); + EditorPresenter.SetCurveNameDefinition(curveNameDefinition); } public void SetNoCurvesSelectedHint(string hint) { - _chartDisplayPresenter.SetNoCurvesSelectedHint(hint); + DisplayPresenter.SetNoCurvesSelectedHint(hint); } - public IChartDisplayPresenter DisplayPresenter - { - get { return _chartDisplayPresenter; } - } + public IChartDisplayPresenter DisplayPresenter { get; } - public IChartEditorPresenter EditorPresenter - { - get { return _chartEditorPresenter; } - } + public IChartEditorPresenter EditorPresenter { get; } public void CopySettingsFrom(ChartEditorAndDisplaySettings settings) { @@ -101,7 +90,8 @@ public void CopySettingsFrom(ChartEditorAndDisplaySettings settings) public void CopySettingsFrom(ChartEditorAndDisplaySettings settings, bool loadEditorLayout, bool loadColumnSettings) { - _chartEditorPresenter.CopySettingsFrom(settings.EditorSettings, loadEditorLayout, loadColumnSettings); + if (settings == null) return; + EditorPresenter.CopySettingsFrom(settings.EditorSettings, loadEditorLayout, loadColumnSettings); _chartEditorAndDisplayControl.LoadLayoutFromString(settings.DockingLayout); } @@ -109,7 +99,7 @@ public ChartEditorAndDisplaySettings CreateSettings() { return new ChartEditorAndDisplaySettings { - EditorSettings = _chartEditorPresenter.CreateSettings(), + EditorSettings = EditorPresenter.CreateSettings(), DockingLayout = _chartEditorAndDisplayControl.SaveLayoutToString() }; } @@ -141,7 +131,7 @@ public IMenuBarItem ChartLayoutButton if (_startOptions.IsDeveloperMode) { chartLayoutButton.AddItem(CreateMenuButton.WithCaption(MenuNames.CustomizeEditorLayout) - .WithActionCommand(_chartEditorPresenter.ShowCustomizationForm) + .WithActionCommand(EditorPresenter.ShowCustomizationForm) .AsGroupStarter() .ForDeveloper()); From 783d8c42ee11e3bfdc7c9d7401a9519f35e35485 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 13 Apr 2017 16:07:48 -0400 Subject: [PATCH 26/50] Fixes #47 update devexpress (#48) --- src/OSPSuite.Assets/OSPSuite.Assets.csproj | 7 +- src/OSPSuite.Assets/UIConstants.cs | 28 ++-- src/OSPSuite.Assets/packages.config | 2 +- .../Commands/Core/RollBackException.cs | 18 +-- src/OSPSuite.Core/Domain/AliasCreator.cs | 4 +- .../Domain/Builder/StartValue.cs | 2 +- src/OSPSuite.Core/Domain/Exceptions.cs | 15 +- .../Domain/Formulas/DynamicFormula.cs | 6 +- .../Domain/Formulas/FormulaFactory.cs | 2 +- .../MPFitLevenbergMarquardtOptimizer.cs | 2 +- .../ConcentrationBasedFormulaUpdater.cs | 2 +- .../Domain/Services/ContainerTask.cs | 2 +- .../Domain/Services/ModelReportCreator.cs | 2 +- .../Domain/UnitSystem/MergedDimensionFor.cs | 2 +- src/OSPSuite.Core/Journal/JournalException.cs | 2 +- .../Journal/JournalSearchContextFinder.cs | 2 +- src/OSPSuite.Core/OSPSuite.Core.csproj | 5 +- src/OSPSuite.Core/packages.config | 2 +- .../NextAvailableJournalPageIndexQuery.cs | 2 +- .../OSPSuite.Infrastructure.csproj | 5 +- .../Serialization/DapperDatabase.cs | 8 +- src/OSPSuite.Infrastructure/packages.config | 2 +- .../OSPSuite.Presentation.csproj | 17 ++- src/OSPSuite.Presentation/packages.config | 4 +- src/OSPSuite.UI/Binders/AxisAdapter.cs | 2 +- src/OSPSuite.UI/OSPSuite.UI.csproj | 143 +++++++++--------- src/OSPSuite.UI/packages.config | 8 +- .../Core/BinIntervalsCreatorSpecs.cs | 2 +- .../Core/DataColumnLoader.cs | 2 +- .../Core/ModelConstructorIntegrationTests.cs | 2 +- .../UnitTestContextSpecificationSpecs.cs | 2 +- .../OSPSuite.Core.Tests.csproj | 13 +- tests/OSPSuite.Core.Tests/packages.config | 4 +- .../OSPSuite.Starter/OSPSuite.Starter.csproj | 142 ++++++++--------- tests/OSPSuite.Starter/packages.config | 8 +- .../OSPSuite.UI.Tests.csproj | 137 ++++++++--------- tests/OSPSuite.UI.Tests/app.config | 20 +++ tests/OSPSuite.UI.Tests/packages.config | 6 +- 38 files changed, 326 insertions(+), 308 deletions(-) diff --git a/src/OSPSuite.Assets/OSPSuite.Assets.csproj b/src/OSPSuite.Assets/OSPSuite.Assets.csproj index b1b53c565..abcfdd1ba 100644 --- a/src/OSPSuite.Assets/OSPSuite.Assets.csproj +++ b/src/OSPSuite.Assets/OSPSuite.Assets.csproj @@ -34,8 +34,9 @@ 4 - - ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.2.0.0.5\lib\net45\OSPSuite.Utility.dll + True @@ -71,8 +72,8 @@ - + diff --git a/src/OSPSuite.Assets/UIConstants.cs b/src/OSPSuite.Assets/UIConstants.cs index 5a6c5fb54..e0950cce2 100644 --- a/src/OSPSuite.Assets/UIConstants.cs +++ b/src/OSPSuite.Assets/UIConstants.cs @@ -193,7 +193,7 @@ public static string ReallyDeleteAllObservedData(IEnumerable anythingNot public static string CloneObjectBase(string entityType, string name) { - return "New name for the cloned {0} '{1}'".FormatWith(entityType, name); + return $"New name for the cloned {entityType} '{name}'"; } public static string ContactSupport(string forumUrl) @@ -203,17 +203,17 @@ public static string ContactSupport(string forumUrl) public static string CreatedOn(string creationDate) { - return "Created on {0}".FormatWith(creationDate); + return $"Created on {creationDate}"; } public static string ClonedOn(string creationDate, string clonedFrom) { - return "Cloned from '{0}' on {1}".FormatWith(clonedFrom, creationDate); + return $"Cloned from '{clonedFrom}' on {creationDate}"; } public static string ConfiguredOn(string creationDate) { - return "Configured on {0}".FormatWith(creationDate); + return $"Configured on {creationDate}"; } public static string ChartFingerprintDataFrom(string projectName, string simulationName, string dateString) @@ -259,12 +259,12 @@ public static string ExceptionViewDescription(string issueTrackerUrl) public static string EnterNameEntityCaption(string type) { - return "Enter name for {0}".FormatWith(type, type); + return $"Enter name for {type}"; } public static string RenameEntityCaption(string type, string name) { - return "New name for {0} '{1}'".FormatWith(type, name); + return $"New name for {type} '{name}'"; } public static class Importer @@ -442,12 +442,12 @@ public static string ExportRelatedItemToFileFilter(string defaultFileExtension) public static string CreatedAtBy(string formattedDate, string by) { - return "Created on {0} by {1}".FormatWith(formattedDate, by); + return $"Created on {formattedDate} by {by}"; } public static string UpdatedAtBy(string formattedDate, string by) { - return "Last updated on {0} by {1}".FormatWith(formattedDate, by); + return $"Last updated on {formattedDate} by {by}"; } public static readonly string ReallyDeleteMultipleRelatedItems = "Really delete Related Items?"; @@ -1284,7 +1284,7 @@ public static class MPFit public static readonly string InitialConstraintsInconsistent = "Initial constraints inconsistent"; public static readonly string NotEnoughDegreesOfFreedom = "Not enough degrees of freedom"; public static readonly string ErrorObjectiveFunction = "Error in objective function: {0}"; - public static readonly string UnknownStatus = "Unknown status: {0}"; + public static string UnknownStatus(string status) => $"Unknown status: {status}"; public static readonly string GeneralInputError = "General input error"; public static string OptimizationFailed(string error) => $"Levenberg-Marquardt optimization failed: {error}"; } @@ -1370,22 +1370,22 @@ public static string ValueGreaterThanMinSizeInPixelAndLessThanMaxSizeIsRequiredO public static string ValueSmallerThanMax(string parameterName, string value, string unit) { - return "Value for {0} should be less than or equal to {1} {2}".FormatWith(parameterName, value, unit); + return $"Value for {parameterName} should be less than or equal to {value} {unit}"; } public static string ValueBiggerThanMin(string parameterName, string value, string unit) { - return "Value for {0} should be greater than or equal to {1} {2}".FormatWith(parameterName, value, unit); + return $"Value for {parameterName} should be greater than or equal to {value} {unit}"; } public static string ValueStrictBiggerThanMin(string parameterName, string value, string unit) { - return "Value for {0} should be strictly greater than {1} {2}".FormatWith(parameterName, value, unit); + return $"Value for {parameterName} should be strictly greater than {value} {unit}"; } public static string ValueStrictSmallerThanMax(string parameterName, string value, string unit) { - return "Value for {0} should be strictly less than {1} {2}".FormatWith(parameterName, value, unit); + return $"Value for {parameterName} should be strictly less than {value} {unit}"; } public static string StartValueDefinedForNonPhysicalContainer(string moleculeName, string containerPath) @@ -1606,7 +1606,7 @@ public static class Command public static string CreateProjectDescription(string version) { - return "Project started with version {0}".FormatWith(version); + return $"Project started with version {version}"; } public static string SetMetaDataAddedCommandDescripton(string name, string value) diff --git a/src/OSPSuite.Assets/packages.config b/src/OSPSuite.Assets/packages.config index 6f059cc79..e713772d6 100644 --- a/src/OSPSuite.Assets/packages.config +++ b/src/OSPSuite.Assets/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/src/OSPSuite.Core/Commands/Core/RollBackException.cs b/src/OSPSuite.Core/Commands/Core/RollBackException.cs index 816d8f273..ebb8a37b5 100644 --- a/src/OSPSuite.Core/Commands/Core/RollBackException.cs +++ b/src/OSPSuite.Core/Commands/Core/RollBackException.cs @@ -1,16 +1,12 @@ using OSPSuite.Utility.Exceptions; -using OSPSuite.Utility.Extensions; namespace OSPSuite.Core.Commands.Core { - public class RollBackException: OSPSuiteException - { - private const string _rollBackCommandExceptionMessage = "Cannot perform Rollback for irreversible action: '{0}'"; - - public RollBackException(ICommand command) - : base(_rollBackCommandExceptionMessage.FormatWith(command.Description)) - { - - } - } + public class RollBackException : OSPSuiteException + { + public RollBackException(ICommand command) + : base($"Cannot perform Rollback for irreversible action: '{command.Description}'") + { + } + } } \ No newline at end of file diff --git a/src/OSPSuite.Core/Domain/AliasCreator.cs b/src/OSPSuite.Core/Domain/AliasCreator.cs index c92f22718..83c9dc9a5 100644 --- a/src/OSPSuite.Core/Domain/AliasCreator.cs +++ b/src/OSPSuite.Core/Domain/AliasCreator.cs @@ -43,7 +43,7 @@ public string CreateAliasFrom(string name, IEnumerable forbiddenAliases) int i = 1; while (forbiddenAliases.ContainsItem(alias)) { - alias = string.Format("{0}{1}", baseAlias, i++); + alias = $"{baseAlias}{i++}"; } return alias; } @@ -53,7 +53,7 @@ private string checkForNumeric(string name) double d; if(double.TryParse(name, out d)) { - return string.Format("_{0}", name); + return $"_{name}"; } return name; } diff --git a/src/OSPSuite.Core/Domain/Builder/StartValue.cs b/src/OSPSuite.Core/Domain/Builder/StartValue.cs index f2ad75e11..85aacdabe 100644 --- a/src/OSPSuite.Core/Domain/Builder/StartValue.cs +++ b/src/OSPSuite.Core/Domain/Builder/StartValue.cs @@ -189,7 +189,7 @@ public override void UpdatePropertiesFrom(IUpdatable source, ICloneManager clone public override string ToString() { - return string.Format("Path={0}, Name={1}", ContainerPath, Name); + return $"Path={ContainerPath}, Name={Name}"; } } } \ No newline at end of file diff --git a/src/OSPSuite.Core/Domain/Exceptions.cs b/src/OSPSuite.Core/Domain/Exceptions.cs index 5e7fa7670..d70f9ae23 100644 --- a/src/OSPSuite.Core/Domain/Exceptions.cs +++ b/src/OSPSuite.Core/Domain/Exceptions.cs @@ -1,12 +1,10 @@ using System; using OSPSuite.Assets; -using OSPSuite.Utility.Exceptions; -using OSPSuite.Utility.Extensions; using OSPSuite.Core.Domain.Formulas; +using OSPSuite.Utility.Exceptions; namespace OSPSuite.Core.Domain { - public class BothNeighborsSatisfyingCriteriaException : OSPSuiteException { public BothNeighborsSatisfyingCriteriaException(INeighborhood neighborhood) : base(Error.BothNeighborsSatisfying(neighborhood.Name)) @@ -16,19 +14,14 @@ public BothNeighborsSatisfyingCriteriaException(INeighborhood neighborhood) : ba public class NotUniqueIdException : ArgumentException { - private static string ERROR_MESSAGE = "Id {0} not unique"; - - public NotUniqueIdException(string id) - : base(string.Format(ERROR_MESSAGE, id)) + public NotUniqueIdException(string id) : base($"Id {id} not unique") { } } public class NotUniqueNameException : OSPSuiteException { - private const string _errorMessage = "Name '{0}' is not unique in parent container '{1}'"; - - public NotUniqueNameException(string childName, string containerName) : this(_errorMessage.FormatWith(childName, containerName)) + public NotUniqueNameException(string childName, string containerName) : this($"Name '{childName}' is not unique in parent container '{containerName}'") { } @@ -41,7 +34,7 @@ public NotUniqueNameException(string message) public class ValuePointAlreadyExistsForPointException : OSPSuiteException { public ValuePointAlreadyExistsForPointException(ValuePoint point) - : base(string.Format("A point for x={0} was already added with y={1}", point.X, point.Y)) + : base($"A point for x={point.X} was already added with y={point.Y}") { } } diff --git a/src/OSPSuite.Core/Domain/Formulas/DynamicFormula.cs b/src/OSPSuite.Core/Domain/Formulas/DynamicFormula.cs index bc985242b..6f7ec46bf 100644 --- a/src/OSPSuite.Core/Domain/Formulas/DynamicFormula.cs +++ b/src/OSPSuite.Core/Domain/Formulas/DynamicFormula.cs @@ -50,7 +50,7 @@ protected override double CalculateFor(IEnumerable usedObjects /// public string VariablePattern { - get { return string.Format("{0}_{1}", Variable, _iterationPattern); } + get { return $"{Variable}_{_iterationPattern}"; } } /// @@ -83,8 +83,8 @@ public IFormula ExpandUsing(IReadOnlyList allFormulaUsable, IObj private void addDynamicVariablesToFormula(ExplicitFormula explicitFormula, StringBuilder stringBuilder, IFormulaUsable formulaUsable, int index0, IObjectPathFactory objectPathFactory) { - string index1 = string.Format("{0}", index0 + 1); - string currentVariable = string.Format("{0}_{1}", Variable, index1); + string index1 = $"{index0 + 1}"; + string currentVariable = $"{Variable}_{index1}"; //replace current variable in formula string and add reference to the explicit formula string formulaStringPart = FormulaString.Replace(VariablePattern, currentVariable); diff --git a/src/OSPSuite.Core/Domain/Formulas/FormulaFactory.cs b/src/OSPSuite.Core/Domain/Formulas/FormulaFactory.cs index e6b41e979..dd63002d5 100644 --- a/src/OSPSuite.Core/Domain/Formulas/FormulaFactory.cs +++ b/src/OSPSuite.Core/Domain/Formulas/FormulaFactory.cs @@ -80,7 +80,7 @@ public IFormula CreateMoleculeAmountReferenceToStartValue(IParameter startValueP { var formula = startValueParameter.IsAmountBased() ? createReferenceStartValueFormula(Constants.START_VALUE_ALIAS, Constants.MOLECULE_CONCENTRATION_IN_AMOUNT_FORMULA) - : createReferenceStartValueFormula(string.Format("{0} * {1}", Constants.START_VALUE_ALIAS, Constants.VOLUME_ALIAS), Constants.MOLECULE_AMOUNT_FORMULA); + : createReferenceStartValueFormula($"{Constants.START_VALUE_ALIAS} * {Constants.VOLUME_ALIAS}", Constants.MOLECULE_AMOUNT_FORMULA); formula.AddObjectPath(_objectPathFactory.CreateFormulaUsablePathFrom(Constants.Parameters.START_VALUE) .WithAlias(Constants.START_VALUE_ALIAS) diff --git a/src/OSPSuite.Core/Domain/ParameterIdentifications/Algorithms/MPFitLevenbergMarquardtOptimizer.cs b/src/OSPSuite.Core/Domain/ParameterIdentifications/Algorithms/MPFitLevenbergMarquardtOptimizer.cs index 670e7d295..0c7e37a31 100644 --- a/src/OSPSuite.Core/Domain/ParameterIdentifications/Algorithms/MPFitLevenbergMarquardtOptimizer.cs +++ b/src/OSPSuite.Core/Domain/ParameterIdentifications/Algorithms/MPFitLevenbergMarquardtOptimizer.cs @@ -132,7 +132,7 @@ private void evaluateStatus(int status) errorMsg = Error.MPFit.NotEnoughDegreesOfFreedom; break; default: - errorMsg = Error.MPFit.UnknownStatus.FormatWith(status); + errorMsg = Error.MPFit.UnknownStatus(status.ToString()); break; } diff --git a/src/OSPSuite.Core/Domain/Services/ConcentrationBasedFormulaUpdater.cs b/src/OSPSuite.Core/Domain/Services/ConcentrationBasedFormulaUpdater.cs index c3c2bde9b..d6c66be7b 100644 --- a/src/OSPSuite.Core/Domain/Services/ConcentrationBasedFormulaUpdater.cs +++ b/src/OSPSuite.Core/Domain/Services/ConcentrationBasedFormulaUpdater.cs @@ -58,7 +58,7 @@ private ExplicitFormula updateFormulaToAmountBase(IFormula originalFormula, IDim formulaInAmount.Dimension = amountDimension; var volumeAlias = _formulaTask.AddParentVolumeReferenceToFormula(formulaInAmount); - formulaInAmount.FormulaString = string.Format("({0})*{1}", formulaInAmount.FormulaString, volumeAlias); + formulaInAmount.FormulaString = $"({formulaInAmount.FormulaString})*{volumeAlias}"; return formulaInAmount; } diff --git a/src/OSPSuite.Core/Domain/Services/ContainerTask.cs b/src/OSPSuite.Core/Domain/Services/ContainerTask.cs index ace098101..7fc4c4f5e 100644 --- a/src/OSPSuite.Core/Domain/Services/ContainerTask.cs +++ b/src/OSPSuite.Core/Domain/Services/ContainerTask.cs @@ -140,7 +140,7 @@ public string CreateUniqueName(IReadOnlyList usedNames, string baseName, .Select(n => n.Substring(baseFormat.Length)); //try to convert them to an int - return string.Format("{0}{1}", baseFormat, getNextAvailableIndexBasedOn(allUsedNamesMatchingBaseFormat)); + return $"{baseFormat}{getNextAvailableIndexBasedOn(allUsedNamesMatchingBaseFormat)}"; } private int getNextAvailableIndexBasedOn(IEnumerable allUsedNamesMatchingBaseFormat) diff --git a/src/OSPSuite.Core/Domain/Services/ModelReportCreator.cs b/src/OSPSuite.Core/Domain/Services/ModelReportCreator.cs index c70d90d5b..508ce0e4f 100644 --- a/src/OSPSuite.Core/Domain/Services/ModelReportCreator.cs +++ b/src/OSPSuite.Core/Domain/Services/ModelReportCreator.cs @@ -345,7 +345,7 @@ private static string getUnit(IDimension dimension) string unit = dimension.BaseUnit.Name; if (!string.IsNullOrEmpty(unit)) - unit = string.Format(" [{0}]", unit); + unit = $" [{unit}]"; return unit; } diff --git a/src/OSPSuite.Core/Domain/UnitSystem/MergedDimensionFor.cs b/src/OSPSuite.Core/Domain/UnitSystem/MergedDimensionFor.cs index aca887205..763b17e50 100644 --- a/src/OSPSuite.Core/Domain/UnitSystem/MergedDimensionFor.cs +++ b/src/OSPSuite.Core/Domain/UnitSystem/MergedDimensionFor.cs @@ -185,7 +185,7 @@ public class UnableToResolveParametersException : OSPSuiteException public Unit Unit { get; private set; } public string UnableToResolveParametersMessage { get; private set; } - public UnableToResolveParametersException(Unit unit, string unableToResolveParametersMessage) : base(string.Format("Unable to convert to {0}.\n{1}", unit.Name, unableToResolveParametersMessage)) + public UnableToResolveParametersException(Unit unit, string unableToResolveParametersMessage) : base($"Unable to convert to {unit.Name}.\n{unableToResolveParametersMessage}") { Unit = unit; UnableToResolveParametersMessage = unableToResolveParametersMessage; diff --git a/src/OSPSuite.Core/Journal/JournalException.cs b/src/OSPSuite.Core/Journal/JournalException.cs index 71eb31ea9..e7e0fb7f8 100644 --- a/src/OSPSuite.Core/Journal/JournalException.cs +++ b/src/OSPSuite.Core/Journal/JournalException.cs @@ -20,7 +20,7 @@ public JournalException(string message, Exception innerException) : base(message public class CannotCreateNewItemForPersitedEntity : JournalException { - public CannotCreateNewItemForPersitedEntity(string id) : base("Cannot create a new item for an existing id: {0}".FormatWith(id)) + public CannotCreateNewItemForPersitedEntity(string id) : base($"Cannot create a new item for an existing id: {id}") { } } diff --git a/src/OSPSuite.Core/Journal/JournalSearchContextFinder.cs b/src/OSPSuite.Core/Journal/JournalSearchContextFinder.cs index c6071c671..b23e8f8e3 100644 --- a/src/OSPSuite.Core/Journal/JournalSearchContextFinder.cs +++ b/src/OSPSuite.Core/Journal/JournalSearchContextFinder.cs @@ -64,7 +64,7 @@ private string createSearchPattern(string searchPattern) { var escapedPattern = Regex.Escape(searchPattern); return "(?(?:\\S+\\s){0," + CONTEXT_WORD_COUNT + "}\\S*)?" + //up to CONTEXT_WORD_COUNT words BEFORE the match - "(?{0})".FormatWith(escapedPattern) + //actual match + $"(?{escapedPattern})"+ //actual match "(?\\S*(?:\\s\\S+){0," + CONTEXT_WORD_COUNT + "})?"; //up to CONTEXT_WORD_COUNT words AFTER the match } diff --git a/src/OSPSuite.Core/OSPSuite.Core.csproj b/src/OSPSuite.Core/OSPSuite.Core.csproj index 888bee1c2..f2d918700 100644 --- a/src/OSPSuite.Core/OSPSuite.Core.csproj +++ b/src/OSPSuite.Core/OSPSuite.Core.csproj @@ -80,8 +80,9 @@ False ..\..\packages\OSPSuite.TeXReporting.2.0.0.1\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.2.0.0.5\lib\net45\OSPSuite.Utility.dll + True diff --git a/src/OSPSuite.Core/packages.config b/src/OSPSuite.Core/packages.config index 1f0a94fe3..0778d23ce 100644 --- a/src/OSPSuite.Core/packages.config +++ b/src/OSPSuite.Core/packages.config @@ -6,5 +6,5 @@ - + \ No newline at end of file diff --git a/src/OSPSuite.Infrastructure/Journal/Queries/NextAvailableJournalPageIndexQuery.cs b/src/OSPSuite.Infrastructure/Journal/Queries/NextAvailableJournalPageIndexQuery.cs index 3781f541a..e8f272d8d 100644 --- a/src/OSPSuite.Infrastructure/Journal/Queries/NextAvailableJournalPageIndexQuery.cs +++ b/src/OSPSuite.Infrastructure/Journal/Queries/NextAvailableJournalPageIndexQuery.cs @@ -15,7 +15,7 @@ public NextAvailableJournalPageIndexQuery(IJournalSession journalSession) : base public override int Query(NextAvailableJournalPageIndex query) { - var sql = "SELECT MAX(UniqueIndex) as UniqueIndex FROM {0}".FormatWith(Db.JournalPages.TableName); + var sql = $"SELECT MAX(UniqueIndex) as UniqueIndex FROM {Db.JournalPages.TableName}"; var dataRow = Db.Connection.ExecuteQueryForSingleRow(sql); return dataRow.ValueAt("UniqueIndex") + 1; } diff --git a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj index fe4aff88f..c571970ab 100644 --- a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj +++ b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj @@ -76,8 +76,9 @@ False ..\..\packages\OSPSuite.TeXReporting.2.0.0.1\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.2.0.0.5\lib\net45\OSPSuite.Utility.dll + True ..\..\packages\OSPSuite.SmartXLS.2.6.3.1\lib\net45\SX.dll diff --git a/src/OSPSuite.Infrastructure/Serialization/DapperDatabase.cs b/src/OSPSuite.Infrastructure/Serialization/DapperDatabase.cs index 18ba44445..29cec03af 100644 --- a/src/OSPSuite.Infrastructure/Serialization/DapperDatabase.cs +++ b/src/OSPSuite.Infrastructure/Serialization/DapperDatabase.cs @@ -117,7 +117,7 @@ public bool Delete(TId id) /// public bool DeleteWhere(string deleteCondition, dynamic data) { - return _database.Execute("DELETE FROM " + TableName + " WHERE {0}".FormatWith(deleteCondition), data) > 0; + return _database.Execute($"DELETE FROM {TableName} WHERE {deleteCondition}", data) > 0; } /// @@ -132,17 +132,17 @@ public T Get(TId id) public IEnumerable GetWhere(string getCondition, dynamic data) { - return _database.DoInConnection(() => _database.Query("SELECT * FROM " + TableName + " WHERE {0}".FormatWith(getCondition), data)); + return _database.DoInConnection(() => _database.Query($"SELECT * FROM {TableName} WHERE {getCondition}", data)); } public T First() { - return _database.DoInConnection(() => _database.Query("SELECT * FROM " + TableName + " LIMIT 1").FirstOrDefault()); + return _database.DoInConnection(() => _database.Query($"SELECT * FROM {TableName} LIMIT 1").FirstOrDefault()); } public IEnumerable All() { - return _database.DoInConnection(() => _database.Query("SELECT * FROM " + TableName)); + return _database.DoInConnection(() => _database.Query($"SELECT * FROM {TableName}")); } private static readonly ConcurrentDictionary> paramNameCache = new ConcurrentDictionary>(); diff --git a/src/OSPSuite.Infrastructure/packages.config b/src/OSPSuite.Infrastructure/packages.config index 7ea49cc45..11b01e00e 100644 --- a/src/OSPSuite.Infrastructure/packages.config +++ b/src/OSPSuite.Infrastructure/packages.config @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj index e0087890c..98f7ad263 100644 --- a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj +++ b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj @@ -34,13 +34,13 @@ 4 - - False - ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.4\lib\net452\DevExpress.Data.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.6\lib\net452\DevExpress.Data.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.4\lib\net452\DevExpress.Utils.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.6\lib\net452\DevExpress.Utils.v16.2.dll + True ..\..\packages\OSPSuite.Serializer.2.0.0.1\lib\net45\OSPSuite.Serializer.dll @@ -48,8 +48,9 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.0.1\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.2.0.0.5\lib\net45\OSPSuite.Utility.dll + True ..\..\packages\OSPSuite.SmartXLS.2.6.3.1\lib\net45\SX.dll diff --git a/src/OSPSuite.Presentation/packages.config b/src/OSPSuite.Presentation/packages.config index 2d2779627..849ac887f 100644 --- a/src/OSPSuite.Presentation/packages.config +++ b/src/OSPSuite.Presentation/packages.config @@ -1,8 +1,8 @@  - + - + \ No newline at end of file diff --git a/src/OSPSuite.UI/Binders/AxisAdapter.cs b/src/OSPSuite.UI/Binders/AxisAdapter.cs index 48a1ae2bd..92fdfa8db 100644 --- a/src/OSPSuite.UI/Binders/AxisAdapter.cs +++ b/src/OSPSuite.UI/Binders/AxisAdapter.cs @@ -261,7 +261,7 @@ private void setLabels() switch (Axis.NumberMode) { case NumberModes.Scientific: - pattern = "V:E{0}".FormatWith(_numericFormatterOptions.DecimalPlace); + pattern = $"V:E{_numericFormatterOptions.DecimalPlace}"; break; case NumberModes.Normal: pattern = "V:G"; diff --git a/src/OSPSuite.UI/OSPSuite.UI.csproj b/src/OSPSuite.UI/OSPSuite.UI.csproj index c0abc4c5e..1dc14cfea 100644 --- a/src/OSPSuite.UI/OSPSuite.UI.csproj +++ b/src/OSPSuite.UI/OSPSuite.UI.csproj @@ -49,93 +49,93 @@ 4 - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.BonusSkins.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.BonusSkins.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.Charts.v16.2.Core.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.Charts.v16.2.Core.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.4\lib\net452\DevExpress.Data.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.6\lib\net452\DevExpress.Data.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.Office.v16.2.Core.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.Office.v16.2.Core.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.PivotGrid.v16.2.Core.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.PivotGrid.v16.2.Core.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.Printing.v16.2.Core.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.Printing.v16.2.Core.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.RichEdit.v16.2.Core.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.RichEdit.v16.2.Core.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.4\lib\net452\DevExpress.Utils.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.6\lib\net452\DevExpress.Utils.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraBars.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraBars.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraCharts.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraCharts.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraCharts.v16.2.UI.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraCharts.v16.2.UI.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraCharts.v16.2.Wizard.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraCharts.v16.2.Wizard.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraEditors.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraEditors.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraGrid.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraGrid.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraLayout.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraLayout.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraNavBar.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraNavBar.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraPivotGrid.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraPivotGrid.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraPrinting.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraPrinting.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraRichEdit.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraRichEdit.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraRichEdit.v16.2.Extensions.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraRichEdit.v16.2.Extensions.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraTreeList.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraTreeList.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraVerticalGrid.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraVerticalGrid.v16.2.dll + True ..\..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll @@ -160,15 +160,16 @@ ..\..\packages\OSPSuite.DataBinding.2.0.0.1\lib\net45\OSPSuite.DataBinding.dll - - False - ..\..\packages\OSPSuite.DataBinding.DevExpress.2.0.0.1\lib\net45\OSPSuite.DataBinding.DevExpress.dll + + ..\..\packages\OSPSuite.DataBinding.DevExpress.2.0.0.3\lib\net45\OSPSuite.DataBinding.DevExpress.dll + True ..\..\packages\OSPSuite.TeXReporting.2.0.0.1\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.2.0.0.5\lib\net45\OSPSuite.Utility.dll + True diff --git a/src/OSPSuite.UI/packages.config b/src/OSPSuite.UI/packages.config index d271c4469..e1c16c409 100644 --- a/src/OSPSuite.UI/packages.config +++ b/src/OSPSuite.UI/packages.config @@ -2,11 +2,11 @@ - - - + + + - + \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Core/BinIntervalsCreatorSpecs.cs b/tests/OSPSuite.Core.Tests/Core/BinIntervalsCreatorSpecs.cs index 35d176f18..3f0371489 100644 --- a/tests/OSPSuite.Core.Tests/Core/BinIntervalsCreatorSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Core/BinIntervalsCreatorSpecs.cs @@ -50,7 +50,7 @@ protected void VerifyIntervalContent(int expectedNumberOfIntervals) for (int i = 0; i < orderedValues.Count / _intervals.Count; i++) { double value = orderedValues[(orderedValues.Count / _intervals.Count) * binIndex + i]; - _intervals[binIndex].Contains(value).ShouldBeTrue("BinIndex = {0}, value = {1}".FormatWith(binIndex, value)); + _intervals[binIndex].Contains(value).ShouldBeTrue($"BinIndex = {binIndex}, value = {value}"); } } } diff --git a/tests/OSPSuite.Core.Tests/Core/DataColumnLoader.cs b/tests/OSPSuite.Core.Tests/Core/DataColumnLoader.cs index 6c97d631b..e5e78a3e3 100644 --- a/tests/OSPSuite.Core.Tests/Core/DataColumnLoader.cs +++ b/tests/OSPSuite.Core.Tests/Core/DataColumnLoader.cs @@ -14,7 +14,7 @@ internal static class DataColumnLoader { public static DataColumn GetDataColumnFrom(string excelFileNameWithoutExtension) { - var fileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Data\\{0}.xls".FormatWith(excelFileNameWithoutExtension)); + var fileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Data\\{excelFileNameWithoutExtension}.xls"); DataTable dataTable; using (var workBook = new WorkBook()) { diff --git a/tests/OSPSuite.Core.Tests/Core/ModelConstructorIntegrationTests.cs b/tests/OSPSuite.Core.Tests/Core/ModelConstructorIntegrationTests.cs index 8ca449912..bbcd3d570 100644 --- a/tests/OSPSuite.Core.Tests/Core/ModelConstructorIntegrationTests.cs +++ b/tests/OSPSuite.Core.Tests/Core/ModelConstructorIntegrationTests.cs @@ -347,7 +347,7 @@ public void each_parameter_using_formula_defined_in_the_simulation_should_have_a var builder = _buildConfiguration.BuilderFor(entity); if (builder != null) continue; if (entity.IsNamed(Constants.NEIGHBORHOODS)) continue; - errorList.Add("No builder found for {0}".FormatWith(entity.Name)); + errorList.Add($"No builder found for {entity.Name}"); } errorList.Count.ShouldBeEqualTo(0, errorList.ToString("\n")); diff --git a/tests/OSPSuite.Core.Tests/Helpers/UnitTestContextSpecificationSpecs.cs b/tests/OSPSuite.Core.Tests/Helpers/UnitTestContextSpecificationSpecs.cs index fc55d3c67..cf7ca7e52 100644 --- a/tests/OSPSuite.Core.Tests/Helpers/UnitTestContextSpecificationSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Helpers/UnitTestContextSpecificationSpecs.cs @@ -123,7 +123,7 @@ public abstract class ContextForModelConstructorIntegration : ContextForIntegrat { public SimulationTransfer LoadPKMLFile(string pkmlName) { - var projectFile = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Data\\{0}.pkml".FormatWith(pkmlName)); + var projectFile = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Data\\{pkmlName}.pkml"); return SerializationHelperForSpecs.Load(projectFile); } diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj index e8a91c023..44d88e515 100644 --- a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj +++ b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj @@ -67,12 +67,12 @@ ..\..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll True - - ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.4\lib\net452\DevExpress.Data.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.6\lib\net452\DevExpress.Data.v16.2.dll True - - ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.4\lib\net452\DevExpress.Utils.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.6\lib\net452\DevExpress.Utils.v16.2.dll True @@ -110,8 +110,9 @@ ..\..\packages\OSPSuite.TeXReporting.2.0.0.1\lib\net45\OSPSuite.TeXReporting.dll - - ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.2.0.0.5\lib\net45\OSPSuite.Utility.dll + True ..\..\packages\OSPSuite.SmartXLS.2.6.3.1\lib\net45\SX.dll diff --git a/tests/OSPSuite.Core.Tests/packages.config b/tests/OSPSuite.Core.Tests/packages.config index e5f757b3b..055f52339 100644 --- a/tests/OSPSuite.Core.Tests/packages.config +++ b/tests/OSPSuite.Core.Tests/packages.config @@ -10,12 +10,12 @@ - + - + \ No newline at end of file diff --git a/tests/OSPSuite.Starter/OSPSuite.Starter.csproj b/tests/OSPSuite.Starter/OSPSuite.Starter.csproj index da0aeba3c..d3fe99e48 100644 --- a/tests/OSPSuite.Starter/OSPSuite.Starter.csproj +++ b/tests/OSPSuite.Starter/OSPSuite.Starter.csproj @@ -66,93 +66,93 @@ ..\..\packages\Castle.Windsor.3.4.0\lib\net45\Castle.Windsor.dll True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.BonusSkins.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.BonusSkins.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.Charts.v16.2.Core.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.Charts.v16.2.Core.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.4\lib\net452\DevExpress.Data.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.6\lib\net452\DevExpress.Data.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.Office.v16.2.Core.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.Office.v16.2.Core.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.PivotGrid.v16.2.Core.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.PivotGrid.v16.2.Core.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.Printing.v16.2.Core.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.Printing.v16.2.Core.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.RichEdit.v16.2.Core.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.RichEdit.v16.2.Core.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.4\lib\net452\DevExpress.Utils.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.6\lib\net452\DevExpress.Utils.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraBars.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraBars.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraCharts.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraCharts.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraCharts.v16.2.UI.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraCharts.v16.2.UI.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraCharts.v16.2.Wizard.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraCharts.v16.2.Wizard.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraEditors.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraEditors.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraGrid.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraGrid.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraLayout.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraLayout.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraNavBar.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraNavBar.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraPivotGrid.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraPivotGrid.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraPrinting.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraPrinting.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraRichEdit.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraRichEdit.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraRichEdit.v16.2.Extensions.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraRichEdit.v16.2.Extensions.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraTreeList.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraTreeList.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraVerticalGrid.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraVerticalGrid.v16.2.dll + True ..\..\packages\Northwoods.GoWin.5.2.0\lib\net45\Northwoods.Go.dll @@ -185,14 +185,16 @@ ..\..\packages\OSPSuite.DataBinding.2.0.0.1\lib\net45\OSPSuite.DataBinding.dll - - ..\..\packages\OSPSuite.DataBinding.DevExpress.2.0.0.1\lib\net45\OSPSuite.DataBinding.DevExpress.dll + + ..\..\packages\OSPSuite.DataBinding.DevExpress.2.0.0.3\lib\net45\OSPSuite.DataBinding.DevExpress.dll + True ..\..\packages\OSPSuite.Serializer.2.0.0.1\lib\net45\OSPSuite.Serializer.dll - - ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.2.0.0.5\lib\net45\OSPSuite.Utility.dll + True diff --git a/tests/OSPSuite.Starter/packages.config b/tests/OSPSuite.Starter/packages.config index f89ada8b5..745525dc0 100644 --- a/tests/OSPSuite.Starter/packages.config +++ b/tests/OSPSuite.Starter/packages.config @@ -4,10 +4,10 @@ - - - + + + - + \ No newline at end of file diff --git a/tests/OSPSuite.UI.Tests/OSPSuite.UI.Tests.csproj b/tests/OSPSuite.UI.Tests/OSPSuite.UI.Tests.csproj index b3d1ef198..1760b0ff6 100644 --- a/tests/OSPSuite.UI.Tests/OSPSuite.UI.Tests.csproj +++ b/tests/OSPSuite.UI.Tests/OSPSuite.UI.Tests.csproj @@ -31,93 +31,93 @@ 4 - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.BonusSkins.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.BonusSkins.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.Charts.v16.2.Core.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.Charts.v16.2.Core.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.4\lib\net452\DevExpress.Data.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.6\lib\net452\DevExpress.Data.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.Office.v16.2.Core.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.Office.v16.2.Core.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.PivotGrid.v16.2.Core.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.PivotGrid.v16.2.Core.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.Printing.v16.2.Core.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.Printing.v16.2.Core.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.RichEdit.v16.2.Core.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.RichEdit.v16.2.Core.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.4\lib\net452\DevExpress.Utils.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.Presentation.16.2.6\lib\net452\DevExpress.Utils.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraBars.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraBars.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraCharts.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraCharts.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraCharts.v16.2.UI.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraCharts.v16.2.UI.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraCharts.v16.2.Wizard.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraCharts.v16.2.Wizard.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraEditors.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraEditors.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraGrid.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraGrid.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraLayout.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraLayout.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraNavBar.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraNavBar.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraPivotGrid.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraPivotGrid.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraPrinting.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraPrinting.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraRichEdit.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraRichEdit.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraRichEdit.v16.2.Extensions.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraRichEdit.v16.2.Extensions.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraTreeList.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraTreeList.v16.2.dll + True - - False - ..\..\packages\OSPSuite.DevExpress.16.2.4\lib\net452\DevExpress.XtraVerticalGrid.v16.2.dll + + ..\..\packages\OSPSuite.DevExpress.16.2.6\lib\net452\DevExpress.XtraVerticalGrid.v16.2.dll + True ..\..\packages\FakeItEasy.2.3.3\lib\net40\FakeItEasy.dll @@ -129,8 +129,9 @@ ..\..\packages\OSPSuite.BDDHelper.2.0.0.1\lib\net45\OSPSuite.BDDHelper.dll - - ..\..\packages\OSPSuite.Utility.2.0.0.1\lib\net45\OSPSuite.Utility.dll + + ..\..\packages\OSPSuite.Utility.2.0.0.5\lib\net45\OSPSuite.Utility.dll + True diff --git a/tests/OSPSuite.UI.Tests/app.config b/tests/OSPSuite.UI.Tests/app.config index 533a9afb4..d62a591c2 100644 --- a/tests/OSPSuite.UI.Tests/app.config +++ b/tests/OSPSuite.UI.Tests/app.config @@ -10,6 +10,26 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/OSPSuite.UI.Tests/packages.config b/tests/OSPSuite.UI.Tests/packages.config index 90279bf03..6a219a73f 100644 --- a/tests/OSPSuite.UI.Tests/packages.config +++ b/tests/OSPSuite.UI.Tests/packages.config @@ -3,7 +3,7 @@ - - - + + + \ No newline at end of file From 3191588214cde8fe9e6014826ed50f6724197204 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Mon, 17 Apr 2017 12:46:29 -0400 Subject: [PATCH 27/50] Fixes #46 update icons (#49) --- src/OSPSuite.Assets/Icons/BeagleGreen.ico | Bin 17542 -> 17542 bytes src/OSPSuite.Assets/Icons/BeagleRed.ico | Bin 17542 -> 17542 bytes src/OSPSuite.Assets/Icons/MouseGreen.ico | Bin 17542 -> 17542 bytes src/OSPSuite.Assets/Icons/MouseRed.ico | Bin 17542 -> 17542 bytes src/OSPSuite.Assets/Icons/Rabbit.ico | Bin 17542 -> 17542 bytes src/OSPSuite.Assets/Icons/RabbitGreen.ico | Bin 17542 -> 17542 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/OSPSuite.Assets/Icons/BeagleGreen.ico b/src/OSPSuite.Assets/Icons/BeagleGreen.ico index 923d6a3bf6ae1b16abbc54d40598d6a6ba8aa897..ce087fed1ed2ffe309c70991e0a20747ab6b7097 100644 GIT binary patch literal 17542 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 literal 17542 zcmeHOcUYCj(#OOeH72H*W=y&F`bAAJdW|i%Aiej_0S;A)6s4X@KO!his@Opkq=TZO zs8|ydHMS^5#F*Hk#>9fj@0(pbcxaX+eoy}R_IdW*eYei;&d$!x%&MvNQtPdzuC7Mm zNVUR$si|qIsi}<|`QU%3n%Xr=8$P`4KYoCkTE;{*wV{;G%6s-!QyVc;O>Gp_p(fM> zffl~^L3mYkgYGL55`axBtF>4+FnbdFRm z`%#!X?~ZwW!7*FU;?mp^zOm2t}sx+{@J-i;2AxGNP)p1qey??~jaSK|~( z>*E!PY>CvemS**fijXf7M~Uv)t#N^FwFL|+En!%034=0j|LPPHxE(mq3`i5jwu)v(lzy!kWo)OMDU z8Wy>agG3&8Q6v_Rj|r8IC0uUSt+pZ9&G~$56dS;}!WxY~?8DXD*D${!60%+8G0L!gjFs*Uo<=J}ZR@uU&$Oy@nYDm|o z_GvBBX|A5d7})xz+6{w57IRx7m1$~ibM?`!bh)EnW`j8dpGmnj!M!1{)-hZFCvx3kwWY7caK8}zxVI}cu zX2C(tO2PfP^&uVLJaP3TEUTR`n`mUxq1+C6H}3ob_f26?U!j8;MMRTo++enSF6MqE z#f_Ucv96#H&-d;FGixVYI<*ry*3Ti8Xw$QRf6ivd{S1DKDi>V(^(PJ|gWa}T0KH8P z&?vXZgw=+~I$qFW3^(uGL{MWa4C~!ty>lMSclbcKH=?~vV`C$&gBn&97USTGxmcn{ zc=R`{LFf6`+$^ZksdnM`&tRV45CNl7+K)s_O}2R9^8yPxr<`HD-4i*dirV305r#{W zub056-V;XKJP>#=wnM&$hX>wz_g}br?i*wgO-&=(_gB}T8~9W7s)VhK{^-(qrCnl7 zXO$@|x6Oq{u{|_5I>K&OAS@gFpjYRL!~;1UVEnc9HwgEHL%U9Z>{IJHu)_%kdqcn0v-Ia%t|xcp*3bkUIU3UoG^);Pj+vlph*+*@q(;qcq;48Y7{YkaoW zh}NO71DrnlWzgFu#L=Hmc1UMGBS*f6Fi8xKmr0PM{Q!Q#BeoVPbe1yuw3u*pcJNOa0YNHoCRwR@t<{ztI9#bUw|YdDq?_sj6zG8)_Jwhy>_W1 z=9Jj;e~TTygzug(t@kF_U0_V%vFoS1g+Dhp7Xt^sgq!CMV1-~H>XQs`e(y?Lzi=E! zjvS@^U4oRXRmfacfL(j`<8sRxH1A%HlHgHDVP_z%k?Owh41csNYOG8g+w4c}>JtBE zyu}rUo7^#TofT{v=7Hf23mGmM)w*-|*}v5ef0)#J!I;i~%JcQz!p;(R?b?Osp6^4k zKX9q}6gF1W!qVOaFARB^?~T6w`s1B<-ocAQhw}gD`V4^3YaUL2cLFD>5|C@#o9`Rt z7&^l*mq(42NaLGRojyQN$Z%K_otahP0L?N7*b?3__|3L>bKJ2em~DtwT5R`$;Z`?T z(>Q8d8hV7CWqkYXw;ZlHv z{B{dg318x8AR9v$_@ko6ilP=aFLrz%d9+@Q-;`iNoF4I%&M?~P3F94J(BCY?)FRr~ z4c@d*U13W2AN5T-ntnO|NZ48Cv17+L+!huVsIIQYZ@>Na*gC90WTc4K^9u^YPbapw zje*fG+V_lqQ}RFZ2k<94zJ~(m7jXX68LIa@%Jdk!oZSf15@$syp}Q9x%0$zR0|ds7V`QN5ZF z*28fy*AB^Pxp?)p*HoLp_h--YHop1hn-1wu@{^sNjlO;RK1tCY%lP>C;>BUFyh2LTr&Tfu}v%4?fU!5C!<&{?u9Ua{{`LX{(p%Cio>W?k=r~<96t(-nB zO3lW%8$yt1+zVo9G{3*J;lH9e&g^Ae`FcI3&C~+xv$GQj1Q<7NT<7G+{*M|p3f|t{ zk1hA80(bA+g|3bs#(y>)*U#?763YP)N#yPDN6HhL71pofX44Mhw?2eI(e*4XFE8gf z^vf^5JgTb>dAD!h=5^RU{If1AD+m8GY7AZ+G7N9N^#OipK8-w&_Yf(PJcM5s-<(YJ z=Vr?xu=8WXh7Dc1WAua3?#jx_E_ppAFnY=AT)TFyry`F`XM6r5g8hYoL-5v{BQR+2 z%lP)lVXR#+9ubkEcK9P?am{INqj2TiVcy@KJ$t%sm*KIEjZL?C-6fiunqvI;@!e%T zaaufgVA zw|SitZ{51Z=YsJ+f7JNNDBC$*b{+Q-$zlr$nc-#D+JlT~G zW-xsB-FFm zgg;BY)N$$Dw;1;NTZALFJ$Cv2`|rcS!J)@|WyY{!!{F)Zsr+pZFJ8PzJWf9U&(B{D zM+awY+g9J6&muK7HTd)azch8GCN^(vz}2${u#;_X6I2YXl#| znl)?i?z;Bu_$ZUQgg^dx5l&9d820jO7(#c0K`#tNpS}ao zr~g2>%?-eD+M|~aSD;2d4e2DeV0SZiFJm&8p7_sX*Z&}m#+OI@_77i`A}%q7kHO#H zAHVs|6XCw%?Y*NBJ^5p8@2bF}qw>0&d^HDseS zbPQ5yF4=tZJHN_(vS;{5VJVF-qsF6SXdYz zAET*BNl8dZNWh2@BhaT$AM`|j+beg9XlQ6)uK#?r?8-qB-7(qSu_sx@qu|dZ-kRMJ z*gcx@s)yHy<6`qk$fDvntn55eb?k0sY;24nLxx}|-JcvC9dVX;y{B>PjAnPRto*gu zo9m2Zx*tDE#_~A$d0iRSN_}PXzx1`F$$kQx4k?&FoI22FA<(U5?!yCrz4+0fUBO-~KPLf0=vR9q}=8_osoM z$uClgUR@y>=6|Qmg0{BKUk3l@pMS=J1q=9mj8&gV_p>8(FA3&!hRxTbaEIkR4g9P; zqg@RtW?Z(x*1*BR5r5_`_|;cm@pF&0F=*&3NXuHz<%(Ms+I+t~seJco;pg%&nwK+M zQ~5dg@@sE$*|NL42M!)Q*yDQKy?d9_q2Sf7Tw8A+fXL(3${TrhS%?vjYG6=wl93ujih_=+UF0rKJVNZ%&;$4a47P zgO|Z&^`WI(?0AcS=(}_fqY#VZYt$EkAqv8|FrYZ>nZ6G;nGUip*XZQ zfWy*6dvJYeH6jT<8-XVb&F$df7mCCsS*WYuiSwj~`MGH?$v$NyPowjZ)-joA8pD;R zg}W#CqnP|8dSP?2>nJe#uPoPH$ogb+#%OdJg#})3qJEJ94zHV!rY(zbcFSU%s*b^d zWv-}^O~FdigR%2)F_RfE*(__H+UTzBCrx`e|IxQe7q2N6i^oW03Fnf91pgE4f8Gzl zz-bfXP3VkIBKVk0mU|Yb@v$?M(GxC%{fjWGj*aP0Q|w=bL>lue-QB;SbN?-ARNPky z{>0-EJZufv82^c$!Ny=r^qxxmbKJS`h={Rv_V#^b(Q#p7iTt+&KW!`#j6jOx8~;eZ z#PJ;@&Yc0NRD74@hbg509Y{1nZ9!<*FwzIp5aNzXqv9`1q848Lr+IOd;;KX*e_14t zKSlVmi0ob7WUwn8*{1Xj3lD!UQY4xzAsdx{nrC)1BrBgB9v<;8n)m)nxVN(iS<*-! zge>@f_v~gs%9^J6-p<13+w8PPQgkNyb~`Py^PBp1abiKOvKk+Ot8?ZxthMIw1@xL6jgE|E%~3k?W) zZ+_VP-GY1%va7O%b_MBp$<9QV>;?=f$o7QN^vIUSvd9t9LDP`xI10(au}E_J_|JLa z7%cRf{<};Z_Dy)CWUN#svlirg-qoozfyPFCZch}pOH82&*%}#;-ji&P%FM~0$O=}g z<{;IYcy~JUIL%~q^JzVuJ=t`|D&}hZE|$m7vn=qOt5ao1dTxEPYcfSc%P!8l)qY9}PE=&U%X*b}XNV?TLoSx9`pQhNtCO+WP;D`d3KF&ZSYC zY(5%P^kutM>_tky+k{yqHqa-%l~%a`Q%Y?y%gz*b_8!(FBP%-6deDjZLq)>r1xEU=AnFh>%~TxlP!#Mso)&4c>Tvq9n+i+ZG_@+-b6`G_|w%q9lvd=`yq2=xKkaBzl z%t^<2`+l3w>B^O>_+;XA>|ZBozhg39mhttBFJwF=o0rb`q1wM$iKm}#mBW35GBcRf z2)J(EeCu4U4`y}+8dZ*1LGy6&w@dKdC&S`n57&hOHf`n{)D@*6jrcpJgIgmUj9QwH zZ40$fEgp}Rq}%4YIThYowSTcxCUjWg)~Zu&PC9B2(xp4Ves>TU3>w9DWS>FyVD%o* z-RcUvoq@P=r=$Ey;NpgowRt#F;D=o$DacGqB3;v5SlGJ2-P;#y@-nb@O(@p7zl2nR zkMW(V{maDh!dO3@R`;b7X>C2ASuKEFV<6eixj?7VnXkDnt+{(+I8NXEzI`o}5wTc; zNt35RQ%4`4Oqc>Ef~T-(J$5(l!K&43VPIl`$ul%jR**?{2%qvbSxW1&$fIrl5j_?v zT&A?vi6_7|-W!g!0dP7Pf@#I(TtDo!UyS_I8*r2C zKM8r6$*2e)hjik@6Wtm8QAkB{g)qkDv(_(3PBC?|HZK2onOAiVbjPywD^#25Ha>6O zJgivp_;M#teTT8*r=VtC7FIhD{dFZ>1MfdU80-33E5qS&gv&~om7WP-ubyS4%5wVp z`q;dAv-0JsNLie4v7bh3$+Cqowdkk=V)yUn=4O=^I!2ky zo|SnLcjgR@N1fR^^hbVnDprb&5iX6EMo43YnIR^v*~wCP`}lWg%FWFUnVFd#(o}z# z9NfjlMK!6%ID_@W4@Ob{eUX}yh}ClIw*DnC!W^kx>!Mf@r1Fk>;7yx0VfO6VJ+?V{ z@?>s@(qn;68J^xgczfh%G*m7}hTk-r|Jb(iM_9M!r7NIoXxgC$TQ8&#zs(wnN#JlvIp(=RGdJ88c=a`~!k9_S4Dm z@eRQCl5}iK)JC2S(Lmb&3*E-I@4tA@S*^?H3~elmg@%q1f)<3~?%jL5ZN6?Feu#bh z9@>zyb)PX~Mu)zYKL-vRB>j>%1`i$vsYHrB#fjJyH4RzRK9gCn^GKEc5)Be6e6(6K zNQRSd|2!HC2llKzIX2)nBH#h-o5Q$; z!otx|LbBM{S;%DaaT-HszUN8%XZ0Abu)=Ww8nfL{Ta*crNCFdUN6eUGfZ5t6Wb5V( zcJ|h+%f$XQ3s4?9n&VDqTvPU`8g>{zJO2s)8UCr3Ve&lA%Ml#ew0@<59}v&4jm8XX z>`J%7me?66_IsP>F*|H7bER>2Xrt4*EAt-qA1{?fCz!PWA?l5ED|!?41U|#+c_g}ha!)Lg1=+6gN}N+_ME4sbx@Xtp#I=*K zs3JS?ax>^t``XpkhzxuU*@WB77J%79a=kk3!=BzPG1)`9RX<20!*gd=+tuihtYTYp z1E-1XbNa?P=vTTyi{9brZFYidxe%p^o+t?!2PUuPGVmVuDBG*7-!$uibdE;m&8oCJ zTyV0Ox4r8^Bl1ra^7x4>XJA+%#FP@cA8&L)a5$ZxzWyi?lZ^ly2eqNx_npJ`_QjET zGb?Pr7B|MA^mIANJZv#xoe@?ymGeHDXdKK|TX-;>|0gfbM4~hR`F77Coy}7ZV^D2h zqsF0R4$ZxGnK3jLB2O_7%NP2hEY1Y0g)btVXcof(W&2U#k#T{slju(73~jR8HQnKj zFUrU^yxt9ZTZAYg_*I?2#T`E0?y#|Uf``w1B$16_j3Ncrq>qY@2tY~rL}b!yW}a7(%|Rg zjg6t>kV<2aiX-ww;h}LGBd5caY_xF~Xgbw|`GNDh)Kw8pb_o-xk3}-N z`?n&wLOG3=YMJ_dh{xZU{sn0ePa(;JEdvL2z(= z2><2FmtkVkagP2V;0z57!R$AfyU=n0r-JPEJk-JJ9Vr8Zi2!Pxzg|($)!1&MwG~^+&nn zb1bL3LMrhT5>a>_=>y|Ztooy5!5D-G`@qvTm}DG#apA%RZp*fEJIGrU0!P|I%w4*4iMP#c z279s*m>U>|4NH7E%~R4ORr6?hIuoHP_}KEc?rYcFn-t*+9YJ=cO2r0;ih^M!}II|>p#u!d}0 z7~ieRv-Z?J=h3N;BENU3t``;r_`+V`4qJf-Y@OU8q&5{2Is+7T*f8&XE+bdcOjTN~ z+P*ka5}Rf_l=FRT42<@%^Mmnf1;Rm`zpWJi7nR}aDE55=%V-T5|ED}Fxn5QEtfV&h z`Doo2GEqd1ST3_uczu2=&E^Gq%RHF;khYNC9;cAqa*BB$EHR@uA>>mm`XSYd-As{1MZ1$tcsH7x&K%NT`)7O@ z>trN(B_B4kH~n;S;;0B6t7R@#UzA%N)+o3BPN%|YpZ_Aatx2AGTjS@MY>f*rC2!Wr zvvjj6i8$QYEZ@0Mi};|mC)dHhJ{Yq~iO1TYha^EShkKqga)XTNO=Yh(-l-E$z-;*90xfFH>pYL`{b3JW zw*{i$Oa<<>-h0e)+`BkE{Y9mqibo2sT^iy1I#vv zoh_Z+>F+N>9%zr$NQauVXul#!XdB&P_V6rcJg$pg*F7)WpW4L?oK3aad26=2E;`~jKB66xp2)3eQawhUt7UC|= z_d~gV$D0g>e~cG@ zfWI+8wkz4bVEDxDzHD481%t56WhjLMI9<$qa4%+clzp-NL-HDYj+|CPyPG9p12nj diff --git a/src/OSPSuite.Assets/Icons/BeagleRed.ico b/src/OSPSuite.Assets/Icons/BeagleRed.ico index 6fda323aaf644d1dafdf00ed531aaa265adee602..fd5f32e221616f970f9dc0dcd054c2ec976bb0ff 100644 GIT binary patch literal 17542 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 VknE}wf^C<{CDCTx`N5yP|6e+D$Up!9 diff --git a/src/OSPSuite.Assets/Icons/MouseRed.ico b/src/OSPSuite.Assets/Icons/MouseRed.ico index 2fda57d24dcd8828c545b18aa3414c6488740eec..b1d84ac12b667aa7cc85f32d9b1359677332bc8d 100644 GIT binary patch literal 17542 zcmeHOd3;Vs_a9qPLF^$F5wh<)5~0@EsKcDDlN(SI6gOw78Y45x&ImDNK3n<#eeR6A)MV}X#5rY zT#x%eYXbAfy)Wm0`16I2KlefMYMdB0*f-eHy+h<5%rkDDu@bx52OEb-bnlsj(D2`p zn0y{X{LVBpcdz_yb5Oe00$N+`dE3D?p->;Y#N`|XGxJaw8E>W> zf;MJhuyfQ%?Cz!W#PwWht(e>I!tzNYffRwlI02rAsxsH%d^=v?4&}QE0!2we&f&wY z0uLxNKi;M~B;OvJQx(6N?d}!M9x?ZI@hF&>|06N|U;7aocMh@f=keK!_Z{XK>Kp2=dujfj0>2t=#`G!W|Vu-+hzZ1y#LLhmuK*|z<%yl#dgdf|K z{^|BZ#oxwmx5mXI=7Bzb=5Yra|0`GSX!)ND?d;;vvRxEfTSm)lVi64!D=J$gqJ>#F zELzosNizYHrd4O-#sUrM2-JH?poS12QC?wg(?a0O@d6|xQA}f^_CdvOYO`lYMfjab z#xSp3zI0oQ|G~pYXk(oKBeNL1Vi~K=#^y0-***>pjYCnhcJopk)#zGPu7Q{8HpI&Y zjbYfhIZWG{!`00LZw>K7VBq_*tlOtyuhJY4pWQ2!aVmZjyWL5Z;kPCHmvr!#lmPBs z4#3&_06e-L)MoWw=iWc#k3X_;=S~4`-MUp}E+{C#!-o&?=+PtX_^5>yD^{R!e$`J({hrR~bPQt`L7-@TzK{JP`+h~&TLtB2r1`1z`v9XlOBuYo_S5T5yZ z@7_Ip^2sMKG&C%oKY>xBM#*-L96d_+YNP(k0vBkVFfXb2P3_WWu`a-CRyXq=W#gd1 zg^OkU^N{d+bXD-{jz5>JT=rt(jI3wI{oug^ELpMy1_lOb-n=>b^ywqAV+7+j7d$e40Po zw{J(CI(4vg=~BeU$D>iBMhFN9cWobuK|JOb{ZSAz3be=eE zA6z|1u2^XB#}n|ocR2_fw|yAscbxc{7RYm^VGGs`FEi7HSOwP+ZUIRPI z#vd7?&7p7FW_f#sfprMpi+CPbej1x;aQ1xJ_%r`|l=46G3}bibuwUj~d-5uz`!qLG zQ&T0jL4yWWT7BfmQL@ganZ!S|AE@JBuvN6VpD40omvn-Ydjf2nwkh*K<8MUxb@`tg z@6_Y4T)&Lnp0L|`?!)&RE>=qSX&%g+ITOQ&53jOni&7bM@_S{UR`KU0i8h5XB8&8Y z#4qgtZ|^OnL#L5WlL$j&4dyNS1t(74LFRu7p^43wveU8SeptEgmHpThdZkLbf5pS- z=omTn9_F;S6HeAUbn%n^oW**^BYJk~#}=45aymMA#S;Eh)Nh##Glv7TZ|#Ax4**MvQAY4B_)sV@qe}- z*RExwt!X>ie!Z7T531V$?aeH}yv~XDHAg2miG9lJip*yoSI4;`{!yQ?PR`|*steSr zZBQxH3l}b6{rdG7IdUX?e0<>I;)0-{pi1lOKDc$O5Gz-Fff>_gV*0chShMJF-k33C z24>Hmjf8}R$Lc@JjpE{B^z5bR5bawEocTeK_bT70V_X$}wmUMvRq#7Hxs)T%40CvKTd^wXctkEf5HWh>ieht?=|HMg0P zlA@(uyLN5t*s(+VU%&AB>#s{0s@}hP^{QHY>{>#G=sWMcBeD1E*AFXKu9W35eFy{b zF8S8V$x4-Hbg%mO*|v|GFYq$?0~q_{$y3YGtzW-BcJ10#?w;-+UKjixV`2NFL4yX` zeN?wzPEHQ#h>DC+?Zflu&&zka*b{!5e|=f0i(4)0BmsmVfpjD%?esH^Lwy?BPNmhDgpF%~6Wv<#zczAfZD!h;LGg}kV9Z7F_9{fCK z+y~V^ad5Rj>_V~$J{H)$LZE4V?ngE7{6A|_*J;zHO>vZb3Hm7`BSYfv?e_fqqw*E^ zgY_TQH+U@AR>Qvq274>>5FET-pM0hNSr_p4_m|k*-Q6pdtrI_(Bfo%Jib&8L$DlF==XTh(| zM^7iE5B>TNL{U*uMR4T3u&{76Y0^w$vbM3UwBCh_7hz-TDC@n~SDEXIbR8A5?)6#l zGf(lJc$#cy<0eWUj9RrJTWLPFZQF*!hYuq>JOa!I#;w~*JUmx5sws7C?VS-76%F>W zak_r}I+iV4E`6U|&&!5<(2JUHjhfZUWaMl<|3%^Rs8gul9l0H1BnLNG8pv{o-{mfqotWJpW%$ z6gWCex9?x=fTf?kn)Li4L+k_ zS*zldSDGJ|TdYTMJdvOdw-WD;8d{{aE3mnfwldwL>jS`#k!$m`q&EitDc=>jW z7+n}G_ELN2DPPQw`3GjgMYvB<+{>zqF{ME@+yP1}!bFXdDA7D8O4!kQaQLU@+&Iw| z`$QcDwGioCph%j9eEt9Q!be~sQ=suq=PMn2bDWkb<*t;qaat71rJs16-;Wd)wD)|t zaNPS}m^*AuFtv<7(bg*d6kSi5S#LeyGLSuuh@s9;{2Se!*GZqi4Dpc^=!_?)=ipBd$b^li~5UvWBFb+xIF>RZB zhbW@2oRc%{b?Z;c@xOVq2-Z%qXk(>;nJvZa*u=o7eJTce+hAyCfwxG<)z1UTR({o1 zz`dKh@}x&{JPwZ&(>Hfa-KR^xokch_n%}kaZ|Sm~&d8F{ z&LIWu>{HOZEybdFOhG4~ZgA`9tCxGDQtPvA$m zc|6$mll`~fv0azGnRyt(BYsoplWE$q#}T;s97f0PN8s7*2yEPs(D~dWExxJ>Cr_Tl zfB^%fO)_=rG$bVRd2V&YE+8G5^lYYYX1{Bd?)UkL4Z)-Z&_33jM7q2|s8RO*1lckSD+fZqtbvrkV?OjHn_;JY1 zC{a9fB>V$78Fa{jpWAm#cX>wLDrdkn>lpj>bmq;nZ4y>_NGAvFy{Q&-Ykn2fa<_yG`56 z=JWFM(4|WkeDJ{sxJW*wXHAEXX5yuKMsPHtb4xn=VY^(F{rdEIKV$kG$j8#N&s&nz z(4j-IdiCmOB`fR4#wXJ_)qM`osR# zLx&E@+sqsKiG7+TCMK}3aYJV-8q;)T|7UvoS?xcq{o=s>O5Z#x^h*suWo z=H*$Hy}doGt*w!qoUDD$aesVP&S!D#&s)206AWvYjyuh*K5gCp(|%kWF-M>Y?bD>6 zQm!Sh1`V5O+t)4Z+_@9Sjvdq9;(hLwS6-2O&fU9;eEueQ6KYXg^4#zV^l1+$X5EB+ zFu!~waCo)ArWp#Bis}69yV^=SdRAHqWh>`rxj+tq0m>?yZ#)g^Uw5kpD|vR zMPCIfWAOPG--1*DZ8~!77x?ynOU{v-XBX{#E?l~D4KAKNU_kLL7ic|I6?|;uIUvTyLWBx=l9OgTE#7dJ7l(uWt~xY>%JcD4G(!*T@Gn=5NX5 zpS&C*+Oh4=^#50BArWRj1$}ZRzbRAw6eH=|GyPP&oBgTPr_LHRG1SB&F~hY}^68E~ z+fJL9Cmam)4~n3<45c%IP}<8wX>Ok?=f{dI21!?K^(x0?CC`Yj2scV6H8OkLxo!*6NtkgDNWZT^PK+#(DC zBX(iTxPPOaWf=J{qG3z@8r=6A&^XCVHV4$46G8gf7J=VL&Sld6cOsbRQTrULQ%LfM z$J5Fw`H)A4XyqFdis9v$V@_7iNoduczjKJEn9@*~wrYsRB!3MJs+HyXwa~0leVDW{ zgQcx2$>?e@X(F(5sX~M2%-VS?+2PUj9aJ)ig zh^DjXhq8r^Jr2n@a<(6LXXNX(TK4z1-+sg3!Gm$+$Pw*LGb>N*_*BaOP$Y|>ka@l3 zH&rdocOc_nA5uC*9NSq@;&w?MNWMu<-iEEI`(@n4*&h{qhWV4*=XJ<7#ArHu z<@x87oqZJ?XEAKpFt9zrXVUtKG4D*L*svZpkS?L>n~Yh-PkaRWR#y6}&Rw_$j@#k*KQ)~? zbqW>f{QP{)+F%*ul=2Z_q;;#>m}>j9j)T}2_xUIR?=F30ljFyaSDTjC*Is)K9P^_e zN5MGEtsG$8O6kA83}pNyqk?v?RCKlXrhJMm;R)#0L!qM*S+HOM#VmD0WMrhgm7kvv zj`Ny6eLAjW--L0qT2k)l`!?0~S>~;sAkg1kpog6RZCb{`Pulk>#Go6I_0tWRPV$Hg6Wc_*>yY~EyVdMv5UU%=*3%LdN!D8^MwVPq^ za&4q9Q_jcLcGRnW`+T3rifJS+6!0XQx@AKFb0e}R`U)IdMR5VW$T!-6WOT#2a5WW3 zTcXHf{juS;Dr#S)!FDzC8|&(PmFM+j^GLgg-o3%LH$CHe6}7ExKT^!*az&ZPi}iTE z(mIrNxXkTwmj3NZ-sSd4$K6cda`Y$NF0Z2Y|I9toABsqao$*JQs9O*v-Xxu33DH^h zm*i-%l=kLv1<9h3zCQF<|7SgnkB3Ytt9n>h`sQChWrx4iYqI~8BzNx}zsy;X`Kz^k z+>wnzJ=19J(`X*jh*v7kQ6h!*V*d$#b2nPrC*Tdgf0K{zCVd-}OnY)7jt7%EO7;u; zrI}ZlcUeYqR{iBPPbs9I?X|X#L66>Bu_g3Zm{~>A_e9&^-{)O~O(*;8eI>6OFR+H} z*X3lJh0P*)Nc=)JWtyE!;&Il$rcB!}*RFfl3>aJOLEkshv4!MP@P;_7-x!b3=$-iL z+X&Ljy28Pu4}$!O#}h>wedC;HO5dc8dtZ6qv)f^q*zAQS{_(wi!i0%37K#ZC=x)b$ zVOsi^wjo`;zlZPOV>m}!rIqV`yz|}(`d(5iO0)$vF7+OXxIsP**_KYD?~p^TMbtrO zmjU?n%S*Humibq;FH+&yk)s$tej>@$e9W1@T<$sKhf1UM62jvg(4)Gne)Z~EgoJFs z=FK7U+X}Ufn3yx^Vd8tp3~MI>8Z?`}r^>Ho^_Bsjiajp0(? z=j(=_GjZ|sDzN`pnXms6`AVlv{}Ajm<1DGY36Ey-kmKlchPE0 zoIDF|*7Zn7?1hctyYS{4Z{hn%#4}{8Gj{cTx`uF>+vIpHvi*=m=P`Si(_TjP4u2`+ zTpj+3p3|7I?$7nr_ep0DR{wLmyw6L$fouZynXrAp{sFcTRNQKPl1WL_pN_;L})Sg2p} literal 17542 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 diff --git a/src/OSPSuite.Assets/Icons/Rabbit.ico b/src/OSPSuite.Assets/Icons/Rabbit.ico index 26aa59d1a7e67138c9cd6c7fc3d3d719f71b2a2b..454725d660e2e4cb08cde9791fc87788e310a495 100644 GIT binary patch literal 17542 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 Vb895Zb2ZD8E4-)F)CUcH{~xgZCkFrk diff --git a/src/OSPSuite.Assets/Icons/RabbitGreen.ico b/src/OSPSuite.Assets/Icons/RabbitGreen.ico index 9a18bc89c33262cd4807b1505264a09c75fc09c9..936f70b0e130b7a7cf7ee018cbd0fba626dfc88a 100644 GIT binary patch literal 17542 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®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 URT1NFwK75;tlL>0JnHlR0etU@(f|Me From 5ffa9953a6b7ac3d1c6054638556213abb3af3d3 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 19 Apr 2017 09:35:03 -0400 Subject: [PATCH 28/50] Fixes #50 update xls save filter (#51) * Fixes #50 update xls save filter * Also fixes bracket at wrong place --- src/OSPSuite.Core/Domain/Constants.cs | 2 +- .../OSPSuite.Core.Tests/Core/ConstantsSpecs.cs | 18 ++++++++++++++++++ .../OSPSuite.Core.Tests.csproj | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 tests/OSPSuite.Core.Tests/Core/ConstantsSpecs.cs diff --git a/src/OSPSuite.Core/Domain/Constants.cs b/src/OSPSuite.Core/Domain/Constants.cs index a5be19a8d..a41fe3848 100644 --- a/src/OSPSuite.Core/Domain/Constants.cs +++ b/src/OSPSuite.Core/Domain/Constants.cs @@ -207,7 +207,7 @@ public static class Filter public static readonly string CHART_LAYOUT_FILTER = XmlFilter("Chart Layout"); public static readonly string PDF_FILE_FILTER = FileFilter("Report", PDF_EXTENSION); public static readonly string XML_FILE_FILTER = XmlFilter("Xml"); - public static readonly string EXCEL_SAVE_FILE_FILTER = string.Format("Excel file (*{0})|*{0}|(Excel file *{1})|*{1}", XLS_EXTENSION, XLSX_EXTENSION); + public static readonly string EXCEL_SAVE_FILE_FILTER = string.Format("Excel file (*{0})|*{0}|Excel file (*{1})|*{1}", XLSX_EXTENSION, XLS_EXTENSION); public static readonly string EXCEL_OPEN_FILE_FILTER = string.Format("Excel file (*{0};*{1})|*{0};*{1}", XLS_EXTENSION, XLSX_EXTENSION); public static readonly string JOURNAL_FILE_FILTER = FileFilter("Journal File", JOURNAL_EXTENSION); public static readonly string WORD_SAVE_FILE_FILTER = FileFilter("Word", ".docx"); diff --git a/tests/OSPSuite.Core.Tests/Core/ConstantsSpecs.cs b/tests/OSPSuite.Core.Tests/Core/ConstantsSpecs.cs new file mode 100644 index 000000000..e6c7b6b7f --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Core/ConstantsSpecs.cs @@ -0,0 +1,18 @@ +using System; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Domain; + +namespace OSPSuite.Core +{ + public class When_validating_the_constants_defined_in_core : StaticContextSpecification + { + [Observation] + public void the_save_excel_filter_should_save_to_xls_first() + { + var posXlsx = Constants.Filter.EXCEL_SAVE_FILE_FILTER.IndexOf($"{Constants.Filter.XLSX_EXTENSION})", StringComparison.Ordinal); + var posXls = Constants.Filter.EXCEL_SAVE_FILE_FILTER.IndexOf($"{Constants.Filter.XLS_EXTENSION})", StringComparison.Ordinal); + posXlsx.ShouldBeSmallerThan(posXls); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj index 44d88e515..a43befd99 100644 --- a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj +++ b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj @@ -168,6 +168,7 @@ + From 03d65b95ff183dadcfeac0740be427a989a15f24 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Tue, 25 Apr 2017 16:32:17 -0400 Subject: [PATCH 29/50] Fixes #52 update notification type (#53) * Fixes #52 Update NotificationType to include ALL and None as flag * Fixes #52 Update NotificationType to include ALL and None as flag * Fixes #52 Update NotificationType to include ALL and None as flag --- src/OSPSuite.Core/Domain/ValidationMessage.cs | 11 +++++++---- .../Core/NotificationTypeExtensionsSpecs.cs | 15 +++++++++------ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/OSPSuite.Core/Domain/ValidationMessage.cs b/src/OSPSuite.Core/Domain/ValidationMessage.cs index 52236f694..a4a94e9a8 100644 --- a/src/OSPSuite.Core/Domain/ValidationMessage.cs +++ b/src/OSPSuite.Core/Domain/ValidationMessage.cs @@ -75,22 +75,25 @@ public enum NotificationType /// /// Indicating a problem that may produce an incorrect model /// - Warning = 2 << 0, + Warning = 1 << 0, /// /// Indicating a problem that leads to a corrupted model /// - Error = 2 << 1, + Error = 1 << 1, /// /// Indicating a message. Model is valid /// - Info = 2 << 2, + Info = 1 << 2, /// /// Indicates a debug information. Is only use for development /// - Debug = 2 << 3, + Debug = 1 << 3, + + + All = Debug | Warning | Info | Error } public static class MessageTypeExtensions diff --git a/tests/OSPSuite.Core.Tests/Core/NotificationTypeExtensionsSpecs.cs b/tests/OSPSuite.Core.Tests/Core/NotificationTypeExtensionsSpecs.cs index cdad0faf9..39cf5c9eb 100644 --- a/tests/OSPSuite.Core.Tests/Core/NotificationTypeExtensionsSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Core/NotificationTypeExtensionsSpecs.cs @@ -4,7 +4,7 @@ namespace OSPSuite.Core { - public class When_testing_if_a_message_type_is_of_a_given_type: StaticContextSpecification + public class When_testing_if_a_message_type_is_of_a_given_type : StaticContextSpecification { [Observation] public void should_return_true_for_all_basic_type() @@ -17,13 +17,16 @@ public void should_return_true_for_all_basic_type() [Observation] public void should_return_the_expected_result_for_composite_name() { - (NotificationType.Error |NotificationType.Info).Is(NotificationType.Error).ShouldBeTrue(); - (NotificationType.Error |NotificationType.Info).Is(NotificationType.Info).ShouldBeTrue(); - (NotificationType.Error |NotificationType.Warning).Is(NotificationType.Info).ShouldBeFalse(); + (NotificationType.Error | NotificationType.Info).Is(NotificationType.Error).ShouldBeTrue(); + (NotificationType.Error | NotificationType.Info).Is(NotificationType.Info).ShouldBeTrue(); + (NotificationType.Error | NotificationType.Warning).Is(NotificationType.Info).ShouldBeFalse(); (NotificationType.Error).Is(NotificationType.Error | NotificationType.Info).ShouldBeTrue(); (NotificationType.Info).Is(NotificationType.Info | NotificationType.Error).ShouldBeTrue(); (NotificationType.Error).Is(NotificationType.Info | NotificationType.Warning).ShouldBeFalse(); + (NotificationType.All).Is(NotificationType.Info).ShouldBeTrue(); + (NotificationType.All).Is(NotificationType.Error).ShouldBeTrue(); + (NotificationType.All).Is(NotificationType.Warning).ShouldBeTrue(); + (NotificationType.All).Is(NotificationType.Debug).ShouldBeTrue(); } - } -} \ No newline at end of file +} \ No newline at end of file From 2466d3bd9ff1e9e45c150e28c8ff08a7242c8d51 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 27 Apr 2017 11:09:07 -0400 Subject: [PATCH 30/50] Fixes #54 add batch domain to core (#55) * Fixes #54 add batch domain to core * Fixes #54 add batch domain to core * Fixes #54 add batch domain to core * Try to fixing issues with appveyor build --- src/OSPSuite.Core/Batch/BatchOutputValues.cs | 9 ++ .../Batch/BatchSimulationExport.cs | 12 +++ ...ionResultsToBatchSimulationExportMapper.cs | 65 +++++++++++ src/OSPSuite.Core/Batch/ParameterValue.cs | 8 ++ src/OSPSuite.Core/Domain/Constants.cs | 8 ++ ...QuantityPathToQuantityDisplayPathMapper.cs | 14 +++ src/OSPSuite.Core/Domain/PathElement.cs | 15 +++ src/OSPSuite.Core/OSPSuite.Core.csproj | 7 ++ .../Services/ISimulationResultsExporter.cs | 12 +++ .../OSPSuite.Infrastructure.csproj | 1 + .../Services/SimulationResultsExporter.cs | 48 +++++++++ src/OSPSuite.Presentation/DTO/PathElement.cs | 16 +-- .../DTO/PathRepresentableDTOExtensions.cs | 1 + ...QuantityPathToQuantityDisplayPathMapper.cs | 15 +-- ...ToSimulationParameterSelectionDTOMapper.cs | 1 + ...yToSimulationQuantitySelectionDTOMapper.cs | 1 + ...ivityAnalysisRunResultToDataTableMapper.cs | 1 + ...arameterToSensitivityParameterDTOMapper.cs | 3 +- .../Presenters/Charts/DataColumnsDTO.cs | 1 + .../Presenters/IQuantityPresenter.cs | 3 +- .../Services/Charts/ChartPresenterContext.cs | 3 +- .../Views/Comparisons/IComparisonView.cs | 1 + .../Views/IQuantityListView.cs | 1 + .../Views/ISimulationParametersView.cs | 1 + ...meterIdentificationLinkedParametersView.cs | 1 + src/OSPSuite.UI/Binders/PathElementsBinder.cs | 1 + .../Views/Comparisons/ComparisonView.cs | 1 + src/OSPSuite.UI/Views/QuantityListView.cs | 1 + .../Views/SimulationParametersView.cs | 1 + .../Batch/SimulationResultsExporterSpecs.cs | 86 +++++++++++++++ ...sultsToBatchSimulationExportMapperSpecs.cs | 101 ++++++++++++++++++ .../OSPSuite.Core.Tests.csproj | 2 + ...nPredictedVsObservedChartPresenterSpecs.cs | 1 + ...cationResidualVsTimeChartPresenterSpecs.cs | 1 + ...ificationTimeProfileChartPresenterSpecs.cs | 1 + ...ityPathToQuantityDisplayPathMapperSpecs.cs | 1 + ...mulationQuantitySelectionDTOMapperSpecs.cs | 1 + 37 files changed, 417 insertions(+), 29 deletions(-) create mode 100644 src/OSPSuite.Core/Batch/BatchOutputValues.cs create mode 100644 src/OSPSuite.Core/Batch/BatchSimulationExport.cs create mode 100644 src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs create mode 100644 src/OSPSuite.Core/Batch/ParameterValue.cs create mode 100644 src/OSPSuite.Core/Domain/Mappers/IQuantityPathToQuantityDisplayPathMapper.cs create mode 100644 src/OSPSuite.Core/Domain/PathElement.cs create mode 100644 src/OSPSuite.Core/Services/ISimulationResultsExporter.cs create mode 100644 src/OSPSuite.Infrastructure/Services/SimulationResultsExporter.cs create mode 100644 tests/OSPSuite.Core.Tests/Batch/SimulationResultsExporterSpecs.cs create mode 100644 tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs diff --git a/src/OSPSuite.Core/Batch/BatchOutputValues.cs b/src/OSPSuite.Core/Batch/BatchOutputValues.cs new file mode 100644 index 000000000..899672055 --- /dev/null +++ b/src/OSPSuite.Core/Batch/BatchOutputValues.cs @@ -0,0 +1,9 @@ +namespace OSPSuite.Core.Batch +{ + public class BatchOutputValues + { + public string Path { get; set; } + public float[] Values { get; set; } + public double Threshold { get; set; } + } +} \ No newline at end of file diff --git a/src/OSPSuite.Core/Batch/BatchSimulationExport.cs b/src/OSPSuite.Core/Batch/BatchSimulationExport.cs new file mode 100644 index 000000000..e4372a5de --- /dev/null +++ b/src/OSPSuite.Core/Batch/BatchSimulationExport.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; + +namespace OSPSuite.Core.Batch +{ + public class BatchSimulationExport + { + public string Name { get; set; } + public float[] Time { get; set; } + public List OutputValues { get; set; } = new List(); + public List ParameterValues { get; set; } = new List(); + } +} \ No newline at end of file diff --git a/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs b/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs new file mode 100644 index 000000000..9ae2d6c97 --- /dev/null +++ b/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs @@ -0,0 +1,65 @@ +using System.Collections.Generic; +using System.Linq; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Data; +using OSPSuite.Core.Domain.Mappers; +using OSPSuite.Utility.Extensions; + +namespace OSPSuite.Core.Batch.Mappers +{ + public interface ISimulationResultsToBatchSimulationExportMapper + { + BatchSimulationExport MapFrom(ISimulation simulation, DataRepository results); + } + + public class SimulationResultsToBatchSimulationExportMapper : ISimulationResultsToBatchSimulationExportMapper + { + private readonly IQuantityPathToQuantityDisplayPathMapper _quantityDisplayPathMapper; + private readonly IObjectPathFactory _objectPathFactory; + + public SimulationResultsToBatchSimulationExportMapper(IQuantityPathToQuantityDisplayPathMapper quantityDisplayPathMapper, IObjectPathFactory objectPathFactory) + { + _quantityDisplayPathMapper = quantityDisplayPathMapper; + _objectPathFactory = objectPathFactory; + } + + public BatchSimulationExport MapFrom(ISimulation simulation, DataRepository results) + { + var simulationExport = new BatchSimulationExport + { + Name = simulation.Name, + Time = displayValuesFor(results.BaseGrid), + ParameterValues = parameterValuesFor(simulation.Model) + }; + + results.AllButBaseGrid().Each(c => simulationExport.OutputValues.Add(quantityResultsFrom(simulation, c))); + + return simulationExport; + } + + private List parameterValuesFor(IModel simulationModel) + { + return simulationModel.Root.GetAllChildren().Select(p => new ParameterValue + { + Path = _objectPathFactory.CreateAbsoluteObjectPath(p).PathAsString, + Value = p.Value + }).ToList(); + } + + private BatchOutputValues quantityResultsFrom(ISimulation simulation, DataColumn column) + { + return new BatchOutputValues + { + Path = _quantityDisplayPathMapper.DisplayPathAsStringFor(simulation, column), + //TODO READ THRESHOLD FROM COLUMN EXTENDED PROPERTIES WHEN READY + Threshold = 1.5f, + Values = displayValuesFor(column) + }; + } + + private float[] displayValuesFor(DataColumn column) + { + return column.ConvertToDisplayValues(column.Values).ToArray(); + } + } +} \ No newline at end of file diff --git a/src/OSPSuite.Core/Batch/ParameterValue.cs b/src/OSPSuite.Core/Batch/ParameterValue.cs new file mode 100644 index 000000000..b228894dd --- /dev/null +++ b/src/OSPSuite.Core/Batch/ParameterValue.cs @@ -0,0 +1,8 @@ +namespace OSPSuite.Core.Batch +{ + public class ParameterValue + { + public string Path { get; set; } + public double Value { get; set; } + } +} \ No newline at end of file diff --git a/src/OSPSuite.Core/Domain/Constants.cs b/src/OSPSuite.Core/Domain/Constants.cs index a41fe3848..d6179d6c8 100644 --- a/src/OSPSuite.Core/Domain/Constants.cs +++ b/src/OSPSuite.Core/Domain/Constants.cs @@ -176,6 +176,14 @@ public static string ParameterCompoundType(int index) //end of delete } + public static class RegistryPaths + { + public const string PKSIM_REG_PATH = @"Open Systems Pharmacology\PK-Sim\"; + public const string MOBI_REG_PATH = @"Open Systems Pharmacology\MoBi\"; + public const string INSTALL_DIR = "InstallDir"; + public const string INSTALL_PATH = "InstallPath"; + } + public static class Groups { public const string UNDEFINED = "UNDEFINED"; diff --git a/src/OSPSuite.Core/Domain/Mappers/IQuantityPathToQuantityDisplayPathMapper.cs b/src/OSPSuite.Core/Domain/Mappers/IQuantityPathToQuantityDisplayPathMapper.cs new file mode 100644 index 000000000..b23ef8c92 --- /dev/null +++ b/src/OSPSuite.Core/Domain/Mappers/IQuantityPathToQuantityDisplayPathMapper.cs @@ -0,0 +1,14 @@ +using System.Collections.Generic; +using OSPSuite.Core.Domain.Data; + +namespace OSPSuite.Core.Domain.Mappers +{ + public interface IQuantityPathToQuantityDisplayPathMapper + { + string DisplayPathAsStringFor(ISimulation simulation, DataColumn column, bool addSimulationName = false); + string DisplayPathAsStringFor(ISimulation simulation, DataColumn column, string simulationName); + string DisplayPathAsStringFor(ISimulation simulation, DataColumn column, IEnumerable pathElementsToUse); + string DisplayPathAsStringFor(IQuantity quantity, bool addSimulationName = false); + string DisplayPathAsStringFor(IQuantity quantity, IEnumerable pathElementsToUse); + } +} \ No newline at end of file diff --git a/src/OSPSuite.Core/Domain/PathElement.cs b/src/OSPSuite.Core/Domain/PathElement.cs new file mode 100644 index 000000000..7ec9d7e50 --- /dev/null +++ b/src/OSPSuite.Core/Domain/PathElement.cs @@ -0,0 +1,15 @@ +namespace OSPSuite.Core.Domain +{ + /// + /// One path element + /// + public enum PathElement + { + Simulation, + TopContainer, + Container, + BottomCompartment, + Molecule, + Name + } +} \ No newline at end of file diff --git a/src/OSPSuite.Core/OSPSuite.Core.csproj b/src/OSPSuite.Core/OSPSuite.Core.csproj index f2d918700..fb3d1d991 100644 --- a/src/OSPSuite.Core/OSPSuite.Core.csproj +++ b/src/OSPSuite.Core/OSPSuite.Core.csproj @@ -100,6 +100,10 @@ Properties\SolutionInfo.cs + + + + @@ -130,6 +134,8 @@ + + @@ -498,6 +504,7 @@ + diff --git a/src/OSPSuite.Core/Services/ISimulationResultsExporter.cs b/src/OSPSuite.Core/Services/ISimulationResultsExporter.cs new file mode 100644 index 000000000..e1438e650 --- /dev/null +++ b/src/OSPSuite.Core/Services/ISimulationResultsExporter.cs @@ -0,0 +1,12 @@ +using System.Threading.Tasks; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Data; + +namespace OSPSuite.Core.Services +{ + public interface ISimulationResultsExporter + { + Task ExportToCsvAsync(ISimulation simulation, DataRepository results, string fileName); + Task ExportToJsonAsync(ISimulation simulation, DataRepository results, string fileName); + } +} \ No newline at end of file diff --git a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj index c571970ab..2d7e4ecbc 100644 --- a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj +++ b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj @@ -182,6 +182,7 @@ + diff --git a/src/OSPSuite.Infrastructure/Services/SimulationResultsExporter.cs b/src/OSPSuite.Infrastructure/Services/SimulationResultsExporter.cs new file mode 100644 index 000000000..a8b51e343 --- /dev/null +++ b/src/OSPSuite.Infrastructure/Services/SimulationResultsExporter.cs @@ -0,0 +1,48 @@ +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using Newtonsoft.Json; +using OSPSuite.Core.Batch.Mappers; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Data; +using OSPSuite.Core.Domain.Mappers; +using OSPSuite.Core.Domain.Services; +using OSPSuite.Core.Services; +using OSPSuite.Utility.Extensions; + +namespace OSPSuite.Infrastructure.Services +{ + public class SimulationResultsExporter : ISimulationResultsExporter + { + private readonly IDataRepositoryTask _dataRepositoryTask; + private readonly IQuantityPathToQuantityDisplayPathMapper _quantityDisplayPathMapper; + private readonly ISimulationResultsToBatchSimulationExportMapper _simulationExportMapper; + + public SimulationResultsExporter(IDataRepositoryTask dataRepositoryTask, IQuantityPathToQuantityDisplayPathMapper quantityDisplayPathMapper, ISimulationResultsToBatchSimulationExportMapper simulationExportMapper) + { + _dataRepositoryTask = dataRepositoryTask; + _quantityDisplayPathMapper = quantityDisplayPathMapper; + _simulationExportMapper = simulationExportMapper; + } + + public Task ExportToCsvAsync(ISimulation simulation, DataRepository results, string fileName) + { + var dataTable = _dataRepositoryTask.ToDataTable(results, x => _quantityDisplayPathMapper.DisplayPathAsStringFor(simulation, x)).First(); + return Task.Run(() => dataTable.ExportToCSV(fileName)); + } + + public Task ExportToJsonAsync(ISimulation simulation, DataRepository results, string fileName) + { + return Task.Run(() => + { + var exportResults = _simulationExportMapper.MapFrom(simulation, results); + // serialize JSON directly to a file + using (var file = File.CreateText(fileName)) + { + var serializer = new JsonSerializer(); + serializer.Serialize(file, exportResults); + } + }); + } + } + } \ No newline at end of file diff --git a/src/OSPSuite.Presentation/DTO/PathElement.cs b/src/OSPSuite.Presentation/DTO/PathElement.cs index 990cb31fa..9161c516b 100644 --- a/src/OSPSuite.Presentation/DTO/PathElement.cs +++ b/src/OSPSuite.Presentation/DTO/PathElement.cs @@ -1,20 +1,8 @@ -using OSPSuite.Utility.Collections; +using OSPSuite.Core.Domain; +using OSPSuite.Utility.Collections; namespace OSPSuite.Presentation.DTO { - /// - /// One path element - /// - public enum PathElement - { - Simulation, - TopContainer, - Container, - BottomCompartment, - Molecule, - Name - } - /// /// A cache returning for each path element the corresonding /// diff --git a/src/OSPSuite.Presentation/DTO/PathRepresentableDTOExtensions.cs b/src/OSPSuite.Presentation/DTO/PathRepresentableDTOExtensions.cs index 65b729fea..f32451ea7 100644 --- a/src/OSPSuite.Presentation/DTO/PathRepresentableDTOExtensions.cs +++ b/src/OSPSuite.Presentation/DTO/PathRepresentableDTOExtensions.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using OSPSuite.Core.Domain; using OSPSuite.Core.Extensions; namespace OSPSuite.Presentation.DTO diff --git a/src/OSPSuite.Presentation/Mappers/QuantityPathToQuantityDisplayPathMapper.cs b/src/OSPSuite.Presentation/Mappers/QuantityPathToQuantityDisplayPathMapper.cs index 25e32b49b..244ea1b25 100644 --- a/src/OSPSuite.Presentation/Mappers/QuantityPathToQuantityDisplayPathMapper.cs +++ b/src/OSPSuite.Presentation/Mappers/QuantityPathToQuantityDisplayPathMapper.cs @@ -1,23 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; -using OSPSuite.Utility.Extensions; using OSPSuite.Core.Domain; using OSPSuite.Core.Domain.Data; +using OSPSuite.Core.Domain.Mappers; using OSPSuite.Presentation.DTO; +using OSPSuite.Utility.Extensions; namespace OSPSuite.Presentation.Mappers { - public interface IQuantityPathToQuantityDisplayPathMapper - { - PathElements DisplayPathFor(ISimulation simulation, DataColumn column); - string DisplayPathAsStringFor(ISimulation simulation, DataColumn column, bool addSimulationName = false); - string DisplayPathAsStringFor(ISimulation simulation, DataColumn column, string simulationName); - string DisplayPathAsStringFor(ISimulation simulation, DataColumn column, IEnumerable pathElementsToUse); - string DisplayPathAsStringFor(IQuantity quantity, bool addSimulationName = false); - string DisplayPathAsStringFor(IQuantity quantity, IEnumerable pathElementsToUse); - } - public class QuantityPathToQuantityDisplayPathMapper : IQuantityPathToQuantityDisplayPathMapper { private readonly IObjectPathFactory _objectPathFactory; @@ -61,7 +52,7 @@ public virtual string DisplayPathAsStringFor(ISimulation simulation, DataColumn return DisplayPathAsStringFrom(DisplayPathFor(simulation, column), pathElementsToUse); } - public virtual PathElements DisplayPathFor(ISimulation simulation, DataColumn column) + protected virtual PathElements DisplayPathFor(ISimulation simulation, DataColumn column) { return displayPathForColumn(column, simulation); } diff --git a/src/OSPSuite.Presentation/Mappers/QuantityToSimulationParameterSelectionDTOMapper.cs b/src/OSPSuite.Presentation/Mappers/QuantityToSimulationParameterSelectionDTOMapper.cs index 373fd4520..6c9018f73 100644 --- a/src/OSPSuite.Presentation/Mappers/QuantityToSimulationParameterSelectionDTOMapper.cs +++ b/src/OSPSuite.Presentation/Mappers/QuantityToSimulationParameterSelectionDTOMapper.cs @@ -1,5 +1,6 @@ using System.Linq; using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Mappers; using OSPSuite.Core.Domain.Repositories; using OSPSuite.Presentation.DTO; diff --git a/src/OSPSuite.Presentation/Mappers/QuantityToSimulationQuantitySelectionDTOMapper.cs b/src/OSPSuite.Presentation/Mappers/QuantityToSimulationQuantitySelectionDTOMapper.cs index cee9f9209..8396f341f 100644 --- a/src/OSPSuite.Presentation/Mappers/QuantityToSimulationQuantitySelectionDTOMapper.cs +++ b/src/OSPSuite.Presentation/Mappers/QuantityToSimulationQuantitySelectionDTOMapper.cs @@ -1,4 +1,5 @@ using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Mappers; using OSPSuite.Presentation.DTO; namespace OSPSuite.Presentation.Mappers diff --git a/src/OSPSuite.Presentation/Mappers/SensitivityAnalyses/SensitivityAnalysisRunResultToDataTableMapper.cs b/src/OSPSuite.Presentation/Mappers/SensitivityAnalyses/SensitivityAnalysisRunResultToDataTableMapper.cs index 1110fb253..20b0b4541 100644 --- a/src/OSPSuite.Presentation/Mappers/SensitivityAnalyses/SensitivityAnalysisRunResultToDataTableMapper.cs +++ b/src/OSPSuite.Presentation/Mappers/SensitivityAnalyses/SensitivityAnalysisRunResultToDataTableMapper.cs @@ -1,5 +1,6 @@ using System.Data; using OSPSuite.Assets; +using OSPSuite.Core.Domain.Mappers; using OSPSuite.Utility.Extensions; using OSPSuite.Core.Domain.PKAnalyses; using OSPSuite.Core.Domain.SensitivityAnalyses; diff --git a/src/OSPSuite.Presentation/Mappers/SensitivityAnalyses/SensitivityParameterToSensitivityParameterDTOMapper.cs b/src/OSPSuite.Presentation/Mappers/SensitivityAnalyses/SensitivityParameterToSensitivityParameterDTOMapper.cs index e9cf2d74b..3ed5512b6 100644 --- a/src/OSPSuite.Presentation/Mappers/SensitivityAnalyses/SensitivityParameterToSensitivityParameterDTOMapper.cs +++ b/src/OSPSuite.Presentation/Mappers/SensitivityAnalyses/SensitivityParameterToSensitivityParameterDTOMapper.cs @@ -1,4 +1,5 @@ -using OSPSuite.Utility; +using OSPSuite.Core.Domain.Mappers; +using OSPSuite.Utility; using OSPSuite.Core.Domain.SensitivityAnalyses; using OSPSuite.Presentation.DTO.SensitivityAnalyses; diff --git a/src/OSPSuite.Presentation/Presenters/Charts/DataColumnsDTO.cs b/src/OSPSuite.Presentation/Presenters/Charts/DataColumnsDTO.cs index 4978839f3..992b5a28a 100644 --- a/src/OSPSuite.Presentation/Presenters/Charts/DataColumnsDTO.cs +++ b/src/OSPSuite.Presentation/Presenters/Charts/DataColumnsDTO.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Data; using System.Linq; +using OSPSuite.Core.Domain; using OSPSuite.Utility.Extensions; using OSPSuite.Presentation.DTO; using DataColumn = OSPSuite.Core.Domain.Data.DataColumn; diff --git a/src/OSPSuite.Presentation/Presenters/IQuantityPresenter.cs b/src/OSPSuite.Presentation/Presenters/IQuantityPresenter.cs index 1b31b2d92..3fca02dce 100644 --- a/src/OSPSuite.Presentation/Presenters/IQuantityPresenter.cs +++ b/src/OSPSuite.Presentation/Presenters/IQuantityPresenter.cs @@ -1,4 +1,5 @@ -using OSPSuite.Presentation.DTO; +using OSPSuite.Core.Domain; +using OSPSuite.Presentation.DTO; namespace OSPSuite.Presentation.Presenters { diff --git a/src/OSPSuite.Presentation/Services/Charts/ChartPresenterContext.cs b/src/OSPSuite.Presentation/Services/Charts/ChartPresenterContext.cs index 7ccb5dc69..8021659d0 100644 --- a/src/OSPSuite.Presentation/Services/Charts/ChartPresenterContext.cs +++ b/src/OSPSuite.Presentation/Services/Charts/ChartPresenterContext.cs @@ -1,4 +1,5 @@ -using OSPSuite.Core.Domain.Services; +using OSPSuite.Core.Domain.Mappers; +using OSPSuite.Core.Domain.Services; using OSPSuite.Core.Domain.UnitSystem; using OSPSuite.Presentation.Mappers; using OSPSuite.Presentation.Presenters.Charts; diff --git a/src/OSPSuite.Presentation/Views/Comparisons/IComparisonView.cs b/src/OSPSuite.Presentation/Views/Comparisons/IComparisonView.cs index fe4767a9e..3c95f8a56 100644 --- a/src/OSPSuite.Presentation/Views/Comparisons/IComparisonView.cs +++ b/src/OSPSuite.Presentation/Views/Comparisons/IComparisonView.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using OSPSuite.Core.Domain; using OSPSuite.Presentation.DTO; using OSPSuite.Presentation.Presenters.Comparisons; diff --git a/src/OSPSuite.Presentation/Views/IQuantityListView.cs b/src/OSPSuite.Presentation/Views/IQuantityListView.cs index ecdbfb7b9..f86d21ff0 100644 --- a/src/OSPSuite.Presentation/Views/IQuantityListView.cs +++ b/src/OSPSuite.Presentation/Views/IQuantityListView.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using OSPSuite.Core.Domain; using OSPSuite.Presentation.DTO; using OSPSuite.Presentation.Presenters; diff --git a/src/OSPSuite.Presentation/Views/ISimulationParametersView.cs b/src/OSPSuite.Presentation/Views/ISimulationParametersView.cs index 2e3efdd48..5e23dfd4c 100644 --- a/src/OSPSuite.Presentation/Views/ISimulationParametersView.cs +++ b/src/OSPSuite.Presentation/Views/ISimulationParametersView.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using OSPSuite.Core.Domain; using OSPSuite.Presentation.DTO; using OSPSuite.Presentation.Presenters; diff --git a/src/OSPSuite.Presentation/Views/ParameterIdentifications/IParameterIdentificationLinkedParametersView.cs b/src/OSPSuite.Presentation/Views/ParameterIdentifications/IParameterIdentificationLinkedParametersView.cs index 080e431ed..d91ace97f 100644 --- a/src/OSPSuite.Presentation/Views/ParameterIdentifications/IParameterIdentificationLinkedParametersView.cs +++ b/src/OSPSuite.Presentation/Views/ParameterIdentifications/IParameterIdentificationLinkedParametersView.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using OSPSuite.Core.Domain; using OSPSuite.Presentation.DTO; using OSPSuite.Presentation.DTO.ParameterIdentifications; using OSPSuite.Presentation.Presenters.ParameterIdentifications; diff --git a/src/OSPSuite.UI/Binders/PathElementsBinder.cs b/src/OSPSuite.UI/Binders/PathElementsBinder.cs index 6ffcc2e6e..6e9ecfee9 100644 --- a/src/OSPSuite.UI/Binders/PathElementsBinder.cs +++ b/src/OSPSuite.UI/Binders/PathElementsBinder.cs @@ -8,6 +8,7 @@ using DevExpress.XtraEditors.Controls; using DevExpress.XtraEditors.Repository; using OSPSuite.Assets; +using OSPSuite.Core.Domain; using OSPSuite.Presentation.DTO; using OSPSuite.UI.Extensions; using OSPSuite.UI.RepositoryItems; diff --git a/src/OSPSuite.UI/Views/Comparisons/ComparisonView.cs b/src/OSPSuite.UI/Views/Comparisons/ComparisonView.cs index afc01903e..e51961160 100644 --- a/src/OSPSuite.UI/Views/Comparisons/ComparisonView.cs +++ b/src/OSPSuite.UI/Views/Comparisons/ComparisonView.cs @@ -6,6 +6,7 @@ using DevExpress.XtraGrid.Views.Grid; using DevExpress.XtraLayout.Utils; using OSPSuite.Assets; +using OSPSuite.Core.Domain; using OSPSuite.Presentation; using OSPSuite.Presentation.DTO; using OSPSuite.Presentation.Extensions; diff --git a/src/OSPSuite.UI/Views/QuantityListView.cs b/src/OSPSuite.UI/Views/QuantityListView.cs index 801b333df..686d607ae 100644 --- a/src/OSPSuite.UI/Views/QuantityListView.cs +++ b/src/OSPSuite.UI/Views/QuantityListView.cs @@ -9,6 +9,7 @@ using DevExpress.XtraGrid.Menu; using DevExpress.XtraGrid.Views.Grid; using OSPSuite.Assets; +using OSPSuite.Core.Domain; using OSPSuite.Presentation.DTO; using OSPSuite.Presentation.Presenters; using OSPSuite.Presentation.Views; diff --git a/src/OSPSuite.UI/Views/SimulationParametersView.cs b/src/OSPSuite.UI/Views/SimulationParametersView.cs index 18aa98a0c..abfe46124 100644 --- a/src/OSPSuite.UI/Views/SimulationParametersView.cs +++ b/src/OSPSuite.UI/Views/SimulationParametersView.cs @@ -6,6 +6,7 @@ using OSPSuite.Utility.Format; using DevExpress.XtraEditors.Repository; using OSPSuite.Assets; +using OSPSuite.Core.Domain; using OSPSuite.Presentation.DTO; using OSPSuite.Presentation.Presenters; using OSPSuite.Presentation.Services; diff --git a/tests/OSPSuite.Core.Tests/Batch/SimulationResultsExporterSpecs.cs b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsExporterSpecs.cs new file mode 100644 index 000000000..bd6308e1e --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsExporterSpecs.cs @@ -0,0 +1,86 @@ +using System.Collections.Generic; +using System.Data; +using System.Threading.Tasks; +using FakeItEasy; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Batch; +using OSPSuite.Core.Batch.Mappers; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Data; +using OSPSuite.Core.Domain.Mappers; +using OSPSuite.Core.Domain.Services; +using OSPSuite.Core.Services; +using OSPSuite.Infrastructure.Services; +using OSPSuite.Utility; + +namespace PKSim.BatchTool +{ + public abstract class concern_for_SimulationResultsExporter : ContextSpecification + { + protected IDataRepositoryTask _dataRepositoryTask; + private IQuantityPathToQuantityDisplayPathMapper _quantityDisplayPathMapper; + protected ISimulationResultsToBatchSimulationExportMapper _batchSimulationExportMapper; + protected ISimulation _simulation; + protected DataRepository _results; + protected string _fileName; + + protected override void Context() + { + _dataRepositoryTask = A.Fake(); + _quantityDisplayPathMapper = A.Fake(); + _batchSimulationExportMapper = A.Fake(); + sut = new SimulationResultsExporter(_dataRepositoryTask, _quantityDisplayPathMapper, _batchSimulationExportMapper); + + _simulation = A.Fake(); + _results = new DataRepository(); + _fileName = FileHelper.GenerateTemporaryFileName(); + } + + public override void GlobalCleanup() + { + base.GlobalCleanup(); + FileHelper.DeleteFile(_fileName); + } + } + + public class When_exporting_simulation_results_to_csv : concern_for_SimulationResultsExporter + { + private List _dataTables; + + protected override void Context() + { + base.Context(); + var dataTable = new DataTable("TEST"); + + _dataTables = new List {dataTable}; + A.CallTo(_dataRepositoryTask).WithReturnType>().Returns(_dataTables); + } + + [Observation] + public void should_create_a_data_table_with_all_results_from_the_simulation_and_export_it_to_the_file() + { + sut.ExportToCsvAsync(_simulation, _results, _fileName).Wait(); + FileHelper.FileExists(_fileName).ShouldBeTrue(); + } + } + + public class When_exporting_simulation_results_to_json : concern_for_SimulationResultsExporter + { + private BatchSimulationExport _batchSimulationExport; + + protected override void Context() + { + base.Context(); + _batchSimulationExport = new BatchSimulationExport {Name = "Sim"}; + A.CallTo(() => _batchSimulationExportMapper.MapFrom(_simulation, _results)).Returns(_batchSimulationExport); + } + + [Observation] + public void should_create_a_batch_simulation_export_object_and_export_it_to_the_file() + { + sut.ExportToJsonAsync(_simulation, _results, _fileName).Wait(); + FileHelper.FileExists(_fileName).ShouldBeTrue(); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs new file mode 100644 index 000000000..f9b4c1bd1 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs @@ -0,0 +1,101 @@ +using FakeItEasy; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Batch; +using OSPSuite.Core.Batch.Mappers; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Data; +using OSPSuite.Core.Domain.Formulas; +using OSPSuite.Core.Domain.Mappers; +using OSPSuite.Helpers; + +namespace OSPSuite.Batch +{ + public abstract class concern_for_SimulationResultsToBatchSimulationExportMapper : ContextSpecification + { + protected IQuantityPathToQuantityDisplayPathMapper _quantityDisplayPathMapper; + protected IObjectPathFactory _objectPathFactory; + + protected override void Context() + { + _quantityDisplayPathMapper = A.Fake(); + _objectPathFactory = A.Fake(); + sut = new SimulationResultsToBatchSimulationExportMapper(_quantityDisplayPathMapper, _objectPathFactory); + } + } + + public class When_mapping_simulation_results_to_batch_simulation_export : concern_for_SimulationResultsToBatchSimulationExportMapper + { + private DataRepository _dataRepository; + private ISimulation _simulation; + private BatchSimulationExport _simulationExport; + private BaseGrid _baseGrid; + private DataColumn _col1; + private DataColumn _col2; + private Parameter _parameter; + + protected override void Context() + { + base.Context(); + _simulation = A.Fake().WithName("SIM"); + _parameter = new Parameter().WithName("P1").WithFormula(new ConstantFormula(10)); + _simulation.Model = new Model + { + Root = new Container + { + _parameter + } + }; + + _baseGrid = new BaseGrid("Time", DomainHelperForSpecs.TimeDimensionForSpecs()) {Values = new[] {1f, 2f, 3f}}; + _col1 = new DataColumn("Drug1", DomainHelperForSpecs.ConcentrationDimensionForSpecs(), _baseGrid) {Values = new[] {10f, 20f, 30f}}; + _col2 = new DataColumn("Drug2", DomainHelperForSpecs.ConcentrationDimensionForSpecs(), _baseGrid) {Values = new[] {100f, 200f, 300f}}; + + _dataRepository = new DataRepository {_col1, _col2}; + + A.CallTo(() => _quantityDisplayPathMapper.DisplayPathAsStringFor(_simulation, _col1, false)).Returns("PATH1"); + A.CallTo(() => _quantityDisplayPathMapper.DisplayPathAsStringFor(_simulation, _col2, false)).Returns("PATH2"); + A.CallTo(() => _objectPathFactory.CreateAbsoluteObjectPath(_parameter)).Returns(new ObjectPath("Sim", "P1")); + } + + protected override void Because() + { + _simulationExport = sut.MapFrom(_simulation, _dataRepository); + } + + [Observation] + public void should_return_an_object_having_the_expected_simulation_properties() + { + _simulationExport.Name.ShouldBeEqualTo(_simulation.Name); + } + + [Observation] + public void should_have_created_one_output_value_for_each_output_results() + { + _simulationExport.OutputValues.Count.ShouldBeEqualTo(2); + verifyOutputExport(_simulationExport.OutputValues[0], _col1, "PATH1", 1.5); + verifyOutputExport(_simulationExport.OutputValues[1], _col2, "PATH2", 1.5); + } + + private void verifyOutputExport(BatchOutputValues outputValues, DataColumn column, string path, double threshold) + { + outputValues.Path.ShouldBeEqualTo(path); + outputValues.Values.ShouldBeEqualTo(column.ConvertToDisplayValues(column.Values)); + outputValues.Threshold.ShouldBeEqualTo(threshold); + } + + [Observation] + public void should_have_set_the_time_values_using_display_units() + { + _simulationExport.Time.ShouldBeEqualTo(_baseGrid.ConvertToDisplayValues(_baseGrid.Values)); + } + + [Observation] + public void should_have_exported_parameter_values() + { + _simulationExport.ParameterValues.Count.ShouldBeEqualTo(1); + _simulationExport.ParameterValues[0].Path.ShouldBeEqualTo(_objectPathFactory.CreateAbsoluteObjectPath(_parameter).PathAsString); + _simulationExport.ParameterValues[0].Value.ShouldBeEqualTo(_parameter.Value); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj index a43befd99..09b5f7b4b 100644 --- a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj +++ b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj @@ -137,6 +137,8 @@ Properties\SolutionInfo.cs + + diff --git a/tests/OSPSuite.Core.Tests/Presentation/ParameterIdentificationPredictedVsObservedChartPresenterSpecs.cs b/tests/OSPSuite.Core.Tests/Presentation/ParameterIdentificationPredictedVsObservedChartPresenterSpecs.cs index ca1b6f360..cbc962192 100644 --- a/tests/OSPSuite.Core.Tests/Presentation/ParameterIdentificationPredictedVsObservedChartPresenterSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Presentation/ParameterIdentificationPredictedVsObservedChartPresenterSpecs.cs @@ -7,6 +7,7 @@ using OSPSuite.Core.Chart.ParameterIdentifications; using OSPSuite.Core.Domain; using OSPSuite.Core.Domain.Data; +using OSPSuite.Core.Domain.Mappers; using OSPSuite.Core.Domain.ParameterIdentifications; using OSPSuite.Core.Domain.Services; using OSPSuite.Core.Domain.UnitSystem; diff --git a/tests/OSPSuite.Core.Tests/Presentation/ParameterIdentificationResidualVsTimeChartPresenterSpecs.cs b/tests/OSPSuite.Core.Tests/Presentation/ParameterIdentificationResidualVsTimeChartPresenterSpecs.cs index 424717052..76d02f2e5 100644 --- a/tests/OSPSuite.Core.Tests/Presentation/ParameterIdentificationResidualVsTimeChartPresenterSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Presentation/ParameterIdentificationResidualVsTimeChartPresenterSpecs.cs @@ -6,6 +6,7 @@ using OSPSuite.Core.Chart; using OSPSuite.Core.Chart.ParameterIdentifications; using OSPSuite.Core.Domain.Data; +using OSPSuite.Core.Domain.Mappers; using OSPSuite.Core.Domain.ParameterIdentifications; using OSPSuite.Core.Domain.Services; using OSPSuite.Core.Domain.UnitSystem; diff --git a/tests/OSPSuite.Core.Tests/Presentation/ParameterIdentificationTimeProfileChartPresenterSpecs.cs b/tests/OSPSuite.Core.Tests/Presentation/ParameterIdentificationTimeProfileChartPresenterSpecs.cs index 7b0b0381a..6ec1c8e96 100644 --- a/tests/OSPSuite.Core.Tests/Presentation/ParameterIdentificationTimeProfileChartPresenterSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Presentation/ParameterIdentificationTimeProfileChartPresenterSpecs.cs @@ -5,6 +5,7 @@ using OSPSuite.Core; using OSPSuite.Core.Chart.ParameterIdentifications; using OSPSuite.Core.Domain.Data; +using OSPSuite.Core.Domain.Mappers; using OSPSuite.Core.Domain.ParameterIdentifications; using OSPSuite.Core.Domain.Services; using OSPSuite.Core.Domain.UnitSystem; diff --git a/tests/OSPSuite.Core.Tests/Presentation/QuantityPathToQuantityDisplayPathMapperSpecs.cs b/tests/OSPSuite.Core.Tests/Presentation/QuantityPathToQuantityDisplayPathMapperSpecs.cs index 6d85efa6c..fb0b1d666 100644 --- a/tests/OSPSuite.Core.Tests/Presentation/QuantityPathToQuantityDisplayPathMapperSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Presentation/QuantityPathToQuantityDisplayPathMapperSpecs.cs @@ -4,6 +4,7 @@ using OSPSuite.Core; using OSPSuite.Core.Domain; using OSPSuite.Core.Domain.Data; +using OSPSuite.Core.Domain.Mappers; using OSPSuite.Helpers; using OSPSuite.Presentation.DTO; using OSPSuite.Presentation.Mappers; diff --git a/tests/OSPSuite.Core.Tests/Presentation/QuantityToSimulationQuantitySelectionDTOMapperSpecs.cs b/tests/OSPSuite.Core.Tests/Presentation/QuantityToSimulationQuantitySelectionDTOMapperSpecs.cs index 48c101b5f..e94a8df58 100644 --- a/tests/OSPSuite.Core.Tests/Presentation/QuantityToSimulationQuantitySelectionDTOMapperSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Presentation/QuantityToSimulationQuantitySelectionDTOMapperSpecs.cs @@ -2,6 +2,7 @@ using OSPSuite.BDDHelper.Extensions; using FakeItEasy; using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Mappers; using OSPSuite.Presentation.DTO; using OSPSuite.Presentation.Mappers; From e1fca32a65f4148704f23bdbb62850d8e3cbace8 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Mon, 1 May 2017 09:15:54 -0400 Subject: [PATCH 31/50] Fixes #56 Add AbsTol and RelTol to batch export (#57) --- .../Batch/BatchSimulationExport.cs | 18 +++++++++++++++++- ...tionResultsToBatchSimulationExportMapper.cs | 6 ++++-- ...esultsToBatchSimulationExportMapperSpecs.cs | 9 ++++++++- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/OSPSuite.Core/Batch/BatchSimulationExport.cs b/src/OSPSuite.Core/Batch/BatchSimulationExport.cs index e4372a5de..52d5c08a2 100644 --- a/src/OSPSuite.Core/Batch/BatchSimulationExport.cs +++ b/src/OSPSuite.Core/Batch/BatchSimulationExport.cs @@ -5,7 +5,23 @@ namespace OSPSuite.Core.Batch public class BatchSimulationExport { public string Name { get; set; } - public float[] Time { get; set; } + + /// + /// Time Array used in the simulation + /// + public float[] Times { get; set; } + + /// + /// Absolute tolerance used in the simulation + /// + public double AbsTol { get; set; } + + /// + /// Relative tolerance used in the simulation + /// + public double RelTol { get; set; } + + public List OutputValues { get; set; } = new List(); public List ParameterValues { get; set; } = new List(); } diff --git a/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs b/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs index 9ae2d6c97..932033c87 100644 --- a/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs +++ b/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs @@ -28,8 +28,10 @@ public BatchSimulationExport MapFrom(ISimulation simulation, DataRepository resu var simulationExport = new BatchSimulationExport { Name = simulation.Name, - Time = displayValuesFor(results.BaseGrid), - ParameterValues = parameterValuesFor(simulation.Model) + Times = displayValuesFor(results.BaseGrid), + ParameterValues = parameterValuesFor(simulation.Model), + AbsTol = simulation.SimulationSettings.Solver.AbsTol, + RelTol = simulation.SimulationSettings.Solver.RelTol, }; results.AllButBaseGrid().Each(c => simulationExport.OutputValues.Add(quantityResultsFrom(simulation, c))); diff --git a/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs index f9b4c1bd1..cea931b51 100644 --- a/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs @@ -33,6 +33,8 @@ public class When_mapping_simulation_results_to_batch_simulation_export : concer private DataColumn _col1; private DataColumn _col2; private Parameter _parameter; + private double _absTol = 1e-2; + private double _relTol = 1e-3; protected override void Context() { @@ -47,6 +49,9 @@ protected override void Context() } }; + _simulation.SimulationSettings.Solver.AbsTol = _absTol; + _simulation.SimulationSettings.Solver.RelTol = _relTol; + _baseGrid = new BaseGrid("Time", DomainHelperForSpecs.TimeDimensionForSpecs()) {Values = new[] {1f, 2f, 3f}}; _col1 = new DataColumn("Drug1", DomainHelperForSpecs.ConcentrationDimensionForSpecs(), _baseGrid) {Values = new[] {10f, 20f, 30f}}; _col2 = new DataColumn("Drug2", DomainHelperForSpecs.ConcentrationDimensionForSpecs(), _baseGrid) {Values = new[] {100f, 200f, 300f}}; @@ -67,6 +72,8 @@ protected override void Because() public void should_return_an_object_having_the_expected_simulation_properties() { _simulationExport.Name.ShouldBeEqualTo(_simulation.Name); + _simulationExport.AbsTol.ShouldBeEqualTo(_absTol); + _simulationExport.RelTol.ShouldBeEqualTo(_relTol); } [Observation] @@ -87,7 +94,7 @@ private void verifyOutputExport(BatchOutputValues outputValues, DataColumn colum [Observation] public void should_have_set_the_time_values_using_display_units() { - _simulationExport.Time.ShouldBeEqualTo(_baseGrid.ConvertToDisplayValues(_baseGrid.Values)); + _simulationExport.Times.ShouldBeEqualTo(_baseGrid.ConvertToDisplayValues(_baseGrid.Values)); } [Observation] From 371774e4d76fcec60e26624d8d7b96471de6ed90 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Mon, 1 May 2017 09:21:41 -0400 Subject: [PATCH 32/50] Fixesd #58 Add Dimension to batch output (#59) --- src/OSPSuite.Core/Batch/BatchOutputValues.cs | 1 + .../SimulationResultsToBatchSimulationExportMapper.cs | 3 ++- ...SimulationResultsToBatchSimulationExportMapperSpecs.cs | 8 +++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/OSPSuite.Core/Batch/BatchOutputValues.cs b/src/OSPSuite.Core/Batch/BatchOutputValues.cs index 899672055..6ecb416d6 100644 --- a/src/OSPSuite.Core/Batch/BatchOutputValues.cs +++ b/src/OSPSuite.Core/Batch/BatchOutputValues.cs @@ -5,5 +5,6 @@ public class BatchOutputValues public string Path { get; set; } public float[] Values { get; set; } public double Threshold { get; set; } + public string Dimension { get; set; } } } \ No newline at end of file diff --git a/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs b/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs index 932033c87..db91b3eeb 100644 --- a/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs +++ b/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs @@ -55,7 +55,8 @@ private BatchOutputValues quantityResultsFrom(ISimulation simulation, DataColumn Path = _quantityDisplayPathMapper.DisplayPathAsStringFor(simulation, column), //TODO READ THRESHOLD FROM COLUMN EXTENDED PROPERTIES WHEN READY Threshold = 1.5f, - Values = displayValuesFor(column) + Values = displayValuesFor(column), + Dimension = column.Dimension.Name }; } diff --git a/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs index cea931b51..4239cb96d 100644 --- a/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs @@ -7,6 +7,7 @@ using OSPSuite.Core.Domain.Data; using OSPSuite.Core.Domain.Formulas; using OSPSuite.Core.Domain.Mappers; +using OSPSuite.Core.Domain.UnitSystem; using OSPSuite.Helpers; namespace OSPSuite.Batch @@ -80,14 +81,15 @@ public void should_return_an_object_having_the_expected_simulation_properties() public void should_have_created_one_output_value_for_each_output_results() { _simulationExport.OutputValues.Count.ShouldBeEqualTo(2); - verifyOutputExport(_simulationExport.OutputValues[0], _col1, "PATH1", 1.5); - verifyOutputExport(_simulationExport.OutputValues[1], _col2, "PATH2", 1.5); + verifyOutputExport(_simulationExport.OutputValues[0], _col1, "PATH1", 1.5, _col1.Dimension); + verifyOutputExport(_simulationExport.OutputValues[1], _col2, "PATH2", 1.5, _col2.Dimension); } - private void verifyOutputExport(BatchOutputValues outputValues, DataColumn column, string path, double threshold) + private void verifyOutputExport(BatchOutputValues outputValues, DataColumn column, string path, double threshold, IDimension dimension) { outputValues.Path.ShouldBeEqualTo(path); outputValues.Values.ShouldBeEqualTo(column.ConvertToDisplayValues(column.Values)); + outputValues.Dimension.ShouldBeEqualTo(dimension.Name); outputValues.Threshold.ShouldBeEqualTo(threshold); } From 53b479880083d8d78bf631c3b012a881832f2395 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Mon, 1 May 2017 10:26:18 -0400 Subject: [PATCH 33/50] Fixes #60 comparison threshold (#61) * Add Comparison threshold to DataInfo * Fixes #60 add comparison threshold --- src/OSPSuite.Core/Batch/BatchOutputValues.cs | 2 +- ...ionResultsToBatchSimulationExportMapper.cs | 4 +- src/OSPSuite.Core/Domain/Data/DataColumn.cs | 13 ++--- src/OSPSuite.Core/Domain/Data/DataInfo.cs | 33 +++++++------ .../Domain/Data/DataRepository.cs | 2 +- src/OSPSuite.Core/Domain/Data/QuantityInfo.cs | 7 +-- .../Domain/Services/DataFactory.cs | 15 ++++-- src/OSPSuite.Core/OSPSuite.Core.csproj | 5 +- .../Xml/DataInfoXmlSerializer.cs | 1 + src/OSPSuite.Core/packages.config | 2 +- .../OSPSuite.Infrastructure.csproj | 4 +- src/OSPSuite.Infrastructure/packages.config | 2 +- .../OSPSuite.Presentation.csproj | 4 +- src/OSPSuite.Presentation/packages.config | 2 +- .../Batch/SimulationResultsExporterSpecs.cs | 3 +- ...sultsToBatchSimulationExportMapperSpecs.cs | 9 ++-- .../Core/DataColumnXmlSerializerSpecs.cs | 1 + .../OSPSuite.Core.Tests/Core/DataInfoSpecs.cs | 48 +++++++++++++++++++ .../Core/SimModelManagerIntegrationTests.cs | 11 ++++- .../Helpers/AssertForSpecs.cs | 1 + .../OSPSuite.Core.Tests.csproj | 12 +++-- tests/OSPSuite.Core.Tests/packages.config | 4 +- .../OSPSuite.Starter/OSPSuite.Starter.csproj | 5 ++ .../OSPSuite.UI.Tests.csproj | 5 ++ 24 files changed, 134 insertions(+), 61 deletions(-) create mode 100644 tests/OSPSuite.Core.Tests/Core/DataInfoSpecs.cs diff --git a/src/OSPSuite.Core/Batch/BatchOutputValues.cs b/src/OSPSuite.Core/Batch/BatchOutputValues.cs index 6ecb416d6..b452f5c20 100644 --- a/src/OSPSuite.Core/Batch/BatchOutputValues.cs +++ b/src/OSPSuite.Core/Batch/BatchOutputValues.cs @@ -4,7 +4,7 @@ public class BatchOutputValues { public string Path { get; set; } public float[] Values { get; set; } - public double Threshold { get; set; } public string Dimension { get; set; } + public double ComparisonThreshold { get; set; } } } \ No newline at end of file diff --git a/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs b/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs index db91b3eeb..dfbbfb890 100644 --- a/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs +++ b/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs @@ -53,8 +53,8 @@ private BatchOutputValues quantityResultsFrom(ISimulation simulation, DataColumn return new BatchOutputValues { Path = _quantityDisplayPathMapper.DisplayPathAsStringFor(simulation, column), - //TODO READ THRESHOLD FROM COLUMN EXTENDED PROPERTIES WHEN READY - Threshold = 1.5f, + //ComparisonThreshold should alwyas have a value. If for some reason it is not set, using 0 ensures that value should be compared exactly + ComparisonThreshold = column.DataInfo.ComparisonThreshold.GetValueOrDefault(0), Values = displayValuesFor(column), Dimension = column.Dimension.Name }; diff --git a/src/OSPSuite.Core/Domain/Data/DataColumn.cs b/src/OSPSuite.Core/Domain/Data/DataColumn.cs index 8016f7728..0c1581ce8 100644 --- a/src/OSPSuite.Core/Domain/Data/DataColumn.cs +++ b/src/OSPSuite.Core/Domain/Data/DataColumn.cs @@ -64,7 +64,7 @@ public DataColumn(string id, string name, IDimension dimension, BaseGrid baseGri public DataRepository Repository { set { _repository = value == null ? null : new WeakRef(value); } - get { return _repository != null ? _repository.Target : null; } + get { return _repository?.Target; } } public virtual bool IsInRepository() @@ -94,14 +94,7 @@ public virtual float this[int index] /// /// Returns true if the column values only contain one element otherwise false /// - public virtual bool HasSingleValue - { - get - { - if (_values == null) return false; - return _values.Count == 1; - } - } + public virtual bool HasSingleValue => _values?.Count == 1; /// /// Set or gets the values of the given columns. Always returns an array having the same dimension as the base grid @@ -131,7 +124,7 @@ public virtual IReadOnlyList Values if (value != null && BaseGrid != null && value.Count != BaseGrid.Count && value.Count != 1) throw new ArgumentException("Values.Length = " + value.Count + " != " + BaseGrid.Count + " = BaseGrid.Count"); - _values = value != null ? value.ToList() : null; + _values = value?.ToList(); _cachedValues = null; } } diff --git a/src/OSPSuite.Core/Domain/Data/DataInfo.cs b/src/OSPSuite.Core/Domain/Data/DataInfo.cs index c90f1b3b9..0c4486481 100644 --- a/src/OSPSuite.Core/Domain/Data/DataInfo.cs +++ b/src/OSPSuite.Core/Domain/Data/DataInfo.cs @@ -27,7 +27,7 @@ public enum ColumnOrigins ObservationAuxiliary, // if Observation and AuxiliaryType defined /// - /// Column is based on calculation values but is used in a different context (for example ParameterIdentification plots) + /// Column is based on calculation values but is used in a different context (for example ParameterIdentification plots) /// CalculationAuxiliary } @@ -43,8 +43,6 @@ public enum AuxiliaryType public class DataInfo { - private readonly ExtendedProperties _extendedProperties; - public ColumnOrigins Origin { get; set; } /// @@ -82,6 +80,19 @@ public class DataInfo /// public double? MolWeight { get; set; } + /// + /// Meta Information on the current column (organ, compartment for observed data etc.) + /// + public ExtendedProperties ExtendedProperties { get; } + + public float? LLOQ { get; set; } + + /// + /// Indicates the threshold that should be used to compare two output columns. This will only be set for calculate + /// columns + /// + public float? ComparisonThreshold { get; set; } + [Obsolete("For serialization")] public DataInfo() : this(ColumnOrigins.Undefined) { @@ -101,23 +112,15 @@ public DataInfo(ColumnOrigins origin, AuxiliaryType auxiliaryType, string displa Source = source; Category = category; MolWeight = molWeight; - _extendedProperties = new ExtendedProperties(); + ExtendedProperties = new ExtendedProperties(); } - /// - /// Meta Information on the current column (organ, compartment for observed data etc.) - /// - public ExtendedProperties ExtendedProperties => _extendedProperties; - - public float? LLOQ { get; set; } - - /// - /// Returns a clone of the DataInfo - /// public DataInfo Clone() { var dataInfo = new DataInfo(Origin, AuxiliaryType, DisplayUnitName, Date, Source, Category, MolWeight); - dataInfo.ExtendedProperties.UpdateFrom(_extendedProperties); + dataInfo.ExtendedProperties.UpdateFrom(ExtendedProperties); + dataInfo.LLOQ = LLOQ; + dataInfo.ComparisonThreshold = ComparisonThreshold; return dataInfo; } } diff --git a/src/OSPSuite.Core/Domain/Data/DataRepository.cs b/src/OSPSuite.Core/Domain/Data/DataRepository.cs index 95f41ac57..87439d5b0 100644 --- a/src/OSPSuite.Core/Domain/Data/DataRepository.cs +++ b/src/OSPSuite.Core/Domain/Data/DataRepository.cs @@ -15,7 +15,7 @@ public class DataRepository : ObjectBase, IEnumerable /// /// All Extended properties /// - public virtual ExtendedProperties ExtendedProperties { get; private set; } + public virtual ExtendedProperties ExtendedProperties { get; } public DataRepository() : this(Guid.NewGuid().ToString()) { diff --git a/src/OSPSuite.Core/Domain/Data/QuantityInfo.cs b/src/OSPSuite.Core/Domain/Data/QuantityInfo.cs index 8bac9379a..65565834d 100644 --- a/src/OSPSuite.Core/Domain/Data/QuantityInfo.cs +++ b/src/OSPSuite.Core/Domain/Data/QuantityInfo.cs @@ -46,10 +46,7 @@ public QuantityInfo(string name, IEnumerable quantityPath, QuantityType /// /// Returns the full path as string /// - public string PathAsString - { - get { return _path.ToPathString(); } - } + public string PathAsString => _path.ToPathString(); /// /// Full path of quantity for which data were saved. @@ -85,7 +82,7 @@ public bool Equals(QuantityInfo other) public override int GetHashCode() { - return (PathAsString != null ? PathAsString.GetHashCode() : 0); + return PathAsString?.GetHashCode() ?? 0; } public override string ToString() diff --git a/src/OSPSuite.Core/Domain/Services/DataFactory.cs b/src/OSPSuite.Core/Domain/Services/DataFactory.cs index 81d86ad5e..606b56e6c 100644 --- a/src/OSPSuite.Core/Domain/Services/DataFactory.cs +++ b/src/OSPSuite.Core/Domain/Services/DataFactory.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; -using OSPSuite.Utility.Collections; -using SimModelNET; using OSPSuite.Core.Domain.Data; using OSPSuite.Core.Domain.UnitSystem; using OSPSuite.Core.Extensions; using OSPSuite.Core.Services; +using OSPSuite.Utility.Collections; +using SimModelNET; namespace OSPSuite.Core.Domain.Services { @@ -18,7 +18,10 @@ public interface IDataFactory /// /// the core simulation for which results should be retrieved /// the simmodel simulation containing the results - /// The optional name for the repository. If not provided, the standard name retrieved from the will be used + /// + /// The optional name for the repository. If not provided, the standard name retrieved from + /// the will be used + /// /// DataRepository CreateRepository(IModelCoreSimulation simulation, SimModelNET.ISimulation simModelSimulation, string repositoryName = null); @@ -80,7 +83,11 @@ private DataColumn createColumn(BaseGrid xValues, IQuantity quantity, IValues yV { var column = new DataColumn(_dataNamingService.GetEntityName(yValues.EntityId), quantity.Dimension, xValues) { - DataInfo = {Origin = ColumnOrigins.Calculation}, + DataInfo = + { + Origin = ColumnOrigins.Calculation, + ComparisonThreshold = (float) yValues.ComparisonThreshold + }, Values = new List(yValues.Values.ToFloatArray()), QuantityInfo = new QuantityInfo(yValues.Name, quantityPath, quantity.QuantityType), DisplayUnit = _displayUnitRetriever.PreferredUnitFor(quantity) diff --git a/src/OSPSuite.Core/OSPSuite.Core.csproj b/src/OSPSuite.Core/OSPSuite.Core.csproj index fb3d1d991..5cb39696d 100644 --- a/src/OSPSuite.Core/OSPSuite.Core.csproj +++ b/src/OSPSuite.Core/OSPSuite.Core.csproj @@ -73,8 +73,9 @@ ..\..\packages\OSPSuite.Serializer.2.0.0.1\lib\net45\OSPSuite.Serializer.dll - - ..\..\packages\OSPSuite.SimModel.2.0.0.1\lib\net45\OSPSuite.SimModel.dll + + ..\..\packages\OSPSuite.SimModel.2.0.0.12\lib\net45\OSPSuite.SimModel.dll + True False diff --git a/src/OSPSuite.Core/Serialization/Xml/DataInfoXmlSerializer.cs b/src/OSPSuite.Core/Serialization/Xml/DataInfoXmlSerializer.cs index 1c4d54537..511cb2d25 100644 --- a/src/OSPSuite.Core/Serialization/Xml/DataInfoXmlSerializer.cs +++ b/src/OSPSuite.Core/Serialization/Xml/DataInfoXmlSerializer.cs @@ -21,6 +21,7 @@ public override void PerformMapping() Map(x => x.Category); Map(x => x.MolWeight); Map(x => x.LLOQ).WithMappingName(Constants.Serialization.Attribute.LLOQ); + Map(x => x.ComparisonThreshold); MapEnumerable(x => x.ExtendedProperties, addFunction); } diff --git a/src/OSPSuite.Core/packages.config b/src/OSPSuite.Core/packages.config index 0778d23ce..f39587b7d 100644 --- a/src/OSPSuite.Core/packages.config +++ b/src/OSPSuite.Core/packages.config @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj index 2d7e4ecbc..892b1ca4d 100644 --- a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj +++ b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj @@ -80,8 +80,8 @@ ..\..\packages\OSPSuite.Utility.2.0.0.5\lib\net45\OSPSuite.Utility.dll True - - ..\..\packages\OSPSuite.SmartXLS.2.6.3.1\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.3.3\lib\net45\SX.dll True diff --git a/src/OSPSuite.Infrastructure/packages.config b/src/OSPSuite.Infrastructure/packages.config index 11b01e00e..85997052a 100644 --- a/src/OSPSuite.Infrastructure/packages.config +++ b/src/OSPSuite.Infrastructure/packages.config @@ -8,7 +8,7 @@ - + diff --git a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj index 98f7ad263..4197486c4 100644 --- a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj +++ b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj @@ -52,8 +52,8 @@ ..\..\packages\OSPSuite.Utility.2.0.0.5\lib\net45\OSPSuite.Utility.dll True - - ..\..\packages\OSPSuite.SmartXLS.2.6.3.1\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.3.3\lib\net45\SX.dll True diff --git a/src/OSPSuite.Presentation/packages.config b/src/OSPSuite.Presentation/packages.config index 849ac887f..53b268691 100644 --- a/src/OSPSuite.Presentation/packages.config +++ b/src/OSPSuite.Presentation/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Batch/SimulationResultsExporterSpecs.cs b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsExporterSpecs.cs index bd6308e1e..5e14ff128 100644 --- a/tests/OSPSuite.Core.Tests/Batch/SimulationResultsExporterSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsExporterSpecs.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Data; -using System.Threading.Tasks; using FakeItEasy; using OSPSuite.BDDHelper; using OSPSuite.BDDHelper.Extensions; @@ -14,7 +13,7 @@ using OSPSuite.Infrastructure.Services; using OSPSuite.Utility; -namespace PKSim.BatchTool +namespace OSPSuite.Batch { public abstract class concern_for_SimulationResultsExporter : ContextSpecification { diff --git a/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs index 4239cb96d..7c3e51f69 100644 --- a/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs @@ -55,6 +55,7 @@ protected override void Context() _baseGrid = new BaseGrid("Time", DomainHelperForSpecs.TimeDimensionForSpecs()) {Values = new[] {1f, 2f, 3f}}; _col1 = new DataColumn("Drug1", DomainHelperForSpecs.ConcentrationDimensionForSpecs(), _baseGrid) {Values = new[] {10f, 20f, 30f}}; + _col1.DataInfo.ComparisonThreshold = 1e-2f; _col2 = new DataColumn("Drug2", DomainHelperForSpecs.ConcentrationDimensionForSpecs(), _baseGrid) {Values = new[] {100f, 200f, 300f}}; _dataRepository = new DataRepository {_col1, _col2}; @@ -81,16 +82,16 @@ public void should_return_an_object_having_the_expected_simulation_properties() public void should_have_created_one_output_value_for_each_output_results() { _simulationExport.OutputValues.Count.ShouldBeEqualTo(2); - verifyOutputExport(_simulationExport.OutputValues[0], _col1, "PATH1", 1.5, _col1.Dimension); - verifyOutputExport(_simulationExport.OutputValues[1], _col2, "PATH2", 1.5, _col2.Dimension); + verifyOutputExport(_simulationExport.OutputValues[0], _col1, "PATH1", _col1.DataInfo.ComparisonThreshold.Value, _col1.Dimension); + verifyOutputExport(_simulationExport.OutputValues[1], _col2, "PATH2", 0, _col2.Dimension); } - private void verifyOutputExport(BatchOutputValues outputValues, DataColumn column, string path, double threshold, IDimension dimension) + private void verifyOutputExport(BatchOutputValues outputValues, DataColumn column, string path, double comparisonThreshold, IDimension dimension) { outputValues.Path.ShouldBeEqualTo(path); outputValues.Values.ShouldBeEqualTo(column.ConvertToDisplayValues(column.Values)); outputValues.Dimension.ShouldBeEqualTo(dimension.Name); - outputValues.Threshold.ShouldBeEqualTo(threshold); + outputValues.ComparisonThreshold.ShouldBeEqualTo(comparisonThreshold); } [Observation] diff --git a/tests/OSPSuite.Core.Tests/Core/DataColumnXmlSerializerSpecs.cs b/tests/OSPSuite.Core.Tests/Core/DataColumnXmlSerializerSpecs.cs index ce7975627..b5499099e 100644 --- a/tests/OSPSuite.Core.Tests/Core/DataColumnXmlSerializerSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Core/DataColumnXmlSerializerSpecs.cs @@ -24,6 +24,7 @@ public void TestSerializationWithoutRelatedColumn() Values = new[] {1.0F, 2.1F, -3.4F} }; x1.DataInfo.LLOQ = 1.0F; + x1.DataInfo.ComparisonThreshold = 1e-2F; var dr1 = new DataRepository("id") {x1}; var dr2 = SerializeAndDeserialize(dr1); diff --git a/tests/OSPSuite.Core.Tests/Core/DataInfoSpecs.cs b/tests/OSPSuite.Core.Tests/Core/DataInfoSpecs.cs new file mode 100644 index 000000000..664b9c7f4 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Core/DataInfoSpecs.cs @@ -0,0 +1,48 @@ +using System; +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Domain; +using OSPSuite.Core.Domain.Data; + +namespace OSPSuite.Core +{ + public abstract class concern_for_DataInfo : ContextSpecification + { + protected override void Context() + { + sut = new DataInfo(ColumnOrigins.Calculation, AuxiliaryType.ArithmeticStdDev, "ml", DateTime.Today, "Journal", "cat", 155d) + { + LLOQ = 25, + ComparisonThreshold = 1e-3f + }; + + sut.ExtendedProperties.Add(new ExtendedProperty {Name = "Test", Value = "hello"}); + } + } + + public class When_cloning_a_data_info : concern_for_DataInfo + { + private DataInfo _clone; + + protected override void Because() + { + _clone = sut.Clone(); + } + + [Observation] + public void should_clone_all_the_properties_of_the_data_info() + { + _clone.ComparisonThreshold.ShouldBeEqualTo(sut.ComparisonThreshold); + _clone.LLOQ.ShouldBeEqualTo(sut.LLOQ); + _clone.AuxiliaryType.ShouldBeEqualTo(sut.AuxiliaryType); + _clone.Origin.ShouldBeEqualTo(sut.Origin); + _clone.DisplayUnitName.ShouldBeEqualTo(sut.DisplayUnitName); + _clone.Date.ShouldBeEqualTo(sut.Date); + _clone.Source.ShouldBeEqualTo(sut.Source); + _clone.Category.ShouldBeEqualTo(sut.Category); + _clone.MolWeight.ShouldBeEqualTo(sut.MolWeight); + + _clone.ExtendedProperties["Test"].ValueAsObject.ShouldBeEqualTo("hello"); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Core/SimModelManagerIntegrationTests.cs b/tests/OSPSuite.Core.Tests/Core/SimModelManagerIntegrationTests.cs index b8b836722..befc9bf8d 100644 --- a/tests/OSPSuite.Core.Tests/Core/SimModelManagerIntegrationTests.cs +++ b/tests/OSPSuite.Core.Tests/Core/SimModelManagerIntegrationTests.cs @@ -90,7 +90,7 @@ public void should_return_repository_with_number_of_amounts_and_observers_and_pe [Observation] public void should_have_set_the_molweight_in_amounts_and_observers_when_available() { - foreach (var dataColumn in _results.Where(x => !x.IsBaseGrid())) + foreach (var dataColumn in _results.AllButBaseGrid()) { if (molWeightShouldBeSetFor(dataColumn)) dataColumn.DataInfo.MolWeight.ShouldBeEqualTo(250); @@ -99,6 +99,15 @@ public void should_have_set_the_molweight_in_amounts_and_observers_when_availabl } } + [Observation] + public void should_have_set_comparison_threshold_for_observers_and_variables() + { + foreach (var dataColumn in _results.AllButBaseGrid()) + { + dataColumn.DataInfo.ComparisonThreshold.ShouldNotBeNull(); + } + } + private bool molWeightShouldBeSetFor(DataColumn dataColumn) { if (dataColumn.QuantityInfo.Name == "A") diff --git a/tests/OSPSuite.Core.Tests/Helpers/AssertForSpecs.cs b/tests/OSPSuite.Core.Tests/Helpers/AssertForSpecs.cs index 1638247ec..8f8e80c9e 100644 --- a/tests/OSPSuite.Core.Tests/Helpers/AssertForSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Helpers/AssertForSpecs.cs @@ -1121,6 +1121,7 @@ public static void AreEqualMcDataColumn(DataColumn x1, DataColumn x2) AreEqualMcQuantityInfo(x1.QuantityInfo, x2.QuantityInfo); AreEqualMcDataInfo(x1.DataInfo, x2.DataInfo); x1.DataInfo.LLOQ.ShouldBeEqualTo(x2.DataInfo.LLOQ); + x1.DataInfo.ComparisonThreshold.ShouldBeEqualTo(x2.DataInfo.ComparisonThreshold); Assert.AreEqual(x1.RelatedColumns.Count(), x2.RelatedColumns.Count()); foreach (var relCol1 in x1.RelatedColumns) diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj index 09b5f7b4b..f9875ed98 100644 --- a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj +++ b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj @@ -104,8 +104,9 @@ ..\..\packages\OSPSuite.Serializer.2.0.0.1\lib\net45\OSPSuite.Serializer.dll - - ..\..\packages\OSPSuite.SimModel.2.0.0.1\lib\net45\OSPSuite.SimModel.dll + + ..\..\packages\OSPSuite.SimModel.2.0.0.12\lib\net45\OSPSuite.SimModel.dll + True ..\..\packages\OSPSuite.TeXReporting.2.0.0.1\lib\net45\OSPSuite.TeXReporting.dll @@ -114,8 +115,8 @@ ..\..\packages\OSPSuite.Utility.2.0.0.5\lib\net45\OSPSuite.Utility.dll True - - ..\..\packages\OSPSuite.SmartXLS.2.6.3.1\lib\net45\SX.dll + + ..\..\packages\OSPSuite.SmartXLS.2.6.3.3\lib\net45\SX.dll True @@ -171,6 +172,7 @@ + @@ -744,7 +746,7 @@ - + OSPSuite.SimModel.xsd Designer PreserveNewest diff --git a/tests/OSPSuite.Core.Tests/packages.config b/tests/OSPSuite.Core.Tests/packages.config index 055f52339..ef8782499 100644 --- a/tests/OSPSuite.Core.Tests/packages.config +++ b/tests/OSPSuite.Core.Tests/packages.config @@ -13,9 +13,9 @@ - + - + \ No newline at end of file diff --git a/tests/OSPSuite.Starter/OSPSuite.Starter.csproj b/tests/OSPSuite.Starter/OSPSuite.Starter.csproj index d3fe99e48..29373870f 100644 --- a/tests/OSPSuite.Starter/OSPSuite.Starter.csproj +++ b/tests/OSPSuite.Starter/OSPSuite.Starter.csproj @@ -441,6 +441,11 @@ TestView.cs + + OSPSuite.SimModel.xsd + Designer + PreserveNewest + Designer diff --git a/tests/OSPSuite.UI.Tests/OSPSuite.UI.Tests.csproj b/tests/OSPSuite.UI.Tests/OSPSuite.UI.Tests.csproj index 1760b0ff6..deac1be29 100644 --- a/tests/OSPSuite.UI.Tests/OSPSuite.UI.Tests.csproj +++ b/tests/OSPSuite.UI.Tests/OSPSuite.UI.Tests.csproj @@ -157,6 +157,11 @@ + + OSPSuite.SimModel.xsd + Designer + PreserveNewest + PreserveNewest From 04237971bbe1d7a273f7be40c5cc00d21ac05591 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Mon, 1 May 2017 14:04:09 -0400 Subject: [PATCH 34/50] Fixes #62 use full output path (#63) --- ...ionResultsToBatchSimulationExportMapper.cs | 11 +++----- ...sultsToBatchSimulationExportMapperSpecs.cs | 26 +++++++++++-------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs b/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs index dfbbfb890..e7916355a 100644 --- a/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs +++ b/src/OSPSuite.Core/Batch/Mappers/SimulationResultsToBatchSimulationExportMapper.cs @@ -2,7 +2,6 @@ using System.Linq; using OSPSuite.Core.Domain; using OSPSuite.Core.Domain.Data; -using OSPSuite.Core.Domain.Mappers; using OSPSuite.Utility.Extensions; namespace OSPSuite.Core.Batch.Mappers @@ -14,12 +13,10 @@ public interface ISimulationResultsToBatchSimulationExportMapper public class SimulationResultsToBatchSimulationExportMapper : ISimulationResultsToBatchSimulationExportMapper { - private readonly IQuantityPathToQuantityDisplayPathMapper _quantityDisplayPathMapper; private readonly IObjectPathFactory _objectPathFactory; - public SimulationResultsToBatchSimulationExportMapper(IQuantityPathToQuantityDisplayPathMapper quantityDisplayPathMapper, IObjectPathFactory objectPathFactory) + public SimulationResultsToBatchSimulationExportMapper(IObjectPathFactory objectPathFactory) { - _quantityDisplayPathMapper = quantityDisplayPathMapper; _objectPathFactory = objectPathFactory; } @@ -34,7 +31,7 @@ public BatchSimulationExport MapFrom(ISimulation simulation, DataRepository resu RelTol = simulation.SimulationSettings.Solver.RelTol, }; - results.AllButBaseGrid().Each(c => simulationExport.OutputValues.Add(quantityResultsFrom(simulation, c))); + results.AllButBaseGrid().Each(c => simulationExport.OutputValues.Add(quantityResultsFrom(c))); return simulationExport; } @@ -48,11 +45,11 @@ private List parameterValuesFor(IModel simulationModel) }).ToList(); } - private BatchOutputValues quantityResultsFrom(ISimulation simulation, DataColumn column) + private BatchOutputValues quantityResultsFrom( DataColumn column) { return new BatchOutputValues { - Path = _quantityDisplayPathMapper.DisplayPathAsStringFor(simulation, column), + Path = column.PathAsString, //ComparisonThreshold should alwyas have a value. If for some reason it is not set, using 0 ensures that value should be compared exactly ComparisonThreshold = column.DataInfo.ComparisonThreshold.GetValueOrDefault(0), Values = displayValuesFor(column), diff --git a/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs index 7c3e51f69..03e246eb4 100644 --- a/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs @@ -14,14 +14,12 @@ namespace OSPSuite.Batch { public abstract class concern_for_SimulationResultsToBatchSimulationExportMapper : ContextSpecification { - protected IQuantityPathToQuantityDisplayPathMapper _quantityDisplayPathMapper; protected IObjectPathFactory _objectPathFactory; protected override void Context() { - _quantityDisplayPathMapper = A.Fake(); _objectPathFactory = A.Fake(); - sut = new SimulationResultsToBatchSimulationExportMapper(_quantityDisplayPathMapper, _objectPathFactory); + sut = new SimulationResultsToBatchSimulationExportMapper( _objectPathFactory); } } @@ -54,14 +52,20 @@ protected override void Context() _simulation.SimulationSettings.Solver.RelTol = _relTol; _baseGrid = new BaseGrid("Time", DomainHelperForSpecs.TimeDimensionForSpecs()) {Values = new[] {1f, 2f, 3f}}; - _col1 = new DataColumn("Drug1", DomainHelperForSpecs.ConcentrationDimensionForSpecs(), _baseGrid) {Values = new[] {10f, 20f, 30f}}; - _col1.DataInfo.ComparisonThreshold = 1e-2f; - _col2 = new DataColumn("Drug2", DomainHelperForSpecs.ConcentrationDimensionForSpecs(), _baseGrid) {Values = new[] {100f, 200f, 300f}}; - + _col1 = new DataColumn("Drug1", DomainHelperForSpecs.ConcentrationDimensionForSpecs(), _baseGrid) + { + Values = new[] {10f, 20f, 30f}, + QuantityInfo = {Path = new[] {"P1", "P2"}}, + DataInfo = {ComparisonThreshold = 1e-2f} + }; + _col2 = new DataColumn("Drug2", DomainHelperForSpecs.ConcentrationDimensionForSpecs(), _baseGrid) + { + Values = new[] {100f, 200f, 300f}, + QuantityInfo = {Path = new[] {"P3", "P4"}} + }; _dataRepository = new DataRepository {_col1, _col2}; - A.CallTo(() => _quantityDisplayPathMapper.DisplayPathAsStringFor(_simulation, _col1, false)).Returns("PATH1"); - A.CallTo(() => _quantityDisplayPathMapper.DisplayPathAsStringFor(_simulation, _col2, false)).Returns("PATH2"); + A.CallTo(() => _objectPathFactory.CreateAbsoluteObjectPath(_parameter)).Returns(new ObjectPath("Sim", "P1")); } @@ -82,8 +86,8 @@ public void should_return_an_object_having_the_expected_simulation_properties() public void should_have_created_one_output_value_for_each_output_results() { _simulationExport.OutputValues.Count.ShouldBeEqualTo(2); - verifyOutputExport(_simulationExport.OutputValues[0], _col1, "PATH1", _col1.DataInfo.ComparisonThreshold.Value, _col1.Dimension); - verifyOutputExport(_simulationExport.OutputValues[1], _col2, "PATH2", 0, _col2.Dimension); + verifyOutputExport(_simulationExport.OutputValues[0], _col1, _col1.PathAsString, _col1.DataInfo.ComparisonThreshold.Value, _col1.Dimension); + verifyOutputExport(_simulationExport.OutputValues[1], _col2, _col2.PathAsString, 0, _col2.Dimension); } private void verifyOutputExport(BatchOutputValues outputValues, DataColumn column, string path, double comparisonThreshold, IDimension dimension) From bb83595263d3fc761689cebced9305f68cd78510 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 4 May 2017 10:25:08 -0400 Subject: [PATCH 35/50] Fixes #64 Rename 6.4.2 to 7.1.0 (#65) --- .../Converter63To64.cs => v7_1/Converter63To710.cs} | 12 ++++++------ src/OSPSuite.Core/OSPSuite.Core.csproj | 2 +- src/OSPSuite.Core/Serialization/PKMLVersion.cs | 4 ++-- ...ationResultsToBatchSimulationExportMapperSpecs.cs | 8 ++++++++ .../Converter63To710Specs.cs} | 10 +++++----- tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj | 2 +- tests/OSPSuite.Starter/Properties/licenses.licx | 5 +++-- 7 files changed, 26 insertions(+), 17 deletions(-) rename src/OSPSuite.Core/Converter/{v6_4/Converter63To64.cs => v7_1/Converter63To710.cs} (90%) rename tests/OSPSuite.Core.Tests/Converter/{v6_4/Converter63To64Specs.cs => v7_1/Converter63To710Specs.cs} (86%) diff --git a/src/OSPSuite.Core/Converter/v6_4/Converter63To64.cs b/src/OSPSuite.Core/Converter/v7_1/Converter63To710.cs similarity index 90% rename from src/OSPSuite.Core/Converter/v6_4/Converter63To64.cs rename to src/OSPSuite.Core/Converter/v7_1/Converter63To710.cs index 2d131ae2f..31d5fa1f9 100644 --- a/src/OSPSuite.Core/Converter/v6_4/Converter63To64.cs +++ b/src/OSPSuite.Core/Converter/v7_1/Converter63To710.cs @@ -1,12 +1,12 @@ using System.Xml.Linq; -using OSPSuite.Serializer.Xml.Extensions; -using OSPSuite.Utility.Extensions; using OSPSuite.Core.Serialization; using OSPSuite.Core.Serialization.Xml.Extensions; +using OSPSuite.Serializer.Xml.Extensions; +using OSPSuite.Utility.Extensions; -namespace OSPSuite.Core.Converter.v6_4 +namespace OSPSuite.Core.Converter.v7_1 { - public class Converter63To64 : IObjectConverter + public class Converter63To710 : IObjectConverter { public bool IsSatisfiedBy(int version) { @@ -15,13 +15,13 @@ public bool IsSatisfiedBy(int version) public int Convert(object objectToUpdate) { - return PKMLVersion.V6_4_2; + return PKMLVersion.V7_1_0; } public int ConvertXml(XElement element) { element.DescendantsAndSelfNamed("CurveChartTemplate").Each(convertCurveChartTemplate); - return PKMLVersion.V6_4_2; + return PKMLVersion.V7_1_0; } private void convertCurveChartTemplate(XElement chartTemplateElement) diff --git a/src/OSPSuite.Core/OSPSuite.Core.csproj b/src/OSPSuite.Core/OSPSuite.Core.csproj index 5cb39696d..e4c8900f8 100644 --- a/src/OSPSuite.Core/OSPSuite.Core.csproj +++ b/src/OSPSuite.Core/OSPSuite.Core.csproj @@ -201,7 +201,7 @@ - + diff --git a/src/OSPSuite.Core/Serialization/PKMLVersion.cs b/src/OSPSuite.Core/Serialization/PKMLVersion.cs index 09199b873..ae0ea11ef 100644 --- a/src/OSPSuite.Core/Serialization/PKMLVersion.cs +++ b/src/OSPSuite.Core/Serialization/PKMLVersion.cs @@ -11,7 +11,7 @@ public static class PKMLVersion public static readonly int V6_1_1 = 9; public static readonly int V6_2_1 = 10; public static readonly int V6_3_1 = 11; - public static readonly int V6_4_2 = 12; - public static readonly int Current = V6_4_2; + public static readonly int V7_1_0 = 12; + public static readonly int Current = V7_1_0; } } \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs index 03e246eb4..6ef895ba2 100644 --- a/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs @@ -87,7 +87,15 @@ public void should_have_created_one_output_value_for_each_output_results() { _simulationExport.OutputValues.Count.ShouldBeEqualTo(2); verifyOutputExport(_simulationExport.OutputValues[0], _col1, _col1.PathAsString, _col1.DataInfo.ComparisonThreshold.Value, _col1.Dimension); +<<<<<<< 162ba7b8bd4deb5e8a0046010219d0cf56817f29 +<<<<<<< 04237971bbe1d7a273f7be40c5cc00d21ac05591 verifyOutputExport(_simulationExport.OutputValues[1], _col2, _col2.PathAsString, 0, _col2.Dimension); +======= + verifyOutputExport(_simulationExport.OutputValues[1], _col2, _col1.PathAsString, 0, _col2.Dimension); +>>>>>>> Fixes #62 use full output path +======= + verifyOutputExport(_simulationExport.OutputValues[1], _col2, _col2.PathAsString, 0, _col2.Dimension); +>>>>>>> Fixes #62 use full output path } private void verifyOutputExport(BatchOutputValues outputValues, DataColumn column, string path, double comparisonThreshold, IDimension dimension) diff --git a/tests/OSPSuite.Core.Tests/Converter/v6_4/Converter63To64Specs.cs b/tests/OSPSuite.Core.Tests/Converter/v7_1/Converter63To710Specs.cs similarity index 86% rename from tests/OSPSuite.Core.Tests/Converter/v6_4/Converter63To64Specs.cs rename to tests/OSPSuite.Core.Tests/Converter/v7_1/Converter63To710Specs.cs index ac4f6d30d..6aeb7234c 100644 --- a/tests/OSPSuite.Core.Tests/Converter/v6_4/Converter63To64Specs.cs +++ b/tests/OSPSuite.Core.Tests/Converter/v7_1/Converter63To710Specs.cs @@ -2,19 +2,19 @@ using System.Xml.Linq; using OSPSuite.BDDHelper; using OSPSuite.BDDHelper.Extensions; -using OSPSuite.Core.Converter.v6_4; +using OSPSuite.Core.Converter.v7_1; -namespace OSPSuite.Converter.v6_4 +namespace OSPSuite.Converter.v7_1 { - public abstract class concern_for_Converter63To64 : ContextSpecification + public abstract class concern_for_Converter63To710 : ContextSpecification { protected override void Context() { - sut = new Converter63To64(); + sut = new Converter63To710(); } } - public class When_converting_a_curve_chart_template_element : concern_for_Converter63To64 + public class When_converting_a_curve_chart_template_element : concern_for_Converter63To710 { private XElement _chartTemplateElement; diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj index f9875ed98..891a34546 100644 --- a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj +++ b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj @@ -165,7 +165,7 @@ - + diff --git a/tests/OSPSuite.Starter/Properties/licenses.licx b/tests/OSPSuite.Starter/Properties/licenses.licx index 97d21b881..8275fa1c4 100644 --- a/tests/OSPSuite.Starter/Properties/licenses.licx +++ b/tests/OSPSuite.Starter/Properties/licenses.licx @@ -1,2 +1,3 @@ -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v16.2, Version=16.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v16.2, Version=16.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a From 13c4f6ca02efd30d58ae85ff223e8566fe7c6660 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 4 May 2017 10:44:34 -0400 Subject: [PATCH 36/50] Fixes broken PR --- ...SimulationResultsToBatchSimulationExportMapperSpecs.cs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs index 6ef895ba2..03e246eb4 100644 --- a/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs +++ b/tests/OSPSuite.Core.Tests/Batch/SimulationResultsToBatchSimulationExportMapperSpecs.cs @@ -87,15 +87,7 @@ public void should_have_created_one_output_value_for_each_output_results() { _simulationExport.OutputValues.Count.ShouldBeEqualTo(2); verifyOutputExport(_simulationExport.OutputValues[0], _col1, _col1.PathAsString, _col1.DataInfo.ComparisonThreshold.Value, _col1.Dimension); -<<<<<<< 162ba7b8bd4deb5e8a0046010219d0cf56817f29 -<<<<<<< 04237971bbe1d7a273f7be40c5cc00d21ac05591 verifyOutputExport(_simulationExport.OutputValues[1], _col2, _col2.PathAsString, 0, _col2.Dimension); -======= - verifyOutputExport(_simulationExport.OutputValues[1], _col2, _col1.PathAsString, 0, _col2.Dimension); ->>>>>>> Fixes #62 use full output path -======= - verifyOutputExport(_simulationExport.OutputValues[1], _col2, _col2.PathAsString, 0, _col2.Dimension); ->>>>>>> Fixes #62 use full output path } private void verifyOutputExport(BatchOutputValues outputValues, DataColumn column, string path, double comparisonThreshold, IDimension dimension) From 0f07ec746c20944204ed22d9674d76af062719e5 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 4 May 2017 16:10:54 -0400 Subject: [PATCH 37/50] Fixes #68 Move constants from installation validator to core (#69) --- src/OSPSuite.Core/Domain/Constants.cs | 14 +++- .../Extensions/ExceptionExtensions.cs | 29 +++++++ .../IApplicationConfiguration.cs | 22 ++++-- src/OSPSuite.Core/OSPSuite.Core.csproj | 1 + .../Configuration/OSPSuiteConfiguration.cs | 1 + .../OSPSuite.Infrastructure.csproj | 1 + .../Services/StartableProcess.cs | 76 +++++++++++++++++++ .../Services/ExceptionManager.cs | 29 ++----- .../Tasks/ApplicationConfiguration.cs | 1 + 9 files changed, 140 insertions(+), 34 deletions(-) create mode 100644 src/OSPSuite.Core/Extensions/ExceptionExtensions.cs create mode 100644 src/OSPSuite.Infrastructure/Services/StartableProcess.cs diff --git a/src/OSPSuite.Core/Domain/Constants.cs b/src/OSPSuite.Core/Domain/Constants.cs index d6179d6c8..deaf7d855 100644 --- a/src/OSPSuite.Core/Domain/Constants.cs +++ b/src/OSPSuite.Core/Domain/Constants.cs @@ -68,6 +68,7 @@ public static class Constants public static readonly string HELP_NAMESPACE = "Open Systems Pharmacology Suite.chm"; public static readonly string LICENSE_AGREEMENT_FILE_NAME = "Open Systems Pharmacology Suite License.pdf"; public static readonly string FORUM_SITE = "forum.open-systems-pharmacology.org"; + public static readonly string SUITE_NAME = "Open Systems Pharmacology Suite"; public const float DEFAULT_WEIGHT = 1; public const double DEFAULT_USE_AS_FACTOR = 1; @@ -207,6 +208,7 @@ public static class Filter public static readonly string XLSX_EXTENSION = ".xlsx"; public static readonly string TEXT_EXTENSION = ".txt"; public static readonly string JSON_EXTENSION = ".json"; + public static readonly string DOCX_EXTENSION = ".docs"; public static readonly string DIAGRAM_IMAGE_FILTER = FileFilter("Diagram Image", PNG_EXTENSION); public static readonly string UNITS_FILE_FILTER = XmlFilter("Units"); @@ -218,7 +220,7 @@ public static class Filter public static readonly string EXCEL_SAVE_FILE_FILTER = string.Format("Excel file (*{0})|*{0}|Excel file (*{1})|*{1}", XLSX_EXTENSION, XLS_EXTENSION); public static readonly string EXCEL_OPEN_FILE_FILTER = string.Format("Excel file (*{0};*{1})|*{0};*{1}", XLS_EXTENSION, XLSX_EXTENSION); public static readonly string JOURNAL_FILE_FILTER = FileFilter("Journal File", JOURNAL_EXTENSION); - public static readonly string WORD_SAVE_FILE_FILTER = FileFilter("Word", ".docx"); + public static readonly string WORD_SAVE_FILE_FILTER = FileFilter("Word", DOCX_EXTENSION); public static readonly string PKML_FILE_FILTER = FileFilter("Shared Modeling", PKML_EXTENSION); public static readonly string HISTORY_FILE_FILTER = FileFilter("History Export", XLS_EXTENSION); public static readonly string TEXT_FILE_FILTER = FileFilter("Text", TEXT_EXTENSION); @@ -227,6 +229,9 @@ public static class Filter public static readonly string CSV_FILE_FILTER = FileFilter("CSV", CSV_EXTENSION); public static readonly string JSON_FILE_FILTER = FileFilter("Json", JSON_EXTENSION); + public static readonly string JSON_FILTER = $"*{JSON_EXTENSION}"; + public static readonly string XML_FILTER = $"*{XML_EXTENSION}"; + public static string XmlFilter(string caption) { return FileFilter(caption, XML_EXTENSION); @@ -234,7 +239,12 @@ public static string XmlFilter(string caption) public static string FileFilter(string caption, string extension) { - return $"{caption} File (*{extension})|*{extension}"; + return $"{caption} File ({filter(extension)})|{filter(extension)}"; + } + + private static string filter(string extension) + { + return $"*{extension}"; } } diff --git a/src/OSPSuite.Core/Extensions/ExceptionExtensions.cs b/src/OSPSuite.Core/Extensions/ExceptionExtensions.cs new file mode 100644 index 000000000..0d66c53d6 --- /dev/null +++ b/src/OSPSuite.Core/Extensions/ExceptionExtensions.cs @@ -0,0 +1,29 @@ +using System; +using System.Reflection; +using OSPSuite.Assets; +using OSPSuite.Core.Domain; +using OSPSuite.Utility.Extensions; + +namespace OSPSuite.Core.Extensions +{ + public static class ExceptionExtensions + { + public static string ExceptionMessage(this Exception ex) + { + if (IsWrapperException(ex)) + return ExceptionMessage(ex.InnerException); + + return $"{ex.FullMessage()}{Environment.NewLine}{Environment.NewLine}{Captions.ContactSupport(Constants.FORUM_SITE)}"; + } + + public static bool IsWrapperException(this Exception ex) + { + return ex.IsAnImplementationOf() || ex.IsAnImplementationOf(); + } + + public static string ExceptionMessageWithStackTrace(this Exception ex) + { + return $"{ExceptionMessage(ex)}{Environment.NewLine}{Environment.NewLine}Stack trace:{Environment.NewLine}{ex.FullStackTrace()}"; + } + } +} \ No newline at end of file diff --git a/src/OSPSuite.Core/IApplicationConfiguration.cs b/src/OSPSuite.Core/IApplicationConfiguration.cs index f1088d8d6..9f744d0cc 100644 --- a/src/OSPSuite.Core/IApplicationConfiguration.cs +++ b/src/OSPSuite.Core/IApplicationConfiguration.cs @@ -5,7 +5,7 @@ namespace OSPSuite.Core { /// - /// Standard interface defining common properties for all application in the suite + /// Standard interface defining common properties for all application in the suite /// public interface IApplicationConfiguration { @@ -23,9 +23,9 @@ public interface IApplicationConfiguration /// Path of the pk analyses file /// string PKParametersFilePath { get; set; } - + /// - /// Path of the license agreement file + /// Path of the license agreement file /// string LicenseAgreementFilePath { get; } @@ -50,30 +50,36 @@ public interface IApplicationConfiguration string BuildVersion { get; } /// - /// Returns the name of the application + /// Returns the name of the application /// string ProductName { get; } /// - /// Returns the product corresponding to the current application + /// Returns the product corresponding to the current application /// Origin Product { get; } /// - /// Returns the name of the application with trademark + /// Returns the name of the application with trademark /// string ProductNameWithTrademark { get; } ApplicationIcon Icon { get; } /// - /// Returns a possible enumeration containg the path of user settings that can be loaded. (Starting from the most recent one down to the first available one) + /// Returns a possible enumeration containg the path of user settings that can be loaded. (Starting from the most recent + /// one down to the first available one) /// IEnumerable UserApplicationSettingsFilePaths { get; } /// - /// Returns the url of the issue tracker + /// Returns the url of the issue tracker /// string IssueTrackerUrl { get; } + + /// + /// Returns the name of the suite with the Version in format X.Y.Z + /// + string OSPSuiteNameWithVersion { get; } } } \ No newline at end of file diff --git a/src/OSPSuite.Core/OSPSuite.Core.csproj b/src/OSPSuite.Core/OSPSuite.Core.csproj index e4c8900f8..4fc3ada99 100644 --- a/src/OSPSuite.Core/OSPSuite.Core.csproj +++ b/src/OSPSuite.Core/OSPSuite.Core.csproj @@ -140,6 +140,7 @@ + diff --git a/src/OSPSuite.Infrastructure/Configuration/OSPSuiteConfiguration.cs b/src/OSPSuite.Infrastructure/Configuration/OSPSuiteConfiguration.cs index 8aed27f90..746b11d8e 100644 --- a/src/OSPSuite.Infrastructure/Configuration/OSPSuiteConfiguration.cs +++ b/src/OSPSuite.Infrastructure/Configuration/OSPSuiteConfiguration.cs @@ -75,5 +75,6 @@ private string userApplicationSettingsFilePath(string revision) protected abstract string ApplicationFolderPathWithRevision(string revision); public virtual string LicenseAgreementFilePath { get; } = Constants.LICENSE_AGREEMENT_FILE_NAME; + public string OSPSuiteNameWithVersion => $"{Constants.SUITE_NAME} - {Version}"; } } \ No newline at end of file diff --git a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj index 892b1ca4d..9aa865ab2 100644 --- a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj +++ b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj @@ -183,6 +183,7 @@ + diff --git a/src/OSPSuite.Infrastructure/Services/StartableProcess.cs b/src/OSPSuite.Infrastructure/Services/StartableProcess.cs new file mode 100644 index 000000000..acb33ae7e --- /dev/null +++ b/src/OSPSuite.Infrastructure/Services/StartableProcess.cs @@ -0,0 +1,76 @@ +using System; +using System.Diagnostics; +using System.Threading; +using Microsoft.Win32.SafeHandles; + +namespace OSPSuite.Infrastructure.Services +{ + public class StartableProcess : IDisposable + { + private readonly Process _process; + private bool _exited; + + public StartableProcess(string filePath, params string[] arguments) + { + _process = new Process + { + StartInfo = new ProcessStartInfo + { + FileName = filePath, + Arguments = string.Join(" ", arguments) + } + }; + } + + /// + /// true if the process exited normally. If the process was stopped, returns false + /// + public bool ExitedNormally => _exited; + + /// + /// the exit code of the process if returns true. + /// throws an if the process has not exited or was aborted abnormally + /// + public int ReturnCode => _process.ExitCode; + + public virtual void Start() + { + _process?.Start(); + } + + public void Dispose() + { + _process.Dispose(); + } + + public virtual void Wait(CancellationToken token) + { + // we are passing ownsHandle = false because the started process owns the handle + // not this process. + using (var processSafeWaitHandle = new SafeWaitHandle(_process.Handle, false)) + using (var processFinishedWaitHandle = new ManualResetEvent(false)) + { + processFinishedWaitHandle.SafeWaitHandle = processSafeWaitHandle; + + var finishingWaitHandle = waitForSignal(token.WaitHandle, processFinishedWaitHandle); + + if (finishingWaitHandle == processFinishedWaitHandle) + { + _exited = true; + return; + } + _process.Kill(); + token.ThrowIfCancellationRequested(); + } + } + + private static WaitHandle waitForSignal(WaitHandle token, WaitHandle processFinishedEvent) + { + var waitHandles = new[] { processFinishedEvent, token }; + + var index = WaitHandle.WaitAny(waitHandles); + + return waitHandles[index]; + } + } +} diff --git a/src/OSPSuite.Presentation/Services/ExceptionManager.cs b/src/OSPSuite.Presentation/Services/ExceptionManager.cs index 01d5b2f25..db58ef81f 100644 --- a/src/OSPSuite.Presentation/Services/ExceptionManager.cs +++ b/src/OSPSuite.Presentation/Services/ExceptionManager.cs @@ -1,13 +1,12 @@ using System; -using System.Reflection; -using OSPSuite.Assets; -using OSPSuite.Utility.Exceptions; -using OSPSuite.Utility.Extensions; using OSPSuite.Core; using OSPSuite.Core.Domain; +using OSPSuite.Core.Extensions; using OSPSuite.Core.Maths.Statistics; using OSPSuite.Core.Services; using OSPSuite.Presentation.Views; +using OSPSuite.Utility.Exceptions; +using OSPSuite.Utility.Extensions; namespace OSPSuite.Presentation.Services { @@ -29,7 +28,7 @@ public override void LogException(Exception ex) { if (isInfoException(ex)) { - var message = ExceptionMessageFrom(ex); + var message = ex.ExceptionMessage(); _dialogCreator.MessageBoxInfo(message); this.LogInfo(message); } @@ -57,7 +56,7 @@ private static bool isInfoException(Exception ex) if (ex == null) return false; - if (isWrapperException(ex)) + if (ex.IsWrapperException()) return isInfoException(ex.InnerException); if (ex.IsAnImplementationOf()) @@ -65,23 +64,5 @@ private static bool isInfoException(Exception ex) return ex.IsAnImplementationOf() || ex.IsAnImplementationOf(); } - - public static string ExceptionMessageFrom(Exception ex) - { - if (isWrapperException(ex)) - return ExceptionMessageFrom(ex.InnerException); - - return $"{ex.FullMessage()}\n{Captions.ContactSupport(Constants.FORUM_SITE)}"; - } - - private static bool isWrapperException(Exception ex) - { - return ex.IsAnImplementationOf() || ex.IsAnImplementationOf(); - } - - public static string ExceptionMessageWithStackTraceFrom(Exception ex) - { - return $"{ExceptionMessageFrom(ex)}\n\nStack trace:\n{ex.FullStackTrace()}"; - } } } \ No newline at end of file diff --git a/tests/OSPSuite.Starter/Tasks/ApplicationConfiguration.cs b/tests/OSPSuite.Starter/Tasks/ApplicationConfiguration.cs index 6705d9345..107e29d0a 100644 --- a/tests/OSPSuite.Starter/Tasks/ApplicationConfiguration.cs +++ b/tests/OSPSuite.Starter/Tasks/ApplicationConfiguration.cs @@ -69,5 +69,6 @@ public ApplicationIcon Icon public string LicenseAgreementFilePath { get; } public string IssueTrackerUrl => "https://github.com/Open-Systems-Pharmacology/PK-Sim/issues"; + public string OSPSuiteNameWithVersion => $"OSPSuite - {Version}"; } } \ No newline at end of file From 57bc7b9495be6e8960b9fe0444ac319bbeb00ddf Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 4 May 2017 16:11:41 -0400 Subject: [PATCH 38/50] Fixes #66 rename simulation error (#67) --- .../OptimizationRunResult.cs | 11 +++--- .../Core/OptimizationRunResultSpecs.cs | 35 +++++++++++++++++++ .../OSPSuite.Core.Tests.csproj | 1 + 3 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 tests/OSPSuite.Core.Tests/Core/OptimizationRunResultSpecs.cs diff --git a/src/OSPSuite.Core/Domain/ParameterIdentifications/OptimizationRunResult.cs b/src/OSPSuite.Core/Domain/ParameterIdentifications/OptimizationRunResult.cs index 2d19b7c39..8e4001358 100644 --- a/src/OSPSuite.Core/Domain/ParameterIdentifications/OptimizationRunResult.cs +++ b/src/OSPSuite.Core/Domain/ParameterIdentifications/OptimizationRunResult.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; -using OSPSuite.Utility.Extensions; using OSPSuite.Core.Domain.Data; +using OSPSuite.Utility.Extensions; namespace OSPSuite.Core.Domain.ParameterIdentifications { @@ -42,7 +42,7 @@ public virtual IReadOnlyList Values public virtual IReadOnlyList SimulationResults { - get { return _simulationResults;} + get { return _simulationResults; } set { _simulationResults.Clear(); @@ -53,12 +53,12 @@ public virtual IReadOnlyList SimulationResults private void updateResultsOrigin() { - _simulationResults.SelectMany(x=>x.AllButBaseGrid()).Each(x=>x.DataInfo.Origin = ColumnOrigins.CalculationAuxiliary); + _simulationResults.SelectMany(x => x.AllButBaseGrid()).Each(x => x.DataInfo.Origin = ColumnOrigins.CalculationAuxiliary); } public virtual double TotalError => ResidualsResult?.TotalError ?? double.PositiveInfinity; - public virtual IReadOnlyCollection AllOutputResiduals => ResidualsResult?.AllOutputResiduals; - public virtual IReadOnlyList AllResiduals => ResidualsResult?.AllResiduals; + public virtual IReadOnlyCollection AllOutputResiduals => ResidualsResult?.AllOutputResiduals ?? new List(); + public virtual IReadOnlyList AllResiduals => ResidualsResult?.AllResiduals ?? new List(); public virtual IReadOnlyList AllResidualValues { @@ -79,6 +79,5 @@ public virtual IEnumerable AllResidualsFor(string fullOutputPath) { return ResidualsResult.AllOutputResidualsFor(fullOutputPath).SelectMany(x => x.Residuals); } - } } \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/Core/OptimizationRunResultSpecs.cs b/tests/OSPSuite.Core.Tests/Core/OptimizationRunResultSpecs.cs new file mode 100644 index 000000000..91b92c6d3 --- /dev/null +++ b/tests/OSPSuite.Core.Tests/Core/OptimizationRunResultSpecs.cs @@ -0,0 +1,35 @@ +using OSPSuite.BDDHelper; +using OSPSuite.BDDHelper.Extensions; +using OSPSuite.Core.Domain.ParameterIdentifications; + +namespace OSPSuite.Core +{ + public abstract class concern_for_OptimizationRunResult : ContextSpecification + { + protected override void Context() + { + sut = new OptimizationRunResult(); + } + } + + public class When_creating_an_optimization_run_results : concern_for_OptimizationRunResult + { + [Observation] + public void should_have_a_default_total_error_of_infinity() + { + double.IsPositiveInfinity(sut.TotalError).ShouldBeTrue(); + } + + [Observation] + public void should_have_an_empty_list_of_residuals() + { + sut.AllResiduals.Count.ShouldBeEqualTo(0); + } + + [Observation] + public void should_have_an_empty_list_of_output_residuals() + { + sut.AllOutputResiduals.Count.ShouldBeEqualTo(0); + } + } +} \ No newline at end of file diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj index 891a34546..367b1874c 100644 --- a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj +++ b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj @@ -173,6 +173,7 @@ + From 9bddd417ac833a8d8755b98082e4fa2fec9e03d1 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Fri, 5 May 2017 11:21:25 -0400 Subject: [PATCH 39/50] Fixes #70 move startable factory to core (#71) --- src/OSPSuite.Core/CoreRegister.cs | 5 +++-- src/OSPSuite.Core/OSPSuite.Core.csproj | 8 +++++--- .../Services/IStartableProcessFactory.cs | 13 +++++++++++++ .../Services/StartableProcess.cs | 2 +- src/OSPSuite.Core/packages.config | 2 +- .../OSPSuite.Infrastructure.csproj | 7 +++---- src/OSPSuite.Infrastructure/packages.config | 2 +- .../OSPSuite.Presentation.csproj | 5 +++-- src/OSPSuite.Presentation/packages.config | 2 +- src/OSPSuite.UI/OSPSuite.UI.csproj | 5 +++-- src/OSPSuite.UI/packages.config | 2 +- .../OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj | 5 +++-- tests/OSPSuite.Core.Tests/packages.config | 2 +- 13 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 src/OSPSuite.Core/Services/IStartableProcessFactory.cs rename src/{OSPSuite.Infrastructure => OSPSuite.Core}/Services/StartableProcess.cs (98%) diff --git a/src/OSPSuite.Core/CoreRegister.cs b/src/OSPSuite.Core/CoreRegister.cs index a306a859b..895535a94 100644 --- a/src/OSPSuite.Core/CoreRegister.cs +++ b/src/OSPSuite.Core/CoreRegister.cs @@ -12,6 +12,7 @@ using OSPSuite.Core.Domain.UnitSystem; using OSPSuite.Core.Serialization; using OSPSuite.Core.Serialization.Xml; +using OSPSuite.Core.Services; using OSPSuite.Utility.Container; using IContainer = OSPSuite.Utility.Container.IContainer; @@ -54,10 +55,9 @@ public override void RegisterInContainer(IContainer container) scan.ExcludeType(); scan.ExcludeType(); - //PKSim registers its own implementation + //PK-Sim registers its own implementation scan.ExcludeType(); - if (!RegisterParameter) { scan.ExcludeType(); @@ -89,6 +89,7 @@ public override void RegisterInContainer(IContainer container) container.RegisterFactory(); container.RegisterFactory(); container.RegisterFactory(); + container.RegisterFactory(); //Register Optimization algorithm explicitely container.Register(Constants.OptimizationAlgorithm.NELDER_MEAD_PKSIM); diff --git a/src/OSPSuite.Core/OSPSuite.Core.csproj b/src/OSPSuite.Core/OSPSuite.Core.csproj index 4fc3ada99..f29274498 100644 --- a/src/OSPSuite.Core/OSPSuite.Core.csproj +++ b/src/OSPSuite.Core/OSPSuite.Core.csproj @@ -77,9 +77,9 @@ ..\..\packages\OSPSuite.SimModel.2.0.0.12\lib\net45\OSPSuite.SimModel.dll True - - False - ..\..\packages\OSPSuite.TeXReporting.2.0.0.1\lib\net45\OSPSuite.TeXReporting.dll + + ..\..\packages\OSPSuite.TeXReporting.2.0.0.4\lib\net45\OSPSuite.TeXReporting.dll + True ..\..\packages\OSPSuite.Utility.2.0.0.5\lib\net45\OSPSuite.Utility.dll @@ -507,6 +507,7 @@ + @@ -1029,6 +1030,7 @@ + diff --git a/src/OSPSuite.Core/Services/IStartableProcessFactory.cs b/src/OSPSuite.Core/Services/IStartableProcessFactory.cs new file mode 100644 index 000000000..d241d4216 --- /dev/null +++ b/src/OSPSuite.Core/Services/IStartableProcessFactory.cs @@ -0,0 +1,13 @@ +namespace OSPSuite.Core.Services +{ + public interface IStartableProcessFactory + { + /// + /// Starts the application located at with the given + /// + /// Full path of application to start + /// Command line arguments + /// A monitoring the application located at + StartableProcess CreateStartableProcess(string applicationPath, params string[] arguments); + } +} \ No newline at end of file diff --git a/src/OSPSuite.Infrastructure/Services/StartableProcess.cs b/src/OSPSuite.Core/Services/StartableProcess.cs similarity index 98% rename from src/OSPSuite.Infrastructure/Services/StartableProcess.cs rename to src/OSPSuite.Core/Services/StartableProcess.cs index acb33ae7e..c98a322bb 100644 --- a/src/OSPSuite.Infrastructure/Services/StartableProcess.cs +++ b/src/OSPSuite.Core/Services/StartableProcess.cs @@ -3,7 +3,7 @@ using System.Threading; using Microsoft.Win32.SafeHandles; -namespace OSPSuite.Infrastructure.Services +namespace OSPSuite.Core.Services { public class StartableProcess : IDisposable { diff --git a/src/OSPSuite.Core/packages.config b/src/OSPSuite.Core/packages.config index f39587b7d..a2c63928f 100644 --- a/src/OSPSuite.Core/packages.config +++ b/src/OSPSuite.Core/packages.config @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj index 9aa865ab2..f65761aa7 100644 --- a/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj +++ b/src/OSPSuite.Infrastructure/OSPSuite.Infrastructure.csproj @@ -72,9 +72,9 @@ ..\..\packages\NHibernate.4.1.1.4000\lib\net40\NHibernate.dll True - - False - ..\..\packages\OSPSuite.TeXReporting.2.0.0.1\lib\net45\OSPSuite.TeXReporting.dll + + ..\..\packages\OSPSuite.TeXReporting.2.0.0.4\lib\net45\OSPSuite.TeXReporting.dll + True ..\..\packages\OSPSuite.Utility.2.0.0.5\lib\net45\OSPSuite.Utility.dll @@ -183,7 +183,6 @@ - diff --git a/src/OSPSuite.Infrastructure/packages.config b/src/OSPSuite.Infrastructure/packages.config index 85997052a..f42f9c212 100644 --- a/src/OSPSuite.Infrastructure/packages.config +++ b/src/OSPSuite.Infrastructure/packages.config @@ -9,7 +9,7 @@ - + diff --git a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj index 4197486c4..9849d6936 100644 --- a/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj +++ b/src/OSPSuite.Presentation/OSPSuite.Presentation.csproj @@ -45,8 +45,9 @@ ..\..\packages\OSPSuite.Serializer.2.0.0.1\lib\net45\OSPSuite.Serializer.dll - - ..\..\packages\OSPSuite.TeXReporting.2.0.0.1\lib\net45\OSPSuite.TeXReporting.dll + + ..\..\packages\OSPSuite.TeXReporting.2.0.0.4\lib\net45\OSPSuite.TeXReporting.dll + True ..\..\packages\OSPSuite.Utility.2.0.0.5\lib\net45\OSPSuite.Utility.dll diff --git a/src/OSPSuite.Presentation/packages.config b/src/OSPSuite.Presentation/packages.config index 53b268691..786e54542 100644 --- a/src/OSPSuite.Presentation/packages.config +++ b/src/OSPSuite.Presentation/packages.config @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/src/OSPSuite.UI/OSPSuite.UI.csproj b/src/OSPSuite.UI/OSPSuite.UI.csproj index 1dc14cfea..413be7252 100644 --- a/src/OSPSuite.UI/OSPSuite.UI.csproj +++ b/src/OSPSuite.UI/OSPSuite.UI.csproj @@ -164,8 +164,9 @@ ..\..\packages\OSPSuite.DataBinding.DevExpress.2.0.0.3\lib\net45\OSPSuite.DataBinding.DevExpress.dll True - - ..\..\packages\OSPSuite.TeXReporting.2.0.0.1\lib\net45\OSPSuite.TeXReporting.dll + + ..\..\packages\OSPSuite.TeXReporting.2.0.0.4\lib\net45\OSPSuite.TeXReporting.dll + True ..\..\packages\OSPSuite.Utility.2.0.0.5\lib\net45\OSPSuite.Utility.dll diff --git a/src/OSPSuite.UI/packages.config b/src/OSPSuite.UI/packages.config index e1c16c409..2cfc7b883 100644 --- a/src/OSPSuite.UI/packages.config +++ b/src/OSPSuite.UI/packages.config @@ -5,7 +5,7 @@ - + diff --git a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj index 367b1874c..3c3db86cc 100644 --- a/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj +++ b/tests/OSPSuite.Core.Tests/OSPSuite.Core.Tests.csproj @@ -108,8 +108,9 @@ ..\..\packages\OSPSuite.SimModel.2.0.0.12\lib\net45\OSPSuite.SimModel.dll True - - ..\..\packages\OSPSuite.TeXReporting.2.0.0.1\lib\net45\OSPSuite.TeXReporting.dll + + ..\..\packages\OSPSuite.TeXReporting.2.0.0.4\lib\net45\OSPSuite.TeXReporting.dll + True ..\..\packages\OSPSuite.Utility.2.0.0.5\lib\net45\OSPSuite.Utility.dll diff --git a/tests/OSPSuite.Core.Tests/packages.config b/tests/OSPSuite.Core.Tests/packages.config index ef8782499..b3c589105 100644 --- a/tests/OSPSuite.Core.Tests/packages.config +++ b/tests/OSPSuite.Core.Tests/packages.config @@ -16,6 +16,6 @@ - + \ No newline at end of file From 196ed85769315db9c701c55def0d6f2dc112e2cd Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Fri, 5 May 2017 11:35:11 -0400 Subject: [PATCH 40/50] Update parameter name --- src/OSPSuite.Core/Services/StartableProcess.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OSPSuite.Core/Services/StartableProcess.cs b/src/OSPSuite.Core/Services/StartableProcess.cs index c98a322bb..53dab2cc8 100644 --- a/src/OSPSuite.Core/Services/StartableProcess.cs +++ b/src/OSPSuite.Core/Services/StartableProcess.cs @@ -10,13 +10,13 @@ public class StartableProcess : IDisposable private readonly Process _process; private bool _exited; - public StartableProcess(string filePath, params string[] arguments) + public StartableProcess(string applicationPath, params string[] arguments) { _process = new Process { StartInfo = new ProcessStartInfo { - FileName = filePath, + FileName = applicationPath, Arguments = string.Join(" ", arguments) } }; From f0fd0603ce501810c1d4a6de1041803eef66dc9d Mon Sep 17 00:00:00 2001 From: Robert McIntosh Date: Mon, 8 May 2017 15:11:20 -0400 Subject: [PATCH 41/50] WIP Open-Systems-Pharmacology/InstallationValidator#88 (#73) * moved message to core and modified exceptionview * refactor html styling and message into captions * rename variable * add custom control for html label * add custom control for html label * add custom control for html label * PR rework * PR rework --- src/OSPSuite.Assets/UIConstants.cs | 34 +++++--- src/OSPSuite.UI/Controls/UxHtmlLabel.cs | 84 +++++++++++++++++++ src/OSPSuite.UI/OSPSuite.UI.csproj | 3 + src/OSPSuite.UI/Properties/licenses.licx | 13 +-- src/OSPSuite.UI/UIConstants.cs | 4 + .../Views/ExceptionView.Designer.cs | 83 +++++++++--------- src/OSPSuite.UI/Views/ExceptionView.cs | 13 +-- .../Presenters/ImporterTestPresenter.cs | 3 +- 8 files changed, 173 insertions(+), 64 deletions(-) create mode 100644 src/OSPSuite.UI/Controls/UxHtmlLabel.cs diff --git a/src/OSPSuite.Assets/UIConstants.cs b/src/OSPSuite.Assets/UIConstants.cs index e0950cce2..74f79acc6 100644 --- a/src/OSPSuite.Assets/UIConstants.cs +++ b/src/OSPSuite.Assets/UIConstants.cs @@ -241,19 +241,31 @@ public static string DoYouWantToDeleteDirectory(string newDirectoryName) return $"Do you want to delete the directory '{newDirectoryName}' and continue?"; } + public static void AppendListItem(string listItem, StringBuilder sb) + { + sb.Append($"
  • {listItem}
    • "); + } + + public static void AppendLine(string lineToAppend, StringBuilder sb) + { + sb.Append($"

    {lineToAppend}

    "); + } + public static string ExceptionViewDescription(string issueTrackerUrl) { var sb = new StringBuilder(); - sb.AppendLine("oops...something went terribly wrong."); - sb.AppendLine(); - sb.AppendLine("To best address the error, please enter an issue in our issue tracker:"); - sb.AppendLine($" 1 - Visit {issueTrackerUrl} or click on the link below"); - sb.AppendLine(" 2 - Click on the New Issue button"); - sb.AppendLine(" 3 - Describe the steps you took prior to the problem emerging"); - sb.AppendLine($" 4 - Copy the information below by using the {CopyToClipboard} button and paste it in the issue description"); - sb.AppendLine(" 5 - if possible, attach your project file to the issue (do not attach confidential information)"); - sb.AppendLine(); - sb.AppendLine("Note: A GitHub account is required to create an issue"); + AppendLine("oops...something went terribly wrong.", sb); + AppendLine(string.Empty, sb); + AppendLine("To best address the error, please enter an issue in our issue tracker:", sb); + sb.Append("
      "); + AppendListItem($"Visit {issueTrackerUrl} or click on the link below", sb); + AppendListItem("Click on the New Issue button", sb); + AppendListItem("Describe the steps you took prior to the problem emerging", sb); + AppendListItem($"Copy the information below by using the {CopyToClipboard} button and paste it in the issue description", sb); + AppendListItem("if possible, attach your project file to the issue (do not attach confidential information)", sb); + sb.Append("
    "); + AppendLine(string.Empty, sb); + AppendLine("Note: A GitHub account is required to create an issue", sb); return sb.ToString(); } @@ -294,7 +306,7 @@ public static class Importer public static readonly string TheUnitInformationMustBeEnteredOrConfirmed = "The unit information must be entered or confirmed."; public static readonly string TheMetaDataInformationMustBeEnteredOrConfirmed = "The meta data must be entered or confirmed."; - + public class ToolTips { public static readonly string NamingPattern = "Set a pattern for renaming imported data"; diff --git a/src/OSPSuite.UI/Controls/UxHtmlLabel.cs b/src/OSPSuite.UI/Controls/UxHtmlLabel.cs new file mode 100644 index 000000000..a0e447f02 --- /dev/null +++ b/src/OSPSuite.UI/Controls/UxHtmlLabel.cs @@ -0,0 +1,84 @@ +using System; +using System.Drawing; +using DevExpress.Utils.Controls; +using DevExpress.XtraEditors.Controls; +using DevExpress.XtraRichEdit; + +namespace OSPSuite.UI.Controls +{ + public class UxHtmlLabel : UxRichEditControl, IXtraResizableControl + { + private static readonly object _layoutInfoChanged = new object(); + private static string _fontFamily; + private static double _fontSize; + + public UxHtmlLabel(string fontFamily, double fontSize) + { + _fontSize = fontSize; + _fontFamily = fontFamily; + + AutoSizeMode = AutoSizeMode.Vertical; + Options.VerticalScrollbar.Visibility = RichEditScrollbarVisibility.Hidden; + ActiveView.BackColor = BackColor; + BorderStyle = BorderStyles.NoBorder; + PopupMenuShowing += (o, e) => e.Menu.Items.Clear(); + Enabled = false; + Views.SimpleView.Padding = new System.Windows.Forms.Padding(0); + ActiveViewType = RichEditViewType.Simple; + } + + public UxHtmlLabel() : this(UIConstants.DEFAULT_HTML_FONT, UIConstants.DEFAULT_HTML_FONT_SIZE) + { + + } + + event EventHandler IXtraResizableControl.Changed + { + add + { + Events.AddHandler(_layoutInfoChanged, value); + } + remove + { + Events.RemoveHandler(_layoutInfoChanged, value); + } + } + protected void RaiseChanged() + { + var changed = (EventHandler)Events[_layoutInfoChanged]; + changed?.Invoke(this, EventArgs.Empty); + } + + bool IXtraResizableControl.IsCaptionVisible => false; + + Size IXtraResizableControl.MaxSize => Size; + + Size IXtraResizableControl.MinSize => Size; + + protected override void OnSizeChanged(EventArgs e) + { + base.OnSizeChanged(e); + RaiseChanged(); + } + + public void Caption(string caption, string fontFamily = "", double? fontSize = 8.25) + { + Document.HtmlText = stylizeHtmlText(fontFamily, fontSize) + $"
    {caption}
    "; + } + + private static string stylizeHtmlText(string fontFamily, double? fontSize) + { + return $@" + "; + } + } +} \ No newline at end of file diff --git a/src/OSPSuite.UI/OSPSuite.UI.csproj b/src/OSPSuite.UI/OSPSuite.UI.csproj index 413be7252..20d1ad100 100644 --- a/src/OSPSuite.UI/OSPSuite.UI.csproj +++ b/src/OSPSuite.UI/OSPSuite.UI.csproj @@ -276,6 +276,9 @@ Component + + Component + Component diff --git a/src/OSPSuite.UI/Properties/licenses.licx b/src/OSPSuite.UI/Properties/licenses.licx index a7a4592fb..f01a95d1b 100644 --- a/src/OSPSuite.UI/Properties/licenses.licx +++ b/src/OSPSuite.UI/Properties/licenses.licx @@ -1,6 +1,7 @@ -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v16.2, Version=16.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v16.2, Version=16.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v16.2, Version=16.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v16.2, Version=16.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v16.2, Version=16.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v16.2, Version=16.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit, DevExpress.XtraEditors.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/src/OSPSuite.UI/UIConstants.cs b/src/OSPSuite.UI/UIConstants.cs index a142a4911..c6e0e82e8 100644 --- a/src/OSPSuite.UI/UIConstants.cs +++ b/src/OSPSuite.UI/UIConstants.cs @@ -11,6 +11,8 @@ public static class UIConstants public const int TOOL_TIP_INITIAL_DELAY_LONG = 1500; public const string EMPTY_COLUMN = " "; + public const double DEFAULT_HTML_FONT_SIZE = 8.25; + /// /// Size used for icons displayed in tab /// @@ -26,6 +28,8 @@ public static class UIConstants ///     public static IconSize ICON_SIZE_TREE_VIEW = IconSizes.Size24x24; + public const string DEFAULT_HTML_FONT = "Tahoma"; + public static class Size { private static readonly double _scaleFactor = createScaleFactor(); diff --git a/src/OSPSuite.UI/Views/ExceptionView.Designer.cs b/src/OSPSuite.UI/Views/ExceptionView.Designer.cs index 09db07ab2..1ae747f91 100644 --- a/src/OSPSuite.UI/Views/ExceptionView.Designer.cs +++ b/src/OSPSuite.UI/Views/ExceptionView.Designer.cs @@ -1,4 +1,6 @@ -namespace OSPSuite.UI.Views +using OSPSuite.UI.Controls; + +namespace OSPSuite.UI.Views { partial class ExceptionView { @@ -34,7 +36,6 @@ private void InitializeComponent() this.tbException = new DevExpress.XtraEditors.MemoEdit(); this.tbFullException = new DevExpress.XtraEditors.MemoEdit(); this.btnClose = new DevExpress.XtraEditors.SimpleButton(); - this.lblDescription = new DevExpress.XtraEditors.LabelControl(); this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutItemOk = new DevExpress.XtraLayout.LayoutControlItem(); this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem(); @@ -43,9 +44,10 @@ private void InitializeComponent() this.layoutGroupException = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutItemException = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutItemCopyToClipbord = new DevExpress.XtraLayout.LayoutControlItem(); - this.layoutItemDescription = new DevExpress.XtraLayout.LayoutControlItem(); this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem(); this.layoutItemIssueTracker = new DevExpress.XtraLayout.LayoutControlItem(); + this.htmlLabel = new UxHtmlLabel(); + this.layoutItemDescription = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.layoutControl)).BeginInit(); this.layoutControl.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.issueTrackerLink.Properties)).BeginInit(); @@ -59,19 +61,19 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.layoutGroupException)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemException)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemCopyToClipbord)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutItemDescription)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemIssueTracker)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutItemDescription)).BeginInit(); this.SuspendLayout(); // // layoutControl // + this.layoutControl.Controls.Add(this.htmlLabel); this.layoutControl.Controls.Add(this.issueTrackerLink); this.layoutControl.Controls.Add(this.btnCopyToClipboard); this.layoutControl.Controls.Add(this.tbException); this.layoutControl.Controls.Add(this.tbFullException); this.layoutControl.Controls.Add(this.btnClose); - this.layoutControl.Controls.Add(this.lblDescription); this.layoutControl.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutControl.Location = new System.Drawing.Point(0, 0); this.layoutControl.Name = "layoutControl"; @@ -84,7 +86,7 @@ private void InitializeComponent() // issueTrackerLink // this.issueTrackerLink.EditValue = "issueTrackerLink"; - this.issueTrackerLink.Location = new System.Drawing.Point(12, 29); + this.issueTrackerLink.Location = new System.Drawing.Point(12, 36); this.issueTrackerLink.Name = "issueTrackerLink"; this.issueTrackerLink.Properties.Appearance.BackColor = System.Drawing.Color.Transparent; this.issueTrackerLink.Properties.Appearance.Options.UseBackColor = true; @@ -95,7 +97,7 @@ private void InitializeComponent() // // btnCopyToClipboard // - this.btnCopyToClipboard.Location = new System.Drawing.Point(382, 29); + this.btnCopyToClipboard.Location = new System.Drawing.Point(382, 36); this.btnCopyToClipboard.Name = "btnCopyToClipboard"; this.btnCopyToClipboard.Size = new System.Drawing.Size(269, 22); this.btnCopyToClipboard.StyleController = this.layoutControl; @@ -104,9 +106,9 @@ private void InitializeComponent() // // tbException // - this.tbException.Location = new System.Drawing.Point(142, 87); + this.tbException.Location = new System.Drawing.Point(142, 92); this.tbException.Name = "tbException"; - this.tbException.Size = new System.Drawing.Size(497, 163); + this.tbException.Size = new System.Drawing.Size(497, 162); this.tbException.StyleController = this.layoutControl; this.tbException.TabIndex = 6; // @@ -128,15 +130,6 @@ private void InitializeComponent() this.btnClose.TabIndex = 4; this.btnClose.Text = "OK"; // - // lblDescription - // - this.lblDescription.Location = new System.Drawing.Point(12, 12); - this.lblDescription.Name = "lblDescription"; - this.lblDescription.Size = new System.Drawing.Size(63, 13); - this.lblDescription.StyleController = this.layoutControl; - this.lblDescription.TabIndex = 7; - this.lblDescription.Text = "lblDescription"; - // // layoutControlGroup1 // this.layoutControlGroup1.CustomizationFormText = "layoutControlGroup1"; @@ -148,9 +141,9 @@ private void InitializeComponent() this.layoutGroupStackTraceException, this.layoutGroupException, this.layoutItemCopyToClipbord, - this.layoutItemDescription, this.emptySpaceItem2, - this.layoutItemIssueTracker}); + this.layoutItemIssueTracker, + this.layoutItemDescription}); this.layoutControlGroup1.Location = new System.Drawing.Point(0, 0); this.layoutControlGroup1.Name = "layoutControlGroup1"; this.layoutControlGroup1.Size = new System.Drawing.Size(663, 522); @@ -181,9 +174,9 @@ private void InitializeComponent() this.layoutGroupStackTraceException.ExpandButtonVisible = true; this.layoutGroupStackTraceException.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutItemFullException}); - this.layoutGroupStackTraceException.Location = new System.Drawing.Point(0, 254); + this.layoutGroupStackTraceException.Location = new System.Drawing.Point(0, 258); this.layoutGroupStackTraceException.Name = "layoutGroupFullException"; - this.layoutGroupStackTraceException.Size = new System.Drawing.Size(643, 222); + this.layoutGroupStackTraceException.Size = new System.Drawing.Size(643, 218); // // layoutItemFullException // @@ -199,9 +192,9 @@ private void InitializeComponent() this.layoutGroupException.CustomizationFormText = "layoutControlGroup2"; this.layoutGroupException.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutItemException}); - this.layoutGroupException.Location = new System.Drawing.Point(0, 43); + this.layoutGroupException.Location = new System.Drawing.Point(0, 50); this.layoutGroupException.Name = "layoutGroupException"; - this.layoutGroupException.Size = new System.Drawing.Size(643, 211); + this.layoutGroupException.Size = new System.Drawing.Size(643, 208); // // layoutItemException // @@ -209,34 +202,24 @@ private void InitializeComponent() this.layoutItemException.CustomizationFormText = "layoutItemException"; this.layoutItemException.Location = new System.Drawing.Point(0, 0); this.layoutItemException.Name = "layoutItemException"; - this.layoutItemException.Size = new System.Drawing.Size(619, 167); + this.layoutItemException.Size = new System.Drawing.Size(619, 166); this.layoutItemException.TextSize = new System.Drawing.Size(115, 13); // // layoutItemCopyToClipbord // this.layoutItemCopyToClipbord.Control = this.btnCopyToClipboard; this.layoutItemCopyToClipbord.CustomizationFormText = "layoutItemCopyToClipbord"; - this.layoutItemCopyToClipbord.Location = new System.Drawing.Point(370, 17); + this.layoutItemCopyToClipbord.Location = new System.Drawing.Point(370, 24); this.layoutItemCopyToClipbord.Name = "layoutItemCopyToClipbord"; this.layoutItemCopyToClipbord.Size = new System.Drawing.Size(273, 26); this.layoutItemCopyToClipbord.TextSize = new System.Drawing.Size(0, 0); this.layoutItemCopyToClipbord.TextVisible = false; // - // layoutItemDescription - // - this.layoutItemDescription.Control = this.lblDescription; - this.layoutItemDescription.CustomizationFormText = "layoutItemDescription"; - this.layoutItemDescription.Location = new System.Drawing.Point(0, 0); - this.layoutItemDescription.Name = "layoutItemDescription"; - this.layoutItemDescription.Size = new System.Drawing.Size(643, 17); - this.layoutItemDescription.TextSize = new System.Drawing.Size(0, 0); - this.layoutItemDescription.TextVisible = false; - // // emptySpaceItem2 // this.emptySpaceItem2.AllowHotTrack = false; this.emptySpaceItem2.CustomizationFormText = "emptySpaceItem2"; - this.emptySpaceItem2.Location = new System.Drawing.Point(276, 17); + this.emptySpaceItem2.Location = new System.Drawing.Point(276, 24); this.emptySpaceItem2.Name = "emptySpaceItem2"; this.emptySpaceItem2.Size = new System.Drawing.Size(94, 26); this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0); @@ -244,12 +227,30 @@ private void InitializeComponent() // layoutItemIssueTracker // this.layoutItemIssueTracker.Control = this.issueTrackerLink; - this.layoutItemIssueTracker.Location = new System.Drawing.Point(0, 17); + this.layoutItemIssueTracker.Location = new System.Drawing.Point(0, 24); this.layoutItemIssueTracker.Name = "layoutItemIssueTracker"; this.layoutItemIssueTracker.Size = new System.Drawing.Size(276, 26); this.layoutItemIssueTracker.TextSize = new System.Drawing.Size(0, 0); this.layoutItemIssueTracker.TextVisible = false; // + // richEditControl + // + this.htmlLabel.Location = new System.Drawing.Point(12, 12); + this.htmlLabel.Name = "htmlLabel"; + this.htmlLabel.Options.Export.Rtf.ExportTheme = true; + this.htmlLabel.Size = new System.Drawing.Size(639, 20); + this.htmlLabel.TabIndex = 10; + this.htmlLabel.Text = "richEditControl1"; + // + // layoutItemDescription + // + this.layoutItemDescription.Control = this.htmlLabel; + this.layoutItemDescription.Location = new System.Drawing.Point(0, 0); + this.layoutItemDescription.Name = "layoutItemDescription"; + this.layoutItemDescription.Size = new System.Drawing.Size(643, 24); + this.layoutItemDescription.TextSize = new System.Drawing.Size(0, 0); + this.layoutItemDescription.TextVisible = false; + // // ExceptionView // this.AcceptButton = this.btnClose; @@ -275,9 +276,9 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.layoutGroupException)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemException)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemCopyToClipbord)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.layoutItemDescription)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutItemIssueTracker)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.layoutItemDescription)).EndInit(); this.ResumeLayout(false); } @@ -295,12 +296,12 @@ private void InitializeComponent() private DevExpress.XtraLayout.LayoutControlItem layoutItemFullException; private DevExpress.XtraLayout.LayoutControlGroup layoutGroupException; private DevExpress.XtraLayout.LayoutControlItem layoutItemException; - private DevExpress.XtraEditors.LabelControl lblDescription; - private DevExpress.XtraLayout.LayoutControlItem layoutItemDescription; private DevExpress.XtraEditors.SimpleButton btnCopyToClipboard; private DevExpress.XtraLayout.LayoutControlItem layoutItemCopyToClipbord; private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2; private DevExpress.XtraEditors.HyperLinkEdit issueTrackerLink; private DevExpress.XtraLayout.LayoutControlItem layoutItemIssueTracker; + private UxHtmlLabel htmlLabel; + private DevExpress.XtraLayout.LayoutControlItem layoutItemDescription; } } \ No newline at end of file diff --git a/src/OSPSuite.UI/Views/ExceptionView.cs b/src/OSPSuite.UI/Views/ExceptionView.cs index 048ceda61..d09ceb89d 100644 --- a/src/OSPSuite.UI/Views/ExceptionView.cs +++ b/src/OSPSuite.UI/Views/ExceptionView.cs @@ -1,9 +1,11 @@ using System; +using System.Drawing; using System.Threading; using System.Windows.Forms; using DevExpress.XtraEditors; using DevExpress.XtraEditors.Controls; using DevExpress.XtraLayout.Utils; +using DevExpress.XtraRichEdit; using OSPSuite.Assets; using OSPSuite.Presentation.Views; using OSPSuite.UI.Extensions; @@ -32,8 +34,7 @@ private void initializeResources() layoutItemFullException.TextVisible = false; tbException.Properties.ReadOnly = true; tbFullException.Properties.ReadOnly = true; - lblDescription.AutoSizeMode = LabelAutoSizeMode.Vertical; - lblDescription.AllowHtmlString = true; + MinimizeBox = false; MaximizeBox = false; btnCopyToClipboard.Text = Captions.CopyToClipboard; @@ -44,6 +45,8 @@ private void initializeResources() layoutGroupStackTraceException.Text = Captions.StackTrace; issueTrackerLink.OpenLink += (o, e) => goToIssueTracker(e); ActiveControl = btnClose; + layoutItemDescription.TextVisible = false; + htmlLabel.ActiveView.BackColor = BackColor; } private void goToIssueTracker(OpenLinkEventArgs e) @@ -56,7 +59,7 @@ public string Description set { layoutItemDescription.Visibility = LayoutVisibilityConvertor.FromBoolean(!string.IsNullOrEmpty(value)); - lblDescription.Text = value; + htmlLabel.Caption(value); } } @@ -101,7 +104,7 @@ private void copyToClipboardOnUIThread() Clipboard.SetText(_cliboardContent); } - + private void showException(string message) { XtraMessageBox.Show(this, message, Text, MessageBoxButtons.OK, MessageBoxIcon.Error); @@ -134,7 +137,7 @@ private void showDialogWithOwner() { try { - ShowDialog((Form) MainView); + ShowDialog((Form)MainView); } catch (Exception) { diff --git a/tests/OSPSuite.Starter/Presenters/ImporterTestPresenter.cs b/tests/OSPSuite.Starter/Presenters/ImporterTestPresenter.cs index ca2045e79..93b042c6e 100644 --- a/tests/OSPSuite.Starter/Presenters/ImporterTestPresenter.cs +++ b/tests/OSPSuite.Starter/Presenters/ImporterTestPresenter.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using DevExpress.XtraEditors; using OSPSuite.Core.Domain; From 3e9f7e47f4f5e1bb6435136d068bb65a4e0df08c Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Wed, 10 May 2017 15:28:37 -0400 Subject: [PATCH 42/50] Fixes #74 Update to UxHtmlLabel to make it usable in other components (#75) --- src/OSPSuite.UI/Controls/UxHtmlLabel.cs | 46 +++++++++---------------- 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/src/OSPSuite.UI/Controls/UxHtmlLabel.cs b/src/OSPSuite.UI/Controls/UxHtmlLabel.cs index a0e447f02..58f37bbf2 100644 --- a/src/OSPSuite.UI/Controls/UxHtmlLabel.cs +++ b/src/OSPSuite.UI/Controls/UxHtmlLabel.cs @@ -1,51 +1,40 @@ using System; using System.Drawing; +using System.Windows.Forms; using DevExpress.Utils.Controls; using DevExpress.XtraEditors.Controls; using DevExpress.XtraRichEdit; +using AutoSizeMode = DevExpress.XtraRichEdit.AutoSizeMode; namespace OSPSuite.UI.Controls { public class UxHtmlLabel : UxRichEditControl, IXtraResizableControl { - private static readonly object _layoutInfoChanged = new object(); - private static string _fontFamily; - private static double _fontSize; + private readonly object _layoutInfoChanged = new object(); + public string FontFamily { get; set; } = UIConstants.DEFAULT_HTML_FONT; + public double FontSize { get; set; } = UIConstants.DEFAULT_HTML_FONT_SIZE; - public UxHtmlLabel(string fontFamily, double fontSize) + public UxHtmlLabel() { - _fontSize = fontSize; - _fontFamily = fontFamily; - AutoSizeMode = AutoSizeMode.Vertical; Options.VerticalScrollbar.Visibility = RichEditScrollbarVisibility.Hidden; ActiveView.BackColor = BackColor; BorderStyle = BorderStyles.NoBorder; PopupMenuShowing += (o, e) => e.Menu.Items.Clear(); Enabled = false; - Views.SimpleView.Padding = new System.Windows.Forms.Padding(0); + Views.SimpleView.Padding = new Padding(0); ActiveViewType = RichEditViewType.Simple; } - public UxHtmlLabel() : this(UIConstants.DEFAULT_HTML_FONT, UIConstants.DEFAULT_HTML_FONT_SIZE) - { - - } - event EventHandler IXtraResizableControl.Changed { - add - { - Events.AddHandler(_layoutInfoChanged, value); - } - remove - { - Events.RemoveHandler(_layoutInfoChanged, value); - } + add { Events.AddHandler(_layoutInfoChanged, value); } + remove { Events.RemoveHandler(_layoutInfoChanged, value); } } + protected void RaiseChanged() { - var changed = (EventHandler)Events[_layoutInfoChanged]; + var changed = (EventHandler) Events[_layoutInfoChanged]; changed?.Invoke(this, EventArgs.Empty); } @@ -61,24 +50,21 @@ protected override void OnSizeChanged(EventArgs e) RaiseChanged(); } - public void Caption(string caption, string fontFamily = "", double? fontSize = 8.25) + public void Caption(string caption) { - Document.HtmlText = stylizeHtmlText(fontFamily, fontSize) + $"
    {caption}
    "; + Document.HtmlText = $"{stylizeHtmlText}
    {caption}
    "; } - private static string stylizeHtmlText(string fontFamily, double? fontSize) - { - return $@" + private string stylizeHtmlText => $@" "; - } } } \ No newline at end of file From f84c1d21c6ad49527fedb2792251be6ad5ae32dc Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 11 May 2017 12:54:55 -0400 Subject: [PATCH 43/50] Defined caption as property set (#76) --- src/OSPSuite.Presentation/Services/ExceptionManager.cs | 2 +- src/OSPSuite.Presentation/Views/IExceptionView.cs | 2 +- src/OSPSuite.UI/Controls/UxHtmlLabel.cs | 4 ++-- src/OSPSuite.UI/Views/ExceptionView.cs | 9 ++------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/OSPSuite.Presentation/Services/ExceptionManager.cs b/src/OSPSuite.Presentation/Services/ExceptionManager.cs index db58ef81f..53cff9d5d 100644 --- a/src/OSPSuite.Presentation/Services/ExceptionManager.cs +++ b/src/OSPSuite.Presentation/Services/ExceptionManager.cs @@ -21,7 +21,7 @@ public ExceptionManager(IDialogCreator dialogCreator, IExceptionView exceptionVi _dialogCreator = dialogCreator; _exceptionView = exceptionView; _productInfo = $"{configuration.ProductNameWithTrademark} {configuration.FullVersion}"; - _exceptionView.Initialize($"{_productInfo} - Error", configuration.Icon, _productInfo, configuration.IssueTrackerUrl, configuration.ProductName); + _exceptionView.Initialize($"{_productInfo} - Error", configuration.Icon, configuration.IssueTrackerUrl, configuration.ProductName); } public override void LogException(Exception ex) diff --git a/src/OSPSuite.Presentation/Views/IExceptionView.cs b/src/OSPSuite.Presentation/Views/IExceptionView.cs index a272f9d18..1928f2b3c 100644 --- a/src/OSPSuite.Presentation/Views/IExceptionView.cs +++ b/src/OSPSuite.Presentation/Views/IExceptionView.cs @@ -13,7 +13,7 @@ public interface IExceptionView /// /// Initialize the view with caption and icon. The assembly info contains information about the calling assembly /// - void Initialize(string caption, ApplicationIcon icon, string productInfo, string issueTrackerUrl, string productName); + void Initialize(string caption, ApplicationIcon icon, string issueTrackerUrl, string productName); /// /// set the text being displayed in the exception message field diff --git a/src/OSPSuite.UI/Controls/UxHtmlLabel.cs b/src/OSPSuite.UI/Controls/UxHtmlLabel.cs index 58f37bbf2..6f6907d94 100644 --- a/src/OSPSuite.UI/Controls/UxHtmlLabel.cs +++ b/src/OSPSuite.UI/Controls/UxHtmlLabel.cs @@ -50,9 +50,9 @@ protected override void OnSizeChanged(EventArgs e) RaiseChanged(); } - public void Caption(string caption) + public string Caption { - Document.HtmlText = $"{stylizeHtmlText}
    {caption}
    "; + set => Document.HtmlText = $"{stylizeHtmlText}
    {value}
    "; } private string stylizeHtmlText => $@" diff --git a/src/OSPSuite.UI/Views/ExceptionView.cs b/src/OSPSuite.UI/Views/ExceptionView.cs index d09ceb89d..744660469 100644 --- a/src/OSPSuite.UI/Views/ExceptionView.cs +++ b/src/OSPSuite.UI/Views/ExceptionView.cs @@ -1,21 +1,17 @@ using System; -using System.Drawing; using System.Threading; using System.Windows.Forms; using DevExpress.XtraEditors; using DevExpress.XtraEditors.Controls; using DevExpress.XtraLayout.Utils; -using DevExpress.XtraRichEdit; using OSPSuite.Assets; using OSPSuite.Presentation.Views; using OSPSuite.UI.Extensions; -using OSPSuite.Utility.Extensions; namespace OSPSuite.UI.Views { public partial class ExceptionView : XtraForm, IExceptionView { - private string _productInfo; private string _issueTrackerUrl; private string _cliboardContent; private const string _couldNotCopyToClipboard = "Unable to copy the information to the clipboard."; @@ -59,15 +55,14 @@ public string Description set { layoutItemDescription.Visibility = LayoutVisibilityConvertor.FromBoolean(!string.IsNullOrEmpty(value)); - htmlLabel.Caption(value); + htmlLabel.Caption = value; } } - public void Initialize(string caption, ApplicationIcon icon, string productInfo, string issueTrackerUrl, string productName) + public void Initialize(string caption, ApplicationIcon icon, string issueTrackerUrl, string productName) { Text = caption; Icon = icon; - _productInfo = productInfo; _issueTrackerUrl = issueTrackerUrl; Description = Captions.ExceptionViewDescription(issueTrackerUrl); issueTrackerLink.Text = Captions.IssueTrackerLinkFor(productName); From 09dce3cfe506b31fca9af585ddbd7fc07eaf66df Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 11 May 2017 13:00:17 -0400 Subject: [PATCH 44/50] Change syntax (#77) --- src/OSPSuite.UI/Controls/UxHtmlLabel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OSPSuite.UI/Controls/UxHtmlLabel.cs b/src/OSPSuite.UI/Controls/UxHtmlLabel.cs index 6f6907d94..4bb05b88d 100644 --- a/src/OSPSuite.UI/Controls/UxHtmlLabel.cs +++ b/src/OSPSuite.UI/Controls/UxHtmlLabel.cs @@ -52,7 +52,7 @@ protected override void OnSizeChanged(EventArgs e) public string Caption { - set => Document.HtmlText = $"{stylizeHtmlText}
    {value}
    "; + set { Document.HtmlText = $"{stylizeHtmlText}
    {value}
    "; } } private string stylizeHtmlText => $@" From 029dc1dd64cd6be8797ffeaa7e60c316cc80d281 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Tue, 23 May 2017 09:15:23 -0400 Subject: [PATCH 45/50] Fixes #82 RangeImage not visible anymore in Parameter Identification Result (#83) --- src/OSPSuite.UI/Services/OptimizedParameterRangeImageCreator.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/OSPSuite.UI/Services/OptimizedParameterRangeImageCreator.cs b/src/OSPSuite.UI/Services/OptimizedParameterRangeImageCreator.cs index 6e5d08042..fb58e92cd 100644 --- a/src/OSPSuite.UI/Services/OptimizedParameterRangeImageCreator.cs +++ b/src/OSPSuite.UI/Services/OptimizedParameterRangeImageCreator.cs @@ -36,6 +36,7 @@ public Image CreateFor(OptimizedParameterDTO optimizedParameterDTO) createPointSeries("seriesStart", MarkerKind.Square, startValue).LegendText = Captions.StartValue; _chart.XYDiagram.AxisY.Visibility = DefaultBoolean.False; + _chart.XYDiagram.AxisY.WholeRange.AutoSideMargins = false; _chart.XYDiagram.DefaultPane.BorderVisible = false; var image = new Bitmap(_chartSize.Width, _chartSize.Height); From 7a684615c087da7fa9ffd8e458632f82e91651e0 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Tue, 23 May 2017 09:47:20 -0400 Subject: [PATCH 46/50] Fixes #84 ReportTask should export to XLXS if required (#86) * Fixes #84 ReportTask should export to XLXS if required * Fixes #84 ReportTask should export to XLXS if required --- src/OSPSuite.Infrastructure/Services/ExportToExcelTask.cs | 4 ++-- src/OSPSuite.Infrastructure/Services/ReportTask.cs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/OSPSuite.Infrastructure/Services/ExportToExcelTask.cs b/src/OSPSuite.Infrastructure/Services/ExportToExcelTask.cs index 1ba1e2c58..608e24c0f 100644 --- a/src/OSPSuite.Infrastructure/Services/ExportToExcelTask.cs +++ b/src/OSPSuite.Infrastructure/Services/ExportToExcelTask.cs @@ -46,14 +46,14 @@ public static void ExportDataTablesToExcel(IEnumerable dataTables, st workbookConfiguration(workBook, dataTable); } - saveWorkbook(fileName, workBook); + SaveWorkbook(fileName, workBook); } if (openExcel) FileHelper.TryOpenFile(fileName); } - private static void saveWorkbook(string fileName, WorkBook workBook) + public static void SaveWorkbook(string fileName, WorkBook workBook) { FileHelper.TrySaveFile(fileName, () => { diff --git a/src/OSPSuite.Infrastructure/Services/ReportTask.cs b/src/OSPSuite.Infrastructure/Services/ReportTask.cs index 5afb670b7..9e2407286 100644 --- a/src/OSPSuite.Infrastructure/Services/ReportTask.cs +++ b/src/OSPSuite.Infrastructure/Services/ReportTask.cs @@ -29,7 +29,8 @@ public void CreateReport(IHistoryManager historyManager, ReportOptions reportOpt } workBook.setSheetName(SheetIndex.Report, reportOptions.SheetName); - workBook.write(reportOptions.ReportFullPath); + + ExportToExcelTask.SaveWorkbook(reportOptions.ReportFullPath, workBook); if (reportOptions.OpenReport) FileHelper.TryOpenFile(reportOptions.ReportFullPath); From 11e566c2a423695c24143c4ef52a536489d58543 Mon Sep 17 00:00:00 2001 From: Robert McIntosh Date: Tue, 23 May 2017 09:49:02 -0400 Subject: [PATCH 47/50] Fixes Open-Systems-Pharmacology/PK-Sim#182 - population plots are missing the context menu (#85) --- src/OSPSuite.UI/Controls/UxChartControl.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OSPSuite.UI/Controls/UxChartControl.cs b/src/OSPSuite.UI/Controls/UxChartControl.cs index 64c99771b..39c2aa337 100644 --- a/src/OSPSuite.UI/Controls/UxChartControl.cs +++ b/src/OSPSuite.UI/Controls/UxChartControl.cs @@ -32,6 +32,7 @@ public UxChartControl(bool addDefaultPopup = true) _clipboardTask = new ClipboardTask(); _barManager = new BarManager {Form = this}; _popupMenu = new PopupMenu(_barManager); + _barManager.SetPopupContextMenu(this, _popupMenu); if (addDefaultPopup) initializePopup(); @@ -102,7 +103,6 @@ public virtual void CopyChartToClipboard(ChartControl chartControl) private void initializePopup() { - _barManager.SetPopupContextMenu(this, _popupMenu); AddPopupMenu(Captions.CopyAsImage, CopyToClipboard, ApplicationIcons.Paste); } From 8a2728156f4b83f4f87fbdbb1e9b91cd0c7ccac8 Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 25 May 2017 11:06:07 -0400 Subject: [PATCH 48/50] Ensure that list of branches for build is specified in appveyor ci and not in appveyor.yml --- appveyor.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f4a63a41f..a5fbcab71 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -35,11 +35,6 @@ build: skip_branch_with_pr: true -branches: - only: - - master - - develop - test: assemblies: - OSPSuite.Core.Tests.dll From 6317e5ef0745b8cd96c25aadb26d108b69963ffc Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 25 May 2017 13:17:47 -0400 Subject: [PATCH 49/50] Fixes #92 popup menu not shown (#93) --- src/OSPSuite.UI/Controls/UxChartControl.cs | 23 ++++++++++++------- .../Views/Charts/ChartDisplayView.Designer.cs | 2 +- ...nalysisPKParameterAnalysisView.Designer.cs | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/OSPSuite.UI/Controls/UxChartControl.cs b/src/OSPSuite.UI/Controls/UxChartControl.cs index 39c2aa337..b7721c4ba 100644 --- a/src/OSPSuite.UI/Controls/UxChartControl.cs +++ b/src/OSPSuite.UI/Controls/UxChartControl.cs @@ -2,12 +2,12 @@ using System.Drawing; using System.Drawing.Imaging; using System.IO; -using OSPSuite.Utility.Extensions; using DevExpress.Utils; using DevExpress.XtraBars; using DevExpress.XtraCharts; using OSPSuite.Assets; using OSPSuite.UI.Services; +using OSPSuite.Utility.Extensions; namespace OSPSuite.UI.Controls { @@ -19,12 +19,12 @@ public class UxChartControl : ChartControl private readonly BarManager _barManager; private readonly PopupMenu _popupMenu; - public UxChartControl(bool addDefaultPopup = true) + public UxChartControl(bool useDefaultPopupMechanism = true, bool addCopyToClipboardMenu = true) { Titles.Clear(); _title = new ChartTitle {Text = string.Empty, Font = new Font("Arial", 16), Alignment = StringAlignment.Center, Dock = ChartTitleDockStyle.Top, WordWrap = true}; - _description = new ChartTitle { Text = string.Empty, Font = new Font("Arial", 12), Alignment = StringAlignment.Near, Dock = ChartTitleDockStyle.Bottom, WordWrap = true }; + _description = new ChartTitle {Text = string.Empty, Font = new Font("Arial", 12), Alignment = StringAlignment.Near, Dock = ChartTitleDockStyle.Bottom, WordWrap = true}; Titles.Add(_title); Titles.Add(_description); @@ -32,10 +32,9 @@ public UxChartControl(bool addDefaultPopup = true) _clipboardTask = new ClipboardTask(); _barManager = new BarManager {Form = this}; _popupMenu = new PopupMenu(_barManager); - _barManager.SetPopupContextMenu(this, _popupMenu); - if (addDefaultPopup) - initializePopup(); + if (useDefaultPopupMechanism) + initializePopup(addCopyToClipboardMenu); } /// @@ -101,9 +100,17 @@ public virtual void CopyChartToClipboard(ChartControl chartControl) } } - private void initializePopup() + private void initializePopup(bool addCopyToClipboardMenu) + { + _barManager.SetPopupContextMenu(this, _popupMenu); + + if (addCopyToClipboardMenu) + AddCopyToCliboardMenu(); + } + + public void AddCopyToCliboardMenu() { - AddPopupMenu(Captions.CopyAsImage, CopyToClipboard, ApplicationIcons.Paste); + AddPopupMenu(MenuNames.CopyToClipboard, CopyToClipboard, ApplicationIcons.Copy); } public DiagramCoordinates DiagramCoordinatesAt(HotTrackEventArgs e) diff --git a/src/OSPSuite.UI/Views/Charts/ChartDisplayView.Designer.cs b/src/OSPSuite.UI/Views/Charts/ChartDisplayView.Designer.cs index 4f69ac823..e8c6248e7 100644 --- a/src/OSPSuite.UI/Views/Charts/ChartDisplayView.Designer.cs +++ b/src/OSPSuite.UI/Views/Charts/ChartDisplayView.Designer.cs @@ -55,7 +55,7 @@ private void InitializeComponent() this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl(); this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl(); this.barDockControlRight = new DevExpress.XtraBars.BarDockControl(); - this.chartControl = new UxChartControl(addDefaultPopup: false); + this.chartControl = new UxChartControl(useDefaultPopupMechanism: false); ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this._barManager)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.chartControl)).BeginInit(); diff --git a/src/OSPSuite.UI/Views/SensitivityAnalyses/SensitivityAnalysisPKParameterAnalysisView.Designer.cs b/src/OSPSuite.UI/Views/SensitivityAnalyses/SensitivityAnalysisPKParameterAnalysisView.Designer.cs index eca891955..1458ca4f9 100644 --- a/src/OSPSuite.UI/Views/SensitivityAnalyses/SensitivityAnalysisPKParameterAnalysisView.Designer.cs +++ b/src/OSPSuite.UI/Views/SensitivityAnalyses/SensitivityAnalysisPKParameterAnalysisView.Designer.cs @@ -37,7 +37,7 @@ private void InitializeComponent() DevExpress.XtraCharts.ChartTitle chartTitle4 = new DevExpress.XtraCharts.ChartTitle(); DevExpress.XtraCharts.ChartTitle chartTitle5 = new DevExpress.XtraCharts.ChartTitle(); DevExpress.XtraCharts.ChartTitle chartTitle6 = new DevExpress.XtraCharts.ChartTitle(); - this.chartControl = new UxChartControl(true); + this.chartControl = new UxChartControl(); this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl(); this.cbOutputPathSelection = new DevExpress.XtraEditors.ComboBoxEdit(); this.lblSensitivityNotCalculated = new DevExpress.XtraEditors.LabelControl(); From 116deb092f2041a5822652e205fb225114deb54b Mon Sep 17 00:00:00 2001 From: Michael Sevestre Date: Thu, 25 May 2017 14:40:58 -0400 Subject: [PATCH 50/50] Branch filtering on appveyor.yml turned back on --- appveyor.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index a5fbcab71..d3ee775c6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -35,6 +35,11 @@ build: skip_branch_with_pr: true +branches: + only: + - master + - develop + test: assemblies: - OSPSuite.Core.Tests.dll