Changeset 47c44f0 in sasview for src/sas/sascalc

Timestamp:

Apr 9, 2018 4:07:25 AM (7 years ago)

Author:

wojciech

Branches:

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

Children:

3b070a0

Parents:

a8e368b

Message:

Reverting Windows page layout

File:

• src/sas/sascalc/fit/pagestate.py (modified) (3 diffs)

src/sas/sascalc/fit/pagestate.py

@@ -646 +646 @@
                     name = value.split(':', 1)[1].strip()
                     file_value = "File name:" + name
-                    if len(file_value) > 50:
-                        file_value = "File name:.."+file_value[-40:]
+                    #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:
@@ -723 +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)
@@ -1372 +1378 @@
 """<img src="%s" width="540"></img>
 """
+FEET_2_unix = \
+"""<img src="%s" width="540"></img>
+"""
 FEET_3 = \
 """</center>