Changeset 383

Timestamp:

05/12/2011 06:10:19 PM (13 years ago)

Author:

marcus

Message:

• experiments with fast plotting
• patching obspy stream for automatic trace merging (standard SH behaviour)

Location:

SHX/trunk

Files:

• SeismicHandler/__init__.py (modified) (2 diffs)
• SeismicHandler/patches (added)
• SeismicHandler/patches/__init__.py (added)
• SeismicHandler/patches/obspy.py (added)
• sandbox/GraphicsContext.py (modified) (2 diffs)
• sandbox/traceplotter.py (added)

SHX/trunk/SeismicHandler/__init__.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2008-2010 Marcus Walther (walther@szgrf.bgr.de)
+# Copyright (C) 2008-2011 Marcus Walther (walther@szgrf.bgr.de)
 #
 # This file is part of Seismic Handler eXtended (SHX)
@@ -19 +19 @@
 # along with SHX (see license.txt); if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+# patching obspy's Trace and Stream
+from obspy.core import Trace, Stream
+from SeismicHandler.patches.obspy import *
+
+# traces in a stream are merge automatically
+Stream.__shx_init__, Stream.__init__ = Stream.__init__, streamAutoMergeInit
+Stream.__shx_append, Stream.append = Stream.append, streamAutoMergeAppend
+Stream.__shx_extend, Stream.extend = Stream.extend, streamAutoMergeExtend
+Stream.__shx_insert, Stream.insert = Stream.insert, streamAutoMergeInsert
+Stream.__shx_add__, Stream.__add__ = Stream.__add__, streamAutoMergeAdd
+
+# add method for faster plotting
+Trace.shx_prepareImageData = tracePrepareDataForImage

SHX/trunk/sandbox/GraphicsContext.py

@@ -28 +28 @@
 #        buffer = wx.PaintDC(self)
         buffer.Clear()
-        
 
 #        printer = wx.PrintData()
 #        dc = wx.PostScriptDC(printer)
         # only for screen, not for print nor postscript
-#        dc = wx.GraphicsContext.Create(buffer)
+
+        # SetAxisOrientation doesn't work in versions <2.9.
+        # http://trac.wxwidgets.org/ticket/4010
 #        dc = wx.GCDC(buffer)
         dc = buffer
@@ -41 +42 @@
 
         dc.BeginDrawing()
-        dc.DrawLines([[10,10],[100,200]])
+        dc.DrawLines([[10,-10],[100,200]])
         dc.CrossHair(150,100)
         dc.EndDrawing()