Changeset 318b5bbb in sasview for calculatorview

Timestamp:

Dec 18, 2012 8:55:24 AM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

6550b64

Parents:

0203ade

Message:

Added polarization and magnetic stuffs

Location:

calculatorview/src/sans/perspectives/calculator

Files:

• calculator.py (modified) (3 diffs)
• gen_scatter_panel.py (added)
• help_panel.py (modified) (5 diffs)
• load_thread.py (modified) (1 diff)
• media/dm_eq.gif (added)
• media/gen_gui_help.bmp (added)
• media/gen_i.gif (added)
• media/gen_mag_pic.bmp (added)
• media/gen_sans_help.html (added)
• media/mag_vector.bmp (added)
• media/mqx.gif (added)
• media/mqy.gif (added)
• media/mxp.gif (added)
• media/myp.gif (added)
• media/mzp.gif (added)
• media/sld1.gif (added)
• media/sld2.gif (added)
• media/v_j.gif (added)
• model_editor.py (modified) (11 diffs)

calculatorview/src/sans/perspectives/calculator/calculator.py

@@ -64 +64 @@
         mass_volume_help = "Based on the chemical formular, "
         mass_volume_help += "compute the mass density or the molar volume."
+        gensans_help = "Genneric SANS"
         pyconsole_help = "Python Console."
         #data_editor_help = "Meta Data Editor"
@@ -77 +78 @@
                           ("SANS Resolution Estimator", 
                         resolution_help, self.on_calculate_resoltuion),
+                ("Generic Scattering Calculator", 
+                        gensans_help, self.on_gen_model),
                 ("Python Shell/Editor", pyconsole_help, self.on_python_console)]
               
@@ -162 +165 @@
         #if event != None:
         #    event.Skip()
+        
+    def on_gen_model(self, event):
+        from sans.perspectives.calculator.gen_scatter_panel \
+        import SasGenWindow
+        frame = SasGenWindow(parent=self.parent)
+        self.put_icon(frame)
+        frame.Show(True) 
+        
     def on_python_console(self, event):
         """

calculatorview/src/sans/perspectives/calculator/help_panel.py

@@ -13 +13 @@
     """
     """
-    def __init__(self, parent, title="Tool Help", pageToOpen=None):
-        wx.Frame.__init__(self, parent, title, size=(700, 450))
+    def __init__(self, parent, id=-1, title="Tool Help", pageToOpen=None, 
+                                                    size=(700, 450)):
+        wx.Frame.__init__(self, parent, id, title, size=size)
         """
              contains help info
         """
-        self.SetTitle("Tool Help",) 
+        self.SetTitle(title) 
         splitter = MultiSplitterWindow(self, style=wx.SP_LIVE_UPDATE)
         rpanel = wx.Panel(splitter, -1)
-        lpanel = wx.Panel(splitter, -1, style=wx.BORDER_SUNKEN)
+        self.lpanel = wx.Panel(splitter, -1, style=wx.BORDER_SUNKEN)
         
         vbox = wx.BoxSizer(wx.VERTICAL)
@@ -37 +38 @@
        
         vboxl = wx.BoxSizer(wx.VERTICAL)
-        headerl = wx.Panel(lpanel, -1, size=(-1, 20))
+        headerl = wx.Panel(self.lpanel, -1, size=(-1, 20))
        
         headerl.SetBackgroundColour('#6666FF')
@@ -49 +50 @@
         headerl.SetSizer(hboxl)
         vboxl.Add(headerl, 0, wx.EXPAND)
-        self.lhelp = html.HtmlWindow(lpanel, -1, style=wx.NO_BORDER)
+        self.lhelp = html.HtmlWindow(self.lpanel, -1, style=wx.NO_BORDER)
         self.rhelp = html.HtmlWindow(rpanel, -1, style=wx.NO_BORDER, 
                                      size=(500,-1))
-        
-        self.path = calculator.get_data_path(media='media')
+        if pageToOpen != None:
+            path = os.path.dirname(pageToOpen)
+            self.path = os.path.join(path, "gen_sans_help.html")
+        else:
+            self.path = calculator.get_data_path(media='media')
        
         page1 = """<html>
