Changeset 132f3d6 in sasview


Ignore:
Timestamp:
Apr 9, 2017 2:13:27 AM (7 years ago)
Author:
Adam Washington <adam.washington@…>
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, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
6ad9c1a
Parents:
1bcc48d (diff), 8eb9043 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch '4_1_issues' of github.com:SasView/sasview into 4_1_issues

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sasview/setup_exe.py

    r8b645cc r8eb9043  
    179179test_1d_dir = os.path.join(path, "test\\1d_data") 
    180180test_2d_dir = os.path.join(path, "test\\2d_data") 
     181test_sesans_dir = os.path.join(path, "test\\sesans_data") 
     182test_convertible_dir = os.path.join(path, "test\\convertible_data") 
    181183test_save_dir = os.path.join(path, "test\\save_states") 
    182 test_upcoming_dir = os.path.join(path, "test\\upcoming_formats") 
     184test_coord_dir = os.path.join(path, "test\\coordinate_data") 
     185test_image_dir = os.path.join(path, "test\\image_data") 
     186test_other_dir = os.path.join(path, "test\\other_files") 
    183187 
    184188matplotlibdatadir = matplotlib.get_data_path() 
     
    269273# Copying the images directory to the distribution directory. 
    270274for f in findall(images_dir): 
    271     if not ".svn" in f: 
    272         data_files.append(("images", [f])) 
     275    data_files.append(("images", [f])) 
    273276 
    274277# Copying the HTML help docs 
    275278for f in findall(media_dir): 
    276     if not ".svn" in f: 
    277         data_files.append(("media", [f])) 
     279    data_files.append(("media", [f])) 
    278280 
    279281# Copying the sample data user data 
    280282for f in findall(test_1d_dir): 
    281     if not ".svn" in f: 
    282         data_files.append(("test\\1d_data", [f])) 
    283  
    284 # Copying the sample data user data 
     283    data_files.append(("test\\1d_data", [f])) 
    285284for f in findall(test_2d_dir): 
    286     if not ".svn" in f: 
    287         data_files.append(("test\\2d_data", [f])) 
    288  
    289 # Copying the sample data user data 
     285    data_files.append(("test\\2d_data", [f])) 
    290286for f in findall(test_save_dir): 
    291     if not ".svn" in f: 
    292         data_files.append(("test\\save_states", [f])) 
    293  
    294 # Copying the sample data user data 
    295 for f in findall(test_upcoming_dir): 
    296     if not ".svn" in f: 
    297         data_files.append(("test\\upcoming_formats", [f])) 
     287    data_files.append(("test\\save_states", [f])) 
     288for f in findall(test_sesans_dir): 
     289    data_files.append(("test\\sesans_data", [f])) 
     290for f in findall(test_convertible_dir): 
     291    data_files.append(("test\\convertible_files", [f])) 
     292for f in findall(test_coord_dir): 
     293    data_files.append(("test\\coordinate_data", [f])) 
     294for f in findall(test_image_dir): 
     295    data_files.append(("test\\image_data", [f])) 
     296for f in findall(test_other_dir): 
     297    data_files.append(("test\\other_files", [f])) 
    298298 
    299299# Copying opencl include files 
  • src/sas/sasgui/perspectives/fitting/fitpage.py

    rd85f1d8a r1bcc48d  
    12391239            mod_cat = self.categorybox.GetStringSelection() 
    12401240            if mod_cat == custom_model: 
     1241                ################This is where the model dies############### 
     1242                temp_id = self.model.id 
    12411243                temp = self.parent.update_model_list() 
     1244                for v in self.parent.model_dictionary.values(): 
     1245                    if v.id == temp_id: 
     1246                        self.model = v() 
    12421247                if temp: 
    12431248                    self.model_list_box = temp 
  • src/sas/sasgui/perspectives/fitting/models.py

    r11b094f r1bcc48d  
    321321        if len(new_plugins) > 0: 
    322322            for name, plug in  new_plugins.iteritems(): 
    323                 if name not in self.stored_plugins.keys(): 
    324                     self.stored_plugins[name] = plug 
    325                     self.plugins.append(plug) 
    326                     self.model_dictionary[name] = plug 
     323                self.stored_plugins[name] = plug 
     324                self.plugins.append(plug) 
     325                self.model_dictionary[name] = plug 
    327326            self.model_combobox.set_list("Plugin Models", self.plugins) 
    328327            return self.model_combobox.get_list() 
Note: See TracChangeset for help on using the changeset viewer.