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

[baerb at myxo.css.msu.edu]

Author: baerb
Date: 2007-06-18 14:03:50 -0400 (Mon, 18 Jun 2007)
New Revision: 1694

Added:
   branches/developers/avida-edward/source/python/AvidaGui2/avida-ED-icon-windows.ico
Modified:
   branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyOnePopulationCtrl.py
Log:

Added an icon for windows version of program.

Added some dummy code for printing/saving images in the organism view
  -- basically will pop up a warning message that you can't print print 
     or save



Added: branches/developers/avida-edward/source/python/AvidaGui2/avida-ED-icon-windows.ico
===================================================================
(Binary files differ)


Property changes on: branches/developers/avida-edward/source/python/AvidaGui2/avida-ED-icon-windows.ico
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py	2007-06-18 18:02:58 UTC (rev 1693)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py	2007-06-18 18:03:50 UTC (rev 1694)
@@ -765,7 +765,7 @@
     self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("startNewExperimentSig"),
       ())
     self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("doDefrostDishSig"),
-      ("@example.empty", thawed_item,))
+      ("@example", thawed_item,))
     self.m_session_mdl.m_session_mdtr.emit(
       PYSIGNAL("freezerItemDoubleClicked"), (file_name, ))
 

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py	2007-06-18 18:02:58 UTC (rev 1693)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py	2007-06-18 18:03:50 UTC (rev 1694)
@@ -390,7 +390,6 @@
     return
 
   def freezerItemDoubleClickedOn(self, freezer_item_name): 
-    descr("BDB")
     # a check in pyOneAnalyzeCtrl.py makes sure this is a valid path
     self.m_petri_dish_dir_exists_flag = True
     short_name = os.path.split(os.path.splitext(os.path.split(freezer_item_name)[0])[0])[1]

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeCtrl.py	2007-06-18 18:02:58 UTC (rev 1693)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeCtrl.py	2007-06-18 18:03:50 UTC (rev 1694)
@@ -103,7 +103,6 @@
               " does not seem to be a populated dish.")
 
   def freezerItemDoubleClicked(self, freezer_item_list):
-    descr("BDB")
     for freezer_item_name in freezer_item_list.split("\t")[1:]:
       if os.path.exists( str(freezer_item_name)) == False:
          warningNoMethodName(freezer_item_name + " does not exist.")

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismCtrl.py	2007-06-18 18:02:58 UTC (rev 1693)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismCtrl.py	2007-06-18 18:03:50 UTC (rev 1694)
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from descr import descr
+from descr import descr, info
 
 from qt import *
 from pyOneOrganismView import pyOneOrganismView
@@ -27,12 +27,37 @@
     self.m_organism_configure_ctrl.setAnalysisNeeded(False)
 
   def aboutToBeLowered(self):
-    """does nothing yet."""
+    """Disconnects menu items from organism viewer controller."""
     descr()
+    self.disconnect(
+      self.m_session_mdl.m_session_mdtr,
+      PYSIGNAL("saveImagesSig"),
+      self.saveImagesSlot)
+    self.disconnect(
+      self.m_session_mdl.m_session_mdtr,
+      PYSIGNAL("printSig"),
+      self.printOrgSlot)
+
   def aboutToBeRaised(self):
-    """does nothing yet."""
+    """Connects menu items from organism viewer controller."""
     descr()
+    self.connect(
+      self.m_session_mdl.m_session_mdtr,
+      PYSIGNAL("saveImagesSig"),
+      self.saveImagesSlot)
+    self.connect(
+      self.m_session_mdl.m_session_mdtr,
+      PYSIGNAL("printSig"),
+      self.printOrgSlot)
 
+  def saveImagesSlot(self):
+    """Place holder for code to save image of organism viewer"""
+    info("You can not save an image of the organism in the current version of Avida-ED.")
+
+  def printOrgSlot(self):
+    """Place holder for code to print image of organism viewer"""
+    info("You can not print an image of the organism in the current version of Avida-ED.")
+
   def setOneOrganismViewNameLabelTextSlot(self, name):
     self.m_organism_name_label.setText(name)
 

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py	2007-06-18 18:02:58 UTC (rev 1693)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py	2007-06-18 18:03:50 UTC (rev 1694)
@@ -229,7 +229,6 @@
         self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("doPauseAvidaSig"), ())
     
   def RenameDishSlot(self, dishName):
-    descr()
     if (not self.dishDisabled):
       self.PopulationTextLabel.setText(dishName)
     

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsCtrl.py	2007-06-18 18:02:58 UTC (rev 1693)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsCtrl.py	2007-06-18 18:03:50 UTC (rev 1694)
@@ -204,7 +204,6 @@
     self.m_org_name.setText(name)
 
   def updateOrgReportSlot(self, clicked_cell_item = None):
-    descr("this is teh most simple test") #JMC delme
     #this line is probably redundant
     self.m_clicked_cell_number = clicked_cell_item
     self.m_clicked_cell_item = clicked_cell_item

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePopulationCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePopulationCtrl.py	2007-06-18 18:02:58 UTC (rev 1693)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePopulationCtrl.py	2007-06-18 18:03:50 UTC (rev 1694)
@@ -59,6 +59,7 @@
       self.m_session_mdl.m_session_mdtr,
       PYSIGNAL("exportAnalyzeSig"),
       self.m_one_pop_graph_ctrl.exportSlot)
+
   def aboutToBeRaised(self):
     """Connects menu items to One-Pop Graph controller."""
     descr()