Changeset 61a8b58 in sasview


Ignore:
Timestamp:
Sep 29, 2017 5:46:22 AM (7 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:
7d8bebf
Parents:
7d97e2d (diff), 7d353af (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_SasView250' into ESS_GUI

Files:
61 added
5 edited

Legend:

Unmodified
Added
Removed

  • src/sas/qtgui/GUITests.py

    r464cd07 r01cda57  
    3737from Calculators.UnitTesting import SLDCalculatorTest 
    3838from Calculators.UnitTesting import SlitSizeCalculatorTest 
     39from Calculators.UnitTesting import ResolutionCalculatorPanelTest 
    3940 
    4041# Utilities 
    … …  
    9293        unittest.makeSuite(SLDCalculatorTest.SLDCalculatorTest, 'test'), 
    9394        unittest.makeSuite(SlitSizeCalculatorTest.SlitSizeCalculatorTest, 'test'), 
     95        unittest.makeSuite(ResolutionCalculatorPanelTest.ResolutionCalculatorPanelTest, 'test'), 
    9496 
    9597        # Perspectives 
    … …  
    100102        unittest.makeSuite(FitPageTest.FitPageTest,                       'test'), 
    101103        unittest.makeSuite(FittingOptionsTest.FittingOptionsTest,         'test'), 
    102     ) 
     104     ) 
    103105    return unittest.TestSuite(suites) 
    104106 

  • src/sas/qtgui/MainWindow/GuiManager.py

    r3c8242c r01cda57  
    3030from sas.qtgui.Calculators.SlitSizeCalculator import SlitSizeCalculator 
    3131from sas.qtgui.Calculators.GenericScatteringCalculator import GenericScatteringCalculator 
     32from sas.qtgui.Calculators.ResolutionCalculatorPanel import ResolutionCalculatorPanel 
     33 
    3234 
    3335# Perspectives 
    … …  
    136138        self.SLDCalculator = SldPanel(self) 
    137139        self.DVCalculator = DensityPanel(self) 
    138         #self.KIESSIGCalculator = DensityPanel(self)#KiessigPanel(self) 
    139140        self.KIESSIGCalculator = KiessigPanel(self) 
    140141        self.SlitSizeCalculator = SlitSizeCalculator(self) 
    141142        self.GENSASCalculator = GenericScatteringCalculator(self) 
     143        self.ResolutionCalculator = ResolutionCalculatorPanel(self) 
    142144 
    143145    def statusBarSetup(self): 
    … …  
    556558        """ 
    557559        """ 
    558         print("actionSAS_Resolution_Estimator TRIGGERED") 
    559         pass 
     560        self.ResolutionCalculator.show() 
    560561 
    561562    def actionGeneric_Scattering_Calculator(self): 

  • src/sas/qtgui/Plotting/Plotter2D.py

    rdc5ef15 r01cda57  
    429429 
    430430            im = self.ax.imshow(output, interpolation='nearest', 
    431                                 origin='lower', 
     431                                # origin='lower', 
    432432                                vmin=zmin_temp, vmax=zmax_temp, 
    433433                                cmap=self.cmap, 
    … …  
    494494        """ 
    495495        Replace data in current chart. 
    496         This effectlvely refreshes the chart with changes to one of its plots 
     496        This effectively refreshes the chart with changes to one of its plots 
    497497        """ 
    498498        self.plot(data=new_plot) 

  • src/sas/sascalc/calculator/resolution_calculator.py

    r7432acb r01cda57  
    9393        : qy_value: y component of q 
    9494        """ 
     95 
    9596        # make sure to update all the variables need. 
    9697        # except lambda, dlambda, and intensity 
    … …  
    152153                                 sig2_list[ind], sigr_list[ind], 
    153154                                 qx_min, qx_max, qy_min, qy_max, coord) 
    154             # this is the case of q being outside the detector 
    155             #if numpy.all(out==0.0): 
    156             #    continue 
    157155            image = out 
    158156            # set variance as sigmas 
    … …  
    186184            sigma_2 = 0 
    187185            sigma1d = 0 
     186 
    188187        if len(self.image) > 0: 
    189188            self.image += image_out 
    … …  
    192191 
    193192        # plot image 
    194         return self.plot_image(self.image) 
     193        return self.image  # self.plot_image(self.image) 
    195194 
    196195    def setup_tof(self, wavelength, wavelength_spread): 
    … …  
    214213                coord='cartesian', tof=False): 
    215214        """ 
    216         Compute the Q resoltuion in || and + direction of 2D 
     215        Compute the Q resolution in || and + direction of 2D 
    217216        : qx_value: x component of q 
    218217        : qy_value: y component of q 

  • src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py

    r7432acb r01cda57  
    934934    def _sigma_strings(self): 
    935935        """ 
    936         Recode sigmas as strins 
     936        Recode sigmas as strings 
    937937        """ 
    938938        sigma_r = self.format_number(self.resolution.sigma_1) 
    … …  
    12081208        source_hint += "Mass of %s: m = %s [g]" % \ 
    12091209                            (selection, str(self.resolution.get_neutron_mass())) 
    1210         #source_tip.SetTip(source_hint) 
     1210        # source_tip.SetTip(source_hint) 
    12111211        self.mass_txt.ToolTip.SetTip(source_hint) 
    12121212 
Note: See TracChangeset for help on using the changeset viewer.