Changeset c9579e0 in sasview

Timestamp:

Oct 20, 2011 9:02:29 AM (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:

67e405b

Parents:

8c7ba5b

Message:

fixed causes of c++ error on plotting after delete graphs

Location:

sansguiframe/src/sans/guiframe

Files:

• gui_manager.py (modified) (3 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -995 +995 @@
         ID = wx.NewId()
         self.panels[str(ID)] = p
+        self.graph_num += 1
+        windowcaption = 'Graph'#p.window_caption
+        windowname = p.window_name
+        """
         count = 0
         for item in self.panels:
@@ -1000 +1004 @@
                or self._mgr.GetPane(p.window_name).IsOk(): 
                 count += 1
-        windowname = p.window_name
-        windowcaption = 'Graph'#p.window_caption
+        
         if count > 0:
             windowname += str(count+1)
-        p.window_name = windowname
-
+        """
         # Append nummber
         captions = self._get_plotpanel_captions()
@@ -1016 +1018 @@
             if self.graph_num > 1000:
                 break
-
-        p.window_caption = caption
-   
+        p.window_caption = caption + str(self.graph_num)
+        #p.window_caption = windowcaption+ str(self.graph_num)
+        p.window_name = windowname + str(self.graph_num)
+        
         style1 = self.__gui_style & GUIFRAME.FIXED_PANEL
         style2 = self.__gui_style & GUIFRAME.FLOATING_PANEL

sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -242 +242 @@
             if self._is_changed_legend_label:
                 data.label = old_data.label
-            data.custom_color = old_data.custom_color
-            data.symbol = old_data.symbol
-            data.markersize = old_data.markersize
+            if old_data.__class__.__name__ == 'Data1D':
+                data.custom_color = old_data.custom_color
+                data.symbol = old_data.symbol
+                data.markersize = old_data.markersize
             # Replace data
             self.graph.replace(data)