Changeset dc0cfa4 in sasview

Timestamp:

Apr 13, 2012 9:37:05 AM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

5625551

Parents:

6d8bad4

Message:

Fixing code style problems and bugs

File:

• sansguiframe/src/sans/guiframe/data_panel.py (modified) (6 diffs)

sansguiframe/src/sans/guiframe/data_panel.py

@@ -11 +11 @@
 This module provides Graphic interface for the data_manager module.
 """
-import os
 import wx
 from wx.build import build_options
 # Check version
-toks = wx.__version__.split('.')
+toks = str(wx.__version__).split('.')
 if int(toks[1]) < 9:
     if int(toks[2]) < 12:
@@ -24 +23 @@
     wx_version = 900
 import sys
-import warnings
-import logging
 from wx.lib.scrolledpanel import ScrolledPanel
 import  wx.lib.agw.customtreectrl as CT
@@ -64 +61 @@
     IS_MAC = True
 
-STYLE_FLAG =wx.RAISED_BORDER|CT.TR_HAS_BUTTONS| CT.TR_HIDE_ROOT|\
+STYLE_FLAG = wx.RAISED_BORDER|CT.TR_HAS_BUTTONS| CT.TR_HIDE_ROOT|\
                     wx.WANTS_CHARS|CT.TR_HAS_VARIABLE_ROW_HEIGHT
                     
@@ -157 +154 @@
         ## Create context menu for page
         self.data_menu = None
+        self.popUpMenu = None
        
         self.owner = None
@@ -1234 +1232 @@
                 temp.append(data)
         return temp
-    
-    def _count_selected_data(self, event):
-        """
-        count selected data
-        """
-        if event.GetEventObject().GetValue():
-            self._nb_selected_data += 1
-        else:
-            self._nb_selected_data -= 1
-        select_data_text = " %s Data selected.\n" % str(self._nb_selected_data)
-        self._data_text_ctrl.SetLabel(select_data_text)
-        if self._nb_selected_data <= self._max_data:
-            self._data_text_ctrl.SetForegroundColour('blue')
-        else:
-            self._data_text_ctrl.SetForegroundColour('red')
-        
-                  
-        
+            
 class DataFrame(wx.Frame):
     ## Internal name for the AUI manager
@@ -1293 +1274 @@
         self.msg += "params : \n"
         self.msg += "name  value\n"
-        return msg
+        return self.msg
+    
 def set_data_state(data=None, path=None, theory=None, state=None):
     dstate = DataState(data=data)