Changes in / [0989bad:2327399] in sasview

Location:

src/sas/qtgui

Files:

• Perspectives/Invariant/InvariantPerspective.py (modified) (2 diffs)
• Utilities/GridPanel.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

@@ -348 +348 @@
                 extrapolated_data.name = title
                 extrapolated_data.title = title
-                extrapolated_data.style = "Line"
+                extrapolated_data.symbol = "Line"
                 extrapolated_data.has_errors = False
-                extrapolated_data.plot_role = Data1D.ROLE_DEFAULT
 
                 # copy labels and units of axes for plotting
@@ -382 +381 @@
                 high_out_data.name = title
                 high_out_data.title = title
-                high_out_data.style = "Line"
+                high_out_data.symbol = "Line"
                 high_out_data.has_errors = False
-                high_out_data.plot_role = Data1D.ROLE_DEFAULT
 
                 # copy labels and units of axes for plotting

src/sas/qtgui/Utilities/GridPanel.py

@@ -186 +186 @@
         Open a local url in the default browser
         """
-        location = GuiUtils.HELP_DIRECTORY_LOCATION
         url = "/user/qtgui/Perspectives/Fitting/fitting_help.html#batch-fit-mode"
+        location = GuiUtils.HELP_DIRECTORY_LOCATION + url
+        if os.path.isdir(location) == False:
+            sas_path = os.path.abspath(os.path.dirname(sys.argv[0]))
+            location = sas_path + "/" + location
         try:
-            webbrowser.open('file://' + os.path.realpath(location+url))
+            webbrowser.open('file://' + os.path.realpath(location))
         except webbrowser.Error as ex:
             logging.warning("Cannot display help. %s" % ex)