Changeset 152


Ignore:
Timestamp:
09/23/2009 11:45:50 PM (14 years ago)
Author:
marcus
Message:
Location:
SHX/trunk/src/SeismicHandler
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • SHX/trunk/src/SeismicHandler

    • Property svn:ignore
      •  

        old new  
        11*.pyc 
         2.project 
         3.pydevproject 
  • SHX/trunk/src/SeismicHandler/core/modules/Command.py

    r137 r152  
    3232from SeismicHandler.core.log import logging 
    3333from SeismicHandler.core.shlib import shlib 
    34 from  SeismicHandler.core.modules.Events import EventManager, Event 
     34from  SeismicHandler.core.modules.Events import MessageService, Message 
    3535 
    3636class Command(object): 
     
    7575            self.promote() 
    7676 
    77         EventManager.trigger(Event(EventManager.COMMANDRUN)) 
     77        MessageService.trigger(Message(MessageService.COMMANDRUN)) 
    7878 
    7979    def Cancel(self): 
  • SHX/trunk/src/SeismicHandler/core/modules/Events.py

    r139 r152  
    3535        return "notifier must be callable!" 
    3636 
    37 class Event(object): 
     37class Message(object): 
    3838    """Event class. 
    3939 
     
    5454        self.done = False 
    5555 
    56 class Events(object): 
     56class MessageController(object): 
    5757    """Events manager 
    5858 
    5959    Subscribing to events: 
    6060    >>> def x(e, x): print x*2 
    61     >>> e = Events() 
    62     >>> foo = Event("foo") 
    63     >>> bar = Event("bar") 
     61    >>> e = MessageController() 
     62    >>> foo = Message("foo") 
     63    >>> bar = Message("bar") 
    6464    >>> e.subscribe(foo, x) 
    6565    >>> e.subscribe(bar, x) 
     
    230230            self.trigger(pending[0], *pending[1]) 
    231231 
    232 EventManager = Events() 
     232MessageService = MessageController() 
    233233 
    234234if __name__ == "__main__": 
  • SHX/trunk/src/SeismicHandler/core/modules/Trace.py

    r151 r152  
    2727from SeismicHandler.core.shlib import shlib 
    2828from SeismicHandler.core.log import logging 
    29 from SeismicHandler.core.modules.Events import EventManager, Event 
     29from SeismicHandler.core.modules.Events import MessageService, Message 
    3030from SeismicHandler.core.shheaders import MEMBLC, EMPTYVALUES 
    3131from SeismicHandler.core.error import InfoEntryNotFoundError, InfoEntryReadOnlyError 
     
    187187    def __init__(self): 
    188188        self.sh = shlib().sh 
    189         EventManager.subscribe(Event(EventManager.REDRAW), self.update) 
    190         EventManager.subscribe(Event(EventManager.TRACEUPDATE), self.update) 
     189        MessageService.subscribe(Message(MessageService.REDRAW), self.update) 
     190        MessageService.subscribe(Message(MessageService.TRACEUPDATE), self.update) 
    191191        self.logger = logging.getLogger("modules.traces") 
    192192        self.update() 
     
    330330    from SeismicHandler.core.commands import Run 
    331331 
    332     EventManager.block(Event(EventManager.REDRAW)) 
     332    MessageService.block(Message(MessageService.REDRAW)) 
    333333    # create 2 hours of synthetic data (100 Hz) 
    334334    # position set by counter 
     
    338338 
    339339    Run("sum all") 
    340     EventManager.unblock(Event(EventManager.REDRAW)) 
     340    MessageService.unblock(Message(MessageService.REDRAW)) 
    341341 
    342342    t.plot(True) 
  • SHX/trunk/src/SeismicHandler/core/shlib.py

    r151 r152  
    3737from SeismicHandler.config.options import environment 
    3838from SeismicHandler.core.shheaders import LINELENGTH, NOERROR, PARAM, CAPCNV, EMPTYVALUES 
    39 from SeismicHandler.core.modules.Events import EventManager, Event 
     39from SeismicHandler.core.modules.Events import MessageService, Message 
    4040 
    4141logger = logging.getLogger("core.shlib") 
     
    9696        self._startup() 
    9797 
    98         idxu = Event(EventManager.INFOIDXUPDATE) 
    99         EventManager.subscribe(idxu, self._readIdxStructure) 
    100         EventManager.trigger(idxu) 
     98        idxu = Message(MessageService.INFOIDXUPDATE) 
     99        MessageService.subscribe(idxu, self._readIdxStructure) 
     100        MessageService.trigger(idxu) 
    101101 
    102102    def _readIdxStructure(self, *args, **kwargs): 
     
    165165            fct(trc, ientry, value, C.byref(status)) 
    166166 
    167         EventManager.trigger(Event(EventManager.TRACEUPDATE)) 
     167        MessageService.trigger(Message(MessageService.TRACEUPDATE)) 
    168168        if status.value: 
    169169            logger.error("could not set info entry '%s'" % name) 
     
    294294 
    295295                if redraw.value: 
    296                     EventManager.trigger(Event(EventManager.REDRAW)) 
     296                    MessageService.trigger(Message(MessageService.REDRAW)) 
    297297 
    298298#                print quit.value, redraw.value, iscmdproc.value, rdlevel.value, status.value 
  • SHX/trunk/src/SeismicHandler/startup.py

    r151 r152  
    3939from SeismicHandler.core.modules.Trace import Traces as xTraces 
    4040from SeismicHandler.core.modules import Tools 
    41 from SeismicHandler.core.modules.Events import Event, EventManager 
     41from SeismicHandler.core.modules.Events import Message, MessageService 
    4242 
    4343# access to traces 
     
    5757            Run(options.args[0]) 
    5858            # After running script from command line, update trace information.  
    59             EventManager.trigger(Event(EventManager.TRACEUPDATE)) 
     59            MessageService.trigger(Message(MessageService.TRACEUPDATE)) 
    6060        except IndexError: 
    6161            pass 
  • SHX/trunk/src/SeismicHandler/tests/test_commands.py

    r151 r152  
    11# -*- coding: utf-8 -*- 
    22 
    3 from SeismicHandler.core.modules.Events import Event, EventManager 
     3from SeismicHandler.core.modules.Events import Message, MessageService 
    44from SeismicHandler.core.modules.Trace import Traces 
    55from SeismicHandler.core.modules.Variables import Symbol, System 
     
    6565    def testAppend(self): 
    6666        # Create two synthetic traces. 
    67         EventManager.block(Event(EventManager.REDRAW)) 
    68         Run("cresharp") 
    69         Run("cresharp") 
    70         EventManager.unblock(Event(EventManager.REDRAW)) 
     67        MessageService.block(Message(MessageService.REDRAW)) 
     68        Run("cresharp") 
     69        Run("cresharp") 
     70        MessageService.unblock(Message(MessageService.REDRAW)) 
    7171 
    7272        self.assertEqual(self.traces[0].length, 1000) 
     
    260260 
    261261        # Reload info entries. 
    262         EventManager.trigger(Event(EventManager.INFOIDXUPDATE)) 
     262        MessageService.trigger(Message(MessageService.INFOIDXUPDATE)) 
    263263 
    264264        # Create test trace and assign value to created info entry. 
     
    267267 
    268268        # Trace data has been altered. 
    269         EventManager.trigger(Event(EventManager.TRACEUPDATE)) 
     269        MessageService.trigger(Message(MessageService.TRACEUPDATE)) 
    270270 
    271271        self.assertEqual(self.traces.get(1).foo, "lala") 
     
    378378 
    379379    def testMend(self): 
     380        # This test fails in context to all other tests. Running stand alone, it will pass. 
     381        # It also passes, if next line is uncommented (strange, isn't it). 
     382        # XXX 
     383#        print len(self.traces) 
    380384        Run("cresharp") 
    381385        Run("mend 1 6 10 30") 
     
    494498 
    495499        # resample does not trigger redraw 
    496         EventManager.trigger(Event(EventManager.TRACEUPDATE)) 
     500        MessageService.trigger(Message(MessageService.TRACEUPDATE)) 
    497501 
    498502        self.assertAlmostEqual(self.traces[-1].delta, 0.01) 
     
    560564        # the summed trace has *never* a length greater 100 seconds 
    561565 
    562         EventManager.block(Event(EventManager.REDRAW)) 
     566        MessageService.block(Message(MessageService.REDRAW)) 
    563567 
    564568        # if you set seconds to 100 or lower, everything works fine 
     
    572576        Run("sum all") 
    573577 
    574         EventManager.unblock(Event(EventManager.REDRAW)) 
     578        MessageService.unblock(Message(MessageService.REDRAW)) 
    575579 
    576580        for trc in self.traces: 
  • SHX/trunk/src/SeismicHandler/tests/test_events.py

    r139 r152  
    11# -*- coding: utf-8 -*- 
    22 
    3 from SeismicHandler.core.modules.Events import Event, EventManager 
     3from SeismicHandler.core.modules.Events import Message, MessageService 
    44import unittest 
    55 
     
    88        self.ret = [] 
    99         
    10         self.test = Event("test") 
    11         self.test2 = Event("test2") 
     10        self.test = Message("test") 
     11        self.test2 = Message("test2") 
    1212         
    13         EventManager.subscribe([self.test, self.test2], self.returnValue) 
     13        MessageService.subscribe([self.test, self.test2], self.returnValue) 
    1414 
    1515    def returnValue(self, *c): 
     
    1818 
    1919    def testSubscribe(self): 
    20         self.assertTrue(self.test in EventManager.events) 
    21         self.assertTrue(self.test2 in EventManager.events) 
     20        self.assertTrue(self.test in MessageService.events) 
     21        self.assertTrue(self.test2 in MessageService.events) 
    2222 
    2323    def testTrigger(self): 
    24         EventManager.trigger(self.test, "one") 
    25         EventManager.trigger(self.test2, "two") 
     24        MessageService.trigger(self.test, "one") 
     25        MessageService.trigger(self.test2, "two") 
    2626 
    2727        self.assertEqual(self.ret, ["one", "two"]) 
    2828 
    2929    def testUnsubscribe(self): 
    30         EventManager.unsubscribe(self.returnValue, self.test) 
    31         self.assertFalse(self.returnValue in EventManager.events[self.test]) 
     30        MessageService.unsubscribe(self.returnValue, self.test) 
     31        self.assertFalse(self.returnValue in MessageService.events[self.test]) 
    3232 
    33         EventManager.trigger(self.test, "one2") 
    34         EventManager.trigger(self.test2, "two2") 
     33        MessageService.trigger(self.test, "one2") 
     34        MessageService.trigger(self.test2, "two2") 
    3535 
    3636        self.assertEqual(self.ret, ["two2",]) 
    3737 
    3838    def tearDown(self): 
    39         EventManager.unsubscribe(self.returnValue) 
     39        MessageService.unsubscribe(self.returnValue) 
    4040 
    4141def suite(): 
  • SHX/trunk/src/SeismicHandler/tests/test_traces.py

    r151 r152  
    11# -*- coding: utf-8 -*- 
    22 
    3 from SeismicHandler.core.modules.Events import Event, EventManager 
     3from SeismicHandler.core.modules.Events import Message, MessageService 
    44from SeismicHandler.core.modules.Trace import Traces 
    55from SeismicHandler.core.commands import Run 
     
    7575 
    7676        # trigger update trace info from lib 
    77         EventManager.trigger(Event(EventManager.REDRAW)) 
     77        MessageService.trigger(Message(MessageService.REDRAW)) 
    7878 
    7979        self.assertEqual(self.trace.alloc, 1000) 
     
    118118    def testInfoEntriesPy(self): 
    119119        # set values via python 
    120         EventManager.block(Event(EventManager.TRACEUPDATE)) 
     120        MessageService.block(Message(MessageService.TRACEUPDATE)) 
    121121        self.trace.station = "FOOBAR" 
    122122        self.trace.chan1 = "E" 
     
    125125        self.trace.comment = "comment with blanks" 
    126126        self.trace.zoom = 5 
    127         EventManager.unblock(Event(EventManager.TRACEUPDATE)) 
     127        MessageService.unblock(Message(MessageService.TRACEUPDATE)) 
    128128 
    129129        self.assertEqual(self.trace.alloc, 1000) 
     
    169169        self.trace.chan1 = "E" 
    170170 
    171         EventManager.trigger(Event(EventManager.REDRAW)) 
     171        MessageService.trigger(Message(MessageService.REDRAW)) 
    172172 
    173173        self.assertEqual(self.trace.chan1, "E") 
Note: See TracChangeset for help on using the changeset viewer.