[Avida-cvs] [avida-svn] r575 - branches/developers/avida-edward/source/python/AvidaGui2
baerb@myxo.css.msu.edu
baerb at myxo.css.msu.edu
Wed Apr 5 11:41:28 PDT 2006
Author: baerb
Date: 2006-04-05 14:41:28 -0400 (Wed, 05 Apr 2006)
New Revision: 575
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_PetriDishCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePopulationCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyRightClickDialogCtrl.py
Log:
Made right click menu truely modal.
Fix problem where the qt decode command was modifying the name of directories
under OS-X that have non-ascii characters.
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2006-04-05 16:09:52 UTC (rev 574)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2006-04-05 18:41:28 UTC (rev 575)
@@ -217,6 +217,8 @@
# Try to decode to the data you understand...
freezer_item_name = QString()
if ( QTextDrag.decode( e, freezer_item_name ) ) :
+ freezer_item_name = str(e.encodedData("text/plain"))
+ print "BDB:pyOneAna_GraphCtrl:petriDropped freezer_item_name = " + freezer_item_name
self.m_petri_dish_dir_path = freezer_item_name
self.modeActivatedSlot()
return
@@ -244,9 +246,9 @@
m = m + " " + i + '\n'
return
- str = decode( e )
- if str:
- print " in if str"
+ decode_str = decode( e )
+ if decode_str:
+ print " in if decode_str"
def freezerItemDoubleClickedOn(self, freezer_item_name):
# a check in pyOneAnalyzeCtrl.py makes sure this is a valid path
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_PetriDishCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_PetriDishCtrl.py 2006-04-05 16:09:52 UTC (rev 574)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_PetriDishCtrl.py 2006-04-05 18:41:28 UTC (rev 575)
@@ -30,7 +30,8 @@
# Try to decode to the data you understand...
freezer_item_name = QString()
if ( QTextDrag.decode( e, freezer_item_name ) ) :
- self.m_one_ana_pop_name.setText(os.path.splitext((os.path.split(str(freezer_item_name))[1]))[0])
+ freezer_item_name = str(e.encodedData("text/plain"))
+ self.m_one_ana_pop_name.setText(os.path.splitext((os.path.split(freezer_item_name)[1]))[0])
def freezerItemDoubleClickedOn(self, freezer_item_name):
self.m_one_ana_pop_name.setText(os.path.split(os.path.splitext(os.path.split(freezer_item_name)[0])[0])[1])
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeCtrl.py 2006-04-05 16:09:52 UTC (rev 574)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeCtrl.py 2006-04-05 18:41:28 UTC (rev 575)
@@ -50,7 +50,8 @@
freezer_item_name = QString()
if ( QTextDrag.decode( e, freezer_item_name ) ) : #freezer_item_name is a string...the file name
- if os.path.exists(str(freezer_item_name)) == False:
+ freezer_item_name = str(e.encodedData("text/plain"))
+ if os.path.exists(freezer_item_name) == False:
descr("that was not a valid path (1)")
else:
e.acceptAction(True)
@@ -60,7 +61,8 @@
def dropEvent( self, e ):
freezer_item_name = QString()
if ( QTextDrag.decode( e, freezer_item_name ) ) :
- if os.path.exists( str(freezer_item_name)) == False:
+ freezer_item_name = str(e.encodedData("text/plain"))
+ if os.path.exists(freezer_item_name) == False:
print "that was not a valid path(3)"
else:
self.emit(PYSIGNAL("freezerItemDroppedInOneAnalyzeSig"), (e,))
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2006-04-05 16:09:52 UTC (rev 574)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2006-04-05 18:41:28 UTC (rev 575)
@@ -185,14 +185,15 @@
# Try to decode to the data you understand...
freezer_item_name = QString()
if ( QTextDrag.decode( e, freezer_item_name ) ) :
+ freezer_item_name = str(e.encodedData("text/plain"))
if freezer_item_name[-8:] == 'organism':
# We can't yet deal with organims in the population view
return
elif freezer_item_name[-4:] == 'full':
- freezer_item_name_temp = os.path.join(str(freezer_item_name), 'petri_dish')
+ freezer_item_name_temp = os.path.join(freezer_item_name, 'petri_dish')
self.m_session_mdl.new_full_dish = True
else:
- freezer_item_name_temp = str(freezer_item_name)
+ freezer_item_name_temp = freezer_item_name
self.m_session_mdl.new_empty_dish = True
thawed_item = pyReadFreezer(freezer_item_name_temp)
self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("doDefrostDishSig"),
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsCtrl.py 2006-04-05 16:09:52 UTC (rev 574)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsCtrl.py 2006-04-05 18:41:28 UTC (rev 575)
@@ -269,12 +269,13 @@
# Try to decode to the data you understand...
freezer_item_name = QString()
if ( QTextDrag.decode( e, freezer_item_name ) ) :
+ freezer_item_name = str(e.encodedData("text/plain"))
if freezer_item_name[-4:] == 'full':
- full_petri_dir = str(freezer_item_name)
+ full_petri_dir = freezer_item_name
self.loadStats(full_petri_dir)
else:
return
-# (os.path.splitext((os.path.split(str(freezer_item_name))[1]))[0], thawed_item,))
+# (os.path.splitext((os.path.split(freezer_item_name)[1]))[0], thawed_item,))
def loadStats(self, full_petri_dir):
full_petri_average_file_name = os.path.join(str(full_petri_dir), 'average.dat')
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePopulationCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePopulationCtrl.py 2006-04-05 16:09:52 UTC (rev 574)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePopulationCtrl.py 2006-04-05 18:41:28 UTC (rev 575)
@@ -57,7 +57,8 @@
freezer_item_name = QString()
if ( QTextDrag.decode( e, freezer_item_name ) ) : #freezer_item_name is a string...the file name
- if os.path.exists(str(freezer_item_name)) == False:
+ freezer_item_name = str(e.encodedData("text/plain"))
+ if os.path.exists(freezer_item_name) == False:
descr("that was not a valid path (1)")
else:
e.acceptAction(True)
@@ -68,7 +69,8 @@
descr(e)
freezer_item_name = QString()
if ( QTextDrag.decode( e, freezer_item_name ) ) : #freezer_item_name is a string...the file name
- if os.path.exists(str(freezer_item_name)) == False:
+ freezer_item_name = str(e.encodedData("text/plain"))
+ if os.path.exists(freezer_item_name) == False:
print "that was not a valid path (1)"
else:
self.emit(PYSIGNAL("petriDishDroppedInPopViewSig"), (e,))
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeCtrl.py 2006-04-05 16:09:52 UTC (rev 574)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeCtrl.py 2006-04-05 18:41:28 UTC (rev 575)
@@ -62,32 +62,30 @@
def dragEnterEvent( self, e ):
e.acceptAction(True)
- freezer_item_name = QString()
- if ( QTextDrag.decode( e, freezer_item_name ) ) :
- if os.path.exists( str(freezer_item_name)) == False:
- print "pyOrganismScopeCtrl.dragEnterEvent(e): that was not a valid path."
+ freezer_item_name = str(e.encodedData("text/plain"))
+ if os.path.exists(freezer_item_name) == False:
+ print "pyOrganismScopeCtrl.dragEnterEvent(e): that was not a valid path."
+ else:
+ print "pyOrganismScopeCtrl.dragEnterEvent(e): that was a valid path."
+ print "pyOrganismScopeCtrl.dragEnterEvent(e): freezer_item_name", freezer_item_name
+ if freezer_item_name.endswith('.organism'):
+ print "pyOrganismScopeCtrl.dragEnterEvent(e): freezer_item_name ends with .organism."
+ e.accept()
else:
- print "pyOrganismScopeCtrl.dragEnterEvent(e): that was a valid path."
- print "pyOrganismScopeCtrl.dragEnterEvent(e): freezer_item_name", freezer_item_name
- if str(freezer_item_name).endswith('.organism'):
- print "pyOrganismScopeCtrl.dragEnterEvent(e): freezer_item_name ends with .organism."
- e.accept()
- else:
- print "pyOrganismScopeCtrl.dragEnterEvent(e): freezer_item_name doesn't end with .organism."
+ print "pyOrganismScopeCtrl.dragEnterEvent(e): freezer_item_name doesn't end with .organism."
def dropEvent( self, e ):
- freezer_item_name = QString()
- if ( QTextDrag.decode( e, freezer_item_name ) ) :
- if os.path.exists( str(freezer_item_name)) == False:
- print "pyOrganismScopeCtrl.dropEvent(e): that was not a valid path."
+ freezer_item_name = str(e.encodedData("text/plain"))
+ if os.path.exists(freezer_item_name) == False:
+ print "pyOrganismScopeCtrl.dropEvent(e): that was not a valid path."
+ else:
+ print "pyOrganismScopeCtrl.dropEvent(e): that was a valid path."
+ if freezer_item_name.endswith('.organism'):
+ print "pyOrganismScopeCtrl.dropEvent(e): freezer_item_name ends with .organism."
+ e.accept()
+ self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("setDebugOrganismFileSig"), (freezer_item_name,))
else:
- print "pyOrganismScopeCtrl.dropEvent(e): that was a valid path."
- if str(freezer_item_name).endswith('.organism'):
- print "pyOrganismScopeCtrl.dropEvent(e): freezer_item_name ends with .organism."
- e.accept()
- self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("setDebugOrganismFileSig"), (freezer_item_name,))
- else:
- print "pyOrganismScopeCtrl.dropEvent(e): freezer_item_name doesn't end with .organism."
+ print "pyOrganismScopeCtrl.dropEvent(e): freezer_item_name doesn't end with .organism."
def setAvidaSlot(self, avida):
@@ -104,7 +102,7 @@
self.setFrames()
inst_set = self.m_avida.m_environment.GetInstSet()
- org_file = open(organism_filename.ascii())
+ org_file = open(organism_filename)
org_string = org_file.readline()
org_string = org_string.rstrip()
org_string = org_string.lstrip()
@@ -128,7 +126,7 @@
self.progress_bar.setProgress(step)
qApp.processEvents()
- self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("setOneOrganismViewNameLabelTextSig"), (organism_filename.ascii(),))
+ self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("setOneOrganismViewNameLabelTextSig"), (organism_filename,))
self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("statusBarMessageSig"), ("Analyzing organism...",))
progress_callback = ProgressCallback(self.m_session_mdl.m_session_mdtr)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2006-04-05 16:09:52 UTC (rev 574)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2006-04-05 18:41:28 UTC (rev 575)
@@ -525,7 +525,8 @@
freezer_item_name = QString()
if ( QTextDrag.decode( e, freezer_item_name ) ) : #freezer_item_name is a string...the file name
- if os.path.exists(str(freezer_item_name)) == False:
+ freezer_item_name = str(e.encodedData("text/plain"))
+ if os.path.exists(freezer_item_name) == False:
descr("that was not a valid path (1)")
else:
e.acceptAction(True)
@@ -536,7 +537,8 @@
descr()
freezer_item_name = QString()
if ( QTextDrag.decode( e, freezer_item_name ) ) :
- if os.path.exists(str(freezer_item_name)) == False:
+ freezer_item_name = str(e.encodedData("text/plain"))
+ if os.path.exists(freezer_item_name) == False:
print "that was not a valid path (2)"
else:
self.emit(PYSIGNAL("petriDishDroppedInPopViewSig"), (e,))
@@ -546,6 +548,7 @@
# Try to decode to the data you understand...
freezer_item_name = QString()
if ( QTextDrag.decode( e, freezer_item_name ) and not self.DishDisabled) :
+ freezer_item_name = str(e.encodedData("text/plain"))
if freezer_item_name[-8:] == 'organism':
core_name = freezer_item_name[:-9]
core_name = os.path.basename(str(freezer_item_name[:-9]))
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyRightClickDialogCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyRightClickDialogCtrl.py 2006-04-05 16:09:52 UTC (rev 574)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyRightClickDialogCtrl.py 2006-04-05 18:41:28 UTC (rev 575)
@@ -44,7 +44,7 @@
def showDialog(self):
self.change = False
self.open_obj = False
- self.show()
+ # self.show()
self.exec_loop()
dialog_result = self.result()
new_name_core = str(self.NewNameLineEdit.text())
More information about the Avida-cvs
mailing list