Changeset 568658b in sasview

Timestamp:

Feb 11, 2011 11:56:12 AM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

d20771f

Parents:

c03b780

Message:

remove print statement

Location:

guiframe

Files:

• gui_manager.py (modified) (5 diffs)
• gui_toolbar.py (modified) (1 diff)
• widgets/__init__.py (added)
• widgets/bitmapPopbutton.py (added)

guiframe/gui_manager.py

@@ -949 +949 @@
             return
         try:
-            temp =  self.loader.load(path, extension)
-            if temp.__class__.__name__ == "list":
-                for item in temp:
-                    data = self.create_gui_data(item, path)
+            if extension == '.svs':
+                for plug in self.plugins:
+                    temp =  self.loader.load(path)
+                    if temp.__class__.__name__ == "list":
+                        for item in temp:
+                            data = self.create_gui_data(item, path)
+                            output.append(data)
+                    else:
+                        data = self.create_gui_data(temp, path)
+                        output.append(data)
+                    
+                    message = "Loading File..." + str(basename) + "\n"
+                    self.load_update(output=output, message=message)
+            else:
+                temp =  self.loader.load(path, extension)
+                if temp.__class__.__name__ == "list":
+                    for item in temp:
+                        data = self.create_gui_data(item, path)
+                        output.append(data)
+                else:
+                    data = self.create_gui_data(temp, path)
                     output.append(data)
-            else:
-                data = self.create_gui_data(temp, path)
-                output.append(data)
             message = "Loading File..." + str(basename) + "\n"
             self.load_update(output=output, message=message)
@@ -1367 +1381 @@
         set the current active perspective 
         """
-        print "set_current_perspective", perspective
         self._current_perspective = perspective
         name = "No current Application selected"
@@ -1375 +1388 @@
                 if hasattr(panel, 'CENTER_PANE') and panel.CENTER_PANE:
                     for name in self._current_perspective.get_perspective():
-                        print "current",name.lower(),panel.window_name.lower(), name == panel.window_name
                         if name == panel.window_name:
                             panel.on_set_focus(event=None)
-                            print "panel", name,  panel.window_name,  panel.window_caption
                             break
                            
@@ -1385 +1396 @@
                 self._data_panel.set_active_perspective(name)
                 self._check_applications_menu()
-            ##update tool bar
-            #if self._toolbar is not None:
-            #    self._update_toolbar_helper()
-                
+  
     def _check_applications_menu(self):
         """
@@ -1700 +1708 @@
         if len(sys.argv) > 1 and '--platform' in sys.argv[1:]:
             w, h = wx.DisplaySize()  # size includes task bar area
-            print "*** Reported screen size including taskbar is %d x %d"%(w, h)
-            print "*** Reported screen size excluding taskbar is %d x %d"%(x, y)
-
         if x > 1920: x = 1280  # display on left side, not centered on screen
         if x > window_width:  xpos = (x - window_width)/2

guiframe/gui_toolbar.py

@@ -167 +167 @@
         self.button_application.SetLabel(str(application_name))
         self.button_panel.SetLabel(str(panel_name))
-        print "update_button", application_name, panel_name
         
     def update_toolbar(self, panel=None):