Changeset d6e38661 in sasview


Ignore:
Timestamp:
Apr 5, 2018 8:32:38 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:
ded5e77, 01ef3f7
Parents:
bb57068
Message:

Fixed naming of datasets for both theory and file data

Location:
src/sas/qtgui
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/MainWindow/DataExplorer.py

    r8ac3551 rd6e38661  
    11331133        # Check if there are any other items for this tab 
    11341134        # If so, delete them 
    1135         # TODO: fix this to resemble GuiUtils.updateModelItemWithPlot 
    1136         # 
    1137         ##self.model.beginResetModel() 
    1138         ##current_tab_name = model_item.text()[:2] 
    1139         ##for current_index in range(self.theory_model.rowCount()): 
     1135        current_tab_name = model_item.text() 
     1136        for current_index in range(self.theory_model.rowCount()): 
    11401137            #if current_tab_name in self.theory_model.item(current_index).text(): 
    1141             #    return 
    1142         ##        self.theory_model.removeRow(current_index) 
    1143         ##        break 
    1144  
    1145         ### Reset the view 
    1146         ##self.model.endResetModel() 
    1147  
    1148         # Reset the view 
     1138            if current_tab_name == self.theory_model.item(current_index).text(): 
     1139                return 
     1140                self.theory_model.removeRow(current_index) 
     1141                break 
     1142 
     1143        # send in the new item 
    11491144        self.theory_model.appendRow(model_item) 
    1150  
    1151         # Pass acting as a debugger anchor 
    1152         pass 
    11531145 
    11541146 
  • src/sas/qtgui/Perspectives/Fitting/FittingLogic.py

    • Property mode changed from 100755 to 100644
    rb3e8629 rd6e38661  
    126126 
    127127        new_plot.group_id = data.group_id 
    128         new_plot.id = str(tab_id) + " " + data.name 
    129         new_plot.name = model.name + " [" + data.name + "]" 
     128        new_plot.id = str(tab_id) + " " + model.id 
     129 
     130        if data.filename: 
     131            new_plot.name = model.name + " [" + data.filename + "]" # data file 
     132        else: 
     133            new_plot.name = model.name + " [" + model.id + "]"  # theory 
     134 
    130135        new_plot.title = new_plot.name 
    131136        new_plot.xaxis(_xaxis, _xunit) 
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    r8b480d27 rd6e38661  
    19571957            self.updateModelIndex(fitted_data) 
    19581958        else: 
    1959             name = self.nameForFittedData(self.kernel_module.name) 
     1959            name = self.nameForFittedData(self.kernel_module.id) 
    19601960            fitted_data.title = name 
    19611961            fitted_data.name = name 
Note: See TracChangeset for help on using the changeset viewer.