Changeset 194

Timestamp:

02/18/2010 02:55:26 PM (13 years ago)

Author:

marcus

Message:

• moved global variables to setting - so it now holds all runtime data (and is renamed in that way)

Location:

SHX/trunk/src/SeismicHandler

Files:

• commands/echo.py (modified) (2 diffs)
• commands/echo_ch.py (modified) (1 diff)
• core/__init__.py (modified) (2 diffs)
• core/runtime.py (added)
• core/setting.py (deleted)

SHX/trunk/src/SeismicHandler/commands/echo.py

@@ -17 +17 @@
 
 from SeismicHandler.core.base.command import BaseCommand
-from SeismicHandler.core.setting import Settings
+from SeismicHandler.core import Settings
 
 class echo(BaseCommand):
     """
     command ECHO <text1>[;<text2>[;...;<textN>]]
-    
+
     Writes text to echo channel (set by ECHO_CH command).  Default output
     channel  is the seismhandler text window.  All parameters entered are
     displayed, separated by blanks.
-    
+
     parameters:
-    
+
     <text1>, <text2>, ..., <textN>  ---  parameter type: string
        Text to be written to echo channel, parameters are separated by
        blanks.
-    
+
     qualifiers:
-    
+
     /NO_LF
        Writes no line feed at the of the line.  Next ECHO command
        overwrites this one.
-    
+
     /NO_CRLF
        Writes no line feed and no carriage return at the end of the
        line.  Next ECHO text is appended to this one.
-    
+
     Examples:
-    
+
        ECHO THIS IS A TEST           ! writes string "THIS IS A TEST" to
                                      ! the currently selected ECHO-file
-    
+
        ECHO DISTANCE ^DISTANCE(2)    ! writes string "DISTANCE " and value
                                      ! of distance information of second trace
@@ -59 +59 @@
     ]
     expectFilename = False
-    
+
     def __init__(self, *args, **kwargs):
         # unroll args & kwargs
         BaseCommand.__init__(self, *args, **kwargs)
-        
+
     def run(self):
         if self.qualifiers["NO_LF"] or self.qualifiers["NO_CRLF"]:

SHX/trunk/src/SeismicHandler/commands/echo_ch.py

@@ -17 +17 @@
 
 from SeismicHandler.core.base.command import BaseCommand
-from SeismicHandler.core.setting import Settings
+from SeismicHandler.core import Settings
 
 class echo_ch(BaseCommand):

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

@@ -5 +5 @@
 # This file is part of Seismic Handler eXtended (SHX)
 # Full details can be found at project website http://www.seismic-handler.org/
-# 
+#
 # SHX is free software; you can redistribute it and/or modify
 # it under the terms of the GNU LESSER GENERAL PUBLIC LICENSE as published by
@@ -22 +22 @@
 from SeismicHandler.core.history import History as history
 from SeismicHandler.core import codes
+
+from SeismicHandler.core.runtime import Settings, Globals