Changeset 5b2b04d in sasview


Ignore:
Timestamp:
Apr 9, 2017 5:30:22 AM (8 months ago)
Author:
GitHub <noreply@…>
Branches:
master, ESS_GUI, ESS_GUI_CategroyManager, ESS_GUI_Pr, ESS_GUI_cns, ESS_GUI_corf, ESS_GUI_py2_OLD, SVCC-1, SasView-664, costrafo411, docs, ticket-873, ticket-976, ticket-993, unittest-saveload
Children:
2651724, 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 05:30:22)
git-committer:
GitHub <noreply@…> (04/09/17 05:30:22)
Message:

Merge pull request #73 from SasView?/quick_numpy_fix

Quick fix for numpy that caused problems in batch fitting

Files:
3 added
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/guiframe/data_processor.py

    r9a5097c re645bbb  
    1818 
    1919""" 
    20 import wx 
    21 import numpy 
    22 import math 
    23 import re 
    2420import os 
    2521import sys 
    2622import copy 
    27 from wx.lib.scrolledpanel import ScrolledPanel 
     23import math 
     24import re 
     25import wx 
     26import numpy as np 
     27 
    2828import wx.aui 
    2929from wx.aui import AuiNotebook as nb 
    3030import wx.lib.sheet as sheet 
     31from wx.lib.scrolledpanel import ScrolledPanel 
     32 
    3133from sas.sasgui.guiframe.panel_base import PanelBase 
    3234from sas.sasgui.guiframe.events import NewPlotEvent 
  • sasview/media/README.txt

    r7202894 r643dcd93  
    22in the menu bar. 
    33 
    4 The source files are in: /SasViewLocalTrunk/docs/sasview 
     4The source files are in: /sasview/docs/sasview 
Note: See TracChangeset for help on using the changeset viewer.