Changeset 529

Timestamp:

02/02/2012 03:50:14 PM (12 years ago)

Author:

marcus

Message:

• accept tailing comment within command line
• access to trace info entries

Location:

SHX/trunk/SeismicHandler

Files:

• basics/error.py (modified) (2 diffs)
• bin/SH (modified) (1 diff)
• commands/README (added)
• config/runtime.py (modified) (2 diffs)
• modules/parse.py (modified) (7 diffs)
• patches/ObsPy.py (modified) (3 diffs)

SHX/trunk/SeismicHandler/basics/error.py

@@ -22 +22 @@
 """module for SHX exceptions"""
 
-from SeismicHandler.basics.messages import MessageSystem as msgs
+from SeismicHandler.basics.messages import MessageSystem as msgs, setStatus
 
 __all__ = ['ShxError']
@@ -48 +48 @@
     def __init__(self, value):
         self.value = value
+        setStatus(1)
         Error.__init__(self)
 

SHX/trunk/SeismicHandler/bin/SH

@@ -2 +2 @@
 
 """
-Helper script for executing SH scripts. In future this will also offer an
-interactive command line interface.
+Helper script for executing SH scripts and interactive usage.
 """
 

SHX/trunk/SeismicHandler/config/runtime.py

@@ -33 +33 @@
 import warnings
 from SeismicHandler.basics import Property, Singleton, AttribDict
-from SeismicHandler.basics.messages import msgs
+from SeismicHandler.basics.messages import msgs, logMessage
 
 
@@ -243 +243 @@
 
     def _setRuntimeVar(self, name, value):
+        logMessage(
+            "debug.runtime",
+            "Received internal update for '%s' (%s)" % (name, str(value))
+        )
         self.Runtime[name] = value
 

SHX/trunk/SeismicHandler/modules/parse.py

@@ -116 +116 @@
     re_file = " (/\w+)+ ?"
 
-    def __init__(self, input, switches=None):
+    def __init__(self, input_string, switches=None):
         if switches is None:
             switches = Switches()
 
         self.switches = switches
-        self.input = input
+        # treat everything after ! as comment
+        input_string = input_string.split("!")[0]
+        self.input = input_string
 
         converted = False
@@ -127 +129 @@
             # If a command starts with @, no conversion to upper case is
             # performed but the indicator char is removed.
-            if input.startswith("@"):
-                input = input[1:]
+            if input_string.startswith("@"):
+                input_string = input_string[1:]
             else:
-                input = input.upper()
+                input_string = input_string.upper()
                 converted = True
 
@@ -137 +139 @@
         f = re.compile(self.re_file)
 
-        cmd = c.search(input).group(0)
-        qual = q.findall(input)
+        cmd = c.search(input_string).group(0)
+        qual = q.findall(input_string)
 
         # guess file
         try:
-            sfile = f.search(input).group(0).strip()
+            sfile = f.search(input_string).group(0).strip()
         except:
             sfile = None
@@ -148 +150 @@
         qualifiers = {}
         # remove cmd and qualifiers from string
-        cmd_par = input.replace(cmd, "")
+        cmd_par = input_string.replace(cmd, "")
         for qq in qual:
             cmd_par = cmd_par.replace(qq, "")
@@ -179 +181 @@
         self._parsed = {
             "shx_input": self.input,
-            "shx_input_conv": input,
+            "shx_input_conv": input_string,
             "shx_command": cmd.lower(), # command always in lower case
             "shx_converted": converted, # indicates cap conversion
@@ -498 +500 @@
 
     def commandQuit(self, *args):
+        if not args:
+            yesno = raw_input("  Leave program [yN]? ")
+        else:
+            yesno = args[0]
+
         msgs.sendMessage("command.run", cmd="quit")
-        quit()
+        if yesno.lower() == "y":
+            quit()
 
     def commandIf(self, cmd):
@@ -720 +728 @@
 
     def __handleTrace(self, name):
-        raise NotImplementedError
+        try:
+            name, traceno = name.split("(")
+            traceno = int(traceno.split(")")[0])
+        except:
+            traceno = 1
+
+        try:
+            # internal counting starts from zero
+            trace = Traces[traceno - 1]
+        except:
+            logMessage("error.parse", "Trace number %u not present" % traceno)
+
+        try:
+            res = trace._shxInfo(name)
+            return res
+        except NameError:
+            logMessage("error.trace", "undefined info entry name '%s'" % name)
 
     def __handleOption(self, name):

SHX/trunk/SeismicHandler/patches/ObsPy.py

@@ -31 +31 @@
 from obspy.core import Stream, Trace
 from obspy.core.util import AttribDict
-from SeismicHandler.basics.messages import logMessage
+from obspy.sh.core import fromUTCDateTime
+from SeismicHandler.basics.messages import logMessage, setStatus
 
 __all__ = []
@@ -211 +212 @@
     self.shx = AttribDict()
 
+def traceGetStatusInfo(self, name):
+    """
+    Mapping of Seismic Handler trace information entries to ObsPy status info.
+    """
+    name = name.lower()
+
+    # identical name
+    if name in self.stats:
+        return self.stats[name]
+
+    # mapping
+    if name == "length":
+        return self.stats.npts
+
+    if name == "chan1":
+        return self.stats.channel[0]
+
+    if name == "chan2":
+        return self.stats.channel[1]
+
+    if name == "comp":
+        return self.stats.channel[2]
+
+    if name == "start":
+        return fromUTCDateTime(self.stats.starttime)
+
+    # finally look into self defined entries
+    if name in self.shx:
+        return self.shx[name]
+
+    raise NameError
+
 # monkey patching obspy stream class: traces are merge automatically if stream
 # get's altered.
@@ -223 +256 @@
 Trace.__shx_init__, Trace.__init__ = Trace.__init__, traceAddShxInit
 Trace._shxPrepareImageData = tracePrepareDataForImage
+Trace._shxInfo = traceGetStatusInfo