Changeset 5080cda in sasview


Ignore:
Timestamp:
Mar 17, 2011 4:50:37 PM (14 years ago)
Author:
Gervaise Alina <gervyh@…>
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:
511c6810
Parents:
02775ab8
Message:

remove wx call from data manager

Location:
guiframe
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • guiframe/data_manager.py

    rd7f727d r5080cda  
    1717import logging 
    1818import os 
    19 import wx 
    2019import copy  
    2120 
     
    2524from sans.guiframe.dataFitting import Data1D 
    2625from sans.guiframe.dataFitting import Data2D 
    27    
     26import time 
    2827 
    2928class DataManager(object): 
     
    4241        self.message = "" 
    4342        self.data_name_dict = {} 
     43        self.count = 0 
     44        self.list_of_id = [] 
    4445       
    4546    def __str__(self): 
     
    5859        """ 
    5960         
    60         if issubclass(DataInfo.Data2D, data.__class__): 
     61        if issubclass(Data2D, data.__class__): 
    6162            new_plot = Data2D(image=None, err_image=None)  
    6263        else:  
     
    9091        new_plot.interactive = True 
    9192        ## when 2 data have the same id override the 1 st plotted 
    92         new_plot.id = wx.NewId() 
     93        new_plot.id = time.time() 
    9394        ##group_id specify on which panel to plot this data 
    94         new_plot.group_id = wx.NewId() 
     95        new_plot.group_id = time.time() 
    9596        new_plot.is_data = True 
    9697        new_plot.path = path 
     
    131132            else: 
    132133                data_state = DataState(data) 
    133                 data_state.id = wx.NewId() 
     134                data_state.id = time.time() 
    134135                self.stored_data[id] = data_state 
    135136     
     
    199200                        theory_data, theory_state = theory_list[t_id] 
    200201                        new_theory = copy.deepcopy(theory_data) 
    201                         new_theory.id  = wx.NewId() 
     202                        new_theory.id  = time.time() 
    202203                        new_theory.is_data = True 
    203204                        selected_theory[new_theory.id] = DataState(new_theory) 
  • guiframe/data_state.py

    r552b3d5 r5080cda  
    4646                _str += "Theory info: \n" 
    4747                _str += str(theory_data) 
    48                 #_str += "Theory info: \n" 
    49                 #_str += str(theory_state) 
     48                
    5049        return _str 
    5150         
Note: See TracChangeset for help on using the changeset viewer.