Changeset ebfe223 in sasview


Ignore:
Timestamp:
Aug 8, 2018 7:31:28 AM (6 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
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:
cde0611
Parents:
03e04a4
Message:

Modified use of plot id to check existing plots.
Fixed padding for main param table
Shuffled initialization calls to minimize model updates.

Location:
src/sas/qtgui
Files:
2 edited

Legend:

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

    rfce6c55 rebfe223  
    496496        # Now query the model item for available plots 
    497497        plots = GuiUtils.plotsFromFilename(filename, model) 
     498        ids = [list(self.active_plots.values())[id].data.id for id in range(len(self.active_plots))] 
    498499 
    499500        new_plots = [] 
    500501        for item, plot in plots.items(): 
    501502            plot_id = plot.id 
    502             if plot_id in list(self.active_plots.keys()): 
     503            if plot_id in ids: 
    503504                self.active_plots[plot_id].replacePlot(plot_id, plot) 
    504505            else: 
  • src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

    r060413c rebfe223  
    135135        self.initializeCategoryCombo() 
    136136 
     137        # Initial control state 
     138        self.initializeControls() 
     139 
     140        QtWidgets.QApplication.processEvents() 
     141 
    137142        # Connect signals to controls 
    138143        self.initializeSignals() 
    139  
    140         # Initial control state 
    141         self.initializeControls() 
    142144 
    143145        if data is not None: 
     
    325327            QTreeView::item { 
    326328                border: 1px; 
    327                 padding: 2px 15px; 
     329                padding: 2px 1px; 
    328330            } 
    329331 
Note: See TracChangeset for help on using the changeset viewer.