Changeset 23ace37 in sasview


Ignore:
Timestamp:
Aug 13, 2018 7:24:40 AM (14 months ago)
Author:
wojciech
Branches:
ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
Children:
ccf44de
Parents:
0c715d6 (diff), 10fee37 (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 'ESS_GUI' of https://github.com/SasView/sasview into ESS_GUI

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py

    r02e7d3a r10fee37  
    115115        Add a new tab for passed data 
    116116        """ 
    117         tab     = FittingWidget(parent=self.parent, data=data, tab_id=self.maxIndex+1) 
     117        tab     = FittingWidget(parent=self.parent, data=data, tab_id=self.maxIndex) 
    118118        tab.is_batch_fitting = is_batch 
    119119 
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    ra2cc8b97 r10fee37  
    27672767        state_reader = Reader(self.loadPageStateCallback) 
    27682768        filepath = self.saveAsAnalysisFile() 
    2769         if filepath is None: 
     2769        if filepath is None or filepath == "": 
    27702770            return 
    27712771        state_reader.write(filename=filepath, fitstate=state) 
     
    28192819        state.formfactorcombobox = self.cbModel.currentText() 
    28202820        if self.cbStructureFactor.isEnabled(): 
    2821             state.structureCombobox = self.cbStructureFactor.currentText() 
     2821            state.structurecombobox = self.cbStructureFactor.currentText() 
    28222822        state.tcChi = self.chi2 
    28232823 
     
    28512851        p = self.model_parameters 
    28522852        # save checkbutton state and txtcrtl values 
    2853         state.parameters = FittingUtilities.getStandardParam() 
    2854         state.orientation_params_disp = FittingUtilities.getOrientationParam() 
     2853        state.parameters = FittingUtilities.getStandardParam(self._model_model) 
     2854        state.orientation_params_disp = FittingUtilities.getOrientationParam(self.kernel_module) 
    28552855 
    28562856        #self._copy_parameters_state(self.orientation_params_disp, self.state.orientation_params_disp) 
  • build_tools/jenkins_ubuntu_build.sh

    r8dd7b79 r0c715d6  
    2020conda env list 
    2121 
    22  
    2322# Activate new env 
    2423source activate qt5_ubuntu 
    2524conda list 
    2625conda env list 
     26 
     27# List envs 
     28conda list 
     29a='/home/sasview/miniconda3/envs' 
     30b=$conda_env_name 
     31c='/lib' 
     32DYLD_LIBRARY_PATH=$a$b$c 
     33export DYLD_LIBRARY_PATH 
    2734 
    2835# Now build Sasview 
Note: See TracChangeset for help on using the changeset viewer.