Changeset 88daca8 in sasview

Timestamp:

Jun 22, 2015 10:44:07 PM (9 years ago)

Author:

butler

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:

2c8dc19

Parents:

f349f85 (diff), 4cf8db9 (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' of ​https://github.com/SasView/sasview.git

Files:

• sasview/setup_exe.py (modified) (4 diffs)
• docs/sphinx-docs/source/conf.py (modified) (2 diffs)
• sasview/README.txt (modified) (5 diffs)
• src/sas/guiframe/documentation_window.py (modified) (3 diffs)
• src/sas/perspectives/fitting/fitpage.py (modified) (1 diff)

sasview/setup_exe.py

@@ -231 +231 @@
 images_dir = os.path.join(path, "images")
 test_dir = os.path.join(path, "test")
+test_1d_dir = os.path.join(path, "test\\1d_data")
+test_2d_dir = os.path.join(path, "test\\2d_data")
+test_save_dir = os.path.join(path, "test\\save_states")
+test_upcoming_dir = os.path.join(path, "test\\upcoming_formats")
 
 matplotlibdatadir = matplotlib.get_data_path()
@@ -290 +294 @@
 
 # Copying the sample data user data
-for f in findall(test_dir):
-    if not ".svn" in f:
-        data_files.append(("test", [f]))
+for f in findall(test_1d_dir):
+    if not ".svn" in f:
+        data_files.append(("test\\1d_data", [f]))
+
+# Copying the sample data user data
+for f in findall(test_2d_dir):
+    if not ".svn" in f:
+        data_files.append(("test\\2d_data", [f]))
+
+# Copying the sample data user data
+for f in findall(test_save_dir):
+    if not ".svn" in f:
+        data_files.append(("test\\save_states", [f]))
+
+# Copying the sample data user data
+for f in findall(test_upcoming_dir):
+    if not ".svn" in f:
+        data_files.append(("test\\upcoming_formats", [f]))
+
 
 # See if the documentation has been built, and if so include it.
@@ -310 +330 @@
     # install the MSVC 9 runtime dll's into the application folder
     data_files.append(("Microsoft.VC90.CRT", py26MSdll_x86))
-
 
 # NOTE:
@@ -370 +389 @@
 #initialize category stuff
 #from sas.guiframe.CategoryInstaller import CategoryInstaller
-#CategoryInstaller.check_install()
+#CategoryInstaller.check_install(s)
 
 setup(

docs/sphinx-docs/source/conf.py

@@ -51 +51 @@
 # General information about the project.
 project = u'SasView'
-copyright = u'2013, The SasView Project'
+copyright = u'2015, The SasView Project'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -58 +58 @@
 #
 # The short X.Y version.
-version = '3.0.0'
+version = '3.1.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.0.0'
+release = '3.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation

sasview/README.txt

@@ -219 +219 @@
 2- Downloading and Installing
         
-        *** Note 1:  Much more information is available at www.sasview.org under links.
+    *** Note 1:  Much more information is available at www.sasview.org under links.
                      Look in the 'For Developers' section and particularly the wiki at
                      www.sasview.org/trac/wiki.
@@ -232 +232 @@
 
     2.2- Installing from source:
-        - Get the code from sourceforge at https://github.com/SasView/sasview.git
+        - Get the code from GitHub at https://github.com/SasView/sasview.git
           for this release version use: https://github.com/SasView/sasview/releases
             - run 'python setup.py install' under the 'sasview-x.x.x' folder
@@ -263 +263 @@
           - vcredist_x86.exe (version 9.0.21022.8  -microsoft visual C 2008 
               re-distributable)
-          - Innosetup (WIN - isetup 5.4.2-unicode) - used to create distributalbe
+          - Innosetup (WIN - isetup 5.4.2-unicode) - used to create distributable
             
         - MAC Specifci Packages:
@@ -274 +274 @@
 
     3.1- All systems:
+        - Documentation Window may take a few seconds to load the first time
+          it i called.  Also, an internet connection is required before
+          equations will render properly. Until then they will show in their
+          original TeX format.
+        - The copy and paste functions (^C, ^V) in the batch mode results grid
+          require two clicks: one to select the cell and a second to select the
+          contents of the cell. 
         - Tutorial has not yet been updated and is somewhat out of date
         - Very old computers may not be able to run
@@ -317 +324 @@
 
     - Latest release Version
-        - http://sourceforge.net/projects/sasview/files/
-    - Latest developer Windows or Ubuntu build
-        - http://build.sasview.org/
-    - Latest developer Mac OS build
-        - http://download.mantidproject.org/jenkins/view/All/job/sasview_snowleopard_32bit/
+        - https://github.com/SasView/sasview/releases
+    - Latest developer builds
+        - https://jenkins.esss.dk/sasview/view/Master-Builds/
 
     

src/sas/guiframe/documentation_window.py

@@ -19 +19 @@
 import webbrowser
 import urllib
+import sys
 
 SPHINX_DOC_ENV = "SASVIEW_DOC_PATH"
@@ -27 +28 @@
     WX_SUPPORTS_HTML2 = False
 
+MAC = True
+if sys.platform.count("win32") > 0:
+    MAC = False
 
 from gui_manager import get_app_dir
@@ -73 +77 @@
             -- has it been built?", file_path)
         elif WX_SUPPORTS_HTML2:
+            if MAC:
+                logging.error('url = ' + url)
             # Complete HTML/CSS support!
             self.view = html.WebView.New(self)

src/sas/perspectives/fitting/fitpage.py

@@ -3115 +3115 @@
                     mag_on_button.Show(True)
                 mag_help_button.Show(False)
+                mag_angle_help_button.Show(False)
                 if mag_on_button.IsShown():
                     if self.magnetic_on: