Changeset e4c475b7 in sasview


Ignore:
Timestamp:
Mar 5, 2018 3:39:00 AM (4 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
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
Children:
3b3b40b, fca1f50
Parents:
91ad45c
Message:

Minor fixes

Location:
src/sas
Files:
5 edited

Legend:

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

    r91ad45c re4c475b7  
    177177            no_params_msg = "Fitting can not be performed.\n" +\ 
    178178                            "Not all tabs chosen for fitting have parameters selected for fitting." 
    179             QtWidgets.QMessageBox.question(self, 
     179            QtWidgets.QMessageBox.warning(self, 
    180180                                           'Warning', 
    181181                                            no_params_msg, 
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    r91ad45c re4c475b7  
    11741174            msg = "Fitting did not converge!" 
    11751175            self.communicate.statusBarUpdateSignal.emit(msg) 
     1176            msg += res.mesg 
    11761177            logging.error(msg) 
    11771178            return 
  • src/sas/qtgui/Perspectives/Fitting/UI/FittingWidgetUI.ui

    r7fd20fc re4c475b7  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>448</width> 
    10     <height>526</height> 
     9    <width>568</width> 
     10    <height>605</height> 
    1111   </rect> 
    1212  </property> 
     
    452452       <property name="minimumSize"> 
    453453        <size> 
    454          <width>75</width> 
    455          <height>23</height> 
     454         <width>93</width> 
     455         <height>28</height> 
    456456        </size> 
    457457       </property> 
     
    471471       <property name="minimumSize"> 
    472472        <size> 
    473          <width>75</width> 
    474          <height>23</height> 
     473         <width>93</width> 
     474         <height>28</height> 
    475475        </size> 
    476476       </property> 
     
    490490       <property name="minimumSize"> 
    491491        <size> 
    492          <width>75</width> 
    493          <height>23</height> 
     492         <width>93</width> 
     493         <height>28</height> 
    494494        </size> 
    495495       </property> 
  • src/sas/qtgui/Plotting/LinearFit.py

    rd6b8a1d re4c475b7  
    1313from sas.qtgui.Plotting import DataTransform 
    1414from sas.qtgui.Plotting.LineModel import LineModel 
     15import sas.qtgui.Utilities.GuiUtils as GuiUtils 
    1516 
    1617# Local UI 
     
    5657        self.txtRangeMin.setText(str(max_range[0])) 
    5758        self.txtRangeMax.setText(str(max_range[1])) 
    58         self.txtFitRangeMin.setText(str(fit_range[0])) 
    59         self.txtFitRangeMax.setText(str(fit_range[1])) 
     59        # Assure nice display of ranges 
     60        fr_min = GuiUtils.formatNumber(fit_range[0]) 
     61        fr_max = GuiUtils.formatNumber(fit_range[1]) 
     62        self.txtFitRangeMin.setText(str(fr_min)) 
     63        self.txtFitRangeMax.setText(str(fr_max)) 
    6064 
    6165        # cast xLabel into html 
     
    113117        # Set the qmin and qmax in the panel that matches the 
    114118        # transformed min and max 
    115         #value_xmin = X_VAL_DICT[self.xLabel].floatTransform(xmin) 
    116         #value_xmax = X_VAL_DICT[self.xLabel].floatTransform(xmax) 
    117  
    118119        value_xmin = self.floatInvTransform(xmin) 
    119120        value_xmax = self.floatInvTransform(xmax) 
  • src/sas/sascalc/fit/expression.py

    rb3e8629 re4c475b7  
    210210 
    211211    #print("Function: "+functiondef) 
    212     exec (functiondef in globals,locals) 
     212    # Python 2.7 
     213    #exec (functiondef in globals,locals) 
     214    # Python 3.5 
     215    exec (functiondef, globals, locals) 
     216 
    213217    retfn = locals['eval_expressions'] 
    214218 
Note: See TracChangeset for help on using the changeset viewer.