Changes in / [cde9d7d:b609c34] in sasview

Files:

• build_tools/jenkins_win_build.bat (added)
• build_tools/jenkins_win_pylint.bat (added)
• docs/sphinx-docs/source/conf.py (modified) (2 diffs)
• docs/sphinx-docs/source/user/analysis.rst (added)
• docs/sphinx-docs/source/user/tools.rst (added)
• docs/sphinx-docs/source/user/user.rst (modified) (2 diffs)
• src/examples/test_chisq_panel.py (modified) (1 diff)
• src/sas/models/qsmearing.py (deleted)
• src/sas/models/resolution.py (deleted)
• src/sas/models/smearing_2d.py (deleted)
• src/sas/sascalc/data_util/qsmearing.py (added)
• src/sas/sascalc/data_util/resolution.py (added)
• src/sas/sascalc/data_util/smearing_2d.py (added)
• src/sas/sascalc/fit/AbstractFitEngine.py (modified) (1 diff)
• src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) (1 diff)
• src/sas/sasgui/guiframe/data_processor.py (modified) (1 diff)
• src/sas/sasgui/guiframe/dummyapp.py (modified) (1 diff)
• src/sas/sasgui/guiframe/gui_manager.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/fit_thread.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/fitpage.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/fitproblem.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/fitting.py (modified) (1 diff, 1 prop)
• src/sas/sasgui/perspectives/fitting/pagestate.py (modified) (2 diffs)
• src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) (4 diffs)
• src/sas/sasgui/perspectives/invariant/invariant.py (modified) (1 diff)
• src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) (1 diff)
• src/sas/sasgui/perspectives/pr/pr.py (modified) (1 diff)
• test/sasdataloader/test/CMSphere5.txt (added)
• test/sasdataloader/test/CMSphere5smearsphere.txt (added)
• test/sasdataloader/test/utest_smearing.py (added)
• test/sasfit/test/batch_fit.py (modified) (1 diff)
• test/sasfit/test/utest_fit_smeared.py (modified) (1 diff)
• test/sasmodels/test/CMSphere5.txt (deleted)
• test/sasmodels/test/CMSphere5smearsphere.txt (deleted)
• test/sasmodels/test/utest_smearing.py (deleted)

docs/sphinx-docs/source/conf.py

@@ -201 +201 @@
 # -- Options for LaTeX output --------------------------------------------------
 
+LATEX_PREAMBLE=r"""
+\renewcommand{\AA}{\text{\r{A}}} % Allow \AA in math mode
+\usepackage[utf8]{inputenc}      % Allow unicode symbols in text
+\DeclareUnicodeCharacter {00B7} {\ensuremath{\cdot}}   % cdot
+\DeclareUnicodeCharacter {00B0} {\ensuremath{^\circ}}  % degrees
+\DeclareUnicodeCharacter {212B} {\AA}                  % Angstrom
+"""
 latex_elements = {
 # The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+'papersize': 'a4paper',
 
 # The font size ('10pt', '11pt' or '12pt').
@@ -209 +216 @@
 
 # Additional stuff for the LaTeX preamble.
-#'preamble': '',
+'preamble': LATEX_PREAMBLE
+
 }
 

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

@@ -8 +8 @@
 
    Model Documentation <models/model_functions>
+   
+   Tools <tools>
+   
+   Types of Analysis <analysis>
 
    Data Formats <sasgui/guiframe/data_formats_help>
@@ -14 +18 @@
    
    Plotting Data/Models <sasgui/guiframe/graph_help>
-   
-   Fitting Perspective <sasgui/perspectives/fitting/fitting>
-   
-   P(r) Inversion Perspective <sasgui/perspectives/pr/pr_help>
-   
-   Invariant Calculation Perspective <sasgui/perspectives/invariant/invariant_help>
-   
-   Data Operations Tool <sasgui/perspectives/calculator/data_operator_help>
       
