Changeset 5047898 in sasview

Timestamp:

Oct 1, 2018 3:10:54 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

4cbd87f

Parents:

085ee014 (diff), 16417bb (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.

git-author:

wpotrzebowski <Wojciech.Potrzebowski@…> (10/01/18 03:10:40)

git-committer:

wpotrzebowski <Wojciech.Potrzebowski@…> (10/01/18 03:10:54)

Message:

Removing tmp file handling from report logic to make it work on OSX

Files:

• build_tools/conda_qt5_min_centos.yml (modified) (1 diff)
• build_tools/conda_qt5_min_osx.yml (modified) (2 diffs)
• build_tools/conda_qt5_win.yml (modified) (2 diffs)
• src/sas/qtgui/Perspectives/Fitting/ReportPageLogic.py (modified) (2 diffs)

build_tools/conda_qt5_min_centos.yml

@@ -15 +15 @@
  - pytest
  - mako
- - pyinstaller 
+ - pyinstaller
+ - testpath=0.3.1
 # GPU not set for Centos build system
 # - pyopencl

build_tools/conda_qt5_min_osx.yml

@@ -7 +7 @@
  - hdf5
  - h5py
- - ipython
+ - ipython=6
  - jupyter
  - twisted
@@ -17 +17 @@
  - pyinstaller 
  - pyopencl
+ - testpath=0.3.1
  - pip:
    - pytools 

build_tools/conda_qt5_win.yml

@@ -8 +8 @@
  - hdf5
  - h5py
- - ipython
+ - ipython=6
+ - ipykernel=5
  - jupyter
  - twisted
@@ -18 +19 @@
  - pyinstaller 
  - pyopencl
+ - testpath=0.3.1
  - pip:
    - pytools 

src/sas/qtgui/Perspectives/Fitting/ReportPageLogic.py

@@ -99 +99 @@
             canvas = FigureCanvas(fig)
             png_output = BytesIO()
-
-            # Create a "safe" location - system tmp
-            tmp_file = tempfile.TemporaryFile(suffix=".png")
             try:
-                fig.savefig(tmp_file.name, dpi=75)
-                fig.savefig(png_output, dpi=75)
-            except PermissionError:
-                # sometimes one gets "permission denied" for temp files
-                # mainly on Windows 7 *gasp*. Let's try local directory
-                tmp_file = open("_tmp.png", "w+")
-                try:
-                    fig.savefig(tmp_file.name, dpi=75)
-                    fig.savefig(png_output, dpi=75)
-                except Exception as ex:
-                    logging.error("Creating of the report failed: %s"%str(ex))
-                    return
-
-            data_to_print = png_output.getvalue() == open(tmp_file.name, 'rb').read()
-            tmp_file.close()
+                fig.savefig(png_output, format="png", dpi=75)
+            except PermissionError as ex:
+                logging.error("Creating of the report failed: %s"%str(ex))
+                return
             data64 = base64.b64encode(png_output.getvalue())
             data_to_print = urllib.parse.quote(data64)
-
             feet = FEET_2
             if sys.platform == "darwin":  # Mac
@@ -126 +111 @@
             html += feet.format(data_to_print)
             html += ELINE
+            png_output.close()
             del canvas
         return html