Changeset 54398d5 in sasview


Ignore:
Timestamp:
Dec 7, 2018 9:09:34 AM (6 months ago)
Author:
wojciech
Branches:
ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc
Children:
b1626bea
Parents:
e33fcd1 (diff), 1dc1d431 (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.
Message:

Merge branch 'ESS_GUI_Invariant' into ESS_GUI

Location:
src/sas/qtgui
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/Invariant/InvariantPerspective.py

    raea6bb7 r1dc1d431  
    329329            surface = None 
    330330 
     331        if (calculation_failed): 
     332            logging.warning('Calculation failed: {}'.format(msg)) 
     333            return self.model 
     334 
     335        low_calculation_pass = True 
     336        high_calculation_pass = True 
    331337        if self._low_extrapolate: 
    332338            try: 
    333339                qstar_low, qstar_low_err = inv.get_qstar_low() 
    334340            except Exception as ex: 
    335                 calculation_failed = True 
     341                low_calculation_pass = False 
    336342                msg += str(ex) 
     343                logging.warning('Low-q calculation failed: {}'.format(msg)) 
    337344        if self._high_extrapolate: 
    338345            try: 
    339346                qstar_high, qstar_high_err = inv.get_qstar_high() 
    340347            except Exception as ex: 
    341                 calculation_failed = True 
     348                high_calculation_pass = False 
    342349                msg += str(ex) 
    343  
    344         if (calculation_failed): 
    345             logging.warning('Calculation failed: {}'.format(msg)) 
    346             return self.model 
    347  
    348         if self._low_extrapolate: 
     350                logging.warning('High-q calculation failed: {}'.format(msg)) 
     351 
     352 
     353        if self._low_extrapolate and low_calculation_pass: 
    349354            extrapolated_data = inv.get_extra_data_low(self._low_points) 
    350355            power_low = inv.get_extrapolation_power(range='low') 
     
    374379                                       title) 
    375380 
    376         if self._high_extrapolate: 
     381        if self._high_extrapolate and high_calculation_pass: 
    377382            # for presentation in InvariantDetails 
    378383            qmax_plot = Q_MAXIMUM_PLOT * max(temp_data.x) 
  • src/sas/qtgui/Calculators/KiessigPanel.py

    r3e314e6 rccdee50  
    3030        self.deltaq_in.textChanged.connect(self.onCompute) 
    3131        self.deltaq_in.setText("0.05") 
     32 
     33        # Set focus away from Close 
     34        self.computeButton.setFocus() 
    3235 
    3336        # no reason to have this widget resizable 
  • src/sas/qtgui/Calculators/UI/KiessigPanel.ui

    r457d961 rccdee50  
    88    <y>0</y> 
    99    <width>365</width> 
    10     <height>193</height> 
     10    <height>197</height> 
    1111   </rect> 
     12  </property> 
     13  <property name="focusPolicy"> 
     14   <enum>Qt::TabFocus</enum> 
    1215  </property> 
    1316  <property name="windowTitle"> 
  • src/sas/qtgui/Utilities/GridPanel.py

    r2327399 re03d56f  
    187187        """ 
    188188        url = "/user/qtgui/Perspectives/Fitting/fitting_help.html#batch-fit-mode" 
    189         location = GuiUtils.HELP_DIRECTORY_LOCATION + url 
    190         if os.path.isdir(location) == False: 
    191             sas_path = os.path.abspath(os.path.dirname(sys.argv[0])) 
    192             location = sas_path + "/" + location 
    193         try: 
    194             webbrowser.open('file://' + os.path.realpath(location)) 
    195         except webbrowser.Error as ex: 
    196             logging.warning("Cannot display help. %s" % ex) 
     189        GuiUtils.showHelp(url) 
     190 
    197191 
    198192    def onPlot(self): 
Note: See TracChangeset for help on using the changeset viewer.