-   Density/Volume Calculator Tool <sasgui/perspectives/calculator/density_calculator_help>
-   
-   Generic SANS Calculator Tool <sasgui/perspectives/calculator/sas_calculator_help>
-   
-   Image Viewer Tool <sasgui/perspectives/calculator/image_viewer_help>
-   
-   Kiessig Thickness Calculator Tool <sasgui/perspectives/calculator/kiessig_calculator_help>
-   
-   SLD Calculator Tool <sasgui/perspectives/calculator/sld_calculator_help>
-   
-   Slit Size Calculator Tool <sasgui/perspectives/calculator/slit_calculator_help>
-   
-   Q Resolution Estimator Tool <sasgui/perspectives/calculator/resolution_calculator_help>
-   
-   Python Shell Tool <sasgui/perspectives/calculator/python_shell_help>
-
    Test Data <../test/testdata_help.rst>

src/examples/test_chisq_panel.py

@@ -86 +86 @@
         dy = numpy.sqrt(100*numpy.abs(y))/100
 
-    from sas.plottools.plottables import Data1D, Theory1D, Chisq , Graph
+    from sas.sasgui.plottools.plottables import Data1D, Theory1D, Chisq , Graph
     data = Data1D(x,y,dy=dy)
     data.xaxis('distance', 'm')

src/sas/sascalc/fit/AbstractFitEngine.py

@@ -140 +140 @@
             do the following: ::
             
