Changeset 143

Timestamp:

08/20/2009 12:28:25 PM (13 years ago)

Author:

marcus

Message:

• more tests
• access to system variables

Location:

SHX/trunk/src/SeismicHandler

Files:

• core/error.py (modified) (1 diff)
• core/modules/Variables.py (modified) (1 diff)
• core/shlib.py (modified) (1 diff)
• tests/data (added)
• tests/data/test-sine.asc (added)
• tests/test_commands.py (added)
• tests/test_traces.py (modified) (1 diff)

SHX/trunk/src/SeismicHandler/core/error.py

@@ -79 +79 @@
         return """info entry "%s" not writable!""" % self.name
 
-class VarsInternalReadOnlyError(Error):
+class VarsSystemReadOnlyError(Error):
     def __init__(self):
         Error.__init__(self)

SHX/trunk/src/SeismicHandler/core/modules/Variables.py

@@ -26 +26 @@
 from SeismicHandler.core.shlib import shlib
 from SeismicHandler.core.log import logging
-from SeismicHandler.core.modules.Events import EventManager, Event
-from SeismicHandler.core.error import VarsInternalReadOnlyError
+from SeismicHandler.core.error import VarsSystemReadOnlyError
+import ctypes as C
 
-class accessInternal(object):
+class accessSystem(object):
+    def __init__(self):
+        self._logger = logging.getLogger("modules.variables")
+        self._sh = shlib().sh
+    
+    def __getattr__(self, name):
+        if name in ["_logger", "_sh"]:
+            return self.__dict__[name]
+        
+        res = C.create_string_buffer(1024)
+        status = C.c_int()
+        
+        self._sh.tr_intern(name.upper(), "", len(res), C.byref(res), C.byref(status))
+        
+        if not status:
+            return res.value
+        else:
+            return False
+    
+    def __setattr__(self, name, value):
+        if name in ["_logger", "_sh"]:
+            self.__dict__[name] = value
+        else:
+            raise VarsSystemReadOnlyError
+
+class accessSymbols(object):
     def __init__(self):
         pass
-
-class accessUserDefined(object):
-    def __init__(self):
+    
+    def __getattr__(self, name):
+        pass
+    
+    def __setattr__(self, name, value):
         pass
 
-Internal = accessInternal()
-UserDefined = accessUserDefined()
+SystemVars = accessSystem()
+SymbolVars = accessSymbols()
+
+if __name__ == "__main__":
+    print SystemVars.pi

SHX/trunk/src/SeismicHandler/core/shlib.py

@@ -170 +170 @@
         """set some start up parameters"""
 
+#        self.call(StringIO("SHSTRTUP"))
+#        return
+    
         self.call(StringIO("wdw/dc=s/ic=s/main"))
         self.call(StringIO("wdw/ic=s"))

SHX/trunk/src/SeismicHandler/tests/test_traces.py

@@ -191 +191 @@
             self.fail("non existing failure")
 
-    def testSumCommand(self):
-        # this test fails for some reason
-        # the summed trace has *never* a length greater 100 seconds
-        
-        EventManager.block(Event(EventManager.REDRAW))
-        
-        seconds, delta = 110., 0.01
-        
-        Run("del 1")
-        # create 2 identical synthetics with "seconds" length, 1/"delta" Hz 
-        for i in xrange(2):
-            Run("CREATE SHARP %.2f %u 1. 15. .1 .5" % (delta, seconds))
-            
-        Run("sum all")
-        
-#        Run("fili f BP_2S_10HZ_4")
-#        Run("filter f 1")
-            
-        EventManager.unblock(Event(EventManager.REDRAW))
-        
-        for i in range(len(self.traces)):
-            print i
-            trc = self.traces[i+1]
-            self.assertAlmostEqual(trc.delta, delta, 6)
-            self.assertEqual(trc.length, seconds/delta)
-            self.assertAlmostEqual(len(trc)/1000., seconds, 1)
-             
 def suite():
     return unittest.makeSuite(eventsTestCase, 'test')