Index: trunk/src/python/unifiedlogger/cad_watcher.py =================================================================== --- trunk/src/python/unifiedlogger/cad_watcher.py (revision 454) +++ trunk/src/python/unifiedlogger/cad_watcher.py (revision 466) @@ -36,5 +36,5 @@ def setup(): - # nothing needed for setup + lastLineNum = 0 return Index: trunk/src/python/unifiedlogger/logging_service.py =================================================================== --- trunk/src/python/unifiedlogger/logging_service.py (revision 461) +++ trunk/src/python/unifiedlogger/logging_service.py (revision 466) @@ -48,5 +48,5 @@ # FOR each plugin LOOP for plugin in plugins: - # dynamically load the setup function for this plugin + # dynamically load the get log function for this plugin plugmodule = globals()[plugin] getfunc = getattr(plugmodule, 'getLogEntries') @@ -54,5 +54,5 @@ # Run the plugin process returning new log entries results = getfunc() - # Append simulation time and the log entries to the Output Buffer + # Append simulation time and the log entries to the Output Buffer for item in results: trimmed_item = item.strip() Index: trunk/src/python/unifiedlogger/wing_project.wpr =================================================================== --- trunk/src/python/unifiedlogger/wing_project.wpr (revision 465) +++ trunk/src/python/unifiedlogger/wing_project.wpr (revision 466) @@ -183,148 +183,16 @@ 'toolbox-percent': 1.0, 'toolbox-tree-sel': ''})], - 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('activitylog_watcher.py'), - {'attrib-starts': [], - 'code-line': '# Local main for unit testing\n', - 'first-line': 48L, + 'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('logging_service.py'), + {'attrib-starts': [('startup|0|', + 20)], + 'code-line': ' trimmed_item = item.strip()\n', + 'first-line': 39L, 'folded-linenos': [], - 'sel-line': 50L, - 'sel-line-start': 1431L, - 'selection_end': 1460L, - 'selection_start': 1460L, + 'sel-line': 57L, + 'sel-line-start': 1955L, + 'selection_end': 1955L, + 'selection_start': 1955L, 'zoom': 0L}, - 1563915276.741928], - [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': 601L, - 'folded-linenos': [], - 'sel-line': 606L, - 'sel-line-start': 22028L, - 'selection_end': 22028L, - 'selection_start': 22028L, - 'zoom': 0L}, - 1563915287.423714], - [loc('activitylog_watcher.py'), - {'attrib-starts': [], - 'code-line': '# Local main for unit testing\n', - 'first-line': 18L, - 'folded-linenos': [], - 'sel-line': 50L, - 'sel-line-start': 1431L, - 'selection_end': 1460L, - 'selection_start': 1460L, - 'zoom': 0L}, - 1563915319.659486], - [loc('../../../../../../../../usr/lib/python2.7/json/decoder.py'), - {'attrib-starts': [('JSONDecoder|0|', - 271), - ('JSONDecoder|0|.raw_decode|0|', - 369)], - 'code-line': ' obj, end = self.scan_once(s, idx)\n', - 'first-line': 370L, - 'folded-linenos': [], - 'sel-line': 379L, - 'sel-line-start': 13534L, - 'selection_end': 13534L, - 'selection_start': 13534L, - 'zoom': 0L}, - 1563915321.261377], - [loc('activitylog_watcher.py'), - {'attrib-starts': [], - 'code-line': '# Local main for unit testing\n', - 'first-line': 18L, - 'folded-linenos': [], - 'sel-line': 50L, - 'sel-line-start': 1431L, - 'selection_end': 1460L, - 'selection_start': 1460L, - 'zoom': 0L}, - 1563915322.700758], - [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}, - 1563915338.030142], - [loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 20)], - 'code-line': ' # dynamically load the setup function for th'\ - 'is plugin \n', - 'first-line': 24L, - 'folded-linenos': [], - 'sel-line': 33L, - 'sel-line-start': 1119L, - 'selection_end': 1180L, - 'selection_start': 1180L, - 'zoom': 0L}, - 1563915525.660434], - [loc('cms_watcher.py'), - {'attrib-starts': [], - 'code-line': '# Read the cms message file\n', - 'first-line': 12L, - 'folded-linenos': [], - 'sel-line': 17L, - 'sel-line-start': 410L, - 'selection_end': 606L, - 'selection_start': 410L, - 'zoom': 0L}, - 1563915548.444179], - [loc('activitylog_watcher.py'), - {'attrib-starts': [('getLogEntries|0|', - 42)], - 'code-line': ' currList = []\n', - 'first-line': 33L, - 'folded-linenos': [], - 'sel-line': 45L, - 'sel-line-start': 1303L, - 'selection_end': 1303L, - 'selection_start': 1303L, - 'zoom': 0L}, - 1563915776.997235], - [loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 20)], - 'code-line': ' trimmed_item = item.strip()\n', - 'first-line': 30L, - 'folded-linenos': [], - 'sel-line': 57L, - 'sel-line-start': 1955L, - 'selection_end': 1955L, - 'selection_start': 1955L, - 'zoom': 0L}, - 1563915793.39434], - [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}, - 1563915821.788454], - [loc('logging_service.py'), - {'attrib-starts': [('startup|0|', - 20)], - 'code-line': ' trimmed_item = item.strip()\n', - 'first-line': 39L, - 'folded-linenos': [], - 'sel-line': 57L, - 'sel-line-start': 1955L, - 'selection_end': 1955L, - 'selection_start': 1955L, - 'zoom': 0L}, - 1563915837.345044], + 1563915837.345044], [loc('activitylog_watcher.py'), {'attrib-starts': [('getLogEntries|0|', @@ -422,7 +290,140 @@ 'selection_start': 559L, 'zoom': 0L}, - 1564102192.752733]], + 1564102192.752733], + [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}, + 1564182621.22245], + [loc('logging_service.py'), + {'attrib-starts': [('startup|0|', + 20)], + 'code-line': ' # dynamically load the get log function '\ + 'for this plugin\n', + 'first-line': 38L, + 'folded-linenos': [], + 'sel-line': 49L, + 'sel-line-start': 1561L, + 'selection_end': 1603L, + 'selection_start': 1603L, + 'zoom': 0L}, + 1564182682.881746], + [loc('cad_watcher.py'), + {'attrib-starts': [('isFull|0|', + 16)], + 'code-line': '\n', + 'first-line': 27L, + 'folded-linenos': [], + 'sel-line': 18L, + 'sel-line-start': 559L, + 'selection_end': 559L, + 'selection_start': 559L, + 'zoom': 0L}, + 1564182715.806107], + [loc('logging_service.py'), + {'attrib-starts': [('startup|0|', + 20)], + 'code-line': ' # Append simulation time and the log entri'\ + 'es to the Output Buffer\n', + 'first-line': 38L, + 'folded-linenos': [], + 'sel-line': 55L, + 'sel-line-start': 1843L, + 'selection_end': 1851L, + 'selection_start': 1851L, + 'zoom': 0L}, + 1564182751.746078], + [loc('cad_watcher.py'), + {'attrib-starts': [('isFull|0|', + 16)], + 'code-line': '\n', + 'first-line': 21L, + 'folded-linenos': [], + 'sel-line': 18L, + 'sel-line-start': 559L, + 'selection_end': 559L, + 'selection_start': 559L, + 'zoom': 0L}, + 1564182793.261813], + [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}, + 1564182798.481531], + [loc('logging_service.py'), + {'attrib-starts': [('startup|0|', + 20)], + 'code-line': ' # Append simulation time and the log entri'\ + 'es to the Output Buffer\n', + 'first-line': 0L, + 'folded-linenos': [], + 'sel-line': 55L, + 'sel-line-start': 1843L, + 'selection_end': 1851L, + 'selection_start': 1851L, + 'zoom': 0L}, + 1564182969.909882], + [loc('cad_watcher.py'), + {'attrib-starts': [], + 'code-line': 'lastLineNum = 0\n', + 'first-line': 7L, + 'folded-linenos': [], + 'sel-line': 11L, + 'sel-line-start': 417L, + 'selection_end': 432L, + 'selection_start': 432L, + 'zoom': 0L}, + 1564183893.9794], + [loc('logging_service.py'), + {'attrib-starts': [('startup|0|', + 20)], + 'code-line': ' # Append simulation time and the log entri'\ + 'es to the Output Buffer\n', + 'first-line': 39L, + 'folded-linenos': [], + 'sel-line': 55L, + 'sel-line-start': 1843L, + 'selection_end': 1851L, + 'selection_start': 1851L, + 'zoom': 0L}, + 1564184320.038293], + [loc('cad_watcher.py'), + {'attrib-starts': [], + 'code-line': 'lastLineNum = 0\n', + 'first-line': 10L, + 'folded-linenos': [], + 'sel-line': 11L, + 'sel-line-start': 417L, + 'selection_end': 432L, + 'selection_start': 432L, + 'zoom': 0L}, + 1564189528.213135], + [loc('logging_service.py'), + {'attrib-starts': [('startup|0|', + 20)], + 'code-line': ' # Append simulation time and the log entri'\ + 'es to the Output Buffer\n', + 'first-line': 21L, + 'folded-linenos': [], + 'sel-line': 55L, + 'sel-line-start': 1843L, + 'selection_end': 1851L, + 'selection_start': 1851L, + 'zoom': 0L}, + 1564189539.194298]], 20), - 'current-loc': loc('__main__.py'), + 'current-loc': loc('cad_watcher.py'), 'editor-state-list': [(loc('activitylog_watcher.py'), {'attrib-starts': [('getLogEntries|0|', @@ -437,13 +438,12 @@ 'zoom': 0L}), (loc('cad_watcher.py'), - {'attrib-starts': [('isFull|0|', - 16)], - 'code-line': '\n', - 'first-line': 3L, + {'attrib-starts': [], + 'code-line': 'lastLineNum = 0\n', + 'first-line': 33L, 'folded-linenos': [], - 'sel-line': 18L, - 'sel-line-start': 559L, - 'selection_end': 559L, - 'selection_start': 559L, + 'sel-line': 11L, + 'sel-line-start': 417L, + 'selection_end': 432L, + 'selection_start': 432L, 'zoom': 0L}), (loc('cms_watcher.py'), @@ -471,12 +471,12 @@ {'attrib-starts': [('startup|0|', 20)], - 'code-line': ' trimmed_item ='\ - ' item.strip()\n', - 'first-line': 50L, + 'code-line': ' # Append simulation '\ + 'time and the log entries to the Output Buffer\n', + 'first-line': 21L, 'folded-linenos': [], - 'sel-line': 57L, - 'sel-line-start': 1955L, - 'selection_end': 1955L, - 'selection_start': 1955L, + 'sel-line': 55L, + 'sel-line-start': 1843L, + 'selection_end': 1851L, + 'selection_start': 1851L, 'zoom': 0L}), (loc('__main__.py'), @@ -500,9 +500,9 @@ loc('__main__.py')]), 'open_files': [u'../../../config/logging_service.cfg', + u'activitylog_watcher.py', u'cms_watcher.py', + u'__main__.py', u'logging_service.py', - u'activitylog_watcher.py', - u'cad_watcher.py', - u'__main__.py']}, + u'cad_watcher.py']}, 'saved_notebook_display': None, 'split_percents': {0: 0.5}, @@ -511,5 +511,5 @@ 'traversal_pos': ((0, 3), - 1563915857.693931), + 1564183253.966105), 'user_data': {}}, 'saved_notebook_display': None, @@ -519,5 +519,5 @@ 'traversal_pos': ((0, 4), - 1564102198.163837), + 1564183317.08295), 'user_data': {}}, 'window-alloc': (29, @@ -525,8 +525,8 @@ 1197, 722)}]} -guimgr.recent-documents = [loc('__main__.py'), - loc('cad_watcher.py'), +guimgr.recent-documents = [loc('cad_watcher.py'), + loc('logging_service.py'), + loc('__main__.py'), loc('activitylog_watcher.py'), - loc('logging_service.py'), loc('cms_watcher.py'), loc('../../../config/logging_service.cfg')]