Changes in / [bb81385:87d44c7] in sasview


Ignore:
Location:
src/sas/sasgui
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py

    rc1d5aea r463e7ffc  
    9292        if dlg.ShowModal() == wx.ID_OK: 
    9393            file_list = dlg.GetPaths() 
    94             if len(file_list) >= 0 and file_list[0] is not None: 
     94            if len(file_list) >= 0 and not file_list[0] is None: 
    9595                self._default_save_location = os.path.dirname(file_list[0]) 
    9696                path = self._default_save_location 

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

    rc1d5aea r25b9707a  
    4242        """ 
    4343        parent = self.parent 
    44         if parent is None: 
     44        if parent == None: 
    4545            location = os.getcwd() 
    4646        else: 
    4747            location = parent._default_save_location 
    4848        path_list = self.choose_data_file(location=location) 
    49         if path_list is None: 
     49        if path_list == None: 
    5050            return 
    51         if len(path_list) >= 0 and path_list[0] is not None: 
    52             if parent is not None: 
     51        if len(path_list) >= 0 and not(path_list[0]is None): 
     52            if parent != None: 
    5353                parent._default_save_location = os.path.dirname(path_list[0]) 
    5454        err_msg = '' 

  • src/sas/sasgui/perspectives/pr/inversion_panel.py

    rc1d5aea r463e7ffc  
    940940        Choose a new input file for I(q) 
    941941        """ 
    942         if self._manager is not None: 
     942        if not self._manager is None: 
    943943            self.plot_data.SetValue(str(data.name)) 
    944944            try: 

  • src/sas/sasgui/perspectives/pr/pr.py

    rc1d5aea r463e7ffc  
    10471047        try: 
    10481048            pr = self._create_file_pr(data) 
    1049             if pr is not None: 
     1049            if not pr is None: 
    10501050                self.pr = pr 
    10511051                self.perform_estimate() 

  • src/sas/sasgui/plottools/PlotPanel.py

    rc1d5aea r463e7ffc  
    14031403        if self.scale == 'log_{10}': 
    14041404            self.scale = 'linear' 
    1405             if self.zmin_2D is not None: 
     1405            if not self.zmin_2D is None: 
    14061406                zmin_2D_temp = math.pow(10, self.zmin_2D) 
    1407             if self.zmax_2D is not None: 
     1407            if not self.zmax_2D is None: 
    14081408                zmax_2D_temp = math.pow(10, self.zmax_2D) 
    14091409        else: 
    14101410            self.scale = 'log_{10}' 
    1411             if self.zmin_2D is not None: 
     1411            if not self.zmin_2D is None: 
    14121412                # min log value: no log(negative) 
    14131413                if self.zmin_2D <= 0: 
    … …  
    14151415                else: 
    14161416                    zmin_2D_temp = math.log10(self.zmin_2D) 
    1417             if self.zmax_2D is not None: 
     1417            if not self.zmax_2D is None: 
    14181418                zmax_2D_temp = math.log10(self.zmax_2D) 
    14191419 
Note: See TracChangeset for help on using the changeset viewer.