2073 molweight correction (#2077)

* initial plug in * plugging in and correcting mw editablility
Open-Systems-Pharmacology · Jan 28, 2022 · 574c726 · 574c726
1 parent 1a0a994
commit 574c726
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 1 deletion.
diff --git a/src/PKSim.Assets.Images/PKSim.Assets.Images.csproj b/src/PKSim.Assets.Images/PKSim.Assets.Images.csproj
@@ -26,6 +26,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="OSPSuite.Assets" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Assets" Version="11.0.60" />
     <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.60" />
   </ItemGroup>

diff --git a/src/PKSim.Assets/PKSim.Assets.csproj b/src/PKSim.Assets/PKSim.Assets.csproj
@@ -26,6 +26,8 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="OSPSuite.Assets" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Assets" Version="11.0.60" />
     <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.60" />
   </ItemGroup>

diff --git a/src/PKSim.BatchTool/PKSim.BatchTool.csproj b/src/PKSim.BatchTool/PKSim.BatchTool.csproj
@@ -63,6 +63,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="OSPSuite.Core" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Core" Version="11.0.60" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.51" GeneratePathProperty="true" />

diff --git a/src/PKSim.CLI.Core/PKSim.CLI.Core.csproj b/src/PKSim.CLI.Core/PKSim.CLI.Core.csproj
@@ -28,6 +28,7 @@
 
   <ItemGroup>
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Core" Version="11.0.60" />
   </ItemGroup>
 

diff --git a/src/PKSim.CLI/PKSim.CLI.csproj b/src/PKSim.CLI/PKSim.CLI.csproj
@@ -61,6 +61,8 @@
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Core" Version="11.0.60" />
     <PackageReference Include="OSPSuite.Presentation" Version="11.0.60" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />

diff --git a/src/PKSim.Core/PKSim.Core.csproj b/src/PKSim.Core/PKSim.Core.csproj
@@ -30,6 +30,10 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.Assets" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Core" Version="11.0.60" />
     <PackageReference Include="OSPSuite.Assets" Version="11.0.60" />
     <PackageReference Include="OSPSuite.Assets.Images" Version="11.0.60" />

diff --git a/src/PKSim.Infrastructure/PKSim.Infrastructure.csproj b/src/PKSim.Infrastructure/PKSim.Infrastructure.csproj
@@ -41,6 +41,14 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
     <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.13" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.Infrastructure" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.Infrastructure.Export" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.Infrastructure.Import" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.Infrastructure.Reporting" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.Infrastructure.Serialization" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.Presentation.Serialization" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Core" Version="11.0.60" />
     <PackageReference Include="OSPSuite.Infrastructure" Version="11.0.60" />
     <PackageReference Include="OSPSuite.Infrastructure.Castle" Version="11.0.60" />

diff --git a/src/PKSim.Infrastructure/Services/ImportObservedDataTask.cs b/src/PKSim.Infrastructure/Services/ImportObservedDataTask.cs
@@ -206,7 +206,12 @@ private void addNamingPatterns(DataImporterSettings dataImporterSettings)
 
       private (IReadOnlyList<MetaDataCategory>, DataImporterSettings) initializeSettings(Compound compound = null, bool allowCompoundNameEdit = false)
       {
-         var dataImporterSettings = new DataImporterSettings { Caption = $"{CoreConstants.ProductDisplayName} - {PKSimConstants.UI.ImportObservedData}", IconName = ApplicationIcons.ObservedData.IconName };
+         var dataImporterSettings = new DataImporterSettings
+         {
+            Caption = $"{CoreConstants.ProductDisplayName} - {PKSimConstants.UI.ImportObservedData}", 
+            IconName = ApplicationIcons.ObservedData.IconName,
+            CheckMolWeightAgainstMolecule = true
+         };
          addNamingPatterns(dataImporterSettings);
          dataImporterSettings.NameOfMetaDataHoldingMoleculeInformation = Constants.ObservedData.MOLECULE;
          dataImporterSettings.NameOfMetaDataHoldingMolecularWeightInformation = Constants.ObservedData.MOLECULAR_WEIGHT;

diff --git a/src/PKSim.Matlab/PKSim.Matlab.csproj b/src/PKSim.Matlab/PKSim.Matlab.csproj
@@ -27,6 +27,7 @@
 
   <ItemGroup>
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Core" Version="11.0.60" />
   </ItemGroup>
 

diff --git a/src/PKSim.Presentation/PKSim.Presentation.csproj b/src/PKSim.Presentation/PKSim.Presentation.csproj
@@ -29,6 +29,8 @@
   <ItemGroup>
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Presentation" Version="11.0.60" />
     <PackageReference Include="OSPSuite.Core" Version="11.0.60" />
   </ItemGroup>

diff --git a/src/PKSim.R/PKSim.R.csproj b/src/PKSim.R/PKSim.R.csproj
@@ -50,6 +50,7 @@
 
   <ItemGroup>
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Core" Version="11.0.60" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.51" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.45" GeneratePathProperty="true" />

diff --git a/src/PKSim.UI/PKSim.UI.csproj b/src/PKSim.UI/PKSim.UI.csproj
@@ -51,6 +51,9 @@
     <PackageReference Include="OSPSuite.DataBinding.DevExpress" Version="6.0.0.2" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.Utility" Version="4.0.0.4" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.UI" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Presentation" Version="11.0.60" />
     <PackageReference Include="OSPSuite.UI" Version="11.0.60" />
     <PackageReference Include="OSPSuite.Core" Version="11.0.60" />

diff --git a/src/PKSim/PKSim.csproj b/src/PKSim/PKSim.csproj
@@ -76,12 +76,14 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="OSPSuite.Core" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Core" Version="11.0.60" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.51" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.45" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.0.62" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.Presentation" Version="11.0.60" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" GeneratePathProperty="true" />
 

diff --git a/tests/PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj b/tests/PKSim.Matlab.Tests/PKSim.Matlab.Tests.csproj
@@ -23,6 +23,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Core" Version="11.0.60" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.51" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.45" GeneratePathProperty="true" />

diff --git a/tests/PKSim.R.Tests/PKSim.R.Tests.csproj b/tests/PKSim.R.Tests/PKSim.R.Tests.csproj
@@ -23,6 +23,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Core" Version="11.0.60" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.51" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.45" GeneratePathProperty="true" />

diff --git a/tests/PKSim.Tests/PKSim.Tests.csproj b/tests/PKSim.Tests/PKSim.Tests.csproj
@@ -21,6 +21,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Core" Version="11.0.60" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.51" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.45" GeneratePathProperty="true" />

diff --git a/tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj b/tests/PKSim.UI.Starter/PKSim.UI.Starter.csproj
@@ -56,12 +56,14 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="OSPSuite.Core" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Core" Version="11.0.60" />
     <PackageReference Include="OSPSuite.DevExpress" Version="21.2.3" />
     <PackageReference Include="OSPSuite.FuncParser" Version="4.0.0.51" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModel" Version="4.0.0.45" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.SimModelSolver_CVODES" Version="4.1.0.8" GeneratePathProperty="true" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" GeneratePathProperty="true" />
+    <PackageReference Include="OSPSuite.Presentation" Version="11.0.62" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.Presentation" Version="11.0.60" GeneratePathProperty="true" />
     <PackageReference Include="OSPSuite.TeXReporting" Version="3.0.0.4" GeneratePathProperty="true" />
   </ItemGroup>

diff --git a/tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj b/tests/PKSim.UI.Tests/PKSim.UI.Tests.csproj
@@ -18,6 +18,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="nunit" Version="3.13.2" />
     <PackageReference Include="OSPSuite.BDDHelper" Version="4.0.0.1" />
+    <PackageReference Include="OSPSuite.Core" Version="11.0.62" />
+    <PackageReference Include="OSPSuite.UI" Version="11.0.62" />
     <PackageReference Include="OSPSuite.Core" Version="11.0.60" />
     <PackageReference Include="OSPSuite.UI" Version="11.0.60" />
   </ItemGroup>