Changes in src/sas/sascalc/fit/pagestate.py [3b070a0:574adc7] in sasview

File:

• src/sas/sascalc/fit/pagestate.py (modified) (4 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:
@@ -726 +721 @@
         html_str, text_str, title = self._get_report_string()
         # Allow 2 figures to append
-        #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]
+        image_links = [FEET_2%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
 
@@ -1234 +1226 @@
                                             namespaces=CANSAS_NS)
                     for entry in entry_list:
+                        try:
+                            sas_entry, _ = self._parse_save_state_entry(entry)
+                        except:
+                            raise
                         fitstate = self._parse_state(entry)
+
                         # state could be None when .svs file is loaded
                         # in this case, skip appending to output
                         if fitstate is not None:
-                            try:
-                                sas_entry, _ = self._parse_save_state_entry(
-                                    entry)
-                            except:
-                                raise
                             sas_entry.meta_data['fitstate'] = fitstate
                             sas_entry.filename = fitstate.file
@@ -1376 +1368 @@
 """
 FEET_2 = \
-"""<img src="%s"></img>
-"""
-FEET_2_unix = \
-"""<img src="%s" width="540"></img>
+"""<img src="%s" ></img>
 """
 FEET_3 = \