Merge pull request #368 from capocchi/version-5.1

Version 5.1

Author: capocchi

devsimpy/DEVSKernel/PyPDEVS/pypdevs241/pypdevs

@@ -0,0 +1 @@
+Subproject commit 979d708a184d342313cc7c2b6bd24225e475af3b

devsimpy/DetachedFrame.py

@@ -99,7 +99,7 @@ def __init__(self, parent=None, ID=wx.NewIdRef(), title="", diagram=None, name="
 			self.canvas.stockRedo = []
 
 		### Menu ToolBar
-		toolbar = wx.ToolBar(self, wx.NewIdRef(), name='tb', style=wx.TB_HORIZONTAL | wx.NO_BORDER)
+		toolbar = self.CreateToolBar()
 		toolbar.SetToolBitmapSize((16,16))
 
 		if self.parent:

devsimpy/DiagramConstantsDialog.py

@@ -279,7 +279,7 @@ def GetData(self):
 	def OnCancel(self,evt):
 		"""	Close dialog.
 		"""
-		self.Destroy()
+		self.CallAfter(self.Destroy)
 
 	def OnHelp(self, event):
 		""" Help message dialogue.

devsimpy/Domain/Basic/Object.py

@@ -14,9 +14,6 @@
 #
 ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ##
 
-#import collections
-
-#Message = collections.namedtuple('Message', 'value time')
 
 class Message:
 	'''	The class Message provide the activation of all DEVS components.
@@ -27,6 +24,7 @@ class Message:
 		@type value: None
 		@type operation: string
 	'''
+	__slots__ = ("value", "time", "name")
 
 	###
 	def __init__(self, v=None, t=None):

devsimpy/Editor.py

@@ -228,8 +228,7 @@ def __init__(self, parent, ID, pos=wx.DefaultPosition, size=wx.DefaultSize, styl
 		"""
 		stc.StyledTextCtrl.__init__(self, parent, ID, pos, size, style)
 
-		# Do we want to automatically pop up command completion options?
-		
+		# Do we want to automatically pop up command completion options?		
 		self.autoComplete = True
 		self.autoCompleteIncludeMagic = True
 		self.autoCompleteIncludeSingle = True
@@ -469,34 +468,50 @@ def get_current_class(self, pos):
 
 	# ------------------ Événement frappe ------------------
 	def on_key_up(self, event):
+		"""On key up event handler for auto-completion.
+
+		Args:
+			event: _key up event
+		"""
 		key = event.GetKeyCode()
-		if (65 <= key <= 90) or (97 <= key <= 122) or key == ord('_') or key == ord('.'):
+
+		return 
+
+		if (65 <= key <= 90) or (97 <= key <= 122) or key in (ord('_'), ord('.')):
 			pos = self.GetCurrentPos()
 			start = self.WordStartPosition(pos, True)
 			length = pos - start
 			current_word = self.GetTextRange(start, pos)
 
 			self.update_classes_and_instances()
 
-			suggestions = set(keyword.kwlist)
-			words = set(self.GetText().split())
-			suggestions |= words
-
-			if '.' in current_word:
-				obj_name, prefix = current_word.rsplit('.', 1)
-				if obj_name == 'self':
-					cls_name = self.get_current_class(pos)
-					if cls_name and cls_name in self.classes:
-						suggestions |= self.classes[cls_name]
-						length = len(prefix)
-				else:
-					cls_name = self.instances.get(obj_name)
-					if cls_name and cls_name in self.classes:
-						suggestions |= self.classes[cls_name]
-						length = len(prefix)
+			final_suggestions = []
 
-			# Affiche suggestions locales immédiatement
-			self.AutoCompShow(length, " ".join(sorted(suggestions)))
+			print(current_word)
+			# --- CAS SPECIAL : self. ---
+			if current_word.startswith("self."):
+				prefix = current_word.split(".", 1)[1]  # ce qui est après self.
+				cls_name = self.get_current_class(pos)
+				print(cls_name, prefix, self.classes)
+				if cls_name and cls_name in self.classes:
+					
+					candidates = self.classes[cls_name]
+					# On ne garde que ce qui commence par le préfixe
+					final_suggestions = sorted(
+						[c for c in candidates if c.startswith(prefix)]
+					)
+					length = len(prefix)
+
+			# --- CAS GENERAL ---
+			# else:
+			# 	suggestions = set(keyword.kwlist)
+			# 	words = set(re.findall(r"[A-Za-z_][A-Za-z0-9_]*", self.GetText()))
+			# 	suggestions |= words
+			# 	final_suggestions = sorted(suggestions)
+
+			# Affiche uniquement si on a quelque chose à proposer
+			if final_suggestions:
+				self.AutoCompShow(length, " ".join(final_suggestions))
 
 			# Appel IA avec délai pour ne pas spammer
 			# self.last_key_time = time.time()
@@ -1615,11 +1630,13 @@ def CreateMenu(self):
 
 		return menubar
 
-	def CreateTB(self):
+	def CreateTB(self, tb=None):
 		""" Create tool-bar.
 		"""
 
-		tb = wx.ToolBar(self, wx.NewIdRef(), name='tb', style=wx.TB_HORIZONTAL | wx.NO_BORDER)
+		if not tb:
+			tb = wx.ToolBar(self, wx.NewIdRef(), name='tb', style=wx.TB_HORIZONTAL | wx.NO_BORDER)
+		
 		tb.SetToolBitmapSize((16, 16))# this required for non-standard size buttons on MSW
 
 		ai_help = _('Generative AI based modification' if bool(getattr(builtins, 'SELECTED_IA')) else 'Check the AI settings in Preferences')
@@ -1647,11 +1664,10 @@ def CreateTB(self):
 			self.Bind(wx.EVT_TOOL, self.nb.OnPaste, id= self.paste.GetId())
 			self.Bind(wx.EVT_TOOL, self.OnAiHelp, id=self.ai.GetId())
 
-		tb.Realize()
-
-		### Add: A. Dominici
 		tb.EnableTool(self.ai.GetId(), bool(getattr(builtins,'SELECTED_IA')))
 
+		tb.Realize()
+
 		return tb
 
 	def DoSearch(self, text):
@@ -2121,6 +2137,8 @@ def __init__(self, parent, id, title):
 		""" Constructor.
 		"""
 
+		Base.__init__(self, parent, id, title)
+		
 		### copy
 		self.parent = parent
 
@@ -2133,10 +2151,10 @@ def __init__(self, parent, id, title):
 		### create menu, toolbar and statusbar for the frame
 		self.menuBar = self.CreateMenu()
 		self.SetMenuBar(self.menuBar)
-		self.toolbar = self.CreateTB()
 		self.statusbar= self.GetStatusBar()
 
-		### set the tool bar
+		### create and set the tool bar
+		self.toolbar = self.CreateTB(self.CreateToolBar(wx.TB_HORIZONTAL | wx.NO_BORDER))
 		self.SetToolBar(self.toolbar)
 
 		### binding
@@ -2148,7 +2166,6 @@ def __init__(self, parent, id, title):
 		e = wx.SizeEvent(self.GetSize())
 		self.ProcessEvent(e)
 
-		Base.__init__(self, parent, id, title)
 
 class BlockBase(object):
 	### 
@@ -2621,11 +2638,13 @@ def __init__(self, parent, id, title, block):
 		EditorFrame.__init__(self, parent, id, title)
 		BlockBase.__init__(self, parent, id, title, block)
 
+		# Icon
 		icon_bitmap = load_and_resize_image('py_file.png')
-		icon = wx.Icon()
-		icon.CopyFromBitmap(icon_bitmap)
-		self.SetIcon(icon)
-		
+		if icon_bitmap and icon_bitmap.IsOk():
+			icon = wx.Icon()
+			icon.CopyFromBitmap(icon_bitmap)
+			self.SetIcon(icon)
+
 		self.ConfigureGUI()
 
 	###
@@ -2717,24 +2736,20 @@ def ConfigureGUI(self):
 		### insert new icon in toolbar (icon are not available in embeded editor (Show menu)
 		tb = self.GetToolBar()
 
-		tb.AddSeparator()
-		#tb.InsertSeparator(tb.GetToolsCount())
+		# tb.AddSeparator()
+		tb.InsertSeparator(tb.GetToolsCount())
 
-		### combo to insert tips text
-		cbID = wx.NewIdRef()
+		# ### combo to insert tips text
+		cbID = wx.NewIdRef()		
 		tb.AddControl(wx.ComboBox(tb, cbID, _("Choose to insert in place"), choices=self.getChoices(),size=(160,-1), style=wx.CB_DROPDOWN))
-		
-		### search text box 
+			
+		# ### search text box 
 		tb.AddStretchableSpace()
 		finddlg = TestSearchCtrl(tb, size=(150,-1), doSearch=self.DoSearch)
 		tb.AddControl(finddlg)
 
-		try:
-			tb.Realize()
-		except:
-			sys.stdout.write(_("Toolbar not displayed on mac..."))
-			pass
-
+		tb.Realize()
+		
 		if not self.cb.isCMD():
 			self.Bind(wx.EVT_MENU, self.OnInsertPeekPoke, id=peek.GetId())
 			self.Bind(wx.EVT_MENU, self.OnInsertPeekPoke, id=poke.GetId())
@@ -2760,6 +2775,7 @@ def ConfigureGUI(self):
 		self.Bind(wx.EVT_MENU, self.OnInsertDebug, id=debug.GetId())
 		self.Bind(wx.EVT_CLOSE, self.OnClose)
 
+
 	def OnClose(self,event):
 		"""
 		"""

devsimpy/LibPanel.py

@@ -111,7 +111,6 @@ def BuildToolbar(self):
 		"""
 
 		tb = wx.ToolBar(self, wx.NewIdRef())
-		#self.ToolBar = tb
 		tb.SetToolBitmapSize((16,16))# this required for non-standard size buttons on MSW
 
 		### Add tool

devsimpy/PlotGUI.py

@@ -277,7 +277,6 @@ def BuildToolbar(self):
 		"""
 
 		tb = self.CreateToolBar()
-		#tb = wx.ToolBar(self, style=wx.TB_HORIZONTAL|wx.NO_BORDER|wx.TB_FLAT)
 		tb.SetToolBitmapSize((16,16))
 
 		zoomLabel, zoomId = self.enableZoom.GetItemLabelText(), self.enableZoom.GetId()

devsimpy/SimulationGUI.py

@@ -494,7 +494,7 @@ def OnOk(self, event):
 
 				### clear all log file
 				for fn in [f for f in os.listdir(gettempdir()) if f.endswith('.devsimpy.log')]:
-					os.remove(os.path.join(gettempdir(),fn))
+					os.remove(os.path.join(gettempdir(), fn))
 
 				self.mem_offset = get_process_memory()
 
@@ -505,7 +505,8 @@ def OnOk(self, event):
 				if self.thread.end_flag:
 					self.OnTimer(event)
 				else:
-					self.timer.Start(-1)
+					# Déclenchement quasi immédiat (1 ms)
+					self.timer.Start(1)
 
 				### timer for real time
 				if self.real_time_flag: 

devsimpy/Utilities.py

@@ -67,17 +67,18 @@
 	@lru_cache(maxsize=128)
 	def load_and_resize_image(filename, width=16, height=16):
 		"""Charge une image et la redimensionne à width x height"""
-
 		image_path = os.path.join(ICON_PATH, filename)
 
 		if not os.path.isfile(image_path):
 			raise FileNotFoundError(f"File not found: {image_path}")
 
 		bitmap = wx.Bitmap(image_path)
-		image = bitmap.ConvertToImage()  # Conversion en wx.Image
-		image = image.Scale(width, height, wx.IMAGE_QUALITY_HIGH)  # Redimensionner l'image
-		return wx.Bitmap(image)  # Reconvertir en wx.Bitmap
-	
+		if not bitmap.IsOk():  # vérification essentielle sur macOS
+			raise RuntimeError(f"Failed to load bitmap: {image_path}")
+
+		image = bitmap.ConvertToImage()
+		image = image.Scale(width, height, wx.IMAGE_QUALITY_HIGH)
+		return wx.Bitmap(image)
 
 else:
 	def load_and_resize_image(filename, width=16, height=16):

devsimpy/WizardGUI.py

@@ -321,7 +321,7 @@ def on_page_changing(self, evt):
 	def on_cancel(self, evt):
 		"""Cancel button has been pressed.  Clean up and exit without continuing."""
 		self.canceled_flag = True
-		self.on_close(evt)
+		wx.CallAfter(self.Destroy)
 
 	def on_finished(self, evt):
 		"""Finish button has been pressed.  Give the specified values
@@ -331,8 +331,8 @@ def on_finished(self, evt):
 	def on_close(self, evt):
 		""" Close button has been pressed. Destroy the wizard.
 		"""
-		self.canceled_flag = True
-		self.Destroy()
+		wx.CallAfter(self.Destroy)
+		
 
 class ModelGeneratorWizard(Wizard):
 	""" Model Generator Wizard Class.
@@ -343,11 +343,11 @@ def __init__(self, *args, **kwargs):
 		"""
 
 		if 'specific_domain_path' in kwargs:
-			domain_path = kwargs['specific_domain_path']
+			domain_path = kwargs['specific_domain_path'] if kwargs['specific_domain_path'] else DOMAIN_PATH
 			del kwargs['specific_domain_path']
 		else:
 			domain_path = DOMAIN_PATH
-
+		
 		Wizard.__init__(self, *args, **kwargs)
 
         # properties of model
@@ -550,7 +550,8 @@ def plugin_path_call_back(evt):
 		# Create a page 4_1
 		page4_1 = CustomPage(self, _('Finish'))
 		# save filebrowse
-		init = os.path.join(domain_path, "%s.amd"%vbox2.GetItem(1).GetWindow().GetValue())
+		filename = vbox2.GetItem(1).GetWindow().GetValue()
+		init = os.path.join(domain_path, f"{filename}.amd")
 		fb2 = filebrowse.FileBrowseButton(	page4_1,
 											wx.NewIdRef(),
 											initialValue = init,