Merge branch 'devFilterWidget' into develop

pylot/core/read/__init__.py

@@ -1,5 +1,6 @@
-from pylot.core.read.data import (Data,
-                                  GenericDataStructure,
-                                  SeiscompDataStructure)
-from pylot.core.read.inputs import (AutoPickParameter,
-                                    FilterOptions)
+from pylot.core.read.inputs import AutoPickParameter
+from pylot.core.read.inputs import FilterOptions
+from pylot.core.read.data import Data
+from pylot.core.read.data import GenericDataStructure
+from pylot.core.read.data import SeiscompDataStructure
+

pylot/core/read/data.py

@@ -27,7 +27,10 @@ class Data(object):
 
     def __init__(self, parent=None, evtdata=None):
         try:
-            self.wfdata = read()
+            if parent:
+                self.wfdata = read(parent.fnames)
+            else:
+                self.wfdata = read()
         except IOError, e:
             msg = 'An I/O error occured while loading data!'
             inform = 'Variable wfdata will be empty.'
@@ -44,6 +47,7 @@ class Data(object):
             self.wfdata = Stream()
         else:
             self.wfdata = Stream()
+        self.newevent = False
         if evtdata is not None and isinstance(evtdata, Event):
             self.evtdata = evtdata
         elif evtdata is not None and not evtdata.endswith('.mat'):
@@ -52,17 +56,27 @@ class Data(object):
         elif evtdata is not None:
             cat = readMatPhases(evtdata)
         else:  # create an empty Event object
+            self.newevent = True
             self.evtdata = Event()
+        self.orig = self.wfdata.copy()
+
+    def isNew(self):
+        return self.newevent
 
     def readMatPhases(self, fname):
         pass
 
     def exportEvent(self, fnout=None, evtformat='QUAKEML'):
 
+        from pylot.core.util.defaults import OUTPUTFORMATS
+
+        if evtformat.strip() not in OUTPUTFORMATS.values():
+            evtformat = OUTPUTFORMATS.values()[0]
+
         if fnout is None:
-            fnout = self.evtdata.getEventID()
+            ID = self.evtdata.getEventID()
         # handle forbidden filenames especially on windows systems
-        fnout = fnConstructor(fnout)
+        fnout = fnConstructor(ID)
 
         evtformat = evtformat.upper().strip()
 
@@ -77,10 +91,9 @@ class Data(object):
                               not implemented: {1}'''.format(evtformat, e))
 
     def plotData(self, widget):
-
         pass #axes = widget.axes
 
-    def getEventID(self):
+    def getID(self):
         try:
             return self.evtdata.get('resource_id').id
         except:
@@ -123,10 +136,19 @@ class SeiscompDataStructure(object):
     :type sdate, edate: str or UTCDateTime or None
     '''
 
+    # Data type options
+    __typeOptions = {'waveform': 'D',  # Waveform data
+                          'detect': 'E',  # Detection data
+                          'log': 'L',  # Log data
+                          'timing': 'T',  # Timing data
+                          'calib': 'C',  # Calibration data
+                          'resp': 'R',  # Response data
+                          'opaque': 'O'  # Opaque data
+                          }
+
     def __init__(self, dataType='waveform', sdate=None, edate=None, **kwargs):
         # imports
         from obspy.core import UTCDateTime
-        import numpy as np
 
         def checkDate(date):
             if not isinstance(date, UTCDateTime):
@@ -140,7 +162,9 @@ class SeiscompDataStructure(object):
                 edate = UTCDateTime(edate)
         except TypeError:
             edate = UTCDateTime()
-            sdate = edate - np.pi*1e7/2
+            halfyear = UTCDateTime('1970-07-01')
+            sdate = UTCDateTime(edate - halfyear)
+            del halfyear
 
         year = ''
         if not edate.year == sdate.year:
@@ -149,17 +173,7 @@ class SeiscompDataStructure(object):
                 year += '{0:04d},'.format(sdate.year+yr)
             year = '{'+year[:-1]+'}'
         else:
