Changeset 1176137 in sasview for src/sas/sascalc

Timestamp:

Apr 17, 2018 9:29:25 AM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, unittest-saveload

Children:

666454e, 1cf490b6, cd10013, c192960

Parents:

94f074c4 (diff), 91552b5 (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:

Paul Butler <butlerpd@…> (04/17/18 09:29:25)

git-committer:

GitHub <noreply@…> (04/17/18 09:29:25)

Message:

Merge pull request #149 from SasView?/ticket-1079

Removing save button from OSX

closes #1079

Location:

src/sas/sascalc

Files:

• fit/pagestate.py (modified) (3 diffs)
• dataloader/file_reader_base_class.py (modified) (4 diffs)
• dataloader/loader.py (modified) (2 diffs)

src/sas/sascalc/fit/pagestate.py

@@ -646 +646 @@
                     name = value.split(':', 1)[1].strip()
                     file_value = "File name:" + name
+                    #Truncating string so print doesn't complain of being outside margins
+                    if sys.platform != "win32":
+                        MAX_STRING_LENGHT = 50
+                        if len(file_value) > MAX_STRING_LENGHT:
+                            file_value = "File name:.."+file_value[-MAX_STRING_LENGHT+10:]
                     file_name = CENTRE % file_value
                     if len(title) == 0:
@@ -721 +726 @@
         html_str, text_str, title = self._get_report_string()
         # Allow 2 figures to append
-        image_links = [FEET_2%fig for fig in fig_urls]
-
+        #Constraining image width for OSX and linux, so print doesn't complain of being outside margins
+        if sys.platform == "win32":
+            image_links = [FEET_2%fig for fig in fig_urls]
+        else:
+            image_links = [FEET_2_unix%fig for fig in fig_urls]
         # final report html strings
         report_str = html_str + ELINE.join(image_links)
-
+        report_str += FEET_3
         return report_str, text_str
 
@@ -1368 +1376 @@
 """
 FEET_2 = \
-"""<img src="%s" ></img>
+"""<img src="%s"></img>
+"""
+FEET_2_unix = \
+"""<img src="%s" width="540"></img>
 """
 FEET_3 = \

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -31 +31 @@
 FIELDS_2D = ('data', 'qx_data', 'qy_data', 'q_data', 'err_data',
                  'dqx_data', 'dqy_data', 'mask')
-
+DEPRECATION_MESSAGE = ("\rThe extension of this file suggests the data set migh"
+                       "t not be fully reduced. Support for the reader associat"
+                       "ed with this file type has been removed. An attempt to "
+                       "load the file was made, but, should it be successful, "
+                       "SasView cannot guarantee the accuracy of the data.")
 
 class FileReader(object):
@@ -40 +44 @@
     # List of allowed extensions
     ext = ['.txt']
+    # Deprecated extensions
+    deprecated_extensions = ['.asc', '.nxs']
     # Bypass extension check and try to load anyway
     allow_all = False
@@ -87 +93 @@
                     if not self.f_open.closed:
                         self.f_open.close()
+                    if any(filepath.lower().endswith(ext) for ext in
+                           self.deprecated_extensions):
+                        self.handle_error_message(DEPRECATION_MESSAGE)
                     if len(self.output) > 0:
                         # Sort the data that's been loaded
@@ -146 +155 @@
         else:
             logger.warning(msg)
+            raise NoKnownLoaderException(msg)
 
     def send_to_output(self):

src/sas/sascalc/dataloader/loader.py

@@ -90 +90 @@
             ascii_loader = ascii_reader.Reader()
             return ascii_loader.read(path)
+        except NoKnownLoaderException:
+            pass  # Try the Cansas XML reader
         except DefaultReaderException:
             pass  # Loader specific error to try the cansas XML reader
@@ -100 +102 @@
             cansas_loader = cansas_reader.Reader()
             return cansas_loader.read(path)
+        except NoKnownLoaderException:
+            pass  # Try the NXcanSAS reader
         except DefaultReaderException:
             pass  # Loader specific error to try the NXcanSAS reader