Version 4.0

Container.py

@@ -2076,18 +2076,18 @@ def OnNewModel(self, event):
 			""" New model menu has been pressed. Wizard is instanciate.
 			"""
 
+			### mouse positions
+			xwindow, ywindow = wx.GetMousePosition()
+			if wx.VERSION_STRING < '4.0':
+				xm,ym = self.ScreenToClientXY(xwindow, ywindow)
+			else:
+				xm,ym = self.ScreenToClient(wx.Point(xwindow, ywindow))
+
 			gmwiz = self.OnStartWizard(event)
 
 			# if wizard is finished witout closing
 			if  gmwiz :
 
-				### mouse positions
-				xwindow, ywindow = wx.GetMousePosition()
-				if wx.VERSION_STRING < '4.0':
-					xm,ym = self.ScreenToClientXY(xwindow, ywindow)
-				else:
-					xm,ym = self.ScreenToClient(wx.Point(xwindow, ywindow))
-
 				m = Components.BlockFactory.CreateBlock( canvas = self,
 													x = xm,
 													y = ym,
@@ -2442,6 +2442,7 @@ def OnLeftUp(self, event):
 							y = s.y[0]*self.scaley
 							w = (s.x[1]-s.x[0])*self.scalex
 							h = (s.y[1]-s.y[0])*self.scaley
+
 							recS = wx.Rect(x,y,w,h)
 
 							# si les deux rectangles se chevauche
@@ -2476,7 +2477,7 @@ def OnMouseLeave(self, event):
 		def DiagramModified(self):
 			""" Modification printing in statusbar and modify value manager.
 
-				This method manage the propagation of modification
+				This method manage the propagation of modification.
 				from window where modifications are performed to DEVSimPy main window.
 			"""
 
@@ -2815,7 +2816,7 @@ def GetState(self):
 
 #-----------------------------------------------------------
 class LinesShape(Shape):
-	"""
+	""" Line Shape Class.
 	"""
 
 	def __init__(self, line):

ImportLibrary.py

@@ -125,66 +125,43 @@ def __init__(self, *args, **kwargs):
 
 		self.InitUI()
 		self.SetSize((250, 200))
-
+		self.Centre() 
+
 	def InitUI(self):
 		""" Init the user interface.
 		"""
 
-		pnl = wx.Panel(self)
-		vbox = wx.BoxSizer(wx.VERTICAL)
-
-		sb = wx.StaticBox(pnl, label='Delete?')
-		sbs = wx.StaticBoxSizer(sb, orient=wx.VERTICAL)
-		self.rb1 = wx.RadioButton(pnl, label=_('label'))
-		self.rb2 = wx.RadioButton(pnl, label=_('label and files'))
-		sbs.Add(self.rb1)
-		sbs.Add(self.rb2)
+		panel = wx.Panel(self) 
+		vbox = wx.BoxSizer(wx.VERTICAL) 
+		nm = wx.StaticBox(panel, -1, 'Delete?') 
+		nmSizer = wx.StaticBoxSizer(nm, wx.VERTICAL) 
 
-		pnl.SetSizer(sbs)
-
-		hbox2 = wx.BoxSizer(wx.HORIZONTAL)
-		okButton = wx.Button(self, wx.ID_OK, label='Ok')
-		closeButton = wx.Button(self, wx.ID_CANCEL, label='Close')
-		hbox2.Add(okButton)
-		hbox2.Add(closeButton, flag=wx.LEFT, border=5)
-
-		vbox.Add(pnl, proportion=1,
-			flag=wx.ALL|wx.EXPAND, border=5)
-		vbox.Add(hbox2, flag=wx.ALIGN_CENTER|wx.TOP|wx.BOTTOM, border=10)
-
-		self.SetSizer(vbox)
-
-		self.Centre()
-
-		### Widgets
-#		txt = wx.StaticText(self, wx.NewIdRef(), _('What do you want to delete:'), (15, 10))
-#		self.rb1 = wx.RadioButton(self, wx.NewIdRef() , _('label'), (20, 30))
-#		self.rb2 = wx.RadioButton(self, wx.NewIdRef() , _('label and files'), (20, 55))
-#		btn_cancel = wx.Button(self, wx.ID_CANCEL, pos = (35, 90), size = (80, -1))
-#		btn_ok = wx.Button(self, wx.ID_OK, pos = (135, 90), size = (80, -1))
-
-		### Sizers
-#		hbox = wx.BoxSizer(wx.HORIZONTAL)
-#		vbox = wx.BoxSizer(wx.VERTICAL)
-
-		### And into Sizers
-#		hbox.Add(btn_cancel, 1, wx.EXPAND|wx.ALIGN_CENTER)
-#		hbox.Add(btn_ok, 1, wx.EXPAND|wx.ALIGN_CENTER)
-
-#		vbox.Add(txt, 0, wx.ALIGN_TOP, 10)
-#		vbox.Add(self.rb1, 1,wx.ALIGN_LEFT, 5)
-#		vbox.Add(self.rb2, 1,wx.ALIGN_LEFT, 5)
-#		vbox.Add(hbox, 1, wx.ALIGN_CENTER)
-
-		### Set Sizer
-#		self.SetSizer(vbox)
-
-#		vbox.SetSizeHints(self)
+		nmbox = wx.BoxSizer(wx.VERTICAL) 
+		self.rb1 = wx.RadioButton(panel, label=_('label'))
+		self.rb2 = wx.RadioButton(panel, label=_('label and files')) 
+
+		nmbox.Add(self.rb1, 0, wx.ALL|wx.LEFT, 5)
+		nmbox.Add(self.rb2, 0, wx.ALL|wx.LEFT, 5)  
+		nmSizer.Add(nmbox, 0, wx.ALL|wx.EXPAND, 10)  
 
+		hbox = wx.BoxSizer(wx.HORIZONTAL)
+		okButton = wx.Button(panel, wx.ID_OK, label='Ok')
+		closeButton = wx.Button(panel, wx.ID_CANCEL, label='Close')
+
+		hbox.Add(closeButton, 0, wx.ALL|wx.LEFT, 10)
+		hbox.Add(okButton, 0, wx.ALL|wx.LEFT, 10)
+
+		vbox.Add(nmSizer,0, wx.ALL|wx.EXPAND, 5) 
+		vbox.Add(hbox,0, wx.ALL|wx.CENTER, 5) 
+		panel.SetSizer(vbox) 
+
+		panel.Fit() 
+
 #-------------------------------------------------------------------
 class ImportLibrary(wx.Dialog):
 	"""
 	"""
+
 	def __init__(self, *args, **kwargs):
 		""" Constructor.
 		"""
@@ -376,14 +353,14 @@ def DocDirectory(self, path):
 					t = inspect.getmoduleinfo(fn_path)
 					if t is not None:
 						name, suffix, mode, module_type = t
-						doc += 	_("---------- %s module :\n")%fn+ \
-								_("\tname : %s\n")%name+ \
-								_("\tsuffix : %s\n")%suffix+ \
-								_("\tmode : %s\n")%mode+ \
-								_("\ttype of module : %s\n")%module_type+ \
-								_("\tpath : %s\n\n")%fn_path
+						doc += 	_("---------- %s module:\n")%fn+ \
+								_("\tname: %s\n")%name+ \
+								_("\tsuffix: %s\n")%suffix+ \
+								_("\tmode: %s\n")%mode+ \
+								_("\ttype of module: %s\n")%module_type+ \
+								_("\tpath: %s\n\n")%fn_path
 					else:
-						doc +=_("----------%s module not inspectable !\n")%fn
+						doc +=_("----------%s module not inspectable!\n")%fn
 			#else:
 				#pass
 				#doc += _("%s is empty !\n")%init_file
@@ -557,6 +534,8 @@ def OnAdd(self, evt):
 		self.OnNew(evt)
 
 	def OnCloseWindow(self, event):
+		"""
+		"""
 		self.Destroy()
 		event.Skip()
 

LibraryTree.py

@@ -30,7 +30,7 @@
 import Container
 import Menu
 
-from Utilities import replaceAll, getPYFileListFromInit, path_to_module, printOnStatusBar, NotificationMessage, install_and_import, module_list
+from Utilities import replaceAll, getPYFileListFromInit, path_to_module, printOnStatusBar, NotificationMessage, install_and_import, module_list, getFilePathInfo
 from Decorators import BuzyCursorNotification
 from Components import BlockFactory, DEVSComponent, GetClass, PyComponent, GenericComponent
 from ZipManager import Zip, getPythonModelFileName
@@ -1019,6 +1019,7 @@ def OnItemEdit(self, evt):
 	def OnDirRename(self, evt):
 		""" Rename the directory of selected librarie.
 		"""
+
 		item = self.GetSelection()
 		name = self.GetItemText(item)
 
@@ -1027,6 +1028,7 @@ def OnDirRename(self, evt):
 			d = wx.TextEntryDialog(self, _('New file name:'), defaultValue = name, style=wx.OK)
 		else:
 			d = wx.TextEntryDialog(self, _('New file name:'), value = name, style=wx.OK)
+
 		d.ShowModal()
 
 		### new label
@@ -1035,22 +1037,34 @@ def OnDirRename(self, evt):
 		### only if new and old label are different
 		if new_label != name:
 
-			### path of file
-			old_dirname = self.GetItemPyData(item)
-			new_dirname = os.path.join(os.path.dirname(old_dirname),new_label)
+			if new_label not in [os.path.basename(a) for a in self.ItemDico if not os.path.isfile(a)]:
+
+				### path of file
+				old_dirname = self.GetItemPyData(item)
+				new_dirname = os.path.join(os.path.dirname(old_dirname),new_label)
 
-			try:
-				os.rename(old_dirname,new_dirname)
-			except:
-				sys.stdout.write(_('Rename failed!'))
+				try:
+					os.rename(old_dirname,new_dirname)
+				except:
+					sys.stdout.write(_('Rename failed!'))
+				else:
+
+					### change the path of the item and its childrens...
+					for elem, itemTree in self.ItemDico.copy().items():
+						if old_dirname in self.GetItemData(itemTree):
+							self.SetItemData(itemTree, elem.replace(old_dirname, new_dirname))
+							self.ItemDico[elem.replace(old_dirname, new_dirname)] = self.ItemDico.pop(elem)
+
+					### change the name of dir in tree
+					self.SetItemText(item, new_label)
+
+					### update only the lib
+					self.UpdateDomain(self.GetPyData(item))
+
+					### sort all item
+					self.SortChildren(self.root)
 			else:
-				self.SetItemData(item,new_dirname)
-				for elem in self.ItemDico:
-					if old_dirname in elem:
-						self.ItemDico[elem.replace(old_dirname, new_dirname)] = self.ItemDico.pop(elem)
-
-				self.SetItemText(item, new_label)
-				self.UpdateAll()
+				wx.MessageBox(_("%s already exist!")%new_label, _("Error"), wx.OK|wx.ICON_ERROR)
 
 	###
 	def OnItemExport(self, evt):
@@ -1059,17 +1073,20 @@ def OnItemExport(self, evt):
 
 		item = self.GetSelection()
 		filename = self.GetPyData(item)
-		old_name = os.path.basename(filename)
-		old_dir_name = os.path.dirname(filename)
-		old_label, ext= old_name.split('.')
 
-		new_name = None
+		old_dir_name, old_name, old_label, ext = getFilePathInfo(filename)
 
+		#old_name = os.path.basename(filename)
+		#old_dir_name = os.path.dirname(filename)
+		#old_label, ext= old_name.split('.')
+
+		new_name = None
+
 		wcd = _('%s Files (*.%s)|*.%s|All files (*)|*')%(ext.upper(), ext, ext)
 		save_dlg = wx.FileDialog(self,
 								message = _('Export file as...'),
 								defaultDir = old_dir_name,
-								defaultFile = old_name,
+								defaultFile = old_label,
 								wildcard = wcd,
 								style = wx.SAVE | wx.OVERWRITE_PROMPT)
 
@@ -1080,13 +1097,22 @@ def OnItemExport(self, evt):
 		save_dlg.Destroy()
 
 		if new_name:
-			### if the new_name and old_name are different or the location is differente.
-			### we need to rename the file and all of its content !
-			if old_name != new_name or new_path != old_dir_name:
-				if shutil.copyfile(filename, new_path) and Rename(new_path, new_name.split('.')[0]):
-					self.UpdateAll()
-				else:
-					sys.stdout.write(_('Export failed!'))
+			if new_name.endswith(ext):
+				### if the new_name and old_name are different or the location is differente.
+				### we need to rename the file and all of its content !
+				if old_name != new_name or new_path != old_dir_name:
+					if shutil.copyfile(filename, new_path) and Rename(new_path, new_name.split('.')[0]):
+
+						### update only the lib
+						self.UpdateDomain(old_dir_name)
+
+						### sort all item
+						self.SortChildren(self.root)
+
+					else:
+						sys.stdout.write(_('Export failed!'))
+			else:
+				wx.MessageBox(_("Extention of the new name must be the same!"), _("Error"), wx.OK|wx.ICON_ERROR)
 
 	###
 	def OnItemRename(self, evt):
@@ -1108,15 +1134,22 @@ def OnItemRename(self, evt):
 
 		### only if new and old label are different
 		if new_label != name:
-
-			### path of file
-			filename = self.GetItemPyData(item)
-
-			### Rename the filename with new_label		
-			if Rename(filename, new_label):
-				self.UpdateAll()
+			if new_label not in [os.path.basename(a).split('.')[0] for a in self.ItemDico if os.path.isfile(a)]:
+
+				### path of file
+				filename = self.GetItemPyData(item)
+
+				### Rename the filename with new_label		
+				if Rename(filename, new_label):
+					### update only the lib
+					self.UpdateDomain(os.path.dirname(self.GetPyData(item)))
+
+					### sort all item
+					self.SortChildren(self.root)
+				else:
+					sys.stdout.write(_('Rename failed!'))
 			else:
-				sys.stdout.write(_('Rename failed!'))
+				wx.MessageBox(_("%s already exist!")%new_label, _("Error"), wx.OK|wx.ICON_ERROR)
 
 	###
 	def OnItemDocumentation(self, evt):

Utilities.py

@@ -92,7 +92,23 @@
 		sys.exit()
 
 #-------------------------------------------------------------------------------
+
+def getFilePathInfo(path):
+	"""
+	"""
+	assert os.path.isabs(path)
+
+	dirname = os.path.dirname(path)
+	basename = os.path.basename(path)
+	info = os.path.splitext(basename)
+	filename = info[0]
+	extend = info[1][1:]
+
+	return dirname, basename, filename, extend
+
 def PrintException():
+	"""
+	"""
 	exc_type, exc_obj, tb = sys.exc_info()
 	f = tb.tb_frame
 	lineno = tb.tb_lineno