Changeset 4cc25e9 in sasview for sansguiframe/src


Ignore:
Timestamp:
Jul 12, 2012 2:35:06 PM (12 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:
699df7f
Parents:
d4d4c8a
Message:

data_panel: pylint cleanup3

File:
1 edited

Legend:

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

    rd4d4c8a r4cc25e9  
    238238        self.selection_cbox.SetValue('Select all Data') 
    239239        wx.EVT_COMBOBOX(self.selection_cbox, -1, self._on_selection_type) 
    240         self.sizer5.AddMany([(select_txt, 0, wx.ALL,5),  
     240        self.sizer5.AddMany([(select_txt, 0, wx.ALL, 5),  
    241241                            (self.selection_cbox, 0, wx.ALL,5)]) 
    242242        self.enable_selection() 
     
    559559            id, data_class_name, _ = self.tree_ctrl.GetSelection().GetData() 
    560560            data_list, _ = \ 
    561                             self.parent.get_data_manager().get_by_id(id_list=[id]) 
     561                        self.parent.get_data_manager().get_by_id(id_list=[id]) 
    562562            if not data_list: 
    563563                is_data = False 
     
    677677                        self.tree_ctrl.DeleteChildren(d_p_c)  
    678678                        for process in process_list: 
    679                             i_t_c = self.tree_ctrl.AppendItem(d_p_c, 
     679                            _ = self.tree_ctrl.AppendItem(d_p_c, 
    680680                                                              process.__str__()) 
    681681                wx.CallAfter(self.append_theory, state_id, theory_list) 
     
    13261326        process1 = data1.process[len(data1.process)-1] 
    13271327        process1.data = "07/01/2010" 
    1328         theory = Data2D() 
    1329         theory.id = 34 
    1330         theory.name = "theory1" 
    1331         path = "path1" 
     1328        theory1 = Data2D() 
     1329        theory1.id = 34 
     1330        theory1.name = "theory1" 
     1331        path1 = "path1" 
    13321332        state1 = State() 
    1333         data_list1['1'] = set_data_state(data1, path, theory, state1) 
     1333        data_list1['1'] = set_data_state(data1, path1, theory1, state1) 
    13341334        #state 2 
    13351335        data1 = Data2D() 
    13361336        data1.name = "data2" 
    13371337        data1.id = 76 
    1338         theory = Data2D() 
    1339         theory.id = 78 
    1340         theory.name = "CoreShell 07/24/25" 
    1341         path = "path2" 
     1338        theory1 = Data2D() 
     1339        theory1.id = 78 
     1340        theory1.name = "CoreShell 07/24/25" 
     1341        path1 = "path2" 
    13421342        #state3 
    13431343        state1 = State() 
    1344         data_list1['2'] = set_data_state(data1, path, theory, state1) 
     1344        data_list1['2'] = set_data_state(data1, path1, theory1, state1) 
    13451345        data1 = Data1D() 
    13461346        data1.id = 3 
    13471347        data1.name = "data2" 
    1348         theory = Theory1D() 
    1349         theory.name = "CoreShell" 
    1350         theory.id = 4 
    1351         theory.append_empty_process() 
    1352         process1 = theory.process[len(theory.process)-1] 
     1348        theory1 = Theory1D() 
     1349        theory1.name = "CoreShell" 
     1350        theory1.id = 4 
     1351        theory1.append_empty_process() 
     1352        process1 = theory1.process[len(theory1.process)-1] 
    13531353        process1.description = "this is my description" 
    1354         path = "path3" 
     1354        path1 = "path3" 
    13551355        data1.append_empty_process() 
    13561356        process1 = data1.process[len(data1.process)-1] 
    13571357        process1.data = "07/22/2010" 
    1358         data_list1['4'] = set_data_state(data1, path, theory, state1) 
     1358        data_list1['4'] = set_data_state(data1, path1, theory1, state1) 
    13591359        #state 4 
    13601360        temp_data_list = {} 
    13611361        data1.name = "data5 erasing data2" 
    1362         temp_data_list['4'] = set_data_state(data1, path, theory, state1) 
     1362        temp_data_list['4'] = set_data_state(data1, path1, theory1, state1) 
    13631363        #state 5 
    13641364        data1 = Data2D() 
     
    13681368        process1 = data1.process[len(data1.process)-1] 
    13691369        process1.data = "07/01/2010" 
    1370         theory = Theory1D() 
    1371         theory.name = "Cylinder" 
    1372         path = "path2" 
     1370        theory1 = Theory1D() 
     1371        theory1.name = "Cylinder" 
     1372        path1 = "path2" 
    13731373        state1 = State() 
    1374         dstate1= set_data_state(data1, path, theory, state1) 
    1375         theory = Theory1D() 
    1376         theory.id = 6 
    1377         theory.name = "CoreShell" 
    1378         dstate1.set_theory(theory) 
    1379         theory = Theory1D() 
    1380         theory.id = 6 
    1381         theory.name = "CoreShell replacing coreshell in data3" 
    1382         dstate1.set_theory(theory) 
     1374        dstate1 = set_data_state(data1, path1, theory1, state1) 
     1375        theory1 = Theory1D() 
     1376        theory1.id = 6 
     1377        theory1.name = "CoreShell" 
     1378        dstate1.set_theory(theory1) 
     1379        theory1 = Theory1D() 
     1380        theory1.id = 6 
     1381        theory1.name = "CoreShell replacing coreshell in data3" 
     1382        dstate1.set_theory(theory1) 
    13831383        data_list1['3'] = dstate1 
    13841384        #state 6 
    1385         data_list1['6'] = set_data_state(None, path, theory, state1) 
    1386         data_list1['6'] = set_data_state(theory=theory, state=None) 
    1387         theory = Theory1D() 
    1388         theory.id = 7 
    1389         data_list1['6'] = set_data_state(theory=theory, state=None) 
    1390         data_list1['7'] = set_data_state(theory=theory, state=None) 
     1385        data_list1['6'] = set_data_state(None, path1, theory1, state1) 
     1386        data_list1['6'] = set_data_state(theory=theory1, state=None) 
     1387        theory1 = Theory1D() 
     1388        theory1.id = 7 
     1389        data_list1['6'] = set_data_state(theory=theory1, state=None) 
     1390        data_list1['7'] = set_data_state(theory=theory1, state=None) 
    13911391        window = DataFrame(list=data_list1) 
    13921392        window.load_data_list(list=data_list1) 
Note: See TracChangeset for help on using the changeset viewer.