@@ -76 +80 @@
             <li><a href ="resolution_calculator_help.html" 
             target ="showframe">Resolution Estimator</a><br></li>
+            <li><a href ="gen_sans_help.html" 
+            target ="showframe">Generic Scattering Calculator</a><br></li>
             <li><a href ="pycrust_help.html" 
             target ="showframe">Python Shell</a><br></li>
@@ -84 +90 @@
         self.lhelp.SetPage(page)
         self.lhelp.Bind(wx.html.EVT_HTML_LINK_CLICKED, self.OnLinkClicked)
-        
+        if  pageToOpen != None:
+            self.rhelp.LoadPage(str(pageToOpen))
         vbox.Add(self.rhelp, 1, wx.EXPAND)
         vboxl.Add(self.lhelp, 1, wx.EXPAND)
         rpanel.SetSizer(vbox)
-        lpanel.SetSizer(vboxl)
-        lpanel.SetFocus()
+        self.lpanel.SetSizer(vboxl)
+        self.lpanel.SetFocus()
         
         vbox1 = wx.BoxSizer(wx.HORIZONTAL)
         vbox1.Add(splitter, 1, wx.EXPAND)
-        splitter.AppendWindow(lpanel, 200)
+        splitter.AppendWindow(self.lpanel, 200)
         splitter.AppendWindow(rpanel)
         self.SetSizer(vbox1)
-       
+        
+        self.splitter = splitter
         self.Centre()
         self.Show(True)

calculatorview/src/sans/perspectives/calculator/load_thread.py

@@ -46 +46 @@
             # Real code should not print, but this is an example...
             raise
-      
+        
+class GenReader(CalcThread):
+    """
+        Load a sld data given a filename
+    """
+    def __init__(self, path, loader, 
+                 completefn=None,
+                 updatefn   = None,
+                 yieldtime  = 0.01,
+                 worktime   = 0.01
+                 ):
+        CalcThread.__init__(self, completefn,
+                 updatefn,
+                 yieldtime,
+                 worktime)
+        self.path = path
+        #Instantiate a loader 
+        self.loader = loader
+        self.starttime = 0  
+        
+    def isquit(self):
+        """
+             @raise KeyboardInterrupt: when the thread is interrupted
+        """
+        try:
+            CalcThread.isquit(self)
+        except KeyboardInterrupt:
+            raise KeyboardInterrupt   
+        
+        
+    def compute(self):
+        """
+            read some data
+        """
+        self.starttime = time.time()
+        try:
+            data =  self.loader.read(self.path)
+            self.complete(data=data)
+        except:
+            # Thread was interrupted, just proceed and re-raise.
+            # Real code should not print, but this is an example...
+            raise
+            

calculatorview/src/sans/perspectives/calculator/model_editor.py

@@ -11 +11 @@
 import sys
 import os
+import math
 from wx.py.editwindow import EditWindow
-import subprocess
 
 if sys.platform.count("win32") > 0:
@@ -24 +24 @@
 M_NAME = 'Model'
 EDITOR_WIDTH = 800
-EDITOR_HEIGTH = 720
+EDITOR_HEIGTH = 735
 PANEL_WIDTH = 500
 _BOX_WIDTH = 55
@@ -530 +530 @@
         self.warning = ""
         self._description = "New Custom Model"
+        self.function_tcl = None
         #self._default_save_location = os.getcwd()
         self._do_layout()
@@ -546 +547 @@
         self.param_sizer = wx.BoxSizer(wx.VERTICAL)
         self.function_sizer = wx.BoxSizer(wx.VERTICAL)