-                from sas.models.qsmearing import smear_selection
+                from sas.sascalc.data_util.qsmearing import smear_selection
                 smearer = smear_selection(some_data)
                 fitdata1d = FitData1D( x= [1,3,..,],

src/sas/sascalc/pr/fit/AbstractFitEngine.py

@@ -140 +140 @@
             do the following: ::
             
-                from sas.models.qsmearing import smear_selection
+                from sas.sascalc.data_util.qsmearing import smear_selection
                 smearer = smear_selection(some_data)
                 fitdata1d = FitData1D( x= [1,3,..,],

src/sas/sasgui/guiframe/data_processor.py

@@ -10 +10 @@
 The organization of the classes goes as:
 
-.. image::  ../../user/guiframe/BatchGridClassLayout.png
+#Path to this is:           /sasview/src/sas/sasgui/guiframe/data_processor.py
+#Path to image is:          /sasview/src/sas/sasgui/guiframe/media/BatchGridClassLayout.png
+.. image::  ./guiframe/media/BatchGridClassLayout.png
    :align:   center
 

src/sas/sasgui/guiframe/dummyapp.py

@@ -7 +7 @@
 from sas.sasgui.guiframe.plugin_base import PluginBase
 
-class DummyView(gui_manager.ViewApp):
+class DummyView(gui_manager.SasViewApp):
     """
     """

src/sas/sasgui/guiframe/gui_manager.py

@@ -3480 +3480 @@
 
 if __name__ == "__main__":
-    app = ViewApp(0)
+    app = SasViewApp(0)
     app.MainLoop()

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

@@ -15 +15 @@
 
 from sas.sasgui.perspectives.fitting.basepage import PageInfoEvent
-from sas.models.qsmearing import smear_selection
+from sas.sascalc.data_util.qsmearing import smear_selection
 from sas.sasgui.perspectives.fitting.fitpage import FitPage
 from sas.sasgui.perspectives.fitting.fitpage import check_data_validity

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

@@ -96 +96 @@
             #some mssg and reset progress bar.
 
+            # Shouldn't this be re-raising? ConsoleUpdate doesn't act on it.
+            # raise KeyboardInterrupt
             if self.handler is not None:
                 self.handler.stop(msg=msg)

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

@@ -26 +26 @@
 from sas.sasgui.perspectives.fitting.basepage import BasicPage as BasicPage
 from sas.sasgui.perspectives.fitting.basepage import PageInfoEvent as PageInfoEvent
-from sas.models.qsmearing import smear_selection
+from sas.sascalc.data_util.qsmearing import smear_selection
 from .basepage import ModelTextCtrl
 

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

@@ -14 +14 @@
 ################################################################################
 import copy
-from sas.models.qsmearing import smear_selection
+from sas.sascalc.data_util.qsmearing import smear_selection
 
 class FitProblemComponent(object):

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

@@ -1483 +1483 @@
         try:
             index = 0
+            # Update potential simfit page(s)
+            if self.sim_page is not None:
+                self.sim_page._on_fit_complete()
+            if self.batch_page:
+                self.batch_page._on_fit_complete()
+            # Update all fit pages
             for uid in page_id:
                 res = result[index]

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

@@ -1613 +1613 @@
 
         if state.data is None:
-            data = sas.dataloader.data_info.Data1D(x=[], y=[])
+            data = sas.sascalc.dataloader.data_info.Data1D(x=[], y=[])
             return None
         elif not state.data.is_data:
@@ -1626 +1626 @@
 
             if issubclass(state.data.__class__,
-                          sas.dataloader.data_info.Data1D):
+                          sas.sascalc.dataloader.data_info.Data1D):
                 data = state.data
                 doc, sasentry = self._to_xml_doc(data)

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

@@ -91 +91 @@
         ## selected mdoel to fit
         self.model_toFit = []
+        ## Control the fit state
+        self.fit_started = False
         ## number of constraint
         self.nb_constraint = 0
@@ -423 +425 @@
 
         """
+        if self.fit_started:
+            self._stop_fit()
+            self.fit_started = False
+            return
+
         flag = False
         # check if the current page a simultaneous fit page or a batch page
@@ -439 +446 @@
                     self.manager.schedule_for_fit(value=1, uid=item[2])
             try:
+                self.fit_started = True
+                wx.CallAfter(self.set_fitbutton)
                 if not self.manager.onFit(uid=self.uid):
                     return
@@ -447 +456 @@
             msg = "Select at least one model check box to fit "
             wx.PostEvent(self.parent.parent, StatusEvent(status=msg))
+
+    def _on_fit_complete(self):
+        """
+        Set the completion flag and display the updated fit button label.
+        """
+        self.fit_started = False
+        self.set_fitbutton()
+
+    def _stop_fit(self, event=None):
+        """
+        Attempt to stop the fitting thread
+        """
+        if event != None:
+            event.Skip()
+        self.manager.stop_fit(self.uid)
+        self.manager._reset_schedule_problem(value=0)
+        self._on_fit_complete()
+
+    def set_fitbutton(self):
+        """
+        Set fit button label depending on the fit_started
+        """
+        label = "Stop" if self.fit_started else "Fit"
+        color = "red" if self.fit_started else "black"
+
+        self.btFit.SetLabel(label)
+        self.btFit.SetForegroundColour(color)
+        self.btFit.Enable(True)
 
     def _onHelp(self, event):

src/sas/sasgui/perspectives/invariant/invariant.py

@@ -237 +237 @@
         else:
             msg = "invariant.save_file: the data being saved is"
-            msg += " not a sas.dataloader.data_info.Data1D object"
+            msg += " not a sas.sascalc.dataloader.data_info.Data1D object"
             raise RuntimeError, msg
 

src/sas/sasgui/perspectives/invariant/invariant_state.py

@@ -773 +773 @@
         """
         if datainfo is None:
-            datainfo = sas.dataloader.data_info.Data1D(x=[], y=[])
-        elif not issubclass(datainfo.__class__, sas.dataloader.data_info.Data1D):
+            datainfo = sas.sascalc.dataloader.data_info.Data1D(x=[], y=[])
+        elif not issubclass(datainfo.__class__, sas.sascalc.dataloader.data_info.Data1D):
             msg = "The cansas writer expects a Data1D"
             msg += " instance: %s" % str(datainfo.__class__.__name__)

src/sas/sasgui/perspectives/pr/pr.py

@@ -896 +896 @@
         # First, check that the data is of the right type
         if issubclass(self.current_plottable.__class__,
-                      sas.dataloader.data_info.Data1D):
+                      sas.sascalc.dataloader.data_info.Data1D):
             self.state_reader.write(filepath, self.current_plottable, prstate)
         else:

test/sasfit/test/batch_fit.py

@@ -6 +6 @@
 from sas.models.CylinderModel import CylinderModel
 import sas.models.dispersion_models 
-from sas.models.qsmearing import smear_selection
+from sas.sascalc.data_util.qsmearing import smear_selection
 
 NPTS = 1

test/sasfit/test/utest_fit_smeared.py

@@ -10 +10 @@
 from sas.sascalc.fit.BumpsFitting import BumpsFit as Fit
 from sas.sascalc.dataloader.loader import Loader
-from sas.models.qsmearing import smear_selection
+from sas.sascalc.data_util.qsmearing import smear_selection
 from sas.models.CylinderModel import CylinderModel
 from sas.models.SphereModel import SphereModel