Skip to content

Commit

Permalink
v8.4.4 RC1
Browse files Browse the repository at this point in the history
  • Loading branch information
@DanWBR
DanWBR committed Apr 30, 2023
1 parent 8348a26 commit a293460
Show file tree
Hide file tree
Showing 58 changed files with 483 additions and 451 deletions.
4 changes: 2 additions & 2 deletions DWSIM.Automation.Tests/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyFileVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
<Assembly: AssemblyFileVersion("8.4.4.0")>
2 changes: 1 addition & 1 deletion DWSIM.Automation/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("8.4.3.0")]
[assembly: AssemblyVersion("8.4.4.0")]
2 changes: 1 addition & 1 deletion DWSIM.Drawing.SkiaSharp/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>

<Assembly: NeutralResourcesLanguageAttribute("en")>
2 changes: 1 addition & 1 deletion DWSIM.DrawingTools.SkiaSharp.Extended/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("8.4.3.0")]
[assembly: AssemblyVersion("8.4.4.0")]
2 changes: 1 addition & 1 deletion DWSIM.DynamicsManager/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
2 changes: 1 addition & 1 deletion DWSIM.ExtensionMethods.Eto/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("8.4.3.0")]
[assembly: AssemblyVersion("8.4.4.0")]
2 changes: 1 addition & 1 deletion DWSIM.ExtensionMethods/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
4 changes: 2 additions & 2 deletions DWSIM.FileStorage/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("8.4.3.0")]
[assembly: AssemblyFileVersion("8.4.3.0")]
[assembly: AssemblyVersion("8.4.4.0")]
[assembly: AssemblyFileVersion("8.4.4.0")]
2 changes: 1 addition & 1 deletion DWSIM.FlowsheetBase/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
2 changes: 1 addition & 1 deletion DWSIM.FlowsheetSolver/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
2 changes: 1 addition & 1 deletion DWSIM.GlobalSettings/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
4 changes: 2 additions & 2 deletions DWSIM.Inspector/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyFileVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
<Assembly: AssemblyFileVersion("8.4.4.0")>
2 changes: 1 addition & 1 deletion DWSIM.Interfaces/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
4 changes: 2 additions & 2 deletions DWSIM.Logging/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("8.4.3.0")]
[assembly: AssemblyFileVersion("8.4.3.0")]
[assembly: AssemblyVersion("8.4.4.0")]
[assembly: AssemblyFileVersion("8.4.4.0")]
2 changes: 1 addition & 1 deletion DWSIM.Math/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
2 changes: 1 addition & 1 deletion DWSIM.Plugins.HeatOfCombustion/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
2 changes: 1 addition & 1 deletion DWSIM.Plugins.NaturalGas/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
4 changes: 2 additions & 2 deletions DWSIM.ProFeatures/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyFileVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
<Assembly: AssemblyFileVersion("8.4.4.0")>
2 changes: 1 addition & 1 deletion DWSIM.Serializers.XML/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
2 changes: 1 addition & 1 deletion DWSIM.SharedClasses/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
2 changes: 1 addition & 1 deletion DWSIM.Thermodynamics.CoolPropInterface/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("8.4.3.0")]
[assembly: AssemblyVersion("8.4.4.0")]
2 changes: 1 addition & 1 deletion DWSIM.Thermodynamics.Databases.ChemeoLink/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
2 changes: 1 addition & 1 deletion DWSIM.Thermodynamics.Databases.DDBStructureLink/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
2 changes: 1 addition & 1 deletion DWSIM.Thermodynamics.Databases.KDBLink/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>

