Changeset 9a15a87 in sasview

Timestamp:

Aug 22, 2016 4:08:36 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:

c97d76a

Parents:

6f343e3 (diff), 525aaa2 (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:

• docs/sphinx-docs/source/conf.py (modified) (1 diff)
• sasview/README.txt (modified) (1 diff)
• sasview/__init__.py (modified) (1 diff)
• sasview/installer_generator.py (modified) (1 diff)
• sasview/setup_exe.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) (1 diff)
• 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)

docs/sphinx-docs/source/conf.py

@@ -62 +62 @@
 version = '4.0.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.0.0-alpha'
+release = '4.0.0-beta'
 
 # The language for content autogenerated by Sphinx. Refer to documentation

sasview/README.txt

@@ -4 +4 @@
 1- Features
 ===========
+
+    - New in Version 4.0.0-beta
+      --------------------
+      This beta adds support for the magnetic and multilevel models of 3.1.2
+      and along with a host of bug fixes found in the alpha.
+
+      - Model package changes and improvements
+         - All 3.1.2 models now available in new interface
+         - Old custom models should now still work
+            - '''NOTE:''' These will be deprecated in a future version. Old
+            custom models should be converted to the new model format which 
+            is now the same as the built in models and offers much better
+            support.
+         - Custom model editor now creates new style models
+         - Custom model editor supports better error checking
+      - Documentation improvements
+        - Continued general cleanup
+      - Other improvements/additions
+         - Support for new canSAS 2D data files added
+         - Plot axes range can now be set manually as well as by zooming
+         - Plot annotations can now be moved around after being placed on plot.
+         - The active optimizer is now listed on the top of the fit panel.
+         - Linear fits now update qmin and max when the x scale limits are
+         changed.  Also the plot range no longer resets after a fit.
+      - Bug fixes
+         - Fixes bug #511 Errors in linearized fits and clean up of interface
+         including Kratky representation
+         - Fixes bug #186 Data operation Tool now executes when something is
+         entered in the text box and does not wait for the user to hit enter
+         - Fixes bug #459 plot context menu bug
+         - Fixes bug #559 copy to clipboard in graph menu broken
+         - Fixes bug #466 cannot remove a linear fit from graph
+         - Numerous bugs introduced in the alpha
+
+
 
     - New in Version 4.0.0-alpha

sasview/__init__.py

@@ -1 @@
-__version__ = "4.0.0-alpha"
+__version__ = "4.0.0-beta"
 __build__ = "GIT_COMMIT"
 try:

sasview/installer_generator.py

@@ -199 +199 @@
     msg += """Source: "dist\plugin_models\*";\tDestDir: "{userdesktop}\..\.sasview\plugin_models";\t"""
     msg += """Flags: recursesubdirs createallsubdirs\n""" 
+    msg += """Source: "dist\compiled_models\*";\tDestDir: "{userdesktop}\..\.sasmodels\compiled_models";\t"""
+    msg += """Flags: recursesubdirs createallsubdirs\n"""
     msg += """Source: "dist\config\custom_config.py";\tDestDir: "{userdesktop}\..\.sasview\config";\t""" 
     msg += """Flags: recursesubdirs createallsubdirs\n"""

sasview/setup_exe.py

@@ -209 +209 @@
 data_files += guiframe.data_files()
 
+# precompile sas models into the sasview build path; doesn't matter too much
+# where it is so long as it is a place that will get cleaned up afterwards.
+import sasmodels.core
+dll_path = os.path.join(build_path, 'compiled_models')
+compiled_dlls = sasmodels.core.precompile_dlls(dll_path, dtype='double')
+
+# include the compiled models as data; coordinate the target path for the
+# data with installer_generator.py
+data_files.append(('compiled_models', compiled_dlls))
+
 import sasmodels
 data_files += sasmodels.data_files()

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

@@ -148 +148 @@
             logging.error(traceback.format_exc())
 
+        # 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:

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