Changeset cd4f421 in sasview for src/sas


Ignore:
Timestamp:
Oct 28, 2017 9:19:37 AM (7 years ago)
Author:
Adam Washington <adam.washington@…>
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:
fca1f50
Parents:
bed08e7 (diff), d132f33 (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 remote-tracking branch 'upstream/ESS_GUI_Pr' into ESS_DMAX

Location:
src/sas/qtgui
Files:
13 added
3 edited

Legend:

Unmodified
Added
Removed

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

    rf0bb711 re32b120  
    648648        """ 
    649649        """ 
    650         print("actionInversion TRIGGERED") 
     650        self._current_perspective = self.perspectiveChanged("PrInversion") 
    651651        pass 
    652652 

  • src/sas/qtgui/Perspectives/__init__.py

    r7adc2a8 re7651ff  
    44from Fitting.FittingPerspective import FittingWindow 
    55from Invariant.InvariantPerspective import InvariantWindow 
     6from Inversion.InversionPerspective import InversionWindow 
    67 
    78PERSPECTIVES = { 
    89    FittingWindow.name: FittingWindow, 
    910    InvariantWindow.name: InvariantWindow, 
     11    InversionWindow.name: InversionWindow 
    1012} 

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

    rdc5ef15 rbed08e7  
    227227            if p.hidden == True: 
    228228                continue 
    229             if not p.x == None: 
     229            if not p.x is None: 
    230230                for x_i in p.x: 
    231                     if min_value == None or x_i < min_value: 
     231                    if min_value is None or x_i < min_value: 
    232232                        min_value = x_i 
    233                     if max_value == None or x_i > max_value: 
     233                    if max_value is None or x_i > max_value: 
    234234                        max_value = x_i 
    235235        return min_value, max_value 
    … …  
    560560        Returns True if there is no data stored in the plottable 
    561561        """ 
    562         if not self.x == None and len(self.x) == 0 \ 
    563             and not self.y == None and len(self.y) == 0: 
     562        if not self.x is None and len(self.x) == 0 \ 
     563            and not self.y is None and len(self.y) == 0: 
    564564            return True 
    565565        return False 
    … …  
    795795        tempy = [] 
    796796        tempdy = [] 
    797         if self.dx == None: 
     797        if self.dx is None: 
    798798            self.dx = numpy.zeros(len(self.x)) 
    799         if self.dy == None: 
     799        if self.dy is None: 
    800800            self.dy = numpy.zeros(len(self.y)) 
    801801        if self.xLabel == "log10(x)": 
    … …  
    825825        tempy = [] 
    826826        tempdy = [] 
    827         if self.dx == None: 
     827        if self.dx is None: 
    828828            self.dx = numpy.zeros(len(self.x)) 
    829         if self.dy == None: 
     829        if self.dy is None: 
    830830            self.dy = numpy.zeros(len(self.y)) 
    831831        if self.yLabel == "log10(y)": 
    … …  
    858858        tempy = [] 
    859859        tempdy = [] 
    860         if self.dx == None: 
     860        if self.dx is None: 
    861861            self.dx = numpy.zeros(len(self.x)) 
    862         if self.dy == None: 
     862        if self.dy is None: 
    863863            self.dy = numpy.zeros(len(self.y)) 
    864864        if xmin != None and xmax != None: 
    … …  
    12021202        """ 
    12031203        """ 
    1204         if  self._chisq == None: 
     1204        if  self._chisq is None: 
    12051205            chisqTxt = r'$\chi^2=$' 
    12061206        else: 
Note: See TracChangeset for help on using the changeset viewer.