<Assembly: NeutralResourcesLanguageAttribute("en")>
2 changes: 1 addition & 1 deletion DWSIM.Thermodynamics.StandaloneLibrary/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
2 changes: 1 addition & 1 deletion DWSIM.Thermodynamics/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
1 change: 1 addition & 0 deletions DWSIM.UI.Desktop.Editors/DWSIM.UI.Desktop.Editors.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@
<ProjectReference Include="..\DWSIM.Drawing.SkiaSharp\DWSIM.DrawingTools.SkiaSharp.vbproj">
<Project>{77040ecc-07b9-4b21-8b1f-7e45764e35f0}</Project>
<Name>DWSIM.DrawingTools.SkiaSharp</Name>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\DWSIM.DrawingTools.SkiaSharp.Extended\DWSIM.DrawingTools.SkiaSharp.Extended.csproj">
<Project>{a58eb237-f703-45cf-89f9-e8b91bff76c1}</Project>
Expand Down
2 changes: 1 addition & 1 deletion DWSIM.UI.Desktop.Editors/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("8.4.3.0")]
[assembly: AssemblyVersion("8.4.4.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.
Expand Down
5 changes: 5 additions & 0 deletions DWSIM.UI.Desktop.Forms/DWSIM.UI.Desktop.Forms.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,11 @@
<Project>{aea79e29-5dff-4aa8-b431-087a67a1467b}</Project>
<Name>DWSIM.FlowsheetBase</Name>
</ProjectReference>
<ProjectReference Include="..\DWSIM.FlowsheetSolver\DWSIM.FlowsheetSolver.vbproj">
<Project>{1d223714-d3c8-463a-b4dc-fefa1323ec87}</Project>
<Name>DWSIM.FlowsheetSolver</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\DWSIM.GlobalSettings\DWSIM.GlobalSettings.vbproj">
<Project>{725c8134-9fe3-43aa-9b33-d9046657fb2a}</Project>
<Name>DWSIM.GlobalSettings</Name>
Expand Down
16 changes: 11 additions & 5 deletions DWSIM.UI.Desktop.Forms/Forms/Flowsheet/Flowsheet.eto.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
using SkiaSharp;
using DWSIM.UI.Controls;
using DWSIM.ExtensionMethods;
using System.Device.Location;

namespace DWSIM.UI.Forms
{
Expand Down Expand Up @@ -2387,10 +2386,17 @@ void SetupDeselectedContextMenu()
item5.Click += (sender, e) => CopyAsImage(2);
item6.Click += (sender, e) => CopyAsImage(3);

var item7 = new ButtonMenuItem { Text = "Perform Auto-Layout", Image = new Bitmap(Eto.Drawing.Bitmap.FromResource(imgprefix + "icons8-parallel_workflow.png")) };
var item7a = new ButtonMenuItem { Text = "Perform Natural Layout", Image = new Bitmap(Eto.Drawing.Bitmap.FromResource(imgprefix + "icons8-parallel_workflow.png")) };
var item7b = new ButtonMenuItem { Text = "Perform Auto-Layout", Image = new Bitmap(Eto.Drawing.Bitmap.FromResource(imgprefix + "icons8-parallel_workflow.png")) };
var item8 = new ButtonMenuItem { Text = "Restore Layout", Image = new Bitmap(Eto.Drawing.Bitmap.FromResource(imgprefix + "icons8-parallel_workflow.png")) };

item7.Click += (sender, e) =>
item7a.Click += (sender, e) =>
{
FlowsheetControl.FlowsheetSurface.ApplyNaturalLayout((List<string>)DWSIM.FlowsheetSolver.FlowsheetSolver.GetSolvingList(this.FlowsheetObject, false)[0], 75);
ActZoomFit.Invoke();
};

item7b.Click += (sender, e) =>
{
FlowsheetControl.FlowsheetSurface.AutoArrange();
ActZoomFit.Invoke();
Expand All @@ -2408,7 +2414,7 @@ void SetupDeselectedContextMenu()
item9.Click += (sender, e) => ExportToPDF();
item10.Click += (sender, e) => ExportToSVG();

deselctxmenu.Items.AddRange(new MenuItem[] { item0, new SeparatorMenuItem(), item1, item2, new SeparatorMenuItem(), item4, item5, item6, new SeparatorMenuItem(), item9, item10, new SeparatorMenuItem(), item7, item8 });
deselctxmenu.Items.AddRange(new MenuItem[] { item0, new SeparatorMenuItem(), item1, item2, new SeparatorMenuItem(), item4, item5, item6, new SeparatorMenuItem(), item9, item10, new SeparatorMenuItem(), item7a, item7b, item8 });

return;

Expand Down Expand Up @@ -2519,7 +2525,7 @@ private void EditSelectedObjectProperties()
{
if (selobj.ObjectType == Interfaces.Enums.GraphicObjects.ObjectType.GO_Table)
{
var editor = new DWSIM.UI.Desktop.Editors.Tables.PropertyTableEditor { Table = (TableGraphic)selobj };
var editor = new DWSIM.UI.Desktop.Editors.Tables.PropertyTableEditor { Table = (DWSIM.Drawing.SkiaSharp.GraphicObjects.Tables.TableGraphic)selobj };
editor.ShowInTaskbar = true;
editor.Topmost = true;
editor.Show();
Expand Down
2 changes: 1 addition & 1 deletion DWSIM.UI.Desktop.Forms/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("8.4.3.0")]
[assembly: AssemblyVersion("8.4.4.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.
Expand Down
4 changes: 2 additions & 2 deletions DWSIM.UI.Desktop.Shared/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("8.4.3.0")]
[assembly: AssemblyFileVersion("8.4.3.0")]
[assembly: AssemblyVersion("8.4.4.0")]
[assembly: AssemblyFileVersion("8.4.4.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.
Expand Down
2 changes: 1 addition & 1 deletion DWSIM.UI.Desktop/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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("8.4.3.0")]
[assembly: AssemblyVersion("8.4.4.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.
Expand Down
2 changes: 1 addition & 1 deletion DWSIM.UnitOperations/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>

<Assembly: NeutralResourcesLanguageAttribute("pt-BR")>
2 changes: 1 addition & 1 deletion DWSIM.XFlowsheet/My Project/AssemblyInfo.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("8.4.3.0")>
<Assembly: AssemblyVersion("8.4.4.0")>
14 changes: 7 additions & 7 deletions ...orms/FlowsheetComponents/FlowsheetSurfaceSkiaSharp/FlowsheetSurface_SkiaSharp.designer.vb
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a293460

Please sign in to comment.