Changeset dbde451 in sasview

Timestamp:

Aug 9, 2016 8:33:31 AM (8 years ago)

Author:

lewis

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

Children:

b6f5ad1c

Parents:

048381b3 (diff), 5213d22 (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.

Message:

Merge branch 'master' into corfunc

Files:

• src/sas/sascalc/fit/pluginmodel.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (1 diff)
• docs/sphinx-docs/source/user/analysis.rst (modified) (1 diff)
• docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (added)
• docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (added)
• docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (added)
• docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (added)
• docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (added)
• docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (added)
• sasview/sasview.py (modified) (4 diffs)
• src/sas/sascalc/corfunc/__init__.py (added)
• src/sas/sascalc/corfunc/corfunc_calculator.py (added)
• src/sas/sascalc/corfunc/transform_thread.py (added)
• src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (6 diffs)
• src/sas/sasgui/perspectives/corfunc/__init__.py (added)
• src/sas/sasgui/perspectives/corfunc/corfunc.py (added)
• src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (added)
• src/sas/sasgui/perspectives/corfunc/corfunc_state.py (added)
• src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (added)
• src/sas/sasgui/perspectives/corfunc/media/fig1.gif (added)
• src/sas/sasgui/perspectives/corfunc/media/fig2.gif (added)
• src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (added)
• src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (added)
• src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (added)
• src/sas/sasgui/perspectives/corfunc/plot_labels.py (added)
• test/corfunc/test/98929.txt (added)
• test/corfunc/test/utest_corfunc.py (added)

src/sas/sascalc/fit/pluginmodel.py

@@ -3 +3 @@
 
 class Model1DPlugin(BaseComponent):
+    is_multiplicity_model = False
+
     ## Name of the model
 

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -2146 +2146 @@
                 self.temp_multi_functional = True
         elif form_factor != None:
-            self.model = form_factor(self.multi_factor)
+            if self.multi_factor is not None:
+                self.model = form_factor(self.multi_factor)
+            else:
+                # old style plugin models do not accept a multiplicity argument
+                self.model = form_factor()
         else:
             self.model = None

docs/sphinx-docs/source/user/analysis.rst

@@ -6 +6 @@
 .. toctree::
    :maxdepth: 1
-   
+
    Model Fitting <sasgui/perspectives/fitting/fitting>
-   
+
    P(r) Inversion <sasgui/perspectives/pr/pr_help>
-   
+
    Invariant Calculation <sasgui/perspectives/invariant/invariant_help>
+
+   Correlation Function <sasgui/perspectives/corfunc/corfunc_help>

sasview/sasview.py

@@ -81 +81 @@
 #Always use private .matplotlib setup to avoid conflicts with other
 #uses of matplotlib
-#Have to check if .sasview exists first 
+#Have to check if .sasview exists first
 sasdir = os.path.join(os.path.expanduser("~"),'.sasview')
 if not os.path.exists(sasdir):
@@ -119 +119 @@
         # Fitting perspective
         try:
-            import sas.sasgui.perspectives.fitting as module    
+            import sas.sasgui.perspectives.fitting as module
             fitting_plug = module.Plugin()
             self.gui.add_perspective(fitting_plug)
@@ -145 +145 @@
             logging.error(traceback.format_exc())
 
-        #Calculator perspective   
+        # Corfunc perspective
+        try:
+            import sas.sasgui.perspectives.corfunc as module
+            corfunc_plug = module.Plugin()
+            self.gui.add_perspective(corfunc_plug)
+        except:
+            logging.error("Unable to load corfunc module")
+
+        #Calculator perspective
         try:
             import sas.sasgui.perspectives.calculator as module
@@ -191 +199 @@
 if __name__ == "__main__":
     run()
-

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -95 +95 @@
         self.parent.SetFocus()
 
+        # If true, there are 3 qrange bars
+        self.is_corfunc = False
+
 
     def get_symbol_label(self):
@@ -214 +217 @@
         if active_ctrl == None:
             return
+        if hasattr(event, 'is_corfunc'):
+            self.is_corfunc = event.is_corfunc
         if event.id in self.plots.keys():
             ctrl = event.ctrl
@@ -222 +227 @@
             values = [max(x_data.min(), float(ctrl[0].GetValue())),
                       min(x_data.max(), float(ctrl[1].GetValue()))]
+            if len(ctrl) == 3:
+                colors.append('purple')
+                values.append(min(x_data.max(), float(ctrl[2].GetValue())))
             if self.ly == None:
                 self.ly = []
@@ -293 +301 @@
         ly0x = ly[0].get_xdata()
         ly1x = ly[1].get_xdata()
+        ly2x = None
+        if self.is_corfunc: ly2x = ly[2].get_xdata()
         self.q_ctrl[0].SetBackgroundColour('white')
         self.q_ctrl[1].SetBackgroundColour('white')
@@ -306 +316 @@
                 self.q_ctrl[0].SetValue(str(pos_x))
                 self.q_ctrl[1].SetBackgroundColour('pink')
+        elif ly2x is not None and ly1x >= ly2x:
+            if self.vl_ind == 1:
+                ly[2].set_xdata(posx)
+                ly[2].set_zorder(nop)
+                self.q_ctrl[2].SetValue(str(pos_x))
+            elif self.vl_ind == 2:
+                ly[1].set_xdata(posx)
+                ly[1].set_zorder(nop)
+                self.q_ctrl[1].SetValue(str(pos_x))
+
 
     def _get_cusor_lines(self, event):
@@ -325 +345 @@
             dqmin = math.fabs(event.xdata - self.ly[0].get_xdata())
             dqmax = math.fabs(event.xdata - self.ly[1].get_xdata())
-            is_qmax = dqmin > dqmax
-            if is_qmax:
-                self.vl_ind = 1
+            if not self.is_corfunc:
+                is_qmax = dqmin > dqmax
+                if is_qmax:
+                    self.vl_ind = 1
+                else:
+                    self.vl_ind = 0
             else:
-                self.vl_ind = 0
+                dqmax2 = math.fabs(event.xdata - self.ly[2].get_xdata())
+                closest = min(dqmin, dqmax, dqmax2)
+                self.vl_ind = { dqmin: 0, dqmax: 1, dqmax2: 2 }.get(closest)
 
     def cusor_line(self, event):