Changeset 265656c in sasview


Ignore:
Timestamp:
Jun 27, 2016 10:42:47 AM (8 years ago)
Author:
Paul Kienzle <pkienzle@…>
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:
646b896, 5552396
Parents:
6ed67db (diff), 9501661 (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 'master' of github.com:sasview/sasview

Location:
src/sas/sasgui/perspectives
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/calculator/model_editor.py

    rd7573c7 r9501661  
    14511451 
    14521452    def _set_dispersion(self): 
    1453         self.dispersion = {} 
     1453        self.dispersion = collections.OrderedDict() 
    14541454        ##set dispersion only from p_model 
    14551455        for name , value in self.p_model1.dispersion.iteritems(): 
  • src/sas/sasgui/perspectives/fitting/basepage.py

    r7673ecd r6ed67db  
    202202        self.state_change = False 
    203203        ## save customized array 
    204         self.values = [] 
    205         self.weights = [] 
     204        self.values = {}   # type: Dict[str, List[float, ...]] 
     205        self.weights = {}   # type: Dict[str, List[float, ...]] 
    206206        ## retrieve saved state 
    207207        self.number_saved_state = 0 
     
    25882588            self._draw_model() 
    25892589            self.Refresh() 
    2590         except: 
     2590        except Exception: 
     2591            logging.error(traceback.format_exc()) 
    25912592            # Error msg 
    25922593            msg = "Error occurred:" 
     
    26802681        # Try to delete values and weight of the names array dic if exists 
    26812682        try: 
    2682             del self.values[name] 
    2683             del self.weights[name] 
    2684             # delete all other dic 
    2685             del self.state.values[name] 
    2686             del self.state.weights[name] 
    2687             del self.model._persistency_dict[name.split('.')[0]] 
    2688             del self.state.model._persistency_dict[name.split('.')[0]] 
     2683            if name in self.values: 
     2684                del self.values[name] 
     2685                del self.weights[name] 
     2686                # delete all other dic 
     2687                del self.state.values[name] 
     2688                del self.state.weights[name] 
     2689                del self.model._persistency_dict[name.split('.')[0]] 
     2690                del self.state.model._persistency_dict[name.split('.')[0]] 
    26892691        except Exception: 
    26902692            logging.error(traceback.format_exc()) 
Note: See TracChangeset for help on using the changeset viewer.