Changeset f468791 in sasview


Ignore:
Timestamp:
Oct 24, 2013 10:40:22 AM (11 years ago)
Author:
Mathieu Doucet <doucetm@…>
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:
1f8eecb
Parents:
a9d5684
Message:

Move plottools under sans

Files:
20 edited

Legend:

Unmodified
Added
Removed
  • .pydevproject

    r9998be0 rf468791  
    44<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property> 
    55<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH"> 
    6 <path>/code/sansrealspace_modeling/src</path> 
    76<path>/code/src</path> 
    87</pydev_pathproperty> 
  • setup.py

    r5980b1a rf468791  
    6767enable_openmp = True                     
    6868 
    69 if sys.platform =='darwin' and not is_64bits: 
    70     # Disable OpenMP 
    71     enable_openmp = False 
     69if sys.platform =='darwin': 
     70    if not is_64bits: 
     71        # Disable OpenMP 
     72        enable_openmp = False 
     73    else: 
     74        # Newer versions of Darwin don't support openmp 
     75        try: 
     76            darwin_ver = int(os.uname()[2].split('.')[0]) 
     77            if darwin_ver >= 12: 
     78                enable_openmp = False 
     79        except: 
     80            print "PROBLEM determining Darwin version" 
    7281 
    7382# Options to enable OpenMP 
     
    175184 
    176185# Plottools 
    177 package_dir["danse"] = os.path.join("src", "danse") 
    178 package_dir["danse.common"] = os.path.join("src", "danse", "common") 
    179 package_dir["danse.common.plottools"] = os.path.join("src", "danse", "common", "plottools") 
    180 packages.extend(["danse", "danse.common", "danse.common.plottools"]) 
     186package_dir["sans.plottools"] = os.path.join("src", "sans", "plottools") 
     187packages.append("sans.plottools") 
    181188 
    182189# Park 1.2.1 
  • src/examples/test_chisq_panel.py

    r5777106 rf468791  
    2727 
    2828import wx 
    29 from danse.common.plottools.PlotPanel import PlotPanel 
    30 from danse.common.plottools.plottables import Plottable, Graph, Data1D, Theory1D 
     29from sans.plottools.PlotPanel import PlotPanel 
     30from sans.plottools.plottables import Plottable, Graph, Data1D, Theory1D 
    3131import  sys 
    3232import numpy 
     
    8686        dy = numpy.sqrt(100*numpy.abs(y))/100 
    8787 
    88     from danse.common.plottools.plottables import Data1D, Theory1D, Chisq , Graph 
     88    from sans.plottools.plottables import Data1D, Theory1D, Chisq , Graph 
    8989    data = Data1D(x,y,dy=dy) 
    9090    data.xaxis('distance', 'm') 
  • src/examples/test_copy_print.py

    r5777106 rf468791  
    2626 
    2727import wx 
    28 from danse.common.plottools.PlotPanel import PlotPanel 
    29 from danse.common.plottools.plottables import Plottable, Graph, Data1D, Theory1D 
     28from sans.plottools.PlotPanel import PlotPanel 
     29from sans.plottools.plottables import Graph, Data1D, Theory1D 
    3030import  sys 
    3131sys.platform = 'win95' 
     
    8585    dy = numpy.sqrt(100*numpy.abs(y))/100 
    8686     
    87     from danse.common.plottools.plottables import Data1D, Theory1D,  Graph 
    88      
    8987    data = Data1D(x,y,dy=dy) 
    9088    data.xaxis('distance', 'm') 
  • src/examples/test_panel.py

    r5777106 rf468791  
    3737""" 
    3838import wx 
    39 from danse.common.plottools.PlotPanel import PlotPanel 
    40 from danse.common.plottools.plottables import Plottable, Graph, Data1D, Theory1D 
     39from sans.plottools.PlotPanel import PlotPanel 
     40from sans.plottools.plottables import Data1D 
    4141import  sys 
    4242import numpy 
  • src/examples/test_panel2D.py

    r5777106 rf468791  
    3737""" 
    3838import wx 
    39 from danse.common.plottools.PlotPanel import PlotPanel 
    40 from danse.common.plottools.plottables import Plottable, Graph, Data1D, Theory1D,Data2D 
     39from sans.plottools.PlotPanel import PlotPanel 
     40from sans.plottools.plottables import Data1D, Theory1D, Data2D 
    4141import  sys,os 
    4242import numpy 
     
    200200            path = dlg.GetPath() 
    201201            mypath = os.path.basename(path) 
    202             #from danse.common.plottools.plottables import Data2D 
    203             from DataLoader.loader import  Loader 
     202            from sans.dataloader.loader import  Loader 
    204203            
    205204            #Instantiate a loader  
  • src/examples/test_text_panel.py

    r5777106 rf468791  
    2727 
    2828import wx 
    29 from danse.common.plottools.PlotPanel import PlotPanel 
    30 from danse.common.plottools.plottables import Plottable, Graph, Data1D, Theory1D 
    31 import  sys 
    32 import numpy 
    33  
     29from sans.plottools.PlotPanel import PlotPanel 
     30from sans.plottools.plottables import Text, Graph 
    3431 
    3532class TestPlotPanel(PlotPanel): 
     
    7774def sample_graph(): 
    7875    # Construct a simple graph 
    79  
    80     from danse.common.plottools.plottables import Text, Graph 
    8176     
    8277    T1 = Text(text='text example 1', xpos=0.2, ypos=0.2) 
     
    106101     
    107102if __name__ == "__main__": 
    108     pass 
    109103    demo_plotter(sample_graph()) 
    110104 
  • src/sans/calculator/sans_gen.py

    r5777106 rf468791  
    10931093 
    10941094def test_load(): 
    1095     from danse.common.plottools.arrow3d import Arrow3D 
     1095    from sans.plottools.arrow3d import Arrow3D 
    10961096    import os 
    10971097    dir = os.path.abspath(os.path.curdir) 
  • src/sans/guiframe/dataFitting.py

    r5777106 rf468791  
    66import math 
    77from data_util.uncertainty import Uncertainty 
    8 from danse.common.plottools.plottables import Data1D as PlotData1D 
    9 from danse.common.plottools.plottables import Data2D as PlotData2D 
    10 from danse.common.plottools.plottables import Theory1D as PlotTheory1D 
     8from sans.plottools.plottables import Data1D as PlotData1D 
     9from sans.plottools.plottables import Data2D as PlotData2D 
     10from sans.plottools.plottables import Theory1D as PlotTheory1D 
    1111 
    1212from sans.dataloader.data_info import Data1D as LoadData1D 
  • src/sans/guiframe/data_processor.py

    r5777106 rf468791  
    55import numpy 
    66import math 
    7 import time 
    87import re 
    98import os 
     
    1615import wx.lib.sheet as sheet 
    1716from sans.guiframe.panel_base import PanelBase 
    18 from sans.guiframe.utils import format_number 
    1917from sans.guiframe.events import NewPlotEvent  
    2018from sans.guiframe.events import StatusEvent   
    21 from danse.common.plottools import plottables 
     19from sans.plottools import plottables 
    2220from sans.guiframe.dataFitting import Data1D 
    2321 
     
    10511049                                                 StatusEvent(status=msg, 
    10521050                                                              info="error")) 
    1053                                     #time.sleep(0.5)  
    10541051                                    return 
    10551052 
     
    10661063                    msg += "Column %s is NOT " % str(label) 
    10671064                    msg += "the results of fits to view..." 
    1068                     #raise ValueError, msg 
    10691065                    wx.PostEvent(self.parent.parent,  
    10701066                         StatusEvent(status=msg, info="error"))  
    1071                     #time.sleep(0.5) 
    10721067                    return 
    1073                     #continue 
    10741068     
    10751069    def on_plot(self, event): 
  • src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

    r5777106 rf468791  
    1313import wx 
    1414import sys 
    15 import os 
    16 import pylab 
    1715import math 
    1816import numpy 
    19 import time 
    20  
    21 from danse.common.plottools.PlotPanel import PlotPanel 
    22 from danse.common.plottools.SizeDialog import SizeDialog 
    23 from danse.common.plottools.LabelDialog import LabelDialog 
    24 #from danse.common.plottools.plottables import Graph 
    25 from sans.guiframe import dataFitting  
    26 from sans.guiframe.events import EVT_NEW_PLOT 
     17 
     18from sans.plottools.PlotPanel import PlotPanel 
    2719from sans.guiframe.events import StatusEvent  
    28 from sans.guiframe.events import NewPlotEvent 
    29 from sans.guiframe.events import NewColorEvent 
    30 from sans.guiframe.events import SlicerEvent 
    3120from sans.guiframe.events import PanelOnFocusEvent 
    32 from sans.guiframe.events import EVT_NEW_LOADED_DATA 
    3321from sans.guiframe.utils import PanelMenu 
    34 from sans.guiframe.dataFitting import Data1D 
    3522from sans.guiframe.panel_base import PanelBase 
    3623from sans.guiframe.gui_style import GUIFRAME_ICON 
    37 from danse.common.plottools.binder import BindArtist 
    3824from appearanceDialog import appearanceDialog 
    3925from graphAppearance import graphAppearance 
  • src/sans/guiframe/local_perspectives/plotting/Plotter2D.py

    r5777106 rf468791  
    1313import wx 
    1414import sys 
    15 import os 
    1615import math 
    1716import numpy 
    18 import pylab 
    19 import danse.common.plottools 
    20 from danse.common.plottools.PlotPanel import PlotPanel 
    21 from danse.common.plottools.plottables import Graph 
    22 from danse.common.plottools.TextDialog import TextDialog 
    23 from sans.guiframe.events import EVT_NEW_PLOT 
    24 from sans.guiframe.events import EVT_SLICER_PARS 
     17from sans.plottools.PlotPanel import PlotPanel 
     18from sans.plottools.plottables import Graph 
     19from sans.plottools.TextDialog import TextDialog 
    2520from sans.guiframe.events import StatusEvent  
    2621from sans.guiframe.events import NewPlotEvent 
     
    3025from  sans.guiframe.local_perspectives.plotting.binder import BindArtist 
    3126from Plotter1D import ModelPanel1D 
    32 from danse.common.plottools.toolbar import NavigationToolBar  
    33 from sans.guiframe.dataFitting import Data1D 
     27from sans.plottools.toolbar import NavigationToolBar  
    3428from matplotlib.font_manager import FontProperties 
    3529from graphAppearance import graphAppearance 
  • src/sans/guiframe/local_perspectives/plotting/SimplePlot.py

    r5777106 rf468791  
    55from sans.guiframe.local_perspectives.plotting.Plotter2D import ModelPanel2D \ 
    66                    as PlotPanel 
    7 from danse.common.plottools.toolbar import NavigationToolBar 
    8 #from danse.common.plottools.PlotPanel import PlotPanel  
    9 from danse.common.plottools.plottables import Graph 
     7from sans.plottools.toolbar import NavigationToolBar 
     8from sans.plottools.plottables import Graph 
    109from sans.guiframe.utils import PanelMenu 
    1110 
  • src/sans/guiframe/local_perspectives/plotting/graphAppearance.py

    r5777106 rf468791  
    1818 
    1919import wx 
    20 from danse.common.plottools.SimpleFont import SimpleFont 
     20from sans.plottools.SimpleFont import SimpleFont 
    2121 
    2222COLOR = ['black', 'blue', 'green', 'red', 'cyan', 'magenta', 'yellow'] 
  • src/sans/guiframe/local_perspectives/plotting/masking.py

    r5777106 rf468791  
    2525import copy 
    2626import numpy 
    27 from danse.common.plottools.PlotPanel import PlotPanel 
    28 from danse.common.plottools.plottables import Graph 
     27from sans.plottools.PlotPanel import PlotPanel 
     28from sans.plottools.plottables import Graph 
    2929from binder import BindArtist 
    3030from sans.guiframe.dataFitting import Data1D, Data2D 
  • src/sans/guiframe/local_perspectives/plotting/profile_dialog.py

    r5777106 rf468791  
    66import sys 
    77from copy import deepcopy 
    8 from danse.common.plottools.plottables import Graph 
     8from sans.plottools.plottables import Graph 
    99from Plotter1D import ModelPanel1D as PlotPanel 
    1010from sans.guiframe.dataFitting import Data1D 
  • src/sans/perspectives/calculator/data_operator.py

    r5777106 rf468791  
    66import time 
    77import numpy 
    8 from sans.dataloader.data_info import Data2D 
    98from sans.dataloader.data_info import Data1D 
    10 from danse.common.plottools.PlotPanel import PlotPanel 
    11 from danse.common.plottools.plottables import Graph 
    12 from danse.common.plottools.canvas import FigureCanvas 
    13 from danse.common.plottools import transform 
     9from sans.plottools.PlotPanel import PlotPanel 
     10from sans.plottools.plottables import Graph 
     11from sans.plottools import transform 
    1412from matplotlib.font_manager import FontProperties 
    15 from matplotlib.figure import Figure 
    1613from sans.guiframe.events import StatusEvent  
    1714from sans.perspectives.calculator import calculator_widgets as widget    
     
    865862            first_item = list.keys()[0] 
    866863            if first_item.x != []: 
    867                 from danse.common.plottools.PropertyDialog import Properties 
     864                from sans.plottools.PropertyDialog import Properties 
    868865                dial = Properties(self, -1, 'Change Scale') 
    869866                # type of view or model used 
  • src/sans/perspectives/calculator/gen_scatter_panel.py

    r5777106 rf468791  
    3434from wx.lib.scrolledpanel import ScrolledPanel 
    3535from sans.perspectives.calculator.load_thread import GenReader 
    36 from danse.common.plottools.arrow3d import Arrow3D 
     36from sans.plottools.arrow3d import Arrow3D 
    3737from sans.perspectives.calculator import calculator_widgets as widget 
    3838from sans.guiframe.events import NewPlotEvent     
  • src/sans/perspectives/fitting/basepage.py

    r5777106 rf468791  
    20052005        x, y = self.model.getProfile() 
    20062006 
    2007         from danse.common.plottools import Data1D as pf_data1d 
     2007        from sans.plottools import Data1D as pf_data1d 
    20082008        #from sans.perspectives.theory.profile_dialog import SLDPanel 
    20092009        from sans.guiframe.local_perspectives.plotting.profile_dialog \ 
  • src/sans/perspectives/pr/explore_dialog.py

    r5777106 rf468791  
    2929 
    3030# Import plotting classes 
    31 from danse.common.plottools.PlotPanel import PlotPanel 
    32 from danse.common.plottools import Data1D as Model1D 
     31from sans.plottools.PlotPanel import PlotPanel 
     32from sans.plottools import Data1D as Model1D 
    3333from sans.guiframe.gui_style import GUIFRAME_ID 
    34 from danse.common.plottools.plottables import Graph 
     34from sans.plottools.plottables import Graph 
    3535 
    3636from pr_widgets import PrTextCtrl 
Note: See TracChangeset for help on using the changeset viewer.