Changeset 2c627ad in sasview for src

Timestamp:

Aug 11, 2016 8:19:11 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:

a47d0c8

Parents:

5a3c1f0 (diff), 713cc1c (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

Location:

src/sas

Files:

• sascalc/calculator/BaseComponent.py (modified) (4 diffs)
• sascalc/dataloader/readers/associations.py (modified) (2 diffs)
• sascalc/corfunc/__init__.py (added)
• sascalc/corfunc/corfunc_calculator.py (added)
• sascalc/corfunc/transform_thread.py (added)
• sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (6 diffs)
• sasgui/perspectives/corfunc/__init__.py (added)
• sasgui/perspectives/corfunc/corfunc.py (added)
• sasgui/perspectives/corfunc/corfunc_panel.py (added)
• sasgui/perspectives/corfunc/corfunc_state.py (added)
• sasgui/perspectives/corfunc/media/corfunc_help.rst (added)
• sasgui/perspectives/corfunc/media/fig1.gif (added)
• sasgui/perspectives/corfunc/media/fig2.gif (added)
• sasgui/perspectives/corfunc/media/tutorial1.png (added)
• sasgui/perspectives/corfunc/media/tutorial2.png (added)
• sasgui/perspectives/corfunc/media/tutorial3.png (added)
• sasgui/perspectives/corfunc/plot_labels.py (added)

src/sas/sascalc/calculator/BaseComponent.py

@@ -7 +7 @@
 # imports
 import copy
+from collections import OrderedDict
+
 import numpy
 #TO DO: that about a way to make the parameter
@@ -254 +256 @@
         Return a list of all available parameters for the model
         """
-        list = self.params.keys()
+        list = _ordered_keys(self.params)
         # WARNING: Extending the list with the dispersion parameters
         list.extend(self.getDispParamList())
@@ -264 +266 @@
         """
         list = []
-
-        for item in self.dispersion.keys():
-            for p in self.dispersion[item].keys():
+        for item in _ordered_keys(self.dispersion):
+            for p in _ordered_keys(self.dispersion[item]):
                 if p not in ['type']:
                     list.append('%s.%s' % (item.lower(), p.lower()))
@@ -309 +310 @@
         """
         raise ValueError, "Model operation are no longer supported"
+
+
+def _ordered_keys(d):
+    keys = list(d.keys())
+    if not isinstance(d, OrderedDict):
+        keys.sort()
+    return keys

src/sas/sascalc/dataloader/readers/associations.py

@@ -92 +92 @@
     import nexus_reader
     import sesans_reader
+    import cansas_reader_HDF5
+    import anton_paar_saxs_reader
     registry_function(sesans_reader)
     registry_function(abs_reader)
@@ -102 +104 @@
     #registry_function(tiff_reader)
     registry_function(nexus_reader)
-    
+    registry_function(cansas_reader_HDF5)
+    registry_function(anton_paar_saxs_reader)
     return True

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):