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

[baerb at myxo.css.msu.edu]

Author: baerb
Date: 2008-04-01 09:28:06 -0400 (Tue, 01 Apr 2008)
New Revision: 2507

Removed:
   branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismDataView.py
Modified:
   branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_startup_utils.py
   branches/developers/avida-edward/source/python/AvidaGui2/checkuic.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyTemporaryReloads.py
Log:

Modified checkuic to use newer version of pyuic that resides in the current
AvidaGui2 directory.

Removed pyOrganismDataView.py that is not used in the code (currently all the
funcions in that file are now in pyOrganismDataCtrl.py)

Removed some "temporary" code from Avida_ED_startup_utils.



Modified: branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_startup_utils.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_startup_utils.py	2008-03-31 20:55:15 UTC (rev 2506)
+++ branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_startup_utils.py	2008-04-01 13:28:06 UTC (rev 2507)
@@ -89,11 +89,6 @@
     s_splash.clear()
     s_splash.hide()
 
-    # BDB temporarily turn off prompting for new/existing workspace at
-    # the beginning of a new program.  Leave just in case we decide to
-    # go back to this system
-    #
-    # edu_main_controller.m_prompt_for_workspace_ctrl.showDialog()
     print """
     
     To disable debugging messages, type 'AvidaGui2.descr.DEBUG = False'.
@@ -136,11 +131,6 @@
     s_splash.clear()
     s_splash.hide()
 
-    # BDB temporarily turn off prompting for new/existing workspace at
-    # the beginning of a new program.  Leave just in case we decide to
-    # go back to this system
-    #
-    # edu_main_controller.m_prompt_for_workspace_ctrl.showDialog()
     print """
     
     To disable debugging messages, type 'AvidaGui2.descr.DEBUG = False'.

Modified: branches/developers/avida-edward/source/python/AvidaGui2/checkuic.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/checkuic.py	2008-03-31 20:55:15 UTC (rev 2506)
+++ branches/developers/avida-edward/source/python/AvidaGui2/checkuic.py	2008-04-01 13:28:06 UTC (rev 2507)
@@ -23,7 +23,7 @@
       # created .py file
 
       # print "******** " + py_name + " *******"
-      # os.system("pyuic " + ui_name + " > pyuic.tmp")
+      # os.system("./app_pyuic " + ui_name + " > pyuic.tmp")
       # os.system("diff -w " + py_name + " pyuic.tmp > diff.tmp")
       # diff_file = open("diff.tmp")
       # lines = diff_file.readlines()
@@ -47,7 +47,7 @@
       if time_diff > 0:
         print ui_name + ' ' + time.ctime(ui_stat.st_mtime)
         print py_name + ' ' + time.ctime(py_stat.st_mtime)
-        command =  "pyuic " + ui_name + " > " + py_name
+        command =  "./app_pyuic " + ui_name + " > " + py_name
         if (force == False):
           response = raw_input(command + "? (y/n)  ")
           response = response.upper()
@@ -59,7 +59,7 @@
           os.system(command)
     else:
       print "No file " + py_name + " exists"
-      command =  "pyuic " + ui_name + " > " + py_name
+      command =  "./app_pyuic " + ui_name + " > " + py_name
       if (force == False):
         response = raw_input(command + "? (y/n)  ")
         response = response.upper()

Deleted: branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismDataView.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismDataView.py	2008-03-31 20:55:15 UTC (rev 2506)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismDataView.py	2008-04-01 13:28:06 UTC (rev 2507)
@@ -1,61 +0,0 @@
-from qt import *
-from pyBufferCtrl import pyBufferCtrl
-from pyHideShowCtrl import pyHideShowCtrl
-
-class pyHideShowFactory:
-  def setParent(self, parent):
-    self.m_parent = parent
-    self.m_layout = QVBoxLayout(parent,5,0)
-  def newHideShow(self):
-    buffer = pyHideShowCtrl(self.m_parent)
-    self.m_layout.addWidget(buffer)
-    return buffer
-  def layout(self):
-    return self.m_layout
-
-class pyBufferCtrlFactory:
-  def setParent(self, parent):
-    self.m_parent = parent
-    self.m_layout = QVBoxLayout(parent,0,0)
-  def newBuffer(self):
-    buffer = pyBufferCtrl(self.m_parent)
-    self.m_layout.addWidget(buffer)
-    return buffer
-
-class pyOrganismDataView(QWidget):
-  def __init__(self,parent = None,name = None,fl = 0):
-    QWidget.__init__(self,parent,name,fl)
-    if not name: self.setName("pyOrganismDataView")
-
-    #self.top_layout = QVBoxLayout(self,5,0,"pyOrganismDataView,top_layout")
-
-    #self.vb_layout = QVBoxLayout(None,0,0,"pyOrganismDataView,layout1")
-    #self.top_layout.addLayout(vb_layout)
-    #self.top_layout.addStretch()
-
-    hs_factory = pyHideShowFactory()
-    b_factory = pyBufferCtrlFactory()
-
-    hs_factory.setParent(self)
-
-    self.m_hideshow_inputs = hs_factory.newHideShow()
-    self.m_hideshow_inputs.getLabel().setText("input array")
-    b_factory.setParent(self.m_hideshow_inputs.getSubwidget())
-    self.m_buffer_in0 = b_factory.newBuffer()
-    self.m_buffer_in1 = b_factory.newBuffer()
-    self.m_buffer_in2 = b_factory.newBuffer()
-
-    self.m_hideshow_ouput = hs_factory.newHideShow()
-    self.m_hideshow_ouput.getLabel().setText("output")
-    b_factory.setParent(self.m_hideshow_ouput.getSubwidget())
-    self.m_buffer_out = b_factory.newBuffer()
-
-    self.m_hideshow_regs = hs_factory.newHideShow()
-    self.m_hideshow_regs.getLabel().setText("registers A, B, C")
-    b_factory.setParent(self.m_hideshow_regs.getSubwidget())
-    self.m_buffer_regA = b_factory.newBuffer()
-    self.m_buffer_regB = b_factory.newBuffer()
-    self.m_buffer_regC = b_factory.newBuffer()
-
-    hs_factory.layout().addStretch()
-

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyTemporaryReloads.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyTemporaryReloads.py	2008-03-31 20:55:15 UTC (rev 2506)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyTemporaryReloads.py	2008-04-01 13:28:06 UTC (rev 2507)
@@ -93,7 +93,6 @@
   "AvidaGui2.pyNewIconView",
   "AvidaGui2.pyOrganismConfigureView",
   "AvidaGui2.pyOrganismConfigureCtrl",
-  "AvidaGui2.pyOrganismDataView",
   "AvidaGui2.pyOrganismDataCtrl",
   "AvidaGui2.pyOrganismScopeView2",
   "AvidaGui2.pyOrganismScopeCtrl",