Changeset 5b2b04d in sasview

Timestamp:

Apr 9, 2017 3:30:22 AM (7 years ago)

Author:

GitHub <noreply@…>

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

7b15990, 4342fed0, 235f514

Parents:

ec65dc81 (diff), e645bbb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Butler <butlerpd@…> (04/09/17 03:30:22)

git-committer:

GitHub <noreply@…> (04/09/17 03:30:22)

Message:

Merge pull request #73 from SasView?/quick_numpy_fix

Quick fix for numpy that caused problems in batch fitting

Files:

• src/sas/sasgui/guiframe/data_processor.py (modified) (1 diff)
• docs/pandoc-docs/Makefile (added)
• docs/pandoc-docs/build_pandoc.py (added)
• docs/pandoc-docs/source/README.txt (added)
• sasview/media/README.txt (modified) (1 diff)

src/sas/sasgui/guiframe/data_processor.py

@@ -18 +18 @@
 
 """
-import wx
-import numpy
-import math
-import re
 import os
 import sys
 import copy
-from wx.lib.scrolledpanel import ScrolledPanel
+import math
+import re
+import wx
+import numpy as np
+
 import wx.aui
 from wx.aui import AuiNotebook as nb
 import wx.lib.sheet as sheet
+from wx.lib.scrolledpanel import ScrolledPanel
+
 from sas.sasgui.guiframe.panel_base import PanelBase
 from sas.sasgui.guiframe.events import NewPlotEvent

sasview/media/README.txt

@@ -2 +2 @@
 in the menu bar.
 
-The source files are in: /SasViewLocalTrunk/docs/sasview
+The source files are in: /sasview/docs/sasview