Merge pull request #365 from capocchi/version-5.1

Version 5.1

Author: capocchi

devsimpy/Container.py

@@ -1347,9 +1347,9 @@ def draw(self, dc):
 		dc.SetPen(wx.Pen(*pen_args))
 
 		if self.dashed:
-			self.pen[2] = wx.PENSTYLE_DOT_DASH
+			self.pen[2] = 104 # wx.PENSTYLE_DOT_DASH
 		else:
-			self.pen[2] = wx.PENSTYLE_SOLID
+			self.pen[2] = 100 # wx.PENSTYLE_SOLID
 
 		# Set the brush color
 		dc.SetBrush(wx.Brush(brushclr))
@@ -2981,7 +2981,7 @@ def OnMotion(self, event):
 
 							### dot trace to prepare connection
 							if len(s.pen)>2:
-								s.pen[2]= wx.PENSTYLE_DOT
+								s.pen[2]= 101 #wx.PENSTYLE_DOT
 
 							if cursor != wx.StockCursor(wx.CURSOR_HAND):
 								cursor = wx.StockCursor(wx.CURSOR_HAND)

devsimpy/Domain/Collector/Plotly_For_Class.py

@@ -13,7 +13,6 @@
 
 ### Specific import ------------------------------------------------------------
 from DomainInterface import DomainBehavior
-from DomainInterface import Message
 
 import chart_studio.plotly as py
 import plotly.graph_objects as go

devsimpy/Domain/Collector/To_Stdout.py

@@ -13,9 +13,7 @@
 
 ### Specific import ------------------------------------------------------------
 from DomainInterface import DomainBehavior
-from DomainInterface import Message
 
-import sys
 
 ### Model class ----------------------------------------------------------------
 class To_Stdout(DomainBehavior):

devsimpy/Domain/Generator/Generator.py

@@ -12,7 +12,7 @@
 
 
 from DomainInterface import DomainBehavior
-from DomainInterface import Message
+from DomainInterface.Object import Message
 
 import os.path
 

devsimpy/Domain/Generator/RandomGenerator.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 
 from DomainInterface import DomainBehavior
-from DomainInterface import Message
+from DomainInterface.Object import Message
 
-import sys
 import random
 
 class RandomGenerator(DomainBehavior):

devsimpy/InteractionYAML.py

@@ -26,8 +26,11 @@ def to_Python(val):
             return val
         elif str(val).replace('.','').replace('-','').isdigit():
             return eval(str(val))
-    elif isinstance(eval(val),list) or isinstance(eval(val),tuple):
-        return eval(val)
+        elif isinstance(eval(val), (list, tuple)):
+            return eval(val)
+    elif isinstance(val, (list, tuple)):
+        val = [to_Python(v) for v in val]
+        return val
 
     return val
 

devsimpy/Mixins/Savable.py

@@ -517,7 +517,7 @@ def Save(self, obj_dumped, fileName=None) -> bool:
 			yaml.register_class(PickledCollection)
 
 			with open(fileName, 'w') as yf:
-				yaml.dump(PickledCollection(obj_dumped), stream=yf, default_flow_style=False)
+				yaml.dump(PickledCollection(obj_dumped), stream=yf)
 
 		except (AttributeError, Exception) as error:
 			sys.stderr.write(f"Warning: First attempt to save YAML failed, retrying in 'unsafe' mode: {error}\n")
@@ -548,6 +548,7 @@ def Open(fileName:str):
 		Args:
 			fileName (str): YAML filename
 		"""
+		global _
 
 		## try to open f with compressed mode
 		try:
@@ -595,8 +596,12 @@ def Load(self, obj_loaded, fileName=None) -> bool:
 			sys.stderr.write(f"Problem loading file '{fileName}': {tb}\n")
 			return False
 
+		if not dsp:
+			sys.stderr.write(f"Failed to load data from file '{fileName}'.\n")
+			return False
+		
 		# Vérification de la correspondance des longueurs
-		if len(dsp) != len(obj_loaded.dump_attributes):
+		if (len(dsp) != len(obj_loaded.dump_attributes)):
 			raise ValueError(f"Mismatch between attributes and dumped data: {len(obj_loaded.dump_attributes)} != {len(dsp)}")
 
 		# Assignation des attributs en utilisant zip

devsimpy/WizardGUI.py

@@ -71,7 +71,7 @@ def atomicCode(label):
 
 ### Specific import ------------------------------------------------------------
 from DomainInterface import DomainBehavior
-from DomainInterface import Message
+from DomainInterface.Object import Message
 
 ### Model class ----------------------------------------------------------------
 class %s(DomainBehavior):