Changeset 318b353e in sasview


Ignore:
Timestamp:
Apr 16, 2018 3:32:25 PM (4 years ago)
Author:
krzywon
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:
98485fe
Parents:
b9e89d5
Message:

Automatically plot P(r) fits when calculated and small tweaks.

Location:
src/sas/qtgui
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Inversion/InversionLogic.py

    rba4e3ba r318b353e  
    209209        new_plot.title = "P(r) fit" 
    210210        new_plot.id = PR_FIT_LABEL 
    211         # Make sure that the plot is linear 
    212         new_plot.xtransform = "x" 
    213         new_plot.ytransform = "y" 
     211        new_plot.scale = "linear" 
    214212        new_plot.group_id = GROUP_ID_PR_FIT 
    215213 
  • src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

    rb9e89d5 r318b353e  
    282282        Enable buttons when data is present, else disable them 
    283283        """ 
    284         self.calculateAllButton.setEnabled(self.logic.data_is_loaded) 
     284        self.calculateAllButton.setEnabled(len(self._data_list) > 1) 
    285285        self.calculateThisButton.setEnabled(self.logic.data_is_loaded) 
    286286        self.removeButton.setEnabled(self.logic.data_is_loaded) 
     
    337337            InversionWindow.__init__(self.parent(), list(self._data_list.keys())) 
    338338            exit(0) 
    339         if self.pr_plot is not None: 
    340             title = self.pr_plot.name 
    341             GuiUtils.updateModelItemWithPlot(self._data, self.pr_plot, title) 
    342         if self.data_plot is not None: 
    343             title = self.data_plot.name 
    344             GuiUtils.updateModelItemWithPlot(self._data, self.data_plot, title) 
    345339        if self.dmaxWindow is not None: 
    346340            self.dmaxWindow.nfunc = self.getNFunc() 
     
    689683        self._calculator = pr 
    690684 
    691         # Create new P(r) and fit plots 
    692         if self.pr_plot is None: 
    693             self.pr_plot = self.logic.newPRPlot(out, self._calculator, cov) 
    694         if self.data_plot is None: 
    695             self.data_plot = self.logic.new1DPlot(out, self._calculator) 
     685        # Update P(r) and fit plots 
     686        self.pr_plot = self.logic.newPRPlot(out, self._calculator, cov) 
     687        self.pr_plot.filename = self.logic.data.filename 
     688        title = self.pr_plot.name 
     689        GuiUtils.updateModelItemWithPlot(self._data, self.pr_plot, title) 
     690        self.communicate.plotRequestedSignal.emit([self.pr_plot]) 
     691        self.data_plot = self.logic.new1DPlot(out, self._calculator) 
     692        self.data_plot.filename = self.logic.data.filename 
     693        title = self.data_plot.name 
     694        GuiUtils.updateModelItemWithPlot(self._data, self.data_plot, title) 
     695        self.communicate.plotRequestedSignal.emit([self.data_plot]) 
     696 
     697        # Udpate internals and GUI 
    696698        self.updateDataList(self._data) 
    697699        self.updateGuiValues() 
  • src/sas/qtgui/Utilities/GridPanel.py

    r76567bb r318b353e  
    343343        Open a local url in the default browser 
    344344        """ 
    345         # TODO: Add anchor to batch fitting help when written 
    346345        location = GuiUtils.HELP_DIRECTORY_LOCATION 
    347         url = "/user/sasgui/perspectives/pr/pr_help.html" 
     346        url = "/user/sasgui/perspectives/pr/pr_help.html#batch-fit-mode" 
    348347        try: 
    349348            webbrowser.open('file://' + os.path.realpath(location + url)) 
Note: See TracChangeset for help on using the changeset viewer.