Changeset 29eb947 in sasview


Ignore:
Timestamp:
Mar 23, 2017 3:41:31 AM (3 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:
b1e36a3
Parents:
0979dfb
Message:

Fixed tooltip size. Fixed a bug in structure factor control

Location:
src/sas/qtgui
Files:
2 edited

Legend:

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

    r351b53e r29eb947  
    256256            self.disableModelCombo() 
    257257            self.enableStructureCombo() 
     258            self._model_model.clear() 
    258259            return 
    259260 
     
    309310        """ 
    310311        model = str(self.cbModel.currentText()) 
     312        category = str(self.cbCategory.currentText()) 
    311313        structure = str(self.cbStructureFactor.currentText()) 
     314        if category == CATEGORY_STRUCTURE: 
     315            model = None 
    312316        self.SASModelToQModel(model, structure_factor=structure) 
    313317 
     
    419423        name_index = self._poly_model.index(model_row, 0) 
    420424        # Extract changed value. Assumes proper validation by QValidator/Delegate 
    421         value = float(item.text()) 
     425        # Checkbox in column 0 
     426        if model_column == 0: 
     427            value = item.checkState() 
     428        else: 
     429            value = float(item.text()) 
    422430        parameter_name = str(self._poly_model.data(name_index).toPyObject()) # "distribution of sld" etc. 
    423431        if "Distribution of" in parameter_name: 
  • src/sas/qtgui/UI/DataExplorerUI.ui

    r0979dfb r29eb947  
    6161           </property> 
    6262           <property name="toolTip"> 
    63             <string>Load a file with data</string> 
     63            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Load a file with data&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> 
    6464           </property> 
    6565           <property name="styleSheet"> 
     
    205205           </property> 
    206206           <property name="toolTip"> 
    207             <string>Send data to perspective</string> 
     207            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Send data to perspective&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> 
    208208           </property> 
    209209           <property name="styleSheet"> 
Note: See TracChangeset for help on using the changeset viewer.