Flowsheet UO bug fix

DanWBR · Nov 13, 2017 · f5cfb1f · f5cfb1f
1 parent e70cfca
commit f5cfb1f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/DWSIM.Drawing/GraphicsSurface/DesignSurface.vb b/DWSIM.Drawing/GraphicsSurface/DesignSurface.vb
@@ -1304,6 +1304,8 @@ Imports DWSIM.Interfaces.Enums.GraphicObjects
 
     Private Sub DrawPropertyListBlock(canvas As Graphics, gobj As GraphicObject)
 
+        If gobj.Owner Is Nothing Then Exit Sub
+
         Dim gCon As Drawing2D.GraphicsContainer
         gCon = canvas.BeginContainer()
         canvas.ScaleTransform(Zoom, Zoom)

diff --git a/DWSIM.UnitOperations/Unit Operations/FlowsheetUO.vb b/DWSIM.UnitOperations/Unit Operations/FlowsheetUO.vb
@@ -249,27 +249,16 @@ Label_00CC:
 
             data = xdoc.Element("DWSIM_Simulation_Data").Element("Compounds").Elements.ToList
 
-            Dim complist As New Concurrent.ConcurrentBag(Of ConstantProperties)
-
-            Parallel.ForEach(data, Sub(xel)
-                                       Try
-                                           Dim obj As New ConstantProperties
-                                           obj.LoadData(xel.Elements.ToList)
-                                           complist.Add(obj)
-                                       Catch ex As Exception
-                                           excs.Add(New Exception("Error Loading Compound Information", ex))
-                                       End Try
-                                   End Sub)
-
-            Dim orderedlist = complist.OrderBy(Function(o) o.Molar_Weight)
-
-            For Each obj In orderedlist
-                fs.SelectedCompounds.Add(obj.Name, obj)
+            For Each xel As XElement In data
+                Try
+                    Dim obj As New ConstantProperties
+                    obj.LoadData(xel.Elements.ToList)
+                    fs.Options.SelectedComponents.Add(obj.Name, obj)
+                Catch ex As Exception
+                    excs.Add(New Exception("Error Loading Compound Information", ex))
+                End Try
             Next
 
-            complist = Nothing
-            orderedlist = Nothing
-
             data = xdoc.Element("DWSIM_Simulation_Data").Element("PropertyPackages").Elements.ToList
 
             For Each xel As XElement In data