Changeset c9579e0 in sasview for sansguiframe/src


Ignore:
Timestamp:
Oct 20, 2011 11: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:
2 edited

Legend:

Unmodified
Added
Removed
  • sansguiframe/src/sans/guiframe/gui_manager.py

    r63f4b8e rc9579e0  
    995995        ID = wx.NewId() 
    996996        self.panels[str(ID)] = p 
     997        self.graph_num += 1 
     998        windowcaption = 'Graph'#p.window_caption 
     999        windowname = p.window_name 
     1000        """ 
    9971001        count = 0 
    9981002        for item in self.panels: 
     
    10001004               or self._mgr.GetPane(p.window_name).IsOk():  
    10011005                count += 1 
    1002         windowname = p.window_name 
    1003         windowcaption = 'Graph'#p.window_caption 
     1006         
    10041007        if count > 0: 
    10051008            windowname += str(count+1) 
    1006         p.window_name = windowname 
    1007  
     1009        """ 
    10081010        # Append nummber 
    10091011        captions = self._get_plotpanel_captions() 
     
    10161018            if self.graph_num > 1000: 
    10171019                break 
    1018  
    1019         p.window_caption = caption 
    1020     
     1020        p.window_caption = caption + str(self.graph_num) 
     1021        #p.window_caption = windowcaption+ str(self.graph_num) 
     1022        p.window_name = windowname + str(self.graph_num) 
     1023         
    10211024        style1 = self.__gui_style & GUIFRAME.FIXED_PANEL 
    10221025        style2 = self.__gui_style & GUIFRAME.FLOATING_PANEL 
  • sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

    r91a3860 rc9579e0  
    242242            if self._is_changed_legend_label: 
    243243                data.label = old_data.label 
    244             data.custom_color = old_data.custom_color 
    245             data.symbol = old_data.symbol 
    246             data.markersize = old_data.markersize 
     244            if old_data.__class__.__name__ == 'Data1D': 
     245                data.custom_color = old_data.custom_color 
     246                data.symbol = old_data.symbol 
     247                data.markersize = old_data.markersize 
    247248            # Replace data 
    248249            self.graph.replace(data) 
Note: See TracChangeset for help on using the changeset viewer.