Changeset f468791 in sasview
- Timestamp:
- Oct 24, 2013 8:40:22 AM (11 years ago)
- 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
- Files:
-
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
.pydevproject
r9998be0 rf468791 4 4 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property> 5 5 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH"> 6 <path>/code/sansrealspace_modeling/src</path>7 6 <path>/code/src</path> 8 7 </pydev_pathproperty> -
setup.py
r5980b1a rf468791 67 67 enable_openmp = True 68 68 69 if sys.platform =='darwin' and not is_64bits: 70 # Disable OpenMP 71 enable_openmp = False 69 if 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" 72 81 73 82 # Options to enable OpenMP … … 175 184 176 185 # 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"]) 186 package_dir["sans.plottools"] = os.path.join("src", "sans", "plottools") 187 packages.append("sans.plottools") 181 188 182 189 # Park 1.2.1 -
src/examples/test_chisq_panel.py
r5777106 rf468791 27 27 28 28 import wx 29 from danse.common.plottools.PlotPanel import PlotPanel30 from danse.common.plottools.plottables import Plottable, Graph, Data1D, Theory1D29 from sans.plottools.PlotPanel import PlotPanel 30 from sans.plottools.plottables import Plottable, Graph, Data1D, Theory1D 31 31 import sys 32 32 import numpy … … 86 86 dy = numpy.sqrt(100*numpy.abs(y))/100 87 87 88 from danse.common.plottools.plottables import Data1D, Theory1D, Chisq , Graph88 from sans.plottools.plottables import Data1D, Theory1D, Chisq , Graph 89 89 data = Data1D(x,y,dy=dy) 90 90 data.xaxis('distance', 'm') -
src/examples/test_copy_print.py
r5777106 rf468791 26 26 27 27 import wx 28 from danse.common.plottools.PlotPanel import PlotPanel29 from danse.common.plottools.plottables import Plottable,Graph, Data1D, Theory1D28 from sans.plottools.PlotPanel import PlotPanel 29 from sans.plottools.plottables import Graph, Data1D, Theory1D 30 30 import sys 31 31 sys.platform = 'win95' … … 85 85 dy = numpy.sqrt(100*numpy.abs(y))/100 86 86 87 from danse.common.plottools.plottables import Data1D, Theory1D, Graph88 89 87 data = Data1D(x,y,dy=dy) 90 88 data.xaxis('distance', 'm') -
src/examples/test_panel.py
r5777106 rf468791 37 37 """ 38 38 import wx 39 from danse.common.plottools.PlotPanel import PlotPanel40 from danse.common.plottools.plottables import Plottable, Graph, Data1D, Theory1D39 from sans.plottools.PlotPanel import PlotPanel 40 from sans.plottools.plottables import Data1D 41 41 import sys 42 42 import numpy -
src/examples/test_panel2D.py
r5777106 rf468791 37 37 """ 38 38 import wx 39 from danse.common.plottools.PlotPanel import PlotPanel40 from danse.common.plottools.plottables import Plottable, Graph, Data1D, Theory1D,Data2D39 from sans.plottools.PlotPanel import PlotPanel 40 from sans.plottools.plottables import Data1D, Theory1D, Data2D 41 41 import sys,os 42 42 import numpy … … 200 200 path = dlg.GetPath() 201 201 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 204 203 205 204 #Instantiate a loader -
src/examples/test_text_panel.py
r5777106 rf468791 27 27 28 28 import 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 29 from sans.plottools.PlotPanel import PlotPanel 30 from sans.plottools.plottables import Text, Graph 34 31 35 32 class TestPlotPanel(PlotPanel): … … 77 74 def sample_graph(): 78 75 # Construct a simple graph 79 80 from danse.common.plottools.plottables import Text, Graph81 76 82 77 T1 = Text(text='text example 1', xpos=0.2, ypos=0.2) … … 106 101 107 102 if __name__ == "__main__": 108 pass109 103 demo_plotter(sample_graph()) 110 104 -
src/sans/calculator/sans_gen.py
r5777106 rf468791 1093 1093 1094 1094 def test_load(): 1095 from danse.common.plottools.arrow3d import Arrow3D1095 from sans.plottools.arrow3d import Arrow3D 1096 1096 import os 1097 1097 dir = os.path.abspath(os.path.curdir) -
src/sans/guiframe/dataFitting.py
r5777106 rf468791 6 6 import math 7 7 from data_util.uncertainty import Uncertainty 8 from danse.common.plottools.plottables import Data1D as PlotData1D9 from danse.common.plottools.plottables import Data2D as PlotData2D10 from danse.common.plottools.plottables import Theory1D as PlotTheory1D8 from sans.plottools.plottables import Data1D as PlotData1D 9 from sans.plottools.plottables import Data2D as PlotData2D 10 from sans.plottools.plottables import Theory1D as PlotTheory1D 11 11 12 12 from sans.dataloader.data_info import Data1D as LoadData1D -
src/sans/guiframe/data_processor.py
r5777106 rf468791 5 5 import numpy 6 6 import math 7 import time8 7 import re 9 8 import os … … 16 15 import wx.lib.sheet as sheet 17 16 from sans.guiframe.panel_base import PanelBase 18 from sans.guiframe.utils import format_number19 17 from sans.guiframe.events import NewPlotEvent 20 18 from sans.guiframe.events import StatusEvent 21 from danse.common.plottools import plottables19 from sans.plottools import plottables 22 20 from sans.guiframe.dataFitting import Data1D 23 21 … … 1051 1049 StatusEvent(status=msg, 1052 1050 info="error")) 1053 #time.sleep(0.5)1054 1051 return 1055 1052 … … 1066 1063 msg += "Column %s is NOT " % str(label) 1067 1064 msg += "the results of fits to view..." 1068 #raise ValueError, msg1069 1065 wx.PostEvent(self.parent.parent, 1070 1066 StatusEvent(status=msg, info="error")) 1071 #time.sleep(0.5)1072 1067 return 1073 #continue1074 1068 1075 1069 def on_plot(self, event): -
src/sans/guiframe/local_perspectives/plotting/Plotter1D.py
r5777106 rf468791 13 13 import wx 14 14 import sys 15 import os16 import pylab17 15 import math 18 16 import 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 18 from sans.plottools.PlotPanel import PlotPanel 27 19 from sans.guiframe.events import StatusEvent 28 from sans.guiframe.events import NewPlotEvent29 from sans.guiframe.events import NewColorEvent30 from sans.guiframe.events import SlicerEvent31 20 from sans.guiframe.events import PanelOnFocusEvent 32 from sans.guiframe.events import EVT_NEW_LOADED_DATA33 21 from sans.guiframe.utils import PanelMenu 34 from sans.guiframe.dataFitting import Data1D35 22 from sans.guiframe.panel_base import PanelBase 36 23 from sans.guiframe.gui_style import GUIFRAME_ICON 37 from danse.common.plottools.binder import BindArtist38 24 from appearanceDialog import appearanceDialog 39 25 from graphAppearance import graphAppearance -
src/sans/guiframe/local_perspectives/plotting/Plotter2D.py
r5777106 rf468791 13 13 import wx 14 14 import sys 15 import os16 15 import math 17 16 import 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 17 from sans.plottools.PlotPanel import PlotPanel 18 from sans.plottools.plottables import Graph 19 from sans.plottools.TextDialog import TextDialog 25 20 from sans.guiframe.events import StatusEvent 26 21 from sans.guiframe.events import NewPlotEvent … … 30 25 from sans.guiframe.local_perspectives.plotting.binder import BindArtist 31 26 from Plotter1D import ModelPanel1D 32 from danse.common.plottools.toolbar import NavigationToolBar 33 from sans.guiframe.dataFitting import Data1D 27 from sans.plottools.toolbar import NavigationToolBar 34 28 from matplotlib.font_manager import FontProperties 35 29 from graphAppearance import graphAppearance -
src/sans/guiframe/local_perspectives/plotting/SimplePlot.py
r5777106 rf468791 5 5 from sans.guiframe.local_perspectives.plotting.Plotter2D import ModelPanel2D \ 6 6 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 7 from sans.plottools.toolbar import NavigationToolBar 8 from sans.plottools.plottables import Graph 10 9 from sans.guiframe.utils import PanelMenu 11 10 -
src/sans/guiframe/local_perspectives/plotting/graphAppearance.py
r5777106 rf468791 18 18 19 19 import wx 20 from danse.common.plottools.SimpleFont import SimpleFont20 from sans.plottools.SimpleFont import SimpleFont 21 21 22 22 COLOR = ['black', 'blue', 'green', 'red', 'cyan', 'magenta', 'yellow'] -
src/sans/guiframe/local_perspectives/plotting/masking.py
r5777106 rf468791 25 25 import copy 26 26 import numpy 27 from danse.common.plottools.PlotPanel import PlotPanel28 from danse.common.plottools.plottables import Graph27 from sans.plottools.PlotPanel import PlotPanel 28 from sans.plottools.plottables import Graph 29 29 from binder import BindArtist 30 30 from sans.guiframe.dataFitting import Data1D, Data2D -
src/sans/guiframe/local_perspectives/plotting/profile_dialog.py
r5777106 rf468791 6 6 import sys 7 7 from copy import deepcopy 8 from danse.common.plottools.plottables import Graph8 from sans.plottools.plottables import Graph 9 9 from Plotter1D import ModelPanel1D as PlotPanel 10 10 from sans.guiframe.dataFitting import Data1D -
src/sans/perspectives/calculator/data_operator.py
r5777106 rf468791 6 6 import time 7 7 import numpy 8 from sans.dataloader.data_info import Data2D9 8 from 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 9 from sans.plottools.PlotPanel import PlotPanel 10 from sans.plottools.plottables import Graph 11 from sans.plottools import transform 14 12 from matplotlib.font_manager import FontProperties 15 from matplotlib.figure import Figure16 13 from sans.guiframe.events import StatusEvent 17 14 from sans.perspectives.calculator import calculator_widgets as widget … … 865 862 first_item = list.keys()[0] 866 863 if first_item.x != []: 867 from danse.common.plottools.PropertyDialog import Properties864 from sans.plottools.PropertyDialog import Properties 868 865 dial = Properties(self, -1, 'Change Scale') 869 866 # type of view or model used -
src/sans/perspectives/calculator/gen_scatter_panel.py
r5777106 rf468791 34 34 from wx.lib.scrolledpanel import ScrolledPanel 35 35 from sans.perspectives.calculator.load_thread import GenReader 36 from danse.common.plottools.arrow3d import Arrow3D36 from sans.plottools.arrow3d import Arrow3D 37 37 from sans.perspectives.calculator import calculator_widgets as widget 38 38 from sans.guiframe.events import NewPlotEvent -
src/sans/perspectives/fitting/basepage.py
r5777106 rf468791 2005 2005 x, y = self.model.getProfile() 2006 2006 2007 from danse.common.plottools import Data1D as pf_data1d2007 from sans.plottools import Data1D as pf_data1d 2008 2008 #from sans.perspectives.theory.profile_dialog import SLDPanel 2009 2009 from sans.guiframe.local_perspectives.plotting.profile_dialog \ -
src/sans/perspectives/pr/explore_dialog.py
r5777106 rf468791 29 29 30 30 # Import plotting classes 31 from danse.common.plottools.PlotPanel import PlotPanel32 from danse.common.plottools import Data1D as Model1D31 from sans.plottools.PlotPanel import PlotPanel 32 from sans.plottools import Data1D as Model1D 33 33 from sans.guiframe.gui_style import GUIFRAME_ID 34 from danse.common.plottools.plottables import Graph34 from sans.plottools.plottables import Graph 35 35 36 36 from pr_widgets import PrTextCtrl
Note: See TracChangeset
for help on using the changeset viewer.