Merge branch 'DanWBR:windows' into windows

mersadk · Apr 9, 2024 · 5fbeea3 · 5fbeea3
2 parents 7d1bc14 + 358cb6b
commit 5fbeea3
Show file tree

Hide file tree

Showing 11 changed files with 1,878 additions and 4,044 deletions.
diff --git a/DWSIM.UnitOperations/DWSIM.UnitOperations.vbproj b/DWSIM.UnitOperations/DWSIM.UnitOperations.vbproj
@@ -250,7 +250,6 @@
     <Compile Include="BaseClasses\UnitOperations.vb" />
     <Compile Include="Controllers\PIDController.vb" />
     <Compile Include="Controllers\PythonController.vb" />
-    <Compile Include="Databases\PumpDatabase.vb" />
     <Compile Include="EditingForms\Dynamics\EditingForm_SeparatorFiller.Designer.vb">
       <DependentUpon>EditingForm_SeparatorFiller.vb</DependentUpon>
     </Compile>
@@ -1154,15 +1153,6 @@
     <EmbeddedResource Include="EditingForms\Supporting\EditingForm_Pipe_UserDefinedU.resx">
       <DependentUpon>EditingForm_Pipe_UserDefinedU.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="EditingForms\Supporting\EditingForm_Pump_Curves.de.resx">
-      <DependentUpon>EditingForm_Pump_Curves.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="EditingForms\Supporting\EditingForm_Pump_Curves.en.resx">
-      <DependentUpon>EditingForm_Pump_Curves.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="EditingForms\Supporting\EditingForm_Pump_Curves.es.resx">
-      <DependentUpon>EditingForm_Pump_Curves.vb</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="EditingForms\Supporting\EditingForm_Pump_Curves.resx">
       <DependentUpon>EditingForm_Pump_Curves.vb</DependentUpon>
     </EmbeddedResource>

diff --git a/DWSIM.UnitOperations/Databases/PumpDatabase.vb b/DWSIM.UnitOperations/Databases/PumpDatabase.vb
diff --git a/DWSIM.UnitOperations/EditingForms/EditingForm_Pump.vb b/DWSIM.UnitOperations/EditingForms/EditingForm_Pump.vb
@@ -444,7 +444,7 @@ Public Class EditingForm_Pump
 
         If Loaded Then SimObject.FlowSheet.RegisterSnapshot(Interfaces.Enums.SnapshotType.ObjectData, SimObject)
 
-        Dim f As New EditingForm_Pump_Curves() With {.selectedpump = SimObject}
+        Dim f As New EditingForm_Pump_Curves() With {.selectedpump = SimObject, .Text = SimObject.GraphicObject.Tag + ": Performance Curves"}
         SimObject.FlowSheet.DisplayForm(f)
 
     End Sub

diff --git a/DWSIM.UnitOperations/EditingForms/Supporting/ComprExprCurveSet.vb b/DWSIM.UnitOperations/EditingForms/Supporting/ComprExprCurveSet.vb
@@ -203,7 +203,7 @@ Public Class ComprExprCurveSet
             If Not dg.Rows(e.RowIndex).Cells(0).ToString = "" _
                 And Not dg.Rows(e.RowIndex).Cells(1).ToString = "" Then
 
-                Dim x, y As New ArrayList
+                Dim x, y As New List(Of Double)
 
                 For Each r As DataGridViewRow In dg.Rows
                     If Not r.Cells(0).Value Is Nothing _
@@ -241,11 +241,11 @@ Public Class ComprExprCurveSet
 
     Sub DrawChart()
 
-        Dim pxh, pyh, pxp, pyp, pxe, pye As New ArrayList
+        Dim pxh, pyh, pxp, pyp, pxe, pye As New List(Of Double)
 
         Dim i As Integer
         Dim xunit, yunit As String
-        Dim x, y As ArrayList
+        Dim x, y As List(Of Double)
         'analyze data, interpolate, bla, bla bla...
 
         If curvedata("HEAD").Enabled Then
@@ -303,7 +303,7 @@ Public Class ComprExprCurveSet
                 ya0.Scale.FontSpec.Size = 10
                 ya0.Title.FontSpec.Size = 10
                 .YAxisList.Add(ya0)
-                With .AddCurve("Head", pxh.ToArray(GetType(Double)), pyh.ToArray(GetType(Double)), Color.Black)
+                With .AddCurve("Head", pxh.ToArray(), pyh.ToArray(), Color.Black)
                     .Line.IsVisible = True
                     .Line.IsSmooth = True
                     .Color = Color.Red
@@ -320,7 +320,7 @@ Public Class ComprExprCurveSet
                 ya0.Scale.FontSpec.Size = 10
                 ya0.Title.FontSpec.Size = 10
                 .YAxisList.Add(ya0)
-                With .AddCurve("Eff.", pxe.ToArray(GetType(Double)), pye.ToArray(GetType(Double)), Color.Black)
+                With .AddCurve("Eff.", pxe.ToArray(), pye.ToArray(), Color.Black)
                     .Line.IsVisible = True
                     .Line.IsSmooth = True
                     .Color = Color.Blue
@@ -337,7 +337,7 @@ Public Class ComprExprCurveSet
                 ya0.Scale.FontSpec.Size = 10
                 ya0.Title.FontSpec.Size = 10
                 .YAxisList.Add(ya0)
-                With .AddCurve("Power", pxp.ToArray(GetType(Double)), pyp.ToArray(GetType(Double)), Color.Black)
+                With .AddCurve("Power", pxp.ToArray(), pyp.ToArray(), Color.Black)
                     .Line.IsVisible = True
                     .Line.IsSmooth = True
                     .Color = Color.Blue