Merge pull request #385 from capocchi/version-5.1

add info diag

Author: capocchi

devsimpy/DetachedFrame.py

@@ -152,6 +152,10 @@ def __init__(self, parent=None, ID=wx.NewIdRef(), title="", diagram=None, name="
 			toolbar.EnableTool(ID_UPWARD, level != 0)
 		#=======================================================================
 
+		# Bouton d'information (NOUVEAU)
+		ID_DETACHED_INFO = self.toggle_list[6]
+		self.tools.append(toolbar.AddTool(ID_DETACHED_INFO, "", load_and_resize_image('info.png'), shortHelp=_('Help')))
+
 		toolbar.Realize()
 		self.SetToolBar(toolbar)
 

devsimpy/LibPanel.py

@@ -105,7 +105,7 @@ def __init__(self, parent, name):
 		self.__set_tips()
 
 	def BuildToolbar(self):
-		"""	creates one of the tool-bars
+		""" creates one of the tool-bars
 		The buttons act like radio buttons, setting a mode for the Panel
 		Only one of them is pressed at a time. The SetMode() method handles this
 		"""
@@ -128,13 +128,107 @@ def BuildToolbar(self):
 		self.Bind(wx.EVT_TOOL, self.tree.OnDelete, id=Menu.ID_DELETE_LIB)
 		#wx.EVT_TOOL(self, Menu.ID_IMPORT_LIB, mainW.OnImport)
 		self.Bind(wx.EVT_TOOL, self.tree.OnUpdateAll, id=Menu.ID_REFRESH_LIB)
-		self.Bind(wx.EVT_TOOL, self.tree.OnInfo, id=Menu.ID_HELP_LIB)
+		self.Bind(wx.EVT_TOOL, self.OnShowLibraryHelp, id=Menu.ID_HELP_LIB)  # Modifié ici
 		self.Bind(wx.EVT_TOOL, self.tree.OnMCCClick, id=Menu.ID_MCC_LIB) 
 
 		tb.Realize()
 
 		return tb
 
+	def OnShowLibraryHelp(self, event):
+		"""Show help dialog about library management"""
+		
+		help_msg = _(
+			"LIBRARY MANAGEMENT PANEL\n\n"
+			"═══════════════════════════════════════\n\n"
+			"OVERVIEW:\n\n"
+			"The library panel allows you to manage DEVS model libraries.\n"
+			"Libraries are collections of reusable DEVS components that can be\n"
+			"instantiated in your diagrams using drag-and-drop.\n\n"
+			"═══════════════════════════════════════\n\n"
+			"TOOLBAR BUTTONS:\n\n"
+			"• Import (+): Add a new library to DEVSimPy.\n"
+			"  You can import:\n"
+			"  - Local directories containing Python DEVS models\n"
+			"  - ZIP archives (.zip) with model collections\n"
+			"  - Remote libraries from URLs\n\n"
+			"• Delete (-): Remove selected library from the tree.\n"
+			"  Warning: This only removes from DEVSimPy, not from disk.\n\n"
+			"• Reload (⟳): Refresh all libraries to detect new models.\n"
+			"  Use this after modifying model files externally.\n\n"
+			"• Help (i): Show this help message.\n\n"
+			"• A-Z: Toggle alphabetical sorting of models in libraries.\n"
+			"  When enabled, models are sorted by name.\n"
+			"  When disabled, models appear in directory order.\n\n"
+			"═══════════════════════════════════════\n\n"
+			"LIBRARY TREE:\n\n"
+			"• Folders: Represent library directories\n"
+			"• Green blocks: Atomic DEVS models (CodeBlock)\n"
+			"• Yellow blocks: Coupled DEVS models (ContainerBlock)\n"
+			"• Gray items: Invalid or incompatible models\n\n"
+			"Right-click on items for context menu options:\n"
+			"- Edit: Open model Python file in editor\n"
+			"- Documentation: View model documentation\n"
+			"- Properties: Inspect model metadata\n"
+			"- Rename: Change model label\n"
+			"- Export: Save model to file\n\n"
+			"═══════════════════════════════════════\n\n"
+			"SEARCH FIELD:\n\n"
+			"Type to search for models by name across all libraries.\n"
+			"Results appear in a temporary search tree.\n"
+			"Click the X button to clear search and return to main tree.\n\n"
+			"═══════════════════════════════════════\n\n"
+			"HOW TO USE MODELS:\n\n"
+			"1. Expand library folders to see available models\n"
+			"2. Drag a model from the library tree\n"
+			"3. Drop it onto the diagram canvas (right panel)\n"
+			"4. The model is instantiated and ready to use\n"
+			"5. Connect models by dragging from output to input ports\n\n"
+			"═══════════════════════════════════════\n\n"
+			"LIBRARY TYPES:\n\n"
+			"• Domain Libraries: Official DEVSimPy model collections\n"
+			"  (Physics, Networks, Control, etc.)\n\n"
+			"• User Libraries: Your custom model collections\n"
+			"  Add them via Import button\n\n"
+			"• Remote Libraries: Libraries loaded from URLs\n"
+			"  Automatically updated when available\n\n"
+			"═══════════════════════════════════════\n\n"
+			"TIPS:\n\n"
+			"- Use search to quickly find models in large libraries\n"
+			"- Keep libraries organized in thematic folders\n"
+			"- Reload after editing model Python files\n"
+			"- Right-click models to view documentation\n"
+			"- Use alphabetical sorting for easier navigation\n"
+			"- Import ZIP archives to share library collections\n\n"
+			"═══════════════════════════════════════\n\n"
+			"CREATING YOUR OWN LIBRARIES:\n\n"
+			"1. Create a folder with your Python DEVS models\n"
+			"2. Each model should inherit from DomainBehavior/DomainStructure\n"
+			"3. Use Import button to add your folder to DEVSimPy\n"
+			"4. Your models appear in the library tree\n"
+			"5. Optionally, create a ZIP archive for distribution\n\n"
+			"For more information, consult the DEVSimPy documentation."
+		)
+		
+		try:
+			import wx.lib.dialogs
+			dlg = wx.lib.dialogs.ScrolledMessageDialog(
+				self, 
+				help_msg, 
+				_("Library Management Help"),
+				size=(650, 600)
+			)
+			dlg.ShowModal()
+			dlg.Destroy()
+		except Exception as e:
+			# Fallback si wx.lib.dialogs n'est pas disponible
+			wx.MessageBox(
+				help_msg,
+				_("Library Management Help"),
+				wx.OK | wx.ICON_INFORMATION
+			)
+
+
 	def __set_tips(self):
 		"""
 		"""

devsimpy/devsimpy.py

@@ -614,6 +614,7 @@ def MakeToolBar(self):
 		tb.AddControl(level_label)
 		tb.AddControl(self.spin)
 
+	
 		### add button to define downward and upward rules
 		ID_UPWARD = self.toggle_list[4]
 		ID_DOWNWARD = self.toggle_list[5]
@@ -626,7 +627,11 @@ def MakeToolBar(self):
 
 		##############################################################################################
 
-		for i in (3,8,12,17,21):
+		# Bouton d'information de la toolbar (NOUVEAU)
+		ID_TOOLBAR_INFO = self.toggle_list[6]
+		self.tools.append(tb.AddTool(ID_TOOLBAR_INFO, "", load_and_resize_image("info.png"), shortHelp="Toolbar Help"))
+
+		for i in (3,8,12,17,21,23):
 			tb.InsertSeparator(i)
 
 		### undo and redo button desabled
@@ -638,12 +643,30 @@ def MakeToolBar(self):
 		### default direct connector toogled
 		tb.ToggleTool(self.toggle_list[0], 1)
 
-		### Binding
+		# Bindings
 		tool_bindings = [
-			self.OnNew, self.OnOpenFile, self.OnPrintPreview, self.OnSaveFile, self.OnSaveAsFile,
-			self.OnUndo, self.OnRedo, self.OnZoom, self.OnUnZoom, self.AnnuleZoom,
-			self.OnPriorityGUI, self.OnCheck, self.OnPlugins, self.OnSimulation,
-			self.OnDirectConnector, self.OnSquareConnector, self.OnLinearConnector, self.OnCurveConnector
+			self.OnNew,
+			self.OnOpenFile,
+			self.OnPrintPreview,
+			self.OnSaveFile,
+			self.OnSaveAsFile,
+			self.OnUndo,
+			self.OnRedo,
+			self.OnZoom,
+			self.OnUnZoom,
+			self.AnnuleZoom,
+			self.OnPriorityGUI,
+			self.OnCheck,
+			self.OnPlugins,
+			self.OnSimulation,
+			self.OnDirectConnector,
+			self.OnSquareConnector,
+			self.OnLinearConnector,
+			self.OnCurveConnector,
+			None,  # Placeholder for level_label (no binding)
+			None,  # Placeholder for spin (has its own binding)
+			self.OnDownWard,
+			self.OnUpWard
 		]
 
 		for tool, handler in zip(self.tools, tool_bindings):
@@ -657,10 +680,108 @@ def MakeToolBar(self):
 		self.Bind(wx.EVT_TOOL, self.OnUpWard, id=ID_UPWARD)
 		self.Bind(wx.EVT_TOOL, self.OnDownWard, id=ID_DOWNWARD)
 
+		self.Bind(wx.EVT_TOOL, self.OnShowToolbarHelp, id=ID_TOOLBAR_INFO)
 		tb.Realize()
 
 		# self.SetToolBar(tb)
 
+	def OnShowToolbarHelp(self, event):
+		"""Show help dialog about toolbar buttons"""
+		
+		help_msg = _(
+			"DEVSimPy TOOLBAR GUIDE\n\n"
+			"═══════════════════════════════════════\n\n"
+			"FILE OPERATIONS:\n\n"
+			"• New (📄): Create a new empty DEVS diagram\n"
+			"  Shortcut: Ctrl+N\n\n"
+			"• Open (📂): Load an existing .dsp or .yaml diagram file\n"
+			"  Shortcut: Ctrl+O\n\n"
+			"• Print Preview (🖨️): Preview diagram before printing\n"
+			"  Shortcut: Ctrl+P\n\n"
+			"• Save (💾): Save current diagram to file\n"
+			"  Shortcut: Ctrl+S\n"
+			"  If file is new, will prompt for filename\n\n"
+			"• Save As (💾+): Save diagram with a new name\n"
+			"  Creates a copy with different filename\n\n"
+			"═══════════════════════════════════════\n\n"
+			"EDITING OPERATIONS:\n\n"
+			"• Undo (↶): Undo last action\n"
+			"  Click to undo once\n"
+			"  Hold to see full history\n\n"
+			"• Redo (↷): Redo previously undone action\n"
+			"  Click to redo once\n"
+			"  Hold to see forward history\n\n"
+			"═══════════════════════════════════════\n\n"
+			"VIEW OPERATIONS:\n\n"
+			"• Zoom In (🔍+): Enlarge diagram view\n"
+			"  Makes models appear bigger\n\n"
+			"• Zoom Out (🔍-): Reduce diagram view\n"
+			"  Makes models appear smaller\n\n"
+			"• Reset Zoom (🔍): Return to 100% normal size\n"
+			"  Cancels all zoom operations\n\n"
+			"═══════════════════════════════════════\n\n"
+			"DEVS TOOLS:\n\n"
+			"• Priority (F3): Define execution order for coupled models\n"
+			"  (PyDEVS only - not available in PyPDEVS)\n\n"
+			"• Debugger (F4): Check diagram for errors\n"
+			"  Validates model connections and structure\n"
+			"  Must run before simulation\n\n"
+			"• Plugins: Manage DEVSimPy plugins\n"
+			"  Enable/disable extensions\n"
+			"  Configure plugin settings\n\n"
+			"• Simulation (F5): Launch simulation dialog\n"
+			"  Start DEVS simulation process\n"
+			"  Configure simulation parameters\n\n"
+			"═══════════════════════════════════════\n\n"
+			"CONNECTION TYPES:\n\n"
+			"Choose how connections between models are drawn:\n\n"
+			"• Direct (—): Straight line connections\n"
+			"  Shortest path between ports\n\n"
+			"• Square (⌐⌙): Right-angle connections\n"
+			"  Horizontal then vertical routing\n\n"
+			"• Linear (╱): Diagonal straight lines\n"
+			"  Direct but with angle constraints\n\n"
+			"• Curve (∿): Curved/bezier connections\n"
+			"  Smooth rounded paths\n\n"
+			"═══════════════════════════════════════\n\n"
+			"ABSTRACTION HIERARCHY:\n\n"
+			"• Level: Select abstraction level (0-20)\n"
+			"  Level 0: Base diagram\n"
+			"  Level 1+: Abstract views with DAM/UAM\n\n"
+			"• Downward (⬇): Configure downward abstraction rules\n"
+			"  Define how to aggregate lower levels\n\n"
+			"• Upward (⬆): Configure upward abstraction rules\n"
+			"  Define how to detail higher levels\n\n"
+			"Note: DAM (Downward Abstraction Manager) and UAM (Upward\n"
+			"Abstraction Manager) are only available at level > 0\n\n"
+			"═══════════════════════════════════════\n\n"
+			"TIPS:\n\n"
+			"- Always save before simulation\n"
+			"- Run Debugger (F4) before Simulation (F5)\n"
+			"- Use connection types for cleaner diagrams\n"
+			"- Undo/Redo support most editing operations\n"
+			"- Zoom controls help with large diagrams\n"
+			"- Abstraction levels enable hierarchical modeling"
+		)
+		
+		try:
+			import wx.lib.dialogs
+			dlg = wx.lib.dialogs.ScrolledMessageDialog(
+				self, 
+				help_msg, 
+				_("Toolbar Help"),
+				size=(650, 600)
+			)
+			dlg.ShowModal()
+			dlg.Destroy()
+		except Exception as e:
+			# Fallback
+			wx.MessageBox(
+				help_msg,
+				_("Toolbar Help"),
+				wx.OK | wx.ICON_INFORMATION
+			)
+
 	def GetExportPathsList(self):
 		""" Return the list of exported path.
 		"""