Changeset a48842a2 in sasview for sansguiframe/src/sans/guiframe/gui_manager.py

Timestamp:

Jun 13, 2012 4:40:41 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

1a98ded

Parents:

9a14138

Message:

added data operation tool

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (7 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -194 +194 @@
     IS_WIN = False
     TIME_FACTOR = 2
-    if int(str(wx.__version__).split('.')[0]) == 2:
-        if int(str(wx.__version__).split('.')[1]) < 9:
+    if int(wx.__version__.split('.')[0]) == 2:
+        if int(wx.__version__.split('.')[1]) < 9:
             CLOSE_SHOW = False
     
@@ -831 +831 @@
                         continue
                     path = [os.path.abspath(dir)]
-                    file = None
+                    file = ''
                     try:
                         if toks[1] == '':
@@ -1787 +1787 @@
                 if self._data_panel is not None and \
                             ID in self.plot_panels.keys():
-                    self._data_panel.cb_plotpanel.Append(str(caption), 
-                                                         self.panels[ID])
+                    self._data_panel.cb_plotpanel.Append(str(caption), p)
                 # Do not Hide default panel here...
                 #self._mgr.GetPane(self.panels["default"].window_name).Hide()
@@ -1854 +1853 @@
             log_msg += "Try Data opening...."
             logging.info(log_msg)
-            print log_msg
-            #self.load_complete(output=output, error_message=error_message,
-            #       message=log_msg, path=path)    
+            self.load_complete(output=output, error_message=error_message,
+                   message=log_msg, path=path)    
             return
         
@@ -2618 +2616 @@
             for i in range(len(data.x)):
                 if has_errors:
-                    if data.dx != [] and data.dx != None:
+                    if data.dx != None and data.dx != []:
                         if  data.dx[i] != None:
                             out.write("%g  %g  %g  %g\n" % (data.x[i], 
@@ -3210 +3208 @@
         drag 
         """
-        #if self.cpanel_on_focus is not None:
-        #    self._toolbar.enable_drag(self.panel_on_focus)
+        if self.cpanel_on_focus is not None:
+            self._toolbar.enable_drag(self.panel_on_focus)
             
     def enable_reset(self):
@@ -3419 +3417 @@
             self.frame.Show()
  
-        #if hasattr(self.frame, 'special'):
-        #    self.frame.special.SetCurrent()
+        if hasattr(self.frame, 'special'):
+            self.frame.special.SetCurrent()
         self.SetTopWindow(self.frame)