Merge pull request #394 from capocchi/version-5.1

Version 5.1

Author: capocchi

devsimpy/Container.py

@@ -2385,7 +2385,7 @@ def OnNewModel(self, event):
 			gmwiz = self.OnStartWizard(event)
 
 			# if wizard is finished witout closing
-			if gmwiz :
+			if gmwiz:
 
 				m = Components.BlockFactory.CreateBlock( canvas = self,
 													x = xm,
@@ -2420,8 +2420,7 @@ def OnNewModel(self, event):
 					# focus
 					#wx.CallAfter(self.SetFocus)
 
-				# Cleanup
-				gmwiz.Destroy()
+					# gmwiz.Destroy()
 
 		@BuzyCursorNotification
 		def OnPaste(self, event):

devsimpy/SimulationGUI.py

@@ -276,7 +276,7 @@ def MakePaneContent(self, pane):
 		# Set initial values and enable/disable based on package
 		if DEFAULT_DEVS_DIRNAME == 'PyDEVS':
 			self.cb2.SetValue(NTL)
-			self.cb3.Enable(False)
+			self.cb3.SetValue(VERBOSE)
 			cb4.Enable(False)
 			cb5.Enable(False)
 		elif DEFAULT_DEVS_DIRNAME == 'BrokerDEVS':
@@ -292,6 +292,11 @@ def MakePaneContent(self, pane):
 			cb4.SetValue(DYNAMIC_STRUCTURE)
 			cb5.SetValue(REAL_TIME and not NTL)
 
+		# Disable and uncheck verbose if plugin is not enabled
+		if not PluginManager.is_enable('verbose'):
+			self.cb3.SetValue(False)
+			self.cb3.Enable(False)
+		
 		pane.SetSizer(main_sizer)
 
 		# Bind events
@@ -606,8 +611,9 @@ def OnText(self, event):
 	def OnViewLog(self, event):
 		"""	When View button is clicked
 		"""
-		# The simulation verbose event occurs
-		PluginManager.trigger_event('START_SIM_VERBOSE', parent=self)
+		# The simulation verbose event occurs only if verbose is enabled
+		if self.verbose:
+			PluginManager.trigger_event('START_SIM_VERBOSE', parent=self)
 
 		# The activity tracking event occurs
 		PluginManager.trigger_event('VIEW_ACTIVITY_REPORT', parent=self, master=self.current_master)
@@ -947,39 +953,55 @@ def ErrorManager(self, msg):
 
 		### try to find the file which have the error from traceback
 		devs_error = False
+		# the pubsub call may pass whatever it likes; the original code assumed a
+		# (type, value, traceback) tuple and would crash if msg was anything else.
+		# be defensive: if unpacking fails treat it as a non‑devs error and fall
+		# through to the generic handler below.
 		try:
-			typ, val, tb = msg
-			trace = traceback.format_exception(typ, val, tb)
-
-			### paths in traceback
-			paths = [a for a in trace if a.split(',')[0].strip().startswith('File')]
-	
-			### find if DOMAIN_PATH is in the first file path of the trace
-			path = paths[-1]
-			devs_error = DOMAIN_PATH in path or DEVSIMPY_PACKAGE_PATH not in path
-				
+			if isinstance(msg, tuple) and len(msg) == 3:
+				typ, val, tb = msg
+				trace = traceback.format_exception(typ, val, tb)
+
+				### paths in traceback
+				paths = [a for a in trace if a.split(',')[0].strip().startswith('File')]
+				if paths:
+					# find if DOMAIN_PATH is in the last file path of the trace
+					p = paths[-1]
+					devs_error = DOMAIN_PATH in p or DEVSIMPY_PACKAGE_PATH not in p
+			else:
+				# msg didnt look like a tuple, maybe pubsub gave keyword args
+				sys.stdout.write(_("ErrorManager received unexpected message type %r\n") % (msg,))
 		except Exception as info:
-			sys.stdout.write(_("Error in ErrorManager: %s"%info))
-	
+			sys.stdout.write(_("Error in ErrorManager: %s" % info))
+
 		### if error come from devs python file
 		if devs_error:
 
 			try:
 				### simulate event button for the code editor
 				event = wx.PyCommandEvent(wx.EVT_BUTTON.typeId, self._btn1.GetId())
-			except:
+			except Exception:
 				pass
 			else:
 				### Error dialog
-				if not Container.MsgBoxError(event, self.parent, msg):
-				### if user dont want correct the error, we destroy the simulation windows
+				if not Container.MsgBoxError(event, getattr(self, 'parent', None), msg):
+					### if user dont want correct the error, we destroy the simulation windows
 					self.PrepareDestroyWin()
 					self.Destroy()
 				else:
-				### if user want to correct error through an editor, we stop simulation process for trying again after the error is corrected.
+					### if user want to correct error through an editor, we stop simulation process for trying again after the error is corrected.
 					self.OnStop(event)
 		else:
-			raise MyBad(msg)
+			# treat any other error the same way instead of raising; on  real
+			# non‑devs errors we simply show a message box and tear down the
+			# simulation so the program can continue gracefully.
+			try:
+				Container.MsgBoxError(None, getattr(self, 'parent', None), msg)
+			except Exception as info2:
+				sys.stdout.write(_("Error displaying error dialog: %s\nOriginal: %r") % (info2, msg))
+			# ensure simulation windows are cleaned up
+			self.PrepareDestroyWin()
+		self.Destroy()
 
 class SimulationDialogPanel(Base, wx.Panel):
 	""" Simulation Dialog Panel 

devsimpy/WizardGUI.py

@@ -332,7 +332,9 @@ def on_finished(self, evt):
 	def on_close(self, evt):
 		""" Close button has been pressed. Destroy the wizard.
 		"""
-		wx.CallAfter(self.Destroy)
+		# wx.CallAfter(self.Destroy)
+		self.canceled_flag = True
+		evt.Skip() 
 
 
 class ModelGeneratorWizard(Wizard):
@@ -905,7 +907,7 @@ def on_finished(self, evt):
 			self.inputs = in_SpinCtrl.GetValue()
 			self.outputs = out_SpinCtrl.GetValue()
 
-			print("the path : %s\nthe name : %s\nThe inputs ports:%s\n the ouputports%s\n"%(self.model_path, self.label, self.inputs, self.outputs))
+			# print("the path : %s\nthe name: %s\nThe inputs ports:%s\n the ouputports:%s\n"%(self.model_path, self.label, self.inputs, self.outputs))
 
 			### model path exist ?
 			if os.path.exists(self.model_path):