Changeset 70b760da in sasview

Timestamp:

Aug 24, 2011 8:26:16 AM (13 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:

4ad076b

Parents:

b3145bf

Message:

shorter path imports

Location:

fittingview/src/sans/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• help_panel.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -2613 +2613 @@
         """
         from help_panel import  HelpWindow
-        import sans.models as models 
+        from sans.models import get_data_path
         
         # Get models help model_function path
-        path = models.get_data_path(media='media')
+        path = get_data_path(media='media')
         model_path = os.path.join(path,"model_functions.html")
         if self.model == None:

fittingview/src/sans/perspectives/fitting/help_panel.py

@@ -49 +49 @@
         self.rhelp = html.HtmlWindow(rpanel, -1, style=wx.NO_BORDER, size=(500,-1))
 
-        import sans.models as models 
         # get the media path
-        path = models.get_data_path(media='media')
+        if pageToOpen != None:
+            path = os.path.dirname(pageToOpen)
+        else:
+            from sans.models import get_data_path as model_path
+            # Get models help model_function path
+            path = model_path(media='media')
+
         self.path = os.path.join(path,"model_functions.html")
         self.path_pd = os.path.join(path,"pd_help.html")
         self.path_sm = os.path.join(path,"smear_computation.html")
-        import sans.perspectives.fitting as fitting
-        
-        fitting_path = fitting.get_data_path(media='media')
+        from sans.perspectives.fitting import get_data_path as fit_path
+        fitting_path = fit_path(media='media')
         
         _html_file = {"status_bar_help.html":"Status Bar Help",