[Avida-SVN] r1665 - branches/developers/avida-edward/source/python/AvidaGui2

[kaben at myxo.css.msu.edu]

Author: kaben
Date: 2007-06-11 13:18:31 -0400 (Mon, 11 Jun 2007)
New Revision: 1665

Modified:
   branches/developers/avida-edward/source/python/AvidaGui2/
   branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
Log:
 r1680 at clearly:  kaben | 2007-06-11 13:20:06 -0400
 Fixes bug where when an org from the petri dish is dragged to the viewer
 button, the view switches to the org viewer and the org is loaded;
 However, the population button remains selected, but on the switch to
 org view, the Organism viewer button should become highlighted instead



Property changes on: branches/developers/avida-edward/source/python/AvidaGui2
___________________________________________________________________
Name: svk:merge
   - ef7795d3-e11b-4b79-8bcc-31c36a5bb0b4:/local/branches/developers/avida-edward/source/python/AvidaGui2:1674
   + ef7795d3-e11b-4b79-8bcc-31c36a5bb0b4:/local/branches/developers/avida-edward/source/python/AvidaGui2:1680

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py	2007-06-11 16:55:21 UTC (rev 1664)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py	2007-06-11 17:18:31 UTC (rev 1665)
@@ -194,12 +194,18 @@
         self.m_widget_stack.raiseWidget(controller)
 
   # @kgn : desperate hacks to get drag & drop working.
+  def switchToView(self, cli):
+    self.m_nav_bar_ctrl.m_list_view.setSelected(self.m_nav_bar_ctrl.m_one_population_cli, False)
+    self.m_nav_bar_ctrl.m_list_view.setSelected(self.m_nav_bar_ctrl.m_one_organism_cli, False)
+    self.m_nav_bar_ctrl.m_list_view.setSelected(self.m_nav_bar_ctrl.m_one_analyze_cli, False)
+    self.m_nav_bar_ctrl.m_list_view.setSelected(cli, True)
+    self.navBarItemClickedSlot(cli)
   def raisePopViewSlot(self):
-    self.navBarItemClickedSlot(self.m_nav_bar_ctrl.m_one_population_cli)
+    self.switchToView(self.m_nav_bar_ctrl.m_one_population_cli)
   def raiseOrgViewSlot(self):
-    self.navBarItemClickedSlot(self.m_nav_bar_ctrl.m_one_organism_cli)
+    self.switchToView(self.m_nav_bar_ctrl.m_one_organism_cli)
   def raiseAnaViewSlot(self):
-    self.navBarItemClickedSlot(self.m_nav_bar_ctrl.m_one_analyze_cli)
+    self.switchToView(self.m_nav_bar_ctrl.m_one_analyze_cli)
 
   # when user clicks on an item (or items) in the freezer list change the 
   # menu to reflect the choice