Changeset 0912feab in sasview

Timestamp:

Jan 25, 2011 7:46:47 PM (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:

7a67e075

Parents:

52b8b74

Message:

working on guiframe

Location:

sansview

Files:

• perspectives/fitting/fitting.py (modified) (1 diff)
• sansview.py (modified) (3 diffs)

sansview/perspectives/fitting/fitting.py

@@ -257 +257 @@
         loader.associate_file_reader(".fitv", self.state_reader)
         loader.associate_file_reader(".svs", self.state_reader)
-
+        from sans.perspectives.calculator.sld_panel import SldPanel
         #Send the fitting panel to guiframe
-        self.mypanels.append(self.fit_panel)
+        self.mypanels.append(self.fit_panel) 
+        self.mypanels.append(SldPanel(parent=self.parent, base=self.parent))
         return self.mypanels
     

sansview/sansview.py

@@ -22 +22 @@
 
 from sans.guiframe import gui_manager
+from sans.guiframe.gui_style import GUIFRAME
 from welcome_panel import WelcomePanel
 # For py2exe, import config here
@@ -30 +31 @@
 APP_HEIGHT = 800
 APP_WIDTH  = 1000
-
+GSTYLE = GUIFRAME.MULTIPLE_APPLICATIONS
 class SansViewApp(gui_manager.ViewApp):
     """
@@ -41 +42 @@
         app_width  = APP_WIDTH if screen_size[0]>APP_WIDTH else screen_size[0]-50
 
-        self.frame = gui_manager.ViewerFrame(None, -1, local_config.__appname__, 
-                             window_height=app_height, window_width=app_width)    
+        self.frame = gui_manager.ViewerFrame(None, -1, 
+                                             local_config.__appname__, 
+                                             gui_style=GSTYLE,
+                                             window_height=app_height, 
+                                             window_width=app_width)    
         self.frame.Show(True)