Changeset 796c4d4 in sasview for fittingview


Ignore:
Timestamp:
Mar 27, 2012 1:36:24 PM (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:
cdc2ee2
Parents:
602c2f3
Message:

new: overwright default changes; sum:added name control

File:
1 edited

Legend:

Unmodified
Added
Removed
  • fittingview/src/sans/perspectives/fitting/fitting.py

    rd2843a9 r796c4d4  
    279279        model_manager = models.ModelManager() 
    280280        model_list = model_manager.get_model_name_list() 
    281  
    282         textdial = TextDialog(None, -1, 'Easy Sum(p1, p2)', model_list) 
     281        plug_dir = models.find_plugins_dir() 
     282        textdial = TextDialog(None, self, -1, 'Easy Sum(p1, p2)',  
     283                              model_list, plug_dir) 
    283284        self.put_icon(textdial) 
    284         if textdial.ShowModal() == wx.ID_OK: 
    285             try: 
    286                 label = textdial.getText() 
    287                 plug_dir = models.find_plugins_dir() 
    288                 fname = os.path.join(plug_dir, "easy_sum_of_p1_p2.py") 
    289                 name1 = label[0] 
    290                 name2 = label[1] 
    291                 textdial.write_string(fname, name1, name2) 
    292                 textdial.compile_file(fname) 
    293                 self.update_custom_combo() 
    294             except: 
    295                 raise 
    296                 if self.parent != None: 
    297                     from sans.guiframe.events import StatusEvent  
    298                     msg= "Easy Custom Sum: Error occurred..." 
    299                     wx.PostEvent(self.parent, StatusEvent(status = msg )) 
    300                 else: 
    301                     raise 
     285        dial = textdial.ShowModal() 
     286 
    302287        textdial.Destroy() 
    303288     
Note: See TracChangeset for help on using the changeset viewer.