Changeset 419 for SHX/trunk/SeismicHandler/patches/ObsPy.py

Timestamp:

07/21/2011 03:45:31 PM (12 years ago)

Author:

marcus

Message:

• more pubsub messaging system
• removed cross dependencies between frame and canvas
• general debug method

File:

• SHX/trunk/SeismicHandler/patches/ObsPy.py (modified) (5 diffs)

SHX/trunk/SeismicHandler/patches/ObsPy.py

@@ -29 +29 @@
 import numpy as np
 import math
-import time
 from obspy.core import Stream, Trace
 from obspy.core.util import AttribDict
+from SeismicHandler.utils.pubsub import pub as msgs
 #from obspy.core import UTCDateTime
 
@@ -77 +77 @@
     norm : norm method: "window", "total" or value (effects y extension)
     """
+    msgs.sendMessage('log.debug.patches',
+                                message=["Preparing plotting data...", self.id])
+
     if not timescale:
         # use trace's total dimensions
@@ -113 +116 @@
         self.shx.PlotData = pt.data.copy()
     else:
-        print time.time(), "using cachedX data for", CacheTraceID[:3]
+        msgs.sendMessage('log.devel.patches', message=["using cachedX data for",
+                                                              CacheTraceID[:3]])
 
     # use minmax approach if more than 4 data points per pixel
@@ -138 +142 @@
             joined = np.append(joined, [remaining.min(), remaining.max()])
 
-        print time.time(), "pixel_width", pixel_width, "minmax", "npts", npts, "dpp", dpp, "dimx", dimx, \
-              "covered", covered, "len_rest", len(remaining), "data_len", \
-              len(data), "joined", len(joined), "width", width
+        msgs.sendMessage(
+            'log.devel.patches',
+            message=[
+                 "pixel_width", pixel_width, "minmax", "npts", npts, "dpp",
+                 dpp, "dimx", dimx, "covered", covered, "len_rest",
+                 len(remaining), "data_len", len(data), "joined", len(joined),
+                 "width", width
+                ]
+        )
 
         # At this stage the x-transformed data can be cached! If pixel_width
@@ -146 +156 @@
         self.shx.PlotData = joined
 
-    print time.time(), width, height, norm, type(self.shx.PlotData)
+    msgs.sendMessage('log.devel.patches',
+                         message=[width, height, norm, type(self.shx.PlotData)])
 
     if cachedY:
-        print time.time(), "using cachedY data for", CacheTraceID[3:]
+        msgs.sendMessage('log.devel.patches',
+                           message=["using cachedY data for", CacheTraceID[3:]])
         return