Changeset 109e50bb in sasview

Timestamp:

Feb 14, 2015 5:57:46 AM (9 years ago)

Author:

gonzalezm

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:

55bde35, 9e11cf5

Parents:

9701348 (diff), d06ae30 (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 'ticket263'

Files:

• src/sas/perspectives/fitting/pagestate.py (modified) (2 diffs)
• src/sas/perspectives/fitting/report_dialog.py (modified) (1 diff)
• build_tools/conda/bumps/meta.yaml (modified) (1 diff)
• build_tools/conda/periodictable/meta.yaml (modified) (1 diff)
• build_tools/conda/unittest-xml-reporting/meta.yaml (modified) (1 diff)

src/sas/perspectives/fitting/pagestate.py

@@ -472 +472 @@
         Get the values (strings) from __str__ for report
         """
-        # Dictionary of teh report strings
+        # Dictionary of the report strings
         repo_time = ""
         model_name = ""
@@ -508 +508 @@
             if name == "value":
                 param_string += value + ','
+            if name == "selected":
+                if value == u' False':
+                    fixed_parameter = True
+                else:
+                    fixed_parameter = False
             if name == "error value":
-                param_string += value + ','
+                if fixed_parameter:
+                    param_string += '(fixed),'
+                else:
+                    param_string += value + ','
             if name == "parameter unit":
                 param_string += value + ':'

src/sas/perspectives/fitting/report_dialog.py

@@ -1 +1 @@
 """
 Dialog report panel to show and summarize the results of 
-the invariant calculation.
+the fitting calculation.
 """
 ################################################################################

build_tools/conda/bumps/meta.yaml

@@ -1 +1 @@
 about: {home: 'http://www.reflectometry.org/danse/software.html', license: UNKNOWN,
   summary: Data fitting with bayesian uncertainty analysis}
-build:
-  entry_points: []
-  features: []
-  string: ''
-  track_features: []
 package: {name: bumps, version: 0.7.5.3}
 requirements:
-  build: [python, setuptools, six]
-  conflicts: []
-  run: [python, six]
+  build:
+    - python
+    - setuptools
+    - six
+  run:
+    - python
+    - six
 source:
   fn: bumps-0.7.5.3.tar.gz
-  git_rev: ''
   md5: f17b41412c3c8ad6432a42e42cb926d5
-  patches: []
-  path: ''
-  svn_rev: ''
   url: https://pypi.python.org/packages/source/b/bumps/bumps-0.7.5.3.tar.gz
 test:
-  commands: []
-  files: []
-  imports: [bumps, bumps.dream, bumps.gui, bumps.gui.resources, bumps.mystic, bumps.mystic.examples,
-    bumps.mystic.optimizer]
-  requires: []
+  imports:
+    - bumps
+    - bumps.dream
+    - bumps.gui
+    - bumps.gui.resources
+    - bumps.mystic
+    - bumps.mystic.examples
+    - bumps.mystic.optimizer
+  requires:
+    - numpy
+    - scipy
+    - matplotlib

build_tools/conda/periodictable/meta.yaml

@@ -1 +1 @@
 about: {home: 'http://www.reflectometry.org/danse/elements.html', license: public
     domain, summary: Extensible periodic table of the elements}
-build:
-  entry_points: []
-  features: []
-  string: ''
-  track_features: []
 package: {name: periodictable, version: 1.4.1}
 requirements:
-  build: [python, setuptools, pyparsing, numpy]
-  conflicts: []
-  run: [python, pyparsing, numpy]
+  build:
+    - python
+    - setuptools
+    - pyparsing
+    - numpy
+  run:
+    - python
+    - pyparsing
+    - numpy
 source:
   fn: periodictable-1.4.1.tar.gz
-  git_rev: ''
   md5: 7246b63cc0b6b1be6e86b6616f9e866e
-  patches: []
-  path: ''
-  svn_rev: ''
   url: https://pypi.python.org/packages/source/p/periodictable/periodictable-1.4.1.tar.gz
 test:
-  commands: []
-  files: []
-  imports: [periodictable]
-  requires: []
+  imports:
+    - periodictable

build_tools/conda/unittest-xml-reporting/meta.yaml

@@ -2 +2 @@
     License, summary: unittest-based test runner with Ant/JUnit like XML reporting.}
 build:
-  entry_points: []
-  features: []
-  string: ''
-  track_features: []
+  features:
+    - I dunno.  The ability to actually work would be nice feature of this recipe.
 package: {name: unittest-xml-reporting, version: 1.10.0}
 requirements:
-  build: [python, setuptools, six >=1.4.0]
-  conflicts: []
-  run: [python, six >=1.4.0]
+  build:
+    - python
+    - setuptools
+    - six
+  run:
+    - python
+    - six
 source:
   fn: unittest-xml-reporting-1.10.0.tar.gz
-  git_rev: ''
   md5: f0d04be2b9bff5b744677b576c326620
-  patches: []
-  path: ''
-  svn_rev: ''
   url: https://pypi.python.org/packages/source/u/unittest-xml-reporting/unittest-xml-reporting-1.10.0.tar.gz
 test:
-  commands: []
-  files: []
-  imports: [xmlrunner, xmlrunner.extra, xmlrunner.tests]
-  requires: []
+  imports:
+    - xmlrunner
+    - xmlrunner.extra
+    - xmlrunner.tests