[Avida-cvs] [avida-svn] r707 - branches/developers/avida-edward/source/python/AvidaGui2
baerb@myxo.css.msu.edu
baerb at myxo.css.msu.edu
Fri May 26 09:46:15 PDT 2006
Author: baerb
Date: 2006-05-26 12:46:14 -0400 (Fri, 26 May 2006)
New Revision: 707
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_startup_utils.py
branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeOrganismCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeOrganismView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
Log:
Added mouse-over help to some of the smaller dialog boxes.
Move code checking if user has chosen a workspace to be activated the first
time they try to save a file (not at the beginning of the program).
Cleaned up a few random lines of code.
Update the to-do list.
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 2006-05-25 01:27:42 UTC (rev 706)
+++ branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_startup_utils.py 2006-05-26 16:46:14 UTC (rev 707)
@@ -58,15 +58,27 @@
# Get the edu_workspace_ctrl to browse interactively via
# 'avida_ed.m_edu_workspace_ctrl'
- #
+
session_ctrl = edu_main_controller.m_main_controller_factory.m_main_controllers_list[1]
+
+ # Get the workspace from the session controller factory
+
edu_main_controller.m_edu_workspace_ctrl = session_ctrl.m_session_controller_factory.m_session_controllers_list[1]
+
+ # Get the prompt for new/existing workspace from the session controller
+ # factory
+
edu_main_controller.m_prompt_for_workspace_ctrl = session_ctrl.m_session_controller_factory.m_session_controllers_list[2]
finally:
s_splash.clear()
s_splash.hide()
- edu_main_controller.m_prompt_for_workspace_ctrl.showDialog()
+
+ # 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 """
Type 'avida_ed=AvidaEd()' to reload the AvidaEd user interface.
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingCtrl.py 2006-05-25 01:27:42 UTC (rev 706)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingCtrl.py 2006-05-26 16:46:14 UTC (rev 707)
@@ -15,18 +15,22 @@
self.m_session_mdl.m_session_mdtr,
PYSIGNAL("workspaceOpenSig"))
self.connect(self.OpenExistingPushButton, SIGNAL("clicked()"),
- self.closeDialog)
+ self.closeDialog1)
self.connect(self.CreateNewPushButton, SIGNAL("clicked()"),
self.m_session_mdl.m_session_mdtr,
PYSIGNAL("workspaceNewSig"))
self.connect(self.CreateNewPushButton, SIGNAL("clicked()"),
- self.closeDialog)
+ self.closeDialog1)
self.connect(self.CancelPushButton, SIGNAL("clicked()"),
- self.closeDialog)
+ self.closeDialog0)
def showDialog(self):
self.exec_loop()
dialog_result = self.result()
+ return(dialog_result)
- def closeDialog(self):
+ def closeDialog0(self):
+ self.done(0)
+
+ def closeDialog1(self):
self.done(1)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui 2006-05-25 01:27:42 UTC (rev 706)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui 2006-05-26 16:46:14 UTC (rev 707)
@@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>224</width>
- <height>136</height>
+ <width>307</width>
+ <height>168</height>
</rect>
</property>
<property name="paletteBackgroundColor">
@@ -20,7 +20,7 @@
</color>
</property>
<property name="caption">
- <string>Before Starting</string>
+ <string>Chose Active Workspace</string>
</property>
<widget class="QButtonGroup">
<property name="name">
@@ -30,8 +30,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>222</width>
- <height>130</height>
+ <width>310</width>
+ <height>203</height>
</rect>
</property>
<property name="title">
@@ -41,6 +41,19 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>BeforeStartTextLabel</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>12</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string><p align="center">Before you can freeze a petri dish or organism<br> you must choose a workspace to work with</p></string>
+ </property>
+ </widget>
<widget class="QPushButton">
<property name="name">
<cstring>OpenExistingPushButton</cstring>
@@ -64,6 +77,9 @@
<property name="on">
<bool>false</bool>
</property>
+ <property name="toolTip" stdset="0">
+ <string><p>Use a directory that has already been created</P></string>
+ </property>
</widget>
<widget class="QPushButton">
<property name="name">
@@ -85,6 +101,9 @@
<property name="toggleButton">
<bool>true</bool>
</property>
+ <property name="toolTip" stdset="0">
+ <string><P>Create a new workspace to save your work</P></string>
+ </property>
</widget>
<widget class="QPushButton">
<property name="name">
@@ -106,6 +125,9 @@
<property name="toggleButton">
<bool>true</bool>
</property>
+ <property name="toolTip" stdset="0">
+ <string><p>Don't freeze and return to the program</P></string>
+ </property>
</widget>
</vbox>
</widget>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-05-25 01:27:42 UTC (rev 706)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-05-26 16:46:14 UTC (rev 707)
@@ -12,7 +12,6 @@
from pyPetriConfigureCtrl import pyPetriConfigureCtrl
from pyQuitDialogCtrl import pyQuitDialogCtrl
from pyDefaultFiles import pyDefaultFiles
-from pyBeforeStartingCtrl import pyBeforeStartingCtrl
import os.path, shutil
@@ -28,8 +27,10 @@
self.m_freezer_ctrl.construct(session_mdl)
self.m_cli_to_ctrl_dict = {}
self.m_ctrl_to_cli_dict = {}
- #self.setCaption(self.m_session_mdl.m_current_workspace)
- self.setCaption('%s - %s' % (avida_ed_version_string, self.m_session_mdl.m_current_workspace) )
+ if (session_mdl.directory_chosen == False):
+ self.setCaption('%s - %s' % (avida_ed_version_string, "No Active Workspace") )
+ else:
+ self.setCaption('%s - %s' % (avida_ed_version_string, self.m_session_mdl.m_current_workspace) )
while self.m_widget_stack.visibleWidget():
self.m_widget_stack.removeWidget(self.m_widget_stack.visibleWidget())
@@ -195,6 +196,7 @@
pyDefaultFiles(fileName, destName)
self.m_session_mdl.m_current_workspace = str(new_dir)
self.m_session_mdl.m_current_freezer = os.path.join(new_dir, "freezer")
+ self.m_session_mdl.directory_chosen = True
self.setCaption('%s - %s' % (avida_ed_version_string, self.m_session_mdl.m_current_workspace) )
self.m_session_mdl.m_session_mdtr.emit(
PYSIGNAL("doRefreshFreezerInventorySig"), ())
@@ -235,7 +237,7 @@
if workspace_dir != "":
self.m_session_mdl.m_current_workspace = str(workspace_dir)
self.m_session_mdl.m_current_freezer = os.path.join(self.m_session_mdl.m_current_workspace, "freezer")
- #self.setCaption(self.m_session_mdl.m_current_workspace)
+ self.m_session_mdl.directory_chosen = True
self.setCaption('%s - %s' % (avida_ed_version_string, self.m_session_mdl.m_current_workspace) )
self.m_session_mdl.m_session_mdtr.emit(
PYSIGNAL("doRefreshFreezerInventorySig"), ())
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogCtrl.py 2006-05-25 01:27:42 UTC (rev 706)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogCtrl.py 2006-05-26 16:46:14 UTC (rev 707)
@@ -2,6 +2,7 @@
from qt import *
from pyFreezeDialogView import pyFreezeDialogView
+from pyBeforeStartingCtrl import pyBeforeStartingCtrl
import shutil, os, os.path
# class to pop up a dialog box to ask for what to freeze and to
@@ -11,13 +12,27 @@
def __init__(self):
pyFreezeDialogView.__init__(self)
- def showDialog(self, freezer_dir = None, freeze_empty_only_flag = False):
+ def showDialog(self, session_mdl, freeze_empty_only_flag = False):
found_valid_name = False
dialog_result = 1
+
+ # If the user has not already chosen an active workspace for this session
+ # make them do so now. If they chose not to pick a workspace, don't let
+ # them save their work
+
+ if (session_mdl.directory_chosen == False):
+ m_prompt_dir = pyBeforeStartingCtrl()
+ m_prompt_dir.construct(session_mdl)
+ if (m_prompt_dir.showDialog() == 0):
+ return ''
if freeze_empty_only_flag == True:
self.FullRadioButton.setEnabled(False)
+ self.FullRadioButton.setChecked(False)
+ self.EmptyRadioButton.setChecked(True)
else:
self.FullRadioButton.setEnabled(True)
+ self.EmptyRadioButton.setChecked(False)
+ self.FullRadioButton.setChecked(True)
while (found_valid_name == False and dialog_result > 0):
self.exec_loop()
dialog_result = self.result()
@@ -28,27 +43,39 @@
found_valid_name = False
self.MainMessageTextLabel.setText("Enter a Non-Blank Name of Item to Freeze")
else:
+
+ # Save empty petri dish
+
if self.EmptyRadioButton.isChecked():
if (tmp_name.endswith(".empty") == False):
tmp_name = tmp_name + ".empty"
- tmp_name = os.path.join(freezer_dir, tmp_name)
+ tmp_name = os.path.join(session_mdl.m_current_freezer, tmp_name)
if os.path.exists(tmp_name):
found_valid_name = False
self.MainMessageTextLabel.setText("Petri Dish Exists, Please Enter a Different Name")
else:
found_valid_name = True
return tmp_name
- else:
+
+ # Save full petri dish
+
+ elif self.FullRadioButton.isChecked():
if (tmp_name.endswith(".full") == False):
tmp_name = tmp_name + ".full"
- tmp_name = os.path.join(freezer_dir, tmp_name)
+ tmp_name = os.path.join(session_mdl.m_current_freezer, tmp_name)
if os.path.exists(tmp_name):
found_valid_name = False
self.MainMessageTextLabel.setText("Petri Dish Exists, Please Enter a Different Name")
else:
found_valid_name = True
return tmp_name
-
+
+ # Save selected organism
+
+ else:
+ # BDB -- code for saving selected organism needs to be added here
+ pass
+
def isEmpty(self):
if self.EmptyRadioButton.isChecked():
return True
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogView.ui 2006-05-25 01:27:42 UTC (rev 706)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogView.ui 2006-05-26 16:46:14 UTC (rev 707)
@@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>500</width>
- <height>157</height>
+ <height>177</height>
</rect>
</property>
<property name="caption">
@@ -40,13 +40,16 @@
<property name="frameShadow">
<enum>Sunken</enum>
</property>
+ <property name="toolTip" stdset="0">
+ <string><P>Enter unique (case-sensitive) name</p></string>
+ </property>
</widget>
<widget class="QButtonGroup">
<property name="name">
<cstring>FullEmptyButtonGroup</cstring>
</property>
<property name="focusPolicy">
- <enum>StrongFocus</enum>
+ <enum>NoFocus</enum>
</property>
<property name="frameShape">
<enum>NoFrame</enum>
@@ -71,6 +74,9 @@
<property name="checked">
<bool>true</bool>
</property>
+ <property name="toolTip" stdset="0">
+ <string><p>Save just the envrionmental settings</p></string>
+ </property>
</widget>
<widget class="QRadioButton">
<property name="name">
@@ -85,6 +91,9 @@
<property name="text">
<string>Full Petri Dish</string>
</property>
+ <property name="toolTip" stdset="0">
+ <string><p>Save the envrionmental settings and all the organisms in the population</P></string>
+ </property>
</widget>
<widget class="QRadioButton">
<property name="name">
@@ -99,6 +108,9 @@
<property name="text">
<string>Highlighted Organism</string>
</property>
+ <property name="toolTip" stdset="0">
+ <string><P>Save just the one organism from the population</P></string>
+ </property>
</widget>
</hbox>
</widget>
@@ -107,7 +119,7 @@
<cstring>FreezeCancelButtonGroup</cstring>
</property>
<property name="focusPolicy">
- <enum>StrongFocus</enum>
+ <enum>NoFocus</enum>
</property>
<property name="frameShape">
<enum>NoFrame</enum>
@@ -129,6 +141,9 @@
<property name="text">
<string>Freeze</string>
</property>
+ <property name="toolTip" stdset="0">
+ <string><P>Save the named file</P></string>
+ </property>
</widget>
<widget class="QPushButton">
<property name="name">
@@ -140,6 +155,9 @@
<property name="text">
<string>Cancel</string>
</property>
+ <property name="toolTip" stdset="0">
+ <string><p>Don't save, return to the program</P></string>
+ </property>
</widget>
</hbox>
</widget>
@@ -162,8 +180,12 @@
<tabstops>
<tabstop>FileNameLineEdit</tabstop>
<tabstop>EmptyRadioButton</tabstop>
+ <tabstop>FullRadioButton</tabstop>
+ <tabstop>OrganismRadioButton</tabstop>
<tabstop>SaveToFreezerPushButton</tabstop>
<tabstop>CancelPushButton</tabstop>
+ <tabstop>FreezeCancelButtonGroup</tabstop>
+ <tabstop>FullEmptyButtonGroup</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
</UI>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeOrganismCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeOrganismCtrl.py 2006-05-25 01:27:42 UTC (rev 706)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeOrganismCtrl.py 2006-05-26 16:46:14 UTC (rev 707)
@@ -2,6 +2,7 @@
from qt import *
from pyFreezeOrganismView import pyFreezeOrganismView
+from pyBeforeStartingCtrl import pyBeforeStartingCtrl
import shutil, os, os.path
# class to pop up a dialog box to ask for what to freeze and to
@@ -11,9 +12,20 @@
def __init__(self):
pyFreezeOrganismView.__init__(self)
- def showDialog(self, freezer_dir = None):
+ def showDialog(self, session_mdl):
found_valid_name = False
dialog_result = 1
+
+ # If the user has not already chosen an active workspace for this session
+ # make them do so now. If they chose not to pick a workspace, don't let
+ # them save their work
+
+ if (session_mdl.directory_chosen == False):
+ m_prompt_dir = pyBeforeStartingCtrl()
+ m_prompt_dir.construct(session_mdl)
+ if (m_prompt_dir.showDialog() == 0):
+ return ''
+
while (found_valid_name == False and dialog_result > 0):
self.show()
self.exec_loop()
@@ -30,7 +42,7 @@
else:
if (tmp_name.endswith(".organism") == False):
tmp_name = tmp_name + ".organism"
- tmp_name = os.path.join(freezer_dir, tmp_name)
+ tmp_name = os.path.join(session_mdl.m_current_freezer, tmp_name)
if os.path.exists(tmp_name):
found_valid_name = False
self.MainMessageTextLabel.setText("Organism Name Exists, Please Enter a Different Name")
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeOrganismView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeOrganismView.ui 2006-05-25 01:27:42 UTC (rev 706)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeOrganismView.ui 2006-05-26 16:46:14 UTC (rev 707)
@@ -48,6 +48,9 @@
<property name="frameShadow">
<enum>Sunken</enum>
</property>
+ <property name="toolTip" stdset="0">
+ <string><P>Enter unique (case-sensitive) name</p></string>
+ </property>
</widget>
<spacer>
<property name="name">
@@ -81,6 +84,9 @@
<property name="text">
<string>Freeze</string>
</property>
+ <property name="toolTip" stdset="0">
+ <string><P>Save the named file</P></string>
+ </property>
</widget>
<widget class="QPushButton">
<property name="name">
@@ -89,6 +95,9 @@
<property name="text">
<string>Cancel</string>
</property>
+ <property name="toolTip" stdset="0">
+ <string><p>Don't save, return to the program</P></string>
+ </property>
</widget>
</hbox>
</widget>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py 2006-05-25 01:27:42 UTC (rev 706)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py 2006-05-26 16:46:14 UTC (rev 707)
@@ -29,14 +29,14 @@
if ( QTextDrag.decode( e, freezer_item_name ) ) : #freezer_item_name is a string...the file name
if freezer_item_name[:9] == 'organism.':
freezer_item_name = freezer_item_name[9:]
- self.FreezeOrganismSlot(freezer_item_name)
+ self.FreezeOrganism(freezer_item_name)
else:
pass
- def FreezeOrganismSlot(self, freezer_item_name, send_reset_signal = False, send_quit_signal = False):
+ def FreezeOrganism(self, freezer_item_name):
tmp_dict = {1:freezer_item_name}
pop_up_organism_file_name = pyFreezeOrganismCtrl()
- file_name = pop_up_organism_file_name.showDialog(self.m_session_mdl.m_current_freezer)
+ file_name = pop_up_organism_file_name.showDialog(self.m_session_mdl)
file_name_len = len(file_name.rstrip())
if (file_name_len > 0):
@@ -315,11 +315,11 @@
if ( QTextDrag.decode( e, freezer_item_name ) ) : #freezer_item_name is a string...the file name
if freezer_item_name[:9] == 'organism.':
freezer_item_name = freezer_item_name[9:]
- self.FreezeOrganismSlot(freezer_item_name)
+ self.FreezeOrganism(freezer_item_name)
else:
pass
- def FreezeOrganismSlot(self, freezer_item_name, send_reset_signal = False, send_quit_signal = False):
+ def FreezeOrganism(self, freezer_item_name):
tmp_dict = {1:freezer_item_name}
pop_up_organism_file_name = pyFreezeOrganismCtrl()
file_name = pop_up_organism_file_name.showDialog(self.m_session_mdl.m_current_freezer)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleCtrl.py 2006-05-25 01:27:42 UTC (rev 706)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleCtrl.py 2006-05-26 16:46:14 UTC (rev 707)
@@ -8,10 +8,9 @@
def __init__(self,parent = None,name = None,fl = 0):
pyGradientScaleView.__init__(self,parent,name,fl)
- QToolTip.add(self, "Dynamic scale for current variable (scale changes as maximum value in population increases or decreases)")
+ QToolTip.add(self, "<p>Dynamic scale for current variable (scale changes as maximum value in population increases or decreases)</p>")
-
def construct(self, session_mdl):
self.m_session_mdl = session_mdl
self.m_avida = None
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2006-05-25 01:27:42 UTC (rev 706)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2006-05-26 16:46:14 UTC (rev 707)
@@ -454,8 +454,7 @@
tmp_dict = {}
tmp_dict["SETTINGS"] = self.Form2Dictionary()
m_pop_up_freezer_file_name = pyFreezeDialogCtrl()
- file_name = m_pop_up_freezer_file_name.showDialog(self.m_session_mdl.m_current_freezer,
- freeze_empty_only_flag)
+ file_name = m_pop_up_freezer_file_name.showDialog(self.m_session_mdl, freeze_empty_only_flag)
file_name_len = len(file_name.rstrip())
# If the user is saving a full population expand the name and insert
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogView.ui 2006-05-25 01:27:42 UTC (rev 706)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogView.ui 2006-05-26 16:46:14 UTC (rev 707)
@@ -48,6 +48,9 @@
<property name="text">
<string>Freeze and Quit</string>
</property>
+ <property name="toolTip" stdset="0">
+ <string><P>Save data and quit the program</P></string>
+ </property>
</widget>
<widget class="QPushButton">
<property name="name">
@@ -59,6 +62,9 @@
<property name="text">
<string>Quit</string>
</property>
+ <property name="toolTip" stdset="0">
+ <string><P>Quit the program discarding any unsaved data</P></string>
+ </property>
</widget>
<widget class="QPushButton">
<property name="name">
@@ -70,6 +76,9 @@
<property name="text">
<string>Cancel</string>
</property>
+ <property name="toolTip" stdset="0">
+ <string><p>Don't quit, return to the program</P></string>
+ </property>
</widget>
</hbox>
</widget>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py 2006-05-25 01:27:42 UTC (rev 706)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py 2006-05-26 16:46:14 UTC (rev 707)
@@ -63,6 +63,13 @@
self.m_session_mdl.saved_full_dish = False
self.m_session_mdl.new_empty_dish = True
self.m_session_mdl.new_full_dish = True
+
+ # flag to see if user has chosen a workspace for this session
+
+ self.m_session_mdl.directory_chosen = False
+
+ # use the default workspace that is in the application directory
+
self.m_session_mdl.m_current_workspace = "default.workspace"
self.m_session_mdl.m_current_freezer = os.path.join(self.m_session_mdl.m_current_workspace, "freezer")
Modified: branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-05-25 01:27:42 UTC (rev 706)
+++ branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-05-26 16:46:14 UTC (rev 707)
@@ -9,14 +9,12 @@
16-Jan-06 Get file system finished -- Make one big database file?
+26-May-06 Fix problem where canceling out of initial Quit menu causes Quit to stop working
+
Priority Medium
18-Apr-06 Replace "Viewers" buttons icons.
-18-Apr-06 Make "freeze full petri dish" be default for freezing.
-
-18-Apr-06 Remove query screen at the beginning of the program, make users choose this the first time a file is saved.
-
29-Apr-06 Change configuration on fly -- work with Kaben on the underlieing problem
15-May-06 Make "default" organism named "*Ancestor"
@@ -134,9 +132,12 @@
29-Apr-06 Add pop-up help for all control items -- Finished 17-May-06
+18-Apr-06 Make "freeze full petri dish" be default for freezing. -- Finished 25-May-06
+18-Apr-06 Remove query screen at the beginning of the program, make users choose this the first time a file is saved. -- Finished 26-May-06
+
************Kaben******************
* 23-Jan-06 Get program to run on all Macs -- Finished 27-Jan-06
More information about the Avida-cvs
mailing list