Changeset 907b24b in sasview

Timestamp:

Oct 24, 2016 2:40:01 AM (7 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:

• calculator/model_editor.py (modified) (1 diff)
• fitting/basepage.py (modified) (2 diffs)

src/sas/sasgui/perspectives/calculator/model_editor.py

@@ -511 +511 @@
         fill the current combobox with the operator
         """
-        operator_list = [' +', ' *']
+        operator_list = ['+', '*']
         for oper in operator_list:
             pos = self._operator_choice.Append(str(oper))
-            self._operator_choice.SetClientData(pos, str(oper.strip()))
+            self._operator_choice.SetClientData(pos, str(oper))
         self._operator_choice.SetSelection(0)
 

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -52 +52 @@
     FONT_VARIANT = 1
     ON_MAC = True
-
 
 class BasicPage(ScrolledPanel, PanelBase):
@@ -1457 +1456 @@
                 self.state_change = True
                 self._draw_model()
+                #Time delay introduced to prevent double compilation on Windows
+                #It seems to be threading related issue that triggers
+                #compilation twice at the same time
+                if ON_MAC == False:
+                    time.sleep(0.1)
                 self.Refresh()