[Avida-cvs] [avida-svn] r825 - branches/developers/avida-edward/source/python/AvidaGui2

[jclune@myxo.css.msu.edu]

Author: jclune
Date: 2006-07-11 12:54:13 -0400 (Tue, 11 Jul 2006)
New Revision: 825

Modified:
   branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
   branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleCtrl.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyMapProfile.py
Log:
removed some debugging commentary and added a keyboard shortcut to starting a new population

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui	2006-07-11 16:40:38 UTC (rev 824)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui	2006-07-11 16:54:13 UTC (rev 825)
@@ -235,24 +235,6 @@
         <property type="0">-1</property>
         <property type="1">pyFreezerView</property>
         <property type="0">-1</property>
-        <property type="1">pyFreezerView</property>
-        <property type="0">-1</property>
-        <property type="1">pyFreezerView</property>
-        <property type="0">-1</property>
-        <property type="1">pyFreezerView</property>
-        <property type="0">-1</property>
-        <property type="1">pyFreezerView</property>
-        <property type="0">-1</property>
-        <property type="1">pyFreezerView</property>
-        <property type="0">-1</property>
-        <property type="1">pyFreezerView</property>
-        <property type="0">-1</property>
-        <property type="1">pyFreezerView</property>
-        <property type="0">-1</property>
-        <property type="1">pyFreezerView</property>
-        <property type="0">-1</property>
-        <property type="1">pyFreezerView</property>
-        <property type="0">-1</property>
         <property type="pyFreezerView"></property>
         <property type="-1">1</property>
     </customwidget>
@@ -296,24 +278,6 @@
         <property type="0">-1</property>
         <property type="1">pyNavBarView</property>
         <property type="0">-1</property>
-        <property type="1">pyNavBarView</property>
-        <property type="0">-1</property>
-        <property type="1">pyNavBarView</property>
-        <property type="0">-1</property>
-        <property type="1">pyNavBarView</property>
-        <property type="0">-1</property>
-        <property type="1">pyNavBarView</property>
-        <property type="0">-1</property>
-        <property type="1">pyNavBarView</property>
-        <property type="0">-1</property>
-        <property type="1">pyNavBarView</property>
-        <property type="0">-1</property>
-        <property type="1">pyNavBarView</property>
-        <property type="0">-1</property>
-        <property type="1">pyNavBarView</property>
-        <property type="0">-1</property>
-        <property type="1">pyNavBarView</property>
-        <property type="0">-1</property>
         <property type="pyNavBarView"></property>
         <property type="-1">1</property>
     </customwidget>
@@ -734,6 +698,9 @@
         <property name="statusTip">
             <string>Start new experiment with empty petri dish</string>
         </property>
+        <property name="accel">
+            <string>Ctrl+R</string>
+        </property>
     </action>
     <action>
         <property name="name">

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleCtrl.py	2006-07-11 16:40:38 UTC (rev 824)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleCtrl.py	2006-07-11 16:54:13 UTC (rev 825)
@@ -40,7 +40,6 @@
 
   def setMapModeSlot(self,index):
     self.m_current_map_mode_name = index
-    print "Map mode changed"
 
   def avidaUpdatedSlot(self):
     pass

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyMapProfile.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyMapProfile.py	2006-07-11 16:40:38 UTC (rev 824)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyMapProfile.py	2006-07-11 16:54:13 UTC (rev 825)
@@ -61,7 +61,7 @@
       def resetRange(self, population):
         #descr(population)
         (inf, sup) = self.m_range.getRange()
-        #descr("(inf, sup)", (inf, sup))
+        descr("(inf, sup)", (inf, sup))
         #(self.m_target_inf, self.m_target_sup) = (self.m_inf, self.m_sup) = (inf, sup)
         (self.m_target_inf, self.m_target_sup) = (self.m_inf, self.m_sup) = (0, sup)
         self.m_inf_rescale_rate = self.m_sup_rescale_rate = 0
@@ -74,6 +74,8 @@
           return self.resetRange(population)
 
         (inf, sup) = self.m_range.getRange()
+        descr("(inf, sup)", (inf, sup))
+
         if (sup < (1 - self.m_sup_tolerance_coeff) * self.m_target_sup) or (self.m_target_sup < sup):
           new_target_sup = sup * (1 + self.m_sup_tolerance_coeff)
           #self.m_sup_rescale_rate = float(new_target_sup - self.m_sup)