-            year = '{0:04d},'.format(sdate.year)
-
-        # Data type options
-        self.__typeOptions = {'waveform': 'D',  # Waveform data
-                              'detect': 'E',  # Detection data
-                              'log': 'L',  # Log data
-                              'timing': 'T',  # Timing data
-                              'calib': 'C',  # Calibration data
-                              'resp': 'R',  # Response data
-                              'opaque': 'O'  # Opaque data
-                              }
+            year = '{0:04d}'.format(sdate.year)
 
         if dataType in self.__typeOptions.keys():
             self.dataType = dataType
@@ -177,7 +191,7 @@ class SeiscompDataStructure(object):
                             'NET': '??',  # up to 8 characters
                             'STA': '????',  # up to 8 characters
                             'CHAN': 'HH?',  # up to 8 characters
-                            'TYPE': self._getType(),  # 1 character
+                            'TYPE': self.getType(),  # 1 character
                             'LOC': '',  # up to 8 characters
                             'DAY': '{0:03d}'.format(sdate.julday)  # 3 digits
                             }
@@ -187,10 +201,14 @@ class SeiscompDataStructure(object):
         if kwargs and isinstance(kwargs, dict):
             for key, value in kwargs.iteritems():
                 key = str(key)
-                value = str(value)
+                if type(value) not in (str, int, float):
+                    for n, val in enumerate(value):
+                        value[n] = str(val)
+                else:
+                    value = str(value)
                 try:
-                    if key in self.__sdsFields.keys():
-                        self.__sdsFields[key] = str(value)
+                    if key in self.getSDSFields().keys():
+                        self.getSDSFields()[key] = value
                     else:
                         raise KeyError('unknown SDS wildcard: %s.' % key)
                 except KeyError, e:
@@ -200,16 +218,19 @@ class SeiscompDataStructure(object):
                     errmsg += '%s; desired value was: %s\n' % (e, value)
                     print errmsg
 
-    def _getType(self):
+    def getType(self):
         return self.__typeOptions[self.dataType]
 
+    def getSDSFields(self):
+        return self.__sdsFields
+
     def expandDataPath(self):
-        fullChan = '{0}.{1}'.format(self.__sdsFields['CHAN'], self._getType())
-        dataPath = os.path.join(self.__sdsFields['SDSdir'],
-                                self.__sdsFields['YEAR'],
-                                self.__sdsFields['NET'],
-                                self.__sdsFields['STA'],
+        fullChan = '{0}.{1}'.format(self.getSDSFields()['CHAN'], self.getType())
+        dataPath = os.path.join(self.getSDSFields()['SDSdir'],
+                                self.getSDSFields()['YEAR'],
+                                self.getSDSFields()['NET'],
+                                self.getSDSFields()['STA'],
                                 fullChan,
-                                '*{0}'.format(self.__sdsFields['DAY'])
+                                '*{0}'.format(self.getSDSFields()['DAY'])
                                 )
         return dataPath

pylot/core/read/inputs.py

@@ -165,34 +165,34 @@ class FilterOptions(object):
     '''
     def __init__(self, filtertype='bandpass', freq=[2., 5.], order=3,
                  **kwargs):
-        self.setFilterType(filtertype)
-        self.setFreq(freq)
-        self.setOrder(order)
+        self._order = order
+        self._filtertype = filtertype
+        self._freq = freq
 
     def __str__(self):
         hrs = '''\n\tFilter parameter:\n
         Type:\t\t{ftype}\n
         Frequencies:\t{freq}\n
         Order:\t\t{order}\n
-        '''.format(ftype=self.getFilterType(),
-                   freq=self.getFreq(),
-                   order=self.getOrder())
+        '''.format(ftype=self.getFilterType,
+                   freq=self.getFreq,
+                   order=self.getOrder)
         return hrs
 
     def getFreq(self):
-        return self.freq
+        return self.__getattribute__('_freq')
 
     def setFreq(self, freq):
-        self.freq = freq
+        self.__setattr__('_freq', freq)
 
     def getOrder(self):
-        return self.order
+        return self.__getattribute__('_order')
 
     def setOrder(self, order):
-        self.order = order
+        self.__setattr__('_order', order)
 
     def getFilterType(self):
-        return self.filterType
+        return self.__getattribute__('_filtertype')
 
     def setFilterType(self, filtertype):
-        self.filterType = filtertype
+        self.__setattr__('_filtertype', filtertype)