Changeset 531

Timestamp:

02/02/2012 05:51:18 PM (12 years ago)

Author:

marcus

Message:

• ...
• method for expanding trace lists

Location:

SHX/trunk/SeismicHandler

Files:

• basics/error.py (modified) (2 diffs)
• basics/tools.py (modified) (2 diffs)
• modules/parse.py (modified) (2 diffs)
• patches/ObsPy.py (modified) (2 diffs)

SHX/trunk/SeismicHandler/basics/error.py

@@ -35 +35 @@
         # log message
         msgs.sendMessage("log.error", message=str(self))
+        setStatus(getattr(self, "status", "unset"))
 
     def __str__(self):
@@ -46 +47 @@
     """
 
-    def __init__(self, value):
+    def __init__(self, value, status=1):
         self.value = value
-        setStatus(1)
+        self.status = status
         Error.__init__(self)
 

SHX/trunk/SeismicHandler/basics/tools.py

@@ -9 +9 @@
 def Property(func):
     return property(**func())
+
 
 class Singleton(type):
@@ -24 +25 @@
 
         return cls.instance
+
+
+def expandTraceList(trcs, selection):
+    """
+    Expand comma separated list of traces into sorted internal trace numbers
+    (reverse order).
+    """
+
+    if not len(trcs):
+        return None
+
+    selection = [i.lower() for i in selection.split(",")]
+
+    if "all" in selection:
+        selected = range(0, len(trcs))
+        selected.reverse()
+        return selected
+
+    selected = []
+    for s in selection:
+        # range
+        if "-" in s:
+            try:
+                start, stop = map(int, s.split("-"))
+            except:
+                print "  skipping '%s'" % s
+                continue
+
+            if stop < start:
+                start, stop = stop, start
+
+            selected.extend(range(start - 1, stop))
+
+        else:
+            if s.isdigit():
+                selected.append(int(s) - 1)
+            else:
+                print "  skipping '%s'" % s
+
+    # unique
+    selected = list(set(selected))
+    selected.sort()
+    selected.reverse()
+
+    return selected

SHX/trunk/SeismicHandler/modules/parse.py

@@ -509 +509 @@
             quit()
 
-    def commandIf(self, cmd):
+    def commandIf(self, *args, **kwargs):
+        print args, kwargs
         pass
 
@@ -695 +696 @@
         except NotImplementedError:
             raise NotImplementedError
+        except ShxError, e:
+            raise ShxError("'%s' could not be translated!" % value, e.status)
         except:
-            raise ShxError("'%s' could not be translated!" % value)
+            raise ShxError("'%s' could not be translated!" % value, 1716)
 
     def __handleSystem(self, name):

SHX/trunk/SeismicHandler/patches/ObsPy.py

@@ -33 +33 @@
 from obspy.sh.core import fromUTCDateTime
 from SeismicHandler.basics.messages import logMessage, setStatus
+from SeismicHandler.basics.error import ShxError
 
 __all__ = []
@@ -242 +243 @@
         return self.shx[name]
 
-    raise NameError
+    raise ShxError("Info entry not found", 1703)
 
 # monkey patching obspy stream class: traces are merge automatically if stream