Changeset 8198e63 in sasview


Ignore:
Timestamp:
Sep 5, 2017 9:56:21 AM (7 years ago)
Author:
GitHub <noreply@…>
Branches:
master, 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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
7b15990
Parents:
d24e41d (diff), 2d9526d (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.
git-author:
Paul Butler <butlerpd@…> (09/05/17 09:56:21)
git-committer:
GitHub <noreply@…> (09/05/17 09:56:21)
Message:

Merge pull request #98 from lewisodriscoll/FixingTicket741

Ticket 741

Location:
src/sas/sasgui
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py

    r235f514 r2d9526d  
    1414import wx 
    1515import sys 
     16from copy import deepcopy 
    1617from sas.sasgui.guiframe.events import EVT_NEW_PLOT 
    1718from sas.sasgui.guiframe.events import EVT_PLOT_QRANGE 
     
    275276                action_check = True 
    276277            else: 
     278                if action_string == 'update': 
     279                    # Update all existing plots of data with this ID 
     280                    for data in event.plots: 
     281                        for panel in self.plot_panels.values(): 
     282                            if data.id in panel.plots.keys(): 
     283                                plot_exists = True 
     284                                # Pass each panel it's own copy of the data 
     285                                # that's being updated, otherwise things like 
     286                                # colour and line thickness are unintentionally 
     287                                # synced across panels 
     288                                self.update_panel(deepcopy(data), panel) 
     289                    return 
     290                     
    277291                group_id = event.group_id 
    278                 if group_id in self.plot_panels.keys(): 
     292                if group_id in self.plot_panels: 
    279293                    #remove data from panel 
    280294                    if action_string == 'remove': 
  • TabularUnified src/sas/sasgui/perspectives/fitting/fitting.py

    rd24e41d r2d9526d  
    17471747                                         data_description=model.name, 
    17481748                                         data_id=str(page_id) + " " + data.name) 
     1749        plots_to_update = [] # List of plottables that have changed since last calculation 
     1750        # Create the new theories 
    17491751        if unsmeared_model is not None: 
    1750             self.create_theory_1D(x, unsmeared_model, page_id, model, data, state, 
     1752            unsmeared_model_plot = self.create_theory_1D(x, unsmeared_model,  
     1753                                  page_id, model, data, state, 
    17511754                                  data_description=model.name + " unsmeared", 
    17521755                                  data_id=str(page_id) + " " + data.name + " unsmeared") 
     1756            plots_to_update.append(unsmeared_model_plot) 
    17531757 
    17541758            if unsmeared_data is not None and unsmeared_error is not None: 
    1755                 self.create_theory_1D(x, unsmeared_data, page_id, model, data, state, 
     1759                unsmeared_data_plot = self.create_theory_1D(x, unsmeared_data,  
     1760                                      page_id, model, data, state, 
    17561761                                      data_description="Data unsmeared", 
    17571762                                      data_id="Data  " + data.name + " unsmeared", 
    17581763                                      dy=unsmeared_error) 
    1759         # Comment this out until we can get P*S models with correctly populated parameters 
     1764                plots_to_update.append(unsmeared_data_plot) 
    17601765        if sq_model is not None and pq_model is not None: 
    1761             self.create_theory_1D(x, sq_model, page_id, model, data, state, 
     1766            sq_id = str(page_id) + " " + data.name + " S(q)" 
     1767            sq_plot = self.create_theory_1D(x, sq_model, page_id, model, data, state, 
    17621768                                  data_description=model.name + " S(q)", 
    1763                                   data_id=str(page_id) + " " + data.name + " S(q)") 
    1764             self.create_theory_1D(x, pq_model, page_id, model, data, state, 
     1769                                  data_id=sq_id) 
     1770            plots_to_update.append(sq_plot) 
     1771            pq_id = str(page_id) + " " + data.name + " P(q)" 
     1772            pq_plot = self.create_theory_1D(x, pq_model, page_id, model, data, state, 
    17651773                                  data_description=model.name + " P(q)", 
    1766                                   data_id=str(page_id) + " " + data.name + " P(q)") 
     1774                                  data_id=pq_id) 
     1775            plots_to_update.append(pq_plot) 
     1776        # Update the P(Q), S(Q) and unsmeared theory plots if they exist 
     1777        wx.PostEvent(self.parent, NewPlotEvent(plots=plots_to_update,  
     1778                                              action='update')) 
    17671779 
    17681780        current_pg = self.fit_panel.get_page_by_id(page_id) 
  • TabularUnified src/sas/sasgui/perspectives/fitting/model_thread.py

    r426df2e r0f9ea1c  
    211211            results = self.model.calc_composition_models(x) 
    212212            if results is not None: 
    213                 sq_values = results[0] 
    214                 pq_values = results[1] 
     213                pq_values, sq_values = results 
    215214 
    216215 
  • TabularUnified src/sas/sasgui/plottools/plottables.py

    r45dffa69 r2d9526d  
    239239    def replace(self, plottable): 
    240240        """Replace an existing plottable from the graph""" 
    241         selected_color = None 
     241        # If the user has set a custom color, ensure the new plot is the same color 
     242        selected_color = plottable.custom_color 
    242243        selected_plottable = None 
    243244        for p in self.plottables.keys(): 
    244245            if plottable.id == p.id: 
    245246                selected_plottable = p 
    246                 selected_color = self.plottables[p] 
     247                if selected_color is None: 
     248                    selected_color = self.plottables[p] 
    247249                break 
    248         if  selected_plottable is not None and selected_color is not None: 
     250        if selected_plottable is not None and selected_color is not None: 
    249251            del self.plottables[selected_plottable] 
     252            plottable.custom_color = selected_color 
    250253            self.plottables[plottable] = selected_color 
    251254 
Note: See TracChangeset for help on using the changeset viewer.