Changeset 8e671c39 in sasview

Timestamp:

Sep 14, 2011 3:30:40 PM (13 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:

bcd3f73

Parents:

a2da783

Message:

fixed minor bug in report due to the recent changes in gui

Files:

• fittingview/src/sans/perspectives/fitting/basepage.py (modified) (1 diff)
• fittingview/src/sans/perspectives/fitting/pagestate.py (modified) (3 diffs)
• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (1 diff)

fittingview/src/sans/perspectives/fitting/basepage.py

@@ -2750 +2750 @@
                  # and data_names (model plot[2D], and residuals)
                  if item2.group_id == data_title or \
-                                title.count(data_name) or \
-                                item2.window_name.count(data_name) or \
-                                item2.window_caption.count(data_name):
+                        item2.group_id.count("res" + str(self.data.id)) or \
+                        item2.group_id.count(str(self.uid)) > 0:
                      #panel = gui_manager._mgr.GetPane(item2.window_name)
                      # append to the list

fittingview/src/sans/perspectives/fitting/pagestate.py

@@ -509 +509 @@
                     pass
         paramval = ""
+        paramval_string += "<table> <tr>"
         for lines in param_string.split(":"): 
             line = lines.split(",")
@@ -521 +522 @@
                     paramval +=  param + "\n"
                     paramval_string += CENTRE % param + "\n"
-        
+            paramval_string += '</tr>'
+        paramval_string += '</table>'
         text_string = "\n\n\n" + title + "\n\n" + file + \
                               "\n" + q_name + \
@@ -1556 +1558 @@
 PARA = "<p class=MsoNormal> %s \n"
 PARA += "</p>"
-CENTRE = "<p class=MsoNormal><center> %s \n"
-CENTRE += "</center></p>"
+CENTRE = "<center> %s \n"
+CENTRE += "</center>"
 FEET_1 = \
 """
-<p class=MsoNormal>&nbsp;</p>
 <p class=MsoNormal><b><span ><center> Graph</span></center></b></p> 
-<p class=MsoNormal>&nbsp;</p> 
 <center> 
 <br>Model Computation<br> 

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -2259 +2259 @@
                                                    action='remove'))
                 #remove res plot: Todo: improve
-                self._remove_res_plot(id)
+                wx.CallAfter(self._remove_res_plot, id)
         self._data_manager.delete_data(data_id=data_id, 
                                        theory_id=theory_id)