[Avida-SVN] r1573 - branches/developers/avida-edward/source/python/AvidaGui2

[kaben at myxo.css.msu.edu]

Author: kaben
Date: 2007-05-19 21:48:33 -0400 (Sat, 19 May 2007)
New Revision: 1573

Modified:
   branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismCtrl.py
Log:
Truncated path names in organism scope and petri dish.


Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py	2007-05-18 18:58:35 UTC (rev 1572)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py	2007-05-20 01:48:33 UTC (rev 1573)
@@ -41,7 +41,7 @@
     if (session_mdl.directory_chosen == False):
       self.setCaption('%s - %s' % (avida_ed_version_string, "Unnamed  Workspace") )
     else:
-      self.setCaption('%s - %s' % (avida_ed_version_string, self.m_session_mdl.m_current_workspace) )
+      self.setCaption('%s - %s' % (avida_ed_version_string, os.path.basename(os.path.splitext(self.m_session_mdl.m_current_workspace)[0])) )
    
     while self.m_widget_stack.visibleWidget():
       self.m_widget_stack.removeWidget(self.m_widget_stack.visibleWidget())
@@ -254,7 +254,7 @@
             self.m_session_mdl.m_current_workspace = str(new_dir)
             self.m_session_mdl.m_current_freezer = os.path.join(new_dir, "freezer")
             self.m_session_mdl.directory_chosen = True
-            self.setCaption('%s - %s' % (avida_ed_version_string, self.m_session_mdl.m_current_workspace) )
+            self.setCaption('%s - %s' % (avida_ed_version_string, os.path.basename(os.path.splitext(self.m_session_mdl.m_current_workspace)[0])) )
             self.m_session_mdl.m_session_mdtr.emit(
               PYSIGNAL("doRefreshFreezerInventorySig"), ())
             created = True
@@ -307,7 +307,7 @@
       self.m_session_mdl.m_current_workspace = str(workspace_dir)
       self.m_session_mdl.m_current_freezer = os.path.join(self.m_session_mdl.m_current_workspace, "freezer")
       self.m_session_mdl.directory_chosen = True
-      self.setCaption('%s - %s' % (avida_ed_version_string, self.m_session_mdl.m_current_workspace) )
+      self.setCaption('%s - %s' % (avida_ed_version_string, os.path.basename(os.path.splitext(self.m_session_mdl.m_current_workspace)[0])) )
       self.m_session_mdl.m_session_mdtr.emit(
         PYSIGNAL("doRefreshFreezerInventorySig"), ())
 
@@ -360,7 +360,7 @@
             self.m_session_mdl.m_current_workspace = str(new_dir)
             self.m_session_mdl.m_current_freezer = os.path.join(new_dir, "freezer")
             #self.setCaption(self.m_session_mdl.m_current_workspace)
-            self.setCaption('%s - %s' % (avida_ed_version_string, self.m_session_mdl.m_current_workspace) )
+            self.setCaption('%s - %s' % (avida_ed_version_string, os.path.basename(os.path.splitext(self.m_session_mdl.m_current_workspace)[0])) )
             self.m_session_mdl.m_session_mdtr.emit(
               PYSIGNAL("doRefreshFreezerInventorySig"), ())
             created = True

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismCtrl.py	2007-05-18 18:58:35 UTC (rev 1572)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismCtrl.py	2007-05-20 01:48:33 UTC (rev 1573)
@@ -5,6 +5,7 @@
 from qt import *
 from pyOneOrganismView import pyOneOrganismView
 
+import os.path
 
 class pyOneOrganismCtrl(pyOneOrganismView):
 
@@ -33,7 +34,7 @@
     descr()
 
   def setOneOrganismViewNameLabelTextSlot(self, name):
-    self.m_organism_name_label.setText(name)
+    self.m_organism_name_label.setText(os.path.basename(os.path.splitext(name)[0]))
 
   def ToggleScopeSlot (self):
     current_page = self.m_organism_scope_widget_stack.visibleWidget()