Changeset 5080cda in sasview for guiframe

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:

• data_manager.py (modified) (7 diffs)
• data_state.py (modified) (1 diff)

guiframe/data_manager.py

@@ -17 +17 @@
 import logging
 import os
-import wx
 import copy 
 
@@ -25 +24 @@
 from sans.guiframe.dataFitting import Data1D
 from sans.guiframe.dataFitting import Data2D
-  
+import time
 
 class DataManager(object):
@@ -42 +41 @@
         self.message = ""
         self.data_name_dict = {}
+        self.count = 0
+        self.list_of_id = []
       
     def __str__(self):
@@ -58 +59 @@
         """
         
-        if issubclass(DataInfo.Data2D, data.__class__):
+        if issubclass(Data2D, data.__class__):
             new_plot = Data2D(image=None, err_image=None) 
         else: 
@@ -90 +91 @@
         new_plot.interactive = True
         ## when 2 data have the same id override the 1 st plotted
-        new_plot.id = wx.NewId()
+        new_plot.id = time.time()
         ##group_id specify on which panel to plot this data
-        new_plot.group_id = wx.NewId()
+        new_plot.group_id = time.time()
         new_plot.is_data = True
         new_plot.path = path
@@ -131 +132 @@
             else:
                 data_state = DataState(data)
-                data_state.id = wx.NewId()
+                data_state.id = time.time()
                 self.stored_data[id] = data_state
     
@@ -199 +200 @@
                         theory_data, theory_state = theory_list[t_id]
                         new_theory = copy.deepcopy(theory_data)
-                        new_theory.id  = wx.NewId()
+                        new_theory.id  = time.time()
                         new_theory.is_data = True
                         selected_theory[new_theory.id] = DataState(new_theory)

guiframe/data_state.py

@@ -46 +46 @@
                 _str += "Theory info: \n"
                 _str += str(theory_data)
-                #_str += "Theory info: \n"
-                #_str += str(theory_state)
+               
         return _str