Changeset 522 in tmcsimulator for trunk/src/python

Timestamp:

11/11/2019 08:39:41 AM (6 years ago)

Author:

jdalbey

Message:

Unified logger - cad_watcher.py set lastLineNum to zero when fileSize == 0.

Location:

trunk/src/python/unifiedlogger

Files:

• cad_watcher.py (modified) (2 diffs)
• wing_project.wpr (modified) (5 diffs)

trunk/src/python/unifiedlogger/cad_watcher.py

@@ -11 +11 @@
 
 lastLineNum = 0
-
-# Utility functions
-def isEmpty(cmsitem):
-    return cmsitem == ",,,,,"
-def isFull(cmsitem):
-    return not isEmpty(cmsitem)
 
 def setup():
@@ -49 +43 @@
             # Assume this is a read sync problem: Don't modify lastLineNum
             print pathToLog+" is empty, ignoring."
+            lastLineNum = 0   #Start over
             return []
         else: # file is good, read it.

trunk/src/python/unifiedlogger/wing_project.wpr

@@ -198 +198 @@
                        'toolbox-percent': 1.0,
                        'toolbox-tree-sel': ''})],
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('logging_service.py'),
-        {'attrib-starts': [('getSimTime|0|',
-                            13)],
-         'code-line': '       print "Proceeding with previous time: ", toHMS'\
-                      '(seconds)\n',
-         'first-line': 3L,
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('../../../../../../../../usr/lib/python2.7/ConfigParser.py'),
+        {'attrib-starts': [('ConfigParser|0|',
+                            85),
+                           ('ConfigParser|0|.get|0|',
+                            589)],
+         'code-line': '                raise NoSectionError(section)\n',
+         'first-line': 589L,
          'folded-linenos': [],
-         'sel-line': 21L,
-         'sel-line-start': 649L,
-         'selection_end': 649L,
-         'selection_start': 649L,
+         'sel-line': 606L,
+         'sel-line-start': 22028L,
+         'selection_end': 22028L,
+         'selection_start': 22028L,
          'zoom': 0L},
-        1566600699.578844],
-        [loc('../../../config/logging_service.cfg'),
-         {'attrib-starts': [],
-          'code-line': 'ActivityLogPath = webapps/dynamicdata/\n',
-          'first-line': 0L,
-          'folded-linenos': [],
-          'sel-line': 2L,
-          'sel-line-start': 46L,
-          'selection_end': 84L,
-          'selection_start': 84L,
-          'zoom': 0L},
-         1566600715.315246],
-        [loc('activitylog_watcher.py'),
-         {'attrib-starts': [('readFile|0|',
-                             21)],
-          'code-line': "    logfilepath = config.get('Paths', 'ActivityLogPa"\
-                       "th')\n",
-          'first-line': 15L,
-          'folded-linenos': [],
-          'sel-line': 25L,
-          'sel-line-start': 767L,
-          'selection_end': 767L,
-          'selection_start': 767L,
-          'zoom': 0L},
-         1566600747.038673],
-        [loc('../../../../../../../../usr/lib/python2.7/ConfigParser.py'),
-         {'attrib-starts': [('ConfigParser|0|',
-                             85),
-                            ('ConfigParser|0|.get|0|',
-                             589)],
-          'code-line': '                raise NoSectionError(section)\n',
-          'first-line': 589L,
-          'folded-linenos': [],
-          'sel-line': 606L,
-          'sel-line-start': 22028L,
-          'selection_end': 22028L,
-          'selection_start': 22028L,
-          'zoom': 0L},
-         1566600751.835139],
+        1566600751.835139],
         [loc('activitylog_watcher.py'),
          {'attrib-starts': [('readFile|0|',
@@ -450 +413 @@
           'selection_start': 649L,
           'zoom': 0L},
-         1569957016.54503]],
+         1569957016.54503],
+        [loc('__main__.py'),
+         {'attrib-starts': [],
+          'code-line': 'import logging_service, os, ConfigParser\n',
+          'first-line': 0L,
+          'folded-linenos': [],
+          'sel-line': 0L,
+          'sel-line-start': 0L,
+          'selection_end': 40L,
+          'selection_start': 28L,
+          'zoom': 0L},
+         1573490786.397811],
+        [loc('cad_watcher.py'),
+         {'attrib-starts': [('getLogEntries|0|',
+                             24)],
+          'code-line': '        fileSize = os.path.getsize(pathToLog)\n',
+          'first-line': 18L,
+          'folded-linenos': [],
+          'sel-line': 46L,
+          'sel-line-start': 1365L,
+          'selection_end': 1410L,
+          'selection_start': 1410L,
+          'zoom': 0L},
+         1573492071.42135],
+        [loc('cms_watcher.py'),
+         {'attrib-starts': [('readFile|0|',
+                             18)],
+          'code-line': ' \n',
+          'first-line': 6L,
+          'folded-linenos': [],
+          'sel-line': 21L,
+          'sel-line-start': 564L,
+          'selection_end': 565L,
+          'selection_start': 565L,
+          'zoom': 0L},
+         1573492072.884505]],
         20),
-        'current-loc': loc('__main__.py'),
+        'current-loc': loc('cad_watcher.py'),
         'editor-state-list': [(loc('activitylog_watcher.py'),
                                {'attrib-starts': [('readFile|0|',
@@ -467 +465 @@
                               (loc('cad_watcher.py'),
                                {'attrib-starts': [('getLogEntries|0|',
-        24)],
-                                'code-line': '            print pathToLog + '\
-        '" missing: assuming reset."\n',
-                                'first-line': 45L,
+        18)],
+                                'code-line': '            return []\n',
+                                'first-line': 33L,
                                 'folded-linenos': [],
-                                'sel-line': 37L,
-                                'sel-line-start': 1087L,
-                                'selection_end': 1143L,
-                                'selection_start': 1143L,
+                                'sel-line': 45L,
+                                'sel-line-start': 1479L,
+                                'selection_end': 1479L,
+                                'selection_start': 1479L,
                                 'zoom': 0L}),
                               (loc('cms_watcher.py'),
@@ -531 +528 @@
          loc('__main__.py')]),
                                'open_files': [u'../../../config/logging_service.cfg',
-        u'cad_watcher.py',
-        u'cms_watcher.py',
         u'activitylog_watcher.py',
         u'logging_service.py',
-        u'__main__.py']},
+        u'__main__.py',
+        u'cms_watcher.py',
+        u'cad_watcher.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.5},
@@ -556 +553 @@
                          1197,
                          722)}]}
-guimgr.recent-documents = [loc('__main__.py'),
+guimgr.recent-documents = [loc('cad_watcher.py'),
+                           loc('cms_watcher.py'),
+                           loc('__main__.py'),
                            loc('logging_service.py'),
                            loc('activitylog_watcher.py'),
-                           loc('../../../config/logging_service.cfg'),
-                           loc('cad_watcher.py'),
-                           loc('cms_watcher.py')]
+                           loc('../../../config/logging_service.cfg')]
 guimgr.visual-state = {loc('get_app_properties.py'): {'attrib-starts': [],
         'code-line': '',