Changeset 248


Ignore:
Timestamp:
08/03/2010 02:26:36 PM (12 years ago)
Author:
marcus
Message:

Hopefully now solved any import issues...

Location:
SHX/trunk/src/SeismicHandler
Files:
1 deleted
6 edited
1 moved

Legend:

Unmodified
Added
Removed
  • SHX/trunk/src/SeismicHandler/commands/echo_ch.py

    r247 r248  
    9090    echo_ch("test2") 
    9191#    echo_ch() 
    92     from SeismicHandler.modules.parser import parse 
     92    from SeismicHandler.core.modules.parser import parse 
    9393    echo_ch(**(parse("echo_ch test2/new").parsed)) 
  • SHX/trunk/src/SeismicHandler/commands/sdef.py

    r247 r248  
    2727    This command deals with the local and/or global symbol set. This is defined 
    2828    a parser level, for doctest is has to done manually. 
    29     >>> from SeismicHandler.core.parser import symbol 
     29    >>> from SeismicHandler.core.modules.parser import symbol 
    3030    >>> s = symbol() 
    3131 
  • SHX/trunk/src/SeismicHandler/commands/sdel.py

    r247 r248  
    2626    This command deals with the local and/or global symbol set. This is defined 
    2727    a parser level, for doctest is has to done manually. 
    28     >>> from SeismicHandler.core.parser import symbol 
     28    >>> from SeismicHandler.core.modules.parser import symbol 
    2929    >>> s = symbol() 
    3030    >>> s.foo = 1 
  • SHX/trunk/src/SeismicHandler/core/__init__.py

    r247 r248  
    2020# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA 
    2121 
    22 #print "it's __init__ from core" 
    23  
    24 from SeismicHandler.core.modules.traces import traces as t 
     22from SeismicHandler.core.modules.traces import Traces 
    2523from SeismicHandler.core.modules.history import History as history 
    26 #from SeismicHandler.core.basic import codes 
     24from SeismicHandler.core.basic import codes 
    2725from SeismicHandler.core.modules.log import Logging 
    2826from SeismicHandler.core.modules.runtime import runtime 
    2927 
     28# runtime configuration 
    3029Settings = runtime() 
    3130Globals = Settings.Globals 
    32 #Traces = t.visible 
    33 #Hidden = t.hidden 
     31 
     32# trace access 
     33t = Traces() 
     34Traces = t.visible 
     35Hidden = t.hidden 
  • SHX/trunk/src/SeismicHandler/core/modules/traces.py

    r247 r248  
    2727 
    2828class Traces(object): 
    29     pass 
    30 #    """ 
    31 # 
    32 #    """ 
    33 #    traces = None 
    34 #    hidden = None 
    35 # 
    36 #    def __new__(cls): 
    37 #        """ 
    38 #        Ensure that there's only one instance of the traces class. 
    39 # 
    40 #        Technically this is a singleton. 
    41 #        """ 
    42 # 
    43 #        if not '__instance' in cls.__dict__: 
    44 #            cls.__instance = object.__new__(cls) 
    45 # 
    46 #        return cls.__instance 
    47 # 
    48 #    def __init__(self, *args, **kwargs): 
    49 #        """Documentation""" 
    50 #        self.traces = s.Stream() 
    51 #        self.hidden = s.Stream() 
     29    """ 
    5230 
    53 traces = Traces() 
     31    """ 
     32    visible = None 
     33    hidden = None 
     34 
     35    def __new__(cls): 
     36        """ 
     37        Ensure that there's only one instance of the traces class. 
     38 
     39        Technically this is a singleton. 
     40        """ 
     41 
     42        if not '__instance' in cls.__dict__: 
     43            cls.__instance = object.__new__(cls) 
     44 
     45        return cls.__instance 
     46 
     47    def __init__(self, *args, **kwargs): 
     48        """Documentation""" 
     49        self.visible = Stream() 
     50        self.hidden = Stream() 
     51 
    5452if __name__ == "__main__": 
    5553    pass 
  • SHX/trunk/src/SeismicHandler/tests/test_parser.py

    r247 r248  
    5757        data = "\n".join(self.addEchoChannel(data.splitlines())) 
    5858 
    59         from SeismicHandler.modules import parser 
     59        from SeismicHandler.core.modules import parser 
    6060 
    6161        s = parser.symbol() 
     
    241241        """ 
    242242 
    243         from SeismicHandler.modules.parser import script, symbol 
     243        from SeismicHandler.core.modules.parser import script, symbol 
    244244 
    245245        s = symbol() 
     
    268268            self.fail("Cannot open test data file.") 
    269269 
    270         from SeismicHandler.modules.parser import script, symbol 
     270        from SeismicHandler.core.modules.parser import script, symbol 
    271271 
    272272        s = symbol() 
Note: See TracChangeset for help on using the changeset viewer.