[Avida-cvs] [Avida2-svn] r58 - trunk/source/python/AvidaGui2

[baerb at myxo.css.msu.edu]

Author: baerb
Date: 2005-03-16 15:39:27 -0500 (Wed, 16 Mar 2005)
New Revision: 58

Modified:
   trunk/source/python/AvidaGui2/pyLiveControlsCtrl.py
   trunk/source/python/AvidaGui2/pyLiveControlsView.ui
Log:
1) Fixed Live Control Play/Pause switch to work

   !!!!!! WARNING !!!!!
   This is an ugly hack -- it basically uses the code in pySessionDumbCtrl --
   the actual code should probably be move up higher in the hierarchy.

2) Minor changes to variable names and speed slider value to maximum



Modified: trunk/source/python/AvidaGui2/pyLiveControlsCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyLiveControlsCtrl.py	2005-03-16 20:21:44 UTC (rev 57)
+++ trunk/source/python/AvidaGui2/pyLiveControlsCtrl.py	2005-03-16 20:39:27 UTC (rev 58)
@@ -15,6 +15,18 @@
     self.connect(
       self.m_session_mdl.m_session_mdtr, PYSIGNAL("setAvidaSig"),
       self.setAvidaSlot)
+    self.connect(
+      self.m_session_mdl.m_session_mdtr, PYSIGNAL("doPauseAvidaSig"),
+      self.doPauseAvidaSlot)
+    self.connect(
+      self.m_session_mdl.m_session_mdtr, PYSIGNAL("doStartAvidaSig"),
+      self.doStartAvidaSlot)
+    self.connect(
+      self.m_play_button, SIGNAL("clicked()"),
+      self.clickedStartAvidaSlot)
+    self.connect(
+      self.m_pause_button, SIGNAL("clicked()"),
+      self.clickedPauseAvidaSlot)
 
   def setAvidaSlot(self, avida):
     old_avida = self.m_avida
@@ -30,4 +42,18 @@
         self.avidaUpdatedSlot)
 
   def avidaUpdatedSlot(self):
-    pass
\ No newline at end of file
+    pass
+    
+  def doPauseAvidaSlot(self):
+    self.m_play_pause_widgetStack.raiseWidget(0)
+    
+  def doStartAvidaSlot(self):
+    self.m_play_pause_widgetStack.raiseWidget(1)
+    
+  def clickedPauseAvidaSlot(self):
+    self.m_session_mdl.m_session_mdtr.emit(
+      PYSIGNAL("fromLiveCtrlPauseAvidaSig"), ())
+    
+  def clickedStartAvidaSlot(self):
+    self.m_session_mdl.m_session_mdtr.emit(
+      PYSIGNAL("fromLiveCtrlStartAvidaSig"), ())

Modified: trunk/source/python/AvidaGui2/pyLiveControlsView.ui
===================================================================
--- trunk/source/python/AvidaGui2/pyLiveControlsView.ui	2005-03-16 20:21:44 UTC (rev 57)
+++ trunk/source/python/AvidaGui2/pyLiveControlsView.ui	2005-03-16 20:39:27 UTC (rev 58)
@@ -29,6 +29,9 @@
             <property name="name">
                 <cstring>m_rate_slider</cstring>
             </property>
+            <property name="value">
+                <number>99</number>
+            </property>
             <property name="orientation">
                 <enum>Horizontal</enum>
             </property>
@@ -105,7 +108,7 @@
                 </spacer>
                 <widget class="QWidgetStack">
                     <property name="name">
-                        <cstring>widgetStack3</cstring>
+                        <cstring>m_play_pause_widgetStack</cstring>
                     </property>
                     <widget class="QWidget">
                         <property name="name">