[Avida-cvs] [avida-svn] r795 - branches/developers/avida-edward/source/python/AvidaGui2
baerb@myxo.css.msu.edu
baerb at myxo.css.msu.edu
Mon Jul 3 13:22:12 PDT 2006
Author: baerb
Date: 2006-07-03 16:22:12 -0400 (Mon, 03 Jul 2006)
New Revision: 795
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui
branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
Log:
Added some menu items
Some cosmetic changes in petri-dish config
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-07-03 20:21:52 UTC (rev 794)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-07-03 20:22:12 UTC (rev 795)
@@ -1,5 +1,7 @@
# -*- coding: utf-8 -*-
+from descr import *
+
from Get_Avida_ED_version import avida_ed_version_string
from pyEduWorkspaceView import pyEduWorkspaceView
from pyMdtr import pyMdtr
@@ -91,6 +93,17 @@
self.next_UpdateActionSlot)
self.connect(
self.controlStartAction,SIGNAL("activated()"),self.startActionSlot)
+
+ # Next three connects are for where a user selects a veiwer from
+ # the View menu
+
+ self.connect( self.viewPopulationAction,SIGNAL("activated()"),
+ self.viewPopulationActionSlot)
+ self.connect( self.viewOrganismAction,SIGNAL("activated()"),
+ self.viewOrganismActionSlot)
+ self.connect( self.viewAnalysisAction,SIGNAL("activated()"),
+ self.viewAnalysisActionSlot)
+
self.connect(
self.m_session_mdl.m_session_mdtr, PYSIGNAL("setAvidaSig"),
self.setAvidaSlot)
@@ -127,6 +140,7 @@
self.m_session_mdl.m_session_mdtr, PYSIGNAL("workspaceOpenSig"),
self.fileOpen)
+ # Start the program with the population viewer
self.navBarItemClickedSlot(self.m_nav_bar_ctrl.m_one_population_cli)
self.m_nav_bar_ctrl.m_list_view.setSelected(self.m_nav_bar_ctrl.m_one_population_cli, True)
@@ -140,6 +154,9 @@
for key in self.m_ctrl_to_cli_dict.keys():
del self.m_ctrl_to_cli_dict[key]
+ # When user clicks on one of the icons in the navigation bar go to the
+ # correct viewer
+
def navBarItemClickedSlot(self, item):
if item:
if self.m_cli_to_ctrl_dict.has_key(item):
@@ -449,7 +466,18 @@
self.m_session_mdl.m_session_mdtr.emit(
PYSIGNAL("freezerItemDoubleClicked"), (file_name, ))
+ # Next three methods are for where a user selects a veiwer from the View menu
+ def viewPopulationActionSlot(self):
+ self.navBarItemClickedSlot(self.m_nav_bar_ctrl.m_one_population_cli)
+
+ def viewOrganismActionSlot(self):
+ self.navBarItemClickedSlot(self.m_nav_bar_ctrl.m_one_organism_cli)
+
+ def viewAnalysisActionSlot(self):
+ self.navBarItemClickedSlot(self.m_nav_bar_ctrl.m_one_analyze_cli)
+
+
def addStatusBarWidgetSlot(self, *args):
widget = args[0]
pt = QPoint()
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2006-07-03 20:21:52 UTC (rev 794)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2006-07-03 20:22:12 UTC (rev 795)
@@ -177,6 +177,9 @@
<action name="controlRestart_ExpAction"/>
</item>
<item text="&View" name="View">
+ <action name="viewPopulationAction"/>
+ <action name="viewOrganismAction"/>
+ <action name="viewAnalysisAction"/>
</item>
<item text="&Window" name="Window">
<action name="windowZoom_WindowAction"/>
@@ -248,6 +251,8 @@
<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>
@@ -307,6 +312,8 @@
<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>
@@ -716,18 +723,60 @@
<cstring>controlRestart_ExpAction</cstring>
</property>
<property name="text">
- <string>Restart Experiment</string>
+ <string>Start New Experiment</string>
</property>
<property name="menuText">
- <string>Restart Experiment</string>
+ <string>Start New Experiment</string>
</property>
<property name="toolTip">
- <string><P>Restart experiment with empty petri dish</p></string>
+ <string><P>Start new experiment with empty petri dish</p></string>
</property>
<property name="statusTip">
- <string>Restart experiment with empty petri dish</string>
+ <string>Start new experiment with empty petri dish</string>
</property>
</action>
+ <action>
+ <property name="name">
+ <cstring>viewPopulationAction</cstring>
+ </property>
+ <property name="text">
+ <string>Population</string>
+ </property>
+ <property name="menuText">
+ <string>Population</string>
+ </property>
+ <property name="toolTip">
+ <string>Open Population Viewer</string>
+ </property>
+ </action>
+ <action>
+ <property name="name">
+ <cstring>viewOrganismAction</cstring>
+ </property>
+ <property name="text">
+ <string>Organism</string>
+ </property>
+ <property name="menuText">
+ <string>Organism</string>
+ </property>
+ <property name="toolTip">
+ <string>Open Organism Viewer</string>
+ </property>
+ </action>
+ <action>
+ <property name="name">
+ <cstring>viewAnalysisAction</cstring>
+ </property>
+ <property name="text">
+ <string>Analysis</string>
+ </property>
+ <property name="menuText">
+ <string>Analysis</string>
+ </property>
+ <property name="toolTip">
+ <string>Open Analysis View</string>
+ </property>
+ </action>
</actions>
<images>
<image name="image0">
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishView.ui 2006-07-03 20:21:52 UTC (rev 794)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishView.ui 2006-07-03 20:22:12 UTC (rev 795)
@@ -259,7 +259,7 @@
</sizepolicy>
</property>
<property name="text">
- <string><font size="-1"><p align="right">Update:</p></font></string>
+ <string><font size="-1"><p align="center">Time (updates):</p></font></string>
</property>
<property name="toolTip" stdset="0">
<string>Updates is the basic unit of time in Avida-ED</string>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui 2006-07-03 20:21:52 UTC (rev 794)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui 2006-07-03 20:22:12 UTC (rev 795)
@@ -741,7 +741,7 @@
</font>
</property>
<property name="text">
- <string><p align="center">Easy<br>(1x)</p></string>
+ <string><p align="center">Easy<br>(x 2)</p></string>
</property>
</widget>
<widget class="QLabel" row="0" column="4">
@@ -753,7 +753,7 @@
</font>
</property>
<property name="text">
- <string><p align="center">Hard<br>(3x)</p></string>
+ <string><p align="center">Hard<br>(x 8)</p></string>
</property>
</widget>
<widget class="QCheckBox" row="1" column="0">
@@ -782,7 +782,7 @@
</font>
</property>
<property name="text">
- <string><p align="center">Moderate<br>(2x)</p></string>
+ <string><p align="center">Moderate<br>(x 4)</p></string>
</property>
</widget>
<widget class="Line" row="0" column="1" rowspan="3" colspan="1">
@@ -808,7 +808,7 @@
</font>
</property>
<property name="text">
- <string><p align="center">Very Hard<br>(4x)</p></string>
+ <string><p align="center">Very Hard<br>(x 16)</p></string>
</property>
</widget>
<widget class="QCheckBox" row="2" column="6">
@@ -896,7 +896,7 @@
</font>
</property>
<property name="text">
- <string><p align="center">Brutal<br>(5x)</p></string>
+ <string><p align="center">Brutal<br>(x 32)</p></string>
</property>
</widget>
<widget class="QCheckBox" row="1" column="8">
Modified: branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-07-03 20:21:52 UTC (rev 794)
+++ branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-07-03 20:22:12 UTC (rev 795)
@@ -49,7 +49,11 @@
30-Jun-06 Make cell location relative to center of screen (use +/- X and Y) instead of using Avida cell location
+03-Jul-06 Default, Replication Only, All Nine, Funky Org, zoo
+03-Jul-06 Delete item by clicking and delete
+
+
************Jeff*******************
Priority High
@@ -64,6 +68,8 @@
-add the ability to drag things into the menu blocks (e.g. drag into the organism tab in the top left corner) (1/30/05)
-right clicking on things as much as possible (1/30/05)
+-Remove doubleclick from freezer items (3/07/06)
+
Priority Low
-color the scales (1/10/05)
@@ -164,6 +170,10 @@
15-Jun-06 Move Freezer/Viewer line up -- Finished 16-Jun-06
+15-Jun-06 Change menu item "Restart Experiment" -> "Start New Experiment" -- Finished 03-Jul-06
+
+15-Jun-06 Add Viewers to view choice on menu -- Finished 03-Jul-06
+
************Kaben******************
* 23-Jan-06 Get program to run on all Macs -- Finished 27-Jan-06
@@ -194,4 +204,4 @@
-Scroll bars are working again (though hard coded)
-Scroll bars are now dynamic (30th)
-July
\ No newline at end of file
+July
More information about the Avida-cvs
mailing list