+        self.func_horizon_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.button_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.msg_sizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -592 +594 @@
         """
         param_txt = wx.StaticText(self, -1, 'Fit Parameters (if any): ') 
+        
         param_tip = "#Set the parameters and initial values.\n"
         param_tip += "#Example:\n"
@@ -601 +604 @@
         self.param_tcl.setDisplayLineNumbers(True)
         self.param_tcl.SetToolTipString(param_tip)
+
         self.param_sizer.AddMany([(param_txt, 0, wx.LEFT, 10),
                         (self.param_tcl, 1, wx.EXPAND|wx.ALL, 10)])
-
-   
+                
     def _layout_function(self):
         """
@@ -616 +619 @@
         hint_function += "    y = A + B * cos(2 * pi * x)\n"
         hint_function += "return y\n"
+        math_txt = wx.StaticText(self, -1, '*Useful math functions: ')
+        math_combo = self._fill_math_combo()
+        
         id  = wx.NewId() 
         self.function_tcl = EditWindow(self, id, wx.DefaultPosition, 
@@ -621 +627 @@
         self.function_tcl.setDisplayLineNumbers(True)
         self.function_tcl.SetToolTipString(hint_function)
-        self.function_sizer.Add(function_txt, 0, wx.LEFT, 10)
+        
+        self.func_horizon_sizer.Add(function_txt)
+        self.func_horizon_sizer.Add(math_txt, 0, wx.LEFT, 250)
+        self.func_horizon_sizer.Add(math_combo, 0, wx.LEFT, 10)
+
+        self.function_sizer.Add(self.func_horizon_sizer, 0, wx.LEFT, 10)
         self.function_sizer.Add( self.function_tcl, 1, wx.EXPAND|wx.ALL, 10)
         
@@ -682 +693 @@
         self.SetSizer(self.main_sizer)
         self.SetAutoLayout(True)
-    
+
+    def _fill_math_combo(self):
+        """
+        Fill up the math combo box
+        """
+        self.math_combo = wx.ComboBox(self, -1, size=(100, -1), 
+                                      style=wx.CB_READONLY) 
+        for item in dir(math):
+            if item.count("_") < 1:
+                try:
+                    exec "float(math.%s)"% item
+                    self.math_combo.Append(str(item))
+                except:
+                    self.math_combo.Append(str(item) + "()" )
+        self.math_combo.Bind(wx.EVT_COMBOBOX, self._on_math_select)
+        self.math_combo.SetSelection(0)
+        return self.math_combo
+        
+    def _on_math_select(self, event):
+        """
+        On math selection on ComboBox
+        """
+        event.Skip()
+        label = self.math_combo.GetLabel() 
+        self.function_tcl.SetFocus()
+        # Put the text at the cursor position
+        pos = self.function_tcl.GetCurrentPos()
+        self.function_tcl.InsertText(pos, label)  
+        # Put the cursor at appropriate postion
+        length = len(label)
+        if label[-1] == ')':
+            length -= 1
+        f_pos = pos + length
+        self.function_tcl.GotoPos(f_pos)   
+
     def get_notes(self):
         """
@@ -1071 +1116 @@
         ## Parameter details [units, min, max]
         self.details = {}
-        
+        ## Magnetic Panrameters
+        self.magnetic_params = []
         # non-fittable parameters
         self.non_fittable = p_model1.non_fittable  
@@ -1105 +1151 @@
             if not new_item in self.orientation_params:
                 self.orientation_params.append(new_item)
+        ## magnetic params
+        for item in self.p_model1.magnetic_params:
+            new_item = "p1_" + item
+            if not new_item in self.magnetic_params:
+                self.magnetic_params.append(new_item)
+            
+        for item in self.p_model2.magnetic_params:
+            new_item = "p2_" + item
+            if not new_item in self.magnetic_params:
+                self.magnetic_params.append(new_item)
         # get multiplicity if model provide it, else 1.
         try: