Changeset 6f16e25 in sasview for sasview

Timestamp:

Oct 21, 2015 8:35:00 AM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

85130cb

Parents:

2d88fc4

Message:

clean up wx id handling in fitting perspective

Location:

sasview

Files:

• sasview.py (modified) (1 diff)
• wxcruft.py (modified) (1 diff)

sasview/sasview.py

@@ -75 +75 @@
     logging.error("Wx version: error reading version")
 
-#from . import wxcruft
-#wxcruft.call_later_fix()
+from . import wxcruft
+wxcruft.call_later_fix()
 #wxcruft.trace_new_id()
 

sasview/wxcruft.py

@@ -15 +15 @@
 def NewId():
     id = wx._misc.NewId()
-    frame = inspect.stack()[1]
+    path, line, function = _get_caller()
+    if path == "sas/guiframe/utils.py":
+        # Special case: NewId is being called via an IdList request; we
+        # want to which widget triggered the request, not that it was
+        # triggered via IdList.
+        path, line, function = _get_caller(2)
+        tag = " via IdList"
+    elif path.endswith("/wxcruft.py"):
+        # Special case: NewId is being called via CallLater; we want to
+        # know where the CallLater was invoked.
+        path, line, function = _get_caller(1)
+        tag = " via CallLater"
+    else:
+        tag = ""
+    print "NewId %d from %s(%d):%s%s"%(id, path, line, function, tag)
+    return id
+
+def _get_caller(distance=0):
+    frame = inspect.stack()[distance+2]
     path = frame[1]
     index = path.find('/sas/')
     if index == -1: index = path.find('\\sas\\')
-    path = path[index+1:]
-    print "NewId %d from %s(%d):%s"%(id, path, frame[2], frame[3])
-    return id
+    return path[index+1:], frame[2], frame[3]
+