diff options
| author | DanWBR | 2022-07-25 09:44:29 -0400 |
|---|---|---|
| committer | DanWBR | 2022-07-25 09:44:29 -0400 |
| commit | 078e360549fa3f4caff0247bdfe4051204538802 (patch) | |
| tree | c7d599a831d3ac493488a63598fa72e2f9c188cd | |
| parent | 950d5c7a3b2d0e3649c9d83f4a2988935a540d33 (diff) | |
| download | crude-characterization-plugin-DWSIM-078e360549fa3f4caff0247bdfe4051204538802.tar.gz crude-characterization-plugin-DWSIM-078e360549fa3f4caff0247bdfe4051204538802.tar.bz2 crude-characterization-plugin-DWSIM-078e360549fa3f4caff0247bdfe4051204538802.zip | |
update
| -rw-r--r-- | Characterization/Form1.Designer.vb | 1 | ||||
| -rw-r--r-- | Characterization/Form1.vb | 13 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Characterization/Form1.Designer.vb b/Characterization/Form1.Designer.vb index f25ae40..54cf5bb 100644 --- a/Characterization/Form1.Designer.vb +++ b/Characterization/Form1.Designer.vb @@ -452,6 +452,7 @@ Partial Class Form1 'cbInputType ' Me.cbInputType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cbInputType.DropDownWidth = 200 Me.cbInputType.FormattingEnabled = True Me.cbInputType.Items.AddRange(New Object() {"Weight Percentages", "Volume Percentages", "Weight Percentages with SG Data", "Volume Percentages with SG Data"}) Me.cbInputType.Location = New System.Drawing.Point(141, 7) diff --git a/Characterization/Form1.vb b/Characterization/Form1.vb index 23c121b..2a062fb 100644 --- a/Characterization/Form1.vb +++ b/Characterization/Form1.vb @@ -248,7 +248,10 @@ Public Class Form1 scope.Exec(charact) Dim np As Object = Py.Import("numpy") - Dim charac1 As Object = scope.Get("characterization") + Dim characterization_wt As Object = scope.Get("characterization_wt") + Dim characterization_vol As Object = scope.Get("characterization_vol") + Dim characterization_wt_SG As Object = scope.Get("characterization_wt_SG") + Dim characterization_vol_SG As Object = scope.Get("characterization_vol_SG") Dim SG = TextBoxSG.Text.ToDoubleFromCurrent() @@ -282,15 +285,15 @@ Public Class Form1 Select Case cbInputType.SelectedIndex Case 0 - result = charac1.characterization_wt(SG, x, y) + result = characterization_wt(SG, x, y) Case 1 - result = charac1.characterization_vol(SG, x, y) + result = characterization_vol(SG, x, y) Case 2 Dim y2 = np.array(datay2) - result = charac1.characterization_wt_SG(SG, x, y) + result = characterization_wt_SG(SG, x, y) Case 3 Dim y2 = np.array(datay2) - result = charac1.characterization_vol_SG(SG, x, y) + result = characterization_vol_SG(SG, x, y) End Select 'return [Ti, Tf, Wf, Vf, Mf, MW, SG, Tb] |