Changeset f5bdb4a in sasview

Timestamp:

Apr 27, 2011 5:19:20 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

600eca2

Parents:

3b792e1

Message:

fixed html string format problem because of '%" symbol

Files:

• invariantview/perspectives/invariant/invariant_state.py (modified) (2 diffs)
• sansview/perspectives/fitting/pagestate.py (modified) (2 diffs)

invariantview/perspectives/invariant/invariant_state.py

@@ -526 +526 @@
                     continue
 
+        s_1 = self._check_html_format(s_1)
+        file_name = self._check_html_format(self.file)
+
         # make plot image
         self.set_plot_state(extra_high=bool_0[1],extra_low=bool_1[1])
@@ -532 +535 @@
                                         s_3, s_4, s_5, s_6, s_7, s_8,
                                     s_9, s_10, s_11, s_12, s_13, s_14, s_15,
-                                        s_16, s_17, s_18, self.file, "%s")
-
+                                        s_16, s_17, s_18, file_name, "%s")
+
+    def _check_html_format(self, name):
+        """
+        Check string '%' for html format
+        """
+        if name.count('%'):
+            name = name.replace('%', '&#37')
+        
+        return name
+        
     def set_saved_state(self, name, value):
         """

sansview/perspectives/fitting/pagestate.py

@@ -503 +503 @@
                     paramval_string += CENTRE % param + "\n"
         
+        text_string = "\n\n\n" + title + "\n\n" + file + \
+                              "\n" + q_name + \
+                              "\n" + chi2 + \
+                              "\n\n" + paramval 
+        
+        title_name = self._check_html_format(title_name)
+        file_name = self._check_html_format(file_name)
+        title = self._check_html_format(title)
+                                  
         html_string = title_name + "\n" + file_name + \
                                    "\n" + q_range + \
@@ -511 +520 @@
                                    "\n" + FEET_1 % title + \
                                    "\n" + FEET_2 
-                            
-        text_string = "\n\n\n" + title + "\n\n" + file + \
-                              "\n" + q_name + \
-                              "\n" + chi2 + \
-                              "\n\n" + paramval 
-                                           
+                                                                      
         return html_string, text_string, title
+    
+    def _check_html_format(self, name):
+        """
+        Check string '%' for html format
+        """
+        if name.count('%'):
+            name = name.replace('%', '&#37')
+        
+        return name
+    
     
     def report(self, figs=None, canvases=None):