Changeset 907b24b in sasview for src


Ignore:
Timestamp:
Oct 24, 2016 4:40:01 AM (8 years ago)
Author:
wojciech
Branches:
master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
d7c29ce
Parents:
def512c (diff), cf1910f (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:

Merged with master

Location:
src/sas/sasgui/perspectives
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/calculator/model_editor.py

    rad1ac45 rcf1910f  
    511511        fill the current combobox with the operator 
    512512        """ 
    513         operator_list = [' +', ' *'] 
     513        operator_list = ['+', '*'] 
    514514        for oper in operator_list: 
    515515            pos = self._operator_choice.Append(str(oper)) 
    516             self._operator_choice.SetClientData(pos, str(oper.strip())) 
     516            self._operator_choice.SetClientData(pos, str(oper)) 
    517517        self._operator_choice.SetSelection(0) 
    518518 
  • src/sas/sasgui/perspectives/fitting/basepage.py

    rc8e1996 rdef512c  
    5252    FONT_VARIANT = 1 
    5353    ON_MAC = True 
    54  
    5554 
    5655class BasicPage(ScrolledPanel, PanelBase): 
     
    14571456                self.state_change = True 
    14581457                self._draw_model() 
     1458                #Time delay introduced to prevent double compilation on Windows 
     1459                #It seems to be threading related issue that triggers 
     1460                #compilation twice at the same time 
     1461                if ON_MAC == False: 
     1462                    time.sleep(0.1) 
    14591463                self.Refresh() 
    14601464 
Note: See TracChangeset for help on using the changeset viewer.