From 0873f3411f654af6c5c477d4c5eff09d17b44f16 Mon Sep 17 00:00:00 2001 From: DanWBR Date: Sat, 11 Jun 2022 09:03:21 -0400 Subject: [PATCH] v7.5.7 RC1 --- .../My Project/AssemblyInfo.vb | 2 +- .../My Project/AssemblyInfo.vb | 2 +- .../My Project/AssemblyInfo.vb | 4 +- DWSIM.Automation/Properties/AssemblyInfo.cs | 2 +- .../My Project/AssemblyInfo.vb | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../My Project/AssemblyInfo.vb | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../My Project/AssemblyInfo.vb | 2 +- DWSIM.FileStorage/Properties/AssemblyInfo.cs | 4 +- .../My Project/AssemblyInfo.vb | 2 +- .../My Project/AssemblyInfo.vb | 2 +- .../My Project/AssemblyInfo.vb | 2 +- DWSIM.Inspector/My Project/AssemblyInfo.vb | 4 +- DWSIM.Interfaces/My Project/AssemblyInfo.vb | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- DWSIM.Logging/Properties/AssemblyInfo.cs | 4 +- DWSIM.Math/My Project/AssemblyInfo.vb | 2 +- .../My Project/AssemblyInfo.vb | 2 +- .../My Project/AssemblyInfo.vb | 2 +- DWSIM.ProFeatures/My Project/AssemblyInfo.vb | 4 +- .../My Project/AssemblyInfo.vb | 2 +- .../My Project/AssemblyInfo.vb | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../My Project/AssemblyInfo.vb | 2 +- .../My Project/AssemblyInfo.vb | 2 +- .../My Project/AssemblyInfo.vb | 2 +- .../My Project/AssemblyInfo.vb | 2 +- .../FlashAlgorithms/FlashAlgorithmConfig.resx | 414 ++++---- .../MaterialStream/MaterialStream.vb | 10 +- .../My Project/AssemblyInfo.vb | 2 +- .../PropertyPackages/PropertyPackage.vb | 6 +- .../Properties/AssemblyInfo.cs | 2 +- .../Forms/Flowsheet/Flowsheet.eto.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- .../Properties/AssemblyInfo.cs | 4 +- DWSIM.UI.Desktop/Properties/AssemblyInfo.cs | 2 +- DWSIM.UI.Web/ClientApp/package-lock.json | 20 +- .../DWSIM.UnitOperations.vbproj | 16 +- .../My Project/AssemblyInfo.vb | 2 +- .../My Project/Resources.Designer.vb | 10 + .../My Project/Resources.resx | 3 + .../Resources/electrolysis.png | Bin 0 -> 9649 bytes .../PEMFuelCells.vb} | 2 +- .../SimulationObjectsPanel.Designer.vb | 44 +- .../SimulationObjectsPanel.en.resx | 45 - .../SimulationObjectsPanel.resx | 214 ++-- .../SimulationObjectsPanel.vb | 7 +- DWSIM/Forms/FormWelcome.en.resx | 11 +- DWSIM/Forms/FormWelcome.resx | 996 +++++++++--------- DWSIM/Forms/MainWindow/FormMain.vb | 2 +- DWSIM/My Project/AssemblyInfo.vb | 2 +- PlatformFiles/Common/readme.txt | 8 +- PlatformFiles/Common/whatsnew.txt | 6 + 55 files changed, 922 insertions(+), 978 deletions(-) create mode 100644 DWSIM.UnitOperations/Resources/electrolysis.png rename DWSIM.UnitOperations/UnitOperations/{Electrolyzers/PEMElectrolyzerBase.vb => CleanEnergy/PEMFuelCells.vb} (97%) diff --git a/DWSIM.Apps.AzureServer/My Project/AssemblyInfo.vb b/DWSIM.Apps.AzureServer/My Project/AssemblyInfo.vb index 092a8e52b..8af34300a 100644 --- a/DWSIM.Apps.AzureServer/My Project/AssemblyInfo.vb +++ b/DWSIM.Apps.AzureServer/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.Apps.TCPServer/My Project/AssemblyInfo.vb b/DWSIM.Apps.TCPServer/My Project/AssemblyInfo.vb index 63b29bce7..51d7071b6 100644 --- a/DWSIM.Apps.TCPServer/My Project/AssemblyInfo.vb +++ b/DWSIM.Apps.TCPServer/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.Automation.Tests/My Project/AssemblyInfo.vb b/DWSIM.Automation.Tests/My Project/AssemblyInfo.vb index eeaa32a95..6402d8adb 100644 --- a/DWSIM.Automation.Tests/My Project/AssemblyInfo.vb +++ b/DWSIM.Automation.Tests/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/DWSIM.Automation/Properties/AssemblyInfo.cs b/DWSIM.Automation/Properties/AssemblyInfo.cs index ca7d78b67..fc38e38e8 100644 --- a/DWSIM.Automation/Properties/AssemblyInfo.cs +++ b/DWSIM.Automation/Properties/AssemblyInfo.cs @@ -32,4 +32,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("7.5.6.0")] +[assembly: AssemblyVersion("7.5.7.0")] diff --git a/DWSIM.Drawing.SkiaSharp/My Project/AssemblyInfo.vb b/DWSIM.Drawing.SkiaSharp/My Project/AssemblyInfo.vb index bc5766cd2..0cbf860f1 100644 --- a/DWSIM.Drawing.SkiaSharp/My Project/AssemblyInfo.vb +++ b/DWSIM.Drawing.SkiaSharp/My Project/AssemblyInfo.vb @@ -33,6 +33,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + \ No newline at end of file diff --git a/DWSIM.DrawingTools.SkiaSharp.Extended/Properties/AssemblyInfo.cs b/DWSIM.DrawingTools.SkiaSharp.Extended/Properties/AssemblyInfo.cs index c4b5f2322..e6b21f906 100644 --- a/DWSIM.DrawingTools.SkiaSharp.Extended/Properties/AssemblyInfo.cs +++ b/DWSIM.DrawingTools.SkiaSharp.Extended/Properties/AssemblyInfo.cs @@ -32,4 +32,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("7.5.6.0")] +[assembly: AssemblyVersion("7.5.7.0")] diff --git a/DWSIM.DynamicsManager/My Project/AssemblyInfo.vb b/DWSIM.DynamicsManager/My Project/AssemblyInfo.vb index a4b0364f1..70d40bd23 100644 --- a/DWSIM.DynamicsManager/My Project/AssemblyInfo.vb +++ b/DWSIM.DynamicsManager/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.ExtensionMethods.Eto/Properties/AssemblyInfo.cs b/DWSIM.ExtensionMethods.Eto/Properties/AssemblyInfo.cs index e652a3e37..580452c4a 100644 --- a/DWSIM.ExtensionMethods.Eto/Properties/AssemblyInfo.cs +++ b/DWSIM.ExtensionMethods.Eto/Properties/AssemblyInfo.cs @@ -32,4 +32,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("7.5.6.0")] +[assembly: AssemblyVersion("7.5.7.0")] diff --git a/DWSIM.ExtensionMethods/My Project/AssemblyInfo.vb b/DWSIM.ExtensionMethods/My Project/AssemblyInfo.vb index 77503cc20..0892567ed 100644 --- a/DWSIM.ExtensionMethods/My Project/AssemblyInfo.vb +++ b/DWSIM.ExtensionMethods/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.FileStorage/Properties/AssemblyInfo.cs b/DWSIM.FileStorage/Properties/AssemblyInfo.cs index eecb940e4..bea4c1c72 100644 --- a/DWSIM.FileStorage/Properties/AssemblyInfo.cs +++ b/DWSIM.FileStorage/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("7.5.6.0")] -[assembly: AssemblyFileVersion("7.5.6.0")] +[assembly: AssemblyVersion("7.5.7.0")] +[assembly: AssemblyFileVersion("7.5.7.0")] diff --git a/DWSIM.FlowsheetBase/My Project/AssemblyInfo.vb b/DWSIM.FlowsheetBase/My Project/AssemblyInfo.vb index 883b67b41..89581cf88 100644 --- a/DWSIM.FlowsheetBase/My Project/AssemblyInfo.vb +++ b/DWSIM.FlowsheetBase/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.FlowsheetSolver/My Project/AssemblyInfo.vb b/DWSIM.FlowsheetSolver/My Project/AssemblyInfo.vb index c1390ac66..254e9f9df 100644 --- a/DWSIM.FlowsheetSolver/My Project/AssemblyInfo.vb +++ b/DWSIM.FlowsheetSolver/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.GlobalSettings/My Project/AssemblyInfo.vb b/DWSIM.GlobalSettings/My Project/AssemblyInfo.vb index 4ae37b2e1..19819574d 100644 --- a/DWSIM.GlobalSettings/My Project/AssemblyInfo.vb +++ b/DWSIM.GlobalSettings/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.Inspector/My Project/AssemblyInfo.vb b/DWSIM.Inspector/My Project/AssemblyInfo.vb index 2a2d063e0..fa5d9f8e9 100644 --- a/DWSIM.Inspector/My Project/AssemblyInfo.vb +++ b/DWSIM.Inspector/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/DWSIM.Interfaces/My Project/AssemblyInfo.vb b/DWSIM.Interfaces/My Project/AssemblyInfo.vb index fe297193e..56565d7a8 100644 --- a/DWSIM.Interfaces/My Project/AssemblyInfo.vb +++ b/DWSIM.Interfaces/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.Libraries.OctaveSharp/Properties/AssemblyInfo.cs b/DWSIM.Libraries.OctaveSharp/Properties/AssemblyInfo.cs index d5c824fcd..179d7d9f1 100644 --- a/DWSIM.Libraries.OctaveSharp/Properties/AssemblyInfo.cs +++ b/DWSIM.Libraries.OctaveSharp/Properties/AssemblyInfo.cs @@ -32,4 +32,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("7.5.6.0")] +[assembly: AssemblyVersion("7.5.7.0")] diff --git a/DWSIM.Libraries.PythonLink/Properties/AssemblyInfo.cs b/DWSIM.Libraries.PythonLink/Properties/AssemblyInfo.cs index 00ee2e023..cf09aa456 100644 --- a/DWSIM.Libraries.PythonLink/Properties/AssemblyInfo.cs +++ b/DWSIM.Libraries.PythonLink/Properties/AssemblyInfo.cs @@ -32,4 +32,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("7.5.6.0")] +[assembly: AssemblyVersion("7.5.7.0")] diff --git a/DWSIM.Logging/Properties/AssemblyInfo.cs b/DWSIM.Logging/Properties/AssemblyInfo.cs index 4d45f04e5..16ba1cba7 100644 --- a/DWSIM.Logging/Properties/AssemblyInfo.cs +++ b/DWSIM.Logging/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("7.5.6.0")] -[assembly: AssemblyFileVersion("7.5.6.0")] +[assembly: AssemblyVersion("7.5.7.0")] +[assembly: AssemblyFileVersion("7.5.7.0")] diff --git a/DWSIM.Math/My Project/AssemblyInfo.vb b/DWSIM.Math/My Project/AssemblyInfo.vb index 6e2264a50..2de34d5a9 100644 --- a/DWSIM.Math/My Project/AssemblyInfo.vb +++ b/DWSIM.Math/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.Plugins.HeatOfCombustion/My Project/AssemblyInfo.vb b/DWSIM.Plugins.HeatOfCombustion/My Project/AssemblyInfo.vb index b582b0b6a..557273bbb 100644 --- a/DWSIM.Plugins.HeatOfCombustion/My Project/AssemblyInfo.vb +++ b/DWSIM.Plugins.HeatOfCombustion/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.Plugins.NaturalGas/My Project/AssemblyInfo.vb b/DWSIM.Plugins.NaturalGas/My Project/AssemblyInfo.vb index b0f6bcfbc..d84766456 100644 --- a/DWSIM.Plugins.NaturalGas/My Project/AssemblyInfo.vb +++ b/DWSIM.Plugins.NaturalGas/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.ProFeatures/My Project/AssemblyInfo.vb b/DWSIM.ProFeatures/My Project/AssemblyInfo.vb index 51fca692a..72c80dc3c 100644 --- a/DWSIM.ProFeatures/My Project/AssemblyInfo.vb +++ b/DWSIM.ProFeatures/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/DWSIM.Serializers.XML/My Project/AssemblyInfo.vb b/DWSIM.Serializers.XML/My Project/AssemblyInfo.vb index 7aea69b80..51d3b4801 100644 --- a/DWSIM.Serializers.XML/My Project/AssemblyInfo.vb +++ b/DWSIM.Serializers.XML/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.SharedClasses/My Project/AssemblyInfo.vb b/DWSIM.SharedClasses/My Project/AssemblyInfo.vb index d8ae5b74f..67b9e7b6b 100644 --- a/DWSIM.SharedClasses/My Project/AssemblyInfo.vb +++ b/DWSIM.SharedClasses/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.Thermodynamics.CoolPropInterface/Properties/AssemblyInfo.cs b/DWSIM.Thermodynamics.CoolPropInterface/Properties/AssemblyInfo.cs index cfe570453..8517885f8 100644 --- a/DWSIM.Thermodynamics.CoolPropInterface/Properties/AssemblyInfo.cs +++ b/DWSIM.Thermodynamics.CoolPropInterface/Properties/AssemblyInfo.cs @@ -32,4 +32,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("7.5.6.0")] +[assembly: AssemblyVersion("7.5.7.0")] diff --git a/DWSIM.Thermodynamics.Databases.ChemeoLink/My Project/AssemblyInfo.vb b/DWSIM.Thermodynamics.Databases.ChemeoLink/My Project/AssemblyInfo.vb index a6dded1aa..64d3b6f99 100644 --- a/DWSIM.Thermodynamics.Databases.ChemeoLink/My Project/AssemblyInfo.vb +++ b/DWSIM.Thermodynamics.Databases.ChemeoLink/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.Thermodynamics.Databases.DDBStructureLink/My Project/AssemblyInfo.vb b/DWSIM.Thermodynamics.Databases.DDBStructureLink/My Project/AssemblyInfo.vb index 629483db5..0eba7d429 100644 --- a/DWSIM.Thermodynamics.Databases.DDBStructureLink/My Project/AssemblyInfo.vb +++ b/DWSIM.Thermodynamics.Databases.DDBStructureLink/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.Thermodynamics.Databases.KDBLink/My Project/AssemblyInfo.vb b/DWSIM.Thermodynamics.Databases.KDBLink/My Project/AssemblyInfo.vb index 4ed3465a8..cb16e4a2b 100644 --- a/DWSIM.Thermodynamics.Databases.KDBLink/My Project/AssemblyInfo.vb +++ b/DWSIM.Thermodynamics.Databases.KDBLink/My Project/AssemblyInfo.vb @@ -33,6 +33,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + \ No newline at end of file diff --git a/DWSIM.Thermodynamics.StandaloneLibrary/My Project/AssemblyInfo.vb b/DWSIM.Thermodynamics.StandaloneLibrary/My Project/AssemblyInfo.vb index ef598df7a..5ee7c70b0 100644 --- a/DWSIM.Thermodynamics.StandaloneLibrary/My Project/AssemblyInfo.vb +++ b/DWSIM.Thermodynamics.StandaloneLibrary/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.Thermodynamics/EditingForms/FlashAlgorithms/FlashAlgorithmConfig.resx b/DWSIM.Thermodynamics/EditingForms/FlashAlgorithms/FlashAlgorithmConfig.resx index f3c4b9806..7ad3d7902 100644 --- a/DWSIM.Thermodynamics/EditingForms/FlashAlgorithms/FlashAlgorithmConfig.resx +++ b/DWSIM.Thermodynamics/EditingForms/FlashAlgorithms/FlashAlgorithmConfig.resx @@ -117,44 +117,31 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 288, 13 - GroupBox1 - - Label30 - Label3 chkDoPhaseId - - GroupBox4 - - - - True + + 8 - - - NoControl + + + 502, 101 207, 20 - - GroupBox1 - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Right 180, 13 @@ -162,9 +149,6 @@ TabPageConvPars - - 502, 101 - 502, 205 @@ -177,14 +161,15 @@ 230, 17 + 10 System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 7 + + True tbPT_DampingFactor @@ -204,14 +189,14 @@ tbPHExtMaxTol - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GroupBox4 - - tbPV_MaxDT + + 6 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Top, Left, Right @@ -255,8 +240,8 @@ GroupBox1 - - 14 + + 38 0 @@ -273,11 +258,14 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - cbExternalSolver + + 1 - - 7 + + 9 + + + tbPTIntTol System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -285,6 +273,9 @@ True + + GroupBox1 + GroupBox1 @@ -306,14 +297,17 @@ Label11 - - Label26 + + 115, 20 Label9 - - 42 + + Right + + + GroupBox1 163, 78 @@ -333,15 +327,9 @@ 14, 21 - - $this - GroupBox1 - - 115, 20 - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -357,17 +345,17 @@ 49 - - GroupBox1 + + 4 - - 6 + + tbPV_MaxDT True - - 38 + + 13 13, 78 @@ -378,17 +366,17 @@ 43 - - TopLeft + + tbPTintMaxIt - - GroupBox1 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 8, 6 + + NoControl - - GroupBox4 + + 113, 17 chkValidateEqCalc @@ -402,8 +390,8 @@ 0 - - GroupBox1 + + Right 4, 22 @@ -438,17 +426,23 @@ 357, 78 + + 14 + NoControl - - 113, 17 + + TabControl1 cbFlashType - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + CheckBoxInterpTempPHFlash + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 10, 351 @@ -486,10 +480,10 @@ TopLeft - - 0 + + 11 - + GroupBox1 @@ -498,8 +492,8 @@ 47 - - 9 + + 7 ESLLV @@ -516,9 +510,6 @@ 2 - - 4 - 37 @@ -534,8 +525,8 @@ 214, 37 - - Right + + 391, 13 True @@ -546,17 +537,17 @@ 11 - + GroupBox4 GroupBox4 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Gibbs Minimization + + Label30 236, 17 @@ -564,6 +555,9 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 14, 51 + 237, 179 @@ -573,9 +567,6 @@ GroupBox4 - - GroupBox4 - 37 @@ -597,8 +588,8 @@ cbFlashApproach - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 288, 13 6 @@ -633,9 +624,6 @@ Flash PT - Fator de Amortização Fixo - - tbPTintMaxIt - GroupBox1 @@ -660,9 +648,6 @@ 13 - - Flash PT/PV - número máximo de iterações no loop interno - Água Imiscível @@ -675,11 +660,11 @@ Loops de convergência - + 115, 20 - - Label25 + + 13, 182 207, 20 @@ -696,8 +681,8 @@ Não Calcular Equilíbrio - - 9 + + 14 System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -708,15 +693,15 @@ 214, 17 + + Label26 + NoControl 414, 270 - - Label5 - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -735,11 +720,8 @@ 657, 445 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True + + 5 Validar o resultado dos cálculos de equilíbrio @@ -747,15 +729,15 @@ Top, Left, Right - - 115, 20 - Top, Left, Right 41 + + NoControl + NoControl @@ -765,10 +747,7 @@ Top, Right - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + True @@ -801,6 +780,12 @@ 40 + + NoControl + + + 42 + TopLeft @@ -819,8 +804,8 @@ Right - - 8 + + 8, 6 14, 82 @@ -858,11 +843,8 @@ GroupBox4 - - 13, 182 - - - 14, 51 + + Label5 288, 13 @@ -873,8 +855,8 @@ 291, 13 - - CheckBoxInterpTempPHFlash + + 6 4 @@ -885,8 +867,8 @@ 11 - - tbPTIntTol + + True Right @@ -918,8 +900,8 @@ Top, Left, Right - - 11 + + 14 NoControl @@ -933,12 +915,6 @@ 115, 20 - - GroupBox1 - - - 9 - 15 @@ -963,21 +939,24 @@ 502, 127 - - TabPageGeneral + + 7 GroupBox4 + + 12, 247 + + + 0 + 143, 13 btnConfigExtSolver - - GroupBox1 - GroupBox1 @@ -996,8 +975,8 @@ tbPHExtMaxIt - - 1 + + GroupBox1 NoControl @@ -1005,18 +984,12 @@ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 True - - 3 - - - 5 - GroupBox1 @@ -1026,12 +999,12 @@ 502, 153 + + 9 + 6, 47 - - 14 - 0 @@ -1044,15 +1017,9 @@ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Flash PV - Valor Máximo para Atualização da Temperatura - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Label10 @@ -1062,8 +1029,8 @@ Top, Left, Right - - 115, 20 + + 3 10 @@ -1089,6 +1056,9 @@ 1 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 44 @@ -1101,11 +1071,11 @@ 96, 17 - - Flash PV - Perturbação para Cálculo da Derivada de K em relação à Temperatura + + True - - 12, 247 + + GroupBox4 GroupBox4 @@ -1128,6 +1098,9 @@ 384, 12 + + cbExternalSolver + 281, 13 @@ -1137,8 +1110,8 @@ 15, 166 - - 13 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 207, 20 @@ -1164,18 +1137,21 @@ Flash PH/PS - Valor Máximo para Atualização da Temperatura + + TopLeft + 2 + + GroupBox1 + 502, 75 Tipo do Cálculo de Equilíbrio - - 6 - Flash PT/PV - tolerância para convergência do loop externo @@ -1185,6 +1161,9 @@ Label6 + + Label25 + Label29 @@ -1209,6 +1188,12 @@ NoControl + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox1 + TabControl1 @@ -1224,17 +1209,17 @@ True - - GroupBox4 + + Flash PT/PV - número máximo de iterações no loop interno True - - 502, 49 + + TabPageGeneral - - 14 + + 15, 113 Right @@ -1242,6 +1227,9 @@ GroupBox1 + + 4, 22 + 5 @@ -1251,8 +1239,8 @@ chkIdealPVFlash - - 15, 113 + + GroupBox1 638, 405 @@ -1260,11 +1248,11 @@ gpNL - - TabControl1 + + CenterParent - - 4, 22 + + $this PV Flash - Tentar Cálculo Ideal em caso de falha @@ -1278,17 +1266,14 @@ 2 - - CenterParent - NoControl System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 391, 13 + + 9 292, 13 @@ -1317,20 +1302,17 @@ 0 - - True - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + GroupBox4 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Flash PV - Perturbação para Cálculo da Derivada de K em relação à Temperatura GroupBox4 - - ESLV + + 115, 20 1 @@ -1338,9 +1320,6 @@ Right - - 6 - NoControl @@ -1365,8 +1344,8 @@ 96, 96 - - NoControl + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 chkImmiscible @@ -1383,20 +1362,29 @@ 19 + + ESLV + 7 + + 502, 49 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Gibbs Minimization + tbPH_MaxDT NoControl - - Right + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Top, Bottom, Left, Right @@ -1431,6 +1419,9 @@ Label24 + + GroupBox4 + 5 @@ -1440,14 +1431,17 @@ 6, 135 - - Stretch + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 115, 20 - - Right + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Label1 @@ -1461,12 +1455,18 @@ 7 + + 6 + 207, 20 8 + + Stretch + 3 diff --git a/DWSIM.Thermodynamics/MaterialStream/MaterialStream.vb b/DWSIM.Thermodynamics/MaterialStream/MaterialStream.vb index ea33c0a01..0edaa25e4 100644 --- a/DWSIM.Thermodynamics/MaterialStream/MaterialStream.vb +++ b/DWSIM.Thermodynamics/MaterialStream/MaterialStream.vb @@ -4985,7 +4985,7 @@ Namespace Streams ''' ''' The identifier of the property for which values are requested. This must ''' be one of the two-phase Physical Properties or Physical Property derivatives listed in sections - ''' 7.5.6 and 7.6. + ''' 7.5.7 and 7.6. ''' List of Phase labels of the Phases for which the property is required. ''' The Phase labels must be two of the identifiers returned by the GetPhaseList method of the Material ''' Object. @@ -5451,7 +5451,7 @@ Namespace Streams ''' Sets two-phase non-constant property values for a mixture. ''' ''' The property for which values are set in the Material Object. This - ''' must be one of the two-phase properties or derivatives included in sections 7.5.6 and 7.6. + ''' must be one of the two-phase properties or derivatives included in sections 7.5.7 and 7.6. ''' Phase labels of the Phases for which the property is set. The Phase ''' labels must be two of the identifiers returned by the GetPhaseList method of the ICapeThermoPhases ''' interface. @@ -5807,7 +5807,7 @@ Namespace Streams ''' ''' The list of identifiers for properties to be calculated. This must be one or more ''' of the supported two-phase properties and derivatives (as given by the GetTwoPhasePropList method). - ''' The standard identifiers for two-phase properties are given in section 7.5.6 and 7.6. + ''' The standard identifiers for two-phase properties are given in section 7.5.7 and 7.6. ''' Phase labels of the phases for which the properties are to be calculated. ''' The phase labels must be two of the strings returned by the GetPhaseList method on the ICapeThermoPhases ''' interface and the phases must also be present in the Material Object. @@ -5916,7 +5916,7 @@ Namespace Streams ''' Returns the list of supported non-constant two-phase properties. ''' ''' List of all supported non-constant two-phase property identifiers. The standard two-phase - ''' property identifiers are listed in section 7.5.6. + ''' property identifiers are listed in section 7.5.7. ''' A non-constant property depends on the state of the Material Object. Two-phase properties ''' are those that depend on more than one co-existing phase, e.g. K-values. ''' GetTwoPhasePropList must return all the properties that can be calculated by @@ -5925,7 +5925,7 @@ Namespace Streams ''' To check whether a property can be evaluated for a particular set of phase labels use the ''' CheckTwoPhasePropSpec method. ''' A component that implements this method may return non-constant two-phase property - ''' identifiers which do not belong to the list defined in section 7.5.6. However, these + ''' identifiers which do not belong to the list defined in section 7.5.7. However, these ''' proprietary identifiers may not be understood by most of the clients of this component. ''' To get the list of supported single-phase properties, use GetSinglePhasePropList. Public Function GetTwoPhasePropList() As Object Implements ICapeThermoPropertyRoutine.GetTwoPhasePropList diff --git a/DWSIM.Thermodynamics/My Project/AssemblyInfo.vb b/DWSIM.Thermodynamics/My Project/AssemblyInfo.vb index 0438fdbd6..adcfecdfd 100644 --- a/DWSIM.Thermodynamics/My Project/AssemblyInfo.vb +++ b/DWSIM.Thermodynamics/My Project/AssemblyInfo.vb @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + diff --git a/DWSIM.Thermodynamics/PropertyPackages/PropertyPackage.vb b/DWSIM.Thermodynamics/PropertyPackages/PropertyPackage.vb index a024d87eb..ad1290ce3 100644 --- a/DWSIM.Thermodynamics/PropertyPackages/PropertyPackage.vb +++ b/DWSIM.Thermodynamics/PropertyPackages/PropertyPackage.vb @@ -10051,7 +10051,7 @@ Final3: ''' ''' The list of identifiers for properties to be calculated. This must be one or more ''' of the supported two-phase properties and derivatives (as given by the GetTwoPhasePropList method). - ''' The standard identifiers for two-phase properties are given in section 7.5.6 and 7.6. + ''' The standard identifiers for two-phase properties are given in section 7.5.7 and 7.6. ''' Phase labels of the phases for which the properties are to be calculated. ''' The phase labels must be two of the strings returned by the GetPhaseList method on the ICapeThermoPhases ''' interface and the phases must also be present in the Material Object. @@ -10230,7 +10230,7 @@ Final3: ''' Returns the list of supported non-constant two-phase properties. ''' ''' List of all supported non-constant two-phase property identifiers. The standard two-phase - ''' property identifiers are listed in section 7.5.6. + ''' property identifiers are listed in section 7.5.7. ''' A non-constant property depends on the state of the Material Object. Two-phase properties ''' are those that depend on more than one co-existing phase, e.g. K-values. ''' GetTwoPhasePropList must return all the properties that can be calculated by @@ -10239,7 +10239,7 @@ Final3: ''' To check whether a property can be evaluated for a particular set of phase labels use the ''' CheckTwoPhasePropSpec method. ''' A component that implements this method may return non-constant two-phase property - ''' identifiers which do not belong to the list defined in section 7.5.6. However, these + ''' identifiers which do not belong to the list defined in section 7.5.7. However, these ''' proprietary identifiers may not be understood by most of the clients of this component. ''' To get the list of supported single-phase properties, use GetSinglePhasePropList. Public Overridable Function GetTwoPhasePropList() As Object Implements ICapeThermoPropertyRoutine.GetTwoPhasePropList diff --git a/DWSIM.UI.Desktop.Editors/Properties/AssemblyInfo.cs b/DWSIM.UI.Desktop.Editors/Properties/AssemblyInfo.cs index 00689caa2..094794586 100644 --- a/DWSIM.UI.Desktop.Editors/Properties/AssemblyInfo.cs +++ b/DWSIM.UI.Desktop.Editors/Properties/AssemblyInfo.cs @@ -17,7 +17,7 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion("7.5.6.0")] +[assembly: AssemblyVersion("7.5.7.0")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. diff --git a/DWSIM.UI.Desktop.Forms/Forms/Flowsheet/Flowsheet.eto.cs b/DWSIM.UI.Desktop.Forms/Forms/Flowsheet/Flowsheet.eto.cs index 3b254b0e4..527ce4e35 100644 --- a/DWSIM.UI.Desktop.Forms/Forms/Flowsheet/Flowsheet.eto.cs +++ b/DWSIM.UI.Desktop.Forms/Forms/Flowsheet/Flowsheet.eto.cs @@ -1845,7 +1845,7 @@ void LoadObjects() List availableTypes = new List(); availableTypes.AddRange(calculatorassembly.GetTypes().Where(x => x.GetInterface("DWSIM.Interfaces.ISimulationObject") != null ? true : false)); - availableTypes.AddRange(unitopassembly.GetTypes().Where(x => x.GetInterface("DWSIM.Interfaces.ISimulationObject") != null ? true : false)); + availableTypes.AddRange(unitopassembly.GetTypes().Where(x => x.GetInterface("DWSIM.Interfaces.ISimulationObject") != null && !x.IsAbstract ? true : false)); List litems = new List(); diff --git a/DWSIM.UI.Desktop.Forms/Properties/AssemblyInfo.cs b/DWSIM.UI.Desktop.Forms/Properties/AssemblyInfo.cs index f77505c2d..7e7762683 100644 --- a/DWSIM.UI.Desktop.Forms/Properties/AssemblyInfo.cs +++ b/DWSIM.UI.Desktop.Forms/Properties/AssemblyInfo.cs @@ -19,7 +19,7 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion("7.5.6.0")] +[assembly: AssemblyVersion("7.5.7.0")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. diff --git a/DWSIM.UI.Desktop.Shared/Properties/AssemblyInfo.cs b/DWSIM.UI.Desktop.Shared/Properties/AssemblyInfo.cs index e58b1322c..e387d516f 100644 --- a/DWSIM.UI.Desktop.Shared/Properties/AssemblyInfo.cs +++ b/DWSIM.UI.Desktop.Shared/Properties/AssemblyInfo.cs @@ -17,8 +17,8 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion("7.5.6.0")] -[assembly: AssemblyFileVersion("7.5.6.0")] +[assembly: AssemblyVersion("7.5.7.0")] +[assembly: AssemblyFileVersion("7.5.7.0")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. diff --git a/DWSIM.UI.Desktop/Properties/AssemblyInfo.cs b/DWSIM.UI.Desktop/Properties/AssemblyInfo.cs index 635cee1d9..2aa60b073 100644 --- a/DWSIM.UI.Desktop/Properties/AssemblyInfo.cs +++ b/DWSIM.UI.Desktop/Properties/AssemblyInfo.cs @@ -17,7 +17,7 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion("7.5.6.0")] +[assembly: AssemblyVersion("7.5.7.0")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. diff --git a/DWSIM.UI.Web/ClientApp/package-lock.json b/DWSIM.UI.Web/ClientApp/package-lock.json index cd522f59c..82f3acc8a 100644 --- a/DWSIM.UI.Web/ClientApp/package-lock.json +++ b/DWSIM.UI.Web/ClientApp/package-lock.json @@ -9274,7 +9274,7 @@ "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz", "integrity": "sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==", "dependencies": { - "@babel/code-frame": "^7.5.6", + "@babel/code-frame": "^7.5.7", "chalk": "^2.4.1", "micromatch": "^3.1.10", "minimatch": "^3.0.4", @@ -17396,7 +17396,7 @@ "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-5.3.1.tgz", "integrity": "sha512-1pkwkervMJQGFYvM9nscrUoncPwiKR/K+bHdjv6PFgRo3cgPHoRT83y2Aa3GvINj4539S15t/tpFPb775TDs6w==", "dependencies": { - "@babel/code-frame": "^7.5.6", + "@babel/code-frame": "^7.5.7", "jest-worker": "^24.9.0", "rollup-pluginutils": "^2.8.2", "serialize-javascript": "^4.0.0", @@ -21404,7 +21404,7 @@ "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-5.1.4.tgz", "integrity": "sha512-PZafF4HpugZndqISi3rZ4ZK4A4DxO8rAqt2FwRptgsDx7NF8TVKP86/huHquUsRjMGQllsNdn4FNl8CD/UvKmQ==", "dependencies": { - "@babel/runtime": "^7.5.6", + "@babel/runtime": "^7.5.7", "fast-json-stable-stringify": "^2.0.0", "source-map-url": "^0.4.0", "upath": "^1.1.2", @@ -21502,8 +21502,8 @@ } }, "node_modules/ws": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz", + "version": "7.5.7", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz", "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==", "engines": { "node": ">=8.3.0" @@ -28637,7 +28637,7 @@ "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz", "integrity": "sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==", "requires": { - "@babel/code-frame": "^7.5.6", + "@babel/code-frame": "^7.5.7", "chalk": "^2.4.1", "micromatch": "^3.1.10", "minimatch": "^3.0.4", @@ -34892,7 +34892,7 @@ "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-5.3.1.tgz", "integrity": "sha512-1pkwkervMJQGFYvM9nscrUoncPwiKR/K+bHdjv6PFgRo3cgPHoRT83y2Aa3GvINj4539S15t/tpFPb775TDs6w==", "requires": { - "@babel/code-frame": "^7.5.6", + "@babel/code-frame": "^7.5.7", "jest-worker": "^24.9.0", "rollup-pluginutils": "^2.8.2", "serialize-javascript": "^4.0.0", @@ -38112,7 +38112,7 @@ "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-5.1.4.tgz", "integrity": "sha512-PZafF4HpugZndqISi3rZ4ZK4A4DxO8rAqt2FwRptgsDx7NF8TVKP86/huHquUsRjMGQllsNdn4FNl8CD/UvKmQ==", "requires": { - "@babel/runtime": "^7.5.6", + "@babel/runtime": "^7.5.7", "fast-json-stable-stringify": "^2.0.0", "source-map-url": "^0.4.0", "upath": "^1.1.2", @@ -38194,8 +38194,8 @@ } }, "ws": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz", + "version": "7.5.7", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz", "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==", "requires": {} }, diff --git a/DWSIM.UnitOperations/DWSIM.UnitOperations.vbproj b/DWSIM.UnitOperations/DWSIM.UnitOperations.vbproj index 96e42b38d..896006749 100644 --- a/DWSIM.UnitOperations/DWSIM.UnitOperations.vbproj +++ b/DWSIM.UnitOperations/DWSIM.UnitOperations.vbproj @@ -232,12 +232,12 @@ Form - + EditingForm_AirCooler.vb - - + + Form - + EditingForm_AnalogGauge.vb @@ -642,10 +642,10 @@ - + - + @@ -688,9 +688,9 @@ EditingForm_Adjust.vb - + EditingForm_AirCooler.vb - + EditingForm_AnalogGauge.vb diff --git a/DWSIM.UnitOperations/My Project/AssemblyInfo.vb b/DWSIM.UnitOperations/My Project/AssemblyInfo.vb index 6f4438ef1..0e5f0d823 100644 --- a/DWSIM.UnitOperations/My Project/AssemblyInfo.vb +++ b/DWSIM.UnitOperations/My Project/AssemblyInfo.vb @@ -33,6 +33,6 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + \ No newline at end of file diff --git a/DWSIM.UnitOperations/My Project/Resources.Designer.vb b/DWSIM.UnitOperations/My Project/Resources.Designer.vb index 67f3a11eb..1da13c083 100644 --- a/DWSIM.UnitOperations/My Project/Resources.Designer.vb +++ b/DWSIM.UnitOperations/My Project/Resources.Designer.vb @@ -420,6 +420,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Bitmap. + ''' + Friend ReadOnly Property electrolysis() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("electrolysis", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' diff --git a/DWSIM.UnitOperations/My Project/Resources.resx b/DWSIM.UnitOperations/My Project/Resources.resx index 55f3af8fb..a08d0365e 100644 --- a/DWSIM.UnitOperations/My Project/Resources.resx +++ b/DWSIM.UnitOperations/My Project/Resources.resx @@ -499,4 +499,7 @@ ..\Resources\icons8-wind_turbine.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\electrolysis.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/DWSIM.UnitOperations/Resources/electrolysis.png b/DWSIM.UnitOperations/Resources/electrolysis.png new file mode 100644 index 0000000000000000000000000000000000000000..89ea40a99e331ce0f03433df03b4b6e916751435 GIT binary patch literal 9649 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 W&-o8M$FG9K3c+=a&lG82y7O;kn34$q literal 0 HcmV?d00001 diff --git a/DWSIM.UnitOperations/UnitOperations/Electrolyzers/PEMElectrolyzerBase.vb b/DWSIM.UnitOperations/UnitOperations/CleanEnergy/PEMFuelCells.vb similarity index 97% rename from DWSIM.UnitOperations/UnitOperations/Electrolyzers/PEMElectrolyzerBase.vb rename to DWSIM.UnitOperations/UnitOperations/CleanEnergy/PEMFuelCells.vb index eb4610325..88123fe89 100644 --- a/DWSIM.UnitOperations/UnitOperations/Electrolyzers/PEMElectrolyzerBase.vb +++ b/DWSIM.UnitOperations/UnitOperations/CleanEnergy/PEMFuelCells.vb @@ -3,7 +3,7 @@ Imports DWSIM.Interfaces.Enums Namespace UnitOperations - Public MustInherit Class PEMElectrolyzerUnitOpBase + Public MustInherit Class PEMFuelCellUnitOpBase Inherits DWSIM.UnitOperations.UnitOperations.UnitOpBaseClass diff --git a/DWSIM/Forms/FlowsheetComponents/SimulationObjectsPanel.Designer.vb b/DWSIM/Forms/FlowsheetComponents/SimulationObjectsPanel.Designer.vb index 3fef745ab..93adec561 100644 --- a/DWSIM/Forms/FlowsheetComponents/SimulationObjectsPanel.Designer.vb +++ b/DWSIM/Forms/FlowsheetComponents/SimulationObjectsPanel.Designer.vb @@ -1,10 +1,10 @@ - _ + Partial Class SimulationObjectsPanel Inherits UserControl 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -21,7 +21,7 @@ Partial Class SimulationObjectsPanel 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(SimulationObjectsPanel)) Me.PanelStreams = New System.Windows.Forms.FlowLayoutPanel() @@ -41,9 +41,6 @@ Partial Class SimulationObjectsPanel Me.PanelColumns = New System.Windows.Forms.FlowLayoutPanel() Me.TabPage8 = New System.Windows.Forms.TabPage() Me.PanelSolids = New System.Windows.Forms.FlowLayoutPanel() - Me.TabPage9 = New System.Windows.Forms.TabPage() - Me.PanelCE = New System.Windows.Forms.FlowLayoutPanel() - Me.TabPage15 = New System.Windows.Forms.TabPage() Me.TabPage10 = New System.Windows.Forms.TabPage() Me.PanelUser = New System.Windows.Forms.FlowLayoutPanel() Me.TabPage11 = New System.Windows.Forms.TabPage() @@ -54,7 +51,6 @@ Partial Class SimulationObjectsPanel Me.PanelControllers = New System.Windows.Forms.FlowLayoutPanel() Me.TabPage12 = New System.Windows.Forms.TabPage() Me.PanelOther = New System.Windows.Forms.FlowLayoutPanel() - Me.PanelELEC = New System.Windows.Forms.FlowLayoutPanel() Me.TabControl1.SuspendLayout() Me.TabPage1.SuspendLayout() Me.TabPage2.SuspendLayout() @@ -64,8 +60,6 @@ Partial Class SimulationObjectsPanel Me.TabPage6.SuspendLayout() Me.TabPage7.SuspendLayout() Me.TabPage8.SuspendLayout() - Me.TabPage9.SuspendLayout() - Me.TabPage15.SuspendLayout() Me.TabPage10.SuspendLayout() Me.TabPage11.SuspendLayout() Me.TabPage13.SuspendLayout() @@ -89,8 +83,6 @@ Partial Class SimulationObjectsPanel Me.TabControl1.Controls.Add(Me.TabPage6) Me.TabControl1.Controls.Add(Me.TabPage7) Me.TabControl1.Controls.Add(Me.TabPage8) - Me.TabControl1.Controls.Add(Me.TabPage9) - Me.TabControl1.Controls.Add(Me.TabPage15) Me.TabControl1.Controls.Add(Me.TabPage10) Me.TabControl1.Controls.Add(Me.TabPage11) Me.TabControl1.Controls.Add(Me.TabPage13) @@ -190,25 +182,6 @@ Partial Class SimulationObjectsPanel resources.ApplyResources(Me.PanelSolids, "PanelSolids") Me.PanelSolids.Name = "PanelSolids" ' - 'TabPage9 - ' - resources.ApplyResources(Me.TabPage9, "TabPage9") - Me.TabPage9.Controls.Add(Me.PanelCE) - Me.TabPage9.Name = "TabPage9" - Me.TabPage9.UseVisualStyleBackColor = True - ' - 'PanelCE - ' - resources.ApplyResources(Me.PanelCE, "PanelCE") - Me.PanelCE.Name = "PanelCE" - ' - 'TabPage15 - ' - resources.ApplyResources(Me.TabPage15, "TabPage15") - Me.TabPage15.Controls.Add(Me.PanelELEC) - Me.TabPage15.Name = "TabPage15" - Me.TabPage15.UseVisualStyleBackColor = True - ' 'TabPage10 ' resources.ApplyResources(Me.TabPage10, "TabPage10") @@ -269,11 +242,6 @@ Partial Class SimulationObjectsPanel resources.ApplyResources(Me.PanelOther, "PanelOther") Me.PanelOther.Name = "PanelOther" ' - 'PanelELEC - ' - resources.ApplyResources(Me.PanelELEC, "PanelELEC") - Me.PanelELEC.Name = "PanelELEC" - ' 'SimulationObjectsPanel ' resources.ApplyResources(Me, "$this") @@ -290,8 +258,6 @@ Partial Class SimulationObjectsPanel Me.TabPage6.ResumeLayout(False) Me.TabPage7.ResumeLayout(False) Me.TabPage8.ResumeLayout(False) - Me.TabPage9.ResumeLayout(False) - Me.TabPage15.ResumeLayout(False) Me.TabPage10.ResumeLayout(False) Me.TabPage11.ResumeLayout(False) Me.TabPage13.ResumeLayout(False) @@ -310,7 +276,6 @@ Partial Class SimulationObjectsPanel Friend WithEvents TabPage6 As TabPage Friend WithEvents TabPage7 As TabPage Friend WithEvents TabPage8 As TabPage - Friend WithEvents TabPage9 As TabPage Friend WithEvents TabPage10 As TabPage Friend WithEvents TabPage11 As TabPage Friend WithEvents TabPage12 As TabPage @@ -321,7 +286,6 @@ Partial Class SimulationObjectsPanel Friend WithEvents PanelReactors As FlowLayoutPanel Friend WithEvents PanelColumns As FlowLayoutPanel Friend WithEvents PanelSolids As FlowLayoutPanel - Friend WithEvents PanelCE As FlowLayoutPanel Friend WithEvents PanelUser As FlowLayoutPanel Friend WithEvents PanelLogical As FlowLayoutPanel Friend WithEvents PanelOther As FlowLayoutPanel @@ -329,6 +293,4 @@ Partial Class SimulationObjectsPanel Friend WithEvents PanelIndicators As FlowLayoutPanel Friend WithEvents TabPage14 As TabPage Friend WithEvents PanelControllers As FlowLayoutPanel - Friend WithEvents TabPage15 As TabPage - Friend WithEvents PanelELEC As FlowLayoutPanel End Class diff --git a/DWSIM/Forms/FlowsheetComponents/SimulationObjectsPanel.en.resx b/DWSIM/Forms/FlowsheetComponents/SimulationObjectsPanel.en.resx index c95c1571a..a8224d9fe 100644 --- a/DWSIM/Forms/FlowsheetComponents/SimulationObjectsPanel.en.resx +++ b/DWSIM/Forms/FlowsheetComponents/SimulationObjectsPanel.en.resx @@ -276,51 +276,6 @@ Solids - - True - - - Fill - - - 7, 6, 7, 6 - - - 1966, 250 - - - 7, 6, 7, 6 - - - 1966, 250 - - - Clean Energy - - - True - - - Fill - - - 0, 0 - - - 7, 6, 7, 6 - - - 1966, 250 - - - 5 - - - 1966, 250 - - - Electrolyzers - 7, 6, 7, 6 diff --git a/DWSIM/Forms/FlowsheetComponents/SimulationObjectsPanel.resx b/DWSIM/Forms/FlowsheetComponents/SimulationObjectsPanel.resx index 880399b35..9b8b9d754 100644 --- a/DWSIM/Forms/FlowsheetComponents/SimulationObjectsPanel.resx +++ b/DWSIM/Forms/FlowsheetComponents/SimulationObjectsPanel.resx @@ -135,7 +135,7 @@ 1109, 137 - 11 + 9 0 @@ -173,12 +173,6 @@ True - - 0 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Fill @@ -186,9 +180,6 @@ TabControl1 - - 0 - Eletrolisadores @@ -204,9 +195,6 @@ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4, 22 - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -216,12 +204,6 @@ Fill - - 3 - - - 0, 0 - TabPage10 @@ -249,11 +231,14 @@ Fill + + 3, 3, 3, 3 + TabPage12 - - 4 + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 True @@ -264,8 +249,8 @@ System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 + + Fill System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -286,7 +271,7 @@ 1109, 137 - 12 + 10 TabPage7 @@ -318,7 +303,7 @@ PanelELEC - + 0 @@ -342,8 +327,11 @@ 0 - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1109, 137 + + + 0, 0 TabControl1 @@ -351,6 +339,9 @@ True + + True + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -360,6 +351,9 @@ 3 + + 0, 0 + 4, 22 @@ -379,7 +373,10 @@ 4 - 10 + 8 + + + 0, 0 False @@ -387,6 +384,9 @@ False + + 1109, 137 + TabPage9 @@ -408,9 +408,6 @@ System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -435,6 +432,9 @@ 1103, 131 + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 4, 22 @@ -444,20 +444,17 @@ PanelCE - - 5 + + Fill - - 4, 22 + + TabPage13 TabPage8 - - 8 - - - Microsoft Sans Serif, 8.25pt + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 0 @@ -477,17 +474,17 @@ 3, 3, 3, 3 - - 1103, 131 + + Microsoft Sans Serif, 8.25pt False - + 5 - - 1109, 137 + + 0 Fill @@ -510,9 +507,6 @@ 3 - - PanelMixers - $this @@ -537,17 +531,14 @@ 4, 22 - - TabPage13 - 2 Misturadores/Divisores - - 1 + + 0, 0 System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -582,15 +573,21 @@ 12 + + 4 + TabPage5 1117, 163 - + 0, 0 + + 4, 22 + True @@ -606,23 +603,23 @@ Separadores/Tanques - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TabPage11 - - 14 + + 1 - - TabPage5 + + 0 + + + 0 4, 22 - - TabPage14 + + 1109, 137 False @@ -699,8 +696,11 @@ 0, 0 - - 3, 3, 3, 3 + + 4, 22 + + + 13 TabControl1 @@ -708,8 +708,8 @@ 1109, 137 - - True + + 0 TabPage1 @@ -720,8 +720,8 @@ Fill - - 0 + + 12 6 @@ -729,8 +729,8 @@ System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - PanelIndicators + + 5 0, 0 @@ -765,30 +765,30 @@ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 13 + + TabControl1 TabPage6 - - Fill + + 1103, 131 - - 4, 22 + + PanelMixers Fill - - Fill - - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 - + 0 + + Indicadores + 1109, 137 @@ -796,7 +796,7 @@ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 13 + 11 1109, 137 @@ -804,6 +804,9 @@ TabPage15 + + TabPage5 + 1109, 137 @@ -819,17 +822,14 @@ 0, 0 - - 0 + + TabPage15 4, 22 - - TabPage15 - - - 0, 0 + + 4, 22 Lógicos @@ -843,20 +843,20 @@ System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1109, 137 + + TabPage14 System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Indicadores + + PanelIndicators PanelCO - - 0, 0 + + False TabPage11 @@ -870,8 +870,8 @@ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - TabControl1 + + 0, 0 False @@ -882,17 +882,17 @@ 1109, 137 - - False + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0, 0 + + 3 - - 0 + + 8 Controladores @@ -939,8 +939,8 @@ PanelSolids - - 1109, 137 + + 0 True diff --git a/DWSIM/Forms/FlowsheetComponents/SimulationObjectsPanel.vb b/DWSIM/Forms/FlowsheetComponents/SimulationObjectsPanel.vb index 9126bf9c5..bef126587 100644 --- a/DWSIM/Forms/FlowsheetComponents/SimulationObjectsPanel.vb +++ b/DWSIM/Forms/FlowsheetComponents/SimulationObjectsPanel.vb @@ -115,10 +115,9 @@ Public Class SimulationObjectsPanel Me.PanelIndicators.Controls.Add(item) Case SimulationObjectClass.Controllers Me.PanelControllers.Controls.Add(item) - Case SimulationObjectClass.CleanPowerSources - Me.PanelCE.Controls.Add(item) - Case SimulationObjectClass.Electrolyzers - Me.PanelELEC.Controls.Add(item) + 'Case SimulationObjectClass.CleanPowerSources + 'Case SimulationObjectClass.Electrolyzers + ' Me.PanelCE.Controls.Add(item) End Select Next diff --git a/DWSIM/Forms/FormWelcome.en.resx b/DWSIM/Forms/FormWelcome.en.resx index 0605d8c96..af0f4bb00 100644 --- a/DWSIM/Forms/FormWelcome.en.resx +++ b/DWSIM/Forms/FormWelcome.en.resx @@ -122,7 +122,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD0 - DwAAAk1TRnQBSQFMAgEBBQEAAVABBgFQAQYBEAEAARABAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFA + DwAAAk1TRnQBSQFMAgEBBQEAAVgBBgFYAQYBEAEAARABAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABIAMAAQEBAAEQBgABEP8AFQABeQF3ARMBcwFJAW4BJwFuAScBbgEnAW4BJwFuAScBbgEnAW4BJwFu AScBbgEnAW4BSAFuATUBc2QAAWoBbgG7AXsBdQF7AXMBewFyAXsBcQF7AVABewFPAXsBTwF7AU4BewFN AXsBLQF7AbgBfwFoAW5kAAFoAW4B/QF/AbQBfwGSAX8BkAF7AW4BewFsAXsBSgF7AUgBewFHAXsBJQF7 @@ -313,7 +313,7 @@ 764, 94 - 254, 41 + 456, 41 158, 16 @@ -321,6 +321,10 @@ Quick Create New Solid + + + False + 254, 67 @@ -349,7 +353,7 @@ Create New Data Regression Study - 441, 41 + 254, 41 169, 16 @@ -384,7 +388,6 @@ 114, 24 - 102 diff --git a/DWSIM/Forms/FormWelcome.resx b/DWSIM/Forms/FormWelcome.resx index 7b04b7d33..dc8f03461 100644 --- a/DWSIM/Forms/FormWelcome.resx +++ b/DWSIM/Forms/FormWelcome.resx @@ -118,8 +118,8 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 558, 39 + + 125, 19 PictureBox1 @@ -130,8 +130,8 @@ MiddleCenter - - ImageList1 + + TabControl1 @@ -140,40 +140,28 @@ 1 - - 0 - - - Zoom + + Right Label3 - - Right - 9, 96 - - True - Arial, 12pt, style=Bold 95, 120 - - 14, 53 + + 499, 731 4, 25 - - Top, Left, Right - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -183,6 +171,9 @@ TabPage5 + + 9, 156 + Top, Bottom, Left, Right @@ -192,14 +183,11 @@ Top - - Top, Left, Right - - - Right + + Button1 - - LinkLabel3 + + Zoom 4, 25 @@ -216,15 +204,21 @@ Panel3 + + Torne-se um Patrocinador + + + Button3 + + + Arial, 9.75pt, style=Bold + Carregar Existente System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl - 125, 16 @@ -246,8 +240,8 @@ Modelagem de Processos - - Button3 + + 1280, 825 294, 66 @@ -255,41 +249,29 @@ 100 - - 646, 0 - Descubra o DWSIM Pro System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Arial, 9.75pt - 0 - - $this - Flat Zoom - - 12, 9 - - - LinkLabel14 + + LinkLabel7 2 - - NoControl + + 0, 0 ImageBeforeText @@ -297,26 +279,32 @@ Arial, 9.75pt + + $this + Panel2 PictureBox7 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Crie ou carregue modelos de processos químicos em estado estacionário ou dinâmicos. 19, 15 + + Panel1 + Panel2 System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 95, 99 + + LinkLabel14 Panel2 @@ -330,14 +318,14 @@ 741, 120 - - ColumnHeader4 + + 360, 19 Arial, 9.75pt - - 160, 34 + + $this Button4 @@ -345,6 +333,9 @@ Panel3 + + 0 + Top, Left, Right @@ -357,14 +348,17 @@ 0 + + 3, 3 + Fill - - 12, 37 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Top, Left, Right + + 4, 4, 4, 4 Panel5 @@ -384,18 +378,15 @@ 100 + + 741, 93 + 13, 39 TabPage1 - - 13, 64 - - - $this - TabPage5 @@ -405,6 +396,12 @@ Arial, 9.75pt, style=Bold + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + Top, Left, Right @@ -414,29 +411,26 @@ System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - True TabControl1 - - PictureBox4 - 13, 36 1 + + 770, 49 + 499, 731 - - TabPage5 + + Panel7 System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -444,36 +438,33 @@ 3, 3 - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Arial, 9.75pt, style=Bold System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 12, 35 - True - - Panel1 + + Documentação + + + 5 True + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ColumnHeader1 True - - Panel7 - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -483,9 +474,6 @@ 241, 16 - - 4, 4, 4, 4 - Arial, 12pt, style=Bold @@ -495,8 +483,8 @@ NoControl - - True + + 3 102 @@ -504,9 +492,6 @@ 5 - - 99 - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -519,8 +504,8 @@ True - - 100, 23 + + Right 95, 119 @@ -537,32 +522,32 @@ Criar Novo Estudo - - Arial, 12pt, style=Bold - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 646, 0 - - Panel6 + + 499, 68 - - 3 + + 96 $this + + 168, 43 + 646, 0 151, 16 - - Criador de Substâncias / Regressão de Dados + + 0 - - 102 + + Zoom 2 @@ -573,14 +558,11 @@ Right - - 3 - True - - 101 + + NoControl 741, 73 @@ -597,17 +579,14 @@ NoControl - - 5 + + Guia do Usuário TabPage5 - - Flat - - - 95, 116 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 97 @@ -615,11 +594,8 @@ NoControl - - TabPage3 - - - Panel3 + + Panel1 3, 3, 3, 3 @@ -627,8 +603,8 @@ Top, Left, Right - - 23, 626 + + 215, 96 System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -639,23 +615,23 @@ 120, 16 - - 392, 40 + + $this - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 4, 25 - - TabPage5 + + 98 - - NoControl + + LinkLabel3 LinkLabel8 - - Panel4 + + 122, 34 128, 40 @@ -666,11 +642,8 @@ File - - ColumnHeader2 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + LinkLabel4 Label11 @@ -687,38 +660,41 @@ 13, 78 - - 122, 34 - 99 - - 1280, 825 - 5 0 + + NoControl + 98 Top, Bottom, Right - - NoControl + + 646, 0 + + + Top, Left, Right File + + Panel2 + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 14, 66 + + 23, 626 Right @@ -735,23 +711,17 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 499, 68 + + 100, 24 - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 558, 39 13, 86 - - Guia do Usuário - - - 125, 24 - - - Panel5 + + Label2 System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -768,35 +738,35 @@ Recursos de Aprendizagem - - Arial, 12pt, style=Bold - 40 - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 41 12, 40 - - 316, 40 + + Arial, 9.75pt, style=Bold - - 0 + + $this - - 100, 24 + + NoControl 3, 3 - - 96, 96 + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 360, 19 + + TabPage3 + + + 2 $this @@ -804,23 +774,26 @@ System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2 + ColumnHeader3 741, 102 - - 499, 731 + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 3 - - 100 + + 2 - - 741, 119 + + 103 lvsamples @@ -831,8 +804,8 @@ Label8 - - 0 + + NoControl LinkLabel12 @@ -840,8 +813,8 @@ 4 - - Fill + + 0 Label16 @@ -870,8 +843,8 @@ Panel5 - - TabPage2 + + Panel5 Arial, 8.25pt @@ -879,6 +852,9 @@ 493, 725 + + 98 + Panel4 @@ -887,7 +863,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2 - DwAAAk1TRnQBSQFMAgEBBQEAAeABBgHkAQYBEAEAARABAAT/AREBEAj/AUIBTQE2BwABNgMAASgDAAFA + DwAAAk1TRnQBSQFMAgEBBQEAAeABBgHoAQYBEAEAARABAAT/AREBEAj/AUIBTQE2BwABNgMAASgDAAFA AwABIAMAAQEBAAEQBgABEP8AFQABeQF3ARMBcwFJAW4BJwFuAScBbgEnAW4BJwFuAScBbgEnAW4BJwFu AScBbgEnAW4BSAFuATUBc2QAAWoBbgG7AXsBdQF7AXMBewFyAXsBcQF7AVABewFPAXsBTwF7AU4BewFN AXsBLQF7AbgBfwFoAW5kAAFoAW4B/QF/AbQBfwGSAX8BkAF7AW4BewFsAXsBSgF7AUgBewFHAXsBJQF7 @@ -961,17 +937,14 @@ Zoom - - Panel6 + + LinkLabel2 3 - - Panel2 - - - 97 + + 95, 116 39 @@ -979,17 +952,14 @@ Top, Left, Right - - 2 - Documentação da API System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 98 + + 1 NoControl @@ -997,9 +967,6 @@ TabControl1 - - NoControl - 2 @@ -1024,14 +991,17 @@ 93 - - 4 + + 741, 119 + + + Arial, 12pt, style=Bold Top, Left, Right - - Documentação + + Panel4 103 @@ -1045,35 +1015,47 @@ TabPage5 - - Arial, 12pt, style=Bold + + 3, 3, 3, 3 102 - - Panel7 - True 646, 0 + + True + 102 + + 0 + + + 97 + Right - - 98 + + Panel2 True - - $this + + True + + + Arial, 9.75pt, style=Bold + + + 95, 73 Panel6 @@ -1081,56 +1063,44 @@ True - - FormWelcome - - - Panel1 + + Arial, 12pt, style=Bold 95, 93 + + 97 + 773, 15 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - True 125, 16 - - 646, 0 - Label13 - - 104 - - - Label1 - - - PictureBox3 + + LinkLabel13 Arial, 9.75pt, style=Bold - - $this + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Panel2 - - 23, 504 + + 8 - - 318, 54 + + lvlatest Arial, 9.75pt @@ -1150,8 +1120,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + 12, 37 Right @@ -1159,35 +1129,32 @@ Panel5 + + 5 + Simulate 365 DASHBOARD Grátis para o DWSIM True - - True - - - Panel4 + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 99 - - 206, 19 + + 78 + + + Arial, 9.75pt, style=Bold 11, 34 - - 627, 41 - - - NoControl - - - 2 + + 4, 4, 4, 4 2 @@ -1195,8 +1162,8 @@ System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Label5 + + 12, 9 178, 19 @@ -1207,8 +1174,8 @@ 525, 16 - - 181, 54 + + System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 0 @@ -1219,8 +1186,8 @@ Zoom - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ColumnHeader2 499, 731 @@ -1252,8 +1219,8 @@ Panel5 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 1 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1267,8 +1234,8 @@ 5 - - Stretch + + Criador de Substâncias / Regressão de Dados 493, 725 @@ -1279,9 +1246,9 @@ Panel6 - - 3, 3, 3, 3 - + + Top, Left, Right + 13, 9 @@ -1291,20 +1258,17 @@ 499, 731 - - 6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Panel3 246, 16 - - Arial, 9.75pt, style=Bold + + 3 - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Top, Left, Right 3 @@ -1333,11 +1297,11 @@ 0 - - 1 + + Top, Left, Right - - $this + + Panel6 14, 43 @@ -1345,11 +1309,11 @@ 984 - - LinkLabel7 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4, 25 + + 627, 41 3, 3, 3, 3 @@ -1363,14 +1327,17 @@ Panel1 - + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl 113, 64 - - 770, 49 + + PictureBox3 Zoom @@ -1381,53 +1348,56 @@ MiddleRight - - Criar Nova Substância + + Arial, 9.75pt, style=Bold + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Arial, 9.75pt, style=Bold - - Arial, 9.75pt, style=Bold + + 101 + + + 102 99 - - NoControl + + ImageList1 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - File + + Panel4 PictureBox6 - - Arial, 9.75pt, style=Bold + + NoControl - - 2 + + 4 - - Arial, 9.75pt, style=Bold + + FormWelcome 69, 16 - - Panel4 - MiddleRight - - 741, 93 + + 12, 35 - - True + + 181, 54 97 @@ -1435,8 +1405,8 @@ Arial, 12pt, style=Bold - - 89 + + File NoControl @@ -1444,9 +1414,6 @@ 148, 16 - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 97 @@ -1459,17 +1426,17 @@ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 517, 16 + Label10 3, 3, 3, 3 - - Label2 - - - System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True 1 @@ -1477,8 +1444,8 @@ NoControl - - 98 + + NoControl 97 @@ -1489,44 +1456,47 @@ Zoom - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 125, 24 3 + + 2 + Panel7 23, 148 - - 44 + + Panel4 - - Bem-vindo ao DWSIM! + + 318, 54 Right - - True - True - - LinkLabel4 + + Panel7 NoControl + + Top, Left, Right + File - - LinkLabel13 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1537,11 +1507,8 @@ LinkLabel5 - - 41 - - - System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 TabPage2 @@ -1561,32 +1528,32 @@ Label7 - - LinkLabel2 - - - Faça Parte + + TabPage5 NoControl + + 160, 34 + + + 0 + 3 - - True + + ColumnHeader4 - - 95, 73 + + 89 Pastas - - Zoom - - - Label15 + + 23, 504 ImageBeforeText @@ -1594,17 +1561,26 @@ Panel5 + + System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 11, 12 + + 98 + + + NoControl + TabPage3 5 - - 4 + + 104 Panel6 @@ -1648,8 +1624,8 @@ 0 - - lvlatest + + Criar Nova Substância 2 @@ -1660,8 +1636,8 @@ Arial, 9.75pt, style=Bold - - 103 + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 119, 16 @@ -1669,6 +1645,9 @@ 101 + + 493, 725 + 4 @@ -1684,20 +1663,17 @@ 4, 4, 4, 4 - - Arial, 12pt, style=Bold - 125, 19 NoControl - - Recentes + + Zoom - - TabControl1 + + Arial, 12pt, style=Bold 3 @@ -1705,8 +1681,8 @@ Iniciar - - Top, Left, Right + + Panel6 Label4 @@ -1717,29 +1693,35 @@ 646, 0 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Flowsheets FOSSEE About FOSSEE - - Crie ou carregue modelos de processos químicos em estado estacionário ou dinâmicos. + + 200, 26 - - 99 + + TabPage2 - - Zoom + + 2 + + + 14, 53 101 - - Arial, 9.75pt, style=Bold + + 4 - - 2 + + PictureBox4 System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1750,17 +1732,14 @@ Panel4 - - 8 + + Panel1 Flat - - Programa de Responsabilidade Social do DWSIM - - - 125, 19 + + Arial, 12pt, style=Bold Criar Novo Sólido @@ -1771,23 +1750,26 @@ Apoie o desenvolvimento do DWSIM e ajude a mantê-lo sempre grátis e de código aberto. - - 101 + + $this - - NoControl + + 646, 0 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 TabPage5 - - 96 + + Fill - - 78 + + Faça Parte + + + Recentes 4 @@ -1795,17 +1777,23 @@ 4, 25 + + NoControl + Label12 - - Panel1 + + 6 TabControl1 - - NoControl + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 NoControl @@ -1822,11 +1810,11 @@ 800 - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2 - - 6 + + TabPage5 9 @@ -1834,44 +1822,44 @@ 37 - - NoControl - - - 646, 0 + + 100, 23 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 99 - - Button1 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl + + Flat True + + 98 + True System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - LinkLabel11 + + NoControl - - 493, 725 + + NoControl - - 215, 96 + + 99 - - Panel2 + + 206, 19 207, 19 @@ -1882,26 +1870,29 @@ Label6 - - 1 + + 96, 96 - - 0, 0 + + NoControl - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Label15 - - 9, 156 + + 44 - - 168, 43 + + Arial, 12pt, style=Bold + + + True 1 - - 98 + + Bem-vindo ao DWSIM! Completed Flowsheets @@ -1915,23 +1906,29 @@ System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl + + True System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0 + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + LinkLabel11 + + NoControl - - 5 + + 13, 64 - - 97 + + System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1951,20 +1948,20 @@ Button6 - - 0 + + NoControl True - - 98 + + Label5 - - Descubra como o irmão comercial do simulador de processos de código aberto DWSIM abre novas oportunidades para você e seus projetos. + + 392, 40 - - 517, 16 + + 95, 99 True @@ -1972,8 +1969,11 @@ Panel4 - - 2 + + Descubra como o irmão comercial do simulador de processos de código aberto DWSIM abre novas oportunidades para você e seus projetos. + + + True 101 @@ -1981,17 +1981,17 @@ 109, 16 - - 23, 253 + + 1 - - Top, Left, Right + + 6 System.Windows.Forms.ListView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Programa de Responsabilidade Social do DWSIM 646, 0 @@ -1999,11 +1999,8 @@ 800 - - 200, 26 - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Label1 7 @@ -2011,8 +2008,8 @@ $this - - NoControl + + 98 Zoom @@ -2029,32 +2026,35 @@ Top - - 4, 4, 4, 4 + + 14, 66 + + + 316, 40 Top, Left, Right - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 23, 253 143, 24 - - Arial, 9.75pt, style=Bold + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 96 - - NoControl + + 101 - - Arial, 12pt, style=Bold + + Arial, 9.75pt, style=Bold - - 1 + + Arial, 9.75pt Zoom @@ -2065,31 +2065,31 @@ lvlatestfolders - - Torne-se um Patrocinador + + NoControl 383, 19 - - 2 + + Stretch System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 3, 3 + + 100 - - True - 25 - - 17, 17 + + True en + + 17, 17 + \ No newline at end of file diff --git a/DWSIM/Forms/MainWindow/FormMain.vb b/DWSIM/Forms/MainWindow/FormMain.vb index 9bbaa65d0..69ad9f549 100644 --- a/DWSIM/Forms/MainWindow/FormMain.vb +++ b/DWSIM/Forms/MainWindow/FormMain.vb @@ -132,7 +132,7 @@ Public Class FormMain unitopassembly = My.Application.Info.LoadedAssemblies.Where(Function(x) x.FullName.Contains("DWSIM.UnitOperations")).FirstOrDefault aTypeList.AddRange(calculatorassembly.GetTypes().Where(Function(x) If(x.GetInterface("DWSIM.Interfaces.ISimulationObject") IsNot Nothing, True, False))) - aTypeList.AddRange(unitopassembly.GetTypes().Where(Function(x) If(x.GetInterface("DWSIM.Interfaces.ISimulationObject") IsNot Nothing, True, False))) + aTypeList.AddRange(unitopassembly.GetTypes().Where(Function(x) If(x.GetInterface("DWSIM.Interfaces.ISimulationObject") IsNot Nothing And Not x.IsAbstract, True, False))) For Each item In aTypeList.OrderBy(Function(x) x.Name) If Not item.IsAbstract Then diff --git a/DWSIM/My Project/AssemblyInfo.vb b/DWSIM/My Project/AssemblyInfo.vb index ca907c094..62a4991ce 100644 --- a/DWSIM/My Project/AssemblyInfo.vb +++ b/DWSIM/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - + ' \ No newline at end of file diff --git a/PlatformFiles/Common/readme.txt b/PlatformFiles/Common/readme.txt index e15a9e6dd..22efd9bc5 100644 --- a/PlatformFiles/Common/readme.txt +++ b/PlatformFiles/Common/readme.txt @@ -1,6 +1,6 @@ ================================================== DWSIM - Open Source Process Simulator -Version 7.5.6 +Version 7.5.7 Copyright (c) 2017-2022 Daniel Medeiros and contributors Copyright (c) 2008-2016 Daniel Medeiros, Gregor Reichert, Gustavo Leon ================================================== @@ -62,6 +62,12 @@ VERSION HISTORY / CHANGELOG The full changelog including souce code changes can be viewed at https://github.com/DanWBR/dwsim/commits/windows +Version 7.5.7 + +- Fixed a bug in PFR +- Fixed a bug in Rigorous Column +- Fixed an issue with LLE Diagram + Version 7.5.6 - Implemented #274: Number of Tubes in Tubular Reactors for Correct Pressure Drop Calculation diff --git a/PlatformFiles/Common/whatsnew.txt b/PlatformFiles/Common/whatsnew.txt index e0b234419..a2ae1f1b3 100644 --- a/PlatformFiles/Common/whatsnew.txt +++ b/PlatformFiles/Common/whatsnew.txt @@ -1,3 +1,9 @@ +Version 7.5.7 + +- Fixed a bug in PFR +- Fixed a bug in Rigorous Column +- Fixed an issue with LLE Diagram + Version 7.5.6 - Implemented #274: Number of Tubes in Tubular Reactors for Correct Pressure Drop Calculation