Changeset 470 in tmcsimulator for trunk

Timestamp:

07/28/2019 06:23:41 AM (7 years ago)

Author:

jdalbey

Message:

activity log watcher modified to output comma-delimited fields. Fixes #179.

Location:

trunk/src/python/unifiedlogger

Files:

• activitylog_watcher.py (modified) (1 diff)
• wing_project.wpr (modified) (8 diffs)

trunk/src/python/unifiedlogger/activitylog_watcher.py

@@ -51 +51 @@
     for item in currList:
         # extract desired fields
-        desiredFields = "Activity Log: "+item[3]+item[4]+item[5]
+        name = item[3].replace(',','')
+        code = item[4].replace(',','')
+        msg = item[5].replace(',','')
+        desiredFields = "Activity Log.,"+name+","+code+","+msg
         # Append to results list
         resultList.append(desiredFields)

trunk/src/python/unifiedlogger/wing_project.wpr

@@ -46 +46 @@
                  'full-screen': False,
                  'notebook_display': 'normal',
-                 'notebook_percent': 0.3850187265917603,
+                 'notebook_percent': 0.3472840605520926,
                  'override_title': None,
                  'pagelist': [('source-assistant',
@@ -86 +86 @@
                           1],
         'notebook_display': 'hidden',
-        'notebook_percent': 0.30000000000000004,
+        'notebook_percent': 0.0,
         'override_title': None,
         'pagelist': [('batch-search',
@@ -183 +183 @@
                        'toolbox-percent': 1.0,
                        'toolbox-tree-sel': ''})],
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('logging_service.py'),
-        {'attrib-starts': [('startup|0|',
-                            20)],
-         'code-line': '                trimmed_item = item.strip()\n',
-         'first-line': 50L,
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('activitylog_watcher.py'),
+        {'attrib-starts': [('getLogEntries|0|',
+                            42)],
+         'code-line': '    return currList\n',
+         'first-line': 37L,
          'folded-linenos': [],
-         'sel-line': 57L,
-         'sel-line-start': 1955L,
-         'selection_end': 1955L,
-         'selection_start': 1955L,
+         'sel-line': 48L,
+         'sel-line-start': 1427L,
+         'selection_end': 1427L,
+         'selection_start': 1427L,
          'zoom': 0L},
-        1563915884.294776],
-        [loc('activitylog_watcher.py'),
-         {'attrib-starts': [('getLogEntries|0|',
-                             42)],
-          'code-line': '    return currList\n',
-          'first-line': 37L,
-          'folded-linenos': [],
-          'sel-line': 48L,
-          'sel-line-start': 1427L,
-          'selection_end': 1427L,
-          'selection_start': 1427L,
-          'zoom': 0L},
-         1563915907.118035],
+        1563915907.118035],
         [loc('logging_service.py'),
          {'attrib-starts': [('startup|0|',
@@ -423 +411 @@
           'selection_start': 1506L,
           'zoom': 0L},
-         1564287481.404096]],
+         1564287481.404096],
+        [loc('cad_watcher.py'),
+         {'attrib-starts': [('getLogEntries|0|',
+                             24)],
+          'code-line': "            msgList = text_file.read().split('\\n')"\
+                       "\n",
+          'first-line': 29L,
+          'folded-linenos': [],
+          'sel-line': 52L,
+          'sel-line-start': 1613L,
+          'selection_end': 1613L,
+          'selection_start': 1613L,
+          'zoom': 0L},
+         1564324057.330601]],
         20),
-        'current-loc': loc('cad_watcher.py'),
+        'current-loc': loc('activitylog_watcher.py'),
         'editor-state-list': [(loc('activitylog_watcher.py'),
                                {'attrib-starts': [('getLogEntries|0|',
         42)],
-                                'code-line': '    resultList = []\n',
-                                'first-line': 40L,
+                                'code-line': '        desiredFields = "Activ'\
+        'ity Log.,"+name+","+code+","+msg\n',
+                                'first-line': 33L,
                                 'folded-linenos': [],
-                                'sel-line': 48L,
-                                'sel-line-start': 1422L,
-                                'selection_end': 1422L,
-                                'selection_start': 1422L,
+                                'sel-line': 55L,
+                                'sel-line-start': 1666L,
+                                'selection_end': 1728L,
+                                'selection_start': 1728L,
                                 'zoom': 0L}),
                               (loc('cad_watcher.py'),
@@ -493 +495 @@
                                 'selection_start': 28L,
                                 'zoom': 0L})],
-        'has-focus': True,
+        'has-focus': False,
         'locked': False},
         [loc('activitylog_watcher.py'),
@@ -503 +505 @@
                                'open_files': [u'../../../config/logging_service.cfg',
         u'__main__.py',
-        u'activitylog_watcher.py',
         u'cms_watcher.py',
         u'logging_service.py',
-        u'cad_watcher.py']},
+        u'cad_watcher.py',
+        u'activitylog_watcher.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.5},
@@ -521 +523 @@
                  'traversal_pos': ((0,
                                     4),
-                                   1564289756.891358),
+                                   1564325707.122876),
                  'user_data': {}},
         'window-alloc': (29,
@@ -527 +529 @@
                          1197,
                          722)}]}
-guimgr.recent-documents = [loc('cad_watcher.py'),
+guimgr.recent-documents = [loc('activitylog_watcher.py'),
+                           loc('cad_watcher.py'),
                            loc('logging_service.py'),
                            loc('__main__.py'),
-                           loc('activitylog_watcher.py'),
                            loc('cms_watcher.py'),
                            loc('../../../config/logging_service.cfg')]