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

[baerb@myxo.css.msu.edu]

Author: baerb
Date: 2005-06-13 15:03:17 -0400 (Mon, 13 Jun 2005)
New Revision: 209

Modified:
   trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
Log:
Fixed problem with drop to analyze mode getting the wrong directory



Modified: trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py	2005-06-13 17:20:39 UTC (rev 208)
+++ trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py	2005-06-13 19:03:17 UTC (rev 209)
@@ -101,15 +101,6 @@
 
   def load(self, filename, colx, coly):
     
-    # Brian's old code, delete 
-    # init_file_name_str = os.path.join(self.m_session_mdl.m_current_freezer, str(self.m_petri_dish_dir_path) + '.full', filename)
-    # init_file = cInitFile(cString(init_file_name_str))
-    #
-    # print "loading"
-    # if not init_file.IsOpen():
-    #   print "the file you are looking for does not exist"
-    #   return
-
     init_file = cInitFile(cString(os.path.join(str(self.m_petri_dish_dir_path), filename)))
     init_file.Load()
     init_file.Compress()
@@ -151,7 +142,7 @@
         print "index_1[2] is"
         print self.m_avida_stats_interface.m_entries[index_1][2]
         self.m_curve_1_arrays = self.load(
-            os.path.join(self.m_session_mdl.m_tempdir_out, self.m_avida_stats_interface.m_entries[index_1][1]),
+            self.m_avida_stats_interface.m_entries[index_1][1],
             1,
             self.m_avida_stats_interface.m_entries[index_1][2]
         )
@@ -173,7 +164,7 @@
         self.m_graph_ctrl.enableYRightAxis(True)      
         self.m_graph_ctrl.setAxisAutoScale(QwtPlot.yRight)
         self.m_curve_2_arrays = self.load(
-            os.path.join(self.m_session_mdl.m_tempdir_out, self.m_avida_stats_interface.m_entries[index_2][1]),
+            self.m_avida_stats_interface.m_entries[index_2][1],
             1,
             self.m_avida_stats_interface.m_entries[index_2][2]
         )